Re: [Qemu-devel] [PATCHv4 4/8] pseries: Cleanup error handling in spapr_vga_init()

[Alexey Kardashevskiy]

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 <address@hidden>
> Reviewed-by: Thomas Huth <address@hidden>

Reviewed-by: Alexey Kardashevskiy <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 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