[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH-for-9.0 25/25] hw/pci-host/raven: Propagate error in raven_realiz
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH-for-9.0 25/25] hw/pci-host/raven: Propagate error in raven_realize() |
Date: |
Mon, 20 Nov 2023 22:32:59 +0100 |
When an Error** reference is available, it is better to
propagate local errors, rather then using generic ones,
which might terminate the whole QEMU process.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/pci-host/raven.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/hw/pci-host/raven.c b/hw/pci-host/raven.c
index 86c3a49087..e34ce47874 100644
--- a/hw/pci-host/raven.c
+++ b/hw/pci-host/raven.c
@@ -345,8 +345,10 @@ static void raven_realize(PCIDevice *d, Error **errp)
d->config[PCI_LATENCY_TIMER] = 0x10;
d->config[PCI_CAPABILITY_LIST] = 0x00;
- memory_region_init_rom_nomigrate(&s->bios, OBJECT(s), "bios", BIOS_SIZE,
- &error_fatal);
+ if (!memory_region_init_rom_nomigrate(&s->bios, OBJECT(s), "bios",
+ BIOS_SIZE, errp)) {
+ return;
+ }
memory_region_add_subregion(get_system_memory(), (uint32_t)(-BIOS_SIZE),
&s->bios);
if (s->bios_name) {
--
2.41.0
- Re: [PATCH-for-9.0 20/25] hw: Simplify memory_region_init_ram() calls, (continued)