From: Peter Maydell Date: Thu, 18 Feb 2016 14:16:18 +0000 (+0000) Subject: hw/sd/sdhci.c: Remove x-drive property X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.2~30^2~6^2~8^2~180^2~19 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ac6de31acded883e04438d25b6ac7189d83a3444;p=sdk%2Femulator%2Fqemu.git hw/sd/sdhci.c: Remove x-drive property 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 Message-id: 1455646193-13238-2-git-send-email-peter.maydell@linaro.org --- diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 30e3bf4f3c..3d1eb85458 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),