From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41785) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aLNxK-0002dX-Qj for qemu-devel@nongnu.org; Mon, 18 Jan 2016 23:31:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aLNxJ-0003B3-V0 for qemu-devel@nongnu.org; Mon, 18 Jan 2016 23:31:46 -0500 Received: from mail-pf0-x232.google.com ([2607:f8b0:400e:c00::232]:36805) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aLNxJ-0003At-OY for qemu-devel@nongnu.org; Mon, 18 Jan 2016 23:31:45 -0500 Received: by mail-pf0-x232.google.com with SMTP id n128so168315545pfn.3 for ; Mon, 18 Jan 2016 20:31:45 -0800 (PST) References: <1453174759-22837-1-git-send-email-david@gibson.dropbear.id.au> <1453174759-22837-5-git-send-email-david@gibson.dropbear.id.au> From: Alexey Kardashevskiy Message-ID: <569DBC2B.9070806@ozlabs.ru> Date: Tue, 19 Jan 2016 15:31:39 +1100 MIME-Version: 1.0 In-Reply-To: <1453174759-22837-5-git-send-email-david@gibson.dropbear.id.au> Content-Type: text/plain; charset=koi8-r; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCHv4 4/8] pseries: Cleanup error handling in spapr_vga_init() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: David Gibson , armbru@redhat.com, mdroth@linux.vnet.ibm.com Cc: lvivier@redhat.com, thuth@redhat.com, qemu-ppc@nongnu.org, qemu-devel@nongnu.org On 01/19/2016 02:39 PM, 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. Also improve the error message. > > While we're at it change the type of spapr_vga_init() to bool since that's > how we're using it anyway. > > Signed-off-by: David Gibson > Reviewed-by: Thomas Huth Reviewed-by: Alexey Kardashevskiy > --- > hw/ppc/spapr.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index fb0e254..1ce9b27 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -1238,7 +1238,7 @@ static void spapr_rtc_create(sPAPRMachineState *spapr) > } > > /* Returns whether we want to use VGA or not */ > -static int spapr_vga_init(PCIBus *pci_bus) > +static bool spapr_vga_init(PCIBus *pci_bus, Error **errp) > { > switch (vga_interface_type) { > case VGA_NONE: > @@ -1249,9 +1249,9 @@ static int spapr_vga_init(PCIBus *pci_bus) > case VGA_VIRTIO: > return pci_vga_init(pci_bus) != 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; > } > } > > @@ -1926,7 +1926,7 @@ static void ppc_spapr_init(MachineState *machine) > } > > /* Graphics */ > - if (spapr_vga_init(phb->bus)) { > + if (spapr_vga_init(phb->bus, &error_fatal)) { > spapr->has_graphics = true; > machine->usb |= defaults_enabled() && !machine->usb_disabled; > } > -- Alexey