From patchwork Mon Apr 10 13:34:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Roger_Pau_Monn=C3=A9?= X-Patchwork-Id: 9672751 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 5327B60244 for ; Mon, 10 Apr 2017 14:15:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4C55128450 for ; Mon, 10 Apr 2017 14:15:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 40FCD2846D; Mon, 10 Apr 2017 14:15:48 +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 D66C228450 for ; Mon, 10 Apr 2017 14:15:46 +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 1cxa4d-00057E-CJ; Mon, 10 Apr 2017 14:13:43 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cxa4c-00055z-4y for xen-devel@lists.xenproject.org; Mon, 10 Apr 2017 14:13:42 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id 38/B1-16497-5139BE85; Mon, 10 Apr 2017 14:13:41 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpmkeJIrShJLcpLzFFi42JxWrrBXldw8us Ig+MrLC2+b5nM5MDocfjDFZYAxijWzLyk/IoE1oy7j/vYC1oEKr5vP8nawNjK28XIwSEh4C/x 6YVJFyMnB5uAjsTFuTvZQMIiAioSt/cadDFycTALrGCUuP7uGhNIXFjAVeLOUSaQchYBVYm9P fNZQWxeAUuJntvLGUFsCQE9ibcTXzBCxAUlTs58wgJiMwtoSrRu/80OYctLNG+dzQxiCwkoSv TPe8A2gZFnFpKWWUhaZiFpWcDIvIpRozi1qCy1SNfQRC+pKDM9oyQ3MTNH19DAVC83tbg4MT0 1JzGpWC85P3cTIzBwGIBgB+PZ056HGCU5mJREedMtX0cI8SXlp1RmJBZnxBeV5qQWH2KU4eBQ kuBtmwiUEyxKTU+tSMvMAYYwTFqCg0dJhFcHJM1bXJCYW5yZDpE6xagoJc47ESQhAJLIKM2Da 4PFzSVGWSlhXkagQ4R4ClKLcjNLUOVfMYpzMCoJ854CmcKTmVcCN/0V0GImoMVndr0EWVySiJ CSamD0enP0E+MmH/cZZyJN94desPZU9LgTfNDY91cUd4lAXufkk8YSi8L0VbdYOq0Tlm3fceW PiL5pL5+zwCbjMy0R/XxL9t++1iAz4aXqPt1iH4fJ11K+r+kWabrY5HVhwjW5ebXMEzqnSHmx rbWf43vX0mHvTPE92nrX2SUc6rj0Sze/k2XzO6bEUpyRaKjFXFScCAAkz+h/lgIAAA== X-Env-Sender: prvs=266d97a94=roger.pau@citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1491833615!89191783!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.4.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3795 invoked from network); 10 Apr 2017 14:13:37 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-3.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 10 Apr 2017 14:13:37 -0000 X-IronPort-AV: E=Sophos;i="5.37,182,1488844800"; d="scan'208";a="427099377" From: Roger Pau Monne To: Date: Mon, 10 Apr 2017 14:34:33 +0100 Message-ID: <20170410133435.51728-1-roger.pau@citrix.com> X-Mailer: git-send-email 2.11.0 (Apple Git-81) MIME-Version: 1.0 Cc: Tamas K Lengyel , Daniel De Graaf , Julien Grall , Roger Pau Monne Subject: [Xen-devel] [PATCH for-4.9 v3 1/3] xsm: fix clang 3.5 build after c47d1d 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 The changes introduced on c47d1d broke the clang build due to undefined references to __xsm_action_mismatch_detected, because clang hasn't optimized the code properly. The following patch allows the clang build to work again, while keeping the same functionality. Signed-off-by: Roger Pau Monné Acked-by: Daniel De Graaf Tested-by: Julien Grall --- Cc: Daniel De Graaf Cc: Julien Grall Cc: Tamas K Lengyel --- Changes since v2: - Use an "if" like v1. Changes since v1: - Remove unused "break". - Remove if condition. NB: this fixes travis build: https://travis-ci.org/royger/xen/builds/219697038 --- xen/include/xsm/dummy.h | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/xen/include/xsm/dummy.h b/xen/include/xsm/dummy.h index 56a8814d82..62fcea6f04 100644 --- a/xen/include/xsm/dummy.h +++ b/xen/include/xsm/dummy.h @@ -557,25 +557,21 @@ static XSM_INLINE int xsm_hvm_param_altp2mhvm(XSM_DEFAULT_ARG struct domain *d) static XSM_INLINE int xsm_hvm_altp2mhvm_op(XSM_DEFAULT_ARG struct domain *d, uint64_t mode, uint32_t op) { - xsm_default_t a; XSM_ASSERT_ACTION(XSM_OTHER); switch ( mode ) { case XEN_ALTP2M_mixed: - a = XSM_TARGET; - break; + return xsm_default_action(XSM_TARGET, current->domain, d); case XEN_ALTP2M_external: - a = XSM_DM_PRIV; - break; + return xsm_default_action(XSM_DM_PRIV, current->domain, d); case XEN_ALTP2M_limited: - a = (HVMOP_altp2m_vcpu_enable_notify == op) ? XSM_TARGET : XSM_DM_PRIV; - break; + if ( HVMOP_altp2m_vcpu_enable_notify == op ) + return xsm_default_action(XSM_TARGET, current->domain, d); + return xsm_default_action(XSM_DM_PRIV, current->domain, d); default: return -EPERM; - }; - - return xsm_default_action(a, current->domain, d); + } } static XSM_INLINE int xsm_vm_event_control(XSM_DEFAULT_ARG struct domain *d, int mode, int op)