From patchwork Fri Mar 17 11:02:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Liu X-Patchwork-Id: 9630343 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 D1CA560132 for ; Fri, 17 Mar 2017 11:04:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C4C122861A for ; Fri, 17 Mar 2017 11:04:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B71AF2868D; Fri, 17 Mar 2017 11:04:59 +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 732422861A for ; Fri, 17 Mar 2017 11:04:59 +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 1copeV-0006nr-9z; Fri, 17 Mar 2017 11:02:35 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1copeT-0006nW-In for xen-devel@lists.xenproject.org; Fri, 17 Mar 2017 11:02:33 +0000 Received: from [85.158.143.35] by server-9.bemta-6.messagelabs.com id F3/35-14382-942CBC85; Fri, 17 Mar 2017 11:02:33 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupnkeJIrShJLcpLzFFi42JxWrrBXtfj0Ok Ig183tSy+b5nM5MDocfjDFZYAxijWzLyk/IoE1owt62ILLrFWrJmk1MB4jqWLkZNDQsBfouHT I2YQm01AWeJnZy8biC0ioCfRdOA5YxcjFwezwBpGif0rWsGKhAU8Ja7t/grWzCKgKtHzexcji M0rYCGxZv8nNoih8hK72i6ygticApYStz5sBasRAqqZ9WATO4StINEx/RgTRK+gxMmZT8BmMg tISBx88YJ5AiPvLCSpWUhSCxiZVjGqF6cWlaUW6RrqJRVlpmeU5CZm5ugaGpjp5aYWFyemp+Y kJhXrJefnbmIEBg4DEOxg3Pnc6RCjJAeTkijvixWnI4T4kvJTKjMSizPii0pzUosPMcpwcChJ 8DodBMoJFqWmp1akZeYAQxgmLcHBoyTC+/UAUJq3uCAxtzgzHSJ1ilGX48bxA2+YhFjy8vNSp cR5GUBmCIAUZZTmwY2AxdMlRlkpYV5GoKOEeApSi3IzS1DlXzGKczAqCfP6gUzhycwrgdv0Cu gIJqAj3n44AXJESSJCSqqBkasiZUYoY77U7bsnjrq8fLXZwvK5r7nacVbO12z9DeoyxzrOz1/ h8l3z7G8bTsmb/QdiOnlLjA4L/+BbZ/3m+He35SlmPcFtzw4wrbyucUb0+uZn302eZfa67pko m//Pa9rhfXdvzN31uM4mt3Ca0Week6rGFj6n2/IiMlO2fZYX571uO+WbkRJLcUaioRZzUXEiA IKzVwWiAgAA X-Env-Sender: prvs=2421b28c6=wei.liu2@citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1489748550!58307169!2 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 16702 invoked from network); 17 Mar 2017 11:02:32 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-16.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 17 Mar 2017 11:02:32 -0000 X-IronPort-AV: E=Sophos;i="5.36,176,1486425600"; d="scan'208";a="423207437" From: Wei Liu To: Xen-devel Date: Fri, 17 Mar 2017 11:02:22 +0000 Message-ID: <20170317110223.25130-4-wei.liu2@citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170317110223.25130-1-wei.liu2@citrix.com> References: <20170317110223.25130-1-wei.liu2@citrix.com> MIME-Version: 1.0 Cc: Andrew Cooper , Wei Liu , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= Subject: [Xen-devel] [PATCH 3/4] x86/traps: undo the PVHv1 bodge in NMI delivery path 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 A bodge was added in 21c9fce8efb to skip delivering NMI to PVHv1 guest. Now that PVHv1 is gone, undo that bodge and remove the fixme. Signed-off-by: Wei Liu --- xen/arch/x86/traps.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 0d54baf20e..c785b3f353 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -3537,7 +3537,7 @@ static void nmi_hwdom_report(unsigned int reason_idx) { struct domain *d = hardware_domain; - if ( !d || !d->vcpu || !d->vcpu[0] || !is_pv_domain(d) /* PVH fixme */ ) + if ( !d || !d->vcpu || !d->vcpu[0] ) return; set_bit(reason_idx, nmi_reason(d));