summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLluís Vilanova <vilanova@ac.upc.edu>2016-02-25 17:43:32 +0100
committerStefan Hajnoczi <stefanha@redhat.com>2016-03-01 13:27:09 +0000
commitb23197f9cf2f221a6cc6272d36852f4f70cf9c1b (patch)
treeea2d709fb9c2fb814a29dacbeea8ce9f790faa87
parentbc9beb47c7822628cf7028ba177b390eabbe88a6 (diff)
downloadqemu-b23197f9cf2f221a6cc6272d36852f4f70cf9c1b.tar.gz
typedefs: Add CPUState
Signed-off-by: Lluís Vilanova <vilanova@ac.upc.edu> Message-id: 145641861239.30295.8564457138934628740.stgit@localhost Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-rw-r--r--include/qemu/typedefs.h1
-rw-r--r--include/qom/cpu.h1
-rw-r--r--stubs/target-get-monitor-def.c3
3 files changed, 2 insertions, 3 deletions
diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h
index 6ed91b4968..9a5ead69a1 100644
--- 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 1df7cb4073..7052eee7b7 100644
--- 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 013e6571e5..4d1033d12d 100644
--- 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)