From patchwork Fri Dec 11 16:37:02 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 58293 Delivered-To: patches@linaro.org Received: by 10.112.157.166 with SMTP id wn6csp250424lbb; Fri, 11 Dec 2015 08:37:23 -0800 (PST) X-Received: by 10.25.142.84 with SMTP id q81mr6933162lfd.77.1449851834572; Fri, 11 Dec 2015 08:37:14 -0800 (PST) Return-Path: Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id rd5si10842680lbb.67.2015.12.11.08.37.14 for (version=TLS1_2 cipher=AES128-SHA bits=128/128); Fri, 11 Dec 2015 08:37:14 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::1 as permitted sender) client-ip=2001:8b0:1d0::1; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::1 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1a7Qgx-0001Id-9i; Fri, 11 Dec 2015 16:37:11 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, qemu-arm@nongnu.org, Alistair Francis , Peter Crosthwaite , "Edgar E. Iglesias" , Markus Armbruster , Paolo Bonzini , Kevin O'Connor Subject: [PATCH 01/10] hw/sd/sdhci.c: Remove x-drive property Date: Fri, 11 Dec 2015 16:37:02 +0000 Message-Id: <1449851831-4966-2-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1449851831-4966-1-git-send-email-peter.maydell@linaro.org> References: <1449851831-4966-1-git-send-email-peter.maydell@linaro.org> The following commits will remove support for the old sdhci-pci command line syntax using the x-drive property: -device sdhci-pci,x-drive=mydrive -drive id=mydrive,[...] and replace it with an explicit sd device: -device sdhci-pci -drive id=mydrive,[...] -device sd,drive=mydrive (This is OK because x-drive is experimental.) This commit removes the x-drive property so that old style command lines will fail with a reasonable error message: -device sdhci-pci,x-drive=mydrive: Property '.x-drive' not found Signed-off-by: Peter Maydell --- hw/sd/sdhci.c | 6 ------ 1 file changed, 6 deletions(-) -- 1.9.1 diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 8612760..991c9b5 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1221,12 +1221,6 @@ const VMStateDescription sdhci_vmstate = { /* Capabilities registers provide information on supported features of this * specific host controller implementation */ static Property sdhci_pci_properties[] = { - /* - * We currently fuse controller and card into a single device - * model, but we intend to separate them. For that purpose, the - * properties that belong to the card are marked as experimental. - */ - DEFINE_PROP_DRIVE("x-drive", SDHCIState, blk), DEFINE_PROP_UINT32("capareg", SDHCIState, capareg, SDHC_CAPAB_REG_DEFAULT), DEFINE_PROP_UINT32("maxcurr", SDHCIState, maxcurr, 0),