summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorPeter Xu <peterx@redhat.com>2017-03-15 16:01:19 +0800
committerPaolo Bonzini <pbonzini@redhat.com>2017-03-23 19:02:06 +0100
commitc761159cf81b8641290f7559a8d8e30f6ab92669 (patch)
tree6d4fcc4c75d17e5252d68e8c238235918178cd9a /arch/x86
parent950712eb8ef03e4a62ac5b3067efde7ec2f8a91e (diff)
downloadlinux-stable-c761159cf81b8641290f7559a8d8e30f6ab92669.tar.gz
linux-stable-c761159cf81b8641290f7559a8d8e30f6ab92669.tar.bz2
linux-stable-c761159cf81b8641290f7559a8d8e30f6ab92669.zip
KVM: x86: use pic/ioapic destructor when destroy vm
We have specific destructors for pic/ioapic, we'd better use them when destroying the VM as well. Signed-off-by: Peter Xu <peterx@redhat.com> Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kvm/x86.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 1faf620a6fdc..d30ff491ecc7 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -8153,8 +8153,8 @@ void kvm_arch_destroy_vm(struct kvm *kvm)
if (kvm_x86_ops->vm_destroy)
kvm_x86_ops->vm_destroy(kvm);
kvm_iommu_unmap_guest(kvm);
- kfree(kvm->arch.vpic);
- kfree(kvm->arch.vioapic);
+ kvm_pic_destroy(kvm);
+ kvm_ioapic_destroy(kvm);
kvm_free_vcpus(kvm);
kvfree(rcu_dereference_check(kvm->arch.apic_map, 1));
kvm_mmu_uninit_vm(kvm);