From patchwork Tue Mar 7 23:32:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 9609973 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 1B87D6016C for ; Tue, 7 Mar 2017 23:35:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 06A6F283A6 for ; Tue, 7 Mar 2017 23:35:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EC02C2858B; Tue, 7 Mar 2017 23:35:15 +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 60099283A6 for ; Tue, 7 Mar 2017 23:35:15 +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 1clObA-0004Iv-C0; Tue, 07 Mar 2017 23:32:56 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1clOb9-0004In-A8 for xen-devel@lists.xen.org; Tue, 07 Mar 2017 23:32:55 +0000 Received: from [193.109.254.147] by server-8.bemta-6.messagelabs.com id 5B/19-21675-6234FB85; Tue, 07 Mar 2017 23:32:54 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrBLMWRWlGSWpSXmKPExsXitHSDva6a8/4 Ig54pghZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa8brb/sZCz6yVLTP7GJtYJzM0sXIySEh4C9x a2cDK4jNJqAvsfvFJyYQW0RAXeJ0x0WgOAcHs4CuxKqfGiBhYQEpiZOrIcpZBFQkmuc1gpXzC nhKrNl3EmqknMT54z+ZQWwhATWJa/2X2CFqBCVOznwCVsMsICFx8MUL5gmM3LOQpGYhSS1gZF rFqFGcWlSWWqRrbKyXVJSZnlGSm5iZo2toYKaXm1pcnJiempOYVKyXnJ+7iREYCgxAsINx5/r AQ4ySHExKorxKJ/dECPEl5adUZiQWZ8QXleakFh9ilOHgUJLg1T4DlBMsSk1PrUjLzAEGJUxa goNHSYT3/GmgNG9xQWJucWY6ROoUoy7HjeMH3jAJseTl56VKifMeBCkSACnKKM2DGwGLkEuMs lLCvIxARwnxFKQW5WaWoMq/YhTnYFQS5hUDuYQnM68EbtMroCOYgI7wk9kJckRJIkJKqoGRxW bjz+quwr1nby24PtF5npWX9N4HkvOiwo9yRSQ2L0xgdYtM3sBm2D1pRWJoYPEEPjFp7c/C5yS urOuNuhTRNrl45rGCm6ppz6NktssyFs6U+F3jfj8++tnxJ0eqlk7fcvxDifMtkxQNk84FOcwM 3lNeTdpa9/d5hKMLw7Z35xleVPS8XHtPiaU4I9FQi7moOBEAw1/gtIsCAAA= X-Env-Sender: prvs=232c9e888=Andrew.Cooper3@citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1488929572!37730939!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.2.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24718 invoked from network); 7 Mar 2017 23:32:54 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-15.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 7 Mar 2017 23:32:54 -0000 X-IronPort-AV: E=Sophos;i="5.36,260,1486425600"; d="scan'208";a="421077011" From: Andrew Cooper To: Xen-devel Date: Tue, 7 Mar 2017 23:32:44 +0000 Message-ID: <1488929565-15663-1-git-send-email-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 Cc: Andrew Cooper Subject: [Xen-devel] [PATCH 1/2] break 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 --- xen/arch/x86/x86_emulate/x86_emulate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 1b507f7..e09975c 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -7920,7 +7920,7 @@ int x86_emulate_wrapper( * called hvm_inject_hw_exception() rather than using * x86_emul_hw_exception().) */ - ASSERT(ctxt->event_pending == (rc == X86EMUL_EXCEPTION)); + /* ASSERT(ctxt->event_pending == (rc == X86EMUL_EXCEPTION)); */ return rc; }