KVM: fix the errno of ioctl KVM_[UN]REGISTER_COALESCED_MMIO failure

This patch change the errno of ioctl KVM_[UN]REGISTER_COALESCED_MMIO
from -EINVAL to -ENXIO if no coalesced mmio dev exists.

Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

2 files changed, 2 insertions, 4 deletions

diff --git a/virt/kvm/coalesced_mmio.c b/virt/kvm/coalesced_mmio.c
index 36e258029649..b66001f8754c 100644
--- a/virt/kvm/coalesced_mmio.c
+++ b/virt/kvm/coalesced_mmio.c
@@ -139,7 +139,7 @@ int kvm_vm_ioctl_register_coalesced_mmio(struct kvm *kvm,
         struct kvm_coalesced_mmio_dev *dev = kvm->coalesced_mmio_dev;
 
         if (dev == NULL)
-                return -EINVAL;
+                return -ENXIO;
 
         mutex_lock(&kvm->slots_lock);
         if (dev->nb_zones >= KVM_COALESCED_MMIO_ZONE_MAX) {
@@ -162,7 +162,7 @@ int kvm_vm_ioctl_unregister_coalesced_mmio(struct kvm *kvm,
         struct kvm_coalesced_mmio_zone *z;
 
         if (dev == NULL)
-                return -EINVAL;
+                return -ENXIO;
 
         mutex_lock(&kvm->slots_lock);
 
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index b152b23cd095..0db6dfcc8420 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -1609,7 +1609,6 @@ static long kvm_vm_ioctl(struct file *filp,
                 r = -EFAULT;
                 if (copy_from_user(&zone, argp, sizeof zone))
                         goto out;
-                r = -ENXIO;
                 r = kvm_vm_ioctl_register_coalesced_mmio(kvm, &zone);
                 if (r)
                         goto out;
@@ -1621,7 +1620,6 @@ static long kvm_vm_ioctl(struct file *filp,
                 r = -EFAULT;
                 if (copy_from_user(&zone, argp, sizeof zone))
                         goto out;
-                r = -ENXIO;
                 r = kvm_vm_ioctl_unregister_coalesced_mmio(kvm, &zone);
                 if (r)
                         goto out;