From patchwork Thu Aug 16 13:45:54 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 177993 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 7F5542C00DC for ; Thu, 16 Aug 2012 23:56:55 +1000 (EST) Received: from localhost ([::1]:57516 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T20ZB-0001sw-MA for incoming@patchwork.ozlabs.org; Thu, 16 Aug 2012 09:56:53 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57833) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T20Z0-0001sh-2L for qemu-devel@nongnu.org; Thu, 16 Aug 2012 09:56:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T20Yv-0007nS-7l for qemu-devel@nongnu.org; Thu, 16 Aug 2012 09:56:42 -0400 Received: from mnementh.archaic.org.uk ([81.2.115.146]:50107) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T20Yu-0007nC-WF for qemu-devel@nongnu.org; Thu, 16 Aug 2012 09:56:37 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1T20OZ-00015q-3d; Thu, 16 Aug 2012 14:45:55 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Thu, 16 Aug 2012 14:45:54 +0100 Message-Id: <1345124754-4173-4-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1345124754-4173-1-git-send-email-peter.maydell@linaro.org> References: <1345124754-4173-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 81.2.115.146 Cc: Kevin Wolf , Paul Brook , Markus Armbruster , patches@linaro.org Subject: [Qemu-devel] [PATCH 3/3] Drop default SD card creation X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Now that all users of IF_SD drives can cope with there being no drive present (ie "controller exists but there is no card in it") we can drop the creation of the default IF_SD card in vl.c and the no_sdcard field in the QEMUMachine struct. Signed-off-by: Peter Maydell --- hw/boards.h | 3 +-- hw/s390-virtio.c | 1 - hw/xilinx_zynq.c | 1 - vl.c | 7 ------- 4 files changed, 1 insertion(+), 11 deletions(-) diff --git a/hw/boards.h b/hw/boards.h index 59c01d0..af4c019 100644 --- a/hw/boards.h +++ b/hw/boards.h @@ -23,8 +23,7 @@ typedef struct QEMUMachine { no_parallel:1, use_virtcon:1, no_floppy:1, - no_cdrom:1, - no_sdcard:1; + no_cdrom:1; int is_default; const char *default_machine_opts; GlobalProperty *compat_props; diff --git a/hw/s390-virtio.c b/hw/s390-virtio.c index 47eed35..560393f 100644 --- a/hw/s390-virtio.c +++ b/hw/s390-virtio.c @@ -338,7 +338,6 @@ static QEMUMachine s390_machine = { .no_floppy = 1, .no_serial = 1, .no_parallel = 1, - .no_sdcard = 1, .use_virtcon = 1, .max_cpus = 255, .is_default = 1, diff --git a/hw/xilinx_zynq.c b/hw/xilinx_zynq.c index 7e6c273..b532953 100644 --- a/hw/xilinx_zynq.c +++ b/hw/xilinx_zynq.c @@ -146,7 +146,6 @@ static QEMUMachine zynq_machine = { .init = zynq_init, .use_scsi = 1, .max_cpus = 1, - .no_sdcard = 1 }; static void zynq_machine_init(void) diff --git a/vl.c b/vl.c index d01256a..ba1953c 100644 --- a/vl.c +++ b/vl.c @@ -268,7 +268,6 @@ static int default_virtcon = 1; static int default_monitor = 1; static int default_floppy = 1; static int default_cdrom = 1; -static int default_sdcard = 1; static int default_vga = 1; static struct { @@ -3169,7 +3168,6 @@ int main(int argc, char **argv, char **envp) default_net = 0; default_floppy = 0; default_cdrom = 0; - default_sdcard = 0; default_vga = 0; break; case QEMU_OPTION_xen_domid: @@ -3343,9 +3341,6 @@ int main(int argc, char **argv, char **envp) if (machine->no_cdrom) { default_cdrom = 0; } - if (machine->no_sdcard) { - default_sdcard = 0; - } if (display_type == DT_NOGRAPHIC) { if (default_parallel) @@ -3488,8 +3483,6 @@ int main(int argc, char **argv, char **envp) IF_DEFAULT, 2, CDROM_OPTS); default_drive(default_floppy, snapshot, machine->use_scsi, IF_FLOPPY, 0, FD_OPTS); - default_drive(default_sdcard, snapshot, machine->use_scsi, - IF_SD, 0, SD_OPTS); register_savevm_live(NULL, "ram", 0, 4, &savevm_ram_handlers, NULL);