From patchwork Wed Dec 16 13:25:40 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [FOR,0.12,2/2] defaults: update device_list[] Date: Wed, 16 Dec 2009 03:25:40 -0000 From: Gerd Hoffmann X-Patchwork-Id: 41259 Message-Id: <1260969940-26796-2-git-send-email-kraxel@redhat.com> To: qemu-devel@nongnu.org Cc: Gerd Hoffmann 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 --- qemu-config.h | 1 + vl.c | 3 +++ 2 files changed, 4 insertions(+), 0 deletions(-) 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_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 0318c56..f53807f 100644 --- a/vl.c +++ b/vl.c @@ -285,6 +285,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 }, @@ -5701,6 +5703,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;