typedefs: Add CPUState

Signed-off-by: Lluís Vilanova <[email protected]>
Message-id: 145641861239.30295.8564457138934628740.stgit@localhost
Signed-off-by: Stefan Hajnoczi <[email protected]>

diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h
index 6ed91b4968f0c042f58392442d95011bda00355b..9a5ead69a12179fddd914dc43ec83765481d0280 100644 (file)
--- a/include/qemu/typedefs.h
+++ b/include/qemu/typedefs.h
@@ -18,6 +18,7 @@ typedef struct BusState BusState;
 typedef struct CharDriverState CharDriverState;
 typedef struct CompatProperty CompatProperty;
 typedef struct CPUAddressSpace CPUAddressSpace;
+typedef struct CPUState CPUState;
 typedef struct DeviceListener DeviceListener;
 typedef struct DeviceState DeviceState;
 typedef struct DisplayChangeListener DisplayChangeListener;

diff --git a/include/qom/cpu.h b/include/qom/cpu.h
index 1df7cb4073e49587b502f13bd72bbb769077bc8e..7052eee7b78ad1e1c9ccf96e7a3dddd953ee9329 100644 (file)
--- a/include/qom/cpu.h
+++ b/include/qom/cpu.h
@@ -62,7 +62,6 @@ typedef uint64_t vaddr;
 #define CPU_CLASS(class) OBJECT_CLASS_CHECK(CPUClass, (class), TYPE_CPU)
 #define CPU_GET_CLASS(obj) OBJECT_GET_CLASS(CPUClass, (obj), TYPE_CPU)
 
-typedef struct CPUState CPUState;
 typedef struct CPUWatchpoint CPUWatchpoint;
 
 typedef void (*CPUUnassignedAccess)(CPUState *cpu, hwaddr addr,

diff --git a/stubs/target-get-monitor-def.c b/stubs/target-get-monitor-def.c
index 013e6571e5f371e7ed996982a0867ed4f314a00c..4d1033d12df6ec466945b8c6a8d52394901731f6 100644 (file)
--- a/stubs/target-get-monitor-def.c
+++ b/stubs/target-get-monitor-def.c
@@ -20,10 +20,9 @@
  */
 
 #include "qemu/osdep.h"
+#include "qemu/typedefs.h"
 #include "stdint.h"
 
-typedef struct CPUState CPUState;
-
 int target_get_monitor_def(CPUState *cs, const char *name, uint64_t *pval);
 
 int target_get_monitor_def(CPUState *cs, const char *name, uint64_t *pval)