diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2014-01-29 08:16:39 -0500 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-01-30 05:56:09 -0500 |
commit | aac5c4226e7136c331ed384c25d5560204da10a0 (patch) | |
tree | e24e17f6bf825f070c8d8708ac89c26c2c41092f /virt/kvm/coalesced_mmio.c | |
parent | b73117c49364551ff789db7c424a115ac5b77850 (diff) |
KVM: return an error code in kvm_vm_ioctl_register_coalesced_mmio()
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.
Cc: stable@vger.kernel.org
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>
Diffstat (limited to 'virt/kvm/coalesced_mmio.c')
-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, | |||
154 | list_add_tail(&dev->list, &kvm->coalesced_zones); | 154 | list_add_tail(&dev->list, &kvm->coalesced_zones); |
155 | mutex_unlock(&kvm->slots_lock); | 155 | mutex_unlock(&kvm->slots_lock); |
156 | 156 | ||
157 | return ret; | 157 | return 0; |
158 | 158 | ||
159 | out_free_dev: | 159 | out_free_dev: |
160 | mutex_unlock(&kvm->slots_lock); | 160 | mutex_unlock(&kvm->slots_lock); |
161 | |||
162 | kfree(dev); | 161 | kfree(dev); |
163 | 162 | ||
164 | if (dev == NULL) | 163 | return ret; |
165 | return -ENXIO; | ||
166 | |||
167 | return 0; | ||
168 | } | 164 | } |
169 | 165 | ||
170 | int kvm_vm_ioctl_unregister_coalesced_mmio(struct kvm *kvm, | 166 | int kvm_vm_ioctl_unregister_coalesced_mmio(struct kvm *kvm, |