commit d8bcbabf260a4ecce73180991cad576de850b66d
author Gerd Hoffmann <kraxel@redhat.com> Wed Dec 16 14:25:40 2009 +0100
committer Anthony Liguori <aliguori@us.ibm.com> Fri Dec 18 11:26:27 2009 -0600
tree b4cadc13c65d777f8d266c3515336949ad0a1eab
parent ac33f8fad14e07fa12b74c3494339ae6882dc22f

defaults: update device_list[]

Add isa-fdc (disables default_floppy).
Add ide-drive (disables default_cdrom).

Also walk the -global QemuOpts, so we'll catch
-global isa-fdc.drive{A,B}=<name> too.

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

qemu-config.h

diff --git a/qemu-config.h b/qemu-config.h
index 34dfadc..dd89ae4 100644
--- a/qemu-config.h
+++ b/qemu-config.h
@@ -7,6 +7,7 @@
 extern QemuOptsList qemu_netdev_opts;
 extern QemuOptsList qemu_net_opts;
 extern QemuOptsList qemu_rtc_opts;
+extern QemuOptsList qemu_global_opts;
 extern QemuOptsList qemu_mon_opts;
 
 int qemu_set_option(const char *str);

vl.c

diff --git a/vl.c b/vl.c
index ffa1aec..95abe7e 100644
--- a/vl.c
+++ b/vl.c
@@ -284,6 +284,8 @@
 } default_list[] = {
     { .driver = "isa-serial",           .flag = &default_serial    },
     { .driver = "isa-parallel",         .flag = &default_parallel  },
+    { .driver = "isa-fdc",              .flag = &default_floppy    },
+    { .driver = "ide-drive",            .flag = &default_cdrom     },
     { .driver = "virtio-console-pci",   .flag = &default_virtcon   },
     { .driver = "virtio-console-s390",  .flag = &default_virtcon   },
     { .driver = "VGA",                  .flag = &default_vga       },
@@ -5676,6 +5678,7 @@
     }
 
     qemu_opts_foreach(&qemu_device_opts, default_driver_check, NULL, 0);
+    qemu_opts_foreach(&qemu_global_opts, default_driver_check, NULL, 0);
 
     if (machine->no_serial) {
         default_serial = 0;