On 05/05/2017 06:48 AM, Paolo Bonzini wrote:
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 <pbonz...@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4...@amsat.org>
---
There are other failures but I don't have time to debug them today:
In file included from /tmp/qemu-test/src/include/hw/ppc/pnv.h:26,
from /tmp/qemu-test/src/hw/ppc/pnv.c:31:
/tmp/qemu-test/src/include/hw/ppc/pnv_psi.h:50: error: redefinition of
typedef ‘PnvPsi’
/tmp/qemu-test/src/include/hw/ppc/pnv_lpc.h:26: note: previous
declaration of ‘PnvPsi’ was here
In file included from /tmp/qemu-test/src/include/hw/ppc/pnv.h:27,
from /tmp/qemu-test/src/hw/ppc/pnv.c:31:
/tmp/qemu-test/src/include/hw/ppc/pnv_occ.h:25: error: redefinition of
typedef ‘PnvPsi’
/tmp/qemu-test/src/include/hw/ppc/pnv_psi.h:50: note: previous
declaration of ‘PnvPsi’ was here
In file included from /tmp/qemu-test/src/hw/ppc/pnv.c:39:
/tmp/qemu-test/src/include/hw/ipmi/ipmi.h:188: error: redefinition of
typedef ‘IPMIBmc’
/tmp/qemu-test/src/include/hw/ppc/pnv.h:121: note: previous declaration
of ‘IPMIBmc’ was here
make[1]: *** [hw/ppc/pnv.o] Error 1
Please start including Docker-based tests in your pre-pull-request
tests.
include/hw/ppc/xics.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h
index c215dc7..ce1942b 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)
