From patchwork Mon Dec 5 10:09:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 9460761 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 14DDC60459 for ; Mon, 5 Dec 2016 10:11:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0E73422ADC for ; Mon, 5 Dec 2016 10:11:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0350A26490; Mon, 5 Dec 2016 10:11:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A935222ADC for ; Mon, 5 Dec 2016 10:11:42 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cDqDN-0007lC-L5; Mon, 05 Dec 2016 10:09:41 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cDqDM-0007l2-TC for xen-devel@lists.xen.org; Mon, 05 Dec 2016 10:09:41 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id D3/7E-20885-4EC35485; Mon, 05 Dec 2016 10:09:40 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmplkeJIrShJLcpLzFFi42JxWrohUvexjWu EwZfdxhZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa8bR5mmsBV85Kr6s2cvUwNjO3sXIySEh4C/R t+Y6G4jNJqAvsfvFJyYQW0RAXeJ0x0VWEJtZwF3i063vLCC2sECIxNS368DqWQRUJG78ew5m8 wp4Svw/94sFYqacxPnjP5lBbE4BL4mls7eCxYWAan5/7GOCsNUkrvVfYofoFZQ4OfMJC8QuCY mDL14wT2DknYUkNQtJagEj0ypGjeLUorLUIl0jY72kosz0jJLcxMwcXUMDY73c1OLixPTUnMS kYr3k/NxNjMDgqWdgYNzB2LfX7xCjJAeTkihvi6FrhBBfUn5KZUZicUZ8UWlOavEhRhkODiUJ 3hZroJxgUWp6akVaZg4wjGHSEhw8SiK820HSvMUFibnFmekQqVOMilLivCdAEgIgiYzSPLg2W OxcYpSVEuZlZGBgEOIpSC3KzSxBlX/FKM7BqCTMewZkCk9mXgnc9FdAi5mAFp847gyyuCQRIS XVwGgvH2+xoys85Fmv3K0KxQcMP3JsRH0seoRDnrSddtxx+/DpF7J+kpNXtvUKdxaWzrd235e weJniB2m95VtuyLOW3JCQ5ZottHnm4y2zTRmeT+C6Z7iiaUmZbq2znOnxd2q78tWO8xRWLN48 5+TxS7Kfiyxl2A7/eV+/7+uu610bnY0ePGRX0VZiKc5INNRiLipOBACqCUUtmAIAAA== X-Env-Sender: prvs=140b549e8=Andrew.Cooper3@citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1480932577!57653486!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.0.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 52540 invoked from network); 5 Dec 2016 10:09:39 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-12.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 5 Dec 2016 10:09:39 -0000 X-IronPort-AV: E=Sophos;i="5.33,747,1477958400"; d="scan'208";a="393002852" From: Andrew Cooper To: Xen-devel Date: Mon, 5 Dec 2016 10:09:24 +0000 Message-ID: <1480932571-23547-2-git-send-email-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1480932571-23547-1-git-send-email-andrew.cooper3@citrix.com> References: <1480932571-23547-1-git-send-email-andrew.cooper3@citrix.com> MIME-Version: 1.0 Cc: Andrew Cooper , Tim Deegan Subject: [Xen-devel] [PATCH 1/8] x86/shadow: Drop stale adjustment in the PAE second-half search X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP This shouldn't have been present in c/s 29a57c992 "x86/emul: Rework emulator event injection". It was a leftover from a previous version of the series. This conditional has no effect on the behaviour following it, as both X86EMUL_EXCEPTION and X86EMUL_UNHANDLEABLE fall into the same "return back to guest" path. Signed-off-by: Andrew Cooper Acked-by: Tim Deegan --- CC: Tim Deegan --- xen/arch/x86/mm/shadow/multi.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 2696396..f494f7b 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -3475,9 +3475,6 @@ static int sh_page_fault(struct vcpu *v, v->arch.paging.last_write_was_pt = 0; r = x86_emulate(&emul_ctxt.ctxt, emul_ops); - if ( r == X86EMUL_EXCEPTION && emul_ctxt.ctxt.event_pending ) - r = X86EMUL_UNHANDLEABLE; - /* * Only continue the search for the second half if there are no * exceptions or pending actions. Otherwise, give up and re-enter