[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-ppc] [PATCH 05/11] pseries: Cleanup error handling in spapr_vg
From: |
David Gibson |
Subject: |
Re: [Qemu-ppc] [PATCH 05/11] pseries: Cleanup error handling in spapr_vga_init() |
Date: |
Mon, 14 Dec 2015 12:13:20 +1100 |
User-agent: |
Mutt/1.5.24 (2015-08-30) |
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.
> >
> > Also improve the error message.
> >
> > Signed-off-by: David Gibson <address@hidden>
> > ---
> > 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 b478ca6..0ff09b9 100644
> > --- a/hw/ppc/spapr.c
> > +++ b/hw/ppc/spapr.c
> > @@ -1246,7 +1246,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 int spapr_vga_init(PCIBus *pci_bus, Error **errp)
>
> While you're at it, you could also change the return type from "int" to
> "bool".
Good point, done.
>
> > {
> > 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) != 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;
> > }
> >
>
> Reviewed-by: Thomas Huth <address@hidden>
>
--
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
signature.asc
Description: PGP signature
- Re: [Qemu-ppc] [Qemu-devel] [PATCH 06/11] pseries: Improve error handling in find_unknown_sysbus_device(), (continued)
- [Qemu-ppc] [PATCH 01/11] ppc: Cleanup error handling in ppc_set_compat(), David Gibson, 2015/12/10
- [Qemu-ppc] [PATCH 09/11] pseries: Clean up error handling in xics_system_init(), David Gibson, 2015/12/10
- [Qemu-ppc] [PATCH 05/11] pseries: Cleanup error handling in spapr_vga_init(), David Gibson, 2015/12/10
- [Qemu-ppc] [PATCH 10/11] pseries: Clean up error handling in ppc_spapr_init(), David Gibson, 2015/12/10
- [Qemu-ppc] [PATCH 07/11] pseries: Cleanup error handling in spapr_kvm_type(), David Gibson, 2015/12/10
- [Qemu-ppc] [PATCH 03/11] pseries: Clean up hash page table allocation error handling, David Gibson, 2015/12/10