Re: [Qemu-arm] [PATCH 01/10] hw/sd/sdhci.c: Remove x-drive property

[Peter Crosthwaite]

On Fri, Dec 11, 2015 at 04:37:02PM +0000, Peter Maydell wrote:
> 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 <address@hidden>

Reviewed-by: Peter Crosthwaite <address@hidden>

> ---
>  hw/sd/sdhci.c | 6 ------
>  1 file changed, 6 deletions(-)
> 
> 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),
> -- 
> 1.9.1
>