From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56535) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9bWd-0007CK-CZ for qemu-devel@nongnu.org; Thu, 17 Dec 2015 11:35:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a9bWb-0003ur-VU for qemu-devel@nongnu.org; Thu, 17 Dec 2015 11:35:31 -0500 From: Markus Armbruster Date: Thu, 17 Dec 2015 17:35:15 +0100 Message-Id: <1450370121-5768-8-git-send-email-armbru@redhat.com> In-Reply-To: <1450370121-5768-1-git-send-email-armbru@redhat.com> References: <1450370121-5768-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH v3 07/13] hw/arm/virt: Fix property "gic-version" error handling List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , qemu-arm@nongnu.org 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 Cc: qemu-arm@nongnu.org Signed-off-by: Markus Armbruster --- 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