diff options
author | 2009-12-08 13:11:48 +0100 | |
---|---|---|
committer | 2009-12-12 08:17:30 -0600 | |
commit | f4f1df70f2e0d177080a4a3b8cc6cbd47d751a7e (patch) | |
tree | 669d44cd0c2e0cc57236bdba599804e89e604fd7 /vl.c | |
parent | default devices: network (diff) | |
download | qemu-kvm-f4f1df70f2e0d177080a4a3b8cc6cbd47d751a7e.tar.gz qemu-kvm-f4f1df70f2e0d177080a4a3b8cc6cbd47d751a7e.tar.bz2 qemu-kvm-f4f1df70f2e0d177080a4a3b8cc6cbd47d751a7e.zip |
default devices: drives
Add a default_drive variable which specified whenever the default drives
(cdrom, floppy, sd) should be created. It is cleared when the new
-nodefaults switch is specified on the command line.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
(cherry picked from commit aa40fc9c96474b0135d1b940611862f260aedba7)
Diffstat (limited to 'vl.c')
-rw-r--r-- | vl.c | 16 |
1 files changed, 10 insertions, 6 deletions
@@ -276,6 +276,7 @@ static int default_serial = 1; static int default_parallel = 1; static int default_monitor = 1; static int default_vga = 1; +static int default_drive = 1; static struct { const char *driver; @@ -5477,6 +5478,7 @@ int main(int argc, char **argv, char **envp) default_monitor = 0; default_vga = 0; default_net = 0; + default_drive = 0; break; #ifndef _WIN32 case QEMU_OPTION_chroot: @@ -5709,14 +5711,16 @@ int main(int argc, char **argv, char **envp) blk_mig_init(); - /* we always create the cdrom drive, even if no disk is there */ - drive_add(NULL, CDROM_ALIAS); + if (default_drive) { + /* we always create the cdrom drive, even if no disk is there */ + drive_add(NULL, CDROM_ALIAS); - /* we always create at least one floppy */ - drive_add(NULL, FD_ALIAS, 0); + /* we always create at least one floppy */ + drive_add(NULL, FD_ALIAS, 0); - /* we always create one sd slot, even if no card is in it */ - drive_add(NULL, SD_ALIAS); + /* we always create one sd slot, even if no card is in it */ + drive_add(NULL, SD_ALIAS); + } /* open the virtual block devices */ if (snapshot) |