Skip to content

Commit

Permalink
KVM: PPC: e500mc: Move reset of oldpir below call to kvm_vcpu_init()
Browse files Browse the repository at this point in the history
Move the initialization of oldpir so that the call to kvm_vcpu_init() is
at the top of kvmppc_core_vcpu_create_e500mc().  oldpir is only use
when loading/putting a vCPU, which currently cannot be done until after
kvm_arch_vcpu_create() completes.  Reording the call to kvm_vcpu_init()
paves the way for moving the invocation to common PPC code.

No functional change intended.

Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
  • Loading branch information
Sean Christopherson authored and Paolo Bonzini committed Jan 24, 2020
1 parent d307695 commit 4dbf6fe
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions arch/powerpc/kvm/e500mc.c
Original file line number Diff line number Diff line change
Expand Up @@ -310,13 +310,13 @@ static int kvmppc_core_vcpu_create_e500mc(struct kvm *kvm, struct kvm_vcpu *vcpu
BUILD_BUG_ON(offsetof(struct kvmppc_vcpu_e500, vcpu) != 0);
vcpu_e500 = to_e500(vcpu);

/* Invalid PIR value -- this LPID dosn't have valid state on any cpu */
vcpu->arch.oldpir = 0xffffffff;

err = kvm_vcpu_init(vcpu, kvm, id);
if (err)
return err;

/* Invalid PIR value -- this LPID dosn't have valid state on any cpu */
vcpu->arch.oldpir = 0xffffffff;

err = kvmppc_e500_tlb_init(vcpu_e500);
if (err)
goto uninit_vcpu;
Expand Down

0 comments on commit 4dbf6fe

Please sign in to comment.