[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 13/43] intc/openpic: Build openpic only once
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 13/43] intc/openpic: Build openpic only once |
Date: |
Wed, 10 Jul 2013 16:33:50 +0200 |
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ärber <address@hidden>
---
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) += slavio_intctl.o
common-obj-$(CONFIG_IOAPIC) += ioapic_common.o
common-obj-$(CONFIG_ARM_GIC) += arm_gic_common.o
common-obj-$(CONFIG_ARM_GIC) += arm_gic.o
+common-obj-$(CONFIG_OPENPIC) += openpic.o
obj-$(CONFIG_APIC) += apic.o apic_common.o
obj-$(CONFIG_ARM_GIC_KVM) += arm_gic_kvm.o
@@ -19,6 +20,5 @@ obj-$(CONFIG_EXYNOS4) += exynos4210_gic.o
exynos4210_combiner.o
obj-$(CONFIG_GRLIB) += grlib_irqmp.o
obj-$(CONFIG_IOAPIC) += ioapic.o
obj-$(CONFIG_OMAP) += omap_intc.o
-obj-$(CONFIG_OPENPIC) += openpic.o
obj-$(CONFIG_OPENPIC_KVM) += openpic_kvm.o
obj-$(CONFIG_SH4) += 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"
//#define DEBUG_OPENPIC
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);
-void ppce500_set_mpic_proxy(bool enabled);
-
/* PPC machines for OpenBIOS */
enum {
ARCH_PREP = 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
--
1.8.1.4
- [Qemu-devel] [PULL 15/43] target-ppc: Don't overuse ENV_GET_CPU(), (continued)
- [Qemu-devel] [PULL 15/43] target-ppc: Don't overuse ENV_GET_CPU(), Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 16/43] target-s390x: Don't overuse ENV_GET_CPU(), Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 12/43] intc/arm_gic: Build arm_gic only once, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 14/43] timer/arm_mptimer: Build arm_mptimer only once, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 18/43] target-i386: Don't overuse CPUArchState, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 20/43] target-lm32: gen_intermediate_code_internal() should be inlined, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 06/43] cpu: Replace cpu_single_env with CPUState current_cpu, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 17/43] target-s390x: Change handle_{hypercall, diag}() argument to S390CPU, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 22/43] target-moxie: gen_intermediate_code_internal() should be inlined, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 03/43] linux-user: Move cpu_clone_regs() and cpu_set_tls() into linux-user, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 13/43] intc/openpic: Build openpic only once,
Andreas Färber <=
- [Qemu-devel] [PULL 23/43] target-xtensa: gen_intermediate_code_internal() should be inlined, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 27/43] target-i386: Change gen_intermediate_code_internal() argument to X86CPU, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 25/43] target-arm: Change gen_intermediate_code_internal() argument to ARMCPU, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 10/43] linux-user: Change thread_env to CPUState, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 26/43] target-cris: Change gen_intermediate_code_internal() argument to CRISCPU, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 30/43] target-microblaze: Change gen_intermediate_code_internal() argument types, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 31/43] target-mips: Change gen_intermediate_code_internal() argument to MIPSCPU, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 28/43] target-lm32: Change gen_intermediate_code_internal() argument to LM32CPU, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 29/43] target-m68k: Change gen_intermediate_code_internal() argument to M68kCPU, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 19/43] target-cris: gen_intermediate_code_internal() should be inlined, Andreas Färber, 2013/07/10