mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pseries: Clean up error handling in spapr_vga_init()

Browse Source 
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 <david@gibson.dropbear.id.au>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
David Gibson 2016-01-20 12:58:39 +11:00
parent 7c150d6f04
commit 14c6a89497
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/ppc/spapr.c
View File

@ -1246,7 +1246,7 @@ static void spapr_rtc_create(sPAPRMachineState *spapr)
} }
/* Returns whether we want to use VGA or not */ /* 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) { switch (vga_interface_type) {
case VGA_NONE: case VGA_NONE:
@ -1257,9 +1257,9 @@ static int spapr_vga_init(PCIBus *pci_bus)
case VGA_VIRTIO: case VGA_VIRTIO:
return pci_vga_init(pci_bus) != NULL; return pci_vga_init(pci_bus) != NULL;
default: default:
fprintf(stderr, "This vga model is not supported," error_setg(errp,
"currently it only supports -vga std\n"); "Unsupported VGA mode, only -vga std or -vga virtio is supported");
exit(0); return false;
} }
} }
@ -1934,7 +1934,7 @@ static void ppc_spapr_init(MachineState *machine)
} }
/* Graphics */ /* Graphics */
if (spapr_vga_init(phb->bus)) { if (spapr_vga_init(phb->bus, &error_fatal)) {
spapr->has_graphics = true; spapr->has_graphics = true;
machine->usb |= defaults_enabled() && !machine->usb_disabled; machine->usb |= defaults_enabled() && !machine->usb_disabled;
} }