diff options
author | Marcelo Tosatti <mtosatti@redhat.com> | 2010-01-19 09:45:23 -0500 |
---|---|---|
committer | Marcelo Tosatti <mtosatti@redhat.com> | 2010-03-01 10:36:01 -0500 |
commit | 647492047763c3ee8fe51ecf9a04f39040aa495b (patch) | |
tree | acdd836ad2695f9e50725c51b667bcc1acb81765 /arch/ia64 | |
parent | ccd469362e826261ccc261c4c36fb0a346338222 (diff) |
KVM: fix cleanup_srcu_struct on vm destruction
cleanup_srcu_struct on VM destruction remains broken:
BUG: unable to handle kernel paging request at ffffffffffffffff
IP: [<ffffffff802533d2>] srcu_read_lock+0x16/0x21
RIP: 0010:[<ffffffff802533d2>] [<ffffffff802533d2>] srcu_read_lock+0x16/0x21
Call Trace:
[<ffffffffa05354c4>] kvm_arch_vcpu_uninit+0x1b/0x48 [kvm]
[<ffffffffa05339c6>] kvm_vcpu_uninit+0x9/0x15 [kvm]
[<ffffffffa0569f7d>] vmx_free_vcpu+0x7f/0x8f [kvm_intel]
[<ffffffffa05357b5>] kvm_arch_destroy_vm+0x78/0x111 [kvm]
[<ffffffffa053315b>] kvm_put_kvm+0xd4/0xfe [kvm]
Move it to kvm_arch_destroy_vm.
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Reported-by: Jan Kiszka <jan.kiszka@siemens.com>
Diffstat (limited to 'arch/ia64')
-rw-r--r-- | arch/ia64/kvm/kvm-ia64.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c index e6ac549f8d55..06188988ed27 100644 --- a/arch/ia64/kvm/kvm-ia64.c +++ b/arch/ia64/kvm/kvm-ia64.c | |||
@@ -1404,6 +1404,7 @@ void kvm_arch_destroy_vm(struct kvm *kvm) | |||
1404 | kfree(kvm->arch.vioapic); | 1404 | kfree(kvm->arch.vioapic); |
1405 | kvm_release_vm_pages(kvm); | 1405 | kvm_release_vm_pages(kvm); |
1406 | kvm_free_physmem(kvm); | 1406 | kvm_free_physmem(kvm); |
1407 | cleanup_srcu_struct(&kvm->srcu); | ||
1407 | free_kvm(kvm); | 1408 | free_kvm(kvm); |
1408 | } | 1409 | } |
1409 | 1410 | ||