From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56938) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aK32t-0000Fl-PK for qemu-devel@nongnu.org; Fri, 15 Jan 2016 07:00:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aK32q-0002yO-UR for qemu-devel@nongnu.org; Fri, 15 Jan 2016 06:59:59 -0500 From: David Gibson Date: Fri, 15 Jan 2016 23:00:40 +1100 Message-Id: <1452859244-9500-7-git-send-email-david@gibson.dropbear.id.au> In-Reply-To: <1452859244-9500-1-git-send-email-david@gibson.dropbear.id.au> References: <1452859244-9500-1-git-send-email-david@gibson.dropbear.id.au> Subject: [Qemu-devel] [PATCH 06/10] pseries: Improve error handling in find_unknown_sysbus_device() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: armbru@redhat.com Cc: aik@ozlabs.ru, David Gibson , qemu-ppc@nongnu.org, mdroth@linux.vnet.ibm.com, qemu-devel@nongnu.org Use error_setg() to return an error instead of using an explicit exit(). Signed-off-by: David Gibson --- hw/ppc/spapr.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index bb5eaa5..ddca6e6 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1106,6 +1106,7 @@ static void spapr_reset_htab(sPAPRMachineState *spapr, Error **errp) static int find_unknown_sysbus_device(SysBusDevice *sbdev, void *opaque) { + Error **errp = opaque; bool matched = false; if (object_dynamic_cast(OBJECT(sbdev), TYPE_SPAPR_PCI_HOST_BRIDGE)) { @@ -1113,9 +1114,10 @@ static int find_unknown_sysbus_device(SysBusDevice *sbdev, void *opaque) } if (!matched) { - error_report("Device %s is not supported by this machine yet.", - qdev_fw_name(DEVICE(sbdev))); - exit(1); + error_setg(errp, + "Device %s is not supported by this machine yet", + qdev_fw_name(DEVICE(sbdev))); + return 1; /* Don't continue scanning devices */ } return 0; @@ -1150,7 +1152,7 @@ static void ppc_spapr_reset(void) uint32_t rtas_limit; /* Check for unknown sysbus devices */ - foreach_dynamic_sysbus_device(find_unknown_sysbus_device, NULL); + foreach_dynamic_sysbus_device(find_unknown_sysbus_device, &error_fatal); /* Reset the hash table & recalc the RMA */ spapr_reset_htab(spapr, &error_fatal); -- 2.5.0