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

Commit 367e1319 authored by Avi Kivity's avatar Avi Kivity
Browse files

KVM: Return -ENOTTY on unrecognized ioctls 



Not the incorrect -EINVAL.

Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 680b3648

arch/ia64/kvm/kvm-ia64.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -941,7 +941,7 @@ long kvm_arch_vm_ioctl(struct file *filp, 
{

{

	struct kvm *kvm = filp->private_data;

	struct kvm *kvm = filp->private_data;

	void __user *argp = (void __user *)arg;

	void __user *argp = (void __user *)arg;

	int r = -EINVAL;

	int r = -ENOTTY;





	switch (ioctl) {

	switch (ioctl) {

	case KVM_SET_MEMORY_REGION: {

	case KVM_SET_MEMORY_REGION: {

arch/powerpc/kvm/powerpc.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -421,7 +421,7 @@ long kvm_arch_vm_ioctl(struct file *filp, 




	switch (ioctl) {

	switch (ioctl) {

	default:

	default:

		r = -EINVAL;

		r = -ENOTTY;

	}

	}





	return r;

	return r;

arch/s390/kvm/kvm-s390.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -150,7 +150,7 @@ long kvm_arch_vm_ioctl(struct file *filp, 
		break;

		break;

	}

	}

	default:

	default:

		r = -EINVAL;

		r = -ENOTTY;

	}

	}





	return r;

	return r;

arch/x86/kvm/x86.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2176,7 +2176,7 @@ long kvm_arch_vm_ioctl(struct file *filp, 
{

{

	struct kvm *kvm = filp->private_data;

	struct kvm *kvm = filp->private_data;

	void __user *argp = (void __user *)arg;

	void __user *argp = (void __user *)arg;

	int r = -EINVAL;

	int r = -ENOTTY;

	/*

	/*

	 * This union makes it completely explicit to gcc-3.x

	 * This union makes it completely explicit to gcc-3.x

	 * that these two variables' stack usage should be

	 * that these two variables' stack usage should be