On 11 December 2015 at 19:01, Kevin O'Connor <ke...@koconnor.net> wrote: > On Fri, Dec 11, 2015 at 04:37:06PM +0000, Peter Maydell wrote: >> Update the SDHCI code to use the new SDBus APIs. >> >> This commit introduces the new command line options required >> to connect a disk to sdhci-pci: >> >> -device sdhci-pci -drive id=mydrive,[...] -device sd,drive=mydrive > > I can't review in depth right now, but I did notice > > [...] >> --- a/hw/sd/sdhci.c >> +++ b/hw/sd/sdhci.c >> @@ -55,6 +55,9 @@ >> } \ >> } while (0) >> >> +#define TYPE_SDHCI_BUS "sdhci-bus" >> +#define SDHCI_BUS(obj) OBJECT_CHECK(SDBus, (obj), TYPE_PXA2XX_MMCI_BUS) > > the above PXA2XX typo
Oops. We never actually use this macro, so I didn't notice the cut-n-paste error. > [...] >> @@ -1303,6 +1323,7 @@ static void sdhci_sysbus_realize(DeviceState *dev, >> Error ** errp) >> memory_region_init_io(&s->iomem, OBJECT(s), &sdhci_mmio_ops, s, "sdhci", >> SDHC_REGISTERS_MAP_SIZE); >> sysbus_init_mmio(sbd, &s->iomem); >> + >> } > > and the above white space damage. Will fix. thanks -- PMM