diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-02-18 14:16:18 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-02-18 14:26:33 +0000 |
| commit | ac6de31acded883e04438d25b6ac7189d83a3444 (patch) | |
| tree | 4800fa6fbdd3bd782631211f88123ca29ad8496f /hw/sd | |
| parent | c3a86b35f2bae29278b2ebb3018c51ba69697db7 (diff) | |
| download | qemu-ac6de31acded883e04438d25b6ac7189d83a3444.zip qemu-ac6de31acded883e04438d25b6ac7189d83a3444.tar.gz qemu-ac6de31acded883e04438d25b6ac7189d83a3444.tar.bz2 | |
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 <peter.maydell@linaro.org>
Reviewed-by: Alistair Francis <alistair.francis@xilinx.com>
Reviewed-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
Message-id: 1455646193-13238-2-git-send-email-peter.maydell@linaro.org
Diffstat (limited to 'hw/sd')
| -rw-r--r-- | hw/sd/sdhci.c | 6 |
1 files changed, 0 insertions, 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), |