summaryrefslogtreecommitdiffstats
path: root/virt
diff options
context:
space:
mode:
authorScott Wood <scottwood@freescale.com>2013-04-25 14:11:23 +0000
committerAlexander Graf <agraf@suse.de>2013-04-26 20:27:28 +0200
commit07f0a7bdec5c4039cfb9b836482c45004d4c21cc (patch)
treeea47de6fc439dd8d20d6d1d0c4f9cd21f95c2fcb /virt
parent22e64024fb83065664160d1c28a10aa98cb5f24c (diff)
downloadlinux-stable-07f0a7bdec5c4039cfb9b836482c45004d4c21cc.tar.gz
linux-stable-07f0a7bdec5c4039cfb9b836482c45004d4c21cc.tar.bz2
linux-stable-07f0a7bdec5c4039cfb9b836482c45004d4c21cc.zip
kvm: destroy emulated devices on VM exit
The hassle of getting refcounting right was greater than the hassle of keeping a list of devices to destroy on VM exit. Signed-off-by: Scott Wood <scottwood@freescale.com> Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'virt')
-rw-r--r--virt/kvm/kvm_main.c29
1 files changed, 16 insertions, 13 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index f6cd14d2f0d9..5da9f02a2a67 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -504,6 +504,7 @@ static struct kvm *kvm_create_vm(unsigned long type)
mutex_init(&kvm->irq_lock);
mutex_init(&kvm->slots_lock);
atomic_set(&kvm->users_count, 1);
+ INIT_LIST_HEAD(&kvm->devices);
r = kvm_init_mmu_notifier(kvm);
if (r)
@@ -581,6 +582,19 @@ void kvm_free_physmem(struct kvm *kvm)
kfree(kvm->memslots);
}
+static void kvm_destroy_devices(struct kvm *kvm)
+{
+ struct list_head *node, *tmp;
+
+ list_for_each_safe(node, tmp, &kvm->devices) {
+ struct kvm_device *dev =
+ list_entry(node, struct kvm_device, vm_node);
+
+ list_del(node);
+ dev->ops->destroy(dev);
+ }
+}
+
static void kvm_destroy_vm(struct kvm *kvm)
{
int i;
@@ -600,6 +614,7 @@ static void kvm_destroy_vm(struct kvm *kvm)
kvm_arch_flush_shadow_all(kvm);
#endif
kvm_arch_destroy_vm(kvm);
+ kvm_destroy_devices(kvm);
kvm_free_physmem(kvm);
cleanup_srcu_struct(&kvm->srcu);
kvm_arch_free_vm(kvm);
@@ -2195,23 +2210,11 @@ static long kvm_device_ioctl(struct file *filp, unsigned int ioctl,
}
}
-void kvm_device_get(struct kvm_device *dev)
-{
- atomic_inc(&dev->users);
-}
-
-void kvm_device_put(struct kvm_device *dev)
-{
- if (atomic_dec_and_test(&dev->users))
- dev->ops->destroy(dev);
-}
-
static int kvm_device_release(struct inode *inode, struct file *filp)
{
struct kvm_device *dev = filp->private_data;
struct kvm *kvm = dev->kvm;
- kvm_device_put(dev);
kvm_put_kvm(kvm);
return 0;
}
@@ -2257,7 +2260,6 @@ static int kvm_ioctl_create_device(struct kvm *kvm,
dev->ops = ops;
dev->kvm = kvm;
- atomic_set(&dev->users, 1);
ret = ops->create(dev, cd->type);
if (ret < 0) {
@@ -2271,6 +2273,7 @@ static int kvm_ioctl_create_device(struct kvm *kvm,
return ret;
}
+ list_add(&dev->vm_node, &kvm->devices);
kvm_get_kvm(kvm);
cd->fd = ret;
return 0;