]> rtime.felk.cvut.cz Git - lisovros/qemu_apohw.git/commitdiff
target-i386: test reserved PS bit on PML4Es
authorPaolo Bonzini <pbonzini@redhat.com>
Tue, 27 May 2014 10:39:23 +0000 (12:39 +0200)
committerPaolo Bonzini <pbonzini@redhat.com>
Thu, 5 Jun 2014 14:10:34 +0000 (16:10 +0200)
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
target-i386/helper.c

index a8e4088b02f8df88cf1918fd1a24569ee4c0fbc1..787fbba9fe4aecbd9355dc269f9259999011c46a 100644 (file)
@@ -580,6 +580,9 @@ int x86_cpu_handle_mmu_fault(CPUState *cs, vaddr addr,
             if (!(pml4e & PG_PRESENT_MASK)) {
                 goto do_fault;
             }
+            if (pml4e & PG_PSE_MASK) {
+                goto do_fault_rsvd;
+            }
             if (!(env->efer & MSR_EFER_NXE) && (pml4e & PG_NX_MASK)) {
                 goto do_fault_rsvd;
             }