[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH qom-cpu v3 09/14] intc/openpic: Build openpic only o
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH qom-cpu v3 09/14] intc/openpic: Build openpic only once |
Date: |
Wed, 26 Jun 2013 19:35:38 +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 9c51ee0..0abd708 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,5 +20,4 @@ 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_SH4) += sh_intc.o
diff --git a/hw/intc/openpic.c b/hw/intc/openpic.c
index 86de0b3..6440400 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 acaf0d6..cc2d78e 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] [PATCH qom-cpu v3 00/14] QOM CPUState, part 10: CPU loops, Andreas Färber, 2013/06/26
- [Qemu-devel] [PATCH qom-cpu v3 01/14] kvm: Free current_cpu identifier, Andreas Färber, 2013/06/26
- [Qemu-devel] [PATCH qom-cpu v3 04/14] linux-user: Clean up do_syscall() Coding Style for TARGET_NR_exit, Andreas Färber, 2013/06/26
- [Qemu-devel] [PATCH qom-cpu v3 12/14] target-s390x: Don't overuse ENV_GET_CPU(), Andreas Färber, 2013/06/26
- [Qemu-devel] [PATCH qom-cpu v3 03/14] kvm: Change kvm_remove_all_breakpoints() argument to CPUState, Andreas Färber, 2013/06/26
- [Qemu-devel] [PATCH qom-cpu v3 11/14] target-ppc: Don't overuse ENV_GET_CPU(), Andreas Färber, 2013/06/26
- [Qemu-devel] [PATCH qom-cpu v3 13/14] target-s390x: Change handle_{hypercall, diag}() argument to S390CPU, Andreas Färber, 2013/06/26
- [Qemu-devel] [PATCH qom-cpu v3 08/14] intc/arm_gic: Build arm_gic only once, Andreas Färber, 2013/06/26
- [Qemu-devel] [PATCH qom-cpu v3 09/14] intc/openpic: Build openpic only once,
Andreas Färber <=
- [Qemu-devel] [PATCH qom-cpu v3 10/14] timer/arm_mptimer: Build arm_mptimer only once, Andreas Färber, 2013/06/26
- [Qemu-devel] [PATCH qom-cpu v3 02/14] cpu: Replace cpu_single_env with CPUState current_cpu, Andreas Färber, 2013/06/26
- [Qemu-devel] [PATCH qom-cpu v3 06/14] linux-user: Change thread_env to CPUState, Andreas Färber, 2013/06/26
- [Qemu-devel] [PATCH qom-cpu v3 14/14] target-i386: Don't overuse CPUArchState, Andreas Färber, 2013/06/26
- [Qemu-devel] [PATCH qom-cpu v3 07/14] bsd-user: Change thread_env to CPUState, Andreas Färber, 2013/06/26
- [Qemu-devel] [PATCH qom-cpu v3 05/14] cpu: Make first_cpu and next_cpu CPUState, Andreas Färber, 2013/06/26