|
@@ -132,7 +132,7 @@ walk:
|
|
|
walker->level = vcpu->arch.mmu.root_level;
|
|
|
pte = vcpu->arch.cr3;
|
|
|
#if PTTYPE == 64
|
|
|
- if (!is_long_mode(vcpu)) {
|
|
|
+ if (vcpu->arch.mmu.root_level == PT32E_ROOT_LEVEL) {
|
|
|
pte = kvm_pdptr_read(vcpu, (addr >> 30) & 3);
|
|
|
trace_kvm_mmu_paging_element(pte, walker->level);
|
|
|
if (!is_present_gpte(pte)) {
|
|
@@ -205,7 +205,7 @@ walk:
|
|
|
(PTTYPE == 64 || is_pse(vcpu))) ||
|
|
|
((walker->level == PT_PDPE_LEVEL) &&
|
|
|
is_large_pte(pte) &&
|
|
|
- is_long_mode(vcpu))) {
|
|
|
+ vcpu->arch.mmu.root_level == PT64_ROOT_LEVEL)) {
|
|
|
int lvl = walker->level;
|
|
|
|
|
|
walker->gfn = gpte_to_gfn_lvl(pte, lvl);
|