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 /virt | |
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 'virt')
-rw-r--r-- | virt/kvm/kvm_main.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 2b7cd6c0d9ca..7c5c873812ff 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c | |||
@@ -506,7 +506,6 @@ static void kvm_destroy_vm(struct kvm *kvm) | |||
506 | #else | 506 | #else |
507 | kvm_arch_flush_shadow(kvm); | 507 | kvm_arch_flush_shadow(kvm); |
508 | #endif | 508 | #endif |
509 | cleanup_srcu_struct(&kvm->srcu); | ||
510 | kvm_arch_destroy_vm(kvm); | 509 | kvm_arch_destroy_vm(kvm); |
511 | hardware_disable_all(); | 510 | hardware_disable_all(); |
512 | mmdrop(mm); | 511 | mmdrop(mm); |