From eeb61d4f8270a6849d9a584fc83da3869b79066d Mon Sep 17 00:00:00 2001
From: Paolo Bonzini <pbonzini@redhat.com>
Date: Fri, 3 Mar 2017 17:28:50 +0100
Subject: [PATCH] ppc: avoid typedef redefinitions
These cause compilation failures on CentOS 6 or other operating
systems with older GCCs.
Cc: David Gibson <dgibson@redhat.com>
Cc: qemu-ppc@nongnu.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 1488558530-21016-3-git-send-email-pbonzini@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
include/hw/ppc/spapr.h | 1 -
include/hw/ppc/xics.h | 4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h
index cfd271129d..15f43717eb 100644
--- a/include/hw/ppc/spapr.h
+++ b/include/hw/ppc/spapr.h
@@ -21,7 +21,6 @@ typedef struct sPAPREventSource sPAPREventSource;
#define SPAPR_TIMEBASE_FREQ 512000000ULL
typedef struct sPAPRMachineClass sPAPRMachineClass;
-typedef struct sPAPRMachineState sPAPRMachineState;
#define TYPE_SPAPR_MACHINE "spapr-machine"
#define SPAPR_MACHINE(obj) \
diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h
index 1945913bf1..9a5e715fe5 100644
--- a/include/hw/ppc/xics.h
+++ b/include/hw/ppc/xics.h
@@ -139,9 +139,9 @@ struct ICSIRQState {
uint8_t flags;
};
-typedef struct XICSFabric {
+struct XICSFabric {
Object parent;
-} XICSFabric;
+};
#define TYPE_XICS_FABRIC "xics-fabric"
#define XICS_FABRIC(obj) \