Commit 2610a57f authored by Tianjia Zhang's avatar Tianjia Zhang Committed by Paul Mackerras
Browse files

KVM: PPC: Remove redundant kvm_run from vcpu_arch 



The 'kvm_run' field already exists in the 'vcpu' structure, which
is the same structure as the 'kvm_run' in the 'vcpu_arch' and
should be deleted.

Signed-off-by: default avatarTianjia Zhang <tianjia.zhang@linux.alibaba.com>
Reviewed-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Reviewed-by: default avatarPaul Mackerras <paulus@ozlabs.org>
Signed-off-by: default avatarPaul Mackerras <paulus@ozlabs.org>
parent 512721d2

arch/powerpc/include/asm/kvm_host.h

+0 −1
Original line number Diff line number Diff line
@@ -795,7 +795,6 @@ struct kvm_vcpu_arch { 
	struct mmio_hpte_cache_entry *pgfault_cache;



	struct task_struct *run_task;

	struct kvm_run *kvm_run;



	spinlock_t vpa_update_lock;

	struct kvmppc_vpa vpa;

arch/powerpc/kvm/book3s_hv.c

+2 −4
Original line number Diff line number Diff line
@@ -2932,7 +2932,7 @@ static void post_guest_process(struct kvmppc_vcore *vc, bool is_master) 


		ret = RESUME_GUEST;

		if (vcpu->arch.trap)

			ret = kvmppc_handle_exit_hv(vcpu->arch.kvm_run, vcpu,

			ret = kvmppc_handle_exit_hv(vcpu->run, vcpu,

						    vcpu->arch.run_task);



		vcpu->arch.ret = ret;
@@ -3917,7 +3917,6 @@ static int kvmppc_run_vcpu(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu) 
	spin_lock(&vc->lock);

	vcpu->arch.ceded = 0;

	vcpu->arch.run_task = current;

	vcpu->arch.kvm_run = kvm_run;

	vcpu->arch.stolen_logged = vcore_stolen_time(vc, mftb());

	vcpu->arch.state = KVMPPC_VCPU_RUNNABLE;

	vcpu->arch.busy_preempt = TB_NIL;
@@ -3970,7 +3969,7 @@ static int kvmppc_run_vcpu(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu) 
			if (signal_pending(v->arch.run_task)) {

				kvmppc_remove_runnable(vc, v);

				v->stat.signal_exits++;

				v->arch.kvm_run->exit_reason = KVM_EXIT_INTR;

				v->run->exit_reason = KVM_EXIT_INTR;

				v->arch.ret = -EINTR;

				wake_up(&v->arch.cpu_run);

			}
@@ -4046,7 +4045,6 @@ int kvmhv_run_single_vcpu(struct kvm_run *kvm_run, 
	vc = vcpu->arch.vcore;

	vcpu->arch.ceded = 0;

	vcpu->arch.run_task = current;

	vcpu->arch.kvm_run = kvm_run;

	vcpu->arch.stolen_logged = vcore_stolen_time(vc, mftb());

	vcpu->arch.state = KVMPPC_VCPU_RUNNABLE;

	vcpu->arch.busy_preempt = TB_NIL;

arch/powerpc/kvm/book3s_hv_nested.c

+1 −2
Original line number Diff line number Diff line
@@ -290,8 +290,7 @@ long kvmhv_enter_nested_guest(struct kvm_vcpu *vcpu) 
			r = RESUME_HOST;

			break;

		}

		r = kvmhv_run_single_vcpu(vcpu->arch.kvm_run, vcpu, hdec_exp,

					  lpcr);

		r = kvmhv_run_single_vcpu(vcpu->run, vcpu, hdec_exp, lpcr);

	} while (is_kvmppc_resume_guest(r));



	/* save L2 state for return */