[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 2/5] hw/i386/pc: Propagate error if HPET device creation faile
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v3 2/5] hw/i386/pc: Propagate error if HPET device creation failed |
Date: |
Fri, 20 Oct 2023 12:54:43 +0200 |
Reported-by: Bernhard Beschow <shentey@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/i386/pc.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index c0477f0141..c58a15182e 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1235,7 +1235,9 @@ bool pc_basic_device_init(struct PCMachineState *pcms,
if (!compat) {
qdev_prop_set_uint32(hpet, HPET_INTCAP, hpet_irqs);
}
- sysbus_realize_and_unref(SYS_BUS_DEVICE(hpet), &error_fatal);
+ if (!sysbus_realize_and_unref(SYS_BUS_DEVICE(hpet), errp)) {
+ return false;
+ }
sysbus_mmio_map(SYS_BUS_DEVICE(hpet), 0, HPET_BASE);
for (i = 0; i < IOAPIC_NUM_PINS; i++) {
--
2.41.0
- [PATCH v3 0/5] hw/audio/pcspk: Inline pcspk_init(), Philippe Mathieu-Daudé, 2023/10/20
- [PATCH v3 1/5] hw/i386/pc: Pass Error** argument to pc_basic_device_init(), Philippe Mathieu-Daudé, 2023/10/20
- [PATCH v3 2/5] hw/i386/pc: Propagate error if HPET device creation failed,
Philippe Mathieu-Daudé <=
- [PATCH v3 3/5] hw/i386/pc: Inline legacy pcspk_init() in pc_basic_device_init(), Philippe Mathieu-Daudé, 2023/10/20
- [PATCH v3 4/5] hw/isa/i82378: Inline legacy pcspk_init(), Philippe Mathieu-Daudé, 2023/10/20
- [PATCH v3 5/5] hw/mips/jazz: Inline and remove legacy pcspk_init(), Philippe Mathieu-Daudé, 2023/10/20
- Re: [PATCH v3 0/5] hw/audio/pcspk: Inline pcspk_init(), Richard Henderson, 2023/10/21