aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorMarcelo Tosatti <marcelo@kvack.org>2008-02-14 18:25:39 -0500
committerAvi Kivity <avi@qumranet.com>2008-03-04 08:19:47 -0500
commit24993d53495d1f9b844f8eb3ebd1b9efd3521617 (patch)
tree93730205c36836e68973619fbbd8c8be0ad96cf1 /arch/x86
parent5e4a0b3c1b899bb0ba28bde6edf95c5ddeb48b5c (diff)
KVM: make MMU_DEBUG compile again
the cr3 variable is now inside the vcpu->arch structure. Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com> Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kvm/mmu.c2
-rw-r--r--arch/x86/kvm/paging_tmpl.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index 26037106ad19..194ece6974e6 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -1182,7 +1182,7 @@ void kvm_mmu_flush_tlb(struct kvm_vcpu *vcpu)
1182 1182
1183static void paging_new_cr3(struct kvm_vcpu *vcpu) 1183static void paging_new_cr3(struct kvm_vcpu *vcpu)
1184{ 1184{
1185 pgprintk("%s: cr3 %lx\n", __FUNCTION__, vcpu->cr3); 1185 pgprintk("%s: cr3 %lx\n", __FUNCTION__, vcpu->arch.cr3);
1186 mmu_free_roots(vcpu); 1186 mmu_free_roots(vcpu);
1187} 1187}
1188 1188
diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
index 2009c6e9dc4d..5588fa594b61 100644
--- a/arch/x86/kvm/paging_tmpl.h
+++ b/arch/x86/kvm/paging_tmpl.h
@@ -143,7 +143,7 @@ walk:
143 } 143 }
144#endif 144#endif
145 ASSERT((!is_long_mode(vcpu) && is_pae(vcpu)) || 145 ASSERT((!is_long_mode(vcpu) && is_pae(vcpu)) ||
146 (vcpu->cr3 & CR3_NONPAE_RESERVED_BITS) == 0); 146 (vcpu->arch.cr3 & CR3_NONPAE_RESERVED_BITS) == 0);
147 147
148 pt_access = ACC_ALL; 148 pt_access = ACC_ALL;
149 149