From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45706) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aVk4Y-00024S-0U for qemu-devel@nongnu.org; Tue, 16 Feb 2016 13:10:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aVk4X-0005tJ-6e for qemu-devel@nongnu.org; Tue, 16 Feb 2016 13:10:01 -0500 From: Peter Maydell Date: Tue, 16 Feb 2016 18:09:43 +0000 Message-Id: <1455646193-13238-2-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1455646193-13238-1-git-send-email-peter.maydell@linaro.org> References: <1455646193-13238-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH v3 01/10] hw/sd/sdhci.c: Remove x-drive property List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "Edgar E. Iglesias" , Alistair Francis , qemu-arm@nongnu.org, Peter Crosthwaite 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 Reviewed-by: Alistair Francis Reviewed-by: Peter Crosthwaite --- hw/sd/sdhci.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 30e3bf4..3d1eb85 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1220,12 +1220,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), -- 1.9.1