Commit 0e1234c0 authored by Janis Schoetterl-Glausch's avatar Janis Schoetterl-Glausch Committed by Christian Borntraeger
Browse files

KVM: s390: Rename existing vcpu memop functions 



Makes the naming consistent, now that we also have a vm ioctl.

Signed-off-by: default avatarJanis Schoetterl-Glausch <scgl@linux.ibm.com>
Reviewed-by: default avatarJanosch Frank <frankja@linux.ibm.com>
Reviewed-by: default avatarClaudio Imbrenda <imbrenda@linux.ibm.com>
Link: https://lore.kernel.org/r/20220211182215.2730017-8-scgl@linux.ibm.com


Signed-off-by: default avatarChristian Borntraeger <borntraeger@linux.ibm.com>
parent ef11c946

arch/s390/kvm/kvm-s390.c

+10 −9
Original line number Diff line number Diff line
@@ -4741,7 +4741,7 @@ static int kvm_vcpu_ioctl_enable_cap(struct kvm_vcpu *vcpu, 
	return r;

}



static long kvm_s390_guest_sida_op(struct kvm_vcpu *vcpu,

static long kvm_s390_vcpu_sida_op(struct kvm_vcpu *vcpu,

				  struct kvm_s390_mem_op *mop)

{

	void __user *uaddr = (void __user *)mop->buf;
@@ -4771,7 +4771,8 @@ static long kvm_s390_guest_sida_op(struct kvm_vcpu *vcpu, 
	}

	return r;

}

static long kvm_s390_guest_mem_op(struct kvm_vcpu *vcpu,



static long kvm_s390_vcpu_mem_op(struct kvm_vcpu *vcpu,

				 struct kvm_s390_mem_op *mop)

{

	void __user *uaddr = (void __user *)mop->buf;
@@ -4835,7 +4836,7 @@ static long kvm_s390_guest_mem_op(struct kvm_vcpu *vcpu, 
	return r;

}



static long kvm_s390_guest_memsida_op(struct kvm_vcpu *vcpu,

static long kvm_s390_vcpu_memsida_op(struct kvm_vcpu *vcpu,

				     struct kvm_s390_mem_op *mop)

{

	int r, srcu_idx;
@@ -4845,12 +4846,12 @@ static long kvm_s390_guest_memsida_op(struct kvm_vcpu *vcpu, 
	switch (mop->op) {

	case KVM_S390_MEMOP_LOGICAL_READ:

	case KVM_S390_MEMOP_LOGICAL_WRITE:

		r = kvm_s390_guest_mem_op(vcpu, mop);

		r = kvm_s390_vcpu_mem_op(vcpu, mop);

		break;

	case KVM_S390_MEMOP_SIDA_READ:

	case KVM_S390_MEMOP_SIDA_WRITE:

		/* we are locked against sida going away by the vcpu->mutex */

		r = kvm_s390_guest_sida_op(vcpu, mop);

		r = kvm_s390_vcpu_sida_op(vcpu, mop);

		break;

	default:

		r = -EINVAL;
@@ -5013,7 +5014,7 @@ long kvm_arch_vcpu_ioctl(struct file *filp, 
		struct kvm_s390_mem_op mem_op;



		if (copy_from_user(&mem_op, argp, sizeof(mem_op)) == 0)

			r = kvm_s390_guest_memsida_op(vcpu, &mem_op);

			r = kvm_s390_vcpu_memsida_op(vcpu, &mem_op);

		else

			r = -EFAULT;

		break;