From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NCrEk-0006ul-Vq for qemu-devel@nongnu.org; Tue, 24 Nov 2009 03:59:03 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NCrEe-0006oG-T8 for qemu-devel@nongnu.org; Tue, 24 Nov 2009 03:59:01 -0500 Received: from [199.232.76.173] (port=51450 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NCrEe-0006o9-Lr for qemu-devel@nongnu.org; Tue, 24 Nov 2009 03:58:56 -0500 Received: from mx1.redhat.com ([209.132.183.28]:30064) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NCrEe-0000tT-4I for qemu-devel@nongnu.org; Tue, 24 Nov 2009 03:58:56 -0500 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nAO8wtaS015332 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 24 Nov 2009 03:58:55 -0500 From: Gerd Hoffmann Date: Tue, 24 Nov 2009 09:58:44 +0100 Message-Id: <1259053124-10471-11-git-send-email-kraxel@redhat.com> In-Reply-To: <1259053124-10471-1-git-send-email-kraxel@redhat.com> References: <1259053124-10471-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 10/10] default devices: drives List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann 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 --- 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