projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f256905
)
KVM: VMX: unlike vmcs on fail path
author
Xiao Guangrong
<
[email protected]
>
Mon, 14 May 2012 06:58:58 +0000
(14:58 +0800)
committer
Avi Kivity
<
[email protected]
>
Mon, 14 May 2012 08:28:02 +0000
(11:28 +0300)
fix:
[ 1529.577273] Call Trace:
[ 1529.577289] [<
ffffffffa060d58f
>] kvm_arch_hardware_disable+0x13/0x30 [kvm]
[ 1529.577302] [<
ffffffffa05fa2d4
>] hardware_disable_nolock+0x35/0x39 [kvm]
[ 1529.577311] [<
ffffffffa05fa29f
>] ? cpumask_clear_cpu.constprop.31+0x13/0x13 [kvm]
[ 1529.577315] [<
ffffffff81096ba8
>] on_each_cpu+0x44/0x84
[ 1529.577326] [<
ffffffffa05f98b5
>] hardware_disable_all_nolock+0x34/0x36 [kvm]
[ 1529.577335] [<
ffffffffa05f98e2
>] hardware_disable_all+0x2b/0x39 [kvm]
[ 1529.577349] [<
ffffffffa05fafe5
>] kvm_put_kvm+0xed/0x10f [kvm]
[ 1529.577358] [<
ffffffffa05fb3d7
>] kvm_vm_release+0x22/0x28 [kvm]
Signed-off-by: Xiao Guangrong <
[email protected]
>
Signed-off-by: Avi Kivity <
[email protected]
>
arch/x86/kvm/vmx.c
patch
|
blob
|
history
diff --git
a/arch/x86/kvm/vmx.c
b/arch/x86/kvm/vmx.c
index 61ebdb6390eeb9fc55dc75c4a61e5754137a6f92..3062ea95266ea6cf6b8ed500ea0bb11846386238 100644
(file)
--- a/
arch/x86/kvm/vmx.c
+++ b/
arch/x86/kvm/vmx.c
@@
-6350,7
+6350,7
@@
static struct kvm_vcpu *vmx_create_vcpu(struct kvm *kvm, unsigned int id)
return &vmx->vcpu;
free_vmcs:
- free_
vmcs(vmx->loaded_vmcs->
vmcs);
+ free_
loaded_vmcs(vmx->loaded_
vmcs);
free_msrs:
kfree(vmx->guest_msrs);
uninit_vcpu: