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: 10770 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id DC03123E1B for ; Thu, 16 Aug 2012 13:46:02 +0000 (UTC) Received: from mail-yx0-f180.google.com (mail-yx0-f180.google.com [209.85.213.180]) by fiordland.canonical.com (Postfix) with ESMTP id 925A9A18D03 for ; Thu, 16 Aug 2012 13:46:02 +0000 (UTC) Received: by yenl8 with SMTP id l8so3069669yen.11 for ; Thu, 16 Aug 2012 06:46:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=nGexnzpUfWDaUSsO/Q9kqU+67o+ppfk1y4s5YnxUDvw=; b=lwrDMyViPLgMdKTZghQgF0o/qzLCEzl9XsALHYCSEHY87HGqpt/FxAqPP2hQnomiw8 HEXk6DuWw6dhR+x37r9uH1Z1wQ66CIyLV4xgz8aW7NEi+OEO0HRy7hNB81fONkfdEy8v bt6rItheD1peaYL8+tEXIwke94iGfIqEwO3ACJjZBfTqr0PSk5Ok1EjF5vYwyikOw4qK lPRNbxhgvfmDY1zqk1pJOhpVaBTk6AXjc0JXnxkYvgt+JcBKGOujVM8htMgKYvpH0BWD D+nQevLeIDvHCsytWsWJFJt2CAioBUSeJRFpvSw/xmeDuCqhKQA89yzyZIo2qTWRe/3u 8vbA== Received: by 10.50.154.132 with SMTP id vo4mr1589230igb.31.1345124761704; Thu, 16 Aug 2012 06:46:01 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.200 with SMTP id ew8csp126729igc; Thu, 16 Aug 2012 06:46:00 -0700 (PDT) Received: by 10.180.84.164 with SMTP id a4mr3333559wiz.12.1345124760003; Thu, 16 Aug 2012 06:46:00 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [81.2.115.146]) by mx.google.com with ESMTPS id o9si6277418wea.143.2012.08.16.06.45.58 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 16 Aug 2012 06:45:59 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) client-ip=81.2.115.146; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) smtp.mail=pm215@archaic.org.uk 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 Cc: patches@linaro.org, Markus Armbruster , Kevin Wolf , Paul Brook Subject: [PATCH 3/3] Drop default SD card creation 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-Gm-Message-State: ALoCoQkZjHw4lkUSsn2ZdazSwIYWlzzO/7eiOuiStj2wbgHbG92vbl/5Aty+nArWYCiYFIBJPBZR 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);