[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 04/12] hw/isa/vt82c686: Reuse errp
From: |
Bernhard Beschow |
Subject: |
[PATCH v4 04/12] hw/isa/vt82c686: Reuse errp |
Date: |
Wed, 31 Aug 2022 17:45:57 +0200 |
Rather than terminating abruptly, make use of the already present errp and
propagate the error to the caller.
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
---
hw/isa/vt82c686.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c
index 5582c0b179..37e37b3855 100644
--- a/hw/isa/vt82c686.c
+++ b/hw/isa/vt82c686.c
@@ -590,7 +590,12 @@ static void via_isa_realize(PCIDevice *d, Error **errp)
qdev_init_gpio_out(dev, &s->cpu_intr, 1);
isa_irq = qemu_allocate_irqs(via_isa_request_i8259_irq, s, 1);
isa_bus = isa_bus_new(dev, pci_address_space(d), pci_address_space_io(d),
- &error_fatal);
+ errp);
+
+ if (!isa_bus) {
+ return;
+ }
+
s->isa_irqs = i8259_init(isa_bus, *isa_irq);
isa_bus_irqs(isa_bus, s->isa_irqs);
i8254_pit_init(isa_bus, 0x40, 0, NULL);
--
2.37.3
- [PATCH v4 00/12] Instantiate VT82xx functions in host device, Bernhard Beschow, 2022/08/31
- [PATCH v4 02/12] hw/isa/vt82c686: Resolve unneeded attribute, Bernhard Beschow, 2022/08/31
- [PATCH v4 01/12] hw/isa/vt82c686: Resolve chip-specific realize methods, Bernhard Beschow, 2022/08/31
- [PATCH v4 03/12] hw/isa/vt82c686: Prefer pci_address_space() over get_system_memory(), Bernhard Beschow, 2022/08/31
- [PATCH v4 08/12] hw/isa/vt82c686: Instantiate USB functions in host device, Bernhard Beschow, 2022/08/31
- [PATCH v4 04/12] hw/isa/vt82c686: Reuse errp,
Bernhard Beschow <=
- [PATCH v4 05/12] hw/isa/vt82c686: Introduce TYPE_VIA_IDE define, Bernhard Beschow, 2022/08/31
- [PATCH v4 07/12] hw/isa/vt82c686: Introduce TYPE_VT82C686B_USB_UHCI define, Bernhard Beschow, 2022/08/31
- [PATCH v4 06/12] hw/isa/vt82c686: Instantiate IDE function in host device, Bernhard Beschow, 2022/08/31
- [PATCH v4 09/12] hw/isa/vt82c686: Instantiate PM function in host device, Bernhard Beschow, 2022/08/31
- [PATCH v4 10/12] hw/isa/vt82c686: Instantiate AC97 and MC97 functions in host device, Bernhard Beschow, 2022/08/31
- [PATCH v4 11/12] hw/isa/vt82c686: Embed RTCState in host device, Bernhard Beschow, 2022/08/31
- [PATCH v4 12/12] hw/isa/vt82c686: Create rtc-time alias in boards instead, Bernhard Beschow, 2022/08/31