From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51763) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WsYZV-0007g6-RH for qemu-devel@nongnu.org; Thu, 05 Jun 2014 10:23:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WsYZM-0000Br-H5 for qemu-devel@nongnu.org; Thu, 05 Jun 2014 10:23:13 -0400 Received: from mail-we0-x22f.google.com ([2a00:1450:400c:c03::22f]:34110) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WsYZM-0000BR-B2 for qemu-devel@nongnu.org; Thu, 05 Jun 2014 10:23:04 -0400 Received: by mail-we0-f175.google.com with SMTP id p10so1174686wes.6 for ; Thu, 05 Jun 2014 07:23:03 -0700 (PDT) Received: from playground.station (net-37-117-132-7.cust.vodafonedsl.it. [37.117.132.7]) by mx.google.com with ESMTPSA id p9sm14884136eeg.32.2014.06.05.07.23.02 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Jun 2014 07:23:03 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Thu, 5 Jun 2014 16:22:16 +0200 Message-Id: <1401978143-11896-27-git-send-email-pbonzini@redhat.com> In-Reply-To: <1401978143-11896-1-git-send-email-pbonzini@redhat.com> References: <1401978143-11896-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 26/33] target-i386: test reserved PS bit on PML4Es List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Paolo Bonzini --- target-i386/helper.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/target-i386/helper.c b/target-i386/helper.c index a8e4088..787fbba 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -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; } -- 1.8.3.1