Patchwork PPC: spapr: Rework VGA select logic

login
register
mail settings
Submitter Alexander Graf
Date Aug. 14, 2012, 11:15 a.m.
Message ID <1344942912-30639-1-git-send-email-agraf@suse.de>
Download mbox | patch
Permalink /patch/177223/
State New
Headers show

Comments

Alexander Graf - Aug. 14, 2012, 11:15 a.m.
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>
---
 hw/spapr.c |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

Patch

diff --git a/hw/spapr.c b/hw/spapr.c
index 494c412..31c4e53 100644
--- a/hw/spapr.c
+++ b/hw/spapr.c
@@ -563,16 +563,22 @@  static void spapr_cpu_reset(void *opaque)
     cpu_reset(CPU(cpu));
 }
 
+/* Returns whether we want to use VGA or not */
 static int spapr_vga_init(PCIBus *pci_bus)
 {
-    if (std_vga_enabled) {
+    switch (vga_interface_type) {
+    case VGA_STD:
         pci_vga_init(pci_bus);
-    } else {
+        return 1;
+        break;
+    case VGA_NONE:
+        return 0;
+    default:
         fprintf(stderr, "This vga model is not supported,"
                 "currently it only supports -vga std\n");
-        return 0;
+        exit(0);
+        break;
     }
-    return 1;
 }
 
 /* pSeries LPAR / sPAPR hardware init */