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

Commit f0fe5108 authored by Avi Kivity's avatar Avi Kivity
Browse files

KVM: Future-proof argument-less ioctls 



Some ioctls ignore their arguments.  By requiring them to be zero now,
we allow a nonzero value to have some special meaning in the future.

Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent 07c45a36

drivers/kvm/kvm_main.c

+9 −0
Original line number Original line Diff line number Diff line
@@ -2169,6 +2169,9 @@ static long kvm_vcpu_ioctl(struct file *filp, 




	switch (ioctl) {

	switch (ioctl) {

	case KVM_RUN:

	case KVM_RUN:

		r = -EINVAL;

		if (arg)

			goto out;

		r = kvm_vcpu_ioctl_run(vcpu, vcpu->run);

		r = kvm_vcpu_ioctl_run(vcpu, vcpu->run);

		break;

		break;

	case KVM_GET_REGS: {

	case KVM_GET_REGS: {
@@ -2440,9 +2443,15 @@ static long kvm_dev_ioctl(struct file *filp, 




	switch (ioctl) {

	switch (ioctl) {

	case KVM_GET_API_VERSION:

	case KVM_GET_API_VERSION:

		r = -EINVAL;

		if (arg)

			goto out;

		r = KVM_API_VERSION;

		r = KVM_API_VERSION;

		break;

		break;

	case KVM_CREATE_VM:

	case KVM_CREATE_VM:

		r = -EINVAL;

		if (arg)

			goto out;

		r = kvm_dev_ioctl_create_vm();

		r = kvm_dev_ioctl_create_vm();

		break;

		break;

	case KVM_GET_MSR_INDEX_LIST: {

	case KVM_GET_MSR_INDEX_LIST: {