ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PPC: spapr: Rework VGA select logic 

When selecting our VGA adapter, we want to:

  * fail completely when we can't satisfy the user's request
  * support -nographic where no VGA adapter should be spawned

This patch reworks the logic so we fulfill the two conditions above.

Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
Alexander Graf 2012-08-14 13:11:49 +02:00
parent a5b71725c7
commit 8c57b867b5
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hw/spapr.c
View File

@ -563,16 +563,21 @@ static void spapr_cpu_reset(void *opaque)
cpu_reset(CPU(cpu)); cpu_reset(CPU(cpu));
} }
/* 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)
{ {
if (std_vga_enabled) { switch (vga_interface_type) {
case VGA_STD:
pci_vga_init(pci_bus); pci_vga_init(pci_bus);
} else { return 1;
case VGA_NONE:
return 0;
default:
fprintf(stderr, "This vga model is not supported," fprintf(stderr, "This vga model is not supported,"
"currently it only supports -vga std\n"); "currently it only supports -vga std\n");
return 0; exit(0);
break;
} }
return 1;
} }
/* pSeries LPAR / sPAPR hardware init */ /* pSeries LPAR / sPAPR hardware init */