diff options
| author | Markus Armbruster <armbru@redhat.com> | 2019-08-12 07:23:54 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2019-08-16 13:31:53 +0200 |
| commit | 7969dd9169f64493fa70b542d8ab65b275571ea6 (patch) | |
| tree | 38541588a89d69ffc5c47ccf542e0253b81c9d75 | |
| parent | a44432b44fe864c7b5dda15cd5472e3a06a4715a (diff) | |
| download | qemu-7969dd9169f64493fa70b542d8ab65b275571ea6.zip | |
Include sysemu/hostmem.h less
Move the HostMemoryBackend typedef from sysemu/hostmem.h to
qemu/typedefs.h. This renders a few inclusions of sysemu/hostmem.h
superfluous; drop them.
Cc: Eduardo Habkost <ehabkost@redhat.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20190812052359.30071-25-armbru@redhat.com>
| -rw-r--r-- | hw/mem/nvdimm.c | 1 | ||||
| -rw-r--r-- | hw/virtio/virtio-pmem.c | 1 | ||||
| -rw-r--r-- | include/hw/mem/pc-dimm.h | 1 | ||||
| -rw-r--r-- | include/hw/virtio/virtio-pmem.h | 1 | ||||
| -rw-r--r-- | include/qemu/typedefs.h | 1 | ||||
| -rw-r--r-- | 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 a95ad6a113..7fe5973312 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -49,6 +49,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; /** |