commit 69fd02eea61e6d9e7cd7831ef26522a5ac9e146c
author Gerd Hoffmann <kraxel@redhat.com> Wed Dec 16 13:35:19 2009 +0100
committer Anthony Liguori <aliguori@us.ibm.com> Fri Dec 18 11:26:28 2009 -0600
tree 8e382f59390143106f60f9fadbe70457c2c2dda9
parent eba6fe8732cb5109b6fcf6a973d8959827eb7af4

fix vga names in default_list

Fix mismerge between 64465297 and 556cd098.

Cc: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

vl.c

diff --git a/vl.c b/vl.c
index 2885978..8be3648 100644
--- a/vl.c
+++ b/vl.c
@@ -289,8 +289,8 @@
     { .driver = "virtio-console-pci",   .flag = &default_virtcon   },
     { .driver = "virtio-console-s390",  .flag = &default_virtcon   },
     { .driver = "VGA",                  .flag = &default_vga       },
-    { .driver = "Cirrus VGA",           .flag = &default_vga       },
-    { .driver = "QEMUware SVGA",        .flag = &default_vga       },
+    { .driver = "cirrus-vga",           .flag = &default_vga       },
+    { .driver = "vmware-svga",          .flag = &default_vga       },
 };
 
 static int default_driver_check(QemuOpts *opts, void *opaque)