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

Commit 5b7c1a2c authored by Liu Yu's avatar Liu Yu Committed by Avi Kivity
Browse files

KVM: ppc: e500: Directly pass pvr to guest 



Signed-off-by: default avatarLiu Yu <yu.liu@freescale.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 0cfb50e5

arch/powerpc/include/asm/kvm_host.h

+0 −1
Original line number Diff line number Diff line
@@ -153,7 +153,6 @@ struct kvm_vcpu_arch { 
	u32 pid;

	u32 swap_pid;



	u32 pvr;

	u32 ccr0;

	u32 ccr1;

	u32 dbcr0;

arch/powerpc/kvm/e500.c

+0 −3
Original line number Diff line number Diff line
@@ -60,9 +60,6 @@ int kvmppc_core_vcpu_setup(struct kvm_vcpu *vcpu) 


	kvmppc_e500_tlb_setup(vcpu_e500);



	/* Use the same core vertion as host's */

	vcpu->arch.pvr = mfspr(SPRN_PVR);



	return 0;

}

arch/powerpc/kvm/emulate.c

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu) 
			case SPRN_SRR1:

				vcpu->arch.gpr[rt] = vcpu->arch.srr1; break;

			case SPRN_PVR:

				vcpu->arch.gpr[rt] = vcpu->arch.pvr; break;

				vcpu->arch.gpr[rt] = mfspr(SPRN_PVR); break;



			/* Note: mftb and TBRL/TBWL are user-accessible, so

			 * the guest can always access the real TB anyways.