From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39388) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aamXR-0007As-SC for qemu-devel@nongnu.org; Tue, 01 Mar 2016 10:48:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aamXQ-0003AS-TO for qemu-devel@nongnu.org; Tue, 01 Mar 2016 10:48:41 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43141) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aamXQ-0003AN-O4 for qemu-devel@nongnu.org; Tue, 01 Mar 2016 10:48:40 -0500 From: Stefan Hajnoczi Date: Tue, 1 Mar 2016 15:48:12 +0000 Message-Id: <1456847294-13576-12-git-send-email-stefanha@redhat.com> In-Reply-To: <1456847294-13576-1-git-send-email-stefanha@redhat.com> References: <1456847294-13576-1-git-send-email-stefanha@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 11/13] typedefs: Add CPUState List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , =?UTF-8?q?Llu=C3=ADs=20Vilanova?= , Stefan Hajnoczi From: Llu=C3=ADs Vilanova Signed-off-by: Llu=C3=ADs 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 6ed91b4..9a5ead6 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 1df7cb4..7052eee 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) =20 -typedef struct CPUState CPUState; typedef struct CPUWatchpoint CPUWatchpoint; =20 typedef void (*CPUUnassignedAccess)(CPUState *cpu, hwaddr addr, diff --git a/stubs/target-get-monitor-def.c b/stubs/target-get-monitor-de= f.c index 013e657..4d1033d 100644 --- a/stubs/target-get-monitor-def.c +++ b/stubs/target-get-monitor-def.c @@ -20,10 +20,9 @@ */ =20 #include "qemu/osdep.h" +#include "qemu/typedefs.h" #include "stdint.h" =20 -typedef struct CPUState CPUState; - int target_get_monitor_def(CPUState *cs, const char *name, uint64_t *pva= l); =20 int target_get_monitor_def(CPUState *cs, const char *name, uint64_t *pva= l) --=20 2.5.0