mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

apic: move target-dependent definitions to cpu.h

Browse Source 
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2015-12-04 11:04:13 +01:00
parent e81096b1c8
commit d613f8cc33
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/intc/ioapic.c
View File

@ -24,6 +24,7 @@
#include "monitor/monitor.h" #include "monitor/monitor.h"
#include "hw/hw.h" #include "hw/hw.h"
#include "hw/i386/pc.h" #include "hw/i386/pc.h"
#include "hw/i386/apic.h"
#include "hw/i386/ioapic.h" #include "hw/i386/ioapic.h"
#include "hw/i386/ioapic_internal.h" #include "hw/i386/ioapic_internal.h"
#include "include/hw/pci/msi.h" #include "include/hw/pci/msi.h"

5
include/hw/i386/apic.h
View File

@ -18,15 +18,10 @@ void cpu_set_apic_tpr(DeviceState *s, uint8_t val);
uint8_t cpu_get_apic_tpr(DeviceState *s); uint8_t cpu_get_apic_tpr(DeviceState *s);
void apic_init_reset(DeviceState *s); void apic_init_reset(DeviceState *s);
void apic_sipi(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_poll_irq(DeviceState *d);
void apic_designate_bsp(DeviceState *d, bool bsp); void apic_designate_bsp(DeviceState *d, bool bsp);
/* pc.c */ /* pc.c */
DeviceState *cpu_get_current_apic(void); DeviceState *cpu_get_current_apic(void);
/* cpu.c */
bool cpu_is_bsp(X86CPU *cpu);
#endif #endif

7
target-i386/cpu.h
View File

@ -1455,7 +1455,11 @@ void do_interrupt_x86_hardirq(CPUX86State *env, int intno, int is_hw);
void do_smm_enter(X86CPU *cpu); void do_smm_enter(X86CPU *cpu);
void cpu_smm_update(X86CPU *cpu); void cpu_smm_update(X86CPU *cpu);
/* apic.c */
void cpu_report_tpr_access(CPUX86State *env, TPRAccess access); 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 /* Change the value of a KVM-specific default
* *
@ -1481,4 +1485,7 @@ void enable_compat_apic_id_mode(void);
void x86_cpu_dump_local_apic_state(CPUState *cs, FILE *f, void x86_cpu_dump_local_apic_state(CPUState *cs, FILE *f,
fprintf_function cpu_fprintf, int flags); fprintf_function cpu_fprintf, int flags);
/* cpu.c */
bool cpu_is_bsp(X86CPU *cpu);
#endif /* CPU_I386_H */ #endif /* CPU_I386_H */