From 67ff4b3c7e1ff23afe378eac193b596633580436 Mon Sep 17 00:00:00 2001 From: Marcelo Tosatti Date: Thu, 3 Apr 2008 20:24:37 -0300 Subject: Make kvm_arch_load_regs() aware of in kernel APIC kvm_arch_load_regs() might load APIC base and APIC TPR from the uninitialized userspace APIC emulation. This happened when running X11 on SMP guest in my case, disabling the APIC for vcpu3: vcpu not ready for apic_round_robin vcpu not ready for apic_round_robin vcpu not ready for apic_round_robin ... Signed-off-by: Marcelo Tosatti Signed-off-by: Avi Kivity --- qemu-kvm-x86.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/qemu-kvm-x86.c b/qemu-kvm-x86.c index 35fb53542..3d3878a06 100644 --- a/qemu-kvm-x86.c +++ b/qemu-kvm-x86.c @@ -248,9 +248,15 @@ void kvm_arch_load_regs(CPUState *env) sregs.cr3 = env->cr[3]; sregs.cr4 = env->cr[4]; - sregs.apic_base = cpu_get_apic_base(env); + if (kvm_irqchip_in_kernel(kvm_context)) { + sregs.cr8 = kvm_get_cr8(kvm_context, env->cpu_index); + sregs.apic_base = kvm_get_apic_base(kvm_context, env->cpu_index); + } else { + sregs.cr8 = cpu_get_apic_tpr(env); + sregs.apic_base = cpu_get_apic_base(env); + } + sregs.efer = env->efer; - sregs.cr8 = cpu_get_apic_tpr(env); kvm_set_sregs(kvm_context, env->cpu_index, &sregs); -- cgit v1.2.3