Commit 1b94f6f8 authored by Tianjia Zhang's avatar Tianjia Zhang Committed by Paolo Bonzini
Browse files

KVM: Remove redundant argument to kvm_arch_vcpu_ioctl_run 



In earlier versions of kvm, 'kvm_run' was an independent structure
and was not included in the vcpu structure. At present, 'kvm_run'
is already included in the vcpu structure, so the parameter
'kvm_run' is redundant.

This patch simplifies the function definition, removes the extra
'kvm_run' parameter, and extracts it from the 'kvm_vcpu' structure
if necessary.

Signed-off-by: default avatarTianjia Zhang <tianjia.zhang@linux.alibaba.com>
Message-Id: <20200416051057.26526-1-tianjia.zhang@linux.alibaba.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 4f233371

arch/mips/kvm/mips.c

+2 −1
Original line number Diff line number Diff line
@@ -438,8 +438,9 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu, 
	return -ENOIOCTLCMD;

}



int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)

int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu)

{

	struct kvm_run *run = vcpu->run;

	int r = -EINTR;



	vcpu_load(vcpu);

arch/powerpc/kvm/powerpc.c

+2 −1
Original line number Diff line number Diff line
@@ -1764,8 +1764,9 @@ int kvm_vcpu_ioctl_set_one_reg(struct kvm_vcpu *vcpu, struct kvm_one_reg *reg) 
	return r;

}



int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)

int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu)

{

	struct kvm_run *run = vcpu->run;

	int r;



	vcpu_load(vcpu);

arch/s390/kvm/kvm-s390.c

+2 −1
Original line number Diff line number Diff line
@@ -4333,8 +4333,9 @@ static void store_regs(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) 
		store_regs_fmt2(vcpu, kvm_run);

}



int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)

int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu)

{

	struct kvm_run *kvm_run = vcpu->run;

	int rc;



	if (kvm_run->immediate_exit)

arch/x86/kvm/x86.c

+6 −5
Original line number Diff line number Diff line
@@ -8710,8 +8710,9 @@ static void kvm_put_guest_fpu(struct kvm_vcpu *vcpu) 
	trace_kvm_fpu(0);

}



int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)

int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu)

{

	struct kvm_run *kvm_run = vcpu->run;

	int r;



	vcpu_load(vcpu);
@@ -8729,18 +8730,18 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) 
		r = -EAGAIN;

		if (signal_pending(current)) {

			r = -EINTR;

			vcpu->run->exit_reason = KVM_EXIT_INTR;

			kvm_run->exit_reason = KVM_EXIT_INTR;

			++vcpu->stat.signal_exits;

		}

		goto out;

	}



	if (vcpu->run->kvm_valid_regs & ~KVM_SYNC_X86_VALID_FIELDS) {

	if (kvm_run->kvm_valid_regs & ~KVM_SYNC_X86_VALID_FIELDS) {

		r = -EINVAL;

		goto out;

	}



	if (vcpu->run->kvm_dirty_regs) {

	if (kvm_run->kvm_dirty_regs) {

		r = sync_regs(vcpu);

		if (r != 0)

			goto out;
@@ -8770,7 +8771,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) 


out:

	kvm_put_guest_fpu(vcpu);

	if (vcpu->run->kvm_valid_regs)

	if (kvm_run->kvm_valid_regs)

		store_regs(vcpu);

	post_kvm_run_save(vcpu);

	kvm_sigset_deactivate(vcpu);

include/linux/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -866,7 +866,7 @@ int kvm_arch_vcpu_ioctl_set_mpstate(struct kvm_vcpu *vcpu, 
				    struct kvm_mp_state *mp_state);

int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,

					struct kvm_guest_debug *dbg);

int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run);

int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu);



int kvm_arch_init(void *opaque);

void kvm_arch_exit(void);

CRA Git | Maintained and supported by SUSTech CRA and CCSE