[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/12] hw/arm/virt: Fix property "gic-version" error
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 06/12] hw/arm/virt: Fix property "gic-version" error handling |
Date: |
Thu, 10 Dec 2015 11:29:26 +0100 |
virt_set_gic_version() calls exit(1) when passed an invalid property
value. Property setters are not supposed to do that. Screwed up in
commit b92ad39. Harmless, because the property belongs to a machine.
Set an error object instead.
Cc: Peter Maydell <address@hidden>
Cc: address@hidden
Signed-off-by: Markus Armbruster <address@hidden>
---
hw/arm/virt.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 9c6792c..2a120dd 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -1126,9 +1126,8 @@ static void virt_set_gic_version(Object *obj, const char
*value, Error **errp)
} else if (!strcmp(value, "host")) {
vms->gic_version = 0; /* Will probe later */
} else {
- error_report("Invalid gic-version option value");
- error_printf("Allowed gic-version values are: 3, 2, host\n");
- exit(1);
+ error_setg(errp, "Invalid gic-version value");
+ error_append_hint(errp, "Valid values are: 3, 2, host\n");
}
}
--
2.4.3
- Re: [Qemu-devel] [PATCH 02/12] omap: Don't use hw_error() in device init() methods, (continued)
- [Qemu-devel] [PATCH 04/12] etraxfs_eth: Don't use hw_error() in init() method, Markus Armbruster, 2015/12/10
- [Qemu-devel] [PATCH 01/12] hw: Don't use hw_error() for machine initialization errors, Markus Armbruster, 2015/12/10
- [Qemu-devel] [PATCH 03/12] arm_mptimer: Don't use hw_error() in realize() method, Markus Armbruster, 2015/12/10
- [Qemu-devel] [PATCH 06/12] hw/arm/virt: Fix property "gic-version" error handling,
Markus Armbruster <=
- [Qemu-devel] [PATCH 11/12] audio: Clean up inappropriate and unreachable use of hw_error(), Markus Armbruster, 2015/12/10
- [Qemu-devel] [PATCH 07/12] sysbus: Don't use hw_error() in machine_init_done_notifiers, Markus Armbruster, 2015/12/10
- [Qemu-devel] [PATCH 12/12] xen-hvm: Mark inappropriate error handling FIXME, Markus Armbruster, 2015/12/10
- [Qemu-devel] [PATCH 09/12] isa: Clean up error handling around isa_bus_new(), Markus Armbruster, 2015/12/10