From patchwork Fri Apr 7 14:34:53 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: 9669633 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 DF1AC60365 for ; Fri, 7 Apr 2017 14:40:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D12B227CF3 for ; Fri, 7 Apr 2017 14:40:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C5D7128608; Fri, 7 Apr 2017 14:40:45 +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 4BEBD28615 for ; Fri, 7 Apr 2017 14:40:45 +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 1cwV20-0004cr-3L; Fri, 07 Apr 2017 14:38:32 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cwV1y-0004cl-Qi for xen-devel@lists.xenproject.org; Fri, 07 Apr 2017 14:38:30 +0000 Received: from [85.158.143.35] by server-10.bemta-6.messagelabs.com id 9D/47-13192-664A7E85; Fri, 07 Apr 2017 14:38:30 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmphkeJIrShJLcpLzFFi42JxWrohUjd1yfM Igyk3tCy+b5nM5MDocfjDFZYAxijWzLyk/IoE1oxth28zFizlr9j17RZLA+NGni5GDg4JAX+J qd+duxg5OdgEdCQuzt3JBhIWEVCRuL3XoIuRi4NZYAWjxPV315hAaoQF7CRuHt/DBmKzANXs2 9DGCmLzClhKXP1wGaxGQkBP4u3EF4wQcUGJkzOfsIDYzAKaEq3bf7ND2PISzVtnM4PYQgKKEv 3zHrBNYOSZhaRlFpKWWUhaFjAyr2LUKE4tKkst0jUy10sqykzPKMlNzMzRNTQw08tNLS5OTE/ NSUwq1kvOz93ECAwdBiDYwbh4beAhRkkOJiVRXgWfJxFCfEn5KZUZicUZ8UWlOanFhxhlODiU JHg1Fz+PEBIsSk1PrUjLzAEGMUxagoNHSYT34yKgNG9xQWJucWY6ROoUo6KUOO8LkIQASCKjN A+uDRY5lxhlpYR5GYEOEeIpSC3KzSxBlX/FKM7BqCTMuwRkO09mXgnc9FdAi5mAFvvcegqyuC QRISXVwBiZ7KXGIflmqbT/bMWudmPRQ+bePiKf/t9Z39PoaXHz0aRIj/fFF5Zlb2sU9ufcr3X 5dlhNM+cB0d020Yy/y68wZjUbOrhr/svmFL/x4g9zk9CTO5uUZSTXqWz/rJlR2XglYVagiUTF V8aO6e+zQwzjajvs+VVMRT/UCeu9+3xy6qFtsWpLlViKMxINtZiLihMBQX4r7JcCAAA= X-Env-Sender: prvs=263d4bd68=roger.pau@citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1491575907!56599456!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.4.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 44034 invoked from network); 7 Apr 2017 14:38:29 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-4.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 7 Apr 2017 14:38:29 -0000 X-IronPort-AV: E=Sophos;i="5.37,165,1488844800"; d="scan'208";a="417915653" From: Roger Pau Monne To: Date: Fri, 7 Apr 2017 15:34:53 +0100 Message-ID: <20170407143453.46310-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] 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é Tested-by: Julien Grall --- Cc: Daniel De Graaf Cc: Julien Grall Cc: Tamas K Lengyel --- NB: this fixes travis build: https://travis-ci.org/royger/xen/builds/219697038 --- xen/include/xsm/dummy.h | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/xen/include/xsm/dummy.h b/xen/include/xsm/dummy.h index 56a8814d82..7d35744afe 100644 --- a/xen/include/xsm/dummy.h +++ b/xen/include/xsm/dummy.h @@ -557,25 +557,23 @@ 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; + return xsm_default_action(XSM_DM_PRIV, current->domain, d); break; 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); + else + 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)