On 7/26/19 2:05 PM, Markus Armbruster wrote: > Move the HostMemoryBackend typedef from sysemu/hostmem.h to > qemu/typedefs.h. This renders a few inclusions of sysemu/hostmem.h > superflouous; drop them. > > Cc: Eduardo Habkost <ehabk...@redhat.com> > Cc: Igor Mammedov <imamm...@redhat.com> > Signed-off-by: Markus Armbruster <arm...@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <phi...@redhat.com> > --- > hw/mem/nvdimm.c | 1 + > hw/virtio/virtio-pmem.c | 1 + > include/hw/mem/pc-dimm.h | 1 - > include/hw/virtio/virtio-pmem.h | 1 - > include/qemu/typedefs.h | 1 + > include/sysemu/hostmem.h | 1 - > 6 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/hw/mem/nvdimm.c b/hw/mem/nvdimm.c > index 6fefd65092..375f9a588a 100644 > --- a/hw/mem/nvdimm.c > +++ b/hw/mem/nvdimm.c > @@ -30,6 +30,7 @@ > #include "hw/mem/nvdimm.h" > #include "hw/qdev-properties.h" > #include "hw/mem/memory-device.h" > +#include "sysemu/hostmem.h" > > static void nvdimm_get_label_size(Object *obj, Visitor *v, const char *name, > void *opaque, Error **errp) > diff --git a/hw/virtio/virtio-pmem.c b/hw/virtio/virtio-pmem.c > index ff1a2ddb36..c0c9395e55 100644 > --- a/hw/virtio/virtio-pmem.c > +++ b/hw/virtio/virtio-pmem.c > @@ -21,6 +21,7 @@ > #include "hw/virtio/virtio-access.h" > #include "standard-headers/linux/virtio_ids.h" > #include "standard-headers/linux/virtio_pmem.h" > +#include "sysemu/hostmem.h" > #include "block/aio.h" > #include "block/thread-pool.h" > > diff --git a/include/hw/mem/pc-dimm.h b/include/hw/mem/pc-dimm.h > index 47b246f95c..289edc0f3d 100644 > --- a/include/hw/mem/pc-dimm.h > +++ b/include/hw/mem/pc-dimm.h > @@ -17,7 +17,6 @@ > #define QEMU_PC_DIMM_H > > #include "exec/memory.h" > -#include "sysemu/hostmem.h" > #include "hw/qdev-core.h" > > #define TYPE_PC_DIMM "pc-dimm" > diff --git a/include/hw/virtio/virtio-pmem.h b/include/hw/virtio/virtio-pmem.h > index 8bf2ae780f..33f1999320 100644 > --- a/include/hw/virtio/virtio-pmem.h > +++ b/include/hw/virtio/virtio-pmem.h > @@ -16,7 +16,6 @@ > > #include "hw/virtio/virtio.h" > #include "qapi/qapi-types-misc.h" > -#include "sysemu/hostmem.h" > > #define TYPE_VIRTIO_PMEM "virtio-pmem" > > diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h > index 9e1283aacf..f569f5f270 100644 > --- a/include/qemu/typedefs.h > +++ b/include/qemu/typedefs.h > @@ -33,6 +33,7 @@ typedef struct FWCfgEntry FWCfgEntry; > typedef struct FWCfgIoState FWCfgIoState; > typedef struct FWCfgMemState FWCfgMemState; > typedef struct FWCfgState FWCfgState; > +typedef struct HostMemoryBackend HostMemoryBackend; > typedef struct HVFX86EmulatorState HVFX86EmulatorState; > typedef struct I2CBus I2CBus; > typedef struct I2SCodec I2SCodec; > diff --git a/include/sysemu/hostmem.h b/include/sysemu/hostmem.h > index 92fa0e458c..afeb5db1b1 100644 > --- a/include/sysemu/hostmem.h > +++ b/include/sysemu/hostmem.h > @@ -27,7 +27,6 @@ > #define MEMORY_BACKEND_CLASS(klass) \ > OBJECT_CLASS_CHECK(HostMemoryBackendClass, (klass), TYPE_MEMORY_BACKEND) > > -typedef struct HostMemoryBackend HostMemoryBackend; > typedef struct HostMemoryBackendClass HostMemoryBackendClass; > > /** >
