renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-09 22:24:04 +08:00
Code

KVM: s390: Rename existing vcpu memop functions

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

Signed-off-by: Janis Schoetterl-Glausch <scgl@linux.ibm.com>
Reviewed-by: Janosch Frank <frankja@linux.ibm.com>
Reviewed-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
Link: https://lore.kernel.org/r/20220211182215.2730017-8-scgl@linux.ibm.com
Signed-off-by: Christian Borntraeger <borntraeger@linux.ibm.com>
This commit is contained in:
Janis Schoetterl-Glausch 2022-02-11 19:22:12 +01:00 committed by Christian Borntraeger
parent ef11c9463a
commit 0e1234c02b
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
arch/s390/kvm/kvm-s390.c
View File

@ -4741,7 +4741,7 @@ static int kvm_vcpu_ioctl_enable_cap(struct kvm_vcpu *vcpu,
return r; 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) struct kvm_s390_mem_op *mop)
{ {
void __user *uaddr = (void __user *)mop->buf; void __user *uaddr = (void __user *)mop->buf;
@ -4771,7 +4771,8 @@ static long kvm_s390_guest_sida_op(struct kvm_vcpu *vcpu,
} }
return r; 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) struct kvm_s390_mem_op *mop)
{ {
void __user *uaddr = (void __user *)mop->buf; void __user *uaddr = (void __user *)mop->buf;
@ -4835,7 +4836,7 @@ static long kvm_s390_guest_mem_op(struct kvm_vcpu *vcpu,
return r; 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) struct kvm_s390_mem_op *mop)
{ {
int r, srcu_idx; int r, srcu_idx;
@ -4845,12 +4846,12 @@ static long kvm_s390_guest_memsida_op(struct kvm_vcpu *vcpu,
switch (mop->op) { switch (mop->op) {
case KVM_S390_MEMOP_LOGICAL_READ: case KVM_S390_MEMOP_LOGICAL_READ:
case KVM_S390_MEMOP_LOGICAL_WRITE: case KVM_S390_MEMOP_LOGICAL_WRITE:
r = kvm_s390_guest_mem_op(vcpu, mop); r = kvm_s390_vcpu_mem_op(vcpu, mop);
break; break;
case KVM_S390_MEMOP_SIDA_READ: case KVM_S390_MEMOP_SIDA_READ:
case KVM_S390_MEMOP_SIDA_WRITE: case KVM_S390_MEMOP_SIDA_WRITE:
/* we are locked against sida going away by the vcpu->mutex */ /* 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; break;
default: default:
r = -EINVAL; r = -EINVAL;
@ -5013,7 +5014,7 @@ long kvm_arch_vcpu_ioctl(struct file *filp,
struct kvm_s390_mem_op mem_op; struct kvm_s390_mem_op mem_op;
if (copy_from_user(&mem_op, argp, sizeof(mem_op)) == 0) 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 else
r = -EFAULT; r = -EFAULT;
break; break;