|
@@ -628,7 +628,7 @@ bool pdptrs_changed(struct kvm_vcpu *vcpu)
|
|
|
gfn_t gfn;
|
|
|
int r;
|
|
|
|
|
|
- if (is_long_mode(vcpu) || !is_pae(vcpu))
|
|
|
+ if (is_long_mode(vcpu) || !is_pae(vcpu) || !is_paging(vcpu))
|
|
|
return false;
|
|
|
|
|
|
if (!test_bit(VCPU_EXREG_PDPTR,
|
|
@@ -8177,7 +8177,7 @@ static int __set_sregs(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs)
|
|
|
kvm_update_cpuid(vcpu);
|
|
|
|
|
|
idx = srcu_read_lock(&vcpu->kvm->srcu);
|
|
|
- if (!is_long_mode(vcpu) && is_pae(vcpu)) {
|
|
|
+ if (!is_long_mode(vcpu) && is_pae(vcpu) && is_paging(vcpu)) {
|
|
|
load_pdptrs(vcpu, vcpu->arch.walk_mmu, kvm_read_cr3(vcpu));
|
|
|
mmu_reset_needed = 1;
|
|
|
}
|