summaryrefslogtreecommitdiffstats
path: root/vl.c
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2009-12-16 14:25:40 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2009-12-18 11:26:27 -0600
commitd8bcbabf260a4ecce73180991cad576de850b66d (patch)
treeb4cadc13c65d777f8d266c3515336949ad0a1eab /vl.c
parentac33f8fad14e07fa12b74c3494339ae6882dc22f (diff)
downloadhqemu-d8bcbabf260a4ecce73180991cad576de850b66d.zip
hqemu-d8bcbabf260a4ecce73180991cad576de850b66d.tar.gz
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>
Diffstat (limited to 'vl.c')
-rw-r--r--vl.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/vl.c b/vl.c
index ffa1aec..95abe7e 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;
OpenPOWER on IntegriCloud