From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33380) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UwvTh-00007M-3r for qemu-devel@nongnu.org; Wed, 10 Jul 2013 10:35:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UwvTY-0003bp-Ms for qemu-devel@nongnu.org; Wed, 10 Jul 2013 10:34:44 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 10 Jul 2013 16:33:50 +0200 Message-Id: <1373466860-32732-14-git-send-email-afaerber@suse.de> In-Reply-To: <1373466860-32732-1-git-send-email-afaerber@suse.de> References: <1373466860-32732-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 13/43] intc/openpic: Build openpic only once List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "open list:PowerPC" , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Alexander Graf Since current_cpu is CPUState it no longer depends on CPUPPCState. Move ppce500_set_mpic_proxy() to a new hw/ppc/ppc_e500.h because hw/ppc/ppc.h is too heavily using CPUPPCState and PowerPCCPU. Signed-off-by: Andreas F=C3=A4rber --- hw/intc/Makefile.objs | 2 +- hw/intc/openpic.c | 2 +- hw/ppc/ppc.c | 1 + include/hw/ppc/ppc.h | 2 -- include/hw/ppc/ppc_e500.h | 6 ++++++ 5 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 include/hw/ppc/ppc_e500.h diff --git a/hw/intc/Makefile.objs b/hw/intc/Makefile.objs index e8f9267..86f9d5b 100644 --- a/hw/intc/Makefile.objs +++ b/hw/intc/Makefile.objs @@ -11,6 +11,7 @@ common-obj-$(CONFIG_SLAVIO) +=3D slavio_intctl.o common-obj-$(CONFIG_IOAPIC) +=3D ioapic_common.o common-obj-$(CONFIG_ARM_GIC) +=3D arm_gic_common.o common-obj-$(CONFIG_ARM_GIC) +=3D arm_gic.o +common-obj-$(CONFIG_OPENPIC) +=3D openpic.o =20 obj-$(CONFIG_APIC) +=3D apic.o apic_common.o obj-$(CONFIG_ARM_GIC_KVM) +=3D arm_gic_kvm.o @@ -19,6 +20,5 @@ obj-$(CONFIG_EXYNOS4) +=3D exynos4210_gic.o exynos4210_= combiner.o obj-$(CONFIG_GRLIB) +=3D grlib_irqmp.o obj-$(CONFIG_IOAPIC) +=3D ioapic.o obj-$(CONFIG_OMAP) +=3D omap_intc.o -obj-$(CONFIG_OPENPIC) +=3D openpic.o obj-$(CONFIG_OPENPIC_KVM) +=3D openpic_kvm.o obj-$(CONFIG_SH4) +=3D sh_intc.o diff --git a/hw/intc/openpic.c b/hw/intc/openpic.c index d984dba..7df72f4 100644 --- a/hw/intc/openpic.c +++ b/hw/intc/openpic.c @@ -37,10 +37,10 @@ #include "hw/ppc/mac.h" #include "hw/pci/pci.h" #include "hw/ppc/openpic.h" +#include "hw/ppc/ppc_e500.h" #include "hw/sysbus.h" #include "hw/pci/msi.h" #include "qemu/bitops.h" -#include "hw/ppc/ppc.h" =20 //#define DEBUG_OPENPIC =20 diff --git a/hw/ppc/ppc.c b/hw/ppc/ppc.c index 554f244..e1c095c 100644 --- a/hw/ppc/ppc.c +++ b/hw/ppc/ppc.c @@ -23,6 +23,7 @@ */ #include "hw/hw.h" #include "hw/ppc/ppc.h" +#include "hw/ppc/ppc_e500.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" #include "hw/timer/m48t59.h" diff --git a/include/hw/ppc/ppc.h b/include/hw/ppc/ppc.h index dfcad25..132ab97 100644 --- a/include/hw/ppc/ppc.h +++ b/include/hw/ppc/ppc.h @@ -73,8 +73,6 @@ void ppc6xx_irq_init (CPUPPCState *env); void ppc970_irq_init (CPUPPCState *env); void ppcPOWER7_irq_init (CPUPPCState *env); =20 -void ppce500_set_mpic_proxy(bool enabled); - /* PPC machines for OpenBIOS */ enum { ARCH_PREP =3D 0, diff --git a/include/hw/ppc/ppc_e500.h b/include/hw/ppc/ppc_e500.h new file mode 100644 index 0000000..b66c0e3 --- /dev/null +++ b/include/hw/ppc/ppc_e500.h @@ -0,0 +1,6 @@ +#ifndef HW_PPC_E500_H +#define HW_PPC_E500_H + +void ppce500_set_mpic_proxy(bool enabled); + +#endif --=20 1.8.1.4