diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2014-01-29 16:16:39 +0300 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2014-04-02 00:58:46 +0100 |
| commit | 64006c84cde2386dee613ebc729aa9463931c789 (patch) | |
| tree | dbe02bdace4d8f94e1baa8c2c60154d98e03431d /virt | |
| parent | 8d4853d023a590181018241c960b1f25e1fe8b96 (diff) | |
| download | kernel_samsung_smdk4412-64006c84cde2386dee613ebc729aa9463931c789.zip kernel_samsung_smdk4412-64006c84cde2386dee613ebc729aa9463931c789.tar.gz kernel_samsung_smdk4412-64006c84cde2386dee613ebc729aa9463931c789.tar.bz2 | |
KVM: return an error code in kvm_vm_ioctl_register_coalesced_mmio()
commit aac5c4226e7136c331ed384c25d5560204da10a0 upstream.
If kvm_io_bus_register_dev() fails then it returns success but it should
return an error code.
I also did a little cleanup like removing an impossible NULL test.
Fixes: 2b3c246a682c ('KVM: Make coalesced mmio use a device per zone')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'virt')
| -rw-r--r-- | virt/kvm/coalesced_mmio.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/virt/kvm/coalesced_mmio.c b/virt/kvm/coalesced_mmio.c index a6ec206..e56b240 100644 --- a/virt/kvm/coalesced_mmio.c +++ b/virt/kvm/coalesced_mmio.c @@ -148,17 +148,13 @@ int kvm_vm_ioctl_register_coalesced_mmio(struct kvm *kvm, list_add_tail(&dev->list, &kvm->coalesced_zones); mutex_unlock(&kvm->slots_lock); - return ret; + return 0; out_free_dev: mutex_unlock(&kvm->slots_lock); - kfree(dev); - if (dev == NULL) - return -ENXIO; - - return 0; + return ret; } int kvm_vm_ioctl_unregister_coalesced_mmio(struct kvm *kvm, |