浏览代码

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>
Marcelo Tosatti 17 年之前
父节点
当前提交
24993d5349
共有 2 个文件被更改,包括 2 次插入2 次删除
  1. 1 1
      arch/x86/kvm/mmu.c
  2. 1 1
      arch/x86/kvm/paging_tmpl.h

+ 1 - 1
arch/x86/kvm/mmu.c

@@ -1182,7 +1182,7 @@ void kvm_mmu_flush_tlb(struct kvm_vcpu *vcpu)
 
 
 static void paging_new_cr3(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);
 	mmu_free_roots(vcpu);
 }
 }
 
 

+ 1 - 1
arch/x86/kvm/paging_tmpl.h

@@ -143,7 +143,7 @@ walk:
 	}
 	}
 #endif
 #endif
 	ASSERT((!is_long_mode(vcpu) && is_pae(vcpu)) ||
 	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;
 	pt_access = ACC_ALL;