Commit d8708b80 authored by Thomas Huth's avatar Thomas Huth Committed by Paolo Bonzini
Browse files

KVM: Change return type of kvm_arch_vm_ioctl() to "int" 



All kvm_arch_vm_ioctl() implementations now only deal with "int"
types as return values, so we can change the return type of these
functions to use "int" instead of "long".

Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
Acked-by: default avatarAnup Patel <anup@brainfault.org>
Message-Id: <20230208140105.655814-7-thuth@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent f15ba52b

arch/arm64/kvm/arm.c

+1 −2
Original line number Diff line number Diff line
@@ -1439,8 +1439,7 @@ static int kvm_vm_ioctl_set_device_addr(struct kvm *kvm, 
	}

}



long kvm_arch_vm_ioctl(struct file *filp,

		       unsigned int ioctl, unsigned long arg)

int kvm_arch_vm_ioctl(struct file *filp, unsigned int ioctl, unsigned long arg)

{

	struct kvm *kvm = filp->private_data;

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

arch/mips/kvm/mips.c

+2 −2
Original line number Diff line number Diff line
@@ -993,9 +993,9 @@ void kvm_arch_flush_remote_tlbs_memslot(struct kvm *kvm, 
	kvm_flush_remote_tlbs(kvm);

}



long kvm_arch_vm_ioctl(struct file *filp, unsigned int ioctl, unsigned long arg)

int kvm_arch_vm_ioctl(struct file *filp, unsigned int ioctl, unsigned long arg)

{

	long r;

	int r;



	switch (ioctl) {

	default:

arch/powerpc/kvm/powerpc.c

+2 −3
Original line number Diff line number Diff line
@@ -2371,12 +2371,11 @@ static int kvmppc_get_cpu_char(struct kvm_ppc_cpu_char *cp) 
}

#endif



long kvm_arch_vm_ioctl(struct file *filp,

                       unsigned int ioctl, unsigned long arg)

int kvm_arch_vm_ioctl(struct file *filp, unsigned int ioctl, unsigned long arg)

{

	struct kvm *kvm __maybe_unused = filp->private_data;

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

	long r;

	int r;



	switch (ioctl) {

	case KVM_PPC_GET_PVINFO: {

arch/riscv/kvm/vm.c

+1 −2
Original line number Diff line number Diff line
@@ -87,8 +87,7 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) 
	return r;

}



long kvm_arch_vm_ioctl(struct file *filp,

		       unsigned int ioctl, unsigned long arg)

int kvm_arch_vm_ioctl(struct file *filp, unsigned int ioctl, unsigned long arg)

{

	return -EINVAL;

}

arch/s390/kvm/kvm-s390.c

+1 −2
Original line number Diff line number Diff line
@@ -2898,8 +2898,7 @@ static int kvm_s390_vm_mem_op(struct kvm *kvm, struct kvm_s390_mem_op *mop) 
	}

}



long kvm_arch_vm_ioctl(struct file *filp,

		       unsigned int ioctl, unsigned long arg)

int kvm_arch_vm_ioctl(struct file *filp, unsigned int ioctl, unsigned long arg)

{

	struct kvm *kvm = filp->private_data;

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