From patchwork Wed Mar 15 09:20:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Razvan Cojocaru X-Patchwork-Id: 9625091 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 E01936048C for ; Wed, 15 Mar 2017 09:22:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CDC8E2855A for ; Wed, 15 Mar 2017 09:22:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C0BD3285F7; Wed, 15 Mar 2017 09:22:58 +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 4D8B72855A for ; Wed, 15 Mar 2017 09:22:58 +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 1co572-00057n-1Z; Wed, 15 Mar 2017 09:20: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 1co570-00057e-Vr for xen-devel@lists.xen.org; Wed, 15 Mar 2017 09:20:55 +0000 Received: from [193.109.254.147] by server-6.bemta-6.messagelabs.com id D0/30-15112-67709C85; Wed, 15 Mar 2017 09:20:54 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprEIsWRWlGSWpSXmKPExsUSfTxjoW4x+8k Ig97bKhZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa8aGtgOMBVM5Kq69YGlgPMTWxcjJISTgIbH8 5S6WLkYuIHsto8T+64vYIJyrjBIfrh1lgahylzjevxaqaj+jRHPfXrAEm4ChxOqNLWCjRASkJ a59vszYxcjBwSxQKvGx0QEkLCwQLvG2bREziM0ioCox/fpBRhCbV8BT4szeu2BxCQE5iZPHJr NC2DkSq75vABsjISAl8b9VCWSthEAvi8T3s10sEDUyEo8m3mSbwCiwgJFhFaNGcWpRWWqRrqG BXlJRZnpGSW5iZg6QZ6aXm1pcnJiempOYVKyXnJ+7iREYVgxAsIPx3rKAQ4ySHExKorzlP05E CPEl5adUZiQWZ8QXleakFh9ilOHgUJLgPc96MkJIsCg1PbUiLTMHGOAwaQkOHiURXks2oDRvc UFibnFmOkTqFKOilDjvW5A+AZBERmkeXBssqi4xykoJ8zICHSLEU5BalJtZgir/ilGcg1FJmN cZZDxPZl4J3PRXQIuZgBa//XACZHFJIkJKqoExqbqlbLbk7wdTJHw2/9f9UHD4ud3rHRe/Otb V2AkqHJYQ+7lgn1bqx3AjLYmXq3XeLf44Offh5M3zns1exTr/DN/1SDUV3iuZxf+uJx9WeTFB jSWN73Tm4Uu+f64XzlOSv3T78u+cB5cen07/x19ReuPGZ3khvpl/RNcHzRdarvBuUVDtVc55f UosxRmJhlrMRcWJANrBbUKlAgAA X-Env-Sender: rcojocaru@bitdefender.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1489569650!91935152!1 X-Originating-IP: [91.199.104.161] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.2.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 51956 invoked from network); 15 Mar 2017 09:20:51 -0000 Received: from mx01.bbu.dsd.mx.bitdefender.com (HELO mx01.bbu.dsd.mx.bitdefender.com) (91.199.104.161) by server-9.tower-27.messagelabs.com with DHE-RSA-AES128-GCM-SHA256 encrypted SMTP; 15 Mar 2017 09:20:51 -0000 Received: (qmail 12817 invoked from network); 15 Mar 2017 11:20:50 +0200 Received: from unknown (HELO mx-sr.buh.bitdefender.com) (10.17.80.103) by mx01.bbu.dsd.mx.bitdefender.com with AES256-GCM-SHA384 encrypted SMTP; 15 Mar 2017 11:20:50 +0200 Received: from smtp02.buh.bitdefender.net (smtp.bitdefender.biz [10.17.80.76]) by mx-sr.buh.bitdefender.com (Postfix) with ESMTP id 9F5947FC09 for ; Wed, 15 Mar 2017 11:20:49 +0200 (EET) Received: (qmail 8532 invoked from network); 15 Mar 2017 11:20:49 +0200 Received: from xen.dsd.ro (HELO xen.dsd.bitdefender.biz) (rcojocaru@bitdefender.com@10.10.14.109) by smtp02.buh.bitdefender.net with AES128-SHA256 encrypted SMTP; 15 Mar 2017 11:20:49 +0200 From: Razvan Cojocaru To: xen-devel@lists.xen.org Date: Wed, 15 Mar 2017 11:20:30 +0200 Message-Id: <1489569630-23972-1-git-send-email-rcojocaru@bitdefender.com> X-Mailer: git-send-email 1.9.1 X-BitDefender-Scanner: Clean, Agent: BitDefender qmail 3.1.6 on smtp02.buh.bitdefender.net, sigver: 7.70176 X-BitDefender-Spam: No (0) X-BitDefender-SpamStamp: Build: [Engines: 2.15.8.1074, Dats: 443287, Stamp: 3], Multi: [Enabled, t: (0.000008, 0.003555)], BW: [Enabled, t: (0.000007)], RBL DNSBL: [Disabled], APM: [Enabled, Score: 500, t: (0.002153), Flags: 85D2ED72; NN_NO_CONTENT_TYPE; NN_NO_LINK_NMD; NN_LEGIT_BITDEFENDER; NN_LEGIT_S_SQARE_BRACKETS; NN_LEGIT_MAILING_LIST_TO], SGN: [Enabled, t: (0.007936,0.000034)], URL: [Enabled, t: (0.000005)], RTDA: [Enabled, t: (0.072858), Hit: No, Details: v2.4.4; Id: 11.5eu6g2.1bb8f7dfo.22a8], total: 0(775) X-BitDefender-CF-Stamp: none Cc: wei.liu2@citrix.com, ian.jackson@eu.citrix.com, Razvan Cojocaru , JBeulich@suse.com Subject: [Xen-devel] [PATCH] tools/libxc: Fix ARM build broken by XEN_DOMCTL_getvcpuextstate commit 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: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP The previous "tools/libxc: Exposed XEN_DOMCTL_getvcpuextstate" broke the ARM build (the hypercall does not have a corresponding DOMCTL ARM struct). This patch fixes the build by returning -ENODEV for ARM from xc_vcpu_get_extstate(). Signed-off-by: Razvan Cojocaru Acked-by: Wei Liu --- tools/libxc/xc_domain.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index 71e5d93..c7e8065 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -560,7 +560,8 @@ int xc_vcpu_get_extstate(xc_interface *xch, uint32_t vcpu, xc_vcpu_extstate_t *extstate) { - int rc; + int rc = -ENODEV; +#if defined (__i386) || defined(__x86_64__) DECLARE_DOMCTL; DECLARE_HYPERCALL_BUFFER(void, buffer); bool get_state; @@ -610,6 +611,7 @@ int xc_vcpu_get_extstate(xc_interface *xch, out: if ( get_state ) xc_hypercall_buffer_free(xch, buffer); +#endif return rc; }