Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a87fa355 authored by Wei Yongjun's avatar Wei Yongjun Committed by Avi Kivity
Browse files

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: default avatarWei Yongjun <yjwei@cn.fujitsu.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent 600f1ec3

virt/kvm/coalesced_mmio.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

virt/kvm/kvm_main.c

+0 −2
Original line number Diff line number Diff line
@@ -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;