qom/object: Move Object typedef to 'qemu/typedefs.h'

We use the Object type all over the place.
Forward declare it in "qemu/typedefs.h".

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20200504115656.6045-2-f4bug@amsat.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/hw/block/vhost-user-blk.c b/hw/block/vhost-user-blk.c
index 9d8c0b3909c51da072a69e52db5da9274a01eb24..98941019a2d9e0c602f805cc586ffa9b46065696 100644 (file)
--- a/hw/block/vhost-user-blk.c
+++ b/hw/block/vhost-user-blk.c
@@ -20,7 +20,6 @@
 #include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "qemu/cutils.h"
-#include "qom/object.h"
 #include "hw/qdev-core.h"
 #include "hw/qdev-properties.h"
 #include "hw/virtio/vhost.h"

diff --git a/hw/pci-host/pam.c b/hw/pci-host/pam.c
index 45c4333cd38fd079c8a8d7c98d53e6374897e096..a4962057833f1f60aa093530007c16162de0acd8 100644 (file)
--- a/hw/pci-host/pam.c
+++ b/hw/pci-host/pam.c
@@ -28,7 +28,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "qom/object.h"
 #include "hw/pci-host/pam.h"
 
 void init_pam(DeviceState *dev, MemoryRegion *ram_memory,

diff --git a/hw/scsi/vhost-user-scsi.c b/hw/scsi/vhost-user-scsi.c
index cbb5d9759933b0ceed8a894fafa34efd4c32fe17..f2e524438a3e10d2d8433cb8342ec6fa51635070 100644 (file)
--- a/hw/scsi/vhost-user-scsi.c
+++ b/hw/scsi/vhost-user-scsi.c
@@ -18,7 +18,6 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
-#include "qom/object.h"
 #include "hw/fw-path-provider.h"
 #include "hw/qdev-core.h"
 #include "hw/qdev-properties.h"

diff --git a/include/hw/display/edid.h b/include/hw/display/edid.h
index 23371ee82c6355855bf7aab1e0ca7b55a781abbf..5b1de57f24f90fed72320d93e5d243bd33436378 100644 (file)
--- a/include/hw/display/edid.h
+++ b/include/hw/display/edid.h
@@ -1,9 +1,6 @@
 #ifndef EDID_H
 #define EDID_H
 
-#include "qom/object.h"
-#include "hw/qdev-properties.h"
-
 typedef struct qemu_edid_info {
     const char *vendor; /* http://www.uefi.org/pnp_id_list */
     const char *name;

diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h
index ecf3cde26c3c34d7987426ace92589f2c8cac442..de68d51d52b93c103ffb2213a3dd05c1f30cf795 100644 (file)
--- a/include/qemu/typedefs.h
+++ b/include/qemu/typedefs.h
@@ -76,6 +76,7 @@ typedef struct NetFilterState NetFilterState;
 typedef struct NICInfo NICInfo;
 typedef struct NodeInfo NodeInfo;
 typedef struct NumaNodeMem NumaNodeMem;
+typedef struct Object Object;
 typedef struct ObjectClass ObjectClass;
 typedef struct PCIBridge PCIBridge;
 typedef struct PCIBus PCIBus;

diff --git a/include/qom/object.h b/include/qom/object.h
index fd453dc8d6827d1d0b593ca810ba059fcd2faee2..c7c97ead60a2106b08bd3ae733343706fb7b5897 100644 (file)
--- a/include/qom/object.h
+++ b/include/qom/object.h
@@ -20,8 +20,6 @@
 struct TypeImpl;
 typedef struct TypeImpl *Type;
 
-typedef struct Object Object;
-
 typedef struct TypeInfo TypeInfo;
 
 typedef struct InterfaceClass InterfaceClass;

diff --git a/include/qom/qom-qobject.h b/include/qom/qom-qobject.h
index 77cd717e3faf465f40fbcf9fb55ea2a5e1409e6d..82136e6e8043e4efa2eb18e507e3927c3a46ff4d 100644 (file)
--- a/include/qom/qom-qobject.h
+++ b/include/qom/qom-qobject.h
@@ -13,8 +13,6 @@
 #ifndef QEMU_QOM_QOBJECT_H
 #define QEMU_QOM_QOBJECT_H
 
-#include "qom/object.h"
-
 /*
  * object_property_get_qobject:
  * @obj: the object

diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h
index 3efccdba7e4b721c3f3bdc019e2c25fbb91524ab..4b6a5c459cd7ab4600e71699bbdb7d651d516861 100644 (file)
--- a/include/sysemu/sysemu.h
+++ b/include/sysemu/sysemu.h
@@ -5,7 +5,6 @@
 #include "qemu/timer.h"
 #include "qemu/notify.h"
 #include "qemu/uuid.h"
-#include "qom/object.h"
 
 /* vl.c */
 

diff --git a/stubs/qmp_memory_device.c b/stubs/qmp_memory_device.c
index 85ff8f2d7eedc2e06b2f37d9f6106f40c2978261..e75cac62dc6f59b96c57f3b756eb3a8d70b68e53 100644 (file)
--- a/stubs/qmp_memory_device.c
+++ b/stubs/qmp_memory_device.c
@@ -1,5 +1,4 @@
 #include "qemu/osdep.h"
-#include "qom/object.h"
 #include "hw/mem/memory-device.h"
 
 MemoryDeviceInfoList *qmp_memory_device_list(void)