[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 12/40] ioapic: Fix error handling in realize()
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 12/40] ioapic: Fix error handling in realize() |
Date: |
Mon, 22 Oct 2018 14:33:45 +0200 |
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 <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Peter Xu <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Message-Id: <address@hidden>
---
hw/intc/ioapic.c | 8 ++++----
1 file 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,
--
2.17.2
- [Qemu-devel] [PULL 00/40] Error reporting patches for 2018-10-22, Markus Armbruster, 2018/10/22
- [Qemu-devel] [PULL 04/40] Use error_fatal to simplify obvious fatal errors (again), Markus Armbruster, 2018/10/22
- [Qemu-devel] [PULL 01/40] scripts: Remove check-qerror.sh, Markus Armbruster, 2018/10/22
- [Qemu-devel] [PULL 03/40] error: Fix use of error_prepend() with &error_fatal, &error_abort, Markus Armbruster, 2018/10/22
- [Qemu-devel] [PULL 05/40] block: Use warn_report() & friends to report warnings, Markus Armbruster, 2018/10/22
- [Qemu-devel] [PULL 12/40] ioapic: Fix error handling in realize(),
Markus Armbruster <=
- [Qemu-devel] [PULL 27/40] ui/keymaps: Fix handling of erroneous include files, Markus Armbruster, 2018/10/22
- [Qemu-devel] [PULL 10/40] 9pfs: Fix CLI parsing crash on error, Markus Armbruster, 2018/10/22
- [Qemu-devel] [PULL 25/40] vl: Clean up error reporting in parse_fw_cfg(), Markus Armbruster, 2018/10/22
- [Qemu-devel] [PULL 24/40] vl: Clean up error reporting in mon_init_func(), Markus Armbruster, 2018/10/22
- [Qemu-devel] [PULL 22/40] vl: Clean up error reporting in chardev_init_func(), Markus Armbruster, 2018/10/22
- [Qemu-devel] [PULL 35/40] blockdev: Convert drive_new() to Error, Markus Armbruster, 2018/10/22
- [Qemu-devel] [PULL 39/40] vpc: Fail open on bad header checksum, Markus Armbruster, 2018/10/22
- [Qemu-devel] [PULL 20/40] vl: Clean up error reporting in parse_add_fd(), Markus Armbruster, 2018/10/22
- [Qemu-devel] [PULL 30/40] numa: Clean up error reporting in parse_numa(), Markus Armbruster, 2018/10/22
- [Qemu-devel] [PULL 08/40] vfio: Clean up error reporting after previous commit, Markus Armbruster, 2018/10/22