From patchwork Wed Dec 16 13:25:39 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 41260 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id EE51010085D for ; Thu, 17 Dec 2009 00:29:26 +1100 (EST) Received: from localhost ([127.0.0.1]:37064 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NKtwQ-0001qN-Lx for incoming@patchwork.ozlabs.org; Wed, 16 Dec 2009 08:29:22 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NKtt0-0000Vz-IC for qemu-devel@nongnu.org; Wed, 16 Dec 2009 08:25:50 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NKtsv-0000T4-A3 for qemu-devel@nongnu.org; Wed, 16 Dec 2009 08:25:49 -0500 Received: from [199.232.76.173] (port=37363 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NKtsu-0000SM-Ni for qemu-devel@nongnu.org; Wed, 16 Dec 2009 08:25:44 -0500 Received: from mx1.redhat.com ([209.132.183.28]:4143) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NKtst-0001g3-ST for qemu-devel@nongnu.org; Wed, 16 Dec 2009 08:25:44 -0500 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nBGDPh3o031248 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 16 Dec 2009 08:25:43 -0500 Received: from zweiblum.home.kraxel.org (vpn2-9-244.ams2.redhat.com [10.36.9.244]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nBGDPfFV013376; Wed, 16 Dec 2009 08:25:42 -0500 Received: by zweiblum.home.kraxel.org (Postfix, from userid 500) id BD6B870FCA; Wed, 16 Dec 2009 14:25:40 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Wed, 16 Dec 2009 14:25:39 +0100 Message-Id: <1260969940-26796-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Gerd Hoffmann Subject: [Qemu-devel] [FOR 0.12 PATCH 1/2] defaults: split default_drive X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Split default_drive into default_{floppy,cdrom,sdcard}. Also add QEMUMachine flags to disable them per machine. Signed-off-by: Gerd Hoffmann --- hw/boards.h | 5 ++++- vl.c | 23 ++++++++++++++++++++--- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/hw/boards.h b/hw/boards.h index 8fe0fbc..e1beda3 100644 --- a/hw/boards.h +++ b/hw/boards.h @@ -22,7 +22,10 @@ typedef struct QEMUMachine { int no_serial:1, no_parallel:1, use_virtcon:1, - no_vga:1; + no_vga:1, + no_floppy:1, + no_cdrom:1, + no_sdcard:1; int is_default; GlobalProperty *compat_props; struct QEMUMachine *next; diff --git a/vl.c b/vl.c index f9c4aff..0318c56 100644 --- a/vl.c +++ b/vl.c @@ -274,7 +274,9 @@ static int default_parallel = 1; static int default_virtcon = 1; static int default_monitor = 1; static int default_vga = 1; -static int default_drive = 1; +static int default_floppy = 1; +static int default_cdrom = 1; +static int default_sdcard = 1; static int stdio_monitor = 0; static struct { @@ -5616,7 +5618,9 @@ int main(int argc, char **argv, char **envp) default_monitor = 0; default_vga = 0; default_net = 0; - default_drive = 0; + default_floppy = 0; + default_cdrom = 0; + default_sdcard = 0; break; #ifndef _WIN32 case QEMU_OPTION_chroot: @@ -5710,6 +5714,15 @@ int main(int argc, char **argv, char **envp) if (machine->no_vga) { default_vga = 0; } + if (machine->no_floppy) { + default_floppy = 0; + } + if (machine->no_cdrom) { + default_cdrom = 0; + } + if (machine->no_sdcard) { + default_sdcard = 0; + } if (display_type == DT_NOGRAPHIC) { if (default_parallel) @@ -5863,13 +5876,17 @@ int main(int argc, char **argv, char **envp) blk_mig_init(); - if (default_drive) { + if (default_cdrom) { /* we always create the cdrom drive, even if no disk is there */ drive_add(NULL, CDROM_ALIAS); + } + if (default_floppy) { /* we always create at least one floppy */ drive_add(NULL, FD_ALIAS, 0); + } + if (default_sdcard) { /* we always create one sd slot, even if no card is in it */ drive_add(NULL, SD_ALIAS); }