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

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

KVM: ppc: Fix e500 warnings and some spelling problems 



Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 87c656b4

arch/powerpc/kvm/e500_emulate.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -30,8 +30,6 @@ int kvmppc_core_emulate_op(struct kvm_run *run, struct kvm_vcpu *vcpu, 
	int emulated = EMULATE_DONE;

	int emulated = EMULATE_DONE;

	int ra;

	int ra;

	int rb;

	int rb;

	int rs;

	int rt;





	switch (get_op(inst)) {

	switch (get_op(inst)) {

	case 31:

	case 31:

arch/powerpc/kvm/e500_tlb.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -260,7 +260,7 @@ static inline void kvmppc_e500_deliver_tlb_miss(struct kvm_vcpu *vcpu, 
	unsigned int victim, pidsel, tsized;

	unsigned int victim, pidsel, tsized;

	int tlbsel;

	int tlbsel;





	/* since we only have tow TLBs, only lower bit is used. */

	/* since we only have two TLBs, only lower bit is used. */

	tlbsel = (vcpu_e500->mas4 >> 28) & 0x1;

	tlbsel = (vcpu_e500->mas4 >> 28) & 0x1;

	victim = (tlbsel == 0) ? tlb0_get_next_victim(vcpu_e500) : 0;

	victim = (tlbsel == 0) ? tlb0_get_next_victim(vcpu_e500) : 0;

	pidsel = (vcpu_e500->mas4 >> 16) & 0xf;

	pidsel = (vcpu_e500->mas4 >> 16) & 0xf;
@@ -402,7 +402,7 @@ int kvmppc_e500_emul_tlbivax(struct kvm_vcpu *vcpu, int ra, int rb) 




	ia = (ea >> 2) & 0x1;

	ia = (ea >> 2) & 0x1;





	/* since we only have tow TLBs, only lower bit is used. */

	/* since we only have two TLBs, only lower bit is used. */

	tlbsel = (ea >> 3) & 0x1;

	tlbsel = (ea >> 3) & 0x1;





	if (ia) {

	if (ia) {
@@ -471,7 +471,7 @@ int kvmppc_e500_emul_tlbsx(struct kvm_vcpu *vcpu, int rb) 
	} else {

	} else {

		int victim;

		int victim;





		/* since we only have tow TLBs, only lower bit is used. */

		/* since we only have two TLBs, only lower bit is used. */

		tlbsel = vcpu_e500->mas4 >> 28 & 0x1;

		tlbsel = vcpu_e500->mas4 >> 28 & 0x1;

		victim = (tlbsel == 0) ? tlb0_get_next_victim(vcpu_e500) : 0;

		victim = (tlbsel == 0) ? tlb0_get_next_victim(vcpu_e500) : 0;

arch/powerpc/kvm/e500_tlb.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -126,7 +126,7 @@ static inline unsigned int get_tlb_tlbsel( 
{

{

	/*

	/*

	 * Manual says that tlbsel has 2 bits wide.

	 * Manual says that tlbsel has 2 bits wide.

	 * Since we only have tow TLBs, only lower bit is used.

	 * Since we only have two TLBs, only lower bit is used.

	 */

	 */

	return (vcpu_e500->mas0 >> 28) & 0x1;

	return (vcpu_e500->mas0 >> 28) & 0x1;

}

}