From b23197f9cf2f221a6cc6272d36852f4f70cf9c1b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Llu=C3=ADs=20Vilanova?= Date: Thu, 25 Feb 2016 17:43:32 +0100 Subject: [PATCH] typedefs: Add CPUState MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Lluís Vilanova Message-id: 145641861239.30295.8564457138934628740.stgit@localhost Signed-off-by: Stefan Hajnoczi --- include/qemu/typedefs.h | 1 + include/qom/cpu.h | 1 - stubs/target-get-monitor-def.c | 3 +-- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index 6ed91b4968f..9a5ead69a12 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 1df7cb4073e..7052eee7b78 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 013e6571e5f..4d1033d12df 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) -- 2.39.5