From d111e2df2d647e5d13f54ce40b6c920037cfc876 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Vilanova?= Date: Wed, 21 Feb 2018 01:55:11 -0500 Subject: [PATCH] typedefs: Add CPUState Backports commit b23197f9cf2f221a6cc6272d36852f4f70cf9c1b from qemu --- qemu/include/qemu/typedefs.h | 1 + qemu/include/qom/cpu.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/qemu/include/qemu/typedefs.h b/qemu/include/qemu/typedefs.h index aa1b70a7..0fd2e45d 100644 --- a/qemu/include/qemu/typedefs.h +++ b/qemu/include/qemu/typedefs.h @@ -16,6 +16,7 @@ typedef struct BusState BusState; typedef struct CharDriverState CharDriverState; typedef struct CompatProperty CompatProperty; typedef struct CPUAddressSpace CPUAddressSpace; +typedef struct CPUState CPUState; typedef struct DeviceState DeviceState; typedef struct DisplayChangeListener DisplayChangeListener; typedef struct DisplayState DisplayState; diff --git a/qemu/include/qom/cpu.h b/qemu/include/qom/cpu.h index 6bad665c..530fe16b 100644 --- a/qemu/include/qom/cpu.h +++ b/qemu/include/qom/cpu.h @@ -62,7 +62,6 @@ typedef uint64_t vaddr; #define CPU_CLASS(uc, class) OBJECT_CLASS_CHECK(uc, CPUClass, (class), TYPE_CPU) #define CPU_GET_CLASS(uc, obj) OBJECT_GET_CLASS(uc, CPUClass, (obj), TYPE_CPU) -typedef struct CPUState CPUState; typedef struct CPUWatchpoint CPUWatchpoint; typedef void (*CPUUnassignedAccess)(CPUState *cpu, hwaddr addr,