Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1143a706 authored by Simon Guo's avatar Simon Guo Committed by Paul Mackerras
Browse files

KVM: PPC: Add pt_regs into kvm_vcpu_arch and move vcpu->arch.gpr[] into it 



Current regs are scattered at kvm_vcpu_arch structure and it will
be more neat to organize them into pt_regs structure.

Also it will enable reimplementation of MMIO emulation code with
analyse_instr() later.

Signed-off-by: default avatarSimon Guo <wei.guo.simon@gmail.com>
Signed-off-by: default avatarPaul Mackerras <paulus@ozlabs.org>
parent 9c9e9cf4

arch/powerpc/include/asm/kvm_book3s.h

+2 −2
Original line number Diff line number Diff line
@@ -275,12 +275,12 @@ static inline struct kvmppc_vcpu_book3s *to_book3s(struct kvm_vcpu *vcpu) 


static inline void kvmppc_set_gpr(struct kvm_vcpu *vcpu, int num, ulong val)

{

	vcpu->arch.gpr[num] = val;

	vcpu->arch.regs.gpr[num] = val;

}



static inline ulong kvmppc_get_gpr(struct kvm_vcpu *vcpu, int num)

{

	return vcpu->arch.gpr[num];

	return vcpu->arch.regs.gpr[num];

}



static inline void kvmppc_set_cr(struct kvm_vcpu *vcpu, u32 val)

arch/powerpc/include/asm/kvm_book3s_64.h

+4 −4
Original line number Diff line number Diff line
@@ -490,8 +490,8 @@ static inline void copy_from_checkpoint(struct kvm_vcpu *vcpu) 
	vcpu->arch.ppr = vcpu->arch.ppr_tm;

	vcpu->arch.dscr = vcpu->arch.dscr_tm;

	vcpu->arch.tar = vcpu->arch.tar_tm;

	memcpy(vcpu->arch.gpr, vcpu->arch.gpr_tm,

	       sizeof(vcpu->arch.gpr));

	memcpy(vcpu->arch.regs.gpr, vcpu->arch.gpr_tm,

	       sizeof(vcpu->arch.regs.gpr));

	vcpu->arch.fp  = vcpu->arch.fp_tm;

	vcpu->arch.vr  = vcpu->arch.vr_tm;

	vcpu->arch.vrsave = vcpu->arch.vrsave_tm;
@@ -507,8 +507,8 @@ static inline void copy_to_checkpoint(struct kvm_vcpu *vcpu) 
	vcpu->arch.ppr_tm = vcpu->arch.ppr;

	vcpu->arch.dscr_tm = vcpu->arch.dscr;

	vcpu->arch.tar_tm = vcpu->arch.tar;

	memcpy(vcpu->arch.gpr_tm, vcpu->arch.gpr,

	       sizeof(vcpu->arch.gpr));

	memcpy(vcpu->arch.gpr_tm, vcpu->arch.regs.gpr,

	       sizeof(vcpu->arch.regs.gpr));

	vcpu->arch.fp_tm  = vcpu->arch.fp;

	vcpu->arch.vr_tm  = vcpu->arch.vr;

	vcpu->arch.vrsave_tm = vcpu->arch.vrsave;

arch/powerpc/include/asm/kvm_booke.h

+2 −2
Original line number Diff line number Diff line
@@ -36,12 +36,12 @@ 


static inline void kvmppc_set_gpr(struct kvm_vcpu *vcpu, int num, ulong val)

{

	vcpu->arch.gpr[num] = val;

	vcpu->arch.regs.gpr[num] = val;

}



static inline ulong kvmppc_get_gpr(struct kvm_vcpu *vcpu, int num)

{

	return vcpu->arch.gpr[num];

	return vcpu->arch.regs.gpr[num];

}



static inline void kvmppc_set_cr(struct kvm_vcpu *vcpu, u32 val)

arch/powerpc/include/asm/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -486,7 +486,7 @@ struct kvm_vcpu_arch { 
	struct kvmppc_book3s_shadow_vcpu *shadow_vcpu;

#endif



	ulong gpr[32];

	struct pt_regs regs;



	struct thread_fp_state fp;

arch/powerpc/kernel/asm-offsets.c

+1 −1
Original line number Diff line number Diff line
@@ -425,7 +425,7 @@ int main(void) 
	OFFSET(VCPU_HOST_STACK, kvm_vcpu, arch.host_stack);

	OFFSET(VCPU_HOST_PID, kvm_vcpu, arch.host_pid);

	OFFSET(VCPU_GUEST_PID, kvm_vcpu, arch.pid);

	OFFSET(VCPU_GPRS, kvm_vcpu, arch.gpr);

	OFFSET(VCPU_GPRS, kvm_vcpu, arch.regs.gpr);

	OFFSET(VCPU_VRSAVE, kvm_vcpu, arch.vrsave);

	OFFSET(VCPU_FPRS, kvm_vcpu, arch.fp.fpr);

#ifdef CONFIG_ALTIVEC