diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2017-05-05 11:48:50 +0200 |
|---|---|---|
| committer | David Gibson <david@gibson.dropbear.id.au> | 2017-05-11 09:45:15 +1000 |
| commit | 5c6b487d673f1f5e5a30f6168bad3bc5cef40180 (patch) | |
| tree | fb2b175bb9c40f97edf16be26333640bedfd8545 | |
| parent | 545d6e2b5c1e5fd321792bce0ad136c3a192c37b (diff) | |
| download | focaccia-qemu-5c6b487d673f1f5e5a30f6168bad3bc5cef40180.tar.gz focaccia-qemu-5c6b487d673f1f5e5a30f6168bad3bc5cef40180.zip | |
ppc: xics: fix compilation with CentOS 6
The PowerPCCPU typedef is included twice if a file includes both hw/ppc/xics.h and target/ppc/cpu-qom.h. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
| -rw-r--r-- | include/hw/ppc/xics.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h index 68525c80d1..05e6acbb35 100644 --- a/include/hw/ppc/xics.h +++ b/include/hw/ppc/xics.h @@ -29,6 +29,7 @@ #define XICS_H #include "hw/qdev.h" +#include "target/ppc/cpu-qom.h" #define XICS_IPI 0x2 #define XICS_BUID 0x1 @@ -46,7 +47,6 @@ typedef struct ICSStateClass ICSStateClass; typedef struct ICSState ICSState; typedef struct ICSIRQState ICSIRQState; typedef struct XICSFabric XICSFabric; -typedef struct PowerPCCPU PowerPCCPU; #define TYPE_ICP "icp" #define ICP(obj) OBJECT_CHECK(ICPState, (obj), TYPE_ICP) |