From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43818) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a8I7m-0001eD-PP for qemu-devel@nongnu.org; Sun, 13 Dec 2015 20:40:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a8I7l-0004UB-6R for qemu-devel@nongnu.org; Sun, 13 Dec 2015 20:40:26 -0500 Date: Mon, 14 Dec 2015 12:13:20 +1100 From: David Gibson Message-ID: <20151214011320.GG22783@voom.fritz.box> References: <1449792685-17000-1-git-send-email-david@gibson.dropbear.id.au> <1449792685-17000-6-git-send-email-david@gibson.dropbear.id.au> <566A98FE.4080500@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="qoTlaiD+Y2fIM3Ll" Content-Disposition: inline In-Reply-To: <566A98FE.4080500@redhat.com> Subject: Re: [Qemu-devel] [PATCH 05/11] pseries: Cleanup error handling in spapr_vga_init() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Thomas Huth Cc: lvivier@redhat.com, qemu-devel@nongnu.org, mdroth@linux.vnet.ibm.com, aik@ozlabs.ru, agraf@suse.de, armbru@redhat.com, qemu-ppc@nongnu.org --qoTlaiD+Y2fIM3Ll Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Dec 11, 2015 at 10:35:58AM +0100, Thomas Huth wrote: > On 11/12/15 01:11, David Gibson wrote: > > Use error_setg() to return an error rather than an explicit exit(). > > Previously it was an exit(0) instead of a non-zero exit code, which was > > simply a bug. > >=20 > > Also improve the error message. > >=20 > > Signed-off-by: David Gibson > > --- > > hw/ppc/spapr.c | 10 +++++----- > > 1 file changed, 5 insertions(+), 5 deletions(-) > >=20 > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > > index b478ca6..0ff09b9 100644 > > --- a/hw/ppc/spapr.c > > +++ b/hw/ppc/spapr.c > > @@ -1246,7 +1246,7 @@ static void spapr_rtc_create(sPAPRMachineState *s= papr) > > } > > =20 > > /* Returns whether we want to use VGA or not */ > > -static int spapr_vga_init(PCIBus *pci_bus) > > +static int spapr_vga_init(PCIBus *pci_bus, Error **errp) >=20 > While you're at it, you could also change the return type from "int" to > "bool". Good point, done. >=20 > > { > > switch (vga_interface_type) { > > case VGA_NONE: > > @@ -1257,9 +1257,9 @@ static int spapr_vga_init(PCIBus *pci_bus) > > case VGA_VIRTIO: > > return pci_vga_init(pci_bus) !=3D NULL; > > default: > > - fprintf(stderr, "This vga model is not supported," > > - "currently it only supports -vga std\n"); > > - exit(0); > > + error_setg(errp, > > + "Unsupported VGA mode, only -vga std or -vga virtio= is supported"); > > + return false; > > } > > } > > =20 > > @@ -1926,7 +1926,7 @@ static void ppc_spapr_init(MachineState *machine) > > } > > =20 > > /* Graphics */ > > - if (spapr_vga_init(phb->bus)) { > > + if (spapr_vga_init(phb->bus, &error_fatal)) { > > spapr->has_graphics =3D true; > > machine->usb |=3D defaults_enabled() && !machine->usb_disabled; > > } > >=20 >=20 > Reviewed-by: Thomas Huth >=20 --=20 David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson --qoTlaiD+Y2fIM3Ll Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJWbhevAAoJEGw4ysog2bOSnmsQANhNndkYqQxBAjUs0TARkr0g Pn2TzNUko8S+ae6zKjMExeyNpyEOonDvQcDVCxNn2GcFyU7zumKzeNY8Ln0xRv96 pDZ+OtAUhSU2f+qtDuVgB5v+ma/UEhK24XybkNZwaA4P8Pxz8ijvxMtIqQ0ASu3N yNhcuEDU6CfUl2WJmQtVduBM9G2pThKybAVBAXn6CsGhC6tFt1YxlDGtsC0MAesz EZyDLkCfzNhDGDNpeyqszYwmgIjdBOD/6ibzs/ApNc5N3juHFQGjynw+V6yNnC5f V4Zm2XpXkt4XpnM0Zmj40YVnlt1WR2EVuf//tnQP6DpR+Ht91g05IuICIeQPQwfH D8kjUsqvx4oQXPWSX1gu9IdMkIOyVnDefqtUkJ8ZJyqIBrCfV+CIcazJTGuZK28M bztZ5i0BgAJ9jWi7js8ty5EJXbjU+J0yIK7v4eLzocDqUVGi/Gn5RxR3cMEMEArB nTR8kbip+x2NUS+goIt1ARf/jVbJNioFgLUIUB5EsqlPKDI7m0XIvM7OHK95YwNU /eoEJmDM09D7LjBlF443fLWC0yeSQ3Pgxyj6mLuRVRNPOpmriH1B4lBkOvC3msPY tUkBa+JPFsbNHfJGd86G259qs+ks9I65Y3mZMO94gT+J5pmEwRIfXk6Kk7KQwL2E K5qASph3yMotdIe26pVN =gr1W -----END PGP SIGNATURE----- --qoTlaiD+Y2fIM3Ll--