[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 31/49] apic: move target-dependent definitions to cp
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 31/49] apic: move target-dependent definitions to cpu.h |
Date: |
Wed, 16 Mar 2016 11:46:41 +0100 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/intc/ioapic.c | 1 +
include/hw/i386/apic.h | 5 -----
target-i386/cpu.h | 7 +++++++
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/hw/intc/ioapic.c b/hw/intc/ioapic.c
index 378e663..4f42b91 100644
--- a/hw/intc/ioapic.c
+++ b/hw/intc/ioapic.c
@@ -24,6 +24,7 @@
#include "monitor/monitor.h"
#include "hw/hw.h"
#include "hw/i386/pc.h"
+#include "hw/i386/apic.h"
#include "hw/i386/ioapic.h"
#include "hw/i386/ioapic_internal.h"
#include "include/hw/pci/msi.h"
diff --git a/include/hw/i386/apic.h b/include/hw/i386/apic.h
index 51eb6d3..ea48ea9 100644
--- a/include/hw/i386/apic.h
+++ b/include/hw/i386/apic.h
@@ -18,15 +18,10 @@ void cpu_set_apic_tpr(DeviceState *s, uint8_t val);
uint8_t cpu_get_apic_tpr(DeviceState *s);
void apic_init_reset(DeviceState *s);
void apic_sipi(DeviceState *s);
-void apic_handle_tpr_access_report(DeviceState *d, target_ulong ip,
- TPRAccess access);
void apic_poll_irq(DeviceState *d);
void apic_designate_bsp(DeviceState *d, bool bsp);
/* pc.c */
DeviceState *cpu_get_current_apic(void);
-/* cpu.c */
-bool cpu_is_bsp(X86CPU *cpu);
-
#endif
diff --git a/target-i386/cpu.h b/target-i386/cpu.h
index c2f4af4..60dc97c 100644
--- a/target-i386/cpu.h
+++ b/target-i386/cpu.h
@@ -1451,7 +1451,11 @@ void do_interrupt_x86_hardirq(CPUX86State *env, int
intno, int is_hw);
void do_smm_enter(X86CPU *cpu);
void cpu_smm_update(X86CPU *cpu);
+/* apic.c */
void cpu_report_tpr_access(CPUX86State *env, TPRAccess access);
+void apic_handle_tpr_access_report(DeviceState *d, target_ulong ip,
+ TPRAccess access);
+
/* Change the value of a KVM-specific default
*
@@ -1477,4 +1481,7 @@ void enable_compat_apic_id_mode(void);
void x86_cpu_dump_local_apic_state(CPUState *cs, FILE *f,
fprintf_function cpu_fprintf, int flags);
+/* cpu.c */
+bool cpu_is_bsp(X86CPU *cpu);
+
#endif /* CPU_I386_H */
--
1.8.3.1
- [Qemu-devel] [PATCH 16/49] target-sh4: make cpu-qom.h not target specific, (continued)
- [Qemu-devel] [PATCH 16/49] target-sh4: make cpu-qom.h not target specific, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 14/49] target-ppc: make cpu-qom.h not target specific, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 25/49] mips: use MIPSCPU instead of CPUMIPSState, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 20/49] target-xtensa: make cpu-qom.h not target specific, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 19/49] target-unicore32: make cpu-qom.h not target specific, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 22/49] m68k: include cpu-qom.h in files that require M68KCPU, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 17/49] target-sparc: make cpu-qom.h not target specific, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 21/49] arm: include cpu-qom.h in files that require ARMCPU, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 24/49] alpha: include cpu-qom.h in files that require AlphaCPU, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 23/49] sh4: include cpu-qom.h in files that require SuperHCPU, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 31/49] apic: move target-dependent definitions to cpu.h,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 28/49] explicitly include qom/cpu.h, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 32/49] include: poison symbols in osdep.h, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 29/49] explicitly include hw/qdev-core.h, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 30/49] explicitly include linux/kvm.h, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 36/49] cpu: move endian-dependent load/store functions to cpu-all.h, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 26/49] ppc: use PowerPCCPU instead of CPUPPCState, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 35/49] hw: cannot include hw/hw.h from user emulation, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 41/49] s390x: move stuff out of cpu.h, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 42/49] qemu-common: push cpu.h inclusion out of qemu-common.h, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 33/49] hw: do not use VMSTATE_*TL, Paolo Bonzini, 2016/03/16