AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

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

Browse Source 
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>
This commit is contained in:
Wei Yongjun 2010-03-12 12:59:06 +08:00 committed by Avi Kivity
parent 600f1ec376
commit a87fa35514
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
virt/kvm/coalesced_mmio.c
View File

@ -139,7 +139,7 @@ int kvm_vm_ioctl_register_coalesced_mmio(struct kvm *kvm,
struct kvm_coalesced_mmio_dev *dev = kvm->coalesced_mmio_dev; struct kvm_coalesced_mmio_dev *dev = kvm->coalesced_mmio_dev;
if (dev == NULL) if (dev == NULL)
return -EINVAL; return -ENXIO;
mutex_lock(&kvm->slots_lock); mutex_lock(&kvm->slots_lock);
if (dev->nb_zones >= KVM_COALESCED_MMIO_ZONE_MAX) { 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; struct kvm_coalesced_mmio_zone *z;
if (dev == NULL) if (dev == NULL)
return -EINVAL; return -ENXIO;
mutex_lock(&kvm->slots_lock); mutex_lock(&kvm->slots_lock);

2
virt/kvm/kvm_main.c
View File

@ -1609,7 +1609,6 @@ static long kvm_vm_ioctl(struct file *filp,
r = -EFAULT; r = -EFAULT;
if (copy_from_user(&zone, argp, sizeof zone)) if (copy_from_user(&zone, argp, sizeof zone))
goto out; goto out;
r = -ENXIO;
r = kvm_vm_ioctl_register_coalesced_mmio(kvm, &zone); r = kvm_vm_ioctl_register_coalesced_mmio(kvm, &zone);
if (r) if (r)
goto out; goto out;
@ -1621,7 +1620,6 @@ static long kvm_vm_ioctl(struct file *filp,
r = -EFAULT; r = -EFAULT;
if (copy_from_user(&zone, argp, sizeof zone)) if (copy_from_user(&zone, argp, sizeof zone))
goto out; goto out;
r = -ENXIO;
r = kvm_vm_ioctl_unregister_coalesced_mmio(kvm, &zone); r = kvm_vm_ioctl_unregister_coalesced_mmio(kvm, &zone);
if (r) if (r)
goto out; goto out;