[Qemu-devel] [7227] simplify vga selection (Gerd Hoffmann)

[Anthony Liguori]

Revision: 7227
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=7227
Author:   aliguori
Date:     2009-04-22 15:19:48 +0000 (Wed, 22 Apr 2009)
Log Message:
-----------
simplify vga selection (Gerd Hoffmann)

Signed-off-by: Gerd Hoffmann <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>

Modified Paths:
--------------
    trunk/vl.c

Modified: trunk/vl.c
===================================================================
--- trunk/vl.c  2009-04-22 15:19:44 UTC (rev 7226)
+++ trunk/vl.c  2009-04-22 15:19:48 UTC (rev 7227)
@@ -4222,23 +4222,16 @@
 {
     const char *opts;
 
+    cirrus_vga_enabled = 0;
+    std_vga_enabled = 0;
+    vmsvga_enabled = 0;
     if (strstart(p, "std", &opts)) {
         std_vga_enabled = 1;
-        cirrus_vga_enabled = 0;
-        vmsvga_enabled = 0;
     } else if (strstart(p, "cirrus", &opts)) {
         cirrus_vga_enabled = 1;
-        std_vga_enabled = 0;
-        vmsvga_enabled = 0;
     } else if (strstart(p, "vmware", &opts)) {
-        cirrus_vga_enabled = 0;
-        std_vga_enabled = 0;
         vmsvga_enabled = 1;
-    } else if (strstart(p, "none", &opts)) {
-        cirrus_vga_enabled = 0;
-        std_vga_enabled = 0;
-        vmsvga_enabled = 0;
-    } else {
+    } else if (!strstart(p, "none", &opts)) {
     invalid_vga:
         fprintf(stderr, "Unknown vga type: %s\n", p);
         exit(1);