alloc_apic_access_page() can sleep, while vmx_vcpu_setup is called inside a non preemptable region. Move it after put_cpu().
Signed-off-by: Marcelo Tosatti <[EMAIL PROTECTED]> Index: linux-2.6-x86-kvm/arch/x86/kvm/vmx.c =================================================================== --- linux-2.6-x86-kvm.orig/arch/x86/kvm/vmx.c +++ linux-2.6-x86-kvm/arch/x86/kvm/vmx.c @@ -1601,9 +1601,6 @@ static int vmx_vcpu_setup(struct vcpu_vm vmcs_writel(CR0_GUEST_HOST_MASK, ~0UL); vmcs_writel(CR4_GUEST_HOST_MASK, KVM_GUEST_CR4_MASK); - if (vm_need_virtualize_apic_accesses(vmx->vcpu.kvm)) - if (alloc_apic_access_page(vmx->vcpu.kvm) != 0) - return -ENOMEM; return 0; } @@ -2533,6 +2530,9 @@ static struct kvm_vcpu *vmx_create_vcpu( put_cpu(); if (err) goto free_vmcs; + if (vm_need_virtualize_apic_accesses(kvm)) + if (alloc_apic_access_page(kvm) != 0) + goto free_vmcs; return &vmx->vcpu; ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ _______________________________________________ kvm-devel mailing list kvm-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/kvm-devel