Commit 24993d53 authored by Marcelo Tosatti's avatar Marcelo Tosatti Committed by Avi Kivity
Browse files

KVM: make MMU_DEBUG compile again 



the cr3 variable is now inside the vcpu->arch structure.

Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent 5e4a0b3c

arch/x86/kvm/mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -1182,7 +1182,7 @@ void kvm_mmu_flush_tlb(struct kvm_vcpu *vcpu) 


static void paging_new_cr3(struct kvm_vcpu *vcpu)

{

	pgprintk("%s: cr3 %lx\n", __FUNCTION__, vcpu->cr3);

	pgprintk("%s: cr3 %lx\n", __FUNCTION__, vcpu->arch.cr3);

	mmu_free_roots(vcpu);

}

arch/x86/kvm/paging_tmpl.h

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ static int FNAME(walk_addr)(struct guest_walker *walker, 
	}

#endif

	ASSERT((!is_long_mode(vcpu) && is_pae(vcpu)) ||

	       (vcpu->cr3 & CR3_NONPAE_RESERVED_BITS) == 0);

	       (vcpu->arch.cr3 & CR3_NONPAE_RESERVED_BITS) == 0);



	pt_access = ACC_ALL;