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

Commit 53021042 authored by Alexander Graf's avatar Alexander Graf Committed by Avi Kivity
Browse files

KVM: PPC: Book3S_32 MMU debug compile fixes 



Due to previous changes, the Book3S_32 guest MMU code didn't compile properly
when enabling debugging.

This patch repairs the broken code paths, making it possible to define DEBUG_MMU
and friends again.

Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 15711e9c

arch/powerpc/kvm/book3s_32_mmu.c

+2 −2
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ static hva_t kvmppc_mmu_book3s_32_get_pteg(struct kvmppc_vcpu_book3s *vcpu_book3 
	pteg = (vcpu_book3s->sdr1 & 0xffff0000) | hash;



	dprintk("MMU: pc=0x%lx eaddr=0x%lx sdr1=0x%llx pteg=0x%x vsid=0x%x\n",

		vcpu_book3s->vcpu.arch.pc, eaddr, vcpu_book3s->sdr1, pteg,

		kvmppc_get_pc(&vcpu_book3s->vcpu), eaddr, vcpu_book3s->sdr1, pteg,

		sre->vsid);



	r = gfn_to_hva(vcpu_book3s->vcpu.kvm, pteg >> PAGE_SHIFT);
@@ -269,7 +269,7 @@ static int kvmppc_mmu_book3s_32_xlate_pte(struct kvm_vcpu *vcpu, gva_t eaddr, 
		dprintk_pte("KVM MMU: No PTE found (sdr1=0x%llx ptegp=0x%lx)\n",

			    to_book3s(vcpu)->sdr1, ptegp);

		for (i=0; i<16; i+=2) {

			dprintk_pte("   %02d: 0x%x - 0x%x (0x%llx)\n",

			dprintk_pte("   %02d: 0x%x - 0x%x (0x%x)\n",

				    i, pteg[i], pteg[i+1], ptem);

		}

	}