From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52442) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a7KKh-0001t5-BI for qemu-devel@nongnu.org; Fri, 11 Dec 2015 04:49:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a7KKe-0000Ct-3O for qemu-devel@nongnu.org; Fri, 11 Dec 2015 04:49:47 -0500 References: <1449792685-17000-1-git-send-email-david@gibson.dropbear.id.au> <1449792685-17000-7-git-send-email-david@gibson.dropbear.id.au> From: Thomas Huth Message-ID: <566A9C34.4070308@redhat.com> Date: Fri, 11 Dec 2015 10:49:40 +0100 MIME-Version: 1.0 In-Reply-To: <1449792685-17000-7-git-send-email-david@gibson.dropbear.id.au> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 06/11] pseries: Improve error handling in find_unknown_sysbus_device() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: David Gibson , armbru@redhat.com, aik@ozlabs.ru, mdroth@linux.vnet.ibm.com Cc: lvivier@redhat.com, qemu-ppc@nongnu.org, agraf@suse.de, qemu-devel@nongnu.org On 11/12/15 01:11, David Gibson wrote: > Use error_setg() to return an error instead of using an explicit exit(). > > Signed-off-by: David Gibson > --- > hw/ppc/spapr.c | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 0ff09b9..fd16db4 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -1107,6 +1107,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)) { > @@ -1114,9 +1115,9 @@ 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 0; > @@ -1151,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_abort); > > /* Reset the hash table & recalc the RMA */ > spapr_reset_htab(spapr, &error_abort); Can this error be triggered by the user (by plugging certain devices or so)? If so, I'm not sure whether error_abort is the right thing to use here ... it's always ugly if the user can trigger an abort directly. Maybe error_fatal would be better instead? Thomas