diff options
| author | Philippe Mathieu-Daudé <philmd@linaro.org> | 2023-11-20 13:25:56 +0100 |
|---|---|---|
| committer | Philippe Mathieu-Daudé <philmd@linaro.org> | 2024-01-05 16:20:15 +0100 |
| commit | cb50fc6842bf95b4e3bc1faa2a56bf7987ea6491 (patch) | |
| tree | e9992758c8e30a71c417473f4ef7bf1c4c553e22 /hw/pci-host/raven.c | |
| parent | ca1b8762922f4fa859e082898ca567c2cc0269ca (diff) | |
| download | focaccia-qemu-cb50fc6842bf95b4e3bc1faa2a56bf7987ea6491.tar.gz focaccia-qemu-cb50fc6842bf95b4e3bc1faa2a56bf7987ea6491.zip | |
hw/pci-host/raven: Propagate error in raven_realize()
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> Reviewed-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org> Reviewed-by: Gavin Shan <gshan@redhat.com> Message-Id: <20231120213301.24349-26-philmd@linaro.org>
Diffstat (limited to 'hw/pci-host/raven.c')
| -rw-r--r-- | hw/pci-host/raven.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/hw/pci-host/raven.c b/hw/pci-host/raven.c index f71d4872c8..c7a0a2878a 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) { |