summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAurelien Jarno <aurelien@aurel32.net>2012-09-10 01:01:44 +0200
committerAurelien Jarno <aurelien@aurel32.net>2012-10-06 18:48:38 +0200
commit3605ded557eb2a6d06a942b952c8fac4c676b125 (patch)
tree756cc4d50c15ccafe553f576e1ec8dd1dc798031
parent879049a39724f91224f10c8d80b3cf70c9dc1c5e (diff)
downloadfocaccia-qemu-3605ded557eb2a6d06a942b952c8fac4c676b125.tar.gz
focaccia-qemu-3605ded557eb2a6d06a942b952c8fac4c676b125.zip
vl.c: default to std if cirrus is not available
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
-rw-r--r--vl.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/vl.c b/vl.c
index 17a33a0968..02dade19fc 100644
--- a/vl.c
+++ b/vl.c
@@ -3617,8 +3617,12 @@ int main(int argc, char **argv, char **envp)
         exit(1);
 
     /* If no default VGA is requested, the default is "none".  */
-    if (default_vga && cirrus_vga_available()) {
-        vga_model = "cirrus";
+    if (default_vga) {
+        if (cirrus_vga_available()) {
+            vga_model = "cirrus";
+        } else if (vga_available()) {
+            vga_model = "std";
+        }
     }
     select_vgahw(vga_model);