Commit ac6de31a authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarAlistair Francis <alistair.francis@xilinx.com>
Reviewed-by: default avatarPeter Crosthwaite <crosthwaite.peter@gmail.com>
Message-id: 1455646193-13238-2-git-send-email-peter.maydell@linaro.org
parent c3a86b35

hw/sd/sdhci.c

+0 −6
Original line number Diff line number Diff line
@@ -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),