automatic floppy boot

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@563 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/vl.c b/vl.c
index 6c43a58..7b52203 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -3461,8 +3461,12 @@ int main(int argc, char **argv)
         help();
     
     /* boot to cd by default if no hard disk */
-    if (hd_filename[0] == '\0' && boot_device == 'c')
-        boot_device = 'd';
+    if (hd_filename[0] == '\0' && boot_device == 'c') {
+        if (fd_filename[0] != '\0')
+            boot_device = 'a';
+        else
+            boot_device = 'd';
+    }
 
 #if !defined(CONFIG_SOFTMMU)
     /* must avoid mmap() usage of glibc by setting a buffer "by hand" */