diff options
| author | Markus Armbruster <armbru@redhat.com> | 2018-10-17 10:26:34 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2018-10-19 14:51:34 +0200 |
| commit | 11ab69d6e7a81c35f109a399a39d56e777f41d8a (patch) | |
| tree | e5b82966fa196a4ee2d0ed6ba3bca011a5c5001b /hw/intc/ioapic.c | |
| parent | d319e05d6f24350272e7f600a43d0c0091924512 (diff) | |
| download | focaccia-qemu-11ab69d6e7a81c35f109a399a39d56e777f41d8a.tar.gz focaccia-qemu-11ab69d6e7a81c35f109a399a39d56e777f41d8a.zip | |
ioapic: Fix error handling in realize()
Calling error_report() in a function that takes an Error ** argument is suspicious. ioapic_realize() does that, and then exit()s. Currently mostly harmless, as the device cannot be hot-plugged. Fixes: 20fd4b7b6d9282fe0cb83601f1821f31bd257458 Cc: Peter Xu <peterx@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Peter Xu <peterx@redhat.com> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> Message-Id: <20181017082702.5581-11-armbru@redhat.com>
Diffstat (limited to 'hw/intc/ioapic.c')
| -rw-r--r-- | hw/intc/ioapic.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/intc/ioapic.c b/hw/intc/ioapic.c index b6896ac4ce..4e529729b4 100644 --- a/hw/intc/ioapic.c +++ b/hw/intc/ioapic.c @@ -21,7 +21,7 @@ */ #include "qemu/osdep.h" -#include "qemu/error-report.h" +#include "qapi/error.h" #include "monitor/monitor.h" #include "hw/hw.h" #include "hw/i386/pc.h" @@ -393,9 +393,9 @@ static void ioapic_realize(DeviceState *dev, Error **errp) IOAPICCommonState *s = IOAPIC_COMMON(dev); if (s->version != 0x11 && s->version != 0x20) { - error_report("IOAPIC only supports version 0x11 or 0x20 " - "(default: 0x%x).", IOAPIC_VER_DEF); - exit(1); + error_setg(errp, "IOAPIC only supports version 0x11 or 0x20 " + "(default: 0x%x).", IOAPIC_VER_DEF); + return; } memory_region_init_io(&s->io_memory, OBJECT(s), &ioapic_io_ops, s, |