[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/10] default devices: drives
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 10/10] default devices: drives |
Date: |
Tue, 24 Nov 2009 09:58:44 +0100 |
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 <address@hidden>
---
vl.c | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/vl.c b/vl.c
index 960d2f6..cefafaf 100644
--- a/vl.c
+++ b/vl.c
@@ -277,6 +277,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;
@@ -5419,6 +5420,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:
@@ -5645,14 +5647,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)
--
1.6.2.5
- [Qemu-devel] [PATCH 00/10] default devices: qdev integration., Gerd Hoffmann, 2009/11/24
- [Qemu-devel] [PATCH 01/10] chardev: move greeting into vc backend., Gerd Hoffmann, 2009/11/24
- [Qemu-devel] [PATCH 02/10] vc: colorize chardev title line with blue background., Gerd Hoffmann, 2009/11/24
- [Qemu-devel] [PATCH 03/10] default devices: core code & serial lines., Gerd Hoffmann, 2009/11/24
- [Qemu-devel] [PATCH 06/10] zap serial_monitor_mux, Gerd Hoffmann, 2009/11/24
- [Qemu-devel] [PATCH 08/10] default devices: add global cmd line option., Gerd Hoffmann, 2009/11/24
- [Qemu-devel] [PATCH 07/10] default devices: vga adapter., Gerd Hoffmann, 2009/11/24
- [Qemu-devel] [PATCH 04/10] default devices: parallel port., Gerd Hoffmann, 2009/11/24
- [Qemu-devel] [PATCH 05/10] default devices: qemu monitor., Gerd Hoffmann, 2009/11/24
- [Qemu-devel] [PATCH 10/10] default devices: drives,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 09/10] default devices: network, Gerd Hoffmann, 2009/11/24
- Re: [Qemu-devel] [PATCH 00/10] default devices: qdev integration., Markus Armbruster, 2009/11/24