On Wed, Dec 13, 2017 at 11:58 AM, Philippe Mathieu-Daudé <f4...@amsat.org> wrote: > Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org>
Reviewed-by: Alistair Francis <alistair.fran...@xilinx.com> Alistair > --- > hw/sd/sdhci-internal.h | 4 ---- > include/hw/sd/sdhci.h | 4 +++- > hw/sd/sdhci.c | 1 + > 3 files changed, 4 insertions(+), 5 deletions(-) > > diff --git a/hw/sd/sdhci-internal.h b/hw/sd/sdhci-internal.h > index 161177cf39..248fd027f9 100644 > --- a/hw/sd/sdhci-internal.h > +++ b/hw/sd/sdhci-internal.h > @@ -24,8 +24,6 @@ > #ifndef SDHCI_INTERNAL_H > #define SDHCI_INTERNAL_H > > -#include "hw/sd/sdhci.h" > - > /* R/W SDMA System Address register 0x0 */ > #define SDHC_SYSAD 0x00 > > @@ -227,6 +225,4 @@ enum { > sdhc_gap_write = 2 /* SDHC stopped at block gap during write > operation */ > }; > > -extern const VMStateDescription sdhci_vmstate; > - > #endif > diff --git a/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h > index 0f0c3f1e64..1b6a98d578 100644 > --- a/include/hw/sd/sdhci.h > +++ b/include/hw/sd/sdhci.h > @@ -26,17 +26,19 @@ > #define SDHCI_H > > #include "qemu-common.h" > -#include "hw/block/block.h" > #include "hw/pci/pci.h" > #include "hw/sysbus.h" > #include "hw/sd/sd.h" > > /* SD/MMC host controller state */ > typedef struct SDHCIState { > + /*< private >*/ > union { > PCIDevice pcidev; > SysBusDevice busdev; > }; > + > + /*< public >*/ > SDBus sdbus; > MemoryRegion iomem; > > diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c > index e7cd3258a3..312b167bfa 100644 > --- a/hw/sd/sdhci.c > +++ b/hw/sd/sdhci.c > @@ -28,6 +28,7 @@ > #include "sysemu/dma.h" > #include "qemu/timer.h" > #include "qemu/bitops.h" > +#include "hw/sd/sdhci.h" > #include "sdhci-internal.h" > #include "sd-internal.h" > #include "qemu/log.h" > -- > 2.15.1 > >