From d8bcbabf260a4ecce73180991cad576de850b66d Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Wed, 16 Dec 2009 14:25:40 +0100 Subject: [PATCH] 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}= too. Signed-off-by: Gerd Hoffmann Signed-off-by: Anthony Liguori --- qemu-config.h | 1 + vl.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/qemu-config.h b/qemu-config.h index 34dfadc5f3..dd89ae4683 100644 --- a/qemu-config.h +++ b/qemu-config.h @@ -7,6 +7,7 @@ extern QemuOptsList qemu_device_opts; 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); diff --git a/vl.c b/vl.c index ffa1aec904..95abe7e67f 100644 --- a/vl.c +++ b/vl.c @@ -284,6 +284,8 @@ static struct { } 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 @@ int main(int argc, char **argv, char **envp) } 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;