From patchwork Wed Apr 28 15:47:58 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Avi Kivity X-Patchwork-Id: 95717 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o3SFmEx3024925 for ; Wed, 28 Apr 2010 15:48:15 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754376Ab0D1PsL (ORCPT ); Wed, 28 Apr 2010 11:48:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:30390 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751581Ab0D1PsB (ORCPT ); Wed, 28 Apr 2010 11:48:01 -0400 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o3SFm0Ld017430 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 28 Apr 2010 11:48:00 -0400 Received: from cleopatra.tlv.redhat.com (cleopatra.tlv.redhat.com [10.35.255.11]) by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o3SFlx8E005820 for ; Wed, 28 Apr 2010 11:48:00 -0400 Received: from localhost.localdomain (file.tlv.redhat.com [10.35.255.8]) by cleopatra.tlv.redhat.com (Postfix) with ESMTP id 6F87D250ADB; Wed, 28 Apr 2010 18:47:58 +0300 (IDT) From: Avi Kivity To: Marcelo Tosatti Cc: kvm@vger.kernel.org Subject: [PATCH 5/5] test: access: don't expect fetch fault indication if !efer.nx Date: Wed, 28 Apr 2010 18:47:58 +0300 Message-Id: <1272469678-10728-6-git-send-email-avi@redhat.com> In-Reply-To: <1272469678-10728-1-git-send-email-avi@redhat.com> References: <1272469678-10728-1-git-send-email-avi@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Wed, 28 Apr 2010 15:48:15 +0000 (UTC) diff --git a/kvm/user/test/x86/access.c b/kvm/user/test/x86/access.c index 5addd15..3338fbc 100644 --- a/kvm/user/test/x86/access.c +++ b/kvm/user/test/x86/access.c @@ -463,6 +463,8 @@ no_pte: fault: if (!at->expected_fault) at->ignore_pde = 0; + if (!at->flags[AC_CPU_EFER_NX]) + at->expected_error &= ~PFERR_FETCH_MASK; } static void ac_test_check(ac_test_t *at, _Bool *success_ret, _Bool cond,