| Message ID | 1449851831-4966-2-git-send-email-peter.maydell@linaro.org |
|---|---|
| State | New |
| Headers | show |
On Fri, Dec 11, 2015 at 8:37 AM, Peter Maydell <peter.maydell@linaro.org> 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 <peter.maydell@linaro.org> I agree with the way you have split up the patches. I don't think it is worth maintaining compatibility over the series. Reviewed-by: Alistair Francis <alistair.francis@xilinx.com> Thanks, Alistair > --- > 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 > >
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 <peter.maydell@linaro.org> Reviewed-by: Peter Crosthwaite <crosthwaite.peter@gmail.com> > --- > 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 >
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),
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> --- hw/sd/sdhci.c | 6 ------ 1 file changed, 6 deletions(-)