diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2014-01-29 16:16:39 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-22 10:32:46 -0800 |
| commit | 5a0d43c3374c287711f4191922835e18fc8ae3ec (patch) | |
| tree | 71a3edc9feb54364e6be5a7d5a731a56ef635a35 | |
| parent | cc512a4a4a197603c83e9c920832d06ffe81f9b9 (diff) | |
| download | lwn-5a0d43c3374c287711f4191922835e18fc8ae3ec.tar.gz lwn-5a0d43c3374c287711f4191922835e18fc8ae3ec.zip | |
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 88b2fe3ddf42..00d86427af0f 100644 --- a/virt/kvm/coalesced_mmio.c +++ b/virt/kvm/coalesced_mmio.c @@ -154,17 +154,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, |