diff options
| author |   Avi Kivity <avi@redhat.com> | 2010-06-21 18:18:18 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2010-06-21 18:18:18 +0300 |
| commit | 303d1f34a55d36c60f1042a868638b19ae3d89f0 (patch) | |
| tree | c5d43328e97031fe4a09a0631856d47eafac6c4a /target-i386/cpu.h | |
| parent | Merge commit '9605111958173938ac08298f515d55e937d0211c' into upstream-merge (diff) | |
| parent | apic: avoid passing CPUState from CPU code (diff) | |
| download | qemu-kvm-303d1f34a55d36c60f1042a868638b19ae3d89f0.tar.gz qemu-kvm-303d1f34a55d36c60f1042a868638b19ae3d89f0.tar.bz2 qemu-kvm-303d1f34a55d36c60f1042a868638b19ae3d89f0.zip | |
Merge commit '4a942ceac7e38c259116960e45ba9619611d1df9' into upstream-merge
* commit '4a942ceac7e38c259116960e45ba9619611d1df9':
apic: avoid passing CPUState from CPU code
apic: avoid passing CPUState from devices
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'target-i386/cpu.h')
| -rw-r--r-- | target-i386/cpu.h | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/target-i386/cpu.h b/target-i386/cpu.h index c32f854f2..49e59ccfc 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -882,14 +882,6 @@ void cpu_x86_update_cr0(CPUX86State *env, uint32_t new_cr0); void cpu_x86_update_cr3(CPUX86State *env, target_ulong new_cr3); void cpu_x86_update_cr4(CPUX86State *env, uint32_t new_cr4); -/* hw/apic.c */ -void cpu_set_apic_base(CPUX86State *env, uint64_t val); -uint64_t cpu_get_apic_base(CPUX86State *env); -void cpu_set_apic_tpr(CPUX86State *env, uint8_t val); -#ifndef NO_CPU_IO_DEFS -uint8_t cpu_get_apic_tpr(CPUX86State *env); -#endif - /* hw/pc.c */ void cpu_smm_update(CPUX86State *env); uint64_t cpu_get_tsc(CPUX86State *env); @@ -952,6 +944,10 @@ static inline void cpu_clone_regs(CPUState *env, target_ulong newsp) #include "svm.h" +#if !defined(CONFIG_USER_ONLY) +#include "hw/apic.h" +#endif + static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb) { env->eip = tb->pc - tb->cs_base; @@ -966,8 +962,6 @@ static inline void cpu_get_tb_cpu_state(CPUState *env, target_ulong *pc, (env->eflags & (IOPL_MASK | TF_MASK | RF_MASK | VM_MASK)); } -void apic_init_reset(CPUState *env); -void apic_sipi(CPUState *env); void do_cpu_init(CPUState *env); void do_cpu_sipi(CPUState *env); #endif /* CPU_I386_H */ |