From xen-changelog-bounces@lists.xen.org Mon May 14 16:28:42 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:28:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8U-00025v-MI; Mon, 14 May 2012 16:28:38 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8T-00025c-V9 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:38 +0000 Received: from [85.158.139.83:61472] by server-3.bemta-5.messagelabs.com id 4E/7E-25237-5B231BF4; Mon, 14 May 2012 16:28:37 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-182.messagelabs.com!1337012914!25626504!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19188 invoked from network); 14 May 2012 16:28:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:28:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8Q-0002gC-Im for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STy8Q-00060v-Ao for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:34 +0000 Message-Id: Date: Mon, 14 May 2012 16:28:33 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] x86: fix memset(ptr, 0, sizeof ptr). X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Tim Deegan # Date 1335261025 -3600 # Node ID f5f1e6ef978299300a64e7db72f43024186f6721 # Parent 494aa5ecd2e19384b5ad6c2d30867b86b7f2b405 x86: fix memset(ptr, 0, sizeof ptr). Signed-off-by: Tim Deegan Acked-by: Jan Beulich Acked-by: Christoph Egger Acked-by: Keir Fraser Committed-by: Tim Deegan xen-unstable changeset: 25168:d5f9005dfc4a xen-unstable date: Wed Apr 11 13:10:33 2012 +0100 --- diff -r 494aa5ecd2e1 -r f5f1e6ef9782 xen/arch/x86/cpu/mcheck/amd_f10.c --- a/xen/arch/x86/cpu/mcheck/amd_f10.c Tue Apr 17 08:35:09 2012 +0100 +++ b/xen/arch/x86/cpu/mcheck/amd_f10.c Tue Apr 24 10:50:25 2012 +0100 @@ -73,9 +73,9 @@ amd_f10_handler(struct mc_info *mi, uint return NULL; } - memset(mc_ext, 0, sizeof(mc_ext)); + memset(mc_ext, 0, sizeof(*mc_ext)); mc_ext->common.type = MC_TYPE_EXTENDED; - mc_ext->common.size = sizeof(mc_ext); + mc_ext->common.size = sizeof(*mc_ext); mc_ext->mc_msrs = 3; mc_ext->mc_msr[0].reg = MSR_F10_MC4_MISC1; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:28:42 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:28:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8V-00026S-RB; Mon, 14 May 2012 16:28:39 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8U-00025l-P1 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:38 +0000 Received: from [85.158.138.51:51606] by server-6.bemta-3.messagelabs.com id 84/99-05145-5B231BF4; Mon, 14 May 2012 16:28:37 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-174.messagelabs.com!1337012916!27109557!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23933 invoked from network); 14 May 2012 16:28:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:28:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8R-0002gI-Je for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STy8R-00061R-BI for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:35 +0000 Message-Id: Date: Mon, 14 May 2012 16:28:34 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] x86-64: Fix memory hotplug epfn upper limit test for updating the compat M2P table X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Malcolm Crossley # Date 1335878038 -3600 # Node ID b1e2ca715ae7f60ecb4bac84dcab48d9bb3006d9 # Parent 99517f769cc861094d35bd9e681d78a5a2573265 x86-64: Fix memory hotplug epfn upper limit test for updating the compat M2P table The epfn is being compared to (RDWR_COMPAT_MPT_VIRT_END - RDWR_COMPAT_MPT_VIRT_START) without a 2 bit shift, resulting in the epfn being compared to the size of the RDWR_COMPAT_MPT table in bytes instead of the maximum page frame number that the RDWR_COMPAT_MPT table can map. Signed-off-by: Malcolm Crossley Committed-by: Jan Beulich xen-unstable changeset: 25242:b7ce6a88bebb xen-unstable date: Wed Apr 25 12:35:56 2012 +0200 --- diff -r 99517f769cc8 -r b1e2ca715ae7 xen/arch/x86/x86_64/mm.c --- a/xen/arch/x86/x86_64/mm.c Tue Apr 24 18:38:19 2012 +0100 +++ b/xen/arch/x86/x86_64/mm.c Tue May 01 14:13:58 2012 +0100 @@ -450,7 +450,7 @@ static int setup_compat_m2p_table(struct if ((smap > ((RDWR_COMPAT_MPT_VIRT_END - RDWR_COMPAT_MPT_VIRT_START) >> 2)) ) return 0; - if (epfn > (RDWR_COMPAT_MPT_VIRT_END - RDWR_COMPAT_MPT_VIRT_START)) + if ( epfn > ((RDWR_COMPAT_MPT_VIRT_END - RDWR_COMPAT_MPT_VIRT_START) >> 2) ) epfn = (RDWR_COMPAT_MPT_VIRT_END - RDWR_COMPAT_MPT_VIRT_START) >> 2; emap = ( (epfn + ((1UL << (L2_PAGETABLE_SHIFT - 2)) - 1 )) & _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:28:42 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:28:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8V-00026S-RB; Mon, 14 May 2012 16:28:39 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8U-00025l-P1 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:38 +0000 Received: from [85.158.138.51:51606] by server-6.bemta-3.messagelabs.com id 84/99-05145-5B231BF4; Mon, 14 May 2012 16:28:37 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-174.messagelabs.com!1337012916!27109557!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23933 invoked from network); 14 May 2012 16:28:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:28:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8R-0002gI-Je for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STy8R-00061R-BI for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:35 +0000 Message-Id: Date: Mon, 14 May 2012 16:28:34 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] x86-64: Fix memory hotplug epfn upper limit test for updating the compat M2P table X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Malcolm Crossley # Date 1335878038 -3600 # Node ID b1e2ca715ae7f60ecb4bac84dcab48d9bb3006d9 # Parent 99517f769cc861094d35bd9e681d78a5a2573265 x86-64: Fix memory hotplug epfn upper limit test for updating the compat M2P table The epfn is being compared to (RDWR_COMPAT_MPT_VIRT_END - RDWR_COMPAT_MPT_VIRT_START) without a 2 bit shift, resulting in the epfn being compared to the size of the RDWR_COMPAT_MPT table in bytes instead of the maximum page frame number that the RDWR_COMPAT_MPT table can map. Signed-off-by: Malcolm Crossley Committed-by: Jan Beulich xen-unstable changeset: 25242:b7ce6a88bebb xen-unstable date: Wed Apr 25 12:35:56 2012 +0200 --- diff -r 99517f769cc8 -r b1e2ca715ae7 xen/arch/x86/x86_64/mm.c --- a/xen/arch/x86/x86_64/mm.c Tue Apr 24 18:38:19 2012 +0100 +++ b/xen/arch/x86/x86_64/mm.c Tue May 01 14:13:58 2012 +0100 @@ -450,7 +450,7 @@ static int setup_compat_m2p_table(struct if ((smap > ((RDWR_COMPAT_MPT_VIRT_END - RDWR_COMPAT_MPT_VIRT_START) >> 2)) ) return 0; - if (epfn > (RDWR_COMPAT_MPT_VIRT_END - RDWR_COMPAT_MPT_VIRT_START)) + if ( epfn > ((RDWR_COMPAT_MPT_VIRT_END - RDWR_COMPAT_MPT_VIRT_START) >> 2) ) epfn = (RDWR_COMPAT_MPT_VIRT_END - RDWR_COMPAT_MPT_VIRT_START) >> 2; emap = ( (epfn + ((1UL << (L2_PAGETABLE_SHIFT - 2)) - 1 )) & _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:28:42 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:28:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8X-000272-0Q; Mon, 14 May 2012 16:28:41 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8V-00025l-Dh for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:39 +0000 Received: from [85.158.138.51:64956] by server-6.bemta-3.messagelabs.com id 3A/99-05145-6B231BF4; Mon, 14 May 2012 16:28:38 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-11.tower-174.messagelabs.com!1337012917!27055856!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23284 invoked from network); 14 May 2012 16:28:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:28:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8S-0002gR-Rv for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STy8S-00062E-R2 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:36 +0000 Message-Id: Date: Mon, 14 May 2012 16:28:36 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] Added tag 4.1.3-rc1 for changeset da64f68730cf X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Keir Fraser # Date 1336394614 -3600 # Node ID d9d582ecb32d2cf535a99bd24bf200a803a8c720 # Parent da64f68730cf1c42c06919578e70d8bc01041051 Added tag 4.1.3-rc1 for changeset da64f68730cf --- diff -r da64f68730cf -r d9d582ecb32d .hgtags --- a/.hgtags Mon May 07 13:43:15 2012 +0100 +++ b/.hgtags Mon May 07 13:43:34 2012 +0100 @@ -62,3 +62,4 @@ 1f21da33dea4acb2dbfb988bcd1b7898e019316c 3e6a3bf83935cc2460707b94ef2801bb6f19d581 4.1.2-rc2 24041ed83728ac6c26d3c32d29d7d08eb8433149 4.1.2-rc3 3eca5bf65e6cca881d599c68f2305f865e0f9fd0 RELEASE-4.1.2 +da64f68730cf1c42c06919578e70d8bc01041051 4.1.3-rc1 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:28:42 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:28:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8U-00025v-MI; Mon, 14 May 2012 16:28:38 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8T-00025c-V9 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:38 +0000 Received: from [85.158.139.83:61472] by server-3.bemta-5.messagelabs.com id 4E/7E-25237-5B231BF4; Mon, 14 May 2012 16:28:37 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-182.messagelabs.com!1337012914!25626504!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19188 invoked from network); 14 May 2012 16:28:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:28:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8Q-0002gC-Im for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STy8Q-00060v-Ao for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:34 +0000 Message-Id: Date: Mon, 14 May 2012 16:28:33 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] x86: fix memset(ptr, 0, sizeof ptr). X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Tim Deegan # Date 1335261025 -3600 # Node ID f5f1e6ef978299300a64e7db72f43024186f6721 # Parent 494aa5ecd2e19384b5ad6c2d30867b86b7f2b405 x86: fix memset(ptr, 0, sizeof ptr). Signed-off-by: Tim Deegan Acked-by: Jan Beulich Acked-by: Christoph Egger Acked-by: Keir Fraser Committed-by: Tim Deegan xen-unstable changeset: 25168:d5f9005dfc4a xen-unstable date: Wed Apr 11 13:10:33 2012 +0100 --- diff -r 494aa5ecd2e1 -r f5f1e6ef9782 xen/arch/x86/cpu/mcheck/amd_f10.c --- a/xen/arch/x86/cpu/mcheck/amd_f10.c Tue Apr 17 08:35:09 2012 +0100 +++ b/xen/arch/x86/cpu/mcheck/amd_f10.c Tue Apr 24 10:50:25 2012 +0100 @@ -73,9 +73,9 @@ amd_f10_handler(struct mc_info *mi, uint return NULL; } - memset(mc_ext, 0, sizeof(mc_ext)); + memset(mc_ext, 0, sizeof(*mc_ext)); mc_ext->common.type = MC_TYPE_EXTENDED; - mc_ext->common.size = sizeof(mc_ext); + mc_ext->common.size = sizeof(*mc_ext); mc_ext->mc_msrs = 3; mc_ext->mc_msr[0].reg = MSR_F10_MC4_MISC1; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:28:42 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:28:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8X-000272-0Q; Mon, 14 May 2012 16:28:41 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8V-00025l-Dh for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:39 +0000 Received: from [85.158.138.51:64956] by server-6.bemta-3.messagelabs.com id 3A/99-05145-6B231BF4; Mon, 14 May 2012 16:28:38 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-11.tower-174.messagelabs.com!1337012917!27055856!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23284 invoked from network); 14 May 2012 16:28:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:28:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8S-0002gR-Rv for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STy8S-00062E-R2 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:36 +0000 Message-Id: Date: Mon, 14 May 2012 16:28:36 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] Added tag 4.1.3-rc1 for changeset da64f68730cf X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Keir Fraser # Date 1336394614 -3600 # Node ID d9d582ecb32d2cf535a99bd24bf200a803a8c720 # Parent da64f68730cf1c42c06919578e70d8bc01041051 Added tag 4.1.3-rc1 for changeset da64f68730cf --- diff -r da64f68730cf -r d9d582ecb32d .hgtags --- a/.hgtags Mon May 07 13:43:15 2012 +0100 +++ b/.hgtags Mon May 07 13:43:34 2012 +0100 @@ -62,3 +62,4 @@ 1f21da33dea4acb2dbfb988bcd1b7898e019316c 3e6a3bf83935cc2460707b94ef2801bb6f19d581 4.1.2-rc2 24041ed83728ac6c26d3c32d29d7d08eb8433149 4.1.2-rc3 3eca5bf65e6cca881d599c68f2305f865e0f9fd0 RELEASE-4.1.2 +da64f68730cf1c42c06919578e70d8bc01041051 4.1.3-rc1 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:28:42 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:28:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8V-00026M-Ol; Mon, 14 May 2012 16:28:39 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8U-00025g-Cq for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:38 +0000 Received: from [85.158.139.83:61510] by server-10.bemta-5.messagelabs.com id 45/38-08260-5B231BF4; Mon, 14 May 2012 16:28:37 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-182.messagelabs.com!1337012915!28331519!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19962 invoked from network); 14 May 2012 16:28:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:28:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8Q-0002gF-VK for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STy8Q-00061B-RO for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:34 +0000 Message-Id: Date: Mon, 14 May 2012 16:28:34 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] QEMU_TAG update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1335289099 -3600 # Node ID 99517f769cc861094d35bd9e681d78a5a2573265 # Parent f5f1e6ef978299300a64e7db72f43024186f6721 QEMU_TAG update --- diff -r f5f1e6ef9782 -r 99517f769cc8 Config.mk --- a/Config.mk Tue Apr 24 10:50:25 2012 +0100 +++ b/Config.mk Tue Apr 24 18:38:19 2012 +0100 @@ -179,9 +179,9 @@ endif # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= 06d2e688405932841e9a1c27e2eaaef315298a66 -# Thu Mar 1 18:58:27 2012 +0000 -# qemu-xen: ignore console disconnect events for console/0 +QEMU_TAG ?= a2d2123a7dfc4d116011d51f48df786a3b853537 +# Mon Apr 2 17:55:05 2012 +0100 +# qemu-xen-traditional: QDISK fixes # Optional components XENSTAT_XENTOP ?= y _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:28:42 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:28:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8V-00026M-Ol; Mon, 14 May 2012 16:28:39 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8U-00025g-Cq for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:38 +0000 Received: from [85.158.139.83:61510] by server-10.bemta-5.messagelabs.com id 45/38-08260-5B231BF4; Mon, 14 May 2012 16:28:37 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-182.messagelabs.com!1337012915!28331519!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19962 invoked from network); 14 May 2012 16:28:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:28:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8Q-0002gF-VK for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STy8Q-00061B-RO for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:34 +0000 Message-Id: Date: Mon, 14 May 2012 16:28:34 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] QEMU_TAG update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1335289099 -3600 # Node ID 99517f769cc861094d35bd9e681d78a5a2573265 # Parent f5f1e6ef978299300a64e7db72f43024186f6721 QEMU_TAG update --- diff -r f5f1e6ef9782 -r 99517f769cc8 Config.mk --- a/Config.mk Tue Apr 24 10:50:25 2012 +0100 +++ b/Config.mk Tue Apr 24 18:38:19 2012 +0100 @@ -179,9 +179,9 @@ endif # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= 06d2e688405932841e9a1c27e2eaaef315298a66 -# Thu Mar 1 18:58:27 2012 +0000 -# qemu-xen: ignore console disconnect events for console/0 +QEMU_TAG ?= a2d2123a7dfc4d116011d51f48df786a3b853537 +# Mon Apr 2 17:55:05 2012 +0100 +# qemu-xen-traditional: QDISK fixes # Optional components XENSTAT_XENTOP ?= y _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:28:43 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:28:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8V-00026X-Tt; Mon, 14 May 2012 16:28:39 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8V-00025n-1i for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:39 +0000 Received: from [85.158.138.51:64909] by server-9.bemta-3.messagelabs.com id 35/E8-26691-6B231BF4; Mon, 14 May 2012 16:28:38 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-174.messagelabs.com!1337012916!18145523!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24611 invoked from network); 14 May 2012 16:28:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:28:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8R-0002gL-VZ for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STy8R-00061k-Rs for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:35 +0000 Message-Id: Date: Mon, 14 May 2012 16:28:35 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] svm: Fake out the Bus Unit Config MSR on revF AMD CPUs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User George Dunlap # Date 1335878120 -3600 # Node ID a21938b58fc4323ca408dbcfe081770bc178f6ed # Parent b1e2ca715ae7f60ecb4bac84dcab48d9bb3006d9 svm: Fake out the Bus Unit Config MSR on revF AMD CPUs Win2k8 x64 reads this MSR on revF chips, where it wasn't publically available; it uses a magic constant in %rdi as a password, which we don't have in rdmsr_safe(). Since we'll ignore the later writes, just use a plausible value here (the reset value from rev10h chips) if the real CPU didn't provide one. Signed-off-by: George Dunlap Committed-by: Keir Fraser xen-unstable changeset: 24990:322300fd2ebd xen-unstable date: Thu Mar 08 09:17:21 2012 +0000 svm: amend c/s 24990:322300fd2ebd (fake BU_CFG MSR on AMD revF) Let's restrict such a hack to the known affected family. Signed-off-by: Jan Beulich Acked-by: Keir Fraser Acked-by: George Dunlap xen-unstable changeset: 25058:f47d91cb0faa xen-unstable date: Thu Mar 15 15:09:18 2012 +0100 --- diff -r b1e2ca715ae7 -r a21938b58fc4 xen/arch/x86/hvm/svm/svm.c --- a/xen/arch/x86/hvm/svm/svm.c Tue May 01 14:13:58 2012 +0100 +++ b/xen/arch/x86/hvm/svm/svm.c Tue May 01 14:15:20 2012 +0100 @@ -1197,6 +1197,18 @@ static int svm_msr_read_intercept(unsign if ( rdmsr_safe(msr, *msr_content) == 0 ) break; + if ( boot_cpu_data.x86 == 0xf && msr == MSR_F10_BU_CFG ) + { + /* Win2k8 x64 reads this MSR on revF chips, where it + * wasn't publically available; it uses a magic constant + * in %rdi as a password, which we don't have in + * rdmsr_safe(). Since we'll ignore the later writes, + * just use a plausible value here (the reset value from + * rev10h chips) if the real CPU didn't provide one. */ + *msr_content = 0x0000000010200020ull; + break; + } + goto gpf; } diff -r b1e2ca715ae7 -r a21938b58fc4 xen/include/asm-x86/msr-index.h --- a/xen/include/asm-x86/msr-index.h Tue May 01 14:13:58 2012 +0100 +++ b/xen/include/asm-x86/msr-index.h Tue May 01 14:15:20 2012 +0100 @@ -253,6 +253,9 @@ #define MSR_F10_MC4_MISC2 0xc0000409 #define MSR_F10_MC4_MISC3 0xc000040A +/* AMD Family10h MMU control MSRs */ +#define MSR_F10_BU_CFG 0xc0011023 + /* Other AMD Fam10h MSRs */ #define MSR_FAM10H_MMIO_CONF_BASE 0xc0010058 #define FAM10H_MMIO_CONF_ENABLE (1<<0) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:28:43 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:28:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8V-00026X-Tt; Mon, 14 May 2012 16:28:39 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8V-00025n-1i for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:39 +0000 Received: from [85.158.138.51:64909] by server-9.bemta-3.messagelabs.com id 35/E8-26691-6B231BF4; Mon, 14 May 2012 16:28:38 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-174.messagelabs.com!1337012916!18145523!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24611 invoked from network); 14 May 2012 16:28:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:28:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8R-0002gL-VZ for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STy8R-00061k-Rs for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:35 +0000 Message-Id: Date: Mon, 14 May 2012 16:28:35 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] svm: Fake out the Bus Unit Config MSR on revF AMD CPUs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User George Dunlap # Date 1335878120 -3600 # Node ID a21938b58fc4323ca408dbcfe081770bc178f6ed # Parent b1e2ca715ae7f60ecb4bac84dcab48d9bb3006d9 svm: Fake out the Bus Unit Config MSR on revF AMD CPUs Win2k8 x64 reads this MSR on revF chips, where it wasn't publically available; it uses a magic constant in %rdi as a password, which we don't have in rdmsr_safe(). Since we'll ignore the later writes, just use a plausible value here (the reset value from rev10h chips) if the real CPU didn't provide one. Signed-off-by: George Dunlap Committed-by: Keir Fraser xen-unstable changeset: 24990:322300fd2ebd xen-unstable date: Thu Mar 08 09:17:21 2012 +0000 svm: amend c/s 24990:322300fd2ebd (fake BU_CFG MSR on AMD revF) Let's restrict such a hack to the known affected family. Signed-off-by: Jan Beulich Acked-by: Keir Fraser Acked-by: George Dunlap xen-unstable changeset: 25058:f47d91cb0faa xen-unstable date: Thu Mar 15 15:09:18 2012 +0100 --- diff -r b1e2ca715ae7 -r a21938b58fc4 xen/arch/x86/hvm/svm/svm.c --- a/xen/arch/x86/hvm/svm/svm.c Tue May 01 14:13:58 2012 +0100 +++ b/xen/arch/x86/hvm/svm/svm.c Tue May 01 14:15:20 2012 +0100 @@ -1197,6 +1197,18 @@ static int svm_msr_read_intercept(unsign if ( rdmsr_safe(msr, *msr_content) == 0 ) break; + if ( boot_cpu_data.x86 == 0xf && msr == MSR_F10_BU_CFG ) + { + /* Win2k8 x64 reads this MSR on revF chips, where it + * wasn't publically available; it uses a magic constant + * in %rdi as a password, which we don't have in + * rdmsr_safe(). Since we'll ignore the later writes, + * just use a plausible value here (the reset value from + * rev10h chips) if the real CPU didn't provide one. */ + *msr_content = 0x0000000010200020ull; + break; + } + goto gpf; } diff -r b1e2ca715ae7 -r a21938b58fc4 xen/include/asm-x86/msr-index.h --- a/xen/include/asm-x86/msr-index.h Tue May 01 14:13:58 2012 +0100 +++ b/xen/include/asm-x86/msr-index.h Tue May 01 14:15:20 2012 +0100 @@ -253,6 +253,9 @@ #define MSR_F10_MC4_MISC2 0xc0000409 #define MSR_F10_MC4_MISC3 0xc000040A +/* AMD Family10h MMU control MSRs */ +#define MSR_F10_BU_CFG 0xc0011023 + /* Other AMD Fam10h MSRs */ #define MSR_FAM10H_MMIO_CONF_BASE 0xc0010058 #define FAM10H_MMIO_CONF_ENABLE (1<<0) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:28:43 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:28:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8Y-00027j-6j; Mon, 14 May 2012 16:28:42 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8W-00026L-C3 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:40 +0000 Received: from [85.158.138.51:55674] by server-11.bemta-3.messagelabs.com id 1A/61-18894-7B231BF4; Mon, 14 May 2012 16:28:39 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-174.messagelabs.com!1337012917!27130388!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21408 invoked from network); 14 May 2012 16:28:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:28:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8T-0002gU-Al for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STy8T-00062T-A8 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:37 +0000 Message-Id: Date: Mon, 14 May 2012 16:28:36 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] Added signature for changeset da64f68730cf X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Keir Fraser # Date 1336394648 -3600 # Node ID 513ca342fd865aa79c4e92f7f5a381c63f8ba4b0 # Parent d9d582ecb32d2cf535a99bd24bf200a803a8c720 Added signature for changeset da64f68730cf --- diff -r d9d582ecb32d -r 513ca342fd86 .hgsigs --- a/.hgsigs Mon May 07 13:43:34 2012 +0100 +++ b/.hgsigs Mon May 07 13:44:08 2012 +0100 @@ -15,3 +15,4 @@ 1f21da33dea4acb2dbfb988bcd1b7898e019316c 3e6a3bf83935cc2460707b94ef2801bb6f19d581 0 iQEcBAABAgAGBQJOZzwsAAoJEIP+FMlX6CvZXBIIAJFb+nUaqTCQRT5cE1mn4n5lEdtBY7L/ar4/rzWAiavQYkaoP93HyOdo0sf2SdwcpTNCXw0TDUmZU3xMqBiwWwp2MX3AFM/0dnPv2CoIH/k3vXr26eBJo15w2dFu2dF8OZ/Tn0NTdXdPd+qa7ugqVqT0PYgyQ8+euQJfcdYAY6YCjGD4v5cX529oB2aqoFKBBsHMnW6uD3OYf3sdvj85wgVpip7nw+5OZWrYP2lK/RXzlo42B/l+fNPJjsM8uU928ETNevJGPK28EJDaNwrEktTJQJYNa6K1oal/kpNP6FM1pOOdel69NSGbMw4Obv0eZ/kZahBLONfCLw4kYVggmWg= 24041ed83728ac6c26d3c32d29d7d08eb8433149 0 iQEcBAABAgAGBQJOjxDqAAoJEIP+FMlX6CvZohIH/2krgh6rTz6hjsv6HOFWQkekqHjZyyQBgdl3tfgSN/vSd3rJPN6mvaYjh8ZltmBbcHcRCmriTr7KK9e6kOChU7hyTCBDmtGxNN5TgMoAf27pSMrFN1HvK0ohQzGXvqKLAepTXW2ew+Abno3OgKRwUMpQJVlq+ZUCuqKODYI9nRE10XV6ORAejgE5mDYNn3BbvcI07Cjmqgm7bJzi5Hv0wzscPuJxQjz4vrJ+5ne65TYOzFPNkIFKeRETP+Shd9Gkw2/w9sbzQ2hzTH/02sUrsxolXD2wexfxgVz07rTe7qgbqKruCBOPtbcnGMAbs3e5NB7V6H3HnkTRtHQ4BosUMnE= 3eca5bf65e6cca881d599c68f2305f865e0f9fd0 0 iQEcBAABAgAGBQJOoE3xAAoJEIP+FMlX6CvZ0P4IALamOXJi4s9OzfutsjD//V5QYU972Y+NxBo2j7VNKnRaFwZ57RbxLE8dzsAufvxx/886ScyvdehAfWkpqhU+brLfKNftG54Bm3DFd+mDCdcTvHOGkKw768YUPBNjOhQZ8voVSnalrQaOlbibluRTYGK1Y4lcWXwP8SSCCR7bpm8VLrSKQoatiaPtc/OxBO+9UOlHFUR2tWt5YY4a5NczaXJ2xGERMnOssE83GjxSD/07+y9aDLNjnQiYqQfSkF46Gv4s94hPv8KeHEiGDMoZF/YqHr+4YxDCt8y39TXiQfT67O3o9xx6VfynTIHRo9CZ0qGrEqz7o8GK1vWhlfq3T5M= +da64f68730cf1c42c06919578e70d8bc01041051 0 iQEcBAABAgAGBQJPp8OUAAoJEIP+FMlX6CvZRkEIAKp5iVEADZyijVw0Jwj1vUWKqHJYVONzNjzRcnavWAEzsuwbAxQ6QfMJIai2ThjF79M2w7fPXY03S/vCV4/bXVE9R9s2/IUmS9B6pK+DAhw3ExuNUfsxq9UZd3Iul6hWifjjouYnBmgUtpF7O5z4pfQ+r1+z58FpIYPrv39NARt5YW7tcPeUJh4gOJ0ugORc5CclZqLLiljjIbVY6DN+jJDzjqCAwbWLGbkVw4kEGAeWI6aP3/5ZDpnk9Yytp9GpZ8d3BpmlHaR/kY6xepmZUqBPFGKUGY437+1jKWGgUYPLt2RC0S88W4iLRW6b9HXd7u3bhrn36ERz8XZ10KqjH7A= _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:28:43 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:28:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8Y-00027j-6j; Mon, 14 May 2012 16:28:42 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8W-00026L-C3 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:40 +0000 Received: from [85.158.138.51:55674] by server-11.bemta-3.messagelabs.com id 1A/61-18894-7B231BF4; Mon, 14 May 2012 16:28:39 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-174.messagelabs.com!1337012917!27130388!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21408 invoked from network); 14 May 2012 16:28:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:28:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8T-0002gU-Al for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STy8T-00062T-A8 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:37 +0000 Message-Id: Date: Mon, 14 May 2012 16:28:36 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] Added signature for changeset da64f68730cf X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Keir Fraser # Date 1336394648 -3600 # Node ID 513ca342fd865aa79c4e92f7f5a381c63f8ba4b0 # Parent d9d582ecb32d2cf535a99bd24bf200a803a8c720 Added signature for changeset da64f68730cf --- diff -r d9d582ecb32d -r 513ca342fd86 .hgsigs --- a/.hgsigs Mon May 07 13:43:34 2012 +0100 +++ b/.hgsigs Mon May 07 13:44:08 2012 +0100 @@ -15,3 +15,4 @@ 1f21da33dea4acb2dbfb988bcd1b7898e019316c 3e6a3bf83935cc2460707b94ef2801bb6f19d581 0 iQEcBAABAgAGBQJOZzwsAAoJEIP+FMlX6CvZXBIIAJFb+nUaqTCQRT5cE1mn4n5lEdtBY7L/ar4/rzWAiavQYkaoP93HyOdo0sf2SdwcpTNCXw0TDUmZU3xMqBiwWwp2MX3AFM/0dnPv2CoIH/k3vXr26eBJo15w2dFu2dF8OZ/Tn0NTdXdPd+qa7ugqVqT0PYgyQ8+euQJfcdYAY6YCjGD4v5cX529oB2aqoFKBBsHMnW6uD3OYf3sdvj85wgVpip7nw+5OZWrYP2lK/RXzlo42B/l+fNPJjsM8uU928ETNevJGPK28EJDaNwrEktTJQJYNa6K1oal/kpNP6FM1pOOdel69NSGbMw4Obv0eZ/kZahBLONfCLw4kYVggmWg= 24041ed83728ac6c26d3c32d29d7d08eb8433149 0 iQEcBAABAgAGBQJOjxDqAAoJEIP+FMlX6CvZohIH/2krgh6rTz6hjsv6HOFWQkekqHjZyyQBgdl3tfgSN/vSd3rJPN6mvaYjh8ZltmBbcHcRCmriTr7KK9e6kOChU7hyTCBDmtGxNN5TgMoAf27pSMrFN1HvK0ohQzGXvqKLAepTXW2ew+Abno3OgKRwUMpQJVlq+ZUCuqKODYI9nRE10XV6ORAejgE5mDYNn3BbvcI07Cjmqgm7bJzi5Hv0wzscPuJxQjz4vrJ+5ne65TYOzFPNkIFKeRETP+Shd9Gkw2/w9sbzQ2hzTH/02sUrsxolXD2wexfxgVz07rTe7qgbqKruCBOPtbcnGMAbs3e5NB7V6H3HnkTRtHQ4BosUMnE= 3eca5bf65e6cca881d599c68f2305f865e0f9fd0 0 iQEcBAABAgAGBQJOoE3xAAoJEIP+FMlX6CvZ0P4IALamOXJi4s9OzfutsjD//V5QYU972Y+NxBo2j7VNKnRaFwZ57RbxLE8dzsAufvxx/886ScyvdehAfWkpqhU+brLfKNftG54Bm3DFd+mDCdcTvHOGkKw768YUPBNjOhQZ8voVSnalrQaOlbibluRTYGK1Y4lcWXwP8SSCCR7bpm8VLrSKQoatiaPtc/OxBO+9UOlHFUR2tWt5YY4a5NczaXJ2xGERMnOssE83GjxSD/07+y9aDLNjnQiYqQfSkF46Gv4s94hPv8KeHEiGDMoZF/YqHr+4YxDCt8y39TXiQfT67O3o9xx6VfynTIHRo9CZ0qGrEqz7o8GK1vWhlfq3T5M= +da64f68730cf1c42c06919578e70d8bc01041051 0 iQEcBAABAgAGBQJPp8OUAAoJEIP+FMlX6CvZRkEIAKp5iVEADZyijVw0Jwj1vUWKqHJYVONzNjzRcnavWAEzsuwbAxQ6QfMJIai2ThjF79M2w7fPXY03S/vCV4/bXVE9R9s2/IUmS9B6pK+DAhw3ExuNUfsxq9UZd3Iul6hWifjjouYnBmgUtpF7O5z4pfQ+r1+z58FpIYPrv39NARt5YW7tcPeUJh4gOJ0ugORc5CclZqLLiljjIbVY6DN+jJDzjqCAwbWLGbkVw4kEGAeWI6aP3/5ZDpnk9Yytp9GpZ8d3BpmlHaR/kY6xepmZUqBPFGKUGY437+1jKWGgUYPLt2RC0S88W4iLRW6b9HXd7u3bhrn36ERz8XZ10KqjH7A= _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:28:43 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:28:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8X-000277-31; Mon, 14 May 2012 16:28:41 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8W-00026F-3m for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:40 +0000 Received: from [85.158.139.83:63629] by server-7.bemta-5.messagelabs.com id F0/F0-16195-7B231BF4; Mon, 14 May 2012 16:28:39 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-182.messagelabs.com!1337012916!28652845!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25069 invoked from network); 14 May 2012 16:28:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:28:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8S-0002gO-Gf for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STy8S-00061z-BS for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:36 +0000 Message-Id: Date: Mon, 14 May 2012 16:28:35 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] Update Xen version to 4.1.3-rc1 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Keir Fraser # Date 1336394595 -3600 # Node ID da64f68730cf1c42c06919578e70d8bc01041051 # Parent a21938b58fc4323ca408dbcfe081770bc178f6ed Update Xen version to 4.1.3-rc1 --- diff -r a21938b58fc4 -r da64f68730cf Config.mk --- a/Config.mk Tue May 01 14:15:20 2012 +0100 +++ b/Config.mk Mon May 07 13:43:15 2012 +0100 @@ -179,7 +179,7 @@ endif # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= a2d2123a7dfc4d116011d51f48df786a3b853537 +QEMU_TAG ?= xen-4.1.3-rc1 # Mon Apr 2 17:55:05 2012 +0100 # qemu-xen-traditional: QDISK fixes diff -r a21938b58fc4 -r da64f68730cf xen/Makefile --- a/xen/Makefile Tue May 01 14:15:20 2012 +0100 +++ b/xen/Makefile Mon May 07 13:43:15 2012 +0100 @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 1 -export XEN_EXTRAVERSION ?= .3-rc1-pre$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .3-rc1$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:28:43 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:28:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8X-000277-31; Mon, 14 May 2012 16:28:41 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8W-00026F-3m for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:40 +0000 Received: from [85.158.139.83:63629] by server-7.bemta-5.messagelabs.com id F0/F0-16195-7B231BF4; Mon, 14 May 2012 16:28:39 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-182.messagelabs.com!1337012916!28652845!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25069 invoked from network); 14 May 2012 16:28:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:28:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8S-0002gO-Gf for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STy8S-00061z-BS for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:36 +0000 Message-Id: Date: Mon, 14 May 2012 16:28:35 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] Update Xen version to 4.1.3-rc1 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Keir Fraser # Date 1336394595 -3600 # Node ID da64f68730cf1c42c06919578e70d8bc01041051 # Parent a21938b58fc4323ca408dbcfe081770bc178f6ed Update Xen version to 4.1.3-rc1 --- diff -r a21938b58fc4 -r da64f68730cf Config.mk --- a/Config.mk Tue May 01 14:15:20 2012 +0100 +++ b/Config.mk Mon May 07 13:43:15 2012 +0100 @@ -179,7 +179,7 @@ endif # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= a2d2123a7dfc4d116011d51f48df786a3b853537 +QEMU_TAG ?= xen-4.1.3-rc1 # Mon Apr 2 17:55:05 2012 +0100 # qemu-xen-traditional: QDISK fixes diff -r a21938b58fc4 -r da64f68730cf xen/Makefile --- a/xen/Makefile Tue May 01 14:15:20 2012 +0100 +++ b/xen/Makefile Mon May 07 13:43:15 2012 +0100 @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 1 -export XEN_EXTRAVERSION ?= .3-rc1-pre$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .3-rc1$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:28:49 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:28:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8e-0002Bh-C4; Mon, 14 May 2012 16:28:48 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8c-0002AP-Jx for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:46 +0000 Received: from [85.158.138.51:65426] by server-2.bemta-3.messagelabs.com id D9/31-09269-DB231BF4; Mon, 14 May 2012 16:28:45 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-174.messagelabs.com!1337012923!18964481!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29428 invoked from network); 14 May 2012 16:28:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:28:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8Z-0002ga-NI for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:43 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STy8Z-00063j-Md for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:43 +0000 Message-Id: Date: Mon, 14 May 2012 16:28:43 +0000 From: Xen patchbot-4.0-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.0-testing] svm: Fake out the Bus Unit Config MSR on revF AMD CPUs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User George Dunlap # Date 1335878326 -3600 # Node ID d8fd425b60d3105d08a82d572bc41d4c36190dae # Parent b1a00a222eb948feeb81ccc2ebd822787316fb47 svm: Fake out the Bus Unit Config MSR on revF AMD CPUs Win2k8 x64 reads this MSR on revF chips, where it wasn't publically available; it uses a magic constant in %rdi as a password, which we don't have in rdmsr_safe(). Since we'll ignore the later writes, just use a plausible value here (the reset value from rev10h chips) if the real CPU didn't provide one. Signed-off-by: George Dunlap Committed-by: Keir Fraser xen-unstable changeset: 24990:322300fd2ebd xen-unstable date: Thu Mar 08 09:17:21 2012 +0000 svm: amend c/s 24990:322300fd2ebd (fake BU_CFG MSR on AMD revF) Let's restrict such a hack to the known affected family. Signed-off-by: Jan Beulich Acked-by: Keir Fraser Acked-by: George Dunlap xen-unstable changeset: 25058:f47d91cb0faa xen-unstable date: Thu Mar 15 15:09:18 2012 +0100 --- diff -r b1a00a222eb9 -r d8fd425b60d3 xen/arch/x86/hvm/svm/svm.c --- a/xen/arch/x86/hvm/svm/svm.c Tue May 01 14:16:31 2012 +0100 +++ b/xen/arch/x86/hvm/svm/svm.c Tue May 01 14:18:46 2012 +0100 @@ -1070,6 +1070,18 @@ static int svm_msr_read_intercept(struct break; } + if ( boot_cpu_data.x86 == 0xf && ecx == MSR_F10_BU_CFG ) + { + /* Win2k8 x64 reads this MSR on revF chips, where it + * wasn't publically available; it uses a magic constant + * in %rdi as a password, which we don't have in + * rdmsr_safe(). Since we'll ignore the later writes, + * just use a plausible value here (the reset value from + * rev10h chips) if the real CPU didn't provide one. */ + msr_content = 0x0000000010200020ull; + break; + } + goto gpf; } diff -r b1a00a222eb9 -r d8fd425b60d3 xen/include/asm-x86/msr-index.h --- a/xen/include/asm-x86/msr-index.h Tue May 01 14:16:31 2012 +0100 +++ b/xen/include/asm-x86/msr-index.h Tue May 01 14:18:46 2012 +0100 @@ -242,6 +242,9 @@ #define MSR_F10_MC4_MISC2 0xc0000409 #define MSR_F10_MC4_MISC3 0xc000040A +/* AMD Family10h MMU control MSRs */ +#define MSR_F10_BU_CFG 0xc0011023 + /* Other AMD Fam10h MSRs */ #define MSR_FAM10H_MMIO_CONF_BASE 0xc0010058 #define FAM10H_MMIO_CONF_ENABLE (1<<0) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:28:49 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:28:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8e-0002Bh-C4; Mon, 14 May 2012 16:28:48 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8c-0002AP-Jx for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:46 +0000 Received: from [85.158.138.51:65426] by server-2.bemta-3.messagelabs.com id D9/31-09269-DB231BF4; Mon, 14 May 2012 16:28:45 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-174.messagelabs.com!1337012923!18964481!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29428 invoked from network); 14 May 2012 16:28:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:28:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8Z-0002ga-NI for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:43 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STy8Z-00063j-Md for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:43 +0000 Message-Id: Date: Mon, 14 May 2012 16:28:43 +0000 From: Xen patchbot-4.0-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.0-testing] svm: Fake out the Bus Unit Config MSR on revF AMD CPUs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User George Dunlap # Date 1335878326 -3600 # Node ID d8fd425b60d3105d08a82d572bc41d4c36190dae # Parent b1a00a222eb948feeb81ccc2ebd822787316fb47 svm: Fake out the Bus Unit Config MSR on revF AMD CPUs Win2k8 x64 reads this MSR on revF chips, where it wasn't publically available; it uses a magic constant in %rdi as a password, which we don't have in rdmsr_safe(). Since we'll ignore the later writes, just use a plausible value here (the reset value from rev10h chips) if the real CPU didn't provide one. Signed-off-by: George Dunlap Committed-by: Keir Fraser xen-unstable changeset: 24990:322300fd2ebd xen-unstable date: Thu Mar 08 09:17:21 2012 +0000 svm: amend c/s 24990:322300fd2ebd (fake BU_CFG MSR on AMD revF) Let's restrict such a hack to the known affected family. Signed-off-by: Jan Beulich Acked-by: Keir Fraser Acked-by: George Dunlap xen-unstable changeset: 25058:f47d91cb0faa xen-unstable date: Thu Mar 15 15:09:18 2012 +0100 --- diff -r b1a00a222eb9 -r d8fd425b60d3 xen/arch/x86/hvm/svm/svm.c --- a/xen/arch/x86/hvm/svm/svm.c Tue May 01 14:16:31 2012 +0100 +++ b/xen/arch/x86/hvm/svm/svm.c Tue May 01 14:18:46 2012 +0100 @@ -1070,6 +1070,18 @@ static int svm_msr_read_intercept(struct break; } + if ( boot_cpu_data.x86 == 0xf && ecx == MSR_F10_BU_CFG ) + { + /* Win2k8 x64 reads this MSR on revF chips, where it + * wasn't publically available; it uses a magic constant + * in %rdi as a password, which we don't have in + * rdmsr_safe(). Since we'll ignore the later writes, + * just use a plausible value here (the reset value from + * rev10h chips) if the real CPU didn't provide one. */ + msr_content = 0x0000000010200020ull; + break; + } + goto gpf; } diff -r b1a00a222eb9 -r d8fd425b60d3 xen/include/asm-x86/msr-index.h --- a/xen/include/asm-x86/msr-index.h Tue May 01 14:16:31 2012 +0100 +++ b/xen/include/asm-x86/msr-index.h Tue May 01 14:18:46 2012 +0100 @@ -242,6 +242,9 @@ #define MSR_F10_MC4_MISC2 0xc0000409 #define MSR_F10_MC4_MISC3 0xc000040A +/* AMD Family10h MMU control MSRs */ +#define MSR_F10_BU_CFG 0xc0011023 + /* Other AMD Fam10h MSRs */ #define MSR_FAM10H_MMIO_CONF_BASE 0xc0010058 #define FAM10H_MMIO_CONF_ENABLE (1<<0) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:28:50 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:28:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8e-0002Bc-9Z; Mon, 14 May 2012 16:28:48 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8c-0002AT-Mv for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:46 +0000 Received: from [193.109.254.147:16474] by server-5.bemta-14.messagelabs.com id 5B/3E-30733-EB231BF4; Mon, 14 May 2012 16:28:46 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-27.messagelabs.com!1337012923!4049167!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8531 invoked from network); 14 May 2012 16:28:44 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:28:44 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8Z-0002gX-94 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:43 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STy8Z-00063U-54 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:43 +0000 Message-Id: Date: Mon, 14 May 2012 16:28:42 +0000 From: Xen patchbot-4.0-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.0-testing] x86-64: Fix memory hotplug epfn upper limit test for updating the X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Malcolm Crossley # Date 1335878191 -3600 # Node ID b1a00a222eb948feeb81ccc2ebd822787316fb47 # Parent 4e446ac2c6de1df2586046b7d103b8867e8f591f x86-64: Fix memory hotplug epfn upper limit test for updating the compat M2P table The epfn is being compared to (RDWR_COMPAT_MPT_VIRT_END - RDWR_COMPAT_MPT_VIRT_START) without a 2 bit shift, resulting in the epfn being compared to the size of the RDWR_COMPAT_MPT table in bytes instead of the maximum page frame number that the RDWR_COMPAT_MPT table can map. Signed-off-by: Malcolm Crossley Committed-by: Jan Beulich xen-unstable changeset: 25242:b7ce6a88bebb xen-unstable date: Wed Apr 25 12:35:56 2012 +0200 --- diff -r 4e446ac2c6de -r b1a00a222eb9 xen/arch/x86/x86_64/mm.c --- a/xen/arch/x86/x86_64/mm.c Tue Apr 17 08:37:47 2012 +0100 +++ b/xen/arch/x86/x86_64/mm.c Tue May 01 14:16:31 2012 +0100 @@ -446,7 +446,7 @@ static int setup_compat_m2p_table(struct if ((smap > ((RDWR_COMPAT_MPT_VIRT_END - RDWR_COMPAT_MPT_VIRT_START) >> 2)) ) return 0; - if (epfn > (RDWR_COMPAT_MPT_VIRT_END - RDWR_COMPAT_MPT_VIRT_START)) + if ( epfn > ((RDWR_COMPAT_MPT_VIRT_END - RDWR_COMPAT_MPT_VIRT_START) >> 2) ) epfn = (RDWR_COMPAT_MPT_VIRT_END - RDWR_COMPAT_MPT_VIRT_START) >> 2; emap = ( (epfn + ((1UL << (L2_PAGETABLE_SHIFT - 2)) - 1 )) & _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:28:50 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:28:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8e-0002Bc-9Z; Mon, 14 May 2012 16:28:48 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8c-0002AT-Mv for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:46 +0000 Received: from [193.109.254.147:16474] by server-5.bemta-14.messagelabs.com id 5B/3E-30733-EB231BF4; Mon, 14 May 2012 16:28:46 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-27.messagelabs.com!1337012923!4049167!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8531 invoked from network); 14 May 2012 16:28:44 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:28:44 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8Z-0002gX-94 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:43 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STy8Z-00063U-54 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:43 +0000 Message-Id: Date: Mon, 14 May 2012 16:28:42 +0000 From: Xen patchbot-4.0-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.0-testing] x86-64: Fix memory hotplug epfn upper limit test for updating the X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Malcolm Crossley # Date 1335878191 -3600 # Node ID b1a00a222eb948feeb81ccc2ebd822787316fb47 # Parent 4e446ac2c6de1df2586046b7d103b8867e8f591f x86-64: Fix memory hotplug epfn upper limit test for updating the compat M2P table The epfn is being compared to (RDWR_COMPAT_MPT_VIRT_END - RDWR_COMPAT_MPT_VIRT_START) without a 2 bit shift, resulting in the epfn being compared to the size of the RDWR_COMPAT_MPT table in bytes instead of the maximum page frame number that the RDWR_COMPAT_MPT table can map. Signed-off-by: Malcolm Crossley Committed-by: Jan Beulich xen-unstable changeset: 25242:b7ce6a88bebb xen-unstable date: Wed Apr 25 12:35:56 2012 +0200 --- diff -r 4e446ac2c6de -r b1a00a222eb9 xen/arch/x86/x86_64/mm.c --- a/xen/arch/x86/x86_64/mm.c Tue Apr 17 08:37:47 2012 +0100 +++ b/xen/arch/x86/x86_64/mm.c Tue May 01 14:16:31 2012 +0100 @@ -446,7 +446,7 @@ static int setup_compat_m2p_table(struct if ((smap > ((RDWR_COMPAT_MPT_VIRT_END - RDWR_COMPAT_MPT_VIRT_START) >> 2)) ) return 0; - if (epfn > (RDWR_COMPAT_MPT_VIRT_END - RDWR_COMPAT_MPT_VIRT_START)) + if ( epfn > ((RDWR_COMPAT_MPT_VIRT_END - RDWR_COMPAT_MPT_VIRT_START) >> 2) ) epfn = (RDWR_COMPAT_MPT_VIRT_END - RDWR_COMPAT_MPT_VIRT_START) >> 2; emap = ( (epfn + ((1UL << (L2_PAGETABLE_SHIFT - 2)) - 1 )) & _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:28:51 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:28:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8f-0002Cl-JC; Mon, 14 May 2012 16:28:49 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8e-0002BD-3q for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:48 +0000 Received: from [85.158.143.99:32920] by server-3.bemta-4.messagelabs.com id 3B/66-05853-FB231BF4; Mon, 14 May 2012 16:28:47 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-216.messagelabs.com!1337012924!27930766!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28221 invoked from network); 14 May 2012 16:28:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:28:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8a-0002gd-6D for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STy8a-00063y-5T for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:44 +0000 Message-Id: Date: Mon, 14 May 2012 16:28:43 +0000 From: Xen patchbot-4.0-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.0-testing] Update Xen version to 4.0.4-rc1 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Keir Fraser # Date 1336394731 -3600 # Node ID 94fddf2a19482c88a60c07a1a085374586d207e8 # Parent d8fd425b60d3105d08a82d572bc41d4c36190dae Update Xen version to 4.0.4-rc1 --- diff -r d8fd425b60d3 -r 94fddf2a1948 Config.mk --- a/Config.mk Tue May 01 14:18:46 2012 +0100 +++ b/Config.mk Mon May 07 13:45:31 2012 +0100 @@ -178,7 +178,7 @@ endif # CONFIG_QEMU ?= ../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG := 36984c285a765541b04f378bfa84d2c850c167d3 +QEMU_TAG := xen-4.0.4-rc1 # Thu Feb 2 13:47:06 2012 +0000 # e1000: bounds packet size against buffer size diff -r d8fd425b60d3 -r 94fddf2a1948 xen/Makefile --- a/xen/Makefile Tue May 01 14:18:46 2012 +0100 +++ b/xen/Makefile Mon May 07 13:45:31 2012 +0100 @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 0 -export XEN_EXTRAVERSION ?= .4-rc1-pre$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .4-rc1$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:28:51 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:28:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8f-0002Cl-JC; Mon, 14 May 2012 16:28:49 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8e-0002BD-3q for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:48 +0000 Received: from [85.158.143.99:32920] by server-3.bemta-4.messagelabs.com id 3B/66-05853-FB231BF4; Mon, 14 May 2012 16:28:47 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-216.messagelabs.com!1337012924!27930766!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28221 invoked from network); 14 May 2012 16:28:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:28:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8a-0002gd-6D for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STy8a-00063y-5T for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:44 +0000 Message-Id: Date: Mon, 14 May 2012 16:28:43 +0000 From: Xen patchbot-4.0-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.0-testing] Update Xen version to 4.0.4-rc1 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Keir Fraser # Date 1336394731 -3600 # Node ID 94fddf2a19482c88a60c07a1a085374586d207e8 # Parent d8fd425b60d3105d08a82d572bc41d4c36190dae Update Xen version to 4.0.4-rc1 --- diff -r d8fd425b60d3 -r 94fddf2a1948 Config.mk --- a/Config.mk Tue May 01 14:18:46 2012 +0100 +++ b/Config.mk Mon May 07 13:45:31 2012 +0100 @@ -178,7 +178,7 @@ endif # CONFIG_QEMU ?= ../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG := 36984c285a765541b04f378bfa84d2c850c167d3 +QEMU_TAG := xen-4.0.4-rc1 # Thu Feb 2 13:47:06 2012 +0000 # e1000: bounds packet size against buffer size diff -r d8fd425b60d3 -r 94fddf2a1948 xen/Makefile --- a/xen/Makefile Tue May 01 14:18:46 2012 +0100 +++ b/xen/Makefile Mon May 07 13:45:31 2012 +0100 @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 0 -export XEN_EXTRAVERSION ?= .4-rc1-pre$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .4-rc1$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:28:51 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:28:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8g-0002Dr-MA; Mon, 14 May 2012 16:28:50 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8f-0002BD-Nh for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:49 +0000 Received: from [85.158.143.35:48549] by server-3.bemta-4.messagelabs.com id E4/76-05853-1C231BF4; Mon, 14 May 2012 16:28:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1337012927!4225248!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8642 invoked from network); 14 May 2012 16:28:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:28:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8c-0002gu-Ki for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STy8c-00065K-Cq for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:46 +0000 Date: Mon, 14 May 2012 16:28:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-unstable] passthrough: Intel GPU passthrough, fix OpRegion mapping X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b7469189669c4de0a5161a869f443738d84539ec Author: Jean Guyader Date: Fri May 11 12:40:42 2012 +0100 passthrough: Intel GPU passthrough, fix OpRegion mapping The OpRegion shouldn't be mapped 1:1 because the address in the host can't be used in the guest directly. This patch traps read and write access to the opregion of the Intel GPU config space (offset 0xfc). To work correctly this patch needs a change in hvmloader. HVMloader will allocate 2 pages for the OpRegion and write this address on the config space of the Intel GPU. Qemu will trap and map the host OpRegion to the guest. Any write to this offset after that won't have any effect. Any read of this config space offset will return the address in the guest. Signed-off-by: Jean Guyader Acked-by: Stefano Stabellini --- hw/pass-through.c | 49 ++++++++++++++++++++++++++++++++++- hw/pass-through.h | 2 + hw/pt-graphics.c | 73 +++++++++++++++++++++++++++++++++++++++-------------- 3 files changed, 104 insertions(+), 20 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index f832c5a..8581253 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -238,6 +238,14 @@ static int pt_bar_reg_restore(struct pt_dev *ptdev, static int pt_exp_rom_bar_reg_restore(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, uint32_t real_offset, uint32_t dev_value, uint32_t *value); +static int pt_intel_opregion_read(struct pt_dev *ptdev, + struct pt_reg_tbl *cfg_entry, + uint32_t *value, uint32_t valid_mask); +static int pt_intel_opregion_write(struct pt_dev *ptdev, + struct pt_reg_tbl *cfg_entry, + uint32_t *value, uint32_t dev_value, uint32_t valid_mask); +static uint8_t pt_reg_grp_header0_size_init(struct pt_dev *ptdev, + struct pt_reg_grp_info_tbl *grp_reg, uint32_t base_offset); /* pt_reg_info_tbl declaration * - only for emulated register (either a part or whole bit). @@ -444,6 +452,16 @@ static struct pt_reg_info_tbl pt_emu_reg_header0_tbl[] = { .u.dw.write = pt_exp_rom_bar_reg_write, .u.dw.restore = pt_exp_rom_bar_reg_restore, }, + /* Intel IGFX OpRegion reg */ + { + .offset = PCI_INTEL_OPREGION, + .size = 4, + .init_val = 0, + .no_wb = 1, + .u.dw.read = pt_intel_opregion_read, + .u.dw.write = pt_intel_opregion_write, + .u.dw.restore = NULL, + }, { .size = 0, }, @@ -737,7 +755,7 @@ static const struct pt_reg_grp_info_tbl pt_emu_reg_grp_tbl[] = { .grp_id = 0xFF, .grp_type = GRP_TYPE_EMU, .grp_size = 0x40, - .size_init = pt_reg_grp_size_init, + .size_init = pt_reg_grp_header0_size_init, .emu_reg_tbl= pt_emu_reg_header0_tbl, }, /* PCI PowerManagement Capability reg group */ @@ -3004,6 +3022,19 @@ static uint32_t pt_msixctrl_reg_init(struct pt_dev *ptdev, return reg->init_val; } +static uint8_t pt_reg_grp_header0_size_init(struct pt_dev *ptdev, + struct pt_reg_grp_info_tbl *grp_reg, uint32_t base_offset) +{ + /* + ** By default we will trap up to 0x40 in the cfg space. + ** If an intel device is pass through we need to trap 0xfc, + ** therefore the size should be 0xff. + */ + if (igd_passthru) + return 0xFF; + return grp_reg->grp_size; +} + /* get register group size */ static uint8_t pt_reg_grp_size_init(struct pt_dev *ptdev, struct pt_reg_grp_info_tbl *grp_reg, uint32_t base_offset) @@ -4152,6 +4183,22 @@ static int pt_pmcsr_reg_restore(struct pt_dev *ptdev, return 0; } +static int pt_intel_opregion_read(struct pt_dev *ptdev, + struct pt_reg_tbl *cfg_entry, + uint32_t *value, uint32_t valid_mask) +{ + *value = igd_read_opregion(ptdev); + return 0; +} + +static int pt_intel_opregion_write(struct pt_dev *ptdev, + struct pt_reg_tbl *cfg_entry, + uint32_t *value, uint32_t dev_value, uint32_t valid_mask) +{ + igd_write_opregion(ptdev, *value); + return 0; +} + static struct pt_dev * register_real_device(PCIBus *e_bus, const char *e_dev_name, int e_devfn, uint8_t r_bus, uint8_t r_dev, uint8_t r_func, uint32_t machine_irq, struct pci_access *pci_access, diff --git a/hw/pass-through.h b/hw/pass-through.h index e641b56..d7d837c 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -424,6 +424,8 @@ PCIBus *intel_pci_bridge_init(PCIBus *bus, int devfn, uint16_t vid, uint16_t did, const char *name, uint16_t revision); void igd_pci_write(PCIDevice *pci_dev, uint32_t config_addr, uint32_t val, int len); uint32_t igd_pci_read(PCIDevice *pci_dev, uint32_t config_addr, int len); +uint32_t igd_read_opregion(struct pt_dev *pci_dev); +void igd_write_opregion(struct pt_dev *real_dev, uint32_t val); #endif /* __PASSTHROUGH_H__ */ diff --git a/hw/pt-graphics.c b/hw/pt-graphics.c index 9c41f3e..c6f8869 100644 --- a/hw/pt-graphics.c +++ b/hw/pt-graphics.c @@ -13,6 +13,8 @@ extern int gfx_passthru; extern int igd_passthru; +static uint32_t igd_guest_opregion = 0; + static int pch_map_irq(PCIDevice *pci_dev, int irq_num) { PT_LOG("pch_map_irq called\n"); @@ -43,6 +45,54 @@ void intel_pch_init(PCIBus *bus) pch_map_irq, "intel_bridge_1f"); } +uint32_t igd_read_opregion(struct pt_dev *pci_dev) +{ + uint32_t val = -1; + + if ( igd_guest_opregion == 0 ) + return -1; + + val = igd_guest_opregion; +#ifdef PT_DEBUG_PCI_CONFIG_ACCESS + PT_LOG_DEV((PCIDevice*)pci_dev, "addr=%x len=%x val=%x\n", + PCI_INTEL_OPREGION, 4, val); +#endif + return val; +} + +void igd_write_opregion(struct pt_dev *real_dev, uint32_t val) +{ + uint32_t host_opregion = 0; + int ret; + + if ( igd_guest_opregion ) + { + PT_LOG("opregion register already been set, ignoring %x\n", val); + return; + } + + host_opregion = pt_pci_host_read(real_dev->pci_dev, PCI_INTEL_OPREGION, 4); + igd_guest_opregion = (val & ~0xfff) | (host_opregion & 0xfff); + PT_LOG("Map OpRegion: %x -> %x\n", host_opregion, igd_guest_opregion); + + ret = xc_domain_memory_mapping(xc_handle, domid, + igd_guest_opregion >> XC_PAGE_SHIFT, + host_opregion >> XC_PAGE_SHIFT, + 2, + DPCI_ADD_MAPPING); + + if ( ret != 0 ) + { + PT_LOG("Error: Can't map opregion\n"); + igd_guest_opregion = 0; + } +#ifdef PT_DEBUG_PCI_CONFIG_ACCESS + PT_LOG_DEV((PCIDevice*)real_dev, "addr=%x len=%lx val=%x\n", + PCI_INTEL_OPREGION, len, val); +#endif + +} + void igd_pci_write(PCIDevice *pci_dev, uint32_t config_addr, uint32_t val, int len) { struct pci_dev *pci_dev_host_bridge; @@ -129,7 +179,6 @@ read_default: int register_vga_regions(struct pt_dev *real_device) { u16 vendor_id; - int igd_opregion; int ret = 0; if ( !gfx_passthru || real_device->pci_dev->device_class != 0x0300 ) @@ -147,19 +196,6 @@ int register_vga_regions(struct pt_dev *real_device) 0x20, DPCI_ADD_MAPPING); - /* 1:1 map ASL Storage register value */ - vendor_id = pt_pci_host_read(real_device->pci_dev, 0, 2); - igd_opregion = pt_pci_host_read(real_device->pci_dev, PCI_INTEL_OPREGION, 4); - if ( (vendor_id == PCI_VENDOR_ID_INTEL ) && igd_opregion ) - { - ret |= xc_domain_memory_mapping(xc_handle, domid, - igd_opregion >> XC_PAGE_SHIFT, - igd_opregion >> XC_PAGE_SHIFT, - 2, - DPCI_ADD_MAPPING); - PT_LOG("register_vga: igd_opregion = %x\n", igd_opregion); - } - if ( ret != 0 ) PT_LOG("VGA region mapping failed\n"); @@ -171,7 +207,7 @@ int register_vga_regions(struct pt_dev *real_device) */ int unregister_vga_regions(struct pt_dev *real_device) { - u32 vendor_id, igd_opregion; + u32 vendor_id; int ret = 0; if ( !gfx_passthru || real_device->pci_dev->device_class != 0x0300 ) @@ -190,12 +226,11 @@ int unregister_vga_regions(struct pt_dev *real_device) DPCI_REMOVE_MAPPING); vendor_id = pt_pci_host_read(real_device->pci_dev, PCI_VENDOR_ID, 2); - igd_opregion = pt_pci_host_read(real_device->pci_dev, PCI_INTEL_OPREGION, 4); - if ( (vendor_id == PCI_VENDOR_ID_INTEL) && igd_opregion ) + if ( (vendor_id == PCI_VENDOR_ID_INTEL) && igd_guest_opregion ) { ret |= xc_domain_memory_mapping(xc_handle, domid, - igd_opregion >> XC_PAGE_SHIFT, - igd_opregion >> XC_PAGE_SHIFT, + igd_guest_opregion >> XC_PAGE_SHIFT, + igd_guest_opregion >> XC_PAGE_SHIFT, 2, DPCI_REMOVE_MAPPING); } -- generated by git-patchbot for /home/xen/git/qemu-xen-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:28:51 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:28:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8g-0002Dr-MA; Mon, 14 May 2012 16:28:50 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8f-0002BD-Nh for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:49 +0000 Received: from [85.158.143.35:48549] by server-3.bemta-4.messagelabs.com id E4/76-05853-1C231BF4; Mon, 14 May 2012 16:28:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1337012927!4225248!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8642 invoked from network); 14 May 2012 16:28:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:28:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8c-0002gu-Ki for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STy8c-00065K-Cq for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:46 +0000 Date: Mon, 14 May 2012 16:28:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-unstable] passthrough: Intel GPU passthrough, fix OpRegion mapping X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b7469189669c4de0a5161a869f443738d84539ec Author: Jean Guyader Date: Fri May 11 12:40:42 2012 +0100 passthrough: Intel GPU passthrough, fix OpRegion mapping The OpRegion shouldn't be mapped 1:1 because the address in the host can't be used in the guest directly. This patch traps read and write access to the opregion of the Intel GPU config space (offset 0xfc). To work correctly this patch needs a change in hvmloader. HVMloader will allocate 2 pages for the OpRegion and write this address on the config space of the Intel GPU. Qemu will trap and map the host OpRegion to the guest. Any write to this offset after that won't have any effect. Any read of this config space offset will return the address in the guest. Signed-off-by: Jean Guyader Acked-by: Stefano Stabellini --- hw/pass-through.c | 49 ++++++++++++++++++++++++++++++++++- hw/pass-through.h | 2 + hw/pt-graphics.c | 73 +++++++++++++++++++++++++++++++++++++++-------------- 3 files changed, 104 insertions(+), 20 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index f832c5a..8581253 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -238,6 +238,14 @@ static int pt_bar_reg_restore(struct pt_dev *ptdev, static int pt_exp_rom_bar_reg_restore(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, uint32_t real_offset, uint32_t dev_value, uint32_t *value); +static int pt_intel_opregion_read(struct pt_dev *ptdev, + struct pt_reg_tbl *cfg_entry, + uint32_t *value, uint32_t valid_mask); +static int pt_intel_opregion_write(struct pt_dev *ptdev, + struct pt_reg_tbl *cfg_entry, + uint32_t *value, uint32_t dev_value, uint32_t valid_mask); +static uint8_t pt_reg_grp_header0_size_init(struct pt_dev *ptdev, + struct pt_reg_grp_info_tbl *grp_reg, uint32_t base_offset); /* pt_reg_info_tbl declaration * - only for emulated register (either a part or whole bit). @@ -444,6 +452,16 @@ static struct pt_reg_info_tbl pt_emu_reg_header0_tbl[] = { .u.dw.write = pt_exp_rom_bar_reg_write, .u.dw.restore = pt_exp_rom_bar_reg_restore, }, + /* Intel IGFX OpRegion reg */ + { + .offset = PCI_INTEL_OPREGION, + .size = 4, + .init_val = 0, + .no_wb = 1, + .u.dw.read = pt_intel_opregion_read, + .u.dw.write = pt_intel_opregion_write, + .u.dw.restore = NULL, + }, { .size = 0, }, @@ -737,7 +755,7 @@ static const struct pt_reg_grp_info_tbl pt_emu_reg_grp_tbl[] = { .grp_id = 0xFF, .grp_type = GRP_TYPE_EMU, .grp_size = 0x40, - .size_init = pt_reg_grp_size_init, + .size_init = pt_reg_grp_header0_size_init, .emu_reg_tbl= pt_emu_reg_header0_tbl, }, /* PCI PowerManagement Capability reg group */ @@ -3004,6 +3022,19 @@ static uint32_t pt_msixctrl_reg_init(struct pt_dev *ptdev, return reg->init_val; } +static uint8_t pt_reg_grp_header0_size_init(struct pt_dev *ptdev, + struct pt_reg_grp_info_tbl *grp_reg, uint32_t base_offset) +{ + /* + ** By default we will trap up to 0x40 in the cfg space. + ** If an intel device is pass through we need to trap 0xfc, + ** therefore the size should be 0xff. + */ + if (igd_passthru) + return 0xFF; + return grp_reg->grp_size; +} + /* get register group size */ static uint8_t pt_reg_grp_size_init(struct pt_dev *ptdev, struct pt_reg_grp_info_tbl *grp_reg, uint32_t base_offset) @@ -4152,6 +4183,22 @@ static int pt_pmcsr_reg_restore(struct pt_dev *ptdev, return 0; } +static int pt_intel_opregion_read(struct pt_dev *ptdev, + struct pt_reg_tbl *cfg_entry, + uint32_t *value, uint32_t valid_mask) +{ + *value = igd_read_opregion(ptdev); + return 0; +} + +static int pt_intel_opregion_write(struct pt_dev *ptdev, + struct pt_reg_tbl *cfg_entry, + uint32_t *value, uint32_t dev_value, uint32_t valid_mask) +{ + igd_write_opregion(ptdev, *value); + return 0; +} + static struct pt_dev * register_real_device(PCIBus *e_bus, const char *e_dev_name, int e_devfn, uint8_t r_bus, uint8_t r_dev, uint8_t r_func, uint32_t machine_irq, struct pci_access *pci_access, diff --git a/hw/pass-through.h b/hw/pass-through.h index e641b56..d7d837c 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -424,6 +424,8 @@ PCIBus *intel_pci_bridge_init(PCIBus *bus, int devfn, uint16_t vid, uint16_t did, const char *name, uint16_t revision); void igd_pci_write(PCIDevice *pci_dev, uint32_t config_addr, uint32_t val, int len); uint32_t igd_pci_read(PCIDevice *pci_dev, uint32_t config_addr, int len); +uint32_t igd_read_opregion(struct pt_dev *pci_dev); +void igd_write_opregion(struct pt_dev *real_dev, uint32_t val); #endif /* __PASSTHROUGH_H__ */ diff --git a/hw/pt-graphics.c b/hw/pt-graphics.c index 9c41f3e..c6f8869 100644 --- a/hw/pt-graphics.c +++ b/hw/pt-graphics.c @@ -13,6 +13,8 @@ extern int gfx_passthru; extern int igd_passthru; +static uint32_t igd_guest_opregion = 0; + static int pch_map_irq(PCIDevice *pci_dev, int irq_num) { PT_LOG("pch_map_irq called\n"); @@ -43,6 +45,54 @@ void intel_pch_init(PCIBus *bus) pch_map_irq, "intel_bridge_1f"); } +uint32_t igd_read_opregion(struct pt_dev *pci_dev) +{ + uint32_t val = -1; + + if ( igd_guest_opregion == 0 ) + return -1; + + val = igd_guest_opregion; +#ifdef PT_DEBUG_PCI_CONFIG_ACCESS + PT_LOG_DEV((PCIDevice*)pci_dev, "addr=%x len=%x val=%x\n", + PCI_INTEL_OPREGION, 4, val); +#endif + return val; +} + +void igd_write_opregion(struct pt_dev *real_dev, uint32_t val) +{ + uint32_t host_opregion = 0; + int ret; + + if ( igd_guest_opregion ) + { + PT_LOG("opregion register already been set, ignoring %x\n", val); + return; + } + + host_opregion = pt_pci_host_read(real_dev->pci_dev, PCI_INTEL_OPREGION, 4); + igd_guest_opregion = (val & ~0xfff) | (host_opregion & 0xfff); + PT_LOG("Map OpRegion: %x -> %x\n", host_opregion, igd_guest_opregion); + + ret = xc_domain_memory_mapping(xc_handle, domid, + igd_guest_opregion >> XC_PAGE_SHIFT, + host_opregion >> XC_PAGE_SHIFT, + 2, + DPCI_ADD_MAPPING); + + if ( ret != 0 ) + { + PT_LOG("Error: Can't map opregion\n"); + igd_guest_opregion = 0; + } +#ifdef PT_DEBUG_PCI_CONFIG_ACCESS + PT_LOG_DEV((PCIDevice*)real_dev, "addr=%x len=%lx val=%x\n", + PCI_INTEL_OPREGION, len, val); +#endif + +} + void igd_pci_write(PCIDevice *pci_dev, uint32_t config_addr, uint32_t val, int len) { struct pci_dev *pci_dev_host_bridge; @@ -129,7 +179,6 @@ read_default: int register_vga_regions(struct pt_dev *real_device) { u16 vendor_id; - int igd_opregion; int ret = 0; if ( !gfx_passthru || real_device->pci_dev->device_class != 0x0300 ) @@ -147,19 +196,6 @@ int register_vga_regions(struct pt_dev *real_device) 0x20, DPCI_ADD_MAPPING); - /* 1:1 map ASL Storage register value */ - vendor_id = pt_pci_host_read(real_device->pci_dev, 0, 2); - igd_opregion = pt_pci_host_read(real_device->pci_dev, PCI_INTEL_OPREGION, 4); - if ( (vendor_id == PCI_VENDOR_ID_INTEL ) && igd_opregion ) - { - ret |= xc_domain_memory_mapping(xc_handle, domid, - igd_opregion >> XC_PAGE_SHIFT, - igd_opregion >> XC_PAGE_SHIFT, - 2, - DPCI_ADD_MAPPING); - PT_LOG("register_vga: igd_opregion = %x\n", igd_opregion); - } - if ( ret != 0 ) PT_LOG("VGA region mapping failed\n"); @@ -171,7 +207,7 @@ int register_vga_regions(struct pt_dev *real_device) */ int unregister_vga_regions(struct pt_dev *real_device) { - u32 vendor_id, igd_opregion; + u32 vendor_id; int ret = 0; if ( !gfx_passthru || real_device->pci_dev->device_class != 0x0300 ) @@ -190,12 +226,11 @@ int unregister_vga_regions(struct pt_dev *real_device) DPCI_REMOVE_MAPPING); vendor_id = pt_pci_host_read(real_device->pci_dev, PCI_VENDOR_ID, 2); - igd_opregion = pt_pci_host_read(real_device->pci_dev, PCI_INTEL_OPREGION, 4); - if ( (vendor_id == PCI_VENDOR_ID_INTEL) && igd_opregion ) + if ( (vendor_id == PCI_VENDOR_ID_INTEL) && igd_guest_opregion ) { ret |= xc_domain_memory_mapping(xc_handle, domid, - igd_opregion >> XC_PAGE_SHIFT, - igd_opregion >> XC_PAGE_SHIFT, + igd_guest_opregion >> XC_PAGE_SHIFT, + igd_guest_opregion >> XC_PAGE_SHIFT, 2, DPCI_REMOVE_MAPPING); } -- generated by git-patchbot for /home/xen/git/qemu-xen-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:28:51 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:28:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8f-0002Cf-H0; Mon, 14 May 2012 16:28:49 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8d-0002B0-Hu for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:47 +0000 Received: from [193.109.254.147:35816] by server-9.bemta-14.messagelabs.com id 68/4F-05787-EB231BF4; Mon, 14 May 2012 16:28:46 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-27.messagelabs.com!1337012924!9269343!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13700 invoked from network); 14 May 2012 16:28:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:28:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8a-0002gg-Kb for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STy8a-00064D-Jq for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:44 +0000 Message-Id: Date: Mon, 14 May 2012 16:28:44 +0000 From: Xen patchbot-4.0-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.0-testing] Added tag 4.0.4-rc1 for changeset 94fddf2a1948 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Keir Fraser # Date 1336394736 -3600 # Node ID f17f0e8f77391c999ff5e41645f7f1ec01a387fd # Parent 94fddf2a19482c88a60c07a1a085374586d207e8 Added tag 4.0.4-rc1 for changeset 94fddf2a1948 --- diff -r 94fddf2a1948 -r f17f0e8f7739 .hgtags --- a/.hgtags Mon May 07 13:45:31 2012 +0100 +++ b/.hgtags Mon May 07 13:45:36 2012 +0100 @@ -64,3 +64,4 @@ 47f9c9648fe7b531e41575a2bf0b0234037985b4 8d012bc20d3063d76b851d9909da6f9fa8ef469c 4.0.3-rc2 fd7c4d4e52d9aa4ad228d73d068fa7db79a0c904 4.0.3-rc3 00b5807c08f266b11fe54de808bafc4f74dde972 RELEASE-4.0.3 +94fddf2a19482c88a60c07a1a085374586d207e8 4.0.4-rc1 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:28:51 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:28:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8f-0002Cf-H0; Mon, 14 May 2012 16:28:49 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8d-0002B0-Hu for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:47 +0000 Received: from [193.109.254.147:35816] by server-9.bemta-14.messagelabs.com id 68/4F-05787-EB231BF4; Mon, 14 May 2012 16:28:46 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-27.messagelabs.com!1337012924!9269343!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13700 invoked from network); 14 May 2012 16:28:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:28:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8a-0002gg-Kb for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STy8a-00064D-Jq for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:44 +0000 Message-Id: Date: Mon, 14 May 2012 16:28:44 +0000 From: Xen patchbot-4.0-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.0-testing] Added tag 4.0.4-rc1 for changeset 94fddf2a1948 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Keir Fraser # Date 1336394736 -3600 # Node ID f17f0e8f77391c999ff5e41645f7f1ec01a387fd # Parent 94fddf2a19482c88a60c07a1a085374586d207e8 Added tag 4.0.4-rc1 for changeset 94fddf2a1948 --- diff -r 94fddf2a1948 -r f17f0e8f7739 .hgtags --- a/.hgtags Mon May 07 13:45:31 2012 +0100 +++ b/.hgtags Mon May 07 13:45:36 2012 +0100 @@ -64,3 +64,4 @@ 47f9c9648fe7b531e41575a2bf0b0234037985b4 8d012bc20d3063d76b851d9909da6f9fa8ef469c 4.0.3-rc2 fd7c4d4e52d9aa4ad228d73d068fa7db79a0c904 4.0.3-rc3 00b5807c08f266b11fe54de808bafc4f74dde972 RELEASE-4.0.3 +94fddf2a19482c88a60c07a1a085374586d207e8 4.0.4-rc1 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:29:02 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:29:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8r-0002Jr-RU; Mon, 14 May 2012 16:29:01 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8r-0002J4-26 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:29:01 +0000 Received: from [85.158.143.99:43028] by server-3.bemta-4.messagelabs.com id BE/A6-05853-CC231BF4; Mon, 14 May 2012 16:29:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-216.messagelabs.com!1337012937!22673924!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23572 invoked from network); 14 May 2012 16:28:59 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:28:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8m-0002hM-Qk for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STy8m-00065g-Pl for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:56 +0000 Date: Mon, 14 May 2012 16:28:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-unstable] xenstore: Use X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7bde54662d45b0bbc2ee78c7a8bf2c97c6655445 Author: Ian Jackson Date: Mon May 14 17:05:48 2012 +0100 xenstore: Use is going away. This change needs to be made in lockstep with xen-unstable.hg, which will be done by a change to the QEMU_TAG in the xen-unstable.hg changeset. Signed-off-by: Ian Jackson --- hw/xen_backend.c | 2 +- hw/xen_common.h | 2 +- hw/xen_console.c | 2 +- hw/xen_disk.c | 2 +- hw/xenfb.c | 2 +- xen-config-host.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/xen_backend.c b/hw/xen_backend.c index 64dc93a..92b3506 100644 --- a/hw/xen_backend.c +++ b/hw/xen_backend.c @@ -32,7 +32,7 @@ #include #include -#include +#include #include #include diff --git a/hw/xen_common.h b/hw/xen_common.h index 7562567..a615052 100644 --- a/hw/xen_common.h +++ b/hw/xen_common.h @@ -5,7 +5,7 @@ #include #include -#include +#include #include #include "hw.h" diff --git a/hw/xen_console.c b/hw/xen_console.c index 8d14131..80beb31 100644 --- a/hw/xen_console.c +++ b/hw/xen_console.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include diff --git a/hw/xen_disk.c b/hw/xen_disk.c index 5db58ac..04a62e2 100644 --- a/hw/xen_disk.c +++ b/hw/xen_disk.c @@ -33,7 +33,7 @@ #include #include -#include +#include #include #include diff --git a/hw/xenfb.c b/hw/xenfb.c index 96c2a6f..75b2bc2 100644 --- a/hw/xenfb.c +++ b/hw/xenfb.c @@ -37,7 +37,7 @@ #include #include -#include +#include #include #include #include diff --git a/xen-config-host.h b/xen-config-host.h index 818f25d..647f6be 100644 --- a/xen-config-host.h +++ b/xen-config-host.h @@ -17,7 +17,7 @@ extern int domid, domid_backend; #include #include "xenctrl.h" -#include "xs.h" +#include "xenstore.h" #if !defined(CONFIG_STUBDOM) && !defined(__NetBSD__) #include "blktaplib.h" #endif -- generated by git-patchbot for /home/xen/git/qemu-xen-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:29:02 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:29:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8r-0002Jr-RU; Mon, 14 May 2012 16:29:01 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8r-0002J4-26 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:29:01 +0000 Received: from [85.158.143.99:43028] by server-3.bemta-4.messagelabs.com id BE/A6-05853-CC231BF4; Mon, 14 May 2012 16:29:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-216.messagelabs.com!1337012937!22673924!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23572 invoked from network); 14 May 2012 16:28:59 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:28:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8m-0002hM-Qk for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STy8m-00065g-Pl for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:56 +0000 Date: Mon, 14 May 2012 16:28:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-unstable] xenstore: Use X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7bde54662d45b0bbc2ee78c7a8bf2c97c6655445 Author: Ian Jackson Date: Mon May 14 17:05:48 2012 +0100 xenstore: Use is going away. This change needs to be made in lockstep with xen-unstable.hg, which will be done by a change to the QEMU_TAG in the xen-unstable.hg changeset. Signed-off-by: Ian Jackson --- hw/xen_backend.c | 2 +- hw/xen_common.h | 2 +- hw/xen_console.c | 2 +- hw/xen_disk.c | 2 +- hw/xenfb.c | 2 +- xen-config-host.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/xen_backend.c b/hw/xen_backend.c index 64dc93a..92b3506 100644 --- a/hw/xen_backend.c +++ b/hw/xen_backend.c @@ -32,7 +32,7 @@ #include #include -#include +#include #include #include diff --git a/hw/xen_common.h b/hw/xen_common.h index 7562567..a615052 100644 --- a/hw/xen_common.h +++ b/hw/xen_common.h @@ -5,7 +5,7 @@ #include #include -#include +#include #include #include "hw.h" diff --git a/hw/xen_console.c b/hw/xen_console.c index 8d14131..80beb31 100644 --- a/hw/xen_console.c +++ b/hw/xen_console.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include diff --git a/hw/xen_disk.c b/hw/xen_disk.c index 5db58ac..04a62e2 100644 --- a/hw/xen_disk.c +++ b/hw/xen_disk.c @@ -33,7 +33,7 @@ #include #include -#include +#include #include #include diff --git a/hw/xenfb.c b/hw/xenfb.c index 96c2a6f..75b2bc2 100644 --- a/hw/xenfb.c +++ b/hw/xenfb.c @@ -37,7 +37,7 @@ #include #include -#include +#include #include #include #include diff --git a/xen-config-host.h b/xen-config-host.h index 818f25d..647f6be 100644 --- a/xen-config-host.h +++ b/xen-config-host.h @@ -17,7 +17,7 @@ extern int domid, domid_backend; #include #include "xenctrl.h" -#include "xs.h" +#include "xenstore.h" #if !defined(CONFIG_STUBDOM) && !defined(__NetBSD__) #include "blktaplib.h" #endif -- generated by git-patchbot for /home/xen/git/qemu-xen-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:29:02 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:29:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8r-0002Jm-PP; Mon, 14 May 2012 16:29:01 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8q-0002J4-G3 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:29:00 +0000 Received: from [85.158.143.35:49222] by server-3.bemta-4.messagelabs.com id 89/A6-05853-BC231BF4; Mon, 14 May 2012 16:28:59 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-21.messagelabs.com!1337012925!12178628!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5278 invoked from network); 14 May 2012 16:28:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:28:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8b-0002gj-3d for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STy8b-00064S-31 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:45 +0000 Message-Id: Date: Mon, 14 May 2012 16:28:44 +0000 From: Xen patchbot-4.0-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.0-testing] Added signature for changeset 94fddf2a1948 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Keir Fraser # Date 1336394749 -3600 # Node ID 92c59e870d72831e7bbee9047ad4cd4014a7ebaa # Parent f17f0e8f77391c999ff5e41645f7f1ec01a387fd Added signature for changeset 94fddf2a1948 --- diff -r f17f0e8f7739 -r 92c59e870d72 .hgsigs --- a/.hgsigs Mon May 07 13:45:36 2012 +0100 +++ b/.hgsigs Mon May 07 13:45:49 2012 +0100 @@ -17,3 +17,4 @@ 47f9c9648fe7b531e41575a2bf0b0234037985b4 8d012bc20d3063d76b851d9909da6f9fa8ef469c 0 iQEcBAABAgAGBQJOZzxcAAoJEIP+FMlX6CvZtR4H+wS6lQUaNK71V/mXuiPz4Y30pKv3w419IfW9ICA6unfxm+IkCbR4QEtO/6aZkU7Q1ZYSDfIyzA60E/rHcU5ZJ27lCvaedrYa4A8W9Ry7+e31MYvG+fvZAO2ZIPRks+HAg79joU10xUKQirTQi436viBL5NrN1R12Y5B75ue6YHhkuhI0XUv9l5MbO4utsTki3YqKTmsZbPCvzymZr0dXG8t7U7AWxbXTfzyKxsoCg7HdYzEPufhIe903xEhQaiSXSSUz78wUCN4KxXGubejEu2/09L4SRzoxV6Mw1K39EqtrisZVazsuy+aEobK5B9U/JGzjGK/CNlw+LobkW2qvMrE= fd7c4d4e52d9aa4ad228d73d068fa7db79a0c904 0 iQEcBAABAgAGBQJOjxDgAAoJEIP+FMlX6CvZbugIAJhthGHfoc7ln0WHj6ZAA2UVPo77l/VdceYohgCnWqgj16SyxkMgSUoieBhO1Fb/+9QzyXbV+ZAkJFCbp0lZ3bg62ZRpRjO38443D1aczabFno1GI22rUiwOkT1v6nvEQbHyc2L6lpzhDvv2h9Mv73tmti/XfM7uzfQD9Ea40BOGZ7PPOLifMnOo2FKepDyRNlo0thrz7kMpri0V9wm7Bx0Rx0SovMA3z9gtCeTYj8HgJ3niBibTe57AjCMwQCODRpAAhKdzGJ7GBxJ93q7WeJoNNxmQzYqFbUI3P3Jo/fF4APsxtnO6dC0Qt0IWVu0w6NCmfasnS9Vc/yifq7fDvLg= 00b5807c08f266b11fe54de808bafc4f74dde972 0 iQEcBAABAgAGBQJOoE3nAAoJEIP+FMlX6CvZg6UH/1WLvfz7MiyLJ2igox5gOQdcfrMe8ohnyd/CGwG/vex+Ohc7mKXVRoIcrR02a247eA3FmJKDqj/NDAbLTjnCzFjlxWKBQo2HO1bGZSGBD8b+hbR1laBSinXB5WscQG5VO7S2uj4j0GZbZ9ATdF11qhzWTviiBxei0l/INtoOb5NhsWpkIubQWVJLBEw9X6COMvwCabcoCDa/xZUxQfOHhRfdp1ouk4V9Zf7amW3ne4p0tMHjN9e0Ic+waBDX4Fyfns4GqDKfBgTOq2AgMO8BSmUuBQtIcYw03Z5GYco1Tfz3Lk3tTq4E+TyWXKKSQ5NOFI+9AxJn813NyR+r+AwatrI= +94fddf2a19482c88a60c07a1a085374586d207e8 0 iQEcBAABAgAGBQJPp8P7AAoJEIP+FMlX6CvZticH/jEqpGGEdlhBftLU7IeQ+0y4E25rbwH4iPpcRFctOvjWi8AsNT3u87UYvP/IqPoCg5NlNIYzmm9GO5dRV+cfKrsNQ1zKB0LETUkElfo+RM1upwGzNc4Hct87Gu8TNGYOsXSovHH868vnZXN0ZylR0PcHMrawJaOi9bJP2GkKo9XKEkmx0Pq77VQCCRUijWSaBYhRKgAbJ3VTB1/qzXDrve2v4HXCg9vFILH6DPWz5M3EhIZQh3+IIcUVlWi/6WbPergm8moKU4TXZc7kpl/hO2x+/LnneA/v96PzyQIJcl/m3PcIBjiaB17UCxwSfkS4VUZjLtfL5rRAywcnjVYXOyY= _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:29:02 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:29:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8r-0002Jm-PP; Mon, 14 May 2012 16:29:01 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8q-0002J4-G3 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:29:00 +0000 Received: from [85.158.143.35:49222] by server-3.bemta-4.messagelabs.com id 89/A6-05853-BC231BF4; Mon, 14 May 2012 16:28:59 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-21.messagelabs.com!1337012925!12178628!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5278 invoked from network); 14 May 2012 16:28:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:28:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy8b-0002gj-3d for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STy8b-00064S-31 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:28:45 +0000 Message-Id: Date: Mon, 14 May 2012 16:28:44 +0000 From: Xen patchbot-4.0-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.0-testing] Added signature for changeset 94fddf2a1948 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Keir Fraser # Date 1336394749 -3600 # Node ID 92c59e870d72831e7bbee9047ad4cd4014a7ebaa # Parent f17f0e8f77391c999ff5e41645f7f1ec01a387fd Added signature for changeset 94fddf2a1948 --- diff -r f17f0e8f7739 -r 92c59e870d72 .hgsigs --- a/.hgsigs Mon May 07 13:45:36 2012 +0100 +++ b/.hgsigs Mon May 07 13:45:49 2012 +0100 @@ -17,3 +17,4 @@ 47f9c9648fe7b531e41575a2bf0b0234037985b4 8d012bc20d3063d76b851d9909da6f9fa8ef469c 0 iQEcBAABAgAGBQJOZzxcAAoJEIP+FMlX6CvZtR4H+wS6lQUaNK71V/mXuiPz4Y30pKv3w419IfW9ICA6unfxm+IkCbR4QEtO/6aZkU7Q1ZYSDfIyzA60E/rHcU5ZJ27lCvaedrYa4A8W9Ry7+e31MYvG+fvZAO2ZIPRks+HAg79joU10xUKQirTQi436viBL5NrN1R12Y5B75ue6YHhkuhI0XUv9l5MbO4utsTki3YqKTmsZbPCvzymZr0dXG8t7U7AWxbXTfzyKxsoCg7HdYzEPufhIe903xEhQaiSXSSUz78wUCN4KxXGubejEu2/09L4SRzoxV6Mw1K39EqtrisZVazsuy+aEobK5B9U/JGzjGK/CNlw+LobkW2qvMrE= fd7c4d4e52d9aa4ad228d73d068fa7db79a0c904 0 iQEcBAABAgAGBQJOjxDgAAoJEIP+FMlX6CvZbugIAJhthGHfoc7ln0WHj6ZAA2UVPo77l/VdceYohgCnWqgj16SyxkMgSUoieBhO1Fb/+9QzyXbV+ZAkJFCbp0lZ3bg62ZRpRjO38443D1aczabFno1GI22rUiwOkT1v6nvEQbHyc2L6lpzhDvv2h9Mv73tmti/XfM7uzfQD9Ea40BOGZ7PPOLifMnOo2FKepDyRNlo0thrz7kMpri0V9wm7Bx0Rx0SovMA3z9gtCeTYj8HgJ3niBibTe57AjCMwQCODRpAAhKdzGJ7GBxJ93q7WeJoNNxmQzYqFbUI3P3Jo/fF4APsxtnO6dC0Qt0IWVu0w6NCmfasnS9Vc/yifq7fDvLg= 00b5807c08f266b11fe54de808bafc4f74dde972 0 iQEcBAABAgAGBQJOoE3nAAoJEIP+FMlX6CvZg6UH/1WLvfz7MiyLJ2igox5gOQdcfrMe8ohnyd/CGwG/vex+Ohc7mKXVRoIcrR02a247eA3FmJKDqj/NDAbLTjnCzFjlxWKBQo2HO1bGZSGBD8b+hbR1laBSinXB5WscQG5VO7S2uj4j0GZbZ9ATdF11qhzWTviiBxei0l/INtoOb5NhsWpkIubQWVJLBEw9X6COMvwCabcoCDa/xZUxQfOHhRfdp1ouk4V9Zf7amW3ne4p0tMHjN9e0Ic+waBDX4Fyfns4GqDKfBgTOq2AgMO8BSmUuBQtIcYw03Z5GYco1Tfz3Lk3tTq4E+TyWXKKSQ5NOFI+9AxJn813NyR+r+AwatrI= +94fddf2a19482c88a60c07a1a085374586d207e8 0 iQEcBAABAgAGBQJPp8P7AAoJEIP+FMlX6CvZticH/jEqpGGEdlhBftLU7IeQ+0y4E25rbwH4iPpcRFctOvjWi8AsNT3u87UYvP/IqPoCg5NlNIYzmm9GO5dRV+cfKrsNQ1zKB0LETUkElfo+RM1upwGzNc4Hct87Gu8TNGYOsXSovHH868vnZXN0ZylR0PcHMrawJaOi9bJP2GkKo9XKEkmx0Pq77VQCCRUijWSaBYhRKgAbJ3VTB1/qzXDrve2v4HXCg9vFILH6DPWz5M3EhIZQh3+IIcUVlWi/6WbPergm8moKU4TXZc7kpl/hO2x+/LnneA/v96PzyQIJcl/m3PcIBjiaB17UCxwSfkS4VUZjLtfL5rRAywcnjVYXOyY= _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:29:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:29:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy98-0002QV-UW; Mon, 14 May 2012 16:29:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy97-0002Pp-ND for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:29:17 +0000 Received: from [85.158.139.83:50687] by server-1.bemta-5.messagelabs.com id D7/2E-19304-CD231BF4; Mon, 14 May 2012 16:29:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-182.messagelabs.com!1337012954!17067520!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22322 invoked from network); 14 May 2012 16:29:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:29:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy94-0002i2-Iq for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:29:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STy94-000671-GQ for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:29:14 +0000 Date: Mon, 14 May 2012 16:29:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.1-testing] qemu-xen-traditional: use O_DIRECT to open disk images for IDE X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ce440ef43089d98a07a65be4ee5c50e638a65528 Author: Stefano Stabellini Date: Mon Apr 2 17:54:08 2012 +0100 qemu-xen-traditional: use O_DIRECT to open disk images for IDE [ Major performance fix. -iwj ] Signed-off-by: Stefano Stabellini Acked-by: Ian Jackson (cherry picked from commit 1307e42a4b3c1102d75401bc0cffb4eb6c9b7a38) --- xenstore.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xenstore.c b/xenstore.c index 4c483e2..ac90366 100644 --- a/xenstore.c +++ b/xenstore.c @@ -643,7 +643,7 @@ void xenstore_parse_domain_config(int hvm_domid) } pstrcpy(bs->filename, sizeof(bs->filename), params); - flags = BDRV_O_CACHE_WB; /* snapshot and write-back */ + flags = BDRV_O_NOCACHE; is_readonly = 0; if (pasprintf(&buf, "%s/mode", bpath) == -1) continue; -- generated by git-patchbot for /home/xen/git/qemu-xen-4.1-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:29:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:29:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy98-0002QV-UW; Mon, 14 May 2012 16:29:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy97-0002Pp-ND for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:29:17 +0000 Received: from [85.158.139.83:50687] by server-1.bemta-5.messagelabs.com id D7/2E-19304-CD231BF4; Mon, 14 May 2012 16:29:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-182.messagelabs.com!1337012954!17067520!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22322 invoked from network); 14 May 2012 16:29:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:29:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy94-0002i2-Iq for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:29:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STy94-000671-GQ for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:29:14 +0000 Date: Mon, 14 May 2012 16:29:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.1-testing] qemu-xen-traditional: use O_DIRECT to open disk images for IDE X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ce440ef43089d98a07a65be4ee5c50e638a65528 Author: Stefano Stabellini Date: Mon Apr 2 17:54:08 2012 +0100 qemu-xen-traditional: use O_DIRECT to open disk images for IDE [ Major performance fix. -iwj ] Signed-off-by: Stefano Stabellini Acked-by: Ian Jackson (cherry picked from commit 1307e42a4b3c1102d75401bc0cffb4eb6c9b7a38) --- xenstore.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xenstore.c b/xenstore.c index 4c483e2..ac90366 100644 --- a/xenstore.c +++ b/xenstore.c @@ -643,7 +643,7 @@ void xenstore_parse_domain_config(int hvm_domid) } pstrcpy(bs->filename, sizeof(bs->filename), params); - flags = BDRV_O_CACHE_WB; /* snapshot and write-back */ + flags = BDRV_O_NOCACHE; is_readonly = 0; if (pasprintf(&buf, "%s/mode", bpath) == -1) continue; -- generated by git-patchbot for /home/xen/git/qemu-xen-4.1-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:29:29 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:29:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy9J-0002VI-1C; Mon, 14 May 2012 16:29:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy9H-0002UR-HB for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:29:27 +0000 Received: from [85.158.138.51:11144] by server-10.bemta-3.messagelabs.com id 4C/3F-29478-6E231BF4; Mon, 14 May 2012 16:29:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-174.messagelabs.com!1337012964!23011446!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8972 invoked from network); 14 May 2012 16:29:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:29:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy9E-0002i8-OW for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:29:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STy9E-00067N-NU for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:29:24 +0000 Date: Mon, 14 May 2012 16:29:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.1-testing] qemu-xen-traditional: use O_DIRECT to open disk images with QDISK X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a899c4c19ccf757248b0f0bb7057c7d00d28bab1 Author: Stefano Stabellini Date: Mon Apr 2 17:54:36 2012 +0100 qemu-xen-traditional: use O_DIRECT to open disk images with QDISK Also enable batch_maps, use_aio and disable syncwrite. Signed-off-by: Stefano Stabellini Acked-by: Ian Jackson (cherry picked from commit 0efae2f1fe8f72628c58b3683f62725a613fcec3) --- hw/xen_disk.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/hw/xen_disk.c b/hw/xen_disk.c index 6aebb77..b1d6985 100644 --- a/hw/xen_disk.c +++ b/hw/xen_disk.c @@ -46,11 +46,11 @@ /* ------------------------------------------------------------- */ -static int syncwrite = 1; -static int batch_maps = 0; +static int syncwrite = 0; +static int batch_maps = 1; static int max_requests = 32; -static int use_aio = 0; +static int use_aio = 1; /* ------------------------------------------------------------- */ @@ -617,12 +617,13 @@ static int blk_init(struct XenDevice *xendev) return -1; /* read-only ? */ + qflags = BDRV_O_NOCACHE; if (strcmp(blkdev->mode, "w") == 0) { mode = O_RDWR; - qflags = BDRV_O_RDWR; + qflags |= BDRV_O_RDWR; } else { mode = O_RDONLY; - qflags = BDRV_O_RDONLY; + qflags |= BDRV_O_RDONLY; info |= VDISK_READONLY; } -- generated by git-patchbot for /home/xen/git/qemu-xen-4.1-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:29:29 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:29:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy9J-0002VI-1C; Mon, 14 May 2012 16:29:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy9H-0002UR-HB for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:29:27 +0000 Received: from [85.158.138.51:11144] by server-10.bemta-3.messagelabs.com id 4C/3F-29478-6E231BF4; Mon, 14 May 2012 16:29:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-174.messagelabs.com!1337012964!23011446!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8972 invoked from network); 14 May 2012 16:29:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:29:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy9E-0002i8-OW for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:29:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STy9E-00067N-NU for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:29:24 +0000 Date: Mon, 14 May 2012 16:29:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.1-testing] qemu-xen-traditional: use O_DIRECT to open disk images with QDISK X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a899c4c19ccf757248b0f0bb7057c7d00d28bab1 Author: Stefano Stabellini Date: Mon Apr 2 17:54:36 2012 +0100 qemu-xen-traditional: use O_DIRECT to open disk images with QDISK Also enable batch_maps, use_aio and disable syncwrite. Signed-off-by: Stefano Stabellini Acked-by: Ian Jackson (cherry picked from commit 0efae2f1fe8f72628c58b3683f62725a613fcec3) --- hw/xen_disk.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/hw/xen_disk.c b/hw/xen_disk.c index 6aebb77..b1d6985 100644 --- a/hw/xen_disk.c +++ b/hw/xen_disk.c @@ -46,11 +46,11 @@ /* ------------------------------------------------------------- */ -static int syncwrite = 1; -static int batch_maps = 0; +static int syncwrite = 0; +static int batch_maps = 1; static int max_requests = 32; -static int use_aio = 0; +static int use_aio = 1; /* ------------------------------------------------------------- */ @@ -617,12 +617,13 @@ static int blk_init(struct XenDevice *xendev) return -1; /* read-only ? */ + qflags = BDRV_O_NOCACHE; if (strcmp(blkdev->mode, "w") == 0) { mode = O_RDWR; - qflags = BDRV_O_RDWR; + qflags |= BDRV_O_RDWR; } else { mode = O_RDONLY; - qflags = BDRV_O_RDONLY; + qflags |= BDRV_O_RDONLY; info |= VDISK_READONLY; } -- generated by git-patchbot for /home/xen/git/qemu-xen-4.1-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:29:39 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:29:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy9T-0002Yv-6C; Mon, 14 May 2012 16:29:39 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy9R-0002YK-P9 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:29:37 +0000 Received: from [193.109.254.147:25806] by server-11.bemta-14.messagelabs.com id 62/A9-05858-1F231BF4; Mon, 14 May 2012 16:29:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1337012975!9183340!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19987 invoked from network); 14 May 2012 16:29:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:29:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy9P-0002iH-03 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:29:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STy9O-00067j-SE for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:29:34 +0000 Date: Mon, 14 May 2012 16:29:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.1-testing] qemu-xen-traditional: QDISK fixes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a2d2123a7dfc4d116011d51f48df786a3b853537 Author: Stefano Stabellini Date: Mon Apr 2 17:55:05 2012 +0100 qemu-xen-traditional: QDISK fixes - if ioreq->postsync call bdrv_flush when the operation is actually completed; - do not increment aio_inflight when not submitting any operations. Signed-off-by: Stefano Stabellini Acked-by: Ian Jackson (cherry picked from commit f0fad5549f8103fc0130d3121eb5f7913c5bc2a9) --- hw/xen_disk.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/xen_disk.c b/hw/xen_disk.c index b1d6985..5db58ac 100644 --- a/hw/xen_disk.c +++ b/hw/xen_disk.c @@ -382,6 +382,8 @@ static void qemu_aio_complete(void *opaque, int ret) ioreq->aio_inflight--; if (ioreq->aio_inflight > 0) return; + if (ioreq->postsync) + bdrv_flush(ioreq->blkdev->bs); ioreq->status = ioreq->aio_errors ? BLKIF_RSP_ERROR : BLKIF_RSP_OKAY; ioreq_unmap(ioreq); @@ -409,9 +411,9 @@ static int ioreq_runio_qemu_aio(struct ioreq *ioreq) break; case BLKIF_OP_WRITE: case BLKIF_OP_WRITE_BARRIER: - ioreq->aio_inflight++; if (!ioreq->req.nr_segments) break; + ioreq->aio_inflight++; bdrv_aio_writev(blkdev->bs, ioreq->start / BLOCK_SIZE, &ioreq->v, ioreq->v.size / BLOCK_SIZE, qemu_aio_complete, ioreq); @@ -421,8 +423,6 @@ static int ioreq_runio_qemu_aio(struct ioreq *ioreq) goto err; } - if (ioreq->postsync) - bdrv_flush(blkdev->bs); /* FIXME: aio_flush() ??? */ qemu_aio_complete(ioreq, 0); return 0; -- generated by git-patchbot for /home/xen/git/qemu-xen-4.1-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:29:39 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:29:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy9T-0002Yv-6C; Mon, 14 May 2012 16:29:39 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy9R-0002YK-P9 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:29:37 +0000 Received: from [193.109.254.147:25806] by server-11.bemta-14.messagelabs.com id 62/A9-05858-1F231BF4; Mon, 14 May 2012 16:29:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1337012975!9183340!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19987 invoked from network); 14 May 2012 16:29:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:29:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy9P-0002iH-03 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:29:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STy9O-00067j-SE for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:29:34 +0000 Date: Mon, 14 May 2012 16:29:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.1-testing] qemu-xen-traditional: QDISK fixes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a2d2123a7dfc4d116011d51f48df786a3b853537 Author: Stefano Stabellini Date: Mon Apr 2 17:55:05 2012 +0100 qemu-xen-traditional: QDISK fixes - if ioreq->postsync call bdrv_flush when the operation is actually completed; - do not increment aio_inflight when not submitting any operations. Signed-off-by: Stefano Stabellini Acked-by: Ian Jackson (cherry picked from commit f0fad5549f8103fc0130d3121eb5f7913c5bc2a9) --- hw/xen_disk.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/xen_disk.c b/hw/xen_disk.c index b1d6985..5db58ac 100644 --- a/hw/xen_disk.c +++ b/hw/xen_disk.c @@ -382,6 +382,8 @@ static void qemu_aio_complete(void *opaque, int ret) ioreq->aio_inflight--; if (ioreq->aio_inflight > 0) return; + if (ioreq->postsync) + bdrv_flush(ioreq->blkdev->bs); ioreq->status = ioreq->aio_errors ? BLKIF_RSP_ERROR : BLKIF_RSP_OKAY; ioreq_unmap(ioreq); @@ -409,9 +411,9 @@ static int ioreq_runio_qemu_aio(struct ioreq *ioreq) break; case BLKIF_OP_WRITE: case BLKIF_OP_WRITE_BARRIER: - ioreq->aio_inflight++; if (!ioreq->req.nr_segments) break; + ioreq->aio_inflight++; bdrv_aio_writev(blkdev->bs, ioreq->start / BLOCK_SIZE, &ioreq->v, ioreq->v.size / BLOCK_SIZE, qemu_aio_complete, ioreq); @@ -421,8 +423,6 @@ static int ioreq_runio_qemu_aio(struct ioreq *ioreq) goto err; } - if (ioreq->postsync) - bdrv_flush(blkdev->bs); /* FIXME: aio_flush() ??? */ qemu_aio_complete(ioreq, 0); return 0; -- generated by git-patchbot for /home/xen/git/qemu-xen-4.1-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:29:50 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:29:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy9e-0002c1-AE; Mon, 14 May 2012 16:29:50 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy9d-0002bX-AO for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:29:49 +0000 Received: from [85.158.143.35:26699] by server-3.bemta-4.messagelabs.com id 47/B7-05853-CF231BF4; Mon, 14 May 2012 16:29:48 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-21.messagelabs.com!1337012987!10418862!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2296 invoked from network); 14 May 2012 16:29:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:29:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy9b-0002ih-0k for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:29:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STy9b-00069M-01 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:29:47 +0000 Message-Id: Date: Mon, 14 May 2012 16:29:46 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] gntdev: fix multi-page slot allocation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Jan Beulich # Date 1336749460 -7200 # Node ID c0e1133a1fc113be9c756c80167f8f55613d1ac9 # Parent 456451e35eca858a0ec0ae6d47febcb7038e0493 gntdev: fix multi-page slot allocation Any range with the first slot available would have got considered usable, as range_length never got reset when encountering an in-use slot. Additionally fold the two almost identical loops into a single instance, at once avoiding to go through both loops when start_index was zero even for the first one. Signed-off-by: Jan Beulich --- diff -r 456451e35eca -r c0e1133a1fc1 drivers/xen/gntdev/gntdev.c --- a/drivers/xen/gntdev/gntdev.c Fri May 11 17:13:17 2012 +0200 +++ b/drivers/xen/gntdev/gntdev.c Fri May 11 17:17:40 2012 +0200 @@ -285,35 +285,27 @@ static void compress_free_list(gntdev_fi static int find_contiguous_free_range(gntdev_file_private_data_t *private_data, uint32_t num_slots) { - uint32_t i, start_index = private_data->next_fit_index; - uint32_t range_start = 0, range_length; + /* First search from next_fit_index to the end of the array. */ + uint32_t start_index = private_data->next_fit_index; + uint32_t end_index = private_data->grants_size; - /* First search from the start_index to the end of the array. */ - range_length = 0; - for (i = start_index; i < private_data->grants_size; ++i) { - if (private_data->grants[i].state == GNTDEV_SLOT_INVALID) { - if (range_length == 0) { - range_start = i; - } - ++range_length; - if (range_length == num_slots) { - return range_start; - } + for (;;) { + uint32_t i, range_start = 0, range_length = 0; + + for (i = start_index; i < end_index; ++i) { + if (private_data->grants[i].state == GNTDEV_SLOT_INVALID) { + if (range_length == 0) + range_start = i; + if (++range_length == num_slots) + return range_start; + } else + range_length = 0; } - } - - /* Now search from the start of the array to the start_index. */ - range_length = 0; - for (i = 0; i < start_index; ++i) { - if (private_data->grants[i].state == GNTDEV_SLOT_INVALID) { - if (range_length == 0) { - range_start = i; - } - ++range_length; - if (range_length == num_slots) { - return range_start; - } - } + /* Now search from the start of the array to next_fit_index. */ + if (!start_index) + break; + end_index = start_index; + start_index = 0; } return -ENOMEM; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:29:50 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:29:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy9e-0002c1-AE; Mon, 14 May 2012 16:29:50 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy9d-0002bX-AO for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:29:49 +0000 Received: from [85.158.143.35:26699] by server-3.bemta-4.messagelabs.com id 47/B7-05853-CF231BF4; Mon, 14 May 2012 16:29:48 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-21.messagelabs.com!1337012987!10418862!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2296 invoked from network); 14 May 2012 16:29:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:29:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy9b-0002ih-0k for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:29:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STy9b-00069M-01 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:29:47 +0000 Message-Id: Date: Mon, 14 May 2012 16:29:46 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] gntdev: fix multi-page slot allocation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Jan Beulich # Date 1336749460 -7200 # Node ID c0e1133a1fc113be9c756c80167f8f55613d1ac9 # Parent 456451e35eca858a0ec0ae6d47febcb7038e0493 gntdev: fix multi-page slot allocation Any range with the first slot available would have got considered usable, as range_length never got reset when encountering an in-use slot. Additionally fold the two almost identical loops into a single instance, at once avoiding to go through both loops when start_index was zero even for the first one. Signed-off-by: Jan Beulich --- diff -r 456451e35eca -r c0e1133a1fc1 drivers/xen/gntdev/gntdev.c --- a/drivers/xen/gntdev/gntdev.c Fri May 11 17:13:17 2012 +0200 +++ b/drivers/xen/gntdev/gntdev.c Fri May 11 17:17:40 2012 +0200 @@ -285,35 +285,27 @@ static void compress_free_list(gntdev_fi static int find_contiguous_free_range(gntdev_file_private_data_t *private_data, uint32_t num_slots) { - uint32_t i, start_index = private_data->next_fit_index; - uint32_t range_start = 0, range_length; + /* First search from next_fit_index to the end of the array. */ + uint32_t start_index = private_data->next_fit_index; + uint32_t end_index = private_data->grants_size; - /* First search from the start_index to the end of the array. */ - range_length = 0; - for (i = start_index; i < private_data->grants_size; ++i) { - if (private_data->grants[i].state == GNTDEV_SLOT_INVALID) { - if (range_length == 0) { - range_start = i; - } - ++range_length; - if (range_length == num_slots) { - return range_start; - } + for (;;) { + uint32_t i, range_start = 0, range_length = 0; + + for (i = start_index; i < end_index; ++i) { + if (private_data->grants[i].state == GNTDEV_SLOT_INVALID) { + if (range_length == 0) + range_start = i; + if (++range_length == num_slots) + return range_start; + } else + range_length = 0; } - } - - /* Now search from the start of the array to the start_index. */ - range_length = 0; - for (i = 0; i < start_index; ++i) { - if (private_data->grants[i].state == GNTDEV_SLOT_INVALID) { - if (range_length == 0) { - range_start = i; - } - ++range_length; - if (range_length == num_slots) { - return range_start; - } - } + /* Now search from the start of the array to next_fit_index. */ + if (!start_index) + break; + end_index = start_index; + start_index = 0; } return -ENOMEM; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:29:51 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:29:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy9e-0002c7-Ck; Mon, 14 May 2012 16:29:50 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy9d-0002bV-BA for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:29:49 +0000 Received: from [85.158.138.51:3084] by server-1.bemta-3.messagelabs.com id 8D/8C-11491-CF231BF4; Mon, 14 May 2012 16:29:48 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-174.messagelabs.com!1337012986!19109132!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9818 invoked from network); 14 May 2012 16:29:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:29:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy9a-0002ib-8R for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:29:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STy9a-00068s-72 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:29:46 +0000 Message-Id: Date: Mon, 14 May 2012 16:29:45 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] xen/grant-table: add error-handling code on failure of gnttab_resume X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Julia Lawall # Date 1336476488 -7200 # Node ID 7ba94caa95963bacd3557d276ea3362e566fb308 # Parent f523a98343a9e20e88cde7a6af9cf7e4415ec57d xen/grant-table: add error-handling code on failure of gnttab_resume Jump to the label ini_nomem as done on the failure of the page allocations above. The code at ini_nomem is modified to accommodate different return values. Signed-off-by: Julia Lawall Signed-off-by: Jan Beulich Committed-by: Jan Beulich --- diff -r f523a98343a9 -r 7ba94caa9596 drivers/xen/core/gnttab.c --- a/drivers/xen/core/gnttab.c Mon Apr 02 14:47:52 2012 +0200 +++ b/drivers/xen/core/gnttab.c Tue May 08 13:28:08 2012 +0200 @@ -805,7 +805,7 @@ static int gnttab_expand(unsigned int re int __devinit gnttab_init(void) { - int i; + int i, ret; unsigned int max_nr_glist_frames, nr_glist_frames; unsigned int nr_init_grefs; @@ -828,12 +828,16 @@ int __devinit gnttab_init(void) nr_glist_frames = nr_freelist_frames(nr_grant_frames); for (i = 0; i < nr_glist_frames; i++) { gnttab_list[i] = (grant_ref_t *)__get_free_page(GFP_KERNEL); - if (gnttab_list[i] == NULL) + if (gnttab_list[i] == NULL) { + ret = -ENOMEM; goto ini_nomem; + } } - if (gnttab_resume() < 0) - return -ENODEV; + if (gnttab_resume() < 0) { + ret = -ENODEV; + goto ini_nomem; + } nr_init_grefs = nr_grant_frames * ENTRIES_PER_GRANT_FRAME; @@ -850,7 +854,7 @@ int __devinit gnttab_init(void) for (i--; i >= 0; i--) free_page((unsigned long)gnttab_list[i]); kfree(gnttab_list); - return -ENOMEM; + return ret; } #ifdef CONFIG_XEN _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:29:51 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:29:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy9e-0002c7-Ck; Mon, 14 May 2012 16:29:50 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy9d-0002bV-BA for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:29:49 +0000 Received: from [85.158.138.51:3084] by server-1.bemta-3.messagelabs.com id 8D/8C-11491-CF231BF4; Mon, 14 May 2012 16:29:48 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-174.messagelabs.com!1337012986!19109132!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9818 invoked from network); 14 May 2012 16:29:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:29:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy9a-0002ib-8R for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:29:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STy9a-00068s-72 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:29:46 +0000 Message-Id: Date: Mon, 14 May 2012 16:29:45 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] xen/grant-table: add error-handling code on failure of gnttab_resume X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Julia Lawall # Date 1336476488 -7200 # Node ID 7ba94caa95963bacd3557d276ea3362e566fb308 # Parent f523a98343a9e20e88cde7a6af9cf7e4415ec57d xen/grant-table: add error-handling code on failure of gnttab_resume Jump to the label ini_nomem as done on the failure of the page allocations above. The code at ini_nomem is modified to accommodate different return values. Signed-off-by: Julia Lawall Signed-off-by: Jan Beulich Committed-by: Jan Beulich --- diff -r f523a98343a9 -r 7ba94caa9596 drivers/xen/core/gnttab.c --- a/drivers/xen/core/gnttab.c Mon Apr 02 14:47:52 2012 +0200 +++ b/drivers/xen/core/gnttab.c Tue May 08 13:28:08 2012 +0200 @@ -805,7 +805,7 @@ static int gnttab_expand(unsigned int re int __devinit gnttab_init(void) { - int i; + int i, ret; unsigned int max_nr_glist_frames, nr_glist_frames; unsigned int nr_init_grefs; @@ -828,12 +828,16 @@ int __devinit gnttab_init(void) nr_glist_frames = nr_freelist_frames(nr_grant_frames); for (i = 0; i < nr_glist_frames; i++) { gnttab_list[i] = (grant_ref_t *)__get_free_page(GFP_KERNEL); - if (gnttab_list[i] == NULL) + if (gnttab_list[i] == NULL) { + ret = -ENOMEM; goto ini_nomem; + } } - if (gnttab_resume() < 0) - return -ENODEV; + if (gnttab_resume() < 0) { + ret = -ENODEV; + goto ini_nomem; + } nr_init_grefs = nr_grant_frames * ENTRIES_PER_GRANT_FRAME; @@ -850,7 +854,7 @@ int __devinit gnttab_init(void) for (i--; i >= 0; i--) free_page((unsigned long)gnttab_list[i]); kfree(gnttab_list); - return -ENOMEM; + return ret; } #ifdef CONFIG_XEN _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:29:51 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:29:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy9f-0002ct-Ff; Mon, 14 May 2012 16:29:51 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy9e-0002bg-1f for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:29:50 +0000 Received: from [85.158.138.51:12845] by server-11.bemta-3.messagelabs.com id 75/D3-18894-DF231BF4; Mon, 14 May 2012 16:29:49 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-174.messagelabs.com!1337012987!27130585!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25003 invoked from network); 14 May 2012 16:29:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:29:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy9a-0002ie-LH for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:29:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STy9a-000697-KT for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:29:46 +0000 Message-Id: Date: Mon, 14 May 2012 16:29:46 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] fix VM_FOREIGN users after c/s 878:eba6fe6d8d53 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Jan Beulich # Date 1336749197 -7200 # Node ID 456451e35eca858a0ec0ae6d47febcb7038e0493 # Parent 7ba94caa95963bacd3557d276ea3362e566fb308 fix VM_FOREIGN users after c/s 878:eba6fe6d8d53 The level of indirection got increased by the blktap2 changes, yet existing users were not properly updated. While c/s 901:9242c5b965c1 did so for a specific case in blktap, this was incomplete and left out gntdev altogether. Signed-off-by: Jan Beulich --- diff -r 7ba94caa9596 -r 456451e35eca drivers/xen/blktap/blktap.c --- a/drivers/xen/blktap/blktap.c Tue May 08 13:28:08 2012 +0200 +++ b/drivers/xen/blktap/blktap.c Fri May 11 17:13:17 2012 +0200 @@ -120,7 +120,7 @@ typedef struct tap_blkif { [req id, idx] tuple */ blkif_t *blkif; /*Associate blkif with tapdev */ struct domid_translate_ext trans; /*Translation from domid to bus. */ - struct vm_foreign_map foreign_map; /*Mapping page */ + struct vm_foreign_map *foreign_maps; /*Mapping pages */ } tap_blkif_t; static struct tap_blkif *tapfds[MAX_TAP_DEV]; @@ -329,7 +329,7 @@ static pte_t blktap_clear_pte(struct vm_ pg = idx_to_page(mmap_idx, pending_idx, seg); ClearPageReserved(pg); - info->foreign_map.map[offset + RING_PAGES] = NULL; + info->foreign_maps->map[offset + RING_PAGES] = NULL; khandle = &pending_handle(mmap_idx, pending_idx, seg); @@ -377,12 +377,17 @@ static pte_t blktap_clear_pte(struct vm_ static void blktap_vma_open(struct vm_area_struct *vma) { tap_blkif_t *info; + unsigned long idx; + struct vm_foreign_map *foreign_map; + if (vma->vm_file == NULL) return; info = vma->vm_file->private_data; - vma->vm_private_data = - &info->foreign_map.map[(vma->vm_start - info->rings_vstart) >> PAGE_SHIFT]; + idx = (vma->vm_start - info->rings_vstart) >> PAGE_SHIFT; + foreign_map = &info->foreign_maps[idx]; + foreign_map->map = &info->foreign_maps->map[idx]; + vma->vm_private_data = foreign_map; } /* tricky part @@ -392,7 +397,6 @@ static void blktap_vma_open(struct vm_ar */ static void blktap_vma_close(struct vm_area_struct *vma) { - tap_blkif_t *info; struct vm_area_struct *next = vma->vm_next; if (next == NULL || @@ -402,9 +406,7 @@ static void blktap_vma_close(struct vm_a vma->vm_file != next->vm_file) return; - info = vma->vm_file->private_data; - next->vm_private_data = - &info->foreign_map.map[(next->vm_start - info->rings_vstart) >> PAGE_SHIFT]; + blktap_vma_open(next); } static struct vm_operations_struct blktap_vm_ops = { @@ -640,8 +642,9 @@ static int blktap_release(struct inode * mm = xchg(&info->mm, NULL); if (mm) mmput(mm); - kfree(info->foreign_map.map); - info->foreign_map.map = NULL; + kfree(info->foreign_maps->map); + kfree(info->foreign_maps); + info->foreign_maps = NULL; /* Free the ring page. */ ClearPageReserved(virt_to_page(info->ufe_ring.sring)); @@ -730,14 +733,19 @@ static int blktap_mmap(struct file *filp } /* Mark this VM as containing foreign pages, and set up mappings. */ - info->foreign_map.map = kzalloc(((vma->vm_end - vma->vm_start) >> PAGE_SHIFT) * - sizeof(*info->foreign_map.map), GFP_KERNEL); - if (info->foreign_map.map == NULL) { + info->foreign_maps = kcalloc(size, sizeof(*info->foreign_maps), + GFP_KERNEL); + if (info->foreign_maps) + info->foreign_maps->map = + kcalloc(size, sizeof(*info->foreign_maps->map), + GFP_KERNEL); + if (!info->foreign_maps || !info->foreign_maps->map) { + kfree(info->foreign_maps); WPRINTK("Couldn't alloc VM_FOREIGN map.\n"); goto fail; } - vma->vm_private_data = &info->foreign_map; + vma->vm_private_data = info->foreign_maps; vma->vm_flags |= VM_FOREIGN; vma->vm_flags |= VM_DONTCOPY; @@ -1242,7 +1250,7 @@ static int blktap_read_ufe_ring(tap_blki pg = idx_to_page(mmap_idx, pending_idx, j); ClearPageReserved(pg); offset = (uvaddr - info->rings_vstart) >> PAGE_SHIFT; - info->foreign_map.map[offset] = NULL; + info->foreign_maps->map[offset] = NULL; } fast_flush_area(pending_req, pending_idx, usr_idx, info); make_response(blkif, pending_req->id, res.operation, @@ -1530,7 +1538,7 @@ static void dispatch_rw_block_io(blkif_t FOREIGN_FRAME(map[i].dev_bus_addr >> PAGE_SHIFT)); offset = (uvaddr - info->rings_vstart) >> PAGE_SHIFT; - info->foreign_map.map[offset] = pg; + info->foreign_maps->map[offset] = pg; } } else { for (i = 0; i < nseg; i++) { @@ -1556,7 +1564,7 @@ static void dispatch_rw_block_io(blkif_t offset = (uvaddr - info->rings_vstart) >> PAGE_SHIFT; pg = idx_to_page(mmap_idx, pending_idx, i); - info->foreign_map.map[offset] = pg; + info->foreign_maps->map[offset] = pg; } } diff -r 7ba94caa9596 -r 456451e35eca drivers/xen/gntdev/gntdev.c --- a/drivers/xen/gntdev/gntdev.c Tue May 08 13:28:08 2012 +0200 +++ b/drivers/xen/gntdev/gntdev.c Fri May 11 17:13:17 2012 +0200 @@ -459,6 +459,7 @@ static int gntdev_mmap (struct file *fli int i; struct page *page; gntdev_file_private_data_t *private_data = flip->private_data; + struct vm_foreign_map *foreign_map; if (unlikely(!private_data)) { printk(KERN_ERR "File's private data is NULL.\n"); @@ -487,6 +488,14 @@ static int gntdev_mmap (struct file *fli return -EINVAL; } + foreign_map = kmalloc(sizeof(*foreign_map), GFP_KERNEL); + if (!foreign_map) { + printk(KERN_ERR "Couldn't allocate mapping structure for VM " + "area.\n"); + return -ENOMEM; + } + foreign_map->map = &private_data->foreign_pages[slot_index]; + /* Slots must be in the NOT_YET_MAPPED state. */ down_write(&private_data->grants_sem); for (i = 0; i < size; ++i) { @@ -496,6 +505,7 @@ static int gntdev_mmap (struct file *fli "state (%d).\n", slot_index + i, private_data->grants[slot_index + i].state); up_write(&private_data->grants_sem); + kfree(foreign_map); return -EINVAL; } } @@ -504,14 +514,8 @@ static int gntdev_mmap (struct file *fli vma->vm_ops = &gntdev_vmops; /* The VM area contains pages from another VM. */ + vma->vm_private_data = foreign_map; vma->vm_flags |= VM_FOREIGN; - vma->vm_private_data = kzalloc(size * sizeof(struct page *), - GFP_KERNEL); - if (vma->vm_private_data == NULL) { - printk(KERN_ERR "Couldn't allocate mapping structure for VM " - "area.\n"); - return -ENOMEM; - } /* This flag prevents Bad PTE errors when the memory is unmapped. */ vma->vm_flags |= VM_RESERVED; @@ -567,11 +571,6 @@ static int gntdev_mmap (struct file *fli goto undo_map_out; } - /* Store a reference to the page that will be mapped into user - * space. - */ - ((struct page **) vma->vm_private_data)[i] = page; - /* Mark mapped page as reserved. */ SetPageReserved(page); @@ -676,7 +675,8 @@ undo_map_out: * by do_mmap_pgoff(), which will eventually call gntdev_clear_pte(). * All we need to do here is free the vma_private_data. */ - kfree(vma->vm_private_data); + vma->vm_flags &= ~VM_FOREIGN; + kfree(foreign_map); /* THIS IS VERY UNPLEASANT: do_mmap_pgoff() will set the vma->vm_file * to NULL on failure. However, we need this in gntdev_clear_pte() to @@ -780,9 +780,8 @@ static pte_t gntdev_clear_pte(struct vm_ /* "Destructor" for a VM area. */ static void gntdev_vma_close(struct vm_area_struct *vma) { - if (vma->vm_private_data) { + if (vma->vm_flags & VM_FOREIGN) kfree(vma->vm_private_data); - } } /* Called when an ioctl is made on the device. _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:29:51 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:29:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy9f-0002ct-Ff; Mon, 14 May 2012 16:29:51 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy9e-0002bg-1f for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:29:50 +0000 Received: from [85.158.138.51:12845] by server-11.bemta-3.messagelabs.com id 75/D3-18894-DF231BF4; Mon, 14 May 2012 16:29:49 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-174.messagelabs.com!1337012987!27130585!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25003 invoked from network); 14 May 2012 16:29:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:29:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy9a-0002ie-LH for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:29:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STy9a-000697-KT for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:29:46 +0000 Message-Id: Date: Mon, 14 May 2012 16:29:46 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] fix VM_FOREIGN users after c/s 878:eba6fe6d8d53 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Jan Beulich # Date 1336749197 -7200 # Node ID 456451e35eca858a0ec0ae6d47febcb7038e0493 # Parent 7ba94caa95963bacd3557d276ea3362e566fb308 fix VM_FOREIGN users after c/s 878:eba6fe6d8d53 The level of indirection got increased by the blktap2 changes, yet existing users were not properly updated. While c/s 901:9242c5b965c1 did so for a specific case in blktap, this was incomplete and left out gntdev altogether. Signed-off-by: Jan Beulich --- diff -r 7ba94caa9596 -r 456451e35eca drivers/xen/blktap/blktap.c --- a/drivers/xen/blktap/blktap.c Tue May 08 13:28:08 2012 +0200 +++ b/drivers/xen/blktap/blktap.c Fri May 11 17:13:17 2012 +0200 @@ -120,7 +120,7 @@ typedef struct tap_blkif { [req id, idx] tuple */ blkif_t *blkif; /*Associate blkif with tapdev */ struct domid_translate_ext trans; /*Translation from domid to bus. */ - struct vm_foreign_map foreign_map; /*Mapping page */ + struct vm_foreign_map *foreign_maps; /*Mapping pages */ } tap_blkif_t; static struct tap_blkif *tapfds[MAX_TAP_DEV]; @@ -329,7 +329,7 @@ static pte_t blktap_clear_pte(struct vm_ pg = idx_to_page(mmap_idx, pending_idx, seg); ClearPageReserved(pg); - info->foreign_map.map[offset + RING_PAGES] = NULL; + info->foreign_maps->map[offset + RING_PAGES] = NULL; khandle = &pending_handle(mmap_idx, pending_idx, seg); @@ -377,12 +377,17 @@ static pte_t blktap_clear_pte(struct vm_ static void blktap_vma_open(struct vm_area_struct *vma) { tap_blkif_t *info; + unsigned long idx; + struct vm_foreign_map *foreign_map; + if (vma->vm_file == NULL) return; info = vma->vm_file->private_data; - vma->vm_private_data = - &info->foreign_map.map[(vma->vm_start - info->rings_vstart) >> PAGE_SHIFT]; + idx = (vma->vm_start - info->rings_vstart) >> PAGE_SHIFT; + foreign_map = &info->foreign_maps[idx]; + foreign_map->map = &info->foreign_maps->map[idx]; + vma->vm_private_data = foreign_map; } /* tricky part @@ -392,7 +397,6 @@ static void blktap_vma_open(struct vm_ar */ static void blktap_vma_close(struct vm_area_struct *vma) { - tap_blkif_t *info; struct vm_area_struct *next = vma->vm_next; if (next == NULL || @@ -402,9 +406,7 @@ static void blktap_vma_close(struct vm_a vma->vm_file != next->vm_file) return; - info = vma->vm_file->private_data; - next->vm_private_data = - &info->foreign_map.map[(next->vm_start - info->rings_vstart) >> PAGE_SHIFT]; + blktap_vma_open(next); } static struct vm_operations_struct blktap_vm_ops = { @@ -640,8 +642,9 @@ static int blktap_release(struct inode * mm = xchg(&info->mm, NULL); if (mm) mmput(mm); - kfree(info->foreign_map.map); - info->foreign_map.map = NULL; + kfree(info->foreign_maps->map); + kfree(info->foreign_maps); + info->foreign_maps = NULL; /* Free the ring page. */ ClearPageReserved(virt_to_page(info->ufe_ring.sring)); @@ -730,14 +733,19 @@ static int blktap_mmap(struct file *filp } /* Mark this VM as containing foreign pages, and set up mappings. */ - info->foreign_map.map = kzalloc(((vma->vm_end - vma->vm_start) >> PAGE_SHIFT) * - sizeof(*info->foreign_map.map), GFP_KERNEL); - if (info->foreign_map.map == NULL) { + info->foreign_maps = kcalloc(size, sizeof(*info->foreign_maps), + GFP_KERNEL); + if (info->foreign_maps) + info->foreign_maps->map = + kcalloc(size, sizeof(*info->foreign_maps->map), + GFP_KERNEL); + if (!info->foreign_maps || !info->foreign_maps->map) { + kfree(info->foreign_maps); WPRINTK("Couldn't alloc VM_FOREIGN map.\n"); goto fail; } - vma->vm_private_data = &info->foreign_map; + vma->vm_private_data = info->foreign_maps; vma->vm_flags |= VM_FOREIGN; vma->vm_flags |= VM_DONTCOPY; @@ -1242,7 +1250,7 @@ static int blktap_read_ufe_ring(tap_blki pg = idx_to_page(mmap_idx, pending_idx, j); ClearPageReserved(pg); offset = (uvaddr - info->rings_vstart) >> PAGE_SHIFT; - info->foreign_map.map[offset] = NULL; + info->foreign_maps->map[offset] = NULL; } fast_flush_area(pending_req, pending_idx, usr_idx, info); make_response(blkif, pending_req->id, res.operation, @@ -1530,7 +1538,7 @@ static void dispatch_rw_block_io(blkif_t FOREIGN_FRAME(map[i].dev_bus_addr >> PAGE_SHIFT)); offset = (uvaddr - info->rings_vstart) >> PAGE_SHIFT; - info->foreign_map.map[offset] = pg; + info->foreign_maps->map[offset] = pg; } } else { for (i = 0; i < nseg; i++) { @@ -1556,7 +1564,7 @@ static void dispatch_rw_block_io(blkif_t offset = (uvaddr - info->rings_vstart) >> PAGE_SHIFT; pg = idx_to_page(mmap_idx, pending_idx, i); - info->foreign_map.map[offset] = pg; + info->foreign_maps->map[offset] = pg; } } diff -r 7ba94caa9596 -r 456451e35eca drivers/xen/gntdev/gntdev.c --- a/drivers/xen/gntdev/gntdev.c Tue May 08 13:28:08 2012 +0200 +++ b/drivers/xen/gntdev/gntdev.c Fri May 11 17:13:17 2012 +0200 @@ -459,6 +459,7 @@ static int gntdev_mmap (struct file *fli int i; struct page *page; gntdev_file_private_data_t *private_data = flip->private_data; + struct vm_foreign_map *foreign_map; if (unlikely(!private_data)) { printk(KERN_ERR "File's private data is NULL.\n"); @@ -487,6 +488,14 @@ static int gntdev_mmap (struct file *fli return -EINVAL; } + foreign_map = kmalloc(sizeof(*foreign_map), GFP_KERNEL); + if (!foreign_map) { + printk(KERN_ERR "Couldn't allocate mapping structure for VM " + "area.\n"); + return -ENOMEM; + } + foreign_map->map = &private_data->foreign_pages[slot_index]; + /* Slots must be in the NOT_YET_MAPPED state. */ down_write(&private_data->grants_sem); for (i = 0; i < size; ++i) { @@ -496,6 +505,7 @@ static int gntdev_mmap (struct file *fli "state (%d).\n", slot_index + i, private_data->grants[slot_index + i].state); up_write(&private_data->grants_sem); + kfree(foreign_map); return -EINVAL; } } @@ -504,14 +514,8 @@ static int gntdev_mmap (struct file *fli vma->vm_ops = &gntdev_vmops; /* The VM area contains pages from another VM. */ + vma->vm_private_data = foreign_map; vma->vm_flags |= VM_FOREIGN; - vma->vm_private_data = kzalloc(size * sizeof(struct page *), - GFP_KERNEL); - if (vma->vm_private_data == NULL) { - printk(KERN_ERR "Couldn't allocate mapping structure for VM " - "area.\n"); - return -ENOMEM; - } /* This flag prevents Bad PTE errors when the memory is unmapped. */ vma->vm_flags |= VM_RESERVED; @@ -567,11 +571,6 @@ static int gntdev_mmap (struct file *fli goto undo_map_out; } - /* Store a reference to the page that will be mapped into user - * space. - */ - ((struct page **) vma->vm_private_data)[i] = page; - /* Mark mapped page as reserved. */ SetPageReserved(page); @@ -676,7 +675,8 @@ undo_map_out: * by do_mmap_pgoff(), which will eventually call gntdev_clear_pte(). * All we need to do here is free the vma_private_data. */ - kfree(vma->vm_private_data); + vma->vm_flags &= ~VM_FOREIGN; + kfree(foreign_map); /* THIS IS VERY UNPLEASANT: do_mmap_pgoff() will set the vma->vm_file * to NULL on failure. However, we need this in gntdev_clear_pte() to @@ -780,9 +780,8 @@ static pte_t gntdev_clear_pte(struct vm_ /* "Destructor" for a VM area. */ static void gntdev_vma_close(struct vm_area_struct *vma) { - if (vma->vm_private_data) { + if (vma->vm_flags & VM_FOREIGN) kfree(vma->vm_private_data); - } } /* Called when an ioctl is made on the device. _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:29:52 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:29:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy9g-0002dy-IV; Mon, 14 May 2012 16:29:52 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy9f-0002cN-6h for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:29:51 +0000 Received: from [85.158.139.83:11878] by server-2.bemta-5.messagelabs.com id E8/BD-17016-EF231BF4; Mon, 14 May 2012 16:29:50 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-182.messagelabs.com!1337012987!24387682!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17694 invoked from network); 14 May 2012 16:29:49 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:29:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy9b-0002in-OC for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:29:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STy9b-00069q-NZ for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:29:47 +0000 Message-Id: Date: Mon, 14 May 2012 16:29:47 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] gntdev: misc cleanup X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Jan Beulich # Date 1336749653 -7200 # Node ID 90a9c811f4c0bac5a16a9c038deb7d8ce5438723 # Parent 1f738f0b706cfb76cb6d9077188f9d3a3ca498f2 gntdev: misc cleanup - eliminate struct gntdev_grant_info's dev_bus_addr member (which was used to communicate a value inside the main loop of gntdev_mmap()) - correct types - use a local variable 'grants' in gntdev_mmap() to improve readability - avoid re-calculating already calculated values - properly check for out of range values - combine both GNTTABOP_unmap_grant_ref calls in gntdev_clear_pte() into a single hypercall - adjust error diagnostic in unmap ioctl to be more useful and better legible Signed-off-by: Jan Beulich --- diff -r 1f738f0b706c -r 90a9c811f4c0 drivers/xen/gntdev/gntdev.c --- a/drivers/xen/gntdev/gntdev.c Fri May 11 17:19:28 2012 +0200 +++ b/drivers/xen/gntdev/gntdev.c Fri May 11 17:20:53 2012 +0200 @@ -76,7 +76,6 @@ typedef struct gntdev_grant_info { grant_ref_t ref; grant_handle_t kernel_handle; grant_handle_t user_handle; - uint64_t dev_bus_addr; } valid; } u; } gntdev_grant_info_t; @@ -443,14 +442,14 @@ static int gntdev_mmap (struct file *fli { struct gnttab_map_grant_ref op; unsigned long slot_index = vma->vm_pgoff; - unsigned long kernel_vaddr, user_vaddr; - uint32_t size = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; + unsigned long kernel_vaddr, user_vaddr, mfn; + unsigned long size = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; uint64_t ptep; int ret, exit_ret; - int flags; - int i; + unsigned int i, flags; struct page *page; gntdev_file_private_data_t *private_data = flip->private_data; + gntdev_grant_info_t *grants; struct vm_foreign_map *foreign_map; if (unlikely(!private_data)) { @@ -460,17 +459,19 @@ static int gntdev_mmap (struct file *fli /* Test to make sure that the grants array has been initialised. */ down_read(&private_data->grants_sem); - if (unlikely(!private_data->grants)) { - up_read(&private_data->grants_sem); + grants = private_data->grants; + up_read(&private_data->grants_sem); + + if (unlikely(!grants)) { printk(KERN_ERR "Attempted to mmap before ioctl.\n"); return -EINVAL; } - up_read(&private_data->grants_sem); + grants += slot_index; - if (unlikely((size <= 0) || - (size + slot_index) > private_data->grants_size)) { + if (unlikely(size + slot_index <= slot_index || + size + slot_index > private_data->grants_size)) { printk(KERN_ERR "Invalid number of pages or offset" - "(num_pages = %d, first_slot = %ld).\n", + "(num_pages = %lu, first_slot = %lu)\n", size, slot_index); return -ENXIO; } @@ -491,11 +492,10 @@ static int gntdev_mmap (struct file *fli /* Slots must be in the NOT_YET_MAPPED state. */ down_write(&private_data->grants_sem); for (i = 0; i < size; ++i) { - if (private_data->grants[slot_index + i].state != - GNTDEV_SLOT_NOT_YET_MAPPED) { - printk(KERN_ERR "Slot (index = %ld) is in the wrong " + if (grants[i].state != GNTDEV_SLOT_NOT_YET_MAPPED) { + printk(KERN_ERR "Slot (index = %lu) is in the wrong " "state (%d).\n", slot_index + i, - private_data->grants[slot_index + i].state); + grants[i].state); up_write(&private_data->grants_sem); kfree(foreign_map); return -EINVAL; @@ -535,14 +535,11 @@ static int gntdev_mmap (struct file *fli flags |= GNTMAP_readonly; kernel_vaddr = get_kernel_vaddr(private_data, slot_index + i); - user_vaddr = get_user_vaddr(vma, i); page = private_data->foreign_pages[slot_index + i]; gnttab_set_map_op(&op, kernel_vaddr, flags, - private_data->grants[slot_index+i] - .u.valid.ref, - private_data->grants[slot_index+i] - .u.valid.domid); + grants[i].u.valid.ref, + grants[i].u.valid.domid); /* Carry out the mapping of the grant reference. */ ret = HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, @@ -553,10 +550,8 @@ static int gntdev_mmap (struct file *fli printk(KERN_ERR "Error mapping the grant reference " "into the kernel (%d). domid = %d; ref = %d\n", op.status, - private_data->grants[slot_index+i] - .u.valid.domid, - private_data->grants[slot_index+i] - .u.valid.ref); + grants[i].u.valid.domid, + grants[i].u.valid.ref); else /* Propagate eagain instead of trying to fix it up */ exit_ret = -EAGAIN; @@ -567,16 +562,14 @@ static int gntdev_mmap (struct file *fli SetPageReserved(page); /* Record the grant handle, for use in the unmap operation. */ - private_data->grants[slot_index+i].u.valid.kernel_handle = - op.handle; - private_data->grants[slot_index+i].u.valid.dev_bus_addr = - op.dev_bus_addr; + grants[i].u.valid.kernel_handle = op.handle; - private_data->grants[slot_index+i].state = GNTDEV_SLOT_MAPPED; - private_data->grants[slot_index+i].u.valid.user_handle = - GNTDEV_INVALID_HANDLE; + grants[i].state = GNTDEV_SLOT_MAPPED; + grants[i].u.valid.user_handle = GNTDEV_INVALID_HANDLE; /* Now perform the mapping to user space. */ + user_vaddr = get_user_vaddr(vma, i); + if (xen_feature(XENFEAT_auto_translated_physmap)) { /* USING SHADOW PAGE TABLES. */ /* In this case, we simply insert the page into the VM @@ -592,11 +585,11 @@ static int gntdev_mmap (struct file *fli /* In this case, we map the grant(s) straight into user * space. */ + mfn = op.dev_bus_addr >> PAGE_SHIFT; /* Get the machine address of the PTE for the user page. */ if ((ret = create_lookup_pte_addr(vma->vm_mm, - vma->vm_start - + (i << PAGE_SHIFT), + user_vaddr, &ptep))) { printk(KERN_ERR "Error obtaining PTE pointer (%d)\n", @@ -606,9 +599,6 @@ static int gntdev_mmap (struct file *fli /* Configure the map operation. */ - /* The reference is to be used by host CPUs. */ - flags = GNTMAP_host_map; - /* Specifies a user space mapping. */ flags |= GNTMAP_application_map; @@ -617,14 +607,9 @@ static int gntdev_mmap (struct file *fli */ flags |= GNTMAP_contains_pte; - if (!(vma->vm_flags & VM_WRITE)) - flags |= GNTMAP_readonly; - gnttab_set_map_op(&op, ptep, flags, - private_data->grants[slot_index+i] - .u.valid.ref, - private_data->grants[slot_index+i] - .u.valid.domid); + grants[i].u.valid.ref, + grants[i].u.valid.domid); /* Carry out the mapping of the grant reference. */ ret = HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, @@ -634,10 +619,8 @@ static int gntdev_mmap (struct file *fli printk(KERN_ERR "Error mapping the grant reference " "into user space (%d). domid = %d; ref = %d\n", op.status, - private_data->grants[slot_index+i].u - .valid.domid, - private_data->grants[slot_index+i].u - .valid.ref); + grants[i].u.valid.domid, + grants[i].u.valid.ref); /* This should never happen after we've mapped into * the kernel space. */ BUG_ON(op.status == GNTST_eagain); @@ -647,15 +630,11 @@ static int gntdev_mmap (struct file *fli /* Record the grant handle, for use in the unmap * operation. */ - private_data->grants[slot_index+i].u.valid.user_handle - = op.handle; + grants[i].u.valid.user_handle = op.handle; /* Update p2m structure with the new mapping. */ set_phys_to_machine(__pa(kernel_vaddr) >> PAGE_SHIFT, - FOREIGN_FRAME(private_data-> - grants[slot_index+i] - .u.valid.dev_bus_addr - >> PAGE_SHIFT)); + FOREIGN_FRAME(mfn)); } exit_ret = 0; @@ -685,9 +664,11 @@ undo_map_out: static pte_t gntdev_clear_pte(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep, int is_fullmm) { - int slot_index, ret; + int ret; + unsigned int nr; + unsigned long slot_index; pte_t copy; - struct gnttab_unmap_grant_ref op; + struct gnttab_unmap_grant_ref op[2]; gntdev_file_private_data_t *private_data; /* THIS IS VERY UNPLEASANT: do_mmap_pgoff() will set the vma->vm_file @@ -720,36 +701,35 @@ static pte_t gntdev_clear_pte(struct vm_ return copy; } - /* First, we clear the user space mapping, if it has been made. - */ + /* Clear the user space mapping, if it has been made. */ if (private_data->grants[slot_index].u.valid.user_handle != - GNTDEV_INVALID_HANDLE && - !xen_feature(XENFEAT_auto_translated_physmap)) { - /* NOT USING SHADOW PAGE TABLES. */ - gnttab_set_unmap_op(&op, ptep_to_machine(ptep), + GNTDEV_INVALID_HANDLE) { + /* NOT USING SHADOW PAGE TABLES (and user handle valid). */ + gnttab_set_unmap_op(&op[0], ptep_to_machine(ptep), GNTMAP_contains_pte, private_data->grants[slot_index].u.valid .user_handle); - ret = HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref, - &op, 1); - BUG_ON(ret); - if (op.status != GNTST_okay) - printk("User unmap grant status = %d\n", op.status); + nr = 1; } else { - /* USING SHADOW PAGE TABLES. */ + /* USING SHADOW PAGE TABLES (or user handle invalid). */ pte_clear_full(vma->vm_mm, addr, ptep, is_fullmm); + nr = 0; } - /* Finally, we unmap the grant from kernel space. */ - gnttab_set_unmap_op(&op, + /* We always unmap the grant from kernel space. */ + gnttab_set_unmap_op(&op[nr], get_kernel_vaddr(private_data, slot_index), GNTMAP_host_map, private_data->grants[slot_index].u.valid .kernel_handle); - ret = HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref, &op, 1); + + ret = HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref, op, nr + 1); BUG_ON(ret); - if (op.status != GNTST_okay) - printk("Kernel unmap grant status = %d\n", op.status); + + if (nr && op[0].status != GNTST_okay) + printk("User unmap grant status = %d\n", op[0].status); + if (op[nr].status != GNTST_okay) + printk("Kernel unmap grant status = %d\n", op[nr].status); /* Return slot to the not-yet-mapped state, so that it may be * mapped again, or removed by a subsequent ioctl. @@ -885,7 +865,8 @@ private_data_initialised: return -EFAULT; start_index = op.index >> PAGE_SHIFT; - if (start_index + op.count > private_data->grants_size) + if (start_index + op.count < start_index || + start_index + op.count > private_data->grants_size) return -EINVAL; down_write(&private_data->grants_sem); @@ -894,28 +875,29 @@ private_data_initialised: * state. */ for (i = 0; i < op.count; ++i) { - if (unlikely - (private_data->grants[start_index + i].state - != GNTDEV_SLOT_NOT_YET_MAPPED)) { - if (private_data->grants[start_index + i].state - == GNTDEV_SLOT_INVALID) { - printk(KERN_ERR - "Tried to remove an invalid " - "grant at offset 0x%x.", - (start_index + i) - << PAGE_SHIFT); - rc = -EINVAL; - } else { - printk(KERN_ERR - "Tried to remove a grant which " - "is currently mmap()-ed at " - "offset 0x%x.", - (start_index + i) - << PAGE_SHIFT); - rc = -EBUSY; - } - goto unmap_out; + const char *what; + + switch (private_data->grants[start_index + i].state) { + case GNTDEV_SLOT_NOT_YET_MAPPED: + continue; + case GNTDEV_SLOT_INVALID: + what = "invalid"; + rc = -EINVAL; + break; + case GNTDEV_SLOT_MAPPED: + what = "currently mmap()-ed"; + rc = -EBUSY; + break; + default: + what = "in an invalid state"; + rc = -ENXIO; + break; } + printk(KERN_ERR "%s[%d] tried to remove a grant" + " which is %s at %#x+%#x\n", + current->comm, current->pid, + what, start_index, i); + goto unmap_out; } down_write(&private_data->free_list_sem); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:29:52 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:29:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy9g-0002dy-IV; Mon, 14 May 2012 16:29:52 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy9f-0002cN-6h for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:29:51 +0000 Received: from [85.158.139.83:11878] by server-2.bemta-5.messagelabs.com id E8/BD-17016-EF231BF4; Mon, 14 May 2012 16:29:50 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-182.messagelabs.com!1337012987!24387682!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17694 invoked from network); 14 May 2012 16:29:49 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:29:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy9b-0002in-OC for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:29:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STy9b-00069q-NZ for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:29:47 +0000 Message-Id: Date: Mon, 14 May 2012 16:29:47 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] gntdev: misc cleanup X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Jan Beulich # Date 1336749653 -7200 # Node ID 90a9c811f4c0bac5a16a9c038deb7d8ce5438723 # Parent 1f738f0b706cfb76cb6d9077188f9d3a3ca498f2 gntdev: misc cleanup - eliminate struct gntdev_grant_info's dev_bus_addr member (which was used to communicate a value inside the main loop of gntdev_mmap()) - correct types - use a local variable 'grants' in gntdev_mmap() to improve readability - avoid re-calculating already calculated values - properly check for out of range values - combine both GNTTABOP_unmap_grant_ref calls in gntdev_clear_pte() into a single hypercall - adjust error diagnostic in unmap ioctl to be more useful and better legible Signed-off-by: Jan Beulich --- diff -r 1f738f0b706c -r 90a9c811f4c0 drivers/xen/gntdev/gntdev.c --- a/drivers/xen/gntdev/gntdev.c Fri May 11 17:19:28 2012 +0200 +++ b/drivers/xen/gntdev/gntdev.c Fri May 11 17:20:53 2012 +0200 @@ -76,7 +76,6 @@ typedef struct gntdev_grant_info { grant_ref_t ref; grant_handle_t kernel_handle; grant_handle_t user_handle; - uint64_t dev_bus_addr; } valid; } u; } gntdev_grant_info_t; @@ -443,14 +442,14 @@ static int gntdev_mmap (struct file *fli { struct gnttab_map_grant_ref op; unsigned long slot_index = vma->vm_pgoff; - unsigned long kernel_vaddr, user_vaddr; - uint32_t size = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; + unsigned long kernel_vaddr, user_vaddr, mfn; + unsigned long size = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; uint64_t ptep; int ret, exit_ret; - int flags; - int i; + unsigned int i, flags; struct page *page; gntdev_file_private_data_t *private_data = flip->private_data; + gntdev_grant_info_t *grants; struct vm_foreign_map *foreign_map; if (unlikely(!private_data)) { @@ -460,17 +459,19 @@ static int gntdev_mmap (struct file *fli /* Test to make sure that the grants array has been initialised. */ down_read(&private_data->grants_sem); - if (unlikely(!private_data->grants)) { - up_read(&private_data->grants_sem); + grants = private_data->grants; + up_read(&private_data->grants_sem); + + if (unlikely(!grants)) { printk(KERN_ERR "Attempted to mmap before ioctl.\n"); return -EINVAL; } - up_read(&private_data->grants_sem); + grants += slot_index; - if (unlikely((size <= 0) || - (size + slot_index) > private_data->grants_size)) { + if (unlikely(size + slot_index <= slot_index || + size + slot_index > private_data->grants_size)) { printk(KERN_ERR "Invalid number of pages or offset" - "(num_pages = %d, first_slot = %ld).\n", + "(num_pages = %lu, first_slot = %lu)\n", size, slot_index); return -ENXIO; } @@ -491,11 +492,10 @@ static int gntdev_mmap (struct file *fli /* Slots must be in the NOT_YET_MAPPED state. */ down_write(&private_data->grants_sem); for (i = 0; i < size; ++i) { - if (private_data->grants[slot_index + i].state != - GNTDEV_SLOT_NOT_YET_MAPPED) { - printk(KERN_ERR "Slot (index = %ld) is in the wrong " + if (grants[i].state != GNTDEV_SLOT_NOT_YET_MAPPED) { + printk(KERN_ERR "Slot (index = %lu) is in the wrong " "state (%d).\n", slot_index + i, - private_data->grants[slot_index + i].state); + grants[i].state); up_write(&private_data->grants_sem); kfree(foreign_map); return -EINVAL; @@ -535,14 +535,11 @@ static int gntdev_mmap (struct file *fli flags |= GNTMAP_readonly; kernel_vaddr = get_kernel_vaddr(private_data, slot_index + i); - user_vaddr = get_user_vaddr(vma, i); page = private_data->foreign_pages[slot_index + i]; gnttab_set_map_op(&op, kernel_vaddr, flags, - private_data->grants[slot_index+i] - .u.valid.ref, - private_data->grants[slot_index+i] - .u.valid.domid); + grants[i].u.valid.ref, + grants[i].u.valid.domid); /* Carry out the mapping of the grant reference. */ ret = HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, @@ -553,10 +550,8 @@ static int gntdev_mmap (struct file *fli printk(KERN_ERR "Error mapping the grant reference " "into the kernel (%d). domid = %d; ref = %d\n", op.status, - private_data->grants[slot_index+i] - .u.valid.domid, - private_data->grants[slot_index+i] - .u.valid.ref); + grants[i].u.valid.domid, + grants[i].u.valid.ref); else /* Propagate eagain instead of trying to fix it up */ exit_ret = -EAGAIN; @@ -567,16 +562,14 @@ static int gntdev_mmap (struct file *fli SetPageReserved(page); /* Record the grant handle, for use in the unmap operation. */ - private_data->grants[slot_index+i].u.valid.kernel_handle = - op.handle; - private_data->grants[slot_index+i].u.valid.dev_bus_addr = - op.dev_bus_addr; + grants[i].u.valid.kernel_handle = op.handle; - private_data->grants[slot_index+i].state = GNTDEV_SLOT_MAPPED; - private_data->grants[slot_index+i].u.valid.user_handle = - GNTDEV_INVALID_HANDLE; + grants[i].state = GNTDEV_SLOT_MAPPED; + grants[i].u.valid.user_handle = GNTDEV_INVALID_HANDLE; /* Now perform the mapping to user space. */ + user_vaddr = get_user_vaddr(vma, i); + if (xen_feature(XENFEAT_auto_translated_physmap)) { /* USING SHADOW PAGE TABLES. */ /* In this case, we simply insert the page into the VM @@ -592,11 +585,11 @@ static int gntdev_mmap (struct file *fli /* In this case, we map the grant(s) straight into user * space. */ + mfn = op.dev_bus_addr >> PAGE_SHIFT; /* Get the machine address of the PTE for the user page. */ if ((ret = create_lookup_pte_addr(vma->vm_mm, - vma->vm_start - + (i << PAGE_SHIFT), + user_vaddr, &ptep))) { printk(KERN_ERR "Error obtaining PTE pointer (%d)\n", @@ -606,9 +599,6 @@ static int gntdev_mmap (struct file *fli /* Configure the map operation. */ - /* The reference is to be used by host CPUs. */ - flags = GNTMAP_host_map; - /* Specifies a user space mapping. */ flags |= GNTMAP_application_map; @@ -617,14 +607,9 @@ static int gntdev_mmap (struct file *fli */ flags |= GNTMAP_contains_pte; - if (!(vma->vm_flags & VM_WRITE)) - flags |= GNTMAP_readonly; - gnttab_set_map_op(&op, ptep, flags, - private_data->grants[slot_index+i] - .u.valid.ref, - private_data->grants[slot_index+i] - .u.valid.domid); + grants[i].u.valid.ref, + grants[i].u.valid.domid); /* Carry out the mapping of the grant reference. */ ret = HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, @@ -634,10 +619,8 @@ static int gntdev_mmap (struct file *fli printk(KERN_ERR "Error mapping the grant reference " "into user space (%d). domid = %d; ref = %d\n", op.status, - private_data->grants[slot_index+i].u - .valid.domid, - private_data->grants[slot_index+i].u - .valid.ref); + grants[i].u.valid.domid, + grants[i].u.valid.ref); /* This should never happen after we've mapped into * the kernel space. */ BUG_ON(op.status == GNTST_eagain); @@ -647,15 +630,11 @@ static int gntdev_mmap (struct file *fli /* Record the grant handle, for use in the unmap * operation. */ - private_data->grants[slot_index+i].u.valid.user_handle - = op.handle; + grants[i].u.valid.user_handle = op.handle; /* Update p2m structure with the new mapping. */ set_phys_to_machine(__pa(kernel_vaddr) >> PAGE_SHIFT, - FOREIGN_FRAME(private_data-> - grants[slot_index+i] - .u.valid.dev_bus_addr - >> PAGE_SHIFT)); + FOREIGN_FRAME(mfn)); } exit_ret = 0; @@ -685,9 +664,11 @@ undo_map_out: static pte_t gntdev_clear_pte(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep, int is_fullmm) { - int slot_index, ret; + int ret; + unsigned int nr; + unsigned long slot_index; pte_t copy; - struct gnttab_unmap_grant_ref op; + struct gnttab_unmap_grant_ref op[2]; gntdev_file_private_data_t *private_data; /* THIS IS VERY UNPLEASANT: do_mmap_pgoff() will set the vma->vm_file @@ -720,36 +701,35 @@ static pte_t gntdev_clear_pte(struct vm_ return copy; } - /* First, we clear the user space mapping, if it has been made. - */ + /* Clear the user space mapping, if it has been made. */ if (private_data->grants[slot_index].u.valid.user_handle != - GNTDEV_INVALID_HANDLE && - !xen_feature(XENFEAT_auto_translated_physmap)) { - /* NOT USING SHADOW PAGE TABLES. */ - gnttab_set_unmap_op(&op, ptep_to_machine(ptep), + GNTDEV_INVALID_HANDLE) { + /* NOT USING SHADOW PAGE TABLES (and user handle valid). */ + gnttab_set_unmap_op(&op[0], ptep_to_machine(ptep), GNTMAP_contains_pte, private_data->grants[slot_index].u.valid .user_handle); - ret = HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref, - &op, 1); - BUG_ON(ret); - if (op.status != GNTST_okay) - printk("User unmap grant status = %d\n", op.status); + nr = 1; } else { - /* USING SHADOW PAGE TABLES. */ + /* USING SHADOW PAGE TABLES (or user handle invalid). */ pte_clear_full(vma->vm_mm, addr, ptep, is_fullmm); + nr = 0; } - /* Finally, we unmap the grant from kernel space. */ - gnttab_set_unmap_op(&op, + /* We always unmap the grant from kernel space. */ + gnttab_set_unmap_op(&op[nr], get_kernel_vaddr(private_data, slot_index), GNTMAP_host_map, private_data->grants[slot_index].u.valid .kernel_handle); - ret = HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref, &op, 1); + + ret = HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref, op, nr + 1); BUG_ON(ret); - if (op.status != GNTST_okay) - printk("Kernel unmap grant status = %d\n", op.status); + + if (nr && op[0].status != GNTST_okay) + printk("User unmap grant status = %d\n", op[0].status); + if (op[nr].status != GNTST_okay) + printk("Kernel unmap grant status = %d\n", op[nr].status); /* Return slot to the not-yet-mapped state, so that it may be * mapped again, or removed by a subsequent ioctl. @@ -885,7 +865,8 @@ private_data_initialised: return -EFAULT; start_index = op.index >> PAGE_SHIFT; - if (start_index + op.count > private_data->grants_size) + if (start_index + op.count < start_index || + start_index + op.count > private_data->grants_size) return -EINVAL; down_write(&private_data->grants_sem); @@ -894,28 +875,29 @@ private_data_initialised: * state. */ for (i = 0; i < op.count; ++i) { - if (unlikely - (private_data->grants[start_index + i].state - != GNTDEV_SLOT_NOT_YET_MAPPED)) { - if (private_data->grants[start_index + i].state - == GNTDEV_SLOT_INVALID) { - printk(KERN_ERR - "Tried to remove an invalid " - "grant at offset 0x%x.", - (start_index + i) - << PAGE_SHIFT); - rc = -EINVAL; - } else { - printk(KERN_ERR - "Tried to remove a grant which " - "is currently mmap()-ed at " - "offset 0x%x.", - (start_index + i) - << PAGE_SHIFT); - rc = -EBUSY; - } - goto unmap_out; + const char *what; + + switch (private_data->grants[start_index + i].state) { + case GNTDEV_SLOT_NOT_YET_MAPPED: + continue; + case GNTDEV_SLOT_INVALID: + what = "invalid"; + rc = -EINVAL; + break; + case GNTDEV_SLOT_MAPPED: + what = "currently mmap()-ed"; + rc = -EBUSY; + break; + default: + what = "in an invalid state"; + rc = -ENXIO; + break; } + printk(KERN_ERR "%s[%d] tried to remove a grant" + " which is %s at %#x+%#x\n", + current->comm, current->pid, + what, start_index, i); + goto unmap_out; } down_write(&private_data->free_list_sem); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:29:54 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:29:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy9h-0002f0-OP; Mon, 14 May 2012 16:29:53 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy9f-0002cw-VT for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:29:52 +0000 Received: from [85.158.143.99:47771] by server-2.bemta-4.messagelabs.com id 91/79-17550-FF231BF4; Mon, 14 May 2012 16:29:51 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-216.messagelabs.com!1337012988!21400446!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6052 invoked from network); 14 May 2012 16:29:49 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:29:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy9b-0002ik-CQ for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:29:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STy9b-00069b-Bh for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:29:47 +0000 Message-Id: Date: Mon, 14 May 2012 16:29:47 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] gntdev: adjust indentation (and fix bugs noticed by doing so) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Jan Beulich # Date 1336749568 -7200 # Node ID 1f738f0b706cfb76cb6d9077188f9d3a3ca498f2 # Parent c0e1133a1fc113be9c756c80167f8f55613d1ac9 gntdev: adjust indentation (and fix bugs noticed by doing so) By inverting two conditions, indentation can be decreased by one level for large code portions, thus improving legibility. In gntdev_mmap(), this made obvious that failure of vm_insert_page() was silently ignored rather than being propagated to the caller. In gntdev_clear_pte(), the final set_phys_to_machine() must not be called for the auto-translated case. Signed-off-by: Jan Beulich --- diff -r c0e1133a1fc1 -r 1f738f0b706c drivers/xen/gntdev/gntdev.c --- a/drivers/xen/gntdev/gntdev.c Fri May 11 17:17:40 2012 +0200 +++ b/drivers/xen/gntdev/gntdev.c Fri May 11 17:19:28 2012 +0200 @@ -577,85 +577,85 @@ static int gntdev_mmap (struct file *fli GNTDEV_INVALID_HANDLE; /* Now perform the mapping to user space. */ - if (!xen_feature(XENFEAT_auto_translated_physmap)) { - - /* NOT USING SHADOW PAGE TABLES. */ - /* In this case, we map the grant(s) straight into user - * space. - */ - - /* Get the machine address of the PTE for the user - * page. - */ - if ((ret = create_lookup_pte_addr(vma->vm_mm, - vma->vm_start - + (i << PAGE_SHIFT), - &ptep))) - { - printk(KERN_ERR "Error obtaining PTE pointer " - "(%d).\n", ret); - goto undo_map_out; - } - - /* Configure the map operation. */ - - /* The reference is to be used by host CPUs. */ - flags = GNTMAP_host_map; - - /* Specifies a user space mapping. */ - flags |= GNTMAP_application_map; - - /* The map request contains the machine address of the - * PTE to update. - */ - flags |= GNTMAP_contains_pte; - - if (!(vma->vm_flags & VM_WRITE)) - flags |= GNTMAP_readonly; - - gnttab_set_map_op(&op, ptep, flags, - private_data->grants[slot_index+i] - .u.valid.ref, - private_data->grants[slot_index+i] - .u.valid.domid); - - /* Carry out the mapping of the grant reference. */ - ret = HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, - &op, 1); - BUG_ON(ret); - if (op.status != GNTST_okay) { - printk(KERN_ERR "Error mapping the grant " - "reference into user space (%d). domid " - "= %d; ref = %d\n", op.status, - private_data->grants[slot_index+i].u - .valid.domid, - private_data->grants[slot_index+i].u - .valid.ref); - /* This should never happen after we've mapped into - * the kernel space. */ - BUG_ON(op.status == GNTST_eagain); - goto undo_map_out; - } - - /* Record the grant handle, for use in the unmap - * operation. - */ - private_data->grants[slot_index+i].u. - valid.user_handle = op.handle; - - /* Update p2m structure with the new mapping. */ - set_phys_to_machine(__pa(kernel_vaddr) >> PAGE_SHIFT, - FOREIGN_FRAME(private_data-> - grants[slot_index+i] - .u.valid.dev_bus_addr - >> PAGE_SHIFT)); - } else { + if (xen_feature(XENFEAT_auto_translated_physmap)) { /* USING SHADOW PAGE TABLES. */ /* In this case, we simply insert the page into the VM * area. */ ret = vm_insert_page(vma, user_vaddr, page); + if (!ret) + continue; + exit_ret = ret; + goto undo_map_out; } + /* NOT USING SHADOW PAGE TABLES. */ + /* In this case, we map the grant(s) straight into user + * space. + */ + + /* Get the machine address of the PTE for the user page. */ + if ((ret = create_lookup_pte_addr(vma->vm_mm, + vma->vm_start + + (i << PAGE_SHIFT), + &ptep))) + { + printk(KERN_ERR "Error obtaining PTE pointer (%d)\n", + ret); + goto undo_map_out; + } + + /* Configure the map operation. */ + + /* The reference is to be used by host CPUs. */ + flags = GNTMAP_host_map; + + /* Specifies a user space mapping. */ + flags |= GNTMAP_application_map; + + /* The map request contains the machine address of the + * PTE to update. + */ + flags |= GNTMAP_contains_pte; + + if (!(vma->vm_flags & VM_WRITE)) + flags |= GNTMAP_readonly; + + gnttab_set_map_op(&op, ptep, flags, + private_data->grants[slot_index+i] + .u.valid.ref, + private_data->grants[slot_index+i] + .u.valid.domid); + + /* Carry out the mapping of the grant reference. */ + ret = HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, + &op, 1); + BUG_ON(ret); + if (op.status != GNTST_okay) { + printk(KERN_ERR "Error mapping the grant reference " + "into user space (%d). domid = %d; ref = %d\n", + op.status, + private_data->grants[slot_index+i].u + .valid.domid, + private_data->grants[slot_index+i].u + .valid.ref); + /* This should never happen after we've mapped into + * the kernel space. */ + BUG_ON(op.status == GNTST_eagain); + goto undo_map_out; + } + + /* Record the grant handle, for use in the unmap + * operation. + */ + private_data->grants[slot_index+i].u.valid.user_handle + = op.handle; + + /* Update p2m structure with the new mapping. */ + set_phys_to_machine(__pa(kernel_vaddr) >> PAGE_SHIFT, + FOREIGN_FRAME(private_data-> + grants[slot_index+i] + .u.valid.dev_bus_addr + >> PAGE_SHIFT)); } exit_ret = 0; @@ -715,55 +715,52 @@ static pte_t gntdev_clear_pte(struct vm_ /* Only unmap grants if the slot has been mapped. This could be being * called from a failing mmap(). */ - if (private_data->grants[slot_index].state == GNTDEV_SLOT_MAPPED) { + if (private_data->grants[slot_index].state != GNTDEV_SLOT_MAPPED) { + pte_clear_full(vma->vm_mm, addr, ptep, is_fullmm); + return copy; + } - /* First, we clear the user space mapping, if it has been made. - */ - if (private_data->grants[slot_index].u.valid.user_handle != - GNTDEV_INVALID_HANDLE && - !xen_feature(XENFEAT_auto_translated_physmap)) { - /* NOT USING SHADOW PAGE TABLES. */ - gnttab_set_unmap_op(&op, ptep_to_machine(ptep), - GNTMAP_contains_pte, - private_data->grants[slot_index] - .u.valid.user_handle); - ret = HYPERVISOR_grant_table_op( - GNTTABOP_unmap_grant_ref, &op, 1); - BUG_ON(ret); - if (op.status != GNTST_okay) - printk("User unmap grant status = %d\n", - op.status); - } else { - /* USING SHADOW PAGE TABLES. */ - pte_clear_full(vma->vm_mm, addr, ptep, is_fullmm); - } - - /* Finally, we unmap the grant from kernel space. */ - gnttab_set_unmap_op(&op, - get_kernel_vaddr(private_data, slot_index), - GNTMAP_host_map, + /* First, we clear the user space mapping, if it has been made. + */ + if (private_data->grants[slot_index].u.valid.user_handle != + GNTDEV_INVALID_HANDLE && + !xen_feature(XENFEAT_auto_translated_physmap)) { + /* NOT USING SHADOW PAGE TABLES. */ + gnttab_set_unmap_op(&op, ptep_to_machine(ptep), + GNTMAP_contains_pte, private_data->grants[slot_index].u.valid - .kernel_handle); - ret = HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref, + .user_handle); + ret = HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref, &op, 1); BUG_ON(ret); if (op.status != GNTST_okay) - printk("Kernel unmap grant status = %d\n", op.status); + printk("User unmap grant status = %d\n", op.status); + } else { + /* USING SHADOW PAGE TABLES. */ + pte_clear_full(vma->vm_mm, addr, ptep, is_fullmm); + } + /* Finally, we unmap the grant from kernel space. */ + gnttab_set_unmap_op(&op, + get_kernel_vaddr(private_data, slot_index), + GNTMAP_host_map, + private_data->grants[slot_index].u.valid + .kernel_handle); + ret = HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref, &op, 1); + BUG_ON(ret); + if (op.status != GNTST_okay) + printk("Kernel unmap grant status = %d\n", op.status); - /* Return slot to the not-yet-mapped state, so that it may be - * mapped again, or removed by a subsequent ioctl. - */ - private_data->grants[slot_index].state = - GNTDEV_SLOT_NOT_YET_MAPPED; + /* Return slot to the not-yet-mapped state, so that it may be + * mapped again, or removed by a subsequent ioctl. + */ + private_data->grants[slot_index].state = GNTDEV_SLOT_NOT_YET_MAPPED; + if (!xen_feature(XENFEAT_auto_translated_physmap)) { /* Invalidate the physical to machine mapping for this page. */ set_phys_to_machine( page_to_pfn(private_data->foreign_pages[slot_index]), INVALID_P2M_ENTRY); - - } else { - pte_clear_full(vma->vm_mm, addr, ptep, is_fullmm); } return copy; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:29:54 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:29:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy9h-0002f0-OP; Mon, 14 May 2012 16:29:53 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy9f-0002cw-VT for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:29:52 +0000 Received: from [85.158.143.99:47771] by server-2.bemta-4.messagelabs.com id 91/79-17550-FF231BF4; Mon, 14 May 2012 16:29:51 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-216.messagelabs.com!1337012988!21400446!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6052 invoked from network); 14 May 2012 16:29:49 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:29:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STy9b-0002ik-CQ for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:29:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STy9b-00069b-Bh for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:29:47 +0000 Message-Id: Date: Mon, 14 May 2012 16:29:47 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] gntdev: adjust indentation (and fix bugs noticed by doing so) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Jan Beulich # Date 1336749568 -7200 # Node ID 1f738f0b706cfb76cb6d9077188f9d3a3ca498f2 # Parent c0e1133a1fc113be9c756c80167f8f55613d1ac9 gntdev: adjust indentation (and fix bugs noticed by doing so) By inverting two conditions, indentation can be decreased by one level for large code portions, thus improving legibility. In gntdev_mmap(), this made obvious that failure of vm_insert_page() was silently ignored rather than being propagated to the caller. In gntdev_clear_pte(), the final set_phys_to_machine() must not be called for the auto-translated case. Signed-off-by: Jan Beulich --- diff -r c0e1133a1fc1 -r 1f738f0b706c drivers/xen/gntdev/gntdev.c --- a/drivers/xen/gntdev/gntdev.c Fri May 11 17:17:40 2012 +0200 +++ b/drivers/xen/gntdev/gntdev.c Fri May 11 17:19:28 2012 +0200 @@ -577,85 +577,85 @@ static int gntdev_mmap (struct file *fli GNTDEV_INVALID_HANDLE; /* Now perform the mapping to user space. */ - if (!xen_feature(XENFEAT_auto_translated_physmap)) { - - /* NOT USING SHADOW PAGE TABLES. */ - /* In this case, we map the grant(s) straight into user - * space. - */ - - /* Get the machine address of the PTE for the user - * page. - */ - if ((ret = create_lookup_pte_addr(vma->vm_mm, - vma->vm_start - + (i << PAGE_SHIFT), - &ptep))) - { - printk(KERN_ERR "Error obtaining PTE pointer " - "(%d).\n", ret); - goto undo_map_out; - } - - /* Configure the map operation. */ - - /* The reference is to be used by host CPUs. */ - flags = GNTMAP_host_map; - - /* Specifies a user space mapping. */ - flags |= GNTMAP_application_map; - - /* The map request contains the machine address of the - * PTE to update. - */ - flags |= GNTMAP_contains_pte; - - if (!(vma->vm_flags & VM_WRITE)) - flags |= GNTMAP_readonly; - - gnttab_set_map_op(&op, ptep, flags, - private_data->grants[slot_index+i] - .u.valid.ref, - private_data->grants[slot_index+i] - .u.valid.domid); - - /* Carry out the mapping of the grant reference. */ - ret = HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, - &op, 1); - BUG_ON(ret); - if (op.status != GNTST_okay) { - printk(KERN_ERR "Error mapping the grant " - "reference into user space (%d). domid " - "= %d; ref = %d\n", op.status, - private_data->grants[slot_index+i].u - .valid.domid, - private_data->grants[slot_index+i].u - .valid.ref); - /* This should never happen after we've mapped into - * the kernel space. */ - BUG_ON(op.status == GNTST_eagain); - goto undo_map_out; - } - - /* Record the grant handle, for use in the unmap - * operation. - */ - private_data->grants[slot_index+i].u. - valid.user_handle = op.handle; - - /* Update p2m structure with the new mapping. */ - set_phys_to_machine(__pa(kernel_vaddr) >> PAGE_SHIFT, - FOREIGN_FRAME(private_data-> - grants[slot_index+i] - .u.valid.dev_bus_addr - >> PAGE_SHIFT)); - } else { + if (xen_feature(XENFEAT_auto_translated_physmap)) { /* USING SHADOW PAGE TABLES. */ /* In this case, we simply insert the page into the VM * area. */ ret = vm_insert_page(vma, user_vaddr, page); + if (!ret) + continue; + exit_ret = ret; + goto undo_map_out; } + /* NOT USING SHADOW PAGE TABLES. */ + /* In this case, we map the grant(s) straight into user + * space. + */ + + /* Get the machine address of the PTE for the user page. */ + if ((ret = create_lookup_pte_addr(vma->vm_mm, + vma->vm_start + + (i << PAGE_SHIFT), + &ptep))) + { + printk(KERN_ERR "Error obtaining PTE pointer (%d)\n", + ret); + goto undo_map_out; + } + + /* Configure the map operation. */ + + /* The reference is to be used by host CPUs. */ + flags = GNTMAP_host_map; + + /* Specifies a user space mapping. */ + flags |= GNTMAP_application_map; + + /* The map request contains the machine address of the + * PTE to update. + */ + flags |= GNTMAP_contains_pte; + + if (!(vma->vm_flags & VM_WRITE)) + flags |= GNTMAP_readonly; + + gnttab_set_map_op(&op, ptep, flags, + private_data->grants[slot_index+i] + .u.valid.ref, + private_data->grants[slot_index+i] + .u.valid.domid); + + /* Carry out the mapping of the grant reference. */ + ret = HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, + &op, 1); + BUG_ON(ret); + if (op.status != GNTST_okay) { + printk(KERN_ERR "Error mapping the grant reference " + "into user space (%d). domid = %d; ref = %d\n", + op.status, + private_data->grants[slot_index+i].u + .valid.domid, + private_data->grants[slot_index+i].u + .valid.ref); + /* This should never happen after we've mapped into + * the kernel space. */ + BUG_ON(op.status == GNTST_eagain); + goto undo_map_out; + } + + /* Record the grant handle, for use in the unmap + * operation. + */ + private_data->grants[slot_index+i].u.valid.user_handle + = op.handle; + + /* Update p2m structure with the new mapping. */ + set_phys_to_machine(__pa(kernel_vaddr) >> PAGE_SHIFT, + FOREIGN_FRAME(private_data-> + grants[slot_index+i] + .u.valid.dev_bus_addr + >> PAGE_SHIFT)); } exit_ret = 0; @@ -715,55 +715,52 @@ static pte_t gntdev_clear_pte(struct vm_ /* Only unmap grants if the slot has been mapped. This could be being * called from a failing mmap(). */ - if (private_data->grants[slot_index].state == GNTDEV_SLOT_MAPPED) { + if (private_data->grants[slot_index].state != GNTDEV_SLOT_MAPPED) { + pte_clear_full(vma->vm_mm, addr, ptep, is_fullmm); + return copy; + } - /* First, we clear the user space mapping, if it has been made. - */ - if (private_data->grants[slot_index].u.valid.user_handle != - GNTDEV_INVALID_HANDLE && - !xen_feature(XENFEAT_auto_translated_physmap)) { - /* NOT USING SHADOW PAGE TABLES. */ - gnttab_set_unmap_op(&op, ptep_to_machine(ptep), - GNTMAP_contains_pte, - private_data->grants[slot_index] - .u.valid.user_handle); - ret = HYPERVISOR_grant_table_op( - GNTTABOP_unmap_grant_ref, &op, 1); - BUG_ON(ret); - if (op.status != GNTST_okay) - printk("User unmap grant status = %d\n", - op.status); - } else { - /* USING SHADOW PAGE TABLES. */ - pte_clear_full(vma->vm_mm, addr, ptep, is_fullmm); - } - - /* Finally, we unmap the grant from kernel space. */ - gnttab_set_unmap_op(&op, - get_kernel_vaddr(private_data, slot_index), - GNTMAP_host_map, + /* First, we clear the user space mapping, if it has been made. + */ + if (private_data->grants[slot_index].u.valid.user_handle != + GNTDEV_INVALID_HANDLE && + !xen_feature(XENFEAT_auto_translated_physmap)) { + /* NOT USING SHADOW PAGE TABLES. */ + gnttab_set_unmap_op(&op, ptep_to_machine(ptep), + GNTMAP_contains_pte, private_data->grants[slot_index].u.valid - .kernel_handle); - ret = HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref, + .user_handle); + ret = HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref, &op, 1); BUG_ON(ret); if (op.status != GNTST_okay) - printk("Kernel unmap grant status = %d\n", op.status); + printk("User unmap grant status = %d\n", op.status); + } else { + /* USING SHADOW PAGE TABLES. */ + pte_clear_full(vma->vm_mm, addr, ptep, is_fullmm); + } + /* Finally, we unmap the grant from kernel space. */ + gnttab_set_unmap_op(&op, + get_kernel_vaddr(private_data, slot_index), + GNTMAP_host_map, + private_data->grants[slot_index].u.valid + .kernel_handle); + ret = HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref, &op, 1); + BUG_ON(ret); + if (op.status != GNTST_okay) + printk("Kernel unmap grant status = %d\n", op.status); - /* Return slot to the not-yet-mapped state, so that it may be - * mapped again, or removed by a subsequent ioctl. - */ - private_data->grants[slot_index].state = - GNTDEV_SLOT_NOT_YET_MAPPED; + /* Return slot to the not-yet-mapped state, so that it may be + * mapped again, or removed by a subsequent ioctl. + */ + private_data->grants[slot_index].state = GNTDEV_SLOT_NOT_YET_MAPPED; + if (!xen_feature(XENFEAT_auto_translated_physmap)) { /* Invalidate the physical to machine mapping for this page. */ set_phys_to_machine( page_to_pfn(private_data->foreign_pages[slot_index]), INVALID_P2M_ENTRY); - - } else { - pte_clear_full(vma->vm_mm, addr, ptep, is_fullmm); } return copy; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:31:56 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:31:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBf-0002yy-Ox; Mon, 14 May 2012 16:31:55 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBf-0002ys-Da for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:55 +0000 Received: from [85.158.143.99:58253] by server-1.bemta-4.messagelabs.com id 0B/48-20925-A7331BF4; Mon, 14 May 2012 16:31:54 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-216.messagelabs.com!1337013112!22700702!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17653 invoked from network); 14 May 2012 16:31:53 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:31:53 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBb-0002nC-Lj for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBb-0006SY-Kj for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:51 +0000 Message-Id: Date: Mon, 14 May 2012 16:31:51 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] Makefile: Some updates to uninstall X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Fabio Fantoni # Date 1335169615 -7200 # Node ID 1a8b47d80157d8671ccf5049c7e56ad2be339795 # Parent 274e5accd62db09a7f703400c8720f7fdd95551a Makefile: Some updates to uninstall Signed-off-by: Fabio Fantoni Committed-by: Ian Jackson --- diff -r 274e5accd62d -r 1a8b47d80157 Makefile --- a/Makefile Fri Apr 20 09:49:06 2012 +0100 +++ b/Makefile Mon Apr 23 10:26:55 2012 +0200 @@ -220,13 +220,13 @@ help: uninstall: D=$(DESTDIR) uninstall: [ -d $(D)$(XEN_CONFIG_DIR) ] && mv -f $(D)$(XEN_CONFIG_DIR) $(D)$(XEN_CONFIG_DIR).old-`date +%s` || true - rm -rf $(D)$(CONFIG_DIR)/init.d/xend* + rm -rf $(D)$(CONFIG_DIR)/init.d/xendomains $(D)$(CONFIG_DIR)/init.d/xend + rm -rf $(D)$(CONFIG_DIR)/init.d/xencommons $(D)$(CONFIG_DIR)/init.d/xen-watchdog rm -rf $(D)$(CONFIG_DIR)/hotplug/xen-backend.agent rm -f $(D)$(CONFIG_DIR)/udev/rules.d/xen-backend.rules - rm -f $(D)$(CONFIG_DIR)/udev/xen-backend.rules rm -f $(D)$(CONFIG_DIR)/udev/rules.d/xend.rules - rm -f $(D)$(CONFIG_DIR)/udev/xend.rules rm -f $(D)$(SYSCONFIG_DIR)/xendomains + rm -f $(D)$(SYSCONFIG_DIR)/xencommons rm -rf $(D)/var/run/xen* $(D)/var/lib/xen* rm -rf $(D)/boot/*xen* rm -rf $(D)/lib/modules/*xen* @@ -236,11 +236,16 @@ uninstall: rm -rf $(D)$(BINDIR)/pygrub rm -rf $(D)$(BINDIR)/setsize $(D)$(BINDIR)/tbctl rm -rf $(D)$(BINDIR)/xsls - rm -rf $(D)$(INCLUDEDIR)/xenctrl.h $(D)$(INCLUDEDIR)/xenguest.h + rm -rf $(D)$(BINDIR)/xenstore* $(D)$(BINDIR)/xentrace* + rm -rf $(D)$(BINDIR)/xen-detect $(D)$(BINDIR)/xencons + rm -rf $(D)$(BINDIR)/xenpvnetboot $(D)$(BINDIR)/qemu-*-xen + rm -rf $(D)$(INCLUDEDIR)/xenctrl* $(D)$(INCLUDEDIR)/xenguest.h rm -rf $(D)$(INCLUDEDIR)/xs_lib.h $(D)$(INCLUDEDIR)/xs.h rm -rf $(D)$(INCLUDEDIR)/xen + rm -rf $(D)$(INCLUDEDIR)/_libxl* $(D)$(INCLUDEDIR)/libxl* + rm -rf $(D)$(INCLUDEDIR)/xenstat.h $(D)$(INCLUDEDIR)/xentoollog.h rm -rf $(D)$(LIBDIR)/libxenctrl* $(D)$(LIBDIR)/libxenguest* - rm -rf $(D)$(LIBDIR)/libxenstore* + rm -rf $(D)$(LIBDIR)/libxenstore* $(D)$(LIBDIR)/libxlutil* rm -rf $(D)$(LIBDIR)/python/xen $(D)$(LIBDIR)/python/grub rm -rf $(D)$(LIBDIR)/xen/ rm -rf $(D)$(LIBEXEC)/xen* @@ -248,6 +253,7 @@ uninstall: rm -rf $(D)$(SBINDIR)/xen* $(D)$(SBINDIR)/netfix $(D)$(SBINDIR)/xm rm -rf $(D)$(SHAREDIR)/doc/xen rm -rf $(D)$(SHAREDIR)/xen + rm -rf $(D)$(SHAREDIR)/qemu-xen rm -rf $(D)$(MAN1DIR)/xen* rm -rf $(D)$(MAN8DIR)/xen* rm -rf $(D)/boot/tboot* _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:31:56 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:31:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBf-0002yy-Ox; Mon, 14 May 2012 16:31:55 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBf-0002ys-Da for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:55 +0000 Received: from [85.158.143.99:58253] by server-1.bemta-4.messagelabs.com id 0B/48-20925-A7331BF4; Mon, 14 May 2012 16:31:54 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-216.messagelabs.com!1337013112!22700702!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17653 invoked from network); 14 May 2012 16:31:53 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:31:53 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBb-0002nC-Lj for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBb-0006SY-Kj for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:51 +0000 Message-Id: Date: Mon, 14 May 2012 16:31:51 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] Makefile: Some updates to uninstall X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Fabio Fantoni # Date 1335169615 -7200 # Node ID 1a8b47d80157d8671ccf5049c7e56ad2be339795 # Parent 274e5accd62db09a7f703400c8720f7fdd95551a Makefile: Some updates to uninstall Signed-off-by: Fabio Fantoni Committed-by: Ian Jackson --- diff -r 274e5accd62d -r 1a8b47d80157 Makefile --- a/Makefile Fri Apr 20 09:49:06 2012 +0100 +++ b/Makefile Mon Apr 23 10:26:55 2012 +0200 @@ -220,13 +220,13 @@ help: uninstall: D=$(DESTDIR) uninstall: [ -d $(D)$(XEN_CONFIG_DIR) ] && mv -f $(D)$(XEN_CONFIG_DIR) $(D)$(XEN_CONFIG_DIR).old-`date +%s` || true - rm -rf $(D)$(CONFIG_DIR)/init.d/xend* + rm -rf $(D)$(CONFIG_DIR)/init.d/xendomains $(D)$(CONFIG_DIR)/init.d/xend + rm -rf $(D)$(CONFIG_DIR)/init.d/xencommons $(D)$(CONFIG_DIR)/init.d/xen-watchdog rm -rf $(D)$(CONFIG_DIR)/hotplug/xen-backend.agent rm -f $(D)$(CONFIG_DIR)/udev/rules.d/xen-backend.rules - rm -f $(D)$(CONFIG_DIR)/udev/xen-backend.rules rm -f $(D)$(CONFIG_DIR)/udev/rules.d/xend.rules - rm -f $(D)$(CONFIG_DIR)/udev/xend.rules rm -f $(D)$(SYSCONFIG_DIR)/xendomains + rm -f $(D)$(SYSCONFIG_DIR)/xencommons rm -rf $(D)/var/run/xen* $(D)/var/lib/xen* rm -rf $(D)/boot/*xen* rm -rf $(D)/lib/modules/*xen* @@ -236,11 +236,16 @@ uninstall: rm -rf $(D)$(BINDIR)/pygrub rm -rf $(D)$(BINDIR)/setsize $(D)$(BINDIR)/tbctl rm -rf $(D)$(BINDIR)/xsls - rm -rf $(D)$(INCLUDEDIR)/xenctrl.h $(D)$(INCLUDEDIR)/xenguest.h + rm -rf $(D)$(BINDIR)/xenstore* $(D)$(BINDIR)/xentrace* + rm -rf $(D)$(BINDIR)/xen-detect $(D)$(BINDIR)/xencons + rm -rf $(D)$(BINDIR)/xenpvnetboot $(D)$(BINDIR)/qemu-*-xen + rm -rf $(D)$(INCLUDEDIR)/xenctrl* $(D)$(INCLUDEDIR)/xenguest.h rm -rf $(D)$(INCLUDEDIR)/xs_lib.h $(D)$(INCLUDEDIR)/xs.h rm -rf $(D)$(INCLUDEDIR)/xen + rm -rf $(D)$(INCLUDEDIR)/_libxl* $(D)$(INCLUDEDIR)/libxl* + rm -rf $(D)$(INCLUDEDIR)/xenstat.h $(D)$(INCLUDEDIR)/xentoollog.h rm -rf $(D)$(LIBDIR)/libxenctrl* $(D)$(LIBDIR)/libxenguest* - rm -rf $(D)$(LIBDIR)/libxenstore* + rm -rf $(D)$(LIBDIR)/libxenstore* $(D)$(LIBDIR)/libxlutil* rm -rf $(D)$(LIBDIR)/python/xen $(D)$(LIBDIR)/python/grub rm -rf $(D)$(LIBDIR)/xen/ rm -rf $(D)$(LIBEXEC)/xen* @@ -248,6 +253,7 @@ uninstall: rm -rf $(D)$(SBINDIR)/xen* $(D)$(SBINDIR)/netfix $(D)$(SBINDIR)/xm rm -rf $(D)$(SHAREDIR)/doc/xen rm -rf $(D)$(SHAREDIR)/xen + rm -rf $(D)$(SHAREDIR)/qemu-xen rm -rf $(D)$(MAN1DIR)/xen* rm -rf $(D)$(MAN8DIR)/xen* rm -rf $(D)/boot/tboot* _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:31:58 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:31:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBg-0002zX-Re; Mon, 14 May 2012 16:31:56 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBf-0002ys-Rg for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:55 +0000 Received: from [85.158.143.99:58281] by server-1.bemta-4.messagelabs.com id 2F/48-20925-B7331BF4; Mon, 14 May 2012 16:31:55 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-11.tower-216.messagelabs.com!1337013113!20417869!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14909 invoked from network); 14 May 2012 16:31:54 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:31:54 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBc-0002nI-LZ for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBc-0006T2-Kr for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:52 +0000 Message-Id: Date: Mon, 14 May 2012 16:31:52 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: use qemu-xen with PV guests by default X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Stefano Stabellini # Date 1335278930 -3600 # Node ID a095e157f280d62562b9ee5a37d57add7c74ff65 # Parent cd7e5479ed828cff4a17125367ddaad6d0a73039 libxl: use qemu-xen with PV guests by default qemu-xen offers better disk performances than qemu-xen-traditional because it supports Linux native AIO: use it for PV guests if it is available. Signed-off-by: Stefano Stabellini Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r cd7e5479ed82 -r a095e157f280 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Tue Apr 24 14:31:36 2012 +0100 +++ b/tools/libxl/libxl_create.c Tue Apr 24 15:48:50 2012 +0100 @@ -71,9 +71,34 @@ int libxl__domain_build_info_setdefault( b_info->type != LIBXL_DOMAIN_TYPE_PV) return ERROR_INVAL; - if (!b_info->device_model_version) - b_info->device_model_version = - LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL; + libxl_defbool_setdefault(&b_info->device_model_stubdomain, false); + + if (!b_info->device_model_version) { + if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) + b_info->device_model_version = + LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL; + else { + const char *dm; + int rc; + + b_info->device_model_version = + LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN; + dm = libxl__domain_device_model(gc, b_info); + rc = access(dm, X_OK); + if (rc < 0) { + /* qemu-xen unavailable, use qemu-xen-traditional */ + if (errno == ENOENT) { + LIBXL__LOG_ERRNO(CTX, XTL_VERBOSE, "qemu-xen is unavailable" + ", use qemu-xen-traditional instead"); + b_info->device_model_version = + LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL; + } else { + LIBXL__LOG_ERRNO(CTX, XTL_ERROR, "qemu-xen access error"); + return ERROR_FAIL; + } + } + } + } if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) { if (!b_info->u.hvm.bios) @@ -99,8 +124,6 @@ int libxl__domain_build_info_setdefault( } } - libxl_defbool_setdefault(&b_info->device_model_stubdomain, false); - if (b_info->type == LIBXL_DOMAIN_TYPE_HVM && b_info->device_model_version != LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL && _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:31:58 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:31:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBg-0002zX-Re; Mon, 14 May 2012 16:31:56 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBf-0002ys-Rg for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:55 +0000 Received: from [85.158.143.99:58281] by server-1.bemta-4.messagelabs.com id 2F/48-20925-B7331BF4; Mon, 14 May 2012 16:31:55 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-11.tower-216.messagelabs.com!1337013113!20417869!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14909 invoked from network); 14 May 2012 16:31:54 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:31:54 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBc-0002nI-LZ for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBc-0006T2-Kr for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:52 +0000 Message-Id: Date: Mon, 14 May 2012 16:31:52 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: use qemu-xen with PV guests by default X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Stefano Stabellini # Date 1335278930 -3600 # Node ID a095e157f280d62562b9ee5a37d57add7c74ff65 # Parent cd7e5479ed828cff4a17125367ddaad6d0a73039 libxl: use qemu-xen with PV guests by default qemu-xen offers better disk performances than qemu-xen-traditional because it supports Linux native AIO: use it for PV guests if it is available. Signed-off-by: Stefano Stabellini Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r cd7e5479ed82 -r a095e157f280 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Tue Apr 24 14:31:36 2012 +0100 +++ b/tools/libxl/libxl_create.c Tue Apr 24 15:48:50 2012 +0100 @@ -71,9 +71,34 @@ int libxl__domain_build_info_setdefault( b_info->type != LIBXL_DOMAIN_TYPE_PV) return ERROR_INVAL; - if (!b_info->device_model_version) - b_info->device_model_version = - LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL; + libxl_defbool_setdefault(&b_info->device_model_stubdomain, false); + + if (!b_info->device_model_version) { + if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) + b_info->device_model_version = + LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL; + else { + const char *dm; + int rc; + + b_info->device_model_version = + LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN; + dm = libxl__domain_device_model(gc, b_info); + rc = access(dm, X_OK); + if (rc < 0) { + /* qemu-xen unavailable, use qemu-xen-traditional */ + if (errno == ENOENT) { + LIBXL__LOG_ERRNO(CTX, XTL_VERBOSE, "qemu-xen is unavailable" + ", use qemu-xen-traditional instead"); + b_info->device_model_version = + LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL; + } else { + LIBXL__LOG_ERRNO(CTX, XTL_ERROR, "qemu-xen access error"); + return ERROR_FAIL; + } + } + } + } if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) { if (!b_info->u.hvm.bios) @@ -99,8 +124,6 @@ int libxl__domain_build_info_setdefault( } } - libxl_defbool_setdefault(&b_info->device_model_stubdomain, false); - if (b_info->type == LIBXL_DOMAIN_TYPE_HVM && b_info->device_model_version != LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL && _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:31:58 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:31:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBi-00030L-1P; Mon, 14 May 2012 16:31:58 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBh-0002zD-13 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:57 +0000 Received: from [85.158.139.83:28008] by server-1.bemta-5.messagelabs.com id 4B/62-19304-C7331BF4; Mon, 14 May 2012 16:31:56 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-182.messagelabs.com!1337013112!28332091!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1057 invoked from network); 14 May 2012 16:31:54 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:31:54 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBc-0002nF-5U for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBc-0006Sn-4q for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:52 +0000 Message-Id: Date: Mon, 14 May 2012 16:31:51 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxc: Replace alloca() with mmap() for large array sizes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Aravindh Puthiyaparambil # Date 1335274296 -3600 # Node ID cd7e5479ed828cff4a17125367ddaad6d0a73039 # Parent 1a8b47d80157d8671ccf5049c7e56ad2be339795 libxc: Replace alloca() with mmap() for large array sizes Replace alloca() with mmap() for array sizes greater than a page in xc_linux_osdep.c. When mapping in large amounts of pages (in the GB range) from a guest in to Dom0 using xc_map_foreign_bulk(), a segfault occurs in the libxc client application. This is because the pfn array in linux_privcmd_map_foreign_bulk() is being allocated using alloca() and the subsequent memcpy causes the stack to blow. This patch replaces the alloca() with mmap() for pfn array sizes greater than a page. Fix an error print with the correct function name. Do the same for the map array in linux_gnttab_grant_map() Signed-off-by: Aravindh Puthiyaparambil Acked-by: Andres Lagar-Cavilla Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 1a8b47d80157 -r cd7e5479ed82 tools/libxc/xc_linux_osdep.c --- a/tools/libxc/xc_linux_osdep.c Mon Apr 23 10:26:55 2012 +0200 +++ b/tools/libxc/xc_linux_osdep.c Tue Apr 24 14:31:36 2012 +0100 @@ -39,6 +39,7 @@ #include "xenctrl.h" #include "xenctrlosdep.h" +#define ROUNDUP(_x,_w) (((unsigned long)(_x)+(1UL<<(_w))-1) & ~((1UL<<(_w))-1)) #define ERROR(_m, _a...) xc_osdep_log(xch,XTL_ERROR,XC_INTERNAL_ERROR,_m , ## _a ) #define PERROR(_m, _a...) xc_osdep_log(xch,XTL_ERROR,XC_INTERNAL_ERROR,_m \ " (%d = %s)", ## _a , errno, xc_strerror(xch, errno)) @@ -258,7 +259,7 @@ static void *linux_privcmd_map_foreign_b fd, 0); if ( addr == MAP_FAILED ) { - PERROR("xc_map_foreign_batch: mmap failed"); + PERROR("xc_map_foreign_bulk: mmap failed"); return NULL; } @@ -286,7 +287,21 @@ static void *linux_privcmd_map_foreign_b * IOCTL_PRIVCMD_MMAPBATCH. */ privcmd_mmapbatch_t ioctlx; - xen_pfn_t *pfn = alloca(num * sizeof(*pfn)); + xen_pfn_t *pfn; + unsigned int pfn_arr_size = ROUNDUP((num * sizeof(*pfn)), XC_PAGE_SHIFT); + + if ( pfn_arr_size <= XC_PAGE_SIZE ) + pfn = alloca(num * sizeof(*pfn)); + else + { + pfn = mmap(NULL, pfn_arr_size, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANON | MAP_POPULATE, -1, 0); + if ( pfn == MAP_FAILED ) + { + PERROR("xc_map_foreign_bulk: mmap of pfn array failed"); + return NULL; + } + } memcpy(pfn, arr, num * sizeof(*arr)); @@ -328,6 +343,9 @@ static void *linux_privcmd_map_foreign_b break; } + if ( pfn_arr_size > XC_PAGE_SIZE ) + munmap(pfn, pfn_arr_size); + if ( rc == -ENOENT && i == num ) rc = 0; else if ( rc ) @@ -549,6 +567,9 @@ static void *linux_gnttab_grant_map(xc_g { int fd = (int)h; struct ioctl_gntdev_map_grant_ref *map; + unsigned int map_size = ROUNDUP((sizeof(*map) + (count - 1) * + sizeof(struct ioctl_gntdev_map_grant_ref)), + XC_PAGE_SHIFT); void *addr = NULL; int domids_stride = 1; int i; @@ -556,8 +577,19 @@ static void *linux_gnttab_grant_map(xc_g if (flags & XC_GRANT_MAP_SINGLE_DOMAIN) domids_stride = 0; - map = alloca(sizeof(*map) + - (count - 1) * sizeof(struct ioctl_gntdev_map_grant_ref)); + if ( map_size <= XC_PAGE_SIZE ) + map = alloca(sizeof(*map) + + (count - 1) * sizeof(struct ioctl_gntdev_map_grant_ref)); + else + { + map = mmap(NULL, map_size, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANON | MAP_POPULATE, -1, 0); + if ( map == MAP_FAILED ) + { + PERROR("linux_gnttab_grant_map: mmap of map failed"); + return NULL; + } + } for ( i = 0; i < count; i++ ) { @@ -628,6 +660,8 @@ static void *linux_gnttab_grant_map(xc_g } out: + if ( map_size > XC_PAGE_SIZE ) + munmap(map, map_size); return addr; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:31:58 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:31:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBi-00030L-1P; Mon, 14 May 2012 16:31:58 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBh-0002zD-13 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:57 +0000 Received: from [85.158.139.83:28008] by server-1.bemta-5.messagelabs.com id 4B/62-19304-C7331BF4; Mon, 14 May 2012 16:31:56 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-182.messagelabs.com!1337013112!28332091!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1057 invoked from network); 14 May 2012 16:31:54 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:31:54 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBc-0002nF-5U for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBc-0006Sn-4q for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:52 +0000 Message-Id: Date: Mon, 14 May 2012 16:31:51 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxc: Replace alloca() with mmap() for large array sizes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Aravindh Puthiyaparambil # Date 1335274296 -3600 # Node ID cd7e5479ed828cff4a17125367ddaad6d0a73039 # Parent 1a8b47d80157d8671ccf5049c7e56ad2be339795 libxc: Replace alloca() with mmap() for large array sizes Replace alloca() with mmap() for array sizes greater than a page in xc_linux_osdep.c. When mapping in large amounts of pages (in the GB range) from a guest in to Dom0 using xc_map_foreign_bulk(), a segfault occurs in the libxc client application. This is because the pfn array in linux_privcmd_map_foreign_bulk() is being allocated using alloca() and the subsequent memcpy causes the stack to blow. This patch replaces the alloca() with mmap() for pfn array sizes greater than a page. Fix an error print with the correct function name. Do the same for the map array in linux_gnttab_grant_map() Signed-off-by: Aravindh Puthiyaparambil Acked-by: Andres Lagar-Cavilla Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 1a8b47d80157 -r cd7e5479ed82 tools/libxc/xc_linux_osdep.c --- a/tools/libxc/xc_linux_osdep.c Mon Apr 23 10:26:55 2012 +0200 +++ b/tools/libxc/xc_linux_osdep.c Tue Apr 24 14:31:36 2012 +0100 @@ -39,6 +39,7 @@ #include "xenctrl.h" #include "xenctrlosdep.h" +#define ROUNDUP(_x,_w) (((unsigned long)(_x)+(1UL<<(_w))-1) & ~((1UL<<(_w))-1)) #define ERROR(_m, _a...) xc_osdep_log(xch,XTL_ERROR,XC_INTERNAL_ERROR,_m , ## _a ) #define PERROR(_m, _a...) xc_osdep_log(xch,XTL_ERROR,XC_INTERNAL_ERROR,_m \ " (%d = %s)", ## _a , errno, xc_strerror(xch, errno)) @@ -258,7 +259,7 @@ static void *linux_privcmd_map_foreign_b fd, 0); if ( addr == MAP_FAILED ) { - PERROR("xc_map_foreign_batch: mmap failed"); + PERROR("xc_map_foreign_bulk: mmap failed"); return NULL; } @@ -286,7 +287,21 @@ static void *linux_privcmd_map_foreign_b * IOCTL_PRIVCMD_MMAPBATCH. */ privcmd_mmapbatch_t ioctlx; - xen_pfn_t *pfn = alloca(num * sizeof(*pfn)); + xen_pfn_t *pfn; + unsigned int pfn_arr_size = ROUNDUP((num * sizeof(*pfn)), XC_PAGE_SHIFT); + + if ( pfn_arr_size <= XC_PAGE_SIZE ) + pfn = alloca(num * sizeof(*pfn)); + else + { + pfn = mmap(NULL, pfn_arr_size, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANON | MAP_POPULATE, -1, 0); + if ( pfn == MAP_FAILED ) + { + PERROR("xc_map_foreign_bulk: mmap of pfn array failed"); + return NULL; + } + } memcpy(pfn, arr, num * sizeof(*arr)); @@ -328,6 +343,9 @@ static void *linux_privcmd_map_foreign_b break; } + if ( pfn_arr_size > XC_PAGE_SIZE ) + munmap(pfn, pfn_arr_size); + if ( rc == -ENOENT && i == num ) rc = 0; else if ( rc ) @@ -549,6 +567,9 @@ static void *linux_gnttab_grant_map(xc_g { int fd = (int)h; struct ioctl_gntdev_map_grant_ref *map; + unsigned int map_size = ROUNDUP((sizeof(*map) + (count - 1) * + sizeof(struct ioctl_gntdev_map_grant_ref)), + XC_PAGE_SHIFT); void *addr = NULL; int domids_stride = 1; int i; @@ -556,8 +577,19 @@ static void *linux_gnttab_grant_map(xc_g if (flags & XC_GRANT_MAP_SINGLE_DOMAIN) domids_stride = 0; - map = alloca(sizeof(*map) + - (count - 1) * sizeof(struct ioctl_gntdev_map_grant_ref)); + if ( map_size <= XC_PAGE_SIZE ) + map = alloca(sizeof(*map) + + (count - 1) * sizeof(struct ioctl_gntdev_map_grant_ref)); + else + { + map = mmap(NULL, map_size, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANON | MAP_POPULATE, -1, 0); + if ( map == MAP_FAILED ) + { + PERROR("linux_gnttab_grant_map: mmap of map failed"); + return NULL; + } + } for ( i = 0; i < count; i++ ) { @@ -628,6 +660,8 @@ static void *linux_gnttab_grant_map(xc_g } out: + if ( map_size > XC_PAGE_SIZE ) + munmap(map, map_size); return addr; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:31:58 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:31:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBi-00030S-4J; Mon, 14 May 2012 16:31:58 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBh-0002zS-6P for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:57 +0000 Received: from [193.109.254.147:7192] by server-11.bemta-14.messagelabs.com id C4/DB-05858-C7331BF4; Mon, 14 May 2012 16:31:56 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-27.messagelabs.com!1337013114!4049524!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15945 invoked from network); 14 May 2012 16:31:55 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:31:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBe-0002nR-85 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBe-0006Tl-7U for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:54 +0000 Message-Id: Date: Mon, 14 May 2012 16:31:53 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] autoconf: add ovmf, rombios and seabios and configure options X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Roger Pau Monne # Date 1335284917 -3600 # Node ID 0342e9ff1adc923826ed944b0655076233136e89 # Parent fb39cccb50e5430dce1ec612fd745b85061ebb10 autoconf: add ovmf, rombios and seabios and configure options Move this hardcoded options from Config.mk to config/Tools.mk and add the appropiate configure options. Signed-off-by: Roger Pau Monne Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r fb39cccb50e5 -r 0342e9ff1adc Config.mk --- a/Config.mk Tue Apr 24 17:12:22 2012 +0100 +++ b/Config.mk Tue Apr 24 17:28:37 2012 +0100 @@ -208,10 +208,6 @@ SEABIOS_UPSTREAM_TAG ?= rel-1.6.3.2 ETHERBOOT_NICS ?= rtl8139 8086100e -CONFIG_OVMF ?= n -CONFIG_ROMBIOS ?= y -CONFIG_SEABIOS ?= y - # Specify which qemu-dm to use. This may be `ioemu' to use the old # Mercurial in-tree version, or a local directory, or a git URL. # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git diff -r fb39cccb50e5 -r 0342e9ff1adc config/Tools.mk.in --- a/config/Tools.mk.in Tue Apr 24 17:12:22 2012 +0100 +++ b/config/Tools.mk.in Tue Apr 24 17:28:37 2012 +0100 @@ -44,6 +44,9 @@ PYTHON_TOOLS := @pythontools@ OCAML_TOOLS := @ocamltools@ CONFIG_MINITERM := @miniterm@ CONFIG_LOMOUNT := @lomount@ +CONFIG_OVMF := @ovmf@ +CONFIG_ROMBIOS := @rombios@ +CONFIG_SEABIOS := @seabios@ #System options CONFIG_SYSTEM_LIBAIO:= @system_aio@ diff -r fb39cccb50e5 -r 0342e9ff1adc tools/configure --- a/tools/configure Tue Apr 24 17:12:22 2012 +0100 +++ b/tools/configure Tue Apr 24 17:28:37 2012 +0100 @@ -653,6 +653,9 @@ APPEND_INCLUDES PREPEND_LIB PREPEND_INCLUDES debug +seabios +rombios +ovmf lomount miniterm ocamltools @@ -728,6 +731,9 @@ enable_pythontools enable_ocamltools enable_miniterm enable_lomount +enable_ovmf +enable_rombios +enable_seabios enable_debug ' ac_precious_vars='build_alias @@ -1386,6 +1392,9 @@ Optional Features: --disable-ocamltools Disable Ocaml tools (default is ENABLED) --enable-miniterm Enable miniterm (default is DISABLED) --enable-lomount Enable lomount (default is DISABLED) + --enable-ovmf Enable OVMF (default is DISABLED) + --disable-rombios Disable ROM BIOS (default is ENABLED) + --disable-seabios Disable SeaBIOS (default is ENABLED) --disable-debug Disable debug build of tools (default is ENABLED) Some influential environment variables: @@ -4133,6 +4142,75 @@ lomount=$ax_cv_lomount +# Check whether --enable-ovmf was given. +if test "${enable_ovmf+set}" = set; then : + enableval=$enable_ovmf; +fi + + +if test "x$enable_ovmf" = "xno"; then : + + ax_cv_ovmf="n" + +elif test "x$enable_ovmf" = "xyes"; then : + + ax_cv_ovmf="y" + +elif test -z $ax_cv_ovmf; then : + + ax_cv_ovmf="n" + +fi +ovmf=$ax_cv_ovmf + + + +# Check whether --enable-rombios was given. +if test "${enable_rombios+set}" = set; then : + enableval=$enable_rombios; +fi + + +if test "x$enable_rombios" = "xno"; then : + + ax_cv_rombios="n" + +elif test "x$enable_rombios" = "xyes"; then : + + ax_cv_rombios="y" + +elif test -z $ax_cv_rombios; then : + + ax_cv_rombios="y" + +fi +rombios=$ax_cv_rombios + + + +# Check whether --enable-seabios was given. +if test "${enable_seabios+set}" = set; then : + enableval=$enable_seabios; +fi + + +if test "x$enable_seabios" = "xno"; then : + + ax_cv_seabios="n" + +elif test "x$enable_seabios" = "xyes"; then : + + ax_cv_seabios="y" + +elif test -z $ax_cv_seabios; then : + + ax_cv_seabios="y" + +fi +seabios=$ax_cv_seabios + + + # Check whether --enable-debug was given. if test "${enable_debug+set}" = set; then : enableval=$enable_debug; diff -r fb39cccb50e5 -r 0342e9ff1adc tools/configure.ac --- a/tools/configure.ac Tue Apr 24 17:12:22 2012 +0100 +++ b/tools/configure.ac Tue Apr 24 17:28:37 2012 +0100 @@ -45,6 +45,9 @@ AX_ARG_DEFAULT_ENABLE([pythontools], [Di AX_ARG_DEFAULT_ENABLE([ocamltools], [Disable Ocaml tools]) AX_ARG_DEFAULT_DISABLE([miniterm], [Enable miniterm]) AX_ARG_DEFAULT_DISABLE([lomount], [Enable lomount]) +AX_ARG_DEFAULT_DISABLE([ovmf], [Enable OVMF]) +AX_ARG_DEFAULT_ENABLE([rombios], [Disable ROM BIOS]) +AX_ARG_DEFAULT_ENABLE([seabios], [Disable SeaBIOS]) AX_ARG_DEFAULT_ENABLE([debug], [Disable debug build of tools]) AC_ARG_VAR([PREPEND_INCLUDES], _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:31:58 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:31:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBi-00030S-4J; Mon, 14 May 2012 16:31:58 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBh-0002zS-6P for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:57 +0000 Received: from [193.109.254.147:7192] by server-11.bemta-14.messagelabs.com id C4/DB-05858-C7331BF4; Mon, 14 May 2012 16:31:56 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-27.messagelabs.com!1337013114!4049524!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15945 invoked from network); 14 May 2012 16:31:55 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:31:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBe-0002nR-85 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBe-0006Tl-7U for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:54 +0000 Message-Id: Date: Mon, 14 May 2012 16:31:53 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] autoconf: add ovmf, rombios and seabios and configure options X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Roger Pau Monne # Date 1335284917 -3600 # Node ID 0342e9ff1adc923826ed944b0655076233136e89 # Parent fb39cccb50e5430dce1ec612fd745b85061ebb10 autoconf: add ovmf, rombios and seabios and configure options Move this hardcoded options from Config.mk to config/Tools.mk and add the appropiate configure options. Signed-off-by: Roger Pau Monne Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r fb39cccb50e5 -r 0342e9ff1adc Config.mk --- a/Config.mk Tue Apr 24 17:12:22 2012 +0100 +++ b/Config.mk Tue Apr 24 17:28:37 2012 +0100 @@ -208,10 +208,6 @@ SEABIOS_UPSTREAM_TAG ?= rel-1.6.3.2 ETHERBOOT_NICS ?= rtl8139 8086100e -CONFIG_OVMF ?= n -CONFIG_ROMBIOS ?= y -CONFIG_SEABIOS ?= y - # Specify which qemu-dm to use. This may be `ioemu' to use the old # Mercurial in-tree version, or a local directory, or a git URL. # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git diff -r fb39cccb50e5 -r 0342e9ff1adc config/Tools.mk.in --- a/config/Tools.mk.in Tue Apr 24 17:12:22 2012 +0100 +++ b/config/Tools.mk.in Tue Apr 24 17:28:37 2012 +0100 @@ -44,6 +44,9 @@ PYTHON_TOOLS := @pythontools@ OCAML_TOOLS := @ocamltools@ CONFIG_MINITERM := @miniterm@ CONFIG_LOMOUNT := @lomount@ +CONFIG_OVMF := @ovmf@ +CONFIG_ROMBIOS := @rombios@ +CONFIG_SEABIOS := @seabios@ #System options CONFIG_SYSTEM_LIBAIO:= @system_aio@ diff -r fb39cccb50e5 -r 0342e9ff1adc tools/configure --- a/tools/configure Tue Apr 24 17:12:22 2012 +0100 +++ b/tools/configure Tue Apr 24 17:28:37 2012 +0100 @@ -653,6 +653,9 @@ APPEND_INCLUDES PREPEND_LIB PREPEND_INCLUDES debug +seabios +rombios +ovmf lomount miniterm ocamltools @@ -728,6 +731,9 @@ enable_pythontools enable_ocamltools enable_miniterm enable_lomount +enable_ovmf +enable_rombios +enable_seabios enable_debug ' ac_precious_vars='build_alias @@ -1386,6 +1392,9 @@ Optional Features: --disable-ocamltools Disable Ocaml tools (default is ENABLED) --enable-miniterm Enable miniterm (default is DISABLED) --enable-lomount Enable lomount (default is DISABLED) + --enable-ovmf Enable OVMF (default is DISABLED) + --disable-rombios Disable ROM BIOS (default is ENABLED) + --disable-seabios Disable SeaBIOS (default is ENABLED) --disable-debug Disable debug build of tools (default is ENABLED) Some influential environment variables: @@ -4133,6 +4142,75 @@ lomount=$ax_cv_lomount +# Check whether --enable-ovmf was given. +if test "${enable_ovmf+set}" = set; then : + enableval=$enable_ovmf; +fi + + +if test "x$enable_ovmf" = "xno"; then : + + ax_cv_ovmf="n" + +elif test "x$enable_ovmf" = "xyes"; then : + + ax_cv_ovmf="y" + +elif test -z $ax_cv_ovmf; then : + + ax_cv_ovmf="n" + +fi +ovmf=$ax_cv_ovmf + + + +# Check whether --enable-rombios was given. +if test "${enable_rombios+set}" = set; then : + enableval=$enable_rombios; +fi + + +if test "x$enable_rombios" = "xno"; then : + + ax_cv_rombios="n" + +elif test "x$enable_rombios" = "xyes"; then : + + ax_cv_rombios="y" + +elif test -z $ax_cv_rombios; then : + + ax_cv_rombios="y" + +fi +rombios=$ax_cv_rombios + + + +# Check whether --enable-seabios was given. +if test "${enable_seabios+set}" = set; then : + enableval=$enable_seabios; +fi + + +if test "x$enable_seabios" = "xno"; then : + + ax_cv_seabios="n" + +elif test "x$enable_seabios" = "xyes"; then : + + ax_cv_seabios="y" + +elif test -z $ax_cv_seabios; then : + + ax_cv_seabios="y" + +fi +seabios=$ax_cv_seabios + + + # Check whether --enable-debug was given. if test "${enable_debug+set}" = set; then : enableval=$enable_debug; diff -r fb39cccb50e5 -r 0342e9ff1adc tools/configure.ac --- a/tools/configure.ac Tue Apr 24 17:12:22 2012 +0100 +++ b/tools/configure.ac Tue Apr 24 17:28:37 2012 +0100 @@ -45,6 +45,9 @@ AX_ARG_DEFAULT_ENABLE([pythontools], [Di AX_ARG_DEFAULT_ENABLE([ocamltools], [Disable Ocaml tools]) AX_ARG_DEFAULT_DISABLE([miniterm], [Enable miniterm]) AX_ARG_DEFAULT_DISABLE([lomount], [Enable lomount]) +AX_ARG_DEFAULT_DISABLE([ovmf], [Enable OVMF]) +AX_ARG_DEFAULT_ENABLE([rombios], [Disable ROM BIOS]) +AX_ARG_DEFAULT_ENABLE([seabios], [Disable SeaBIOS]) AX_ARG_DEFAULT_ENABLE([debug], [Disable debug build of tools]) AC_ARG_VAR([PREPEND_INCLUDES], _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:31:58 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:31:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBh-00030D-UD; Mon, 14 May 2012 16:31:57 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBg-0002z9-Og for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:57 +0000 Received: from [85.158.138.51:28753] by server-5.bemta-3.messagelabs.com id D5/7D-17113-B7331BF4; Mon, 14 May 2012 16:31:55 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-174.messagelabs.com!1337013113!27110102!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3331 invoked from network); 14 May 2012 16:31:54 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:31:54 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBd-0002nL-70 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:53 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBd-0006TH-6D for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:53 +0000 Message-Id: Date: Mon, 14 May 2012 16:31:52 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xl: add support for vif rate limiting X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Mathieu Gagne # Date 1335283762 -3600 # Node ID 46aad1a3ab3fc5888f7dcc365dd9f90832667a67 # Parent a095e157f280d62562b9ee5a37d57add7c74ff65 xl: add support for vif rate limiting The `rate` keyword specifies the rate at which the outgoing traffic will be limited to. The default if this keyword is not specified is unlimited. The `rate` keyword supports an optional replenishment interval parameter for specifying the granularity of credit replenishment. It determines the frequency at which the vif transmission credit is replenished. The default interval is 50ms. For example: 'rate=10Mb/s' 'rate=250KB/s' 'rate=1MB/s@20ms' Signed-off-by: Mathieu Gagne Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r a095e157f280 -r 46aad1a3ab3f docs/misc/xl-network-configuration.markdown --- a/docs/misc/xl-network-configuration.markdown Tue Apr 24 15:48:50 2012 +0100 +++ b/docs/misc/xl-network-configuration.markdown Tue Apr 24 17:09:22 2012 +0100 @@ -122,5 +122,34 @@ Specifies the backend domain which this defaults to domain 0. Specifying another domain requires setting up a driver domain which is outside the scope of this document. +### rate + +Specifies the rate at which the outgoing traffic will be limited to. +The default if this keyword is not specified is unlimited. + +The rate may be specified as "/s" or optionally "/s@". + + * `RATE` is in bytes and can accept suffixes: + * GB, MB, KB, B for bytes. + * Gb, Mb, Kb, b for bits. + * `INTERVAL` is in microseconds and can accept suffixes: ms, us, s. + It determines the frequency at which the vif transmission credit + is replenished. The default is 50ms. + +Vif rate limiting is credit-based. It means that for "1MB/s@20ms", the +available credit will be equivalent of the traffic you would have done +at "1MB/s" during 20ms. This will results in a credit of 20,000 bytes +replenished every 20,000 us. + +For example: + + 'rate=10Mb/s' -- meaning up to 10 megabits every second + 'rate=250KB/s' -- meaning up to 250 kilobytes every second + 'rate=1MB/s@20ms' -- meaning 20,000 bytes in every 20 millisecond period + +NOTE: The actual underlying limits of rate limiting are dependent +on the underlying netback implementation. + + [oui]: http://en.wikipedia.org/wiki/Organizationally_Unique_Identifier [net]: http://wiki.xen.org/wiki/HostConfiguration/Networking diff -r a095e157f280 -r 46aad1a3ab3f tools/libxl/Makefile --- a/tools/libxl/Makefile Tue Apr 24 15:48:50 2012 +0100 +++ b/tools/libxl/Makefile Tue Apr 24 17:09:22 2012 +0100 @@ -61,7 +61,7 @@ LIBXL_OBJS += _libxl_types.o libxl_flask AUTOINCS= libxlu_cfg_y.h libxlu_cfg_l.h _libxl_list.h AUTOSRCS= libxlu_cfg_y.c libxlu_cfg_l.c LIBXLU_OBJS = libxlu_cfg_y.o libxlu_cfg_l.o libxlu_cfg.o \ - libxlu_disk_l.o libxlu_disk.o libxlu_pci.o + libxlu_disk_l.o libxlu_disk.o libxlu_vif.o libxlu_pci.o $(LIBXLU_OBJS): CFLAGS += $(CFLAGS_libxenctrl) # For xentoollog.h CLIENTS = xl testidl diff -r a095e157f280 -r 46aad1a3ab3f tools/libxl/libxl.c --- a/tools/libxl/libxl.c Tue Apr 24 15:48:50 2012 +0100 +++ b/tools/libxl/libxl.c Tue Apr 24 17:09:22 2012 +0100 @@ -1854,6 +1854,13 @@ int libxl_device_nic_add(libxl_ctx *ctx, flexarray_append(back, libxl__strdup(gc, nic->ip)); } + if (nic->rate_interval_usecs > 0) { + flexarray_append(back, "rate"); + flexarray_append(back, libxl__sprintf(gc, "%"PRIu64",%"PRIu32"", + nic->rate_bytes_per_interval, + nic->rate_interval_usecs)); + } + flexarray_append(back, "bridge"); flexarray_append(back, libxl__strdup(gc, nic->bridge)); flexarray_append(back, "handle"); diff -r a095e157f280 -r 46aad1a3ab3f tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Tue Apr 24 15:48:50 2012 +0100 +++ b/tools/libxl/libxl_types.idl Tue Apr 24 17:09:22 2012 +0100 @@ -343,6 +343,8 @@ libxl_device_nic = Struct("device_nic", ("ifname", string), ("script", string), ("nictype", libxl_nic_type), + ("rate_bytes_per_interval", uint64), + ("rate_interval_usecs", uint32), ]) libxl_device_pci = Struct("device_pci", [ diff -r a095e157f280 -r 46aad1a3ab3f tools/libxl/libxlu_internal.h --- a/tools/libxl/libxlu_internal.h Tue Apr 24 15:48:50 2012 +0100 +++ b/tools/libxl/libxlu_internal.h Tue Apr 24 17:09:22 2012 +0100 @@ -17,9 +17,11 @@ #define LIBXLU_INTERNAL_H #include +#include #include #include #include +#include #define XLU_ConfigList XLU_ConfigSetting diff -r a095e157f280 -r 46aad1a3ab3f tools/libxl/libxlu_vif.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/libxl/libxlu_vif.c Tue Apr 24 17:09:22 2012 +0100 @@ -0,0 +1,141 @@ +#include "libxl_osdeps.h" /* must come before any other headers */ +#include "libxlu_internal.h" + +static const char *vif_bytes_per_sec_re = "^[0-9]+[GMK]?[Bb]/s$"; +static const char *vif_internal_usec_re = "^[0-9]+[mu]?s?$"; + +static void xlu__vif_err(XLU_Config *cfg, const char *msg, const char *rate) { + fprintf(cfg->report, + "%s: config parsing error in vif: %s in `%s'\n", + cfg->filename, msg, rate); +} + +static int vif_parse_rate_bytes_per_sec(XLU_Config *cfg, const char *bytes, + uint64_t *bytes_per_sec) +{ + regex_t rec; + uint64_t tmp = 0; + const char *p; + int rc = 0; + + regcomp(&rec, vif_bytes_per_sec_re, REG_EXTENDED|REG_NOSUB); + if (regexec(&rec, bytes, 0, NULL, 0)) { + xlu__vif_err(cfg, "invalid rate", bytes); + rc = EINVAL; + goto out; + } + + p = bytes; + tmp = strtoull(p, (char**)&p, 0); + if (tmp == 0 || tmp > UINT32_MAX || errno == ERANGE) { + xlu__vif_err(cfg, "rate overflow", bytes); + rc = EOVERFLOW; + goto out; + } + + if (*p == 'G') + tmp *= 1000 * 1000 * 1000; + else if (*p == 'M') + tmp *= 1000 * 1000; + else if (*p == 'K') + tmp *= 1000; + if (*p == 'b' || *(p+1) == 'b') + tmp /= 8; + + *bytes_per_sec = tmp; + +out: + regfree(&rec); + return rc; +} + +static int vif_parse_rate_interval_usecs(XLU_Config *cfg, const char *interval, + uint32_t *interval_usecs) +{ + regex_t rec; + uint64_t tmp = 0; + const char *p; + int rc = 0; + + regcomp(&rec, vif_internal_usec_re, REG_EXTENDED|REG_NOSUB); + if (regexec(&rec, interval, 0, NULL, 0)) { + xlu__vif_err(cfg, "invalid replenishment interval", interval); + rc = EINVAL; + goto out; + } + + p = interval; + tmp = strtoull(p, (char**)&p, 0); + if (tmp == 0 || tmp > UINT32_MAX || errno == ERANGE) { + xlu__vif_err(cfg, "replenishment interval overflow", interval); + rc = EOVERFLOW; + goto out; + } + + if (*p == 's' || *p == '\0') + tmp *= 1000 * 1000; + else if (*p == 'm') + tmp *= 1000; + + if (tmp > UINT32_MAX) { + xlu__vif_err(cfg, "replenishment interval overflow", interval); + rc = EOVERFLOW; + goto out; + } + + *interval_usecs = (uint32_t) tmp; + +out: + regfree(&rec); + return rc; +} + +int xlu_vif_parse_rate(XLU_Config *cfg, const char *rate, libxl_device_nic *nic) +{ + uint64_t bytes_per_sec = 0; + uint64_t bytes_per_interval = 0; + uint32_t interval_usecs = 50000UL; /* Default to 50ms */ + char *ratetok, *tmprate; + int rc = 0; + + tmprate = strdup(rate); + if (!strcmp(tmprate,"")) { + xlu__vif_err(cfg, "no rate specified", rate); + rc = EINVAL; + goto out; + } + + ratetok = strtok(tmprate, "@"); + rc = vif_parse_rate_bytes_per_sec(cfg, ratetok, &bytes_per_sec); + if (rc) goto out; + + ratetok = strtok(NULL, "@"); + if (ratetok != NULL) { + rc = vif_parse_rate_interval_usecs(cfg, ratetok, &interval_usecs); + if (rc) goto out; + } + + if (interval_usecs != 0 && (bytes_per_sec > (UINT64_MAX / interval_usecs))) { + xlu__vif_err(cfg, "rate overflow", rate); + rc = EOVERFLOW; + goto out; + } + + bytes_per_interval = + (((uint64_t) bytes_per_sec * (uint64_t) interval_usecs) / 1000000UL); + + nic->rate_interval_usecs = interval_usecs; + nic->rate_bytes_per_interval = bytes_per_interval; + +out: + free(tmprate); + return rc; +} + +/* + * Local variables: + * mode: C + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff -r a095e157f280 -r 46aad1a3ab3f tools/libxl/libxlutil.h --- a/tools/libxl/libxlutil.h Tue Apr 24 15:48:50 2012 +0100 +++ b/tools/libxl/libxlutil.h Tue Apr 24 17:09:22 2012 +0100 @@ -94,6 +94,13 @@ int xlu_disk_parse(XLU_Config *cfg, int int xlu_pci_parse_bdf(XLU_Config *cfg, libxl_device_pci *pcidev, const char *str); +/* + * Vif rate parsing. + */ + +int xlu_vif_parse_rate(XLU_Config *cfg, const char *rate, + libxl_device_nic *nic); + #endif /* LIBXLUTIL_H */ /* diff -r a095e157f280 -r 46aad1a3ab3f tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Tue Apr 24 15:48:50 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Tue Apr 24 17:09:22 2012 +0100 @@ -403,6 +403,19 @@ static void parse_disk_config(XLU_Config parse_disk_config_multistring(config, 1, &spec, disk); } +static void parse_vif_rate(XLU_Config **config, const char *rate, + libxl_device_nic *nic) +{ + int e; + + e = xlu_vif_parse_rate(*config, rate, nic); + if (e == EINVAL || e == EOVERFLOW) exit(-1); + if (e) { + fprintf(stderr,"xlu_vif_parse_rate failed: %s\n",strerror(errno)); + exit(-1); + } +} + static void split_string_into_string_list(const char *str, const char *delim, libxl_string_list *psl) @@ -906,7 +919,7 @@ static void parse_config_data(const char nic->backend_domid = 0; } } else if (!strcmp(p, "rate")) { - fprintf(stderr, "the rate parameter for vifs is currently not supported\n"); + parse_vif_rate(&config, (p2 + 1), nic); } else if (!strcmp(p, "accel")) { fprintf(stderr, "the accel parameter for vifs is currently not supported\n"); } @@ -4855,6 +4868,7 @@ int main_networkattach(int argc, char ** { int opt; libxl_device_nic nic; + XLU_Config *config = 0; char *endptr, *oparg; const char *tok; int i; @@ -4872,6 +4886,13 @@ int main_networkattach(int argc, char ** fprintf(stderr, "%s is an invalid domain identifier\n", argv[optind]); return 1; } + + config= xlu_cfg_init(stderr, "command line"); + if (!config) { + fprintf(stderr, "Failed to allocate for configuration\n"); + return 1; + } + libxl_device_nic_init(&nic); for (argv += optind+1, argc -= optind+1; argc > 0; ++argv, --argc) { if (MATCH_OPTION("type", *argv, oparg)) { @@ -4910,6 +4931,7 @@ int main_networkattach(int argc, char ** } else if (MATCH_OPTION("model", *argv, oparg)) { replace_string(&nic.model, oparg); } else if (MATCH_OPTION("rate", *argv, oparg)) { + parse_vif_rate(&config, oparg, &nic); } else if (MATCH_OPTION("accel", *argv, oparg)) { } else { fprintf(stderr, "unrecognized argument `%s'\n", *argv); @@ -4931,6 +4953,7 @@ int main_networkattach(int argc, char ** return 1; } libxl_device_nic_dispose(&nic); + xlu_cfg_destroy(config); return 0; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:31:58 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:31:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBh-00030D-UD; Mon, 14 May 2012 16:31:57 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBg-0002z9-Og for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:57 +0000 Received: from [85.158.138.51:28753] by server-5.bemta-3.messagelabs.com id D5/7D-17113-B7331BF4; Mon, 14 May 2012 16:31:55 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-174.messagelabs.com!1337013113!27110102!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3331 invoked from network); 14 May 2012 16:31:54 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:31:54 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBd-0002nL-70 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:53 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBd-0006TH-6D for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:53 +0000 Message-Id: Date: Mon, 14 May 2012 16:31:52 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xl: add support for vif rate limiting X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Mathieu Gagne # Date 1335283762 -3600 # Node ID 46aad1a3ab3fc5888f7dcc365dd9f90832667a67 # Parent a095e157f280d62562b9ee5a37d57add7c74ff65 xl: add support for vif rate limiting The `rate` keyword specifies the rate at which the outgoing traffic will be limited to. The default if this keyword is not specified is unlimited. The `rate` keyword supports an optional replenishment interval parameter for specifying the granularity of credit replenishment. It determines the frequency at which the vif transmission credit is replenished. The default interval is 50ms. For example: 'rate=10Mb/s' 'rate=250KB/s' 'rate=1MB/s@20ms' Signed-off-by: Mathieu Gagne Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r a095e157f280 -r 46aad1a3ab3f docs/misc/xl-network-configuration.markdown --- a/docs/misc/xl-network-configuration.markdown Tue Apr 24 15:48:50 2012 +0100 +++ b/docs/misc/xl-network-configuration.markdown Tue Apr 24 17:09:22 2012 +0100 @@ -122,5 +122,34 @@ Specifies the backend domain which this defaults to domain 0. Specifying another domain requires setting up a driver domain which is outside the scope of this document. +### rate + +Specifies the rate at which the outgoing traffic will be limited to. +The default if this keyword is not specified is unlimited. + +The rate may be specified as "/s" or optionally "/s@". + + * `RATE` is in bytes and can accept suffixes: + * GB, MB, KB, B for bytes. + * Gb, Mb, Kb, b for bits. + * `INTERVAL` is in microseconds and can accept suffixes: ms, us, s. + It determines the frequency at which the vif transmission credit + is replenished. The default is 50ms. + +Vif rate limiting is credit-based. It means that for "1MB/s@20ms", the +available credit will be equivalent of the traffic you would have done +at "1MB/s" during 20ms. This will results in a credit of 20,000 bytes +replenished every 20,000 us. + +For example: + + 'rate=10Mb/s' -- meaning up to 10 megabits every second + 'rate=250KB/s' -- meaning up to 250 kilobytes every second + 'rate=1MB/s@20ms' -- meaning 20,000 bytes in every 20 millisecond period + +NOTE: The actual underlying limits of rate limiting are dependent +on the underlying netback implementation. + + [oui]: http://en.wikipedia.org/wiki/Organizationally_Unique_Identifier [net]: http://wiki.xen.org/wiki/HostConfiguration/Networking diff -r a095e157f280 -r 46aad1a3ab3f tools/libxl/Makefile --- a/tools/libxl/Makefile Tue Apr 24 15:48:50 2012 +0100 +++ b/tools/libxl/Makefile Tue Apr 24 17:09:22 2012 +0100 @@ -61,7 +61,7 @@ LIBXL_OBJS += _libxl_types.o libxl_flask AUTOINCS= libxlu_cfg_y.h libxlu_cfg_l.h _libxl_list.h AUTOSRCS= libxlu_cfg_y.c libxlu_cfg_l.c LIBXLU_OBJS = libxlu_cfg_y.o libxlu_cfg_l.o libxlu_cfg.o \ - libxlu_disk_l.o libxlu_disk.o libxlu_pci.o + libxlu_disk_l.o libxlu_disk.o libxlu_vif.o libxlu_pci.o $(LIBXLU_OBJS): CFLAGS += $(CFLAGS_libxenctrl) # For xentoollog.h CLIENTS = xl testidl diff -r a095e157f280 -r 46aad1a3ab3f tools/libxl/libxl.c --- a/tools/libxl/libxl.c Tue Apr 24 15:48:50 2012 +0100 +++ b/tools/libxl/libxl.c Tue Apr 24 17:09:22 2012 +0100 @@ -1854,6 +1854,13 @@ int libxl_device_nic_add(libxl_ctx *ctx, flexarray_append(back, libxl__strdup(gc, nic->ip)); } + if (nic->rate_interval_usecs > 0) { + flexarray_append(back, "rate"); + flexarray_append(back, libxl__sprintf(gc, "%"PRIu64",%"PRIu32"", + nic->rate_bytes_per_interval, + nic->rate_interval_usecs)); + } + flexarray_append(back, "bridge"); flexarray_append(back, libxl__strdup(gc, nic->bridge)); flexarray_append(back, "handle"); diff -r a095e157f280 -r 46aad1a3ab3f tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Tue Apr 24 15:48:50 2012 +0100 +++ b/tools/libxl/libxl_types.idl Tue Apr 24 17:09:22 2012 +0100 @@ -343,6 +343,8 @@ libxl_device_nic = Struct("device_nic", ("ifname", string), ("script", string), ("nictype", libxl_nic_type), + ("rate_bytes_per_interval", uint64), + ("rate_interval_usecs", uint32), ]) libxl_device_pci = Struct("device_pci", [ diff -r a095e157f280 -r 46aad1a3ab3f tools/libxl/libxlu_internal.h --- a/tools/libxl/libxlu_internal.h Tue Apr 24 15:48:50 2012 +0100 +++ b/tools/libxl/libxlu_internal.h Tue Apr 24 17:09:22 2012 +0100 @@ -17,9 +17,11 @@ #define LIBXLU_INTERNAL_H #include +#include #include #include #include +#include #define XLU_ConfigList XLU_ConfigSetting diff -r a095e157f280 -r 46aad1a3ab3f tools/libxl/libxlu_vif.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/libxl/libxlu_vif.c Tue Apr 24 17:09:22 2012 +0100 @@ -0,0 +1,141 @@ +#include "libxl_osdeps.h" /* must come before any other headers */ +#include "libxlu_internal.h" + +static const char *vif_bytes_per_sec_re = "^[0-9]+[GMK]?[Bb]/s$"; +static const char *vif_internal_usec_re = "^[0-9]+[mu]?s?$"; + +static void xlu__vif_err(XLU_Config *cfg, const char *msg, const char *rate) { + fprintf(cfg->report, + "%s: config parsing error in vif: %s in `%s'\n", + cfg->filename, msg, rate); +} + +static int vif_parse_rate_bytes_per_sec(XLU_Config *cfg, const char *bytes, + uint64_t *bytes_per_sec) +{ + regex_t rec; + uint64_t tmp = 0; + const char *p; + int rc = 0; + + regcomp(&rec, vif_bytes_per_sec_re, REG_EXTENDED|REG_NOSUB); + if (regexec(&rec, bytes, 0, NULL, 0)) { + xlu__vif_err(cfg, "invalid rate", bytes); + rc = EINVAL; + goto out; + } + + p = bytes; + tmp = strtoull(p, (char**)&p, 0); + if (tmp == 0 || tmp > UINT32_MAX || errno == ERANGE) { + xlu__vif_err(cfg, "rate overflow", bytes); + rc = EOVERFLOW; + goto out; + } + + if (*p == 'G') + tmp *= 1000 * 1000 * 1000; + else if (*p == 'M') + tmp *= 1000 * 1000; + else if (*p == 'K') + tmp *= 1000; + if (*p == 'b' || *(p+1) == 'b') + tmp /= 8; + + *bytes_per_sec = tmp; + +out: + regfree(&rec); + return rc; +} + +static int vif_parse_rate_interval_usecs(XLU_Config *cfg, const char *interval, + uint32_t *interval_usecs) +{ + regex_t rec; + uint64_t tmp = 0; + const char *p; + int rc = 0; + + regcomp(&rec, vif_internal_usec_re, REG_EXTENDED|REG_NOSUB); + if (regexec(&rec, interval, 0, NULL, 0)) { + xlu__vif_err(cfg, "invalid replenishment interval", interval); + rc = EINVAL; + goto out; + } + + p = interval; + tmp = strtoull(p, (char**)&p, 0); + if (tmp == 0 || tmp > UINT32_MAX || errno == ERANGE) { + xlu__vif_err(cfg, "replenishment interval overflow", interval); + rc = EOVERFLOW; + goto out; + } + + if (*p == 's' || *p == '\0') + tmp *= 1000 * 1000; + else if (*p == 'm') + tmp *= 1000; + + if (tmp > UINT32_MAX) { + xlu__vif_err(cfg, "replenishment interval overflow", interval); + rc = EOVERFLOW; + goto out; + } + + *interval_usecs = (uint32_t) tmp; + +out: + regfree(&rec); + return rc; +} + +int xlu_vif_parse_rate(XLU_Config *cfg, const char *rate, libxl_device_nic *nic) +{ + uint64_t bytes_per_sec = 0; + uint64_t bytes_per_interval = 0; + uint32_t interval_usecs = 50000UL; /* Default to 50ms */ + char *ratetok, *tmprate; + int rc = 0; + + tmprate = strdup(rate); + if (!strcmp(tmprate,"")) { + xlu__vif_err(cfg, "no rate specified", rate); + rc = EINVAL; + goto out; + } + + ratetok = strtok(tmprate, "@"); + rc = vif_parse_rate_bytes_per_sec(cfg, ratetok, &bytes_per_sec); + if (rc) goto out; + + ratetok = strtok(NULL, "@"); + if (ratetok != NULL) { + rc = vif_parse_rate_interval_usecs(cfg, ratetok, &interval_usecs); + if (rc) goto out; + } + + if (interval_usecs != 0 && (bytes_per_sec > (UINT64_MAX / interval_usecs))) { + xlu__vif_err(cfg, "rate overflow", rate); + rc = EOVERFLOW; + goto out; + } + + bytes_per_interval = + (((uint64_t) bytes_per_sec * (uint64_t) interval_usecs) / 1000000UL); + + nic->rate_interval_usecs = interval_usecs; + nic->rate_bytes_per_interval = bytes_per_interval; + +out: + free(tmprate); + return rc; +} + +/* + * Local variables: + * mode: C + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff -r a095e157f280 -r 46aad1a3ab3f tools/libxl/libxlutil.h --- a/tools/libxl/libxlutil.h Tue Apr 24 15:48:50 2012 +0100 +++ b/tools/libxl/libxlutil.h Tue Apr 24 17:09:22 2012 +0100 @@ -94,6 +94,13 @@ int xlu_disk_parse(XLU_Config *cfg, int int xlu_pci_parse_bdf(XLU_Config *cfg, libxl_device_pci *pcidev, const char *str); +/* + * Vif rate parsing. + */ + +int xlu_vif_parse_rate(XLU_Config *cfg, const char *rate, + libxl_device_nic *nic); + #endif /* LIBXLUTIL_H */ /* diff -r a095e157f280 -r 46aad1a3ab3f tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Tue Apr 24 15:48:50 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Tue Apr 24 17:09:22 2012 +0100 @@ -403,6 +403,19 @@ static void parse_disk_config(XLU_Config parse_disk_config_multistring(config, 1, &spec, disk); } +static void parse_vif_rate(XLU_Config **config, const char *rate, + libxl_device_nic *nic) +{ + int e; + + e = xlu_vif_parse_rate(*config, rate, nic); + if (e == EINVAL || e == EOVERFLOW) exit(-1); + if (e) { + fprintf(stderr,"xlu_vif_parse_rate failed: %s\n",strerror(errno)); + exit(-1); + } +} + static void split_string_into_string_list(const char *str, const char *delim, libxl_string_list *psl) @@ -906,7 +919,7 @@ static void parse_config_data(const char nic->backend_domid = 0; } } else if (!strcmp(p, "rate")) { - fprintf(stderr, "the rate parameter for vifs is currently not supported\n"); + parse_vif_rate(&config, (p2 + 1), nic); } else if (!strcmp(p, "accel")) { fprintf(stderr, "the accel parameter for vifs is currently not supported\n"); } @@ -4855,6 +4868,7 @@ int main_networkattach(int argc, char ** { int opt; libxl_device_nic nic; + XLU_Config *config = 0; char *endptr, *oparg; const char *tok; int i; @@ -4872,6 +4886,13 @@ int main_networkattach(int argc, char ** fprintf(stderr, "%s is an invalid domain identifier\n", argv[optind]); return 1; } + + config= xlu_cfg_init(stderr, "command line"); + if (!config) { + fprintf(stderr, "Failed to allocate for configuration\n"); + return 1; + } + libxl_device_nic_init(&nic); for (argv += optind+1, argc -= optind+1; argc > 0; ++argv, --argc) { if (MATCH_OPTION("type", *argv, oparg)) { @@ -4910,6 +4931,7 @@ int main_networkattach(int argc, char ** } else if (MATCH_OPTION("model", *argv, oparg)) { replace_string(&nic.model, oparg); } else if (MATCH_OPTION("rate", *argv, oparg)) { + parse_vif_rate(&config, oparg, &nic); } else if (MATCH_OPTION("accel", *argv, oparg)) { } else { fprintf(stderr, "unrecognized argument `%s'\n", *argv); @@ -4931,6 +4953,7 @@ int main_networkattach(int argc, char ** return 1; } libxl_device_nic_dispose(&nic); + xlu_cfg_destroy(config); return 0; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:31:59 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:31:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBj-00031x-9k; Mon, 14 May 2012 16:31:59 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBi-00030A-DJ for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:58 +0000 Received: from [85.158.138.51:28893] by server-2.bemta-3.messagelabs.com id CB/E5-09269-D7331BF4; Mon, 14 May 2012 16:31:57 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-174.messagelabs.com!1337013115!20705693!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5650 invoked from network); 14 May 2012 16:31:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:31:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBf-0002na-9y for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBf-0006UF-9H for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:55 +0000 Message-Id: Date: Mon, 14 May 2012 16:31:54 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: fix rtc_timeoffset setting X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Lin Ming # Date 1335285945 -3600 # Node ID 8c0e4983916cae5acd9991e9ef48e054c4e84a32 # Parent 1205b0b5b810cc4aec21a6c8a4451178cd2c71a9 libxl: fix rtc_timeoffset setting libxl__domain_build_info_setdefault may be called several times, so rtc_timeoffset can't be setted in it. Move rtc_timeoffset setting logic to libxl__build_pre. Reported-by: Teck Choon Giam Acked-by: Ian Campbell Signed-off-by: Lin Ming Committed-by: Ian Jackson --- diff -r 1205b0b5b810 -r 8c0e4983916c tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Mon Apr 16 16:00:47 2012 +0100 +++ b/tools/libxl/libxl_create.c Tue Apr 24 17:45:45 2012 +0100 @@ -150,15 +150,6 @@ int libxl__domain_build_info_setdefault( b_info->target_memkb = b_info->max_memkb; libxl_defbool_setdefault(&b_info->localtime, false); - if (libxl_defbool_val(b_info->localtime)) { - time_t t; - struct tm *tm; - - t = time(NULL); - tm = localtime(&t); - - b_info->rtc_timeoffset += tm->tm_gmtoff; - } libxl_defbool_setdefault(&b_info->disable_migrate, false); diff -r 1205b0b5b810 -r 8c0e4983916c tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Mon Apr 16 16:00:47 2012 +0100 +++ b/tools/libxl/libxl_dom.c Tue Apr 24 17:45:45 2012 +0100 @@ -65,6 +65,8 @@ int libxl__build_pre(libxl__gc *gc, uint libxl_ctx *ctx = libxl__gc_owner(gc); int tsc_mode; char *xs_domid, *con_domid; + uint32_t rtc_timeoffset; + xc_domain_max_vcpus(ctx->xch, domid, info->max_vcpus); libxl_set_vcpuaffinity_all(ctx, domid, info->max_vcpus, &info->cpumap); xc_domain_setmaxmem(ctx->xch, domid, info->target_memkb + LIBXL_MAXMEM_CONSTANT); @@ -91,8 +93,19 @@ int libxl__build_pre(libxl__gc *gc, uint if (libxl_defbool_val(info->disable_migrate)) xc_domain_disable_migrate(ctx->xch, domid); - if (info->rtc_timeoffset) - xc_domain_set_time_offset(ctx->xch, domid, info->rtc_timeoffset); + rtc_timeoffset = info->rtc_timeoffset; + if (libxl_defbool_val(info->localtime)) { + time_t t; + struct tm *tm; + + t = time(NULL); + tm = localtime(&t); + + rtc_timeoffset += tm->tm_gmtoff; + } + + if (rtc_timeoffset) + xc_domain_set_time_offset(ctx->xch, domid, rtc_timeoffset); if (info->type == LIBXL_DOMAIN_TYPE_HVM) { unsigned long shadow; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:31:59 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:31:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBj-00031x-9k; Mon, 14 May 2012 16:31:59 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBi-00030A-DJ for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:58 +0000 Received: from [85.158.138.51:28893] by server-2.bemta-3.messagelabs.com id CB/E5-09269-D7331BF4; Mon, 14 May 2012 16:31:57 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-174.messagelabs.com!1337013115!20705693!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5650 invoked from network); 14 May 2012 16:31:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:31:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBf-0002na-9y for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBf-0006UF-9H for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:55 +0000 Message-Id: Date: Mon, 14 May 2012 16:31:54 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: fix rtc_timeoffset setting X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Lin Ming # Date 1335285945 -3600 # Node ID 8c0e4983916cae5acd9991e9ef48e054c4e84a32 # Parent 1205b0b5b810cc4aec21a6c8a4451178cd2c71a9 libxl: fix rtc_timeoffset setting libxl__domain_build_info_setdefault may be called several times, so rtc_timeoffset can't be setted in it. Move rtc_timeoffset setting logic to libxl__build_pre. Reported-by: Teck Choon Giam Acked-by: Ian Campbell Signed-off-by: Lin Ming Committed-by: Ian Jackson --- diff -r 1205b0b5b810 -r 8c0e4983916c tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Mon Apr 16 16:00:47 2012 +0100 +++ b/tools/libxl/libxl_create.c Tue Apr 24 17:45:45 2012 +0100 @@ -150,15 +150,6 @@ int libxl__domain_build_info_setdefault( b_info->target_memkb = b_info->max_memkb; libxl_defbool_setdefault(&b_info->localtime, false); - if (libxl_defbool_val(b_info->localtime)) { - time_t t; - struct tm *tm; - - t = time(NULL); - tm = localtime(&t); - - b_info->rtc_timeoffset += tm->tm_gmtoff; - } libxl_defbool_setdefault(&b_info->disable_migrate, false); diff -r 1205b0b5b810 -r 8c0e4983916c tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Mon Apr 16 16:00:47 2012 +0100 +++ b/tools/libxl/libxl_dom.c Tue Apr 24 17:45:45 2012 +0100 @@ -65,6 +65,8 @@ int libxl__build_pre(libxl__gc *gc, uint libxl_ctx *ctx = libxl__gc_owner(gc); int tsc_mode; char *xs_domid, *con_domid; + uint32_t rtc_timeoffset; + xc_domain_max_vcpus(ctx->xch, domid, info->max_vcpus); libxl_set_vcpuaffinity_all(ctx, domid, info->max_vcpus, &info->cpumap); xc_domain_setmaxmem(ctx->xch, domid, info->target_memkb + LIBXL_MAXMEM_CONSTANT); @@ -91,8 +93,19 @@ int libxl__build_pre(libxl__gc *gc, uint if (libxl_defbool_val(info->disable_migrate)) xc_domain_disable_migrate(ctx->xch, domid); - if (info->rtc_timeoffset) - xc_domain_set_time_offset(ctx->xch, domid, info->rtc_timeoffset); + rtc_timeoffset = info->rtc_timeoffset; + if (libxl_defbool_val(info->localtime)) { + time_t t; + struct tm *tm; + + t = time(NULL); + tm = localtime(&t); + + rtc_timeoffset += tm->tm_gmtoff; + } + + if (rtc_timeoffset) + xc_domain_set_time_offset(ctx->xch, domid, rtc_timeoffset); if (info->type == LIBXL_DOMAIN_TYPE_HVM) { unsigned long shadow; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:00 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBk-000330-CX; Mon, 14 May 2012 16:32:00 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBj-00031o-Fr for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:59 +0000 Received: from [85.158.143.99:58469] by server-2.bemta-4.messagelabs.com id 42/CC-17550-E7331BF4; Mon, 14 May 2012 16:31:58 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-216.messagelabs.com!1337013116!27931078!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1376 invoked from network); 14 May 2012 16:31:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:31:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBf-0002nd-Pc for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBf-0006UU-Ou for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:55 +0000 Message-Id: Date: Mon, 14 May 2012 16:31:55 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] tools/blktap: fix build error w/o MEMSHR X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Christoph Egger # Date 1335287790 -3600 # Node ID bffff7fecd8846def877ffd2ffd3fc7ed5700451 # Parent 8c0e4983916cae5acd9991e9ef48e054c4e84a32 tools/blktap: fix build error w/o MEMSHR Do not include memshr.h when MEMSHR is not defined. Fixes build error when MEMSHR is disabled. Signed-off-by: Christoph Egger Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 8c0e4983916c -r bffff7fecd88 tools/blktap/drivers/blktapctrl.c --- a/tools/blktap/drivers/blktapctrl.c Tue Apr 24 17:45:45 2012 +0100 +++ b/tools/blktap/drivers/blktapctrl.c Tue Apr 24 18:16:30 2012 +0100 @@ -50,7 +50,9 @@ #include #include #include +#ifdef MEMSHR #include +#endif #include #include "blktaplib.h" _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:00 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBk-000330-CX; Mon, 14 May 2012 16:32:00 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBj-00031o-Fr for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:59 +0000 Received: from [85.158.143.99:58469] by server-2.bemta-4.messagelabs.com id 42/CC-17550-E7331BF4; Mon, 14 May 2012 16:31:58 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-216.messagelabs.com!1337013116!27931078!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1376 invoked from network); 14 May 2012 16:31:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:31:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBf-0002nd-Pc for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBf-0006UU-Ou for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:55 +0000 Message-Id: Date: Mon, 14 May 2012 16:31:55 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] tools/blktap: fix build error w/o MEMSHR X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Christoph Egger # Date 1335287790 -3600 # Node ID bffff7fecd8846def877ffd2ffd3fc7ed5700451 # Parent 8c0e4983916cae5acd9991e9ef48e054c4e84a32 tools/blktap: fix build error w/o MEMSHR Do not include memshr.h when MEMSHR is not defined. Fixes build error when MEMSHR is disabled. Signed-off-by: Christoph Egger Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 8c0e4983916c -r bffff7fecd88 tools/blktap/drivers/blktapctrl.c --- a/tools/blktap/drivers/blktapctrl.c Tue Apr 24 17:45:45 2012 +0100 +++ b/tools/blktap/drivers/blktapctrl.c Tue Apr 24 18:16:30 2012 +0100 @@ -50,7 +50,9 @@ #include #include #include +#ifdef MEMSHR #include +#endif #include #include "blktaplib.h" _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:01 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBl-000345-Is; Mon, 14 May 2012 16:32:01 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBj-00031z-RX for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:00 +0000 Received: from [85.158.138.51:28797] by server-12.bemta-3.messagelabs.com id A5/75-29760-F7331BF4; Mon, 14 May 2012 16:31:59 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-174.messagelabs.com!1337013113!27110103!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3365 invoked from network); 14 May 2012 16:31:55 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:31:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBd-0002nO-NO for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:53 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBd-0006TW-Mm for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:53 +0000 Message-Id: Date: Mon, 14 May 2012 16:31:53 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xl: add "check-xl-vif-parse" test script X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Mathieu Gagne # Date 1335283942 -3600 # Node ID fb39cccb50e5430dce1ec612fd745b85061ebb10 # Parent 46aad1a3ab3fc5888f7dcc365dd9f90832667a67 xl: add "check-xl-vif-parse" test script This test script runs "xl -N network-attach 0 " against various rate syntax and checks that the output is as expected. [ Added entries to .hgignore and .gitignore for tools/libxl/tmp.* -iwj ] Signed-off-by: Mathieu Gagne Acked-by: Ian Campbell Signed-off-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 46aad1a3ab3f -r fb39cccb50e5 .gitignore --- a/.gitignore Tue Apr 24 17:09:22 2012 +0100 +++ b/.gitignore Tue Apr 24 17:12:22 2012 +0100 @@ -186,6 +186,7 @@ tools/libxl/libxlu_cfg_y.output tools/libxl/xl tools/libxl/testenum tools/libxl/testenum.c +tools/libxl/tmp.* tools/libaio/src/*.ol tools/libaio/src/*.os tools/misc/cpuperf/cpuperf-perfcntr diff -r 46aad1a3ab3f -r fb39cccb50e5 .hgignore --- a/.hgignore Tue Apr 24 17:09:22 2012 +0100 +++ b/.hgignore Tue Apr 24 17:12:22 2012 +0100 @@ -182,6 +182,7 @@ ^tools/libxl/xl$ ^tools/libxl/testidl$ ^tools/libxl/testidl\.c$ +^tools/libxl/tmp\..*$ ^tools/libvchan/vchan-node[12]$ ^tools/libaio/src/.*\.ol$ ^tools/libaio/src/.*\.os$ diff -r 46aad1a3ab3f -r fb39cccb50e5 tools/libxl/check-xl-vif-parse --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/libxl/check-xl-vif-parse Tue Apr 24 17:12:22 2012 +0100 @@ -0,0 +1,209 @@ +#!/bin/bash + +set -e + +if [ -x ./xl ] ; then + export LD_LIBRARY_PATH=. + XL=./xl +else + XL=xl +fi + +fprefix=tmp.check-xl-vif-parse + +expected () { + cat >$fprefix.expected +} + +failures=0 + +one () { + expected_rc=$1; shift + printf "test case %s...\n" "$*" + set +e + ${XL} -N network-attach 0 "$@" $fprefix.actual 2>/dev/null + actual_rc=$? + diff -u $fprefix.expected $fprefix.actual + diff_rc=$? + set -e + if [ $actual_rc != $expected_rc ] || [ $diff_rc != 0 ]; then + echo >&2 "test case \`$*' failed ($actual_rc $diff_rc)" + failures=$(( $failures + 1 )) + fi +} + +complete () { + if [ "$failures" = 0 ]; then + echo all ok.; exit 0 + else + echo "$failures tests failed."; exit 1 + fi +} + +e=255 + + +#---------- test data ---------- + +# test invalid vif config +expected Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBl-000345-Is; Mon, 14 May 2012 16:32:01 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBj-00031z-RX for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:00 +0000 Received: from [85.158.138.51:28797] by server-12.bemta-3.messagelabs.com id A5/75-29760-F7331BF4; Mon, 14 May 2012 16:31:59 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-174.messagelabs.com!1337013113!27110103!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3365 invoked from network); 14 May 2012 16:31:55 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:31:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBd-0002nO-NO for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:53 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBd-0006TW-Mm for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:53 +0000 Message-Id: Date: Mon, 14 May 2012 16:31:53 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xl: add "check-xl-vif-parse" test script X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Mathieu Gagne # Date 1335283942 -3600 # Node ID fb39cccb50e5430dce1ec612fd745b85061ebb10 # Parent 46aad1a3ab3fc5888f7dcc365dd9f90832667a67 xl: add "check-xl-vif-parse" test script This test script runs "xl -N network-attach 0 " against various rate syntax and checks that the output is as expected. [ Added entries to .hgignore and .gitignore for tools/libxl/tmp.* -iwj ] Signed-off-by: Mathieu Gagne Acked-by: Ian Campbell Signed-off-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 46aad1a3ab3f -r fb39cccb50e5 .gitignore --- a/.gitignore Tue Apr 24 17:09:22 2012 +0100 +++ b/.gitignore Tue Apr 24 17:12:22 2012 +0100 @@ -186,6 +186,7 @@ tools/libxl/libxlu_cfg_y.output tools/libxl/xl tools/libxl/testenum tools/libxl/testenum.c +tools/libxl/tmp.* tools/libaio/src/*.ol tools/libaio/src/*.os tools/misc/cpuperf/cpuperf-perfcntr diff -r 46aad1a3ab3f -r fb39cccb50e5 .hgignore --- a/.hgignore Tue Apr 24 17:09:22 2012 +0100 +++ b/.hgignore Tue Apr 24 17:12:22 2012 +0100 @@ -182,6 +182,7 @@ ^tools/libxl/xl$ ^tools/libxl/testidl$ ^tools/libxl/testidl\.c$ +^tools/libxl/tmp\..*$ ^tools/libvchan/vchan-node[12]$ ^tools/libaio/src/.*\.ol$ ^tools/libaio/src/.*\.os$ diff -r 46aad1a3ab3f -r fb39cccb50e5 tools/libxl/check-xl-vif-parse --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/libxl/check-xl-vif-parse Tue Apr 24 17:12:22 2012 +0100 @@ -0,0 +1,209 @@ +#!/bin/bash + +set -e + +if [ -x ./xl ] ; then + export LD_LIBRARY_PATH=. + XL=./xl +else + XL=xl +fi + +fprefix=tmp.check-xl-vif-parse + +expected () { + cat >$fprefix.expected +} + +failures=0 + +one () { + expected_rc=$1; shift + printf "test case %s...\n" "$*" + set +e + ${XL} -N network-attach 0 "$@" $fprefix.actual 2>/dev/null + actual_rc=$? + diff -u $fprefix.expected $fprefix.actual + diff_rc=$? + set -e + if [ $actual_rc != $expected_rc ] || [ $diff_rc != 0 ]; then + echo >&2 "test case \`$*' failed ($actual_rc $diff_rc)" + failures=$(( $failures + 1 )) + fi +} + +complete () { + if [ "$failures" = 0 ]; then + echo all ok.; exit 0 + else + echo "$failures tests failed."; exit 1 + fi +} + +e=255 + + +#---------- test data ---------- + +# test invalid vif config +expected Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBl-00034C-Lx; Mon, 14 May 2012 16:32:01 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBk-00032f-Al for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:00 +0000 Received: from [85.158.143.99:58516] by server-3.bemta-4.messagelabs.com id 76/7A-05853-F7331BF4; Mon, 14 May 2012 16:31:59 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-216.messagelabs.com!1337013116!20925394!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7089 invoked from network); 14 May 2012 16:31:58 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:31:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBg-0002ng-9I for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBg-0006Uj-8e for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:56 +0000 Message-Id: Date: Mon, 14 May 2012 16:31:55 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] tools: xen-access: Check return values and clean up on errors during init X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Aravindh Puthiyaparambil # Date 1335287871 -3600 # Node ID 4030cd5f99695c097bcf318993350433ddd1af10 # Parent bffff7fecd8846def877ffd2ffd3fc7ed5700451 tools: xen-access: Check return values and clean up on errors during init Check the return values of the libxc mem_access calls. Free allocated structures (platform_info, domain_info) on errors during initialization and exit. Unbind VIRQ, close event channel and connection to Xen on errors during initialization Signed-off-by: Aravindh Puthiyaparambil Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r bffff7fecd88 -r 4030cd5f9969 tools/tests/xen-access/xen-access.c --- a/tools/tests/xen-access/xen-access.c Tue Apr 24 18:16:30 2012 +0100 +++ b/tools/tests/xen-access/xen-access.c Tue Apr 24 18:17:51 2012 +0100 @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -120,6 +121,7 @@ typedef struct xenaccess { } xenaccess_t; static int interrupted; +bool evtchn_bind = 0, evtchn_open = 0, mem_access_enable = 0; static void close_handler(int sig) { @@ -167,9 +169,68 @@ int xc_wait_for_event_or_timeout(xc_inte return -errno; } +int xenaccess_teardown(xc_interface *xch, xenaccess_t *xenaccess) +{ + int rc; + + if ( xenaccess == NULL ) + return 0; + + /* Tear down domain xenaccess in Xen */ + if ( xenaccess->mem_event.ring_page ) + munmap(xenaccess->mem_event.ring_page, PAGE_SIZE); + + if ( mem_access_enable ) + { + rc = xc_mem_access_disable(xenaccess->xc_handle, + xenaccess->mem_event.domain_id); + if ( rc != 0 ) + { + ERROR("Error tearing down domain xenaccess in xen"); + } + } + + /* Unbind VIRQ */ + if ( evtchn_bind ) + { + rc = xc_evtchn_unbind(xenaccess->mem_event.xce_handle, + xenaccess->mem_event.port); + if ( rc != 0 ) + { + ERROR("Error unbinding event port"); + } + } + + /* Close event channel */ + if ( evtchn_open ) + { + rc = xc_evtchn_close(xenaccess->mem_event.xce_handle); + if ( rc != 0 ) + { + ERROR("Error closing event channel"); + } + } + + /* Close connection to Xen */ + rc = xc_interface_close(xenaccess->xc_handle); + if ( rc != 0 ) + { + ERROR("Error closing connection to xen"); + } + xenaccess->xc_handle = NULL; + + if ( xenaccess->platform_info ) + free(xenaccess->platform_info); + if ( xenaccess->domain_info ) + free(xenaccess->domain_info); + free(xenaccess); + + return 0; +} + xenaccess_t *xenaccess_init(xc_interface **xch_r, domid_t domain_id) { - xenaccess_t *xenaccess; + xenaccess_t *xenaccess = 0; xc_interface *xch; int rc; unsigned long ring_pfn, mmap_pfn; @@ -242,6 +303,7 @@ xenaccess_t *xenaccess_init(xc_interface } goto err; } + mem_access_enable = 1; /* Open event channel */ xenaccess->mem_event.xce_handle = xc_evtchn_open(NULL, 0); @@ -250,6 +312,7 @@ xenaccess_t *xenaccess_init(xc_interface ERROR("Failed to open event channel"); goto err; } + evtchn_open = 1; /* Bind event notification */ rc = xc_evtchn_bind_interdomain(xenaccess->mem_event.xce_handle, @@ -260,7 +323,7 @@ xenaccess_t *xenaccess_init(xc_interface ERROR("Failed to bind event channel"); goto err; } - + evtchn_bind = 1; xenaccess->mem_event.port = rc; /* Initialise ring */ @@ -314,64 +377,12 @@ xenaccess_t *xenaccess_init(xc_interface return xenaccess; err: - if ( xenaccess ) - { - if ( xenaccess->mem_event.ring_page ) - { - munmap(xenaccess->mem_event.ring_page, PAGE_SIZE); - } - - free(xenaccess->platform_info); - free(xenaccess->domain_info); - free(xenaccess); - } + xenaccess_teardown(xch, xenaccess); err_iface: return NULL; } -int xenaccess_teardown(xc_interface *xch, xenaccess_t *xenaccess) -{ - int rc; - - if ( xenaccess == NULL ) - return 0; - - /* Tear down domain xenaccess in Xen */ - munmap(xenaccess->mem_event.ring_page, PAGE_SIZE); - rc = xc_mem_access_disable(xenaccess->xc_handle, xenaccess->mem_event.domain_id); - if ( rc != 0 ) - { - ERROR("Error tearing down domain xenaccess in xen"); - } - - /* Unbind VIRQ */ - rc = xc_evtchn_unbind(xenaccess->mem_event.xce_handle, xenaccess->mem_event.port); - if ( rc != 0 ) - { - ERROR("Error unbinding event port"); - } - xenaccess->mem_event.port = -1; - - /* Close event channel */ - rc = xc_evtchn_close(xenaccess->mem_event.xce_handle); - if ( rc != 0 ) - { - ERROR("Error closing event channel"); - } - xenaccess->mem_event.xce_handle = NULL; - - /* Close connection to Xen */ - rc = xc_interface_close(xenaccess->xc_handle); - if ( rc != 0 ) - { - ERROR("Error closing connection to xen"); - } - xenaccess->xc_handle = NULL; - - return 0; -} - int get_request(mem_event_t *mem_event, mem_event_request_t *req) { mem_event_back_ring_t *back_ring; @@ -530,16 +541,39 @@ int main(int argc, char *argv[]) sigaction(SIGALRM, &act, NULL); /* Set whether the access listener is required */ - xc_domain_set_access_required(xch, domain_id, required); + rc = xc_domain_set_access_required(xch, domain_id, required); + if ( rc < 0 ) + { + ERROR("Error %d setting mem_access listener required\n", rc); + goto exit; + } /* Set the default access type and convert all pages to it */ rc = xc_hvm_set_mem_access(xch, domain_id, default_access, ~0ull, 0); - rc = xc_hvm_set_mem_access(xch, domain_id, default_access, 0, xenaccess->domain_info->max_pages); + if ( rc < 0 ) + { + ERROR("Error %d setting default mem access type\n", rc); + goto exit; + } + + rc = xc_hvm_set_mem_access(xch, domain_id, default_access, 0, + xenaccess->domain_info->max_pages); + if ( rc < 0 ) + { + ERROR("Error %d setting all memory to access type %d\n", rc, + default_access); + goto exit; + } if ( int3 ) rc = xc_set_hvm_param(xch, domain_id, HVM_PARAM_MEMORY_EVENT_INT3, HVMPME_mode_sync); else rc = xc_set_hvm_param(xch, domain_id, HVM_PARAM_MEMORY_EVENT_INT3, HVMPME_mode_disabled); + if ( rc < 0 ) + { + ERROR("Error %d setting int3 mem_event\n", rc); + goto exit; + } /* Wait for access */ for (;;) @@ -587,6 +621,12 @@ int main(int argc, char *argv[]) switch (req.reason) { case MEM_EVENT_REASON_VIOLATION: rc = xc_hvm_get_mem_access(xch, domain_id, req.gfn, &access); + if (rc < 0) + { + ERROR("Error %d getting mem_access event\n", rc); + interrupted = -1; + continue; + } printf("PAGE ACCESS: %c%c%c for GFN %"PRIx64" (offset %06" PRIx64") gla %016"PRIx64" (vcpu %d)\n", @@ -599,7 +639,17 @@ int main(int argc, char *argv[]) req.vcpu_id); if ( default_access != after_first_access ) - rc = xc_hvm_set_mem_access(xch, domain_id, after_first_access, req.gfn, 1); + { + rc = xc_hvm_set_mem_access(xch, domain_id, + after_first_access, req.gfn, 1); + if (rc < 0) + { + ERROR("Error %d setting gfn to access_type %d\n", rc, + after_first_access); + interrupted = -1; + continue; + } + } rsp.gfn = req.gfn; @@ -613,6 +663,12 @@ int main(int argc, char *argv[]) /* Reinject */ rc = xc_hvm_inject_trap(xch, domain_id, req.vcpu_id, 3, -1, 0); + if (rc < 0) + { + ERROR("Error %d injecting int3\n", rc); + interrupted = -1; + continue; + } break; default: @@ -633,6 +689,7 @@ int main(int argc, char *argv[]) } DPRINTF("xenaccess shut down on signal %d\n", interrupted); +exit: /* Tear down domain xenaccess */ rc1 = xenaccess_teardown(xch, xenaccess); if ( rc1 != 0 ) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:01 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBl-00034C-Lx; Mon, 14 May 2012 16:32:01 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBk-00032f-Al for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:00 +0000 Received: from [85.158.143.99:58516] by server-3.bemta-4.messagelabs.com id 76/7A-05853-F7331BF4; Mon, 14 May 2012 16:31:59 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-216.messagelabs.com!1337013116!20925394!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7089 invoked from network); 14 May 2012 16:31:58 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:31:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBg-0002ng-9I for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBg-0006Uj-8e for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:56 +0000 Message-Id: Date: Mon, 14 May 2012 16:31:55 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] tools: xen-access: Check return values and clean up on errors during init X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Aravindh Puthiyaparambil # Date 1335287871 -3600 # Node ID 4030cd5f99695c097bcf318993350433ddd1af10 # Parent bffff7fecd8846def877ffd2ffd3fc7ed5700451 tools: xen-access: Check return values and clean up on errors during init Check the return values of the libxc mem_access calls. Free allocated structures (platform_info, domain_info) on errors during initialization and exit. Unbind VIRQ, close event channel and connection to Xen on errors during initialization Signed-off-by: Aravindh Puthiyaparambil Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r bffff7fecd88 -r 4030cd5f9969 tools/tests/xen-access/xen-access.c --- a/tools/tests/xen-access/xen-access.c Tue Apr 24 18:16:30 2012 +0100 +++ b/tools/tests/xen-access/xen-access.c Tue Apr 24 18:17:51 2012 +0100 @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -120,6 +121,7 @@ typedef struct xenaccess { } xenaccess_t; static int interrupted; +bool evtchn_bind = 0, evtchn_open = 0, mem_access_enable = 0; static void close_handler(int sig) { @@ -167,9 +169,68 @@ int xc_wait_for_event_or_timeout(xc_inte return -errno; } +int xenaccess_teardown(xc_interface *xch, xenaccess_t *xenaccess) +{ + int rc; + + if ( xenaccess == NULL ) + return 0; + + /* Tear down domain xenaccess in Xen */ + if ( xenaccess->mem_event.ring_page ) + munmap(xenaccess->mem_event.ring_page, PAGE_SIZE); + + if ( mem_access_enable ) + { + rc = xc_mem_access_disable(xenaccess->xc_handle, + xenaccess->mem_event.domain_id); + if ( rc != 0 ) + { + ERROR("Error tearing down domain xenaccess in xen"); + } + } + + /* Unbind VIRQ */ + if ( evtchn_bind ) + { + rc = xc_evtchn_unbind(xenaccess->mem_event.xce_handle, + xenaccess->mem_event.port); + if ( rc != 0 ) + { + ERROR("Error unbinding event port"); + } + } + + /* Close event channel */ + if ( evtchn_open ) + { + rc = xc_evtchn_close(xenaccess->mem_event.xce_handle); + if ( rc != 0 ) + { + ERROR("Error closing event channel"); + } + } + + /* Close connection to Xen */ + rc = xc_interface_close(xenaccess->xc_handle); + if ( rc != 0 ) + { + ERROR("Error closing connection to xen"); + } + xenaccess->xc_handle = NULL; + + if ( xenaccess->platform_info ) + free(xenaccess->platform_info); + if ( xenaccess->domain_info ) + free(xenaccess->domain_info); + free(xenaccess); + + return 0; +} + xenaccess_t *xenaccess_init(xc_interface **xch_r, domid_t domain_id) { - xenaccess_t *xenaccess; + xenaccess_t *xenaccess = 0; xc_interface *xch; int rc; unsigned long ring_pfn, mmap_pfn; @@ -242,6 +303,7 @@ xenaccess_t *xenaccess_init(xc_interface } goto err; } + mem_access_enable = 1; /* Open event channel */ xenaccess->mem_event.xce_handle = xc_evtchn_open(NULL, 0); @@ -250,6 +312,7 @@ xenaccess_t *xenaccess_init(xc_interface ERROR("Failed to open event channel"); goto err; } + evtchn_open = 1; /* Bind event notification */ rc = xc_evtchn_bind_interdomain(xenaccess->mem_event.xce_handle, @@ -260,7 +323,7 @@ xenaccess_t *xenaccess_init(xc_interface ERROR("Failed to bind event channel"); goto err; } - + evtchn_bind = 1; xenaccess->mem_event.port = rc; /* Initialise ring */ @@ -314,64 +377,12 @@ xenaccess_t *xenaccess_init(xc_interface return xenaccess; err: - if ( xenaccess ) - { - if ( xenaccess->mem_event.ring_page ) - { - munmap(xenaccess->mem_event.ring_page, PAGE_SIZE); - } - - free(xenaccess->platform_info); - free(xenaccess->domain_info); - free(xenaccess); - } + xenaccess_teardown(xch, xenaccess); err_iface: return NULL; } -int xenaccess_teardown(xc_interface *xch, xenaccess_t *xenaccess) -{ - int rc; - - if ( xenaccess == NULL ) - return 0; - - /* Tear down domain xenaccess in Xen */ - munmap(xenaccess->mem_event.ring_page, PAGE_SIZE); - rc = xc_mem_access_disable(xenaccess->xc_handle, xenaccess->mem_event.domain_id); - if ( rc != 0 ) - { - ERROR("Error tearing down domain xenaccess in xen"); - } - - /* Unbind VIRQ */ - rc = xc_evtchn_unbind(xenaccess->mem_event.xce_handle, xenaccess->mem_event.port); - if ( rc != 0 ) - { - ERROR("Error unbinding event port"); - } - xenaccess->mem_event.port = -1; - - /* Close event channel */ - rc = xc_evtchn_close(xenaccess->mem_event.xce_handle); - if ( rc != 0 ) - { - ERROR("Error closing event channel"); - } - xenaccess->mem_event.xce_handle = NULL; - - /* Close connection to Xen */ - rc = xc_interface_close(xenaccess->xc_handle); - if ( rc != 0 ) - { - ERROR("Error closing connection to xen"); - } - xenaccess->xc_handle = NULL; - - return 0; -} - int get_request(mem_event_t *mem_event, mem_event_request_t *req) { mem_event_back_ring_t *back_ring; @@ -530,16 +541,39 @@ int main(int argc, char *argv[]) sigaction(SIGALRM, &act, NULL); /* Set whether the access listener is required */ - xc_domain_set_access_required(xch, domain_id, required); + rc = xc_domain_set_access_required(xch, domain_id, required); + if ( rc < 0 ) + { + ERROR("Error %d setting mem_access listener required\n", rc); + goto exit; + } /* Set the default access type and convert all pages to it */ rc = xc_hvm_set_mem_access(xch, domain_id, default_access, ~0ull, 0); - rc = xc_hvm_set_mem_access(xch, domain_id, default_access, 0, xenaccess->domain_info->max_pages); + if ( rc < 0 ) + { + ERROR("Error %d setting default mem access type\n", rc); + goto exit; + } + + rc = xc_hvm_set_mem_access(xch, domain_id, default_access, 0, + xenaccess->domain_info->max_pages); + if ( rc < 0 ) + { + ERROR("Error %d setting all memory to access type %d\n", rc, + default_access); + goto exit; + } if ( int3 ) rc = xc_set_hvm_param(xch, domain_id, HVM_PARAM_MEMORY_EVENT_INT3, HVMPME_mode_sync); else rc = xc_set_hvm_param(xch, domain_id, HVM_PARAM_MEMORY_EVENT_INT3, HVMPME_mode_disabled); + if ( rc < 0 ) + { + ERROR("Error %d setting int3 mem_event\n", rc); + goto exit; + } /* Wait for access */ for (;;) @@ -587,6 +621,12 @@ int main(int argc, char *argv[]) switch (req.reason) { case MEM_EVENT_REASON_VIOLATION: rc = xc_hvm_get_mem_access(xch, domain_id, req.gfn, &access); + if (rc < 0) + { + ERROR("Error %d getting mem_access event\n", rc); + interrupted = -1; + continue; + } printf("PAGE ACCESS: %c%c%c for GFN %"PRIx64" (offset %06" PRIx64") gla %016"PRIx64" (vcpu %d)\n", @@ -599,7 +639,17 @@ int main(int argc, char *argv[]) req.vcpu_id); if ( default_access != after_first_access ) - rc = xc_hvm_set_mem_access(xch, domain_id, after_first_access, req.gfn, 1); + { + rc = xc_hvm_set_mem_access(xch, domain_id, + after_first_access, req.gfn, 1); + if (rc < 0) + { + ERROR("Error %d setting gfn to access_type %d\n", rc, + after_first_access); + interrupted = -1; + continue; + } + } rsp.gfn = req.gfn; @@ -613,6 +663,12 @@ int main(int argc, char *argv[]) /* Reinject */ rc = xc_hvm_inject_trap(xch, domain_id, req.vcpu_id, 3, -1, 0); + if (rc < 0) + { + ERROR("Error %d injecting int3\n", rc); + interrupted = -1; + continue; + } break; default: @@ -633,6 +689,7 @@ int main(int argc, char *argv[]) } DPRINTF("xenaccess shut down on signal %d\n", interrupted); +exit: /* Tear down domain xenaccess */ rc1 = xenaccess_teardown(xch, xenaccess); if ( rc1 != 0 ) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:02 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBl-00033w-Es; Mon, 14 May 2012 16:32:01 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBj-00031v-KT for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:59 +0000 Received: from [193.109.254.147:48650] by server-6.bemta-14.messagelabs.com id 88/99-04960-F7331BF4; Mon, 14 May 2012 16:31:59 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-27.messagelabs.com!1337013117!9215638!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13006 invoked from network); 14 May 2012 16:31:58 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:31:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBg-0002nj-Pl for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBg-0006Uy-P6 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:56 +0000 Message-Id: Date: Mon, 14 May 2012 16:31:56 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] tools/build: fix distclean X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Roger Pau Monne # Date 1335288007 -3600 # Node ID 18f64a3630db7edf97f9a6875111389fd9758e16 # Parent 4030cd5f99695c097bcf318993350433ddd1af10 tools/build: fix distclean distclean removed config/Tools.mk which was needed by tools/Rules.mk, thus preventing distclean from running properly in the tools directory. This patch only enforces config/Tools.mk presence when not performing a clean/distclean target Signed-off-by: Roger Pau Monne Cc: George Dunlap Committed-by: Ian Jackson --- diff -r 4030cd5f9969 -r 18f64a3630db tools/Rules.mk --- a/tools/Rules.mk Tue Apr 24 18:17:51 2012 +0100 +++ b/tools/Rules.mk Tue Apr 24 18:20:07 2012 +0100 @@ -4,7 +4,7 @@ all: include $(XEN_ROOT)/Config.mk -include $(XEN_ROOT)/config/Tools.mk +-include $(XEN_ROOT)/config/Tools.mk export _INSTALL := $(INSTALL) INSTALL = $(XEN_ROOT)/tools/cross-install @@ -109,6 +109,7 @@ subdir-all-% subdir-clean-% subdir-insta subdir-distclean-%: .phony $(MAKE) -C $* clean +ifeq (,$(findstring clean,$(MAKECMDGOALS))) $(XEN_ROOT)/config/Tools.mk: - @echo "You have to run ./configure before building or installing the tools" - @exit 1 + $(error You have to run ./configure before building or installing the tools) +endif _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:02 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBl-00033w-Es; Mon, 14 May 2012 16:32:01 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBj-00031v-KT for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:59 +0000 Received: from [193.109.254.147:48650] by server-6.bemta-14.messagelabs.com id 88/99-04960-F7331BF4; Mon, 14 May 2012 16:31:59 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-27.messagelabs.com!1337013117!9215638!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13006 invoked from network); 14 May 2012 16:31:58 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:31:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBg-0002nj-Pl for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBg-0006Uy-P6 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:56 +0000 Message-Id: Date: Mon, 14 May 2012 16:31:56 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] tools/build: fix distclean X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Roger Pau Monne # Date 1335288007 -3600 # Node ID 18f64a3630db7edf97f9a6875111389fd9758e16 # Parent 4030cd5f99695c097bcf318993350433ddd1af10 tools/build: fix distclean distclean removed config/Tools.mk which was needed by tools/Rules.mk, thus preventing distclean from running properly in the tools directory. This patch only enforces config/Tools.mk presence when not performing a clean/distclean target Signed-off-by: Roger Pau Monne Cc: George Dunlap Committed-by: Ian Jackson --- diff -r 4030cd5f9969 -r 18f64a3630db tools/Rules.mk --- a/tools/Rules.mk Tue Apr 24 18:17:51 2012 +0100 +++ b/tools/Rules.mk Tue Apr 24 18:20:07 2012 +0100 @@ -4,7 +4,7 @@ all: include $(XEN_ROOT)/Config.mk -include $(XEN_ROOT)/config/Tools.mk +-include $(XEN_ROOT)/config/Tools.mk export _INSTALL := $(INSTALL) INSTALL = $(XEN_ROOT)/tools/cross-install @@ -109,6 +109,7 @@ subdir-all-% subdir-clean-% subdir-insta subdir-distclean-%: .phony $(MAKE) -C $* clean +ifeq (,$(findstring clean,$(MAKECMDGOALS))) $(XEN_ROOT)/config/Tools.mk: - @echo "You have to run ./configure before building or installing the tools" - @exit 1 + $(error You have to run ./configure before building or installing the tools) +endif _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:03 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBm-000368-SI; Mon, 14 May 2012 16:32:02 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBk-00033L-VC for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:01 +0000 Received: from [193.109.254.147:41705] by server-5.bemta-14.messagelabs.com id 8B/F0-30733-08331BF4; Mon, 14 May 2012 16:32:00 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-27.messagelabs.com!1337013118!9215642!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13051 invoked from network); 14 May 2012 16:31:59 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:31:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBh-0002np-Q5 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBh-0006VS-PP for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:57 +0000 Message-Id: Date: Mon, 14 May 2012 16:31:57 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: mark internal functions hidden X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1335289215 -3600 # Node ID d8ce6ab50fbce9b0072bc2df52f8f527f0c185e1 # Parent eb6a5ab8323bb6cc2b35d4a5067cdb4807227cc5 libxl: mark internal functions hidden Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r eb6a5ab8323b -r d8ce6ab50fbc tools/libxl/gentypes.py --- a/tools/libxl/gentypes.py Tue Apr 24 18:39:18 2012 +0100 +++ b/tools/libxl/gentypes.py Tue Apr 24 18:40:15 2012 +0100 @@ -280,22 +280,22 @@ if __name__ == '__main__': for ty in types: f.write(libxl_C_type_define(ty) + ";\n") if ty.dispose_fn is not None: - f.write("void %s(%s);\n" % (ty.dispose_fn, ty.make_arg("p"))) + f.write("%svoid %s(%s);\n" % (ty.hidden(), ty.dispose_fn, ty.make_arg("p"))) if ty.init_fn is not None: - f.write("void %s(%s);\n" % (ty.init_fn, ty.make_arg("p"))) + f.write("%svoid %s(%s);\n" % (ty.hidden(), ty.init_fn, ty.make_arg("p"))) for field in libxl_init_members(ty): if not isinstance(field.type, idl.KeyedUnion): raise Exception("Only KeyedUnion is supported for member init") ku = field.type - f.write("void %s(%s, %s);\n" % (ty.init_fn + "_" + ku.keyvar.name, + f.write("%svoid %s(%s, %s);\n" % (ty.hidden(), ty.init_fn + "_" + ku.keyvar.name, ty.make_arg("p"), ku.keyvar.type.make_arg(ku.keyvar.name))) if ty.json_fn is not None: - f.write("char *%s_to_json(libxl_ctx *ctx, %s);\n" % (ty.typename, ty.make_arg("p"))) + f.write("%schar *%s_to_json(libxl_ctx *ctx, %s);\n" % (ty.hidden(), ty.typename, ty.make_arg("p"))) if isinstance(ty, idl.Enumeration): - f.write("const char *%s_to_string(%s);\n" % (ty.typename, ty.make_arg("p"))) - f.write("int %s_from_string(const char *s, %s);\n" % (ty.typename, ty.make_arg("e", passby=idl.PASS_BY_REFERENCE))) - f.write("extern libxl_enum_string_table %s_string_table[];\n" % (ty.typename)) + f.write("%sconst char *%s_to_string(%s);\n" % (ty.hidden(), ty.typename, ty.make_arg("p"))) + f.write("%sint %s_from_string(const char *s, %s);\n" % (ty.hidden(), ty.typename, ty.make_arg("e", passby=idl.PASS_BY_REFERENCE))) + f.write("%sextern libxl_enum_string_table %s_string_table[];\n" % (ty.hidden(), ty.typename)) f.write("\n") f.write("""#endif /* %s */\n""" % (header_define)) @@ -319,7 +319,7 @@ if __name__ == '__main__': """ % (header_json_define, header_json_define, " ".join(sys.argv))) for ty in [ty for ty in types if ty.json_fn is not None]: - f.write("yajl_gen_status %s_gen_json(yajl_gen hand, %s);\n" % (ty.typename, ty.make_arg("p", passby=idl.PASS_BY_REFERENCE))) + f.write("%syajl_gen_status %s_gen_json(yajl_gen hand, %s);\n" % (ty.hidden(), ty.typename, ty.make_arg("p", passby=idl.PASS_BY_REFERENCE))) f.write("\n") f.write("""#endif /* %s */\n""" % header_json_define) diff -r eb6a5ab8323b -r d8ce6ab50fbc tools/libxl/idl.py --- a/tools/libxl/idl.py Tue Apr 24 18:39:18 2012 +0100 +++ b/tools/libxl/idl.py Tue Apr 24 18:40:15 2012 +0100 @@ -19,11 +19,20 @@ def _get_default_namespace(): global _default_namespace return _default_namespace +_default_hidden = False +def hidden(b): + global _default_hidden + _default_hidden = b + +def _get_default_hidden(): + global _default_hidden + return _default_hidden class Type(object): def __init__(self, typename, **kwargs): self.namespace = kwargs.setdefault('namespace', _get_default_namespace()) + self._hidden = kwargs.setdefault('hidden', _get_default_hidden()) self.dir = kwargs.setdefault('dir', DIR_BOTH) if self.dir not in [DIR_NONE, DIR_IN, DIR_OUT, DIR_BOTH]: raise ValueError @@ -67,6 +76,12 @@ class Type(object): def marshal_out(self): return self.dir in [DIR_OUT, DIR_BOTH] + def hidden(self): + if self._hidden: + return "_hidden " + else: + return "" + def make_arg(self, n, passby=None): if passby is None: passby = self.passby @@ -289,7 +304,7 @@ def parse(f): globs[n] = t elif n in ['PASS_BY_REFERENCE', 'PASS_BY_VALUE', 'DIR_NONE', 'DIR_IN', 'DIR_OUT', 'DIR_BOTH', - 'namespace']: + 'namespace', 'hidden']: globs[n] = t try: diff -r eb6a5ab8323b -r d8ce6ab50fbc tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Tue Apr 24 18:39:18 2012 +0100 +++ b/tools/libxl/libxl_internal.h Tue Apr 24 18:40:15 2012 +0100 @@ -118,7 +118,7 @@ typedef struct libxl__gc libxl__gc; typedef struct libxl__egc libxl__egc; typedef struct libxl__ao libxl__ao; -void libxl__alloc_failed(libxl_ctx *, const char *func, +_hidden void libxl__alloc_failed(libxl_ctx *, const char *func, size_t nmemb, size_t size) __attribute__((noreturn)); /* func, size and nmemb are used only in the log message. * You may pass size==0 if size and nmemb are not meaningful @@ -184,7 +184,8 @@ typedef struct libxl__ev_watch_slot { LIBXL_SLIST_ENTRY(struct libxl__ev_watch_slot) empty; } libxl__ev_watch_slot; -libxl__ev_xswatch *libxl__watch_slot_contents(libxl__gc *gc, int slotnum); +_hidden libxl__ev_xswatch *libxl__watch_slot_contents(libxl__gc *gc, + int slotnum); /* @@ -597,21 +598,21 @@ _hidden void libxl__event_disaster(libxl /* Fills in, or disposes of, the resources held by, a poller whose * space the caller has allocated. ctx must be locked. */ -int libxl__poller_init(libxl_ctx *ctx, libxl__poller *p); -void libxl__poller_dispose(libxl__poller *p); +_hidden int libxl__poller_init(libxl_ctx *ctx, libxl__poller *p); +_hidden void libxl__poller_dispose(libxl__poller *p); /* Obtain a fresh poller from malloc or the idle list, and put it * away again afterwards. _get can fail, returning NULL. * ctx must be locked. */ -libxl__poller *libxl__poller_get(libxl_ctx *ctx); -void libxl__poller_put(libxl_ctx *ctx, libxl__poller *p); +_hidden libxl__poller *libxl__poller_get(libxl_ctx *ctx); +_hidden void libxl__poller_put(libxl_ctx *ctx, libxl__poller *p); /* Notifies whoever is polling using p that they should wake up. * ctx must be locked. */ -void libxl__poller_wakeup(libxl__egc *egc, libxl__poller *p); +_hidden void libxl__poller_wakeup(libxl__egc *egc, libxl__poller *p); -int libxl__atfork_init(libxl_ctx *ctx); +_hidden int libxl__atfork_init(libxl_ctx *ctx); /* from xl_dom */ @@ -1356,23 +1357,23 @@ _hidden void libxl__ao__destroy(libxl_ct */ typedef struct libxl__carefd libxl__carefd; -void libxl__carefd_begin(void); -void libxl__carefd_unlock(void); +_hidden void libxl__carefd_begin(void); +_hidden void libxl__carefd_unlock(void); /* fd may be -1, in which case this returns a dummy libxl__fd_record * on which it _carefd_close is a no-op. Cannot fail. */ -libxl__carefd *libxl__carefd_record(libxl_ctx *ctx, int fd); +_hidden libxl__carefd *libxl__carefd_record(libxl_ctx *ctx, int fd); /* Combines _record and _unlock in a single call. If fd==-1, * still does the unlock, but returns 0. Cannot fail. */ -libxl__carefd *libxl__carefd_opened(libxl_ctx *ctx, int fd); +_hidden libxl__carefd *libxl__carefd_opened(libxl_ctx *ctx, int fd); /* Works just like close(2). You may pass NULL, in which case it's * a successful no-op. */ -int libxl__carefd_close(libxl__carefd*); +_hidden int libxl__carefd_close(libxl__carefd*); /* You may pass NULL in which case the answer is -1. */ -int libxl__carefd_fd(const libxl__carefd*); +_hidden int libxl__carefd_fd(const libxl__carefd*); /* diff -r eb6a5ab8323b -r d8ce6ab50fbc tools/libxl/libxl_types_internal.idl --- a/tools/libxl/libxl_types_internal.idl Tue Apr 24 18:39:18 2012 +0100 +++ b/tools/libxl/libxl_types_internal.idl Tue Apr 24 18:40:15 2012 +0100 @@ -1,4 +1,5 @@ namespace("libxl__") +hidden(True) libxl_domid = Builtin("domid", namespace="libxl_", json_fn = "yajl_gen_integer") _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:03 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBm-000368-SI; Mon, 14 May 2012 16:32:02 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBk-00033L-VC for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:01 +0000 Received: from [193.109.254.147:41705] by server-5.bemta-14.messagelabs.com id 8B/F0-30733-08331BF4; Mon, 14 May 2012 16:32:00 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-27.messagelabs.com!1337013118!9215642!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13051 invoked from network); 14 May 2012 16:31:59 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:31:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBh-0002np-Q5 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBh-0006VS-PP for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:57 +0000 Message-Id: Date: Mon, 14 May 2012 16:31:57 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: mark internal functions hidden X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1335289215 -3600 # Node ID d8ce6ab50fbce9b0072bc2df52f8f527f0c185e1 # Parent eb6a5ab8323bb6cc2b35d4a5067cdb4807227cc5 libxl: mark internal functions hidden Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r eb6a5ab8323b -r d8ce6ab50fbc tools/libxl/gentypes.py --- a/tools/libxl/gentypes.py Tue Apr 24 18:39:18 2012 +0100 +++ b/tools/libxl/gentypes.py Tue Apr 24 18:40:15 2012 +0100 @@ -280,22 +280,22 @@ if __name__ == '__main__': for ty in types: f.write(libxl_C_type_define(ty) + ";\n") if ty.dispose_fn is not None: - f.write("void %s(%s);\n" % (ty.dispose_fn, ty.make_arg("p"))) + f.write("%svoid %s(%s);\n" % (ty.hidden(), ty.dispose_fn, ty.make_arg("p"))) if ty.init_fn is not None: - f.write("void %s(%s);\n" % (ty.init_fn, ty.make_arg("p"))) + f.write("%svoid %s(%s);\n" % (ty.hidden(), ty.init_fn, ty.make_arg("p"))) for field in libxl_init_members(ty): if not isinstance(field.type, idl.KeyedUnion): raise Exception("Only KeyedUnion is supported for member init") ku = field.type - f.write("void %s(%s, %s);\n" % (ty.init_fn + "_" + ku.keyvar.name, + f.write("%svoid %s(%s, %s);\n" % (ty.hidden(), ty.init_fn + "_" + ku.keyvar.name, ty.make_arg("p"), ku.keyvar.type.make_arg(ku.keyvar.name))) if ty.json_fn is not None: - f.write("char *%s_to_json(libxl_ctx *ctx, %s);\n" % (ty.typename, ty.make_arg("p"))) + f.write("%schar *%s_to_json(libxl_ctx *ctx, %s);\n" % (ty.hidden(), ty.typename, ty.make_arg("p"))) if isinstance(ty, idl.Enumeration): - f.write("const char *%s_to_string(%s);\n" % (ty.typename, ty.make_arg("p"))) - f.write("int %s_from_string(const char *s, %s);\n" % (ty.typename, ty.make_arg("e", passby=idl.PASS_BY_REFERENCE))) - f.write("extern libxl_enum_string_table %s_string_table[];\n" % (ty.typename)) + f.write("%sconst char *%s_to_string(%s);\n" % (ty.hidden(), ty.typename, ty.make_arg("p"))) + f.write("%sint %s_from_string(const char *s, %s);\n" % (ty.hidden(), ty.typename, ty.make_arg("e", passby=idl.PASS_BY_REFERENCE))) + f.write("%sextern libxl_enum_string_table %s_string_table[];\n" % (ty.hidden(), ty.typename)) f.write("\n") f.write("""#endif /* %s */\n""" % (header_define)) @@ -319,7 +319,7 @@ if __name__ == '__main__': """ % (header_json_define, header_json_define, " ".join(sys.argv))) for ty in [ty for ty in types if ty.json_fn is not None]: - f.write("yajl_gen_status %s_gen_json(yajl_gen hand, %s);\n" % (ty.typename, ty.make_arg("p", passby=idl.PASS_BY_REFERENCE))) + f.write("%syajl_gen_status %s_gen_json(yajl_gen hand, %s);\n" % (ty.hidden(), ty.typename, ty.make_arg("p", passby=idl.PASS_BY_REFERENCE))) f.write("\n") f.write("""#endif /* %s */\n""" % header_json_define) diff -r eb6a5ab8323b -r d8ce6ab50fbc tools/libxl/idl.py --- a/tools/libxl/idl.py Tue Apr 24 18:39:18 2012 +0100 +++ b/tools/libxl/idl.py Tue Apr 24 18:40:15 2012 +0100 @@ -19,11 +19,20 @@ def _get_default_namespace(): global _default_namespace return _default_namespace +_default_hidden = False +def hidden(b): + global _default_hidden + _default_hidden = b + +def _get_default_hidden(): + global _default_hidden + return _default_hidden class Type(object): def __init__(self, typename, **kwargs): self.namespace = kwargs.setdefault('namespace', _get_default_namespace()) + self._hidden = kwargs.setdefault('hidden', _get_default_hidden()) self.dir = kwargs.setdefault('dir', DIR_BOTH) if self.dir not in [DIR_NONE, DIR_IN, DIR_OUT, DIR_BOTH]: raise ValueError @@ -67,6 +76,12 @@ class Type(object): def marshal_out(self): return self.dir in [DIR_OUT, DIR_BOTH] + def hidden(self): + if self._hidden: + return "_hidden " + else: + return "" + def make_arg(self, n, passby=None): if passby is None: passby = self.passby @@ -289,7 +304,7 @@ def parse(f): globs[n] = t elif n in ['PASS_BY_REFERENCE', 'PASS_BY_VALUE', 'DIR_NONE', 'DIR_IN', 'DIR_OUT', 'DIR_BOTH', - 'namespace']: + 'namespace', 'hidden']: globs[n] = t try: diff -r eb6a5ab8323b -r d8ce6ab50fbc tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Tue Apr 24 18:39:18 2012 +0100 +++ b/tools/libxl/libxl_internal.h Tue Apr 24 18:40:15 2012 +0100 @@ -118,7 +118,7 @@ typedef struct libxl__gc libxl__gc; typedef struct libxl__egc libxl__egc; typedef struct libxl__ao libxl__ao; -void libxl__alloc_failed(libxl_ctx *, const char *func, +_hidden void libxl__alloc_failed(libxl_ctx *, const char *func, size_t nmemb, size_t size) __attribute__((noreturn)); /* func, size and nmemb are used only in the log message. * You may pass size==0 if size and nmemb are not meaningful @@ -184,7 +184,8 @@ typedef struct libxl__ev_watch_slot { LIBXL_SLIST_ENTRY(struct libxl__ev_watch_slot) empty; } libxl__ev_watch_slot; -libxl__ev_xswatch *libxl__watch_slot_contents(libxl__gc *gc, int slotnum); +_hidden libxl__ev_xswatch *libxl__watch_slot_contents(libxl__gc *gc, + int slotnum); /* @@ -597,21 +598,21 @@ _hidden void libxl__event_disaster(libxl /* Fills in, or disposes of, the resources held by, a poller whose * space the caller has allocated. ctx must be locked. */ -int libxl__poller_init(libxl_ctx *ctx, libxl__poller *p); -void libxl__poller_dispose(libxl__poller *p); +_hidden int libxl__poller_init(libxl_ctx *ctx, libxl__poller *p); +_hidden void libxl__poller_dispose(libxl__poller *p); /* Obtain a fresh poller from malloc or the idle list, and put it * away again afterwards. _get can fail, returning NULL. * ctx must be locked. */ -libxl__poller *libxl__poller_get(libxl_ctx *ctx); -void libxl__poller_put(libxl_ctx *ctx, libxl__poller *p); +_hidden libxl__poller *libxl__poller_get(libxl_ctx *ctx); +_hidden void libxl__poller_put(libxl_ctx *ctx, libxl__poller *p); /* Notifies whoever is polling using p that they should wake up. * ctx must be locked. */ -void libxl__poller_wakeup(libxl__egc *egc, libxl__poller *p); +_hidden void libxl__poller_wakeup(libxl__egc *egc, libxl__poller *p); -int libxl__atfork_init(libxl_ctx *ctx); +_hidden int libxl__atfork_init(libxl_ctx *ctx); /* from xl_dom */ @@ -1356,23 +1357,23 @@ _hidden void libxl__ao__destroy(libxl_ct */ typedef struct libxl__carefd libxl__carefd; -void libxl__carefd_begin(void); -void libxl__carefd_unlock(void); +_hidden void libxl__carefd_begin(void); +_hidden void libxl__carefd_unlock(void); /* fd may be -1, in which case this returns a dummy libxl__fd_record * on which it _carefd_close is a no-op. Cannot fail. */ -libxl__carefd *libxl__carefd_record(libxl_ctx *ctx, int fd); +_hidden libxl__carefd *libxl__carefd_record(libxl_ctx *ctx, int fd); /* Combines _record and _unlock in a single call. If fd==-1, * still does the unlock, but returns 0. Cannot fail. */ -libxl__carefd *libxl__carefd_opened(libxl_ctx *ctx, int fd); +_hidden libxl__carefd *libxl__carefd_opened(libxl_ctx *ctx, int fd); /* Works just like close(2). You may pass NULL, in which case it's * a successful no-op. */ -int libxl__carefd_close(libxl__carefd*); +_hidden int libxl__carefd_close(libxl__carefd*); /* You may pass NULL in which case the answer is -1. */ -int libxl__carefd_fd(const libxl__carefd*); +_hidden int libxl__carefd_fd(const libxl__carefd*); /* diff -r eb6a5ab8323b -r d8ce6ab50fbc tools/libxl/libxl_types_internal.idl --- a/tools/libxl/libxl_types_internal.idl Tue Apr 24 18:39:18 2012 +0100 +++ b/tools/libxl/libxl_types_internal.idl Tue Apr 24 18:40:15 2012 +0100 @@ -1,4 +1,5 @@ namespace("libxl__") +hidden(True) libxl_domid = Builtin("domid", namespace="libxl_", json_fn = "yajl_gen_integer") _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:04 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBn-00037B-Vx; Mon, 14 May 2012 16:32:03 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBl-00031o-MG for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:01 +0000 Received: from [85.158.143.99:62544] by server-2.bemta-4.messagelabs.com id 16/DC-17550-18331BF4; Mon, 14 May 2012 16:32:01 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-216.messagelabs.com!1337013118!27931081!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1480 invoked from network); 14 May 2012 16:32:00 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBi-0002ns-Aj for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBi-0006Vh-9v for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:58 +0000 Message-Id: Date: Mon, 14 May 2012 16:31:57 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] autoconf: use python-config when present, if not switch to distuti X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Roger Pau Monne # Date 1335289344 -3600 # Node ID caee592e55cbaaf4157bd1ead097e571b1dfcef8 # Parent d8ce6ab50fbce9b0072bc2df52f8f527f0c185e1 autoconf: use python-config when present, if not switch to distuti Use python-config utility when possible, and if it is not present switch to distutils. Should fix the bug reported by Olaf Hering on SuSE. Signed-off-by: Roger Pau Monne Tested-by: Olaf Hering Committed-by: Ian Jackson --- diff -r d8ce6ab50fbc -r caee592e55cb tools/configure --- a/tools/configure Tue Apr 24 18:40:15 2012 +0100 +++ b/tools/configure Tue Apr 24 18:42:24 2012 +0100 @@ -616,6 +616,7 @@ PKG_CONFIG_LIBDIR PKG_CONFIG_PATH PKG_CONFIG CURSES_LIBS +pyconfig PYTHONPATH OCAMLBUILD OCAMLDOC @@ -6282,25 +6283,75 @@ else $as_echo "yes" >&6; } fi +ac_previous_cppflags=$CPPFLAGS +ac_previous_ldflags=$LDFLAGS ac_python_version=`$PYTHON -c 'import distutils.sysconfig; \ print distutils.sysconfig.get_config_var("VERSION")'` -ac_previous_cppflags=$CPPFLAGS -CPPFLAGS="$CFLAGS `$PYTHON -c 'import distutils.sysconfig; \ - print "-I" + distutils.sysconfig.get_config_var("INCLUDEPY")'`" -CPPFLAGS="$CPPFLAGS `$PYTHON -c 'import distutils.sysconfig; \ - print distutils.sysconfig.get_config_var("CFLAGS")'`" -ac_previous_ldflags=$LDFLAGS -LDFLAGS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \ - print distutils.sysconfig.get_config_var("LIBS")'`" -LDFLAGS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \ - print distutils.sysconfig.get_config_var("SYSLIBS")'`" -LDFLAGS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \ - print "-L" + distutils.sysconfig.get_python_lib(plat_specific=1,\ - standard_lib=1) + "/config"'`" -LDFLAGS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \ - print distutils.sysconfig.get_config_var("LINKFORSHARED")'`" -LDFLAGS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \ - print distutils.sysconfig.get_config_var("LDFLAGS")'`" +# Extract the first word of "$PYTHON-config", so it can be a program name with args. +set dummy $PYTHON-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_pyconfig+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + case $pyconfig in + [\\/]* | ?:[\\/]*) + ac_cv_path_pyconfig="$pyconfig" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_pyconfig="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_path_pyconfig" && ac_cv_path_pyconfig="no" + ;; +esac +fi +pyconfig=$ac_cv_path_pyconfig +if test -n "$pyconfig"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pyconfig" >&5 +$as_echo "$pyconfig" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +if test x"$pyconfig" == x"no"; then : + + CPPFLAGS="$CFLAGS `$PYTHON -c 'import distutils.sysconfig; \ + print "-I" + distutils.sysconfig.get_config_var("INCLUDEPY")'`" + CPPFLAGS="$CPPFLAGS `$PYTHON -c 'import distutils.sysconfig; \ + print distutils.sysconfig.get_config_var("CFLAGS")'`" + LDFLAGS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \ + print distutils.sysconfig.get_config_var("LIBS")'`" + LDFLAGS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \ + print distutils.sysconfig.get_config_var("SYSLIBS")'`" + LDFLAGS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \ + print "-L" + distutils.sysconfig.get_python_lib(plat_specific=1,\ + standard_lib=1) + "/config"'`" + LDFLAGS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \ + print distutils.sysconfig.get_config_var("LINKFORSHARED")'`" + LDFLAGS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \ + print distutils.sysconfig.get_config_var("LDFLAGS")'`" + +else + + CPPFLAGS="$CFLAGS `$PYTHON-config --cflags`" + LDFLAGS="$LDFLAGS `$PYTHON-config --ldflags`" + +fi ac_fn_c_check_header_mongrel "$LINENO" "Python.h" "ac_cv_header_Python_h" "$ac_includes_default" if test "x$ac_cv_header_Python_h" = x""yes; then : diff -r d8ce6ab50fbc -r caee592e55cb tools/m4/python_devel.m4 --- a/tools/m4/python_devel.m4 Tue Apr 24 18:40:15 2012 +0100 +++ b/tools/m4/python_devel.m4 Tue Apr 24 18:42:24 2012 +0100 @@ -1,23 +1,31 @@ AC_DEFUN([AX_CHECK_PYTHON_DEVEL], [ +ac_previous_cppflags=$CPPFLAGS +ac_previous_ldflags=$LDFLAGS ac_python_version=`$PYTHON -c 'import distutils.sysconfig; \ print distutils.sysconfig.get_config_var("VERSION")'` -ac_previous_cppflags=$CPPFLAGS -CPPFLAGS="$CFLAGS `$PYTHON -c 'import distutils.sysconfig; \ - print "-I" + distutils.sysconfig.get_config_var("INCLUDEPY")'`" -CPPFLAGS="$CPPFLAGS `$PYTHON -c 'import distutils.sysconfig; \ - print distutils.sysconfig.get_config_var("CFLAGS")'`" -ac_previous_ldflags=$LDFLAGS -LDFLAGS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \ - print distutils.sysconfig.get_config_var("LIBS")'`" -LDFLAGS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \ - print distutils.sysconfig.get_config_var("SYSLIBS")'`" -LDFLAGS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \ - print "-L" + distutils.sysconfig.get_python_lib(plat_specific=1,\ - standard_lib=1) + "/config"'`" -LDFLAGS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \ - print distutils.sysconfig.get_config_var("LINKFORSHARED")'`" -LDFLAGS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \ - print distutils.sysconfig.get_config_var("LDFLAGS")'`" +AC_PATH_PROG([pyconfig], [$PYTHON-config], [no]) +AS_IF([test x"$pyconfig" == x"no"], [ + dnl For those that don't have python-config + CPPFLAGS="$CFLAGS `$PYTHON -c 'import distutils.sysconfig; \ + print "-I" + distutils.sysconfig.get_config_var("INCLUDEPY")'`" + CPPFLAGS="$CPPFLAGS `$PYTHON -c 'import distutils.sysconfig; \ + print distutils.sysconfig.get_config_var("CFLAGS")'`" + LDFLAGS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \ + print distutils.sysconfig.get_config_var("LIBS")'`" + LDFLAGS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \ + print distutils.sysconfig.get_config_var("SYSLIBS")'`" + LDFLAGS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \ + print "-L" + distutils.sysconfig.get_python_lib(plat_specific=1,\ + standard_lib=1) + "/config"'`" + LDFLAGS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \ + print distutils.sysconfig.get_config_var("LINKFORSHARED")'`" + LDFLAGS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \ + print distutils.sysconfig.get_config_var("LDFLAGS")'`" +], [ + dnl If python-config is found use it + CPPFLAGS="$CFLAGS `$PYTHON-config --cflags`" + LDFLAGS="$LDFLAGS `$PYTHON-config --ldflags`" +]) AC_CHECK_HEADER([Python.h], [], [AC_MSG_ERROR([Unable to find Python development headers])],) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:04 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBn-00037B-Vx; Mon, 14 May 2012 16:32:03 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBl-00031o-MG for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:01 +0000 Received: from [85.158.143.99:62544] by server-2.bemta-4.messagelabs.com id 16/DC-17550-18331BF4; Mon, 14 May 2012 16:32:01 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-216.messagelabs.com!1337013118!27931081!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1480 invoked from network); 14 May 2012 16:32:00 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBi-0002ns-Aj for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBi-0006Vh-9v for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:58 +0000 Message-Id: Date: Mon, 14 May 2012 16:31:57 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] autoconf: use python-config when present, if not switch to distuti X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Roger Pau Monne # Date 1335289344 -3600 # Node ID caee592e55cbaaf4157bd1ead097e571b1dfcef8 # Parent d8ce6ab50fbce9b0072bc2df52f8f527f0c185e1 autoconf: use python-config when present, if not switch to distuti Use python-config utility when possible, and if it is not present switch to distutils. Should fix the bug reported by Olaf Hering on SuSE. Signed-off-by: Roger Pau Monne Tested-by: Olaf Hering Committed-by: Ian Jackson --- diff -r d8ce6ab50fbc -r caee592e55cb tools/configure --- a/tools/configure Tue Apr 24 18:40:15 2012 +0100 +++ b/tools/configure Tue Apr 24 18:42:24 2012 +0100 @@ -616,6 +616,7 @@ PKG_CONFIG_LIBDIR PKG_CONFIG_PATH PKG_CONFIG CURSES_LIBS +pyconfig PYTHONPATH OCAMLBUILD OCAMLDOC @@ -6282,25 +6283,75 @@ else $as_echo "yes" >&6; } fi +ac_previous_cppflags=$CPPFLAGS +ac_previous_ldflags=$LDFLAGS ac_python_version=`$PYTHON -c 'import distutils.sysconfig; \ print distutils.sysconfig.get_config_var("VERSION")'` -ac_previous_cppflags=$CPPFLAGS -CPPFLAGS="$CFLAGS `$PYTHON -c 'import distutils.sysconfig; \ - print "-I" + distutils.sysconfig.get_config_var("INCLUDEPY")'`" -CPPFLAGS="$CPPFLAGS `$PYTHON -c 'import distutils.sysconfig; \ - print distutils.sysconfig.get_config_var("CFLAGS")'`" -ac_previous_ldflags=$LDFLAGS -LDFLAGS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \ - print distutils.sysconfig.get_config_var("LIBS")'`" -LDFLAGS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \ - print distutils.sysconfig.get_config_var("SYSLIBS")'`" -LDFLAGS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \ - print "-L" + distutils.sysconfig.get_python_lib(plat_specific=1,\ - standard_lib=1) + "/config"'`" -LDFLAGS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \ - print distutils.sysconfig.get_config_var("LINKFORSHARED")'`" -LDFLAGS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \ - print distutils.sysconfig.get_config_var("LDFLAGS")'`" +# Extract the first word of "$PYTHON-config", so it can be a program name with args. +set dummy $PYTHON-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_pyconfig+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + case $pyconfig in + [\\/]* | ?:[\\/]*) + ac_cv_path_pyconfig="$pyconfig" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_pyconfig="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_path_pyconfig" && ac_cv_path_pyconfig="no" + ;; +esac +fi +pyconfig=$ac_cv_path_pyconfig +if test -n "$pyconfig"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pyconfig" >&5 +$as_echo "$pyconfig" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +if test x"$pyconfig" == x"no"; then : + + CPPFLAGS="$CFLAGS `$PYTHON -c 'import distutils.sysconfig; \ + print "-I" + distutils.sysconfig.get_config_var("INCLUDEPY")'`" + CPPFLAGS="$CPPFLAGS `$PYTHON -c 'import distutils.sysconfig; \ + print distutils.sysconfig.get_config_var("CFLAGS")'`" + LDFLAGS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \ + print distutils.sysconfig.get_config_var("LIBS")'`" + LDFLAGS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \ + print distutils.sysconfig.get_config_var("SYSLIBS")'`" + LDFLAGS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \ + print "-L" + distutils.sysconfig.get_python_lib(plat_specific=1,\ + standard_lib=1) + "/config"'`" + LDFLAGS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \ + print distutils.sysconfig.get_config_var("LINKFORSHARED")'`" + LDFLAGS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \ + print distutils.sysconfig.get_config_var("LDFLAGS")'`" + +else + + CPPFLAGS="$CFLAGS `$PYTHON-config --cflags`" + LDFLAGS="$LDFLAGS `$PYTHON-config --ldflags`" + +fi ac_fn_c_check_header_mongrel "$LINENO" "Python.h" "ac_cv_header_Python_h" "$ac_includes_default" if test "x$ac_cv_header_Python_h" = x""yes; then : diff -r d8ce6ab50fbc -r caee592e55cb tools/m4/python_devel.m4 --- a/tools/m4/python_devel.m4 Tue Apr 24 18:40:15 2012 +0100 +++ b/tools/m4/python_devel.m4 Tue Apr 24 18:42:24 2012 +0100 @@ -1,23 +1,31 @@ AC_DEFUN([AX_CHECK_PYTHON_DEVEL], [ +ac_previous_cppflags=$CPPFLAGS +ac_previous_ldflags=$LDFLAGS ac_python_version=`$PYTHON -c 'import distutils.sysconfig; \ print distutils.sysconfig.get_config_var("VERSION")'` -ac_previous_cppflags=$CPPFLAGS -CPPFLAGS="$CFLAGS `$PYTHON -c 'import distutils.sysconfig; \ - print "-I" + distutils.sysconfig.get_config_var("INCLUDEPY")'`" -CPPFLAGS="$CPPFLAGS `$PYTHON -c 'import distutils.sysconfig; \ - print distutils.sysconfig.get_config_var("CFLAGS")'`" -ac_previous_ldflags=$LDFLAGS -LDFLAGS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \ - print distutils.sysconfig.get_config_var("LIBS")'`" -LDFLAGS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \ - print distutils.sysconfig.get_config_var("SYSLIBS")'`" -LDFLAGS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \ - print "-L" + distutils.sysconfig.get_python_lib(plat_specific=1,\ - standard_lib=1) + "/config"'`" -LDFLAGS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \ - print distutils.sysconfig.get_config_var("LINKFORSHARED")'`" -LDFLAGS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \ - print distutils.sysconfig.get_config_var("LDFLAGS")'`" +AC_PATH_PROG([pyconfig], [$PYTHON-config], [no]) +AS_IF([test x"$pyconfig" == x"no"], [ + dnl For those that don't have python-config + CPPFLAGS="$CFLAGS `$PYTHON -c 'import distutils.sysconfig; \ + print "-I" + distutils.sysconfig.get_config_var("INCLUDEPY")'`" + CPPFLAGS="$CPPFLAGS `$PYTHON -c 'import distutils.sysconfig; \ + print distutils.sysconfig.get_config_var("CFLAGS")'`" + LDFLAGS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \ + print distutils.sysconfig.get_config_var("LIBS")'`" + LDFLAGS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \ + print distutils.sysconfig.get_config_var("SYSLIBS")'`" + LDFLAGS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \ + print "-L" + distutils.sysconfig.get_python_lib(plat_specific=1,\ + standard_lib=1) + "/config"'`" + LDFLAGS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \ + print distutils.sysconfig.get_config_var("LINKFORSHARED")'`" + LDFLAGS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \ + print distutils.sysconfig.get_config_var("LDFLAGS")'`" +], [ + dnl If python-config is found use it + CPPFLAGS="$CFLAGS `$PYTHON-config --cflags`" + LDFLAGS="$LDFLAGS `$PYTHON-config --ldflags`" +]) AC_CHECK_HEADER([Python.h], [], [AC_MSG_ERROR([Unable to find Python development headers])],) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:04 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBo-00037Z-5A; Mon, 14 May 2012 16:32:04 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBm-00034g-Ex for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:02 +0000 Received: from [85.158.139.83:14924] by server-3.bemta-5.messagelabs.com id DD/14-25237-18331BF4; Mon, 14 May 2012 16:32:01 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-182.messagelabs.com!1337013117!28332105!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1260 invoked from network); 14 May 2012 16:31:59 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:31:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBh-0002nm-9i for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBh-0006VD-95 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:57 +0000 Message-Id: Date: Mon, 14 May 2012 16:31:56 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] tools: Fix FPU save area definition in xen-hvmctx X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Tim Deegan # Date 1335289158 -3600 # Node ID eb6a5ab8323bb6cc2b35d4a5067cdb4807227cc5 # Parent 18f64a3630db7edf97f9a6875111389fd9758e16 tools: Fix FPU save area definition in xen-hvmctx Reported-by: Olaf Hering Signed-off-by: Tim Deegan Committed-by: Ian Jackson --- diff -r 18f64a3630db -r eb6a5ab8323b tools/misc/xen-hvmctx.c --- a/tools/misc/xen-hvmctx.c Tue Apr 24 18:20:07 2012 +0100 +++ b/tools/misc/xen-hvmctx.c Tue Apr 24 18:39:18 2012 +0100 @@ -98,7 +98,7 @@ struct fpu_regs { uint32_t mxcsr; uint32_t mxcsr_mask; struct fpu_mm mm[8]; - struct fpu_xmm xmm[15]; + struct fpu_xmm xmm[16]; uint64_t res1[12]; } __attribute__((packed)); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:04 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBo-00037Z-5A; Mon, 14 May 2012 16:32:04 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBm-00034g-Ex for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:02 +0000 Received: from [85.158.139.83:14924] by server-3.bemta-5.messagelabs.com id DD/14-25237-18331BF4; Mon, 14 May 2012 16:32:01 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-182.messagelabs.com!1337013117!28332105!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1260 invoked from network); 14 May 2012 16:31:59 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:31:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBh-0002nm-9i for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBh-0006VD-95 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:57 +0000 Message-Id: Date: Mon, 14 May 2012 16:31:56 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] tools: Fix FPU save area definition in xen-hvmctx X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Tim Deegan # Date 1335289158 -3600 # Node ID eb6a5ab8323bb6cc2b35d4a5067cdb4807227cc5 # Parent 18f64a3630db7edf97f9a6875111389fd9758e16 tools: Fix FPU save area definition in xen-hvmctx Reported-by: Olaf Hering Signed-off-by: Tim Deegan Committed-by: Ian Jackson --- diff -r 18f64a3630db -r eb6a5ab8323b tools/misc/xen-hvmctx.c --- a/tools/misc/xen-hvmctx.c Tue Apr 24 18:20:07 2012 +0100 +++ b/tools/misc/xen-hvmctx.c Tue Apr 24 18:39:18 2012 +0100 @@ -98,7 +98,7 @@ struct fpu_regs { uint32_t mxcsr; uint32_t mxcsr_mask; struct fpu_mm mm[8]; - struct fpu_xmm xmm[15]; + struct fpu_xmm xmm[16]; uint64_t res1[12]; } __attribute__((packed)); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:04 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBo-00038Y-IM; Mon, 14 May 2012 16:32:04 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBm-00032f-Sn for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:03 +0000 Received: from [85.158.143.35:49836] by server-3.bemta-4.messagelabs.com id 5B/8A-05853-28331BF4; Mon, 14 May 2012 16:32:02 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-21.messagelabs.com!1337013121!15334590!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21030 invoked from network); 14 May 2012 16:32:01 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBk-0002oB-UQ for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBk-0006Wu-To for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:00 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:00 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] x86/mem_sharing: Clean up debugging calls X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Andres Lagar-Cavilla # Date 1335290708 -3600 # Node ID 0db887afb73aae1012747a77c3b96a652d260f0f # Parent 31489be80c511940ca83056c5e4df1068da30a8d x86/mem_sharing: Clean up debugging calls - Remove debug_mfn from the user-space interface - Clean up errno codes Signed-off-by: Andres Lagar-Cavilla Acked-by: Tim Deegan Committed-by: Ian Jackson --- diff -r 31489be80c51 -r 0db887afb73a tools/libxc/xc_memshr.c --- a/tools/libxc/xc_memshr.c Wed Apr 04 10:51:11 2012 +0100 +++ b/tools/libxc/xc_memshr.c Tue Apr 24 19:05:08 2012 +0100 @@ -208,20 +208,6 @@ int xc_memshr_debug_gfn(xc_interface *xc return xc_memshr_memop(xch, domid, &mso); } -int xc_memshr_debug_mfn(xc_interface *xch, - domid_t domid, - unsigned long mfn) -{ - xen_mem_sharing_op_t mso; - - memset(&mso, 0, sizeof(mso)); - - mso.op = XENMEM_sharing_op_debug_mfn; - mso.u.debug.u.mfn = mfn; - - return xc_memshr_memop(xch, domid, &mso); -} - int xc_memshr_debug_gref(xc_interface *xch, domid_t domid, grant_ref_t gref) diff -r 31489be80c51 -r 0db887afb73a tools/libxc/xenctrl.h --- a/tools/libxc/xenctrl.h Wed Apr 04 10:51:11 2012 +0100 +++ b/tools/libxc/xenctrl.h Tue Apr 24 19:05:08 2012 +0100 @@ -1955,9 +1955,6 @@ int xc_memshr_domain_resume(xc_interface int xc_memshr_debug_gfn(xc_interface *xch, domid_t domid, unsigned long gfn); -int xc_memshr_debug_mfn(xc_interface *xch, - domid_t domid, - unsigned long mfn); int xc_memshr_debug_gref(xc_interface *xch, domid_t domid, grant_ref_t gref); diff -r 31489be80c51 -r 0db887afb73a xen/arch/x86/mm/mem_sharing.c --- a/xen/arch/x86/mm/mem_sharing.c Wed Apr 04 10:51:11 2012 +0100 +++ b/xen/arch/x86/mm/mem_sharing.c Tue Apr 24 19:05:08 2012 +0100 @@ -512,7 +512,7 @@ int mem_sharing_debug_mfn(mfn_t mfn) if ( (page = __grab_shared_page(mfn)) == NULL) { gdprintk(XENLOG_ERR, "Invalid MFN=%lx\n", mfn_x(mfn)); - return -1; + return -EINVAL; } MEM_SHARING_DEBUG( @@ -599,7 +599,7 @@ int mem_sharing_debug_gref(struct domain MEM_SHARING_DEBUG( "Asked to debug [dom=%d,gref=%d], but not yet inited.\n", d->domain_id, ref); - return -1; + return -EINVAL; } (void)mem_sharing_gref_to_gfn(d, ref, &gfn); shah = shared_entry_header(d->grant_table, ref); @@ -1222,13 +1222,6 @@ int mem_sharing_memop(struct domain *d, } break; - case XENMEM_sharing_op_debug_mfn: - { - unsigned long mfn = mec->u.debug.u.mfn; - rc = mem_sharing_debug_mfn(_mfn(mfn)); - } - break; - case XENMEM_sharing_op_debug_gref: { grant_ref_t gref = mec->u.debug.u.gref; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:04 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBo-00038Y-IM; Mon, 14 May 2012 16:32:04 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBm-00032f-Sn for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:03 +0000 Received: from [85.158.143.35:49836] by server-3.bemta-4.messagelabs.com id 5B/8A-05853-28331BF4; Mon, 14 May 2012 16:32:02 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-21.messagelabs.com!1337013121!15334590!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21030 invoked from network); 14 May 2012 16:32:01 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBk-0002oB-UQ for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBk-0006Wu-To for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:00 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:00 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] x86/mem_sharing: Clean up debugging calls X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Andres Lagar-Cavilla # Date 1335290708 -3600 # Node ID 0db887afb73aae1012747a77c3b96a652d260f0f # Parent 31489be80c511940ca83056c5e4df1068da30a8d x86/mem_sharing: Clean up debugging calls - Remove debug_mfn from the user-space interface - Clean up errno codes Signed-off-by: Andres Lagar-Cavilla Acked-by: Tim Deegan Committed-by: Ian Jackson --- diff -r 31489be80c51 -r 0db887afb73a tools/libxc/xc_memshr.c --- a/tools/libxc/xc_memshr.c Wed Apr 04 10:51:11 2012 +0100 +++ b/tools/libxc/xc_memshr.c Tue Apr 24 19:05:08 2012 +0100 @@ -208,20 +208,6 @@ int xc_memshr_debug_gfn(xc_interface *xc return xc_memshr_memop(xch, domid, &mso); } -int xc_memshr_debug_mfn(xc_interface *xch, - domid_t domid, - unsigned long mfn) -{ - xen_mem_sharing_op_t mso; - - memset(&mso, 0, sizeof(mso)); - - mso.op = XENMEM_sharing_op_debug_mfn; - mso.u.debug.u.mfn = mfn; - - return xc_memshr_memop(xch, domid, &mso); -} - int xc_memshr_debug_gref(xc_interface *xch, domid_t domid, grant_ref_t gref) diff -r 31489be80c51 -r 0db887afb73a tools/libxc/xenctrl.h --- a/tools/libxc/xenctrl.h Wed Apr 04 10:51:11 2012 +0100 +++ b/tools/libxc/xenctrl.h Tue Apr 24 19:05:08 2012 +0100 @@ -1955,9 +1955,6 @@ int xc_memshr_domain_resume(xc_interface int xc_memshr_debug_gfn(xc_interface *xch, domid_t domid, unsigned long gfn); -int xc_memshr_debug_mfn(xc_interface *xch, - domid_t domid, - unsigned long mfn); int xc_memshr_debug_gref(xc_interface *xch, domid_t domid, grant_ref_t gref); diff -r 31489be80c51 -r 0db887afb73a xen/arch/x86/mm/mem_sharing.c --- a/xen/arch/x86/mm/mem_sharing.c Wed Apr 04 10:51:11 2012 +0100 +++ b/xen/arch/x86/mm/mem_sharing.c Tue Apr 24 19:05:08 2012 +0100 @@ -512,7 +512,7 @@ int mem_sharing_debug_mfn(mfn_t mfn) if ( (page = __grab_shared_page(mfn)) == NULL) { gdprintk(XENLOG_ERR, "Invalid MFN=%lx\n", mfn_x(mfn)); - return -1; + return -EINVAL; } MEM_SHARING_DEBUG( @@ -599,7 +599,7 @@ int mem_sharing_debug_gref(struct domain MEM_SHARING_DEBUG( "Asked to debug [dom=%d,gref=%d], but not yet inited.\n", d->domain_id, ref); - return -1; + return -EINVAL; } (void)mem_sharing_gref_to_gfn(d, ref, &gfn); shah = shared_entry_header(d->grant_table, ref); @@ -1222,13 +1222,6 @@ int mem_sharing_memop(struct domain *d, } break; - case XENMEM_sharing_op_debug_mfn: - { - unsigned long mfn = mec->u.debug.u.mfn; - rc = mem_sharing_debug_mfn(_mfn(mfn)); - } - break; - case XENMEM_sharing_op_debug_gref: { grant_ref_t gref = mec->u.debug.u.gref; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:04 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBo-00037r-9Y; Mon, 14 May 2012 16:32:04 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBm-00035H-LG for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:02 +0000 Received: from [85.158.143.99:58716] by server-1.bemta-4.messagelabs.com id 0A/68-20925-18331BF4; Mon, 14 May 2012 16:32:01 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-216.messagelabs.com!1337013119!27392199!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4858 invoked from network); 14 May 2012 16:32:01 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBj-0002ny-Ct for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBj-0006WB-CC for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:59 +0000 Message-Id: Date: Mon, 14 May 2012 16:31:58 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xl, cpupools: Create empty pool if no cpus are specified X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User George Dunlap # Date 1335289916 -3600 # Node ID b8e182cc7f2e1394cc80a24598d4cb1c965c3b4a # Parent 7d53703aa3ffa88cf57d212dd80e90f42647c74e xl, cpupools: Create empty pool if no cpus are specified Currently, if "xl cpupool-create" is called with no cpus configured, xl will choose a cpu at random from the list of unassigned cpus, and if no unassigned cpus are available, it will fail. This seems to me to be a poor interface. For one, it makes it impossible to create an empty cpupool using the xl command-line, except by creating a pool and then removing the cpus from it. For two, I don't think assigning a random cpu is a feature; it's not unreasonable for the user to specify which cpus to add to which pools. This patch changes the behavior of "xl cpupool-create" to create an empty pool if no cpus are specified. I believe this interface to be more expected and more script-friendly. Signed-off-by: George Dunlap Committed-by: Ian Jackson Acked-by: Ian Jackson --- diff -r 7d53703aa3ff -r b8e182cc7f2e tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Thu Apr 12 09:12:58 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Tue Apr 24 18:51:56 2012 +0100 @@ -5718,20 +5718,8 @@ int main_cpupoolcreate(int argc, char ** libxl_cpumap_set(&cpumap, i); n_cpus++; } - } else { - n_cpus = 1; - n = 0; - libxl_for_each_cpu(i, freemap) - if (libxl_cpumap_test(&freemap, i)) { - n++; - libxl_cpumap_set(&cpumap, i); - break; - } - if (n < n_cpus) { - fprintf(stderr, "no free cpu found\n"); - return -ERROR_FAIL; - } - } + } else + n_cpus = 0; libxl_uuid_generate(&uuid); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:04 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBo-00037r-9Y; Mon, 14 May 2012 16:32:04 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBm-00035H-LG for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:02 +0000 Received: from [85.158.143.99:58716] by server-1.bemta-4.messagelabs.com id 0A/68-20925-18331BF4; Mon, 14 May 2012 16:32:01 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-216.messagelabs.com!1337013119!27392199!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4858 invoked from network); 14 May 2012 16:32:01 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBj-0002ny-Ct for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBj-0006WB-CC for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:59 +0000 Message-Id: Date: Mon, 14 May 2012 16:31:58 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xl, cpupools: Create empty pool if no cpus are specified X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User George Dunlap # Date 1335289916 -3600 # Node ID b8e182cc7f2e1394cc80a24598d4cb1c965c3b4a # Parent 7d53703aa3ffa88cf57d212dd80e90f42647c74e xl, cpupools: Create empty pool if no cpus are specified Currently, if "xl cpupool-create" is called with no cpus configured, xl will choose a cpu at random from the list of unassigned cpus, and if no unassigned cpus are available, it will fail. This seems to me to be a poor interface. For one, it makes it impossible to create an empty cpupool using the xl command-line, except by creating a pool and then removing the cpus from it. For two, I don't think assigning a random cpu is a feature; it's not unreasonable for the user to specify which cpus to add to which pools. This patch changes the behavior of "xl cpupool-create" to create an empty pool if no cpus are specified. I believe this interface to be more expected and more script-friendly. Signed-off-by: George Dunlap Committed-by: Ian Jackson Acked-by: Ian Jackson --- diff -r 7d53703aa3ff -r b8e182cc7f2e tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Thu Apr 12 09:12:58 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Tue Apr 24 18:51:56 2012 +0100 @@ -5718,20 +5718,8 @@ int main_cpupoolcreate(int argc, char ** libxl_cpumap_set(&cpumap, i); n_cpus++; } - } else { - n_cpus = 1; - n = 0; - libxl_for_each_cpu(i, freemap) - if (libxl_cpumap_test(&freemap, i)) { - n++; - libxl_cpumap_set(&cpumap, i); - break; - } - if (n < n_cpus) { - fprintf(stderr, "no free cpu found\n"); - return -ERROR_FAIL; - } - } + } else + n_cpus = 0; libxl_uuid_generate(&uuid); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:05 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBp-0003AD-LR; Mon, 14 May 2012 16:32:05 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBn-00036c-Ku for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:03 +0000 Received: from [193.109.254.147:7572] by server-9.bemta-14.messagelabs.com id D9/62-05787-38331BF4; Mon, 14 May 2012 16:32:03 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-27.messagelabs.com!1337013115!3535401!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12824 invoked from network); 14 May 2012 16:31:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:31:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBe-0002nU-Q7 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBe-0006U0-PG for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:54 +0000 Message-Id: Date: Mon, 14 May 2012 16:31:54 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: Remove libxl_tmem_destroy and associated xl command X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1334588447 -3600 # Node ID 1205b0b5b810cc4aec21a6c8a4451178cd2c71a9 # Parent 0342e9ff1adc923826ed944b0655076233136e89 libxl: Remove libxl_tmem_destroy and associated xl command Dan Magenheimer explains in <4c2f7fca-dda2-4598-aaab-3a6a3fe532cd@default>: I think the tmem_destroy functionality pre-dates the existence of tmem "freeable" memory* and was a way for a toolset to force the hypervisor to free up the hypervisor memory used by some or all ephemeral tmem pools. Once the tmem allocation/free process was directly linked into alloc_heap_pages() in the hypervisor (see call to tmem_relinquish_pages()), this forcing function was no longer needed. So, bottom line, I *think* it can be ripped out, or at least for now removed from the definition of the stable xl API/UI. The libxl.c routine libxl_tmem_destroy() could also be removed if you like, but I guess I'd prefer to leave the lower level droppings in xc.c and in the hypervisor in case I am misremembering. Accordingly remove this interface from libxl and xl but don't touch libxc or the hypervisor. This is the only libxl_tmem_* function which might potentially have required conversion to be asynchronous and which therefore might have been a potential API stability concern. Signed-off-by: Ian Campbell Committed-by: Ian Jackson Acked-by: Dan Magenheimer --- diff -r 0342e9ff1adc -r 1205b0b5b810 docs/man/xl.pod.1 --- a/docs/man/xl.pod.1 Tue Apr 24 17:28:37 2012 +0100 +++ b/docs/man/xl.pod.1 Mon Apr 16 16:00:47 2012 +0100 @@ -1055,10 +1055,6 @@ List tmem pools. If I<-l> is specified, Freeze tmem pools. -=item B I - -Destroy tmem pools. - =item B I Thaw tmem pools. diff -r 0342e9ff1adc -r 1205b0b5b810 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Tue Apr 24 17:28:37 2012 +0100 +++ b/tools/libxl/libxl.c Mon Apr 16 16:00:47 2012 +0100 @@ -3496,21 +3496,6 @@ int libxl_tmem_freeze(libxl_ctx *ctx, ui return rc; } -int libxl_tmem_destroy(libxl_ctx *ctx, uint32_t domid) -{ - int rc; - - rc = xc_tmem_control(ctx->xch, -1, TMEMC_DESTROY, domid, 0, 0, - 0, NULL); - if (rc < 0) { - LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, rc, - "Can not destroy tmem pools"); - return ERROR_FAIL; - } - - return rc; -} - int libxl_tmem_thaw(libxl_ctx *ctx, uint32_t domid) { int rc; diff -r 0342e9ff1adc -r 1205b0b5b810 tools/libxl/libxl.h --- a/tools/libxl/libxl.h Tue Apr 24 17:28:37 2012 +0100 +++ b/tools/libxl/libxl.h Mon Apr 16 16:00:47 2012 +0100 @@ -754,7 +754,6 @@ uint32_t libxl_vm_get_start_time(libxl_c char *libxl_tmem_list(libxl_ctx *ctx, uint32_t domid, int use_long); int libxl_tmem_freeze(libxl_ctx *ctx, uint32_t domid); -int libxl_tmem_destroy(libxl_ctx *ctx, uint32_t domid); int libxl_tmem_thaw(libxl_ctx *ctx, uint32_t domid); int libxl_tmem_set(libxl_ctx *ctx, uint32_t domid, char* name, uint32_t set); diff -r 0342e9ff1adc -r 1205b0b5b810 tools/libxl/xl.h --- a/tools/libxl/xl.h Tue Apr 24 17:28:37 2012 +0100 +++ b/tools/libxl/xl.h Mon Apr 16 16:00:47 2012 +0100 @@ -76,7 +76,6 @@ int main_blockdetach(int argc, char **ar int main_uptime(int argc, char **argv); int main_tmem_list(int argc, char **argv); int main_tmem_freeze(int argc, char **argv); -int main_tmem_destroy(int argc, char **argv); int main_tmem_thaw(int argc, char **argv); int main_tmem_set(int argc, char **argv); int main_tmem_shared_auth(int argc, char **argv); diff -r 0342e9ff1adc -r 1205b0b5b810 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Tue Apr 24 17:28:37 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Mon Apr 16 16:00:47 2012 +0100 @@ -5384,38 +5384,6 @@ int main_tmem_freeze(int argc, char **ar return 0; } -int main_tmem_destroy(int argc, char **argv) -{ - const char *dom = NULL; - int all = 0; - int opt; - - while ((opt = def_getopt(argc, argv, "a", "tmem-destroy", 0)) != -1) { - switch (opt) { - case 0: case 2: - return opt; - case 'a': - all = 1; - break; - } - } - - dom = argv[optind]; - if (!dom && all == 0) { - fprintf(stderr, "You must specify -a or a domain id.\n\n"); - help("tmem-destroy"); - return 1; - } - - if (all) - domid = -1; - else - find_domain(dom); - - libxl_tmem_destroy(ctx, domid); - return 0; -} - int main_tmem_thaw(int argc, char **argv) { const char *dom = NULL; diff -r 0342e9ff1adc -r 1205b0b5b810 tools/libxl/xl_cmdtable.c --- a/tools/libxl/xl_cmdtable.c Tue Apr 24 17:28:37 2012 +0100 +++ b/tools/libxl/xl_cmdtable.c Mon Apr 16 16:00:47 2012 +0100 @@ -336,12 +336,6 @@ struct cmd_spec cmd_table[] = { "[|-a]", " -a Freeze all tmem", }, - { "tmem-destroy", - &main_tmem_destroy, 0, - "Destroy tmem pools", - "[|-a]", - " -a Destroy all tmem", - }, { "tmem-thaw", &main_tmem_thaw, 0, "Thaw tmem pools", _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:05 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBp-0003AL-Nz; Mon, 14 May 2012 16:32:05 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBn-00036p-PO for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:04 +0000 Received: from [193.109.254.147:41837] by server-1.bemta-14.messagelabs.com id EC/49-29372-38331BF4; Mon, 14 May 2012 16:32:03 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-27.messagelabs.com!1337013120!4049545!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16554 invoked from network); 14 May 2012 16:32:01 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBk-0002o6-EO for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBk-0006Wf-Dc for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:00 +0000 Message-Id: Date: Mon, 14 May 2012 16:31:59 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: provide libxl_domain_config_init. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1333533071 -3600 # Node ID 31489be80c511940ca83056c5e4df1068da30a8d # Parent 7872b091890196b4d170de1e89a5d221506301c6 libxl: provide libxl_domain_config_init. Currently this struct is too complicated for the IDL to represent (arrays) so for now implement by hand. Signed-off-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 7872b0918901 -r 31489be80c51 tools/libxl/libxl.h --- a/tools/libxl/libxl.h Tue Apr 24 18:51:56 2012 +0100 +++ b/tools/libxl/libxl.h Wed Apr 04 10:51:11 2012 +0100 @@ -466,6 +466,7 @@ int libxl_ctx_free(libxl_ctx *ctx /* 0 i typedef int (*libxl_console_ready)(libxl_ctx *ctx, uint32_t domid, void *priv); int libxl_domain_create_new(libxl_ctx *ctx, libxl_domain_config *d_config, libxl_console_ready cb, void *priv, uint32_t *domid); int libxl_domain_create_restore(libxl_ctx *ctx, libxl_domain_config *d_config, libxl_console_ready cb, void *priv, uint32_t *domid, int restore_fd); +void libxl_domain_config_init(libxl_domain_config *d_config); void libxl_domain_config_dispose(libxl_domain_config *d_config); int libxl_domain_suspend(libxl_ctx *ctx, libxl_domain_suspend_info *info, uint32_t domid, int fd); diff -r 7872b0918901 -r 31489be80c51 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Tue Apr 24 18:51:56 2012 +0100 +++ b/tools/libxl/libxl_create.c Wed Apr 04 10:51:11 2012 +0100 @@ -22,6 +22,13 @@ #include #include +void libxl_domain_config_init(libxl_domain_config *d_config) +{ + memset(d_config, 0, sizeof(*d_config)); + libxl_domain_create_info_init(&d_config->c_info); + libxl_domain_build_info_init(&d_config->b_info); +} + void libxl_domain_config_dispose(libxl_domain_config *d_config) { int i; diff -r 7872b0918901 -r 31489be80c51 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Tue Apr 24 18:51:56 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Wed Apr 04 10:51:11 2012 +0100 @@ -549,8 +549,6 @@ static void parse_config_data(const char exit(1); } - libxl_domain_create_info_init(c_info); - if (!xlu_cfg_get_string (config, "seclabel", &buf, 0)) { e = libxl_flask_context_to_sid(ctx, (char *)buf, strlen(buf), &c_info->ssidref); @@ -596,7 +594,6 @@ static void parse_config_data(const char exit(1); } - libxl_domain_build_info_init(b_info); libxl_domain_build_info_init_type(b_info, c_info->type); /* the following is the actual config parsing with overriding values in the structures */ @@ -1523,7 +1520,7 @@ static int create_domain(struct domain_c pid_t child_console_pid = -1; struct save_file_header hdr; - memset(&d_config, 0x00, sizeof(d_config)); + libxl_domain_config_init(&d_config); if (restore_file) { uint8_t *optdata_begin = 0; @@ -1836,7 +1833,7 @@ start: /* Reparse the configuration in case it has changed */ libxl_domain_config_dispose(&d_config); - memset(&d_config, 0, sizeof(d_config)); + libxl_domain_config_init(&d_config); parse_config_data(config_file, config_data, config_len, &d_config); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:05 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBp-0003AL-Nz; Mon, 14 May 2012 16:32:05 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBn-00036p-PO for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:04 +0000 Received: from [193.109.254.147:41837] by server-1.bemta-14.messagelabs.com id EC/49-29372-38331BF4; Mon, 14 May 2012 16:32:03 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-27.messagelabs.com!1337013120!4049545!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16554 invoked from network); 14 May 2012 16:32:01 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBk-0002o6-EO for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBk-0006Wf-Dc for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:00 +0000 Message-Id: Date: Mon, 14 May 2012 16:31:59 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: provide libxl_domain_config_init. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1333533071 -3600 # Node ID 31489be80c511940ca83056c5e4df1068da30a8d # Parent 7872b091890196b4d170de1e89a5d221506301c6 libxl: provide libxl_domain_config_init. Currently this struct is too complicated for the IDL to represent (arrays) so for now implement by hand. Signed-off-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 7872b0918901 -r 31489be80c51 tools/libxl/libxl.h --- a/tools/libxl/libxl.h Tue Apr 24 18:51:56 2012 +0100 +++ b/tools/libxl/libxl.h Wed Apr 04 10:51:11 2012 +0100 @@ -466,6 +466,7 @@ int libxl_ctx_free(libxl_ctx *ctx /* 0 i typedef int (*libxl_console_ready)(libxl_ctx *ctx, uint32_t domid, void *priv); int libxl_domain_create_new(libxl_ctx *ctx, libxl_domain_config *d_config, libxl_console_ready cb, void *priv, uint32_t *domid); int libxl_domain_create_restore(libxl_ctx *ctx, libxl_domain_config *d_config, libxl_console_ready cb, void *priv, uint32_t *domid, int restore_fd); +void libxl_domain_config_init(libxl_domain_config *d_config); void libxl_domain_config_dispose(libxl_domain_config *d_config); int libxl_domain_suspend(libxl_ctx *ctx, libxl_domain_suspend_info *info, uint32_t domid, int fd); diff -r 7872b0918901 -r 31489be80c51 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Tue Apr 24 18:51:56 2012 +0100 +++ b/tools/libxl/libxl_create.c Wed Apr 04 10:51:11 2012 +0100 @@ -22,6 +22,13 @@ #include #include +void libxl_domain_config_init(libxl_domain_config *d_config) +{ + memset(d_config, 0, sizeof(*d_config)); + libxl_domain_create_info_init(&d_config->c_info); + libxl_domain_build_info_init(&d_config->b_info); +} + void libxl_domain_config_dispose(libxl_domain_config *d_config) { int i; diff -r 7872b0918901 -r 31489be80c51 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Tue Apr 24 18:51:56 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Wed Apr 04 10:51:11 2012 +0100 @@ -549,8 +549,6 @@ static void parse_config_data(const char exit(1); } - libxl_domain_create_info_init(c_info); - if (!xlu_cfg_get_string (config, "seclabel", &buf, 0)) { e = libxl_flask_context_to_sid(ctx, (char *)buf, strlen(buf), &c_info->ssidref); @@ -596,7 +594,6 @@ static void parse_config_data(const char exit(1); } - libxl_domain_build_info_init(b_info); libxl_domain_build_info_init_type(b_info, c_info->type); /* the following is the actual config parsing with overriding values in the structures */ @@ -1523,7 +1520,7 @@ static int create_domain(struct domain_c pid_t child_console_pid = -1; struct save_file_header hdr; - memset(&d_config, 0x00, sizeof(d_config)); + libxl_domain_config_init(&d_config); if (restore_file) { uint8_t *optdata_begin = 0; @@ -1836,7 +1833,7 @@ start: /* Reparse the configuration in case it has changed */ libxl_domain_config_dispose(&d_config); - memset(&d_config, 0, sizeof(d_config)); + libxl_domain_config_init(&d_config); parse_config_data(config_file, config_data, config_len, &d_config); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:05 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBp-0003AD-LR; Mon, 14 May 2012 16:32:05 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBn-00036c-Ku for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:03 +0000 Received: from [193.109.254.147:7572] by server-9.bemta-14.messagelabs.com id D9/62-05787-38331BF4; Mon, 14 May 2012 16:32:03 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-27.messagelabs.com!1337013115!3535401!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12824 invoked from network); 14 May 2012 16:31:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:31:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBe-0002nU-Q7 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBe-0006U0-PG for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:54 +0000 Message-Id: Date: Mon, 14 May 2012 16:31:54 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: Remove libxl_tmem_destroy and associated xl command X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1334588447 -3600 # Node ID 1205b0b5b810cc4aec21a6c8a4451178cd2c71a9 # Parent 0342e9ff1adc923826ed944b0655076233136e89 libxl: Remove libxl_tmem_destroy and associated xl command Dan Magenheimer explains in <4c2f7fca-dda2-4598-aaab-3a6a3fe532cd@default>: I think the tmem_destroy functionality pre-dates the existence of tmem "freeable" memory* and was a way for a toolset to force the hypervisor to free up the hypervisor memory used by some or all ephemeral tmem pools. Once the tmem allocation/free process was directly linked into alloc_heap_pages() in the hypervisor (see call to tmem_relinquish_pages()), this forcing function was no longer needed. So, bottom line, I *think* it can be ripped out, or at least for now removed from the definition of the stable xl API/UI. The libxl.c routine libxl_tmem_destroy() could also be removed if you like, but I guess I'd prefer to leave the lower level droppings in xc.c and in the hypervisor in case I am misremembering. Accordingly remove this interface from libxl and xl but don't touch libxc or the hypervisor. This is the only libxl_tmem_* function which might potentially have required conversion to be asynchronous and which therefore might have been a potential API stability concern. Signed-off-by: Ian Campbell Committed-by: Ian Jackson Acked-by: Dan Magenheimer --- diff -r 0342e9ff1adc -r 1205b0b5b810 docs/man/xl.pod.1 --- a/docs/man/xl.pod.1 Tue Apr 24 17:28:37 2012 +0100 +++ b/docs/man/xl.pod.1 Mon Apr 16 16:00:47 2012 +0100 @@ -1055,10 +1055,6 @@ List tmem pools. If I<-l> is specified, Freeze tmem pools. -=item B I - -Destroy tmem pools. - =item B I Thaw tmem pools. diff -r 0342e9ff1adc -r 1205b0b5b810 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Tue Apr 24 17:28:37 2012 +0100 +++ b/tools/libxl/libxl.c Mon Apr 16 16:00:47 2012 +0100 @@ -3496,21 +3496,6 @@ int libxl_tmem_freeze(libxl_ctx *ctx, ui return rc; } -int libxl_tmem_destroy(libxl_ctx *ctx, uint32_t domid) -{ - int rc; - - rc = xc_tmem_control(ctx->xch, -1, TMEMC_DESTROY, domid, 0, 0, - 0, NULL); - if (rc < 0) { - LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, rc, - "Can not destroy tmem pools"); - return ERROR_FAIL; - } - - return rc; -} - int libxl_tmem_thaw(libxl_ctx *ctx, uint32_t domid) { int rc; diff -r 0342e9ff1adc -r 1205b0b5b810 tools/libxl/libxl.h --- a/tools/libxl/libxl.h Tue Apr 24 17:28:37 2012 +0100 +++ b/tools/libxl/libxl.h Mon Apr 16 16:00:47 2012 +0100 @@ -754,7 +754,6 @@ uint32_t libxl_vm_get_start_time(libxl_c char *libxl_tmem_list(libxl_ctx *ctx, uint32_t domid, int use_long); int libxl_tmem_freeze(libxl_ctx *ctx, uint32_t domid); -int libxl_tmem_destroy(libxl_ctx *ctx, uint32_t domid); int libxl_tmem_thaw(libxl_ctx *ctx, uint32_t domid); int libxl_tmem_set(libxl_ctx *ctx, uint32_t domid, char* name, uint32_t set); diff -r 0342e9ff1adc -r 1205b0b5b810 tools/libxl/xl.h --- a/tools/libxl/xl.h Tue Apr 24 17:28:37 2012 +0100 +++ b/tools/libxl/xl.h Mon Apr 16 16:00:47 2012 +0100 @@ -76,7 +76,6 @@ int main_blockdetach(int argc, char **ar int main_uptime(int argc, char **argv); int main_tmem_list(int argc, char **argv); int main_tmem_freeze(int argc, char **argv); -int main_tmem_destroy(int argc, char **argv); int main_tmem_thaw(int argc, char **argv); int main_tmem_set(int argc, char **argv); int main_tmem_shared_auth(int argc, char **argv); diff -r 0342e9ff1adc -r 1205b0b5b810 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Tue Apr 24 17:28:37 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Mon Apr 16 16:00:47 2012 +0100 @@ -5384,38 +5384,6 @@ int main_tmem_freeze(int argc, char **ar return 0; } -int main_tmem_destroy(int argc, char **argv) -{ - const char *dom = NULL; - int all = 0; - int opt; - - while ((opt = def_getopt(argc, argv, "a", "tmem-destroy", 0)) != -1) { - switch (opt) { - case 0: case 2: - return opt; - case 'a': - all = 1; - break; - } - } - - dom = argv[optind]; - if (!dom && all == 0) { - fprintf(stderr, "You must specify -a or a domain id.\n\n"); - help("tmem-destroy"); - return 1; - } - - if (all) - domid = -1; - else - find_domain(dom); - - libxl_tmem_destroy(ctx, domid); - return 0; -} - int main_tmem_thaw(int argc, char **argv) { const char *dom = NULL; diff -r 0342e9ff1adc -r 1205b0b5b810 tools/libxl/xl_cmdtable.c --- a/tools/libxl/xl_cmdtable.c Tue Apr 24 17:28:37 2012 +0100 +++ b/tools/libxl/xl_cmdtable.c Mon Apr 16 16:00:47 2012 +0100 @@ -336,12 +336,6 @@ struct cmd_spec cmd_table[] = { "[|-a]", " -a Freeze all tmem", }, - { "tmem-destroy", - &main_tmem_destroy, 0, - "Destroy tmem pools", - "[|-a]", - " -a Destroy all tmem", - }, { "tmem-thaw", &main_tmem_thaw, 0, "Thaw tmem pools", _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:05 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBp-0003AW-QL; Mon, 14 May 2012 16:32:05 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBo-00031o-Ew for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:04 +0000 Received: from [85.158.143.35:7081] by server-2.bemta-4.messagelabs.com id 42/EC-17550-48331BF4; Mon, 14 May 2012 16:32:04 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-21.messagelabs.com!1337013122!5002962!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16349 invoked from network); 14 May 2012 16:32:03 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBm-0002ot-FM for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBm-0006Xd-Eg for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:02 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:01 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] tools/firmware: pass PYTHON as an env var to sub-makes in this subtree X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Christoph Egger # Date 1335349285 -3600 # Node ID 15f094c85c85fb769f72a48b9c5d924a8e455855 # Parent 8fd318f89728cc42f5ab9c1885dd39e04a1f3b11 tools/firmware: pass PYTHON as an env var to sub-makes in this subtree This fixes the Seabios build on platforms where just "python" is not correct, which includes NetBSD. Signed-off-by: Christoph Egger Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 8fd318f89728 -r 15f094c85c85 tools/firmware/Makefile --- a/tools/firmware/Makefile Wed Apr 25 11:18:45 2012 +0100 +++ b/tools/firmware/Makefile Wed Apr 25 11:21:25 2012 +0100 @@ -32,7 +32,7 @@ ifeq ($(CONFIG_ROMBIOS),y) false ; \ fi endif - $(MAKE) subdirs-$@ + $(MAKE) PYTHON=$(PYTHON) subdirs-$@ .PHONY: install _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:05 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBp-0003AW-QL; Mon, 14 May 2012 16:32:05 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBo-00031o-Ew for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:04 +0000 Received: from [85.158.143.35:7081] by server-2.bemta-4.messagelabs.com id 42/EC-17550-48331BF4; Mon, 14 May 2012 16:32:04 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-21.messagelabs.com!1337013122!5002962!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16349 invoked from network); 14 May 2012 16:32:03 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBm-0002ot-FM for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBm-0006Xd-Eg for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:02 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:01 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] tools/firmware: pass PYTHON as an env var to sub-makes in this subtree X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Christoph Egger # Date 1335349285 -3600 # Node ID 15f094c85c85fb769f72a48b9c5d924a8e455855 # Parent 8fd318f89728cc42f5ab9c1885dd39e04a1f3b11 tools/firmware: pass PYTHON as an env var to sub-makes in this subtree This fixes the Seabios build on platforms where just "python" is not correct, which includes NetBSD. Signed-off-by: Christoph Egger Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 8fd318f89728 -r 15f094c85c85 tools/firmware/Makefile --- a/tools/firmware/Makefile Wed Apr 25 11:18:45 2012 +0100 +++ b/tools/firmware/Makefile Wed Apr 25 11:21:25 2012 +0100 @@ -32,7 +32,7 @@ ifeq ($(CONFIG_ROMBIOS),y) false ; \ fi endif - $(MAKE) subdirs-$@ + $(MAKE) PYTHON=$(PYTHON) subdirs-$@ .PHONY: install _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:07 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBq-0003CX-TF; Mon, 14 May 2012 16:32:06 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBo-00037s-QG for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:05 +0000 Received: from [85.158.138.51:27071] by server-9.bemta-3.messagelabs.com id AE/10-26691-48331BF4; Mon, 14 May 2012 16:32:04 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-11.tower-174.messagelabs.com!1337013121!27056447!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1012 invoked from network); 14 May 2012 16:32:02 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:02 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBl-0002oH-EO for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBl-0006X9-Df for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:01 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:00 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxc: Document the sharing interface X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Andres Lagar-Cavilla # Date 1335290802 -3600 # Node ID 8fddae41cd1b874e4991c6fd3d51a2b63642d914 # Parent 0db887afb73aae1012747a77c3b96a652d260f0f libxc: Document the sharing interface (also make note about AMD support's experimental status) Signed-off-by: Andres Lagar-Cavilla Acked-by: Tim Deegan Committed-by: Ian Jackson --- diff -r 0db887afb73a -r 8fddae41cd1b tools/libxc/xenctrl.h --- a/tools/libxc/xenctrl.h Tue Apr 24 19:05:08 2012 +0100 +++ b/tools/libxc/xenctrl.h Tue Apr 24 19:06:42 2012 +0100 @@ -1246,23 +1246,6 @@ int xc_mmuext_op(xc_interface *xch, stru /* System wide memory properties */ long xc_maximum_ram_page(xc_interface *xch); -/** - * This function returns the total number of pages freed by using sharing - * on the system. For example, if two domains contain a single entry in - * their p2m map that points to the same shared page (and no other pages - * in the system are shared), then this function should return 1. - */ -long xc_sharing_freed_pages(xc_interface *xch); - -/** - * This function returns the total number of frames occupied by shared - * pages on the system. This is independent of the number of domains - * pointing at these frames. For example, in the above scenario this - * should return 1. The following should hold: - * memory usage without sharing = freed_pages + used_frames - */ -long xc_sharing_used_frames(xc_interface *xch); - /* Get current total pages allocated to a domain. */ long xc_get_tot_pages(xc_interface *xch, uint32_t domid); @@ -1889,7 +1872,7 @@ int xc_tmem_restore(xc_interface *xch, i int xc_tmem_restore_extra(xc_interface *xch, int dom, int fd); /** - * mem_event operations + * mem_event operations. Internal use only. */ int xc_mem_event_control(xc_interface *xch, domid_t domain_id, unsigned int op, unsigned int mode, uint32_t *port); @@ -1897,6 +1880,12 @@ int xc_mem_event_memop(xc_interface *xch unsigned int op, unsigned int mode, uint64_t gfn, void *buffer); +/** + * Mem paging operations. + * Paging is supported only on the x86 architecture in 64 bit mode, with + * Hardware-Assisted Paging (i.e. Intel EPT, AMD NPT). Moreover, AMD NPT + * support is considered experimental. + */ int xc_mem_paging_enable(xc_interface *xch, domid_t domain_id, uint32_t *port); int xc_mem_paging_disable(xc_interface *xch, domid_t domain_id); int xc_mem_paging_nominate(xc_interface *xch, domid_t domain_id, @@ -1906,30 +1895,133 @@ int xc_mem_paging_prep(xc_interface *xch int xc_mem_paging_load(xc_interface *xch, domid_t domain_id, unsigned long gfn, void *buffer); +/** + * Access tracking operations. + * Supported only on Intel EPT 64 bit processors. + */ int xc_mem_access_enable(xc_interface *xch, domid_t domain_id, uint32_t *port); int xc_mem_access_disable(xc_interface *xch, domid_t domain_id); int xc_mem_access_resume(xc_interface *xch, domid_t domain_id, unsigned long gfn); -/** - * memshr operations +/*** + * Memory sharing operations. + * + * Unles otherwise noted, these calls return 0 on succes, -1 and errno on + * failure. + * + * Sharing is supported only on the x86 architecture in 64 bit mode, with + * Hardware-Assisted Paging (i.e. Intel EPT, AMD NPT). Moreover, AMD NPT + * support is considered experimental. + + * Calls below return ENOSYS if not in the x86_64 architecture. + * Calls below return ENODEV if the domain does not support HAP. + * Calls below return ESRCH if the specified domain does not exist. + * Calls below return EPERM if the caller is unprivileged for this domain. */ + +/* Turn on/off sharing for the domid, depending on the enable flag. + * + * Returns EXDEV if trying to enable and the domain has had a PCI device + * assigned for passthrough (these two features are mutually exclusive). + * + * When sharing for a domain is turned off, the domain may still reference + * shared pages. Unsharing happens lazily. */ int xc_memshr_control(xc_interface *xch, domid_t domid, int enable); + +/* Create a communication ring in which the hypervisor will place ENOMEM + * notifications. + * + * ENOMEM happens when unsharing pages: a Copy-on-Write duplicate needs to be + * allocated, and thus the out-of-memory error occurr. + * + * For complete examples on how to plumb a notification ring, look into + * xenpaging or xen-access. + * + * On receipt of a notification, the helper should ensure there is memory + * available to the domain before retrying. + * + * If a domain encounters an ENOMEM condition when sharing and this ring + * has not been set up, the hypervisor will crash the domain. + * + * Fails with: + * EINVAL if port is NULL + * EINVAL if the sharing ring has already been enabled + * ENOSYS if no guest gfn has been specified to host the ring via an hvm param + * EINVAL if the gfn for the ring has not been populated + * ENOENT if the gfn for the ring is paged out, or cannot be unshared + * EINVAL if the gfn for the ring cannot be written to + * EINVAL if the domain is dying + * ENOSPC if an event channel cannot be allocated for the ring + * ENOMEM if memory cannot be allocated for internal data structures + * EINVAL or EACCESS if the request is denied by the security policy + */ + int xc_memshr_ring_enable(xc_interface *xch, domid_t domid, uint32_t *port); +/* Disable the ring for ENOMEM communication. + * May fail with EINVAL if the ring was not enabled in the first place. + */ int xc_memshr_ring_disable(xc_interface *xch, domid_t domid); + +/* + * Calls below return EINVAL if sharing has not been enabled for the domain + * Calls below return EINVAL if the domain is dying + */ +/* Once a reponse to an ENOMEM notification is prepared, the tool can + * notify the hypervisor to re-schedule the faulting vcpu of the domain with an + * event channel kick and/or this call. */ +int xc_memshr_domain_resume(xc_interface *xch, + domid_t domid); + +/* Select a page for sharing. + * + * A 64 bit opaque handle will be stored in handle. The hypervisor ensures + * that if the page is modified, the handle will be invalidated, and future + * users of it will fail. If the page has already been selected and is still + * associated to a valid handle, the existing handle will be returned. + * + * May fail with: + * EINVAL if the gfn is not populated or not sharable (mmio, etc) + * ENOMEM if internal data structures cannot be allocated + * E2BIG if the page is being referenced by other subsytems (e.g. qemu) + * ENOENT or EEXIST if there are internal hypervisor errors. + */ int xc_memshr_nominate_gfn(xc_interface *xch, domid_t domid, unsigned long gfn, uint64_t *handle); +/* Same as above, but instead of a guest frame number, the input is a grant + * reference provided by the guest. + * + * May fail with EINVAL if the grant reference is invalid. + */ int xc_memshr_nominate_gref(xc_interface *xch, domid_t domid, grant_ref_t gref, uint64_t *handle); + +/* The three calls below may fail with + * 10 (or -XENMEM_SHARING_OP_S_HANDLE_INVALID) if the handle passed as source + * is invalid. + * 9 (or -XENMEM_SHARING_OP_C_HANDLE_INVALID) if the handle passed as client is + * invalid. + */ +/* Share two nominated guest pages. + * + * If the call succeeds, both pages will point to the same backing frame (or + * mfn). The hypervisor will verify the handles are still valid, but it will + * not perform any sanity checking on the contens of the pages (the selection + * mechanism for sharing candidates is entirely up to the user-space tool). + * + * After successful sharing, the client handle becomes invalid. Both tuples point to the same mfn with the same handle, the one specified as + * source. Either 3-tuple can be specified later for further re-sharing. + */ int xc_memshr_share_gfns(xc_interface *xch, domid_t source_domain, unsigned long source_gfn, @@ -1937,6 +2029,11 @@ int xc_memshr_share_gfns(xc_interface *x domid_t client_domain, unsigned long client_gfn, uint64_t client_handle); + +/* Same as above, but share two grant references instead. + * + * May fail with EINVAL if either grant reference is invalid. + */ int xc_memshr_share_grefs(xc_interface *xch, domid_t source_domain, grant_ref_t source_gref, @@ -1944,22 +2041,82 @@ int xc_memshr_share_grefs(xc_interface * domid_t client_domain, grant_ref_t client_gref, uint64_t client_handle); + +/* Allows to add to the guest physmap of the client domain a shared frame + * directly. + * + * May additionally fail with + * 9 (-XENMEM_SHARING_OP_C_HANDLE_INVALID) if the physmap entry for the gfn is + * not suitable. + * ENOMEM if internal data structures cannot be allocated. + * ENOENT if there is an internal hypervisor error. + */ int xc_memshr_add_to_physmap(xc_interface *xch, domid_t source_domain, unsigned long source_gfn, uint64_t source_handle, domid_t client_domain, unsigned long client_gfn); -int xc_memshr_domain_resume(xc_interface *xch, - domid_t domid); + +/* Debug calls: return the number of pages referencing the shared frame backing + * the input argument. Should be one or greater. + * + * May fail with EINVAL if there is no backing shared frame for the input + * argument. + */ int xc_memshr_debug_gfn(xc_interface *xch, domid_t domid, unsigned long gfn); +/* May additionally fail with EINVAL if the grant reference is invalid. */ int xc_memshr_debug_gref(xc_interface *xch, domid_t domid, grant_ref_t gref); + +/* Audits the share subsystem. + * + * Returns ENOSYS if not supported (may not be compiled into the hypervisor). + * + * Returns the number of errors found during auditing otherwise. May be (should + * be!) zero. + * + * If debugtrace support has been compiled into the hypervisor and is enabled, + * verbose descriptions for the errors are available in the hypervisor console. + */ int xc_memshr_audit(xc_interface *xch); +/* Stats reporting. + * + * At any point in time, the following equality should hold for a host: + * + * Let dominfo(d) be the xc_dominfo_t struct filled by a call to + * xc_domain_getinfo(d) + * + * The summation of dominfo(d)->shr_pages for all domains in the system + * should be equal to + * xc_sharing_freed_pages + xc_sharing_used_frames + */ +/* + * This function returns the total number of pages freed by using sharing + * on the system. For example, if two domains contain a single entry in + * their p2m table that points to the same shared page (and no other pages + * in the system are shared), then this function should return 1. + */ +long xc_sharing_freed_pages(xc_interface *xch); + +/* + * This function returns the total number of frames occupied by shared + * pages on the system. This is independent of the number of domains + * pointing at these frames. For example, in the above scenario this + * should return 1. (And dominfo(d) for each of the two domains should return 1 + * as well). + * + * Note that some of these sharing_used_frames may be referenced by + * a single domain page, and thus not realize any savings. The same + * applies to some of the pages counted in dominfo(d)->shr_pages. + */ +long xc_sharing_used_frames(xc_interface *xch); +/*** End sharing interface ***/ + int xc_flask_load(xc_interface *xc_handle, char *buf, uint32_t size); int xc_flask_context_to_sid(xc_interface *xc_handle, char *buf, uint32_t size, uint32_t *sid); int xc_flask_sid_to_context(xc_interface *xc_handle, int sid, char *buf, uint32_t size); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:07 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBq-0003CX-TF; Mon, 14 May 2012 16:32:06 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBo-00037s-QG for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:05 +0000 Received: from [85.158.138.51:27071] by server-9.bemta-3.messagelabs.com id AE/10-26691-48331BF4; Mon, 14 May 2012 16:32:04 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-11.tower-174.messagelabs.com!1337013121!27056447!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1012 invoked from network); 14 May 2012 16:32:02 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:02 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBl-0002oH-EO for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBl-0006X9-Df for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:01 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:00 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxc: Document the sharing interface X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Andres Lagar-Cavilla # Date 1335290802 -3600 # Node ID 8fddae41cd1b874e4991c6fd3d51a2b63642d914 # Parent 0db887afb73aae1012747a77c3b96a652d260f0f libxc: Document the sharing interface (also make note about AMD support's experimental status) Signed-off-by: Andres Lagar-Cavilla Acked-by: Tim Deegan Committed-by: Ian Jackson --- diff -r 0db887afb73a -r 8fddae41cd1b tools/libxc/xenctrl.h --- a/tools/libxc/xenctrl.h Tue Apr 24 19:05:08 2012 +0100 +++ b/tools/libxc/xenctrl.h Tue Apr 24 19:06:42 2012 +0100 @@ -1246,23 +1246,6 @@ int xc_mmuext_op(xc_interface *xch, stru /* System wide memory properties */ long xc_maximum_ram_page(xc_interface *xch); -/** - * This function returns the total number of pages freed by using sharing - * on the system. For example, if two domains contain a single entry in - * their p2m map that points to the same shared page (and no other pages - * in the system are shared), then this function should return 1. - */ -long xc_sharing_freed_pages(xc_interface *xch); - -/** - * This function returns the total number of frames occupied by shared - * pages on the system. This is independent of the number of domains - * pointing at these frames. For example, in the above scenario this - * should return 1. The following should hold: - * memory usage without sharing = freed_pages + used_frames - */ -long xc_sharing_used_frames(xc_interface *xch); - /* Get current total pages allocated to a domain. */ long xc_get_tot_pages(xc_interface *xch, uint32_t domid); @@ -1889,7 +1872,7 @@ int xc_tmem_restore(xc_interface *xch, i int xc_tmem_restore_extra(xc_interface *xch, int dom, int fd); /** - * mem_event operations + * mem_event operations. Internal use only. */ int xc_mem_event_control(xc_interface *xch, domid_t domain_id, unsigned int op, unsigned int mode, uint32_t *port); @@ -1897,6 +1880,12 @@ int xc_mem_event_memop(xc_interface *xch unsigned int op, unsigned int mode, uint64_t gfn, void *buffer); +/** + * Mem paging operations. + * Paging is supported only on the x86 architecture in 64 bit mode, with + * Hardware-Assisted Paging (i.e. Intel EPT, AMD NPT). Moreover, AMD NPT + * support is considered experimental. + */ int xc_mem_paging_enable(xc_interface *xch, domid_t domain_id, uint32_t *port); int xc_mem_paging_disable(xc_interface *xch, domid_t domain_id); int xc_mem_paging_nominate(xc_interface *xch, domid_t domain_id, @@ -1906,30 +1895,133 @@ int xc_mem_paging_prep(xc_interface *xch int xc_mem_paging_load(xc_interface *xch, domid_t domain_id, unsigned long gfn, void *buffer); +/** + * Access tracking operations. + * Supported only on Intel EPT 64 bit processors. + */ int xc_mem_access_enable(xc_interface *xch, domid_t domain_id, uint32_t *port); int xc_mem_access_disable(xc_interface *xch, domid_t domain_id); int xc_mem_access_resume(xc_interface *xch, domid_t domain_id, unsigned long gfn); -/** - * memshr operations +/*** + * Memory sharing operations. + * + * Unles otherwise noted, these calls return 0 on succes, -1 and errno on + * failure. + * + * Sharing is supported only on the x86 architecture in 64 bit mode, with + * Hardware-Assisted Paging (i.e. Intel EPT, AMD NPT). Moreover, AMD NPT + * support is considered experimental. + + * Calls below return ENOSYS if not in the x86_64 architecture. + * Calls below return ENODEV if the domain does not support HAP. + * Calls below return ESRCH if the specified domain does not exist. + * Calls below return EPERM if the caller is unprivileged for this domain. */ + +/* Turn on/off sharing for the domid, depending on the enable flag. + * + * Returns EXDEV if trying to enable and the domain has had a PCI device + * assigned for passthrough (these two features are mutually exclusive). + * + * When sharing for a domain is turned off, the domain may still reference + * shared pages. Unsharing happens lazily. */ int xc_memshr_control(xc_interface *xch, domid_t domid, int enable); + +/* Create a communication ring in which the hypervisor will place ENOMEM + * notifications. + * + * ENOMEM happens when unsharing pages: a Copy-on-Write duplicate needs to be + * allocated, and thus the out-of-memory error occurr. + * + * For complete examples on how to plumb a notification ring, look into + * xenpaging or xen-access. + * + * On receipt of a notification, the helper should ensure there is memory + * available to the domain before retrying. + * + * If a domain encounters an ENOMEM condition when sharing and this ring + * has not been set up, the hypervisor will crash the domain. + * + * Fails with: + * EINVAL if port is NULL + * EINVAL if the sharing ring has already been enabled + * ENOSYS if no guest gfn has been specified to host the ring via an hvm param + * EINVAL if the gfn for the ring has not been populated + * ENOENT if the gfn for the ring is paged out, or cannot be unshared + * EINVAL if the gfn for the ring cannot be written to + * EINVAL if the domain is dying + * ENOSPC if an event channel cannot be allocated for the ring + * ENOMEM if memory cannot be allocated for internal data structures + * EINVAL or EACCESS if the request is denied by the security policy + */ + int xc_memshr_ring_enable(xc_interface *xch, domid_t domid, uint32_t *port); +/* Disable the ring for ENOMEM communication. + * May fail with EINVAL if the ring was not enabled in the first place. + */ int xc_memshr_ring_disable(xc_interface *xch, domid_t domid); + +/* + * Calls below return EINVAL if sharing has not been enabled for the domain + * Calls below return EINVAL if the domain is dying + */ +/* Once a reponse to an ENOMEM notification is prepared, the tool can + * notify the hypervisor to re-schedule the faulting vcpu of the domain with an + * event channel kick and/or this call. */ +int xc_memshr_domain_resume(xc_interface *xch, + domid_t domid); + +/* Select a page for sharing. + * + * A 64 bit opaque handle will be stored in handle. The hypervisor ensures + * that if the page is modified, the handle will be invalidated, and future + * users of it will fail. If the page has already been selected and is still + * associated to a valid handle, the existing handle will be returned. + * + * May fail with: + * EINVAL if the gfn is not populated or not sharable (mmio, etc) + * ENOMEM if internal data structures cannot be allocated + * E2BIG if the page is being referenced by other subsytems (e.g. qemu) + * ENOENT or EEXIST if there are internal hypervisor errors. + */ int xc_memshr_nominate_gfn(xc_interface *xch, domid_t domid, unsigned long gfn, uint64_t *handle); +/* Same as above, but instead of a guest frame number, the input is a grant + * reference provided by the guest. + * + * May fail with EINVAL if the grant reference is invalid. + */ int xc_memshr_nominate_gref(xc_interface *xch, domid_t domid, grant_ref_t gref, uint64_t *handle); + +/* The three calls below may fail with + * 10 (or -XENMEM_SHARING_OP_S_HANDLE_INVALID) if the handle passed as source + * is invalid. + * 9 (or -XENMEM_SHARING_OP_C_HANDLE_INVALID) if the handle passed as client is + * invalid. + */ +/* Share two nominated guest pages. + * + * If the call succeeds, both pages will point to the same backing frame (or + * mfn). The hypervisor will verify the handles are still valid, but it will + * not perform any sanity checking on the contens of the pages (the selection + * mechanism for sharing candidates is entirely up to the user-space tool). + * + * After successful sharing, the client handle becomes invalid. Both tuples point to the same mfn with the same handle, the one specified as + * source. Either 3-tuple can be specified later for further re-sharing. + */ int xc_memshr_share_gfns(xc_interface *xch, domid_t source_domain, unsigned long source_gfn, @@ -1937,6 +2029,11 @@ int xc_memshr_share_gfns(xc_interface *x domid_t client_domain, unsigned long client_gfn, uint64_t client_handle); + +/* Same as above, but share two grant references instead. + * + * May fail with EINVAL if either grant reference is invalid. + */ int xc_memshr_share_grefs(xc_interface *xch, domid_t source_domain, grant_ref_t source_gref, @@ -1944,22 +2041,82 @@ int xc_memshr_share_grefs(xc_interface * domid_t client_domain, grant_ref_t client_gref, uint64_t client_handle); + +/* Allows to add to the guest physmap of the client domain a shared frame + * directly. + * + * May additionally fail with + * 9 (-XENMEM_SHARING_OP_C_HANDLE_INVALID) if the physmap entry for the gfn is + * not suitable. + * ENOMEM if internal data structures cannot be allocated. + * ENOENT if there is an internal hypervisor error. + */ int xc_memshr_add_to_physmap(xc_interface *xch, domid_t source_domain, unsigned long source_gfn, uint64_t source_handle, domid_t client_domain, unsigned long client_gfn); -int xc_memshr_domain_resume(xc_interface *xch, - domid_t domid); + +/* Debug calls: return the number of pages referencing the shared frame backing + * the input argument. Should be one or greater. + * + * May fail with EINVAL if there is no backing shared frame for the input + * argument. + */ int xc_memshr_debug_gfn(xc_interface *xch, domid_t domid, unsigned long gfn); +/* May additionally fail with EINVAL if the grant reference is invalid. */ int xc_memshr_debug_gref(xc_interface *xch, domid_t domid, grant_ref_t gref); + +/* Audits the share subsystem. + * + * Returns ENOSYS if not supported (may not be compiled into the hypervisor). + * + * Returns the number of errors found during auditing otherwise. May be (should + * be!) zero. + * + * If debugtrace support has been compiled into the hypervisor and is enabled, + * verbose descriptions for the errors are available in the hypervisor console. + */ int xc_memshr_audit(xc_interface *xch); +/* Stats reporting. + * + * At any point in time, the following equality should hold for a host: + * + * Let dominfo(d) be the xc_dominfo_t struct filled by a call to + * xc_domain_getinfo(d) + * + * The summation of dominfo(d)->shr_pages for all domains in the system + * should be equal to + * xc_sharing_freed_pages + xc_sharing_used_frames + */ +/* + * This function returns the total number of pages freed by using sharing + * on the system. For example, if two domains contain a single entry in + * their p2m table that points to the same shared page (and no other pages + * in the system are shared), then this function should return 1. + */ +long xc_sharing_freed_pages(xc_interface *xch); + +/* + * This function returns the total number of frames occupied by shared + * pages on the system. This is independent of the number of domains + * pointing at these frames. For example, in the above scenario this + * should return 1. (And dominfo(d) for each of the two domains should return 1 + * as well). + * + * Note that some of these sharing_used_frames may be referenced by + * a single domain page, and thus not realize any savings. The same + * applies to some of the pages counted in dominfo(d)->shr_pages. + */ +long xc_sharing_used_frames(xc_interface *xch); +/*** End sharing interface ***/ + int xc_flask_load(xc_interface *xc_handle, char *buf, uint32_t size); int xc_flask_context_to_sid(xc_interface *xc_handle, char *buf, uint32_t size, uint32_t *sid); int xc_flask_sid_to_context(xc_interface *xc_handle, int sid, char *buf, uint32_t size); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:07 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBq-0003Ce-WE; Mon, 14 May 2012 16:32:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBo-00038C-TF for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:05 +0000 Received: from [85.158.139.83:28638] by server-8.bemta-5.messagelabs.com id 0D/8B-26964-48331BF4; Mon, 14 May 2012 16:32:04 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-182.messagelabs.com!1337013120!28653422!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6584 invoked from network); 14 May 2012 16:32:02 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:02 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBj-0002o2-Tg for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBj-0006WQ-T0 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:59 +0000 Message-Id: Date: Mon, 14 May 2012 16:31:59 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] [v2] xl: Don't require a config file for cpupools X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User George Dunlap # Date 1335289916 -3600 # Node ID 7872b091890196b4d170de1e89a5d221506301c6 # Parent b8e182cc7f2e1394cc80a24598d4cb1c965c3b4a [v2] xl: Don't require a config file for cpupools Since the key information can be fairly simply put on the command-line, there's no need to require an actual config file. Also improve the help to cross-reference the xlcpupool.cfg manpage. Signed-off-by: George Dunlap Committed-by: Ian Jackson Acked-by: Ian Jackson --- diff -r b8e182cc7f2e -r 7872b0918901 docs/man/xl.pod.1 --- a/docs/man/xl.pod.1 Tue Apr 24 18:51:56 2012 +0100 +++ b/docs/man/xl.pod.1 Tue Apr 24 18:51:56 2012 +0100 @@ -873,11 +873,13 @@ Cpu-pools can be specified either by nam =over 4 -=item B [I] I [I ...] +=item B [I] [I] [I ...] -Create a cpu pool based an I. -Variable settings from the I may be altered by specifying new -or additional assignments on the command line. +Create a cpu pool based an config from a I or command-line +parameters. Variable settings from the I may be altered +by specifying new or additional assignments on the command line. + +See the L manpage for more information. B diff -r b8e182cc7f2e -r 7872b0918901 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Tue Apr 24 18:51:56 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Tue Apr 24 18:51:56 2012 +0100 @@ -5547,7 +5547,7 @@ int main_tmem_freeable(int argc, char ** int main_cpupoolcreate(int argc, char **argv) { - const char *filename = NULL; + const char *filename = NULL, *config_src=NULL; const char *p; char extra_config[1024]; int opt; @@ -5611,23 +5611,26 @@ int main_cpupoolcreate(int argc, char ** optind++; } - if (!filename) { - help("cpupool-create"); - return -ERROR_FAIL; - } - - if (libxl_read_file_contents(ctx, filename, (void **)&config_data, &config_len)) { - fprintf(stderr, "Failed to read config file: %s: %s\n", - filename, strerror(errno)); - return -ERROR_FAIL; - } + if (filename) + { + if (libxl_read_file_contents(ctx, filename, (void **)&config_data, + &config_len)) { + fprintf(stderr, "Failed to read config file: %s: %s\n", + filename, strerror(errno)); + return -ERROR_FAIL; + } + config_src=filename; + } + else + config_src="command line"; + if (strlen(extra_config)) { if (config_len > INT_MAX - (strlen(extra_config) + 2)) { fprintf(stderr, "Failed to attach extra configration\n"); return -ERROR_FAIL; } config_data = xrealloc(config_data, - config_len + strlen(extra_config) + 2); + config_len + strlen(extra_config) + 2); if (!config_data) { fprintf(stderr, "Failed to realloc config_data\n"); return -ERROR_FAIL; @@ -5638,7 +5641,7 @@ int main_cpupoolcreate(int argc, char ** config_len += strlen(extra_config) + 1; } - config = xlu_cfg_init(stderr, filename); + config = xlu_cfg_init(stderr, config_src); if (!config) { fprintf(stderr, "Failed to allocate for configuration\n"); return -ERROR_FAIL; @@ -5652,8 +5655,12 @@ int main_cpupoolcreate(int argc, char ** if (!xlu_cfg_get_string (config, "name", &buf, 0)) name = strdup(buf); - else + else if (filename) name = libxl_basename(filename); + else { + fprintf(stderr, "Missing cpupool name!\n"); + return -ERROR_FAIL; + } if (!libxl_name_to_cpupoolid(ctx, name, &poolid)) { fprintf(stderr, "Pool name \"%s\" already exists\n", name); return -ERROR_FAIL; @@ -5723,7 +5730,7 @@ int main_cpupoolcreate(int argc, char ** libxl_uuid_generate(&uuid); - printf("Using config file \"%s\"\n", filename); + printf("Using config file \"%s\"\n", config_src); printf("cpupool name: %s\n", name); printf("scheduler: %s\n", libxl_scheduler_to_string(sched)); printf("number of cpus: %d\n", n_cpus); diff -r b8e182cc7f2e -r 7872b0918901 tools/libxl/xl_cmdtable.c --- a/tools/libxl/xl_cmdtable.c Tue Apr 24 18:51:56 2012 +0100 +++ b/tools/libxl/xl_cmdtable.c Tue Apr 24 18:51:56 2012 +0100 @@ -367,12 +367,14 @@ struct cmd_spec cmd_table[] = { }, { "cpupool-create", &main_cpupoolcreate, 1, - "Create a CPU pool based an ConfigFile", - "[options] [vars]", + "Create a new CPU pool", + "[options] [] [Variable=value ...]", "-h, --help Print this help.\n" "-f FILE, --defconfig=FILE Use the given configuration file.\n" "-n, --dryrun Dry run - prints the resulting configuration.\n" - " (deprecated in favour of global -N option)." + " (deprecated in favour of global -N option).\n" + "\nSee the xlcpupool.cfg(5) manpage for more information.", + }, { "cpupool-list", &main_cpupoollist, 0, _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:07 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBq-0003Ce-WE; Mon, 14 May 2012 16:32:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBo-00038C-TF for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:05 +0000 Received: from [85.158.139.83:28638] by server-8.bemta-5.messagelabs.com id 0D/8B-26964-48331BF4; Mon, 14 May 2012 16:32:04 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-182.messagelabs.com!1337013120!28653422!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6584 invoked from network); 14 May 2012 16:32:02 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:02 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBj-0002o2-Tg for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBj-0006WQ-T0 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:59 +0000 Message-Id: Date: Mon, 14 May 2012 16:31:59 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] [v2] xl: Don't require a config file for cpupools X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User George Dunlap # Date 1335289916 -3600 # Node ID 7872b091890196b4d170de1e89a5d221506301c6 # Parent b8e182cc7f2e1394cc80a24598d4cb1c965c3b4a [v2] xl: Don't require a config file for cpupools Since the key information can be fairly simply put on the command-line, there's no need to require an actual config file. Also improve the help to cross-reference the xlcpupool.cfg manpage. Signed-off-by: George Dunlap Committed-by: Ian Jackson Acked-by: Ian Jackson --- diff -r b8e182cc7f2e -r 7872b0918901 docs/man/xl.pod.1 --- a/docs/man/xl.pod.1 Tue Apr 24 18:51:56 2012 +0100 +++ b/docs/man/xl.pod.1 Tue Apr 24 18:51:56 2012 +0100 @@ -873,11 +873,13 @@ Cpu-pools can be specified either by nam =over 4 -=item B [I] I [I ...] +=item B [I] [I] [I ...] -Create a cpu pool based an I. -Variable settings from the I may be altered by specifying new -or additional assignments on the command line. +Create a cpu pool based an config from a I or command-line +parameters. Variable settings from the I may be altered +by specifying new or additional assignments on the command line. + +See the L manpage for more information. B diff -r b8e182cc7f2e -r 7872b0918901 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Tue Apr 24 18:51:56 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Tue Apr 24 18:51:56 2012 +0100 @@ -5547,7 +5547,7 @@ int main_tmem_freeable(int argc, char ** int main_cpupoolcreate(int argc, char **argv) { - const char *filename = NULL; + const char *filename = NULL, *config_src=NULL; const char *p; char extra_config[1024]; int opt; @@ -5611,23 +5611,26 @@ int main_cpupoolcreate(int argc, char ** optind++; } - if (!filename) { - help("cpupool-create"); - return -ERROR_FAIL; - } - - if (libxl_read_file_contents(ctx, filename, (void **)&config_data, &config_len)) { - fprintf(stderr, "Failed to read config file: %s: %s\n", - filename, strerror(errno)); - return -ERROR_FAIL; - } + if (filename) + { + if (libxl_read_file_contents(ctx, filename, (void **)&config_data, + &config_len)) { + fprintf(stderr, "Failed to read config file: %s: %s\n", + filename, strerror(errno)); + return -ERROR_FAIL; + } + config_src=filename; + } + else + config_src="command line"; + if (strlen(extra_config)) { if (config_len > INT_MAX - (strlen(extra_config) + 2)) { fprintf(stderr, "Failed to attach extra configration\n"); return -ERROR_FAIL; } config_data = xrealloc(config_data, - config_len + strlen(extra_config) + 2); + config_len + strlen(extra_config) + 2); if (!config_data) { fprintf(stderr, "Failed to realloc config_data\n"); return -ERROR_FAIL; @@ -5638,7 +5641,7 @@ int main_cpupoolcreate(int argc, char ** config_len += strlen(extra_config) + 1; } - config = xlu_cfg_init(stderr, filename); + config = xlu_cfg_init(stderr, config_src); if (!config) { fprintf(stderr, "Failed to allocate for configuration\n"); return -ERROR_FAIL; @@ -5652,8 +5655,12 @@ int main_cpupoolcreate(int argc, char ** if (!xlu_cfg_get_string (config, "name", &buf, 0)) name = strdup(buf); - else + else if (filename) name = libxl_basename(filename); + else { + fprintf(stderr, "Missing cpupool name!\n"); + return -ERROR_FAIL; + } if (!libxl_name_to_cpupoolid(ctx, name, &poolid)) { fprintf(stderr, "Pool name \"%s\" already exists\n", name); return -ERROR_FAIL; @@ -5723,7 +5730,7 @@ int main_cpupoolcreate(int argc, char ** libxl_uuid_generate(&uuid); - printf("Using config file \"%s\"\n", filename); + printf("Using config file \"%s\"\n", config_src); printf("cpupool name: %s\n", name); printf("scheduler: %s\n", libxl_scheduler_to_string(sched)); printf("number of cpus: %d\n", n_cpus); diff -r b8e182cc7f2e -r 7872b0918901 tools/libxl/xl_cmdtable.c --- a/tools/libxl/xl_cmdtable.c Tue Apr 24 18:51:56 2012 +0100 +++ b/tools/libxl/xl_cmdtable.c Tue Apr 24 18:51:56 2012 +0100 @@ -367,12 +367,14 @@ struct cmd_spec cmd_table[] = { }, { "cpupool-create", &main_cpupoolcreate, 1, - "Create a CPU pool based an ConfigFile", - "[options] [vars]", + "Create a new CPU pool", + "[options] [] [Variable=value ...]", "-h, --help Print this help.\n" "-f FILE, --defconfig=FILE Use the given configuration file.\n" "-n, --dryrun Dry run - prints the resulting configuration.\n" - " (deprecated in favour of global -N option)." + " (deprecated in favour of global -N option).\n" + "\nSee the xlcpupool.cfg(5) manpage for more information.", + }, { "cpupool-list", &main_cpupoollist, 0, _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:07 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBr-0003D1-3s; Mon, 14 May 2012 16:32:07 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBp-00039h-Kb for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:05 +0000 Received: from [85.158.138.51:29478] by server-7.bemta-3.messagelabs.com id 00/98-03078-48331BF4; Mon, 14 May 2012 16:32:04 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-174.messagelabs.com!1337013123!19109512!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17953 invoked from network); 14 May 2012 16:32:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBm-0002oy-VS for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBm-0006Xs-Ur for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:02 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:02 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] x86-64: Fix memory hotplug epfn upper limit test for updating the compat M2P table X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Malcolm Crossley # Date 1335350156 -7200 # Node ID b7ce6a88bebbbd8d03fe50099ede8de4d9adef0f # Parent 15f094c85c85fb769f72a48b9c5d924a8e455855 x86-64: Fix memory hotplug epfn upper limit test for updating the compat M2P table The epfn is being compared to (RDWR_COMPAT_MPT_VIRT_END - RDWR_COMPAT_MPT_VIRT_START) without a 2 bit shift, resulting in the epfn being compared to the size of the RDWR_COMPAT_MPT table in bytes instead of the maximum page frame number that the RDWR_COMPAT_MPT table can map. Signed-off-by: Malcolm Crossley Committed-by: Jan Beulich --- diff -r 15f094c85c85 -r b7ce6a88bebb xen/arch/x86/x86_64/mm.c --- a/xen/arch/x86/x86_64/mm.c Wed Apr 25 11:21:25 2012 +0100 +++ b/xen/arch/x86/x86_64/mm.c Wed Apr 25 12:35:56 2012 +0200 @@ -454,7 +454,7 @@ static int setup_compat_m2p_table(struct if ((smap > ((RDWR_COMPAT_MPT_VIRT_END - RDWR_COMPAT_MPT_VIRT_START) >> 2)) ) return 0; - if (epfn > (RDWR_COMPAT_MPT_VIRT_END - RDWR_COMPAT_MPT_VIRT_START)) + if ( epfn > ((RDWR_COMPAT_MPT_VIRT_END - RDWR_COMPAT_MPT_VIRT_START) >> 2) ) epfn = (RDWR_COMPAT_MPT_VIRT_END - RDWR_COMPAT_MPT_VIRT_START) >> 2; emap = ( (epfn + ((1UL << (L2_PAGETABLE_SHIFT - 2)) - 1 )) & _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:07 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBr-0003D1-3s; Mon, 14 May 2012 16:32:07 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBp-00039h-Kb for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:05 +0000 Received: from [85.158.138.51:29478] by server-7.bemta-3.messagelabs.com id 00/98-03078-48331BF4; Mon, 14 May 2012 16:32:04 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-174.messagelabs.com!1337013123!19109512!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17953 invoked from network); 14 May 2012 16:32:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBm-0002oy-VS for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBm-0006Xs-Ur for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:02 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:02 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] x86-64: Fix memory hotplug epfn upper limit test for updating the compat M2P table X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Malcolm Crossley # Date 1335350156 -7200 # Node ID b7ce6a88bebbbd8d03fe50099ede8de4d9adef0f # Parent 15f094c85c85fb769f72a48b9c5d924a8e455855 x86-64: Fix memory hotplug epfn upper limit test for updating the compat M2P table The epfn is being compared to (RDWR_COMPAT_MPT_VIRT_END - RDWR_COMPAT_MPT_VIRT_START) without a 2 bit shift, resulting in the epfn being compared to the size of the RDWR_COMPAT_MPT table in bytes instead of the maximum page frame number that the RDWR_COMPAT_MPT table can map. Signed-off-by: Malcolm Crossley Committed-by: Jan Beulich --- diff -r 15f094c85c85 -r b7ce6a88bebb xen/arch/x86/x86_64/mm.c --- a/xen/arch/x86/x86_64/mm.c Wed Apr 25 11:21:25 2012 +0100 +++ b/xen/arch/x86/x86_64/mm.c Wed Apr 25 12:35:56 2012 +0200 @@ -454,7 +454,7 @@ static int setup_compat_m2p_table(struct if ((smap > ((RDWR_COMPAT_MPT_VIRT_END - RDWR_COMPAT_MPT_VIRT_START) >> 2)) ) return 0; - if (epfn > (RDWR_COMPAT_MPT_VIRT_END - RDWR_COMPAT_MPT_VIRT_START)) + if ( epfn > ((RDWR_COMPAT_MPT_VIRT_END - RDWR_COMPAT_MPT_VIRT_START) >> 2) ) epfn = (RDWR_COMPAT_MPT_VIRT_END - RDWR_COMPAT_MPT_VIRT_START) >> 2; emap = ( (epfn + ((1UL << (L2_PAGETABLE_SHIFT - 2)) - 1 )) & _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:07 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBr-0003Dz-FZ; Mon, 14 May 2012 16:32:07 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBq-0003A8-4s for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:06 +0000 Received: from [85.158.138.51:27170] by server-8.bemta-3.messagelabs.com id E5/C7-24428-58331BF4; Mon, 14 May 2012 16:32:05 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-174.messagelabs.com!1337013123!8368036!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23641 invoked from network); 14 May 2012 16:32:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBn-0002p3-FW for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBn-0006Y7-Eu for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:03 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:02 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: use libxl_domain_config_init and not memset 0 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1335350142 -3600 # Node ID b3caa36ed7e7f33fbb5acf20c0cc709e0bb891ca # Parent 15f094c85c85fb769f72a48b9c5d924a8e455855 libxl: use libxl_domain_config_init and not memset 0 I missed a couple of memsets in 25237:31489be80c51, we need to use libxl_domain_config_init everywhere and not memset since not all fields are initialised to zero now (the type field in particular). This fixes an abort with "xl list " for a specific domain due to assert(type == -1) in libxl_domain_build_info_init_type(). Signed-off-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 15f094c85c85 -r b3caa36ed7e7 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Wed Apr 25 11:21:25 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Wed Apr 25 11:35:42 2012 +0100 @@ -2464,7 +2464,7 @@ static void list_domains_details(const l if (rc) continue; CHK_ERRNO(asprintf(&config_file, "", info[i].domid)); - memset(&d_config, 0x00, sizeof(d_config)); + libxl_domain_config_init(&d_config); parse_config_data(config_file, (char *)data, len, &d_config); printf_info(default_output_format, info[i].domid, &d_config); libxl_domain_config_dispose(&d_config); @@ -3546,7 +3546,7 @@ int main_config_update(int argc, char ** exit(1); } - memset(&d_config, 0x00, sizeof(d_config)); + libxl_domain_config_init(&d_config); parse_config_data(filename, config_data, config_len, &d_config); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:07 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBr-0003Dz-FZ; Mon, 14 May 2012 16:32:07 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBq-0003A8-4s for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:06 +0000 Received: from [85.158.138.51:27170] by server-8.bemta-3.messagelabs.com id E5/C7-24428-58331BF4; Mon, 14 May 2012 16:32:05 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-174.messagelabs.com!1337013123!8368036!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23641 invoked from network); 14 May 2012 16:32:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBn-0002p3-FW for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBn-0006Y7-Eu for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:03 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:02 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: use libxl_domain_config_init and not memset 0 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1335350142 -3600 # Node ID b3caa36ed7e7f33fbb5acf20c0cc709e0bb891ca # Parent 15f094c85c85fb769f72a48b9c5d924a8e455855 libxl: use libxl_domain_config_init and not memset 0 I missed a couple of memsets in 25237:31489be80c51, we need to use libxl_domain_config_init everywhere and not memset since not all fields are initialised to zero now (the type field in particular). This fixes an abort with "xl list " for a specific domain due to assert(type == -1) in libxl_domain_build_info_init_type(). Signed-off-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 15f094c85c85 -r b3caa36ed7e7 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Wed Apr 25 11:21:25 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Wed Apr 25 11:35:42 2012 +0100 @@ -2464,7 +2464,7 @@ static void list_domains_details(const l if (rc) continue; CHK_ERRNO(asprintf(&config_file, "", info[i].domid)); - memset(&d_config, 0x00, sizeof(d_config)); + libxl_domain_config_init(&d_config); parse_config_data(config_file, (char *)data, len, &d_config); printf_info(default_output_format, info[i].domid, &d_config); libxl_domain_config_dispose(&d_config); @@ -3546,7 +3546,7 @@ int main_config_update(int argc, char ** exit(1); } - memset(&d_config, 0x00, sizeof(d_config)); + libxl_domain_config_init(&d_config); parse_config_data(filename, config_data, config_len, &d_config); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:07 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBr-0003Ek-Nk; Mon, 14 May 2012 16:32:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBq-0003AR-AV for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:06 +0000 Received: from [85.158.139.83:15216] by server-10.bemta-5.messagelabs.com id 54/40-08260-58331BF4; Mon, 14 May 2012 16:32:05 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-182.messagelabs.com!1337013122!20999951!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13262 invoked from network); 14 May 2012 16:32:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBl-0002on-Uf for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBl-0006XO-Ty for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:01 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:01 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: passthrough: avoid passing through devices not owned by pciback X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Xudong Hao # Date 1335349125 -3600 # Node ID 8fd318f89728cc42f5ab9c1885dd39e04a1f3b11 # Parent 8fddae41cd1b874e4991c6fd3d51a2b63642d914 libxl: passthrough: avoid passing through devices not owned by pciback This patch makes sure the passthrough device belongs to pciback before allow them passthrough to the guest. There are still many other checks missing. xm terminates the guest startup process when this type of condition is found. This patch just allows the guest to continue to boot but with no device passthrough. Signed-off-by: Allen Kay Signed-off-by: Xudong Hao Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 8fddae41cd1b -r 8fd318f89728 tools/libxl/libxl_pci.c --- a/tools/libxl/libxl_pci.c Tue Apr 24 19:06:42 2012 +0100 +++ b/tools/libxl/libxl_pci.c Wed Apr 25 11:18:45 2012 +0100 @@ -664,6 +664,24 @@ int libxl_device_pci_add(libxl_ctx *ctx, return rc; } +static int libxl_pcidev_assignable(libxl_ctx *ctx, libxl_device_pci *pcidev) +{ + libxl_device_pci *pcidevs; + int num, i; + + pcidevs = libxl_device_pci_list_assignable(ctx, &num); + for (i = 0; i < num; i++) { + if (pcidevs[i].domain == pcidev->domain && + pcidevs[i].bus == pcidev->bus && + pcidevs[i].dev == pcidev->dev && + pcidevs[i].func == pcidev->func) + { + return 1; + } + } + return 0; +} + int libxl__device_pci_add(libxl__gc *gc, uint32_t domid, libxl_device_pci *pcidev, int starting) { libxl_ctx *ctx = libxl__gc_owner(gc); @@ -675,6 +693,13 @@ int libxl__device_pci_add(libxl__gc *gc, rc = libxl__device_pci_setdefault(gc, pcidev); if (rc) goto out; + if (!libxl_pcidev_assignable(ctx, pcidev)) { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "PCI device %x:%x:%x.%x is not assignable", + pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func); + rc = ERROR_FAIL; + goto out; + } + rc = get_all_assigned_devices(gc, &assigned, &num_assigned); if ( rc ) { LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "cannot determine if device is assigned, refusing to continue"); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:07 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBr-0003Ek-Nk; Mon, 14 May 2012 16:32:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBq-0003AR-AV for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:06 +0000 Received: from [85.158.139.83:15216] by server-10.bemta-5.messagelabs.com id 54/40-08260-58331BF4; Mon, 14 May 2012 16:32:05 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-182.messagelabs.com!1337013122!20999951!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13262 invoked from network); 14 May 2012 16:32:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBl-0002on-Uf for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBl-0006XO-Ty for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:01 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:01 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: passthrough: avoid passing through devices not owned by pciback X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Xudong Hao # Date 1335349125 -3600 # Node ID 8fd318f89728cc42f5ab9c1885dd39e04a1f3b11 # Parent 8fddae41cd1b874e4991c6fd3d51a2b63642d914 libxl: passthrough: avoid passing through devices not owned by pciback This patch makes sure the passthrough device belongs to pciback before allow them passthrough to the guest. There are still many other checks missing. xm terminates the guest startup process when this type of condition is found. This patch just allows the guest to continue to boot but with no device passthrough. Signed-off-by: Allen Kay Signed-off-by: Xudong Hao Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 8fddae41cd1b -r 8fd318f89728 tools/libxl/libxl_pci.c --- a/tools/libxl/libxl_pci.c Tue Apr 24 19:06:42 2012 +0100 +++ b/tools/libxl/libxl_pci.c Wed Apr 25 11:18:45 2012 +0100 @@ -664,6 +664,24 @@ int libxl_device_pci_add(libxl_ctx *ctx, return rc; } +static int libxl_pcidev_assignable(libxl_ctx *ctx, libxl_device_pci *pcidev) +{ + libxl_device_pci *pcidevs; + int num, i; + + pcidevs = libxl_device_pci_list_assignable(ctx, &num); + for (i = 0; i < num; i++) { + if (pcidevs[i].domain == pcidev->domain && + pcidevs[i].bus == pcidev->bus && + pcidevs[i].dev == pcidev->dev && + pcidevs[i].func == pcidev->func) + { + return 1; + } + } + return 0; +} + int libxl__device_pci_add(libxl__gc *gc, uint32_t domid, libxl_device_pci *pcidev, int starting) { libxl_ctx *ctx = libxl__gc_owner(gc); @@ -675,6 +693,13 @@ int libxl__device_pci_add(libxl__gc *gc, rc = libxl__device_pci_setdefault(gc, pcidev); if (rc) goto out; + if (!libxl_pcidev_assignable(ctx, pcidev)) { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "PCI device %x:%x:%x.%x is not assignable", + pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func); + rc = ERROR_FAIL; + goto out; + } + rc = get_all_assigned_devices(gc, &assigned, &num_assigned); if ( rc ) { LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "cannot determine if device is assigned, refusing to continue"); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:09 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBs-0003Ge-SC; Mon, 14 May 2012 16:32:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBr-0003CB-5J for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:07 +0000 Received: from [85.158.138.51:29598] by server-10.bemta-3.messagelabs.com id 27/E4-29478-68331BF4; Mon, 14 May 2012 16:32:06 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-174.messagelabs.com!1337013124!18964760!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3871 invoked from network); 14 May 2012 16:32:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBo-0002p7-0h for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBn-0006YM-WC for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:04 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:03 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: set domain scheduling parameters while creating the domU X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Dieter Bloms # Date 1335350306 -3600 # Node ID e428eae1838c0c384a6f311750e3024a257a3793 # Parent b3caa36ed7e7f33fbb5acf20c0cc709e0bb891ca libxl: set domain scheduling parameters while creating the domU the domain specific scheduling parameters like cpu_weight, cap, slice, ... will be set during creating the domain, so this parameters can be defined in the domain config file [ Improved the documentation wording slightly. -iwj ] Signed-off-by: Dieter Bloms Acked-by: Ian Campbell Signed-off-by: Ian Jackson Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r b3caa36ed7e7 -r e428eae1838c docs/man/xl.cfg.pod.5 --- a/docs/man/xl.cfg.pod.5 Wed Apr 25 11:35:42 2012 +0100 +++ b/docs/man/xl.cfg.pod.5 Wed Apr 25 11:38:26 2012 +0100 @@ -112,6 +112,44 @@ List of which cpus the guest is allowed (all vcpus will run on cpus 0,2,3,5), or `cpus=["2", "3"]` (all vcpus will run on cpus 2 and 3). +=item B + +A domain with a weight of 512 will get twice as much CPU as a domain +with a weight of 256 on a contended host. +Legal weights range from 1 to 65535 and the default is 256. +Honoured by the credit, credit2 and sedf schedulers. + +=item B + +The cap optionally fixes the maximum amount of CPU a domain will be +able to consume, even if the host system has idle CPU cycles. +The cap is expressed in percentage of one physical CPU: +100 is 1 physical CPU, 50 is half a CPU, 400 is 4 CPUs, etc. +The default, 0, means there is no upper cap. +Honoured by the credit and credit2 schedulers. + +=item B + +The normal EDF scheduling usage in nanoseconds. This means every period +the domain gets cpu time defined in slice. +Honoured by the sedf scheduler. + +=item B + +The normal EDF scheduling usage in nanoseconds. it defines the time +a domain get every period time. +Honoured by the sedf scheduler. + +=item B + +Scaled period if domain is doing heavy I/O. +Honoured by the sedf scheduler. + +=item B + +Flag for allowing domain to run in extra time. +Honoured by the sedf scheduler. + =item B Start the guest with MBYTES megabytes of RAM. diff -r b3caa36ed7e7 -r e428eae1838c tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Wed Apr 25 11:35:42 2012 +0100 +++ b/tools/libxl/libxl_dom.c Wed Apr 25 11:38:26 2012 +0100 @@ -42,6 +42,40 @@ libxl_domain_type libxl__domain_type(lib return LIBXL_DOMAIN_TYPE_PV; } +int libxl__sched_set_params(libxl__gc *gc, uint32_t domid, libxl_sched_params *scparams) +{ + libxl_ctx *ctx = libxl__gc_owner(gc); + libxl_scheduler sched; + libxl_sched_sedf_domain sedf_info; + libxl_sched_credit_domain credit_info; + libxl_sched_credit2_domain credit2_info; + int ret; + + sched = libxl_get_scheduler (ctx); + switch (sched) { + case LIBXL_SCHEDULER_SEDF: + sedf_info.period = scparams->period; + sedf_info.slice = scparams->slice; + sedf_info.latency = scparams->latency; + sedf_info.extratime = scparams->extratime; + sedf_info.weight = scparams->weight; + ret=libxl_sched_sedf_domain_set(ctx, domid, &sedf_info); + break; + case LIBXL_SCHEDULER_CREDIT: + credit_info.weight = scparams->weight; + credit_info.cap = scparams->cap; + ret=libxl_sched_credit_domain_set(ctx, domid, &credit_info); + break; + case LIBXL_SCHEDULER_CREDIT2: + credit2_info.weight = scparams->weight; + ret=libxl_sched_credit2_domain_set(ctx, domid, &credit2_info); + break; + default: + ret=-1; + } + return ret; +} + int libxl__domain_shutdown_reason(libxl__gc *gc, uint32_t domid) { libxl_ctx *ctx = libxl__gc_owner(gc); @@ -139,6 +173,8 @@ int libxl__build_post(libxl__gc *gc, uin char **ents, **hvm_ents; int i; + libxl__sched_set_params (gc, domid, &(info->sched_params)); + libxl_cpuid_apply_policy(ctx, domid); if (info->cpuid != NULL) libxl_cpuid_set(ctx, domid, info->cpuid); diff -r b3caa36ed7e7 -r e428eae1838c tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Wed Apr 25 11:35:42 2012 +0100 +++ b/tools/libxl/libxl_internal.h Wed Apr 25 11:38:26 2012 +0100 @@ -618,6 +618,7 @@ _hidden int libxl__atfork_init(libxl_ctx /* from xl_dom */ _hidden libxl_domain_type libxl__domain_type(libxl__gc *gc, uint32_t domid); _hidden int libxl__domain_shutdown_reason(libxl__gc *gc, uint32_t domid); +_hidden int libxl__sched_set_params(libxl__gc *gc, uint32_t domid, libxl_sched_params *scparams); #define LIBXL__DOMAIN_IS_TYPE(gc, domid, type) \ libxl__domain_type((gc), (domid)) == LIBXL_DOMAIN_TYPE_##type typedef struct { diff -r b3caa36ed7e7 -r e428eae1838c tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Wed Apr 25 11:35:42 2012 +0100 +++ b/tools/libxl/libxl_types.idl Wed Apr 25 11:38:26 2012 +0100 @@ -224,6 +224,17 @@ libxl_domain_create_info = Struct("domai MemKB = UInt(64, init_val = "LIBXL_MEMKB_DEFAULT") +libxl_sched_params = Struct("sched_params",[ + ("weight", integer), + ("cap", integer), + ("tslice_ms", integer), + ("ratelimit_us", integer), + ("period", integer), + ("slice", integer), + ("latency", integer), + ("extratime", integer), + ], dir=DIR_IN) + # Instances of libxl_file_reference contained in this struct which # have been mapped (with libxl_file_reference_map) will be unmapped # by libxl_domain_build/restore. If either of these are never called @@ -255,6 +266,8 @@ libxl_domain_build_info = Struct("domain ("extra_pv", libxl_string_list), # extra parameters pass directly to qemu for HVM guest, NULL terminated ("extra_hvm", libxl_string_list), + # parameters for all type of scheduler + ("sched_params", libxl_sched_params), ("u", KeyedUnion(None, libxl_domain_type, "type", [("hvm", Struct(None, [("firmware", string), diff -r b3caa36ed7e7 -r e428eae1838c tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Wed Apr 25 11:35:42 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Wed Apr 25 11:38:26 2012 +0100 @@ -597,6 +597,23 @@ static void parse_config_data(const char libxl_domain_build_info_init_type(b_info, c_info->type); /* the following is the actual config parsing with overriding values in the structures */ + if (!xlu_cfg_get_long (config, "cpu_weight", &l, 0)) + b_info->sched_params.weight = l; + if (!xlu_cfg_get_long (config, "cap", &l, 0)) + b_info->sched_params.cap = l; + if (!xlu_cfg_get_long (config, "tslice_ms", &l, 0)) + b_info->sched_params.tslice_ms = l; + if (!xlu_cfg_get_long (config, "ratelimit_us", &l, 0)) + b_info->sched_params.ratelimit_us = l; + if (!xlu_cfg_get_long (config, "period", &l, 0)) + b_info->sched_params.period = l; + if (!xlu_cfg_get_long (config, "slice", &l, 0)) + b_info->sched_params.period = l; + if (!xlu_cfg_get_long (config, "latency", &l, 0)) + b_info->sched_params.period = l; + if (!xlu_cfg_get_long (config, "extratime", &l, 0)) + b_info->sched_params.period = l; + if (!xlu_cfg_get_long (config, "vcpus", &l, 0)) { b_info->max_vcpus = l; b_info->cur_vcpus = (1 << l) - 1; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:09 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBs-0003Ge-SC; Mon, 14 May 2012 16:32:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBr-0003CB-5J for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:07 +0000 Received: from [85.158.138.51:29598] by server-10.bemta-3.messagelabs.com id 27/E4-29478-68331BF4; Mon, 14 May 2012 16:32:06 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-174.messagelabs.com!1337013124!18964760!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3871 invoked from network); 14 May 2012 16:32:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBo-0002p7-0h for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBn-0006YM-WC for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:04 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:03 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: set domain scheduling parameters while creating the domU X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Dieter Bloms # Date 1335350306 -3600 # Node ID e428eae1838c0c384a6f311750e3024a257a3793 # Parent b3caa36ed7e7f33fbb5acf20c0cc709e0bb891ca libxl: set domain scheduling parameters while creating the domU the domain specific scheduling parameters like cpu_weight, cap, slice, ... will be set during creating the domain, so this parameters can be defined in the domain config file [ Improved the documentation wording slightly. -iwj ] Signed-off-by: Dieter Bloms Acked-by: Ian Campbell Signed-off-by: Ian Jackson Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r b3caa36ed7e7 -r e428eae1838c docs/man/xl.cfg.pod.5 --- a/docs/man/xl.cfg.pod.5 Wed Apr 25 11:35:42 2012 +0100 +++ b/docs/man/xl.cfg.pod.5 Wed Apr 25 11:38:26 2012 +0100 @@ -112,6 +112,44 @@ List of which cpus the guest is allowed (all vcpus will run on cpus 0,2,3,5), or `cpus=["2", "3"]` (all vcpus will run on cpus 2 and 3). +=item B + +A domain with a weight of 512 will get twice as much CPU as a domain +with a weight of 256 on a contended host. +Legal weights range from 1 to 65535 and the default is 256. +Honoured by the credit, credit2 and sedf schedulers. + +=item B + +The cap optionally fixes the maximum amount of CPU a domain will be +able to consume, even if the host system has idle CPU cycles. +The cap is expressed in percentage of one physical CPU: +100 is 1 physical CPU, 50 is half a CPU, 400 is 4 CPUs, etc. +The default, 0, means there is no upper cap. +Honoured by the credit and credit2 schedulers. + +=item B + +The normal EDF scheduling usage in nanoseconds. This means every period +the domain gets cpu time defined in slice. +Honoured by the sedf scheduler. + +=item B + +The normal EDF scheduling usage in nanoseconds. it defines the time +a domain get every period time. +Honoured by the sedf scheduler. + +=item B + +Scaled period if domain is doing heavy I/O. +Honoured by the sedf scheduler. + +=item B + +Flag for allowing domain to run in extra time. +Honoured by the sedf scheduler. + =item B Start the guest with MBYTES megabytes of RAM. diff -r b3caa36ed7e7 -r e428eae1838c tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Wed Apr 25 11:35:42 2012 +0100 +++ b/tools/libxl/libxl_dom.c Wed Apr 25 11:38:26 2012 +0100 @@ -42,6 +42,40 @@ libxl_domain_type libxl__domain_type(lib return LIBXL_DOMAIN_TYPE_PV; } +int libxl__sched_set_params(libxl__gc *gc, uint32_t domid, libxl_sched_params *scparams) +{ + libxl_ctx *ctx = libxl__gc_owner(gc); + libxl_scheduler sched; + libxl_sched_sedf_domain sedf_info; + libxl_sched_credit_domain credit_info; + libxl_sched_credit2_domain credit2_info; + int ret; + + sched = libxl_get_scheduler (ctx); + switch (sched) { + case LIBXL_SCHEDULER_SEDF: + sedf_info.period = scparams->period; + sedf_info.slice = scparams->slice; + sedf_info.latency = scparams->latency; + sedf_info.extratime = scparams->extratime; + sedf_info.weight = scparams->weight; + ret=libxl_sched_sedf_domain_set(ctx, domid, &sedf_info); + break; + case LIBXL_SCHEDULER_CREDIT: + credit_info.weight = scparams->weight; + credit_info.cap = scparams->cap; + ret=libxl_sched_credit_domain_set(ctx, domid, &credit_info); + break; + case LIBXL_SCHEDULER_CREDIT2: + credit2_info.weight = scparams->weight; + ret=libxl_sched_credit2_domain_set(ctx, domid, &credit2_info); + break; + default: + ret=-1; + } + return ret; +} + int libxl__domain_shutdown_reason(libxl__gc *gc, uint32_t domid) { libxl_ctx *ctx = libxl__gc_owner(gc); @@ -139,6 +173,8 @@ int libxl__build_post(libxl__gc *gc, uin char **ents, **hvm_ents; int i; + libxl__sched_set_params (gc, domid, &(info->sched_params)); + libxl_cpuid_apply_policy(ctx, domid); if (info->cpuid != NULL) libxl_cpuid_set(ctx, domid, info->cpuid); diff -r b3caa36ed7e7 -r e428eae1838c tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Wed Apr 25 11:35:42 2012 +0100 +++ b/tools/libxl/libxl_internal.h Wed Apr 25 11:38:26 2012 +0100 @@ -618,6 +618,7 @@ _hidden int libxl__atfork_init(libxl_ctx /* from xl_dom */ _hidden libxl_domain_type libxl__domain_type(libxl__gc *gc, uint32_t domid); _hidden int libxl__domain_shutdown_reason(libxl__gc *gc, uint32_t domid); +_hidden int libxl__sched_set_params(libxl__gc *gc, uint32_t domid, libxl_sched_params *scparams); #define LIBXL__DOMAIN_IS_TYPE(gc, domid, type) \ libxl__domain_type((gc), (domid)) == LIBXL_DOMAIN_TYPE_##type typedef struct { diff -r b3caa36ed7e7 -r e428eae1838c tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Wed Apr 25 11:35:42 2012 +0100 +++ b/tools/libxl/libxl_types.idl Wed Apr 25 11:38:26 2012 +0100 @@ -224,6 +224,17 @@ libxl_domain_create_info = Struct("domai MemKB = UInt(64, init_val = "LIBXL_MEMKB_DEFAULT") +libxl_sched_params = Struct("sched_params",[ + ("weight", integer), + ("cap", integer), + ("tslice_ms", integer), + ("ratelimit_us", integer), + ("period", integer), + ("slice", integer), + ("latency", integer), + ("extratime", integer), + ], dir=DIR_IN) + # Instances of libxl_file_reference contained in this struct which # have been mapped (with libxl_file_reference_map) will be unmapped # by libxl_domain_build/restore. If either of these are never called @@ -255,6 +266,8 @@ libxl_domain_build_info = Struct("domain ("extra_pv", libxl_string_list), # extra parameters pass directly to qemu for HVM guest, NULL terminated ("extra_hvm", libxl_string_list), + # parameters for all type of scheduler + ("sched_params", libxl_sched_params), ("u", KeyedUnion(None, libxl_domain_type, "type", [("hvm", Struct(None, [("firmware", string), diff -r b3caa36ed7e7 -r e428eae1838c tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Wed Apr 25 11:35:42 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Wed Apr 25 11:38:26 2012 +0100 @@ -597,6 +597,23 @@ static void parse_config_data(const char libxl_domain_build_info_init_type(b_info, c_info->type); /* the following is the actual config parsing with overriding values in the structures */ + if (!xlu_cfg_get_long (config, "cpu_weight", &l, 0)) + b_info->sched_params.weight = l; + if (!xlu_cfg_get_long (config, "cap", &l, 0)) + b_info->sched_params.cap = l; + if (!xlu_cfg_get_long (config, "tslice_ms", &l, 0)) + b_info->sched_params.tslice_ms = l; + if (!xlu_cfg_get_long (config, "ratelimit_us", &l, 0)) + b_info->sched_params.ratelimit_us = l; + if (!xlu_cfg_get_long (config, "period", &l, 0)) + b_info->sched_params.period = l; + if (!xlu_cfg_get_long (config, "slice", &l, 0)) + b_info->sched_params.period = l; + if (!xlu_cfg_get_long (config, "latency", &l, 0)) + b_info->sched_params.period = l; + if (!xlu_cfg_get_long (config, "extratime", &l, 0)) + b_info->sched_params.period = l; + if (!xlu_cfg_get_long (config, "vcpus", &l, 0)) { b_info->max_vcpus = l; b_info->cur_vcpus = (1 << l) - 1; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:09 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBs-0003Gp-Uw; Mon, 14 May 2012 16:32:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBr-0003Dm-Tr for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:08 +0000 Received: from [85.158.138.51:29664] by server-12.bemta-3.messagelabs.com id 10/C5-29760-78331BF4; Mon, 14 May 2012 16:32:07 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-174.messagelabs.com!1337013125!19109517!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18114 invoked from network); 14 May 2012 16:32:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBp-0002pF-2o for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBp-0006Yq-22 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:05 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:04 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] Merge X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1335351608 -3600 # Node ID 7ba11d9b1d23633b5c42fadddad17b6dcb686141 # Parent 841b7e3bd1f99f6a61fde8e2bf670a3327135184 # Parent b7ce6a88bebbbd8d03fe50099ede8de4d9adef0f Merge --- diff -r 841b7e3bd1f9 -r 7ba11d9b1d23 xen/arch/x86/x86_64/mm.c --- a/xen/arch/x86/x86_64/mm.c Wed Apr 25 11:44:09 2012 +0100 +++ b/xen/arch/x86/x86_64/mm.c Wed Apr 25 12:00:08 2012 +0100 @@ -454,7 +454,7 @@ static int setup_compat_m2p_table(struct if ((smap > ((RDWR_COMPAT_MPT_VIRT_END - RDWR_COMPAT_MPT_VIRT_START) >> 2)) ) return 0; - if (epfn > (RDWR_COMPAT_MPT_VIRT_END - RDWR_COMPAT_MPT_VIRT_START)) + if ( epfn > ((RDWR_COMPAT_MPT_VIRT_END - RDWR_COMPAT_MPT_VIRT_START) >> 2) ) epfn = (RDWR_COMPAT_MPT_VIRT_END - RDWR_COMPAT_MPT_VIRT_START) >> 2; emap = ( (epfn + ((1UL << (L2_PAGETABLE_SHIFT - 2)) - 1 )) & _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:09 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBs-0003Gp-Uw; Mon, 14 May 2012 16:32:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBr-0003Dm-Tr for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:08 +0000 Received: from [85.158.138.51:29664] by server-12.bemta-3.messagelabs.com id 10/C5-29760-78331BF4; Mon, 14 May 2012 16:32:07 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-174.messagelabs.com!1337013125!19109517!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18114 invoked from network); 14 May 2012 16:32:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBp-0002pF-2o for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBp-0006Yq-22 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:05 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:04 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] Merge X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1335351608 -3600 # Node ID 7ba11d9b1d23633b5c42fadddad17b6dcb686141 # Parent 841b7e3bd1f99f6a61fde8e2bf670a3327135184 # Parent b7ce6a88bebbbd8d03fe50099ede8de4d9adef0f Merge --- diff -r 841b7e3bd1f9 -r 7ba11d9b1d23 xen/arch/x86/x86_64/mm.c --- a/xen/arch/x86/x86_64/mm.c Wed Apr 25 11:44:09 2012 +0100 +++ b/xen/arch/x86/x86_64/mm.c Wed Apr 25 12:00:08 2012 +0100 @@ -454,7 +454,7 @@ static int setup_compat_m2p_table(struct if ((smap > ((RDWR_COMPAT_MPT_VIRT_END - RDWR_COMPAT_MPT_VIRT_START) >> 2)) ) return 0; - if (epfn > (RDWR_COMPAT_MPT_VIRT_END - RDWR_COMPAT_MPT_VIRT_START)) + if ( epfn > ((RDWR_COMPAT_MPT_VIRT_END - RDWR_COMPAT_MPT_VIRT_START) >> 2) ) epfn = (RDWR_COMPAT_MPT_VIRT_END - RDWR_COMPAT_MPT_VIRT_START) >> 2; emap = ( (epfn + ((1UL << (L2_PAGETABLE_SHIFT - 2)) - 1 )) & _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:10 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBu-0003JF-5D; Mon, 14 May 2012 16:32:10 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBs-0003G6-Sr for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:08 +0000 Received: from [85.158.143.99:62997] by server-3.bemta-4.messagelabs.com id FE/AA-05853-88331BF4; Mon, 14 May 2012 16:32:08 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-216.messagelabs.com!1337013126!16746913!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7684 invoked from network); 14 May 2012 16:32:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBq-0002pR-J8 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBq-0006ZZ-IP for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:06 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:06 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] docs: use "a4" not "a4wide" paper type for doxygen and latex X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1335358526 -3600 # Node ID a4e7fce6ee2bd11919db98ca0a3b1f4bcb3c02bd # Parent 7883b6dea8f82c236ab09ce311c1692dd1d31fc7 docs: use "a4" not "a4wide" paper type for doxygen and latex a4wide is no longer shipped in texlive. Reported by Bastian Blank Signed-off-by: Ian Campbell Committed-by: Keir Fraser --- diff -r 7883b6dea8f8 -r a4e7fce6ee2b docs/Doxyfile --- a/docs/Doxyfile Wed Apr 25 13:54:36 2012 +0100 +++ b/docs/Doxyfile Wed Apr 25 13:55:26 2012 +0100 @@ -747,7 +747,7 @@ COMPACT_LATEX = NO # by the printer. Possible values are: a4, a4wide, letter, legal and # executive. If left blank a4wide will be used. -PAPER_TYPE = a4wide +PAPER_TYPE = a4 # The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX # packages that should be included in the LaTeX output. diff -r 7883b6dea8f8 -r a4e7fce6ee2b docs/xen-api/xenapi.tex --- a/docs/xen-api/xenapi.tex Wed Apr 25 13:54:36 2012 +0100 +++ b/docs/xen-api/xenapi.tex Wed Apr 25 13:55:26 2012 +0100 @@ -13,7 +13,7 @@ \documentclass{report} -\usepackage{a4wide} +\usepackage{a4} \usepackage{graphics} \usepackage{longtable} \usepackage{fancyhdr} _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:10 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBu-0003JF-5D; Mon, 14 May 2012 16:32:10 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBs-0003G6-Sr for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:08 +0000 Received: from [85.158.143.99:62997] by server-3.bemta-4.messagelabs.com id FE/AA-05853-88331BF4; Mon, 14 May 2012 16:32:08 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-216.messagelabs.com!1337013126!16746913!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7684 invoked from network); 14 May 2012 16:32:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBq-0002pR-J8 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBq-0006ZZ-IP for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:06 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:06 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] docs: use "a4" not "a4wide" paper type for doxygen and latex X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1335358526 -3600 # Node ID a4e7fce6ee2bd11919db98ca0a3b1f4bcb3c02bd # Parent 7883b6dea8f82c236ab09ce311c1692dd1d31fc7 docs: use "a4" not "a4wide" paper type for doxygen and latex a4wide is no longer shipped in texlive. Reported by Bastian Blank Signed-off-by: Ian Campbell Committed-by: Keir Fraser --- diff -r 7883b6dea8f8 -r a4e7fce6ee2b docs/Doxyfile --- a/docs/Doxyfile Wed Apr 25 13:54:36 2012 +0100 +++ b/docs/Doxyfile Wed Apr 25 13:55:26 2012 +0100 @@ -747,7 +747,7 @@ COMPACT_LATEX = NO # by the printer. Possible values are: a4, a4wide, letter, legal and # executive. If left blank a4wide will be used. -PAPER_TYPE = a4wide +PAPER_TYPE = a4 # The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX # packages that should be included in the LaTeX output. diff -r 7883b6dea8f8 -r a4e7fce6ee2b docs/xen-api/xenapi.tex --- a/docs/xen-api/xenapi.tex Wed Apr 25 13:54:36 2012 +0100 +++ b/docs/xen-api/xenapi.tex Wed Apr 25 13:55:26 2012 +0100 @@ -13,7 +13,7 @@ \documentclass{report} -\usepackage{a4wide} +\usepackage{a4} \usepackage{graphics} \usepackage{longtable} \usepackage{fancyhdr} _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:11 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBv-0003L9-8J; Mon, 14 May 2012 16:32:11 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBt-0003HF-K0 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:09 +0000 Received: from [85.158.139.83:15500] by server-7.bemta-5.messagelabs.com id 45/16-16195-88331BF4; Mon, 14 May 2012 16:32:08 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-182.messagelabs.com!1337013125!28653441!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7011 invoked from network); 14 May 2012 16:32:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBo-0002pA-IC for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBo-0006Yb-HS for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:04 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:04 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl, configure: print a warning if flex/bison are needed X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Roger Pau Monne # Date 1335350649 -3600 # Node ID 841b7e3bd1f99f6a61fde8e2bf670a3327135184 # Parent e428eae1838c0c384a6f311750e3024a257a3793 libxl, configure: print a warning if flex/bison are needed This patch adds better support for both Flex and Bison, which might be needed to compile libxl. Now configure script sets BISON and FLEX Makefile vars if bison and flex are found, but doesn't complain if they are not found. Also, added some Makefile soccery to print a warning message if Bison or Flex are needed but not found. [ Improved the warning message slightly. -iwj ] Signed-off-by: Roger Pau Monne Acked-by: Ian Jackson Signed-off-by: Ian Jackson Committed-by: Ian Jackson --- diff -r e428eae1838c -r 841b7e3bd1f9 tools/configure --- a/tools/configure Wed Apr 25 11:38:26 2012 +0100 +++ b/tools/configure Wed Apr 25 11:44:09 2012 +0100 @@ -5017,6 +5017,86 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' +# Extract the first word of "bison", so it can be a program name with args. +set dummy bison; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_BISON+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + case $BISON in + [\\/]* | ?:[\\/]*) + ac_cv_path_BISON="$BISON" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_BISON="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +BISON=$ac_cv_path_BISON +if test -n "$BISON"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BISON" >&5 +$as_echo "$BISON" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +# Extract the first word of "flex", so it can be a program name with args. +set dummy flex; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_FLEX+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + case $FLEX in + [\\/]* | ?:[\\/]*) + ac_cv_path_FLEX="$FLEX" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_FLEX="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +FLEX=$ac_cv_path_FLEX +if test -n "$FLEX"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FLEX" >&5 +$as_echo "$FLEX" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 diff -r e428eae1838c -r 841b7e3bd1f9 tools/configure.ac --- a/tools/configure.ac Wed Apr 25 11:38:26 2012 +0100 +++ b/tools/configure.ac Wed Apr 25 11:44:09 2012 +0100 @@ -80,6 +80,8 @@ AC_PROG_CC AC_PROG_LN_S AC_PROG_MAKE_SET AC_PROG_INSTALL +AC_PATH_PROG([BISON], [bison]) +AC_PATH_PROG([FLEX], [flex]) AX_PATH_PROG_OR_FAIL([PERL], [perl]) AS_IF([test "x$xapi" = "xy"], [ AX_PATH_PROG_OR_FAIL([CURL], [curl-config]) diff -r e428eae1838c -r 841b7e3bd1f9 tools/libxl/Makefile --- a/tools/libxl/Makefile Wed Apr 25 11:38:26 2012 +0100 +++ b/tools/libxl/Makefile Wed Apr 25 11:44:09 2012 +0100 @@ -48,6 +48,18 @@ please check libxl_linux.c and libxl_net endif endif +ifeq ($(FLEX),) +%.c %.h:: %.l + $(warning Flex is needed to rebuild some libxl parsers and \ + scanners, please install it and rerun configure) +endif + +ifeq ($(BISON),) +%.c %.h:: %.y + $(warning Bison is needed to rebuild some libxl parsers and \ + scanners, please install it an rerun configure) +endif + LIBXL_LIBS += -lyajl LIBXL_OBJS = flexarray.o libxl.o libxl_create.o libxl_dm.o libxl_pci.o \ @@ -82,11 +94,11 @@ all: $(CLIENTS) libxenlight.so libxenlig $(LIBXL_OBJS) $(LIBXLU_OBJS) $(XL_OBJS): $(AUTOINCS) -%.c %.h: %.y +%.c %.h:: %.y @rm -f $*.[ch] $(BISON) --output=$*.c $< -%.c %.h: %.l +%.c %.h:: %.l @rm -f $*.[ch] $(FLEX) --header-file=$*.h --outfile=$*.c $< _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:11 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBv-0003L9-8J; Mon, 14 May 2012 16:32:11 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBt-0003HF-K0 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:09 +0000 Received: from [85.158.139.83:15500] by server-7.bemta-5.messagelabs.com id 45/16-16195-88331BF4; Mon, 14 May 2012 16:32:08 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-182.messagelabs.com!1337013125!28653441!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7011 invoked from network); 14 May 2012 16:32:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBo-0002pA-IC for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBo-0006Yb-HS for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:04 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:04 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl, configure: print a warning if flex/bison are needed X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Roger Pau Monne # Date 1335350649 -3600 # Node ID 841b7e3bd1f99f6a61fde8e2bf670a3327135184 # Parent e428eae1838c0c384a6f311750e3024a257a3793 libxl, configure: print a warning if flex/bison are needed This patch adds better support for both Flex and Bison, which might be needed to compile libxl. Now configure script sets BISON and FLEX Makefile vars if bison and flex are found, but doesn't complain if they are not found. Also, added some Makefile soccery to print a warning message if Bison or Flex are needed but not found. [ Improved the warning message slightly. -iwj ] Signed-off-by: Roger Pau Monne Acked-by: Ian Jackson Signed-off-by: Ian Jackson Committed-by: Ian Jackson --- diff -r e428eae1838c -r 841b7e3bd1f9 tools/configure --- a/tools/configure Wed Apr 25 11:38:26 2012 +0100 +++ b/tools/configure Wed Apr 25 11:44:09 2012 +0100 @@ -5017,6 +5017,86 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' +# Extract the first word of "bison", so it can be a program name with args. +set dummy bison; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_BISON+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + case $BISON in + [\\/]* | ?:[\\/]*) + ac_cv_path_BISON="$BISON" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_BISON="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +BISON=$ac_cv_path_BISON +if test -n "$BISON"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BISON" >&5 +$as_echo "$BISON" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +# Extract the first word of "flex", so it can be a program name with args. +set dummy flex; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_FLEX+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + case $FLEX in + [\\/]* | ?:[\\/]*) + ac_cv_path_FLEX="$FLEX" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_FLEX="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +FLEX=$ac_cv_path_FLEX +if test -n "$FLEX"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FLEX" >&5 +$as_echo "$FLEX" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 diff -r e428eae1838c -r 841b7e3bd1f9 tools/configure.ac --- a/tools/configure.ac Wed Apr 25 11:38:26 2012 +0100 +++ b/tools/configure.ac Wed Apr 25 11:44:09 2012 +0100 @@ -80,6 +80,8 @@ AC_PROG_CC AC_PROG_LN_S AC_PROG_MAKE_SET AC_PROG_INSTALL +AC_PATH_PROG([BISON], [bison]) +AC_PATH_PROG([FLEX], [flex]) AX_PATH_PROG_OR_FAIL([PERL], [perl]) AS_IF([test "x$xapi" = "xy"], [ AX_PATH_PROG_OR_FAIL([CURL], [curl-config]) diff -r e428eae1838c -r 841b7e3bd1f9 tools/libxl/Makefile --- a/tools/libxl/Makefile Wed Apr 25 11:38:26 2012 +0100 +++ b/tools/libxl/Makefile Wed Apr 25 11:44:09 2012 +0100 @@ -48,6 +48,18 @@ please check libxl_linux.c and libxl_net endif endif +ifeq ($(FLEX),) +%.c %.h:: %.l + $(warning Flex is needed to rebuild some libxl parsers and \ + scanners, please install it and rerun configure) +endif + +ifeq ($(BISON),) +%.c %.h:: %.y + $(warning Bison is needed to rebuild some libxl parsers and \ + scanners, please install it an rerun configure) +endif + LIBXL_LIBS += -lyajl LIBXL_OBJS = flexarray.o libxl.o libxl_create.o libxl_dm.o libxl_pci.o \ @@ -82,11 +94,11 @@ all: $(CLIENTS) libxenlight.so libxenlig $(LIBXL_OBJS) $(LIBXLU_OBJS) $(XL_OBJS): $(AUTOINCS) -%.c %.h: %.y +%.c %.h:: %.y @rm -f $*.[ch] $(BISON) --output=$*.c $< -%.c %.h: %.l +%.c %.h:: %.l @rm -f $*.[ch] $(FLEX) --header-file=$*.h --outfile=$*.c $< _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:11 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBv-0003LM-BB; Mon, 14 May 2012 16:32:11 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBt-0003G6-Uy for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:10 +0000 Received: from [85.158.143.35:7427] by server-3.bemta-4.messagelabs.com id D6/BA-05853-98331BF4; Mon, 14 May 2012 16:32:09 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-21.messagelabs.com!1337013128!12170276!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8809 invoked from network); 14 May 2012 16:32:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBs-0002pl-44 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBs-0006aI-3Q for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:08 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:07 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] x86/mem_sharing: Don't destroy a page's shared state before depleting its tuple list X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Andres Lagar-Cavilla # Date 1335430988 -3600 # Node ID 6ff8e44e8d29ce3bc42a621d660513ab9df19cd8 # Parent 12bc6abfc2649b73d8966c869c207b9e9f67edb0 x86/mem_sharing: Don't destroy a page's shared state before depleting its tuple list Signed-off-by: Andres Lagar-Cavilla Acked-by: Tim Deegan Committed-by: Tim Deegan --- diff -r 12bc6abfc264 -r 6ff8e44e8d29 xen/arch/x86/mm/mem_sharing.c --- a/xen/arch/x86/mm/mem_sharing.c Thu Apr 26 10:03:08 2012 +0100 +++ b/xen/arch/x86/mm/mem_sharing.c Thu Apr 26 10:03:08 2012 +0100 @@ -963,7 +963,9 @@ gfn_found: last_gfn = list_has_one_entry(&page->sharing->gfns); if ( last_gfn ) { - /* Clean up shared state */ + /* Clean up shared state. Get rid of the tuple + * before destroying the rmap. */ + mem_sharing_gfn_destroy(d, gfn_info); audit_del_list(page); page->sharing = NULL; atomic_dec(&nr_shared_mfns); @@ -974,7 +976,8 @@ gfn_found: * (possibly freeing the page), and exit early */ if ( flags & MEM_SHARING_DESTROY_GFN ) { - mem_sharing_gfn_destroy(d, gfn_info); + if ( !last_gfn ) + mem_sharing_gfn_destroy(d, gfn_info); put_page_and_type(page); mem_sharing_page_unlock(page); if ( last_gfn && @@ -987,7 +990,6 @@ gfn_found: if ( last_gfn ) { - mem_sharing_gfn_destroy(d, gfn_info); /* Making a page private atomically unlocks it */ BUG_ON(page_make_private(d, page) != 0); goto private_page_found; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:11 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBv-0003LM-BB; Mon, 14 May 2012 16:32:11 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBt-0003G6-Uy for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:10 +0000 Received: from [85.158.143.35:7427] by server-3.bemta-4.messagelabs.com id D6/BA-05853-98331BF4; Mon, 14 May 2012 16:32:09 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-21.messagelabs.com!1337013128!12170276!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8809 invoked from network); 14 May 2012 16:32:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBs-0002pl-44 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBs-0006aI-3Q for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:08 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:07 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] x86/mem_sharing: Don't destroy a page's shared state before depleting its tuple list X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Andres Lagar-Cavilla # Date 1335430988 -3600 # Node ID 6ff8e44e8d29ce3bc42a621d660513ab9df19cd8 # Parent 12bc6abfc2649b73d8966c869c207b9e9f67edb0 x86/mem_sharing: Don't destroy a page's shared state before depleting its tuple list Signed-off-by: Andres Lagar-Cavilla Acked-by: Tim Deegan Committed-by: Tim Deegan --- diff -r 12bc6abfc264 -r 6ff8e44e8d29 xen/arch/x86/mm/mem_sharing.c --- a/xen/arch/x86/mm/mem_sharing.c Thu Apr 26 10:03:08 2012 +0100 +++ b/xen/arch/x86/mm/mem_sharing.c Thu Apr 26 10:03:08 2012 +0100 @@ -963,7 +963,9 @@ gfn_found: last_gfn = list_has_one_entry(&page->sharing->gfns); if ( last_gfn ) { - /* Clean up shared state */ + /* Clean up shared state. Get rid of the tuple + * before destroying the rmap. */ + mem_sharing_gfn_destroy(d, gfn_info); audit_del_list(page); page->sharing = NULL; atomic_dec(&nr_shared_mfns); @@ -974,7 +976,8 @@ gfn_found: * (possibly freeing the page), and exit early */ if ( flags & MEM_SHARING_DESTROY_GFN ) { - mem_sharing_gfn_destroy(d, gfn_info); + if ( !last_gfn ) + mem_sharing_gfn_destroy(d, gfn_info); put_page_and_type(page); mem_sharing_page_unlock(page); if ( last_gfn && @@ -987,7 +990,6 @@ gfn_found: if ( last_gfn ) { - mem_sharing_gfn_destroy(d, gfn_info); /* Making a page private atomically unlocks it */ BUG_ON(page_make_private(d, page) != 0); goto private_page_found; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:11 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBv-0003Lh-Ds; Mon, 14 May 2012 16:32:11 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBu-0003IG-1g for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:10 +0000 Received: from [85.158.143.99:63061] by server-1.bemta-4.messagelabs.com id 24/98-20925-98331BF4; Mon, 14 May 2012 16:32:09 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-216.messagelabs.com!1337013127!22674431!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 504 invoked from network); 14 May 2012 16:32:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBr-0002pY-3x for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBr-0006Zo-3H for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:07 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:06 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] x86/mm/shadow: don't use locking p2m lookups with the paging lock held. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Tim Deegan # Date 1335430988 -3600 # Node ID e06850161b7f5b90027a9e7e894a61085226e809 # Parent a4e7fce6ee2bd11919db98ca0a3b1f4bcb3c02bd x86/mm/shadow: don't use locking p2m lookups with the paging lock held. The existing interlock between shadow and p2m (where p2m table updates are done under the paging lock) keeps us safe from the p2m changing under our feet, and using the locking lookups is a violation of the locking discipline (which says always to take the p2m lock first). Signed-off-by: Tim Deegan Acked-by: Andres Lagar-Cavilla Committed-by: Tim Deegan --- diff -r a4e7fce6ee2b -r e06850161b7f xen/arch/x86/mm/shadow/common.c --- a/xen/arch/x86/mm/shadow/common.c Wed Apr 25 13:55:26 2012 +0100 +++ b/xen/arch/x86/mm/shadow/common.c Thu Apr 26 10:03:08 2012 +0100 @@ -3676,7 +3676,7 @@ int shadow_track_dirty_vram(struct domai /* Iterate over VRAM to track dirty bits. */ for ( i = 0; i < nr; i++ ) { - mfn_t mfn = get_gfn_query(d, begin_pfn + i, &t); + mfn_t mfn = get_gfn_query_unlocked(d, begin_pfn + i, &t); struct page_info *page; int dirty = 0; paddr_t sl1ma = dirty_vram->sl1ma[i]; @@ -3741,8 +3741,6 @@ int shadow_track_dirty_vram(struct domai } } - put_gfn(d, begin_pfn + i); - if ( dirty ) { dirty_vram->dirty_bitmap[i / 8] |= 1 << (i % 8); diff -r a4e7fce6ee2b -r e06850161b7f xen/arch/x86/mm/shadow/multi.c --- a/xen/arch/x86/mm/shadow/multi.c Wed Apr 25 13:55:26 2012 +0100 +++ b/xen/arch/x86/mm/shadow/multi.c Thu Apr 26 10:03:08 2012 +0100 @@ -2266,7 +2266,7 @@ static int validate_gl4e(struct vcpu *v, if ( guest_l4e_get_flags(new_gl4e) & _PAGE_PRESENT ) { gfn_t gl3gfn = guest_l4e_get_gfn(new_gl4e); - mfn_t gl3mfn = get_gfn_query(d, gl3gfn, &p2mt); + mfn_t gl3mfn = get_gfn_query_unlocked(d, gfn_x(gl3gfn), &p2mt); if ( p2m_is_ram(p2mt) ) sl3mfn = get_shadow_status(v, gl3mfn, SH_type_l3_shadow); else if ( p2mt != p2m_populate_on_demand ) @@ -2276,7 +2276,6 @@ static int validate_gl4e(struct vcpu *v, if ( mfn_valid(sl3mfn) ) shadow_resync_all(v); #endif - put_gfn(d, gfn_x(gl3gfn)); } l4e_propagate_from_guest(v, new_gl4e, sl3mfn, &new_sl4e, ft_prefetch); @@ -2324,7 +2323,7 @@ static int validate_gl3e(struct vcpu *v, if ( guest_l3e_get_flags(new_gl3e) & _PAGE_PRESENT ) { gfn_t gl2gfn = guest_l3e_get_gfn(new_gl3e); - mfn_t gl2mfn = get_gfn_query(v->domain, gl2gfn, &p2mt); + mfn_t gl2mfn = get_gfn_query_unlocked(v->domain, gfn_x(gl2gfn), &p2mt); if ( p2m_is_ram(p2mt) ) sl2mfn = get_shadow_status(v, gl2mfn, SH_type_l2_shadow); else if ( p2mt != p2m_populate_on_demand ) @@ -2334,7 +2333,6 @@ static int validate_gl3e(struct vcpu *v, if ( mfn_valid(sl2mfn) ) shadow_resync_all(v); #endif - put_gfn(v->domain, gfn_x(gl2gfn)); } l3e_propagate_from_guest(v, new_gl3e, sl2mfn, &new_sl3e, ft_prefetch); result |= shadow_set_l3e(v, sl3p, new_sl3e, sl3mfn); @@ -2374,12 +2372,12 @@ static int validate_gl2e(struct vcpu *v, } else { - mfn_t gl1mfn = get_gfn_query(v->domain, gl1gfn, &p2mt); + mfn_t gl1mfn = get_gfn_query_unlocked(v->domain, gfn_x(gl1gfn), + &p2mt); if ( p2m_is_ram(p2mt) ) sl1mfn = get_shadow_status(v, gl1mfn, SH_type_l1_shadow); else if ( p2mt != p2m_populate_on_demand ) result |= SHADOW_SET_ERROR; - put_gfn(v->domain, gfn_x(gl1gfn)); } } l2e_propagate_from_guest(v, new_gl2e, sl1mfn, &new_sl2e, ft_prefetch); @@ -2505,11 +2503,9 @@ void sh_resync_l1(struct vcpu *v, mfn_t shadow_l1e_t nsl1e; gfn = guest_l1e_get_gfn(gl1e); - gmfn = get_gfn_query(v->domain, gfn, &p2mt); + gmfn = get_gfn_query_unlocked(v->domain, gfn_x(gfn), &p2mt); l1e_propagate_from_guest(v, gl1e, gmfn, &nsl1e, ft_prefetch, p2mt); rc |= shadow_set_l1e(v, sl1p, nsl1e, p2mt, sl1mfn); - - put_gfn(v->domain, gfn_x(gfn)); *snpl1p = gl1e; } }); @@ -2830,7 +2826,7 @@ static void sh_prefetch(struct vcpu *v, /* Look at the gfn that the l1e is pointing at */ gfn = guest_l1e_get_gfn(gl1e); - gmfn = get_gfn_query(v->domain, gfn, &p2mt); + gmfn = get_gfn_query_unlocked(v->domain, gfn_x(gfn), &p2mt); /* Propagate the entry. */ l1e_propagate_from_guest(v, gl1e, gmfn, &sl1e, ft_prefetch, p2mt); @@ -2840,8 +2836,6 @@ static void sh_prefetch(struct vcpu *v, if ( snpl1p != NULL ) snpl1p[i] = gl1e; #endif /* OOS */ - - put_gfn(v->domain, gfn_x(gfn)); } if ( gl1p != NULL ) sh_unmap_domain_page(gl1p); @@ -4323,14 +4317,13 @@ sh_update_cr3(struct vcpu *v, int do_loc if ( guest_l3e_get_flags(gl3e[i]) & _PAGE_PRESENT ) { gl2gfn = guest_l3e_get_gfn(gl3e[i]); - gl2mfn = get_gfn_query(d, gl2gfn, &p2mt); + gl2mfn = get_gfn_query_unlocked(d, gfn_x(gl2gfn), &p2mt); if ( p2m_is_ram(p2mt) ) sh_set_toplevel_shadow(v, i, gl2mfn, (i == 3) ? SH_type_l2h_shadow : SH_type_l2_shadow); else sh_set_toplevel_shadow(v, i, _mfn(INVALID_MFN), 0); - put_gfn(d, gfn_x(gl2gfn)); } else sh_set_toplevel_shadow(v, i, _mfn(INVALID_MFN), 0); @@ -4748,9 +4741,8 @@ static void sh_pagetable_dying(struct vc /* retrieving the l2s */ gl2a = guest_l3e_get_paddr(gl3e[i]); gfn = gl2a >> PAGE_SHIFT; - gmfn = get_gfn_query(v->domain, _gfn(gfn), &p2mt); + gmfn = get_gfn_query_unlocked(v->domain, gfn, &p2mt); smfn = shadow_hash_lookup(v, mfn_x(gmfn), SH_type_l2_pae_shadow); - put_gfn(v->domain, gfn); } if ( mfn_valid(smfn) ) diff -r a4e7fce6ee2b -r e06850161b7f xen/include/asm-x86/p2m.h --- a/xen/include/asm-x86/p2m.h Wed Apr 25 13:55:26 2012 +0100 +++ b/xen/include/asm-x86/p2m.h Thu Apr 26 10:03:08 2012 +0100 @@ -360,6 +360,11 @@ void __put_gfn(struct p2m_domain *p2m, u * during a domain crash, or to peek at a p2m entry/type. Caller is not * holding the p2m entry exclusively during or after calling this. * + * This is also used in the shadow code whenever the paging lock is + * held -- in those cases, the caller is protected against concurrent + * p2m updates by the fact that shadow_write_p2m_entry() also takes + * the paging lock. + * * Note that an unlocked accessor only makes sense for a "query" lookup. * Any other type of query can cause a change in the p2m and may need to * perform locking. _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:11 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBv-0003Lh-Ds; Mon, 14 May 2012 16:32:11 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBu-0003IG-1g for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:10 +0000 Received: from [85.158.143.99:63061] by server-1.bemta-4.messagelabs.com id 24/98-20925-98331BF4; Mon, 14 May 2012 16:32:09 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-216.messagelabs.com!1337013127!22674431!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 504 invoked from network); 14 May 2012 16:32:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBr-0002pY-3x for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBr-0006Zo-3H for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:07 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:06 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] x86/mm/shadow: don't use locking p2m lookups with the paging lock held. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Tim Deegan # Date 1335430988 -3600 # Node ID e06850161b7f5b90027a9e7e894a61085226e809 # Parent a4e7fce6ee2bd11919db98ca0a3b1f4bcb3c02bd x86/mm/shadow: don't use locking p2m lookups with the paging lock held. The existing interlock between shadow and p2m (where p2m table updates are done under the paging lock) keeps us safe from the p2m changing under our feet, and using the locking lookups is a violation of the locking discipline (which says always to take the p2m lock first). Signed-off-by: Tim Deegan Acked-by: Andres Lagar-Cavilla Committed-by: Tim Deegan --- diff -r a4e7fce6ee2b -r e06850161b7f xen/arch/x86/mm/shadow/common.c --- a/xen/arch/x86/mm/shadow/common.c Wed Apr 25 13:55:26 2012 +0100 +++ b/xen/arch/x86/mm/shadow/common.c Thu Apr 26 10:03:08 2012 +0100 @@ -3676,7 +3676,7 @@ int shadow_track_dirty_vram(struct domai /* Iterate over VRAM to track dirty bits. */ for ( i = 0; i < nr; i++ ) { - mfn_t mfn = get_gfn_query(d, begin_pfn + i, &t); + mfn_t mfn = get_gfn_query_unlocked(d, begin_pfn + i, &t); struct page_info *page; int dirty = 0; paddr_t sl1ma = dirty_vram->sl1ma[i]; @@ -3741,8 +3741,6 @@ int shadow_track_dirty_vram(struct domai } } - put_gfn(d, begin_pfn + i); - if ( dirty ) { dirty_vram->dirty_bitmap[i / 8] |= 1 << (i % 8); diff -r a4e7fce6ee2b -r e06850161b7f xen/arch/x86/mm/shadow/multi.c --- a/xen/arch/x86/mm/shadow/multi.c Wed Apr 25 13:55:26 2012 +0100 +++ b/xen/arch/x86/mm/shadow/multi.c Thu Apr 26 10:03:08 2012 +0100 @@ -2266,7 +2266,7 @@ static int validate_gl4e(struct vcpu *v, if ( guest_l4e_get_flags(new_gl4e) & _PAGE_PRESENT ) { gfn_t gl3gfn = guest_l4e_get_gfn(new_gl4e); - mfn_t gl3mfn = get_gfn_query(d, gl3gfn, &p2mt); + mfn_t gl3mfn = get_gfn_query_unlocked(d, gfn_x(gl3gfn), &p2mt); if ( p2m_is_ram(p2mt) ) sl3mfn = get_shadow_status(v, gl3mfn, SH_type_l3_shadow); else if ( p2mt != p2m_populate_on_demand ) @@ -2276,7 +2276,6 @@ static int validate_gl4e(struct vcpu *v, if ( mfn_valid(sl3mfn) ) shadow_resync_all(v); #endif - put_gfn(d, gfn_x(gl3gfn)); } l4e_propagate_from_guest(v, new_gl4e, sl3mfn, &new_sl4e, ft_prefetch); @@ -2324,7 +2323,7 @@ static int validate_gl3e(struct vcpu *v, if ( guest_l3e_get_flags(new_gl3e) & _PAGE_PRESENT ) { gfn_t gl2gfn = guest_l3e_get_gfn(new_gl3e); - mfn_t gl2mfn = get_gfn_query(v->domain, gl2gfn, &p2mt); + mfn_t gl2mfn = get_gfn_query_unlocked(v->domain, gfn_x(gl2gfn), &p2mt); if ( p2m_is_ram(p2mt) ) sl2mfn = get_shadow_status(v, gl2mfn, SH_type_l2_shadow); else if ( p2mt != p2m_populate_on_demand ) @@ -2334,7 +2333,6 @@ static int validate_gl3e(struct vcpu *v, if ( mfn_valid(sl2mfn) ) shadow_resync_all(v); #endif - put_gfn(v->domain, gfn_x(gl2gfn)); } l3e_propagate_from_guest(v, new_gl3e, sl2mfn, &new_sl3e, ft_prefetch); result |= shadow_set_l3e(v, sl3p, new_sl3e, sl3mfn); @@ -2374,12 +2372,12 @@ static int validate_gl2e(struct vcpu *v, } else { - mfn_t gl1mfn = get_gfn_query(v->domain, gl1gfn, &p2mt); + mfn_t gl1mfn = get_gfn_query_unlocked(v->domain, gfn_x(gl1gfn), + &p2mt); if ( p2m_is_ram(p2mt) ) sl1mfn = get_shadow_status(v, gl1mfn, SH_type_l1_shadow); else if ( p2mt != p2m_populate_on_demand ) result |= SHADOW_SET_ERROR; - put_gfn(v->domain, gfn_x(gl1gfn)); } } l2e_propagate_from_guest(v, new_gl2e, sl1mfn, &new_sl2e, ft_prefetch); @@ -2505,11 +2503,9 @@ void sh_resync_l1(struct vcpu *v, mfn_t shadow_l1e_t nsl1e; gfn = guest_l1e_get_gfn(gl1e); - gmfn = get_gfn_query(v->domain, gfn, &p2mt); + gmfn = get_gfn_query_unlocked(v->domain, gfn_x(gfn), &p2mt); l1e_propagate_from_guest(v, gl1e, gmfn, &nsl1e, ft_prefetch, p2mt); rc |= shadow_set_l1e(v, sl1p, nsl1e, p2mt, sl1mfn); - - put_gfn(v->domain, gfn_x(gfn)); *snpl1p = gl1e; } }); @@ -2830,7 +2826,7 @@ static void sh_prefetch(struct vcpu *v, /* Look at the gfn that the l1e is pointing at */ gfn = guest_l1e_get_gfn(gl1e); - gmfn = get_gfn_query(v->domain, gfn, &p2mt); + gmfn = get_gfn_query_unlocked(v->domain, gfn_x(gfn), &p2mt); /* Propagate the entry. */ l1e_propagate_from_guest(v, gl1e, gmfn, &sl1e, ft_prefetch, p2mt); @@ -2840,8 +2836,6 @@ static void sh_prefetch(struct vcpu *v, if ( snpl1p != NULL ) snpl1p[i] = gl1e; #endif /* OOS */ - - put_gfn(v->domain, gfn_x(gfn)); } if ( gl1p != NULL ) sh_unmap_domain_page(gl1p); @@ -4323,14 +4317,13 @@ sh_update_cr3(struct vcpu *v, int do_loc if ( guest_l3e_get_flags(gl3e[i]) & _PAGE_PRESENT ) { gl2gfn = guest_l3e_get_gfn(gl3e[i]); - gl2mfn = get_gfn_query(d, gl2gfn, &p2mt); + gl2mfn = get_gfn_query_unlocked(d, gfn_x(gl2gfn), &p2mt); if ( p2m_is_ram(p2mt) ) sh_set_toplevel_shadow(v, i, gl2mfn, (i == 3) ? SH_type_l2h_shadow : SH_type_l2_shadow); else sh_set_toplevel_shadow(v, i, _mfn(INVALID_MFN), 0); - put_gfn(d, gfn_x(gl2gfn)); } else sh_set_toplevel_shadow(v, i, _mfn(INVALID_MFN), 0); @@ -4748,9 +4741,8 @@ static void sh_pagetable_dying(struct vc /* retrieving the l2s */ gl2a = guest_l3e_get_paddr(gl3e[i]); gfn = gl2a >> PAGE_SHIFT; - gmfn = get_gfn_query(v->domain, _gfn(gfn), &p2mt); + gmfn = get_gfn_query_unlocked(v->domain, gfn, &p2mt); smfn = shadow_hash_lookup(v, mfn_x(gmfn), SH_type_l2_pae_shadow); - put_gfn(v->domain, gfn); } if ( mfn_valid(smfn) ) diff -r a4e7fce6ee2b -r e06850161b7f xen/include/asm-x86/p2m.h --- a/xen/include/asm-x86/p2m.h Wed Apr 25 13:55:26 2012 +0100 +++ b/xen/include/asm-x86/p2m.h Thu Apr 26 10:03:08 2012 +0100 @@ -360,6 +360,11 @@ void __put_gfn(struct p2m_domain *p2m, u * during a domain crash, or to peek at a p2m entry/type. Caller is not * holding the p2m entry exclusively during or after calling this. * + * This is also used in the shadow code whenever the paging lock is + * held -- in those cases, the caller is protected against concurrent + * p2m updates by the fact that shadow_write_p2m_entry() also takes + * the paging lock. + * * Note that an unlocked accessor only makes sense for a "query" lookup. * Any other type of query can cause a change in the p2m and may need to * perform locking. _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:11 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBv-0003Lw-HR; Mon, 14 May 2012 16:32:11 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBu-0003IJ-66 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:10 +0000 Received: from [85.158.139.83:15563] by server-12.bemta-5.messagelabs.com id 6E/72-01344-98331BF4; Mon, 14 May 2012 16:32:09 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-182.messagelabs.com!1337013126!28326048!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4188 invoked from network); 14 May 2012 16:32:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBp-0002pJ-Ip for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBp-0006Z5-IC for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:05 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:05 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] svm: Do not intercept RDTSC(P) when TSC scaling is supported by hardware X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Boris Ostrovsky # Date 1335358394 -3600 # Node ID ed9c557f8a35a6deb7e6df0679f24a2121fd1172 # Parent 7ba11d9b1d23633b5c42fadddad17b6dcb686141 svm: Do not intercept RDTSC(P) when TSC scaling is supported by hardware When running in TSC_MODE_ALWAYS_EMULATE mode on processors that support TSC scaling we don't need to intercept RDTSC/RDTSCP instructions. Signed-off-by: Boris Ostrovsky Acked-by: Wei Huang Tested-by: Wei Huang Committed-by: Keir Fraser --- diff -r 7ba11d9b1d23 -r ed9c557f8a35 xen/arch/x86/hvm/svm/svm.c --- a/xen/arch/x86/hvm/svm/svm.c Wed Apr 25 12:00:08 2012 +0100 +++ b/xen/arch/x86/hvm/svm/svm.c Wed Apr 25 13:53:14 2012 +0100 @@ -724,12 +724,19 @@ static void svm_set_rdtsc_exiting(struct { struct vmcb_struct *vmcb = v->arch.hvm_svm.vmcb; u32 general1_intercepts = vmcb_get_general1_intercepts(vmcb); + u32 general2_intercepts = vmcb_get_general2_intercepts(vmcb); general1_intercepts &= ~GENERAL1_INTERCEPT_RDTSC; - if ( enable ) + general2_intercepts &= ~GENERAL2_INTERCEPT_RDTSCP; + + if ( enable && !cpu_has_tsc_ratio ) + { general1_intercepts |= GENERAL1_INTERCEPT_RDTSC; + general2_intercepts |= GENERAL2_INTERCEPT_RDTSCP; + } vmcb_set_general1_intercepts(vmcb, general1_intercepts); + vmcb_set_general2_intercepts(vmcb, general2_intercepts); } static unsigned int svm_get_insn_bytes(struct vcpu *v, uint8_t *buf) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:11 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBv-0003Lw-HR; Mon, 14 May 2012 16:32:11 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBu-0003IJ-66 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:10 +0000 Received: from [85.158.139.83:15563] by server-12.bemta-5.messagelabs.com id 6E/72-01344-98331BF4; Mon, 14 May 2012 16:32:09 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-182.messagelabs.com!1337013126!28326048!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4188 invoked from network); 14 May 2012 16:32:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBp-0002pJ-Ip for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBp-0006Z5-IC for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:05 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:05 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] svm: Do not intercept RDTSC(P) when TSC scaling is supported by hardware X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Boris Ostrovsky # Date 1335358394 -3600 # Node ID ed9c557f8a35a6deb7e6df0679f24a2121fd1172 # Parent 7ba11d9b1d23633b5c42fadddad17b6dcb686141 svm: Do not intercept RDTSC(P) when TSC scaling is supported by hardware When running in TSC_MODE_ALWAYS_EMULATE mode on processors that support TSC scaling we don't need to intercept RDTSC/RDTSCP instructions. Signed-off-by: Boris Ostrovsky Acked-by: Wei Huang Tested-by: Wei Huang Committed-by: Keir Fraser --- diff -r 7ba11d9b1d23 -r ed9c557f8a35 xen/arch/x86/hvm/svm/svm.c --- a/xen/arch/x86/hvm/svm/svm.c Wed Apr 25 12:00:08 2012 +0100 +++ b/xen/arch/x86/hvm/svm/svm.c Wed Apr 25 13:53:14 2012 +0100 @@ -724,12 +724,19 @@ static void svm_set_rdtsc_exiting(struct { struct vmcb_struct *vmcb = v->arch.hvm_svm.vmcb; u32 general1_intercepts = vmcb_get_general1_intercepts(vmcb); + u32 general2_intercepts = vmcb_get_general2_intercepts(vmcb); general1_intercepts &= ~GENERAL1_INTERCEPT_RDTSC; - if ( enable ) + general2_intercepts &= ~GENERAL2_INTERCEPT_RDTSCP; + + if ( enable && !cpu_has_tsc_ratio ) + { general1_intercepts |= GENERAL1_INTERCEPT_RDTSC; + general2_intercepts |= GENERAL2_INTERCEPT_RDTSCP; + } vmcb_set_general1_intercepts(vmcb, general1_intercepts); + vmcb_set_general2_intercepts(vmcb, general2_intercepts); } static unsigned int svm_get_insn_bytes(struct vcpu *v, uint8_t *buf) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:12 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBw-0003OU-KX; Mon, 14 May 2012 16:32:12 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBu-0003G6-BP for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:10 +0000 Received: from [85.158.143.99:63073] by server-3.bemta-4.messagelabs.com id 66/BA-05853-98331BF4; Mon, 14 May 2012 16:32:09 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-216.messagelabs.com!1337013127!27057093!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3363 invoked from network); 14 May 2012 16:32:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBr-0002pg-KJ for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBr-0006a3-Jb for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:07 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:07 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] x86/mem_sharing: Fix saved mfns stat for failed unsharing X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Andres Lagar-Cavilla # Date 1335430988 -3600 # Node ID 12bc6abfc2649b73d8966c869c207b9e9f67edb0 # Parent e06850161b7f5b90027a9e7e894a61085226e809 x86/mem_sharing: Fix saved mfns stat for failed unsharing If unsharing fails, the decrease of the nr_saved_mfns stat was not being undone. This would result in an underflow of the stat, as the retry would later decrease the counter again. Signed-off-by: Andres Lagar-Cavilla Acked-by: Tim Deegan Committed-by: Tim Deegan --- diff -r e06850161b7f -r 12bc6abfc264 xen/arch/x86/mm/mem_sharing.c --- a/xen/arch/x86/mm/mem_sharing.c Thu Apr 26 10:03:08 2012 +0100 +++ b/xen/arch/x86/mm/mem_sharing.c Thu Apr 26 10:03:08 2012 +0100 @@ -997,6 +997,8 @@ gfn_found: page = alloc_domheap_page(d, 0); if ( !page ) { + /* Undo dec of nr_saved_mfns, as the retry will decrease again. */ + atomic_inc(&nr_saved_mfns); mem_sharing_page_unlock(old_page); put_gfn(d, gfn); /* Caller is responsible for placing an event _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:12 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBw-0003OU-KX; Mon, 14 May 2012 16:32:12 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBu-0003G6-BP for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:10 +0000 Received: from [85.158.143.99:63073] by server-3.bemta-4.messagelabs.com id 66/BA-05853-98331BF4; Mon, 14 May 2012 16:32:09 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-216.messagelabs.com!1337013127!27057093!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3363 invoked from network); 14 May 2012 16:32:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBr-0002pg-KJ for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBr-0006a3-Jb for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:07 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:07 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] x86/mem_sharing: Fix saved mfns stat for failed unsharing X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Andres Lagar-Cavilla # Date 1335430988 -3600 # Node ID 12bc6abfc2649b73d8966c869c207b9e9f67edb0 # Parent e06850161b7f5b90027a9e7e894a61085226e809 x86/mem_sharing: Fix saved mfns stat for failed unsharing If unsharing fails, the decrease of the nr_saved_mfns stat was not being undone. This would result in an underflow of the stat, as the retry would later decrease the counter again. Signed-off-by: Andres Lagar-Cavilla Acked-by: Tim Deegan Committed-by: Tim Deegan --- diff -r e06850161b7f -r 12bc6abfc264 xen/arch/x86/mm/mem_sharing.c --- a/xen/arch/x86/mm/mem_sharing.c Thu Apr 26 10:03:08 2012 +0100 +++ b/xen/arch/x86/mm/mem_sharing.c Thu Apr 26 10:03:08 2012 +0100 @@ -997,6 +997,8 @@ gfn_found: page = alloc_domheap_page(d, 0); if ( !page ) { + /* Undo dec of nr_saved_mfns, as the retry will decrease again. */ + atomic_inc(&nr_saved_mfns); mem_sharing_page_unlock(old_page); put_gfn(d, gfn); /* Caller is responsible for placing an event _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:12 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBw-0003Of-N5; Mon, 14 May 2012 16:32:12 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBu-0003Jk-T0 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:11 +0000 Received: from [85.158.139.83:15637] by server-5.bemta-5.messagelabs.com id A9/C1-13566-A8331BF4; Mon, 14 May 2012 16:32:10 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-182.messagelabs.com!1337013126!20999960!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13524 invoked from network); 14 May 2012 16:32:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBq-0002pM-38 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBq-0006ZK-2S for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:06 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:05 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] vvmx: fix instruction decode segment limit check X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Jan Beulich # Date 1335358476 -3600 # Node ID 7883b6dea8f82c236ab09ce311c1692dd1d31fc7 # Parent ed9c557f8a35a6deb7e6df0679f24a2121fd1172 vvmx: fix instruction decode segment limit check - no limit check for 64-bit mode (and GS: is not special in any way) - limit check is needed in compatibility mode - canonical address check should instead be performed for 64-bit mode - the last accessed byte must be within limits, not the first byte - past the accessed range - segment base address should be ignored for 64-bit mode unless FS: or GS: is in use Signed-off-by: Jan Beulich Acked-by: Tim Deegan Committed-by: Keir Fraser --- diff -r ed9c557f8a35 -r 7883b6dea8f8 xen/arch/x86/hvm/vmx/vvmx.c --- a/xen/arch/x86/hvm/vmx/vvmx.c Wed Apr 25 13:53:14 2012 +0100 +++ b/xen/arch/x86/hvm/vmx/vvmx.c Wed Apr 25 13:54:36 2012 +0100 @@ -336,8 +336,17 @@ static int decode_vmx_inst(struct cpu_us } else { + bool_t mode_64bit = 0; + decode->type = VMX_INST_MEMREG_TYPE_MEMORY; - if ( info.fields.segment > 5 ) + + if ( hvm_long_mode_enabled(v) ) + { + hvm_get_segment_register(v, x86_seg_cs, &seg); + mode_64bit = seg.attr.fields.l; + } + + if ( info.fields.segment > VMX_SREG_GS ) goto gp_fault; hvm_get_segment_register(v, sreg_to_index[info.fields.segment], &seg); seg_base = seg.base; @@ -355,15 +364,20 @@ static int decode_vmx_inst(struct cpu_us size = 1 << (info.fields.addr_size + 1); offset = base + index * scale + disp; - if ( (offset > seg.limit || offset + size > seg.limit) && - (!hvm_long_mode_enabled(v) || info.fields.segment == VMX_SREG_GS) ) + base = !mode_64bit || info.fields.segment >= VMX_SREG_FS ? + seg_base + offset : offset; + if ( offset + size - 1 < offset || + (mode_64bit ? + !is_canonical_address((long)base < 0 ? base : + base + size - 1) : + offset + size - 1 > seg.limit) ) goto gp_fault; if ( poperandS != NULL && - hvm_copy_from_guest_virt(poperandS, seg_base + offset, size, 0) + hvm_copy_from_guest_virt(poperandS, base, size, 0) != HVMCOPY_okay ) return X86EMUL_EXCEPTION; - decode->mem = seg_base + offset; + decode->mem = base; decode->len = size; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:12 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBw-0003Of-N5; Mon, 14 May 2012 16:32:12 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBu-0003Jk-T0 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:11 +0000 Received: from [85.158.139.83:15637] by server-5.bemta-5.messagelabs.com id A9/C1-13566-A8331BF4; Mon, 14 May 2012 16:32:10 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-182.messagelabs.com!1337013126!20999960!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13524 invoked from network); 14 May 2012 16:32:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBq-0002pM-38 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBq-0006ZK-2S for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:06 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:05 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] vvmx: fix instruction decode segment limit check X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Jan Beulich # Date 1335358476 -3600 # Node ID 7883b6dea8f82c236ab09ce311c1692dd1d31fc7 # Parent ed9c557f8a35a6deb7e6df0679f24a2121fd1172 vvmx: fix instruction decode segment limit check - no limit check for 64-bit mode (and GS: is not special in any way) - limit check is needed in compatibility mode - canonical address check should instead be performed for 64-bit mode - the last accessed byte must be within limits, not the first byte - past the accessed range - segment base address should be ignored for 64-bit mode unless FS: or GS: is in use Signed-off-by: Jan Beulich Acked-by: Tim Deegan Committed-by: Keir Fraser --- diff -r ed9c557f8a35 -r 7883b6dea8f8 xen/arch/x86/hvm/vmx/vvmx.c --- a/xen/arch/x86/hvm/vmx/vvmx.c Wed Apr 25 13:53:14 2012 +0100 +++ b/xen/arch/x86/hvm/vmx/vvmx.c Wed Apr 25 13:54:36 2012 +0100 @@ -336,8 +336,17 @@ static int decode_vmx_inst(struct cpu_us } else { + bool_t mode_64bit = 0; + decode->type = VMX_INST_MEMREG_TYPE_MEMORY; - if ( info.fields.segment > 5 ) + + if ( hvm_long_mode_enabled(v) ) + { + hvm_get_segment_register(v, x86_seg_cs, &seg); + mode_64bit = seg.attr.fields.l; + } + + if ( info.fields.segment > VMX_SREG_GS ) goto gp_fault; hvm_get_segment_register(v, sreg_to_index[info.fields.segment], &seg); seg_base = seg.base; @@ -355,15 +364,20 @@ static int decode_vmx_inst(struct cpu_us size = 1 << (info.fields.addr_size + 1); offset = base + index * scale + disp; - if ( (offset > seg.limit || offset + size > seg.limit) && - (!hvm_long_mode_enabled(v) || info.fields.segment == VMX_SREG_GS) ) + base = !mode_64bit || info.fields.segment >= VMX_SREG_FS ? + seg_base + offset : offset; + if ( offset + size - 1 < offset || + (mode_64bit ? + !is_canonical_address((long)base < 0 ? base : + base + size - 1) : + offset + size - 1 > seg.limit) ) goto gp_fault; if ( poperandS != NULL && - hvm_copy_from_guest_virt(poperandS, seg_base + offset, size, 0) + hvm_copy_from_guest_virt(poperandS, base, size, 0) != HVMCOPY_okay ) return X86EMUL_EXCEPTION; - decode->mem = seg_base + offset; + decode->mem = base; decode->len = size; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:13 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBw-0003PR-Ul; Mon, 14 May 2012 16:32:12 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBv-0003G6-Kk for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:11 +0000 Received: from [85.158.143.35:50325] by server-3.bemta-4.messagelabs.com id 70/CA-05853-B8331BF4; Mon, 14 May 2012 16:32:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-21.messagelabs.com!1337013129!12826299!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27520 invoked from network); 14 May 2012 16:32:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBt-0002pw-Ls for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBt-0006b1-LE for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:09 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:09 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] x86/hvm: Add get_shadow_gs_base() wrapper function X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Aravindh Puthiyaparambil # Date 1335542040 -7200 # Node ID fd04ba0aa4fa6e06b58f9c3ed4e1cd3830459bc6 # Parent 107285938c50f82667bd4d014820b439a077c22c x86/hvm: Add get_shadow_gs_base() wrapper function Add a wrapper function to the HVM function table that returns the shadow GS base. Signed-off-by: Aravindh Puthiyaparambil Committed-by: Jan Beulich --- diff -r 107285938c50 -r fd04ba0aa4fa xen/arch/x86/hvm/svm/svm.c --- a/xen/arch/x86/hvm/svm/svm.c Thu Apr 26 10:03:08 2012 +0100 +++ b/xen/arch/x86/hvm/svm/svm.c Fri Apr 27 17:54:00 2012 +0200 @@ -645,6 +645,11 @@ static void svm_set_segment_register(str svm_vmload(vmcb); } +static unsigned long svm_get_shadow_gs_base(struct vcpu *v) +{ + return v->arch.hvm_svm.vmcb->kerngsbase; +} + static int svm_set_guest_pat(struct vcpu *v, u64 gpat) { struct vmcb_struct *vmcb = v->arch.hvm_svm.vmcb; @@ -1990,6 +1995,7 @@ static struct hvm_function_table __read_ .guest_x86_mode = svm_guest_x86_mode, .get_segment_register = svm_get_segment_register, .set_segment_register = svm_set_segment_register, + .get_shadow_gs_base = svm_get_shadow_gs_base, .update_host_cr3 = svm_update_host_cr3, .update_guest_cr = svm_update_guest_cr, .update_guest_efer = svm_update_guest_efer, diff -r 107285938c50 -r fd04ba0aa4fa xen/arch/x86/hvm/vmx/vmx.c --- a/xen/arch/x86/hvm/vmx/vmx.c Thu Apr 26 10:03:08 2012 +0100 +++ b/xen/arch/x86/hvm/vmx/vmx.c Fri Apr 27 17:54:00 2012 +0200 @@ -942,6 +942,15 @@ static void vmx_set_segment_register(str vmx_vmcs_exit(v); } +static unsigned long vmx_get_shadow_gs_base(struct vcpu *v) +{ +#ifdef __x86_64__ + return v->arch.hvm_vmx.shadow_gs; +#else + return 0; +#endif +} + static int vmx_set_guest_pat(struct vcpu *v, u64 gpat) { if ( !cpu_has_vmx_pat || !paging_mode_hap(v->domain) ) @@ -1522,6 +1531,7 @@ static struct hvm_function_table __read_ .guest_x86_mode = vmx_guest_x86_mode, .get_segment_register = vmx_get_segment_register, .set_segment_register = vmx_set_segment_register, + .get_shadow_gs_base = vmx_get_shadow_gs_base, .update_host_cr3 = vmx_update_host_cr3, .update_guest_cr = vmx_update_guest_cr, .update_guest_efer = vmx_update_guest_efer, diff -r 107285938c50 -r fd04ba0aa4fa xen/include/asm-x86/hvm/hvm.h --- a/xen/include/asm-x86/hvm/hvm.h Thu Apr 26 10:03:08 2012 +0100 +++ b/xen/include/asm-x86/hvm/hvm.h Fri Apr 27 17:54:00 2012 +0200 @@ -106,6 +106,7 @@ struct hvm_function_table { struct segment_register *reg); void (*set_segment_register)(struct vcpu *v, enum x86_segment seg, struct segment_register *reg); + unsigned long (*get_shadow_gs_base)(struct vcpu *v); /* * Re-set the value of CR3 that Xen runs on when handling VM exits. @@ -305,6 +306,11 @@ hvm_set_segment_register(struct vcpu *v, hvm_funcs.set_segment_register(v, seg, reg); } +static inline unsigned long hvm_get_shadow_gs_base(struct vcpu *v) +{ + return hvm_funcs.get_shadow_gs_base(v); +} + #define is_viridian_domain(_d) \ (is_hvm_domain(_d) && ((_d)->arch.hvm_domain.params[HVM_PARAM_VIRIDIAN])) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:13 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBw-0003PR-Ul; Mon, 14 May 2012 16:32:12 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBv-0003G6-Kk for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:11 +0000 Received: from [85.158.143.35:50325] by server-3.bemta-4.messagelabs.com id 70/CA-05853-B8331BF4; Mon, 14 May 2012 16:32:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-21.messagelabs.com!1337013129!12826299!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27520 invoked from network); 14 May 2012 16:32:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBt-0002pw-Ls for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBt-0006b1-LE for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:09 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:09 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] x86/hvm: Add get_shadow_gs_base() wrapper function X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Aravindh Puthiyaparambil # Date 1335542040 -7200 # Node ID fd04ba0aa4fa6e06b58f9c3ed4e1cd3830459bc6 # Parent 107285938c50f82667bd4d014820b439a077c22c x86/hvm: Add get_shadow_gs_base() wrapper function Add a wrapper function to the HVM function table that returns the shadow GS base. Signed-off-by: Aravindh Puthiyaparambil Committed-by: Jan Beulich --- diff -r 107285938c50 -r fd04ba0aa4fa xen/arch/x86/hvm/svm/svm.c --- a/xen/arch/x86/hvm/svm/svm.c Thu Apr 26 10:03:08 2012 +0100 +++ b/xen/arch/x86/hvm/svm/svm.c Fri Apr 27 17:54:00 2012 +0200 @@ -645,6 +645,11 @@ static void svm_set_segment_register(str svm_vmload(vmcb); } +static unsigned long svm_get_shadow_gs_base(struct vcpu *v) +{ + return v->arch.hvm_svm.vmcb->kerngsbase; +} + static int svm_set_guest_pat(struct vcpu *v, u64 gpat) { struct vmcb_struct *vmcb = v->arch.hvm_svm.vmcb; @@ -1990,6 +1995,7 @@ static struct hvm_function_table __read_ .guest_x86_mode = svm_guest_x86_mode, .get_segment_register = svm_get_segment_register, .set_segment_register = svm_set_segment_register, + .get_shadow_gs_base = svm_get_shadow_gs_base, .update_host_cr3 = svm_update_host_cr3, .update_guest_cr = svm_update_guest_cr, .update_guest_efer = svm_update_guest_efer, diff -r 107285938c50 -r fd04ba0aa4fa xen/arch/x86/hvm/vmx/vmx.c --- a/xen/arch/x86/hvm/vmx/vmx.c Thu Apr 26 10:03:08 2012 +0100 +++ b/xen/arch/x86/hvm/vmx/vmx.c Fri Apr 27 17:54:00 2012 +0200 @@ -942,6 +942,15 @@ static void vmx_set_segment_register(str vmx_vmcs_exit(v); } +static unsigned long vmx_get_shadow_gs_base(struct vcpu *v) +{ +#ifdef __x86_64__ + return v->arch.hvm_vmx.shadow_gs; +#else + return 0; +#endif +} + static int vmx_set_guest_pat(struct vcpu *v, u64 gpat) { if ( !cpu_has_vmx_pat || !paging_mode_hap(v->domain) ) @@ -1522,6 +1531,7 @@ static struct hvm_function_table __read_ .guest_x86_mode = vmx_guest_x86_mode, .get_segment_register = vmx_get_segment_register, .set_segment_register = vmx_set_segment_register, + .get_shadow_gs_base = vmx_get_shadow_gs_base, .update_host_cr3 = vmx_update_host_cr3, .update_guest_cr = vmx_update_guest_cr, .update_guest_efer = vmx_update_guest_efer, diff -r 107285938c50 -r fd04ba0aa4fa xen/include/asm-x86/hvm/hvm.h --- a/xen/include/asm-x86/hvm/hvm.h Thu Apr 26 10:03:08 2012 +0100 +++ b/xen/include/asm-x86/hvm/hvm.h Fri Apr 27 17:54:00 2012 +0200 @@ -106,6 +106,7 @@ struct hvm_function_table { struct segment_register *reg); void (*set_segment_register)(struct vcpu *v, enum x86_segment seg, struct segment_register *reg); + unsigned long (*get_shadow_gs_base)(struct vcpu *v); /* * Re-set the value of CR3 that Xen runs on when handling VM exits. @@ -305,6 +306,11 @@ hvm_set_segment_register(struct vcpu *v, hvm_funcs.set_segment_register(v, seg, reg); } +static inline unsigned long hvm_get_shadow_gs_base(struct vcpu *v) +{ + return hvm_funcs.get_shadow_gs_base(v); +} + #define is_viridian_domain(_d) \ (is_hvm_domain(_d) && ((_d)->arch.hvm_domain.params[HVM_PARAM_VIRIDIAN])) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:15 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBz-0003Tu-4p; Mon, 14 May 2012 16:32:15 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBw-0003G6-JD for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:12 +0000 Received: from [85.158.143.99:59373] by server-3.bemta-4.messagelabs.com id 74/CA-05853-C8331BF4; Mon, 14 May 2012 16:32:12 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-216.messagelabs.com!1337013130!22632784!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8572 invoked from network); 14 May 2012 16:32:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBu-0002q8-5t for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBu-0006bG-5G for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:10 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:09 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] x86: Add FS and GS base to HVM VCPU context X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Aravindh Puthiyaparambil # Date 1335542275 -7200 # Node ID 9dda0efd8ce153049579a364974f50294702ffd2 # Parent fd04ba0aa4fa6e06b58f9c3ed4e1cd3830459bc6 x86: Add FS and GS base to HVM VCPU context Add FS and GS base to the HVM VCPU context returned by xc_vcpu_getcontext(). Signed-off-by: Aravindh Puthiyaparambil Committed-by: Jan Beulich --- diff -r fd04ba0aa4fa -r 9dda0efd8ce1 xen/arch/x86/domctl.c --- a/xen/arch/x86/domctl.c Fri Apr 27 17:54:00 2012 +0200 +++ b/xen/arch/x86/domctl.c Fri Apr 27 17:57:55 2012 +0200 @@ -1590,8 +1590,23 @@ void arch_get_info_guest(struct vcpu *v, c.nat->user_regs.es = sreg.sel; hvm_get_segment_register(v, x86_seg_fs, &sreg); c.nat->user_regs.fs = sreg.sel; +#ifdef __x86_64__ + c.nat->fs_base = sreg.base; +#endif hvm_get_segment_register(v, x86_seg_gs, &sreg); c.nat->user_regs.gs = sreg.sel; +#ifdef __x86_64__ + if ( ring_0(&c.nat->user_regs) ) + { + c.nat->gs_base_kernel = sreg.base; + c.nat->gs_base_user = hvm_get_shadow_gs_base(v); + } + else + { + c.nat->gs_base_user = sreg.base; + c.nat->gs_base_kernel = hvm_get_shadow_gs_base(v); + } +#endif } else { _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:15 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBz-0003Tu-4p; Mon, 14 May 2012 16:32:15 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBw-0003G6-JD for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:12 +0000 Received: from [85.158.143.99:59373] by server-3.bemta-4.messagelabs.com id 74/CA-05853-C8331BF4; Mon, 14 May 2012 16:32:12 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-216.messagelabs.com!1337013130!22632784!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8572 invoked from network); 14 May 2012 16:32:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBu-0002q8-5t for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBu-0006bG-5G for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:10 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:09 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] x86: Add FS and GS base to HVM VCPU context X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Aravindh Puthiyaparambil # Date 1335542275 -7200 # Node ID 9dda0efd8ce153049579a364974f50294702ffd2 # Parent fd04ba0aa4fa6e06b58f9c3ed4e1cd3830459bc6 x86: Add FS and GS base to HVM VCPU context Add FS and GS base to the HVM VCPU context returned by xc_vcpu_getcontext(). Signed-off-by: Aravindh Puthiyaparambil Committed-by: Jan Beulich --- diff -r fd04ba0aa4fa -r 9dda0efd8ce1 xen/arch/x86/domctl.c --- a/xen/arch/x86/domctl.c Fri Apr 27 17:54:00 2012 +0200 +++ b/xen/arch/x86/domctl.c Fri Apr 27 17:57:55 2012 +0200 @@ -1590,8 +1590,23 @@ void arch_get_info_guest(struct vcpu *v, c.nat->user_regs.es = sreg.sel; hvm_get_segment_register(v, x86_seg_fs, &sreg); c.nat->user_regs.fs = sreg.sel; +#ifdef __x86_64__ + c.nat->fs_base = sreg.base; +#endif hvm_get_segment_register(v, x86_seg_gs, &sreg); c.nat->user_regs.gs = sreg.sel; +#ifdef __x86_64__ + if ( ring_0(&c.nat->user_regs) ) + { + c.nat->gs_base_kernel = sreg.base; + c.nat->gs_base_user = hvm_get_shadow_gs_base(v); + } + else + { + c.nat->gs_base_user = sreg.base; + c.nat->gs_base_kernel = hvm_get_shadow_gs_base(v); + } +#endif } else { _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:15 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBz-0003U7-8c; Mon, 14 May 2012 16:32:15 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBx-0003OL-12 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:13 +0000 Received: from [85.158.138.51:30019] by server-11.bemta-3.messagelabs.com id 6A/D8-18894-C8331BF4; Mon, 14 May 2012 16:32:12 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-174.messagelabs.com!1337013129!27110153!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4491 invoked from network); 14 May 2012 16:32:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBs-0002po-KC for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBs-0006aX-JW for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:08 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] x86/mem_sharing: modularize reverse map for shared frames X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Andres Lagar-Cavilla # Date 1335430988 -3600 # Node ID f3a39aeb3a227b9177167a7a2e9dcec763ead26b # Parent 6ff8e44e8d29ce3bc42a621d660513ab9df19cd8 x86/mem_sharing: modularize reverse map for shared frames Each shared frame maintains a reverse map of tuples, so we know which tuples this shared frame is backing. This is useful for auditing and sanity-checking, and necessary to update all relevant p2m entries when sharing. The reverse map is maintained as a doubly linked list, but the interface is open-coded throughout the mem_sharing.c subsystem. Bury it inside a level of abstraction, so it can later support different (more scalable) rmap implementations. Signed-off-by: Andres Lagar-Cavilla Acked-by: Tim Deegan Committed-by: Tim Deegan --- diff -r 6ff8e44e8d29 -r f3a39aeb3a22 xen/arch/x86/mm/mem_sharing.c --- a/xen/arch/x86/mm/mem_sharing.c Thu Apr 26 10:03:08 2012 +0100 +++ b/xen/arch/x86/mm/mem_sharing.c Thu Apr 26 10:03:08 2012 +0100 @@ -69,7 +69,8 @@ static inline void audit_add_list(struct spin_unlock(&shr_audit_lock); } -static inline void audit_del_list(struct page_info *page) +/* Removes from the audit list and cleans up the page sharing metadata. */ +static inline void page_sharing_dispose(struct page_info *page) { spin_lock(&shr_audit_lock); list_del_rcu(&page->sharing->entry); @@ -86,7 +87,7 @@ int mem_sharing_audit(void) } #define audit_add_list(p) ((void)0) -static inline void audit_del_list(struct page_info *page) +static inline void page_sharing_dispose(struct page_info *page) { xfree(page->sharing); } @@ -143,6 +144,7 @@ static inline shr_handle_t get_next_hand static atomic_t nr_saved_mfns = ATOMIC_INIT(0); static atomic_t nr_shared_mfns = ATOMIC_INIT(0); +/** Reverse map **/ typedef struct gfn_info { unsigned long gfn; @@ -150,15 +152,77 @@ typedef struct gfn_info struct list_head list; } gfn_info_t; -/* Returns true if list has only one entry. O(1) complexity. */ -static inline int list_has_one_entry(struct list_head *head) +static inline void +rmap_init(struct page_info *page) { + INIT_LIST_HEAD(&page->sharing->gfns); +} + +static inline void +rmap_del(gfn_info_t *gfn_info, struct page_info *page) +{ + list_del(&gfn_info->list); +} + +static inline void +rmap_add(gfn_info_t *gfn_info, struct page_info *page) +{ + INIT_LIST_HEAD(&gfn_info->list); + list_add(&gfn_info->list, &page->sharing->gfns); +} + +static inline gfn_info_t * +rmap_retrieve(uint16_t domain_id, unsigned long gfn, + struct page_info *page) +{ + gfn_info_t *gfn_info; + struct list_head *le; + list_for_each(le, &page->sharing->gfns) + { + gfn_info = list_entry(le, gfn_info_t, list); + if ( (gfn_info->gfn == gfn) && (gfn_info->domain == domain_id) ) + return gfn_info; + } + return NULL; +} + +/* Returns true if the rmap has only one entry. O(1) complexity. */ +static inline int rmap_has_one_entry(struct page_info *page) +{ + struct list_head *head = &page->sharing->gfns; return (head->next != head) && (head->next->next == head); } -static inline gfn_info_t *gfn_get_info(struct list_head *list) +/* Returns true if the rmap has any entries. O(1) complexity. */ +static inline int rmap_has_entries(struct page_info *page) { - return list_entry(list->next, gfn_info_t, list); + return (!list_empty(&page->sharing->gfns)); +} + +/* The iterator hides the details of how the rmap is implemented. This + * involves splitting the list_for_each_safe macro into two steps. */ +struct rmap_iterator { + struct list_head *curr; + struct list_head *next; +}; + +static inline void +rmap_seed_iterator(struct page_info *page, struct rmap_iterator *ri) +{ + ri->curr = &page->sharing->gfns; + ri->next = ri->curr->next; +} + +static inline gfn_info_t * +rmap_iterate(struct page_info *page, struct rmap_iterator *ri) +{ + if ( ri->next == &page->sharing->gfns) + return NULL; + + ri->curr = ri->next; + ri->next = ri->curr->next; + + return list_entry(ri->curr, gfn_info_t, list); } static inline gfn_info_t *mem_sharing_gfn_alloc(struct page_info *page, @@ -172,8 +236,8 @@ static inline gfn_info_t *mem_sharing_gf gfn_info->gfn = gfn; gfn_info->domain = d->domain_id; - INIT_LIST_HEAD(&gfn_info->list); - list_add(&gfn_info->list, &page->sharing->gfns); + + rmap_add(gfn_info, page); /* Increment our number of shared pges. */ atomic_inc(&d->shr_pages); @@ -181,14 +245,15 @@ static inline gfn_info_t *mem_sharing_gf return gfn_info; } -static inline void mem_sharing_gfn_destroy(struct domain *d, +static inline void mem_sharing_gfn_destroy(struct page_info *page, + struct domain *d, gfn_info_t *gfn_info) { /* Decrement the number of pages. */ atomic_dec(&d->shr_pages); /* Free the gfn_info structure. */ - list_del(&gfn_info->list); + rmap_del(gfn_info, page); xfree(gfn_info); } @@ -230,8 +295,9 @@ int mem_sharing_audit(void) struct page_sharing_info *pg_shared_info; unsigned long nr_gfns = 0; struct page_info *pg; - struct list_head *le; mfn_t mfn; + gfn_info_t *g; + struct rmap_iterator ri; pg_shared_info = list_entry(ae, struct page_sharing_info, entry); pg = pg_shared_info->pg; @@ -272,7 +338,7 @@ int mem_sharing_audit(void) } /* Check we have a list */ - if ( (!pg->sharing) || (list_empty(&pg->sharing->gfns)) ) + if ( (!pg->sharing) || !rmap_has_entries(pg) ) { MEM_SHARING_DEBUG("mfn %lx shared, but empty gfn list!\n", mfn_x(mfn)); @@ -284,14 +350,13 @@ int mem_sharing_audit(void) count_found++; /* Check if all GFNs map to the MFN, and the p2m types */ - list_for_each(le, &pg->sharing->gfns) + rmap_seed_iterator(pg, &ri); + while ( (g = rmap_iterate(pg, &ri)) != NULL ) { struct domain *d; p2m_type_t t; mfn_t o_mfn; - gfn_info_t *g; - g = list_entry(le, gfn_info_t, list); d = get_domain_by_id(g->domain); if ( d == NULL ) { @@ -677,7 +742,7 @@ int mem_sharing_nominate_page(struct dom goto out; } page->sharing->pg = page; - INIT_LIST_HEAD(&page->sharing->gfns); + rmap_init(page); /* Create the handle */ page->sharing->handle = get_next_handle(); @@ -698,7 +763,7 @@ int mem_sharing_nominate_page(struct dom * it a few lines above. * The mfn needs to revert back to rw type. This should never fail, * since no-one knew that the mfn was temporarily sharable */ - mem_sharing_gfn_destroy(d, gfn_info); + mem_sharing_gfn_destroy(page, d, gfn_info); xfree(page->sharing); page->sharing = NULL; /* NOTE: We haven't yet added this to the audit list. */ @@ -726,13 +791,13 @@ int mem_sharing_share_pages(struct domai struct domain *cd, unsigned long cgfn, shr_handle_t ch) { struct page_info *spage, *cpage, *firstpg, *secondpg; - struct list_head *le, *te; gfn_info_t *gfn; struct domain *d; int ret = -EINVAL; mfn_t smfn, cmfn; p2m_type_t smfn_type, cmfn_type; struct two_gfns tg; + struct rmap_iterator ri; get_two_gfns(sd, sgfn, &smfn_type, NULL, &smfn, cd, cgfn, &cmfn_type, NULL, &cmfn, @@ -799,15 +864,15 @@ int mem_sharing_share_pages(struct domai } /* Merge the lists together */ - list_for_each_safe(le, te, &cpage->sharing->gfns) + rmap_seed_iterator(cpage, &ri); + while ( (gfn = rmap_iterate(cpage, &ri)) != NULL) { - gfn = list_entry(le, gfn_info_t, list); /* Get the source page and type, this should never fail: * we are under shr lock, and got a successful lookup */ BUG_ON(!get_page_and_type(spage, dom_cow, PGT_shared_page)); /* Move the gfn_info from client list to source list */ - list_del(&gfn->list); - list_add(&gfn->list, &spage->sharing->gfns); + rmap_del(gfn, cpage); + rmap_add(gfn, spage); put_page_and_type(cpage); d = get_domain_by_id(gfn->domain); BUG_ON(!d); @@ -817,7 +882,7 @@ int mem_sharing_share_pages(struct domai ASSERT(list_empty(&cpage->sharing->gfns)); /* Clear the rest of the shared state */ - audit_del_list(cpage); + page_sharing_dispose(cpage); cpage->sharing = NULL; mem_sharing_page_unlock(secondpg); @@ -887,7 +952,7 @@ int mem_sharing_add_to_physmap(struct do if ( !ret ) { ret = -ENOENT; - mem_sharing_gfn_destroy(cd, gfn_info); + mem_sharing_gfn_destroy(spage, cd, gfn_info); put_page_and_type(spage); } else { ret = 0; @@ -929,7 +994,6 @@ int __mem_sharing_unshare_page(struct do void *s, *t; int last_gfn; gfn_info_t *gfn_info = NULL; - struct list_head *le; mfn = get_gfn(d, gfn, &p2mt); @@ -947,37 +1011,35 @@ int __mem_sharing_unshare_page(struct do BUG(); } - list_for_each(le, &page->sharing->gfns) + gfn_info = rmap_retrieve(d->domain_id, gfn, page); + if ( unlikely(gfn_info == NULL) ) { - gfn_info = list_entry(le, gfn_info_t, list); - if ( (gfn_info->gfn == gfn) && (gfn_info->domain == d->domain_id) ) - goto gfn_found; + gdprintk(XENLOG_ERR, "Could not find gfn_info for shared gfn: " + "%lx\n", gfn); + BUG(); } - gdprintk(XENLOG_ERR, "Could not find gfn_info for shared gfn: " - "%lx\n", gfn); - BUG(); -gfn_found: /* Do the accounting first. If anything fails below, we have bigger * bigger fish to fry. First, remove the gfn from the list. */ - last_gfn = list_has_one_entry(&page->sharing->gfns); + last_gfn = rmap_has_one_entry(page); if ( last_gfn ) { /* Clean up shared state. Get rid of the tuple * before destroying the rmap. */ - mem_sharing_gfn_destroy(d, gfn_info); - audit_del_list(page); + mem_sharing_gfn_destroy(page, d, gfn_info); + page_sharing_dispose(page); page->sharing = NULL; atomic_dec(&nr_shared_mfns); } else atomic_dec(&nr_saved_mfns); + /* If the GFN is getting destroyed drop the references to MFN * (possibly freeing the page), and exit early */ if ( flags & MEM_SHARING_DESTROY_GFN ) { if ( !last_gfn ) - mem_sharing_gfn_destroy(d, gfn_info); + mem_sharing_gfn_destroy(page, d, gfn_info); put_page_and_type(page); mem_sharing_page_unlock(page); if ( last_gfn && @@ -1015,7 +1077,7 @@ gfn_found: unmap_domain_page(t); BUG_ON(set_shared_p2m_entry(d, gfn, page_to_mfn(page)) == 0); - mem_sharing_gfn_destroy(d, gfn_info); + mem_sharing_gfn_destroy(old_page, d, gfn_info); mem_sharing_page_unlock(old_page); put_page_and_type(old_page); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:15 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBz-0003U7-8c; Mon, 14 May 2012 16:32:15 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBx-0003OL-12 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:13 +0000 Received: from [85.158.138.51:30019] by server-11.bemta-3.messagelabs.com id 6A/D8-18894-C8331BF4; Mon, 14 May 2012 16:32:12 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-174.messagelabs.com!1337013129!27110153!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4491 invoked from network); 14 May 2012 16:32:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBs-0002po-KC for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBs-0006aX-JW for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:08 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] x86/mem_sharing: modularize reverse map for shared frames X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Andres Lagar-Cavilla # Date 1335430988 -3600 # Node ID f3a39aeb3a227b9177167a7a2e9dcec763ead26b # Parent 6ff8e44e8d29ce3bc42a621d660513ab9df19cd8 x86/mem_sharing: modularize reverse map for shared frames Each shared frame maintains a reverse map of tuples, so we know which tuples this shared frame is backing. This is useful for auditing and sanity-checking, and necessary to update all relevant p2m entries when sharing. The reverse map is maintained as a doubly linked list, but the interface is open-coded throughout the mem_sharing.c subsystem. Bury it inside a level of abstraction, so it can later support different (more scalable) rmap implementations. Signed-off-by: Andres Lagar-Cavilla Acked-by: Tim Deegan Committed-by: Tim Deegan --- diff -r 6ff8e44e8d29 -r f3a39aeb3a22 xen/arch/x86/mm/mem_sharing.c --- a/xen/arch/x86/mm/mem_sharing.c Thu Apr 26 10:03:08 2012 +0100 +++ b/xen/arch/x86/mm/mem_sharing.c Thu Apr 26 10:03:08 2012 +0100 @@ -69,7 +69,8 @@ static inline void audit_add_list(struct spin_unlock(&shr_audit_lock); } -static inline void audit_del_list(struct page_info *page) +/* Removes from the audit list and cleans up the page sharing metadata. */ +static inline void page_sharing_dispose(struct page_info *page) { spin_lock(&shr_audit_lock); list_del_rcu(&page->sharing->entry); @@ -86,7 +87,7 @@ int mem_sharing_audit(void) } #define audit_add_list(p) ((void)0) -static inline void audit_del_list(struct page_info *page) +static inline void page_sharing_dispose(struct page_info *page) { xfree(page->sharing); } @@ -143,6 +144,7 @@ static inline shr_handle_t get_next_hand static atomic_t nr_saved_mfns = ATOMIC_INIT(0); static atomic_t nr_shared_mfns = ATOMIC_INIT(0); +/** Reverse map **/ typedef struct gfn_info { unsigned long gfn; @@ -150,15 +152,77 @@ typedef struct gfn_info struct list_head list; } gfn_info_t; -/* Returns true if list has only one entry. O(1) complexity. */ -static inline int list_has_one_entry(struct list_head *head) +static inline void +rmap_init(struct page_info *page) { + INIT_LIST_HEAD(&page->sharing->gfns); +} + +static inline void +rmap_del(gfn_info_t *gfn_info, struct page_info *page) +{ + list_del(&gfn_info->list); +} + +static inline void +rmap_add(gfn_info_t *gfn_info, struct page_info *page) +{ + INIT_LIST_HEAD(&gfn_info->list); + list_add(&gfn_info->list, &page->sharing->gfns); +} + +static inline gfn_info_t * +rmap_retrieve(uint16_t domain_id, unsigned long gfn, + struct page_info *page) +{ + gfn_info_t *gfn_info; + struct list_head *le; + list_for_each(le, &page->sharing->gfns) + { + gfn_info = list_entry(le, gfn_info_t, list); + if ( (gfn_info->gfn == gfn) && (gfn_info->domain == domain_id) ) + return gfn_info; + } + return NULL; +} + +/* Returns true if the rmap has only one entry. O(1) complexity. */ +static inline int rmap_has_one_entry(struct page_info *page) +{ + struct list_head *head = &page->sharing->gfns; return (head->next != head) && (head->next->next == head); } -static inline gfn_info_t *gfn_get_info(struct list_head *list) +/* Returns true if the rmap has any entries. O(1) complexity. */ +static inline int rmap_has_entries(struct page_info *page) { - return list_entry(list->next, gfn_info_t, list); + return (!list_empty(&page->sharing->gfns)); +} + +/* The iterator hides the details of how the rmap is implemented. This + * involves splitting the list_for_each_safe macro into two steps. */ +struct rmap_iterator { + struct list_head *curr; + struct list_head *next; +}; + +static inline void +rmap_seed_iterator(struct page_info *page, struct rmap_iterator *ri) +{ + ri->curr = &page->sharing->gfns; + ri->next = ri->curr->next; +} + +static inline gfn_info_t * +rmap_iterate(struct page_info *page, struct rmap_iterator *ri) +{ + if ( ri->next == &page->sharing->gfns) + return NULL; + + ri->curr = ri->next; + ri->next = ri->curr->next; + + return list_entry(ri->curr, gfn_info_t, list); } static inline gfn_info_t *mem_sharing_gfn_alloc(struct page_info *page, @@ -172,8 +236,8 @@ static inline gfn_info_t *mem_sharing_gf gfn_info->gfn = gfn; gfn_info->domain = d->domain_id; - INIT_LIST_HEAD(&gfn_info->list); - list_add(&gfn_info->list, &page->sharing->gfns); + + rmap_add(gfn_info, page); /* Increment our number of shared pges. */ atomic_inc(&d->shr_pages); @@ -181,14 +245,15 @@ static inline gfn_info_t *mem_sharing_gf return gfn_info; } -static inline void mem_sharing_gfn_destroy(struct domain *d, +static inline void mem_sharing_gfn_destroy(struct page_info *page, + struct domain *d, gfn_info_t *gfn_info) { /* Decrement the number of pages. */ atomic_dec(&d->shr_pages); /* Free the gfn_info structure. */ - list_del(&gfn_info->list); + rmap_del(gfn_info, page); xfree(gfn_info); } @@ -230,8 +295,9 @@ int mem_sharing_audit(void) struct page_sharing_info *pg_shared_info; unsigned long nr_gfns = 0; struct page_info *pg; - struct list_head *le; mfn_t mfn; + gfn_info_t *g; + struct rmap_iterator ri; pg_shared_info = list_entry(ae, struct page_sharing_info, entry); pg = pg_shared_info->pg; @@ -272,7 +338,7 @@ int mem_sharing_audit(void) } /* Check we have a list */ - if ( (!pg->sharing) || (list_empty(&pg->sharing->gfns)) ) + if ( (!pg->sharing) || !rmap_has_entries(pg) ) { MEM_SHARING_DEBUG("mfn %lx shared, but empty gfn list!\n", mfn_x(mfn)); @@ -284,14 +350,13 @@ int mem_sharing_audit(void) count_found++; /* Check if all GFNs map to the MFN, and the p2m types */ - list_for_each(le, &pg->sharing->gfns) + rmap_seed_iterator(pg, &ri); + while ( (g = rmap_iterate(pg, &ri)) != NULL ) { struct domain *d; p2m_type_t t; mfn_t o_mfn; - gfn_info_t *g; - g = list_entry(le, gfn_info_t, list); d = get_domain_by_id(g->domain); if ( d == NULL ) { @@ -677,7 +742,7 @@ int mem_sharing_nominate_page(struct dom goto out; } page->sharing->pg = page; - INIT_LIST_HEAD(&page->sharing->gfns); + rmap_init(page); /* Create the handle */ page->sharing->handle = get_next_handle(); @@ -698,7 +763,7 @@ int mem_sharing_nominate_page(struct dom * it a few lines above. * The mfn needs to revert back to rw type. This should never fail, * since no-one knew that the mfn was temporarily sharable */ - mem_sharing_gfn_destroy(d, gfn_info); + mem_sharing_gfn_destroy(page, d, gfn_info); xfree(page->sharing); page->sharing = NULL; /* NOTE: We haven't yet added this to the audit list. */ @@ -726,13 +791,13 @@ int mem_sharing_share_pages(struct domai struct domain *cd, unsigned long cgfn, shr_handle_t ch) { struct page_info *spage, *cpage, *firstpg, *secondpg; - struct list_head *le, *te; gfn_info_t *gfn; struct domain *d; int ret = -EINVAL; mfn_t smfn, cmfn; p2m_type_t smfn_type, cmfn_type; struct two_gfns tg; + struct rmap_iterator ri; get_two_gfns(sd, sgfn, &smfn_type, NULL, &smfn, cd, cgfn, &cmfn_type, NULL, &cmfn, @@ -799,15 +864,15 @@ int mem_sharing_share_pages(struct domai } /* Merge the lists together */ - list_for_each_safe(le, te, &cpage->sharing->gfns) + rmap_seed_iterator(cpage, &ri); + while ( (gfn = rmap_iterate(cpage, &ri)) != NULL) { - gfn = list_entry(le, gfn_info_t, list); /* Get the source page and type, this should never fail: * we are under shr lock, and got a successful lookup */ BUG_ON(!get_page_and_type(spage, dom_cow, PGT_shared_page)); /* Move the gfn_info from client list to source list */ - list_del(&gfn->list); - list_add(&gfn->list, &spage->sharing->gfns); + rmap_del(gfn, cpage); + rmap_add(gfn, spage); put_page_and_type(cpage); d = get_domain_by_id(gfn->domain); BUG_ON(!d); @@ -817,7 +882,7 @@ int mem_sharing_share_pages(struct domai ASSERT(list_empty(&cpage->sharing->gfns)); /* Clear the rest of the shared state */ - audit_del_list(cpage); + page_sharing_dispose(cpage); cpage->sharing = NULL; mem_sharing_page_unlock(secondpg); @@ -887,7 +952,7 @@ int mem_sharing_add_to_physmap(struct do if ( !ret ) { ret = -ENOENT; - mem_sharing_gfn_destroy(cd, gfn_info); + mem_sharing_gfn_destroy(spage, cd, gfn_info); put_page_and_type(spage); } else { ret = 0; @@ -929,7 +994,6 @@ int __mem_sharing_unshare_page(struct do void *s, *t; int last_gfn; gfn_info_t *gfn_info = NULL; - struct list_head *le; mfn = get_gfn(d, gfn, &p2mt); @@ -947,37 +1011,35 @@ int __mem_sharing_unshare_page(struct do BUG(); } - list_for_each(le, &page->sharing->gfns) + gfn_info = rmap_retrieve(d->domain_id, gfn, page); + if ( unlikely(gfn_info == NULL) ) { - gfn_info = list_entry(le, gfn_info_t, list); - if ( (gfn_info->gfn == gfn) && (gfn_info->domain == d->domain_id) ) - goto gfn_found; + gdprintk(XENLOG_ERR, "Could not find gfn_info for shared gfn: " + "%lx\n", gfn); + BUG(); } - gdprintk(XENLOG_ERR, "Could not find gfn_info for shared gfn: " - "%lx\n", gfn); - BUG(); -gfn_found: /* Do the accounting first. If anything fails below, we have bigger * bigger fish to fry. First, remove the gfn from the list. */ - last_gfn = list_has_one_entry(&page->sharing->gfns); + last_gfn = rmap_has_one_entry(page); if ( last_gfn ) { /* Clean up shared state. Get rid of the tuple * before destroying the rmap. */ - mem_sharing_gfn_destroy(d, gfn_info); - audit_del_list(page); + mem_sharing_gfn_destroy(page, d, gfn_info); + page_sharing_dispose(page); page->sharing = NULL; atomic_dec(&nr_shared_mfns); } else atomic_dec(&nr_saved_mfns); + /* If the GFN is getting destroyed drop the references to MFN * (possibly freeing the page), and exit early */ if ( flags & MEM_SHARING_DESTROY_GFN ) { if ( !last_gfn ) - mem_sharing_gfn_destroy(d, gfn_info); + mem_sharing_gfn_destroy(page, d, gfn_info); put_page_and_type(page); mem_sharing_page_unlock(page); if ( last_gfn && @@ -1015,7 +1077,7 @@ gfn_found: unmap_domain_page(t); BUG_ON(set_shared_p2m_entry(d, gfn, page_to_mfn(page)) == 0); - mem_sharing_gfn_destroy(d, gfn_info); + mem_sharing_gfn_destroy(old_page, d, gfn_info); mem_sharing_page_unlock(old_page); put_page_and_type(old_page); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:16 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC0-0003Wq-Cz; Mon, 14 May 2012 16:32:16 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBx-0003Pb-Gz for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:14 +0000 Received: from [85.158.139.83:19873] by server-4.bemta-5.messagelabs.com id 82/E9-10788-C8331BF4; Mon, 14 May 2012 16:32:12 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-182.messagelabs.com!1337013129!24461210!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32633 invoked from network); 14 May 2012 16:32:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBt-0002ps-4a for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBt-0006am-3s for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:09 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] x86/mem_sharing: For shared pages with many references, use a hash table X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Andres Lagar-Cavilla # Date 1335430988 -3600 # Node ID 107285938c50f82667bd4d014820b439a077c22c # Parent f3a39aeb3a227b9177167a7a2e9dcec763ead26b x86/mem_sharing: For shared pages with many references, use a hash table For shared frames that have many references, the doubly-linked list used to store the rmap results in costly scans during unshare operations. To alleviate the overhead, replace the linked list by a hash table. However, hash tables are space-intensive, so only use them for pages that have "many" (arbitrary threshold) references. Unsharing is heaviliy exercised during domain destroy. In experimental testing, for a domain that points over 100 thousand pages to the same shared frame, domain destruction dropped from over 7 minutes(!) to less than two seconds. Signed-off-by: Andres Lagar-Cavilla Acked-by: Tim Deegan Committed-by: Tim Deegan --- diff -r f3a39aeb3a22 -r 107285938c50 xen/arch/x86/mm/mem_sharing.c --- a/xen/arch/x86/mm/mem_sharing.c Thu Apr 26 10:03:08 2012 +0100 +++ b/xen/arch/x86/mm/mem_sharing.c Thu Apr 26 10:03:08 2012 +0100 @@ -49,6 +49,17 @@ DEFINE_PER_CPU(pg_lock_data_t, __pld); #define MEM_SHARING_DEBUG(_f, _a...) \ debugtrace_printk("mem_sharing_debug: %s(): " _f, __func__, ##_a) +/* Reverse map defines */ +#define RMAP_HASHTAB_ORDER 0 +#define RMAP_HASHTAB_SIZE \ + ((PAGE_SIZE << RMAP_HASHTAB_ORDER) / sizeof(struct list_head)) +#define RMAP_USES_HASHTAB(page) \ + ((page)->sharing->hash_table.flag == NULL) +#define RMAP_HEAVY_SHARED_PAGE RMAP_HASHTAB_SIZE +/* A bit of hysteresis. We don't want to be mutating between list and hash + * table constantly. */ +#define RMAP_LIGHT_SHARED_PAGE (RMAP_HEAVY_SHARED_PAGE >> 2) + #if MEM_SHARING_AUDIT static struct list_head shr_audit_list; @@ -72,6 +83,11 @@ static inline void audit_add_list(struct /* Removes from the audit list and cleans up the page sharing metadata. */ static inline void page_sharing_dispose(struct page_info *page) { + /* Unlikely given our thresholds, but we should be careful. */ + if ( unlikely(RMAP_USES_HASHTAB(page)) ) + free_xenheap_pages(page->sharing->hash_table.bucket, + RMAP_HASHTAB_ORDER); + spin_lock(&shr_audit_lock); list_del_rcu(&page->sharing->entry); spin_unlock(&shr_audit_lock); @@ -89,6 +105,10 @@ int mem_sharing_audit(void) #define audit_add_list(p) ((void)0) static inline void page_sharing_dispose(struct page_info *page) { + /* Unlikely given our thresholds, but we should be careful. */ + if ( unlikely(RMAP_USES_HASHTAB(page)) ) + free_xenheap_pages(page->sharing->hash_table.bucket, + RMAP_HASHTAB_ORDER); xfree(page->sharing); } @@ -145,6 +165,11 @@ static atomic_t nr_saved_mfns = ATOMIC static atomic_t nr_shared_mfns = ATOMIC_INIT(0); /** Reverse map **/ +/* Every shared frame keeps a reverse map (rmap) of tuples that + * this shared frame backs. For pages with a low degree of sharing, a O(n) + * search linked list is good enough. For pages with higher degree of sharing, + * we use a hash table instead. */ + typedef struct gfn_info { unsigned long gfn; @@ -155,20 +180,109 @@ typedef struct gfn_info static inline void rmap_init(struct page_info *page) { + /* We always start off as a doubly linked list. */ INIT_LIST_HEAD(&page->sharing->gfns); } +/* Exceedingly simple "hash function" */ +#define HASH(domain, gfn) \ + (((gfn) + (domain)) % RMAP_HASHTAB_SIZE) + +/* Conversions. Tuned by the thresholds. Should only happen twice + * (once each) during the lifetime of a shared page */ +static inline int +rmap_list_to_hash_table(struct page_info *page) +{ + unsigned int i; + struct list_head *pos, *tmp, *b = + alloc_xenheap_pages(RMAP_HASHTAB_ORDER, 0); + + if ( b == NULL ) + return -ENOMEM; + + for ( i = 0; i < RMAP_HASHTAB_SIZE; i++ ) + INIT_LIST_HEAD(b + i); + + list_for_each_safe(pos, tmp, &page->sharing->gfns) + { + gfn_info_t *gfn_info = list_entry(pos, gfn_info_t, list); + struct list_head *bucket = b + HASH(gfn_info->domain, gfn_info->gfn); + list_del(pos); + list_add(pos, bucket); + } + + page->sharing->hash_table.bucket = b; + page->sharing->hash_table.flag = NULL; + + return 0; +} + static inline void -rmap_del(gfn_info_t *gfn_info, struct page_info *page) +rmap_hash_table_to_list(struct page_info *page) { + unsigned int i; + struct list_head *bucket = page->sharing->hash_table.bucket; + + INIT_LIST_HEAD(&page->sharing->gfns); + + for ( i = 0; i < RMAP_HASHTAB_SIZE; i++ ) + { + struct list_head *pos, *tmp, *head = bucket + i; + list_for_each_safe(pos, tmp, head) + { + list_del(pos); + list_add(pos, &page->sharing->gfns); + } + } + + free_xenheap_pages(bucket, RMAP_HASHTAB_ORDER); +} + +/* Generic accessors to the rmap */ +static inline unsigned long +rmap_count(struct page_info *pg) +{ + unsigned long count; + unsigned long t = read_atomic(&pg->u.inuse.type_info); + count = t & PGT_count_mask; + if ( t & PGT_locked ) + count--; + return count; +} + +/* The page type count is always decreased after removing from the rmap. + * Use a convert flag to avoid mutating the rmap if in the middle of an + * iterator, or if the page will be soon destroyed anyways. */ +static inline void +rmap_del(gfn_info_t *gfn_info, struct page_info *page, int convert) +{ + if ( RMAP_USES_HASHTAB(page) && convert && + (rmap_count(page) <= RMAP_LIGHT_SHARED_PAGE) ) + rmap_hash_table_to_list(page); + + /* Regardless of rmap type, same removal operation */ list_del(&gfn_info->list); } +/* The page type count is always increased before adding to the rmap. */ static inline void rmap_add(gfn_info_t *gfn_info, struct page_info *page) { + struct list_head *head; + + if ( !RMAP_USES_HASHTAB(page) && + (rmap_count(page) >= RMAP_HEAVY_SHARED_PAGE) ) + /* The conversion may fail with ENOMEM. We'll be less efficient, + * but no reason to panic. */ + (void)rmap_list_to_hash_table(page); + + head = (RMAP_USES_HASHTAB(page)) ? + page->sharing->hash_table.bucket + + HASH(gfn_info->domain, gfn_info->gfn) : + &page->sharing->gfns; + INIT_LIST_HEAD(&gfn_info->list); - list_add(&gfn_info->list, &page->sharing->gfns); + list_add(&gfn_info->list, head); } static inline gfn_info_t * @@ -176,27 +290,33 @@ rmap_retrieve(uint16_t domain_id, unsign struct page_info *page) { gfn_info_t *gfn_info; - struct list_head *le; - list_for_each(le, &page->sharing->gfns) + struct list_head *le, *head; + + head = (RMAP_USES_HASHTAB(page)) ? + page->sharing->hash_table.bucket + HASH(domain_id, gfn) : + &page->sharing->gfns; + + list_for_each(le, head) { gfn_info = list_entry(le, gfn_info_t, list); if ( (gfn_info->gfn == gfn) && (gfn_info->domain == domain_id) ) return gfn_info; } + + /* Nothing was found */ return NULL; } /* Returns true if the rmap has only one entry. O(1) complexity. */ static inline int rmap_has_one_entry(struct page_info *page) { - struct list_head *head = &page->sharing->gfns; - return (head->next != head) && (head->next->next == head); + return (rmap_count(page) == 1); } /* Returns true if the rmap has any entries. O(1) complexity. */ static inline int rmap_has_entries(struct page_info *page) { - return (!list_empty(&page->sharing->gfns)); + return (rmap_count(page) != 0); } /* The iterator hides the details of how the rmap is implemented. This @@ -204,20 +324,43 @@ static inline int rmap_has_entries(struc struct rmap_iterator { struct list_head *curr; struct list_head *next; + unsigned int bucket; }; static inline void rmap_seed_iterator(struct page_info *page, struct rmap_iterator *ri) { - ri->curr = &page->sharing->gfns; + ri->curr = (RMAP_USES_HASHTAB(page)) ? + page->sharing->hash_table.bucket : + &page->sharing->gfns; ri->next = ri->curr->next; + ri->bucket = 0; } static inline gfn_info_t * rmap_iterate(struct page_info *page, struct rmap_iterator *ri) { - if ( ri->next == &page->sharing->gfns) - return NULL; + struct list_head *head = (RMAP_USES_HASHTAB(page)) ? + page->sharing->hash_table.bucket + ri->bucket : + &page->sharing->gfns; + +retry: + if ( ri->next == head) + { + if ( RMAP_USES_HASHTAB(page) ) + { + ri->bucket++; + if ( ri->bucket >= RMAP_HASHTAB_SIZE ) + /* No more hash table buckets */ + return NULL; + head = page->sharing->hash_table.bucket + ri->bucket; + ri->curr = head; + ri->next = ri->curr->next; + goto retry; + } else + /* List exhausted */ + return NULL; + } ri->curr = ri->next; ri->next = ri->curr->next; @@ -253,7 +396,7 @@ static inline void mem_sharing_gfn_destr atomic_dec(&d->shr_pages); /* Free the gfn_info structure. */ - rmap_del(gfn_info, page); + rmap_del(gfn_info, page, 1); xfree(gfn_info); } @@ -870,8 +1013,9 @@ int mem_sharing_share_pages(struct domai /* Get the source page and type, this should never fail: * we are under shr lock, and got a successful lookup */ BUG_ON(!get_page_and_type(spage, dom_cow, PGT_shared_page)); - /* Move the gfn_info from client list to source list */ - rmap_del(gfn, cpage); + /* Move the gfn_info from client list to source list. + * Don't change the type of rmap for the client page. */ + rmap_del(gfn, cpage, 0); rmap_add(gfn, spage); put_page_and_type(cpage); d = get_domain_by_id(gfn->domain); diff -r f3a39aeb3a22 -r 107285938c50 xen/include/asm-x86/mem_sharing.h --- a/xen/include/asm-x86/mem_sharing.h Thu Apr 26 10:03:08 2012 +0100 +++ b/xen/include/asm-x86/mem_sharing.h Thu Apr 26 10:03:08 2012 +0100 @@ -30,6 +30,13 @@ typedef uint64_t shr_handle_t; +typedef struct rmap_hashtab { + struct list_head *bucket; + /* Overlaps with prev pointer of list_head in union below. + * Unlike the prev pointer, this can be NULL. */ + void *flag; +} rmap_hashtab_t; + struct page_sharing_info { struct page_info *pg; /* Back pointer to the page. */ @@ -38,7 +45,11 @@ struct page_sharing_info struct list_head entry; /* List of all shared pages (entry). */ struct rcu_head rcu_head; /* List of all shared pages (entry). */ #endif - struct list_head gfns; /* List of domains and gfns for this page (head). */ + /* Reverse map of tuples for this shared frame. */ + union { + struct list_head gfns; + rmap_hashtab_t hash_table; + }; }; #ifdef __x86_64__ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:16 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC0-0003Wq-Cz; Mon, 14 May 2012 16:32:16 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBx-0003Pb-Gz for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:14 +0000 Received: from [85.158.139.83:19873] by server-4.bemta-5.messagelabs.com id 82/E9-10788-C8331BF4; Mon, 14 May 2012 16:32:12 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-182.messagelabs.com!1337013129!24461210!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32633 invoked from network); 14 May 2012 16:32:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBt-0002ps-4a for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBt-0006am-3s for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:09 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] x86/mem_sharing: For shared pages with many references, use a hash table X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Andres Lagar-Cavilla # Date 1335430988 -3600 # Node ID 107285938c50f82667bd4d014820b439a077c22c # Parent f3a39aeb3a227b9177167a7a2e9dcec763ead26b x86/mem_sharing: For shared pages with many references, use a hash table For shared frames that have many references, the doubly-linked list used to store the rmap results in costly scans during unshare operations. To alleviate the overhead, replace the linked list by a hash table. However, hash tables are space-intensive, so only use them for pages that have "many" (arbitrary threshold) references. Unsharing is heaviliy exercised during domain destroy. In experimental testing, for a domain that points over 100 thousand pages to the same shared frame, domain destruction dropped from over 7 minutes(!) to less than two seconds. Signed-off-by: Andres Lagar-Cavilla Acked-by: Tim Deegan Committed-by: Tim Deegan --- diff -r f3a39aeb3a22 -r 107285938c50 xen/arch/x86/mm/mem_sharing.c --- a/xen/arch/x86/mm/mem_sharing.c Thu Apr 26 10:03:08 2012 +0100 +++ b/xen/arch/x86/mm/mem_sharing.c Thu Apr 26 10:03:08 2012 +0100 @@ -49,6 +49,17 @@ DEFINE_PER_CPU(pg_lock_data_t, __pld); #define MEM_SHARING_DEBUG(_f, _a...) \ debugtrace_printk("mem_sharing_debug: %s(): " _f, __func__, ##_a) +/* Reverse map defines */ +#define RMAP_HASHTAB_ORDER 0 +#define RMAP_HASHTAB_SIZE \ + ((PAGE_SIZE << RMAP_HASHTAB_ORDER) / sizeof(struct list_head)) +#define RMAP_USES_HASHTAB(page) \ + ((page)->sharing->hash_table.flag == NULL) +#define RMAP_HEAVY_SHARED_PAGE RMAP_HASHTAB_SIZE +/* A bit of hysteresis. We don't want to be mutating between list and hash + * table constantly. */ +#define RMAP_LIGHT_SHARED_PAGE (RMAP_HEAVY_SHARED_PAGE >> 2) + #if MEM_SHARING_AUDIT static struct list_head shr_audit_list; @@ -72,6 +83,11 @@ static inline void audit_add_list(struct /* Removes from the audit list and cleans up the page sharing metadata. */ static inline void page_sharing_dispose(struct page_info *page) { + /* Unlikely given our thresholds, but we should be careful. */ + if ( unlikely(RMAP_USES_HASHTAB(page)) ) + free_xenheap_pages(page->sharing->hash_table.bucket, + RMAP_HASHTAB_ORDER); + spin_lock(&shr_audit_lock); list_del_rcu(&page->sharing->entry); spin_unlock(&shr_audit_lock); @@ -89,6 +105,10 @@ int mem_sharing_audit(void) #define audit_add_list(p) ((void)0) static inline void page_sharing_dispose(struct page_info *page) { + /* Unlikely given our thresholds, but we should be careful. */ + if ( unlikely(RMAP_USES_HASHTAB(page)) ) + free_xenheap_pages(page->sharing->hash_table.bucket, + RMAP_HASHTAB_ORDER); xfree(page->sharing); } @@ -145,6 +165,11 @@ static atomic_t nr_saved_mfns = ATOMIC static atomic_t nr_shared_mfns = ATOMIC_INIT(0); /** Reverse map **/ +/* Every shared frame keeps a reverse map (rmap) of tuples that + * this shared frame backs. For pages with a low degree of sharing, a O(n) + * search linked list is good enough. For pages with higher degree of sharing, + * we use a hash table instead. */ + typedef struct gfn_info { unsigned long gfn; @@ -155,20 +180,109 @@ typedef struct gfn_info static inline void rmap_init(struct page_info *page) { + /* We always start off as a doubly linked list. */ INIT_LIST_HEAD(&page->sharing->gfns); } +/* Exceedingly simple "hash function" */ +#define HASH(domain, gfn) \ + (((gfn) + (domain)) % RMAP_HASHTAB_SIZE) + +/* Conversions. Tuned by the thresholds. Should only happen twice + * (once each) during the lifetime of a shared page */ +static inline int +rmap_list_to_hash_table(struct page_info *page) +{ + unsigned int i; + struct list_head *pos, *tmp, *b = + alloc_xenheap_pages(RMAP_HASHTAB_ORDER, 0); + + if ( b == NULL ) + return -ENOMEM; + + for ( i = 0; i < RMAP_HASHTAB_SIZE; i++ ) + INIT_LIST_HEAD(b + i); + + list_for_each_safe(pos, tmp, &page->sharing->gfns) + { + gfn_info_t *gfn_info = list_entry(pos, gfn_info_t, list); + struct list_head *bucket = b + HASH(gfn_info->domain, gfn_info->gfn); + list_del(pos); + list_add(pos, bucket); + } + + page->sharing->hash_table.bucket = b; + page->sharing->hash_table.flag = NULL; + + return 0; +} + static inline void -rmap_del(gfn_info_t *gfn_info, struct page_info *page) +rmap_hash_table_to_list(struct page_info *page) { + unsigned int i; + struct list_head *bucket = page->sharing->hash_table.bucket; + + INIT_LIST_HEAD(&page->sharing->gfns); + + for ( i = 0; i < RMAP_HASHTAB_SIZE; i++ ) + { + struct list_head *pos, *tmp, *head = bucket + i; + list_for_each_safe(pos, tmp, head) + { + list_del(pos); + list_add(pos, &page->sharing->gfns); + } + } + + free_xenheap_pages(bucket, RMAP_HASHTAB_ORDER); +} + +/* Generic accessors to the rmap */ +static inline unsigned long +rmap_count(struct page_info *pg) +{ + unsigned long count; + unsigned long t = read_atomic(&pg->u.inuse.type_info); + count = t & PGT_count_mask; + if ( t & PGT_locked ) + count--; + return count; +} + +/* The page type count is always decreased after removing from the rmap. + * Use a convert flag to avoid mutating the rmap if in the middle of an + * iterator, or if the page will be soon destroyed anyways. */ +static inline void +rmap_del(gfn_info_t *gfn_info, struct page_info *page, int convert) +{ + if ( RMAP_USES_HASHTAB(page) && convert && + (rmap_count(page) <= RMAP_LIGHT_SHARED_PAGE) ) + rmap_hash_table_to_list(page); + + /* Regardless of rmap type, same removal operation */ list_del(&gfn_info->list); } +/* The page type count is always increased before adding to the rmap. */ static inline void rmap_add(gfn_info_t *gfn_info, struct page_info *page) { + struct list_head *head; + + if ( !RMAP_USES_HASHTAB(page) && + (rmap_count(page) >= RMAP_HEAVY_SHARED_PAGE) ) + /* The conversion may fail with ENOMEM. We'll be less efficient, + * but no reason to panic. */ + (void)rmap_list_to_hash_table(page); + + head = (RMAP_USES_HASHTAB(page)) ? + page->sharing->hash_table.bucket + + HASH(gfn_info->domain, gfn_info->gfn) : + &page->sharing->gfns; + INIT_LIST_HEAD(&gfn_info->list); - list_add(&gfn_info->list, &page->sharing->gfns); + list_add(&gfn_info->list, head); } static inline gfn_info_t * @@ -176,27 +290,33 @@ rmap_retrieve(uint16_t domain_id, unsign struct page_info *page) { gfn_info_t *gfn_info; - struct list_head *le; - list_for_each(le, &page->sharing->gfns) + struct list_head *le, *head; + + head = (RMAP_USES_HASHTAB(page)) ? + page->sharing->hash_table.bucket + HASH(domain_id, gfn) : + &page->sharing->gfns; + + list_for_each(le, head) { gfn_info = list_entry(le, gfn_info_t, list); if ( (gfn_info->gfn == gfn) && (gfn_info->domain == domain_id) ) return gfn_info; } + + /* Nothing was found */ return NULL; } /* Returns true if the rmap has only one entry. O(1) complexity. */ static inline int rmap_has_one_entry(struct page_info *page) { - struct list_head *head = &page->sharing->gfns; - return (head->next != head) && (head->next->next == head); + return (rmap_count(page) == 1); } /* Returns true if the rmap has any entries. O(1) complexity. */ static inline int rmap_has_entries(struct page_info *page) { - return (!list_empty(&page->sharing->gfns)); + return (rmap_count(page) != 0); } /* The iterator hides the details of how the rmap is implemented. This @@ -204,20 +324,43 @@ static inline int rmap_has_entries(struc struct rmap_iterator { struct list_head *curr; struct list_head *next; + unsigned int bucket; }; static inline void rmap_seed_iterator(struct page_info *page, struct rmap_iterator *ri) { - ri->curr = &page->sharing->gfns; + ri->curr = (RMAP_USES_HASHTAB(page)) ? + page->sharing->hash_table.bucket : + &page->sharing->gfns; ri->next = ri->curr->next; + ri->bucket = 0; } static inline gfn_info_t * rmap_iterate(struct page_info *page, struct rmap_iterator *ri) { - if ( ri->next == &page->sharing->gfns) - return NULL; + struct list_head *head = (RMAP_USES_HASHTAB(page)) ? + page->sharing->hash_table.bucket + ri->bucket : + &page->sharing->gfns; + +retry: + if ( ri->next == head) + { + if ( RMAP_USES_HASHTAB(page) ) + { + ri->bucket++; + if ( ri->bucket >= RMAP_HASHTAB_SIZE ) + /* No more hash table buckets */ + return NULL; + head = page->sharing->hash_table.bucket + ri->bucket; + ri->curr = head; + ri->next = ri->curr->next; + goto retry; + } else + /* List exhausted */ + return NULL; + } ri->curr = ri->next; ri->next = ri->curr->next; @@ -253,7 +396,7 @@ static inline void mem_sharing_gfn_destr atomic_dec(&d->shr_pages); /* Free the gfn_info structure. */ - rmap_del(gfn_info, page); + rmap_del(gfn_info, page, 1); xfree(gfn_info); } @@ -870,8 +1013,9 @@ int mem_sharing_share_pages(struct domai /* Get the source page and type, this should never fail: * we are under shr lock, and got a successful lookup */ BUG_ON(!get_page_and_type(spage, dom_cow, PGT_shared_page)); - /* Move the gfn_info from client list to source list */ - rmap_del(gfn, cpage); + /* Move the gfn_info from client list to source list. + * Don't change the type of rmap for the client page. */ + rmap_del(gfn, cpage, 0); rmap_add(gfn, spage); put_page_and_type(cpage); d = get_domain_by_id(gfn->domain); diff -r f3a39aeb3a22 -r 107285938c50 xen/include/asm-x86/mem_sharing.h --- a/xen/include/asm-x86/mem_sharing.h Thu Apr 26 10:03:08 2012 +0100 +++ b/xen/include/asm-x86/mem_sharing.h Thu Apr 26 10:03:08 2012 +0100 @@ -30,6 +30,13 @@ typedef uint64_t shr_handle_t; +typedef struct rmap_hashtab { + struct list_head *bucket; + /* Overlaps with prev pointer of list_head in union below. + * Unlike the prev pointer, this can be NULL. */ + void *flag; +} rmap_hashtab_t; + struct page_sharing_info { struct page_info *pg; /* Back pointer to the page. */ @@ -38,7 +45,11 @@ struct page_sharing_info struct list_head entry; /* List of all shared pages (entry). */ struct rcu_head rcu_head; /* List of all shared pages (entry). */ #endif - struct list_head gfns; /* List of domains and gfns for this page (head). */ + /* Reverse map of tuples for this shared frame. */ + union { + struct list_head gfns; + rmap_hashtab_t hash_table; + }; }; #ifdef __x86_64__ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:16 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC0-0003X4-GF; Mon, 14 May 2012 16:32:16 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBx-0003Qr-U4 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:14 +0000 Received: from [85.158.138.51:30089] by server-12.bemta-3.messagelabs.com id 14/F5-29760-D8331BF4; Mon, 14 May 2012 16:32:13 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-174.messagelabs.com!1337013131!8368060!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24018 invoked from network); 14 May 2012 16:32:12 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBv-0002qQ-7x for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBv-0006bk-7F for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:11 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:10 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] x86/mm: Eliminate _shadow_mode_refcounts X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Andres Lagar-Cavilla # Date 1336062069 -3600 # Node ID 8f556a70ae0bef47e242f9e7be0a054769fc8277 # Parent 98fe3b2a572d4ffe704124e75c7aa8d94dbb51bc x86/mm: Eliminate _shadow_mode_refcounts Replace its only useer with paging_mode_refcounts(). Signed-off-by: Andres Lagar-Cavilla Acked-by: Tim Deegan Committed-by: Tim Deegan --- diff -r 98fe3b2a572d -r 8f556a70ae0b xen/arch/x86/mm.c --- a/xen/arch/x86/mm.c Tue May 01 14:20:37 2012 +0100 +++ b/xen/arch/x86/mm.c Thu May 03 17:21:09 2012 +0100 @@ -2165,7 +2165,7 @@ int get_page(struct page_info *page, str if ( owner != NULL ) put_page(page); - if ( !_shadow_mode_refcounts(domain) && !domain->is_dying ) + if ( !paging_mode_refcounts(domain) && !domain->is_dying ) gdprintk(XENLOG_INFO, "Error pfn %lx: rd=%p, od=%p, caf=%08lx, taf=%" PRtype_info "\n", diff -r 98fe3b2a572d -r 8f556a70ae0b xen/arch/x86/mm/shadow/common.c --- a/xen/arch/x86/mm/shadow/common.c Tue May 01 14:20:37 2012 +0100 +++ b/xen/arch/x86/mm/shadow/common.c Thu May 03 17:21:09 2012 +0100 @@ -105,11 +105,6 @@ static int __init shadow_audit_key_init( __initcall(shadow_audit_key_init); #endif /* SHADOW_AUDIT */ -int _shadow_mode_refcounts(struct domain *d) -{ - return shadow_mode_refcounts(d); -} - /**************************************************************************/ /* x86 emulator support for the shadow code diff -r 98fe3b2a572d -r 8f556a70ae0b xen/include/asm-x86/mm.h --- a/xen/include/asm-x86/mm.h Tue May 01 14:20:37 2012 +0100 +++ b/xen/include/asm-x86/mm.h Thu May 03 17:21:09 2012 +0100 @@ -331,7 +331,6 @@ static inline void *__page_to_virt(const int free_page_type(struct page_info *page, unsigned long type, int preemptible); -int _shadow_mode_refcounts(struct domain *d); int is_iomem_page(unsigned long mfn); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:16 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC0-0003X4-GF; Mon, 14 May 2012 16:32:16 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBx-0003Qr-U4 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:14 +0000 Received: from [85.158.138.51:30089] by server-12.bemta-3.messagelabs.com id 14/F5-29760-D8331BF4; Mon, 14 May 2012 16:32:13 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-174.messagelabs.com!1337013131!8368060!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24018 invoked from network); 14 May 2012 16:32:12 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBv-0002qQ-7x for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBv-0006bk-7F for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:11 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:10 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] x86/mm: Eliminate _shadow_mode_refcounts X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Andres Lagar-Cavilla # Date 1336062069 -3600 # Node ID 8f556a70ae0bef47e242f9e7be0a054769fc8277 # Parent 98fe3b2a572d4ffe704124e75c7aa8d94dbb51bc x86/mm: Eliminate _shadow_mode_refcounts Replace its only useer with paging_mode_refcounts(). Signed-off-by: Andres Lagar-Cavilla Acked-by: Tim Deegan Committed-by: Tim Deegan --- diff -r 98fe3b2a572d -r 8f556a70ae0b xen/arch/x86/mm.c --- a/xen/arch/x86/mm.c Tue May 01 14:20:37 2012 +0100 +++ b/xen/arch/x86/mm.c Thu May 03 17:21:09 2012 +0100 @@ -2165,7 +2165,7 @@ int get_page(struct page_info *page, str if ( owner != NULL ) put_page(page); - if ( !_shadow_mode_refcounts(domain) && !domain->is_dying ) + if ( !paging_mode_refcounts(domain) && !domain->is_dying ) gdprintk(XENLOG_INFO, "Error pfn %lx: rd=%p, od=%p, caf=%08lx, taf=%" PRtype_info "\n", diff -r 98fe3b2a572d -r 8f556a70ae0b xen/arch/x86/mm/shadow/common.c --- a/xen/arch/x86/mm/shadow/common.c Tue May 01 14:20:37 2012 +0100 +++ b/xen/arch/x86/mm/shadow/common.c Thu May 03 17:21:09 2012 +0100 @@ -105,11 +105,6 @@ static int __init shadow_audit_key_init( __initcall(shadow_audit_key_init); #endif /* SHADOW_AUDIT */ -int _shadow_mode_refcounts(struct domain *d) -{ - return shadow_mode_refcounts(d); -} - /**************************************************************************/ /* x86 emulator support for the shadow code diff -r 98fe3b2a572d -r 8f556a70ae0b xen/include/asm-x86/mm.h --- a/xen/include/asm-x86/mm.h Tue May 01 14:20:37 2012 +0100 +++ b/xen/include/asm-x86/mm.h Thu May 03 17:21:09 2012 +0100 @@ -331,7 +331,6 @@ static inline void *__page_to_virt(const int free_page_type(struct page_info *page, unsigned long type, int preemptible); -int _shadow_mode_refcounts(struct domain *d); int is_iomem_page(unsigned long mfn); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:17 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC0-0003XV-KC; Mon, 14 May 2012 16:32:16 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBy-0003OL-Fj for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:14 +0000 Received: from [85.158.138.51:27765] by server-11.bemta-3.messagelabs.com id 2E/E8-18894-E8331BF4; Mon, 14 May 2012 16:32:14 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-174.messagelabs.com!1337013132!18964773!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4056 invoked from network); 14 May 2012 16:32:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBw-0002qe-8T for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBw-0006cE-7i for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:12 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:11 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] x86/MSI: remove stray endianness definition X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Jan Beulich # Date 1336378395 -7200 # Node ID b9eac81e8564f67cd2157f7d4f805e1b7c868996 # Parent 0f53540494f779a1260d4e5319dcdb268389dd07 x86/MSI: remove stray endianness definition ... as it conflicts with the one made in asm/byteorder.h, and hence build fails when both happen to be included from the same source file. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- diff -r 0f53540494f7 -r b9eac81e8564 xen/include/asm-x86/msi.h --- a/xen/include/asm-x86/msi.h Fri May 04 11:18:48 2012 +0100 +++ b/xen/include/asm-x86/msi.h Mon May 07 10:13:15 2012 +0200 @@ -3,6 +3,7 @@ #include #include +#include /* * Constants for Intel APIC based MSI messages. @@ -165,8 +166,6 @@ int msi_free_irq(struct msi_desc *entry) #define MSI_LOGICAL_MODE 1 #define MSI_REDIRECTION_HINT_MODE 0 -#define __LITTLE_ENDIAN_BITFIELD 1 - struct msg_data { #if defined(__LITTLE_ENDIAN_BITFIELD) __u32 vector : 8; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:17 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC0-0003XV-KC; Mon, 14 May 2012 16:32:16 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBy-0003OL-Fj for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:14 +0000 Received: from [85.158.138.51:27765] by server-11.bemta-3.messagelabs.com id 2E/E8-18894-E8331BF4; Mon, 14 May 2012 16:32:14 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-174.messagelabs.com!1337013132!18964773!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4056 invoked from network); 14 May 2012 16:32:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBw-0002qe-8T for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBw-0006cE-7i for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:12 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:11 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] x86/MSI: remove stray endianness definition X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Jan Beulich # Date 1336378395 -7200 # Node ID b9eac81e8564f67cd2157f7d4f805e1b7c868996 # Parent 0f53540494f779a1260d4e5319dcdb268389dd07 x86/MSI: remove stray endianness definition ... as it conflicts with the one made in asm/byteorder.h, and hence build fails when both happen to be included from the same source file. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- diff -r 0f53540494f7 -r b9eac81e8564 xen/include/asm-x86/msi.h --- a/xen/include/asm-x86/msi.h Fri May 04 11:18:48 2012 +0100 +++ b/xen/include/asm-x86/msi.h Mon May 07 10:13:15 2012 +0200 @@ -3,6 +3,7 @@ #include #include +#include /* * Constants for Intel APIC based MSI messages. @@ -165,8 +166,6 @@ int msi_free_irq(struct msi_desc *entry) #define MSI_LOGICAL_MODE 1 #define MSI_REDIRECTION_HINT_MODE 0 -#define __LITTLE_ENDIAN_BITFIELD 1 - struct msg_data { #if defined(__LITTLE_ENDIAN_BITFIELD) __u32 vector : 8; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:17 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC0-0003Y5-QJ; Mon, 14 May 2012 16:32:16 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBy-0003Qr-PM for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:14 +0000 Received: from [85.158.138.51:30112] by server-12.bemta-3.messagelabs.com id 07/F5-29760-D8331BF4; Mon, 14 May 2012 16:32:13 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-174.messagelabs.com!1337013131!27110158!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4557 invoked from network); 14 May 2012 16:32:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBv-0002qZ-OL for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBv-0006bz-Nh for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:11 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:11 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] tools/vtpm: Revert 25142:c5b7d49ca3ee (LDLIBS) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1336126728 -3600 # Node ID 0f53540494f779a1260d4e5319dcdb268389dd07 # Parent 8f556a70ae0bef47e242f9e7be0a054769fc8277 tools/vtpm: Revert 25142:c5b7d49ca3ee (LDLIBS) 25142:c5b7d49ca3ee is broken; it edits the patch context. Signed-off-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 8f556a70ae0b -r 0f53540494f7 tools/vtpm/vtpm-0.5.1.patch --- a/tools/vtpm/vtpm-0.5.1.patch Thu May 03 17:21:09 2012 +0100 +++ b/tools/vtpm/vtpm-0.5.1.patch Fri May 04 11:18:48 2012 +0100 @@ -74,7 +74,7 @@ diff -Naurp tpm_emulator-0.5.1/tpmd/Make #WFLAGS += -Wextra -Wcast-qual -Wmissing-prototypes -Wmissing-declarations -Wstrict-aliasing CFLAGS += $(WFLAGS) -g -I.. -I. -O2 -fno-strict-aliasing +CFLAGS += -I../../../../tools/vtpm_manager/manager - LDLIBS += -lgmp + LDFLAGS += -lgmp -BINDIR := /usr/sbin/ +BINDIR := /usr/bin/ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:17 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC0-0003Yc-WE; Mon, 14 May 2012 16:32:17 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBy-0003G6-PM for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:14 +0000 Received: from [85.158.143.99:63327] by server-3.bemta-4.messagelabs.com id E0/EA-05853-E8331BF4; Mon, 14 May 2012 16:32:14 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-216.messagelabs.com!1337013132!22674447!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 743 invoked from network); 14 May 2012 16:32:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBw-0002qk-Or for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBw-0006cT-OF for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:12 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:12 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] kexec: clear notes during setup X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Andrew Cooper # Date 1336393948 -3600 # Node ID 15246e0ef818c1508816533ef3e4397ee7ece548 # Parent b9eac81e8564f67cd2157f7d4f805e1b7c868996 kexec: clear notes during setup Explicity zero the memory backing the crash notes during setup. This allows the crash environment to be rather more certain whether the crash notes were actually written, rather than trusting that the memory was clear beforehand. Signed-off-by: Andrew Cooper Committed-by: Keir Fraser --- diff -r b9eac81e8564 -r 15246e0ef818 xen/common/kexec.c --- a/xen/common/kexec.c Mon May 07 10:13:15 2012 +0200 +++ b/xen/common/kexec.c Mon May 07 13:32:28 2012 +0100 @@ -401,7 +401,7 @@ static int kexec_init_cpu_notes(const un /* If we dont care about the position of allocation, malloc. */ if ( low_crashinfo_mode == LOW_CRASHINFO_NONE ) - note = xmalloc_bytes(nr_bytes); + note = xzalloc_bytes(nr_bytes); /* Protect the write into crash_notes[] with a spinlock, as this function * is on a hotplug path and a hypercall path. */ @@ -520,6 +520,8 @@ static int __init kexec_init(void) if ( ! crash_heap_current ) return -ENOMEM; + memset(crash_heap_current, 0, crash_heap_size); + crash_heap_end = crash_heap_current + crash_heap_size; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:17 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC0-0003Y5-QJ; Mon, 14 May 2012 16:32:16 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBy-0003Qr-PM for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:14 +0000 Received: from [85.158.138.51:30112] by server-12.bemta-3.messagelabs.com id 07/F5-29760-D8331BF4; Mon, 14 May 2012 16:32:13 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-174.messagelabs.com!1337013131!27110158!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4557 invoked from network); 14 May 2012 16:32:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBv-0002qZ-OL for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBv-0006bz-Nh for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:11 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:11 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] tools/vtpm: Revert 25142:c5b7d49ca3ee (LDLIBS) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1336126728 -3600 # Node ID 0f53540494f779a1260d4e5319dcdb268389dd07 # Parent 8f556a70ae0bef47e242f9e7be0a054769fc8277 tools/vtpm: Revert 25142:c5b7d49ca3ee (LDLIBS) 25142:c5b7d49ca3ee is broken; it edits the patch context. Signed-off-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 8f556a70ae0b -r 0f53540494f7 tools/vtpm/vtpm-0.5.1.patch --- a/tools/vtpm/vtpm-0.5.1.patch Thu May 03 17:21:09 2012 +0100 +++ b/tools/vtpm/vtpm-0.5.1.patch Fri May 04 11:18:48 2012 +0100 @@ -74,7 +74,7 @@ diff -Naurp tpm_emulator-0.5.1/tpmd/Make #WFLAGS += -Wextra -Wcast-qual -Wmissing-prototypes -Wmissing-declarations -Wstrict-aliasing CFLAGS += $(WFLAGS) -g -I.. -I. -O2 -fno-strict-aliasing +CFLAGS += -I../../../../tools/vtpm_manager/manager - LDLIBS += -lgmp + LDFLAGS += -lgmp -BINDIR := /usr/sbin/ +BINDIR := /usr/bin/ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:17 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC0-0003Yc-WE; Mon, 14 May 2012 16:32:17 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBy-0003G6-PM for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:14 +0000 Received: from [85.158.143.99:63327] by server-3.bemta-4.messagelabs.com id E0/EA-05853-E8331BF4; Mon, 14 May 2012 16:32:14 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-216.messagelabs.com!1337013132!22674447!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 743 invoked from network); 14 May 2012 16:32:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBw-0002qk-Or for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBw-0006cT-OF for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:12 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:12 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] kexec: clear notes during setup X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Andrew Cooper # Date 1336393948 -3600 # Node ID 15246e0ef818c1508816533ef3e4397ee7ece548 # Parent b9eac81e8564f67cd2157f7d4f805e1b7c868996 kexec: clear notes during setup Explicity zero the memory backing the crash notes during setup. This allows the crash environment to be rather more certain whether the crash notes were actually written, rather than trusting that the memory was clear beforehand. Signed-off-by: Andrew Cooper Committed-by: Keir Fraser --- diff -r b9eac81e8564 -r 15246e0ef818 xen/common/kexec.c --- a/xen/common/kexec.c Mon May 07 10:13:15 2012 +0200 +++ b/xen/common/kexec.c Mon May 07 13:32:28 2012 +0100 @@ -401,7 +401,7 @@ static int kexec_init_cpu_notes(const un /* If we dont care about the position of allocation, malloc. */ if ( low_crashinfo_mode == LOW_CRASHINFO_NONE ) - note = xmalloc_bytes(nr_bytes); + note = xzalloc_bytes(nr_bytes); /* Protect the write into crash_notes[] with a spinlock, as this function * is on a hotplug path and a hypercall path. */ @@ -520,6 +520,8 @@ static int __init kexec_init(void) if ( ! crash_heap_current ) return -ENOMEM; + memset(crash_heap_current, 0, crash_heap_size); + crash_heap_end = crash_heap_current + crash_heap_size; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC1-0003aR-GR; Mon, 14 May 2012 16:32:17 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBz-0003Tr-JT for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:15 +0000 Received: from [85.158.143.35:7781] by server-2.bemta-4.messagelabs.com id DB/1D-17550-E8331BF4; Mon, 14 May 2012 16:32:14 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-21.messagelabs.com!1337013133!15334620!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21456 invoked from network); 14 May 2012 16:32:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBx-0002qt-95 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBx-0006ci-8O for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:13 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:12 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] vgabios: Fix size computation overflow X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Frediano Ziglio # Date 1336394230 -3600 # Node ID a2ff1bd3a2005e6a16a83075d0fa78c2c6edc256 # Parent 15246e0ef818c1508816533ef3e4397ee7ece548 vgabios: Fix size computation overflow Remove an overflow computing width x height x bit which does not fit into a 16 bits. I wrote a routine to multiple these value and get the size required for framebuffer in segment unit (64k). Signed-off-by: Frediano Ziglio Committed-by: Keir Fraser --- diff -r 15246e0ef818 -r a2ff1bd3a200 tools/firmware/vgabios/vbe.c --- a/tools/firmware/vgabios/vbe.c Mon May 07 13:32:28 2012 +0100 +++ b/tools/firmware/vgabios/vbe.c Mon May 07 13:37:10 2012 +0100 @@ -742,6 +742,29 @@ no_vbe_flag: jmp _display_string ASM_END +ASM_START +_size64: + push bp + mov bp, sp + push dx + +; multiply bbp by yres first as results fit in 16bits +; then multiply by xres + mov ax, 8[bp] + mul word 6[bp] + mul word 4[bp] +; divide by 2^19 ceiling result + add ax, #0xffff + adc dx, #7 + mov ax, dx + shr ax, #3 + + pop dx + pop bp + ret +ASM_END + + /** Function 00h - Return VBE Controller Information * * Input: @@ -844,9 +867,12 @@ Bit16u *AX;Bit16u ES;Bit16u DI; do { + Bit16u size_64k = size64(cur_info->info.XResolution, cur_info->info.YResolution, cur_info->info.BitsPerPixel); + Bit16u max_bpp = dispi_get_max_bpp(); + if ((cur_info->info.XResolution <= dispi_get_max_xres()) && - (cur_info->info.BitsPerPixel <= dispi_get_max_bpp()) && - (cur_info->info.XResolution * cur_info->info.XResolution * cur_info->info.BitsPerPixel <= vbe_info_block.TotalMemory << 19 )) { + (cur_info->info.BitsPerPixel <= max_bpp) && + (size_64k <= vbe_info_block.TotalMemory)) { #ifdef DEBUG printf("VBE found mode %x => %x\n", cur_info->mode,cur_mode); #endif _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC1-0003aR-GR; Mon, 14 May 2012 16:32:17 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBz-0003Tr-JT for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:15 +0000 Received: from [85.158.143.35:7781] by server-2.bemta-4.messagelabs.com id DB/1D-17550-E8331BF4; Mon, 14 May 2012 16:32:14 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-21.messagelabs.com!1337013133!15334620!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21456 invoked from network); 14 May 2012 16:32:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBx-0002qt-95 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBx-0006ci-8O for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:13 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:12 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] vgabios: Fix size computation overflow X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Frediano Ziglio # Date 1336394230 -3600 # Node ID a2ff1bd3a2005e6a16a83075d0fa78c2c6edc256 # Parent 15246e0ef818c1508816533ef3e4397ee7ece548 vgabios: Fix size computation overflow Remove an overflow computing width x height x bit which does not fit into a 16 bits. I wrote a routine to multiple these value and get the size required for framebuffer in segment unit (64k). Signed-off-by: Frediano Ziglio Committed-by: Keir Fraser --- diff -r 15246e0ef818 -r a2ff1bd3a200 tools/firmware/vgabios/vbe.c --- a/tools/firmware/vgabios/vbe.c Mon May 07 13:32:28 2012 +0100 +++ b/tools/firmware/vgabios/vbe.c Mon May 07 13:37:10 2012 +0100 @@ -742,6 +742,29 @@ no_vbe_flag: jmp _display_string ASM_END +ASM_START +_size64: + push bp + mov bp, sp + push dx + +; multiply bbp by yres first as results fit in 16bits +; then multiply by xres + mov ax, 8[bp] + mul word 6[bp] + mul word 4[bp] +; divide by 2^19 ceiling result + add ax, #0xffff + adc dx, #7 + mov ax, dx + shr ax, #3 + + pop dx + pop bp + ret +ASM_END + + /** Function 00h - Return VBE Controller Information * * Input: @@ -844,9 +867,12 @@ Bit16u *AX;Bit16u ES;Bit16u DI; do { + Bit16u size_64k = size64(cur_info->info.XResolution, cur_info->info.YResolution, cur_info->info.BitsPerPixel); + Bit16u max_bpp = dispi_get_max_bpp(); + if ((cur_info->info.XResolution <= dispi_get_max_xres()) && - (cur_info->info.BitsPerPixel <= dispi_get_max_bpp()) && - (cur_info->info.XResolution * cur_info->info.XResolution * cur_info->info.BitsPerPixel <= vbe_info_block.TotalMemory << 19 )) { + (cur_info->info.BitsPerPixel <= max_bpp) && + (size_64k <= vbe_info_block.TotalMemory)) { #ifdef DEBUG printf("VBE found mode %x => %x\n", cur_info->mode,cur_mode); #endif _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC2-0003di-Qy; Mon, 14 May 2012 16:32:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC0-0003Wj-Qs for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:16 +0000 Received: from [193.109.254.147:42649] by server-2.bemta-14.messagelabs.com id C7/B7-19409-F8331BF4; Mon, 14 May 2012 16:32:15 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-27.messagelabs.com!1337013134!1511646!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15263 invoked from network); 14 May 2012 16:32:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBx-0002qx-PT for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBx-0006cy-Om for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:13 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:13 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] vgabios: Report mode not supported getting mode informations X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Frediano Ziglio # Date 1336394267 -3600 # Node ID efb4061b9ce8b36fe64571ffecda732dacf4aab0 # Parent a2ff1bd3a2005e6a16a83075d0fa78c2c6edc256 vgabios: Report mode not supported getting mode informations If you try to get mode information for an unsupported mode interrupt should return error but not that the function is not supported. Signed-off-by: Frediano Ziglio Committed-by: Keir Fraser --- diff -r a2ff1bd3a200 -r efb4061b9ce8 tools/firmware/vgabios/vbe.c --- a/tools/firmware/vgabios/vbe.c Mon May 07 13:37:10 2012 +0100 +++ b/tools/firmware/vgabios/vbe.c Mon May 07 13:37:47 2012 +0100 @@ -909,7 +909,8 @@ Bit16u *AX;Bit16u ES;Bit16u DI; void vbe_biosfn_return_mode_information(AX, CX, ES, DI) Bit16u *AX;Bit16u CX; Bit16u ES;Bit16u DI; { - Bit16u result=0x0100; + // error by default is 0x014f which means supported but error + Bit16u result=0x014f; Bit16u ss=get_SS(); ModeInfoBlock info; ModeInfoListItem *cur_info; @@ -953,7 +954,6 @@ Bit16u *AX;Bit16u CX; Bit16u ES;Bit16u D #ifdef DEBUG printf("VBE *NOT* found mode %x\n",CX); #endif - result = 0x100; } if (result == 0x4f) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC2-0003di-Qy; Mon, 14 May 2012 16:32:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC0-0003Wj-Qs for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:16 +0000 Received: from [193.109.254.147:42649] by server-2.bemta-14.messagelabs.com id C7/B7-19409-F8331BF4; Mon, 14 May 2012 16:32:15 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-27.messagelabs.com!1337013134!1511646!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15263 invoked from network); 14 May 2012 16:32:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBx-0002qx-PT for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBx-0006cy-Om for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:13 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:13 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] vgabios: Report mode not supported getting mode informations X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Frediano Ziglio # Date 1336394267 -3600 # Node ID efb4061b9ce8b36fe64571ffecda732dacf4aab0 # Parent a2ff1bd3a2005e6a16a83075d0fa78c2c6edc256 vgabios: Report mode not supported getting mode informations If you try to get mode information for an unsupported mode interrupt should return error but not that the function is not supported. Signed-off-by: Frediano Ziglio Committed-by: Keir Fraser --- diff -r a2ff1bd3a200 -r efb4061b9ce8 tools/firmware/vgabios/vbe.c --- a/tools/firmware/vgabios/vbe.c Mon May 07 13:37:10 2012 +0100 +++ b/tools/firmware/vgabios/vbe.c Mon May 07 13:37:47 2012 +0100 @@ -909,7 +909,8 @@ Bit16u *AX;Bit16u ES;Bit16u DI; void vbe_biosfn_return_mode_information(AX, CX, ES, DI) Bit16u *AX;Bit16u CX; Bit16u ES;Bit16u DI; { - Bit16u result=0x0100; + // error by default is 0x014f which means supported but error + Bit16u result=0x014f; Bit16u ss=get_SS(); ModeInfoBlock info; ModeInfoListItem *cur_info; @@ -953,7 +954,6 @@ Bit16u *AX;Bit16u CX; Bit16u ES;Bit16u D #ifdef DEBUG printf("VBE *NOT* found mode %x\n",CX); #endif - result = 0x100; } if (result == 0x4f) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC2-0003dx-Tw; Mon, 14 May 2012 16:32:18 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC1-0003YO-D6 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:17 +0000 Received: from [85.158.143.99:59631] by server-1.bemta-4.messagelabs.com id 1F/B8-20925-09331BF4; Mon, 14 May 2012 16:32:16 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-216.messagelabs.com!1337013134!22674452!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 825 invoked from network); 14 May 2012 16:32:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBy-0002r9-PR for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBy-0006dU-Oo for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:14 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:14 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] vgabios: Check if mode is currently supported as vesa specifications X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Frediano Ziglio # Date 1336394337 -3600 # Node ID 5097d77b057b7cb4ccf6d05923a960b562a74d03 # Parent 8579bff9dc3f1aaf5543fc71d1c0f5e5c81f5222 vgabios: Check if mode is currently supported as vesa specifications Vesa specification require that mode information return if a given mode is supported or not so test if we can support it checking required memory and set correctly supported bit. Signed-off-by: Frediano Ziglio Committed-by: Keir Fraser --- diff -r 8579bff9dc3f -r 5097d77b057b tools/firmware/vgabios/vbe.c --- a/tools/firmware/vgabios/vbe.c Mon May 07 13:38:23 2012 +0100 +++ b/tools/firmware/vgabios/vbe.c Mon May 07 13:38:57 2012 +0100 @@ -928,10 +928,22 @@ Bit16u *AX;Bit16u CX; Bit16u ES;Bit16u D if (cur_info != 0) { + Bit16u max_bpp = dispi_get_max_bpp(); + Bit16u size_64k; + Bit16u totalMemory; + + outw(VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_VIDEO_MEMORY_64K); + totalMemory = inw(VBE_DISPI_IOPORT_DATA); #ifdef DEBUG printf("VBE found mode %x\n",CX); #endif memcpyb(ss, &info, 0xc000, &(cur_info->info), sizeof(ModeInfoBlockCompact)); + size_64k = size64(info.XResolution, info.YResolution, info.BitsPerPixel); + if ((info.XResolution > dispi_get_max_xres()) || + (info.BitsPerPixel > max_bpp) || + (size_64k > totalMemory)) + info.ModeAttributes &= ~VBE_MODE_ATTRIBUTE_SUPPORTED; + if (using_lfb) { info.NumberOfBanks = 1; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC2-0003dx-Tw; Mon, 14 May 2012 16:32:18 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC1-0003YO-D6 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:17 +0000 Received: from [85.158.143.99:59631] by server-1.bemta-4.messagelabs.com id 1F/B8-20925-09331BF4; Mon, 14 May 2012 16:32:16 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-216.messagelabs.com!1337013134!22674452!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 825 invoked from network); 14 May 2012 16:32:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBy-0002r9-PR for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBy-0006dU-Oo for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:14 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:14 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] vgabios: Check if mode is currently supported as vesa specifications X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Frediano Ziglio # Date 1336394337 -3600 # Node ID 5097d77b057b7cb4ccf6d05923a960b562a74d03 # Parent 8579bff9dc3f1aaf5543fc71d1c0f5e5c81f5222 vgabios: Check if mode is currently supported as vesa specifications Vesa specification require that mode information return if a given mode is supported or not so test if we can support it checking required memory and set correctly supported bit. Signed-off-by: Frediano Ziglio Committed-by: Keir Fraser --- diff -r 8579bff9dc3f -r 5097d77b057b tools/firmware/vgabios/vbe.c --- a/tools/firmware/vgabios/vbe.c Mon May 07 13:38:23 2012 +0100 +++ b/tools/firmware/vgabios/vbe.c Mon May 07 13:38:57 2012 +0100 @@ -928,10 +928,22 @@ Bit16u *AX;Bit16u CX; Bit16u ES;Bit16u D if (cur_info != 0) { + Bit16u max_bpp = dispi_get_max_bpp(); + Bit16u size_64k; + Bit16u totalMemory; + + outw(VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_VIDEO_MEMORY_64K); + totalMemory = inw(VBE_DISPI_IOPORT_DATA); #ifdef DEBUG printf("VBE found mode %x\n",CX); #endif memcpyb(ss, &info, 0xc000, &(cur_info->info), sizeof(ModeInfoBlockCompact)); + size_64k = size64(info.XResolution, info.YResolution, info.BitsPerPixel); + if ((info.XResolution > dispi_get_max_xres()) || + (info.BitsPerPixel > max_bpp) || + (size_64k > totalMemory)) + info.ModeAttributes &= ~VBE_MODE_ATTRIBUTE_SUPPORTED; + if (using_lfb) { info.NumberOfBanks = 1; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC3-0003eL-2A; Mon, 14 May 2012 16:32:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC1-0003ZS-Ko for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:17 +0000 Received: from [193.109.254.147:42705] by server-9.bemta-14.messagelabs.com id A3/A2-05787-09331BF4; Mon, 14 May 2012 16:32:16 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-27.messagelabs.com!1337013119!8852075!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3715 invoked from network); 14 May 2012 16:32:00 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBi-0002nv-SE for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBi-0006Vw-RS for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:58 +0000 Message-Id: Date: Mon, 14 May 2012 16:31:58 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: make most libxl_FOO_path() functions internal. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1334218378 -3600 # Node ID 7d53703aa3ffa88cf57d212dd80e90f42647c74e # Parent caee592e55cbaaf4157bd1ead097e571b1dfcef8 libxl: make most libxl_FOO_path() functions internal. Only libxl_xen_config_dir_path and libxl_lock_dir_path are used outside the library. Also bindir, sbindir, sharedir and xenpagingdir appeared to be completely unused so nuke them. Signed-off-by: Ian Campbell Committed-by: Ian Jackson Acked-by: Ian Jackson --- diff -r caee592e55cb -r 7d53703aa3ff tools/libxl/libxl.c --- a/tools/libxl/libxl.c Tue Apr 24 18:42:24 2012 +0100 +++ b/tools/libxl/libxl.c Thu Apr 12 09:12:58 2012 +0100 @@ -1126,7 +1126,7 @@ out: int libxl_console_exec(libxl_ctx *ctx, uint32_t domid, int cons_num, libxl_console_type type) { GC_INIT(ctx); - char *p = libxl__sprintf(gc, "%s/xenconsole", libxl_private_bindir_path()); + char *p = libxl__sprintf(gc, "%s/xenconsole", libxl__private_bindir_path()); char *domid_s = libxl__sprintf(gc, "%d", domid); char *cons_num_s = libxl__sprintf(gc, "%d", cons_num); char *cons_type_s; @@ -1767,7 +1767,7 @@ int libxl__device_nic_setdefault(libxl__ if (!nic->bridge) return ERROR_NOMEM; } if ( !nic->script && asprintf(&nic->script, "%s/vif-bridge", - libxl_xen_script_dir_path()) < 0 ) + libxl__xen_script_dir_path()) < 0 ) return ERROR_FAIL; if (!nic->nictype) nic->nictype = LIBXL_NIC_TYPE_IOEMU; @@ -1837,7 +1837,7 @@ int libxl_device_nic_add(libxl_ctx *ctx, flexarray_append(back, "script"); flexarray_append(back, nic->script[0]=='/' ? nic->script : libxl__sprintf(gc, "%s/%s", - libxl_xen_script_dir_path(), + libxl__xen_script_dir_path(), nic->script)); } diff -r caee592e55cb -r 7d53703aa3ff tools/libxl/libxl.h --- a/tools/libxl/libxl.h Tue Apr 24 18:42:24 2012 +0100 +++ b/tools/libxl/libxl.h Thu Apr 12 09:12:58 2012 +0100 @@ -785,18 +785,8 @@ int libxl_flask_setenforce(libxl_ctx *ct int libxl_flask_loadpolicy(libxl_ctx *ctx, void *policy, uint32_t size); /* common paths */ -const char *libxl_sbindir_path(void); -const char *libxl_bindir_path(void); -const char *libxl_libexec_path(void); -const char *libxl_libdir_path(void); -const char *libxl_sharedir_path(void); -const char *libxl_private_bindir_path(void); -const char *libxl_xenfirmwaredir_path(void); const char *libxl_xen_config_dir_path(void); -const char *libxl_xen_script_dir_path(void); const char *libxl_lock_dir_path(void); -const char *libxl_run_dir_path(void); -const char *libxl_xenpaging_dir_path(void); /* misc */ diff -r caee592e55cb -r 7d53703aa3ff tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Tue Apr 24 18:42:24 2012 +0100 +++ b/tools/libxl/libxl_dm.c Thu Apr 12 09:12:58 2012 +0100 @@ -24,7 +24,7 @@ static const char *libxl_tapif_script(li #ifdef __linux__ return libxl__strdup(gc, "no"); #else - return libxl__sprintf(gc, "%s/qemu-ifup", libxl_xen_script_dir_path()); + return libxl__sprintf(gc, "%s/qemu-ifup", libxl__xen_script_dir_path()); #endif } @@ -47,10 +47,10 @@ const char *libxl__domain_device_model(l } else { switch (info->device_model_version) { case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: - dm = libxl__abs_path(gc, "qemu-dm", libxl_libexec_path()); + dm = libxl__abs_path(gc, "qemu-dm", libxl__libexec_path()); break; case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: - dm = libxl__abs_path(gc, "qemu-system-i386", libxl_libexec_path()); + dm = libxl__abs_path(gc, "qemu-system-i386", libxl__libexec_path()); break; default: LIBXL__LOG(ctx, LIBXL__LOG_ERROR, @@ -337,7 +337,7 @@ static char ** libxl__build_device_model flexarray_append(dm_args, libxl__sprintf(gc, "socket,id=libxl-cmd," "path=%s/qmp-libxl-%d,server,nowait", - libxl_run_dir_path(), guest_domid)); + libxl__run_dir_path(), guest_domid)); flexarray_append(dm_args, "-mon"); flexarray_append(dm_args, "chardev=libxl-cmd,mode=control"); @@ -708,7 +708,7 @@ static int libxl__create_stubdom(libxl__ dm_config.b_info.target_memkb = dm_config.b_info.max_memkb; dm_config.b_info.u.pv.kernel.path = libxl__abs_path(gc, "ioemu-stubdom.gz", - libxl_xenfirmwaredir_path()); + libxl__xenfirmwaredir_path()); dm_config.b_info.u.pv.cmdline = libxl__sprintf(gc, " -d %d", guest_domid); dm_config.b_info.u.pv.ramdisk.path = ""; dm_config.b_info.u.pv.features = ""; diff -r caee592e55cb -r 7d53703aa3ff tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Tue Apr 24 18:42:24 2012 +0100 +++ b/tools/libxl/libxl_dom.c Thu Apr 12 09:12:58 2012 +0100 @@ -362,7 +362,7 @@ static const char *libxl__domain_firmwar break; } } - return libxl__abs_path(gc, firmware, libxl_xenfirmwaredir_path()); + return libxl__abs_path(gc, firmware, libxl__xenfirmwaredir_path()); } int libxl__build_hvm(libxl__gc *gc, uint32_t domid, diff -r caee592e55cb -r 7d53703aa3ff tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Tue Apr 24 18:42:24 2012 +0100 +++ b/tools/libxl/libxl_internal.h Thu Apr 12 09:12:58 2012 +0100 @@ -1375,6 +1375,14 @@ _hidden int libxl__carefd_close(libxl__c /* You may pass NULL in which case the answer is -1. */ _hidden int libxl__carefd_fd(const libxl__carefd*); +/* common paths */ +_hidden const char *libxl__libexec_path(void); +_hidden const char *libxl__private_bindir_path(void); +_hidden const char *libxl__xenfirmwaredir_path(void); +_hidden const char *libxl__xen_config_dir_path(void); +_hidden const char *libxl__xen_script_dir_path(void); +_hidden const char *libxl__lock_dir_path(void); +_hidden const char *libxl__run_dir_path(void); /* * Convenience macros. diff -r caee592e55cb -r 7d53703aa3ff tools/libxl/libxl_paths.c --- a/tools/libxl/libxl_paths.c Tue Apr 24 18:42:24 2012 +0100 +++ b/tools/libxl/libxl_paths.c Thu Apr 12 09:12:58 2012 +0100 @@ -15,37 +15,17 @@ #include "libxl_osdeps.h" /* must come before any other headers */ #include "libxl_internal.h" -const char *libxl_sbindir_path(void) -{ - return SBINDIR; -} - -const char *libxl_bindir_path(void) -{ - return BINDIR; -} - -const char *libxl_libexec_path(void) +const char *libxl__libexec_path(void) { return LIBEXEC; } -const char *libxl_libdir_path(void) -{ - return LIBDIR; -} - -const char *libxl_sharedir_path(void) -{ - return SHAREDIR; -} - -const char *libxl_private_bindir_path(void) +const char *libxl__private_bindir_path(void) { return PRIVATE_BINDIR; } -const char *libxl_xenfirmwaredir_path(void) +const char *libxl__xenfirmwaredir_path(void) { return XENFIRMWAREDIR; } @@ -55,7 +35,7 @@ const char *libxl_xen_config_dir_path(vo return XEN_CONFIG_DIR; } -const char *libxl_xen_script_dir_path(void) +const char *libxl__xen_script_dir_path(void) { return XEN_SCRIPT_DIR; } @@ -65,16 +45,11 @@ const char *libxl_lock_dir_path(void) return XEN_LOCK_DIR; } -const char *libxl_run_dir_path(void) +const char *libxl__run_dir_path(void) { return XEN_RUN_DIR; } -const char *libxl_xenpaging_dir_path(void) -{ - return XEN_PAGING_DIR; -} - /* * Local variables: * mode: C diff -r caee592e55cb -r 7d53703aa3ff tools/libxl/libxl_qmp.c --- a/tools/libxl/libxl_qmp.c Tue Apr 24 18:42:24 2012 +0100 +++ b/tools/libxl/libxl_qmp.c Thu Apr 12 09:12:58 2012 +0100 @@ -682,7 +682,7 @@ libxl__qmp_handler *libxl__qmp_initializ qmp = qmp_init_handler(gc, domid); qmp_socket = libxl__sprintf(gc, "%s/qmp-libxl-%d", - libxl_run_dir_path(), domid); + libxl__run_dir_path(), domid); if ((ret = qmp_open(qmp, qmp_socket, QMP_SOCKET_CONNECT_TIMEOUT)) < 0) { LIBXL__LOG_ERRNO(qmp->ctx, LIBXL__LOG_ERROR, "Connection error"); qmp_free_handler(qmp); @@ -720,7 +720,7 @@ void libxl__qmp_cleanup(libxl__gc *gc, u char *qmp_socket; qmp_socket = libxl__sprintf(gc, "%s/qmp-libxl-%d", - libxl_run_dir_path(), domid); + libxl__run_dir_path(), domid); if (unlink(qmp_socket) == -1) { if (errno != ENOENT) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC3-0003eL-2A; Mon, 14 May 2012 16:32:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC1-0003ZS-Ko for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:17 +0000 Received: from [193.109.254.147:42705] by server-9.bemta-14.messagelabs.com id A3/A2-05787-09331BF4; Mon, 14 May 2012 16:32:16 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-27.messagelabs.com!1337013119!8852075!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3715 invoked from network); 14 May 2012 16:32:00 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBi-0002nv-SE for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBi-0006Vw-RS for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:31:58 +0000 Message-Id: Date: Mon, 14 May 2012 16:31:58 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: make most libxl_FOO_path() functions internal. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1334218378 -3600 # Node ID 7d53703aa3ffa88cf57d212dd80e90f42647c74e # Parent caee592e55cbaaf4157bd1ead097e571b1dfcef8 libxl: make most libxl_FOO_path() functions internal. Only libxl_xen_config_dir_path and libxl_lock_dir_path are used outside the library. Also bindir, sbindir, sharedir and xenpagingdir appeared to be completely unused so nuke them. Signed-off-by: Ian Campbell Committed-by: Ian Jackson Acked-by: Ian Jackson --- diff -r caee592e55cb -r 7d53703aa3ff tools/libxl/libxl.c --- a/tools/libxl/libxl.c Tue Apr 24 18:42:24 2012 +0100 +++ b/tools/libxl/libxl.c Thu Apr 12 09:12:58 2012 +0100 @@ -1126,7 +1126,7 @@ out: int libxl_console_exec(libxl_ctx *ctx, uint32_t domid, int cons_num, libxl_console_type type) { GC_INIT(ctx); - char *p = libxl__sprintf(gc, "%s/xenconsole", libxl_private_bindir_path()); + char *p = libxl__sprintf(gc, "%s/xenconsole", libxl__private_bindir_path()); char *domid_s = libxl__sprintf(gc, "%d", domid); char *cons_num_s = libxl__sprintf(gc, "%d", cons_num); char *cons_type_s; @@ -1767,7 +1767,7 @@ int libxl__device_nic_setdefault(libxl__ if (!nic->bridge) return ERROR_NOMEM; } if ( !nic->script && asprintf(&nic->script, "%s/vif-bridge", - libxl_xen_script_dir_path()) < 0 ) + libxl__xen_script_dir_path()) < 0 ) return ERROR_FAIL; if (!nic->nictype) nic->nictype = LIBXL_NIC_TYPE_IOEMU; @@ -1837,7 +1837,7 @@ int libxl_device_nic_add(libxl_ctx *ctx, flexarray_append(back, "script"); flexarray_append(back, nic->script[0]=='/' ? nic->script : libxl__sprintf(gc, "%s/%s", - libxl_xen_script_dir_path(), + libxl__xen_script_dir_path(), nic->script)); } diff -r caee592e55cb -r 7d53703aa3ff tools/libxl/libxl.h --- a/tools/libxl/libxl.h Tue Apr 24 18:42:24 2012 +0100 +++ b/tools/libxl/libxl.h Thu Apr 12 09:12:58 2012 +0100 @@ -785,18 +785,8 @@ int libxl_flask_setenforce(libxl_ctx *ct int libxl_flask_loadpolicy(libxl_ctx *ctx, void *policy, uint32_t size); /* common paths */ -const char *libxl_sbindir_path(void); -const char *libxl_bindir_path(void); -const char *libxl_libexec_path(void); -const char *libxl_libdir_path(void); -const char *libxl_sharedir_path(void); -const char *libxl_private_bindir_path(void); -const char *libxl_xenfirmwaredir_path(void); const char *libxl_xen_config_dir_path(void); -const char *libxl_xen_script_dir_path(void); const char *libxl_lock_dir_path(void); -const char *libxl_run_dir_path(void); -const char *libxl_xenpaging_dir_path(void); /* misc */ diff -r caee592e55cb -r 7d53703aa3ff tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Tue Apr 24 18:42:24 2012 +0100 +++ b/tools/libxl/libxl_dm.c Thu Apr 12 09:12:58 2012 +0100 @@ -24,7 +24,7 @@ static const char *libxl_tapif_script(li #ifdef __linux__ return libxl__strdup(gc, "no"); #else - return libxl__sprintf(gc, "%s/qemu-ifup", libxl_xen_script_dir_path()); + return libxl__sprintf(gc, "%s/qemu-ifup", libxl__xen_script_dir_path()); #endif } @@ -47,10 +47,10 @@ const char *libxl__domain_device_model(l } else { switch (info->device_model_version) { case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: - dm = libxl__abs_path(gc, "qemu-dm", libxl_libexec_path()); + dm = libxl__abs_path(gc, "qemu-dm", libxl__libexec_path()); break; case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: - dm = libxl__abs_path(gc, "qemu-system-i386", libxl_libexec_path()); + dm = libxl__abs_path(gc, "qemu-system-i386", libxl__libexec_path()); break; default: LIBXL__LOG(ctx, LIBXL__LOG_ERROR, @@ -337,7 +337,7 @@ static char ** libxl__build_device_model flexarray_append(dm_args, libxl__sprintf(gc, "socket,id=libxl-cmd," "path=%s/qmp-libxl-%d,server,nowait", - libxl_run_dir_path(), guest_domid)); + libxl__run_dir_path(), guest_domid)); flexarray_append(dm_args, "-mon"); flexarray_append(dm_args, "chardev=libxl-cmd,mode=control"); @@ -708,7 +708,7 @@ static int libxl__create_stubdom(libxl__ dm_config.b_info.target_memkb = dm_config.b_info.max_memkb; dm_config.b_info.u.pv.kernel.path = libxl__abs_path(gc, "ioemu-stubdom.gz", - libxl_xenfirmwaredir_path()); + libxl__xenfirmwaredir_path()); dm_config.b_info.u.pv.cmdline = libxl__sprintf(gc, " -d %d", guest_domid); dm_config.b_info.u.pv.ramdisk.path = ""; dm_config.b_info.u.pv.features = ""; diff -r caee592e55cb -r 7d53703aa3ff tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Tue Apr 24 18:42:24 2012 +0100 +++ b/tools/libxl/libxl_dom.c Thu Apr 12 09:12:58 2012 +0100 @@ -362,7 +362,7 @@ static const char *libxl__domain_firmwar break; } } - return libxl__abs_path(gc, firmware, libxl_xenfirmwaredir_path()); + return libxl__abs_path(gc, firmware, libxl__xenfirmwaredir_path()); } int libxl__build_hvm(libxl__gc *gc, uint32_t domid, diff -r caee592e55cb -r 7d53703aa3ff tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Tue Apr 24 18:42:24 2012 +0100 +++ b/tools/libxl/libxl_internal.h Thu Apr 12 09:12:58 2012 +0100 @@ -1375,6 +1375,14 @@ _hidden int libxl__carefd_close(libxl__c /* You may pass NULL in which case the answer is -1. */ _hidden int libxl__carefd_fd(const libxl__carefd*); +/* common paths */ +_hidden const char *libxl__libexec_path(void); +_hidden const char *libxl__private_bindir_path(void); +_hidden const char *libxl__xenfirmwaredir_path(void); +_hidden const char *libxl__xen_config_dir_path(void); +_hidden const char *libxl__xen_script_dir_path(void); +_hidden const char *libxl__lock_dir_path(void); +_hidden const char *libxl__run_dir_path(void); /* * Convenience macros. diff -r caee592e55cb -r 7d53703aa3ff tools/libxl/libxl_paths.c --- a/tools/libxl/libxl_paths.c Tue Apr 24 18:42:24 2012 +0100 +++ b/tools/libxl/libxl_paths.c Thu Apr 12 09:12:58 2012 +0100 @@ -15,37 +15,17 @@ #include "libxl_osdeps.h" /* must come before any other headers */ #include "libxl_internal.h" -const char *libxl_sbindir_path(void) -{ - return SBINDIR; -} - -const char *libxl_bindir_path(void) -{ - return BINDIR; -} - -const char *libxl_libexec_path(void) +const char *libxl__libexec_path(void) { return LIBEXEC; } -const char *libxl_libdir_path(void) -{ - return LIBDIR; -} - -const char *libxl_sharedir_path(void) -{ - return SHAREDIR; -} - -const char *libxl_private_bindir_path(void) +const char *libxl__private_bindir_path(void) { return PRIVATE_BINDIR; } -const char *libxl_xenfirmwaredir_path(void) +const char *libxl__xenfirmwaredir_path(void) { return XENFIRMWAREDIR; } @@ -55,7 +35,7 @@ const char *libxl_xen_config_dir_path(vo return XEN_CONFIG_DIR; } -const char *libxl_xen_script_dir_path(void) +const char *libxl__xen_script_dir_path(void) { return XEN_SCRIPT_DIR; } @@ -65,16 +45,11 @@ const char *libxl_lock_dir_path(void) return XEN_LOCK_DIR; } -const char *libxl_run_dir_path(void) +const char *libxl__run_dir_path(void) { return XEN_RUN_DIR; } -const char *libxl_xenpaging_dir_path(void) -{ - return XEN_PAGING_DIR; -} - /* * Local variables: * mode: C diff -r caee592e55cb -r 7d53703aa3ff tools/libxl/libxl_qmp.c --- a/tools/libxl/libxl_qmp.c Tue Apr 24 18:42:24 2012 +0100 +++ b/tools/libxl/libxl_qmp.c Thu Apr 12 09:12:58 2012 +0100 @@ -682,7 +682,7 @@ libxl__qmp_handler *libxl__qmp_initializ qmp = qmp_init_handler(gc, domid); qmp_socket = libxl__sprintf(gc, "%s/qmp-libxl-%d", - libxl_run_dir_path(), domid); + libxl__run_dir_path(), domid); if ((ret = qmp_open(qmp, qmp_socket, QMP_SOCKET_CONNECT_TIMEOUT)) < 0) { LIBXL__LOG_ERRNO(qmp->ctx, LIBXL__LOG_ERROR, "Connection error"); qmp_free_handler(qmp); @@ -720,7 +720,7 @@ void libxl__qmp_cleanup(libxl__gc *gc, u char *qmp_socket; qmp_socket = libxl__sprintf(gc, "%s/qmp-libxl-%d", - libxl_run_dir_path(), domid); + libxl__run_dir_path(), domid); if (unlink(qmp_socket) == -1) { if (errno != ENOENT) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC3-0003gP-Ra; Mon, 14 May 2012 16:32:19 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC1-0003G6-VP for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:18 +0000 Received: from [85.158.143.99:59685] by server-3.bemta-4.messagelabs.com id A6/FA-05853-19331BF4; Mon, 14 May 2012 16:32:17 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-216.messagelabs.com!1337013135!27626207!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28569 invoked from network); 14 May 2012 16:32:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBz-0002rJ-PP for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBz-0006dy-Oo for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:15 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:15 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] x86: merge .text.* into .text while linking X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Jan Beulich # Date 1336476796 -7200 # Node ID f3fd3136f7a04b8d4e9a6ef1e6787810bae198e9 # Parent 8f1e0cc4a507a52a49a2eb7832a57ecc7e032dce x86: merge .text.* into .text while linking For xen.efi, this eliminates a pointless gap between .text and .text.unlikely of almost 2Mb size. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- diff -r 8f1e0cc4a507 -r f3fd3136f7a0 xen/arch/x86/xen.lds.S --- a/xen/arch/x86/xen.lds.S Mon May 07 13:39:27 2012 +0100 +++ b/xen/arch/x86/xen.lds.S Tue May 08 13:33:16 2012 +0200 @@ -47,6 +47,8 @@ SECTIONS .text : { _stext = .; /* Text and read-only data */ *(.text) + *(.text.cold) + *(.text.unlikely) *(.fixup) *(.gnu.warning) _etext = .; /* End of text section */ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC3-0003gP-Ra; Mon, 14 May 2012 16:32:19 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC1-0003G6-VP for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:18 +0000 Received: from [85.158.143.99:59685] by server-3.bemta-4.messagelabs.com id A6/FA-05853-19331BF4; Mon, 14 May 2012 16:32:17 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-216.messagelabs.com!1337013135!27626207!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28569 invoked from network); 14 May 2012 16:32:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBz-0002rJ-PP for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBz-0006dy-Oo for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:15 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:15 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] x86: merge .text.* into .text while linking X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Jan Beulich # Date 1336476796 -7200 # Node ID f3fd3136f7a04b8d4e9a6ef1e6787810bae198e9 # Parent 8f1e0cc4a507a52a49a2eb7832a57ecc7e032dce x86: merge .text.* into .text while linking For xen.efi, this eliminates a pointless gap between .text and .text.unlikely of almost 2Mb size. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- diff -r 8f1e0cc4a507 -r f3fd3136f7a0 xen/arch/x86/xen.lds.S --- a/xen/arch/x86/xen.lds.S Mon May 07 13:39:27 2012 +0100 +++ b/xen/arch/x86/xen.lds.S Tue May 08 13:33:16 2012 +0200 @@ -47,6 +47,8 @@ SECTIONS .text : { _stext = .; /* Text and read-only data */ *(.text) + *(.text.cold) + *(.text.unlikely) *(.fixup) *(.gnu.warning) _etext = .; /* End of text section */ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC4-0003h8-2a; Mon, 14 May 2012 16:32:20 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC2-0003ac-2W for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:18 +0000 Received: from [85.158.139.83:29827] by server-11.bemta-5.messagelabs.com id C0/50-12959-19331BF4; Mon, 14 May 2012 16:32:17 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-182.messagelabs.com!1337013134!28653469!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7761 invoked from network); 14 May 2012 16:32:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBy-0002r4-9T for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBy-0006dF-8q for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:14 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:13 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] vgabios: Reduce stack usage getting mode informations X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Frediano Ziglio # Date 1336394303 -3600 # Node ID 8579bff9dc3f1aaf5543fc71d1c0f5e5c81f5222 # Parent efb4061b9ce8b36fe64571ffecda732dacf4aab0 vgabios: Reduce stack usage getting mode informations Informations are stored in a structure that is smaller than final one. Previous code copy this structure to stack extending with zeroes then update it and copy to caller while now the not-extended version is copied into stack and then is extended during copy reducing stack usage. Signed-off-by: Frediano Ziglio Committed-by: Keir Fraser --- diff -r efb4061b9ce8 -r 8579bff9dc3f tools/firmware/vgabios/vbe.c --- a/tools/firmware/vgabios/vbe.c Mon May 07 13:37:47 2012 +0100 +++ b/tools/firmware/vgabios/vbe.c Mon May 07 13:38:23 2012 +0100 @@ -912,9 +912,9 @@ Bit16u *AX;Bit16u CX; Bit16u ES;Bit16u D // error by default is 0x014f which means supported but error Bit16u result=0x014f; Bit16u ss=get_SS(); - ModeInfoBlock info; ModeInfoListItem *cur_info; Boolean using_lfb; + ModeInfoBlockCompact info; #ifdef DEBUG printf("VBE vbe_biosfn_return_mode_information ES%x DI%x CX%x\n",ES,DI,CX); @@ -931,7 +931,6 @@ Bit16u *AX;Bit16u CX; Bit16u ES;Bit16u D #ifdef DEBUG printf("VBE found mode %x\n",CX); #endif - memsetb(ss, &info, 0, sizeof(ModeInfoBlock)); memcpyb(ss, &info, 0xc000, &(cur_info->info), sizeof(ModeInfoBlockCompact)); if (using_lfb) { info.NumberOfBanks = 1; @@ -948,6 +947,10 @@ Bit16u *AX;Bit16u CX; Bit16u ES;Bit16u D info.PhysBasePtr |= inw(VBE_DISPI_IOPORT_DATA); #endif result = 0x4f; + + // copy updates in mode_info_block back + memsetb(ES, DI, 0, sizeof(ModeInfoBlock)); + memcpyb(ES, DI, ss, &info, sizeof(info)); } else { @@ -955,12 +958,6 @@ Bit16u *AX;Bit16u CX; Bit16u ES;Bit16u D printf("VBE *NOT* found mode %x\n",CX); #endif } - - if (result == 0x4f) - { - // copy updates in mode_info_block back - memcpyb(ES, DI, ss, &info, sizeof(info)); - } write_word(ss, AX, result); } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC4-0003h8-2a; Mon, 14 May 2012 16:32:20 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC2-0003ac-2W for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:18 +0000 Received: from [85.158.139.83:29827] by server-11.bemta-5.messagelabs.com id C0/50-12959-19331BF4; Mon, 14 May 2012 16:32:17 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-182.messagelabs.com!1337013134!28653469!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7761 invoked from network); 14 May 2012 16:32:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBy-0002r4-9T for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBy-0006dF-8q for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:14 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:13 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] vgabios: Reduce stack usage getting mode informations X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Frediano Ziglio # Date 1336394303 -3600 # Node ID 8579bff9dc3f1aaf5543fc71d1c0f5e5c81f5222 # Parent efb4061b9ce8b36fe64571ffecda732dacf4aab0 vgabios: Reduce stack usage getting mode informations Informations are stored in a structure that is smaller than final one. Previous code copy this structure to stack extending with zeroes then update it and copy to caller while now the not-extended version is copied into stack and then is extended during copy reducing stack usage. Signed-off-by: Frediano Ziglio Committed-by: Keir Fraser --- diff -r efb4061b9ce8 -r 8579bff9dc3f tools/firmware/vgabios/vbe.c --- a/tools/firmware/vgabios/vbe.c Mon May 07 13:37:47 2012 +0100 +++ b/tools/firmware/vgabios/vbe.c Mon May 07 13:38:23 2012 +0100 @@ -912,9 +912,9 @@ Bit16u *AX;Bit16u CX; Bit16u ES;Bit16u D // error by default is 0x014f which means supported but error Bit16u result=0x014f; Bit16u ss=get_SS(); - ModeInfoBlock info; ModeInfoListItem *cur_info; Boolean using_lfb; + ModeInfoBlockCompact info; #ifdef DEBUG printf("VBE vbe_biosfn_return_mode_information ES%x DI%x CX%x\n",ES,DI,CX); @@ -931,7 +931,6 @@ Bit16u *AX;Bit16u CX; Bit16u ES;Bit16u D #ifdef DEBUG printf("VBE found mode %x\n",CX); #endif - memsetb(ss, &info, 0, sizeof(ModeInfoBlock)); memcpyb(ss, &info, 0xc000, &(cur_info->info), sizeof(ModeInfoBlockCompact)); if (using_lfb) { info.NumberOfBanks = 1; @@ -948,6 +947,10 @@ Bit16u *AX;Bit16u CX; Bit16u ES;Bit16u D info.PhysBasePtr |= inw(VBE_DISPI_IOPORT_DATA); #endif result = 0x4f; + + // copy updates in mode_info_block back + memsetb(ES, DI, 0, sizeof(ModeInfoBlock)); + memcpyb(ES, DI, ss, &info, sizeof(info)); } else { @@ -955,12 +958,6 @@ Bit16u *AX;Bit16u CX; Bit16u ES;Bit16u D printf("VBE *NOT* found mode %x\n",CX); #endif } - - if (result == 0x4f) - { - // copy updates in mode_info_block back - memcpyb(ES, DI, ss, &info, sizeof(info)); - } write_word(ss, AX, result); } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:21 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC5-0003jb-7g; Mon, 14 May 2012 16:32:21 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC3-0003YO-G6 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:19 +0000 Received: from [85.158.143.99:59748] by server-1.bemta-4.messagelabs.com id 6B/C8-20925-39331BF4; Mon, 14 May 2012 16:32:19 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-216.messagelabs.com!1337013137!20925450!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8166 invoked from network); 14 May 2012 16:32:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC0-0002rS-P2 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyC0-0006eS-OP for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:16 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:16 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] fix vmce MCi_ADDR/MCi_MISC wrmsr bug X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Liu, Jinsong # Date 1336476984 -7200 # Node ID 8a86d841e6d42fbffc9e20d3028875dd4990882d # Parent ea7c9cabd7ad9ccbdf0c2d1a71e479b69d24ea5b fix vmce MCi_ADDR/MCi_MISC wrmsr bug This patch fixes a bug related to wrmsr vmce MCi_ADDR/MCi_MISC registers, since they are not read-only. Intel SDM recommanded os mce driver clear MCi_ADDR/MCi_MISC, so guest MCE driver may clear MCi_ADDR/MCi_MISC registers. In such case, old vmce wrmsr logic would generate a #GP fault in guest MCE context, causing the guest to crash. When wrmsr MCi_ADDR/MCi_MISC, writing all 1s will cause #GP. Signed-off-by: Liu, Jinsong Signed-off-by: Jan Beulich Committed-by: Jan Beulich --- diff -r ea7c9cabd7ad -r 8a86d841e6d4 xen/arch/x86/cpu/mcheck/vmce.c --- a/xen/arch/x86/cpu/mcheck/vmce.c Tue May 08 13:34:14 2012 +0200 +++ b/xen/arch/x86/cpu/mcheck/vmce.c Tue May 08 13:36:24 2012 +0200 @@ -209,6 +209,14 @@ static int bank_mce_wrmsr(struct vcpu *v struct domain_mca_msrs *vmce = dom_vmce(v->domain); struct bank_entry *entry = NULL; + /* Give the first entry of the list, it corresponds to current + * vMCE# injection. When vMCE# is finished processing by the + * the guest, this node will be deleted. + * Only error bank is written. Non-error banks simply return. + */ + if ( !list_empty(&vmce->impact_header) ) + entry = list_entry(vmce->impact_header.next, struct bank_entry, list); + switch ( msr & (MSR_IA32_MC0_CTL | 3) ) { case MSR_IA32_MC0_CTL: @@ -216,17 +224,9 @@ static int bank_mce_wrmsr(struct vcpu *v vmce->mci_ctl[bank] = val; break; case MSR_IA32_MC0_STATUS: - /* Give the first entry of the list, it corresponds to current - * vMCE# injection. When vMCE# is finished processing by the - * the guest, this node will be deleted. - * Only error bank is written. Non-error banks simply return. - */ - if ( !list_empty(&vmce->impact_header) ) + if ( entry && (entry->bank == bank) ) { - entry = list_entry(vmce->impact_header.next, - struct bank_entry, list); - if ( entry->bank == bank ) - entry->mci_status = val; + entry->mci_status = val; mce_printk(MCE_VERBOSE, "MCE: wr MC%u_STATUS %"PRIx64" in vMCE#\n", bank, val); @@ -236,12 +236,38 @@ static int bank_mce_wrmsr(struct vcpu *v "MCE: wr MC%u_STATUS %"PRIx64"\n", bank, val); break; case MSR_IA32_MC0_ADDR: - mce_printk(MCE_QUIET, "MCE: MC%u_ADDR is read-only\n", bank); - ret = -1; + if ( !~val ) + { + mce_printk(MCE_QUIET, + "MCE: wr MC%u_ADDR with all 1s will cause #GP\n", bank); + ret = -1; + } + else if ( entry && (entry->bank == bank) ) + { + entry->mci_addr = val; + mce_printk(MCE_VERBOSE, + "MCE: wr MC%u_ADDR %"PRIx64" in vMCE#\n", bank, val); + } + else + mce_printk(MCE_VERBOSE, + "MCE: wr MC%u_ADDR %"PRIx64"\n", bank, val); break; case MSR_IA32_MC0_MISC: - mce_printk(MCE_QUIET, "MCE: MC%u_MISC is read-only\n", bank); - ret = -1; + if ( !~val ) + { + mce_printk(MCE_QUIET, + "MCE: wr MC%u_MISC with all 1s will cause #GP\n", bank); + ret = -1; + } + else if ( entry && (entry->bank == bank) ) + { + entry->mci_misc = val; + mce_printk(MCE_VERBOSE, + "MCE: wr MC%u_MISC %"PRIx64" in vMCE#\n", bank, val); + } + else + mce_printk(MCE_VERBOSE, + "MCE: wr MC%u_MISC %"PRIx64"\n", bank, val); break; default: switch ( boot_cpu_data.x86_vendor ) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:21 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC5-0003jb-7g; Mon, 14 May 2012 16:32:21 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC3-0003YO-G6 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:19 +0000 Received: from [85.158.143.99:59748] by server-1.bemta-4.messagelabs.com id 6B/C8-20925-39331BF4; Mon, 14 May 2012 16:32:19 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-216.messagelabs.com!1337013137!20925450!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8166 invoked from network); 14 May 2012 16:32:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC0-0002rS-P2 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyC0-0006eS-OP for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:16 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:16 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] fix vmce MCi_ADDR/MCi_MISC wrmsr bug X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Liu, Jinsong # Date 1336476984 -7200 # Node ID 8a86d841e6d42fbffc9e20d3028875dd4990882d # Parent ea7c9cabd7ad9ccbdf0c2d1a71e479b69d24ea5b fix vmce MCi_ADDR/MCi_MISC wrmsr bug This patch fixes a bug related to wrmsr vmce MCi_ADDR/MCi_MISC registers, since they are not read-only. Intel SDM recommanded os mce driver clear MCi_ADDR/MCi_MISC, so guest MCE driver may clear MCi_ADDR/MCi_MISC registers. In such case, old vmce wrmsr logic would generate a #GP fault in guest MCE context, causing the guest to crash. When wrmsr MCi_ADDR/MCi_MISC, writing all 1s will cause #GP. Signed-off-by: Liu, Jinsong Signed-off-by: Jan Beulich Committed-by: Jan Beulich --- diff -r ea7c9cabd7ad -r 8a86d841e6d4 xen/arch/x86/cpu/mcheck/vmce.c --- a/xen/arch/x86/cpu/mcheck/vmce.c Tue May 08 13:34:14 2012 +0200 +++ b/xen/arch/x86/cpu/mcheck/vmce.c Tue May 08 13:36:24 2012 +0200 @@ -209,6 +209,14 @@ static int bank_mce_wrmsr(struct vcpu *v struct domain_mca_msrs *vmce = dom_vmce(v->domain); struct bank_entry *entry = NULL; + /* Give the first entry of the list, it corresponds to current + * vMCE# injection. When vMCE# is finished processing by the + * the guest, this node will be deleted. + * Only error bank is written. Non-error banks simply return. + */ + if ( !list_empty(&vmce->impact_header) ) + entry = list_entry(vmce->impact_header.next, struct bank_entry, list); + switch ( msr & (MSR_IA32_MC0_CTL | 3) ) { case MSR_IA32_MC0_CTL: @@ -216,17 +224,9 @@ static int bank_mce_wrmsr(struct vcpu *v vmce->mci_ctl[bank] = val; break; case MSR_IA32_MC0_STATUS: - /* Give the first entry of the list, it corresponds to current - * vMCE# injection. When vMCE# is finished processing by the - * the guest, this node will be deleted. - * Only error bank is written. Non-error banks simply return. - */ - if ( !list_empty(&vmce->impact_header) ) + if ( entry && (entry->bank == bank) ) { - entry = list_entry(vmce->impact_header.next, - struct bank_entry, list); - if ( entry->bank == bank ) - entry->mci_status = val; + entry->mci_status = val; mce_printk(MCE_VERBOSE, "MCE: wr MC%u_STATUS %"PRIx64" in vMCE#\n", bank, val); @@ -236,12 +236,38 @@ static int bank_mce_wrmsr(struct vcpu *v "MCE: wr MC%u_STATUS %"PRIx64"\n", bank, val); break; case MSR_IA32_MC0_ADDR: - mce_printk(MCE_QUIET, "MCE: MC%u_ADDR is read-only\n", bank); - ret = -1; + if ( !~val ) + { + mce_printk(MCE_QUIET, + "MCE: wr MC%u_ADDR with all 1s will cause #GP\n", bank); + ret = -1; + } + else if ( entry && (entry->bank == bank) ) + { + entry->mci_addr = val; + mce_printk(MCE_VERBOSE, + "MCE: wr MC%u_ADDR %"PRIx64" in vMCE#\n", bank, val); + } + else + mce_printk(MCE_VERBOSE, + "MCE: wr MC%u_ADDR %"PRIx64"\n", bank, val); break; case MSR_IA32_MC0_MISC: - mce_printk(MCE_QUIET, "MCE: MC%u_MISC is read-only\n", bank); - ret = -1; + if ( !~val ) + { + mce_printk(MCE_QUIET, + "MCE: wr MC%u_MISC with all 1s will cause #GP\n", bank); + ret = -1; + } + else if ( entry && (entry->bank == bank) ) + { + entry->mci_misc = val; + mce_printk(MCE_VERBOSE, + "MCE: wr MC%u_MISC %"PRIx64" in vMCE#\n", bank, val); + } + else + mce_printk(MCE_VERBOSE, + "MCE: wr MC%u_MISC %"PRIx64"\n", bank, val); break; default: switch ( boot_cpu_data.x86_vendor ) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:21 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC5-0003jv-BO; Mon, 14 May 2012 16:32:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC3-0003de-DP for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:19 +0000 Received: from [85.158.139.83:20300] by server-7.bemta-5.messagelabs.com id AA/66-16195-29331BF4; Mon, 14 May 2012 16:32:18 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-182.messagelabs.com!1337013135!24066731!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9804 invoked from network); 14 May 2012 16:32:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBz-0002rE-9I for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBz-0006dj-8R for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:15 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:14 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] vgabios: Make Windows 8 support greater resolutions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Frediano Ziglio # Date 1336394367 -3600 # Node ID 8f1e0cc4a507a52a49a2eb7832a57ecc7e032dce # Parent 5097d77b057b7cb4ccf6d05923a960b562a74d03 vgabios: Make Windows 8 support greater resolutions Apparently Windows 8 refuse to use any mode if has more than one page. Signed-off-by: Frediano Ziglio Committed-by: Keir Fraser --- diff -r 5097d77b057b -r 8f1e0cc4a507 tools/firmware/vgabios/vbe.c --- a/tools/firmware/vgabios/vbe.c Mon May 07 13:38:57 2012 +0100 +++ b/tools/firmware/vgabios/vbe.c Mon May 07 13:39:27 2012 +0100 @@ -944,9 +944,9 @@ Bit16u *AX;Bit16u CX; Bit16u ES;Bit16u D (size_64k > totalMemory)) info.ModeAttributes &= ~VBE_MODE_ATTRIBUTE_SUPPORTED; - if (using_lfb) { - info.NumberOfBanks = 1; - } + /* Windows 8 require this to be 1! */ + info.NumberOfBanks = 1; + if (info.WinAAttributes & VBE_WINDOW_ATTRIBUTE_RELOCATABLE) { info.WinFuncPtr = 0xC0000000UL; *(Bit16u *)&(info.WinFuncPtr) = (Bit16u)(dispi_set_bank_farcall); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:21 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC5-0003jv-BO; Mon, 14 May 2012 16:32:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC3-0003de-DP for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:19 +0000 Received: from [85.158.139.83:20300] by server-7.bemta-5.messagelabs.com id AA/66-16195-29331BF4; Mon, 14 May 2012 16:32:18 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-182.messagelabs.com!1337013135!24066731!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9804 invoked from network); 14 May 2012 16:32:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBz-0002rE-9I for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBz-0006dj-8R for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:15 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:14 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] vgabios: Make Windows 8 support greater resolutions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Frediano Ziglio # Date 1336394367 -3600 # Node ID 8f1e0cc4a507a52a49a2eb7832a57ecc7e032dce # Parent 5097d77b057b7cb4ccf6d05923a960b562a74d03 vgabios: Make Windows 8 support greater resolutions Apparently Windows 8 refuse to use any mode if has more than one page. Signed-off-by: Frediano Ziglio Committed-by: Keir Fraser --- diff -r 5097d77b057b -r 8f1e0cc4a507 tools/firmware/vgabios/vbe.c --- a/tools/firmware/vgabios/vbe.c Mon May 07 13:38:57 2012 +0100 +++ b/tools/firmware/vgabios/vbe.c Mon May 07 13:39:27 2012 +0100 @@ -944,9 +944,9 @@ Bit16u *AX;Bit16u CX; Bit16u ES;Bit16u D (size_64k > totalMemory)) info.ModeAttributes &= ~VBE_MODE_ATTRIBUTE_SUPPORTED; - if (using_lfb) { - info.NumberOfBanks = 1; - } + /* Windows 8 require this to be 1! */ + info.NumberOfBanks = 1; + if (info.WinAAttributes & VBE_WINDOW_ATTRIBUTE_RELOCATABLE) { info.WinFuncPtr = 0xC0000000UL; *(Bit16u *)&(info.WinFuncPtr) = (Bit16u)(dispi_set_bank_farcall); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:21 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC5-0003kF-Ec; Mon, 14 May 2012 16:32:21 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC3-0003dB-4j for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:19 +0000 Received: from [85.158.138.51:32088] by server-7.bemta-3.messagelabs.com id BC/C8-03078-29331BF4; Mon, 14 May 2012 16:32:18 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-174.messagelabs.com!1337013136!25291976!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27915 invoked from network); 14 May 2012 16:32:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC0-0002rM-93 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyC0-0006eD-8O for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:16 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:15 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] ns16550: adjust suspend/resume logic X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Jan Beulich # Date 1336476854 -7200 # Node ID ea7c9cabd7ad9ccbdf0c2d1a71e479b69d24ea5b # Parent f3fd3136f7a04b8d4e9a6ef1e6787810bae198e9 ns16550: adjust suspend/resume logic - no need to read BAR during suspend - command register is 16-bits rather than 32 - BAR and command register must be restored before trying to access the device - use ps_bdf[] for storing the device coordinates (pb_bdf[] is used to store the bridge's ones) Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- diff -r f3fd3136f7a0 -r ea7c9cabd7ad xen/drivers/char/ns16550.c --- a/xen/drivers/char/ns16550.c Tue May 08 13:33:16 2012 +0200 +++ b/xen/drivers/char/ns16550.c Tue May 08 13:34:14 2012 +0200 @@ -49,7 +49,9 @@ static struct ns16550 { unsigned int ps_bdf[3]; /* pci serial port BDF */ bool_t pb_bdf_enable; /* if =1, pb-bdf effective, port behind bridge */ bool_t ps_bdf_enable; /* if =1, ps_bdf effective, port on pci card */ - int bar, cr, bar_idx; + u32 bar; + u16 cr; + u8 bar_idx; } ns16550_com[2] = { { 0 } }; /* Register offsets */ @@ -324,30 +326,24 @@ static void ns16550_suspend(struct seria stop_timer(&uart->timer); if ( uart->bar ) - { - uart->bar = pci_conf_read32( - 0, uart->pb_bdf[0], uart->pb_bdf[1], uart->pb_bdf[2], - PCI_BASE_ADDRESS_0 + uart->bar_idx*4); - uart->cr = pci_conf_read32( - 0, uart->pb_bdf[0], uart->pb_bdf[1], uart->pb_bdf[2], - PCI_COMMAND); - } + uart->cr = pci_conf_read16(0, uart->ps_bdf[0], uart->ps_bdf[1], + uart->ps_bdf[2], PCI_COMMAND); } static void ns16550_resume(struct serial_port *port) { struct ns16550 *uart = port->uart; + if ( uart->bar ) + { + pci_conf_write32(0, uart->ps_bdf[0], uart->ps_bdf[1], uart->ps_bdf[2], + PCI_BASE_ADDRESS_0 + uart->bar_idx*4, uart->bar); + pci_conf_write16(0, uart->ps_bdf[0], uart->ps_bdf[1], uart->ps_bdf[2], + PCI_COMMAND, uart->cr); + } + ns16550_setup_preirq(port->uart); ns16550_setup_postirq(port->uart); - - if ( uart->bar ) - { - pci_conf_write32(0, uart->pb_bdf[0], uart->pb_bdf[1], uart->pb_bdf[2], - PCI_BASE_ADDRESS_0 + uart->bar_idx*4, uart->bar); - pci_conf_write32(0, uart->pb_bdf[0], uart->pb_bdf[1], uart->pb_bdf[2], - PCI_COMMAND, uart->cr); - } } #ifdef CONFIG_X86 @@ -483,9 +479,9 @@ pci_uart_config (struct ns16550 *uart, i if ( (len & 0xffff) != 0xfff9 ) continue; - uart->pb_bdf[0] = b; - uart->pb_bdf[1] = d; - uart->pb_bdf[2] = f; + uart->ps_bdf[0] = b; + uart->ps_bdf[1] = d; + uart->ps_bdf[2] = f; uart->bar = bar; uart->bar_idx = bar_idx; uart->io_base = bar & 0xfffe; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:21 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC5-0003kF-Ec; Mon, 14 May 2012 16:32:21 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC3-0003dB-4j for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:19 +0000 Received: from [85.158.138.51:32088] by server-7.bemta-3.messagelabs.com id BC/C8-03078-29331BF4; Mon, 14 May 2012 16:32:18 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-174.messagelabs.com!1337013136!25291976!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27915 invoked from network); 14 May 2012 16:32:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC0-0002rM-93 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyC0-0006eD-8O for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:16 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:15 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] ns16550: adjust suspend/resume logic X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Jan Beulich # Date 1336476854 -7200 # Node ID ea7c9cabd7ad9ccbdf0c2d1a71e479b69d24ea5b # Parent f3fd3136f7a04b8d4e9a6ef1e6787810bae198e9 ns16550: adjust suspend/resume logic - no need to read BAR during suspend - command register is 16-bits rather than 32 - BAR and command register must be restored before trying to access the device - use ps_bdf[] for storing the device coordinates (pb_bdf[] is used to store the bridge's ones) Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- diff -r f3fd3136f7a0 -r ea7c9cabd7ad xen/drivers/char/ns16550.c --- a/xen/drivers/char/ns16550.c Tue May 08 13:33:16 2012 +0200 +++ b/xen/drivers/char/ns16550.c Tue May 08 13:34:14 2012 +0200 @@ -49,7 +49,9 @@ static struct ns16550 { unsigned int ps_bdf[3]; /* pci serial port BDF */ bool_t pb_bdf_enable; /* if =1, pb-bdf effective, port behind bridge */ bool_t ps_bdf_enable; /* if =1, ps_bdf effective, port on pci card */ - int bar, cr, bar_idx; + u32 bar; + u16 cr; + u8 bar_idx; } ns16550_com[2] = { { 0 } }; /* Register offsets */ @@ -324,30 +326,24 @@ static void ns16550_suspend(struct seria stop_timer(&uart->timer); if ( uart->bar ) - { - uart->bar = pci_conf_read32( - 0, uart->pb_bdf[0], uart->pb_bdf[1], uart->pb_bdf[2], - PCI_BASE_ADDRESS_0 + uart->bar_idx*4); - uart->cr = pci_conf_read32( - 0, uart->pb_bdf[0], uart->pb_bdf[1], uart->pb_bdf[2], - PCI_COMMAND); - } + uart->cr = pci_conf_read16(0, uart->ps_bdf[0], uart->ps_bdf[1], + uart->ps_bdf[2], PCI_COMMAND); } static void ns16550_resume(struct serial_port *port) { struct ns16550 *uart = port->uart; + if ( uart->bar ) + { + pci_conf_write32(0, uart->ps_bdf[0], uart->ps_bdf[1], uart->ps_bdf[2], + PCI_BASE_ADDRESS_0 + uart->bar_idx*4, uart->bar); + pci_conf_write16(0, uart->ps_bdf[0], uart->ps_bdf[1], uart->ps_bdf[2], + PCI_COMMAND, uart->cr); + } + ns16550_setup_preirq(port->uart); ns16550_setup_postirq(port->uart); - - if ( uart->bar ) - { - pci_conf_write32(0, uart->pb_bdf[0], uart->pb_bdf[1], uart->pb_bdf[2], - PCI_BASE_ADDRESS_0 + uart->bar_idx*4, uart->bar); - pci_conf_write32(0, uart->pb_bdf[0], uart->pb_bdf[1], uart->pb_bdf[2], - PCI_COMMAND, uart->cr); - } } #ifdef CONFIG_X86 @@ -483,9 +479,9 @@ pci_uart_config (struct ns16550 *uart, i if ( (len & 0xffff) != 0xfff9 ) continue; - uart->pb_bdf[0] = b; - uart->pb_bdf[1] = d; - uart->pb_bdf[2] = f; + uart->ps_bdf[0] = b; + uart->ps_bdf[1] = d; + uart->ps_bdf[2] = f; uart->bar = bar; uart->bar_idx = bar_idx; uart->io_base = bar & 0xfffe; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:22 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC5-0003kp-KX; Mon, 14 May 2012 16:32:21 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC4-0003G6-8A for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:20 +0000 Received: from [85.158.143.35:10051] by server-3.bemta-4.messagelabs.com id 8F/FA-05853-39331BF4; Mon, 14 May 2012 16:32:19 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-21.messagelabs.com!1337013138!16023605!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17120 invoked from network); 14 May 2012 16:32:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC2-0002rm-AE for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyC2-0006fB-9Z for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:18 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:17 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] tools/blktap2: fix build errors caused by Werror in X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Olaf Hering # Date 1336645145 -3600 # Node ID ca02580986d2e78a6ccb90dae66f7cbd1ad8058c # Parent 54da0329e259c11b63afe3312c9fa6cc1cb7cc9d tools/blktap2: fix build errors caused by Werror in vhd_journal_write_entry -O2 -Wall -Werror triggers these warnings: libvhd-journal.c: In function 'vhd_journal_write_entry': libvhd-journal.c:335: warning: statement with no effect Really return the error from vhd_journal_write() to caller. v2: - simplify the patch by just adding the missing return statement Signed-off-by: Olaf Hering Committed-by: Keir Fraser --- diff -r 54da0329e259 -r ca02580986d2 tools/blktap2/vhd/lib/libvhd-journal.c --- a/tools/blktap2/vhd/lib/libvhd-journal.c Thu May 10 11:04:32 2012 +0100 +++ b/tools/blktap2/vhd/lib/libvhd-journal.c Thu May 10 11:19:05 2012 +0100 @@ -332,7 +332,7 @@ vhd_journal_write_entry(vhd_journal_t *j err = vhd_journal_write(j, &e, sizeof(vhd_journal_entry_t)); if (err) - err; + return err; return 0; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:22 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC5-0003kp-KX; Mon, 14 May 2012 16:32:21 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC4-0003G6-8A for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:20 +0000 Received: from [85.158.143.35:10051] by server-3.bemta-4.messagelabs.com id 8F/FA-05853-39331BF4; Mon, 14 May 2012 16:32:19 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-21.messagelabs.com!1337013138!16023605!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17120 invoked from network); 14 May 2012 16:32:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC2-0002rm-AE for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyC2-0006fB-9Z for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:18 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:17 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] tools/blktap2: fix build errors caused by Werror in X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Olaf Hering # Date 1336645145 -3600 # Node ID ca02580986d2e78a6ccb90dae66f7cbd1ad8058c # Parent 54da0329e259c11b63afe3312c9fa6cc1cb7cc9d tools/blktap2: fix build errors caused by Werror in vhd_journal_write_entry -O2 -Wall -Werror triggers these warnings: libvhd-journal.c: In function 'vhd_journal_write_entry': libvhd-journal.c:335: warning: statement with no effect Really return the error from vhd_journal_write() to caller. v2: - simplify the patch by just adding the missing return statement Signed-off-by: Olaf Hering Committed-by: Keir Fraser --- diff -r 54da0329e259 -r ca02580986d2 tools/blktap2/vhd/lib/libvhd-journal.c --- a/tools/blktap2/vhd/lib/libvhd-journal.c Thu May 10 11:04:32 2012 +0100 +++ b/tools/blktap2/vhd/lib/libvhd-journal.c Thu May 10 11:19:05 2012 +0100 @@ -332,7 +332,7 @@ vhd_journal_write_entry(vhd_journal_t *j err = vhd_journal_write(j, &e, sizeof(vhd_journal_entry_t)); if (err) - err; + return err; return 0; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:23 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC6-0003ow-S7; Mon, 14 May 2012 16:32:22 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC4-0003he-NB for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:20 +0000 Received: from [193.109.254.147:54063] by server-4.bemta-14.messagelabs.com id 04/64-11570-49331BF4; Mon, 14 May 2012 16:32:20 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-27.messagelabs.com!1337013138!9011393!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19743 invoked from network); 14 May 2012 16:32:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC1-0002rf-Q8 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyC1-0006ew-PV for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:17 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:17 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] x86_64: Fix off-by-one error setting up the Interrupt Stack Tables X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Andrew Cooper # Date 1336644272 -3600 # Node ID 54da0329e259c11b63afe3312c9fa6cc1cb7cc9d # Parent b059c62449fb490074d85c00aa03c38fb34a0e80 x86_64: Fix off-by-one error setting up the Interrupt Stack Tables The Interrupt Stack Table entries in a 64bit TSS are a 1 based data structure as far as hardware is concerned. As a result, the code setting up stacks in subarch_percpu_traps_init() fills in the wrong IST entries. The result is that the MCE handler executes on the stack set up for NMIs; the NMI handler executes on a stack set up for Double Faults, and Double Faults are executed with a stack pointer set to 0. Once the #DF handler starts to execute, it will usually take a page fault looking up the address at 0xfffffffffffffff8, which will cause a triple fault. If a guest has mapped a page in that location, then it will have some state overwritten, but as the #DF handler always calls panic(), this is not a problem the guest will have time to care about. Signed-off-by: Andrew Cooper Committed-by: Keir Fraser --- diff -r b059c62449fb -r 54da0329e259 xen/arch/x86/x86_64/traps.c --- a/xen/arch/x86/x86_64/traps.c Thu May 10 11:02:54 2012 +0100 +++ b/xen/arch/x86/x86_64/traps.c Thu May 10 11:04:32 2012 +0100 @@ -386,13 +386,13 @@ void __devinit subarch_percpu_traps_init BUILD_BUG_ON((IST_MAX + 2) * PAGE_SIZE + PRIMARY_STACK_SIZE > STACK_SIZE); /* Machine Check handler has its own per-CPU 4kB stack. */ - this_cpu(init_tss).ist[IST_MCE] = (unsigned long)&stack[IST_MCE * PAGE_SIZE]; + this_cpu(init_tss).ist[IST_MCE-1] = (unsigned long)&stack[IST_MCE * PAGE_SIZE]; /* Double-fault handler has its own per-CPU 4kB stack. */ - this_cpu(init_tss).ist[IST_DF] = (unsigned long)&stack[IST_DF * PAGE_SIZE]; + this_cpu(init_tss).ist[IST_DF-1] = (unsigned long)&stack[IST_DF * PAGE_SIZE]; /* NMI handler has its own per-CPU 4kB stack. */ - this_cpu(init_tss).ist[IST_NMI] = (unsigned long)&stack[IST_NMI * PAGE_SIZE]; + this_cpu(init_tss).ist[IST_NMI-1] = (unsigned long)&stack[IST_NMI * PAGE_SIZE]; /* Trampoline for SYSCALL entry from long mode. */ stack = &stack[IST_MAX * PAGE_SIZE]; /* Skip the IST stacks. */ diff -r b059c62449fb -r 54da0329e259 xen/include/asm-x86/processor.h --- a/xen/include/asm-x86/processor.h Thu May 10 11:02:54 2012 +0100 +++ b/xen/include/asm-x86/processor.h Thu May 10 11:04:32 2012 +0100 @@ -424,7 +424,9 @@ struct tss_struct { union { u64 rsp1, esp1; }; union { u64 rsp2, esp2; }; u64 reserved1; - u64 ist[7]; + u64 ist[7]; /* Interrupt Stack Table is 1-based so tss->ist[0] + * corresponds to an IST value of 1 in an Interrupt + * Descriptor */ u64 reserved2; u16 reserved3; #else _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:23 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC6-0003ow-S7; Mon, 14 May 2012 16:32:22 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC4-0003he-NB for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:20 +0000 Received: from [193.109.254.147:54063] by server-4.bemta-14.messagelabs.com id 04/64-11570-49331BF4; Mon, 14 May 2012 16:32:20 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-27.messagelabs.com!1337013138!9011393!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19743 invoked from network); 14 May 2012 16:32:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC1-0002rf-Q8 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyC1-0006ew-PV for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:17 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:17 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] x86_64: Fix off-by-one error setting up the Interrupt Stack Tables X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Andrew Cooper # Date 1336644272 -3600 # Node ID 54da0329e259c11b63afe3312c9fa6cc1cb7cc9d # Parent b059c62449fb490074d85c00aa03c38fb34a0e80 x86_64: Fix off-by-one error setting up the Interrupt Stack Tables The Interrupt Stack Table entries in a 64bit TSS are a 1 based data structure as far as hardware is concerned. As a result, the code setting up stacks in subarch_percpu_traps_init() fills in the wrong IST entries. The result is that the MCE handler executes on the stack set up for NMIs; the NMI handler executes on a stack set up for Double Faults, and Double Faults are executed with a stack pointer set to 0. Once the #DF handler starts to execute, it will usually take a page fault looking up the address at 0xfffffffffffffff8, which will cause a triple fault. If a guest has mapped a page in that location, then it will have some state overwritten, but as the #DF handler always calls panic(), this is not a problem the guest will have time to care about. Signed-off-by: Andrew Cooper Committed-by: Keir Fraser --- diff -r b059c62449fb -r 54da0329e259 xen/arch/x86/x86_64/traps.c --- a/xen/arch/x86/x86_64/traps.c Thu May 10 11:02:54 2012 +0100 +++ b/xen/arch/x86/x86_64/traps.c Thu May 10 11:04:32 2012 +0100 @@ -386,13 +386,13 @@ void __devinit subarch_percpu_traps_init BUILD_BUG_ON((IST_MAX + 2) * PAGE_SIZE + PRIMARY_STACK_SIZE > STACK_SIZE); /* Machine Check handler has its own per-CPU 4kB stack. */ - this_cpu(init_tss).ist[IST_MCE] = (unsigned long)&stack[IST_MCE * PAGE_SIZE]; + this_cpu(init_tss).ist[IST_MCE-1] = (unsigned long)&stack[IST_MCE * PAGE_SIZE]; /* Double-fault handler has its own per-CPU 4kB stack. */ - this_cpu(init_tss).ist[IST_DF] = (unsigned long)&stack[IST_DF * PAGE_SIZE]; + this_cpu(init_tss).ist[IST_DF-1] = (unsigned long)&stack[IST_DF * PAGE_SIZE]; /* NMI handler has its own per-CPU 4kB stack. */ - this_cpu(init_tss).ist[IST_NMI] = (unsigned long)&stack[IST_NMI * PAGE_SIZE]; + this_cpu(init_tss).ist[IST_NMI-1] = (unsigned long)&stack[IST_NMI * PAGE_SIZE]; /* Trampoline for SYSCALL entry from long mode. */ stack = &stack[IST_MAX * PAGE_SIZE]; /* Skip the IST stacks. */ diff -r b059c62449fb -r 54da0329e259 xen/include/asm-x86/processor.h --- a/xen/include/asm-x86/processor.h Thu May 10 11:02:54 2012 +0100 +++ b/xen/include/asm-x86/processor.h Thu May 10 11:04:32 2012 +0100 @@ -424,7 +424,9 @@ struct tss_struct { union { u64 rsp1, esp1; }; union { u64 rsp2, esp2; }; u64 reserved1; - u64 ist[7]; + u64 ist[7]; /* Interrupt Stack Table is 1-based so tss->ist[0] + * corresponds to an IST value of 1 in an Interrupt + * Descriptor */ u64 reserved2; u16 reserved3; #else _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:23 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC7-0003pr-BI; Mon, 14 May 2012 16:32:23 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC5-0003j9-DW for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:21 +0000 Received: from [85.158.139.83:30083] by server-12.bemta-5.messagelabs.com id E9/F2-01344-49331BF4; Mon, 14 May 2012 16:32:20 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-182.messagelabs.com!1337013137!28332168!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2329 invoked from network); 14 May 2012 16:32:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC1-0002rX-9T for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyC1-0006eh-8m for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:17 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:16 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] x86_64: fix naming of rflags in elf regset structure X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Andrew Cooper # Date 1336644174 -3600 # Node ID b059c62449fb490074d85c00aa03c38fb34a0e80 # Parent 8a86d841e6d42fbffc9e20d3028875dd4990882d x86_64: fix naming of rflags in elf regset structure 'pushfq' pushes rflags, not eflags. Fix up naming of the structure. No functional change. Signed-off-by: Andrew Cooper Committed-by: Keir Fraser --- diff -r 8a86d841e6d4 -r b059c62449fb xen/include/asm-x86/x86_64/elf.h --- a/xen/include/asm-x86/x86_64/elf.h Tue May 08 13:36:24 2012 +0200 +++ b/xen/include/asm-x86/x86_64/elf.h Thu May 10 11:02:54 2012 +0100 @@ -20,7 +20,7 @@ typedef struct { unsigned long orig_rax; unsigned long rip; unsigned long cs; - unsigned long eflags; + unsigned long rflags; unsigned long rsp; unsigned long ss; unsigned long thread_fs; @@ -54,7 +54,7 @@ static inline void elf_core_save_regs(EL /* orig_rax not filled in for now */ core_regs->rip = (unsigned long)elf_core_save_regs; asm volatile("movl %%cs, %%eax;" :"=a"(core_regs->cs)); - asm volatile("pushfq; popq %0" :"=m"(core_regs->eflags)); + asm volatile("pushfq; popq %0" :"=m"(core_regs->rflags)); asm volatile("movq %%rsp,%0" : "=m"(core_regs->rsp)); asm volatile("movl %%ss, %%eax;" :"=a"(core_regs->ss)); /* thread_fs not filled in for now */ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:23 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC7-0003pr-BI; Mon, 14 May 2012 16:32:23 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC5-0003j9-DW for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:21 +0000 Received: from [85.158.139.83:30083] by server-12.bemta-5.messagelabs.com id E9/F2-01344-49331BF4; Mon, 14 May 2012 16:32:20 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-182.messagelabs.com!1337013137!28332168!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2329 invoked from network); 14 May 2012 16:32:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC1-0002rX-9T for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyC1-0006eh-8m for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:17 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:16 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] x86_64: fix naming of rflags in elf regset structure X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Andrew Cooper # Date 1336644174 -3600 # Node ID b059c62449fb490074d85c00aa03c38fb34a0e80 # Parent 8a86d841e6d42fbffc9e20d3028875dd4990882d x86_64: fix naming of rflags in elf regset structure 'pushfq' pushes rflags, not eflags. Fix up naming of the structure. No functional change. Signed-off-by: Andrew Cooper Committed-by: Keir Fraser --- diff -r 8a86d841e6d4 -r b059c62449fb xen/include/asm-x86/x86_64/elf.h --- a/xen/include/asm-x86/x86_64/elf.h Tue May 08 13:36:24 2012 +0200 +++ b/xen/include/asm-x86/x86_64/elf.h Thu May 10 11:02:54 2012 +0100 @@ -20,7 +20,7 @@ typedef struct { unsigned long orig_rax; unsigned long rip; unsigned long cs; - unsigned long eflags; + unsigned long rflags; unsigned long rsp; unsigned long ss; unsigned long thread_fs; @@ -54,7 +54,7 @@ static inline void elf_core_save_regs(EL /* orig_rax not filled in for now */ core_regs->rip = (unsigned long)elf_core_save_regs; asm volatile("movl %%cs, %%eax;" :"=a"(core_regs->cs)); - asm volatile("pushfq; popq %0" :"=m"(core_regs->eflags)); + asm volatile("pushfq; popq %0" :"=m"(core_regs->rflags)); asm volatile("movq %%rsp,%0" : "=m"(core_regs->rsp)); asm volatile("movl %%ss, %%eax;" :"=a"(core_regs->ss)); /* thread_fs not filled in for now */ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:23 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC7-0003qi-If; Mon, 14 May 2012 16:32:23 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC5-0003ja-KT for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:21 +0000 Received: from [193.109.254.147:12735] by server-8.bemta-14.messagelabs.com id C6/CD-23244-49331BF4; Mon, 14 May 2012 16:32:20 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-27.messagelabs.com!1337013139!4049597!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18374 invoked from network); 14 May 2012 16:32:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC2-0002rp-QW for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyC2-0006fQ-Po for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:18 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:18 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] tools/blktap2: fix out of bounds access in block-log.c X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Olaf Hering # Date 1336645204 -3600 # Node ID 83a02f225bde5ca7c51a483381cfc4ce5eae9800 # Parent ca02580986d2e78a6ccb90dae66f7cbd1ad8058c tools/blktap2: fix out of bounds access in block-log.c block-log.c: In function 'ctl_close_sock': block-log.c:363:23: warning: array subscript is above array bounds [-Warray-bounds] Adjust loop condition in ctl_close_sock() to fix warning. Adjust array acccess in ctl_close() to actually access the array member. Signed-off-by: Olaf Hering Acked-by: Ian Jackson Committed-by: Keir Fraser --- diff -r ca02580986d2 -r 83a02f225bde tools/blktap2/drivers/block-log.c --- a/tools/blktap2/drivers/block-log.c Thu May 10 11:19:05 2012 +0100 +++ b/tools/blktap2/drivers/block-log.c Thu May 10 11:20:04 2012 +0100 @@ -324,11 +324,11 @@ static int ctl_open(struct tdlog_state* static int ctl_close(struct tdlog_state* s) { while (s->connected) { + s->connected--; tapdisk_server_unregister_event(s->connections[s->connected].id); close(s->connections[s->connected].fd); s->connections[s->connected].fd = -1; s->connections[s->connected].id = 0; - s->connected--; } if (s->ctl.fd >= 0) { @@ -359,7 +359,7 @@ static int ctl_close_sock(struct tdlog_s { int i; - for (i = 0; i <= s->connected; i++) { + for (i = 0; i < s->connected; i++) { if (s->connections[i].fd == fd) { tapdisk_server_unregister_event(s->connections[i].id); close(s->connections[i].fd); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:23 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC7-0003qi-If; Mon, 14 May 2012 16:32:23 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC5-0003ja-KT for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:21 +0000 Received: from [193.109.254.147:12735] by server-8.bemta-14.messagelabs.com id C6/CD-23244-49331BF4; Mon, 14 May 2012 16:32:20 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-27.messagelabs.com!1337013139!4049597!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18374 invoked from network); 14 May 2012 16:32:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC2-0002rp-QW for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyC2-0006fQ-Po for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:18 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:18 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] tools/blktap2: fix out of bounds access in block-log.c X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Olaf Hering # Date 1336645204 -3600 # Node ID 83a02f225bde5ca7c51a483381cfc4ce5eae9800 # Parent ca02580986d2e78a6ccb90dae66f7cbd1ad8058c tools/blktap2: fix out of bounds access in block-log.c block-log.c: In function 'ctl_close_sock': block-log.c:363:23: warning: array subscript is above array bounds [-Warray-bounds] Adjust loop condition in ctl_close_sock() to fix warning. Adjust array acccess in ctl_close() to actually access the array member. Signed-off-by: Olaf Hering Acked-by: Ian Jackson Committed-by: Keir Fraser --- diff -r ca02580986d2 -r 83a02f225bde tools/blktap2/drivers/block-log.c --- a/tools/blktap2/drivers/block-log.c Thu May 10 11:19:05 2012 +0100 +++ b/tools/blktap2/drivers/block-log.c Thu May 10 11:20:04 2012 +0100 @@ -324,11 +324,11 @@ static int ctl_open(struct tdlog_state* static int ctl_close(struct tdlog_state* s) { while (s->connected) { + s->connected--; tapdisk_server_unregister_event(s->connections[s->connected].id); close(s->connections[s->connected].fd); s->connections[s->connected].fd = -1; s->connections[s->connected].id = 0; - s->connected--; } if (s->ctl.fd >= 0) { @@ -359,7 +359,7 @@ static int ctl_close_sock(struct tdlog_s { int i; - for (i = 0; i <= s->connected; i++) { + for (i = 0; i < s->connected; i++) { if (s->connections[i].fd == fd) { tapdisk_server_unregister_event(s->connections[i].id); close(s->connections[i].fd); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:25 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC9-0003vi-Na; Mon, 14 May 2012 16:32:25 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC8-0003YO-1G for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:24 +0000 Received: from [85.158.143.99:2252] by server-1.bemta-4.messagelabs.com id 4E/D8-20925-79331BF4; Mon, 14 May 2012 16:32:23 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-216.messagelabs.com!1337013141!27931142!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2852 invoked from network); 14 May 2012 16:32:21 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC4-0002sB-SB for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyC4-0006gO-RY for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:20 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:20 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xl: xl.cfg: fix typo in opengl section X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Olaf Hering # Date 1336406048 -7200 # Node ID ba9fc0cb26b7104cdb85b3e5563253c2d949a90a # Parent 3a71173d20e1249856ef4bf6a12e638e100e90f5 xl: xl.cfg: fix typo in opengl section Add missing i to qemu-xen-traditonal Signed-off-by: Olaf Hering Committed-by: Ian Jackson Acked-by: Ian Campbell --- diff -r 3a71173d20e1 -r ba9fc0cb26b7 docs/man/xl.cfg.pod.5 --- a/docs/man/xl.cfg.pod.5 Thu May 10 11:58:33 2012 +0100 +++ b/docs/man/xl.cfg.pod.5 Mon May 07 17:54:08 2012 +0200 @@ -278,7 +278,7 @@ Simple DirectMedia Layer). The default i =item C Enable OpenGL acceleration of the SDL display. Only effects machines -using C and only if the +using C and only if the device-model was compiled with OpenGL support. Disabled by default. =item C _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:25 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC9-0003vi-Na; Mon, 14 May 2012 16:32:25 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC8-0003YO-1G for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:24 +0000 Received: from [85.158.143.99:2252] by server-1.bemta-4.messagelabs.com id 4E/D8-20925-79331BF4; Mon, 14 May 2012 16:32:23 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-216.messagelabs.com!1337013141!27931142!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2852 invoked from network); 14 May 2012 16:32:21 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC4-0002sB-SB for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyC4-0006gO-RY for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:20 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:20 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xl: xl.cfg: fix typo in opengl section X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Olaf Hering # Date 1336406048 -7200 # Node ID ba9fc0cb26b7104cdb85b3e5563253c2d949a90a # Parent 3a71173d20e1249856ef4bf6a12e638e100e90f5 xl: xl.cfg: fix typo in opengl section Add missing i to qemu-xen-traditonal Signed-off-by: Olaf Hering Committed-by: Ian Jackson Acked-by: Ian Campbell --- diff -r 3a71173d20e1 -r ba9fc0cb26b7 docs/man/xl.cfg.pod.5 --- a/docs/man/xl.cfg.pod.5 Thu May 10 11:58:33 2012 +0100 +++ b/docs/man/xl.cfg.pod.5 Mon May 07 17:54:08 2012 +0200 @@ -278,7 +278,7 @@ Simple DirectMedia Layer). The default i =item C Enable OpenGL acceleration of the SDL display. Only effects machines -using C and only if the +using C and only if the device-model was compiled with OpenGL support. Disabled by default. =item C _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:26 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC9-0003w1-SD; Mon, 14 May 2012 16:32:25 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC8-0003rX-AK for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:24 +0000 Received: from [85.158.143.99:60005] by server-2.bemta-4.messagelabs.com id 2B/3D-17550-79331BF4; Mon, 14 May 2012 16:32:23 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-216.messagelabs.com!1337013139!27977199!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13119 invoked from network); 14 May 2012 16:32:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC3-0002rv-Au for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyC3-0006ff-AB for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:19 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:18 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] blktap2: Fix uninitialised value error. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Keir Fraser # Date 1336645319 -3600 # Node ID cb82b5aa73bd1fbc36920afb2dbaf6207b8aa0b4 # Parent 83a02f225bde5ca7c51a483381cfc4ce5eae9800 blktap2: Fix uninitialised value error. Signed-off-by: Keir Fraser --- diff -r 83a02f225bde -r cb82b5aa73bd tools/blktap2/drivers/block-qcow.c --- a/tools/blktap2/drivers/block-qcow.c Thu May 10 11:20:04 2012 +0100 +++ b/tools/blktap2/drivers/block-qcow.c Thu May 10 11:21:59 2012 +0100 @@ -1428,7 +1428,7 @@ int tdqcow_get_parent_id(td_driver_t *dr { off_t off; char *buf, *filename; - int len, secs, type, err = -EINVAL; + int len, secs, type = 0, err = -EINVAL; struct tdqcow_state *child = (struct tdqcow_state *)driver->data; if (!child->backing_file_offset) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:26 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC9-0003w1-SD; Mon, 14 May 2012 16:32:25 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC8-0003rX-AK for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:24 +0000 Received: from [85.158.143.99:60005] by server-2.bemta-4.messagelabs.com id 2B/3D-17550-79331BF4; Mon, 14 May 2012 16:32:23 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-216.messagelabs.com!1337013139!27977199!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13119 invoked from network); 14 May 2012 16:32:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC3-0002rv-Au for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyC3-0006ff-AB for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:19 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:18 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] blktap2: Fix uninitialised value error. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Keir Fraser # Date 1336645319 -3600 # Node ID cb82b5aa73bd1fbc36920afb2dbaf6207b8aa0b4 # Parent 83a02f225bde5ca7c51a483381cfc4ce5eae9800 blktap2: Fix uninitialised value error. Signed-off-by: Keir Fraser --- diff -r 83a02f225bde -r cb82b5aa73bd tools/blktap2/drivers/block-qcow.c --- a/tools/blktap2/drivers/block-qcow.c Thu May 10 11:20:04 2012 +0100 +++ b/tools/blktap2/drivers/block-qcow.c Thu May 10 11:21:59 2012 +0100 @@ -1428,7 +1428,7 @@ int tdqcow_get_parent_id(td_driver_t *dr { off_t off; char *buf, *filename; - int len, secs, type, err = -EINVAL; + int len, secs, type = 0, err = -EINVAL; struct tdqcow_state *child = (struct tdqcow_state *)driver->data; if (!child->backing_file_offset) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCB-0003yo-34; Mon, 14 May 2012 16:32:27 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC9-0003ts-Cj for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:25 +0000 Received: from [85.158.138.51:31011] by server-9.bemta-3.messagelabs.com id C8/B0-26691-89331BF4; Mon, 14 May 2012 16:32:24 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-174.messagelabs.com!1337013142!8368099!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24787 invoked from network); 14 May 2012 16:32:23 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC6-0002sQ-Cm for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyC6-0006h7-C8 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:22 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:21 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] MAINTAINERS: add Ian Campbell as a tools maintainer X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1336648756 -3600 # Node ID 81088df89e80b960ba922e4b82fcc504d86cb499 # Parent deee8230f784967548bb5785d78d371afedc9f63 MAINTAINERS: add Ian Campbell as a tools maintainer Signed-off-by: Ian Campbell Committed-by: Ian Jackson Acked-by: Stefano Stabellini Acked-by: Ian Jackson --- diff -r deee8230f784 -r 81088df89e80 MAINTAINERS --- a/MAINTAINERS Tue May 08 14:24:31 2012 +0100 +++ b/MAINTAINERS Thu May 10 12:19:16 2012 +0100 @@ -217,6 +217,7 @@ F: stubdom/ TOOLSTACK M: Ian Jackson M: Stefano Stabellini +M: Ian Campbell S: Supported F: tools/ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCB-0003yo-34; Mon, 14 May 2012 16:32:27 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC9-0003ts-Cj for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:25 +0000 Received: from [85.158.138.51:31011] by server-9.bemta-3.messagelabs.com id C8/B0-26691-89331BF4; Mon, 14 May 2012 16:32:24 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-174.messagelabs.com!1337013142!8368099!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24787 invoked from network); 14 May 2012 16:32:23 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC6-0002sQ-Cm for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyC6-0006h7-C8 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:22 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:21 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] MAINTAINERS: add Ian Campbell as a tools maintainer X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1336648756 -3600 # Node ID 81088df89e80b960ba922e4b82fcc504d86cb499 # Parent deee8230f784967548bb5785d78d371afedc9f63 MAINTAINERS: add Ian Campbell as a tools maintainer Signed-off-by: Ian Campbell Committed-by: Ian Jackson Acked-by: Stefano Stabellini Acked-by: Ian Jackson --- diff -r deee8230f784 -r 81088df89e80 MAINTAINERS --- a/MAINTAINERS Tue May 08 14:24:31 2012 +0100 +++ b/MAINTAINERS Thu May 10 12:19:16 2012 +0100 @@ -217,6 +217,7 @@ F: stubdom/ TOOLSTACK M: Ian Jackson M: Stefano Stabellini +M: Ian Campbell S: Supported F: tools/ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCB-0003zJ-7e; Mon, 14 May 2012 16:32:27 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC9-0003de-Bq for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:25 +0000 Received: from [85.158.139.83:30211] by server-7.bemta-5.messagelabs.com id B7/86-16195-69331BF4; Mon, 14 May 2012 16:32:22 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-182.messagelabs.com!1337013140!28326095!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4887 invoked from network); 14 May 2012 16:32:21 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC3-0002s0-RD for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyC3-0006fu-Qa for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:19 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:19 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] blktap2: Do not build with -O0 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Keir Fraser # Date 1336645338 -3600 # Node ID 27d63b9f111abc7c61a213e8d714f6df81d11f73 # Parent cb82b5aa73bd1fbc36920afb2dbaf6207b8aa0b4 blktap2: Do not build with -O0 Signed-off-by: Keir Fraser --- diff -r cb82b5aa73bd -r 27d63b9f111a tools/blktap2/drivers/Makefile --- a/tools/blktap2/drivers/Makefile Thu May 10 11:21:59 2012 +0100 +++ b/tools/blktap2/drivers/Makefile Thu May 10 11:22:18 2012 +0100 @@ -9,7 +9,7 @@ QCOW_UTIL = img2qcow qcow-create qcow2r LOCK_UTIL = lock-util INST_DIR = $(SBINDIR) -CFLAGS += -Werror -g -O0 +CFLAGS += -Werror -g CFLAGS += -Wno-unused CFLAGS += -fno-strict-aliasing CFLAGS += -I$(BLKTAP_ROOT)/include -I$(BLKTAP_ROOT)/drivers _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCB-0003zn-B6; Mon, 14 May 2012 16:32:27 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC9-0003uT-Io for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:25 +0000 Received: from [85.158.138.51:31040] by server-10.bemta-3.messagelabs.com id 19/85-29478-89331BF4; Mon, 14 May 2012 16:32:24 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-174.messagelabs.com!1337013143!25291998!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28210 invoked from network); 14 May 2012 16:32:24 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC6-0002sV-T0 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyC6-0006hM-SP for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:22 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:22 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] blktap2: Fix another uninitialised value error X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1336656374 -3600 # Node ID 60064411a8a9b68136e16ae5abdd98410745d5c7 # Parent 81088df89e80b960ba922e4b82fcc504d86cb499 blktap2: Fix another uninitialised value error gcc -O1 -fno-omit-frame-pointer -m32 -march=i686 -g -fno-strict-aliasing -std=gnu99 -Wall -Wstrict-prototypes -Wdeclaration-after-statement -D__XEN_TOOLS__ -MMD -MF .block-remus.o.d -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -fno-optimize-sibling-calls -mno-tls-direct-seg-refs -Werror -g -Wno-unused -fno-strict-aliasing -I../include -I../drivers -I/home/osstest/build.12828.build-i386/xen-unstable/tools/blktap2/drivers/../../../tools/libxc -I/home/osstest/build.12828.build-i386/xen-unstable/tools/blktap2/drivers/../../../tools/include -D_GNU_SOURCE -DUSE_NFS_LOCKS -c -o block-remus.o block-remus.c block-remus.c: In function 'ramdisk_flush': block-remus.c:508: error: 'buf' may be used uninitialized in this function make[5]: *** [block-remus.o] Error 1 This is because gcc can see that merge_requests doesn't always set *mergedbuf but gcc isn't able to prove that it always does so if merge_requests returns 0 and that in that case the value of ramdisk_flush::buf isn't used. This is too useful a warning to disable, despite the occasional false positive of this form. The conventional approach is to suppress the warning by explicitly initialising the variable to 0. This has just come to light because 25275:27d63b9f111a reenabled optimisation for this area of code, and gcc's data flow analysis (which is required to trigger the uninitialised variable warning) only occurs when optimisation is turned on. Signed-off-by: Ian Jackson --- diff -r 81088df89e80 -r 60064411a8a9 tools/blktap2/drivers/block-remus.c --- a/tools/blktap2/drivers/block-remus.c Thu May 10 12:19:16 2012 +0100 +++ b/tools/blktap2/drivers/block-remus.c Thu May 10 14:26:14 2012 +0100 @@ -505,7 +505,7 @@ fail: static int ramdisk_flush(td_driver_t *driver, struct tdremus_state* s) { uint64_t* sectors; - char* buf; + char* buf = NULL; uint64_t base, batchlen; int i, j, count = 0; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCB-0003zn-B6; Mon, 14 May 2012 16:32:27 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC9-0003uT-Io for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:25 +0000 Received: from [85.158.138.51:31040] by server-10.bemta-3.messagelabs.com id 19/85-29478-89331BF4; Mon, 14 May 2012 16:32:24 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-174.messagelabs.com!1337013143!25291998!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28210 invoked from network); 14 May 2012 16:32:24 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC6-0002sV-T0 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyC6-0006hM-SP for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:22 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:22 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] blktap2: Fix another uninitialised value error X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1336656374 -3600 # Node ID 60064411a8a9b68136e16ae5abdd98410745d5c7 # Parent 81088df89e80b960ba922e4b82fcc504d86cb499 blktap2: Fix another uninitialised value error gcc -O1 -fno-omit-frame-pointer -m32 -march=i686 -g -fno-strict-aliasing -std=gnu99 -Wall -Wstrict-prototypes -Wdeclaration-after-statement -D__XEN_TOOLS__ -MMD -MF .block-remus.o.d -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -fno-optimize-sibling-calls -mno-tls-direct-seg-refs -Werror -g -Wno-unused -fno-strict-aliasing -I../include -I../drivers -I/home/osstest/build.12828.build-i386/xen-unstable/tools/blktap2/drivers/../../../tools/libxc -I/home/osstest/build.12828.build-i386/xen-unstable/tools/blktap2/drivers/../../../tools/include -D_GNU_SOURCE -DUSE_NFS_LOCKS -c -o block-remus.o block-remus.c block-remus.c: In function 'ramdisk_flush': block-remus.c:508: error: 'buf' may be used uninitialized in this function make[5]: *** [block-remus.o] Error 1 This is because gcc can see that merge_requests doesn't always set *mergedbuf but gcc isn't able to prove that it always does so if merge_requests returns 0 and that in that case the value of ramdisk_flush::buf isn't used. This is too useful a warning to disable, despite the occasional false positive of this form. The conventional approach is to suppress the warning by explicitly initialising the variable to 0. This has just come to light because 25275:27d63b9f111a reenabled optimisation for this area of code, and gcc's data flow analysis (which is required to trigger the uninitialised variable warning) only occurs when optimisation is turned on. Signed-off-by: Ian Jackson --- diff -r 81088df89e80 -r 60064411a8a9 tools/blktap2/drivers/block-remus.c --- a/tools/blktap2/drivers/block-remus.c Thu May 10 12:19:16 2012 +0100 +++ b/tools/blktap2/drivers/block-remus.c Thu May 10 14:26:14 2012 +0100 @@ -505,7 +505,7 @@ fail: static int ramdisk_flush(td_driver_t *driver, struct tdremus_state* s) { uint64_t* sectors; - char* buf; + char* buf = NULL; uint64_t base, batchlen; int i, j, count = 0; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCB-0003zJ-7e; Mon, 14 May 2012 16:32:27 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC9-0003de-Bq for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:25 +0000 Received: from [85.158.139.83:30211] by server-7.bemta-5.messagelabs.com id B7/86-16195-69331BF4; Mon, 14 May 2012 16:32:22 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-182.messagelabs.com!1337013140!28326095!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4887 invoked from network); 14 May 2012 16:32:21 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC3-0002s0-RD for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyC3-0006fu-Qa for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:19 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:19 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] blktap2: Do not build with -O0 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Keir Fraser # Date 1336645338 -3600 # Node ID 27d63b9f111abc7c61a213e8d714f6df81d11f73 # Parent cb82b5aa73bd1fbc36920afb2dbaf6207b8aa0b4 blktap2: Do not build with -O0 Signed-off-by: Keir Fraser --- diff -r cb82b5aa73bd -r 27d63b9f111a tools/blktap2/drivers/Makefile --- a/tools/blktap2/drivers/Makefile Thu May 10 11:21:59 2012 +0100 +++ b/tools/blktap2/drivers/Makefile Thu May 10 11:22:18 2012 +0100 @@ -9,7 +9,7 @@ QCOW_UTIL = img2qcow qcow-create qcow2r LOCK_UTIL = lock-util INST_DIR = $(SBINDIR) -CFLAGS += -Werror -g -O0 +CFLAGS += -Werror -g CFLAGS += -Wno-unused CFLAGS += -fno-strict-aliasing CFLAGS += -I$(BLKTAP_ROOT)/include -I$(BLKTAP_ROOT)/drivers _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCB-00040J-Iq; Mon, 14 May 2012 16:32:27 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCA-0003vx-Aw for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:26 +0000 Received: from [85.158.139.83:30427] by server-5.bemta-5.messagelabs.com id E3/32-13566-99331BF4; Mon, 14 May 2012 16:32:25 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-182.messagelabs.com!1337013142!17067999!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32345 invoked from network); 14 May 2012 16:32:23 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC5-0002sL-TF for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyC5-0006gs-SB for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:21 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:21 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: log failure from libxl__blktap_devpath in libxl_device_disk_add X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1336483471 -3600 # Node ID deee8230f784967548bb5785d78d371afedc9f63 # Parent fd2a63f58481c495dce41584e289a64e1bc04efc libxl: log failure from libxl__blktap_devpath in libxl_device_disk_add Signed-off-by: Ian Campbell Committed-by: Ian Jackson Acked-by: Ian Jackson --- diff -r fd2a63f58481 -r deee8230f784 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Thu May 10 12:19:15 2012 +0100 +++ b/tools/libxl/libxl.c Tue May 08 14:24:31 2012 +0100 @@ -1351,6 +1351,8 @@ int libxl_device_disk_add(libxl_ctx *ctx case LIBXL_DISK_BACKEND_TAP: dev = libxl__blktap_devpath(gc, disk->pdev_path, disk->format); if (!dev) { + LOG(ERROR, "failed to get blktap devpath for %p\n", + disk->pdev_path); rc = ERROR_FAIL; goto out_free; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCB-00040J-Iq; Mon, 14 May 2012 16:32:27 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCA-0003vx-Aw for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:26 +0000 Received: from [85.158.139.83:30427] by server-5.bemta-5.messagelabs.com id E3/32-13566-99331BF4; Mon, 14 May 2012 16:32:25 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-182.messagelabs.com!1337013142!17067999!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32345 invoked from network); 14 May 2012 16:32:23 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC5-0002sL-TF for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyC5-0006gs-SB for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:21 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:21 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: log failure from libxl__blktap_devpath in libxl_device_disk_add X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1336483471 -3600 # Node ID deee8230f784967548bb5785d78d371afedc9f63 # Parent fd2a63f58481c495dce41584e289a64e1bc04efc libxl: log failure from libxl__blktap_devpath in libxl_device_disk_add Signed-off-by: Ian Campbell Committed-by: Ian Jackson Acked-by: Ian Jackson --- diff -r fd2a63f58481 -r deee8230f784 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Thu May 10 12:19:15 2012 +0100 +++ b/tools/libxl/libxl.c Tue May 08 14:24:31 2012 +0100 @@ -1351,6 +1351,8 @@ int libxl_device_disk_add(libxl_ctx *ctx case LIBXL_DISK_BACKEND_TAP: dev = libxl__blktap_devpath(gc, disk->pdev_path, disk->format); if (!dev) { + LOG(ERROR, "failed to get blktap devpath for %p\n", + disk->pdev_path); rc = ERROR_FAIL; goto out_free; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:28 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCC-00042P-8B; Mon, 14 May 2012 16:32:28 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCA-0003vt-AI for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:26 +0000 Received: from [85.158.138.51:32634] by server-6.bemta-3.messagelabs.com id E7/0F-05145-99331BF4; Mon, 14 May 2012 16:32:25 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-174.messagelabs.com!1337013143!25291999!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28244 invoked from network); 14 May 2012 16:32:24 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC7-0002sZ-DP for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyC7-0006hb-CU for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:23 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:22 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] tools/vtpm_manager: add missing DESTDIR to install rule X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Olaf Hering # Date 1336146040 -7200 # Node ID 96a6f10c9b37c397292fe1169cc871b55808d583 # Parent 60064411a8a9b68136e16ae5abdd98410745d5c7 tools/vtpm_manager: add missing DESTDIR to install rule Signed-off-by: Olaf Hering Committed-by: Ian Jackson Acked-by: Ian Jackson --- diff -r 60064411a8a9 -r 96a6f10c9b37 tools/vtpm_manager/manager/Makefile --- a/tools/vtpm_manager/manager/Makefile Thu May 10 14:26:14 2012 +0100 +++ b/tools/vtpm_manager/manager/Makefile Fri May 04 17:40:40 2012 +0200 @@ -17,7 +17,7 @@ install: build if [ ! -d "$(DESTDIR)/var/vtpm/socks" ]; \ then mkdir -p $(DESTDIR)/var/vtpm/socks; \ fi - $(INSTALL_PROG) $(BIN) $(BINDIR) + $(INSTALL_PROG) $(BIN) $(DESTDIR)$(BINDIR) .PHONY: clean clean: diff -r 60064411a8a9 -r 96a6f10c9b37 tools/vtpm_manager/migration/Makefile --- a/tools/vtpm_manager/migration/Makefile Thu May 10 14:26:14 2012 +0100 +++ b/tools/vtpm_manager/migration/Makefile Fri May 04 17:40:40 2012 +0200 @@ -20,8 +20,8 @@ build: $(BIND) $(BINC) .PHONY: install install: build - $(INSTALL_PROG) $(BIND) $(BINDIR) - $(INSTALL_PROG) $(BINC) $(BINDIR) + $(INSTALL_PROG) $(BIND) $(DESTDIR)$(BINDIR) + $(INSTALL_PROG) $(BINC) $(DESTDIR)$(BINDIR) .PHONY: clean clean: _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:28 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCC-00042j-Cd; Mon, 14 May 2012 16:32:28 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCA-0003rX-GJ for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:26 +0000 Received: from [85.158.143.35:10408] by server-2.bemta-4.messagelabs.com id B3/4D-17550-A9331BF4; Mon, 14 May 2012 16:32:26 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-21.messagelabs.com!1337013144!4928447!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26541 invoked from network); 14 May 2012 16:32:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC8-0002sl-DD for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyC8-0006i5-CY for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:24 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:23 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] tools/vtpm: use LDLIBS to pass -lgmp X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Olaf Hering # Date 1336153405 -7200 # Node ID 3314ed4b12bacf134a1e6df8e54c62e1eb864295 # Parent 7d3d3fece2373fccc4ae1252a50619fb082639a1 tools/vtpm: use LDLIBS to pass -lgmp Linking tpmd will fail with recent toolchains because -lgmp is passed via LDFLAGS instead of LDLIBS. With this change -lgpm is placed at the end of the gcc cmdline and linking tpmd succeeds again. Signed-off-by: Olaf Hering Committed-by: Ian Jackson --- diff -r 7d3d3fece237 -r 3314ed4b12ba tools/vtpm/Makefile --- a/tools/vtpm/Makefile Fri May 04 19:38:02 2012 +0200 +++ b/tools/vtpm/Makefile Fri May 04 19:43:25 2012 +0200 @@ -50,7 +50,8 @@ mrproper: mv $(TPM_EMULATOR_NAME) $(VTPM_DIR) set -e; cd $(VTPM_DIR); \ - patch -p1 < ../vtpm-0.5.1.patch + patch -p1 < ../vtpm-0.5.1.patch; \ + patch -p1 < ../vtpm-0.5.1-LDLIBS.patch orig: $(TPM_EMULATOR_TARFILE) mkdir $(ORIG_DIR); diff -r 7d3d3fece237 -r 3314ed4b12ba tools/vtpm/vtpm-0.5.1-LDLIBS.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/vtpm/vtpm-0.5.1-LDLIBS.patch Fri May 04 19:43:25 2012 +0200 @@ -0,0 +1,12 @@ +diff -Naurp tpm_emulator-0.5.1/tpmd/Makefile tpm_emulator-0.5.1/tpmd/Makefile +--- tpm_emulator-0.5.1/tpmd/Makefile ++++ tpm_emulator-0.5.1/tpmd/Makefile +@@ -8,7 +8,7 @@ WFLAGS := -Wall -Wno-unused -Wpointer-a + #WFLAGS += -Wextra -Wcast-qual -Wmissing-prototypes -Wmissing-declarations -Wstrict-aliasing + CFLAGS += $(WFLAGS) -g -I.. -I. -O2 -fno-strict-aliasing + CFLAGS += -I../../../../tools/vtpm_manager/manager +-LDFLAGS += -lgmp ++LDLIBS += -lgmp + + BINDIR := /usr/bin/ + _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:28 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCC-00042P-8B; Mon, 14 May 2012 16:32:28 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCA-0003vt-AI for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:26 +0000 Received: from [85.158.138.51:32634] by server-6.bemta-3.messagelabs.com id E7/0F-05145-99331BF4; Mon, 14 May 2012 16:32:25 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-174.messagelabs.com!1337013143!25291999!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28244 invoked from network); 14 May 2012 16:32:24 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC7-0002sZ-DP for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyC7-0006hb-CU for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:23 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:22 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] tools/vtpm_manager: add missing DESTDIR to install rule X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Olaf Hering # Date 1336146040 -7200 # Node ID 96a6f10c9b37c397292fe1169cc871b55808d583 # Parent 60064411a8a9b68136e16ae5abdd98410745d5c7 tools/vtpm_manager: add missing DESTDIR to install rule Signed-off-by: Olaf Hering Committed-by: Ian Jackson Acked-by: Ian Jackson --- diff -r 60064411a8a9 -r 96a6f10c9b37 tools/vtpm_manager/manager/Makefile --- a/tools/vtpm_manager/manager/Makefile Thu May 10 14:26:14 2012 +0100 +++ b/tools/vtpm_manager/manager/Makefile Fri May 04 17:40:40 2012 +0200 @@ -17,7 +17,7 @@ install: build if [ ! -d "$(DESTDIR)/var/vtpm/socks" ]; \ then mkdir -p $(DESTDIR)/var/vtpm/socks; \ fi - $(INSTALL_PROG) $(BIN) $(BINDIR) + $(INSTALL_PROG) $(BIN) $(DESTDIR)$(BINDIR) .PHONY: clean clean: diff -r 60064411a8a9 -r 96a6f10c9b37 tools/vtpm_manager/migration/Makefile --- a/tools/vtpm_manager/migration/Makefile Thu May 10 14:26:14 2012 +0100 +++ b/tools/vtpm_manager/migration/Makefile Fri May 04 17:40:40 2012 +0200 @@ -20,8 +20,8 @@ build: $(BIND) $(BINC) .PHONY: install install: build - $(INSTALL_PROG) $(BIND) $(BINDIR) - $(INSTALL_PROG) $(BINC) $(BINDIR) + $(INSTALL_PROG) $(BIND) $(DESTDIR)$(BINDIR) + $(INSTALL_PROG) $(BINC) $(DESTDIR)$(BINDIR) .PHONY: clean clean: _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:28 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCC-00042j-Cd; Mon, 14 May 2012 16:32:28 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCA-0003rX-GJ for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:26 +0000 Received: from [85.158.143.35:10408] by server-2.bemta-4.messagelabs.com id B3/4D-17550-A9331BF4; Mon, 14 May 2012 16:32:26 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-21.messagelabs.com!1337013144!4928447!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26541 invoked from network); 14 May 2012 16:32:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC8-0002sl-DD for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyC8-0006i5-CY for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:24 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:23 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] tools/vtpm: use LDLIBS to pass -lgmp X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Olaf Hering # Date 1336153405 -7200 # Node ID 3314ed4b12bacf134a1e6df8e54c62e1eb864295 # Parent 7d3d3fece2373fccc4ae1252a50619fb082639a1 tools/vtpm: use LDLIBS to pass -lgmp Linking tpmd will fail with recent toolchains because -lgmp is passed via LDFLAGS instead of LDLIBS. With this change -lgpm is placed at the end of the gcc cmdline and linking tpmd succeeds again. Signed-off-by: Olaf Hering Committed-by: Ian Jackson --- diff -r 7d3d3fece237 -r 3314ed4b12ba tools/vtpm/Makefile --- a/tools/vtpm/Makefile Fri May 04 19:38:02 2012 +0200 +++ b/tools/vtpm/Makefile Fri May 04 19:43:25 2012 +0200 @@ -50,7 +50,8 @@ mrproper: mv $(TPM_EMULATOR_NAME) $(VTPM_DIR) set -e; cd $(VTPM_DIR); \ - patch -p1 < ../vtpm-0.5.1.patch + patch -p1 < ../vtpm-0.5.1.patch; \ + patch -p1 < ../vtpm-0.5.1-LDLIBS.patch orig: $(TPM_EMULATOR_TARFILE) mkdir $(ORIG_DIR); diff -r 7d3d3fece237 -r 3314ed4b12ba tools/vtpm/vtpm-0.5.1-LDLIBS.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/vtpm/vtpm-0.5.1-LDLIBS.patch Fri May 04 19:43:25 2012 +0200 @@ -0,0 +1,12 @@ +diff -Naurp tpm_emulator-0.5.1/tpmd/Makefile tpm_emulator-0.5.1/tpmd/Makefile +--- tpm_emulator-0.5.1/tpmd/Makefile ++++ tpm_emulator-0.5.1/tpmd/Makefile +@@ -8,7 +8,7 @@ WFLAGS := -Wall -Wno-unused -Wpointer-a + #WFLAGS += -Wextra -Wcast-qual -Wmissing-prototypes -Wmissing-declarations -Wstrict-aliasing + CFLAGS += $(WFLAGS) -g -I.. -I. -O2 -fno-strict-aliasing + CFLAGS += -I../../../../tools/vtpm_manager/manager +-LDFLAGS += -lgmp ++LDLIBS += -lgmp + + BINDIR := /usr/bin/ + _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:29 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCC-00043K-Lq; Mon, 14 May 2012 16:32:28 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCA-0003xB-Na for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:26 +0000 Received: from [85.158.138.51:31141] by server-2.bemta-3.messagelabs.com id C9/96-09269-99331BF4; Mon, 14 May 2012 16:32:25 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-174.messagelabs.com!1337013144!23011883!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18516 invoked from network); 14 May 2012 16:32:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC7-0002sf-Th for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyC7-0006hq-Sx for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:23 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:23 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] tools/hotplug: remove 4 from default runlevel in init scripts X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Olaf Hering # Date 1336153082 -7200 # Node ID 7d3d3fece2373fccc4ae1252a50619fb082639a1 # Parent 96a6f10c9b37c397292fe1169cc871b55808d583 tools/hotplug: remove 4 from default runlevel in init scripts Remove 4 from default runlevel in xen-watchdog, xend and xendomains. Similar to what changeset 24847:0900b1c905f1 does in xencommons, remove runlevel 4 from the other runlevel scripts. LSB defines runlevel 4 as reserved for local use, the local sysadmin is responsible for symlink creation in rc4.d. Runlevel 4 was specified in Default-Start since a very long time. Then it was copied also to the new xen-watchdog in 21861:fb3649141e19. Until now this was not an issue since only xencommons is automatically enabled during package install, and a custom xend and xendomains script is included in the SuSE packages. Since some time a rpmlint check complains about the wrong Default-Start entry in xen-watchdog. Signed-off-by: Olaf Hering Committed-by: Ian Jackson --- diff -r 96a6f10c9b37 -r 7d3d3fece237 tools/hotplug/Linux/init.d/xen-watchdog --- a/tools/hotplug/Linux/init.d/xen-watchdog Fri May 04 17:40:40 2012 +0200 +++ b/tools/hotplug/Linux/init.d/xen-watchdog Fri May 04 19:38:02 2012 +0200 @@ -10,7 +10,7 @@ # Should-Start: xend # Required-Stop: $syslog $remote_fs # Should-Stop: xend -# Default-Start: 2 3 4 5 +# Default-Start: 2 3 5 # Default-Stop: 0 1 6 # Short-Description: Start/stop xen-watchdog # Description: Run domain watchdog daemon. diff -r 96a6f10c9b37 -r 7d3d3fece237 tools/hotplug/Linux/init.d/xend --- a/tools/hotplug/Linux/init.d/xend Fri May 04 17:40:40 2012 +0200 +++ b/tools/hotplug/Linux/init.d/xend Fri May 04 19:38:02 2012 +0200 @@ -12,7 +12,7 @@ # Should-Start: # Required-Stop: $syslog $remote_fs xenstored xenconsoled # Should-Stop: -# Default-Start: 2 3 4 5 +# Default-Start: 2 3 5 # Default-Stop: 0 1 6 # Short-Description: Start/stop xend # Description: Starts and stops the Xen control daemon. diff -r 96a6f10c9b37 -r 7d3d3fece237 tools/hotplug/Linux/init.d/xendomains --- a/tools/hotplug/Linux/init.d/xendomains Fri May 04 17:40:40 2012 +0200 +++ b/tools/hotplug/Linux/init.d/xendomains Fri May 04 19:38:02 2012 +0200 @@ -20,7 +20,7 @@ # Should-Start: xend # Required-Stop: $syslog $remote_fs xenstored xenconsoled # Should-Stop: xend -# Default-Start: 2 3 4 5 +# Default-Start: 2 3 5 # Default-Stop: 0 1 6 # Short-Description: Start/stop secondary xen domains # Description: Start / stop domains automatically when domain 0 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:29 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCC-00043K-Lq; Mon, 14 May 2012 16:32:28 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCA-0003xB-Na for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:26 +0000 Received: from [85.158.138.51:31141] by server-2.bemta-3.messagelabs.com id C9/96-09269-99331BF4; Mon, 14 May 2012 16:32:25 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-174.messagelabs.com!1337013144!23011883!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18516 invoked from network); 14 May 2012 16:32:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC7-0002sf-Th for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyC7-0006hq-Sx for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:23 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:23 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] tools/hotplug: remove 4 from default runlevel in init scripts X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Olaf Hering # Date 1336153082 -7200 # Node ID 7d3d3fece2373fccc4ae1252a50619fb082639a1 # Parent 96a6f10c9b37c397292fe1169cc871b55808d583 tools/hotplug: remove 4 from default runlevel in init scripts Remove 4 from default runlevel in xen-watchdog, xend and xendomains. Similar to what changeset 24847:0900b1c905f1 does in xencommons, remove runlevel 4 from the other runlevel scripts. LSB defines runlevel 4 as reserved for local use, the local sysadmin is responsible for symlink creation in rc4.d. Runlevel 4 was specified in Default-Start since a very long time. Then it was copied also to the new xen-watchdog in 21861:fb3649141e19. Until now this was not an issue since only xencommons is automatically enabled during package install, and a custom xend and xendomains script is included in the SuSE packages. Since some time a rpmlint check complains about the wrong Default-Start entry in xen-watchdog. Signed-off-by: Olaf Hering Committed-by: Ian Jackson --- diff -r 96a6f10c9b37 -r 7d3d3fece237 tools/hotplug/Linux/init.d/xen-watchdog --- a/tools/hotplug/Linux/init.d/xen-watchdog Fri May 04 17:40:40 2012 +0200 +++ b/tools/hotplug/Linux/init.d/xen-watchdog Fri May 04 19:38:02 2012 +0200 @@ -10,7 +10,7 @@ # Should-Start: xend # Required-Stop: $syslog $remote_fs # Should-Stop: xend -# Default-Start: 2 3 4 5 +# Default-Start: 2 3 5 # Default-Stop: 0 1 6 # Short-Description: Start/stop xen-watchdog # Description: Run domain watchdog daemon. diff -r 96a6f10c9b37 -r 7d3d3fece237 tools/hotplug/Linux/init.d/xend --- a/tools/hotplug/Linux/init.d/xend Fri May 04 17:40:40 2012 +0200 +++ b/tools/hotplug/Linux/init.d/xend Fri May 04 19:38:02 2012 +0200 @@ -12,7 +12,7 @@ # Should-Start: # Required-Stop: $syslog $remote_fs xenstored xenconsoled # Should-Stop: -# Default-Start: 2 3 4 5 +# Default-Start: 2 3 5 # Default-Stop: 0 1 6 # Short-Description: Start/stop xend # Description: Starts and stops the Xen control daemon. diff -r 96a6f10c9b37 -r 7d3d3fece237 tools/hotplug/Linux/init.d/xendomains --- a/tools/hotplug/Linux/init.d/xendomains Fri May 04 17:40:40 2012 +0200 +++ b/tools/hotplug/Linux/init.d/xendomains Fri May 04 19:38:02 2012 +0200 @@ -20,7 +20,7 @@ # Should-Start: xend # Required-Stop: $syslog $remote_fs xenstored xenconsoled # Should-Stop: xend -# Default-Start: 2 3 4 5 +# Default-Start: 2 3 5 # Default-Stop: 0 1 6 # Short-Description: Start/stop secondary xen domains # Description: Start / stop domains automatically when domain 0 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:30 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCD-00046S-Rx; Mon, 14 May 2012 16:32:29 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCB-0003zr-R9 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:27 +0000 Received: from [85.158.143.35:10468] by server-3.bemta-4.messagelabs.com id 3C/1B-05853-B9331BF4; Mon, 14 May 2012 16:32:27 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-21.messagelabs.com!1337013145!12170317!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9397 invoked from network); 14 May 2012 16:32:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC9-0002t0-DK for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyC9-0006ia-CZ for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:25 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:24 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: fix indentation in libxl_dm.c for qemu X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Roger Pau Monne # Date 1336667639 -3600 # Node ID 453bd08998001bb0212f6c4101bb6228ef70da1b # Parent 8885452be593e503c5ca91a19412ec1eb69387c1 libxl: fix indentation in libxl_dm.c for qemu Fixed indentation on Qemu argument construction for network devices. Signed-off-by: Roger Pau Monne Committed-by: Ian Jackson Acked-by: Ian Jackson --- diff -r 8885452be593 -r 453bd0899800 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Thu May 10 17:33:58 2012 +0100 +++ b/tools/libxl/libxl_dm.c Thu May 10 17:33:59 2012 +0100 @@ -216,8 +216,10 @@ static char ** libxl__build_device_model else ifname = vifs[i].ifname; flexarray_vappend(dm_args, - "-net", libxl__sprintf(gc, "nic,vlan=%d,macaddr=%s,model=%s", - vifs[i].devid, smac, vifs[i].model), + "-net", + GCSPRINTF( + "nic,vlan=%d,macaddr=%s,model=%s", + vifs[i].devid, smac, vifs[i].model), "-net", GCSPRINTF( "tap,vlan=%d,ifname=%s,bridge=%s," _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:30 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCD-00046S-Rx; Mon, 14 May 2012 16:32:29 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCB-0003zr-R9 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:27 +0000 Received: from [85.158.143.35:10468] by server-3.bemta-4.messagelabs.com id 3C/1B-05853-B9331BF4; Mon, 14 May 2012 16:32:27 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-21.messagelabs.com!1337013145!12170317!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9397 invoked from network); 14 May 2012 16:32:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC9-0002t0-DK for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyC9-0006ia-CZ for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:25 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:24 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: fix indentation in libxl_dm.c for qemu X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Roger Pau Monne # Date 1336667639 -3600 # Node ID 453bd08998001bb0212f6c4101bb6228ef70da1b # Parent 8885452be593e503c5ca91a19412ec1eb69387c1 libxl: fix indentation in libxl_dm.c for qemu Fixed indentation on Qemu argument construction for network devices. Signed-off-by: Roger Pau Monne Committed-by: Ian Jackson Acked-by: Ian Jackson --- diff -r 8885452be593 -r 453bd0899800 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Thu May 10 17:33:58 2012 +0100 +++ b/tools/libxl/libxl_dm.c Thu May 10 17:33:59 2012 +0100 @@ -216,8 +216,10 @@ static char ** libxl__build_device_model else ifname = vifs[i].ifname; flexarray_vappend(dm_args, - "-net", libxl__sprintf(gc, "nic,vlan=%d,macaddr=%s,model=%s", - vifs[i].devid, smac, vifs[i].model), + "-net", + GCSPRINTF( + "nic,vlan=%d,macaddr=%s,model=%s", + vifs[i].devid, smac, vifs[i].model), "-net", GCSPRINTF( "tap,vlan=%d,ifname=%s,bridge=%s," _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:31 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCF-00049v-6s; Mon, 14 May 2012 16:32:31 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCC-00041u-FB for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:28 +0000 Received: from [193.109.254.147:43509] by server-3.bemta-14.messagelabs.com id 4E/51-23274-B9331BF4; Mon, 14 May 2012 16:32:27 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-27.messagelabs.com!1337013141!9183837!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2503 invoked from network); 14 May 2012 16:32:22 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC5-0002sE-CD for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyC5-0006gd-Ba for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:21 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:20 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: Fix incorrect return of OSEVENT_HOOK macro X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Daniel De Graaf # Date 1336648755 -3600 # Node ID fd2a63f58481c495dce41584e289a64e1bc04efc # Parent ba9fc0cb26b7104cdb85b3e5563253c2d949a90a libxl: Fix incorrect return of OSEVENT_HOOK macro The OSEVENT_HOOK_INTERN macro incorrectly returned the value of the expression CTX->osevent_in_hook-- (usually 1) instead of the value of the function call it made. Fix the macro to return the proper value. Signed-off-by: Daniel De Graaf Committed-by: Ian Jackson Acked-by: Ian Jackson --- diff -r ba9fc0cb26b7 -r fd2a63f58481 tools/libxl/libxl_event.c --- a/tools/libxl/libxl_event.c Mon May 07 17:54:08 2012 +0200 +++ b/tools/libxl/libxl_event.c Thu May 10 12:19:15 2012 +0100 @@ -27,18 +27,22 @@ * these macros, with the ctx locked. Likewise all the "occurred" * entrypoints from the application should assert(!in_hook); */ -#define OSEVENT_HOOK_INTERN(defval, hookname, ...) \ - (CTX->osevent_hooks \ - ? (CTX->osevent_in_hook++, \ - CTX->osevent_hooks->hookname(CTX->osevent_user, __VA_ARGS__), \ - CTX->osevent_in_hook--) \ - : defval) +#define OSEVENT_HOOK_INTERN(retval, hookname, ...) do { \ + if (CTX->osevent_hooks) { \ + CTX->osevent_in_hook++; \ + retval CTX->osevent_hooks->hookname(CTX->osevent_user, __VA_ARGS__); \ + CTX->osevent_in_hook--; \ + } \ +} while (0) -#define OSEVENT_HOOK(hookname,...) \ - OSEVENT_HOOK_INTERN(0, hookname, __VA_ARGS__) +#define OSEVENT_HOOK(hookname, ...) ({ \ + int osevent_hook_rc = 0; \ + OSEVENT_HOOK_INTERN(osevent_hook_rc = , hookname, __VA_ARGS__); \ + osevent_hook_rc; \ +}) -#define OSEVENT_HOOK_VOID(hookname,...) \ - OSEVENT_HOOK_INTERN((void)0, hookname, __VA_ARGS__) +#define OSEVENT_HOOK_VOID(hookname, ...) \ + OSEVENT_HOOK_INTERN(/* void */, hookname, __VA_ARGS__) /* * fd events _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:31 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCF-00049v-6s; Mon, 14 May 2012 16:32:31 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCC-00041u-FB for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:28 +0000 Received: from [193.109.254.147:43509] by server-3.bemta-14.messagelabs.com id 4E/51-23274-B9331BF4; Mon, 14 May 2012 16:32:27 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-27.messagelabs.com!1337013141!9183837!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2503 invoked from network); 14 May 2012 16:32:22 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC5-0002sE-CD for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyC5-0006gd-Ba for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:21 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:20 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: Fix incorrect return of OSEVENT_HOOK macro X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Daniel De Graaf # Date 1336648755 -3600 # Node ID fd2a63f58481c495dce41584e289a64e1bc04efc # Parent ba9fc0cb26b7104cdb85b3e5563253c2d949a90a libxl: Fix incorrect return of OSEVENT_HOOK macro The OSEVENT_HOOK_INTERN macro incorrectly returned the value of the expression CTX->osevent_in_hook-- (usually 1) instead of the value of the function call it made. Fix the macro to return the proper value. Signed-off-by: Daniel De Graaf Committed-by: Ian Jackson Acked-by: Ian Jackson --- diff -r ba9fc0cb26b7 -r fd2a63f58481 tools/libxl/libxl_event.c --- a/tools/libxl/libxl_event.c Mon May 07 17:54:08 2012 +0200 +++ b/tools/libxl/libxl_event.c Thu May 10 12:19:15 2012 +0100 @@ -27,18 +27,22 @@ * these macros, with the ctx locked. Likewise all the "occurred" * entrypoints from the application should assert(!in_hook); */ -#define OSEVENT_HOOK_INTERN(defval, hookname, ...) \ - (CTX->osevent_hooks \ - ? (CTX->osevent_in_hook++, \ - CTX->osevent_hooks->hookname(CTX->osevent_user, __VA_ARGS__), \ - CTX->osevent_in_hook--) \ - : defval) +#define OSEVENT_HOOK_INTERN(retval, hookname, ...) do { \ + if (CTX->osevent_hooks) { \ + CTX->osevent_in_hook++; \ + retval CTX->osevent_hooks->hookname(CTX->osevent_user, __VA_ARGS__); \ + CTX->osevent_in_hook--; \ + } \ +} while (0) -#define OSEVENT_HOOK(hookname,...) \ - OSEVENT_HOOK_INTERN(0, hookname, __VA_ARGS__) +#define OSEVENT_HOOK(hookname, ...) ({ \ + int osevent_hook_rc = 0; \ + OSEVENT_HOOK_INTERN(osevent_hook_rc = , hookname, __VA_ARGS__); \ + osevent_hook_rc; \ +}) -#define OSEVENT_HOOK_VOID(hookname,...) \ - OSEVENT_HOOK_INTERN((void)0, hookname, __VA_ARGS__) +#define OSEVENT_HOOK_VOID(hookname, ...) \ + OSEVENT_HOOK_INTERN(/* void */, hookname, __VA_ARGS__) /* * fd events _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:31 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCF-0004BB-Kg; Mon, 14 May 2012 16:32:31 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCD-0003rX-5P for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:29 +0000 Received: from [85.158.143.99:60318] by server-2.bemta-4.messagelabs.com id CF/4D-17550-C9331BF4; Mon, 14 May 2012 16:32:28 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-216.messagelabs.com!1337013146!18175407!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31365 invoked from network); 14 May 2012 16:32:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCA-0002tC-EE for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCA-0006j4-Da for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:26 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:25 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: use xc_topologyinfo to figure out how many CPUs we actually have X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Darrio Faggioli # Date 1336736383 -3600 # Node ID 7a4c6481fb38e4e3f859c9dcd9f88d977084e7a9 # Parent 54c8c9eaee9295f2790dc2fbb8f4094c13a4185e libxl: use xc_topologyinfo to figure out how many CPUs we actually have Within libxl_get_cpu_topology(), considering all the CPUs the hypervisor supports to be valid topology entries might lead to misleading and incorrect behaviours, e.g., the output of `xl info -n' below on a 16 cores machine: ... cpu_topology : cpu: core socket node 0: 0 1 0 1: 0 1 0 2: 1 1 0 3: 1 1 0 4: 9 1 0 5: 9 1 0 6: 10 1 0 7: 10 1 0 8: 0 0 1 9: 0 0 1 10: 1 0 1 11: 1 0 1 12: 9 0 1 13: 9 0 1 14: 10 0 1 15: 10 0 1 16: 0 0 0 17: 0 0 0 18: 0 0 0 19: 0 0 0 20: 0 0 0 ... ... 62: 0 0 0 63: 0 0 0 However, xc_topologyinfo() tells us (in max_cpu_index) how many entries arrays it returns corresponds to actually valid CPUs, so let's use that information. Signed-off-by: Dario Faggioli Committed-by: Ian Jackson --- diff -r 54c8c9eaee92 -r 7a4c6481fb38 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Fri Apr 27 11:09:26 2012 +0200 +++ b/tools/libxl/libxl.c Fri May 11 12:39:43 2012 +0100 @@ -2897,6 +2897,9 @@ libxl_cputopology *libxl_get_cpu_topolog goto fail; } + if (tinfo.max_cpu_index < max_cpus - 1) + max_cpus = tinfo.max_cpu_index + 1; + ret = malloc(sizeof(libxl_cputopology) * max_cpus); if (ret == NULL) { LIBXL__LOG_ERRNOVAL(ctx, XTL_ERROR, ENOMEM, _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:31 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCF-0004BB-Kg; Mon, 14 May 2012 16:32:31 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCD-0003rX-5P for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:29 +0000 Received: from [85.158.143.99:60318] by server-2.bemta-4.messagelabs.com id CF/4D-17550-C9331BF4; Mon, 14 May 2012 16:32:28 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-216.messagelabs.com!1337013146!18175407!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31365 invoked from network); 14 May 2012 16:32:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCA-0002tC-EE for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCA-0006j4-Da for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:26 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:25 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: use xc_topologyinfo to figure out how many CPUs we actually have X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Darrio Faggioli # Date 1336736383 -3600 # Node ID 7a4c6481fb38e4e3f859c9dcd9f88d977084e7a9 # Parent 54c8c9eaee9295f2790dc2fbb8f4094c13a4185e libxl: use xc_topologyinfo to figure out how many CPUs we actually have Within libxl_get_cpu_topology(), considering all the CPUs the hypervisor supports to be valid topology entries might lead to misleading and incorrect behaviours, e.g., the output of `xl info -n' below on a 16 cores machine: ... cpu_topology : cpu: core socket node 0: 0 1 0 1: 0 1 0 2: 1 1 0 3: 1 1 0 4: 9 1 0 5: 9 1 0 6: 10 1 0 7: 10 1 0 8: 0 0 1 9: 0 0 1 10: 1 0 1 11: 1 0 1 12: 9 0 1 13: 9 0 1 14: 10 0 1 15: 10 0 1 16: 0 0 0 17: 0 0 0 18: 0 0 0 19: 0 0 0 20: 0 0 0 ... ... 62: 0 0 0 63: 0 0 0 However, xc_topologyinfo() tells us (in max_cpu_index) how many entries arrays it returns corresponds to actually valid CPUs, so let's use that information. Signed-off-by: Dario Faggioli Committed-by: Ian Jackson --- diff -r 54c8c9eaee92 -r 7a4c6481fb38 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Fri Apr 27 11:09:26 2012 +0200 +++ b/tools/libxl/libxl.c Fri May 11 12:39:43 2012 +0100 @@ -2897,6 +2897,9 @@ libxl_cputopology *libxl_get_cpu_topolog goto fail; } + if (tinfo.max_cpu_index < max_cpus - 1) + max_cpus = tinfo.max_cpu_index + 1; + ret = malloc(sizeof(libxl_cputopology) * max_cpus); if (ret == NULL) { LIBXL__LOG_ERRNOVAL(ctx, XTL_ERROR, ENOMEM, _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:32 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCF-0004Bf-SQ; Mon, 14 May 2012 16:32:31 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCD-0003YO-2F for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:29 +0000 Received: from [85.158.143.99:60301] by server-1.bemta-4.messagelabs.com id 2F/E8-20925-C9331BF4; Mon, 14 May 2012 16:32:28 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-216.messagelabs.com!1337013146!27626237!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28977 invoked from network); 14 May 2012 16:32:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC9-0002t5-Tp for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyC9-0006ip-TB for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:25 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:25 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] docs: add vpmu description to xen-command-line.markdown X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Dietmar Hahn # Date 1335517766 -7200 # Node ID 54c8c9eaee9295f2790dc2fbb8f4094c13a4185e # Parent 453bd08998001bb0212f6c4101bb6228ef70da1b docs: add vpmu description to xen-command-line.markdown Add a short description to the vpmu boot option in the xen-command-line.markdown Signed-off-by: Dietmar Hahn Committed-by: Ian Jackson Acked-by: Ian Campbell --- diff -r 453bd0899800 -r 54c8c9eaee92 docs/misc/xen-command-line.markdown --- a/docs/misc/xen-command-line.markdown Thu May 10 17:33:59 2012 +0100 +++ b/docs/misc/xen-command-line.markdown Fri Apr 27 11:09:26 2012 +0200 @@ -543,7 +543,28 @@ console even after dom0 has been started relinquish control to dom0. ### vpid + ### vpmu +> `= ( bts )` + +> Default: `off` + +Switch on the virtualized performance monitoring unit for HVM guests. + +If the current cpu isn't supported a message like +'VPMU: Initialization failed. ...' +is printed on the hypervisor serial log. + +For some Intel Nehalem processors a quirk handling exist for an unknown +wrong behaviour (see handle_pmc_quirk()). + +If 'vpmu=bts' is specified the virtualisation of the Branch Trace Store (BTS) +feature is switched on on Intel processors supporting this feature. + +*Warning:* +As the BTS virtualisation is not 100% safe and because of the nehalem quirk +don't use the vpmu flag on production systems with Intel cpus! + ### vti\_vhpt\_size ### vti\_vtlb\_size ### watchdog _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:32 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCF-0004Bf-SQ; Mon, 14 May 2012 16:32:31 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCD-0003YO-2F for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:29 +0000 Received: from [85.158.143.99:60301] by server-1.bemta-4.messagelabs.com id 2F/E8-20925-C9331BF4; Mon, 14 May 2012 16:32:28 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-216.messagelabs.com!1337013146!27626237!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28977 invoked from network); 14 May 2012 16:32:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC9-0002t5-Tp for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyC9-0006ip-TB for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:25 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:25 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] docs: add vpmu description to xen-command-line.markdown X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Dietmar Hahn # Date 1335517766 -7200 # Node ID 54c8c9eaee9295f2790dc2fbb8f4094c13a4185e # Parent 453bd08998001bb0212f6c4101bb6228ef70da1b docs: add vpmu description to xen-command-line.markdown Add a short description to the vpmu boot option in the xen-command-line.markdown Signed-off-by: Dietmar Hahn Committed-by: Ian Jackson Acked-by: Ian Campbell --- diff -r 453bd0899800 -r 54c8c9eaee92 docs/misc/xen-command-line.markdown --- a/docs/misc/xen-command-line.markdown Thu May 10 17:33:59 2012 +0100 +++ b/docs/misc/xen-command-line.markdown Fri Apr 27 11:09:26 2012 +0200 @@ -543,7 +543,28 @@ console even after dom0 has been started relinquish control to dom0. ### vpid + ### vpmu +> `= ( bts )` + +> Default: `off` + +Switch on the virtualized performance monitoring unit for HVM guests. + +If the current cpu isn't supported a message like +'VPMU: Initialization failed. ...' +is printed on the hypervisor serial log. + +For some Intel Nehalem processors a quirk handling exist for an unknown +wrong behaviour (see handle_pmc_quirk()). + +If 'vpmu=bts' is specified the virtualisation of the Branch Trace Store (BTS) +feature is switched on on Intel processors supporting this feature. + +*Warning:* +As the BTS virtualisation is not 100% safe and because of the nehalem quirk +don't use the vpmu flag on production systems with Intel cpus! + ### vti\_vhpt\_size ### vti\_vtlb\_size ### watchdog _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:32 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCG-0004Dm-J0; Mon, 14 May 2012 16:32:32 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCD-00044i-FZ for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:29 +0000 Received: from [85.158.139.83:20994] by server-9.bemta-5.messagelabs.com id 03/FF-09826-C9331BF4; Mon, 14 May 2012 16:32:28 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-182.messagelabs.com!1337013145!24066757!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10448 invoked from network); 14 May 2012 16:32:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC8-0002sv-TH for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyC8-0006iK-SV for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:24 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:24 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: add "downscript=no" to Qemu call X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Roger Pau Monne # Date 1336667638 -3600 # Node ID 8885452be593e503c5ca91a19412ec1eb69387c1 # Parent 3314ed4b12bacf134a1e6df8e54c62e1eb864295 libxl: add "downscript=no" to Qemu call Currently we only pass script=no to Qemu, to avoid calling any scripts when attaching a tap interface, but we should also pass downscript=no to avoid Qemu trying to execute a script when disconnecting the interface. This prevents the following harmless error message: /etc/qemu-ifdown: could not launch network script Signed-off-by: Roger Pau Monne Committed-by: Ian Jackson Acked-by: Ian Jackson --- diff -r 3314ed4b12ba -r 8885452be593 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Fri May 04 19:43:25 2012 +0200 +++ b/tools/libxl/libxl_dm.c Thu May 10 17:33:58 2012 +0100 @@ -218,9 +218,14 @@ static char ** libxl__build_device_model flexarray_vappend(dm_args, "-net", libxl__sprintf(gc, "nic,vlan=%d,macaddr=%s,model=%s", vifs[i].devid, smac, vifs[i].model), - "-net", libxl__sprintf(gc, "tap,vlan=%d,ifname=%s,bridge=%s,script=%s", - vifs[i].devid, ifname, vifs[i].bridge, libxl_tapif_script(gc)), - NULL); + "-net", + GCSPRINTF( + "tap,vlan=%d,ifname=%s,bridge=%s," + "script=%s,downscript=%s", + vifs[i].devid, ifname, vifs[i].bridge, + libxl_tapif_script(gc), + libxl_tapif_script(gc)), + NULL); ioemu_vifs++; } } @@ -462,10 +467,12 @@ static char ** libxl__build_device_model vifs[i].model, vifs[i].devid, vifs[i].devid, smac)); flexarray_append(dm_args, "-netdev"); - flexarray_append(dm_args, - libxl__sprintf(gc, "type=tap,id=net%d,ifname=%s,script=%s", - vifs[i].devid, ifname, - libxl_tapif_script(gc))); + flexarray_append(dm_args, GCSPRINTF( + "type=tap,id=net%d,ifname=%s," + "script=%s,downscript=%s", + vifs[i].devid, ifname, + libxl_tapif_script(gc), + libxl_tapif_script(gc))); ioemu_vifs++; } } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:32 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCG-0004Dm-J0; Mon, 14 May 2012 16:32:32 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCD-00044i-FZ for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:29 +0000 Received: from [85.158.139.83:20994] by server-9.bemta-5.messagelabs.com id 03/FF-09826-C9331BF4; Mon, 14 May 2012 16:32:28 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-182.messagelabs.com!1337013145!24066757!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10448 invoked from network); 14 May 2012 16:32:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC8-0002sv-TH for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyC8-0006iK-SV for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:24 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:24 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: add "downscript=no" to Qemu call X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Roger Pau Monne # Date 1336667638 -3600 # Node ID 8885452be593e503c5ca91a19412ec1eb69387c1 # Parent 3314ed4b12bacf134a1e6df8e54c62e1eb864295 libxl: add "downscript=no" to Qemu call Currently we only pass script=no to Qemu, to avoid calling any scripts when attaching a tap interface, but we should also pass downscript=no to avoid Qemu trying to execute a script when disconnecting the interface. This prevents the following harmless error message: /etc/qemu-ifdown: could not launch network script Signed-off-by: Roger Pau Monne Committed-by: Ian Jackson Acked-by: Ian Jackson --- diff -r 3314ed4b12ba -r 8885452be593 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Fri May 04 19:43:25 2012 +0200 +++ b/tools/libxl/libxl_dm.c Thu May 10 17:33:58 2012 +0100 @@ -218,9 +218,14 @@ static char ** libxl__build_device_model flexarray_vappend(dm_args, "-net", libxl__sprintf(gc, "nic,vlan=%d,macaddr=%s,model=%s", vifs[i].devid, smac, vifs[i].model), - "-net", libxl__sprintf(gc, "tap,vlan=%d,ifname=%s,bridge=%s,script=%s", - vifs[i].devid, ifname, vifs[i].bridge, libxl_tapif_script(gc)), - NULL); + "-net", + GCSPRINTF( + "tap,vlan=%d,ifname=%s,bridge=%s," + "script=%s,downscript=%s", + vifs[i].devid, ifname, vifs[i].bridge, + libxl_tapif_script(gc), + libxl_tapif_script(gc)), + NULL); ioemu_vifs++; } } @@ -462,10 +467,12 @@ static char ** libxl__build_device_model vifs[i].model, vifs[i].devid, vifs[i].devid, smac)); flexarray_append(dm_args, "-netdev"); - flexarray_append(dm_args, - libxl__sprintf(gc, "type=tap,id=net%d,ifname=%s,script=%s", - vifs[i].devid, ifname, - libxl_tapif_script(gc))); + flexarray_append(dm_args, GCSPRINTF( + "type=tap,id=net%d,ifname=%s," + "script=%s,downscript=%s", + vifs[i].devid, ifname, + libxl_tapif_script(gc), + libxl_tapif_script(gc))); ioemu_vifs++; } } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:33 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCH-0004Eu-GU; Mon, 14 May 2012 16:32:33 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCD-0003rX-S9 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:30 +0000 Received: from [85.158.143.35:10600] by server-2.bemta-4.messagelabs.com id 33/5D-17550-D9331BF4; Mon, 14 May 2012 16:32:29 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-21.messagelabs.com!1337013147!14107558!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8611 invoked from network); 14 May 2012 16:32:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCB-0002tP-Ex for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCB-0006jY-E4 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:27 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:26 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl/xend: name tap devices vifX.Y-emu X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1335354957 -3600 # Node ID 7a6dcecb1781838c9f5d0e0a51c89a718f85c85d # Parent 42553101ccfe90b021df00986b6a0990f7900b98 libxl/xend: name tap devices vifX.Y-emu This prevents the udev scripts from operating on other tap devices (e.g. openvpn etc) Correct the documentation for the "vifname" option which suggested it applied to HVM tap devices only, which is not the case. Reported by Michael Young. Also fix the use of vifname with emulated devices. This is slightly complex. The current hotplug scripts rely on being able to parse the "tapX.Y" (now "vifX.Y-emu") name in order to locate the xenstore backend dir relating to the corresponding vif. This is because we cannot inject our own environment vars into the tap hotplug events. However this means that if the tap is initially named with a user specified name (which will not match the expected scheme) we fail to do anything useful with the device. So now we create the initial tap device with the standard "vifX.Y-emu" name and the hotplug script will handle the rename to the desired name. This is also how PV vif devices work -- they are always created by netback with the name vifX.Y and renamed in the script. Lastly also move libxl__device_* to a better place in the header, otherwise the comment about evgen stuff isn't next to the associated functions (noticed jsut because I was going to add nic_devname near to the setdefault functions) Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 42553101ccfe -r 7a6dcecb1781 docs/misc/xl-network-configuration.markdown --- a/docs/misc/xl-network-configuration.markdown Fri May 11 12:42:57 2012 +0100 +++ b/docs/misc/xl-network-configuration.markdown Wed Apr 25 12:55:57 2012 +0100 @@ -93,11 +93,14 @@ are: ### vifname -This keyword is valid for HVM guest devices with `type=ioemu` only. +Specifies the backend device name for the virtual device. -Specifies the backend device name for an emulated device. The default -is `tapDOMID.DEVID` where `DOMID` is the guest domain ID and `DEVID` -is the device number. +If the domain is an HVM domain then the associated emulated (tap) +device will have a "-emu" suffice added. + +The default name for the virtual device is `vifDOMID.DEVID` where +`DOMID` is the guest domain ID and `DEVID` is the device +number. Likewise the default tap name is `vifDOMID.DEVID-emu`. ### script diff -r 42553101ccfe -r 7a6dcecb1781 tools/hotplug/Linux/vif-common.sh --- a/tools/hotplug/Linux/vif-common.sh Fri May 11 12:42:57 2012 +0100 +++ b/tools/hotplug/Linux/vif-common.sh Wed Apr 25 12:55:57 2012 +0100 @@ -85,12 +85,23 @@ elif [ "$type_if" = tap ]; then : ${INTERFACE:?} # Get xenbus_path from device name. - # The name is built like that: "tap${domid}.${devid}". - dev_=${dev#tap} + # The name is built like that: "vif${domid}.${devid}-emu". + dev_=${dev#vif} + dev_=${dev_%-emu} domid=${dev_%.*} devid=${dev_#*.} XENBUS_PATH="/local/domain/0/backend/vif/$domid/$devid" + vifname=$(xenstore_read_default "$XENBUS_PATH/vifname" "") + if [ "$vifname" ] + then + vifname="${vifname}-emu" + if [ "$command" == "add" ] && ! ip link show "$vifname" >&/dev/null + then + do_or_die ip link set "$dev" name "$vifname" + fi + dev="$vifname" + fi fi ip=${ip:-} diff -r 42553101ccfe -r 7a6dcecb1781 tools/hotplug/Linux/xen-backend.rules --- a/tools/hotplug/Linux/xen-backend.rules Fri May 11 12:42:57 2012 +0100 +++ b/tools/hotplug/Linux/xen-backend.rules Wed Apr 25 12:55:57 2012 +0100 @@ -13,4 +13,4 @@ KERNEL=="blktap-control", NAME="xen/blkt KERNEL=="gntdev", NAME="xen/%k", MODE="0600" KERNEL=="pci_iomul", NAME="xen/%k", MODE="0600" KERNEL=="tapdev[a-z]*", NAME="xen/blktap-2/tapdev%m", MODE="0600" -SUBSYSTEM=="net", KERNEL=="tap*", ACTION=="add", RUN+="/etc/xen/scripts/vif-setup $env{ACTION} type_if=tap" +SUBSYSTEM=="net", KERNEL=="vif*-emu", ACTION=="add", RUN+="/etc/xen/scripts/vif-setup $env{ACTION} type_if=tap" diff -r 42553101ccfe -r 7a6dcecb1781 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Fri May 11 12:42:57 2012 +0100 +++ b/tools/libxl/libxl.c Wed Apr 25 12:55:57 2012 +0100 @@ -2087,6 +2087,21 @@ int libxl_device_nic_getinfo(libxl_ctx * return 0; } +const char *libxl__device_nic_devname(libxl__gc *gc, + uint32_t domid, + uint32_t devid, + libxl_nic_type type) +{ + switch (type) { + case LIBXL_NIC_TYPE_VIF: + return GCSPRINTF("vif%u.%d", domid, devid); + case LIBXL_NIC_TYPE_IOEMU: + return GCSPRINTF("vif%u.%d" TAP_DEVICE_SUFFIX, domid, devid); + default: + abort(); + } +} + /******************************************************************************/ int libxl__device_console_add(libxl__gc *gc, uint32_t domid, libxl__device_console *console, diff -r 42553101ccfe -r 7a6dcecb1781 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Fri May 11 12:42:57 2012 +0100 +++ b/tools/libxl/libxl_dm.c Wed Apr 25 12:55:57 2012 +0100 @@ -209,12 +209,9 @@ static char ** libxl__build_device_model if (vifs[i].nictype == LIBXL_NIC_TYPE_IOEMU) { char *smac = libxl__sprintf(gc, LIBXL_MAC_FMT, LIBXL_MAC_BYTES(vifs[i].mac)); - char *ifname; - if (!vifs[i].ifname) - ifname = libxl__sprintf(gc, - "tap%d.%d", domid, vifs[i].devid); - else - ifname = vifs[i].ifname; + const char *ifname = libxl__device_nic_devname(gc, + domid, vifs[i].devid, + LIBXL_NIC_TYPE_IOEMU); flexarray_vappend(dm_args, "-net", GCSPRINTF( @@ -456,13 +453,9 @@ static char ** libxl__build_device_model if (vifs[i].nictype == LIBXL_NIC_TYPE_IOEMU) { char *smac = libxl__sprintf(gc, LIBXL_MAC_FMT, LIBXL_MAC_BYTES(vifs[i].mac)); - char *ifname; - if (!vifs[i].ifname) { - ifname = libxl__sprintf(gc, "tap%d.%d", - guest_domid, vifs[i].devid); - } else { - ifname = vifs[i].ifname; - } + const char *ifname = libxl__device_nic_devname(gc, + guest_domid, vifs[i].devid, + LIBXL_NIC_TYPE_IOEMU); flexarray_append(dm_args, "-device"); flexarray_append(dm_args, libxl__sprintf(gc, "%s,id=nic%d,netdev=net%d,mac=%s", diff -r 42553101ccfe -r 7a6dcecb1781 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri May 11 12:42:57 2012 +0100 +++ b/tools/libxl/libxl_internal.h Wed Apr 25 12:55:57 2012 +0100 @@ -83,6 +83,7 @@ #define STUBDOM_CONSOLE_RESTORE 2 #define STUBDOM_CONSOLE_SERIAL 3 #define STUBDOM_SPECIAL_CONSOLES 3 +#define TAP_DEVICE_SUFFIX "-emu" #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0])) @@ -196,17 +197,6 @@ _hidden libxl__ev_xswatch *libxl__watch_ * version of the _evdisable_FOO function; the internal one is * used during cleanup. */ -_hidden int libxl__domain_create_info_setdefault(libxl__gc *gc, - libxl_domain_create_info *c_info); -_hidden int libxl__domain_build_info_setdefault(libxl__gc *gc, - libxl_domain_build_info *b_info); -_hidden int libxl__device_disk_setdefault(libxl__gc *gc, - libxl_device_disk *disk); -_hidden int libxl__device_nic_setdefault(libxl__gc *gc, libxl_device_nic *nic); -_hidden int libxl__device_vfb_setdefault(libxl__gc *gc, libxl_device_vfb *vfb); -_hidden int libxl__device_vkb_setdefault(libxl__gc *gc, libxl_device_vkb *vkb); -_hidden int libxl__device_pci_setdefault(libxl__gc *gc, libxl_device_pci *pci); - struct libxl__evgen_domain_death { uint32_t domid; unsigned shutdown_reported:1, death_reported:1; @@ -705,6 +695,21 @@ _hidden int libxl__wait_for_backend(libx * All libxl API functions are expected to have arranged for this * to be called before using any values within these structures. */ +_hidden int libxl__domain_create_info_setdefault(libxl__gc *gc, + libxl_domain_create_info *c_info); +_hidden int libxl__domain_build_info_setdefault(libxl__gc *gc, + libxl_domain_build_info *b_info); +_hidden int libxl__device_disk_setdefault(libxl__gc *gc, + libxl_device_disk *disk); +_hidden int libxl__device_nic_setdefault(libxl__gc *gc, libxl_device_nic *nic); +_hidden int libxl__device_vfb_setdefault(libxl__gc *gc, libxl_device_vfb *vfb); +_hidden int libxl__device_vkb_setdefault(libxl__gc *gc, libxl_device_vkb *vkb); +_hidden int libxl__device_pci_setdefault(libxl__gc *gc, libxl_device_pci *pci); + +_hidden const char *libxl__device_nic_devname(libxl__gc *gc, + uint32_t domid, + uint32_t devid, + libxl_nic_type type); /* Arranges that dev will be removed from its guest. When * this is done, the ao will be completed. An error diff -r 42553101ccfe -r 7a6dcecb1781 tools/python/xen/xend/image.py --- a/tools/python/xen/xend/image.py Fri May 11 12:42:57 2012 +0100 +++ b/tools/python/xen/xend/image.py Wed Apr 25 12:55:57 2012 +0100 @@ -917,11 +917,7 @@ class HVMImageHandler(ImageHandler): ret.append("-net") ret.append("nic,vlan=%d,macaddr=%s,model=%s" % (nics, mac, model)) - vifname = devinfo.get('vifname') - if vifname: - vifname = "tap-" + vifname - else: - vifname = "tap%d.%d" % (self.vm.getDomid(), nics-1) + vifname = "vif%d.%d-emu" % (self.vm.getDomid(), nics-1) ret.append("-net") ret.append("tap,vlan=%d,ifname=%s,bridge=%s" % (nics, vifname, bridge)) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:33 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCH-0004Eu-GU; Mon, 14 May 2012 16:32:33 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCD-0003rX-S9 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:30 +0000 Received: from [85.158.143.35:10600] by server-2.bemta-4.messagelabs.com id 33/5D-17550-D9331BF4; Mon, 14 May 2012 16:32:29 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-21.messagelabs.com!1337013147!14107558!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8611 invoked from network); 14 May 2012 16:32:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCB-0002tP-Ex for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCB-0006jY-E4 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:27 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:26 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl/xend: name tap devices vifX.Y-emu X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1335354957 -3600 # Node ID 7a6dcecb1781838c9f5d0e0a51c89a718f85c85d # Parent 42553101ccfe90b021df00986b6a0990f7900b98 libxl/xend: name tap devices vifX.Y-emu This prevents the udev scripts from operating on other tap devices (e.g. openvpn etc) Correct the documentation for the "vifname" option which suggested it applied to HVM tap devices only, which is not the case. Reported by Michael Young. Also fix the use of vifname with emulated devices. This is slightly complex. The current hotplug scripts rely on being able to parse the "tapX.Y" (now "vifX.Y-emu") name in order to locate the xenstore backend dir relating to the corresponding vif. This is because we cannot inject our own environment vars into the tap hotplug events. However this means that if the tap is initially named with a user specified name (which will not match the expected scheme) we fail to do anything useful with the device. So now we create the initial tap device with the standard "vifX.Y-emu" name and the hotplug script will handle the rename to the desired name. This is also how PV vif devices work -- they are always created by netback with the name vifX.Y and renamed in the script. Lastly also move libxl__device_* to a better place in the header, otherwise the comment about evgen stuff isn't next to the associated functions (noticed jsut because I was going to add nic_devname near to the setdefault functions) Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 42553101ccfe -r 7a6dcecb1781 docs/misc/xl-network-configuration.markdown --- a/docs/misc/xl-network-configuration.markdown Fri May 11 12:42:57 2012 +0100 +++ b/docs/misc/xl-network-configuration.markdown Wed Apr 25 12:55:57 2012 +0100 @@ -93,11 +93,14 @@ are: ### vifname -This keyword is valid for HVM guest devices with `type=ioemu` only. +Specifies the backend device name for the virtual device. -Specifies the backend device name for an emulated device. The default -is `tapDOMID.DEVID` where `DOMID` is the guest domain ID and `DEVID` -is the device number. +If the domain is an HVM domain then the associated emulated (tap) +device will have a "-emu" suffice added. + +The default name for the virtual device is `vifDOMID.DEVID` where +`DOMID` is the guest domain ID and `DEVID` is the device +number. Likewise the default tap name is `vifDOMID.DEVID-emu`. ### script diff -r 42553101ccfe -r 7a6dcecb1781 tools/hotplug/Linux/vif-common.sh --- a/tools/hotplug/Linux/vif-common.sh Fri May 11 12:42:57 2012 +0100 +++ b/tools/hotplug/Linux/vif-common.sh Wed Apr 25 12:55:57 2012 +0100 @@ -85,12 +85,23 @@ elif [ "$type_if" = tap ]; then : ${INTERFACE:?} # Get xenbus_path from device name. - # The name is built like that: "tap${domid}.${devid}". - dev_=${dev#tap} + # The name is built like that: "vif${domid}.${devid}-emu". + dev_=${dev#vif} + dev_=${dev_%-emu} domid=${dev_%.*} devid=${dev_#*.} XENBUS_PATH="/local/domain/0/backend/vif/$domid/$devid" + vifname=$(xenstore_read_default "$XENBUS_PATH/vifname" "") + if [ "$vifname" ] + then + vifname="${vifname}-emu" + if [ "$command" == "add" ] && ! ip link show "$vifname" >&/dev/null + then + do_or_die ip link set "$dev" name "$vifname" + fi + dev="$vifname" + fi fi ip=${ip:-} diff -r 42553101ccfe -r 7a6dcecb1781 tools/hotplug/Linux/xen-backend.rules --- a/tools/hotplug/Linux/xen-backend.rules Fri May 11 12:42:57 2012 +0100 +++ b/tools/hotplug/Linux/xen-backend.rules Wed Apr 25 12:55:57 2012 +0100 @@ -13,4 +13,4 @@ KERNEL=="blktap-control", NAME="xen/blkt KERNEL=="gntdev", NAME="xen/%k", MODE="0600" KERNEL=="pci_iomul", NAME="xen/%k", MODE="0600" KERNEL=="tapdev[a-z]*", NAME="xen/blktap-2/tapdev%m", MODE="0600" -SUBSYSTEM=="net", KERNEL=="tap*", ACTION=="add", RUN+="/etc/xen/scripts/vif-setup $env{ACTION} type_if=tap" +SUBSYSTEM=="net", KERNEL=="vif*-emu", ACTION=="add", RUN+="/etc/xen/scripts/vif-setup $env{ACTION} type_if=tap" diff -r 42553101ccfe -r 7a6dcecb1781 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Fri May 11 12:42:57 2012 +0100 +++ b/tools/libxl/libxl.c Wed Apr 25 12:55:57 2012 +0100 @@ -2087,6 +2087,21 @@ int libxl_device_nic_getinfo(libxl_ctx * return 0; } +const char *libxl__device_nic_devname(libxl__gc *gc, + uint32_t domid, + uint32_t devid, + libxl_nic_type type) +{ + switch (type) { + case LIBXL_NIC_TYPE_VIF: + return GCSPRINTF("vif%u.%d", domid, devid); + case LIBXL_NIC_TYPE_IOEMU: + return GCSPRINTF("vif%u.%d" TAP_DEVICE_SUFFIX, domid, devid); + default: + abort(); + } +} + /******************************************************************************/ int libxl__device_console_add(libxl__gc *gc, uint32_t domid, libxl__device_console *console, diff -r 42553101ccfe -r 7a6dcecb1781 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Fri May 11 12:42:57 2012 +0100 +++ b/tools/libxl/libxl_dm.c Wed Apr 25 12:55:57 2012 +0100 @@ -209,12 +209,9 @@ static char ** libxl__build_device_model if (vifs[i].nictype == LIBXL_NIC_TYPE_IOEMU) { char *smac = libxl__sprintf(gc, LIBXL_MAC_FMT, LIBXL_MAC_BYTES(vifs[i].mac)); - char *ifname; - if (!vifs[i].ifname) - ifname = libxl__sprintf(gc, - "tap%d.%d", domid, vifs[i].devid); - else - ifname = vifs[i].ifname; + const char *ifname = libxl__device_nic_devname(gc, + domid, vifs[i].devid, + LIBXL_NIC_TYPE_IOEMU); flexarray_vappend(dm_args, "-net", GCSPRINTF( @@ -456,13 +453,9 @@ static char ** libxl__build_device_model if (vifs[i].nictype == LIBXL_NIC_TYPE_IOEMU) { char *smac = libxl__sprintf(gc, LIBXL_MAC_FMT, LIBXL_MAC_BYTES(vifs[i].mac)); - char *ifname; - if (!vifs[i].ifname) { - ifname = libxl__sprintf(gc, "tap%d.%d", - guest_domid, vifs[i].devid); - } else { - ifname = vifs[i].ifname; - } + const char *ifname = libxl__device_nic_devname(gc, + guest_domid, vifs[i].devid, + LIBXL_NIC_TYPE_IOEMU); flexarray_append(dm_args, "-device"); flexarray_append(dm_args, libxl__sprintf(gc, "%s,id=nic%d,netdev=net%d,mac=%s", diff -r 42553101ccfe -r 7a6dcecb1781 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri May 11 12:42:57 2012 +0100 +++ b/tools/libxl/libxl_internal.h Wed Apr 25 12:55:57 2012 +0100 @@ -83,6 +83,7 @@ #define STUBDOM_CONSOLE_RESTORE 2 #define STUBDOM_CONSOLE_SERIAL 3 #define STUBDOM_SPECIAL_CONSOLES 3 +#define TAP_DEVICE_SUFFIX "-emu" #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0])) @@ -196,17 +197,6 @@ _hidden libxl__ev_xswatch *libxl__watch_ * version of the _evdisable_FOO function; the internal one is * used during cleanup. */ -_hidden int libxl__domain_create_info_setdefault(libxl__gc *gc, - libxl_domain_create_info *c_info); -_hidden int libxl__domain_build_info_setdefault(libxl__gc *gc, - libxl_domain_build_info *b_info); -_hidden int libxl__device_disk_setdefault(libxl__gc *gc, - libxl_device_disk *disk); -_hidden int libxl__device_nic_setdefault(libxl__gc *gc, libxl_device_nic *nic); -_hidden int libxl__device_vfb_setdefault(libxl__gc *gc, libxl_device_vfb *vfb); -_hidden int libxl__device_vkb_setdefault(libxl__gc *gc, libxl_device_vkb *vkb); -_hidden int libxl__device_pci_setdefault(libxl__gc *gc, libxl_device_pci *pci); - struct libxl__evgen_domain_death { uint32_t domid; unsigned shutdown_reported:1, death_reported:1; @@ -705,6 +695,21 @@ _hidden int libxl__wait_for_backend(libx * All libxl API functions are expected to have arranged for this * to be called before using any values within these structures. */ +_hidden int libxl__domain_create_info_setdefault(libxl__gc *gc, + libxl_domain_create_info *c_info); +_hidden int libxl__domain_build_info_setdefault(libxl__gc *gc, + libxl_domain_build_info *b_info); +_hidden int libxl__device_disk_setdefault(libxl__gc *gc, + libxl_device_disk *disk); +_hidden int libxl__device_nic_setdefault(libxl__gc *gc, libxl_device_nic *nic); +_hidden int libxl__device_vfb_setdefault(libxl__gc *gc, libxl_device_vfb *vfb); +_hidden int libxl__device_vkb_setdefault(libxl__gc *gc, libxl_device_vkb *vkb); +_hidden int libxl__device_pci_setdefault(libxl__gc *gc, libxl_device_pci *pci); + +_hidden const char *libxl__device_nic_devname(libxl__gc *gc, + uint32_t domid, + uint32_t devid, + libxl_nic_type type); /* Arranges that dev will be removed from its guest. When * this is done, the ao will be completed. An error diff -r 42553101ccfe -r 7a6dcecb1781 tools/python/xen/xend/image.py --- a/tools/python/xen/xend/image.py Fri May 11 12:42:57 2012 +0100 +++ b/tools/python/xen/xend/image.py Wed Apr 25 12:55:57 2012 +0100 @@ -917,11 +917,7 @@ class HVMImageHandler(ImageHandler): ret.append("-net") ret.append("nic,vlan=%d,macaddr=%s,model=%s" % (nics, mac, model)) - vifname = devinfo.get('vifname') - if vifname: - vifname = "tap-" + vifname - else: - vifname = "tap%d.%d" % (self.vm.getDomid(), nics-1) + vifname = "vif%d.%d-emu" % (self.vm.getDomid(), nics-1) ret.append("-net") ret.append("tap,vlan=%d,ifname=%s,bridge=%s" % (nics, vifname, bridge)) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:35 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCI-0004JT-W9; Mon, 14 May 2012 16:32:35 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCF-00049q-KT for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:31 +0000 Received: from [85.158.139.83:30755] by server-12.bemta-5.messagelabs.com id 48/43-01344-E9331BF4; Mon, 14 May 2012 16:32:30 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-182.messagelabs.com!1337013147!24461257!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 800 invoked from network); 14 May 2012 16:32:29 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCA-0002tJ-U6 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCA-0006jJ-TR for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:26 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:26 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] QEMU_TAG update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1336736577 -3600 # Node ID 42553101ccfe90b021df00986b6a0990f7900b98 # Parent 7a4c6481fb38e4e3f859c9dcd9f88d977084e7a9 QEMU_TAG update --- diff -r 7a4c6481fb38 -r 42553101ccfe Config.mk --- a/Config.mk Fri May 11 12:39:43 2012 +0100 +++ b/Config.mk Fri May 11 12:42:57 2012 +0100 @@ -213,9 +213,9 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= 82db8de16530f016809264d3179823999d702849 -# Tue Apr 3 15:44:48 2012 +0100 -# timers: use INT64_MAX as max expiration +QEMU_TAG ?= b7469189669c4de0a5161a869f443738d84539ec +# Fri May 11 12:40:42 2012 +0100 +# passthrough: Intel GPU passthrough, fix OpRegion mapping # Short answer -- do not enable this unless you know what you are # doing and are prepared for some pain. _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:35 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCI-0004JT-W9; Mon, 14 May 2012 16:32:35 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCF-00049q-KT for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:31 +0000 Received: from [85.158.139.83:30755] by server-12.bemta-5.messagelabs.com id 48/43-01344-E9331BF4; Mon, 14 May 2012 16:32:30 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-182.messagelabs.com!1337013147!24461257!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 800 invoked from network); 14 May 2012 16:32:29 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCA-0002tJ-U6 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCA-0006jJ-TR for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:26 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:26 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] QEMU_TAG update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1336736577 -3600 # Node ID 42553101ccfe90b021df00986b6a0990f7900b98 # Parent 7a4c6481fb38e4e3f859c9dcd9f88d977084e7a9 QEMU_TAG update --- diff -r 7a4c6481fb38 -r 42553101ccfe Config.mk --- a/Config.mk Fri May 11 12:39:43 2012 +0100 +++ b/Config.mk Fri May 11 12:42:57 2012 +0100 @@ -213,9 +213,9 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= 82db8de16530f016809264d3179823999d702849 -# Tue Apr 3 15:44:48 2012 +0100 -# timers: use INT64_MAX as max expiration +QEMU_TAG ?= b7469189669c4de0a5161a869f443738d84539ec +# Fri May 11 12:40:42 2012 +0100 +# passthrough: Intel GPU passthrough, fix OpRegion mapping # Short answer -- do not enable this unless you know what you are # doing and are prepared for some pain. _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:35 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCJ-0004KD-5W; Mon, 14 May 2012 16:32:35 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCF-00049e-I9 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:31 +0000 Received: from [85.158.138.51:31590] by server-11.bemta-3.messagelabs.com id 4A/79-18894-E9331BF4; Mon, 14 May 2012 16:32:30 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-174.messagelabs.com!1337013148!23011891!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18652 invoked from network); 14 May 2012 16:32:29 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCC-0002tZ-Fv for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCC-0006k2-FG for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:28 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:27 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xl: use libxl_cpumap_set_none not memset X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1336735243 -3600 # Node ID af6d24d47b56fb5e07fc17e68c33915d6ea35099 # Parent cb0da7656e4e7ca8a58e3e1a64dcb79c24231b7a xl: use libxl_cpumap_set_none not memset Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r cb0da7656e4e -r af6d24d47b56 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Fri May 11 15:52:52 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Fri May 11 12:20:43 2012 +0100 @@ -6107,7 +6107,7 @@ int main_cpupoolnumasplit(int argc, char fprintf(stderr, "failed to offline vcpus\n"); goto out; } - memset(cpumap.map, 0, cpumap.size); + libxl_cpumap_set_none(&cpumap); for (c = 0; c < n_cpus; c++) { if (topology[c].node == LIBXL_CPUTOPOLOGY_INVALID_ENTRY) { _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:35 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCJ-0004KD-5W; Mon, 14 May 2012 16:32:35 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCF-00049e-I9 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:31 +0000 Received: from [85.158.138.51:31590] by server-11.bemta-3.messagelabs.com id 4A/79-18894-E9331BF4; Mon, 14 May 2012 16:32:30 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-174.messagelabs.com!1337013148!23011891!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18652 invoked from network); 14 May 2012 16:32:29 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCC-0002tZ-Fv for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCC-0006k2-FG for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:28 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:27 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xl: use libxl_cpumap_set_none not memset X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1336735243 -3600 # Node ID af6d24d47b56fb5e07fc17e68c33915d6ea35099 # Parent cb0da7656e4e7ca8a58e3e1a64dcb79c24231b7a xl: use libxl_cpumap_set_none not memset Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r cb0da7656e4e -r af6d24d47b56 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Fri May 11 15:52:52 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Fri May 11 12:20:43 2012 +0100 @@ -6107,7 +6107,7 @@ int main_cpupoolnumasplit(int argc, char fprintf(stderr, "failed to offline vcpus\n"); goto out; } - memset(cpumap.map, 0, cpumap.size); + libxl_cpumap_set_none(&cpumap); for (c = 0; c < n_cpus; c++) { if (topology[c].node == LIBXL_CPUTOPOLOGY_INVALID_ENTRY) { _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:36 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCJ-0004LL-Mb; Mon, 14 May 2012 16:32:35 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCG-0004Bp-Ca for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:32 +0000 Received: from [85.158.139.83:30789] by server-10.bemta-5.messagelabs.com id B9/81-08260-F9331BF4; Mon, 14 May 2012 16:32:31 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-182.messagelabs.com!1337013148!17068017!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32560 invoked from network); 14 May 2012 16:32:30 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCB-0002tS-VT for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCB-0006jn-Uq for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:27 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:27 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: default to xenconsoled for pv guests X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1336747972 -3600 # Node ID cb0da7656e4e7ca8a58e3e1a64dcb79c24231b7a # Parent 7a6dcecb1781838c9f5d0e0a51c89a718f85c85d libxl: default to xenconsoled for pv guests Default to xenconsoled for pv guests, even if qemu is running. Currently we prefer to use qemu for the disk backend if we are starting qemu anyway (e.g. to service a disk). Unfortunately qemu doesn't log the console, which xenconsoled can do via XENCONSOLED_TRACE=guest. Since xenconsoled is also running anyway it seems like there is no particular reason to prefer qemu just because it happens to be running. However we must use qemu if thereis more than one console (xenconsoled only supports a single console). Therefore push the logic to change the console backend down into libxl__need_xenpv_qemu so that it can do the right thing. Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini Committed-by: Ian Jackson --- diff -r 7a6dcecb1781 -r cb0da7656e4e tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Wed Apr 25 12:55:57 2012 +0100 +++ b/tools/libxl/libxl_create.c Fri May 11 15:52:52 2012 +0100 @@ -682,9 +682,6 @@ static int do_domain_create(libxl__gc *g d_config->num_vfbs, d_config->vfbs, d_config->num_disks, &d_config->disks[0]); - if (need_qemu) - console.consback = LIBXL__CONSOLE_BACKEND_IOEMU; - libxl__device_console_add(gc, domid, &console, &state); libxl__device_console_dispose(&console); diff -r 7a6dcecb1781 -r cb0da7656e4e tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Wed Apr 25 12:55:57 2012 +0100 +++ b/tools/libxl/libxl_dm.c Fri May 11 15:52:52 2012 +0100 @@ -1095,7 +1095,13 @@ int libxl__need_xenpv_qemu(libxl__gc *gc { int i, ret = 0; + /* + * qemu is required in order to support 2 or more consoles. So switch all + * backends to qemu if this is the case + */ if (nr_consoles > 1) { + for (i = 0; i < nr_consoles; i++) + consoles[i].consback = LIBXL__CONSOLE_BACKEND_IOEMU; ret = 1; goto out; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:36 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCJ-0004LL-Mb; Mon, 14 May 2012 16:32:35 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCG-0004Bp-Ca for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:32 +0000 Received: from [85.158.139.83:30789] by server-10.bemta-5.messagelabs.com id B9/81-08260-F9331BF4; Mon, 14 May 2012 16:32:31 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-182.messagelabs.com!1337013148!17068017!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32560 invoked from network); 14 May 2012 16:32:30 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCB-0002tS-VT for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCB-0006jn-Uq for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:27 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:27 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: default to xenconsoled for pv guests X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1336747972 -3600 # Node ID cb0da7656e4e7ca8a58e3e1a64dcb79c24231b7a # Parent 7a6dcecb1781838c9f5d0e0a51c89a718f85c85d libxl: default to xenconsoled for pv guests Default to xenconsoled for pv guests, even if qemu is running. Currently we prefer to use qemu for the disk backend if we are starting qemu anyway (e.g. to service a disk). Unfortunately qemu doesn't log the console, which xenconsoled can do via XENCONSOLED_TRACE=guest. Since xenconsoled is also running anyway it seems like there is no particular reason to prefer qemu just because it happens to be running. However we must use qemu if thereis more than one console (xenconsoled only supports a single console). Therefore push the logic to change the console backend down into libxl__need_xenpv_qemu so that it can do the right thing. Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini Committed-by: Ian Jackson --- diff -r 7a6dcecb1781 -r cb0da7656e4e tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Wed Apr 25 12:55:57 2012 +0100 +++ b/tools/libxl/libxl_create.c Fri May 11 15:52:52 2012 +0100 @@ -682,9 +682,6 @@ static int do_domain_create(libxl__gc *g d_config->num_vfbs, d_config->vfbs, d_config->num_disks, &d_config->disks[0]); - if (need_qemu) - console.consback = LIBXL__CONSOLE_BACKEND_IOEMU; - libxl__device_console_add(gc, domid, &console, &state); libxl__device_console_dispose(&console); diff -r 7a6dcecb1781 -r cb0da7656e4e tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Wed Apr 25 12:55:57 2012 +0100 +++ b/tools/libxl/libxl_dm.c Fri May 11 15:52:52 2012 +0100 @@ -1095,7 +1095,13 @@ int libxl__need_xenpv_qemu(libxl__gc *gc { int i, ret = 0; + /* + * qemu is required in order to support 2 or more consoles. So switch all + * backends to qemu if this is the case + */ if (nr_consoles > 1) { + for (i = 0; i < nr_consoles; i++) + consoles[i].consback = LIBXL__CONSOLE_BACKEND_IOEMU; ret = 1; goto out; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:36 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCK-0004Np-DS; Mon, 14 May 2012 16:32:36 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCG-0004CX-L4 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:32 +0000 Received: from [85.158.138.51:31693] by server-6.bemta-3.messagelabs.com id 52/3F-05145-F9331BF4; Mon, 14 May 2012 16:32:31 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-174.messagelabs.com!1337013149!18964816!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5014 invoked from network); 14 May 2012 16:32:30 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCD-0002tj-Gx for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCD-0006kW-GJ for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:29 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:29 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xl: Call xlu_cfg_destroy in the pciattach and pcidetach X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User George Dunlap # Date 1336754063 -3600 # Node ID 83f16dfd5f077b5b8242f4f9bf5b4301ff27b8e1 # Parent 71c6cca6b4b6ae6332269dbfdb093bb973532bfd xl: Call xlu_cfg_destroy in the pciattach and pcidetach Signed-off-by: George Dunlap Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 71c6cca6b4b6 -r 83f16dfd5f07 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Fri May 11 17:34:23 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Fri May 11 17:34:23 2012 +0100 @@ -2298,7 +2298,9 @@ static void pcidetach(const char *dom, c libxl_device_pci_destroy(ctx, domid, &pcidev); else libxl_device_pci_remove(ctx, domid, &pcidev); + libxl_device_pci_dispose(&pcidev); + xlu_cfg_destroy(config); } int main_pcidetach(int argc, char **argv) @@ -2340,7 +2342,9 @@ static void pciattach(const char *dom, c exit(2); } libxl_device_pci_add(ctx, domid, &pcidev); + libxl_device_pci_dispose(&pcidev); + xlu_cfg_destroy(config); } int main_pciattach(int argc, char **argv) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:36 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCK-0004Np-DS; Mon, 14 May 2012 16:32:36 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCG-0004CX-L4 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:32 +0000 Received: from [85.158.138.51:31693] by server-6.bemta-3.messagelabs.com id 52/3F-05145-F9331BF4; Mon, 14 May 2012 16:32:31 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-174.messagelabs.com!1337013149!18964816!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5014 invoked from network); 14 May 2012 16:32:30 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCD-0002tj-Gx for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCD-0006kW-GJ for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:29 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:29 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xl: Call xlu_cfg_destroy in the pciattach and pcidetach X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User George Dunlap # Date 1336754063 -3600 # Node ID 83f16dfd5f077b5b8242f4f9bf5b4301ff27b8e1 # Parent 71c6cca6b4b6ae6332269dbfdb093bb973532bfd xl: Call xlu_cfg_destroy in the pciattach and pcidetach Signed-off-by: George Dunlap Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 71c6cca6b4b6 -r 83f16dfd5f07 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Fri May 11 17:34:23 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Fri May 11 17:34:23 2012 +0100 @@ -2298,7 +2298,9 @@ static void pcidetach(const char *dom, c libxl_device_pci_destroy(ctx, domid, &pcidev); else libxl_device_pci_remove(ctx, domid, &pcidev); + libxl_device_pci_dispose(&pcidev); + xlu_cfg_destroy(config); } int main_pcidetach(int argc, char **argv) @@ -2340,7 +2342,9 @@ static void pciattach(const char *dom, c exit(2); } libxl_device_pci_add(ctx, domid, &pcidev); + libxl_device_pci_dispose(&pcidev); + xlu_cfg_destroy(config); } int main_pciattach(int argc, char **argv) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:37 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCL-0004QC-Cd; Mon, 14 May 2012 16:32:37 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCH-0004Ek-J5 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:33 +0000 Received: from [85.158.139.83:30854] by server-2.bemta-5.messagelabs.com id 4E/72-17016-0A331BF4; Mon, 14 May 2012 16:32:32 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-182.messagelabs.com!1337013149!24388130!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27003 invoked from network); 14 May 2012 16:32:31 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCD-0002td-0S for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCC-0006kH-WA for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:29 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:28 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xl: Replace memset with libxl_device_pci_init X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User George Dunlap # Date 1336754063 -3600 # Node ID 71c6cca6b4b6ae6332269dbfdb093bb973532bfd # Parent af6d24d47b56fb5e07fc17e68c33915d6ea35099 xl: Replace memset with libxl_device_pci_init Signed-off-by: George Dunlap Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r af6d24d47b56 -r 71c6cca6b4b6 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Fri May 11 12:20:43 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Fri May 11 17:34:23 2012 +0100 @@ -2285,7 +2285,7 @@ static void pcidetach(const char *dom, c find_domain(dom); - memset(&pcidev, 0x00, sizeof(pcidev)); + libxl_device_pci_init(&pcidev); config = xlu_cfg_init(stderr, "command line"); if (!config) { perror("xlu_cfg_inig"); exit(-1); } @@ -2330,7 +2330,7 @@ static void pciattach(const char *dom, c find_domain(dom); - memset(&pcidev, 0x00, sizeof(pcidev)); + libxl_device_pci_init(&pcidev); config = xlu_cfg_init(stderr, "command line"); if (!config) { perror("xlu_cfg_inig"); exit(-1); } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:37 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCL-0004QC-Cd; Mon, 14 May 2012 16:32:37 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCH-0004Ek-J5 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:33 +0000 Received: from [85.158.139.83:30854] by server-2.bemta-5.messagelabs.com id 4E/72-17016-0A331BF4; Mon, 14 May 2012 16:32:32 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-182.messagelabs.com!1337013149!24388130!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27003 invoked from network); 14 May 2012 16:32:31 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCD-0002td-0S for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCC-0006kH-WA for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:29 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:28 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xl: Replace memset with libxl_device_pci_init X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User George Dunlap # Date 1336754063 -3600 # Node ID 71c6cca6b4b6ae6332269dbfdb093bb973532bfd # Parent af6d24d47b56fb5e07fc17e68c33915d6ea35099 xl: Replace memset with libxl_device_pci_init Signed-off-by: George Dunlap Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r af6d24d47b56 -r 71c6cca6b4b6 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Fri May 11 12:20:43 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Fri May 11 17:34:23 2012 +0100 @@ -2285,7 +2285,7 @@ static void pcidetach(const char *dom, c find_domain(dom); - memset(&pcidev, 0x00, sizeof(pcidev)); + libxl_device_pci_init(&pcidev); config = xlu_cfg_init(stderr, "command line"); if (!config) { perror("xlu_cfg_inig"); exit(-1); } @@ -2330,7 +2330,7 @@ static void pciattach(const char *dom, c find_domain(dom); - memset(&pcidev, 0x00, sizeof(pcidev)); + libxl_device_pci_init(&pcidev); config = xlu_cfg_init(stderr, "command line"); if (!config) { perror("xlu_cfg_inig"); exit(-1); } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:38 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCM-0004SH-4x; Mon, 14 May 2012 16:32:38 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCI-0004GM-KS for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:34 +0000 Received: from [193.109.254.147:13604] by server-10.bemta-14.messagelabs.com id 52/C2-05847-1A331BF4; Mon, 14 May 2012 16:32:33 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-27.messagelabs.com!1337013151!3535499!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14559 invoked from network); 14 May 2012 16:32:32 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCF-0002tv-4A for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCF-0006lF-3V for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:31 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:30 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: save/restore qemu's physmap X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Stefano Stabellini # Date 1336754775 -3600 # Node ID 45adc237cd898ed6ab0eaaf5535004fcc6af50e9 # Parent 5f206c06e6626f077201890bd3c59cb0bc88df77 libxl: save/restore qemu's physmap Read Qemu's physmap from xenstore and save it using toolstack_save. Restore Qemu's physmap using toolstack_restore. Signed-off-by: Stefano Stabellini Committed-by: Ian Jackson --- diff -r 5f206c06e662 -r 45adc237cd89 tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Fri May 11 17:46:15 2012 +0100 +++ b/tools/libxl/libxl_dom.c Fri May 11 17:46:15 2012 +0100 @@ -443,6 +443,79 @@ int libxl__qemu_traditional_cmd(libxl__g return libxl__xs_write(gc, XBT_NULL, path, "%s", cmd); } +struct libxl__physmap_info { + uint64_t phys_offset; + uint64_t start_addr; + uint64_t size; + uint32_t namelen; + char name[]; +}; + +#define TOOLSTACK_SAVE_VERSION 1 + +static inline char *restore_helper(libxl__gc *gc, uint32_t domid, + uint64_t phys_offset, char *node) +{ + return libxl__sprintf(gc, + "/local/domain/0/device-model/%d/physmap/%"PRIx64"/%s", + domid, phys_offset, node); +} + +static int libxl__toolstack_restore(uint32_t domid, uint8_t *buf, + uint32_t size, void *data) +{ + libxl__gc *gc = (libxl__gc *) data; + libxl_ctx *ctx = gc->owner; + int i, ret; + uint8_t *ptr = buf; + uint32_t count = 0, version = 0; + struct libxl__physmap_info* pi; + char *xs_path; + + if (size < sizeof(version) + sizeof(count)) { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "wrong size"); + return -1; + } + + memcpy(&version, ptr, sizeof(version)); + ptr += sizeof(version); + + if (version != TOOLSTACK_SAVE_VERSION) { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "wrong version"); + return -1; + } + + memcpy(&count, ptr, sizeof(count)); + ptr += sizeof(count); + + if (size < sizeof(version) + sizeof(count) + + count * (sizeof(struct libxl__physmap_info))) { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "wrong size"); + return -1; + } + + for (i = 0; i < count; i++) { + pi = (struct libxl__physmap_info*) ptr; + ptr += sizeof(struct libxl__physmap_info) + pi->namelen; + + xs_path = restore_helper(gc, domid, pi->phys_offset, "start_addr"); + ret = libxl__xs_write(gc, 0, xs_path, "%"PRIx64, pi->start_addr); + if (ret) + return -1; + xs_path = restore_helper(gc, domid, pi->phys_offset, "size"); + ret = libxl__xs_write(gc, 0, xs_path, "%"PRIx64, pi->size); + if (ret) + return -1; + if (pi->namelen > 0) { + xs_path = restore_helper(gc, domid, pi->phys_offset, "name"); + ret = libxl__xs_write(gc, 0, xs_path, "%s", pi->name); + if (ret) + return -1; + } + } + return 0; +} + int libxl__domain_restore_common(libxl__gc *gc, uint32_t domid, libxl_domain_build_info *info, libxl__domain_build_state *state, @@ -452,6 +525,7 @@ int libxl__domain_restore_common(libxl__ /* read signature */ int rc; int hvm, pae, superpages; + struct restore_callbacks callbacks; int no_incr_generationid; switch (info->type) { case LIBXL_DOMAIN_TYPE_HVM: @@ -459,6 +533,8 @@ int libxl__domain_restore_common(libxl__ superpages = 1; pae = libxl_defbool_val(info->u.hvm.pae); no_incr_generationid = !libxl_defbool_val(info->u.hvm.incr_generationid); + callbacks.toolstack_restore = libxl__toolstack_restore; + callbacks.data = gc; break; case LIBXL_DOMAIN_TYPE_PV: hvm = 0; @@ -474,7 +550,7 @@ int libxl__domain_restore_common(libxl__ state->store_domid, state->console_port, &state->console_mfn, state->console_domid, hvm, pae, superpages, no_incr_generationid, - &state->vm_generationid_addr, NULL); + &state->vm_generationid_addr, &callbacks); if ( rc ) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "restoring domain"); return ERROR_FAIL; @@ -629,6 +705,90 @@ static int libxl__domain_suspend_common_ return 0; } +static inline char *save_helper(libxl__gc *gc, uint32_t domid, + char *phys_offset, char *node) +{ + return libxl__sprintf(gc, + "/local/domain/0/device-model/%d/physmap/%s/%s", + domid, phys_offset, node); +} + +static int libxl__toolstack_save(uint32_t domid, uint8_t **buf, + uint32_t *len, void *data) +{ + struct suspendinfo *si = (struct suspendinfo *) data; + libxl__gc *gc = (libxl__gc *) si->gc; + libxl_ctx *ctx = gc->owner; + int i = 0; + char *start_addr = NULL, *size = NULL, *phys_offset = NULL, *name = NULL; + unsigned int num = 0; + uint32_t count = 0, version = TOOLSTACK_SAVE_VERSION, namelen = 0; + uint8_t *ptr = NULL; + char **entries = NULL; + struct libxl__physmap_info *pi; + + entries = libxl__xs_directory(gc, 0, libxl__sprintf(gc, + "/local/domain/0/device-model/%d/physmap", domid), &num); + count = num; + + *len = sizeof(version) + sizeof(count); + *buf = calloc(1, *len); + ptr = *buf; + if (*buf == NULL) + return -1; + + memcpy(ptr, &version, sizeof(version)); + ptr += sizeof(version); + memcpy(ptr, &count, sizeof(count)); + ptr += sizeof(count); + + for (i = 0; i < count; i++) { + unsigned long offset; + char *xs_path; + phys_offset = entries[i]; + if (phys_offset == NULL) { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "phys_offset %d is NULL", i); + return -1; + } + + xs_path = save_helper(gc, domid, phys_offset, "start_addr"); + start_addr = libxl__xs_read(gc, 0, xs_path); + if (start_addr == NULL) { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "%s is NULL", xs_path); + return -1; + } + + xs_path = save_helper(gc, domid, phys_offset, "size"); + size = libxl__xs_read(gc, 0, xs_path); + if (size == NULL) { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "%s is NULL", xs_path); + return -1; + } + + xs_path = save_helper(gc, domid, phys_offset, "name"); + name = libxl__xs_read(gc, 0, xs_path); + if (name == NULL) + namelen = 0; + else + namelen = strlen(name) + 1; + *len += namelen + sizeof(struct libxl__physmap_info); + offset = ptr - (*buf); + *buf = realloc(*buf, *len); + if (*buf == NULL) + return -1; + ptr = (*buf) + offset; + pi = (struct libxl__physmap_info *) ptr; + pi->phys_offset = strtoll(phys_offset, NULL, 16); + pi->start_addr = strtoll(start_addr, NULL, 16); + pi->size = strtoll(size, NULL, 16); + pi->namelen = namelen; + memcpy(pi->name, name, namelen); + ptr += sizeof(struct libxl__physmap_info) + namelen; + } + + return 0; +} + int libxl__domain_suspend_common(libxl__gc *gc, uint32_t domid, int fd, libxl_domain_type type, int live, int debug) @@ -691,6 +851,7 @@ int libxl__domain_suspend_common(libxl__ memset(&callbacks, 0, sizeof(callbacks)); callbacks.suspend = libxl__domain_suspend_common_callback; callbacks.switch_qemu_logdirty = libxl__domain_suspend_common_switch_qemu_logdirty; + callbacks.toolstack_save = libxl__toolstack_save; callbacks.data = &si; rc = xc_domain_save(ctx->xch, fd, domid, 0, 0, flags, &callbacks, _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:38 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCM-0004SH-4x; Mon, 14 May 2012 16:32:38 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCI-0004GM-KS for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:34 +0000 Received: from [193.109.254.147:13604] by server-10.bemta-14.messagelabs.com id 52/C2-05847-1A331BF4; Mon, 14 May 2012 16:32:33 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-27.messagelabs.com!1337013151!3535499!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14559 invoked from network); 14 May 2012 16:32:32 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCF-0002tv-4A for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCF-0006lF-3V for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:31 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:30 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: save/restore qemu's physmap X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Stefano Stabellini # Date 1336754775 -3600 # Node ID 45adc237cd898ed6ab0eaaf5535004fcc6af50e9 # Parent 5f206c06e6626f077201890bd3c59cb0bc88df77 libxl: save/restore qemu's physmap Read Qemu's physmap from xenstore and save it using toolstack_save. Restore Qemu's physmap using toolstack_restore. Signed-off-by: Stefano Stabellini Committed-by: Ian Jackson --- diff -r 5f206c06e662 -r 45adc237cd89 tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Fri May 11 17:46:15 2012 +0100 +++ b/tools/libxl/libxl_dom.c Fri May 11 17:46:15 2012 +0100 @@ -443,6 +443,79 @@ int libxl__qemu_traditional_cmd(libxl__g return libxl__xs_write(gc, XBT_NULL, path, "%s", cmd); } +struct libxl__physmap_info { + uint64_t phys_offset; + uint64_t start_addr; + uint64_t size; + uint32_t namelen; + char name[]; +}; + +#define TOOLSTACK_SAVE_VERSION 1 + +static inline char *restore_helper(libxl__gc *gc, uint32_t domid, + uint64_t phys_offset, char *node) +{ + return libxl__sprintf(gc, + "/local/domain/0/device-model/%d/physmap/%"PRIx64"/%s", + domid, phys_offset, node); +} + +static int libxl__toolstack_restore(uint32_t domid, uint8_t *buf, + uint32_t size, void *data) +{ + libxl__gc *gc = (libxl__gc *) data; + libxl_ctx *ctx = gc->owner; + int i, ret; + uint8_t *ptr = buf; + uint32_t count = 0, version = 0; + struct libxl__physmap_info* pi; + char *xs_path; + + if (size < sizeof(version) + sizeof(count)) { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "wrong size"); + return -1; + } + + memcpy(&version, ptr, sizeof(version)); + ptr += sizeof(version); + + if (version != TOOLSTACK_SAVE_VERSION) { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "wrong version"); + return -1; + } + + memcpy(&count, ptr, sizeof(count)); + ptr += sizeof(count); + + if (size < sizeof(version) + sizeof(count) + + count * (sizeof(struct libxl__physmap_info))) { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "wrong size"); + return -1; + } + + for (i = 0; i < count; i++) { + pi = (struct libxl__physmap_info*) ptr; + ptr += sizeof(struct libxl__physmap_info) + pi->namelen; + + xs_path = restore_helper(gc, domid, pi->phys_offset, "start_addr"); + ret = libxl__xs_write(gc, 0, xs_path, "%"PRIx64, pi->start_addr); + if (ret) + return -1; + xs_path = restore_helper(gc, domid, pi->phys_offset, "size"); + ret = libxl__xs_write(gc, 0, xs_path, "%"PRIx64, pi->size); + if (ret) + return -1; + if (pi->namelen > 0) { + xs_path = restore_helper(gc, domid, pi->phys_offset, "name"); + ret = libxl__xs_write(gc, 0, xs_path, "%s", pi->name); + if (ret) + return -1; + } + } + return 0; +} + int libxl__domain_restore_common(libxl__gc *gc, uint32_t domid, libxl_domain_build_info *info, libxl__domain_build_state *state, @@ -452,6 +525,7 @@ int libxl__domain_restore_common(libxl__ /* read signature */ int rc; int hvm, pae, superpages; + struct restore_callbacks callbacks; int no_incr_generationid; switch (info->type) { case LIBXL_DOMAIN_TYPE_HVM: @@ -459,6 +533,8 @@ int libxl__domain_restore_common(libxl__ superpages = 1; pae = libxl_defbool_val(info->u.hvm.pae); no_incr_generationid = !libxl_defbool_val(info->u.hvm.incr_generationid); + callbacks.toolstack_restore = libxl__toolstack_restore; + callbacks.data = gc; break; case LIBXL_DOMAIN_TYPE_PV: hvm = 0; @@ -474,7 +550,7 @@ int libxl__domain_restore_common(libxl__ state->store_domid, state->console_port, &state->console_mfn, state->console_domid, hvm, pae, superpages, no_incr_generationid, - &state->vm_generationid_addr, NULL); + &state->vm_generationid_addr, &callbacks); if ( rc ) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "restoring domain"); return ERROR_FAIL; @@ -629,6 +705,90 @@ static int libxl__domain_suspend_common_ return 0; } +static inline char *save_helper(libxl__gc *gc, uint32_t domid, + char *phys_offset, char *node) +{ + return libxl__sprintf(gc, + "/local/domain/0/device-model/%d/physmap/%s/%s", + domid, phys_offset, node); +} + +static int libxl__toolstack_save(uint32_t domid, uint8_t **buf, + uint32_t *len, void *data) +{ + struct suspendinfo *si = (struct suspendinfo *) data; + libxl__gc *gc = (libxl__gc *) si->gc; + libxl_ctx *ctx = gc->owner; + int i = 0; + char *start_addr = NULL, *size = NULL, *phys_offset = NULL, *name = NULL; + unsigned int num = 0; + uint32_t count = 0, version = TOOLSTACK_SAVE_VERSION, namelen = 0; + uint8_t *ptr = NULL; + char **entries = NULL; + struct libxl__physmap_info *pi; + + entries = libxl__xs_directory(gc, 0, libxl__sprintf(gc, + "/local/domain/0/device-model/%d/physmap", domid), &num); + count = num; + + *len = sizeof(version) + sizeof(count); + *buf = calloc(1, *len); + ptr = *buf; + if (*buf == NULL) + return -1; + + memcpy(ptr, &version, sizeof(version)); + ptr += sizeof(version); + memcpy(ptr, &count, sizeof(count)); + ptr += sizeof(count); + + for (i = 0; i < count; i++) { + unsigned long offset; + char *xs_path; + phys_offset = entries[i]; + if (phys_offset == NULL) { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "phys_offset %d is NULL", i); + return -1; + } + + xs_path = save_helper(gc, domid, phys_offset, "start_addr"); + start_addr = libxl__xs_read(gc, 0, xs_path); + if (start_addr == NULL) { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "%s is NULL", xs_path); + return -1; + } + + xs_path = save_helper(gc, domid, phys_offset, "size"); + size = libxl__xs_read(gc, 0, xs_path); + if (size == NULL) { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "%s is NULL", xs_path); + return -1; + } + + xs_path = save_helper(gc, domid, phys_offset, "name"); + name = libxl__xs_read(gc, 0, xs_path); + if (name == NULL) + namelen = 0; + else + namelen = strlen(name) + 1; + *len += namelen + sizeof(struct libxl__physmap_info); + offset = ptr - (*buf); + *buf = realloc(*buf, *len); + if (*buf == NULL) + return -1; + ptr = (*buf) + offset; + pi = (struct libxl__physmap_info *) ptr; + pi->phys_offset = strtoll(phys_offset, NULL, 16); + pi->start_addr = strtoll(start_addr, NULL, 16); + pi->size = strtoll(size, NULL, 16); + pi->namelen = namelen; + memcpy(pi->name, name, namelen); + ptr += sizeof(struct libxl__physmap_info) + namelen; + } + + return 0; +} + int libxl__domain_suspend_common(libxl__gc *gc, uint32_t domid, int fd, libxl_domain_type type, int live, int debug) @@ -691,6 +851,7 @@ int libxl__domain_suspend_common(libxl__ memset(&callbacks, 0, sizeof(callbacks)); callbacks.suspend = libxl__domain_suspend_common_callback; callbacks.switch_qemu_logdirty = libxl__domain_suspend_common_switch_qemu_logdirty; + callbacks.toolstack_save = libxl__toolstack_save; callbacks.data = &si; rc = xc_domain_save(ctx->xch, fd, domid, 0, 0, flags, &callbacks, _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:38 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCM-0004Tl-Jb; Mon, 14 May 2012 16:32:38 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCI-0004Hh-TE for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:35 +0000 Received: from [85.158.139.83:30962] by server-7.bemta-5.messagelabs.com id 0F/C6-16195-2A331BF4; Mon, 14 May 2012 16:32:34 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-182.messagelabs.com!1337013150!28332203!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3090 invoked from network); 14 May 2012 16:32:32 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCE-0002tm-37 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCE-0006kl-2Q for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:30 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:29 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xl: Call xlu_cfg_destroy in main_cpupoolcreate X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User George Dunlap # Date 1336754064 -3600 # Node ID 2e980a2405ebb1e213facd17fa423d2a4d6dedf0 # Parent 83f16dfd5f077b5b8242f4f9bf5b4301ff27b8e1 xl: Call xlu_cfg_destroy in main_cpupoolcreate This involves making a goto clean-up path, rather than calling return directly. Signed-off-by: George Dunlap Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 83f16dfd5f07 -r 2e980a2405eb tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Fri May 11 17:34:23 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Fri May 11 17:34:24 2012 +0100 @@ -5591,6 +5591,7 @@ int main_cpupoolcreate(int argc, char ** libxl_cpumap cpumap; libxl_uuid uuid; libxl_cputopology *topology; + int rc = -ERROR_FAIL; while (1) { opt = getopt_long(argc, argv, "hnf:", long_options, &option_index); @@ -5624,7 +5625,7 @@ int main_cpupoolcreate(int argc, char ** filename = argv[optind]; } else { help("cpupool-create"); - return -ERROR_FAIL; + goto out; } optind++; } @@ -5635,7 +5636,7 @@ int main_cpupoolcreate(int argc, char ** &config_len)) { fprintf(stderr, "Failed to read config file: %s: %s\n", filename, strerror(errno)); - return -ERROR_FAIL; + goto out; } config_src=filename; } @@ -5645,13 +5646,13 @@ int main_cpupoolcreate(int argc, char ** if (strlen(extra_config)) { if (config_len > INT_MAX - (strlen(extra_config) + 2)) { fprintf(stderr, "Failed to attach extra configration\n"); - return -ERROR_FAIL; + goto out; } config_data = xrealloc(config_data, config_len + strlen(extra_config) + 2); if (!config_data) { fprintf(stderr, "Failed to realloc config_data\n"); - return -ERROR_FAIL; + goto out; } config_data[config_len] = 0; strcat(config_data, extra_config); @@ -5662,13 +5663,13 @@ int main_cpupoolcreate(int argc, char ** config = xlu_cfg_init(stderr, config_src); if (!config) { fprintf(stderr, "Failed to allocate for configuration\n"); - return -ERROR_FAIL; + goto out; } ret = xlu_cfg_readdata(config, config_data, config_len); if (ret) { fprintf(stderr, "Failed to parse config file: %s\n", strerror(ret)); - return -ERROR_FAIL; + goto out_cfg; } if (!xlu_cfg_get_string (config, "name", &buf, 0)) @@ -5677,32 +5678,32 @@ int main_cpupoolcreate(int argc, char ** name = libxl_basename(filename); else { fprintf(stderr, "Missing cpupool name!\n"); - return -ERROR_FAIL; + goto out_cfg; } if (!libxl_name_to_cpupoolid(ctx, name, &poolid)) { fprintf(stderr, "Pool name \"%s\" already exists\n", name); - return -ERROR_FAIL; + goto out_cfg; } if (!xlu_cfg_get_string (config, "sched", &buf, 0)) { if ((libxl_scheduler_from_string(buf, &sched)) < 0) { fprintf(stderr, "Unknown scheduler\n"); - return -ERROR_FAIL; + goto out_cfg; } } else { if ((sched = libxl_get_scheduler(ctx)) < 0) { fprintf(stderr, "get_scheduler sysctl failed.\n"); - return -ERROR_FAIL; + goto out_cfg; } } if (libxl_get_freecpus(ctx, &freemap)) { fprintf(stderr, "libxl_get_freecpus failed\n"); - return -ERROR_FAIL; + goto out_cfg; } if (libxl_cpumap_alloc(ctx, &cpumap)) { fprintf(stderr, "Failed to allocate cpumap\n"); - return -ERROR_FAIL; + goto out_cfg; } if (!xlu_cfg_get_list(config, "nodes", &nodes, 0, 0)) { int nr; @@ -5711,7 +5712,7 @@ int main_cpupoolcreate(int argc, char ** topology = libxl_get_cpu_topology(ctx, &nr); if (topology == NULL) { fprintf(stderr, "libxl_get_topologyinfo failed\n"); - return -ERROR_FAIL; + goto out_cfg; } while ((buf = xlu_cfg_get_listitem(nodes, n_nodes)) != NULL) { n = atoi(buf); @@ -5729,7 +5730,7 @@ int main_cpupoolcreate(int argc, char ** if (n_cpus == 0) { fprintf(stderr, "no free cpu found\n"); - return -ERROR_FAIL; + goto out_cfg; } } else if (!xlu_cfg_get_list(config, "cpus", &cpus, 0, 0)) { n_cpus = 0; @@ -5738,7 +5739,7 @@ int main_cpupoolcreate(int argc, char ** if ((i < 0) || (i >= freemap.size * 8) || !libxl_cpumap_test(&freemap, i)) { fprintf(stderr, "cpu %d illegal or not free\n", i); - return -ERROR_FAIL; + goto out_cfg; } libxl_cpumap_set(&cpumap, i); n_cpus++; @@ -5753,16 +5754,20 @@ int main_cpupoolcreate(int argc, char ** printf("scheduler: %s\n", libxl_scheduler_to_string(sched)); printf("number of cpus: %d\n", n_cpus); - if (dryrun_only) - return 0; - - poolid = 0; - if (libxl_cpupool_create(ctx, name, sched, cpumap, &uuid, &poolid)) { - fprintf(stderr, "error on creating cpupool\n"); - return -ERROR_FAIL; - } - - return 0; + if (!dryrun_only) { + poolid = 0; + if (libxl_cpupool_create(ctx, name, sched, cpumap, &uuid, &poolid)) { + fprintf(stderr, "error on creating cpupool\n"); + goto out_cfg; + } + } + /* We made it! */ + rc = 0; + +out_cfg: + xlu_cfg_destroy(config); +out: + return rc; } int main_cpupoollist(int argc, char **argv) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:38 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCM-0004Tl-Jb; Mon, 14 May 2012 16:32:38 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCI-0004Hh-TE for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:35 +0000 Received: from [85.158.139.83:30962] by server-7.bemta-5.messagelabs.com id 0F/C6-16195-2A331BF4; Mon, 14 May 2012 16:32:34 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-182.messagelabs.com!1337013150!28332203!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3090 invoked from network); 14 May 2012 16:32:32 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCE-0002tm-37 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCE-0006kl-2Q for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:30 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:29 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xl: Call xlu_cfg_destroy in main_cpupoolcreate X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User George Dunlap # Date 1336754064 -3600 # Node ID 2e980a2405ebb1e213facd17fa423d2a4d6dedf0 # Parent 83f16dfd5f077b5b8242f4f9bf5b4301ff27b8e1 xl: Call xlu_cfg_destroy in main_cpupoolcreate This involves making a goto clean-up path, rather than calling return directly. Signed-off-by: George Dunlap Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 83f16dfd5f07 -r 2e980a2405eb tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Fri May 11 17:34:23 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Fri May 11 17:34:24 2012 +0100 @@ -5591,6 +5591,7 @@ int main_cpupoolcreate(int argc, char ** libxl_cpumap cpumap; libxl_uuid uuid; libxl_cputopology *topology; + int rc = -ERROR_FAIL; while (1) { opt = getopt_long(argc, argv, "hnf:", long_options, &option_index); @@ -5624,7 +5625,7 @@ int main_cpupoolcreate(int argc, char ** filename = argv[optind]; } else { help("cpupool-create"); - return -ERROR_FAIL; + goto out; } optind++; } @@ -5635,7 +5636,7 @@ int main_cpupoolcreate(int argc, char ** &config_len)) { fprintf(stderr, "Failed to read config file: %s: %s\n", filename, strerror(errno)); - return -ERROR_FAIL; + goto out; } config_src=filename; } @@ -5645,13 +5646,13 @@ int main_cpupoolcreate(int argc, char ** if (strlen(extra_config)) { if (config_len > INT_MAX - (strlen(extra_config) + 2)) { fprintf(stderr, "Failed to attach extra configration\n"); - return -ERROR_FAIL; + goto out; } config_data = xrealloc(config_data, config_len + strlen(extra_config) + 2); if (!config_data) { fprintf(stderr, "Failed to realloc config_data\n"); - return -ERROR_FAIL; + goto out; } config_data[config_len] = 0; strcat(config_data, extra_config); @@ -5662,13 +5663,13 @@ int main_cpupoolcreate(int argc, char ** config = xlu_cfg_init(stderr, config_src); if (!config) { fprintf(stderr, "Failed to allocate for configuration\n"); - return -ERROR_FAIL; + goto out; } ret = xlu_cfg_readdata(config, config_data, config_len); if (ret) { fprintf(stderr, "Failed to parse config file: %s\n", strerror(ret)); - return -ERROR_FAIL; + goto out_cfg; } if (!xlu_cfg_get_string (config, "name", &buf, 0)) @@ -5677,32 +5678,32 @@ int main_cpupoolcreate(int argc, char ** name = libxl_basename(filename); else { fprintf(stderr, "Missing cpupool name!\n"); - return -ERROR_FAIL; + goto out_cfg; } if (!libxl_name_to_cpupoolid(ctx, name, &poolid)) { fprintf(stderr, "Pool name \"%s\" already exists\n", name); - return -ERROR_FAIL; + goto out_cfg; } if (!xlu_cfg_get_string (config, "sched", &buf, 0)) { if ((libxl_scheduler_from_string(buf, &sched)) < 0) { fprintf(stderr, "Unknown scheduler\n"); - return -ERROR_FAIL; + goto out_cfg; } } else { if ((sched = libxl_get_scheduler(ctx)) < 0) { fprintf(stderr, "get_scheduler sysctl failed.\n"); - return -ERROR_FAIL; + goto out_cfg; } } if (libxl_get_freecpus(ctx, &freemap)) { fprintf(stderr, "libxl_get_freecpus failed\n"); - return -ERROR_FAIL; + goto out_cfg; } if (libxl_cpumap_alloc(ctx, &cpumap)) { fprintf(stderr, "Failed to allocate cpumap\n"); - return -ERROR_FAIL; + goto out_cfg; } if (!xlu_cfg_get_list(config, "nodes", &nodes, 0, 0)) { int nr; @@ -5711,7 +5712,7 @@ int main_cpupoolcreate(int argc, char ** topology = libxl_get_cpu_topology(ctx, &nr); if (topology == NULL) { fprintf(stderr, "libxl_get_topologyinfo failed\n"); - return -ERROR_FAIL; + goto out_cfg; } while ((buf = xlu_cfg_get_listitem(nodes, n_nodes)) != NULL) { n = atoi(buf); @@ -5729,7 +5730,7 @@ int main_cpupoolcreate(int argc, char ** if (n_cpus == 0) { fprintf(stderr, "no free cpu found\n"); - return -ERROR_FAIL; + goto out_cfg; } } else if (!xlu_cfg_get_list(config, "cpus", &cpus, 0, 0)) { n_cpus = 0; @@ -5738,7 +5739,7 @@ int main_cpupoolcreate(int argc, char ** if ((i < 0) || (i >= freemap.size * 8) || !libxl_cpumap_test(&freemap, i)) { fprintf(stderr, "cpu %d illegal or not free\n", i); - return -ERROR_FAIL; + goto out_cfg; } libxl_cpumap_set(&cpumap, i); n_cpus++; @@ -5753,16 +5754,20 @@ int main_cpupoolcreate(int argc, char ** printf("scheduler: %s\n", libxl_scheduler_to_string(sched)); printf("number of cpus: %d\n", n_cpus); - if (dryrun_only) - return 0; - - poolid = 0; - if (libxl_cpupool_create(ctx, name, sched, cpumap, &uuid, &poolid)) { - fprintf(stderr, "error on creating cpupool\n"); - return -ERROR_FAIL; - } - - return 0; + if (!dryrun_only) { + poolid = 0; + if (libxl_cpupool_create(ctx, name, sched, cpumap, &uuid, &poolid)) { + fprintf(stderr, "error on creating cpupool\n"); + goto out_cfg; + } + } + /* We made it! */ + rc = 0; + +out_cfg: + xlu_cfg_destroy(config); +out: + return rc; } int main_cpupoollist(int argc, char **argv) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:39 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCM-0004Ub-TC; Mon, 14 May 2012 16:32:38 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCJ-0004Ie-81 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:35 +0000 Received: from [85.158.138.51:33938] by server-10.bemta-3.messagelabs.com id 6A/E5-29478-2A331BF4; Mon, 14 May 2012 16:32:34 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-174.messagelabs.com!1337013152!23011900!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18766 invoked from network); 14 May 2012 16:32:33 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCG-0002u6-5l for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCG-0006lj-4x for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:32 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:31 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] blktap2: Fix naked unchecked uses of read/write/chdir. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Keir Fraser # Date 1336757429 -3600 # Node ID 01d64a3dea717134d9387a1b39745bdc2eb8cf59 # Parent 84ae90427c54f275944683848344d1b17f5584f5 blktap2: Fix naked unchecked uses of read/write/chdir. These cause warnings under warn_unused_result, and for read/write we ought to deal with partial io results. Signed-off-by: Keir Fraser --- diff -r 84ae90427c54 -r 01d64a3dea71 tools/blktap2/drivers/tapdisk-diff.c --- a/tools/blktap2/drivers/tapdisk-diff.c Fri May 11 17:46:16 2012 +0100 +++ b/tools/blktap2/drivers/tapdisk-diff.c Fri May 11 18:30:29 2012 +0100 @@ -39,6 +39,7 @@ #include "tapdisk-vbd.h" #include "tapdisk-server.h" #include "tapdisk-disktype.h" +#include "tapdisk-utils.h" #include "libvhd.h" #define POLL_READ 0 @@ -170,7 +171,7 @@ tapdisk_stream_poll_clear(struct tapdisk { int dummy; - read(p->pipe[POLL_READ], &dummy, sizeof(dummy)); + read_exact(p->pipe[POLL_READ], &dummy, sizeof(dummy)); p->set = 0; } @@ -180,7 +181,7 @@ tapdisk_stream_poll_set(struct tapdisk_s int dummy = 0; if (!p->set) { - write(p->pipe[POLL_WRITE], &dummy, sizeof(dummy)); + write_exact(p->pipe[POLL_WRITE], &dummy, sizeof(dummy)); p->set = 1; } } diff -r 84ae90427c54 -r 01d64a3dea71 tools/blktap2/drivers/tapdisk-log.c --- a/tools/blktap2/drivers/tapdisk-log.c Fri May 11 17:46:16 2012 +0100 +++ b/tools/blktap2/drivers/tapdisk-log.c Fri May 11 18:30:29 2012 +0100 @@ -37,6 +37,7 @@ #include #include "tapdisk-log.h" +#include "tapdisk-utils.h" #define MAX_ENTRY_LEN 512 #define MAX_ERROR_MESSAGES 16 @@ -247,7 +248,7 @@ tlog_flush(void) wsize = ((size + 511) & (~511)); memset(tapdisk_log.buf + size, '\n', wsize - size); - write(fd, tapdisk_log.buf, wsize); + write_exact(fd, tapdisk_log.buf, wsize); tapdisk_log.p = tapdisk_log.buf; diff -r 84ae90427c54 -r 01d64a3dea71 tools/blktap2/drivers/tapdisk-queue.c --- a/tools/blktap2/drivers/tapdisk-queue.c Fri May 11 17:46:16 2012 +0100 +++ b/tools/blktap2/drivers/tapdisk-queue.c Fri May 11 18:30:29 2012 +0100 @@ -435,7 +435,7 @@ tapdisk_lio_ack_event(struct tqueue *que uint64_t val; if (lio->flags & LIO_FLAG_EVENTFD) - read(lio->event_fd, &val, sizeof(val)); + read_exact(lio->event_fd, &val, sizeof(val)); } static void diff -r 84ae90427c54 -r 01d64a3dea71 tools/blktap2/drivers/tapdisk-stream.c --- a/tools/blktap2/drivers/tapdisk-stream.c Fri May 11 17:46:16 2012 +0100 +++ b/tools/blktap2/drivers/tapdisk-stream.c Fri May 11 18:30:29 2012 +0100 @@ -38,6 +38,7 @@ #include "tapdisk-vbd.h" #include "tapdisk-server.h" #include "tapdisk-disktype.h" +#include "tapdisk-utils.h" #define POLL_READ 0 #define POLL_WRITE 1 @@ -145,7 +146,7 @@ tapdisk_stream_poll_clear(struct tapdisk { int dummy; - read(p->pipe[POLL_READ], &dummy, sizeof(dummy)); + read_exact(p->pipe[POLL_READ], &dummy, sizeof(dummy)); p->set = 0; } @@ -155,7 +156,7 @@ tapdisk_stream_poll_set(struct tapdisk_s int dummy = 0; if (!p->set) { - write(p->pipe[POLL_WRITE], &dummy, sizeof(dummy)); + write_exact(p->pipe[POLL_WRITE], &dummy, sizeof(dummy)); p->set = 1; } } @@ -203,7 +204,7 @@ tapdisk_stream_print_request(struct tapd { unsigned long idx = (unsigned long)tapdisk_stream_request_idx(s, sreq); char *buf = (char *)MMAP_VADDR(s->vbd->ring.vstart, idx, 0); - write(s->out_fd, buf, sreq->secs << SECTOR_SHIFT); + write_exact(s->out_fd, buf, sreq->secs << SECTOR_SHIFT); } static void diff -r 84ae90427c54 -r 01d64a3dea71 tools/blktap2/drivers/tapdisk-utils.c --- a/tools/blktap2/drivers/tapdisk-utils.c Fri May 11 17:46:16 2012 +0100 +++ b/tools/blktap2/drivers/tapdisk-utils.c Fri May 11 18:30:29 2012 +0100 @@ -175,3 +175,40 @@ int tapdisk_linux_version(void) } #endif +int read_exact(int fd, void *data, size_t size) +{ + size_t offset = 0; + ssize_t len; + + while ( offset < size ) + { + len = read(fd, (char *)data + offset, size - offset); + if ( (len == -1) && (errno == EINTR) ) + continue; + if ( len == 0 ) + errno = 0; + if ( len <= 0 ) + return -1; + offset += len; + } + + return 0; +} + +int write_exact(int fd, const void *data, size_t size) +{ + size_t offset = 0; + ssize_t len; + + while ( offset < size ) + { + len = write(fd, (const char *)data + offset, size - offset); + if ( (len == -1) && (errno == EINTR) ) + continue; + if ( len <= 0 ) + return -1; + offset += len; + } + + return 0; +} diff -r 84ae90427c54 -r 01d64a3dea71 tools/blktap2/drivers/tapdisk-utils.h --- a/tools/blktap2/drivers/tapdisk-utils.h Fri May 11 17:46:16 2012 +0100 +++ b/tools/blktap2/drivers/tapdisk-utils.h Fri May 11 18:30:29 2012 +0100 @@ -39,4 +39,7 @@ int tapdisk_namedup(char **, const char int tapdisk_get_image_size(int, uint64_t *, uint32_t *); int tapdisk_linux_version(void); +int read_exact(int fd, void *data, size_t size); /* EOF => -1, errno=0 */ +int write_exact(int fd, const void *data, size_t size); + #endif diff -r 84ae90427c54 -r 01d64a3dea71 tools/blktap2/drivers/tapdisk2.c --- a/tools/blktap2/drivers/tapdisk2.c Fri May 11 17:46:16 2012 +0100 +++ b/tools/blktap2/drivers/tapdisk2.c Fri May 11 18:30:29 2012 +0100 @@ -79,7 +79,12 @@ main(int argc, char *argv[]) if (optind != argc) usage(argv[0], EINVAL); - chdir("/"); + if (chdir("/")) { + DPRINTF("failed to chdir(/): %d\n", errno); + err = 1; + goto out; + } + tapdisk_start_logging("tapdisk2"); err = tapdisk_server_init(); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:39 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCM-0004Ub-TC; Mon, 14 May 2012 16:32:38 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCJ-0004Ie-81 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:35 +0000 Received: from [85.158.138.51:33938] by server-10.bemta-3.messagelabs.com id 6A/E5-29478-2A331BF4; Mon, 14 May 2012 16:32:34 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-174.messagelabs.com!1337013152!23011900!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18766 invoked from network); 14 May 2012 16:32:33 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCG-0002u6-5l for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCG-0006lj-4x for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:32 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:31 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] blktap2: Fix naked unchecked uses of read/write/chdir. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Keir Fraser # Date 1336757429 -3600 # Node ID 01d64a3dea717134d9387a1b39745bdc2eb8cf59 # Parent 84ae90427c54f275944683848344d1b17f5584f5 blktap2: Fix naked unchecked uses of read/write/chdir. These cause warnings under warn_unused_result, and for read/write we ought to deal with partial io results. Signed-off-by: Keir Fraser --- diff -r 84ae90427c54 -r 01d64a3dea71 tools/blktap2/drivers/tapdisk-diff.c --- a/tools/blktap2/drivers/tapdisk-diff.c Fri May 11 17:46:16 2012 +0100 +++ b/tools/blktap2/drivers/tapdisk-diff.c Fri May 11 18:30:29 2012 +0100 @@ -39,6 +39,7 @@ #include "tapdisk-vbd.h" #include "tapdisk-server.h" #include "tapdisk-disktype.h" +#include "tapdisk-utils.h" #include "libvhd.h" #define POLL_READ 0 @@ -170,7 +171,7 @@ tapdisk_stream_poll_clear(struct tapdisk { int dummy; - read(p->pipe[POLL_READ], &dummy, sizeof(dummy)); + read_exact(p->pipe[POLL_READ], &dummy, sizeof(dummy)); p->set = 0; } @@ -180,7 +181,7 @@ tapdisk_stream_poll_set(struct tapdisk_s int dummy = 0; if (!p->set) { - write(p->pipe[POLL_WRITE], &dummy, sizeof(dummy)); + write_exact(p->pipe[POLL_WRITE], &dummy, sizeof(dummy)); p->set = 1; } } diff -r 84ae90427c54 -r 01d64a3dea71 tools/blktap2/drivers/tapdisk-log.c --- a/tools/blktap2/drivers/tapdisk-log.c Fri May 11 17:46:16 2012 +0100 +++ b/tools/blktap2/drivers/tapdisk-log.c Fri May 11 18:30:29 2012 +0100 @@ -37,6 +37,7 @@ #include #include "tapdisk-log.h" +#include "tapdisk-utils.h" #define MAX_ENTRY_LEN 512 #define MAX_ERROR_MESSAGES 16 @@ -247,7 +248,7 @@ tlog_flush(void) wsize = ((size + 511) & (~511)); memset(tapdisk_log.buf + size, '\n', wsize - size); - write(fd, tapdisk_log.buf, wsize); + write_exact(fd, tapdisk_log.buf, wsize); tapdisk_log.p = tapdisk_log.buf; diff -r 84ae90427c54 -r 01d64a3dea71 tools/blktap2/drivers/tapdisk-queue.c --- a/tools/blktap2/drivers/tapdisk-queue.c Fri May 11 17:46:16 2012 +0100 +++ b/tools/blktap2/drivers/tapdisk-queue.c Fri May 11 18:30:29 2012 +0100 @@ -435,7 +435,7 @@ tapdisk_lio_ack_event(struct tqueue *que uint64_t val; if (lio->flags & LIO_FLAG_EVENTFD) - read(lio->event_fd, &val, sizeof(val)); + read_exact(lio->event_fd, &val, sizeof(val)); } static void diff -r 84ae90427c54 -r 01d64a3dea71 tools/blktap2/drivers/tapdisk-stream.c --- a/tools/blktap2/drivers/tapdisk-stream.c Fri May 11 17:46:16 2012 +0100 +++ b/tools/blktap2/drivers/tapdisk-stream.c Fri May 11 18:30:29 2012 +0100 @@ -38,6 +38,7 @@ #include "tapdisk-vbd.h" #include "tapdisk-server.h" #include "tapdisk-disktype.h" +#include "tapdisk-utils.h" #define POLL_READ 0 #define POLL_WRITE 1 @@ -145,7 +146,7 @@ tapdisk_stream_poll_clear(struct tapdisk { int dummy; - read(p->pipe[POLL_READ], &dummy, sizeof(dummy)); + read_exact(p->pipe[POLL_READ], &dummy, sizeof(dummy)); p->set = 0; } @@ -155,7 +156,7 @@ tapdisk_stream_poll_set(struct tapdisk_s int dummy = 0; if (!p->set) { - write(p->pipe[POLL_WRITE], &dummy, sizeof(dummy)); + write_exact(p->pipe[POLL_WRITE], &dummy, sizeof(dummy)); p->set = 1; } } @@ -203,7 +204,7 @@ tapdisk_stream_print_request(struct tapd { unsigned long idx = (unsigned long)tapdisk_stream_request_idx(s, sreq); char *buf = (char *)MMAP_VADDR(s->vbd->ring.vstart, idx, 0); - write(s->out_fd, buf, sreq->secs << SECTOR_SHIFT); + write_exact(s->out_fd, buf, sreq->secs << SECTOR_SHIFT); } static void diff -r 84ae90427c54 -r 01d64a3dea71 tools/blktap2/drivers/tapdisk-utils.c --- a/tools/blktap2/drivers/tapdisk-utils.c Fri May 11 17:46:16 2012 +0100 +++ b/tools/blktap2/drivers/tapdisk-utils.c Fri May 11 18:30:29 2012 +0100 @@ -175,3 +175,40 @@ int tapdisk_linux_version(void) } #endif +int read_exact(int fd, void *data, size_t size) +{ + size_t offset = 0; + ssize_t len; + + while ( offset < size ) + { + len = read(fd, (char *)data + offset, size - offset); + if ( (len == -1) && (errno == EINTR) ) + continue; + if ( len == 0 ) + errno = 0; + if ( len <= 0 ) + return -1; + offset += len; + } + + return 0; +} + +int write_exact(int fd, const void *data, size_t size) +{ + size_t offset = 0; + ssize_t len; + + while ( offset < size ) + { + len = write(fd, (const char *)data + offset, size - offset); + if ( (len == -1) && (errno == EINTR) ) + continue; + if ( len <= 0 ) + return -1; + offset += len; + } + + return 0; +} diff -r 84ae90427c54 -r 01d64a3dea71 tools/blktap2/drivers/tapdisk-utils.h --- a/tools/blktap2/drivers/tapdisk-utils.h Fri May 11 17:46:16 2012 +0100 +++ b/tools/blktap2/drivers/tapdisk-utils.h Fri May 11 18:30:29 2012 +0100 @@ -39,4 +39,7 @@ int tapdisk_namedup(char **, const char int tapdisk_get_image_size(int, uint64_t *, uint32_t *); int tapdisk_linux_version(void); +int read_exact(int fd, void *data, size_t size); /* EOF => -1, errno=0 */ +int write_exact(int fd, const void *data, size_t size); + #endif diff -r 84ae90427c54 -r 01d64a3dea71 tools/blktap2/drivers/tapdisk2.c --- a/tools/blktap2/drivers/tapdisk2.c Fri May 11 17:46:16 2012 +0100 +++ b/tools/blktap2/drivers/tapdisk2.c Fri May 11 18:30:29 2012 +0100 @@ -79,7 +79,12 @@ main(int argc, char *argv[]) if (optind != argc) usage(argv[0], EINVAL); - chdir("/"); + if (chdir("/")) { + DPRINTF("failed to chdir(/): %d\n", errno); + err = 1; + goto out; + } + tapdisk_start_logging("tapdisk2"); err = tapdisk_server_init(); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:39 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCN-0004Vp-Bz; Mon, 14 May 2012 16:32:39 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCJ-0004JL-Bj for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:35 +0000 Received: from [193.109.254.147:49809] by server-5.bemta-14.messagelabs.com id 05/71-30733-2A331BF4; Mon, 14 May 2012 16:32:34 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-27.messagelabs.com!1337013153!3535505!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14632 invoked from network); 14 May 2012 16:32:33 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCG-0002uB-Ms for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCG-0006ly-Lr for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:32 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:32 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: handle POLLERR, POLLHUP, POLLNVAL properly X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1336759135 -3600 # Node ID b675568d14b8f40b75a0db4dd8762c42c188961a # Parent 01d64a3dea717134d9387a1b39745bdc2eb8cf59 libxl: handle POLLERR, POLLHUP, POLLNVAL properly Pass POLLERR and POLLHUP to fd callbacks, as is necessary. Crash on POLLNVAL since that means our fds are messed up. Document the behaviour (including the fact that poll sometimes sets POLLHUP or POLLERR even if only POLLIN was requested. Fix the one current fd callback to do something with POLLERR|POLLHUP. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 01d64a3dea71 -r b675568d14b8 tools/libxl/libxl_event.c --- a/tools/libxl/libxl_event.c Fri May 11 18:30:29 2012 +0100 +++ b/tools/libxl/libxl_event.c Fri May 11 18:58:55 2012 +0100 @@ -339,6 +339,9 @@ static void watchfd_callback(libxl__egc { EGC_GC; + if (revents & (POLLERR|POLLHUP)) + LIBXL__EVENT_DISASTER(egc, "unexpected poll event on watch fd", 0, 0); + for (;;) { char **event = xs_check_watch(CTX->xsh); if (!event) { @@ -743,7 +746,9 @@ static int afterpoll_check_fd(libxl__pol /* again, stale slot entry */ return 0; - int revents = fds[slot].revents & events; + assert(!(fds[slot].revents & POLLNVAL)); + + int revents = fds[slot].revents & (events | POLLERR | POLLHUP); /* we mask in case requested events have changed */ return revents; diff -r 01d64a3dea71 -r b675568d14b8 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri May 11 18:30:29 2012 +0100 +++ b/tools/libxl/libxl_internal.h Fri May 11 18:58:55 2012 +0100 @@ -128,6 +128,11 @@ _hidden void libxl__alloc_failed(libxl_c typedef struct libxl__ev_fd libxl__ev_fd; typedef void libxl__ev_fd_callback(libxl__egc *egc, libxl__ev_fd *ev, int fd, short events, short revents); + /* Note that revents may contain POLLERR or POLLHUP regardless of + * events; otherwise revents contains only bits in events. Contrary + * to the documentation for poll(2), POLLERR and POLLHUP can occur + * even if only POLLIN was set in events. (POLLNVAL is a fatal + * error and will cause libxl event machinery to fail an assertion.) */ struct libxl__ev_fd { /* caller should include this in their own struct */ /* read-only for caller, who may read only when registered: */ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:39 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCN-0004Vp-Bz; Mon, 14 May 2012 16:32:39 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCJ-0004JL-Bj for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:35 +0000 Received: from [193.109.254.147:49809] by server-5.bemta-14.messagelabs.com id 05/71-30733-2A331BF4; Mon, 14 May 2012 16:32:34 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-27.messagelabs.com!1337013153!3535505!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14632 invoked from network); 14 May 2012 16:32:33 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCG-0002uB-Ms for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCG-0006ly-Lr for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:32 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:32 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: handle POLLERR, POLLHUP, POLLNVAL properly X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1336759135 -3600 # Node ID b675568d14b8f40b75a0db4dd8762c42c188961a # Parent 01d64a3dea717134d9387a1b39745bdc2eb8cf59 libxl: handle POLLERR, POLLHUP, POLLNVAL properly Pass POLLERR and POLLHUP to fd callbacks, as is necessary. Crash on POLLNVAL since that means our fds are messed up. Document the behaviour (including the fact that poll sometimes sets POLLHUP or POLLERR even if only POLLIN was requested. Fix the one current fd callback to do something with POLLERR|POLLHUP. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 01d64a3dea71 -r b675568d14b8 tools/libxl/libxl_event.c --- a/tools/libxl/libxl_event.c Fri May 11 18:30:29 2012 +0100 +++ b/tools/libxl/libxl_event.c Fri May 11 18:58:55 2012 +0100 @@ -339,6 +339,9 @@ static void watchfd_callback(libxl__egc { EGC_GC; + if (revents & (POLLERR|POLLHUP)) + LIBXL__EVENT_DISASTER(egc, "unexpected poll event on watch fd", 0, 0); + for (;;) { char **event = xs_check_watch(CTX->xsh); if (!event) { @@ -743,7 +746,9 @@ static int afterpoll_check_fd(libxl__pol /* again, stale slot entry */ return 0; - int revents = fds[slot].revents & events; + assert(!(fds[slot].revents & POLLNVAL)); + + int revents = fds[slot].revents & (events | POLLERR | POLLHUP); /* we mask in case requested events have changed */ return revents; diff -r 01d64a3dea71 -r b675568d14b8 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri May 11 18:30:29 2012 +0100 +++ b/tools/libxl/libxl_internal.h Fri May 11 18:58:55 2012 +0100 @@ -128,6 +128,11 @@ _hidden void libxl__alloc_failed(libxl_c typedef struct libxl__ev_fd libxl__ev_fd; typedef void libxl__ev_fd_callback(libxl__egc *egc, libxl__ev_fd *ev, int fd, short events, short revents); + /* Note that revents may contain POLLERR or POLLHUP regardless of + * events; otherwise revents contains only bits in events. Contrary + * to the documentation for poll(2), POLLERR and POLLHUP can occur + * even if only POLLIN was set in events. (POLLNVAL is a fatal + * error and will cause libxl event machinery to fail an assertion.) */ struct libxl__ev_fd { /* caller should include this in their own struct */ /* read-only for caller, who may read only when registered: */ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:40 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCO-0004Xb-13; Mon, 14 May 2012 16:32:40 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCI-0003YO-3p for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:36 +0000 Received: from [85.158.143.99:60622] by server-1.bemta-4.messagelabs.com id 00/19-20925-1A331BF4; Mon, 14 May 2012 16:32:33 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-216.messagelabs.com!1337013150!27057149!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4472 invoked from network); 14 May 2012 16:32:31 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCE-0002tr-Jm for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCE-0006l0-J6 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:30 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:30 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxc: introduce XC_SAVE_ID_TOOLSTACK X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Stefano Stabellini # Date 1336754775 -3600 # Node ID 5f206c06e6626f077201890bd3c59cb0bc88df77 # Parent 2e980a2405ebb1e213facd17fa423d2a4d6dedf0 libxc: introduce XC_SAVE_ID_TOOLSTACK Introduce a new save_id to save/restore toolstack specific extra information. Signed-off-by: Stefano Stabellini Committed-by: Ian Jackson --- diff -r 2e980a2405eb -r 5f206c06e662 tools/libxc/xc_domain_restore.c --- a/tools/libxc/xc_domain_restore.c Fri May 11 17:34:24 2012 +0100 +++ b/tools/libxc/xc_domain_restore.c Fri May 11 17:46:15 2012 +0100 @@ -659,6 +659,11 @@ static void tailbuf_free(tailbuf_t *buf) tailbuf_free_pv(&buf->u.pv); } +struct toolstack_data_t { + uint8_t *data; + uint32_t len; +}; + typedef struct { void* pages; /* pages is of length nr_physpages, pfn_types is of length nr_pages */ @@ -685,6 +690,8 @@ typedef struct { uint64_t acpi_ioport_location; uint64_t viridian; uint64_t vm_generationid_addr; + + struct toolstack_data_t tdata; } pagebuf_t; static int pagebuf_init(pagebuf_t* buf) @@ -695,6 +702,10 @@ static int pagebuf_init(pagebuf_t* buf) static void pagebuf_free(pagebuf_t* buf) { + if (buf->tdata.data != NULL) { + free(buf->tdata.data); + buf->tdata.data = NULL; + } if (buf->pages) { free(buf->pages); buf->pages = NULL; @@ -863,6 +874,19 @@ static int pagebuf_get_one(xc_interface } return pagebuf_get_one(xch, ctx, buf, fd, dom); + case XC_SAVE_ID_TOOLSTACK: + { + RDEXACT(fd, &buf->tdata.len, sizeof(buf->tdata.len)); + buf->tdata.data = (uint8_t*) realloc(buf->tdata.data, buf->tdata.len); + if ( buf->tdata.data == NULL ) + { + PERROR("error memory allocation"); + return -1; + } + RDEXACT(fd, buf->tdata.data, buf->tdata.len); + return pagebuf_get_one(xch, ctx, buf, fd, dom); + } + case XC_SAVE_ID_ENABLE_COMPRESSION: /* We cannot set compression flag directly in pagebuf structure, * since this pagebuf still has uncompressed pages that are yet to @@ -1299,7 +1323,8 @@ int xc_domain_restore(xc_interface *xch, unsigned long *console_mfn, domid_t console_domid, unsigned int hvm, unsigned int pae, int superpages, int no_incr_generationid, - unsigned long *vm_generationid_addr) + unsigned long *vm_generationid_addr, + struct restore_callbacks *callbacks) { DECLARE_DOMCTL; int rc = 1, frc, i, j, n, m, pae_extended_cr3 = 0, ext_vcpucontext = 0; @@ -1347,6 +1372,7 @@ int xc_domain_restore(xc_interface *xch, pagebuf_t pagebuf; tailbuf_t tailbuf, tmptail; + struct toolstack_data_t tdata, tdatatmp; void* vcpup; uint64_t console_pfn = 0; @@ -1359,6 +1385,7 @@ int xc_domain_restore(xc_interface *xch, pagebuf_init(&pagebuf); memset(&tailbuf, 0, sizeof(tailbuf)); tailbuf.ishvm = hvm; + memset(&tdata, 0, sizeof(tdata)); memset(ctx, 0, sizeof(*ctx)); @@ -1624,6 +1651,10 @@ int xc_domain_restore(xc_interface *xch, ERROR("Error, unknow acpi ioport location (%i)", pagebuf.acpi_ioport_location); } + tdatatmp = tdata; + tdata = pagebuf.tdata; + pagebuf.tdata = tdatatmp; + if ( ctx->last_checkpoint ) { // DPRINTF("Last checkpoint, finishing\n"); @@ -2074,6 +2105,26 @@ int xc_domain_restore(xc_interface *xch, goto out; finish_hvm: + if ( tdata.data != NULL ) + { + if ( callbacks != NULL && callbacks->toolstack_restore != NULL ) + { + rc = callbacks->toolstack_restore(dom, tdata.data, tdata.len, + callbacks->data); + free(tdata.data); + if ( rc < 0 ) + { + PERROR("error calling toolstack_restore"); + goto out; + } + } else { + rc = -1; + ERROR("toolstack data available but no callback provided\n"); + free(tdata.data); + goto out; + } + } + /* Dump the QEMU state to a state file for QEMU to load */ if ( dump_qemu(xch, dom, &tailbuf.u.hvm) ) { PERROR("Error dumping QEMU state to file"); diff -r 2e980a2405eb -r 5f206c06e662 tools/libxc/xc_domain_save.c --- a/tools/libxc/xc_domain_save.c Fri May 11 17:34:24 2012 +0100 +++ b/tools/libxc/xc_domain_save.c Fri May 11 17:46:15 2012 +0100 @@ -1723,6 +1723,23 @@ int xc_domain_save(xc_interface *xch, in } } + if ( callbacks != NULL && callbacks->toolstack_save != NULL ) + { + int id = XC_SAVE_ID_TOOLSTACK; + uint8_t *buf; + uint32_t len; + + if ( callbacks->toolstack_save(dom, &buf, &len, callbacks->data) < 0 ) + { + PERROR("Error calling toolstack_save"); + goto out; + } + wrexact(io_fd, &id, sizeof(id)); + wrexact(io_fd, &len, sizeof(len)); + wrexact(io_fd, buf, len); + free(buf); + } + if ( !callbacks->checkpoint ) { /* diff -r 2e980a2405eb -r 5f206c06e662 tools/libxc/xenguest.h --- a/tools/libxc/xenguest.h Fri May 11 17:34:24 2012 +0100 +++ b/tools/libxc/xenguest.h Fri May 11 17:46:15 2012 +0100 @@ -44,6 +44,14 @@ struct save_callbacks { /* Enable qemu-dm logging dirty pages to xen */ int (*switch_qemu_logdirty)(int domid, unsigned enable, void *data); /* HVM only */ + /* Save toolstack specific data + * @param buf the buffer with the data to be saved + * @param len the length of the buffer + * The callee allocates the buffer, the caller frees it (buffer must + * be free'able). + */ + int (*toolstack_save)(uint32_t domid, uint8_t **buf, uint32_t *len, void *data); + /* to be provided as the last argument to each callback function */ void* data; }; @@ -62,6 +70,16 @@ int xc_domain_save(xc_interface *xch, in unsigned long vm_generationid_addr); +/* callbacks provided by xc_domain_restore */ +struct restore_callbacks { + /* callback to restore toolstack specific data */ + int (*toolstack_restore)(uint32_t domid, uint8_t *buf, + uint32_t size, void* data); + + /* to be provided as the last argument to each callback function */ + void* data; +}; + /** * This function will restore a saved domain. * @@ -75,6 +93,8 @@ int xc_domain_save(xc_interface *xch, in * @parm superpages non-zero to allocate guest memory with superpages * @parm no_incr_generationid non-zero if generation id is NOT to be incremented * @parm vm_generationid_addr returned with the address of the generation id buffer + * @parm callbacks non-NULL to receive a callback to restore toolstack + * specific data * @return 0 on success, -1 on failure */ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, @@ -83,7 +103,8 @@ int xc_domain_restore(xc_interface *xch, unsigned long *console_mfn, domid_t console_domid, unsigned int hvm, unsigned int pae, int superpages, int no_incr_generationid, - unsigned long *vm_generationid_addr); + unsigned long *vm_generationid_addr, + struct restore_callbacks *callbacks); /** * xc_domain_restore writes a file to disk that contains the device * model saved state. diff -r 2e980a2405eb -r 5f206c06e662 tools/libxc/xg_save_restore.h --- a/tools/libxc/xg_save_restore.h Fri May 11 17:34:24 2012 +0100 +++ b/tools/libxc/xg_save_restore.h Fri May 11 17:46:15 2012 +0100 @@ -258,6 +258,7 @@ #define XC_SAVE_ID_HVM_PAGING_RING_PFN -15 #define XC_SAVE_ID_HVM_ACCESS_RING_PFN -16 #define XC_SAVE_ID_HVM_SHARING_RING_PFN -17 +#define XC_SAVE_ID_TOOLSTACK -18 /* Optional toolstack specific info */ /* ** We process save/restore/migrate in batches of pages; the below diff -r 2e980a2405eb -r 5f206c06e662 tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Fri May 11 17:34:24 2012 +0100 +++ b/tools/libxl/libxl_dom.c Fri May 11 17:46:15 2012 +0100 @@ -474,7 +474,7 @@ int libxl__domain_restore_common(libxl__ state->store_domid, state->console_port, &state->console_mfn, state->console_domid, hvm, pae, superpages, no_incr_generationid, - &state->vm_generationid_addr); + &state->vm_generationid_addr, NULL); if ( rc ) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "restoring domain"); return ERROR_FAIL; diff -r 2e980a2405eb -r 5f206c06e662 tools/xcutils/xc_restore.c --- a/tools/xcutils/xc_restore.c Fri May 11 17:34:24 2012 +0100 +++ b/tools/xcutils/xc_restore.c Fri May 11 17:46:15 2012 +0100 @@ -47,7 +47,7 @@ main(int argc, char **argv) ret = xc_domain_restore(xch, io_fd, domid, store_evtchn, &store_mfn, 0, console_evtchn, &console_mfn, 0, hvm, pae, superpages, - 0, NULL); + 0, NULL, NULL); if ( ret == 0 ) { _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:40 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCO-0004Xb-13; Mon, 14 May 2012 16:32:40 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCI-0003YO-3p for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:36 +0000 Received: from [85.158.143.99:60622] by server-1.bemta-4.messagelabs.com id 00/19-20925-1A331BF4; Mon, 14 May 2012 16:32:33 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-216.messagelabs.com!1337013150!27057149!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4472 invoked from network); 14 May 2012 16:32:31 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCE-0002tr-Jm for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCE-0006l0-J6 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:30 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:30 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxc: introduce XC_SAVE_ID_TOOLSTACK X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Stefano Stabellini # Date 1336754775 -3600 # Node ID 5f206c06e6626f077201890bd3c59cb0bc88df77 # Parent 2e980a2405ebb1e213facd17fa423d2a4d6dedf0 libxc: introduce XC_SAVE_ID_TOOLSTACK Introduce a new save_id to save/restore toolstack specific extra information. Signed-off-by: Stefano Stabellini Committed-by: Ian Jackson --- diff -r 2e980a2405eb -r 5f206c06e662 tools/libxc/xc_domain_restore.c --- a/tools/libxc/xc_domain_restore.c Fri May 11 17:34:24 2012 +0100 +++ b/tools/libxc/xc_domain_restore.c Fri May 11 17:46:15 2012 +0100 @@ -659,6 +659,11 @@ static void tailbuf_free(tailbuf_t *buf) tailbuf_free_pv(&buf->u.pv); } +struct toolstack_data_t { + uint8_t *data; + uint32_t len; +}; + typedef struct { void* pages; /* pages is of length nr_physpages, pfn_types is of length nr_pages */ @@ -685,6 +690,8 @@ typedef struct { uint64_t acpi_ioport_location; uint64_t viridian; uint64_t vm_generationid_addr; + + struct toolstack_data_t tdata; } pagebuf_t; static int pagebuf_init(pagebuf_t* buf) @@ -695,6 +702,10 @@ static int pagebuf_init(pagebuf_t* buf) static void pagebuf_free(pagebuf_t* buf) { + if (buf->tdata.data != NULL) { + free(buf->tdata.data); + buf->tdata.data = NULL; + } if (buf->pages) { free(buf->pages); buf->pages = NULL; @@ -863,6 +874,19 @@ static int pagebuf_get_one(xc_interface } return pagebuf_get_one(xch, ctx, buf, fd, dom); + case XC_SAVE_ID_TOOLSTACK: + { + RDEXACT(fd, &buf->tdata.len, sizeof(buf->tdata.len)); + buf->tdata.data = (uint8_t*) realloc(buf->tdata.data, buf->tdata.len); + if ( buf->tdata.data == NULL ) + { + PERROR("error memory allocation"); + return -1; + } + RDEXACT(fd, buf->tdata.data, buf->tdata.len); + return pagebuf_get_one(xch, ctx, buf, fd, dom); + } + case XC_SAVE_ID_ENABLE_COMPRESSION: /* We cannot set compression flag directly in pagebuf structure, * since this pagebuf still has uncompressed pages that are yet to @@ -1299,7 +1323,8 @@ int xc_domain_restore(xc_interface *xch, unsigned long *console_mfn, domid_t console_domid, unsigned int hvm, unsigned int pae, int superpages, int no_incr_generationid, - unsigned long *vm_generationid_addr) + unsigned long *vm_generationid_addr, + struct restore_callbacks *callbacks) { DECLARE_DOMCTL; int rc = 1, frc, i, j, n, m, pae_extended_cr3 = 0, ext_vcpucontext = 0; @@ -1347,6 +1372,7 @@ int xc_domain_restore(xc_interface *xch, pagebuf_t pagebuf; tailbuf_t tailbuf, tmptail; + struct toolstack_data_t tdata, tdatatmp; void* vcpup; uint64_t console_pfn = 0; @@ -1359,6 +1385,7 @@ int xc_domain_restore(xc_interface *xch, pagebuf_init(&pagebuf); memset(&tailbuf, 0, sizeof(tailbuf)); tailbuf.ishvm = hvm; + memset(&tdata, 0, sizeof(tdata)); memset(ctx, 0, sizeof(*ctx)); @@ -1624,6 +1651,10 @@ int xc_domain_restore(xc_interface *xch, ERROR("Error, unknow acpi ioport location (%i)", pagebuf.acpi_ioport_location); } + tdatatmp = tdata; + tdata = pagebuf.tdata; + pagebuf.tdata = tdatatmp; + if ( ctx->last_checkpoint ) { // DPRINTF("Last checkpoint, finishing\n"); @@ -2074,6 +2105,26 @@ int xc_domain_restore(xc_interface *xch, goto out; finish_hvm: + if ( tdata.data != NULL ) + { + if ( callbacks != NULL && callbacks->toolstack_restore != NULL ) + { + rc = callbacks->toolstack_restore(dom, tdata.data, tdata.len, + callbacks->data); + free(tdata.data); + if ( rc < 0 ) + { + PERROR("error calling toolstack_restore"); + goto out; + } + } else { + rc = -1; + ERROR("toolstack data available but no callback provided\n"); + free(tdata.data); + goto out; + } + } + /* Dump the QEMU state to a state file for QEMU to load */ if ( dump_qemu(xch, dom, &tailbuf.u.hvm) ) { PERROR("Error dumping QEMU state to file"); diff -r 2e980a2405eb -r 5f206c06e662 tools/libxc/xc_domain_save.c --- a/tools/libxc/xc_domain_save.c Fri May 11 17:34:24 2012 +0100 +++ b/tools/libxc/xc_domain_save.c Fri May 11 17:46:15 2012 +0100 @@ -1723,6 +1723,23 @@ int xc_domain_save(xc_interface *xch, in } } + if ( callbacks != NULL && callbacks->toolstack_save != NULL ) + { + int id = XC_SAVE_ID_TOOLSTACK; + uint8_t *buf; + uint32_t len; + + if ( callbacks->toolstack_save(dom, &buf, &len, callbacks->data) < 0 ) + { + PERROR("Error calling toolstack_save"); + goto out; + } + wrexact(io_fd, &id, sizeof(id)); + wrexact(io_fd, &len, sizeof(len)); + wrexact(io_fd, buf, len); + free(buf); + } + if ( !callbacks->checkpoint ) { /* diff -r 2e980a2405eb -r 5f206c06e662 tools/libxc/xenguest.h --- a/tools/libxc/xenguest.h Fri May 11 17:34:24 2012 +0100 +++ b/tools/libxc/xenguest.h Fri May 11 17:46:15 2012 +0100 @@ -44,6 +44,14 @@ struct save_callbacks { /* Enable qemu-dm logging dirty pages to xen */ int (*switch_qemu_logdirty)(int domid, unsigned enable, void *data); /* HVM only */ + /* Save toolstack specific data + * @param buf the buffer with the data to be saved + * @param len the length of the buffer + * The callee allocates the buffer, the caller frees it (buffer must + * be free'able). + */ + int (*toolstack_save)(uint32_t domid, uint8_t **buf, uint32_t *len, void *data); + /* to be provided as the last argument to each callback function */ void* data; }; @@ -62,6 +70,16 @@ int xc_domain_save(xc_interface *xch, in unsigned long vm_generationid_addr); +/* callbacks provided by xc_domain_restore */ +struct restore_callbacks { + /* callback to restore toolstack specific data */ + int (*toolstack_restore)(uint32_t domid, uint8_t *buf, + uint32_t size, void* data); + + /* to be provided as the last argument to each callback function */ + void* data; +}; + /** * This function will restore a saved domain. * @@ -75,6 +93,8 @@ int xc_domain_save(xc_interface *xch, in * @parm superpages non-zero to allocate guest memory with superpages * @parm no_incr_generationid non-zero if generation id is NOT to be incremented * @parm vm_generationid_addr returned with the address of the generation id buffer + * @parm callbacks non-NULL to receive a callback to restore toolstack + * specific data * @return 0 on success, -1 on failure */ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, @@ -83,7 +103,8 @@ int xc_domain_restore(xc_interface *xch, unsigned long *console_mfn, domid_t console_domid, unsigned int hvm, unsigned int pae, int superpages, int no_incr_generationid, - unsigned long *vm_generationid_addr); + unsigned long *vm_generationid_addr, + struct restore_callbacks *callbacks); /** * xc_domain_restore writes a file to disk that contains the device * model saved state. diff -r 2e980a2405eb -r 5f206c06e662 tools/libxc/xg_save_restore.h --- a/tools/libxc/xg_save_restore.h Fri May 11 17:34:24 2012 +0100 +++ b/tools/libxc/xg_save_restore.h Fri May 11 17:46:15 2012 +0100 @@ -258,6 +258,7 @@ #define XC_SAVE_ID_HVM_PAGING_RING_PFN -15 #define XC_SAVE_ID_HVM_ACCESS_RING_PFN -16 #define XC_SAVE_ID_HVM_SHARING_RING_PFN -17 +#define XC_SAVE_ID_TOOLSTACK -18 /* Optional toolstack specific info */ /* ** We process save/restore/migrate in batches of pages; the below diff -r 2e980a2405eb -r 5f206c06e662 tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Fri May 11 17:34:24 2012 +0100 +++ b/tools/libxl/libxl_dom.c Fri May 11 17:46:15 2012 +0100 @@ -474,7 +474,7 @@ int libxl__domain_restore_common(libxl__ state->store_domid, state->console_port, &state->console_mfn, state->console_domid, hvm, pae, superpages, no_incr_generationid, - &state->vm_generationid_addr); + &state->vm_generationid_addr, NULL); if ( rc ) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "restoring domain"); return ERROR_FAIL; diff -r 2e980a2405eb -r 5f206c06e662 tools/xcutils/xc_restore.c --- a/tools/xcutils/xc_restore.c Fri May 11 17:34:24 2012 +0100 +++ b/tools/xcutils/xc_restore.c Fri May 11 17:46:15 2012 +0100 @@ -47,7 +47,7 @@ main(int argc, char **argv) ret = xc_domain_restore(xch, io_fd, domid, store_evtchn, &store_mfn, 0, console_evtchn, &console_mfn, 0, hvm, pae, superpages, - 0, NULL); + 0, NULL, NULL); if ( ret == 0 ) { _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:41 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCP-0004Zw-0b; Mon, 14 May 2012 16:32:41 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCK-0004LU-04 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:36 +0000 Received: from [85.158.143.35:10939] by server-2.bemta-4.messagelabs.com id B8/7D-17550-3A331BF4; Mon, 14 May 2012 16:32:35 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-21.messagelabs.com!1337013153!12073872!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20817 invoked from network); 14 May 2012 16:32:34 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCH-0002uI-7X for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCH-0006mD-6b for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:33 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:32 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: support multiple libxl__ev_fds for the same fd X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1336759135 -3600 # Node ID 4e7a03e27a12e76e6a65f1e45ec991c600119ba1 # Parent b675568d14b8f40b75a0db4dd8762c42c188961a libxl: support multiple libxl__ev_fds for the same fd We need a slightly more sophisticated data structure to allow this, where we record the slot not just for each fd but also for each (fd,eventbit) where eventbit is POLLIN, POLLPRI, POLLOUT. Document the new relaxed restriction. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Changes since v6: * Fix typo Committed-by: Ian Jackson --- diff -r b675568d14b8 -r 4e7a03e27a12 tools/libxl/libxl_event.c --- a/tools/libxl/libxl_event.c Fri May 11 18:58:55 2012 +0100 +++ b/tools/libxl/libxl_event.c Fri May 11 18:58:55 2012 +0100 @@ -639,10 +639,11 @@ static int beforepoll_internal(libxl__gc /* - * In order to be able to efficiently find the libxl__ev_fd - * for a struct poll during _afterpoll, we maintain a shadow - * data structure in CTX->fd_beforepolled: each slot in - * the fds array corresponds to a slot in fd_beforepolled. + * In order to be able to efficiently find the libxl__ev_fd for a + * struct poll during _afterpoll, we maintain a shadow data + * structure in CTX->fd_rindices: each fd corresponds to a slot in + * fd_rindices, and each element in the rindices is three indices + * into the fd array (for POLLIN, POLLPRI and POLLOUT). */ if (*nfds_io) { @@ -663,14 +664,16 @@ static int beforepoll_internal(libxl__gc }); /* make sure our array is as big as *nfds_io */ - if (poller->fd_rindex_allocd < maxfd) { - assert(maxfd < INT_MAX / sizeof(int) / 2); - int *newarray = realloc(poller->fd_rindex, sizeof(int) * maxfd); - if (!newarray) { rc = ERROR_NOMEM; goto out; } - memset(newarray + poller->fd_rindex_allocd, 0, - sizeof(int) * (maxfd - poller->fd_rindex_allocd)); - poller->fd_rindex = newarray; - poller->fd_rindex_allocd = maxfd; + if (poller->fd_rindices_allocd < maxfd) { + assert(ARRAY_SIZE_OK(poller->fd_rindices, maxfd)); + poller->fd_rindices = + libxl__realloc(0, poller->fd_rindices, + maxfd * sizeof(*poller->fd_rindices)); + memset(poller->fd_rindices + poller->fd_rindices_allocd, + 0, + (maxfd - poller->fd_rindices_allocd) + * sizeof(*poller->fd_rindices)); + poller->fd_rindices_allocd = maxfd; } } @@ -681,8 +684,10 @@ static int beforepoll_internal(libxl__gc fds[used].fd = req_fd; fds[used].events = req_events; fds[used].revents = 0; - assert(req_fd < poller->fd_rindex_allocd); - poller->fd_rindex[req_fd] = used; + assert(req_fd < poller->fd_rindices_allocd); + if (req_events & POLLIN) poller->fd_rindices[req_fd][0] = used; + if (req_events & POLLPRI) poller->fd_rindices[req_fd][1] = used; + if (req_events & POLLOUT) poller->fd_rindices[req_fd][2] = used; } used++; }); @@ -710,7 +715,6 @@ static int beforepoll_internal(libxl__gc *timeout_upd = our_timeout; } - out: return rc; } @@ -732,24 +736,28 @@ static int afterpoll_check_fd(libxl__pol int fd, int events) /* returns mask of events which were requested and occurred */ { - if (fd >= poller->fd_rindex_allocd) + if (fd >= poller->fd_rindices_allocd) /* added after we went into poll, have to try again */ return 0; - int slot = poller->fd_rindex[fd]; + int i, revents = 0; + for (i=0; i<3; i++) { + int slot = poller->fd_rindices[fd][i]; - if (slot >= nfds) - /* stale slot entry; again, added afterwards */ - return 0; + if (slot >= nfds) + /* stale slot entry; again, added afterwards */ + continue; - if (fds[slot].fd != fd) - /* again, stale slot entry */ - return 0; + if (fds[slot].fd != fd) + /* again, stale slot entry */ + continue; - assert(!(fds[slot].revents & POLLNVAL)); + assert(!(fds[slot].revents & POLLNVAL)); + revents |= fds[slot].revents; + } - int revents = fds[slot].revents & (events | POLLERR | POLLHUP); /* we mask in case requested events have changed */ + revents &= (events | POLLERR | POLLHUP); return revents; } @@ -1013,7 +1021,7 @@ int libxl__poller_init(libxl_ctx *ctx, l { int r, rc; p->fd_polls = 0; - p->fd_rindex = 0; + p->fd_rindices = 0; r = pipe(p->wakeup_pipe); if (r) { @@ -1040,7 +1048,7 @@ void libxl__poller_dispose(libxl__poller if (p->wakeup_pipe[1] > 0) close(p->wakeup_pipe[1]); if (p->wakeup_pipe[0] > 0) close(p->wakeup_pipe[0]); free(p->fd_polls); - free(p->fd_rindex); + free(p->fd_rindices); } libxl__poller *libxl__poller_get(libxl_ctx *ctx) diff -r b675568d14b8 -r 4e7a03e27a12 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri May 11 18:58:55 2012 +0100 +++ b/tools/libxl/libxl_internal.h Fri May 11 18:58:55 2012 +0100 @@ -132,7 +132,11 @@ typedef void libxl__ev_fd_callback(libxl * events; otherwise revents contains only bits in events. Contrary * to the documentation for poll(2), POLLERR and POLLHUP can occur * even if only POLLIN was set in events. (POLLNVAL is a fatal - * error and will cause libxl event machinery to fail an assertion.) */ + * error and will cause libxl event machinery to fail an assertion.) + * + * It is not permitted to listen for the same or overlapping events + * on the same fd using multiple different libxl__ev_fd's. + */ struct libxl__ev_fd { /* caller should include this in their own struct */ /* read-only for caller, who may read only when registered: */ @@ -248,8 +252,8 @@ struct libxl__poller { struct pollfd *fd_polls; int fd_polls_allocd; - int fd_rindex_allocd; - int *fd_rindex; /* see libxl_osevent_beforepoll */ + int fd_rindices_allocd; + int (*fd_rindices)[3]; /* see libxl_osevent_beforepoll */ int wakeup_pipe[2]; /* 0 means no fd allocated */ }; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:41 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCP-0004Zw-0b; Mon, 14 May 2012 16:32:41 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCK-0004LU-04 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:36 +0000 Received: from [85.158.143.35:10939] by server-2.bemta-4.messagelabs.com id B8/7D-17550-3A331BF4; Mon, 14 May 2012 16:32:35 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-21.messagelabs.com!1337013153!12073872!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20817 invoked from network); 14 May 2012 16:32:34 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCH-0002uI-7X for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCH-0006mD-6b for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:33 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:32 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: support multiple libxl__ev_fds for the same fd X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1336759135 -3600 # Node ID 4e7a03e27a12e76e6a65f1e45ec991c600119ba1 # Parent b675568d14b8f40b75a0db4dd8762c42c188961a libxl: support multiple libxl__ev_fds for the same fd We need a slightly more sophisticated data structure to allow this, where we record the slot not just for each fd but also for each (fd,eventbit) where eventbit is POLLIN, POLLPRI, POLLOUT. Document the new relaxed restriction. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Changes since v6: * Fix typo Committed-by: Ian Jackson --- diff -r b675568d14b8 -r 4e7a03e27a12 tools/libxl/libxl_event.c --- a/tools/libxl/libxl_event.c Fri May 11 18:58:55 2012 +0100 +++ b/tools/libxl/libxl_event.c Fri May 11 18:58:55 2012 +0100 @@ -639,10 +639,11 @@ static int beforepoll_internal(libxl__gc /* - * In order to be able to efficiently find the libxl__ev_fd - * for a struct poll during _afterpoll, we maintain a shadow - * data structure in CTX->fd_beforepolled: each slot in - * the fds array corresponds to a slot in fd_beforepolled. + * In order to be able to efficiently find the libxl__ev_fd for a + * struct poll during _afterpoll, we maintain a shadow data + * structure in CTX->fd_rindices: each fd corresponds to a slot in + * fd_rindices, and each element in the rindices is three indices + * into the fd array (for POLLIN, POLLPRI and POLLOUT). */ if (*nfds_io) { @@ -663,14 +664,16 @@ static int beforepoll_internal(libxl__gc }); /* make sure our array is as big as *nfds_io */ - if (poller->fd_rindex_allocd < maxfd) { - assert(maxfd < INT_MAX / sizeof(int) / 2); - int *newarray = realloc(poller->fd_rindex, sizeof(int) * maxfd); - if (!newarray) { rc = ERROR_NOMEM; goto out; } - memset(newarray + poller->fd_rindex_allocd, 0, - sizeof(int) * (maxfd - poller->fd_rindex_allocd)); - poller->fd_rindex = newarray; - poller->fd_rindex_allocd = maxfd; + if (poller->fd_rindices_allocd < maxfd) { + assert(ARRAY_SIZE_OK(poller->fd_rindices, maxfd)); + poller->fd_rindices = + libxl__realloc(0, poller->fd_rindices, + maxfd * sizeof(*poller->fd_rindices)); + memset(poller->fd_rindices + poller->fd_rindices_allocd, + 0, + (maxfd - poller->fd_rindices_allocd) + * sizeof(*poller->fd_rindices)); + poller->fd_rindices_allocd = maxfd; } } @@ -681,8 +684,10 @@ static int beforepoll_internal(libxl__gc fds[used].fd = req_fd; fds[used].events = req_events; fds[used].revents = 0; - assert(req_fd < poller->fd_rindex_allocd); - poller->fd_rindex[req_fd] = used; + assert(req_fd < poller->fd_rindices_allocd); + if (req_events & POLLIN) poller->fd_rindices[req_fd][0] = used; + if (req_events & POLLPRI) poller->fd_rindices[req_fd][1] = used; + if (req_events & POLLOUT) poller->fd_rindices[req_fd][2] = used; } used++; }); @@ -710,7 +715,6 @@ static int beforepoll_internal(libxl__gc *timeout_upd = our_timeout; } - out: return rc; } @@ -732,24 +736,28 @@ static int afterpoll_check_fd(libxl__pol int fd, int events) /* returns mask of events which were requested and occurred */ { - if (fd >= poller->fd_rindex_allocd) + if (fd >= poller->fd_rindices_allocd) /* added after we went into poll, have to try again */ return 0; - int slot = poller->fd_rindex[fd]; + int i, revents = 0; + for (i=0; i<3; i++) { + int slot = poller->fd_rindices[fd][i]; - if (slot >= nfds) - /* stale slot entry; again, added afterwards */ - return 0; + if (slot >= nfds) + /* stale slot entry; again, added afterwards */ + continue; - if (fds[slot].fd != fd) - /* again, stale slot entry */ - return 0; + if (fds[slot].fd != fd) + /* again, stale slot entry */ + continue; - assert(!(fds[slot].revents & POLLNVAL)); + assert(!(fds[slot].revents & POLLNVAL)); + revents |= fds[slot].revents; + } - int revents = fds[slot].revents & (events | POLLERR | POLLHUP); /* we mask in case requested events have changed */ + revents &= (events | POLLERR | POLLHUP); return revents; } @@ -1013,7 +1021,7 @@ int libxl__poller_init(libxl_ctx *ctx, l { int r, rc; p->fd_polls = 0; - p->fd_rindex = 0; + p->fd_rindices = 0; r = pipe(p->wakeup_pipe); if (r) { @@ -1040,7 +1048,7 @@ void libxl__poller_dispose(libxl__poller if (p->wakeup_pipe[1] > 0) close(p->wakeup_pipe[1]); if (p->wakeup_pipe[0] > 0) close(p->wakeup_pipe[0]); free(p->fd_polls); - free(p->fd_rindex); + free(p->fd_rindices); } libxl__poller *libxl__poller_get(libxl_ctx *ctx) diff -r b675568d14b8 -r 4e7a03e27a12 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri May 11 18:58:55 2012 +0100 +++ b/tools/libxl/libxl_internal.h Fri May 11 18:58:55 2012 +0100 @@ -132,7 +132,11 @@ typedef void libxl__ev_fd_callback(libxl * events; otherwise revents contains only bits in events. Contrary * to the documentation for poll(2), POLLERR and POLLHUP can occur * even if only POLLIN was set in events. (POLLNVAL is a fatal - * error and will cause libxl event machinery to fail an assertion.) */ + * error and will cause libxl event machinery to fail an assertion.) + * + * It is not permitted to listen for the same or overlapping events + * on the same fd using multiple different libxl__ev_fd's. + */ struct libxl__ev_fd { /* caller should include this in their own struct */ /* read-only for caller, who may read only when registered: */ @@ -248,8 +252,8 @@ struct libxl__poller { struct pollfd *fd_polls; int fd_polls_allocd; - int fd_rindex_allocd; - int *fd_rindex; /* see libxl_osevent_beforepoll */ + int fd_rindices_allocd; + int (*fd_rindices)[3]; /* see libxl_osevent_beforepoll */ int wakeup_pipe[2]; /* 0 means no fd allocated */ }; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:41 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCP-0004bM-Gk; Mon, 14 May 2012 16:32:41 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCK-0004Mv-Jy for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:36 +0000 Received: from [85.158.139.83:31100] by server-9.bemta-5.messagelabs.com id 85/20-09826-3A331BF4; Mon, 14 May 2012 16:32:35 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-182.messagelabs.com!1337013152!28374177!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=2.0 required=7.0 tests=SUBJECT_RANDOMQ X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14964 invoked from network); 14 May 2012 16:32:33 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCF-0002u0-LK for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCF-0006lU-Kc for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:31 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:31 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl_qmp: remove libxl__qmp_migrate, introduce libxl__qmp_save X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Stefano Stabellini # Date 1336754776 -3600 # Node ID 84ae90427c54f275944683848344d1b17f5584f5 # Parent 45adc237cd898ed6ab0eaaf5535004fcc6af50e9 libxl_qmp: remove libxl__qmp_migrate, introduce libxl__qmp_save Following the recent changes to upstream Qemu, the best monitor command to suit or needs is "xen-save-devices-state" rather than "migrate". This patch removes libxl__qmp_migrate and introduces libxl__qmp_save instead, that uses "xen-save-devices-state". Signed-off-by: Stefano Stabellini Committed-by: Ian Jackson --- diff -r 45adc237cd89 -r 84ae90427c54 tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Fri May 11 17:46:15 2012 +0100 +++ b/tools/libxl/libxl_dom.c Fri May 11 17:46:16 2012 +0100 @@ -894,18 +894,9 @@ int libxl__domain_save_device_model(libx break; } case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: - fd2 = open(filename, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR); - if (fd2 < 0) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, - "Unable to create a QEMU save file\n"); - return ERROR_FAIL; - } - /* Save DM state into fd2 */ - ret = libxl__qmp_migrate(gc, domid, fd2); + ret = libxl__qmp_save(gc, domid, (char *)filename); if (ret) goto out; - close(fd2); - fd2 = -1; break; default: return ERROR_INVAL; diff -r 45adc237cd89 -r 84ae90427c54 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri May 11 17:46:15 2012 +0100 +++ b/tools/libxl/libxl_internal.h Fri May 11 17:46:16 2012 +0100 @@ -1052,7 +1052,7 @@ _hidden int libxl__qmp_pci_add(libxl__gc _hidden int libxl__qmp_pci_del(libxl__gc *gc, int domid, libxl_device_pci *pcidev); /* Save current QEMU state into fd. */ -_hidden int libxl__qmp_migrate(libxl__gc *gc, int domid, int fd); +_hidden int libxl__qmp_save(libxl__gc *gc, int domid, const char *filename); /* close and free the QMP handler */ _hidden void libxl__qmp_close(libxl__qmp_handler *qmp); /* remove the socket file, if the file has already been removed, diff -r 45adc237cd89 -r 84ae90427c54 tools/libxl/libxl_qmp.c --- a/tools/libxl/libxl_qmp.c Fri May 11 17:46:15 2012 +0100 +++ b/tools/libxl/libxl_qmp.c Fri May 11 17:46:16 2012 +0100 @@ -587,52 +587,6 @@ out: return rc; } -static int qmp_send_fd(libxl__gc *gc, libxl__qmp_handler *qmp, - libxl_key_value_list *args, - qmp_callback_t callback, void *opaque, - qmp_request_context *context, - int fd) -{ - struct msghdr msg = { 0 }; - struct cmsghdr *cmsg; - char control[CMSG_SPACE(sizeof (fd))]; - struct iovec iov; - char *buf = NULL; - - buf = qmp_send_prepare(gc, qmp, "getfd", args, callback, opaque, context); - - /* Response data */ - iov.iov_base = buf; - iov.iov_len = strlen(buf); - - /* compose the message */ - msg.msg_iov = &iov; - msg.msg_iovlen = 1; - msg.msg_control = control; - msg.msg_controllen = sizeof (control); - - /* attach open fd */ - cmsg = CMSG_FIRSTHDR(&msg); - cmsg->cmsg_level = SOL_SOCKET; - cmsg->cmsg_type = SCM_RIGHTS; - cmsg->cmsg_len = CMSG_LEN(sizeof (fd)); - *(int *)CMSG_DATA(cmsg) = fd; - - msg.msg_controllen = cmsg->cmsg_len; - - if (sendmsg(qmp->qmp_fd, &msg, 0) < 0) { - LIBXL__LOG_ERRNO(qmp->ctx, LIBXL__LOG_ERROR, - "Failed to send a QMP message to QEMU."); - return ERROR_FAIL; - } - if (libxl_write_exactly(qmp->ctx, qmp->qmp_fd, "\r\n", 2, - "CRLF", "QMP socket")) { - return ERROR_FAIL; - } - - return qmp->last_id_used; -} - static int qmp_synchronous_send(libxl__qmp_handler *qmp, const char *cmd, libxl_key_value_list *args, qmp_callback_t callback, void *opaque, @@ -873,34 +827,8 @@ int libxl__qmp_pci_del(libxl__gc *gc, in return qmp_device_del(gc, domid, id); } -static int qmp_getfd(libxl__gc *gc, libxl__qmp_handler *qmp, - int fd, const char *name) +int libxl__qmp_save(libxl__gc *gc, int domid, const char *filename) { - flexarray_t *parameters = NULL; - libxl_key_value_list args = NULL; - int rc = 0; - - parameters = flexarray_make(2, 1); - if (!parameters) - return ERROR_NOMEM; - flexarray_append_pair(parameters, "fdname", (char*)name); - args = libxl__xs_kvs_of_flexarray(gc, parameters, parameters->count); - if (!args) { - rc = ERROR_NOMEM; - goto out; - } - - if (qmp_send_fd(gc, qmp, &args, NULL, NULL, NULL, fd) < 0) { - rc = ERROR_FAIL; - } -out: - flexarray_free(parameters); - return rc; -} - -int libxl__qmp_migrate(libxl__gc *gc, int domid, int fd) -{ -#define MIGRATE_FD_NAME "dm-migrate" libxl__qmp_handler *qmp = NULL; flexarray_t *parameters = NULL; libxl_key_value_list args = NULL; @@ -910,23 +838,19 @@ int libxl__qmp_migrate(libxl__gc *gc, in if (!qmp) return ERROR_FAIL; - rc = qmp_getfd(gc, qmp, fd, MIGRATE_FD_NAME); - if (rc) - goto out; - parameters = flexarray_make(2, 1); if (!parameters) { rc = ERROR_NOMEM; goto out; } - flexarray_append_pair(parameters, "uri", "fd:" MIGRATE_FD_NAME); + flexarray_append_pair(parameters, "filename", (char *)filename); args = libxl__xs_kvs_of_flexarray(gc, parameters, parameters->count); if (!args) { rc = ERROR_NOMEM; goto out2; } - rc = qmp_synchronous_send(qmp, "migrate", &args, + rc = qmp_synchronous_send(qmp, "xen-save-devices-state", &args, NULL, NULL, qmp->timeout); out2: _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:41 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCP-0004bM-Gk; Mon, 14 May 2012 16:32:41 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCK-0004Mv-Jy for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:36 +0000 Received: from [85.158.139.83:31100] by server-9.bemta-5.messagelabs.com id 85/20-09826-3A331BF4; Mon, 14 May 2012 16:32:35 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-182.messagelabs.com!1337013152!28374177!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=2.0 required=7.0 tests=SUBJECT_RANDOMQ X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14964 invoked from network); 14 May 2012 16:32:33 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCF-0002u0-LK for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCF-0006lU-Kc for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:31 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:31 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl_qmp: remove libxl__qmp_migrate, introduce libxl__qmp_save X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Stefano Stabellini # Date 1336754776 -3600 # Node ID 84ae90427c54f275944683848344d1b17f5584f5 # Parent 45adc237cd898ed6ab0eaaf5535004fcc6af50e9 libxl_qmp: remove libxl__qmp_migrate, introduce libxl__qmp_save Following the recent changes to upstream Qemu, the best monitor command to suit or needs is "xen-save-devices-state" rather than "migrate". This patch removes libxl__qmp_migrate and introduces libxl__qmp_save instead, that uses "xen-save-devices-state". Signed-off-by: Stefano Stabellini Committed-by: Ian Jackson --- diff -r 45adc237cd89 -r 84ae90427c54 tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Fri May 11 17:46:15 2012 +0100 +++ b/tools/libxl/libxl_dom.c Fri May 11 17:46:16 2012 +0100 @@ -894,18 +894,9 @@ int libxl__domain_save_device_model(libx break; } case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: - fd2 = open(filename, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR); - if (fd2 < 0) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, - "Unable to create a QEMU save file\n"); - return ERROR_FAIL; - } - /* Save DM state into fd2 */ - ret = libxl__qmp_migrate(gc, domid, fd2); + ret = libxl__qmp_save(gc, domid, (char *)filename); if (ret) goto out; - close(fd2); - fd2 = -1; break; default: return ERROR_INVAL; diff -r 45adc237cd89 -r 84ae90427c54 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri May 11 17:46:15 2012 +0100 +++ b/tools/libxl/libxl_internal.h Fri May 11 17:46:16 2012 +0100 @@ -1052,7 +1052,7 @@ _hidden int libxl__qmp_pci_add(libxl__gc _hidden int libxl__qmp_pci_del(libxl__gc *gc, int domid, libxl_device_pci *pcidev); /* Save current QEMU state into fd. */ -_hidden int libxl__qmp_migrate(libxl__gc *gc, int domid, int fd); +_hidden int libxl__qmp_save(libxl__gc *gc, int domid, const char *filename); /* close and free the QMP handler */ _hidden void libxl__qmp_close(libxl__qmp_handler *qmp); /* remove the socket file, if the file has already been removed, diff -r 45adc237cd89 -r 84ae90427c54 tools/libxl/libxl_qmp.c --- a/tools/libxl/libxl_qmp.c Fri May 11 17:46:15 2012 +0100 +++ b/tools/libxl/libxl_qmp.c Fri May 11 17:46:16 2012 +0100 @@ -587,52 +587,6 @@ out: return rc; } -static int qmp_send_fd(libxl__gc *gc, libxl__qmp_handler *qmp, - libxl_key_value_list *args, - qmp_callback_t callback, void *opaque, - qmp_request_context *context, - int fd) -{ - struct msghdr msg = { 0 }; - struct cmsghdr *cmsg; - char control[CMSG_SPACE(sizeof (fd))]; - struct iovec iov; - char *buf = NULL; - - buf = qmp_send_prepare(gc, qmp, "getfd", args, callback, opaque, context); - - /* Response data */ - iov.iov_base = buf; - iov.iov_len = strlen(buf); - - /* compose the message */ - msg.msg_iov = &iov; - msg.msg_iovlen = 1; - msg.msg_control = control; - msg.msg_controllen = sizeof (control); - - /* attach open fd */ - cmsg = CMSG_FIRSTHDR(&msg); - cmsg->cmsg_level = SOL_SOCKET; - cmsg->cmsg_type = SCM_RIGHTS; - cmsg->cmsg_len = CMSG_LEN(sizeof (fd)); - *(int *)CMSG_DATA(cmsg) = fd; - - msg.msg_controllen = cmsg->cmsg_len; - - if (sendmsg(qmp->qmp_fd, &msg, 0) < 0) { - LIBXL__LOG_ERRNO(qmp->ctx, LIBXL__LOG_ERROR, - "Failed to send a QMP message to QEMU."); - return ERROR_FAIL; - } - if (libxl_write_exactly(qmp->ctx, qmp->qmp_fd, "\r\n", 2, - "CRLF", "QMP socket")) { - return ERROR_FAIL; - } - - return qmp->last_id_used; -} - static int qmp_synchronous_send(libxl__qmp_handler *qmp, const char *cmd, libxl_key_value_list *args, qmp_callback_t callback, void *opaque, @@ -873,34 +827,8 @@ int libxl__qmp_pci_del(libxl__gc *gc, in return qmp_device_del(gc, domid, id); } -static int qmp_getfd(libxl__gc *gc, libxl__qmp_handler *qmp, - int fd, const char *name) +int libxl__qmp_save(libxl__gc *gc, int domid, const char *filename) { - flexarray_t *parameters = NULL; - libxl_key_value_list args = NULL; - int rc = 0; - - parameters = flexarray_make(2, 1); - if (!parameters) - return ERROR_NOMEM; - flexarray_append_pair(parameters, "fdname", (char*)name); - args = libxl__xs_kvs_of_flexarray(gc, parameters, parameters->count); - if (!args) { - rc = ERROR_NOMEM; - goto out; - } - - if (qmp_send_fd(gc, qmp, &args, NULL, NULL, NULL, fd) < 0) { - rc = ERROR_FAIL; - } -out: - flexarray_free(parameters); - return rc; -} - -int libxl__qmp_migrate(libxl__gc *gc, int domid, int fd) -{ -#define MIGRATE_FD_NAME "dm-migrate" libxl__qmp_handler *qmp = NULL; flexarray_t *parameters = NULL; libxl_key_value_list args = NULL; @@ -910,23 +838,19 @@ int libxl__qmp_migrate(libxl__gc *gc, in if (!qmp) return ERROR_FAIL; - rc = qmp_getfd(gc, qmp, fd, MIGRATE_FD_NAME); - if (rc) - goto out; - parameters = flexarray_make(2, 1); if (!parameters) { rc = ERROR_NOMEM; goto out; } - flexarray_append_pair(parameters, "uri", "fd:" MIGRATE_FD_NAME); + flexarray_append_pair(parameters, "filename", (char *)filename); args = libxl__xs_kvs_of_flexarray(gc, parameters, parameters->count); if (!args) { rc = ERROR_NOMEM; goto out2; } - rc = qmp_synchronous_send(qmp, "migrate", &args, + rc = qmp_synchronous_send(qmp, "xen-save-devices-state", &args, NULL, NULL, qmp->timeout); out2: _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:42 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCP-0004cC-UI; Mon, 14 May 2012 16:32:42 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCL-0004GM-Oy for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:37 +0000 Received: from [193.109.254.147:49997] by server-10.bemta-14.messagelabs.com id 43/D2-05847-5A331BF4; Mon, 14 May 2012 16:32:37 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-27.messagelabs.com!1337013155!3535513!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14749 invoked from network); 14 May 2012 16:32:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCJ-0002uc-DK for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCJ-0006nE-CU for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:35 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:34 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: provide libxl__remove_file et al. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1336759138 -3600 # Node ID 0856b8d4d80acccf4cf453815a1cb2737d2b9903 # Parent 85bf1c658d98ade6caa0eefa30172c732fc47b40 libxl: provide libxl__remove_file et al. These utility functions cope with EINTR AND ENOENT, do error logging, and we provide a recursive version to delete whole directory trees. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 85bf1c658d98 -r 0856b8d4d80a tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri May 11 18:58:57 2012 +0100 +++ b/tools/libxl/libxl_internal.h Fri May 11 18:58:58 2012 +0100 @@ -433,6 +433,13 @@ _hidden char *libxl__strndup(libxl__gc * * string. (similar to a gc'd dirname(3)). */ _hidden char *libxl__dirname(libxl__gc *gc_opt, const char *s); +/* Each of these logs errors and returns a libxl error code. + * They do not mind if path is already removed. + * For _file, path must not be a directory; for _directory it must be. */ +_hidden int libxl__remove_file(libxl__gc *gc, const char *path); +_hidden int libxl__remove_directory(libxl__gc *gc, const char *path); +_hidden int libxl__remove_file_or_directory(libxl__gc *gc, const char *path); + _hidden char **libxl__xs_kvs_of_flexarray(libxl__gc *gc, flexarray_t *array, int length); _hidden int libxl__xs_writev(libxl__gc *gc, xs_transaction_t t, diff -r 85bf1c658d98 -r 0856b8d4d80a tools/libxl/libxl_utils.c --- a/tools/libxl/libxl_utils.c Fri May 11 18:58:57 2012 +0100 +++ b/tools/libxl/libxl_utils.c Fri May 11 18:58:58 2012 +0100 @@ -364,6 +364,85 @@ int libxl_read_file_contents(libxl_ctx * READ_WRITE_EXACTLY(read, 1, /* */) READ_WRITE_EXACTLY(write, 0, const) +int libxl__remove_file(libxl__gc *gc, const char *path) +{ + for (;;) { + int r = unlink(path); + if (!r) return 0; + if (errno == ENOENT) return 0; + if (errno == EINTR) continue; + LOGE(ERROR, "failed to remove file %s", path); + return ERROR_FAIL; + } +} + +int libxl__remove_file_or_directory(libxl__gc *gc, const char *path) +{ + for (;;) { + int r = rmdir(path); + if (!r) return 0; + if (errno == ENOENT) return 0; + if (errno == ENOTEMPTY) return libxl__remove_directory(gc, path); + if (errno == ENOTDIR) return libxl__remove_file(gc, path); + if (errno == EINTR) continue; + LOGE(ERROR, "failed to remove %s", path); + return ERROR_FAIL; + } +} + +int libxl__remove_directory(libxl__gc *gc, const char *dirpath) +{ + int rc = 0; + DIR *d = 0; + + d = opendir(dirpath); + if (!d) { + if (errno == ENOENT) + goto out; + + LOGE(ERROR, "failed to opendir %s for removal", dirpath); + rc = ERROR_FAIL; + goto out; + } + + size_t need = offsetof(struct dirent, d_name) + + pathconf(dirpath, _PC_NAME_MAX) + 1; + struct dirent *de_buf = libxl__zalloc(gc, need); + struct dirent *de; + + for (;;) { + int r = readdir_r(d, de_buf, &de); + if (r) { + LOGE(ERROR, "failed to readdir %s for removal", dirpath); + rc = ERROR_FAIL; + break; + } + if (!de) + break; + + if (!strcmp(de->d_name, ".") || + !strcmp(de->d_name, "..")) + continue; + + const char *subpath = GCSPRINTF("%s/%s", dirpath, de->d_name); + if (libxl__remove_file_or_directory(gc, subpath)) + rc = ERROR_FAIL; + } + + for (;;) { + int r = rmdir(dirpath); + if (!r) break; + if (errno == ENOENT) goto out; + if (errno == EINTR) continue; + LOGE(ERROR, "failed to remove emptied directory %s", dirpath); + rc = ERROR_FAIL; + } + + out: + if (d) closedir(d); + + return rc; +} pid_t libxl_fork(libxl_ctx *ctx) { _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:42 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCP-0004cC-UI; Mon, 14 May 2012 16:32:42 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCL-0004GM-Oy for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:37 +0000 Received: from [193.109.254.147:49997] by server-10.bemta-14.messagelabs.com id 43/D2-05847-5A331BF4; Mon, 14 May 2012 16:32:37 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-27.messagelabs.com!1337013155!3535513!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14749 invoked from network); 14 May 2012 16:32:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCJ-0002uc-DK for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCJ-0006nE-CU for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:35 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:34 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: provide libxl__remove_file et al. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1336759138 -3600 # Node ID 0856b8d4d80acccf4cf453815a1cb2737d2b9903 # Parent 85bf1c658d98ade6caa0eefa30172c732fc47b40 libxl: provide libxl__remove_file et al. These utility functions cope with EINTR AND ENOENT, do error logging, and we provide a recursive version to delete whole directory trees. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 85bf1c658d98 -r 0856b8d4d80a tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri May 11 18:58:57 2012 +0100 +++ b/tools/libxl/libxl_internal.h Fri May 11 18:58:58 2012 +0100 @@ -433,6 +433,13 @@ _hidden char *libxl__strndup(libxl__gc * * string. (similar to a gc'd dirname(3)). */ _hidden char *libxl__dirname(libxl__gc *gc_opt, const char *s); +/* Each of these logs errors and returns a libxl error code. + * They do not mind if path is already removed. + * For _file, path must not be a directory; for _directory it must be. */ +_hidden int libxl__remove_file(libxl__gc *gc, const char *path); +_hidden int libxl__remove_directory(libxl__gc *gc, const char *path); +_hidden int libxl__remove_file_or_directory(libxl__gc *gc, const char *path); + _hidden char **libxl__xs_kvs_of_flexarray(libxl__gc *gc, flexarray_t *array, int length); _hidden int libxl__xs_writev(libxl__gc *gc, xs_transaction_t t, diff -r 85bf1c658d98 -r 0856b8d4d80a tools/libxl/libxl_utils.c --- a/tools/libxl/libxl_utils.c Fri May 11 18:58:57 2012 +0100 +++ b/tools/libxl/libxl_utils.c Fri May 11 18:58:58 2012 +0100 @@ -364,6 +364,85 @@ int libxl_read_file_contents(libxl_ctx * READ_WRITE_EXACTLY(read, 1, /* */) READ_WRITE_EXACTLY(write, 0, const) +int libxl__remove_file(libxl__gc *gc, const char *path) +{ + for (;;) { + int r = unlink(path); + if (!r) return 0; + if (errno == ENOENT) return 0; + if (errno == EINTR) continue; + LOGE(ERROR, "failed to remove file %s", path); + return ERROR_FAIL; + } +} + +int libxl__remove_file_or_directory(libxl__gc *gc, const char *path) +{ + for (;;) { + int r = rmdir(path); + if (!r) return 0; + if (errno == ENOENT) return 0; + if (errno == ENOTEMPTY) return libxl__remove_directory(gc, path); + if (errno == ENOTDIR) return libxl__remove_file(gc, path); + if (errno == EINTR) continue; + LOGE(ERROR, "failed to remove %s", path); + return ERROR_FAIL; + } +} + +int libxl__remove_directory(libxl__gc *gc, const char *dirpath) +{ + int rc = 0; + DIR *d = 0; + + d = opendir(dirpath); + if (!d) { + if (errno == ENOENT) + goto out; + + LOGE(ERROR, "failed to opendir %s for removal", dirpath); + rc = ERROR_FAIL; + goto out; + } + + size_t need = offsetof(struct dirent, d_name) + + pathconf(dirpath, _PC_NAME_MAX) + 1; + struct dirent *de_buf = libxl__zalloc(gc, need); + struct dirent *de; + + for (;;) { + int r = readdir_r(d, de_buf, &de); + if (r) { + LOGE(ERROR, "failed to readdir %s for removal", dirpath); + rc = ERROR_FAIL; + break; + } + if (!de) + break; + + if (!strcmp(de->d_name, ".") || + !strcmp(de->d_name, "..")) + continue; + + const char *subpath = GCSPRINTF("%s/%s", dirpath, de->d_name); + if (libxl__remove_file_or_directory(gc, subpath)) + rc = ERROR_FAIL; + } + + for (;;) { + int r = rmdir(dirpath); + if (!r) break; + if (errno == ENOENT) goto out; + if (errno == EINTR) continue; + LOGE(ERROR, "failed to remove emptied directory %s", dirpath); + rc = ERROR_FAIL; + } + + out: + if (d) closedir(d); + + return rc; +} pid_t libxl_fork(libxl_ctx *ctx) { _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:43 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCQ-0004e9-Uj; Mon, 14 May 2012 16:32:43 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCL-0004Pr-J5 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:38 +0000 Received: from [85.158.138.51:34142] by server-7.bemta-3.messagelabs.com id 92/49-03078-4A331BF4; Mon, 14 May 2012 16:32:36 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-11.tower-174.messagelabs.com!1337013153!27056542!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2646 invoked from network); 14 May 2012 16:32:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCH-0002uN-PI for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCH-0006mV-OM for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:33 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:33 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] of SIGCHLD. The application can tell us whether it wants to own X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1336759136 -3600 # Node ID e3371fc765b1b9bb63af122ea3d42a6901702e18 # Parent 4e7a03e27a12e76e6a65f1e45ec991c600119ba1 of SIGCHLD. The application can tell us whether it wants to own SIGCHLD or not; if it does, it has to tell us about deaths of our children. Currently there are no callers in libxl which use these facilities. All code in libxl which forks needs to be converted and libxl_fork needse to be be abolished. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 4e7a03e27a12 -r e3371fc765b1 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Fri May 11 18:58:55 2012 +0100 +++ b/tools/libxl/libxl.c Fri May 11 18:58:56 2012 +0100 @@ -39,7 +39,7 @@ int libxl_ctx_alloc(libxl_ctx **pctx, in memset(ctx, 0, sizeof(libxl_ctx)); ctx->lg = lg; - /* First initialise pointers (cannot fail) */ + /* First initialise pointers etc. (cannot fail) */ LIBXL_TAILQ_INIT(&ctx->occurred); @@ -58,6 +58,11 @@ int libxl_ctx_alloc(libxl_ctx **pctx, in LIBXL_TAILQ_INIT(&ctx->death_list); libxl__ev_xswatch_init(&ctx->death_watch); + ctx->childproc_hooks = &libxl__childproc_default_hooks; + ctx->childproc_user = 0; + + ctx->sigchld_selfpipe[0] = -1; + /* The mutex is special because we can't idempotently destroy it */ if (libxl__init_recursive_mutex(ctx, &ctx->lock) < 0) { @@ -160,6 +165,16 @@ int libxl_ctx_free(libxl_ctx *ctx) discard_events(&ctx->occurred); + /* If we have outstanding children, then the application inherits + * them; we wish the application good luck with understanding + * this if and when it reaps them. */ + libxl__sigchld_removehandler(ctx); + + if (ctx->sigchld_selfpipe[0] >= 0) { + close(ctx->sigchld_selfpipe[0]); + close(ctx->sigchld_selfpipe[1]); + } + pthread_mutex_destroy(&ctx->lock); GC_FREE; diff -r 4e7a03e27a12 -r e3371fc765b1 tools/libxl/libxl.h --- a/tools/libxl/libxl.h Fri May 11 18:58:55 2012 +0100 +++ b/tools/libxl/libxl.h Fri May 11 18:58:56 2012 +0100 @@ -380,6 +380,7 @@ enum { ERROR_NOT_READY = -11, ERROR_OSEVENT_REG_FAIL = -12, ERROR_BUFFERFULL = -13, + ERROR_UNKNOWN_CHILD = -14, }; diff -r 4e7a03e27a12 -r e3371fc765b1 tools/libxl/libxl_event.c --- a/tools/libxl/libxl_event.c Fri May 11 18:58:55 2012 +0100 +++ b/tools/libxl/libxl_event.c Fri May 11 18:58:56 2012 +0100 @@ -627,6 +627,10 @@ static int beforepoll_internal(libxl__gc \ REQUIRE_FD(poller->wakeup_pipe[0], POLLIN, BODY); \ \ + int selfpipe = libxl__fork_selfpipe_active(CTX); \ + if (selfpipe >= 0) \ + REQUIRE_FD(selfpipe, POLLIN, BODY); \ + \ }while(0) #define REQUIRE_FD(req_fd_, req_events_, BODY) do{ \ @@ -766,10 +770,11 @@ static void afterpoll_internal(libxl__eg int nfds, const struct pollfd *fds, struct timeval now) { + /* May make callbacks into the application for child processes. + * ctx must be locked exactly once */ EGC_GC; libxl__ev_fd *efd; - LIBXL_LIST_FOREACH(efd, &CTX->efds, entry) { if (!efd->events) continue; @@ -780,11 +785,16 @@ static void afterpoll_internal(libxl__eg } if (afterpoll_check_fd(poller,fds,nfds, poller->wakeup_pipe[0],POLLIN)) { - char buf[256]; - int r = read(poller->wakeup_pipe[0], buf, sizeof(buf)); - if (r < 0) - if (errno != EINTR && errno != EWOULDBLOCK) - LIBXL__EVENT_DISASTER(egc, "read wakeup", errno, 0); + int e = libxl__self_pipe_eatall(poller->wakeup_pipe[0]); + if (e) LIBXL__EVENT_DISASTER(egc, "read wakeup", e, 0); + } + + int selfpipe = libxl__fork_selfpipe_active(CTX); + if (selfpipe >= 0 && + afterpoll_check_fd(poller,fds,nfds, selfpipe, POLLIN)) { + int e = libxl__self_pipe_eatall(selfpipe); + if (e) LIBXL__EVENT_DISASTER(egc, "read sigchld pipe", e, 0); + libxl__fork_selfpipe_woken(egc); } for (;;) { @@ -1082,16 +1092,37 @@ void libxl__poller_put(libxl_ctx *ctx, l void libxl__poller_wakeup(libxl__egc *egc, libxl__poller *p) { + int e = libxl__self_pipe_wakeup(p->wakeup_pipe[1]); + if (e) LIBXL__EVENT_DISASTER(egc, "cannot poke watch pipe", e, 0); +} + +int libxl__self_pipe_wakeup(int fd) +{ static const char buf[1] = ""; for (;;) { - int r = write(p->wakeup_pipe[1], buf, 1); - if (r==1) return; + int r = write(fd, buf, 1); + if (r==1) return 0; assert(r==-1); if (errno == EINTR) continue; - if (errno == EWOULDBLOCK) return; - LIBXL__EVENT_DISASTER(egc, "cannot poke watch pipe", errno, 0); - return; + if (errno == EWOULDBLOCK) return 0; + assert(errno); + return errno; + } +} + +int libxl__self_pipe_eatall(int fd) +{ + char buf[256]; + for (;;) { + int r = read(fd, buf, sizeof(buf)); + if (r == sizeof(buf)) continue; + if (r >= 0) return 0; + assert(r == -1); + if (errno == EINTR) continue; + if (errno == EWOULDBLOCK) return 0; + assert(errno); + return errno; } } diff -r 4e7a03e27a12 -r e3371fc765b1 tools/libxl/libxl_event.h --- a/tools/libxl/libxl_event.h Fri May 11 18:58:55 2012 +0100 +++ b/tools/libxl/libxl_event.h Fri May 11 18:58:56 2012 +0100 @@ -163,11 +163,6 @@ void libxl_event_register_callbacks(libx * After libxl_ctx_free, all corresponding evgen handles become * invalid and must no longer be passed to evdisable. * - * Events enabled with evenable prior to a fork and libxl_ctx_postfork - * are no longer generated after the fork/postfork; however the evgen - * structures are still valid and must be passed to evdisable if the - * memory they use should not be leaked. - * * Applications should ensure that they eventually retrieve every * event using libxl_event_check or libxl_event_wait, since events * which occur but are not retreived by the application will be queued @@ -372,6 +367,148 @@ void libxl_osevent_occurred_fd(libxl_ctx void libxl_osevent_occurred_timeout(libxl_ctx *ctx, void *for_libxl); +/*======================================================================*/ + +/* + * Subprocess handling. + * + * Unfortunately the POSIX interface makes this very awkward. + * + * There are two possible arrangements for collecting statuses from + * wait/waitpid. + * + * For naive programs: + * + * libxl will keep a SIGCHLD handler installed whenever it has an + * active (unreaped) child. It will reap all children with + * wait(); any children it does not recognise will be passed to + * the application via an optional callback (and will result in + * logged warnings if no callback is provided or the callback + * denies responsibility for the child). + * + * libxl may have children whenever: + * + * - libxl is performing an operation which can be made + * asynchronous; ie one taking a libxl_asyncop_how, even + * if NULL is passed indicating that the operation is + * synchronous; or + * + * - events of any kind are being generated, as requested + * by libxl_evenable_.... + * + * A multithreaded application which is naive in this sense may + * block SIGCHLD on some of its threads, but there must be at + * least one thread that has SIGCHLD unblocked. libxl will not + * modify the blocking flag for SIGCHLD (except that it may create + * internal service threads with all signals blocked). + * + * A naive program must only have at any one time only + * one libxl context which might have children. + * + * For programs which run their own children alongside libxl's: + * + * A program which does this must call libxl_childproc_setmode. + * There are two options: + * + * libxl_sigchld_owner_mainloop: + * The application must install a SIGCHLD handler and reap (at + * least) all of libxl's children and pass their exit status + * to libxl by calling libxl_childproc_exited. + * + * libxl_sigchld_owner_libxl_always: + * The application expects libxl to reap all of its children, + * and provides a callback to be notified of their exit + * statues. + * + * An application which fails to call setmode, or which passes 0 for + * hooks, while it uses any libxl operation which might + * create or use child processes (see above): + * - Must not have any child processes running. + * - Must not install a SIGCHLD handler. + * - Must not reap any children. + */ + + +typedef enum { + /* libxl owns SIGCHLD whenever it has a child. */ + libxl_sigchld_owner_libxl, + + /* Application promises to call libxl_childproc_exited but NOT + * from within a signal handler. libxl will not itself arrange to + * (un)block or catch SIGCHLD. */ + libxl_sigchld_owner_mainloop, + + /* libxl owns SIGCHLD all the time, and the application is + * relying on libxl's event loop for reaping its own children. */ + libxl_sigchld_owner_libxl_always, +} libxl_sigchld_owner; + +typedef struct { + libxl_sigchld_owner chldowner; + + /* All of these are optional: */ + + /* Called by libxl instead of fork. Should behave exactly like + * fork, including setting errno etc. May NOT reenter into libxl. + * Application may use this to discover pids of libxl's children, + * for example. + */ + pid_t (*fork_replacement)(void *user); + + /* With libxl_sigchld_owner_libxl, called by libxl when it has + * reaped a pid. (Not permitted with _owner_mainloop.) + * + * Should return 0 if the child was recognised by the application + * (or if the application does not keep those kind of records), + * ERROR_UNKNOWN_CHILD if the application knows that the child is not + * the application's; if it returns another error code it is a + * disaster as described for libxl_event_register_callbacks. + * (libxl will report unexpected children to its error log.) + * + * If not supplied, the application is assumed not to start + * any children of its own. + * + * This function is NOT called from within the signal handler. + * Rather it will be called from inside a libxl's event handling + * code and thus only when libxl is running, for example from + * within libxl_event_wait. (libxl uses the self-pipe trick + * to implement this.) + * + * childproc_exited_callback may call back into libxl, but it + * is best to avoid making long-running libxl calls as that might + * stall the calling event loop while the nested operation + * completes. + */ + int (*reaped_callback)(pid_t, int status, void *user); +} libxl_childproc_hooks; + +/* hooks may be 0 in which is equivalent to &{ libxl_sigchld_owner_libxl, 0, 0 } + * + * May not be called when libxl might have any child processes, or the + * behaviour is undefined. So it is best to call this at + * initialisation. + */ +void libxl_childproc_setmode(libxl_ctx *ctx, const libxl_childproc_hooks *hooks, + void *user); + +/* + * This function is for an application which owns SIGCHLD and which + * therefore reaps all of the process's children. + * + * May be called only by an application which has called setmode with + * chldowner == libxl_sigchld_owner_mainloop. If pid was a process started + * by this instance of libxl, returns 0 after doing whatever + * processing is appropriate. Otherwise silently returns + * ERROR_UNKNOWN_CHILD. No other error returns are possible. + * + * May NOT be called from within a signal handler which might + * interrupt any libxl operation. The application will almost + * certainly need to use the self-pipe trick (or a working pselect or + * ppoll) to implement this. + */ +int libxl_childproc_reaped(libxl_ctx *ctx, pid_t, int status); + + /* * An application which initialises a libxl_ctx in a parent process * and then forks a child which does not quickly exec, must diff -r 4e7a03e27a12 -r e3371fc765b1 tools/libxl/libxl_fork.c --- a/tools/libxl/libxl_fork.c Fri May 11 18:58:55 2012 +0100 +++ b/tools/libxl/libxl_fork.c Fri May 11 18:58:56 2012 +0100 @@ -46,6 +46,12 @@ static int atfork_registered; static LIBXL_LIST_HEAD(, libxl__carefd) carefds = LIBXL_LIST_HEAD_INITIALIZER(carefds); +/* non-null iff installed, protected by no_forking */ +static libxl_ctx *sigchld_owner; +static struct sigaction sigchld_saved_action; + +static void sigchld_removehandler_core(void); + static void atfork_lock(void) { int r = pthread_mutex_lock(&no_forking); @@ -107,6 +113,7 @@ void libxl_postfork_child_noexec(libxl_c int r; atfork_lock(); + LIBXL_LIST_FOREACH_SAFE(cf, &carefds, entry, cf_tmp) { if (cf->fd >= 0) { r = close(cf->fd); @@ -118,6 +125,10 @@ void libxl_postfork_child_noexec(libxl_c free(cf); } LIBXL_LIST_INIT(&carefds); + + if (sigchld_owner) + sigchld_removehandler_core(); + atfork_unlock(); } @@ -141,6 +152,250 @@ int libxl__carefd_fd(const libxl__carefd } /* + * Actual child process handling + */ + +static void sigchld_handler(int signo) +{ + int e = libxl__self_pipe_wakeup(sigchld_owner->sigchld_selfpipe[1]); + assert(!e); /* errors are probably EBADF, very bad */ +} + +static void sigchld_removehandler_core(void) +{ + struct sigaction was; + int r; + + r = sigaction(SIGCHLD, &sigchld_saved_action, &was); + assert(!r); + assert(!(was.sa_flags & SA_SIGINFO)); + assert(was.sa_handler == sigchld_handler); + sigchld_owner = 0; +} + +void libxl__sigchld_removehandler(libxl_ctx *ctx) /* non-reentrant */ +{ + atfork_lock(); + if (sigchld_owner == ctx) + sigchld_removehandler_core(); + atfork_unlock(); +} + +int libxl__sigchld_installhandler(libxl_ctx *ctx) /* non-reentrant */ +{ + int r, rc; + + if (ctx->sigchld_selfpipe[0] < 0) { + r = pipe(ctx->sigchld_selfpipe); + if (r) { + ctx->sigchld_selfpipe[0] = -1; + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, + "failed to create sigchld pipe"); + rc = ERROR_FAIL; + goto out; + } + } + + atfork_lock(); + if (sigchld_owner != ctx) { + struct sigaction ours; + + assert(!sigchld_owner); + sigchld_owner = ctx; + + memset(&ours,0,sizeof(ours)); + ours.sa_handler = sigchld_handler; + sigemptyset(&ours.sa_mask); + ours.sa_flags = SA_NOCLDSTOP | SA_RESTART; + r = sigaction(SIGCHLD, &ours, &sigchld_saved_action); + assert(!r); + + assert(((void)"application must negotiate with libxl about SIGCHLD", + !(sigchld_saved_action.sa_flags & SA_SIGINFO) && + (sigchld_saved_action.sa_handler == SIG_DFL || + sigchld_saved_action.sa_handler == SIG_IGN))); + } + atfork_unlock(); + + rc = 0; + out: + return rc; +} + +static int chldmode_ours(libxl_ctx *ctx) +{ + return ctx->childproc_hooks->chldowner == libxl_sigchld_owner_libxl; +} + +int libxl__fork_selfpipe_active(libxl_ctx *ctx) +{ + /* Returns the fd to read, or -1 */ + if (!chldmode_ours(ctx)) + return -1; + + if (LIBXL_LIST_EMPTY(&ctx->children)) + return -1; + + return ctx->sigchld_selfpipe[0]; +} + +static void perhaps_removehandler(libxl_ctx *ctx) +{ + if (LIBXL_LIST_EMPTY(&ctx->children) && + ctx->childproc_hooks->chldowner != libxl_sigchld_owner_libxl_always) + libxl__sigchld_removehandler(ctx); +} + +static int childproc_reaped(libxl__egc *egc, pid_t pid, int status) +{ + EGC_GC; + libxl__ev_child *ch; + + LIBXL_LIST_FOREACH(ch, &CTX->children, entry) + if (ch->pid == pid) + goto found; + + /* not found */ + return ERROR_UNKNOWN_CHILD; + + found: + LIBXL_LIST_REMOVE(ch, entry); + ch->pid = -1; + ch->callback(egc, ch, pid, status); + + perhaps_removehandler(CTX); + + return 0; +} + +int libxl_childproc_reaped(libxl_ctx *ctx, pid_t pid, int status) +{ + EGC_INIT(ctx); + CTX_LOCK; + int rc = childproc_reaped(egc, pid, status); + CTX_UNLOCK; + EGC_FREE; + return rc; +} + +void libxl__fork_selfpipe_woken(libxl__egc *egc) +{ + /* May make callbacks into the application for child processes. + * ctx must be locked EXACTLY ONCE */ + EGC_GC; + + while (chldmode_ours(CTX) /* in case the app changes the mode */) { + int status; + pid_t pid = waitpid(-1, &status, WNOHANG); + + if (pid == 0) return; + + if (pid == -1) { + if (errno == ECHILD) return; + if (errno == EINTR) continue; + LIBXL__EVENT_DISASTER(egc, "waitpid() failed", errno, 0); + return; + } + + int rc = childproc_reaped(egc, pid, status); + + if (rc) { + if (CTX->childproc_hooks->reaped_callback) { + CTX_UNLOCK; + rc = CTX->childproc_hooks->reaped_callback + (pid, status, CTX->childproc_user); + CTX_LOCK; + if (rc != 0 && rc != ERROR_UNKNOWN_CHILD) { + char disasterbuf[200]; + snprintf(disasterbuf, sizeof(disasterbuf), " reported by" + " libxl_childproc_hooks->reaped_callback" + " (for pid=%lu, status=%d; error code %d)", + (unsigned long)pid, status, rc); + LIBXL__EVENT_DISASTER(egc, disasterbuf, 0, 0); + return; + } + } else { + rc = ERROR_UNKNOWN_CHILD; + } + if (rc) + libxl_report_child_exitstatus(CTX, XTL_WARN, + "unknown child", (long)pid, status); + } + } +} + +pid_t libxl__ev_child_fork(libxl__gc *gc, libxl__ev_child *ch, + libxl__ev_child_callback *death) +{ + CTX_LOCK; + int rc; + + if (chldmode_ours(CTX)) { + rc = libxl__sigchld_installhandler(CTX); + if (rc) goto out; + } + + pid_t pid = + CTX->childproc_hooks->fork_replacement + ? CTX->childproc_hooks->fork_replacement(CTX->childproc_user) + : fork(); + if (pid == -1) { + LOGE(ERROR, "fork failed"); + rc = ERROR_FAIL; + goto out; + } + + if (!pid) { + /* woohoo! */ + return 0; /* Yes, CTX is left locked in the child. */ + } + + ch->pid = pid; + ch->callback = death; + LIBXL_LIST_INSERT_HEAD(&CTX->children, ch, entry); + rc = pid; + + out: + perhaps_removehandler(CTX); + CTX_UNLOCK; + return rc; +} + +void libxl_childproc_setmode(libxl_ctx *ctx, const libxl_childproc_hooks *hooks, + void *user) +{ + GC_INIT(ctx); + CTX_LOCK; + + assert(LIBXL_LIST_EMPTY(&CTX->children)); + + if (!hooks) + hooks = &libxl__childproc_default_hooks; + + ctx->childproc_hooks = hooks; + ctx->childproc_user = user; + + switch (ctx->childproc_hooks->chldowner) { + case libxl_sigchld_owner_mainloop: + case libxl_sigchld_owner_libxl: + libxl__sigchld_removehandler(ctx); + break; + case libxl_sigchld_owner_libxl_always: + libxl__sigchld_installhandler(ctx); + break; + default: + abort(); + } + + CTX_UNLOCK; + GC_FREE; +} + +const libxl_childproc_hooks libxl__childproc_default_hooks = { + libxl_sigchld_owner_libxl, 0, 0 +}; + +/* * Local variables: * mode: C * c-basic-offset: 4 diff -r 4e7a03e27a12 -r e3371fc765b1 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri May 11 18:58:55 2012 +0100 +++ b/tools/libxl/libxl_internal.h Fri May 11 18:58:56 2012 +0100 @@ -198,6 +198,19 @@ _hidden libxl__ev_xswatch *libxl__watch_ int slotnum); +typedef struct libxl__ev_child libxl__ev_child; +typedef void libxl__ev_child_callback(libxl__egc *egc, libxl__ev_child*, + pid_t pid, int status); +struct libxl__ev_child { + /* caller should include this in their own struct */ + /* read-only for caller: */ + pid_t pid; /* -1 means unused ("unregistered", ie Idle) */ + libxl__ev_child_callback *callback; + /* remainder is private for libxl__ev_... */ + LIBXL_LIST_ENTRY(struct libxl__ev_child) entry; +}; + + /* * evgen structures, which are the state we use for generating * events for the caller. @@ -306,10 +319,14 @@ struct libxl__ctx { LIBXL_LIST_HEAD(, libxl_evgen_disk_eject) disk_eject_evgens; - /* for callers who reap children willy-nilly; caller must only - * set this after libxl_init and before any other call - or - * may leave them untouched */ + const libxl_childproc_hooks *childproc_hooks; + void *childproc_user; + int sigchld_selfpipe[2]; /* [0]==-1 means handler not installed */ + LIBXL_LIST_HEAD(, libxl__ev_child) children; + + /* This is obsolete and must be removed: */ int (*waitpid_instead)(pid_t pid, int *status, int flags); + libxl_version_info version_info; }; @@ -557,6 +574,36 @@ static inline int libxl__ev_xswatch_isre /* + * For making subprocesses. This is the only permitted mechanism for + * code in libxl to do so. + * + * In the parent, returns the pid, filling in childw_out. + * In the child, returns 0. + * If it fails, returns a libxl error (all of which are -ve). + * + * The child should go on to exec (or exit) soon. The child may not + * make any further calls to libxl infrastructure, except for memory + * allocation and logging. If the child needs to use xenstore it + * must open its own xs handle and use it directly, rather than via + * the libxl event machinery. + * + * The parent may signal the child but it must not reap it. That will + * be done by the event machinery. death may be NULL in which case + * the child is still reaped but its death is ignored. + * + * It is not possible to "deregister" the child death event source. + * It will generate exactly one event callback; until then the childw + * is Active and may not be reused. + */ +_hidden pid_t libxl__ev_child_fork(libxl__gc *gc, libxl__ev_child *childw_out, + libxl__ev_child_callback *death); +static inline void libxl__ev_child_init(libxl__ev_child *childw_out) + { childw_out->pid = -1; } +static inline int libxl__ev_child_inuse(libxl__ev_child *childw_out) + { return childw_out->pid >= 0; } + + +/* * Other event-handling support provided by the libxl event core to * the rest of libxl. */ @@ -610,6 +657,15 @@ _hidden void libxl__poller_put(libxl_ctx * ctx must be locked. */ _hidden void libxl__poller_wakeup(libxl__egc *egc, libxl__poller *p); +/* Internal to fork and child reaping machinery */ +extern const libxl_childproc_hooks libxl__childproc_default_hooks; +int libxl__sigchld_installhandler(libxl_ctx *ctx); /* non-reentrant;logs errs */ +void libxl__sigchld_removehandler(libxl_ctx *ctx); /* non-reentrant */ +int libxl__fork_selfpipe_active(libxl_ctx *ctx); /* returns read fd or -1 */ +void libxl__fork_selfpipe_woken(libxl__egc *egc); +int libxl__self_pipe_wakeup(int fd); /* returns 0 or -1 setting errno */ +int libxl__self_pipe_eatall(int fd); /* returns 0 or -1 setting errno */ + _hidden int libxl__atfork_init(libxl_ctx *ctx); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:43 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCQ-0004e9-Uj; Mon, 14 May 2012 16:32:43 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCL-0004Pr-J5 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:38 +0000 Received: from [85.158.138.51:34142] by server-7.bemta-3.messagelabs.com id 92/49-03078-4A331BF4; Mon, 14 May 2012 16:32:36 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-11.tower-174.messagelabs.com!1337013153!27056542!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2646 invoked from network); 14 May 2012 16:32:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCH-0002uN-PI for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCH-0006mV-OM for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:33 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:33 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] of SIGCHLD. The application can tell us whether it wants to own X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1336759136 -3600 # Node ID e3371fc765b1b9bb63af122ea3d42a6901702e18 # Parent 4e7a03e27a12e76e6a65f1e45ec991c600119ba1 of SIGCHLD. The application can tell us whether it wants to own SIGCHLD or not; if it does, it has to tell us about deaths of our children. Currently there are no callers in libxl which use these facilities. All code in libxl which forks needs to be converted and libxl_fork needse to be be abolished. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 4e7a03e27a12 -r e3371fc765b1 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Fri May 11 18:58:55 2012 +0100 +++ b/tools/libxl/libxl.c Fri May 11 18:58:56 2012 +0100 @@ -39,7 +39,7 @@ int libxl_ctx_alloc(libxl_ctx **pctx, in memset(ctx, 0, sizeof(libxl_ctx)); ctx->lg = lg; - /* First initialise pointers (cannot fail) */ + /* First initialise pointers etc. (cannot fail) */ LIBXL_TAILQ_INIT(&ctx->occurred); @@ -58,6 +58,11 @@ int libxl_ctx_alloc(libxl_ctx **pctx, in LIBXL_TAILQ_INIT(&ctx->death_list); libxl__ev_xswatch_init(&ctx->death_watch); + ctx->childproc_hooks = &libxl__childproc_default_hooks; + ctx->childproc_user = 0; + + ctx->sigchld_selfpipe[0] = -1; + /* The mutex is special because we can't idempotently destroy it */ if (libxl__init_recursive_mutex(ctx, &ctx->lock) < 0) { @@ -160,6 +165,16 @@ int libxl_ctx_free(libxl_ctx *ctx) discard_events(&ctx->occurred); + /* If we have outstanding children, then the application inherits + * them; we wish the application good luck with understanding + * this if and when it reaps them. */ + libxl__sigchld_removehandler(ctx); + + if (ctx->sigchld_selfpipe[0] >= 0) { + close(ctx->sigchld_selfpipe[0]); + close(ctx->sigchld_selfpipe[1]); + } + pthread_mutex_destroy(&ctx->lock); GC_FREE; diff -r 4e7a03e27a12 -r e3371fc765b1 tools/libxl/libxl.h --- a/tools/libxl/libxl.h Fri May 11 18:58:55 2012 +0100 +++ b/tools/libxl/libxl.h Fri May 11 18:58:56 2012 +0100 @@ -380,6 +380,7 @@ enum { ERROR_NOT_READY = -11, ERROR_OSEVENT_REG_FAIL = -12, ERROR_BUFFERFULL = -13, + ERROR_UNKNOWN_CHILD = -14, }; diff -r 4e7a03e27a12 -r e3371fc765b1 tools/libxl/libxl_event.c --- a/tools/libxl/libxl_event.c Fri May 11 18:58:55 2012 +0100 +++ b/tools/libxl/libxl_event.c Fri May 11 18:58:56 2012 +0100 @@ -627,6 +627,10 @@ static int beforepoll_internal(libxl__gc \ REQUIRE_FD(poller->wakeup_pipe[0], POLLIN, BODY); \ \ + int selfpipe = libxl__fork_selfpipe_active(CTX); \ + if (selfpipe >= 0) \ + REQUIRE_FD(selfpipe, POLLIN, BODY); \ + \ }while(0) #define REQUIRE_FD(req_fd_, req_events_, BODY) do{ \ @@ -766,10 +770,11 @@ static void afterpoll_internal(libxl__eg int nfds, const struct pollfd *fds, struct timeval now) { + /* May make callbacks into the application for child processes. + * ctx must be locked exactly once */ EGC_GC; libxl__ev_fd *efd; - LIBXL_LIST_FOREACH(efd, &CTX->efds, entry) { if (!efd->events) continue; @@ -780,11 +785,16 @@ static void afterpoll_internal(libxl__eg } if (afterpoll_check_fd(poller,fds,nfds, poller->wakeup_pipe[0],POLLIN)) { - char buf[256]; - int r = read(poller->wakeup_pipe[0], buf, sizeof(buf)); - if (r < 0) - if (errno != EINTR && errno != EWOULDBLOCK) - LIBXL__EVENT_DISASTER(egc, "read wakeup", errno, 0); + int e = libxl__self_pipe_eatall(poller->wakeup_pipe[0]); + if (e) LIBXL__EVENT_DISASTER(egc, "read wakeup", e, 0); + } + + int selfpipe = libxl__fork_selfpipe_active(CTX); + if (selfpipe >= 0 && + afterpoll_check_fd(poller,fds,nfds, selfpipe, POLLIN)) { + int e = libxl__self_pipe_eatall(selfpipe); + if (e) LIBXL__EVENT_DISASTER(egc, "read sigchld pipe", e, 0); + libxl__fork_selfpipe_woken(egc); } for (;;) { @@ -1082,16 +1092,37 @@ void libxl__poller_put(libxl_ctx *ctx, l void libxl__poller_wakeup(libxl__egc *egc, libxl__poller *p) { + int e = libxl__self_pipe_wakeup(p->wakeup_pipe[1]); + if (e) LIBXL__EVENT_DISASTER(egc, "cannot poke watch pipe", e, 0); +} + +int libxl__self_pipe_wakeup(int fd) +{ static const char buf[1] = ""; for (;;) { - int r = write(p->wakeup_pipe[1], buf, 1); - if (r==1) return; + int r = write(fd, buf, 1); + if (r==1) return 0; assert(r==-1); if (errno == EINTR) continue; - if (errno == EWOULDBLOCK) return; - LIBXL__EVENT_DISASTER(egc, "cannot poke watch pipe", errno, 0); - return; + if (errno == EWOULDBLOCK) return 0; + assert(errno); + return errno; + } +} + +int libxl__self_pipe_eatall(int fd) +{ + char buf[256]; + for (;;) { + int r = read(fd, buf, sizeof(buf)); + if (r == sizeof(buf)) continue; + if (r >= 0) return 0; + assert(r == -1); + if (errno == EINTR) continue; + if (errno == EWOULDBLOCK) return 0; + assert(errno); + return errno; } } diff -r 4e7a03e27a12 -r e3371fc765b1 tools/libxl/libxl_event.h --- a/tools/libxl/libxl_event.h Fri May 11 18:58:55 2012 +0100 +++ b/tools/libxl/libxl_event.h Fri May 11 18:58:56 2012 +0100 @@ -163,11 +163,6 @@ void libxl_event_register_callbacks(libx * After libxl_ctx_free, all corresponding evgen handles become * invalid and must no longer be passed to evdisable. * - * Events enabled with evenable prior to a fork and libxl_ctx_postfork - * are no longer generated after the fork/postfork; however the evgen - * structures are still valid and must be passed to evdisable if the - * memory they use should not be leaked. - * * Applications should ensure that they eventually retrieve every * event using libxl_event_check or libxl_event_wait, since events * which occur but are not retreived by the application will be queued @@ -372,6 +367,148 @@ void libxl_osevent_occurred_fd(libxl_ctx void libxl_osevent_occurred_timeout(libxl_ctx *ctx, void *for_libxl); +/*======================================================================*/ + +/* + * Subprocess handling. + * + * Unfortunately the POSIX interface makes this very awkward. + * + * There are two possible arrangements for collecting statuses from + * wait/waitpid. + * + * For naive programs: + * + * libxl will keep a SIGCHLD handler installed whenever it has an + * active (unreaped) child. It will reap all children with + * wait(); any children it does not recognise will be passed to + * the application via an optional callback (and will result in + * logged warnings if no callback is provided or the callback + * denies responsibility for the child). + * + * libxl may have children whenever: + * + * - libxl is performing an operation which can be made + * asynchronous; ie one taking a libxl_asyncop_how, even + * if NULL is passed indicating that the operation is + * synchronous; or + * + * - events of any kind are being generated, as requested + * by libxl_evenable_.... + * + * A multithreaded application which is naive in this sense may + * block SIGCHLD on some of its threads, but there must be at + * least one thread that has SIGCHLD unblocked. libxl will not + * modify the blocking flag for SIGCHLD (except that it may create + * internal service threads with all signals blocked). + * + * A naive program must only have at any one time only + * one libxl context which might have children. + * + * For programs which run their own children alongside libxl's: + * + * A program which does this must call libxl_childproc_setmode. + * There are two options: + * + * libxl_sigchld_owner_mainloop: + * The application must install a SIGCHLD handler and reap (at + * least) all of libxl's children and pass their exit status + * to libxl by calling libxl_childproc_exited. + * + * libxl_sigchld_owner_libxl_always: + * The application expects libxl to reap all of its children, + * and provides a callback to be notified of their exit + * statues. + * + * An application which fails to call setmode, or which passes 0 for + * hooks, while it uses any libxl operation which might + * create or use child processes (see above): + * - Must not have any child processes running. + * - Must not install a SIGCHLD handler. + * - Must not reap any children. + */ + + +typedef enum { + /* libxl owns SIGCHLD whenever it has a child. */ + libxl_sigchld_owner_libxl, + + /* Application promises to call libxl_childproc_exited but NOT + * from within a signal handler. libxl will not itself arrange to + * (un)block or catch SIGCHLD. */ + libxl_sigchld_owner_mainloop, + + /* libxl owns SIGCHLD all the time, and the application is + * relying on libxl's event loop for reaping its own children. */ + libxl_sigchld_owner_libxl_always, +} libxl_sigchld_owner; + +typedef struct { + libxl_sigchld_owner chldowner; + + /* All of these are optional: */ + + /* Called by libxl instead of fork. Should behave exactly like + * fork, including setting errno etc. May NOT reenter into libxl. + * Application may use this to discover pids of libxl's children, + * for example. + */ + pid_t (*fork_replacement)(void *user); + + /* With libxl_sigchld_owner_libxl, called by libxl when it has + * reaped a pid. (Not permitted with _owner_mainloop.) + * + * Should return 0 if the child was recognised by the application + * (or if the application does not keep those kind of records), + * ERROR_UNKNOWN_CHILD if the application knows that the child is not + * the application's; if it returns another error code it is a + * disaster as described for libxl_event_register_callbacks. + * (libxl will report unexpected children to its error log.) + * + * If not supplied, the application is assumed not to start + * any children of its own. + * + * This function is NOT called from within the signal handler. + * Rather it will be called from inside a libxl's event handling + * code and thus only when libxl is running, for example from + * within libxl_event_wait. (libxl uses the self-pipe trick + * to implement this.) + * + * childproc_exited_callback may call back into libxl, but it + * is best to avoid making long-running libxl calls as that might + * stall the calling event loop while the nested operation + * completes. + */ + int (*reaped_callback)(pid_t, int status, void *user); +} libxl_childproc_hooks; + +/* hooks may be 0 in which is equivalent to &{ libxl_sigchld_owner_libxl, 0, 0 } + * + * May not be called when libxl might have any child processes, or the + * behaviour is undefined. So it is best to call this at + * initialisation. + */ +void libxl_childproc_setmode(libxl_ctx *ctx, const libxl_childproc_hooks *hooks, + void *user); + +/* + * This function is for an application which owns SIGCHLD and which + * therefore reaps all of the process's children. + * + * May be called only by an application which has called setmode with + * chldowner == libxl_sigchld_owner_mainloop. If pid was a process started + * by this instance of libxl, returns 0 after doing whatever + * processing is appropriate. Otherwise silently returns + * ERROR_UNKNOWN_CHILD. No other error returns are possible. + * + * May NOT be called from within a signal handler which might + * interrupt any libxl operation. The application will almost + * certainly need to use the self-pipe trick (or a working pselect or + * ppoll) to implement this. + */ +int libxl_childproc_reaped(libxl_ctx *ctx, pid_t, int status); + + /* * An application which initialises a libxl_ctx in a parent process * and then forks a child which does not quickly exec, must diff -r 4e7a03e27a12 -r e3371fc765b1 tools/libxl/libxl_fork.c --- a/tools/libxl/libxl_fork.c Fri May 11 18:58:55 2012 +0100 +++ b/tools/libxl/libxl_fork.c Fri May 11 18:58:56 2012 +0100 @@ -46,6 +46,12 @@ static int atfork_registered; static LIBXL_LIST_HEAD(, libxl__carefd) carefds = LIBXL_LIST_HEAD_INITIALIZER(carefds); +/* non-null iff installed, protected by no_forking */ +static libxl_ctx *sigchld_owner; +static struct sigaction sigchld_saved_action; + +static void sigchld_removehandler_core(void); + static void atfork_lock(void) { int r = pthread_mutex_lock(&no_forking); @@ -107,6 +113,7 @@ void libxl_postfork_child_noexec(libxl_c int r; atfork_lock(); + LIBXL_LIST_FOREACH_SAFE(cf, &carefds, entry, cf_tmp) { if (cf->fd >= 0) { r = close(cf->fd); @@ -118,6 +125,10 @@ void libxl_postfork_child_noexec(libxl_c free(cf); } LIBXL_LIST_INIT(&carefds); + + if (sigchld_owner) + sigchld_removehandler_core(); + atfork_unlock(); } @@ -141,6 +152,250 @@ int libxl__carefd_fd(const libxl__carefd } /* + * Actual child process handling + */ + +static void sigchld_handler(int signo) +{ + int e = libxl__self_pipe_wakeup(sigchld_owner->sigchld_selfpipe[1]); + assert(!e); /* errors are probably EBADF, very bad */ +} + +static void sigchld_removehandler_core(void) +{ + struct sigaction was; + int r; + + r = sigaction(SIGCHLD, &sigchld_saved_action, &was); + assert(!r); + assert(!(was.sa_flags & SA_SIGINFO)); + assert(was.sa_handler == sigchld_handler); + sigchld_owner = 0; +} + +void libxl__sigchld_removehandler(libxl_ctx *ctx) /* non-reentrant */ +{ + atfork_lock(); + if (sigchld_owner == ctx) + sigchld_removehandler_core(); + atfork_unlock(); +} + +int libxl__sigchld_installhandler(libxl_ctx *ctx) /* non-reentrant */ +{ + int r, rc; + + if (ctx->sigchld_selfpipe[0] < 0) { + r = pipe(ctx->sigchld_selfpipe); + if (r) { + ctx->sigchld_selfpipe[0] = -1; + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, + "failed to create sigchld pipe"); + rc = ERROR_FAIL; + goto out; + } + } + + atfork_lock(); + if (sigchld_owner != ctx) { + struct sigaction ours; + + assert(!sigchld_owner); + sigchld_owner = ctx; + + memset(&ours,0,sizeof(ours)); + ours.sa_handler = sigchld_handler; + sigemptyset(&ours.sa_mask); + ours.sa_flags = SA_NOCLDSTOP | SA_RESTART; + r = sigaction(SIGCHLD, &ours, &sigchld_saved_action); + assert(!r); + + assert(((void)"application must negotiate with libxl about SIGCHLD", + !(sigchld_saved_action.sa_flags & SA_SIGINFO) && + (sigchld_saved_action.sa_handler == SIG_DFL || + sigchld_saved_action.sa_handler == SIG_IGN))); + } + atfork_unlock(); + + rc = 0; + out: + return rc; +} + +static int chldmode_ours(libxl_ctx *ctx) +{ + return ctx->childproc_hooks->chldowner == libxl_sigchld_owner_libxl; +} + +int libxl__fork_selfpipe_active(libxl_ctx *ctx) +{ + /* Returns the fd to read, or -1 */ + if (!chldmode_ours(ctx)) + return -1; + + if (LIBXL_LIST_EMPTY(&ctx->children)) + return -1; + + return ctx->sigchld_selfpipe[0]; +} + +static void perhaps_removehandler(libxl_ctx *ctx) +{ + if (LIBXL_LIST_EMPTY(&ctx->children) && + ctx->childproc_hooks->chldowner != libxl_sigchld_owner_libxl_always) + libxl__sigchld_removehandler(ctx); +} + +static int childproc_reaped(libxl__egc *egc, pid_t pid, int status) +{ + EGC_GC; + libxl__ev_child *ch; + + LIBXL_LIST_FOREACH(ch, &CTX->children, entry) + if (ch->pid == pid) + goto found; + + /* not found */ + return ERROR_UNKNOWN_CHILD; + + found: + LIBXL_LIST_REMOVE(ch, entry); + ch->pid = -1; + ch->callback(egc, ch, pid, status); + + perhaps_removehandler(CTX); + + return 0; +} + +int libxl_childproc_reaped(libxl_ctx *ctx, pid_t pid, int status) +{ + EGC_INIT(ctx); + CTX_LOCK; + int rc = childproc_reaped(egc, pid, status); + CTX_UNLOCK; + EGC_FREE; + return rc; +} + +void libxl__fork_selfpipe_woken(libxl__egc *egc) +{ + /* May make callbacks into the application for child processes. + * ctx must be locked EXACTLY ONCE */ + EGC_GC; + + while (chldmode_ours(CTX) /* in case the app changes the mode */) { + int status; + pid_t pid = waitpid(-1, &status, WNOHANG); + + if (pid == 0) return; + + if (pid == -1) { + if (errno == ECHILD) return; + if (errno == EINTR) continue; + LIBXL__EVENT_DISASTER(egc, "waitpid() failed", errno, 0); + return; + } + + int rc = childproc_reaped(egc, pid, status); + + if (rc) { + if (CTX->childproc_hooks->reaped_callback) { + CTX_UNLOCK; + rc = CTX->childproc_hooks->reaped_callback + (pid, status, CTX->childproc_user); + CTX_LOCK; + if (rc != 0 && rc != ERROR_UNKNOWN_CHILD) { + char disasterbuf[200]; + snprintf(disasterbuf, sizeof(disasterbuf), " reported by" + " libxl_childproc_hooks->reaped_callback" + " (for pid=%lu, status=%d; error code %d)", + (unsigned long)pid, status, rc); + LIBXL__EVENT_DISASTER(egc, disasterbuf, 0, 0); + return; + } + } else { + rc = ERROR_UNKNOWN_CHILD; + } + if (rc) + libxl_report_child_exitstatus(CTX, XTL_WARN, + "unknown child", (long)pid, status); + } + } +} + +pid_t libxl__ev_child_fork(libxl__gc *gc, libxl__ev_child *ch, + libxl__ev_child_callback *death) +{ + CTX_LOCK; + int rc; + + if (chldmode_ours(CTX)) { + rc = libxl__sigchld_installhandler(CTX); + if (rc) goto out; + } + + pid_t pid = + CTX->childproc_hooks->fork_replacement + ? CTX->childproc_hooks->fork_replacement(CTX->childproc_user) + : fork(); + if (pid == -1) { + LOGE(ERROR, "fork failed"); + rc = ERROR_FAIL; + goto out; + } + + if (!pid) { + /* woohoo! */ + return 0; /* Yes, CTX is left locked in the child. */ + } + + ch->pid = pid; + ch->callback = death; + LIBXL_LIST_INSERT_HEAD(&CTX->children, ch, entry); + rc = pid; + + out: + perhaps_removehandler(CTX); + CTX_UNLOCK; + return rc; +} + +void libxl_childproc_setmode(libxl_ctx *ctx, const libxl_childproc_hooks *hooks, + void *user) +{ + GC_INIT(ctx); + CTX_LOCK; + + assert(LIBXL_LIST_EMPTY(&CTX->children)); + + if (!hooks) + hooks = &libxl__childproc_default_hooks; + + ctx->childproc_hooks = hooks; + ctx->childproc_user = user; + + switch (ctx->childproc_hooks->chldowner) { + case libxl_sigchld_owner_mainloop: + case libxl_sigchld_owner_libxl: + libxl__sigchld_removehandler(ctx); + break; + case libxl_sigchld_owner_libxl_always: + libxl__sigchld_installhandler(ctx); + break; + default: + abort(); + } + + CTX_UNLOCK; + GC_FREE; +} + +const libxl_childproc_hooks libxl__childproc_default_hooks = { + libxl_sigchld_owner_libxl, 0, 0 +}; + +/* * Local variables: * mode: C * c-basic-offset: 4 diff -r 4e7a03e27a12 -r e3371fc765b1 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri May 11 18:58:55 2012 +0100 +++ b/tools/libxl/libxl_internal.h Fri May 11 18:58:56 2012 +0100 @@ -198,6 +198,19 @@ _hidden libxl__ev_xswatch *libxl__watch_ int slotnum); +typedef struct libxl__ev_child libxl__ev_child; +typedef void libxl__ev_child_callback(libxl__egc *egc, libxl__ev_child*, + pid_t pid, int status); +struct libxl__ev_child { + /* caller should include this in their own struct */ + /* read-only for caller: */ + pid_t pid; /* -1 means unused ("unregistered", ie Idle) */ + libxl__ev_child_callback *callback; + /* remainder is private for libxl__ev_... */ + LIBXL_LIST_ENTRY(struct libxl__ev_child) entry; +}; + + /* * evgen structures, which are the state we use for generating * events for the caller. @@ -306,10 +319,14 @@ struct libxl__ctx { LIBXL_LIST_HEAD(, libxl_evgen_disk_eject) disk_eject_evgens; - /* for callers who reap children willy-nilly; caller must only - * set this after libxl_init and before any other call - or - * may leave them untouched */ + const libxl_childproc_hooks *childproc_hooks; + void *childproc_user; + int sigchld_selfpipe[2]; /* [0]==-1 means handler not installed */ + LIBXL_LIST_HEAD(, libxl__ev_child) children; + + /* This is obsolete and must be removed: */ int (*waitpid_instead)(pid_t pid, int *status, int flags); + libxl_version_info version_info; }; @@ -557,6 +574,36 @@ static inline int libxl__ev_xswatch_isre /* + * For making subprocesses. This is the only permitted mechanism for + * code in libxl to do so. + * + * In the parent, returns the pid, filling in childw_out. + * In the child, returns 0. + * If it fails, returns a libxl error (all of which are -ve). + * + * The child should go on to exec (or exit) soon. The child may not + * make any further calls to libxl infrastructure, except for memory + * allocation and logging. If the child needs to use xenstore it + * must open its own xs handle and use it directly, rather than via + * the libxl event machinery. + * + * The parent may signal the child but it must not reap it. That will + * be done by the event machinery. death may be NULL in which case + * the child is still reaped but its death is ignored. + * + * It is not possible to "deregister" the child death event source. + * It will generate exactly one event callback; until then the childw + * is Active and may not be reused. + */ +_hidden pid_t libxl__ev_child_fork(libxl__gc *gc, libxl__ev_child *childw_out, + libxl__ev_child_callback *death); +static inline void libxl__ev_child_init(libxl__ev_child *childw_out) + { childw_out->pid = -1; } +static inline int libxl__ev_child_inuse(libxl__ev_child *childw_out) + { return childw_out->pid >= 0; } + + +/* * Other event-handling support provided by the libxl event core to * the rest of libxl. */ @@ -610,6 +657,15 @@ _hidden void libxl__poller_put(libxl_ctx * ctx must be locked. */ _hidden void libxl__poller_wakeup(libxl__egc *egc, libxl__poller *p); +/* Internal to fork and child reaping machinery */ +extern const libxl_childproc_hooks libxl__childproc_default_hooks; +int libxl__sigchld_installhandler(libxl_ctx *ctx); /* non-reentrant;logs errs */ +void libxl__sigchld_removehandler(libxl_ctx *ctx); /* non-reentrant */ +int libxl__fork_selfpipe_active(libxl_ctx *ctx); /* returns read fd or -1 */ +void libxl__fork_selfpipe_woken(libxl__egc *egc); +int libxl__self_pipe_wakeup(int fd); /* returns 0 or -1 setting errno */ +int libxl__self_pipe_eatall(int fd); /* returns 0 or -1 setting errno */ + _hidden int libxl__atfork_init(libxl_ctx *ctx); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:43 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCR-0004fo-K5; Mon, 14 May 2012 16:32:43 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCN-0004Pr-Jf for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:39 +0000 Received: from [85.158.138.51:34387] by server-7.bemta-3.messagelabs.com id 82/59-03078-7A331BF4; Mon, 14 May 2012 16:32:39 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-174.messagelabs.com!1337013157!27110211!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5279 invoked from network); 14 May 2012 16:32:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCK-0002up-Vb for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCK-0006nx-UR for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:36 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:36 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: provide libxl__datacopier_* X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1336759139 -3600 # Node ID 65716de1674822ff28651b7badf9ce19e010604b # Parent bf91e2bc1b88558fe5a395cb3f94c948a570bfc0 libxl: provide libxl__datacopier_* General facility for ao operations to shovel data between fds. This will be used by the bootloader machinery. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Changes in v7: * assert that the ao is non-null on _init. Committed-by: Ian Jackson --- diff -r bf91e2bc1b88 -r 65716de16748 tools/libxl/Makefile --- a/tools/libxl/Makefile Fri May 11 18:58:58 2012 +0100 +++ b/tools/libxl/Makefile Fri May 11 18:58:59 2012 +0100 @@ -64,7 +64,8 @@ LIBXL_LIBS += -lyajl LIBXL_OBJS = flexarray.o libxl.o libxl_create.o libxl_dm.o libxl_pci.o \ libxl_dom.o libxl_exec.o libxl_xshelp.o libxl_device.o \ - libxl_internal.o libxl_utils.o libxl_uuid.o libxl_json.o \ + libxl_internal.o libxl_utils.o libxl_uuid.o \ + libxl_json.o libxl_aoutils.o \ libxl_qmp.o libxl_event.o libxl_fork.o $(LIBXL_OBJS-y) LIBXL_OBJS += _libxl_types.o libxl_flask.o _libxl_types_internal.o diff -r bf91e2bc1b88 -r 65716de16748 tools/libxl/libxl_aoutils.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/libxl/libxl_aoutils.c Fri May 11 18:58:59 2012 +0100 @@ -0,0 +1,189 @@ +/* + * Copyright (C) 2010 Citrix Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; version 2.1 only. with the special + * exception on linking described in file LICENSE. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + */ + +#include "libxl_osdeps.h" /* must come before any other headers */ + +#include "libxl_internal.h" + +/*----- data copier -----*/ + +void libxl__datacopier_init(libxl__datacopier_state *dc) +{ + assert(dc->ao); + libxl__ev_fd_init(&dc->toread); + libxl__ev_fd_init(&dc->towrite); + LIBXL_TAILQ_INIT(&dc->bufs); +} + +void libxl__datacopier_kill(libxl__datacopier_state *dc) +{ + STATE_AO_GC(dc->ao); + libxl__datacopier_buf *buf, *tbuf; + + libxl__ev_fd_deregister(gc, &dc->toread); + libxl__ev_fd_deregister(gc, &dc->towrite); + LIBXL_TAILQ_FOREACH_SAFE(buf, &dc->bufs, entry, tbuf) + free(buf); + LIBXL_TAILQ_INIT(&dc->bufs); +} + +static void datacopier_callback(libxl__egc *egc, libxl__datacopier_state *dc, + int onwrite, int errnoval) +{ + libxl__datacopier_kill(dc); + dc->callback(egc, dc, onwrite, errnoval); +} + +static void datacopier_writable(libxl__egc *egc, libxl__ev_fd *ev, + int fd, short events, short revents); + +static void datacopier_check_state(libxl__egc *egc, libxl__datacopier_state *dc) +{ + STATE_AO_GC(dc->ao); + int rc; + + if (dc->used) { + if (!libxl__ev_fd_isregistered(&dc->towrite)) { + rc = libxl__ev_fd_register(gc, &dc->towrite, datacopier_writable, + dc->writefd, POLLOUT); + if (rc) { + LOG(ERROR, "unable to establish write event on %s" + " during copy of %s", dc->writewhat, dc->copywhat); + datacopier_callback(egc, dc, -1, 0); + return; + } + } + } else if (!libxl__ev_fd_isregistered(&dc->toread)) { + /* we have had eof */ + datacopier_callback(egc, dc, 0, 0); + return; + } else { + /* nothing buffered, but still reading */ + libxl__ev_fd_deregister(gc, &dc->towrite); + } +} + +static void datacopier_readable(libxl__egc *egc, libxl__ev_fd *ev, + int fd, short events, short revents) { + libxl__datacopier_state *dc = CONTAINER_OF(ev, *dc, toread); + STATE_AO_GC(dc->ao); + + if (revents & ~POLLIN) { + LOG(ERROR, "unexpected poll event 0x%x (should be POLLIN)" + " on %s during copy of %s", revents, dc->readwhat, dc->copywhat); + datacopier_callback(egc, dc, -1, 0); + return; + } + assert(revents & POLLIN); + for (;;) { + while (dc->used >= dc->maxsz) { + libxl__datacopier_buf *rm = LIBXL_TAILQ_FIRST(&dc->bufs); + dc->used -= rm->used; + assert(dc->used >= 0); + LIBXL_TAILQ_REMOVE(&dc->bufs, rm, entry); + free(rm); + } + + libxl__datacopier_buf *buf = + LIBXL_TAILQ_LAST(&dc->bufs, libxl__datacopier_bufs); + if (!buf || buf->used >= sizeof(buf->buf)) { + buf = malloc(sizeof(*buf)); + if (!buf) libxl__alloc_failed(CTX, __func__, 1, sizeof(*buf)); + buf->used = 0; + LIBXL_TAILQ_INSERT_TAIL(&dc->bufs, buf, entry); + } + int r = read(ev->fd, + buf->buf + buf->used, + sizeof(buf->buf) - buf->used); + if (r < 0) { + if (errno == EINTR) continue; + if (errno == EWOULDBLOCK) break; + LOGE(ERROR, "error reading %s during copy of %s", + dc->readwhat, dc->copywhat); + datacopier_callback(egc, dc, 0, errno); + return; + } + if (r == 0) { + libxl__ev_fd_deregister(gc, &dc->toread); + break; + } + buf->used += r; + dc->used += r; + assert(buf->used <= sizeof(buf->buf)); + } + datacopier_check_state(egc, dc); +} + +static void datacopier_writable(libxl__egc *egc, libxl__ev_fd *ev, + int fd, short events, short revents) { + libxl__datacopier_state *dc = CONTAINER_OF(ev, *dc, towrite); + STATE_AO_GC(dc->ao); + + if (revents & ~POLLOUT) { + LOG(ERROR, "unexpected poll event 0x%x (should be POLLOUT)" + " on %s during copy of %s", revents, dc->writewhat, dc->copywhat); + datacopier_callback(egc, dc, -1, 0); + return; + } + assert(revents & POLLOUT); + for (;;) { + libxl__datacopier_buf *buf = LIBXL_TAILQ_FIRST(&dc->bufs); + if (!buf) + break; + if (!buf->used) { + LIBXL_TAILQ_REMOVE(&dc->bufs, buf, entry); + free(buf); + continue; + } + int r = write(ev->fd, buf->buf, buf->used); + if (r < 0) { + if (errno == EINTR) continue; + if (errno == EWOULDBLOCK) break; + LOGE(ERROR, "error writing to %s during copy of %s", + dc->writewhat, dc->copywhat); + datacopier_callback(egc, dc, 1, errno); + return; + } + assert(r > 0); + assert(r <= buf->used); + buf->used -= r; + dc->used -= r; + assert(dc->used >= 0); + memmove(buf->buf, buf->buf+r, buf->used); + } + datacopier_check_state(egc, dc); +} + +int libxl__datacopier_start(libxl__datacopier_state *dc) +{ + int rc; + STATE_AO_GC(dc->ao); + + libxl__datacopier_init(dc); + + rc = libxl__ev_fd_register(gc, &dc->toread, datacopier_readable, + dc->readfd, POLLIN); + if (rc) goto out; + + rc = libxl__ev_fd_register(gc, &dc->towrite, datacopier_writable, + dc->writefd, POLLOUT); + if (rc) goto out; + + return 0; + + out: + libxl__datacopier_kill(dc); + return rc; +} + diff -r bf91e2bc1b88 -r 65716de16748 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri May 11 18:58:58 2012 +0100 +++ b/tools/libxl/libxl_internal.h Fri May 11 18:58:59 2012 +0100 @@ -840,6 +840,7 @@ _hidden int libxl__ev_devstate_wait(libx */ _hidden int libxl__try_phy_backend(mode_t st_mode); + /* from libxl_pci */ _hidden int libxl__device_pci_add(libxl__gc *gc, uint32_t domid, libxl_device_pci *pcidev, int starting); @@ -1473,6 +1474,45 @@ _hidden const char *libxl__xen_script_di _hidden const char *libxl__lock_dir_path(void); _hidden const char *libxl__run_dir_path(void); +/*----- datacopier: copies data from one fd to another -----*/ + +typedef struct libxl__datacopier_state libxl__datacopier_state; +typedef struct libxl__datacopier_buf libxl__datacopier_buf; + +/* onwrite==1 means failure happened when writing, logged, errnoval is valid + * onwrite==0 means failure happened when reading + * errnoval==0 means we got eof and all data was written + * errnoval!=0 means we had a read error, logged + * onwrite==-1 means some other internal failure, errnoval not valid, logged + * in all cases copier is killed before calling this callback */ +typedef void libxl__datacopier_callback(libxl__egc *egc, + libxl__datacopier_state *dc, int onwrite, int errnoval); + +struct libxl__datacopier_buf { + /* private to datacopier */ + LIBXL_TAILQ_ENTRY(libxl__datacopier_buf) entry; + int used; + char buf[1000]; +}; + +struct libxl__datacopier_state { + /* caller must fill these in, and they must all remain valid */ + libxl__ao *ao; + int readfd, writefd; + ssize_t maxsz; + const char *copywhat, *readwhat, *writewhat; /* for error msgs */ + libxl__datacopier_callback *callback; + /* remaining fields are private to datacopier */ + libxl__ev_fd toread, towrite; + ssize_t used; + LIBXL_TAILQ_HEAD(libxl__datacopier_bufs, libxl__datacopier_buf) bufs; +}; + +_hidden void libxl__datacopier_init(libxl__datacopier_state *dc); +_hidden void libxl__datacopier_kill(libxl__datacopier_state *dc); +_hidden int libxl__datacopier_start(libxl__datacopier_state *dc); + + /* * Convenience macros. */ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:43 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCR-0004fo-K5; Mon, 14 May 2012 16:32:43 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCN-0004Pr-Jf for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:39 +0000 Received: from [85.158.138.51:34387] by server-7.bemta-3.messagelabs.com id 82/59-03078-7A331BF4; Mon, 14 May 2012 16:32:39 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-174.messagelabs.com!1337013157!27110211!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5279 invoked from network); 14 May 2012 16:32:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCK-0002up-Vb for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCK-0006nx-UR for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:36 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:36 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: provide libxl__datacopier_* X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1336759139 -3600 # Node ID 65716de1674822ff28651b7badf9ce19e010604b # Parent bf91e2bc1b88558fe5a395cb3f94c948a570bfc0 libxl: provide libxl__datacopier_* General facility for ao operations to shovel data between fds. This will be used by the bootloader machinery. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Changes in v7: * assert that the ao is non-null on _init. Committed-by: Ian Jackson --- diff -r bf91e2bc1b88 -r 65716de16748 tools/libxl/Makefile --- a/tools/libxl/Makefile Fri May 11 18:58:58 2012 +0100 +++ b/tools/libxl/Makefile Fri May 11 18:58:59 2012 +0100 @@ -64,7 +64,8 @@ LIBXL_LIBS += -lyajl LIBXL_OBJS = flexarray.o libxl.o libxl_create.o libxl_dm.o libxl_pci.o \ libxl_dom.o libxl_exec.o libxl_xshelp.o libxl_device.o \ - libxl_internal.o libxl_utils.o libxl_uuid.o libxl_json.o \ + libxl_internal.o libxl_utils.o libxl_uuid.o \ + libxl_json.o libxl_aoutils.o \ libxl_qmp.o libxl_event.o libxl_fork.o $(LIBXL_OBJS-y) LIBXL_OBJS += _libxl_types.o libxl_flask.o _libxl_types_internal.o diff -r bf91e2bc1b88 -r 65716de16748 tools/libxl/libxl_aoutils.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/libxl/libxl_aoutils.c Fri May 11 18:58:59 2012 +0100 @@ -0,0 +1,189 @@ +/* + * Copyright (C) 2010 Citrix Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; version 2.1 only. with the special + * exception on linking described in file LICENSE. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + */ + +#include "libxl_osdeps.h" /* must come before any other headers */ + +#include "libxl_internal.h" + +/*----- data copier -----*/ + +void libxl__datacopier_init(libxl__datacopier_state *dc) +{ + assert(dc->ao); + libxl__ev_fd_init(&dc->toread); + libxl__ev_fd_init(&dc->towrite); + LIBXL_TAILQ_INIT(&dc->bufs); +} + +void libxl__datacopier_kill(libxl__datacopier_state *dc) +{ + STATE_AO_GC(dc->ao); + libxl__datacopier_buf *buf, *tbuf; + + libxl__ev_fd_deregister(gc, &dc->toread); + libxl__ev_fd_deregister(gc, &dc->towrite); + LIBXL_TAILQ_FOREACH_SAFE(buf, &dc->bufs, entry, tbuf) + free(buf); + LIBXL_TAILQ_INIT(&dc->bufs); +} + +static void datacopier_callback(libxl__egc *egc, libxl__datacopier_state *dc, + int onwrite, int errnoval) +{ + libxl__datacopier_kill(dc); + dc->callback(egc, dc, onwrite, errnoval); +} + +static void datacopier_writable(libxl__egc *egc, libxl__ev_fd *ev, + int fd, short events, short revents); + +static void datacopier_check_state(libxl__egc *egc, libxl__datacopier_state *dc) +{ + STATE_AO_GC(dc->ao); + int rc; + + if (dc->used) { + if (!libxl__ev_fd_isregistered(&dc->towrite)) { + rc = libxl__ev_fd_register(gc, &dc->towrite, datacopier_writable, + dc->writefd, POLLOUT); + if (rc) { + LOG(ERROR, "unable to establish write event on %s" + " during copy of %s", dc->writewhat, dc->copywhat); + datacopier_callback(egc, dc, -1, 0); + return; + } + } + } else if (!libxl__ev_fd_isregistered(&dc->toread)) { + /* we have had eof */ + datacopier_callback(egc, dc, 0, 0); + return; + } else { + /* nothing buffered, but still reading */ + libxl__ev_fd_deregister(gc, &dc->towrite); + } +} + +static void datacopier_readable(libxl__egc *egc, libxl__ev_fd *ev, + int fd, short events, short revents) { + libxl__datacopier_state *dc = CONTAINER_OF(ev, *dc, toread); + STATE_AO_GC(dc->ao); + + if (revents & ~POLLIN) { + LOG(ERROR, "unexpected poll event 0x%x (should be POLLIN)" + " on %s during copy of %s", revents, dc->readwhat, dc->copywhat); + datacopier_callback(egc, dc, -1, 0); + return; + } + assert(revents & POLLIN); + for (;;) { + while (dc->used >= dc->maxsz) { + libxl__datacopier_buf *rm = LIBXL_TAILQ_FIRST(&dc->bufs); + dc->used -= rm->used; + assert(dc->used >= 0); + LIBXL_TAILQ_REMOVE(&dc->bufs, rm, entry); + free(rm); + } + + libxl__datacopier_buf *buf = + LIBXL_TAILQ_LAST(&dc->bufs, libxl__datacopier_bufs); + if (!buf || buf->used >= sizeof(buf->buf)) { + buf = malloc(sizeof(*buf)); + if (!buf) libxl__alloc_failed(CTX, __func__, 1, sizeof(*buf)); + buf->used = 0; + LIBXL_TAILQ_INSERT_TAIL(&dc->bufs, buf, entry); + } + int r = read(ev->fd, + buf->buf + buf->used, + sizeof(buf->buf) - buf->used); + if (r < 0) { + if (errno == EINTR) continue; + if (errno == EWOULDBLOCK) break; + LOGE(ERROR, "error reading %s during copy of %s", + dc->readwhat, dc->copywhat); + datacopier_callback(egc, dc, 0, errno); + return; + } + if (r == 0) { + libxl__ev_fd_deregister(gc, &dc->toread); + break; + } + buf->used += r; + dc->used += r; + assert(buf->used <= sizeof(buf->buf)); + } + datacopier_check_state(egc, dc); +} + +static void datacopier_writable(libxl__egc *egc, libxl__ev_fd *ev, + int fd, short events, short revents) { + libxl__datacopier_state *dc = CONTAINER_OF(ev, *dc, towrite); + STATE_AO_GC(dc->ao); + + if (revents & ~POLLOUT) { + LOG(ERROR, "unexpected poll event 0x%x (should be POLLOUT)" + " on %s during copy of %s", revents, dc->writewhat, dc->copywhat); + datacopier_callback(egc, dc, -1, 0); + return; + } + assert(revents & POLLOUT); + for (;;) { + libxl__datacopier_buf *buf = LIBXL_TAILQ_FIRST(&dc->bufs); + if (!buf) + break; + if (!buf->used) { + LIBXL_TAILQ_REMOVE(&dc->bufs, buf, entry); + free(buf); + continue; + } + int r = write(ev->fd, buf->buf, buf->used); + if (r < 0) { + if (errno == EINTR) continue; + if (errno == EWOULDBLOCK) break; + LOGE(ERROR, "error writing to %s during copy of %s", + dc->writewhat, dc->copywhat); + datacopier_callback(egc, dc, 1, errno); + return; + } + assert(r > 0); + assert(r <= buf->used); + buf->used -= r; + dc->used -= r; + assert(dc->used >= 0); + memmove(buf->buf, buf->buf+r, buf->used); + } + datacopier_check_state(egc, dc); +} + +int libxl__datacopier_start(libxl__datacopier_state *dc) +{ + int rc; + STATE_AO_GC(dc->ao); + + libxl__datacopier_init(dc); + + rc = libxl__ev_fd_register(gc, &dc->toread, datacopier_readable, + dc->readfd, POLLIN); + if (rc) goto out; + + rc = libxl__ev_fd_register(gc, &dc->towrite, datacopier_writable, + dc->writefd, POLLOUT); + if (rc) goto out; + + return 0; + + out: + libxl__datacopier_kill(dc); + return rc; +} + diff -r bf91e2bc1b88 -r 65716de16748 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri May 11 18:58:58 2012 +0100 +++ b/tools/libxl/libxl_internal.h Fri May 11 18:58:59 2012 +0100 @@ -840,6 +840,7 @@ _hidden int libxl__ev_devstate_wait(libx */ _hidden int libxl__try_phy_backend(mode_t st_mode); + /* from libxl_pci */ _hidden int libxl__device_pci_add(libxl__gc *gc, uint32_t domid, libxl_device_pci *pcidev, int starting); @@ -1473,6 +1474,45 @@ _hidden const char *libxl__xen_script_di _hidden const char *libxl__lock_dir_path(void); _hidden const char *libxl__run_dir_path(void); +/*----- datacopier: copies data from one fd to another -----*/ + +typedef struct libxl__datacopier_state libxl__datacopier_state; +typedef struct libxl__datacopier_buf libxl__datacopier_buf; + +/* onwrite==1 means failure happened when writing, logged, errnoval is valid + * onwrite==0 means failure happened when reading + * errnoval==0 means we got eof and all data was written + * errnoval!=0 means we had a read error, logged + * onwrite==-1 means some other internal failure, errnoval not valid, logged + * in all cases copier is killed before calling this callback */ +typedef void libxl__datacopier_callback(libxl__egc *egc, + libxl__datacopier_state *dc, int onwrite, int errnoval); + +struct libxl__datacopier_buf { + /* private to datacopier */ + LIBXL_TAILQ_ENTRY(libxl__datacopier_buf) entry; + int used; + char buf[1000]; +}; + +struct libxl__datacopier_state { + /* caller must fill these in, and they must all remain valid */ + libxl__ao *ao; + int readfd, writefd; + ssize_t maxsz; + const char *copywhat, *readwhat, *writewhat; /* for error msgs */ + libxl__datacopier_callback *callback; + /* remaining fields are private to datacopier */ + libxl__ev_fd toread, towrite; + ssize_t used; + LIBXL_TAILQ_HEAD(libxl__datacopier_bufs, libxl__datacopier_buf) bufs; +}; + +_hidden void libxl__datacopier_init(libxl__datacopier_state *dc); +_hidden void libxl__datacopier_kill(libxl__datacopier_state *dc); +_hidden int libxl__datacopier_start(libxl__datacopier_state *dc); + + /* * Convenience macros. */ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:49 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCW-0004nW-Va; Mon, 14 May 2012 16:32:48 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCO-0004Qk-1e for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:40 +0000 Received: from [85.158.138.51:33601] by server-4.bemta-3.messagelabs.com id BC/BA-15341-5A331BF4; Mon, 14 May 2012 16:32:37 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-174.messagelabs.com!1337013155!23011910!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18898 invoked from network); 14 May 2012 16:32:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCI-0002uX-TD for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCI-0006mz-Rx for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:34 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:34 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] autoconf: New test for openpty et al. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1336759137 -3600 # Node ID 85bf1c658d98ade6caa0eefa30172c732fc47b40 # Parent 078c7d4cde1d4593446e70ffc999845a571cd691 autoconf: New test for openpty et al. We may need to #include , and/or link with -lutil, to use openpty, login_tty, and the like. Provide INCLUDE_LIBUTIL_H (preprocessor constant, not always defined) and PTYFUNCS_LIBS (makefile variable). We link libxl against PTYFUNCS_LIBS (which comes from autoconf) rather than UTIL_LIBS, and #include where appropriate. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Changes since v7: * Actually include the call to AX_CHECK_PTYFUNCS in this patch, not the previous one, and regenerate configure accordingly. Changes since v6: * Put failure macro call in correct place so it might actually happen. * Try both with -lutil and without. * Patch now contains update for config.h.in. Committed-by: Ian Jackson --- diff -r 078c7d4cde1d -r 85bf1c658d98 config/Tools.mk.in --- a/config/Tools.mk.in Fri May 11 18:58:57 2012 +0100 +++ b/config/Tools.mk.in Fri May 11 18:58:57 2012 +0100 @@ -30,6 +30,8 @@ PTHREAD_CFLAGS := @PTHREAD_CFLAGS@ PTHREAD_LDFLAGS := @PTHREAD_LDFLAGS@ PTHREAD_LIBS := @PTHREAD_LIBS@ +PTYFUNCS_LIBS := @PTYFUNCS_LIBS@ + # Download GIT repositories via HTTP or GIT's own protocol? # GIT's protocol is faster and more robust, when it works at all (firewalls # may block it). We make it the default, but if your GIT repository downloads diff -r 078c7d4cde1d -r 85bf1c658d98 tools/config.h.in --- a/tools/config.h.in Fri May 11 18:58:57 2012 +0100 +++ b/tools/config.h.in Fri May 11 18:58:57 2012 +0100 @@ -42,6 +42,9 @@ /* Define curses header to use */ #undef INCLUDE_CURSES_H +/* libutil header file name */ +#undef INCLUDE_LIBUTIL_H + /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT diff -r 078c7d4cde1d -r 85bf1c658d98 tools/configure --- a/tools/configure Fri May 11 18:58:57 2012 +0100 +++ b/tools/configure Fri May 11 18:58:57 2012 +0100 @@ -598,6 +598,7 @@ ac_includes_default="\ ac_subst_vars='LTLIBOBJS LIBOBJS libiconv +PTYFUNCS_LIBS PTHREAD_LIBS PTHREAD_LDFLAGS PTHREAD_CFLAGS @@ -2308,6 +2309,8 @@ fi + + # Enable/disable options # Check whether --enable-githttp was given. @@ -6443,6 +6446,64 @@ fi + + ac_fn_c_check_header_mongrel "$LINENO" "libutil.h" "ac_cv_header_libutil_h" "$ac_includes_default" +if test "x$ac_cv_header_libutil_h" = x""yes; then : + + +$as_echo "#define INCLUDE_LIBUTIL_H " >>confdefs.h + + +fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openpty et al" >&5 +$as_echo_n "checking for openpty et al... " >&6; } +if test "${ax_cv_ptyfuncs_libs+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + + for ax_cv_ptyfuncs_libs in -lutil "" NOT_FOUND; do + if test "x$ax_cv_ptyfuncs_libs" = "xNOT_FOUND"; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "Unable to find library for openpty and login_tty +See \`config.log' for more details" "$LINENO" 5 ; } + fi + + saved_LIBS="$LIBS" + + LIBS="$LIBS $ax_cv_ptyfuncs_libs" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#ifdef INCLUDE_LIBUTIL_H +#include INCLUDE_LIBUTIL_H +#endif +int main(void) { + openpty(0,0,0,0,0); + login_tty(0); +} + +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + + break + +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + + LIBS="$saved_LIBS" + + done + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_ptyfuncs_libs" >&5 +$as_echo "$ax_cv_ptyfuncs_libs" >&6; } + PTYFUNCS_LIBS="$ax_cv_ptyfuncs_libs" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for yajl_alloc in -lyajl" >&5 $as_echo_n "checking for yajl_alloc in -lyajl... " >&6; } if test "${ac_cv_lib_yajl_yajl_alloc+set}" = set; then : diff -r 078c7d4cde1d -r 85bf1c658d98 tools/configure.ac --- a/tools/configure.ac Fri May 11 18:58:57 2012 +0100 +++ b/tools/configure.ac Fri May 11 18:58:57 2012 +0100 @@ -32,6 +32,7 @@ m4_include([m4/uuid.m4]) m4_include([m4/pkg.m4]) m4_include([m4/curses.m4]) m4_include([m4/pthread.m4]) +m4_include([m4/ptyfuncs.m4]) # Enable/disable options AX_ARG_DEFAULT_DISABLE([githttp], [Download GIT repositories via HTTP]) @@ -132,6 +133,7 @@ AC_SUBST(libext2fs) AC_CHECK_LIB([gcrypt], [gcry_md_hash_buffer], [libgcrypt="y"], [libgcrypt="n"]) AC_SUBST(libgcrypt) AX_CHECK_PTHREAD +AX_CHECK_PTYFUNCS AC_CHECK_LIB([yajl], [yajl_alloc], [], [AC_MSG_ERROR([Could not find yajl])]) AC_CHECK_LIB([z], [deflateCopy], [], [AC_MSG_ERROR([Could not find zlib])]) diff -r 078c7d4cde1d -r 85bf1c658d98 tools/libxl/Makefile --- a/tools/libxl/Makefile Fri May 11 18:58:57 2012 +0100 +++ b/tools/libxl/Makefile Fri May 11 18:58:57 2012 +0100 @@ -20,7 +20,7 @@ LIBUUID_LIBS += -luuid endif LIBXL_LIBS = -LIBXL_LIBS = $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) $(LDLIBS_libblktapctl) $(UTIL_LIBS) $(LIBUUID_LIBS) +LIBXL_LIBS = $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) $(LDLIBS_libblktapctl) $(PTYFUNCS_LIBS) $(LIBUUID_LIBS) CFLAGS += $(PTHREAD_CFLAGS) LDFLAGS += $(PTHREAD_LDFLAGS) diff -r 078c7d4cde1d -r 85bf1c658d98 tools/libxl/libxl_bootloader.c --- a/tools/libxl/libxl_bootloader.c Fri May 11 18:58:57 2012 +0100 +++ b/tools/libxl/libxl_bootloader.c Fri May 11 18:58:57 2012 +0100 @@ -16,6 +16,10 @@ #include +#ifdef INCLUDE_LIBUTIL_H +#include INCLUDE_LIBUTIL_H +#endif + #include "libxl_internal.h" #define XENCONSOLED_BUF_SIZE 16 diff -r 078c7d4cde1d -r 85bf1c658d98 tools/m4/ptyfuncs.m4 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/m4/ptyfuncs.m4 Fri May 11 18:58:57 2012 +0100 @@ -0,0 +1,28 @@ +AC_DEFUN([AX_CHECK_PTYFUNCS], [ + AC_CHECK_HEADER([libutil.h],[ + AC_DEFINE([INCLUDE_LIBUTIL_H],[],[libutil header file name]) + ]) + AC_CACHE_CHECK([for openpty et al], [ax_cv_ptyfuncs_libs], [ + for ax_cv_ptyfuncs_libs in -lutil "" NOT_FOUND; do + if test "x$ax_cv_ptyfuncs_libs" = "xNOT_FOUND"; then + AC_MSG_FAILURE([Unable to find library for openpty and login_tty]) + fi + AX_SAVEVAR_SAVE(LIBS) + LIBS="$LIBS $ax_cv_ptyfuncs_libs" + AC_LINK_IFELSE([ +#ifdef INCLUDE_LIBUTIL_H +#include INCLUDE_LIBUTIL_H +#endif +int main(void) { + openpty(0,0,0,0,0); + login_tty(0); +} +],[ + break + ],[]) + AX_SAVEVAR_RESTORE(LIBS) + done + ]) + PTYFUNCS_LIBS="$ax_cv_ptyfuncs_libs" + AC_SUBST(PTYFUNCS_LIBS) +]) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:49 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCW-0004nW-Va; Mon, 14 May 2012 16:32:48 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCO-0004Qk-1e for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:40 +0000 Received: from [85.158.138.51:33601] by server-4.bemta-3.messagelabs.com id BC/BA-15341-5A331BF4; Mon, 14 May 2012 16:32:37 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-174.messagelabs.com!1337013155!23011910!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18898 invoked from network); 14 May 2012 16:32:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCI-0002uX-TD for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCI-0006mz-Rx for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:34 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:34 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] autoconf: New test for openpty et al. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1336759137 -3600 # Node ID 85bf1c658d98ade6caa0eefa30172c732fc47b40 # Parent 078c7d4cde1d4593446e70ffc999845a571cd691 autoconf: New test for openpty et al. We may need to #include , and/or link with -lutil, to use openpty, login_tty, and the like. Provide INCLUDE_LIBUTIL_H (preprocessor constant, not always defined) and PTYFUNCS_LIBS (makefile variable). We link libxl against PTYFUNCS_LIBS (which comes from autoconf) rather than UTIL_LIBS, and #include where appropriate. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Changes since v7: * Actually include the call to AX_CHECK_PTYFUNCS in this patch, not the previous one, and regenerate configure accordingly. Changes since v6: * Put failure macro call in correct place so it might actually happen. * Try both with -lutil and without. * Patch now contains update for config.h.in. Committed-by: Ian Jackson --- diff -r 078c7d4cde1d -r 85bf1c658d98 config/Tools.mk.in --- a/config/Tools.mk.in Fri May 11 18:58:57 2012 +0100 +++ b/config/Tools.mk.in Fri May 11 18:58:57 2012 +0100 @@ -30,6 +30,8 @@ PTHREAD_CFLAGS := @PTHREAD_CFLAGS@ PTHREAD_LDFLAGS := @PTHREAD_LDFLAGS@ PTHREAD_LIBS := @PTHREAD_LIBS@ +PTYFUNCS_LIBS := @PTYFUNCS_LIBS@ + # Download GIT repositories via HTTP or GIT's own protocol? # GIT's protocol is faster and more robust, when it works at all (firewalls # may block it). We make it the default, but if your GIT repository downloads diff -r 078c7d4cde1d -r 85bf1c658d98 tools/config.h.in --- a/tools/config.h.in Fri May 11 18:58:57 2012 +0100 +++ b/tools/config.h.in Fri May 11 18:58:57 2012 +0100 @@ -42,6 +42,9 @@ /* Define curses header to use */ #undef INCLUDE_CURSES_H +/* libutil header file name */ +#undef INCLUDE_LIBUTIL_H + /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT diff -r 078c7d4cde1d -r 85bf1c658d98 tools/configure --- a/tools/configure Fri May 11 18:58:57 2012 +0100 +++ b/tools/configure Fri May 11 18:58:57 2012 +0100 @@ -598,6 +598,7 @@ ac_includes_default="\ ac_subst_vars='LTLIBOBJS LIBOBJS libiconv +PTYFUNCS_LIBS PTHREAD_LIBS PTHREAD_LDFLAGS PTHREAD_CFLAGS @@ -2308,6 +2309,8 @@ fi + + # Enable/disable options # Check whether --enable-githttp was given. @@ -6443,6 +6446,64 @@ fi + + ac_fn_c_check_header_mongrel "$LINENO" "libutil.h" "ac_cv_header_libutil_h" "$ac_includes_default" +if test "x$ac_cv_header_libutil_h" = x""yes; then : + + +$as_echo "#define INCLUDE_LIBUTIL_H " >>confdefs.h + + +fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openpty et al" >&5 +$as_echo_n "checking for openpty et al... " >&6; } +if test "${ax_cv_ptyfuncs_libs+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + + for ax_cv_ptyfuncs_libs in -lutil "" NOT_FOUND; do + if test "x$ax_cv_ptyfuncs_libs" = "xNOT_FOUND"; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "Unable to find library for openpty and login_tty +See \`config.log' for more details" "$LINENO" 5 ; } + fi + + saved_LIBS="$LIBS" + + LIBS="$LIBS $ax_cv_ptyfuncs_libs" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#ifdef INCLUDE_LIBUTIL_H +#include INCLUDE_LIBUTIL_H +#endif +int main(void) { + openpty(0,0,0,0,0); + login_tty(0); +} + +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + + break + +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + + LIBS="$saved_LIBS" + + done + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_ptyfuncs_libs" >&5 +$as_echo "$ax_cv_ptyfuncs_libs" >&6; } + PTYFUNCS_LIBS="$ax_cv_ptyfuncs_libs" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for yajl_alloc in -lyajl" >&5 $as_echo_n "checking for yajl_alloc in -lyajl... " >&6; } if test "${ac_cv_lib_yajl_yajl_alloc+set}" = set; then : diff -r 078c7d4cde1d -r 85bf1c658d98 tools/configure.ac --- a/tools/configure.ac Fri May 11 18:58:57 2012 +0100 +++ b/tools/configure.ac Fri May 11 18:58:57 2012 +0100 @@ -32,6 +32,7 @@ m4_include([m4/uuid.m4]) m4_include([m4/pkg.m4]) m4_include([m4/curses.m4]) m4_include([m4/pthread.m4]) +m4_include([m4/ptyfuncs.m4]) # Enable/disable options AX_ARG_DEFAULT_DISABLE([githttp], [Download GIT repositories via HTTP]) @@ -132,6 +133,7 @@ AC_SUBST(libext2fs) AC_CHECK_LIB([gcrypt], [gcry_md_hash_buffer], [libgcrypt="y"], [libgcrypt="n"]) AC_SUBST(libgcrypt) AX_CHECK_PTHREAD +AX_CHECK_PTYFUNCS AC_CHECK_LIB([yajl], [yajl_alloc], [], [AC_MSG_ERROR([Could not find yajl])]) AC_CHECK_LIB([z], [deflateCopy], [], [AC_MSG_ERROR([Could not find zlib])]) diff -r 078c7d4cde1d -r 85bf1c658d98 tools/libxl/Makefile --- a/tools/libxl/Makefile Fri May 11 18:58:57 2012 +0100 +++ b/tools/libxl/Makefile Fri May 11 18:58:57 2012 +0100 @@ -20,7 +20,7 @@ LIBUUID_LIBS += -luuid endif LIBXL_LIBS = -LIBXL_LIBS = $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) $(LDLIBS_libblktapctl) $(UTIL_LIBS) $(LIBUUID_LIBS) +LIBXL_LIBS = $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) $(LDLIBS_libblktapctl) $(PTYFUNCS_LIBS) $(LIBUUID_LIBS) CFLAGS += $(PTHREAD_CFLAGS) LDFLAGS += $(PTHREAD_LDFLAGS) diff -r 078c7d4cde1d -r 85bf1c658d98 tools/libxl/libxl_bootloader.c --- a/tools/libxl/libxl_bootloader.c Fri May 11 18:58:57 2012 +0100 +++ b/tools/libxl/libxl_bootloader.c Fri May 11 18:58:57 2012 +0100 @@ -16,6 +16,10 @@ #include +#ifdef INCLUDE_LIBUTIL_H +#include INCLUDE_LIBUTIL_H +#endif + #include "libxl_internal.h" #define XENCONSOLED_BUF_SIZE 16 diff -r 078c7d4cde1d -r 85bf1c658d98 tools/m4/ptyfuncs.m4 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/m4/ptyfuncs.m4 Fri May 11 18:58:57 2012 +0100 @@ -0,0 +1,28 @@ +AC_DEFUN([AX_CHECK_PTYFUNCS], [ + AC_CHECK_HEADER([libutil.h],[ + AC_DEFINE([INCLUDE_LIBUTIL_H],[],[libutil header file name]) + ]) + AC_CACHE_CHECK([for openpty et al], [ax_cv_ptyfuncs_libs], [ + for ax_cv_ptyfuncs_libs in -lutil "" NOT_FOUND; do + if test "x$ax_cv_ptyfuncs_libs" = "xNOT_FOUND"; then + AC_MSG_FAILURE([Unable to find library for openpty and login_tty]) + fi + AX_SAVEVAR_SAVE(LIBS) + LIBS="$LIBS $ax_cv_ptyfuncs_libs" + AC_LINK_IFELSE([ +#ifdef INCLUDE_LIBUTIL_H +#include INCLUDE_LIBUTIL_H +#endif +int main(void) { + openpty(0,0,0,0,0); + login_tty(0); +} +],[ + break + ],[]) + AX_SAVEVAR_RESTORE(LIBS) + done + ]) + PTYFUNCS_LIBS="$ax_cv_ptyfuncs_libs" + AC_SUBST(PTYFUNCS_LIBS) +]) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:50 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCY-0004om-4D; Mon, 14 May 2012 16:32:50 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCP-0004ZO-65 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:41 +0000 Received: from [85.158.139.83:31398] by server-11.bemta-5.messagelabs.com id 3B/41-12959-8A331BF4; Mon, 14 May 2012 16:32:40 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-182.messagelabs.com!1337013156!24388145!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27269 invoked from network); 14 May 2012 16:32:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCJ-0002ug-UT for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCJ-0006nT-TT for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:35 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:35 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: Introduce libxl__sendmsg_fds and libxl__recvmsg_fds X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1336759138 -3600 # Node ID 8655160877d21874a97c16d061f84b2812caa2b0 # Parent 0856b8d4d80acccf4cf453815a1cb2737d2b9903 libxl: Introduce libxl__sendmsg_fds and libxl__recvmsg_fds Provide functions for sending and receiving fds. There used to be fd-sending functionality in libxl_qmp.c before 25298:84ae90427c54, which this implementation is partially derived from. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 0856b8d4d80a -r 8655160877d2 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri May 11 18:58:58 2012 +0100 +++ b/tools/libxl/libxl_internal.h Fri May 11 18:58:58 2012 +0100 @@ -1135,6 +1135,17 @@ _hidden void libxl__qmp_cleanup(libxl__g _hidden int libxl__qmp_initializations(libxl__gc *gc, uint32_t domid, const libxl_domain_config *guest_config); +/* on failure, logs */ +int libxl__sendmsg_fds(libxl__gc *gc, int carrier, + const void *data, size_t datalen, + int nfds, const int fds[], const char *what); + +/* Insists on receiving exactly nfds and datalen. On failure, logs + * and leaves *fds untouched. */ +int libxl__recvmsg_fds(libxl__gc *gc, int carrier, + void *databuf, size_t datalen, + int nfds, int fds[], const char *what); + /* from libxl_json */ #include diff -r 0856b8d4d80a -r 8655160877d2 tools/libxl/libxl_utils.c --- a/tools/libxl/libxl_utils.c Fri May 11 18:58:58 2012 +0100 +++ b/tools/libxl/libxl_utils.c Fri May 11 18:58:58 2012 +0100 @@ -579,6 +579,110 @@ void libxl_cputopology_list_free(libxl_c free(list); } +int libxl__sendmsg_fds(libxl__gc *gc, int carrier, + const void *data, size_t datalen, + int nfds, const int fds[], const char *what) { + struct msghdr msg = { 0 }; + struct cmsghdr *cmsg; + size_t spaceneeded = nfds * sizeof(fds[0]); + char control[CMSG_SPACE(spaceneeded)]; + struct iovec iov; + int r; + + iov.iov_base = (void*)data; + iov.iov_len = datalen; + + /* compose the message */ + msg.msg_iov = &iov; + msg.msg_iovlen = 1; + msg.msg_control = control; + msg.msg_controllen = sizeof(control); + + /* attach open fd */ + cmsg = CMSG_FIRSTHDR(&msg); + cmsg->cmsg_level = SOL_SOCKET; + cmsg->cmsg_type = SCM_RIGHTS; + cmsg->cmsg_len = CMSG_LEN(spaceneeded); + memcpy(CMSG_DATA(cmsg), fds, spaceneeded); + + msg.msg_controllen = cmsg->cmsg_len; + + r = sendmsg(carrier, &msg, 0); + if (r < 0) { + LOGE(ERROR, "failed to send fd-carrying message (%s)", what); + return ERROR_FAIL; + } + + return 0; +} + +int libxl__recvmsg_fds(libxl__gc *gc, int carrier, + void *databuf, size_t datalen, + int nfds, int fds[], const char *what) +{ + struct msghdr msg = { 0 }; + struct cmsghdr *cmsg; + size_t spaceneeded = nfds * sizeof(fds[0]); + char control[CMSG_SPACE(spaceneeded)]; + struct iovec iov; + int r; + + iov.iov_base = databuf; + iov.iov_len = datalen; + + msg.msg_iov = &iov; + msg.msg_iovlen = 1; + msg.msg_control = control; + msg.msg_controllen = sizeof(control); + + for (;;) { + r = recvmsg(carrier, &msg, 0); + if (r < 0) { + if (errno == EINTR) continue; + if (errno == EWOULDBLOCK) return -1; + LOGE(ERROR,"recvmsg failed (%s)", what); + return ERROR_FAIL; + } + if (r == 0) { + LOG(ERROR,"recvmsg got EOF (%s)", what); + return ERROR_FAIL; + } + cmsg = CMSG_FIRSTHDR(&msg); + if (cmsg->cmsg_len <= CMSG_LEN(0)) { + LOG(ERROR,"recvmsg got no control msg" + " when expecting fds (%s)", what); + return ERROR_FAIL; + } + if (cmsg->cmsg_level != SOL_SOCKET || cmsg->cmsg_type != SCM_RIGHTS) { + LOG(ERROR, "recvmsg got unexpected" + " cmsg_level %d (!=%d) or _type %d (!=%d) (%s)", + cmsg->cmsg_level, SOL_SOCKET, + cmsg->cmsg_type, SCM_RIGHTS, + what); + return ERROR_FAIL; + } + if (cmsg->cmsg_len != CMSG_LEN(spaceneeded) || + msg.msg_controllen != cmsg->cmsg_len) { + LOG(ERROR, "recvmsg got unexpected" + " number of fds or extra control data" + " (%ld bytes' worth, expected %ld) (%s)", + (long)CMSG_LEN(spaceneeded), (long)cmsg->cmsg_len, + what); + int i, fd; + unsigned char *p; + for (i=0, p=CMSG_DATA(cmsg); + CMSG_SPACE(i * sizeof(fds[0])); + i++, i+=sizeof(fd)) { + memcpy(&fd, p, sizeof(fd)); + close(fd); + } + return ERROR_FAIL; + } + memcpy(fds, CMSG_DATA(cmsg), spaceneeded); + return 0; + } +} + void libxl_dominfo_list_free(libxl_dominfo *list, int nr) { int i; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:50 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCY-0004om-4D; Mon, 14 May 2012 16:32:50 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCP-0004ZO-65 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:41 +0000 Received: from [85.158.139.83:31398] by server-11.bemta-5.messagelabs.com id 3B/41-12959-8A331BF4; Mon, 14 May 2012 16:32:40 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-182.messagelabs.com!1337013156!24388145!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27269 invoked from network); 14 May 2012 16:32:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCJ-0002ug-UT for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCJ-0006nT-TT for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:35 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:35 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: Introduce libxl__sendmsg_fds and libxl__recvmsg_fds X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1336759138 -3600 # Node ID 8655160877d21874a97c16d061f84b2812caa2b0 # Parent 0856b8d4d80acccf4cf453815a1cb2737d2b9903 libxl: Introduce libxl__sendmsg_fds and libxl__recvmsg_fds Provide functions for sending and receiving fds. There used to be fd-sending functionality in libxl_qmp.c before 25298:84ae90427c54, which this implementation is partially derived from. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 0856b8d4d80a -r 8655160877d2 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri May 11 18:58:58 2012 +0100 +++ b/tools/libxl/libxl_internal.h Fri May 11 18:58:58 2012 +0100 @@ -1135,6 +1135,17 @@ _hidden void libxl__qmp_cleanup(libxl__g _hidden int libxl__qmp_initializations(libxl__gc *gc, uint32_t domid, const libxl_domain_config *guest_config); +/* on failure, logs */ +int libxl__sendmsg_fds(libxl__gc *gc, int carrier, + const void *data, size_t datalen, + int nfds, const int fds[], const char *what); + +/* Insists on receiving exactly nfds and datalen. On failure, logs + * and leaves *fds untouched. */ +int libxl__recvmsg_fds(libxl__gc *gc, int carrier, + void *databuf, size_t datalen, + int nfds, int fds[], const char *what); + /* from libxl_json */ #include diff -r 0856b8d4d80a -r 8655160877d2 tools/libxl/libxl_utils.c --- a/tools/libxl/libxl_utils.c Fri May 11 18:58:58 2012 +0100 +++ b/tools/libxl/libxl_utils.c Fri May 11 18:58:58 2012 +0100 @@ -579,6 +579,110 @@ void libxl_cputopology_list_free(libxl_c free(list); } +int libxl__sendmsg_fds(libxl__gc *gc, int carrier, + const void *data, size_t datalen, + int nfds, const int fds[], const char *what) { + struct msghdr msg = { 0 }; + struct cmsghdr *cmsg; + size_t spaceneeded = nfds * sizeof(fds[0]); + char control[CMSG_SPACE(spaceneeded)]; + struct iovec iov; + int r; + + iov.iov_base = (void*)data; + iov.iov_len = datalen; + + /* compose the message */ + msg.msg_iov = &iov; + msg.msg_iovlen = 1; + msg.msg_control = control; + msg.msg_controllen = sizeof(control); + + /* attach open fd */ + cmsg = CMSG_FIRSTHDR(&msg); + cmsg->cmsg_level = SOL_SOCKET; + cmsg->cmsg_type = SCM_RIGHTS; + cmsg->cmsg_len = CMSG_LEN(spaceneeded); + memcpy(CMSG_DATA(cmsg), fds, spaceneeded); + + msg.msg_controllen = cmsg->cmsg_len; + + r = sendmsg(carrier, &msg, 0); + if (r < 0) { + LOGE(ERROR, "failed to send fd-carrying message (%s)", what); + return ERROR_FAIL; + } + + return 0; +} + +int libxl__recvmsg_fds(libxl__gc *gc, int carrier, + void *databuf, size_t datalen, + int nfds, int fds[], const char *what) +{ + struct msghdr msg = { 0 }; + struct cmsghdr *cmsg; + size_t spaceneeded = nfds * sizeof(fds[0]); + char control[CMSG_SPACE(spaceneeded)]; + struct iovec iov; + int r; + + iov.iov_base = databuf; + iov.iov_len = datalen; + + msg.msg_iov = &iov; + msg.msg_iovlen = 1; + msg.msg_control = control; + msg.msg_controllen = sizeof(control); + + for (;;) { + r = recvmsg(carrier, &msg, 0); + if (r < 0) { + if (errno == EINTR) continue; + if (errno == EWOULDBLOCK) return -1; + LOGE(ERROR,"recvmsg failed (%s)", what); + return ERROR_FAIL; + } + if (r == 0) { + LOG(ERROR,"recvmsg got EOF (%s)", what); + return ERROR_FAIL; + } + cmsg = CMSG_FIRSTHDR(&msg); + if (cmsg->cmsg_len <= CMSG_LEN(0)) { + LOG(ERROR,"recvmsg got no control msg" + " when expecting fds (%s)", what); + return ERROR_FAIL; + } + if (cmsg->cmsg_level != SOL_SOCKET || cmsg->cmsg_type != SCM_RIGHTS) { + LOG(ERROR, "recvmsg got unexpected" + " cmsg_level %d (!=%d) or _type %d (!=%d) (%s)", + cmsg->cmsg_level, SOL_SOCKET, + cmsg->cmsg_type, SCM_RIGHTS, + what); + return ERROR_FAIL; + } + if (cmsg->cmsg_len != CMSG_LEN(spaceneeded) || + msg.msg_controllen != cmsg->cmsg_len) { + LOG(ERROR, "recvmsg got unexpected" + " number of fds or extra control data" + " (%ld bytes' worth, expected %ld) (%s)", + (long)CMSG_LEN(spaceneeded), (long)cmsg->cmsg_len, + what); + int i, fd; + unsigned char *p; + for (i=0, p=CMSG_DATA(cmsg); + CMSG_SPACE(i * sizeof(fds[0])); + i++, i+=sizeof(fd)) { + memcpy(&fd, p, sizeof(fd)); + close(fd); + } + return ERROR_FAIL; + } + memcpy(fds, CMSG_DATA(cmsg), spaceneeded); + return 0; + } +} + void libxl_dominfo_list_free(libxl_dominfo *list, int nr) { int i; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:52 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCZ-0004r5-US; Mon, 14 May 2012 16:32:51 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCO-0004Yk-Se for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:41 +0000 Received: from [193.109.254.147:14015] by server-6.bemta-14.messagelabs.com id 62/4A-04960-8A331BF4; Mon, 14 May 2012 16:32:40 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-27.messagelabs.com!1337013157!2364104!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4370 invoked from network); 14 May 2012 16:32:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCL-0002us-Fo for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCL-0006oC-F5 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:37 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:36 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: provide libxl__openpty_* X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1336759139 -3600 # Node ID bdfb4beb57fe8c8c6c571204ed4eb11530525b78 # Parent 65716de1674822ff28651b7badf9ce19e010604b libxl: provide libxl__openpty_* General facility for ao operations to open ptys. This will be used by the bootloader machinery. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 65716de16748 -r bdfb4beb57fe tools/libxl/libxl_aoutils.c --- a/tools/libxl/libxl_aoutils.c Fri May 11 18:58:59 2012 +0100 +++ b/tools/libxl/libxl_aoutils.c Fri May 11 18:58:59 2012 +0100 @@ -187,3 +187,130 @@ int libxl__datacopier_start(libxl__datac return rc; } +/*----- openpty -----*/ + +/* implementation */ + +static void openpty_cleanup(libxl__openpty_state *op) +{ + int i; + + for (i=0; icount; i++) { + libxl__openpty_result *res = &op->results[i]; + libxl__carefd_close(res->master); res->master = 0; + libxl__carefd_close(res->slave); res->slave = 0; + } +} + +static void openpty_exited(libxl__egc *egc, libxl__ev_child *child, + pid_t pid, int status) { + libxl__openpty_state *op = CONTAINER_OF(child, *op, child); + STATE_AO_GC(op->ao); + + if (status) { + /* Perhaps the child gave us the fds and then exited nonzero. + * Well that would be odd but we don't really care. */ + libxl_report_child_exitstatus(CTX, op->rc ? LIBXL__LOG_ERROR + : LIBXL__LOG_WARNING, + "openpty child", pid, status); + } + if (op->rc) + openpty_cleanup(op); + op->callback(egc, op); +} + +int libxl__openptys(libxl__openpty_state *op, + const struct termios *termp, + const struct winsize *winp) { + /* + * This is completely crazy. openpty calls grantpt which the spec + * says may fork, and may not be called with a SIGCHLD handler. + * Now our application may have a SIGCHLD handler so that's bad. + * We could perhaps block it but we'd need to block it on all + * threads. This is just Too Hard. + * + * So instead, we run openpty in a child process. That child + * process then of course has only our own thread and our own + * signal handlers. We pass the fds back. + * + * Since our only current caller actually wants two ptys, we + * support calling openpty multiple times for a single fork. + */ + STATE_AO_GC(op->ao); + int count = op->count; + int r, i, rc, sockets[2], ptyfds[count][2]; + libxl__carefd *for_child = 0; + pid_t pid = -1; + + for (i=0; iresults[i]; + assert(!res->master); + assert(!res->slave); + } + sockets[0] = sockets[1] = -1; /* 0 is for us, 1 for our child */ + + libxl__carefd_begin(); + r = socketpair(AF_UNIX, SOCK_STREAM, 0, sockets); + if (r) { sockets[0] = sockets[1] = -1; } + for_child = libxl__carefd_opened(CTX, sockets[1]); + if (r) { LOGE(ERROR,"socketpair failed"); rc = ERROR_FAIL; goto out; } + + pid = libxl__ev_child_fork(gc, &op->child, openpty_exited); + if (pid == -1) { + rc = ERROR_FAIL; + goto out; + } + + if (!pid) { + /* child */ + close(sockets[0]); + signal(SIGCHLD, SIG_DFL); + + for (i=0; iresults[i]; + res->master = libxl__carefd_record(CTX, ptyfds[i][0]); + res->slave = libxl__carefd_record(CTX, ptyfds[i][1]); + } + } + /* now the pty fds are in the carefds, if they were ever open */ + libxl__carefd_unlock(); + if (rc) + goto out; + + rc = 0; + + out: + if (sockets[0] >= 0) close(sockets[0]); + libxl__carefd_close(for_child); + if (libxl__ev_child_inuse(&op->child)) { + op->rc = rc; + /* we will get a callback when the child dies */ + return 0; + } + + assert(rc); + openpty_cleanup(op); + return rc; +} + diff -r 65716de16748 -r bdfb4beb57fe tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri May 11 18:58:59 2012 +0100 +++ b/tools/libxl/libxl_internal.h Fri May 11 18:58:59 2012 +0100 @@ -1513,6 +1513,42 @@ _hidden void libxl__datacopier_kill(libx _hidden int libxl__datacopier_start(libxl__datacopier_state *dc); +/*----- openpty -----*/ + +/* + * opens count (>0) ptys like count calls to openpty, and then + * calls back. On entry, all op[].master and op[].slave must be + * 0. On callback, either rc==0 and master and slave are non-0, + * or rc is a libxl error and they are both 0. If libxl__openpty + * returns non-0 no callback will happen and everything is left + * cleaned up. + */ + +typedef struct libxl__openpty_state libxl__openpty_state; +typedef struct libxl__openpty_result libxl__openpty_result; +typedef void libxl__openpty_callback(libxl__egc *egc, libxl__openpty_state *op); + +struct libxl__openpty_state { + /* caller must fill these in, and they must all remain valid */ + libxl__ao *ao; + libxl__openpty_callback *callback; + int count; + libxl__openpty_result *results; /* actual size is count, out parameter */ + /* public, result, caller may only read in callback */ + int rc; + /* private for implementation */ + libxl__ev_child child; +}; + +struct libxl__openpty_result { + libxl__carefd *master, *slave; +}; + +int libxl__openptys(libxl__openpty_state *op, + const struct termios *termp, + const struct winsize *winp); + + /* * Convenience macros. */ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:52 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCZ-0004r5-US; Mon, 14 May 2012 16:32:51 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCO-0004Yk-Se for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:41 +0000 Received: from [193.109.254.147:14015] by server-6.bemta-14.messagelabs.com id 62/4A-04960-8A331BF4; Mon, 14 May 2012 16:32:40 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-27.messagelabs.com!1337013157!2364104!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4370 invoked from network); 14 May 2012 16:32:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCL-0002us-Fo for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCL-0006oC-F5 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:37 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:36 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: provide libxl__openpty_* X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1336759139 -3600 # Node ID bdfb4beb57fe8c8c6c571204ed4eb11530525b78 # Parent 65716de1674822ff28651b7badf9ce19e010604b libxl: provide libxl__openpty_* General facility for ao operations to open ptys. This will be used by the bootloader machinery. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 65716de16748 -r bdfb4beb57fe tools/libxl/libxl_aoutils.c --- a/tools/libxl/libxl_aoutils.c Fri May 11 18:58:59 2012 +0100 +++ b/tools/libxl/libxl_aoutils.c Fri May 11 18:58:59 2012 +0100 @@ -187,3 +187,130 @@ int libxl__datacopier_start(libxl__datac return rc; } +/*----- openpty -----*/ + +/* implementation */ + +static void openpty_cleanup(libxl__openpty_state *op) +{ + int i; + + for (i=0; icount; i++) { + libxl__openpty_result *res = &op->results[i]; + libxl__carefd_close(res->master); res->master = 0; + libxl__carefd_close(res->slave); res->slave = 0; + } +} + +static void openpty_exited(libxl__egc *egc, libxl__ev_child *child, + pid_t pid, int status) { + libxl__openpty_state *op = CONTAINER_OF(child, *op, child); + STATE_AO_GC(op->ao); + + if (status) { + /* Perhaps the child gave us the fds and then exited nonzero. + * Well that would be odd but we don't really care. */ + libxl_report_child_exitstatus(CTX, op->rc ? LIBXL__LOG_ERROR + : LIBXL__LOG_WARNING, + "openpty child", pid, status); + } + if (op->rc) + openpty_cleanup(op); + op->callback(egc, op); +} + +int libxl__openptys(libxl__openpty_state *op, + const struct termios *termp, + const struct winsize *winp) { + /* + * This is completely crazy. openpty calls grantpt which the spec + * says may fork, and may not be called with a SIGCHLD handler. + * Now our application may have a SIGCHLD handler so that's bad. + * We could perhaps block it but we'd need to block it on all + * threads. This is just Too Hard. + * + * So instead, we run openpty in a child process. That child + * process then of course has only our own thread and our own + * signal handlers. We pass the fds back. + * + * Since our only current caller actually wants two ptys, we + * support calling openpty multiple times for a single fork. + */ + STATE_AO_GC(op->ao); + int count = op->count; + int r, i, rc, sockets[2], ptyfds[count][2]; + libxl__carefd *for_child = 0; + pid_t pid = -1; + + for (i=0; iresults[i]; + assert(!res->master); + assert(!res->slave); + } + sockets[0] = sockets[1] = -1; /* 0 is for us, 1 for our child */ + + libxl__carefd_begin(); + r = socketpair(AF_UNIX, SOCK_STREAM, 0, sockets); + if (r) { sockets[0] = sockets[1] = -1; } + for_child = libxl__carefd_opened(CTX, sockets[1]); + if (r) { LOGE(ERROR,"socketpair failed"); rc = ERROR_FAIL; goto out; } + + pid = libxl__ev_child_fork(gc, &op->child, openpty_exited); + if (pid == -1) { + rc = ERROR_FAIL; + goto out; + } + + if (!pid) { + /* child */ + close(sockets[0]); + signal(SIGCHLD, SIG_DFL); + + for (i=0; iresults[i]; + res->master = libxl__carefd_record(CTX, ptyfds[i][0]); + res->slave = libxl__carefd_record(CTX, ptyfds[i][1]); + } + } + /* now the pty fds are in the carefds, if they were ever open */ + libxl__carefd_unlock(); + if (rc) + goto out; + + rc = 0; + + out: + if (sockets[0] >= 0) close(sockets[0]); + libxl__carefd_close(for_child); + if (libxl__ev_child_inuse(&op->child)) { + op->rc = rc; + /* we will get a callback when the child dies */ + return 0; + } + + assert(rc); + openpty_cleanup(op); + return rc; +} + diff -r 65716de16748 -r bdfb4beb57fe tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri May 11 18:58:59 2012 +0100 +++ b/tools/libxl/libxl_internal.h Fri May 11 18:58:59 2012 +0100 @@ -1513,6 +1513,42 @@ _hidden void libxl__datacopier_kill(libx _hidden int libxl__datacopier_start(libxl__datacopier_state *dc); +/*----- openpty -----*/ + +/* + * opens count (>0) ptys like count calls to openpty, and then + * calls back. On entry, all op[].master and op[].slave must be + * 0. On callback, either rc==0 and master and slave are non-0, + * or rc is a libxl error and they are both 0. If libxl__openpty + * returns non-0 no callback will happen and everything is left + * cleaned up. + */ + +typedef struct libxl__openpty_state libxl__openpty_state; +typedef struct libxl__openpty_result libxl__openpty_result; +typedef void libxl__openpty_callback(libxl__egc *egc, libxl__openpty_state *op); + +struct libxl__openpty_state { + /* caller must fill these in, and they must all remain valid */ + libxl__ao *ao; + libxl__openpty_callback *callback; + int count; + libxl__openpty_result *results; /* actual size is count, out parameter */ + /* public, result, caller may only read in callback */ + int rc; + /* private for implementation */ + libxl__ev_child child; +}; + +struct libxl__openpty_result { + libxl__carefd *master, *slave; +}; + +int libxl__openptys(libxl__openpty_state *op, + const struct termios *termp, + const struct winsize *winp); + + /* * Convenience macros. */ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:53 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCb-0004ss-0o; Mon, 14 May 2012 16:32:53 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCQ-0004cf-HH for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:42 +0000 Received: from [193.109.254.147:55730] by server-12.bemta-14.messagelabs.com id 6C/E0-05898-9A331BF4; Mon, 14 May 2012 16:32:41 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-11.tower-27.messagelabs.com!1337013140!2376355!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24048 invoked from network); 14 May 2012 16:32:22 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC4-0002s5-Bz for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyC4-0006g9-BN for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:20 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:19 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] Remove bool return code from evtchn_set_pending() and callers. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Keir Fraser # Date 1336647513 -3600 # Node ID 3a71173d20e1249856ef4bf6a12e638e100e90f5 # Parent 27d63b9f111abc7c61a213e8d714f6df81d11f73 Remove bool return code from evtchn_set_pending() and callers. Signed-off-by: Keir Fraser --- diff -r 27d63b9f111a -r 3a71173d20e1 xen/arch/x86/hvm/vmsi.c --- a/xen/arch/x86/hvm/vmsi.c Thu May 10 11:22:18 2012 +0100 +++ b/xen/arch/x86/hvm/vmsi.c Thu May 10 11:58:33 2012 +0100 @@ -111,7 +111,7 @@ int vmsi_deliver( return 1; } -int vmsi_deliver_pirq(struct domain *d, const struct hvm_pirq_dpci *pirq_dpci) +void vmsi_deliver_pirq(struct domain *d, const struct hvm_pirq_dpci *pirq_dpci) { uint32_t flags = pirq_dpci->gmsi.gflags; int vector = pirq_dpci->gmsi.gvec; @@ -129,7 +129,6 @@ int vmsi_deliver_pirq(struct domain *d, ASSERT(pirq_dpci->flags & HVM_IRQ_DPCI_GUEST_MSI); vmsi_deliver(d, vector, dest, dest_mode, delivery_mode, trig_mode); - return 1; } /* Return value, -1 : multi-dests, non-negative value: dest_vcpu_id */ diff -r 27d63b9f111a -r 3a71173d20e1 xen/common/event_channel.c --- a/xen/common/event_channel.c Thu May 10 11:22:18 2012 +0100 +++ b/xen/common/event_channel.c Thu May 10 11:58:33 2012 +0100 @@ -94,7 +94,7 @@ static uint8_t get_xen_consumer(xen_even /* Get the notification function for a given Xen-bound event channel. */ #define xen_notification_fn(e) (xen_consumers[(e)->xen_consumer-1]) -static int evtchn_set_pending(struct vcpu *v, int port); +static void evtchn_set_pending(struct vcpu *v, int port); static int virq_is_global(uint32_t virq) { @@ -594,9 +594,7 @@ int evtchn_send(struct domain *d, unsign if ( consumer_is_xen(rchn) ) (*xen_notification_fn(rchn))(rvcpu, rport); else - { evtchn_set_pending(rvcpu, rport); - } break; case ECS_IPI: evtchn_set_pending(ld->vcpu[lchn->notify_vcpu_id], lport); @@ -614,7 +612,7 @@ out: return ret; } -static int evtchn_set_pending(struct vcpu *v, int port) +static void evtchn_set_pending(struct vcpu *v, int port) { struct domain *d = v->domain; int vcpuid; @@ -627,7 +625,7 @@ static int evtchn_set_pending(struct vcp */ if ( test_and_set_bit(port, &shared_info(d, evtchn_pending)) ) - return 1; + return; if ( !test_bit (port, &shared_info(d, evtchn_mask)) && !test_and_set_bit(port / BITS_PER_EVTCHN_WORD(d), @@ -638,7 +636,7 @@ static int evtchn_set_pending(struct vcp /* Check if some VCPU might be polling for this event. */ if ( likely(bitmap_empty(d->poll_mask, d->max_vcpus)) ) - return 0; + return; /* Wake any interested (or potentially interested) pollers. */ for ( vcpuid = find_first_bit(d->poll_mask, d->max_vcpus); @@ -653,8 +651,6 @@ static int evtchn_set_pending(struct vcp vcpu_unblock(v); } } - - return 0; } int guest_enabled_event(struct vcpu *v, uint32_t virq) @@ -710,7 +706,7 @@ static void send_guest_global_virq(struc spin_unlock_irqrestore(&v->virq_lock, flags); } -int send_guest_pirq(struct domain *d, const struct pirq *pirq) +void send_guest_pirq(struct domain *d, const struct pirq *pirq) { int port; struct evtchn *chn; @@ -724,11 +720,11 @@ int send_guest_pirq(struct domain *d, co if ( pirq == NULL || (port = pirq->evtchn) == 0 ) { BUG_ON(!is_hvm_domain(d)); - return 0; + return; } chn = evtchn_from_port(d, port); - return evtchn_set_pending(d->vcpu[chn->notify_vcpu_id], port); + evtchn_set_pending(d->vcpu[chn->notify_vcpu_id], port); } static struct domain *global_virq_handlers[NR_VIRQS] __read_mostly; diff -r 27d63b9f111a -r 3a71173d20e1 xen/drivers/passthrough/io.c --- a/xen/drivers/passthrough/io.c Thu May 10 11:22:18 2012 +0100 +++ b/xen/drivers/passthrough/io.c Thu May 10 11:58:33 2012 +0100 @@ -469,14 +469,15 @@ void hvm_dpci_msi_eoi(struct domain *d, spin_unlock(&d->event_lock); } -static int hvm_pci_msi_assert(struct domain *d, - struct hvm_pirq_dpci *pirq_dpci) +static void hvm_pci_msi_assert( + struct domain *d, struct hvm_pirq_dpci *pirq_dpci) { struct pirq *pirq = dpci_pirq(pirq_dpci); - return (hvm_domain_use_pirq(d, pirq) - ? send_guest_pirq(d, pirq) - : vmsi_deliver_pirq(d, pirq_dpci)); + if ( hvm_domain_use_pirq(d, pirq) ) + send_guest_pirq(d, pirq); + else + vmsi_deliver_pirq(d, pirq_dpci); } static int _hvm_dirq_assist(struct domain *d, struct hvm_pirq_dpci *pirq_dpci, diff -r 27d63b9f111a -r 3a71173d20e1 xen/include/asm-x86/hvm/hvm.h --- a/xen/include/asm-x86/hvm/hvm.h Thu May 10 11:22:18 2012 +0100 +++ b/xen/include/asm-x86/hvm/hvm.h Thu May 10 11:58:33 2012 +0100 @@ -219,7 +219,7 @@ int vmsi_deliver( uint8_t dest, uint8_t dest_mode, uint8_t delivery_mode, uint8_t trig_mode); struct hvm_pirq_dpci; -int vmsi_deliver_pirq(struct domain *d, const struct hvm_pirq_dpci *); +void vmsi_deliver_pirq(struct domain *d, const struct hvm_pirq_dpci *); int hvm_girq_dest_2_vcpu_id(struct domain *d, uint8_t dest, uint8_t dest_mode); #define hvm_paging_enabled(v) \ diff -r 27d63b9f111a -r 3a71173d20e1 xen/include/xen/event.h --- a/xen/include/xen/event.h Thu May 10 11:22:18 2012 +0100 +++ b/xen/include/xen/event.h Thu May 10 11:58:33 2012 +0100 @@ -39,9 +39,8 @@ int set_global_virq_handler(struct domai * send_guest_pirq: * @d: Domain to which physical IRQ should be sent * @pirq: Physical IRQ number - * Returns TRUE if the delivery port was already pending. */ -int send_guest_pirq(struct domain *, const struct pirq *); +void send_guest_pirq(struct domain *, const struct pirq *); /* Send a notification from a given domain's event-channel port. */ int evtchn_send(struct domain *d, unsigned int lport); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:53 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCb-0004ss-0o; Mon, 14 May 2012 16:32:53 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCQ-0004cf-HH for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:42 +0000 Received: from [193.109.254.147:55730] by server-12.bemta-14.messagelabs.com id 6C/E0-05898-9A331BF4; Mon, 14 May 2012 16:32:41 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-11.tower-27.messagelabs.com!1337013140!2376355!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24048 invoked from network); 14 May 2012 16:32:22 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyC4-0002s5-Bz for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyC4-0006g9-BN for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:20 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:19 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] Remove bool return code from evtchn_set_pending() and callers. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Keir Fraser # Date 1336647513 -3600 # Node ID 3a71173d20e1249856ef4bf6a12e638e100e90f5 # Parent 27d63b9f111abc7c61a213e8d714f6df81d11f73 Remove bool return code from evtchn_set_pending() and callers. Signed-off-by: Keir Fraser --- diff -r 27d63b9f111a -r 3a71173d20e1 xen/arch/x86/hvm/vmsi.c --- a/xen/arch/x86/hvm/vmsi.c Thu May 10 11:22:18 2012 +0100 +++ b/xen/arch/x86/hvm/vmsi.c Thu May 10 11:58:33 2012 +0100 @@ -111,7 +111,7 @@ int vmsi_deliver( return 1; } -int vmsi_deliver_pirq(struct domain *d, const struct hvm_pirq_dpci *pirq_dpci) +void vmsi_deliver_pirq(struct domain *d, const struct hvm_pirq_dpci *pirq_dpci) { uint32_t flags = pirq_dpci->gmsi.gflags; int vector = pirq_dpci->gmsi.gvec; @@ -129,7 +129,6 @@ int vmsi_deliver_pirq(struct domain *d, ASSERT(pirq_dpci->flags & HVM_IRQ_DPCI_GUEST_MSI); vmsi_deliver(d, vector, dest, dest_mode, delivery_mode, trig_mode); - return 1; } /* Return value, -1 : multi-dests, non-negative value: dest_vcpu_id */ diff -r 27d63b9f111a -r 3a71173d20e1 xen/common/event_channel.c --- a/xen/common/event_channel.c Thu May 10 11:22:18 2012 +0100 +++ b/xen/common/event_channel.c Thu May 10 11:58:33 2012 +0100 @@ -94,7 +94,7 @@ static uint8_t get_xen_consumer(xen_even /* Get the notification function for a given Xen-bound event channel. */ #define xen_notification_fn(e) (xen_consumers[(e)->xen_consumer-1]) -static int evtchn_set_pending(struct vcpu *v, int port); +static void evtchn_set_pending(struct vcpu *v, int port); static int virq_is_global(uint32_t virq) { @@ -594,9 +594,7 @@ int evtchn_send(struct domain *d, unsign if ( consumer_is_xen(rchn) ) (*xen_notification_fn(rchn))(rvcpu, rport); else - { evtchn_set_pending(rvcpu, rport); - } break; case ECS_IPI: evtchn_set_pending(ld->vcpu[lchn->notify_vcpu_id], lport); @@ -614,7 +612,7 @@ out: return ret; } -static int evtchn_set_pending(struct vcpu *v, int port) +static void evtchn_set_pending(struct vcpu *v, int port) { struct domain *d = v->domain; int vcpuid; @@ -627,7 +625,7 @@ static int evtchn_set_pending(struct vcp */ if ( test_and_set_bit(port, &shared_info(d, evtchn_pending)) ) - return 1; + return; if ( !test_bit (port, &shared_info(d, evtchn_mask)) && !test_and_set_bit(port / BITS_PER_EVTCHN_WORD(d), @@ -638,7 +636,7 @@ static int evtchn_set_pending(struct vcp /* Check if some VCPU might be polling for this event. */ if ( likely(bitmap_empty(d->poll_mask, d->max_vcpus)) ) - return 0; + return; /* Wake any interested (or potentially interested) pollers. */ for ( vcpuid = find_first_bit(d->poll_mask, d->max_vcpus); @@ -653,8 +651,6 @@ static int evtchn_set_pending(struct vcp vcpu_unblock(v); } } - - return 0; } int guest_enabled_event(struct vcpu *v, uint32_t virq) @@ -710,7 +706,7 @@ static void send_guest_global_virq(struc spin_unlock_irqrestore(&v->virq_lock, flags); } -int send_guest_pirq(struct domain *d, const struct pirq *pirq) +void send_guest_pirq(struct domain *d, const struct pirq *pirq) { int port; struct evtchn *chn; @@ -724,11 +720,11 @@ int send_guest_pirq(struct domain *d, co if ( pirq == NULL || (port = pirq->evtchn) == 0 ) { BUG_ON(!is_hvm_domain(d)); - return 0; + return; } chn = evtchn_from_port(d, port); - return evtchn_set_pending(d->vcpu[chn->notify_vcpu_id], port); + evtchn_set_pending(d->vcpu[chn->notify_vcpu_id], port); } static struct domain *global_virq_handlers[NR_VIRQS] __read_mostly; diff -r 27d63b9f111a -r 3a71173d20e1 xen/drivers/passthrough/io.c --- a/xen/drivers/passthrough/io.c Thu May 10 11:22:18 2012 +0100 +++ b/xen/drivers/passthrough/io.c Thu May 10 11:58:33 2012 +0100 @@ -469,14 +469,15 @@ void hvm_dpci_msi_eoi(struct domain *d, spin_unlock(&d->event_lock); } -static int hvm_pci_msi_assert(struct domain *d, - struct hvm_pirq_dpci *pirq_dpci) +static void hvm_pci_msi_assert( + struct domain *d, struct hvm_pirq_dpci *pirq_dpci) { struct pirq *pirq = dpci_pirq(pirq_dpci); - return (hvm_domain_use_pirq(d, pirq) - ? send_guest_pirq(d, pirq) - : vmsi_deliver_pirq(d, pirq_dpci)); + if ( hvm_domain_use_pirq(d, pirq) ) + send_guest_pirq(d, pirq); + else + vmsi_deliver_pirq(d, pirq_dpci); } static int _hvm_dirq_assist(struct domain *d, struct hvm_pirq_dpci *pirq_dpci, diff -r 27d63b9f111a -r 3a71173d20e1 xen/include/asm-x86/hvm/hvm.h --- a/xen/include/asm-x86/hvm/hvm.h Thu May 10 11:22:18 2012 +0100 +++ b/xen/include/asm-x86/hvm/hvm.h Thu May 10 11:58:33 2012 +0100 @@ -219,7 +219,7 @@ int vmsi_deliver( uint8_t dest, uint8_t dest_mode, uint8_t delivery_mode, uint8_t trig_mode); struct hvm_pirq_dpci; -int vmsi_deliver_pirq(struct domain *d, const struct hvm_pirq_dpci *); +void vmsi_deliver_pirq(struct domain *d, const struct hvm_pirq_dpci *); int hvm_girq_dest_2_vcpu_id(struct domain *d, uint8_t dest, uint8_t dest_mode); #define hvm_paging_enabled(v) \ diff -r 27d63b9f111a -r 3a71173d20e1 xen/include/xen/event.h --- a/xen/include/xen/event.h Thu May 10 11:22:18 2012 +0100 +++ b/xen/include/xen/event.h Thu May 10 11:58:33 2012 +0100 @@ -39,9 +39,8 @@ int set_global_virq_handler(struct domai * send_guest_pirq: * @d: Domain to which physical IRQ should be sent * @pirq: Physical IRQ number - * Returns TRUE if the delivery port was already pending. */ -int send_guest_pirq(struct domain *, const struct pirq *); +void send_guest_pirq(struct domain *, const struct pirq *); /* Send a notification from a given domain's event-channel port. */ int evtchn_send(struct domain *d, unsigned int lport); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:53 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCb-0004t7-5W; Mon, 14 May 2012 16:32:53 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCR-0004eI-EQ for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:43 +0000 Received: from [85.158.139.83:31405] by server-6.bemta-5.messagelabs.com id D3/CD-13222-AA331BF4; Mon, 14 May 2012 16:32:42 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-182.messagelabs.com!1337013157!28335161!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21228 invoked from network); 14 May 2012 16:32:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCK-0002um-ES for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCK-0006ni-Dh for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:36 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:35 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: Clean up setdefault in do_domain_create X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1336759138 -3600 # Node ID bf91e2bc1b88558fe5a395cb3f94c948a570bfc0 # Parent 8655160877d21874a97c16d061f84b2812caa2b0 libxl: Clean up setdefault in do_domain_create do_domain_create called libxl__domain_create_info_setdefault twice. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 8655160877d2 -r bf91e2bc1b88 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Fri May 11 18:58:58 2012 +0100 +++ b/tools/libxl/libxl_create.c Fri May 11 18:58:58 2012 +0100 @@ -573,9 +573,6 @@ static int do_domain_create(libxl__gc *g ret = libxl__domain_create_info_setdefault(gc, &d_config->c_info); if (ret) goto error_out; - ret = libxl__domain_create_info_setdefault(gc, &d_config->c_info); - if (ret) goto error_out; - ret = libxl__domain_make(gc, &d_config->c_info, &domid); if (ret) { LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "cannot make domain: %d", ret); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:53 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCb-0004t7-5W; Mon, 14 May 2012 16:32:53 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCR-0004eI-EQ for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:43 +0000 Received: from [85.158.139.83:31405] by server-6.bemta-5.messagelabs.com id D3/CD-13222-AA331BF4; Mon, 14 May 2012 16:32:42 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-182.messagelabs.com!1337013157!28335161!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21228 invoked from network); 14 May 2012 16:32:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCK-0002um-ES for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCK-0006ni-Dh for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:36 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:35 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: Clean up setdefault in do_domain_create X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1336759138 -3600 # Node ID bf91e2bc1b88558fe5a395cb3f94c948a570bfc0 # Parent 8655160877d21874a97c16d061f84b2812caa2b0 libxl: Clean up setdefault in do_domain_create do_domain_create called libxl__domain_create_info_setdefault twice. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 8655160877d2 -r bf91e2bc1b88 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Fri May 11 18:58:58 2012 +0100 +++ b/tools/libxl/libxl_create.c Fri May 11 18:58:58 2012 +0100 @@ -573,9 +573,6 @@ static int do_domain_create(libxl__gc *g ret = libxl__domain_create_info_setdefault(gc, &d_config->c_info); if (ret) goto error_out; - ret = libxl__domain_create_info_setdefault(gc, &d_config->c_info); - if (ret) goto error_out; - ret = libxl__domain_make(gc, &d_config->c_info, &domid); if (ret) { LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "cannot make domain: %d", ret); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:54 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCa-0004sL-Jl; Mon, 14 May 2012 16:32:52 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCQ-0004ZO-Di for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:42 +0000 Received: from [85.158.139.83:31575] by server-11.bemta-5.messagelabs.com id C0/61-12959-AA331BF4; Mon, 14 May 2012 16:32:42 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-182.messagelabs.com!1337013159!28258049!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29548 invoked from network); 14 May 2012 16:32:40 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCM-0002v3-Hd for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCM-0006og-Go for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:38 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:38 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: make libxl_create_logfile const-correct X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1336759140 -3600 # Node ID e0bc91c320c94648836f3296f28263a6cf31b24b # Parent ca1df379c8622982eee181596ee1f31049165755 libxl: make libxl_create_logfile const-correct Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r ca1df379c862 -r e0bc91c320c9 tools/libxl/libxl_utils.c --- a/tools/libxl/libxl_utils.c Fri May 11 18:59:00 2012 +0100 +++ b/tools/libxl/libxl_utils.c Fri May 11 18:59:00 2012 +0100 @@ -193,7 +193,7 @@ static int logrename(libxl__gc *gc, cons return 0; } -int libxl_create_logfile(libxl_ctx *ctx, char *name, char **full_name) +int libxl_create_logfile(libxl_ctx *ctx, const char *name, char **full_name) { GC_INIT(ctx); struct stat stat_buf; diff -r ca1df379c862 -r e0bc91c320c9 tools/libxl/libxl_utils.h --- a/tools/libxl/libxl_utils.h Fri May 11 18:59:00 2012 +0100 +++ b/tools/libxl/libxl_utils.h Fri May 11 18:59:00 2012 +0100 @@ -26,7 +26,7 @@ int libxl_name_to_cpupoolid(libxl_ctx *c char *libxl_cpupoolid_to_name(libxl_ctx *ctx, uint32_t poolid); int libxl_get_stubdom_id(libxl_ctx *ctx, int guest_domid); int libxl_is_stubdom(libxl_ctx *ctx, uint32_t domid, uint32_t *target_domid); -int libxl_create_logfile(libxl_ctx *ctx, char *name, char **full_name); +int libxl_create_logfile(libxl_ctx *ctx, const char *name, char **full_name); int libxl_string_to_backend(libxl_ctx *ctx, char *s, libxl_disk_backend *backend); int libxl_read_file_contents(libxl_ctx *ctx, const char *filename, _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:54 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCa-0004s0-Ci; Mon, 14 May 2012 16:32:52 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCQ-0004cp-HH for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:42 +0000 Received: from [193.109.254.147:55723] by server-11.bemta-14.messagelabs.com id 87/9C-05858-9A331BF4; Mon, 14 May 2012 16:32:41 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-11.tower-27.messagelabs.com!1337013131!2376328!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23451 invoked from network); 14 May 2012 16:32:12 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBu-0002qF-Mo for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBu-0006bV-Lw for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:10 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:10 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] rombios: remove sdtint.h dependency X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Roger Pau Monne # Date 1335878437 -3600 # Node ID 98fe3b2a572d4ffe704124e75c7aa8d94dbb51bc # Parent 9dda0efd8ce153049579a364974f50294702ffd2 rombios: remove sdtint.h dependency Hardcode uint8_t, uint16_t and uint32_t typedefs, so we no longer need stdint.h Resolves problem reported by Wang Zhihao on 64bit Ubuntu systems. Signed-off-by: Roger Pau Monne Committed-by: Keir Fraser --- diff -r 9dda0efd8ce1 -r 98fe3b2a572d tools/firmware/rombios/32bit/rombios_compat.h --- a/tools/firmware/rombios/32bit/rombios_compat.h Fri Apr 27 17:57:55 2012 +0200 +++ b/tools/firmware/rombios/32bit/rombios_compat.h Tue May 01 14:20:37 2012 +0100 @@ -5,10 +5,13 @@ * Compatibility functions and structures for transitioning between * 16 bit Bochs BIOS and 32 bit BIOS code. */ -#include #define ADDR_FROM_SEG_OFF(seg, off) (void *)((((uint32_t)(seg)) << 4) + (off)) +typedef unsigned char uint8_t; +typedef unsigned short int uint16_t; +typedef unsigned int uint32_t; + typedef uint8_t Bit8u; typedef uint16_t Bit16u; typedef uint32_t Bit32u; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:54 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCa-0004sL-Jl; Mon, 14 May 2012 16:32:52 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCQ-0004ZO-Di for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:42 +0000 Received: from [85.158.139.83:31575] by server-11.bemta-5.messagelabs.com id C0/61-12959-AA331BF4; Mon, 14 May 2012 16:32:42 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-182.messagelabs.com!1337013159!28258049!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29548 invoked from network); 14 May 2012 16:32:40 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCM-0002v3-Hd for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCM-0006og-Go for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:38 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:38 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: make libxl_create_logfile const-correct X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1336759140 -3600 # Node ID e0bc91c320c94648836f3296f28263a6cf31b24b # Parent ca1df379c8622982eee181596ee1f31049165755 libxl: make libxl_create_logfile const-correct Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r ca1df379c862 -r e0bc91c320c9 tools/libxl/libxl_utils.c --- a/tools/libxl/libxl_utils.c Fri May 11 18:59:00 2012 +0100 +++ b/tools/libxl/libxl_utils.c Fri May 11 18:59:00 2012 +0100 @@ -193,7 +193,7 @@ static int logrename(libxl__gc *gc, cons return 0; } -int libxl_create_logfile(libxl_ctx *ctx, char *name, char **full_name) +int libxl_create_logfile(libxl_ctx *ctx, const char *name, char **full_name) { GC_INIT(ctx); struct stat stat_buf; diff -r ca1df379c862 -r e0bc91c320c9 tools/libxl/libxl_utils.h --- a/tools/libxl/libxl_utils.h Fri May 11 18:59:00 2012 +0100 +++ b/tools/libxl/libxl_utils.h Fri May 11 18:59:00 2012 +0100 @@ -26,7 +26,7 @@ int libxl_name_to_cpupoolid(libxl_ctx *c char *libxl_cpupoolid_to_name(libxl_ctx *ctx, uint32_t poolid); int libxl_get_stubdom_id(libxl_ctx *ctx, int guest_domid); int libxl_is_stubdom(libxl_ctx *ctx, uint32_t domid, uint32_t *target_domid); -int libxl_create_logfile(libxl_ctx *ctx, char *name, char **full_name); +int libxl_create_logfile(libxl_ctx *ctx, const char *name, char **full_name); int libxl_string_to_backend(libxl_ctx *ctx, char *s, libxl_disk_backend *backend); int libxl_read_file_contents(libxl_ctx *ctx, const char *filename, _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:54 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCa-0004s0-Ci; Mon, 14 May 2012 16:32:52 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCQ-0004cp-HH for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:42 +0000 Received: from [193.109.254.147:55723] by server-11.bemta-14.messagelabs.com id 87/9C-05858-9A331BF4; Mon, 14 May 2012 16:32:41 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-11.tower-27.messagelabs.com!1337013131!2376328!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23451 invoked from network); 14 May 2012 16:32:12 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyBu-0002qF-Mo for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyBu-0006bV-Lw for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:10 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:10 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] rombios: remove sdtint.h dependency X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Roger Pau Monne # Date 1335878437 -3600 # Node ID 98fe3b2a572d4ffe704124e75c7aa8d94dbb51bc # Parent 9dda0efd8ce153049579a364974f50294702ffd2 rombios: remove sdtint.h dependency Hardcode uint8_t, uint16_t and uint32_t typedefs, so we no longer need stdint.h Resolves problem reported by Wang Zhihao on 64bit Ubuntu systems. Signed-off-by: Roger Pau Monne Committed-by: Keir Fraser --- diff -r 9dda0efd8ce1 -r 98fe3b2a572d tools/firmware/rombios/32bit/rombios_compat.h --- a/tools/firmware/rombios/32bit/rombios_compat.h Fri Apr 27 17:57:55 2012 +0200 +++ b/tools/firmware/rombios/32bit/rombios_compat.h Tue May 01 14:20:37 2012 +0100 @@ -5,10 +5,13 @@ * Compatibility functions and structures for transitioning between * 16 bit Bochs BIOS and 32 bit BIOS code. */ -#include #define ADDR_FROM_SEG_OFF(seg, off) (void *)((((uint32_t)(seg)) << 4) + (off)) +typedef unsigned char uint8_t; +typedef unsigned short int uint16_t; +typedef unsigned int uint32_t; + typedef uint8_t Bit8u; typedef uint16_t Bit16u; typedef uint32_t Bit32u; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:54 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCc-0004ua-0p; Mon, 14 May 2012 16:32:54 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCR-0004ef-E3 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:43 +0000 Received: from [85.158.143.99:61118] by server-3.bemta-4.messagelabs.com id BB/6B-05853-AA331BF4; Mon, 14 May 2012 16:32:42 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-216.messagelabs.com!1337013160!22700837!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20808 invoked from network); 14 May 2012 16:32:41 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCN-0002vE-JI for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCN-0006pA-IX for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:39 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:39 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: Allow AO_GC and EGC_GC even if not used X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1336759141 -3600 # Node ID d66bee9704548312a2f79f1349b58fb808c61592 # Parent 15e8b3366b67d54bf6717d0b1f6bc8b460eb7be8 libxl: Allow AO_GC and EGC_GC even if not used Mark the gc produced by AO_GC and EGC_GC with the gcc feature __attribute__((unused)). This allows the use of EGC_INIT and STATE_AO_GC by functions which do actually use the gc. This is convenient because those functions might want to use the ao or egc, rather than the gc; and also because it means that functions which morally ought to be fishing any gc they use out of an egc or state structure can be written do so regardless of whether the gc is actually used right then. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 15e8b3366b67 -r d66bee970454 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri May 11 18:59:01 2012 +0100 +++ b/tools/libxl/libxl_internal.h Fri May 11 18:59:01 2012 +0100 @@ -1287,7 +1287,7 @@ libxl__device_model_version_running(libx /* useful for all functions which take an egc: */ #define EGC_GC \ - libxl__gc *const gc = &egc->gc + libxl__gc *const gc __attribute__((unused)) = &egc->gc /* egc initialisation and destruction: */ @@ -1390,7 +1390,7 @@ _hidden void libxl__egc_cleanup(libxl__e }) #define AO_GC \ - libxl__gc *const gc = &ao->gc + libxl__gc *const gc __attribute__((unused)) = &ao->gc #define STATE_AO_GC(op_ao) \ libxl__ao *const ao = (op_ao); \ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:54 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCc-0004ua-0p; Mon, 14 May 2012 16:32:54 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCR-0004ef-E3 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:43 +0000 Received: from [85.158.143.99:61118] by server-3.bemta-4.messagelabs.com id BB/6B-05853-AA331BF4; Mon, 14 May 2012 16:32:42 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-216.messagelabs.com!1337013160!22700837!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20808 invoked from network); 14 May 2012 16:32:41 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCN-0002vE-JI for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCN-0006pA-IX for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:39 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:39 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: Allow AO_GC and EGC_GC even if not used X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1336759141 -3600 # Node ID d66bee9704548312a2f79f1349b58fb808c61592 # Parent 15e8b3366b67d54bf6717d0b1f6bc8b460eb7be8 libxl: Allow AO_GC and EGC_GC even if not used Mark the gc produced by AO_GC and EGC_GC with the gcc feature __attribute__((unused)). This allows the use of EGC_INIT and STATE_AO_GC by functions which do actually use the gc. This is convenient because those functions might want to use the ao or egc, rather than the gc; and also because it means that functions which morally ought to be fishing any gc they use out of an egc or state structure can be written do so regardless of whether the gc is actually used right then. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 15e8b3366b67 -r d66bee970454 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri May 11 18:59:01 2012 +0100 +++ b/tools/libxl/libxl_internal.h Fri May 11 18:59:01 2012 +0100 @@ -1287,7 +1287,7 @@ libxl__device_model_version_running(libx /* useful for all functions which take an egc: */ #define EGC_GC \ - libxl__gc *const gc = &egc->gc + libxl__gc *const gc __attribute__((unused)) = &egc->gc /* egc initialisation and destruction: */ @@ -1390,7 +1390,7 @@ _hidden void libxl__egc_cleanup(libxl__e }) #define AO_GC \ - libxl__gc *const gc = &ao->gc + libxl__gc *const gc __attribute__((unused)) = &ao->gc #define STATE_AO_GC(op_ao) \ libxl__ao *const ao = (op_ao); \ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:54 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCc-0004vc-Mw; Mon, 14 May 2012 16:32:54 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCR-0004eW-ET for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:43 +0000 Received: from [85.158.138.51:38015] by server-11.bemta-3.messagelabs.com id 66/C9-18894-AA331BF4; Mon, 14 May 2012 16:32:42 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-174.messagelabs.com!1337013160!19024967!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6101 invoked from network); 14 May 2012 16:32:41 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCO-0002vQ-Li for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCO-0006pe-Kz for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:40 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:40 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: remove ctx->waitpid_instead X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1336759142 -3600 # Node ID 635eb1d6d43376c1897711ac6b7c012f453cca62 # Parent 0d642524dcabb76489aeb5105f8fe0aafcbd8d04 libxl: remove ctx->waitpid_instead Remove this obsolete hook. Callers inside libxl which create and reap children should use the mechanisms provided by the event system. (This has no functional difference since there is no way for ctx->waitpid_instead ever to become set.) Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 0d642524dcab -r 635eb1d6d433 tools/libxl/libxl_exec.c --- a/tools/libxl/libxl_exec.c Fri May 11 18:59:02 2012 +0100 +++ b/tools/libxl/libxl_exec.c Fri May 11 18:59:02 2012 +0100 @@ -19,11 +19,6 @@ #include "libxl_internal.h" -static int call_waitpid(pid_t (*waitpid_cb)(pid_t, int *, int), pid_t pid, int *status, int options) -{ - return (waitpid_cb) ? waitpid_cb(pid, status, options) : waitpid(pid, status, options); -} - static void check_open_fds(const char *what) { const char *env_debug; @@ -344,7 +339,7 @@ int libxl__spawn_spawn(libxl__gc *gc, if (!for_spawn) _exit(0); /* just detach then */ - got = call_waitpid(ctx->waitpid_instead, child, &status, 0); + got = waitpid(child, &status, 0); assert(got == child); rc = (WIFEXITED(status) ? WEXITSTATUS(status) : @@ -404,7 +399,7 @@ int libxl__spawn_detach(libxl__gc *gc, (unsigned long)for_spawn->intermediate); abort(); /* things are very wrong */ } - got = call_waitpid(ctx->waitpid_instead, for_spawn->intermediate, &status, 0); + got = waitpid(for_spawn->intermediate, &status, 0); assert(got == for_spawn->intermediate); if (!(WIFSIGNALED(status) && WTERMSIG(status) == SIGKILL)) { report_spawn_intermediate_status(gc, for_spawn, status); @@ -421,14 +416,13 @@ int libxl__spawn_detach(libxl__gc *gc, int libxl__spawn_check(libxl__gc *gc, libxl__spawn_starting *for_spawn) { - libxl_ctx *ctx = libxl__gc_owner(gc); pid_t got; int status; if (!for_spawn) return 0; assert(for_spawn->intermediate); - got = call_waitpid(ctx->waitpid_instead, for_spawn->intermediate, &status, WNOHANG); + got = waitpid(for_spawn->intermediate, &status, WNOHANG); if (!got) return 0; assert(got == for_spawn->intermediate); diff -r 0d642524dcab -r 635eb1d6d433 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri May 11 18:59:02 2012 +0100 +++ b/tools/libxl/libxl_internal.h Fri May 11 18:59:02 2012 +0100 @@ -325,9 +325,6 @@ struct libxl__ctx { int sigchld_selfpipe[2]; /* [0]==-1 means handler not installed */ LIBXL_LIST_HEAD(, libxl__ev_child) children; - /* This is obsolete and must be removed: */ - int (*waitpid_instead)(pid_t pid, int *status, int flags); - libxl_version_info version_info; }; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:32:54 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:32:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCc-0004vc-Mw; Mon, 14 May 2012 16:32:54 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCR-0004eW-ET for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:43 +0000 Received: from [85.158.138.51:38015] by server-11.bemta-3.messagelabs.com id 66/C9-18894-AA331BF4; Mon, 14 May 2012 16:32:42 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-174.messagelabs.com!1337013160!19024967!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6101 invoked from network); 14 May 2012 16:32:41 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCO-0002vQ-Li for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCO-0006pe-Kz for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:40 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:40 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: remove ctx->waitpid_instead X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1336759142 -3600 # Node ID 635eb1d6d43376c1897711ac6b7c012f453cca62 # Parent 0d642524dcabb76489aeb5105f8fe0aafcbd8d04 libxl: remove ctx->waitpid_instead Remove this obsolete hook. Callers inside libxl which create and reap children should use the mechanisms provided by the event system. (This has no functional difference since there is no way for ctx->waitpid_instead ever to become set.) Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 0d642524dcab -r 635eb1d6d433 tools/libxl/libxl_exec.c --- a/tools/libxl/libxl_exec.c Fri May 11 18:59:02 2012 +0100 +++ b/tools/libxl/libxl_exec.c Fri May 11 18:59:02 2012 +0100 @@ -19,11 +19,6 @@ #include "libxl_internal.h" -static int call_waitpid(pid_t (*waitpid_cb)(pid_t, int *, int), pid_t pid, int *status, int options) -{ - return (waitpid_cb) ? waitpid_cb(pid, status, options) : waitpid(pid, status, options); -} - static void check_open_fds(const char *what) { const char *env_debug; @@ -344,7 +339,7 @@ int libxl__spawn_spawn(libxl__gc *gc, if (!for_spawn) _exit(0); /* just detach then */ - got = call_waitpid(ctx->waitpid_instead, child, &status, 0); + got = waitpid(child, &status, 0); assert(got == child); rc = (WIFEXITED(status) ? WEXITSTATUS(status) : @@ -404,7 +399,7 @@ int libxl__spawn_detach(libxl__gc *gc, (unsigned long)for_spawn->intermediate); abort(); /* things are very wrong */ } - got = call_waitpid(ctx->waitpid_instead, for_spawn->intermediate, &status, 0); + got = waitpid(for_spawn->intermediate, &status, 0); assert(got == for_spawn->intermediate); if (!(WIFSIGNALED(status) && WTERMSIG(status) == SIGKILL)) { report_spawn_intermediate_status(gc, for_spawn, status); @@ -421,14 +416,13 @@ int libxl__spawn_detach(libxl__gc *gc, int libxl__spawn_check(libxl__gc *gc, libxl__spawn_starting *for_spawn) { - libxl_ctx *ctx = libxl__gc_owner(gc); pid_t got; int status; if (!for_spawn) return 0; assert(for_spawn->intermediate); - got = call_waitpid(ctx->waitpid_instead, for_spawn->intermediate, &status, WNOHANG); + got = waitpid(for_spawn->intermediate, &status, WNOHANG); if (!got) return 0; assert(got == for_spawn->intermediate); diff -r 0d642524dcab -r 635eb1d6d433 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri May 11 18:59:02 2012 +0100 +++ b/tools/libxl/libxl_internal.h Fri May 11 18:59:02 2012 +0100 @@ -325,9 +325,6 @@ struct libxl__ctx { int sigchld_selfpipe[2]; /* [0]==-1 means handler not installed */ LIBXL_LIST_HEAD(, libxl__ev_child) children; - /* This is obsolete and must be removed: */ - int (*waitpid_instead)(pid_t pid, int *status, int flags); - libxl_version_info version_info; }; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:33:02 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:33:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCk-0004ya-8c; Mon, 14 May 2012 16:33:02 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCR-0004eY-E4 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:44 +0000 Received: from [85.158.143.99:61105] by server-1.bemta-4.messagelabs.com id 1F/29-20925-AA331BF4; Mon, 14 May 2012 16:32:42 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-216.messagelabs.com!1337013154!18324724!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17827 invoked from network); 14 May 2012 16:32:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCI-0002uR-B1 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCI-0006mk-9d for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:34 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:33 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] autoconf: trim the configure script; use autoheader X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3226337522166469128==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============3226337522166469128== Content-Type: text/plain # HG changeset patch # User Ian Jackson # Date 1336759137 -3600 # Node ID 078c7d4cde1d4593446e70ffc999845a571cd691 # Parent e3371fc765b1b9bb63af122ea3d42a6901702e18 autoconf: trim the configure script; use autoheader Remove a lot of unnecessary tests. Specifically, we no longer test for standard POSIX facilities which we expect to be provided everywhere and which we don't in any case have any alternative for. Switch to generating config.h.in with autoheader. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Cc: Roger Pau Monne Changes since v7: * Removed AX_CHECK_PTYFUNCS (snuck in from previous patch) Committed-by: Ian Jackson --- diff -r e3371fc765b1 -r 078c7d4cde1d autogen.sh --- a/autogen.sh Fri May 11 18:58:56 2012 +0100 +++ b/autogen.sh Fri May 11 18:58:57 2012 +0100 @@ -1,3 +1,4 @@ #!/bin/sh -e cd tools autoconf +autoheader diff -r e3371fc765b1 -r 078c7d4cde1d tools/config.h.in --- a/tools/config.h.in Fri May 11 18:58:56 2012 +0100 +++ b/tools/config.h.in Fri May 11 18:58:57 2012 +0100 @@ -1,19 +1,64 @@ -/* - * Copyright (C) 2012 - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; version 2.1 only. with the special - * exception on linking described in file LICENSE. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - */ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if you have the header file. */ +#undef HAVE_INTTYPES_H + +/* Define to 1 if you have the `crypto' library (-lcrypto). */ +#undef HAVE_LIBCRYPTO + +/* Define to 1 if you have the `yajl' library (-lyajl). */ +#undef HAVE_LIBYAJL + +/* Define to 1 if you have the `z' library (-lz). */ +#undef HAVE_LIBZ + +/* Define to 1 if you have the header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_UNISTD_H /* Define to 1 if you have the header file. */ #undef HAVE_YAJL_YAJL_VERSION_H -/* Define curses header to include. */ +/* Define curses header to use */ #undef INCLUDE_CURSES_H + +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT + +/* Define to the full name of this package. */ +#undef PACKAGE_NAME + +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME + +/* Define to the home page for this package. */ +#undef PACKAGE_URL + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION + +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS diff -r e3371fc765b1 -r 078c7d4cde1d tools/configure --- a/tools/configure Fri May 11 18:58:56 2012 +0100 +++ b/tools/configure Fri May 11 18:58:57 2012 +0100 @@ -595,12 +595,8 @@ ac_includes_default="\ # include #endif" -ac_header_list= -ac_func_list= ac_subst_vars='LTLIBOBJS -POW_LIB LIBOBJS -ALLOCA libiconv PTHREAD_LIBS PTHREAD_LDFLAGS @@ -616,6 +612,9 @@ PKG_CONFIG_LIBDIR PKG_CONFIG_PATH PKG_CONFIG CURSES_LIBS +EGREP +GREP +CPP pyconfig PYTHONPATH OCAMLBUILD @@ -635,8 +634,13 @@ INSTALL_DATA INSTALL_SCRIPT INSTALL_PROGRAM SET_MAKE -LN_S -SED +OBJEXT +EXEEXT +ac_ct_CC +CPPFLAGS +LDFLAGS +CFLAGS +CC IASL BCC LD86 @@ -665,24 +669,6 @@ xenapi vtpm monitors githttp -host_os -host_vendor -host_cpu -host -build_os -build_vendor -build_cpu -build -EGREP -GREP -CPP -OBJEXT -EXEEXT -ac_ct_CC -CPPFLAGS -LDFLAGS -CFLAGS -CC target_alias host_alias build_alias @@ -740,12 +726,6 @@ enable_debug ac_precious_vars='build_alias host_alias target_alias -CC -CFLAGS -LDFLAGS -LIBS -CPPFLAGS -CPP PREPEND_INCLUDES PREPEND_LIB APPEND_INCLUDES @@ -762,6 +742,12 @@ AS86 LD86 BCC IASL +CC +CFLAGS +LDFLAGS +LIBS +CPPFLAGS +CPP PKG_CONFIG PKG_CONFIG_PATH PKG_CONFIG_LIBDIR @@ -1365,10 +1351,6 @@ Fine tuning of the installation director _ACEOF cat <<\_ACEOF - -System types: - --build=BUILD configure for building on BUILD [guessed] - --host=HOST cross-compile to build programs to run on HOST [BUILD] _ACEOF fi @@ -1399,14 +1381,6 @@ Optional Features: --disable-debug Disable debug build of tools (default is ENABLED) Some influential environment variables: - CC C compiler command - CFLAGS C compiler flags - LDFLAGS linker flags, e.g. -L if you have libraries in a - nonstandard directory - LIBS libraries to pass to the linker, e.g. -l - CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if - you have headers in a nonstandard directory - CPP C preprocessor PREPEND_INCLUDES List of include folders to prepend to CFLAGS (without -I) PREPEND_LIB List of library folders to prepend to LDFLAGS (without -L) @@ -1425,6 +1399,14 @@ Some influential environment variables: LD86 Path to ld86 tool BCC Path to bcc tool IASL Path to iasl tool + CC C compiler command + CFLAGS C compiler flags + LDFLAGS linker flags, e.g. -L if you have libraries in a + nonstandard directory + LIBS libraries to pass to the linker, e.g. -l + CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if + you have headers in a nonstandard directory + CPP C preprocessor PKG_CONFIG path to pkg-config utility PKG_CONFIG_PATH directories to add to pkg-config's search path @@ -1797,311 +1779,6 @@ fi as_fn_set_status $ac_retval } # ac_fn_c_try_link - -# ac_fn_c_check_func LINENO FUNC VAR -# ---------------------------------- -# Tests whether FUNC exists, setting the cache variable VAR accordingly -ac_fn_c_check_func () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -/* Define $2 to an innocuous variant, in case declares $2. - For example, HP-UX 11i declares gettimeofday. */ -#define $2 innocuous_$2 - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $2 (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $2 - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $2 (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$2 || defined __stub___$2 -choke me -#endif - -int -main () -{ -return $2 (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - eval "$3=yes" -else - eval "$3=no" -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - -} # ac_fn_c_check_func - -# ac_fn_c_check_type LINENO TYPE VAR INCLUDES -# ------------------------------------------- -# Tests whether TYPE exists after having included INCLUDES, setting cache -# variable VAR accordingly. -ac_fn_c_check_type () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : - $as_echo_n "(cached) " >&6 -else - eval "$3=no" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -int -main () -{ -if (sizeof ($2)) - return 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -int -main () -{ -if (sizeof (($2))) - return 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - -else - eval "$3=yes" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - -} # ac_fn_c_check_type - -# ac_fn_c_find_intX_t LINENO BITS VAR -# ----------------------------------- -# Finds a signed integer type with width BITS, setting cache variable VAR -# accordingly. -ac_fn_c_find_intX_t () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for int$2_t" >&5 -$as_echo_n "checking for int$2_t... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : - $as_echo_n "(cached) " >&6 -else - eval "$3=no" - # Order is important - never check a type that is potentially smaller - # than half of the expected target width. - for ac_type in int$2_t 'int' 'long int' \ - 'long long int' 'short int' 'signed char'; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_includes_default - enum { N = $2 / 2 - 1 }; -int -main () -{ -static int test_array [1 - 2 * !(0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1))]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_includes_default - enum { N = $2 / 2 - 1 }; -int -main () -{ -static int test_array [1 - 2 * !(($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1) - < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 2))]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - -else - case $ac_type in #( - int$2_t) : - eval "$3=yes" ;; #( - *) : - eval "$3=\$ac_type" ;; -esac -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - if eval test \"x\$"$3"\" = x"no"; then : - -else - break -fi - done -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - -} # ac_fn_c_find_intX_t - -# ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES -# ---------------------------------------------------- -# Tries to find if the field MEMBER exists in type AGGR, after including -# INCLUDES, setting cache variable VAR accordingly. -ac_fn_c_check_member () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5 -$as_echo_n "checking for $2.$3... " >&6; } -if eval "test \"\${$4+set}\"" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$5 -int -main () -{ -static $2 ac_aggr; -if (ac_aggr.$3) -return 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - eval "$4=yes" -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$5 -int -main () -{ -static $2 ac_aggr; -if (sizeof ac_aggr.$3) -return 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - eval "$4=yes" -else - eval "$4=no" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -eval ac_res=\$$4 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - -} # ac_fn_c_check_member - -# ac_fn_c_find_uintX_t LINENO BITS VAR -# ------------------------------------ -# Finds an unsigned integer type with width BITS, setting cache variable VAR -# accordingly. -ac_fn_c_find_uintX_t () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uint$2_t" >&5 -$as_echo_n "checking for uint$2_t... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : - $as_echo_n "(cached) " >&6 -else - eval "$3=no" - # Order is important - never check a type that is potentially smaller - # than half of the expected target width. - for ac_type in uint$2_t 'unsigned int' 'unsigned long int' \ - 'unsigned long long int' 'unsigned short int' 'unsigned char'; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -static int test_array [1 - 2 * !((($ac_type) -1 >> ($2 / 2 - 1)) >> ($2 / 2 - 1) == 3)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - case $ac_type in #( - uint$2_t) : - eval "$3=yes" ;; #( - *) : - eval "$3=\$ac_type" ;; -esac -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - if eval test \"x\$"$3"\" = x"no"; then : - -else - break -fi - done -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - -} # ac_fn_c_find_uintX_t cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. @@ -2386,11 +2063,6 @@ else >$cache_file fi -as_fn_append ac_header_list " sys/time.h" -as_fn_append ac_header_list " unistd.h" -as_fn_append ac_func_list " alarm" -as_fn_append ac_header_list " stdlib.h" -as_fn_append ac_header_list " sys/param.h" # Check that the precious variables saved in the cache have kept the same # value. ac_cache_corrupted=false @@ -2508,6 +2180,450 @@ APPEND_INCLUDES and APPEND_LIB instead w fi +# M4 Macro includes + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 1 (pkg-config-0.24) +# +# Copyright © 2004 Scott James Remnant . +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# PKG_PROG_PKG_CONFIG([MIN-VERSION]) +# ---------------------------------- +# PKG_PROG_PKG_CONFIG + +# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# +# Check to see whether a particular set of modules exists. Similar +# to PKG_CHECK_MODULES(), but does not set variables or print errors. +# +# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +# only at the first occurence in configure.ac, so if the first place +# it's called might be skipped (such as if it is within an "if", you +# have to call PKG_CHECK_EXISTS manually +# -------------------------------------------------------------- + + +# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +# --------------------------------------------- +# _PKG_CONFIG + +# _PKG_SHORT_ERRORS_SUPPORTED +# ----------------------------- +# _PKG_SHORT_ERRORS_SUPPORTED + + +# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +# [ACTION-IF-NOT-FOUND]) +# +# +# Note that if there is a possibility the first call to +# PKG_CHECK_MODULES might not happen, you should be sure to include an +# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +# +# +# -------------------------------------------------------------- +# PKG_CHECK_MODULES + + + +# We define, separately, PTHREAD_CFLAGS, _LDFLAGS and _LIBS +# even though currently we don't set them very separately. +# This means that the makefiles will not need to change in +# the future if we make the test more sophisticated. + + + +# We invoke AX_PTHREAD_VARS with the name of another macro +# which is then expanded once for each variable. + + + + + + + + +# Enable/disable options + +# Check whether --enable-githttp was given. +if test "${enable_githttp+set}" = set; then : + enableval=$enable_githttp; +fi + + +if test "x$enable_githttp" = "xno"; then : + + ax_cv_githttp="n" + +elif test "x$enable_githttp" = "xyes"; then : + + ax_cv_githttp="y" + +elif test -z $ax_cv_githttp; then : + + ax_cv_githttp="n" + +fi +githttp=$ax_cv_githttp + + + +# Check whether --enable-monitors was given. +if test "${enable_monitors+set}" = set; then : + enableval=$enable_monitors; +fi + + +if test "x$enable_monitors" = "xno"; then : + + ax_cv_monitors="n" + +elif test "x$enable_monitors" = "xyes"; then : + + ax_cv_monitors="y" + +elif test -z $ax_cv_monitors; then : + + ax_cv_monitors="y" + +fi +monitors=$ax_cv_monitors + + + +# Check whether --enable-vtpm was given. +if test "${enable_vtpm+set}" = set; then : + enableval=$enable_vtpm; +fi + + +if test "x$enable_vtpm" = "xno"; then : + + ax_cv_vtpm="n" + +elif test "x$enable_vtpm" = "xyes"; then : + + ax_cv_vtpm="y" + +elif test -z $ax_cv_vtpm; then : + + ax_cv_vtpm="n" + +fi +vtpm=$ax_cv_vtpm + + + +# Check whether --enable-xenapi was given. +if test "${enable_xenapi+set}" = set; then : + enableval=$enable_xenapi; +fi + + +if test "x$enable_xenapi" = "xno"; then : + + ax_cv_xenapi="n" + +elif test "x$enable_xenapi" = "xyes"; then : + + ax_cv_xenapi="y" + +elif test -z $ax_cv_xenapi; then : + + ax_cv_xenapi="n" + +fi +xenapi=$ax_cv_xenapi + + + +# Check whether --enable-pythontools was given. +if test "${enable_pythontools+set}" = set; then : + enableval=$enable_pythontools; +fi + + +if test "x$enable_pythontools" = "xno"; then : + + ax_cv_pythontools="n" + +elif test "x$enable_pythontools" = "xyes"; then : + + ax_cv_pythontools="y" + +elif test -z $ax_cv_pythontools; then : + + ax_cv_pythontools="y" + +fi +pythontools=$ax_cv_pythontools + + + +# Check whether --enable-ocamltools was given. +if test "${enable_ocamltools+set}" = set; then : + enableval=$enable_ocamltools; +fi + + +if test "x$enable_ocamltools" = "xno"; then : + + ax_cv_ocamltools="n" + +elif test "x$enable_ocamltools" = "xyes"; then : + + ax_cv_ocamltools="y" + +elif test -z $ax_cv_ocamltools; then : + + ax_cv_ocamltools="y" + +fi +ocamltools=$ax_cv_ocamltools + + + +# Check whether --enable-miniterm was given. +if test "${enable_miniterm+set}" = set; then : + enableval=$enable_miniterm; +fi + + +if test "x$enable_miniterm" = "xno"; then : + + ax_cv_miniterm="n" + +elif test "x$enable_miniterm" = "xyes"; then : + + ax_cv_miniterm="y" + +elif test -z $ax_cv_miniterm; then : + + ax_cv_miniterm="n" + +fi +miniterm=$ax_cv_miniterm + + + +# Check whether --enable-lomount was given. +if test "${enable_lomount+set}" = set; then : + enableval=$enable_lomount; +fi + + +if test "x$enable_lomount" = "xno"; then : + + ax_cv_lomount="n" + +elif test "x$enable_lomount" = "xyes"; then : + + ax_cv_lomount="y" + +elif test -z $ax_cv_lomount; then : + + ax_cv_lomount="n" + +fi +lomount=$ax_cv_lomount + + + +# Check whether --enable-ovmf was given. +if test "${enable_ovmf+set}" = set; then : + enableval=$enable_ovmf; +fi + + +if test "x$enable_ovmf" = "xno"; then : + + ax_cv_ovmf="n" + +elif test "x$enable_ovmf" = "xyes"; then : + + ax_cv_ovmf="y" + +elif test -z $ax_cv_ovmf; then : + + ax_cv_ovmf="n" + +fi +ovmf=$ax_cv_ovmf + + + +# Check whether --enable-rombios was given. +if test "${enable_rombios+set}" = set; then : + enableval=$enable_rombios; +fi + + +if test "x$enable_rombios" = "xno"; then : + + ax_cv_rombios="n" + +elif test "x$enable_rombios" = "xyes"; then : + + ax_cv_rombios="y" + +elif test -z $ax_cv_rombios; then : + + ax_cv_rombios="y" + +fi +rombios=$ax_cv_rombios + + + +# Check whether --enable-seabios was given. +if test "${enable_seabios+set}" = set; then : + enableval=$enable_seabios; +fi + + +if test "x$enable_seabios" = "xno"; then : + + ax_cv_seabios="n" + +elif test "x$enable_seabios" = "xyes"; then : + + ax_cv_seabios="y" + +elif test -z $ax_cv_seabios; then : + + ax_cv_seabios="y" + +fi +seabios=$ax_cv_seabios + + + +# Check whether --enable-debug was given. +if test "${enable_debug+set}" = set; then : + enableval=$enable_debug; +fi + + +if test "x$enable_debug" = "xno"; then : + + ax_cv_debug="n" + +elif test "x$enable_debug" = "xyes"; then : + + ax_cv_debug="y" + +elif test -z $ax_cv_debug; then : + + ax_cv_debug="y" + +fi +debug=$ax_cv_debug + + + + + + + + +for cflag in $PREPEND_INCLUDES +do + PREPEND_CFLAGS+=" -I$cflag" +done +for ldflag in $PREPEND_LIB +do + PREPEND_LDFLAGS+=" -L$ldflag" +done +for cflag in $APPEND_INCLUDES +do + APPEND_CFLAGS+=" -I$cflag" +done +for ldflag in $APPEND_LIB +do + APPEND_LDFLAGS+=" -L$ldflag" +done +CFLAGS="$PREPEND_CFLAGS $CFLAGS $APPEND_CFLAGS" +LDFLAGS="$PREPEND_LDFLAGS $LDFLAGS $APPEND_LDFLAGS" + + + + + + + + + + + + + + +# Checks for programs. ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -3298,1601 +3414,6 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 -$as_echo_n "checking how to run the C preprocessor... " >&6; } -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= -fi -if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" - do - ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.i conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.i conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - break -fi - - done - ac_cv_prog_CPP=$CPP - -fi - CPP=$ac_cv_prog_CPP -else - ac_cv_prog_CPP=$CPP -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 -$as_echo "$CPP" >&6; } -ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.i conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.i conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5 ; } -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 -$as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if test "${ac_cv_path_GREP+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -z "$GREP"; then - ac_path_GREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue -# Check for GNU ac_path_GREP and select it if it is found. - # Check for GNU $ac_path_GREP -case `"$ac_path_GREP" --version 2>&1` in -*GNU*) - ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo 'GREP' >> "conftest.nl" - "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_GREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_GREP="$ac_path_GREP" - ac_path_GREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_GREP_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_GREP"; then - as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi -else - ac_cv_path_GREP=$GREP -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 -$as_echo "$ac_cv_path_GREP" >&6; } - GREP="$ac_cv_path_GREP" - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 -$as_echo_n "checking for egrep... " >&6; } -if test "${ac_cv_path_EGREP+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 - then ac_cv_path_EGREP="$GREP -E" - else - if test -z "$EGREP"; then - ac_path_EGREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in egrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue -# Check for GNU ac_path_EGREP and select it if it is found. - # Check for GNU $ac_path_EGREP -case `"$ac_path_EGREP" --version 2>&1` in -*GNU*) - ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo 'EGREP' >> "conftest.nl" - "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_EGREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_EGREP="$ac_path_EGREP" - ac_path_EGREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_EGREP_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_EGREP"; then - as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi -else - ac_cv_path_EGREP=$EGREP -fi - - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 -$as_echo "$ac_cv_path_EGREP" >&6; } - EGREP="$ac_cv_path_EGREP" - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 -$as_echo_n "checking for ANSI C header files... " >&6; } -if test "${ac_cv_header_stdc+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include -#include - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_stdc=yes -else - ac_cv_header_stdc=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then : - : -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - -else - ac_cv_header_stdc=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then - -$as_echo "#define STDC_HEADERS 1" >>confdefs.h - -fi - -# On IRIX 5.3, sys/types and inttypes.h are conflicting. -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default -" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - - - ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default" -if test "x$ac_cv_header_minix_config_h" = x""yes; then : - MINIX=yes -else - MINIX= -fi - - - if test "$MINIX" = yes; then - -$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h - - -$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h - - -$as_echo "#define _MINIX 1" >>confdefs.h - - fi - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 -$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; } -if test "${ac_cv_safe_to_define___extensions__+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -# define __EXTENSIONS__ 1 - $ac_includes_default -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_safe_to_define___extensions__=yes -else - ac_cv_safe_to_define___extensions__=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 -$as_echo "$ac_cv_safe_to_define___extensions__" >&6; } - test $ac_cv_safe_to_define___extensions__ = yes && - $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h - - $as_echo "#define _ALL_SOURCE 1" >>confdefs.h - - $as_echo "#define _GNU_SOURCE 1" >>confdefs.h - - $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h - - $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h - - -# Make sure we can run config.sub. -$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 -$as_echo_n "checking build system type... " >&6; } -if test "${ac_cv_build+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_build_alias=$build_alias -test "x$ac_build_alias" = x && - ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` -test "x$ac_build_alias" = x && - as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 -ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 -$as_echo "$ac_cv_build" >&6; } -case $ac_cv_build in -*-*-*) ;; -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; -esac -build=$ac_cv_build -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_build -shift -build_cpu=$1 -build_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -build_os=$* -IFS=$ac_save_IFS -case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 -$as_echo_n "checking host system type... " >&6; } -if test "${ac_cv_host+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test "x$host_alias" = x; then - ac_cv_host=$ac_cv_build -else - ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 -$as_echo "$ac_cv_host" >&6; } -case $ac_cv_host in -*-*-*) ;; -*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; -esac -host=$ac_cv_host -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_host -shift -host_cpu=$1 -host_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -host_os=$* -IFS=$ac_save_IFS -case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac - - - -# M4 Macro includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# serial 1 (pkg-config-0.24) -# -# Copyright © 2004 Scott James Remnant . -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -# ---------------------------------- -# PKG_PROG_PKG_CONFIG - -# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# -# Check to see whether a particular set of modules exists. Similar -# to PKG_CHECK_MODULES(), but does not set variables or print errors. -# -# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -# only at the first occurence in configure.ac, so if the first place -# it's called might be skipped (such as if it is within an "if", you -# have to call PKG_CHECK_EXISTS manually -# -------------------------------------------------------------- - - -# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -# --------------------------------------------- -# _PKG_CONFIG - -# _PKG_SHORT_ERRORS_SUPPORTED -# ----------------------------- -# _PKG_SHORT_ERRORS_SUPPORTED - - -# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -# [ACTION-IF-NOT-FOUND]) -# -# -# Note that if there is a possibility the first call to -# PKG_CHECK_MODULES might not happen, you should be sure to include an -# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac -# -# -# -------------------------------------------------------------- -# PKG_CHECK_MODULES - - - -# We define, separately, PTHREAD_CFLAGS, _LDFLAGS and _LIBS -# even though currently we don't set them very separately. -# This means that the makefiles will not need to change in -# the future if we make the test more sophisticated. - - - -# We invoke AX_PTHREAD_VARS with the name of another macro -# which is then expanded once for each variable. - - - - - - - - -# Enable/disable options - -# Check whether --enable-githttp was given. -if test "${enable_githttp+set}" = set; then : - enableval=$enable_githttp; -fi - - -if test "x$enable_githttp" = "xno"; then : - - ax_cv_githttp="n" - -elif test "x$enable_githttp" = "xyes"; then : - - ax_cv_githttp="y" - -elif test -z $ax_cv_githttp; then : - - ax_cv_githttp="n" - -fi -githttp=$ax_cv_githttp - - - -# Check whether --enable-monitors was given. -if test "${enable_monitors+set}" = set; then : - enableval=$enable_monitors; -fi - - -if test "x$enable_monitors" = "xno"; then : - - ax_cv_monitors="n" - -elif test "x$enable_monitors" = "xyes"; then : - - ax_cv_monitors="y" - -elif test -z $ax_cv_monitors; then : - - ax_cv_monitors="y" - -fi -monitors=$ax_cv_monitors - - - -# Check whether --enable-vtpm was given. -if test "${enable_vtpm+set}" = set; then : - enableval=$enable_vtpm; -fi - - -if test "x$enable_vtpm" = "xno"; then : - - ax_cv_vtpm="n" - -elif test "x$enable_vtpm" = "xyes"; then : - - ax_cv_vtpm="y" - -elif test -z $ax_cv_vtpm; then : - - ax_cv_vtpm="n" - -fi -vtpm=$ax_cv_vtpm - - - -# Check whether --enable-xenapi was given. -if test "${enable_xenapi+set}" = set; then : - enableval=$enable_xenapi; -fi - - -if test "x$enable_xenapi" = "xno"; then : - - ax_cv_xenapi="n" - -elif test "x$enable_xenapi" = "xyes"; then : - - ax_cv_xenapi="y" - -elif test -z $ax_cv_xenapi; then : - - ax_cv_xenapi="n" - -fi -xenapi=$ax_cv_xenapi - - - -# Check whether --enable-pythontools was given. -if test "${enable_pythontools+set}" = set; then : - enableval=$enable_pythontools; -fi - - -if test "x$enable_pythontools" = "xno"; then : - - ax_cv_pythontools="n" - -elif test "x$enable_pythontools" = "xyes"; then : - - ax_cv_pythontools="y" - -elif test -z $ax_cv_pythontools; then : - - ax_cv_pythontools="y" - -fi -pythontools=$ax_cv_pythontools - - - -# Check whether --enable-ocamltools was given. -if test "${enable_ocamltools+set}" = set; then : - enableval=$enable_ocamltools; -fi - - -if test "x$enable_ocamltools" = "xno"; then : - - ax_cv_ocamltools="n" - -elif test "x$enable_ocamltools" = "xyes"; then : - - ax_cv_ocamltools="y" - -elif test -z $ax_cv_ocamltools; then : - - ax_cv_ocamltools="y" - -fi -ocamltools=$ax_cv_ocamltools - - - -# Check whether --enable-miniterm was given. -if test "${enable_miniterm+set}" = set; then : - enableval=$enable_miniterm; -fi - - -if test "x$enable_miniterm" = "xno"; then : - - ax_cv_miniterm="n" - -elif test "x$enable_miniterm" = "xyes"; then : - - ax_cv_miniterm="y" - -elif test -z $ax_cv_miniterm; then : - - ax_cv_miniterm="n" - -fi -miniterm=$ax_cv_miniterm - - - -# Check whether --enable-lomount was given. -if test "${enable_lomount+set}" = set; then : - enableval=$enable_lomount; -fi - - -if test "x$enable_lomount" = "xno"; then : - - ax_cv_lomount="n" - -elif test "x$enable_lomount" = "xyes"; then : - - ax_cv_lomount="y" - -elif test -z $ax_cv_lomount; then : - - ax_cv_lomount="n" - -fi -lomount=$ax_cv_lomount - - - -# Check whether --enable-ovmf was given. -if test "${enable_ovmf+set}" = set; then : - enableval=$enable_ovmf; -fi - - -if test "x$enable_ovmf" = "xno"; then : - - ax_cv_ovmf="n" - -elif test "x$enable_ovmf" = "xyes"; then : - - ax_cv_ovmf="y" - -elif test -z $ax_cv_ovmf; then : - - ax_cv_ovmf="n" - -fi -ovmf=$ax_cv_ovmf - - - -# Check whether --enable-rombios was given. -if test "${enable_rombios+set}" = set; then : - enableval=$enable_rombios; -fi - - -if test "x$enable_rombios" = "xno"; then : - - ax_cv_rombios="n" - -elif test "x$enable_rombios" = "xyes"; then : - - ax_cv_rombios="y" - -elif test -z $ax_cv_rombios; then : - - ax_cv_rombios="y" - -fi -rombios=$ax_cv_rombios - - - -# Check whether --enable-seabios was given. -if test "${enable_seabios+set}" = set; then : - enableval=$enable_seabios; -fi - - -if test "x$enable_seabios" = "xno"; then : - - ax_cv_seabios="n" - -elif test "x$enable_seabios" = "xyes"; then : - - ax_cv_seabios="y" - -elif test -z $ax_cv_seabios; then : - - ax_cv_seabios="y" - -fi -seabios=$ax_cv_seabios - - - -# Check whether --enable-debug was given. -if test "${enable_debug+set}" = set; then : - enableval=$enable_debug; -fi - - -if test "x$enable_debug" = "xno"; then : - - ax_cv_debug="n" - -elif test "x$enable_debug" = "xyes"; then : - - ax_cv_debug="y" - -elif test -z $ax_cv_debug; then : - - ax_cv_debug="y" - -fi -debug=$ax_cv_debug - - - - - - - - -for cflag in $PREPEND_INCLUDES -do - PREPEND_CFLAGS+=" -I$cflag" -done -for ldflag in $PREPEND_LIB -do - PREPEND_LDFLAGS+=" -L$ldflag" -done -for cflag in $APPEND_INCLUDES -do - APPEND_CFLAGS+=" -I$cflag" -done -for ldflag in $APPEND_LIB -do - APPEND_LDFLAGS+=" -L$ldflag" -done -CFLAGS="$PREPEND_CFLAGS $CFLAGS $APPEND_CFLAGS" -LDFLAGS="$PREPEND_LDFLAGS $LDFLAGS $APPEND_LDFLAGS" - - - - - - - - - - - - - - -# Checks for programs. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 -$as_echo_n "checking for a sed that does not truncate output... " >&6; } -if test "${ac_cv_path_SED+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ - for ac_i in 1 2 3 4 5 6 7; do - ac_script="$ac_script$as_nl$ac_script" - done - echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed - { ac_script=; unset ac_script;} - if test -z "$SED"; then - ac_path_SED_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue -# Check for GNU ac_path_SED and select it if it is found. - # Check for GNU $ac_path_SED -case `"$ac_path_SED" --version 2>&1` in -*GNU*) - ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo '' >> "conftest.nl" - "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_SED_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_SED="$ac_path_SED" - ac_path_SED_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_SED_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_SED"; then - as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 - fi -else - ac_cv_path_SED=$SED -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 -$as_echo "$ac_cv_path_SED" >&6; } - SED="$ac_cv_path_SED" - rm -f conftest.sed - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. -set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. -set dummy gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC - fi -else - CC="$ac_cv_prog_CC" -fi - -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - fi -fi -if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - ac_prog_rejected=no -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $ac_cv_prog_CC - shift - if test $# != 0; then - # We chose a different compiler from the bogus one. - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" - fi -fi -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - for ac_prog in cl.exe - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$CC" && break - done -fi -if test -z "$CC"; then - ac_ct_CC=$CC - for ac_prog in cl.exe -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$ac_ct_CC" && break -done - - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC - fi -fi - -fi - - -test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5 ; } - -# Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 -set X $ac_compile -ac_compiler=$2 -for ac_option in --version -v -V -qversion; do - { { ac_try="$ac_compiler $ac_option >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compiler $ac_option >&5") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - sed '10a\ -... rest of stderr output deleted ... - 10q' conftest.err >conftest.er1 - cat conftest.er1 >&5 - fi - rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -done - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 -$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ -#ifndef __GNUC__ - choke me -#endif - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_compiler_gnu=yes -else - ac_compiler_gnu=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_c_compiler_gnu=$ac_compiler_gnu - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 -$as_echo "$ac_cv_c_compiler_gnu" >&6; } -if test $ac_compiler_gnu = yes; then - GCC=yes -else - GCC= -fi -ac_test_CFLAGS=${CFLAGS+set} -ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 -$as_echo_n "checking whether $CC accepts -g... " >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_save_c_werror_flag=$ac_c_werror_flag - ac_c_werror_flag=yes - ac_cv_prog_cc_g=no - CFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_g=yes -else - CFLAGS="" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - -else - ac_c_werror_flag=$ac_save_c_werror_flag - CFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_g=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_c_werror_flag=$ac_save_c_werror_flag -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 -$as_echo "$ac_cv_prog_cc_g" >&6; } -if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS -elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then - CFLAGS="-g -O2" - else - CFLAGS="-g" - fi -else - if test "$GCC" = yes; then - CFLAGS="-O2" - else - CFLAGS= - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 -$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_prog_cc_c89=no -ac_save_CC=$CC -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include -#include -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} - -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; - -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters - inside strings and character constants. */ -#define FOO(x) 'x' -int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; - -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} -_ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ - -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -do - CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_c89=$ac_arg -fi -rm -f core conftest.err conftest.$ac_objext - test "x$ac_cv_prog_cc_c89" != "xno" && break -done -rm -f conftest.$ac_ext -CC=$ac_save_CC - -fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c89" in - x) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; - xno) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -$as_echo "unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 -$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; -esac -if test "x$ac_cv_prog_cc_c89" != xno; then : - -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 -$as_echo_n "checking whether ln -s works... " >&6; } -LN_S=$as_ln_s -if test "$LN_S" = "ln -s"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 -$as_echo "no, using $LN_S" >&6; } -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} @@ -6292,6 +4813,404 @@ if test x"${BASH}" == x"no" then as_fn_error $? "Unable to find bash, please install bash" "$LINENO" 5 fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 +$as_echo_n "checking how to run the C preprocessor... " >&6; } +# On Suns, sometimes $CPP names a directory. +if test -n "$CPP" && test -d "$CPP"; then + CPP= +fi +if test -z "$CPP"; then + if test "${ac_cv_prog_CPP+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + # Double quotes because CPP needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" + do + ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + +else + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue +else + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + break +fi + + done + ac_cv_prog_CPP=$CPP + +fi + CPP=$ac_cv_prog_CPP +else + ac_cv_prog_CPP=$CPP +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +$as_echo "$CPP" >&6; } +ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + +else + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue +else + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + +else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5 ; } +fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 +$as_echo_n "checking for grep that handles long lines and -e... " >&6; } +if test "${ac_cv_path_GREP+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$GREP"; then + ac_path_GREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue +# Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP +case `"$ac_path_GREP" --version 2>&1` in +*GNU*) + ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo 'GREP' >> "conftest.nl" + "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_GREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_GREP="$ac_path_GREP" + ac_path_GREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_GREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_GREP"; then + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi +else + ac_cv_path_GREP=$GREP +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 +$as_echo "$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 +$as_echo_n "checking for egrep... " >&6; } +if test "${ac_cv_path_EGREP+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 + then ac_cv_path_EGREP="$GREP -E" + else + if test -z "$EGREP"; then + ac_path_EGREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue +# Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP +case `"$ac_path_EGREP" --version 2>&1` in +*GNU*) + ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo 'EGREP' >> "conftest.nl" + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_EGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_EGREP="$ac_path_EGREP" + ac_path_EGREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_EGREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_EGREP"; then + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi +else + ac_cv_path_EGREP=$EGREP +fi + + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 +$as_echo "$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 +$as_echo_n "checking for ANSI C header files... " >&6; } +if test "${ac_cv_header_stdc+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#include +#include + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_header_stdc=yes +else + ac_cv_header_stdc=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "memchr" >/dev/null 2>&1; then : + +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "free" >/dev/null 2>&1; then : + +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + if test "$cross_compiling" = yes; then : + : +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif + +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int +main () +{ + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + return 2; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + +else + ac_cv_header_stdc=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 +$as_echo "$ac_cv_header_stdc" >&6; } +if test $ac_cv_header_stdc = yes; then + +$as_echo "#define STDC_HEADERS 1" >>confdefs.h + +fi + +# On IRIX 5.3, sys/types and inttypes.h are conflicting. +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default +" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + if test "x$pythontools" = "xy"; then : if echo "$PYTHON" | grep -q "^/"; then : @@ -7524,51 +6443,6 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5 -$as_echo_n "checking for clock_gettime in -lrt... " >&6; } -if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lrt $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char clock_gettime (); -int -main () -{ -return clock_gettime (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_rt_clock_gettime=yes -else - ac_cv_lib_rt_clock_gettime=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_gettime" >&5 -$as_echo "$ac_cv_lib_rt_clock_gettime" >&6; } -if test "x$ac_cv_lib_rt_clock_gettime" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBRT 1 -_ACEOF - - LIBS="-lrt $LIBS" - -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for yajl_alloc in -lyajl" >&5 $as_echo_n "checking for yajl_alloc in -lyajl... " >&6; } if test "${ac_cv_lib_yajl_yajl_alloc+set}" = set; then : @@ -7708,1875 +6582,16 @@ fi # Checks for header files. -# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works -# for constant arguments. Useless! -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5 -$as_echo_n "checking for working alloca.h... " >&6; } -if test "${ac_cv_working_alloca_h+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -char *p = (char *) alloca (2 * sizeof (int)); - if (p) return 0; - ; - return 0; -} +for ac_header in yajl/yajl_version.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "yajl/yajl_version.h" "ac_cv_header_yajl_yajl_version_h" "$ac_includes_default" +if test "x$ac_cv_header_yajl_yajl_version_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_YAJL_YAJL_VERSION_H 1 _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_working_alloca_h=yes -else - ac_cv_working_alloca_h=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5 -$as_echo "$ac_cv_working_alloca_h" >&6; } -if test $ac_cv_working_alloca_h = yes; then - -$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h - -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5 -$as_echo_n "checking for alloca... " >&6; } -if test "${ac_cv_func_alloca_works+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __GNUC__ -# define alloca __builtin_alloca -#else -# ifdef _MSC_VER -# include -# define alloca _alloca -# else -# ifdef HAVE_ALLOCA_H -# include -# else -# ifdef _AIX - #pragma alloca -# else -# ifndef alloca /* predefined by HP cc +Olibcalls */ -char *alloca (); -# endif -# endif -# endif -# endif -#endif - -int -main () -{ -char *p = (char *) alloca (1); - if (p) return 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_func_alloca_works=yes -else - ac_cv_func_alloca_works=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5 -$as_echo "$ac_cv_func_alloca_works" >&6; } - -if test $ac_cv_func_alloca_works = yes; then - -$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h - -else - # The SVR3 libPW and SVR4 libucb both contain incompatible functions -# that cause trouble. Some versions do not even contain alloca or -# contain a buggy version. If you still want to use their alloca, -# use ar to extract alloca.o from them instead of compiling alloca.c. - -ALLOCA=\${LIBOBJDIR}alloca.$ac_objext - -$as_echo "#define C_ALLOCA 1" >>confdefs.h - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5 -$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; } -if test "${ac_cv_os_cray+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#if defined CRAY && ! defined CRAY2 -webecray -#else -wenotbecray -#endif - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "webecray" >/dev/null 2>&1; then : - ac_cv_os_cray=yes -else - ac_cv_os_cray=no -fi -rm -f conftest* - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5 -$as_echo "$ac_cv_os_cray" >&6; } -if test $ac_cv_os_cray = yes; then - for ac_func in _getb67 GETB67 getb67; do - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - -cat >>confdefs.h <<_ACEOF -#define CRAY_STACKSEG_END $ac_func -_ACEOF - - break -fi - - done -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5 -$as_echo_n "checking stack direction for C alloca... " >&6; } -if test "${ac_cv_c_stack_direction+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - ac_cv_c_stack_direction=0 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_includes_default -int -find_stack_direction () -{ - static char *addr = 0; - auto char dummy; - if (addr == 0) - { - addr = &dummy; - return find_stack_direction (); - } - else - return (&dummy > addr) ? 1 : -1; -} - -int -main () -{ - return find_stack_direction () < 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - ac_cv_c_stack_direction=1 -else - ac_cv_c_stack_direction=-1 -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5 -$as_echo "$ac_cv_c_stack_direction" >&6; } -cat >>confdefs.h <<_ACEOF -#define STACK_DIRECTION $ac_cv_c_stack_direction -_ACEOF - - -fi - -for ac_header in \ - arpa/inet.h fcntl.h inttypes.h libintl.h limits.h malloc.h \ - netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h \ - strings.h sys/file.h sys/ioctl.h sys/mount.h sys/param.h \ - sys/socket.h sys/statvfs.h sys/time.h syslog.h termios.h \ - unistd.h yajl/yajl_version.h \ - -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - -# Checks for typedefs, structures, and compiler characteristics. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5 -$as_echo_n "checking for stdbool.h that conforms to C99... " >&6; } -if test "${ac_cv_header_stdbool_h+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include -#ifndef bool - "error: bool is not defined" -#endif -#ifndef false - "error: false is not defined" -#endif -#if false - "error: false is not 0" -#endif -#ifndef true - "error: true is not defined" -#endif -#if true != 1 - "error: true is not 1" -#endif -#ifndef __bool_true_false_are_defined - "error: __bool_true_false_are_defined is not defined" -#endif - - struct s { _Bool s: 1; _Bool t; } s; - - char a[true == 1 ? 1 : -1]; - char b[false == 0 ? 1 : -1]; - char c[__bool_true_false_are_defined == 1 ? 1 : -1]; - char d[(bool) 0.5 == true ? 1 : -1]; - bool e = &s; - char f[(_Bool) 0.0 == false ? 1 : -1]; - char g[true]; - char h[sizeof (_Bool)]; - char i[sizeof s.t]; - enum { j = false, k = true, l = false * true, m = true * 256 }; - /* The following fails for - HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */ - _Bool n[m]; - char o[sizeof n == m * sizeof n[0] ? 1 : -1]; - char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1]; -# if defined __xlc__ || defined __GNUC__ - /* Catch a bug in IBM AIX xlc compiler version 6.0.0.0 - reported by James Lemley on 2005-10-05; see - http://lists.gnu.org/archive/html/bug-coreutils/2005-10/msg00086.html - This test is not quite right, since xlc is allowed to - reject this program, as the initializer for xlcbug is - not one of the forms that C requires support for. - However, doing the test right would require a runtime - test, and that would make cross-compilation harder. - Let us hope that IBM fixes the xlc bug, and also adds - support for this kind of constant expression. In the - meantime, this test will reject xlc, which is OK, since - our stdbool.h substitute should suffice. We also test - this with GCC, where it should work, to detect more - quickly whether someone messes up the test in the - future. */ - char digs[] = "0123456789"; - int xlcbug = 1 / (&(digs + 5)[-2 + (bool) 1] == &digs[4] ? 1 : -1); -# endif - /* Catch a bug in an HP-UX C compiler. See - http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html - http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html - */ - _Bool q = true; - _Bool *pq = &q; - -int -main () -{ - - *pq |= q; - *pq |= ! q; - /* Refer to every declared value, to avoid compiler optimizations. */ - return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l - + !m + !n + !o + !p + !q + !pq); - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_stdbool_h=yes -else - ac_cv_header_stdbool_h=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5 -$as_echo "$ac_cv_header_stdbool_h" >&6; } -ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default" -if test "x$ac_cv_type__Bool" = x""yes; then : - -cat >>confdefs.h <<_ACEOF -#define HAVE__BOOL 1 -_ACEOF - - -fi - -if test $ac_cv_header_stdbool_h = yes; then - -$as_echo "#define HAVE_STDBOOL_H 1" >>confdefs.h - -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5 -$as_echo_n "checking for uid_t in sys/types.h... " >&6; } -if test "${ac_cv_type_uid_t+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "uid_t" >/dev/null 2>&1; then : - ac_cv_type_uid_t=yes -else - ac_cv_type_uid_t=no -fi -rm -f conftest* - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5 -$as_echo "$ac_cv_type_uid_t" >&6; } -if test $ac_cv_type_uid_t = no; then - -$as_echo "#define uid_t int" >>confdefs.h - - -$as_echo "#define gid_t int" >>confdefs.h - -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 -$as_echo_n "checking for inline... " >&6; } -if test "${ac_cv_c_inline+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_c_inline=no -for ac_kw in inline __inline__ __inline; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifndef __cplusplus -typedef int foo_t; -static $ac_kw foo_t static_foo () {return 0; } -$ac_kw foo_t foo () {return 0; } -#endif - -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_c_inline=$ac_kw -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - test "$ac_cv_c_inline" != no && break -done - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5 -$as_echo "$ac_cv_c_inline" >&6; } - -case $ac_cv_c_inline in - inline | yes) ;; - *) - case $ac_cv_c_inline in - no) ac_val=;; - *) ac_val=$ac_cv_c_inline;; - esac - cat >>confdefs.h <<_ACEOF -#ifndef __cplusplus -#define inline $ac_val -#endif -_ACEOF - ;; -esac - -ac_fn_c_find_intX_t "$LINENO" "16" "ac_cv_c_int16_t" -case $ac_cv_c_int16_t in #( - no|yes) ;; #( - *) - -cat >>confdefs.h <<_ACEOF -#define int16_t $ac_cv_c_int16_t -_ACEOF -;; -esac - -ac_fn_c_find_intX_t "$LINENO" "32" "ac_cv_c_int32_t" -case $ac_cv_c_int32_t in #( - no|yes) ;; #( - *) - -cat >>confdefs.h <<_ACEOF -#define int32_t $ac_cv_c_int32_t -_ACEOF -;; -esac - -ac_fn_c_find_intX_t "$LINENO" "64" "ac_cv_c_int64_t" -case $ac_cv_c_int64_t in #( - no|yes) ;; #( - *) - -cat >>confdefs.h <<_ACEOF -#define int64_t $ac_cv_c_int64_t -_ACEOF -;; -esac - -ac_fn_c_find_intX_t "$LINENO" "8" "ac_cv_c_int8_t" -case $ac_cv_c_int8_t in #( - no|yes) ;; #( - *) - -cat >>confdefs.h <<_ACEOF -#define int8_t $ac_cv_c_int8_t -_ACEOF -;; -esac - -ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default" -if test "x$ac_cv_type_mode_t" = x""yes; then : - -else - -cat >>confdefs.h <<_ACEOF -#define mode_t int -_ACEOF - -fi - -ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default" -if test "x$ac_cv_type_off_t" = x""yes; then : - -else - -cat >>confdefs.h <<_ACEOF -#define off_t long int -_ACEOF - -fi - -ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default" -if test "x$ac_cv_type_pid_t" = x""yes; then : - -else - -cat >>confdefs.h <<_ACEOF -#define pid_t int -_ACEOF - -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C/C++ restrict keyword" >&5 -$as_echo_n "checking for C/C++ restrict keyword... " >&6; } -if test "${ac_cv_c_restrict+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_c_restrict=no - # The order here caters to the fact that C++ does not require restrict. - for ac_kw in __restrict __restrict__ _Restrict restrict; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -typedef int * int_ptr; - int foo (int_ptr $ac_kw ip) { - return ip[0]; - } -int -main () -{ -int s[1]; - int * $ac_kw t = s; - t[0] = 0; - return foo(t) - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_c_restrict=$ac_kw -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - test "$ac_cv_c_restrict" != no && break - done - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_restrict" >&5 -$as_echo "$ac_cv_c_restrict" >&6; } - - case $ac_cv_c_restrict in - restrict) ;; - no) $as_echo "#define restrict /**/" >>confdefs.h - ;; - *) cat >>confdefs.h <<_ACEOF -#define restrict $ac_cv_c_restrict -_ACEOF - ;; - esac - -ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" -if test "x$ac_cv_type_size_t" = x""yes; then : - -else - -cat >>confdefs.h <<_ACEOF -#define size_t unsigned int -_ACEOF - -fi - -ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default" -if test "x$ac_cv_type_ssize_t" = x""yes; then : - -else - -cat >>confdefs.h <<_ACEOF -#define ssize_t int -_ACEOF - -fi - -ac_fn_c_check_member "$LINENO" "struct stat" "st_blksize" "ac_cv_member_struct_stat_st_blksize" "$ac_includes_default" -if test "x$ac_cv_member_struct_stat_st_blksize" = x""yes; then : - -cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_STAT_ST_BLKSIZE 1 -_ACEOF - - -fi - -ac_fn_c_check_member "$LINENO" "struct stat" "st_blocks" "ac_cv_member_struct_stat_st_blocks" "$ac_includes_default" -if test "x$ac_cv_member_struct_stat_st_blocks" = x""yes; then : - -cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_STAT_ST_BLOCKS 1 -_ACEOF - - -$as_echo "#define HAVE_ST_BLOCKS 1" >>confdefs.h - -else - case " $LIBOBJS " in - *" fileblocks.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS fileblocks.$ac_objext" - ;; -esac - -fi - - -ac_fn_c_check_member "$LINENO" "struct stat" "st_rdev" "ac_cv_member_struct_stat_st_rdev" "$ac_includes_default" -if test "x$ac_cv_member_struct_stat_st_rdev" = x""yes; then : - -cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_STAT_ST_RDEV 1 -_ACEOF - - -fi - -ac_fn_c_find_uintX_t "$LINENO" "16" "ac_cv_c_uint16_t" -case $ac_cv_c_uint16_t in #( - no|yes) ;; #( - *) - - -cat >>confdefs.h <<_ACEOF -#define uint16_t $ac_cv_c_uint16_t -_ACEOF -;; - esac - -ac_fn_c_find_uintX_t "$LINENO" "32" "ac_cv_c_uint32_t" -case $ac_cv_c_uint32_t in #( - no|yes) ;; #( - *) - -$as_echo "#define _UINT32_T 1" >>confdefs.h - - -cat >>confdefs.h <<_ACEOF -#define uint32_t $ac_cv_c_uint32_t -_ACEOF -;; - esac - -ac_fn_c_find_uintX_t "$LINENO" "64" "ac_cv_c_uint64_t" -case $ac_cv_c_uint64_t in #( - no|yes) ;; #( - *) - -$as_echo "#define _UINT64_T 1" >>confdefs.h - - -cat >>confdefs.h <<_ACEOF -#define uint64_t $ac_cv_c_uint64_t -_ACEOF -;; - esac - -ac_fn_c_find_uintX_t "$LINENO" "8" "ac_cv_c_uint8_t" -case $ac_cv_c_uint8_t in #( - no|yes) ;; #( - *) - -$as_echo "#define _UINT8_T 1" >>confdefs.h - - -cat >>confdefs.h <<_ACEOF -#define uint8_t $ac_cv_c_uint8_t -_ACEOF -;; - esac - -ac_fn_c_check_type "$LINENO" "ptrdiff_t" "ac_cv_type_ptrdiff_t" "$ac_includes_default" -if test "x$ac_cv_type_ptrdiff_t" = x""yes; then : - -cat >>confdefs.h <<_ACEOF -#define HAVE_PTRDIFF_T 1 -_ACEOF - - -fi - - -# Checks for library functions. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for error_at_line" >&5 -$as_echo_n "checking for error_at_line... " >&6; } -if test "${ac_cv_lib_error_at_line+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -error_at_line (0, 0, "", 0, "an error occurred"); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_error_at_line=yes -else - ac_cv_lib_error_at_line=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_error_at_line" >&5 -$as_echo "$ac_cv_lib_error_at_line" >&6; } -if test $ac_cv_lib_error_at_line = no; then - case " $LIBOBJS " in - *" error.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS error.$ac_objext" - ;; -esac - -fi - -for ac_header in vfork.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "vfork.h" "ac_cv_header_vfork_h" "$ac_includes_default" -if test "x$ac_cv_header_vfork_h" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_VFORK_H 1 -_ACEOF - -fi - -done - -for ac_func in fork vfork -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done - -if test "x$ac_cv_func_fork" = xyes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working fork" >&5 -$as_echo_n "checking for working fork... " >&6; } -if test "${ac_cv_func_fork_works+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - ac_cv_func_fork_works=cross -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ - - /* By Ruediger Kuhlmann. */ - return fork () < 0; - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - ac_cv_func_fork_works=yes -else - ac_cv_func_fork_works=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_fork_works" >&5 -$as_echo "$ac_cv_func_fork_works" >&6; } - -else - ac_cv_func_fork_works=$ac_cv_func_fork -fi -if test "x$ac_cv_func_fork_works" = xcross; then - case $host in - *-*-amigaos* | *-*-msdosdjgpp*) - # Override, as these systems have only a dummy fork() stub - ac_cv_func_fork_works=no - ;; - *) - ac_cv_func_fork_works=yes - ;; - esac - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&5 -$as_echo "$as_me: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&2;} -fi -ac_cv_func_vfork_works=$ac_cv_func_vfork -if test "x$ac_cv_func_vfork" = xyes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working vfork" >&5 -$as_echo_n "checking for working vfork... " >&6; } -if test "${ac_cv_func_vfork_works+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - ac_cv_func_vfork_works=cross -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -/* Thanks to Paul Eggert for this test. */ -$ac_includes_default -#include -#ifdef HAVE_VFORK_H -# include -#endif -/* On some sparc systems, changes by the child to local and incoming - argument registers are propagated back to the parent. The compiler - is told about this with #include , but some compilers - (e.g. gcc -O) don't grok . Test for this by using a - static variable whose address is put into a register that is - clobbered by the vfork. */ -static void -#ifdef __cplusplus -sparc_address_test (int arg) -# else -sparc_address_test (arg) int arg; -#endif -{ - static pid_t child; - if (!child) { - child = vfork (); - if (child < 0) { - perror ("vfork"); - _exit(2); - } - if (!child) { - arg = getpid(); - write(-1, "", 0); - _exit (arg); - } - } -} - -int -main () -{ - pid_t parent = getpid (); - pid_t child; - - sparc_address_test (0); - - child = vfork (); - - if (child == 0) { - /* Here is another test for sparc vfork register problems. This - test uses lots of local variables, at least as many local - variables as main has allocated so far including compiler - temporaries. 4 locals are enough for gcc 1.40.3 on a Solaris - 4.1.3 sparc, but we use 8 to be safe. A buggy compiler should - reuse the register of parent for one of the local variables, - since it will think that parent can't possibly be used any more - in this routine. Assigning to the local variable will thus - munge parent in the parent process. */ - pid_t - p = getpid(), p1 = getpid(), p2 = getpid(), p3 = getpid(), - p4 = getpid(), p5 = getpid(), p6 = getpid(), p7 = getpid(); - /* Convince the compiler that p..p7 are live; otherwise, it might - use the same hardware register for all 8 local variables. */ - if (p != p1 || p != p2 || p != p3 || p != p4 - || p != p5 || p != p6 || p != p7) - _exit(1); - - /* On some systems (e.g. IRIX 3.3), vfork doesn't separate parent - from child file descriptors. If the child closes a descriptor - before it execs or exits, this munges the parent's descriptor - as well. Test for this by closing stdout in the child. */ - _exit(close(fileno(stdout)) != 0); - } else { - int status; - struct stat st; - - while (wait(&status) != child) - ; - return ( - /* Was there some problem with vforking? */ - child < 0 - - /* Did the child fail? (This shouldn't happen.) */ - || status - - /* Did the vfork/compiler bug occur? */ - || parent != getpid() - - /* Did the file descriptor bug occur? */ - || fstat(fileno(stdout), &st) != 0 - ); - } -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - ac_cv_func_vfork_works=yes -else - ac_cv_func_vfork_works=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_vfork_works" >&5 -$as_echo "$ac_cv_func_vfork_works" >&6; } - -fi; -if test "x$ac_cv_func_fork_works" = xcross; then - ac_cv_func_vfork_works=$ac_cv_func_vfork - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&5 -$as_echo "$as_me: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&2;} -fi - -if test "x$ac_cv_func_vfork_works" = xyes; then - -$as_echo "#define HAVE_WORKING_VFORK 1" >>confdefs.h - -else - -$as_echo "#define vfork fork" >>confdefs.h - -fi -if test "x$ac_cv_func_fork_works" = xyes; then - -$as_echo "#define HAVE_WORKING_FORK 1" >>confdefs.h - -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value needed for large files" >&5 -$as_echo_n "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; } -if test "${ac_cv_sys_largefile_source+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - while :; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include /* for off_t */ - #include -int -main () -{ -int (*fp) (FILE *, off_t, int) = fseeko; - return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_sys_largefile_source=no; break -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#define _LARGEFILE_SOURCE 1 -#include /* for off_t */ - #include -int -main () -{ -int (*fp) (FILE *, off_t, int) = fseeko; - return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_sys_largefile_source=1; break -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - ac_cv_sys_largefile_source=unknown - break -done -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_source" >&5 -$as_echo "$ac_cv_sys_largefile_source" >&6; } -case $ac_cv_sys_largefile_source in #( - no | unknown) ;; - *) -cat >>confdefs.h <<_ACEOF -#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source -_ACEOF -;; -esac -rm -rf conftest* - -# We used to try defining _XOPEN_SOURCE=500 too, to work around a bug -# in glibc 2.1.3, but that breaks too many other things. -# If you want fseeko and ftello with glibc, upgrade to a fixed glibc. -if test $ac_cv_sys_largefile_source != unknown; then - -$as_echo "#define HAVE_FSEEKO 1" >>confdefs.h - -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5 -$as_echo_n "checking whether lstat correctly handles trailing slash... " >&6; } -if test "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - rm -f conftest.sym conftest.file -echo >conftest.file -if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then - if test "$cross_compiling" = yes; then : - ac_cv_func_lstat_dereferences_slashed_symlink=no -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -struct stat sbuf; - /* Linux will dereference the symlink and fail, as required by POSIX. - That is better in the sense that it means we will not - have to compile and use the lstat wrapper. */ - return lstat ("conftest.sym/", &sbuf) == 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - ac_cv_func_lstat_dereferences_slashed_symlink=yes -else - ac_cv_func_lstat_dereferences_slashed_symlink=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -else - # If the `ln -s' command failed, then we probably don't even - # have an lstat function. - ac_cv_func_lstat_dereferences_slashed_symlink=no -fi -rm -f conftest.sym conftest.file - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5 -$as_echo "$ac_cv_func_lstat_dereferences_slashed_symlink" >&6; } - -test $ac_cv_func_lstat_dereferences_slashed_symlink = yes && - -cat >>confdefs.h <<_ACEOF -#define LSTAT_FOLLOWS_SLASHED_SYMLINK 1 -_ACEOF - - -if test "x$ac_cv_func_lstat_dereferences_slashed_symlink" = xno; then - case " $LIBOBJS " in - *" lstat.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS lstat.$ac_objext" - ;; -esac - -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether sys/types.h defines makedev" >&5 -$as_echo_n "checking whether sys/types.h defines makedev... " >&6; } -if test "${ac_cv_header_sys_types_h_makedev+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -return makedev(0, 0); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_header_sys_types_h_makedev=yes -else - ac_cv_header_sys_types_h_makedev=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_types_h_makedev" >&5 -$as_echo "$ac_cv_header_sys_types_h_makedev" >&6; } - -if test $ac_cv_header_sys_types_h_makedev = no; then -ac_fn_c_check_header_mongrel "$LINENO" "sys/mkdev.h" "ac_cv_header_sys_mkdev_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_mkdev_h" = x""yes; then : - -$as_echo "#define MAJOR_IN_MKDEV 1" >>confdefs.h - -fi - - - - if test $ac_cv_header_sys_mkdev_h = no; then - ac_fn_c_check_header_mongrel "$LINENO" "sys/sysmacros.h" "ac_cv_header_sys_sysmacros_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_sysmacros_h" = x""yes; then : - -$as_echo "#define MAJOR_IN_SYSMACROS 1" >>confdefs.h - -fi - - - fi -fi - -for ac_header in stdlib.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default" -if test "x$ac_cv_header_stdlib_h" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_STDLIB_H 1 -_ACEOF - -fi - -done - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5 -$as_echo_n "checking for GNU libc compatible malloc... " >&6; } -if test "${ac_cv_func_malloc_0_nonnull+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - ac_cv_func_malloc_0_nonnull=no -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#if defined STDC_HEADERS || defined HAVE_STDLIB_H -# include -#else -char *malloc (); -#endif - -int -main () -{ -return ! malloc (0); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - ac_cv_func_malloc_0_nonnull=yes -else - ac_cv_func_malloc_0_nonnull=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5 -$as_echo "$ac_cv_func_malloc_0_nonnull" >&6; } -if test $ac_cv_func_malloc_0_nonnull = yes; then : - -$as_echo "#define HAVE_MALLOC 1" >>confdefs.h - -else - $as_echo "#define HAVE_MALLOC 0" >>confdefs.h - - case " $LIBOBJS " in - *" malloc.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS malloc.$ac_objext" - ;; -esac - - -$as_echo "#define malloc rpl_malloc" >>confdefs.h - -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5 -$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; } -if test "${ac_cv_header_time+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include - -int -main () -{ -if ((struct tm *) 0) -return 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_time=yes -else - ac_cv_header_time=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5 -$as_echo "$ac_cv_header_time" >&6; } -if test $ac_cv_header_time = yes; then - -$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h - -fi - - - - - for ac_header in $ac_header_list -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default -" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - - - - - - - - for ac_func in $ac_func_list -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mktime" >&5 -$as_echo_n "checking for working mktime... " >&6; } -if test "${ac_cv_func_working_mktime+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - ac_cv_func_working_mktime=no -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -/* Test program from Paul Eggert and Tony Leneis. */ -#ifdef TIME_WITH_SYS_TIME -# include -# include -#else -# ifdef HAVE_SYS_TIME_H -# include -# else -# include -# endif -#endif - -#include -#include - -#ifdef HAVE_UNISTD_H -# include -#endif - -#ifndef HAVE_ALARM -# define alarm(X) /* empty */ -#endif - -/* Work around redefinition to rpl_putenv by other config tests. */ -#undef putenv - -static time_t time_t_max; -static time_t time_t_min; - -/* Values we'll use to set the TZ environment variable. */ -static const char *tz_strings[] = { - (const char *) 0, "TZ=GMT0", "TZ=JST-9", - "TZ=EST+3EDT+2,M10.1.0/00:00:00,M2.3.0/00:00:00" -}; -#define N_STRINGS (sizeof (tz_strings) / sizeof (tz_strings[0])) - -/* Return 0 if mktime fails to convert a date in the spring-forward gap. - Based on a problem report from Andreas Jaeger. */ -static int -spring_forward_gap () -{ - /* glibc (up to about 1998-10-07) failed this test. */ - struct tm tm; - - /* Use the portable POSIX.1 specification "TZ=PST8PDT,M4.1.0,M10.5.0" - instead of "TZ=America/Vancouver" in order to detect the bug even - on systems that don't support the Olson extension, or don't have the - full zoneinfo tables installed. */ - putenv ((char*) "TZ=PST8PDT,M4.1.0,M10.5.0"); - - tm.tm_year = 98; - tm.tm_mon = 3; - tm.tm_mday = 5; - tm.tm_hour = 2; - tm.tm_min = 0; - tm.tm_sec = 0; - tm.tm_isdst = -1; - return mktime (&tm) != (time_t) -1; -} - -static int -mktime_test1 (time_t now) -{ - struct tm *lt; - return ! (lt = localtime (&now)) || mktime (lt) == now; -} - -static int -mktime_test (time_t now) -{ - return (mktime_test1 (now) - && mktime_test1 ((time_t) (time_t_max - now)) - && mktime_test1 ((time_t) (time_t_min + now))); -} - -static int -irix_6_4_bug () -{ - /* Based on code from Ariel Faigon. */ - struct tm tm; - tm.tm_year = 96; - tm.tm_mon = 3; - tm.tm_mday = 0; - tm.tm_hour = 0; - tm.tm_min = 0; - tm.tm_sec = 0; - tm.tm_isdst = -1; - mktime (&tm); - return tm.tm_mon == 2 && tm.tm_mday == 31; -} - -static int -bigtime_test (int j) -{ - struct tm tm; - time_t now; - tm.tm_year = tm.tm_mon = tm.tm_mday = tm.tm_hour = tm.tm_min = tm.tm_sec = j; - now = mktime (&tm); - if (now != (time_t) -1) - { - struct tm *lt = localtime (&now); - if (! (lt - && lt->tm_year == tm.tm_year - && lt->tm_mon == tm.tm_mon - && lt->tm_mday == tm.tm_mday - && lt->tm_hour == tm.tm_hour - && lt->tm_min == tm.tm_min - && lt->tm_sec == tm.tm_sec - && lt->tm_yday == tm.tm_yday - && lt->tm_wday == tm.tm_wday - && ((lt->tm_isdst < 0 ? -1 : 0 < lt->tm_isdst) - == (tm.tm_isdst < 0 ? -1 : 0 < tm.tm_isdst)))) - return 0; - } - return 1; -} - -static int -year_2050_test () -{ - /* The correct answer for 2050-02-01 00:00:00 in Pacific time, - ignoring leap seconds. */ - unsigned long int answer = 2527315200UL; - - struct tm tm; - time_t t; - tm.tm_year = 2050 - 1900; - tm.tm_mon = 2 - 1; - tm.tm_mday = 1; - tm.tm_hour = tm.tm_min = tm.tm_sec = 0; - tm.tm_isdst = -1; - - /* Use the portable POSIX.1 specification "TZ=PST8PDT,M4.1.0,M10.5.0" - instead of "TZ=America/Vancouver" in order to detect the bug even - on systems that don't support the Olson extension, or don't have the - full zoneinfo tables installed. */ - putenv ((char*) "TZ=PST8PDT,M4.1.0,M10.5.0"); - - t = mktime (&tm); - - /* Check that the result is either a failure, or close enough - to the correct answer that we can assume the discrepancy is - due to leap seconds. */ - return (t == (time_t) -1 - || (0 < t && answer - 120 <= t && t <= answer + 120)); -} - -int -main () -{ - time_t t, delta; - int i, j; - - /* This test makes some buggy mktime implementations loop. - Give up after 60 seconds; a mktime slower than that - isn't worth using anyway. */ - alarm (60); - - for (;;) - { - t = (time_t_max << 1) + 1; - if (t <= time_t_max) - break; - time_t_max = t; - } - time_t_min = - ((time_t) ~ (time_t) 0 == (time_t) -1) - time_t_max; - - delta = time_t_max / 997; /* a suitable prime number */ - for (i = 0; i < N_STRINGS; i++) - { - if (tz_strings[i]) - putenv ((char*) tz_strings[i]); - - for (t = 0; t <= time_t_max - delta; t += delta) - if (! mktime_test (t)) - return 1; - if (! (mktime_test ((time_t) 1) - && mktime_test ((time_t) (60 * 60)) - && mktime_test ((time_t) (60 * 60 * 24)))) - return 1; - - for (j = 1; ; j <<= 1) - if (! bigtime_test (j)) - return 1; - else if (INT_MAX / 2 < j) - break; - if (! bigtime_test (INT_MAX)) - return 1; - } - return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ()); -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - ac_cv_func_working_mktime=yes -else - ac_cv_func_working_mktime=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_working_mktime" >&5 -$as_echo "$ac_cv_func_working_mktime" >&6; } -if test $ac_cv_func_working_mktime = no; then - case " $LIBOBJS " in - *" mktime.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS mktime.$ac_objext" - ;; -esac - -fi - - - - - - -for ac_func in getpagesize -do : - ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize" -if test "x$ac_cv_func_getpagesize" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_GETPAGESIZE 1 -_ACEOF - -fi -done - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5 -$as_echo_n "checking for working mmap... " >&6; } -if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - ac_cv_func_mmap_fixed_mapped=no -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_includes_default -/* malloc might have been renamed as rpl_malloc. */ -#undef malloc - -/* Thanks to Mike Haertel and Jim Avera for this test. - Here is a matrix of mmap possibilities: - mmap private not fixed - mmap private fixed at somewhere currently unmapped - mmap private fixed at somewhere already mapped - mmap shared not fixed - mmap shared fixed at somewhere currently unmapped - mmap shared fixed at somewhere already mapped - For private mappings, we should verify that changes cannot be read() - back from the file, nor mmap's back from the file at a different - address. (There have been systems where private was not correctly - implemented like the infamous i386 svr4.0, and systems where the - VM page cache was not coherent with the file system buffer cache - like early versions of FreeBSD and possibly contemporary NetBSD.) - For shared mappings, we should conversely verify that changes get - propagated back to all the places they're supposed to be. - - Grep wants private fixed already mapped. - The main things grep needs to know about mmap are: - * does it exist and is it safe to write into the mmap'd area - * how to use it (BSD variants) */ - -#include -#include - -#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H -char *malloc (); -#endif - -/* This mess was copied from the GNU getpagesize.h. */ -#ifndef HAVE_GETPAGESIZE -# ifdef _SC_PAGESIZE -# define getpagesize() sysconf(_SC_PAGESIZE) -# else /* no _SC_PAGESIZE */ -# ifdef HAVE_SYS_PARAM_H -# include -# ifdef EXEC_PAGESIZE -# define getpagesize() EXEC_PAGESIZE -# else /* no EXEC_PAGESIZE */ -# ifdef NBPG -# define getpagesize() NBPG * CLSIZE -# ifndef CLSIZE -# define CLSIZE 1 -# endif /* no CLSIZE */ -# else /* no NBPG */ -# ifdef NBPC -# define getpagesize() NBPC -# else /* no NBPC */ -# ifdef PAGESIZE -# define getpagesize() PAGESIZE -# endif /* PAGESIZE */ -# endif /* no NBPC */ -# endif /* no NBPG */ -# endif /* no EXEC_PAGESIZE */ -# else /* no HAVE_SYS_PARAM_H */ -# define getpagesize() 8192 /* punt totally */ -# endif /* no HAVE_SYS_PARAM_H */ -# endif /* no _SC_PAGESIZE */ - -#endif /* no HAVE_GETPAGESIZE */ - -int -main () -{ - char *data, *data2, *data3; - const char *cdata2; - int i, pagesize; - int fd, fd2; - - pagesize = getpagesize (); - - /* First, make a file with some known garbage in it. */ - data = (char *) malloc (pagesize); - if (!data) - return 1; - for (i = 0; i < pagesize; ++i) - *(data + i) = rand (); - umask (0); - fd = creat ("conftest.mmap", 0600); - if (fd < 0) - return 2; - if (write (fd, data, pagesize) != pagesize) - return 3; - close (fd); - - /* Next, check that the tail of a page is zero-filled. File must have - non-zero length, otherwise we risk SIGBUS for entire page. */ - fd2 = open ("conftest.txt", O_RDWR | O_CREAT | O_TRUNC, 0600); - if (fd2 < 0) - return 4; - cdata2 = ""; - if (write (fd2, cdata2, 1) != 1) - return 5; - data2 = (char *) mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L); - if (data2 == MAP_FAILED) - return 6; - for (i = 0; i < pagesize; ++i) - if (*(data2 + i)) - return 7; - close (fd2); - if (munmap (data2, pagesize)) - return 8; - - /* Next, try to mmap the file at a fixed address which already has - something else allocated at it. If we can, also make sure that - we see the same garbage. */ - fd = open ("conftest.mmap", O_RDWR); - if (fd < 0) - return 9; - if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_FIXED, fd, 0L)) - return 10; - for (i = 0; i < pagesize; ++i) - if (*(data + i) != *(data2 + i)) - return 11; - - /* Finally, make sure that changes to the mapped area do not - percolate back to the file as seen by read(). (This is a bug on - some variants of i386 svr4.0.) */ - for (i = 0; i < pagesize; ++i) - *(data2 + i) = *(data2 + i) + 1; - data3 = (char *) malloc (pagesize); - if (!data3) - return 12; - if (read (fd, data3, pagesize) != pagesize) - return 13; - for (i = 0; i < pagesize; ++i) - if (*(data + i) != *(data3 + i)) - return 14; - close (fd); - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - ac_cv_func_mmap_fixed_mapped=yes -else - ac_cv_func_mmap_fixed_mapped=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mmap_fixed_mapped" >&5 -$as_echo "$ac_cv_func_mmap_fixed_mapped" >&6; } -if test $ac_cv_func_mmap_fixed_mapped = yes; then - -$as_echo "#define HAVE_MMAP 1" >>confdefs.h - -fi -rm -f conftest.mmap conftest.txt - -for ac_header in stdlib.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default" -if test "x$ac_cv_header_stdlib_h" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_STDLIB_H 1 -_ACEOF - -fi - -done - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible realloc" >&5 -$as_echo_n "checking for GNU libc compatible realloc... " >&6; } -if test "${ac_cv_func_realloc_0_nonnull+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - ac_cv_func_realloc_0_nonnull=no -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#if defined STDC_HEADERS || defined HAVE_STDLIB_H -# include -#else -char *realloc (); -#endif - -int -main () -{ -return ! realloc (0, 0); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - ac_cv_func_realloc_0_nonnull=yes -else - ac_cv_func_realloc_0_nonnull=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_realloc_0_nonnull" >&5 -$as_echo "$ac_cv_func_realloc_0_nonnull" >&6; } -if test $ac_cv_func_realloc_0_nonnull = yes; then : - -$as_echo "#define HAVE_REALLOC 1" >>confdefs.h - -else - $as_echo "#define HAVE_REALLOC 0" >>confdefs.h - - case " $LIBOBJS " in - *" realloc.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS realloc.$ac_objext" - ;; -esac - - -$as_echo "#define realloc rpl_realloc" >>confdefs.h - -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strnlen" >&5 -$as_echo_n "checking for working strnlen... " >&6; } -if test "${ac_cv_func_strnlen_working+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - ac_cv_func_strnlen_working=no -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ - -#define S "foobar" -#define S_LEN (sizeof S - 1) - - /* At least one implementation is buggy: that of AIX 4.3 would - give strnlen (S, 1) == 3. */ - - int i; - for (i = 0; i < S_LEN + 1; ++i) - { - int expected = i <= S_LEN ? i : S_LEN; - if (strnlen (S, i) != expected) - return 1; - } - return 0; - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - ac_cv_func_strnlen_working=yes -else - ac_cv_func_strnlen_working=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strnlen_working" >&5 -$as_echo "$ac_cv_func_strnlen_working" >&6; } -test $ac_cv_func_strnlen_working = no && case " $LIBOBJS " in - *" strnlen.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS strnlen.$ac_objext" - ;; -esac - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strtod" >&5 -$as_echo_n "checking for working strtod... " >&6; } -if test "${ac_cv_func_strtod+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - ac_cv_func_strtod=no -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -$ac_includes_default -#ifndef strtod -double strtod (); -#endif -int -main() -{ - { - /* Some versions of Linux strtod mis-parse strings with leading '+'. */ - char *string = " +69"; - char *term; - double value; - value = strtod (string, &term); - if (value != 69 || term != (string + 4)) - return 1; - } - - { - /* Under Solaris 2.4, strtod returns the wrong value for the - terminating character under some conditions. */ - char *string = "NaN"; - char *term; - strtod (string, &term); - if (term != string && *(term - 1) == 0) - return 1; - } - return 0; -} - -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - ac_cv_func_strtod=yes -else - ac_cv_func_strtod=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strtod" >&5 -$as_echo "$ac_cv_func_strtod" >&6; } -if test $ac_cv_func_strtod = no; then - case " $LIBOBJS " in - *" strtod.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS strtod.$ac_objext" - ;; -esac - -ac_fn_c_check_func "$LINENO" "pow" "ac_cv_func_pow" -if test "x$ac_cv_func_pow" = x""yes; then : - -fi - -if test $ac_cv_func_pow = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pow in -lm" >&5 -$as_echo_n "checking for pow in -lm... " >&6; } -if test "${ac_cv_lib_m_pow+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lm $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char pow (); -int -main () -{ -return pow (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_m_pow=yes -else - ac_cv_lib_m_pow=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_pow" >&5 -$as_echo "$ac_cv_lib_m_pow" >&6; } -if test "x$ac_cv_lib_m_pow" = x""yes; then : - POW_LIB=-lm -else - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot find library containing definition of pow" >&5 -$as_echo "$as_me: WARNING: cannot find library containing definition of pow" >&2;} -fi - -fi - -fi - -for ac_func in \ - alarm atexit bzero clock_gettime dup2 fdatasync ftruncate \ - getcwd gethostbyname gethostname getpagesize gettimeofday \ - inet_ntoa isascii localtime_r memchr memmove memset mkdir \ - mkfifo munmap pathconf realpath regcomp rmdir select setenv \ - socket strcasecmp strchr strcspn strdup strerror strndup \ - strpbrk strrchr strspn strstr strtol strtoul strtoull tzset \ - uname \ - -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi + +fi + done diff -r e3371fc765b1 -r 078c7d4cde1d tools/configure.ac --- a/tools/configure.ac Fri May 11 18:58:56 2012 +0100 +++ b/tools/configure.ac Fri May 11 18:58:57 2012 +0100 @@ -19,9 +19,6 @@ recommended, use PREPEND_INCLUDES, PREPE APPEND_INCLUDES and APPEND_LIB instead when possible.]) ]) -AC_USE_SYSTEM_EXTENSIONS -AC_CANONICAL_HOST - # M4 Macro includes m4_include([m4/savevar.m4]) m4_include([m4/features.m4]) @@ -75,9 +72,7 @@ AC_ARG_VAR([BCC], [Path to bcc tool]) AC_ARG_VAR([IASL], [Path to iasl tool]) # Checks for programs. -AC_PROG_SED AC_PROG_CC -AC_PROG_LN_S AC_PROG_MAKE_SET AC_PROG_INSTALL AC_PATH_PROG([BISON], [bison]) @@ -137,7 +132,6 @@ AC_SUBST(libext2fs) AC_CHECK_LIB([gcrypt], [gcry_md_hash_buffer], [libgcrypt="y"], [libgcrypt="n"]) AC_SUBST(libgcrypt) AX_CHECK_PTHREAD -AC_CHECK_LIB([rt], [clock_gettime]) AC_CHECK_LIB([yajl], [yajl_alloc], [], [AC_MSG_ERROR([Could not find yajl])]) AC_CHECK_LIB([z], [deflateCopy], [], [AC_MSG_ERROR([Could not find zlib])]) @@ -145,58 +139,6 @@ AC_CHECK_LIB([iconv], [libiconv_open], [ AC_SUBST(libiconv) # Checks for header files. -AC_FUNC_ALLOCA -AC_CHECK_HEADERS([ \ - arpa/inet.h fcntl.h inttypes.h libintl.h limits.h malloc.h \ - netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h \ - strings.h sys/file.h sys/ioctl.h sys/mount.h sys/param.h \ - sys/socket.h sys/statvfs.h sys/time.h syslog.h termios.h \ - unistd.h yajl/yajl_version.h \ - ]) - -# Checks for typedefs, structures, and compiler characteristics. -AC_HEADER_STDBOOL -AC_TYPE_UID_T -AC_C_INLINE -AC_TYPE_INT16_T -AC_TYPE_INT32_T -AC_TYPE_INT64_T -AC_TYPE_INT8_T -AC_TYPE_MODE_T -AC_TYPE_OFF_T -AC_TYPE_PID_T -AC_C_RESTRICT -AC_TYPE_SIZE_T -AC_TYPE_SSIZE_T -AC_CHECK_MEMBERS([struct stat.st_blksize]) -AC_STRUCT_ST_BLOCKS -AC_CHECK_MEMBERS([struct stat.st_rdev]) -AC_TYPE_UINT16_T -AC_TYPE_UINT32_T -AC_TYPE_UINT64_T -AC_TYPE_UINT8_T -AC_CHECK_TYPES([ptrdiff_t]) - -# Checks for library functions. -AC_FUNC_ERROR_AT_LINE -AC_FUNC_FORK -AC_FUNC_FSEEKO -AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK -AC_HEADER_MAJOR -AC_FUNC_MALLOC -AC_FUNC_MKTIME -AC_FUNC_MMAP -AC_FUNC_REALLOC -AC_FUNC_STRNLEN -AC_FUNC_STRTOD -AC_CHECK_FUNCS([ \ - alarm atexit bzero clock_gettime dup2 fdatasync ftruncate \ - getcwd gethostbyname gethostname getpagesize gettimeofday \ - inet_ntoa isascii localtime_r memchr memmove memset mkdir \ - mkfifo munmap pathconf realpath regcomp rmdir select setenv \ - socket strcasecmp strchr strcspn strdup strerror strndup \ - strpbrk strrchr strspn strstr strtol strtoul strtoull tzset \ - uname \ - ]) +AC_CHECK_HEADERS([yajl/yajl_version.h]) AC_OUTPUT() --===============3226337522166469128== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog --===============3226337522166469128==-- From xen-changelog-bounces@lists.xen.org Mon May 14 16:33:02 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:33:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCk-0004zL-KM; Mon, 14 May 2012 16:33:02 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCS-0004f2-CZ for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:44 +0000 Received: from [85.158.139.83:25867] by server-10.bemta-5.messagelabs.com id DC/12-08260-AA331BF4; Mon, 14 May 2012 16:32:42 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-182.messagelabs.com!1337013159!28335167!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21319 invoked from network); 14 May 2012 16:32:41 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCN-0002v6-2H for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCN-0006ov-1W for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:39 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:38 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: log bootloader output X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1336759141 -3600 # Node ID 15e8b3366b67d54bf6717d0b1f6bc8b460eb7be8 # Parent e0bc91c320c94648836f3296f28263a6cf31b24b libxl: log bootloader output This involves adding a new log feature to libxl__datacopier, and then using it. If the bootloader exits nonzero we print the log filename in a log message from libxl. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r e0bc91c320c9 -r 15e8b3366b67 tools/libxl/libxl_aoutils.c --- a/tools/libxl/libxl_aoutils.c Fri May 11 18:59:00 2012 +0100 +++ b/tools/libxl/libxl_aoutils.c Fri May 11 18:59:01 2012 +0100 @@ -118,6 +118,16 @@ static void datacopier_readable(libxl__e libxl__ev_fd_deregister(gc, &dc->toread); break; } + if (dc->log) { + int wrote = fwrite(buf->buf + buf->used, 1, r, dc->log); + if (wrote != r) { + assert(ferror(dc->log)); + assert(errno); + LOGE(ERROR, "error logging %s", dc->copywhat); + datacopier_callback(egc, dc, 0, errno); + return; + } + } buf->used += r; dc->used += r; assert(buf->used <= sizeof(buf->buf)); diff -r e0bc91c320c9 -r 15e8b3366b67 tools/libxl/libxl_bootloader.c --- a/tools/libxl/libxl_bootloader.c Fri May 11 18:59:00 2012 +0100 +++ b/tools/libxl/libxl_bootloader.c Fri May 11 18:59:01 2012 +0100 @@ -236,6 +236,10 @@ static void bootloader_cleanup(libxl__eg libxl__carefd_close(bl->ptys[i].master); libxl__carefd_close(bl->ptys[i].slave); } + if (bl->display.log) { + fclose(bl->display.log); + bl->display.log = NULL; + } } static void bootloader_setpaths(libxl__gc *gc, libxl__bootloader_state *bl) @@ -258,6 +262,8 @@ void libxl__bootloader_run(libxl__egc *e { STATE_AO_GC(bl->ao); libxl_domain_build_info *info = bl->info; + uint32_t domid = bl->domid; + char *logfile_tmp = NULL; int rc, r; libxl__bootloader_init(bl); @@ -269,6 +275,22 @@ void libxl__bootloader_run(libxl__egc *e bootloader_setpaths(gc, bl); + const char *logfile_leaf = GCSPRINTF("bootloader.%"PRIu32, domid); + rc = libxl_create_logfile(CTX, logfile_leaf, &logfile_tmp); + if (rc) goto out; + + /* Transfer ownership of log filename to bl and the gc */ + bl->logfile = logfile_tmp; + libxl__ptr_add(gc, logfile_tmp); + logfile_tmp = NULL; + + bl->display.log = fopen(bl->logfile, "a"); + if (!bl->display.log) { + LOGE(ERROR, "failed to create bootloader logfile %s", bl->logfile); + rc = ERROR_FAIL; + goto out; + } + for (;;) { r = mkdir(bl->outputdir, 0600); if (!r) break; @@ -308,6 +330,7 @@ void libxl__bootloader_run(libxl__egc *e out: assert(rc); out_ok: + free(logfile_tmp); bootloader_callback(egc, bl, rc); } @@ -465,6 +488,7 @@ static void bootloader_finished(libxl__e libxl__datacopier_kill(&bl->display); if (status) { + LOG(ERROR, "bootloader failed - consult logfile %s", bl->logfile); libxl_report_child_exitstatus(CTX, XTL_ERROR, "bootloader", pid, status); rc = ERROR_FAIL; diff -r e0bc91c320c9 -r 15e8b3366b67 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri May 11 18:59:00 2012 +0100 +++ b/tools/libxl/libxl_internal.h Fri May 11 18:59:01 2012 +0100 @@ -1503,6 +1503,7 @@ struct libxl__datacopier_state { int readfd, writefd; ssize_t maxsz; const char *copywhat, *readwhat, *writewhat; /* for error msgs */ + FILE *log; /* gets a copy of everything */ libxl__datacopier_callback *callback; /* remaining fields are private to datacopier */ libxl__ev_fd toread, towrite; @@ -1565,7 +1566,7 @@ struct libxl__bootloader_state { libxl_device_disk *disk; uint32_t domid; /* private to libxl__run_bootloader */ - char *outputpath, *outputdir; + char *outputpath, *outputdir, *logfile; char *diskpath; /* not from gc, represents actually attached disk */ libxl__openpty_state openpty; libxl__openpty_result ptys[2]; /* [0] is for bootloader */ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:33:02 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:33:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCk-0004ya-8c; Mon, 14 May 2012 16:33:02 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCR-0004eY-E4 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:44 +0000 Received: from [85.158.143.99:61105] by server-1.bemta-4.messagelabs.com id 1F/29-20925-AA331BF4; Mon, 14 May 2012 16:32:42 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-216.messagelabs.com!1337013154!18324724!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17827 invoked from network); 14 May 2012 16:32:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCI-0002uR-B1 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCI-0006mk-9d for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:34 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:33 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] autoconf: trim the configure script; use autoheader X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3226337522166469128==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============3226337522166469128== Content-Type: text/plain # HG changeset patch # User Ian Jackson # Date 1336759137 -3600 # Node ID 078c7d4cde1d4593446e70ffc999845a571cd691 # Parent e3371fc765b1b9bb63af122ea3d42a6901702e18 autoconf: trim the configure script; use autoheader Remove a lot of unnecessary tests. Specifically, we no longer test for standard POSIX facilities which we expect to be provided everywhere and which we don't in any case have any alternative for. Switch to generating config.h.in with autoheader. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Cc: Roger Pau Monne Changes since v7: * Removed AX_CHECK_PTYFUNCS (snuck in from previous patch) Committed-by: Ian Jackson --- diff -r e3371fc765b1 -r 078c7d4cde1d autogen.sh --- a/autogen.sh Fri May 11 18:58:56 2012 +0100 +++ b/autogen.sh Fri May 11 18:58:57 2012 +0100 @@ -1,3 +1,4 @@ #!/bin/sh -e cd tools autoconf +autoheader diff -r e3371fc765b1 -r 078c7d4cde1d tools/config.h.in --- a/tools/config.h.in Fri May 11 18:58:56 2012 +0100 +++ b/tools/config.h.in Fri May 11 18:58:57 2012 +0100 @@ -1,19 +1,64 @@ -/* - * Copyright (C) 2012 - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; version 2.1 only. with the special - * exception on linking described in file LICENSE. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - */ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if you have the header file. */ +#undef HAVE_INTTYPES_H + +/* Define to 1 if you have the `crypto' library (-lcrypto). */ +#undef HAVE_LIBCRYPTO + +/* Define to 1 if you have the `yajl' library (-lyajl). */ +#undef HAVE_LIBYAJL + +/* Define to 1 if you have the `z' library (-lz). */ +#undef HAVE_LIBZ + +/* Define to 1 if you have the header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_UNISTD_H /* Define to 1 if you have the header file. */ #undef HAVE_YAJL_YAJL_VERSION_H -/* Define curses header to include. */ +/* Define curses header to use */ #undef INCLUDE_CURSES_H + +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT + +/* Define to the full name of this package. */ +#undef PACKAGE_NAME + +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME + +/* Define to the home page for this package. */ +#undef PACKAGE_URL + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION + +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS diff -r e3371fc765b1 -r 078c7d4cde1d tools/configure --- a/tools/configure Fri May 11 18:58:56 2012 +0100 +++ b/tools/configure Fri May 11 18:58:57 2012 +0100 @@ -595,12 +595,8 @@ ac_includes_default="\ # include #endif" -ac_header_list= -ac_func_list= ac_subst_vars='LTLIBOBJS -POW_LIB LIBOBJS -ALLOCA libiconv PTHREAD_LIBS PTHREAD_LDFLAGS @@ -616,6 +612,9 @@ PKG_CONFIG_LIBDIR PKG_CONFIG_PATH PKG_CONFIG CURSES_LIBS +EGREP +GREP +CPP pyconfig PYTHONPATH OCAMLBUILD @@ -635,8 +634,13 @@ INSTALL_DATA INSTALL_SCRIPT INSTALL_PROGRAM SET_MAKE -LN_S -SED +OBJEXT +EXEEXT +ac_ct_CC +CPPFLAGS +LDFLAGS +CFLAGS +CC IASL BCC LD86 @@ -665,24 +669,6 @@ xenapi vtpm monitors githttp -host_os -host_vendor -host_cpu -host -build_os -build_vendor -build_cpu -build -EGREP -GREP -CPP -OBJEXT -EXEEXT -ac_ct_CC -CPPFLAGS -LDFLAGS -CFLAGS -CC target_alias host_alias build_alias @@ -740,12 +726,6 @@ enable_debug ac_precious_vars='build_alias host_alias target_alias -CC -CFLAGS -LDFLAGS -LIBS -CPPFLAGS -CPP PREPEND_INCLUDES PREPEND_LIB APPEND_INCLUDES @@ -762,6 +742,12 @@ AS86 LD86 BCC IASL +CC +CFLAGS +LDFLAGS +LIBS +CPPFLAGS +CPP PKG_CONFIG PKG_CONFIG_PATH PKG_CONFIG_LIBDIR @@ -1365,10 +1351,6 @@ Fine tuning of the installation director _ACEOF cat <<\_ACEOF - -System types: - --build=BUILD configure for building on BUILD [guessed] - --host=HOST cross-compile to build programs to run on HOST [BUILD] _ACEOF fi @@ -1399,14 +1381,6 @@ Optional Features: --disable-debug Disable debug build of tools (default is ENABLED) Some influential environment variables: - CC C compiler command - CFLAGS C compiler flags - LDFLAGS linker flags, e.g. -L if you have libraries in a - nonstandard directory - LIBS libraries to pass to the linker, e.g. -l - CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if - you have headers in a nonstandard directory - CPP C preprocessor PREPEND_INCLUDES List of include folders to prepend to CFLAGS (without -I) PREPEND_LIB List of library folders to prepend to LDFLAGS (without -L) @@ -1425,6 +1399,14 @@ Some influential environment variables: LD86 Path to ld86 tool BCC Path to bcc tool IASL Path to iasl tool + CC C compiler command + CFLAGS C compiler flags + LDFLAGS linker flags, e.g. -L if you have libraries in a + nonstandard directory + LIBS libraries to pass to the linker, e.g. -l + CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if + you have headers in a nonstandard directory + CPP C preprocessor PKG_CONFIG path to pkg-config utility PKG_CONFIG_PATH directories to add to pkg-config's search path @@ -1797,311 +1779,6 @@ fi as_fn_set_status $ac_retval } # ac_fn_c_try_link - -# ac_fn_c_check_func LINENO FUNC VAR -# ---------------------------------- -# Tests whether FUNC exists, setting the cache variable VAR accordingly -ac_fn_c_check_func () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -/* Define $2 to an innocuous variant, in case declares $2. - For example, HP-UX 11i declares gettimeofday. */ -#define $2 innocuous_$2 - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $2 (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $2 - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $2 (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$2 || defined __stub___$2 -choke me -#endif - -int -main () -{ -return $2 (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - eval "$3=yes" -else - eval "$3=no" -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - -} # ac_fn_c_check_func - -# ac_fn_c_check_type LINENO TYPE VAR INCLUDES -# ------------------------------------------- -# Tests whether TYPE exists after having included INCLUDES, setting cache -# variable VAR accordingly. -ac_fn_c_check_type () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : - $as_echo_n "(cached) " >&6 -else - eval "$3=no" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -int -main () -{ -if (sizeof ($2)) - return 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -int -main () -{ -if (sizeof (($2))) - return 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - -else - eval "$3=yes" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - -} # ac_fn_c_check_type - -# ac_fn_c_find_intX_t LINENO BITS VAR -# ----------------------------------- -# Finds a signed integer type with width BITS, setting cache variable VAR -# accordingly. -ac_fn_c_find_intX_t () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for int$2_t" >&5 -$as_echo_n "checking for int$2_t... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : - $as_echo_n "(cached) " >&6 -else - eval "$3=no" - # Order is important - never check a type that is potentially smaller - # than half of the expected target width. - for ac_type in int$2_t 'int' 'long int' \ - 'long long int' 'short int' 'signed char'; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_includes_default - enum { N = $2 / 2 - 1 }; -int -main () -{ -static int test_array [1 - 2 * !(0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1))]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_includes_default - enum { N = $2 / 2 - 1 }; -int -main () -{ -static int test_array [1 - 2 * !(($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1) - < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 2))]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - -else - case $ac_type in #( - int$2_t) : - eval "$3=yes" ;; #( - *) : - eval "$3=\$ac_type" ;; -esac -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - if eval test \"x\$"$3"\" = x"no"; then : - -else - break -fi - done -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - -} # ac_fn_c_find_intX_t - -# ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES -# ---------------------------------------------------- -# Tries to find if the field MEMBER exists in type AGGR, after including -# INCLUDES, setting cache variable VAR accordingly. -ac_fn_c_check_member () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5 -$as_echo_n "checking for $2.$3... " >&6; } -if eval "test \"\${$4+set}\"" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$5 -int -main () -{ -static $2 ac_aggr; -if (ac_aggr.$3) -return 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - eval "$4=yes" -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$5 -int -main () -{ -static $2 ac_aggr; -if (sizeof ac_aggr.$3) -return 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - eval "$4=yes" -else - eval "$4=no" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -eval ac_res=\$$4 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - -} # ac_fn_c_check_member - -# ac_fn_c_find_uintX_t LINENO BITS VAR -# ------------------------------------ -# Finds an unsigned integer type with width BITS, setting cache variable VAR -# accordingly. -ac_fn_c_find_uintX_t () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uint$2_t" >&5 -$as_echo_n "checking for uint$2_t... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : - $as_echo_n "(cached) " >&6 -else - eval "$3=no" - # Order is important - never check a type that is potentially smaller - # than half of the expected target width. - for ac_type in uint$2_t 'unsigned int' 'unsigned long int' \ - 'unsigned long long int' 'unsigned short int' 'unsigned char'; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -static int test_array [1 - 2 * !((($ac_type) -1 >> ($2 / 2 - 1)) >> ($2 / 2 - 1) == 3)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - case $ac_type in #( - uint$2_t) : - eval "$3=yes" ;; #( - *) : - eval "$3=\$ac_type" ;; -esac -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - if eval test \"x\$"$3"\" = x"no"; then : - -else - break -fi - done -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - -} # ac_fn_c_find_uintX_t cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. @@ -2386,11 +2063,6 @@ else >$cache_file fi -as_fn_append ac_header_list " sys/time.h" -as_fn_append ac_header_list " unistd.h" -as_fn_append ac_func_list " alarm" -as_fn_append ac_header_list " stdlib.h" -as_fn_append ac_header_list " sys/param.h" # Check that the precious variables saved in the cache have kept the same # value. ac_cache_corrupted=false @@ -2508,6 +2180,450 @@ APPEND_INCLUDES and APPEND_LIB instead w fi +# M4 Macro includes + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 1 (pkg-config-0.24) +# +# Copyright © 2004 Scott James Remnant . +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# PKG_PROG_PKG_CONFIG([MIN-VERSION]) +# ---------------------------------- +# PKG_PROG_PKG_CONFIG + +# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# +# Check to see whether a particular set of modules exists. Similar +# to PKG_CHECK_MODULES(), but does not set variables or print errors. +# +# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +# only at the first occurence in configure.ac, so if the first place +# it's called might be skipped (such as if it is within an "if", you +# have to call PKG_CHECK_EXISTS manually +# -------------------------------------------------------------- + + +# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +# --------------------------------------------- +# _PKG_CONFIG + +# _PKG_SHORT_ERRORS_SUPPORTED +# ----------------------------- +# _PKG_SHORT_ERRORS_SUPPORTED + + +# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +# [ACTION-IF-NOT-FOUND]) +# +# +# Note that if there is a possibility the first call to +# PKG_CHECK_MODULES might not happen, you should be sure to include an +# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +# +# +# -------------------------------------------------------------- +# PKG_CHECK_MODULES + + + +# We define, separately, PTHREAD_CFLAGS, _LDFLAGS and _LIBS +# even though currently we don't set them very separately. +# This means that the makefiles will not need to change in +# the future if we make the test more sophisticated. + + + +# We invoke AX_PTHREAD_VARS with the name of another macro +# which is then expanded once for each variable. + + + + + + + + +# Enable/disable options + +# Check whether --enable-githttp was given. +if test "${enable_githttp+set}" = set; then : + enableval=$enable_githttp; +fi + + +if test "x$enable_githttp" = "xno"; then : + + ax_cv_githttp="n" + +elif test "x$enable_githttp" = "xyes"; then : + + ax_cv_githttp="y" + +elif test -z $ax_cv_githttp; then : + + ax_cv_githttp="n" + +fi +githttp=$ax_cv_githttp + + + +# Check whether --enable-monitors was given. +if test "${enable_monitors+set}" = set; then : + enableval=$enable_monitors; +fi + + +if test "x$enable_monitors" = "xno"; then : + + ax_cv_monitors="n" + +elif test "x$enable_monitors" = "xyes"; then : + + ax_cv_monitors="y" + +elif test -z $ax_cv_monitors; then : + + ax_cv_monitors="y" + +fi +monitors=$ax_cv_monitors + + + +# Check whether --enable-vtpm was given. +if test "${enable_vtpm+set}" = set; then : + enableval=$enable_vtpm; +fi + + +if test "x$enable_vtpm" = "xno"; then : + + ax_cv_vtpm="n" + +elif test "x$enable_vtpm" = "xyes"; then : + + ax_cv_vtpm="y" + +elif test -z $ax_cv_vtpm; then : + + ax_cv_vtpm="n" + +fi +vtpm=$ax_cv_vtpm + + + +# Check whether --enable-xenapi was given. +if test "${enable_xenapi+set}" = set; then : + enableval=$enable_xenapi; +fi + + +if test "x$enable_xenapi" = "xno"; then : + + ax_cv_xenapi="n" + +elif test "x$enable_xenapi" = "xyes"; then : + + ax_cv_xenapi="y" + +elif test -z $ax_cv_xenapi; then : + + ax_cv_xenapi="n" + +fi +xenapi=$ax_cv_xenapi + + + +# Check whether --enable-pythontools was given. +if test "${enable_pythontools+set}" = set; then : + enableval=$enable_pythontools; +fi + + +if test "x$enable_pythontools" = "xno"; then : + + ax_cv_pythontools="n" + +elif test "x$enable_pythontools" = "xyes"; then : + + ax_cv_pythontools="y" + +elif test -z $ax_cv_pythontools; then : + + ax_cv_pythontools="y" + +fi +pythontools=$ax_cv_pythontools + + + +# Check whether --enable-ocamltools was given. +if test "${enable_ocamltools+set}" = set; then : + enableval=$enable_ocamltools; +fi + + +if test "x$enable_ocamltools" = "xno"; then : + + ax_cv_ocamltools="n" + +elif test "x$enable_ocamltools" = "xyes"; then : + + ax_cv_ocamltools="y" + +elif test -z $ax_cv_ocamltools; then : + + ax_cv_ocamltools="y" + +fi +ocamltools=$ax_cv_ocamltools + + + +# Check whether --enable-miniterm was given. +if test "${enable_miniterm+set}" = set; then : + enableval=$enable_miniterm; +fi + + +if test "x$enable_miniterm" = "xno"; then : + + ax_cv_miniterm="n" + +elif test "x$enable_miniterm" = "xyes"; then : + + ax_cv_miniterm="y" + +elif test -z $ax_cv_miniterm; then : + + ax_cv_miniterm="n" + +fi +miniterm=$ax_cv_miniterm + + + +# Check whether --enable-lomount was given. +if test "${enable_lomount+set}" = set; then : + enableval=$enable_lomount; +fi + + +if test "x$enable_lomount" = "xno"; then : + + ax_cv_lomount="n" + +elif test "x$enable_lomount" = "xyes"; then : + + ax_cv_lomount="y" + +elif test -z $ax_cv_lomount; then : + + ax_cv_lomount="n" + +fi +lomount=$ax_cv_lomount + + + +# Check whether --enable-ovmf was given. +if test "${enable_ovmf+set}" = set; then : + enableval=$enable_ovmf; +fi + + +if test "x$enable_ovmf" = "xno"; then : + + ax_cv_ovmf="n" + +elif test "x$enable_ovmf" = "xyes"; then : + + ax_cv_ovmf="y" + +elif test -z $ax_cv_ovmf; then : + + ax_cv_ovmf="n" + +fi +ovmf=$ax_cv_ovmf + + + +# Check whether --enable-rombios was given. +if test "${enable_rombios+set}" = set; then : + enableval=$enable_rombios; +fi + + +if test "x$enable_rombios" = "xno"; then : + + ax_cv_rombios="n" + +elif test "x$enable_rombios" = "xyes"; then : + + ax_cv_rombios="y" + +elif test -z $ax_cv_rombios; then : + + ax_cv_rombios="y" + +fi +rombios=$ax_cv_rombios + + + +# Check whether --enable-seabios was given. +if test "${enable_seabios+set}" = set; then : + enableval=$enable_seabios; +fi + + +if test "x$enable_seabios" = "xno"; then : + + ax_cv_seabios="n" + +elif test "x$enable_seabios" = "xyes"; then : + + ax_cv_seabios="y" + +elif test -z $ax_cv_seabios; then : + + ax_cv_seabios="y" + +fi +seabios=$ax_cv_seabios + + + +# Check whether --enable-debug was given. +if test "${enable_debug+set}" = set; then : + enableval=$enable_debug; +fi + + +if test "x$enable_debug" = "xno"; then : + + ax_cv_debug="n" + +elif test "x$enable_debug" = "xyes"; then : + + ax_cv_debug="y" + +elif test -z $ax_cv_debug; then : + + ax_cv_debug="y" + +fi +debug=$ax_cv_debug + + + + + + + + +for cflag in $PREPEND_INCLUDES +do + PREPEND_CFLAGS+=" -I$cflag" +done +for ldflag in $PREPEND_LIB +do + PREPEND_LDFLAGS+=" -L$ldflag" +done +for cflag in $APPEND_INCLUDES +do + APPEND_CFLAGS+=" -I$cflag" +done +for ldflag in $APPEND_LIB +do + APPEND_LDFLAGS+=" -L$ldflag" +done +CFLAGS="$PREPEND_CFLAGS $CFLAGS $APPEND_CFLAGS" +LDFLAGS="$PREPEND_LDFLAGS $LDFLAGS $APPEND_LDFLAGS" + + + + + + + + + + + + + + +# Checks for programs. ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -3298,1601 +3414,6 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 -$as_echo_n "checking how to run the C preprocessor... " >&6; } -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= -fi -if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" - do - ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.i conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.i conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - break -fi - - done - ac_cv_prog_CPP=$CPP - -fi - CPP=$ac_cv_prog_CPP -else - ac_cv_prog_CPP=$CPP -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 -$as_echo "$CPP" >&6; } -ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.i conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.i conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5 ; } -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 -$as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if test "${ac_cv_path_GREP+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -z "$GREP"; then - ac_path_GREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue -# Check for GNU ac_path_GREP and select it if it is found. - # Check for GNU $ac_path_GREP -case `"$ac_path_GREP" --version 2>&1` in -*GNU*) - ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo 'GREP' >> "conftest.nl" - "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_GREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_GREP="$ac_path_GREP" - ac_path_GREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_GREP_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_GREP"; then - as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi -else - ac_cv_path_GREP=$GREP -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 -$as_echo "$ac_cv_path_GREP" >&6; } - GREP="$ac_cv_path_GREP" - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 -$as_echo_n "checking for egrep... " >&6; } -if test "${ac_cv_path_EGREP+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 - then ac_cv_path_EGREP="$GREP -E" - else - if test -z "$EGREP"; then - ac_path_EGREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in egrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue -# Check for GNU ac_path_EGREP and select it if it is found. - # Check for GNU $ac_path_EGREP -case `"$ac_path_EGREP" --version 2>&1` in -*GNU*) - ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo 'EGREP' >> "conftest.nl" - "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_EGREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_EGREP="$ac_path_EGREP" - ac_path_EGREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_EGREP_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_EGREP"; then - as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi -else - ac_cv_path_EGREP=$EGREP -fi - - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 -$as_echo "$ac_cv_path_EGREP" >&6; } - EGREP="$ac_cv_path_EGREP" - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 -$as_echo_n "checking for ANSI C header files... " >&6; } -if test "${ac_cv_header_stdc+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include -#include - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_stdc=yes -else - ac_cv_header_stdc=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then : - : -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - -else - ac_cv_header_stdc=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then - -$as_echo "#define STDC_HEADERS 1" >>confdefs.h - -fi - -# On IRIX 5.3, sys/types and inttypes.h are conflicting. -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default -" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - - - ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default" -if test "x$ac_cv_header_minix_config_h" = x""yes; then : - MINIX=yes -else - MINIX= -fi - - - if test "$MINIX" = yes; then - -$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h - - -$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h - - -$as_echo "#define _MINIX 1" >>confdefs.h - - fi - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 -$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; } -if test "${ac_cv_safe_to_define___extensions__+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -# define __EXTENSIONS__ 1 - $ac_includes_default -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_safe_to_define___extensions__=yes -else - ac_cv_safe_to_define___extensions__=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 -$as_echo "$ac_cv_safe_to_define___extensions__" >&6; } - test $ac_cv_safe_to_define___extensions__ = yes && - $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h - - $as_echo "#define _ALL_SOURCE 1" >>confdefs.h - - $as_echo "#define _GNU_SOURCE 1" >>confdefs.h - - $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h - - $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h - - -# Make sure we can run config.sub. -$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 -$as_echo_n "checking build system type... " >&6; } -if test "${ac_cv_build+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_build_alias=$build_alias -test "x$ac_build_alias" = x && - ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` -test "x$ac_build_alias" = x && - as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 -ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 -$as_echo "$ac_cv_build" >&6; } -case $ac_cv_build in -*-*-*) ;; -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; -esac -build=$ac_cv_build -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_build -shift -build_cpu=$1 -build_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -build_os=$* -IFS=$ac_save_IFS -case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 -$as_echo_n "checking host system type... " >&6; } -if test "${ac_cv_host+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test "x$host_alias" = x; then - ac_cv_host=$ac_cv_build -else - ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 -$as_echo "$ac_cv_host" >&6; } -case $ac_cv_host in -*-*-*) ;; -*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; -esac -host=$ac_cv_host -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_host -shift -host_cpu=$1 -host_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -host_os=$* -IFS=$ac_save_IFS -case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac - - - -# M4 Macro includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# serial 1 (pkg-config-0.24) -# -# Copyright © 2004 Scott James Remnant . -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -# ---------------------------------- -# PKG_PROG_PKG_CONFIG - -# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# -# Check to see whether a particular set of modules exists. Similar -# to PKG_CHECK_MODULES(), but does not set variables or print errors. -# -# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -# only at the first occurence in configure.ac, so if the first place -# it's called might be skipped (such as if it is within an "if", you -# have to call PKG_CHECK_EXISTS manually -# -------------------------------------------------------------- - - -# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -# --------------------------------------------- -# _PKG_CONFIG - -# _PKG_SHORT_ERRORS_SUPPORTED -# ----------------------------- -# _PKG_SHORT_ERRORS_SUPPORTED - - -# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -# [ACTION-IF-NOT-FOUND]) -# -# -# Note that if there is a possibility the first call to -# PKG_CHECK_MODULES might not happen, you should be sure to include an -# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac -# -# -# -------------------------------------------------------------- -# PKG_CHECK_MODULES - - - -# We define, separately, PTHREAD_CFLAGS, _LDFLAGS and _LIBS -# even though currently we don't set them very separately. -# This means that the makefiles will not need to change in -# the future if we make the test more sophisticated. - - - -# We invoke AX_PTHREAD_VARS with the name of another macro -# which is then expanded once for each variable. - - - - - - - - -# Enable/disable options - -# Check whether --enable-githttp was given. -if test "${enable_githttp+set}" = set; then : - enableval=$enable_githttp; -fi - - -if test "x$enable_githttp" = "xno"; then : - - ax_cv_githttp="n" - -elif test "x$enable_githttp" = "xyes"; then : - - ax_cv_githttp="y" - -elif test -z $ax_cv_githttp; then : - - ax_cv_githttp="n" - -fi -githttp=$ax_cv_githttp - - - -# Check whether --enable-monitors was given. -if test "${enable_monitors+set}" = set; then : - enableval=$enable_monitors; -fi - - -if test "x$enable_monitors" = "xno"; then : - - ax_cv_monitors="n" - -elif test "x$enable_monitors" = "xyes"; then : - - ax_cv_monitors="y" - -elif test -z $ax_cv_monitors; then : - - ax_cv_monitors="y" - -fi -monitors=$ax_cv_monitors - - - -# Check whether --enable-vtpm was given. -if test "${enable_vtpm+set}" = set; then : - enableval=$enable_vtpm; -fi - - -if test "x$enable_vtpm" = "xno"; then : - - ax_cv_vtpm="n" - -elif test "x$enable_vtpm" = "xyes"; then : - - ax_cv_vtpm="y" - -elif test -z $ax_cv_vtpm; then : - - ax_cv_vtpm="n" - -fi -vtpm=$ax_cv_vtpm - - - -# Check whether --enable-xenapi was given. -if test "${enable_xenapi+set}" = set; then : - enableval=$enable_xenapi; -fi - - -if test "x$enable_xenapi" = "xno"; then : - - ax_cv_xenapi="n" - -elif test "x$enable_xenapi" = "xyes"; then : - - ax_cv_xenapi="y" - -elif test -z $ax_cv_xenapi; then : - - ax_cv_xenapi="n" - -fi -xenapi=$ax_cv_xenapi - - - -# Check whether --enable-pythontools was given. -if test "${enable_pythontools+set}" = set; then : - enableval=$enable_pythontools; -fi - - -if test "x$enable_pythontools" = "xno"; then : - - ax_cv_pythontools="n" - -elif test "x$enable_pythontools" = "xyes"; then : - - ax_cv_pythontools="y" - -elif test -z $ax_cv_pythontools; then : - - ax_cv_pythontools="y" - -fi -pythontools=$ax_cv_pythontools - - - -# Check whether --enable-ocamltools was given. -if test "${enable_ocamltools+set}" = set; then : - enableval=$enable_ocamltools; -fi - - -if test "x$enable_ocamltools" = "xno"; then : - - ax_cv_ocamltools="n" - -elif test "x$enable_ocamltools" = "xyes"; then : - - ax_cv_ocamltools="y" - -elif test -z $ax_cv_ocamltools; then : - - ax_cv_ocamltools="y" - -fi -ocamltools=$ax_cv_ocamltools - - - -# Check whether --enable-miniterm was given. -if test "${enable_miniterm+set}" = set; then : - enableval=$enable_miniterm; -fi - - -if test "x$enable_miniterm" = "xno"; then : - - ax_cv_miniterm="n" - -elif test "x$enable_miniterm" = "xyes"; then : - - ax_cv_miniterm="y" - -elif test -z $ax_cv_miniterm; then : - - ax_cv_miniterm="n" - -fi -miniterm=$ax_cv_miniterm - - - -# Check whether --enable-lomount was given. -if test "${enable_lomount+set}" = set; then : - enableval=$enable_lomount; -fi - - -if test "x$enable_lomount" = "xno"; then : - - ax_cv_lomount="n" - -elif test "x$enable_lomount" = "xyes"; then : - - ax_cv_lomount="y" - -elif test -z $ax_cv_lomount; then : - - ax_cv_lomount="n" - -fi -lomount=$ax_cv_lomount - - - -# Check whether --enable-ovmf was given. -if test "${enable_ovmf+set}" = set; then : - enableval=$enable_ovmf; -fi - - -if test "x$enable_ovmf" = "xno"; then : - - ax_cv_ovmf="n" - -elif test "x$enable_ovmf" = "xyes"; then : - - ax_cv_ovmf="y" - -elif test -z $ax_cv_ovmf; then : - - ax_cv_ovmf="n" - -fi -ovmf=$ax_cv_ovmf - - - -# Check whether --enable-rombios was given. -if test "${enable_rombios+set}" = set; then : - enableval=$enable_rombios; -fi - - -if test "x$enable_rombios" = "xno"; then : - - ax_cv_rombios="n" - -elif test "x$enable_rombios" = "xyes"; then : - - ax_cv_rombios="y" - -elif test -z $ax_cv_rombios; then : - - ax_cv_rombios="y" - -fi -rombios=$ax_cv_rombios - - - -# Check whether --enable-seabios was given. -if test "${enable_seabios+set}" = set; then : - enableval=$enable_seabios; -fi - - -if test "x$enable_seabios" = "xno"; then : - - ax_cv_seabios="n" - -elif test "x$enable_seabios" = "xyes"; then : - - ax_cv_seabios="y" - -elif test -z $ax_cv_seabios; then : - - ax_cv_seabios="y" - -fi -seabios=$ax_cv_seabios - - - -# Check whether --enable-debug was given. -if test "${enable_debug+set}" = set; then : - enableval=$enable_debug; -fi - - -if test "x$enable_debug" = "xno"; then : - - ax_cv_debug="n" - -elif test "x$enable_debug" = "xyes"; then : - - ax_cv_debug="y" - -elif test -z $ax_cv_debug; then : - - ax_cv_debug="y" - -fi -debug=$ax_cv_debug - - - - - - - - -for cflag in $PREPEND_INCLUDES -do - PREPEND_CFLAGS+=" -I$cflag" -done -for ldflag in $PREPEND_LIB -do - PREPEND_LDFLAGS+=" -L$ldflag" -done -for cflag in $APPEND_INCLUDES -do - APPEND_CFLAGS+=" -I$cflag" -done -for ldflag in $APPEND_LIB -do - APPEND_LDFLAGS+=" -L$ldflag" -done -CFLAGS="$PREPEND_CFLAGS $CFLAGS $APPEND_CFLAGS" -LDFLAGS="$PREPEND_LDFLAGS $LDFLAGS $APPEND_LDFLAGS" - - - - - - - - - - - - - - -# Checks for programs. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 -$as_echo_n "checking for a sed that does not truncate output... " >&6; } -if test "${ac_cv_path_SED+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ - for ac_i in 1 2 3 4 5 6 7; do - ac_script="$ac_script$as_nl$ac_script" - done - echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed - { ac_script=; unset ac_script;} - if test -z "$SED"; then - ac_path_SED_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue -# Check for GNU ac_path_SED and select it if it is found. - # Check for GNU $ac_path_SED -case `"$ac_path_SED" --version 2>&1` in -*GNU*) - ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo '' >> "conftest.nl" - "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_SED_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_SED="$ac_path_SED" - ac_path_SED_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_SED_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_SED"; then - as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 - fi -else - ac_cv_path_SED=$SED -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 -$as_echo "$ac_cv_path_SED" >&6; } - SED="$ac_cv_path_SED" - rm -f conftest.sed - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. -set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. -set dummy gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC - fi -else - CC="$ac_cv_prog_CC" -fi - -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - fi -fi -if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - ac_prog_rejected=no -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $ac_cv_prog_CC - shift - if test $# != 0; then - # We chose a different compiler from the bogus one. - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" - fi -fi -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - for ac_prog in cl.exe - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$CC" && break - done -fi -if test -z "$CC"; then - ac_ct_CC=$CC - for ac_prog in cl.exe -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$ac_ct_CC" && break -done - - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC - fi -fi - -fi - - -test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5 ; } - -# Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 -set X $ac_compile -ac_compiler=$2 -for ac_option in --version -v -V -qversion; do - { { ac_try="$ac_compiler $ac_option >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compiler $ac_option >&5") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - sed '10a\ -... rest of stderr output deleted ... - 10q' conftest.err >conftest.er1 - cat conftest.er1 >&5 - fi - rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -done - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 -$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ -#ifndef __GNUC__ - choke me -#endif - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_compiler_gnu=yes -else - ac_compiler_gnu=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_c_compiler_gnu=$ac_compiler_gnu - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 -$as_echo "$ac_cv_c_compiler_gnu" >&6; } -if test $ac_compiler_gnu = yes; then - GCC=yes -else - GCC= -fi -ac_test_CFLAGS=${CFLAGS+set} -ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 -$as_echo_n "checking whether $CC accepts -g... " >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_save_c_werror_flag=$ac_c_werror_flag - ac_c_werror_flag=yes - ac_cv_prog_cc_g=no - CFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_g=yes -else - CFLAGS="" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - -else - ac_c_werror_flag=$ac_save_c_werror_flag - CFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_g=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_c_werror_flag=$ac_save_c_werror_flag -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 -$as_echo "$ac_cv_prog_cc_g" >&6; } -if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS -elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then - CFLAGS="-g -O2" - else - CFLAGS="-g" - fi -else - if test "$GCC" = yes; then - CFLAGS="-O2" - else - CFLAGS= - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 -$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_prog_cc_c89=no -ac_save_CC=$CC -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include -#include -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} - -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; - -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters - inside strings and character constants. */ -#define FOO(x) 'x' -int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; - -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} -_ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ - -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -do - CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_c89=$ac_arg -fi -rm -f core conftest.err conftest.$ac_objext - test "x$ac_cv_prog_cc_c89" != "xno" && break -done -rm -f conftest.$ac_ext -CC=$ac_save_CC - -fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c89" in - x) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; - xno) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -$as_echo "unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 -$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; -esac -if test "x$ac_cv_prog_cc_c89" != xno; then : - -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 -$as_echo_n "checking whether ln -s works... " >&6; } -LN_S=$as_ln_s -if test "$LN_S" = "ln -s"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 -$as_echo "no, using $LN_S" >&6; } -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} @@ -6292,6 +4813,404 @@ if test x"${BASH}" == x"no" then as_fn_error $? "Unable to find bash, please install bash" "$LINENO" 5 fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 +$as_echo_n "checking how to run the C preprocessor... " >&6; } +# On Suns, sometimes $CPP names a directory. +if test -n "$CPP" && test -d "$CPP"; then + CPP= +fi +if test -z "$CPP"; then + if test "${ac_cv_prog_CPP+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + # Double quotes because CPP needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" + do + ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + +else + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue +else + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + break +fi + + done + ac_cv_prog_CPP=$CPP + +fi + CPP=$ac_cv_prog_CPP +else + ac_cv_prog_CPP=$CPP +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +$as_echo "$CPP" >&6; } +ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + +else + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue +else + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + +else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5 ; } +fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 +$as_echo_n "checking for grep that handles long lines and -e... " >&6; } +if test "${ac_cv_path_GREP+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$GREP"; then + ac_path_GREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue +# Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP +case `"$ac_path_GREP" --version 2>&1` in +*GNU*) + ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo 'GREP' >> "conftest.nl" + "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_GREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_GREP="$ac_path_GREP" + ac_path_GREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_GREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_GREP"; then + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi +else + ac_cv_path_GREP=$GREP +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 +$as_echo "$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 +$as_echo_n "checking for egrep... " >&6; } +if test "${ac_cv_path_EGREP+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 + then ac_cv_path_EGREP="$GREP -E" + else + if test -z "$EGREP"; then + ac_path_EGREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue +# Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP +case `"$ac_path_EGREP" --version 2>&1` in +*GNU*) + ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo 'EGREP' >> "conftest.nl" + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_EGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_EGREP="$ac_path_EGREP" + ac_path_EGREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_EGREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_EGREP"; then + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi +else + ac_cv_path_EGREP=$EGREP +fi + + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 +$as_echo "$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 +$as_echo_n "checking for ANSI C header files... " >&6; } +if test "${ac_cv_header_stdc+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#include +#include + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_header_stdc=yes +else + ac_cv_header_stdc=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "memchr" >/dev/null 2>&1; then : + +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "free" >/dev/null 2>&1; then : + +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + if test "$cross_compiling" = yes; then : + : +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif + +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int +main () +{ + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + return 2; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + +else + ac_cv_header_stdc=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 +$as_echo "$ac_cv_header_stdc" >&6; } +if test $ac_cv_header_stdc = yes; then + +$as_echo "#define STDC_HEADERS 1" >>confdefs.h + +fi + +# On IRIX 5.3, sys/types and inttypes.h are conflicting. +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default +" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + if test "x$pythontools" = "xy"; then : if echo "$PYTHON" | grep -q "^/"; then : @@ -7524,51 +6443,6 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5 -$as_echo_n "checking for clock_gettime in -lrt... " >&6; } -if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lrt $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char clock_gettime (); -int -main () -{ -return clock_gettime (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_rt_clock_gettime=yes -else - ac_cv_lib_rt_clock_gettime=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_gettime" >&5 -$as_echo "$ac_cv_lib_rt_clock_gettime" >&6; } -if test "x$ac_cv_lib_rt_clock_gettime" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBRT 1 -_ACEOF - - LIBS="-lrt $LIBS" - -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for yajl_alloc in -lyajl" >&5 $as_echo_n "checking for yajl_alloc in -lyajl... " >&6; } if test "${ac_cv_lib_yajl_yajl_alloc+set}" = set; then : @@ -7708,1875 +6582,16 @@ fi # Checks for header files. -# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works -# for constant arguments. Useless! -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5 -$as_echo_n "checking for working alloca.h... " >&6; } -if test "${ac_cv_working_alloca_h+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -char *p = (char *) alloca (2 * sizeof (int)); - if (p) return 0; - ; - return 0; -} +for ac_header in yajl/yajl_version.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "yajl/yajl_version.h" "ac_cv_header_yajl_yajl_version_h" "$ac_includes_default" +if test "x$ac_cv_header_yajl_yajl_version_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_YAJL_YAJL_VERSION_H 1 _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_working_alloca_h=yes -else - ac_cv_working_alloca_h=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5 -$as_echo "$ac_cv_working_alloca_h" >&6; } -if test $ac_cv_working_alloca_h = yes; then - -$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h - -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5 -$as_echo_n "checking for alloca... " >&6; } -if test "${ac_cv_func_alloca_works+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __GNUC__ -# define alloca __builtin_alloca -#else -# ifdef _MSC_VER -# include -# define alloca _alloca -# else -# ifdef HAVE_ALLOCA_H -# include -# else -# ifdef _AIX - #pragma alloca -# else -# ifndef alloca /* predefined by HP cc +Olibcalls */ -char *alloca (); -# endif -# endif -# endif -# endif -#endif - -int -main () -{ -char *p = (char *) alloca (1); - if (p) return 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_func_alloca_works=yes -else - ac_cv_func_alloca_works=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5 -$as_echo "$ac_cv_func_alloca_works" >&6; } - -if test $ac_cv_func_alloca_works = yes; then - -$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h - -else - # The SVR3 libPW and SVR4 libucb both contain incompatible functions -# that cause trouble. Some versions do not even contain alloca or -# contain a buggy version. If you still want to use their alloca, -# use ar to extract alloca.o from them instead of compiling alloca.c. - -ALLOCA=\${LIBOBJDIR}alloca.$ac_objext - -$as_echo "#define C_ALLOCA 1" >>confdefs.h - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5 -$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; } -if test "${ac_cv_os_cray+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#if defined CRAY && ! defined CRAY2 -webecray -#else -wenotbecray -#endif - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "webecray" >/dev/null 2>&1; then : - ac_cv_os_cray=yes -else - ac_cv_os_cray=no -fi -rm -f conftest* - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5 -$as_echo "$ac_cv_os_cray" >&6; } -if test $ac_cv_os_cray = yes; then - for ac_func in _getb67 GETB67 getb67; do - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - -cat >>confdefs.h <<_ACEOF -#define CRAY_STACKSEG_END $ac_func -_ACEOF - - break -fi - - done -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5 -$as_echo_n "checking stack direction for C alloca... " >&6; } -if test "${ac_cv_c_stack_direction+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - ac_cv_c_stack_direction=0 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_includes_default -int -find_stack_direction () -{ - static char *addr = 0; - auto char dummy; - if (addr == 0) - { - addr = &dummy; - return find_stack_direction (); - } - else - return (&dummy > addr) ? 1 : -1; -} - -int -main () -{ - return find_stack_direction () < 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - ac_cv_c_stack_direction=1 -else - ac_cv_c_stack_direction=-1 -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5 -$as_echo "$ac_cv_c_stack_direction" >&6; } -cat >>confdefs.h <<_ACEOF -#define STACK_DIRECTION $ac_cv_c_stack_direction -_ACEOF - - -fi - -for ac_header in \ - arpa/inet.h fcntl.h inttypes.h libintl.h limits.h malloc.h \ - netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h \ - strings.h sys/file.h sys/ioctl.h sys/mount.h sys/param.h \ - sys/socket.h sys/statvfs.h sys/time.h syslog.h termios.h \ - unistd.h yajl/yajl_version.h \ - -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - -# Checks for typedefs, structures, and compiler characteristics. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5 -$as_echo_n "checking for stdbool.h that conforms to C99... " >&6; } -if test "${ac_cv_header_stdbool_h+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include -#ifndef bool - "error: bool is not defined" -#endif -#ifndef false - "error: false is not defined" -#endif -#if false - "error: false is not 0" -#endif -#ifndef true - "error: true is not defined" -#endif -#if true != 1 - "error: true is not 1" -#endif -#ifndef __bool_true_false_are_defined - "error: __bool_true_false_are_defined is not defined" -#endif - - struct s { _Bool s: 1; _Bool t; } s; - - char a[true == 1 ? 1 : -1]; - char b[false == 0 ? 1 : -1]; - char c[__bool_true_false_are_defined == 1 ? 1 : -1]; - char d[(bool) 0.5 == true ? 1 : -1]; - bool e = &s; - char f[(_Bool) 0.0 == false ? 1 : -1]; - char g[true]; - char h[sizeof (_Bool)]; - char i[sizeof s.t]; - enum { j = false, k = true, l = false * true, m = true * 256 }; - /* The following fails for - HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */ - _Bool n[m]; - char o[sizeof n == m * sizeof n[0] ? 1 : -1]; - char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1]; -# if defined __xlc__ || defined __GNUC__ - /* Catch a bug in IBM AIX xlc compiler version 6.0.0.0 - reported by James Lemley on 2005-10-05; see - http://lists.gnu.org/archive/html/bug-coreutils/2005-10/msg00086.html - This test is not quite right, since xlc is allowed to - reject this program, as the initializer for xlcbug is - not one of the forms that C requires support for. - However, doing the test right would require a runtime - test, and that would make cross-compilation harder. - Let us hope that IBM fixes the xlc bug, and also adds - support for this kind of constant expression. In the - meantime, this test will reject xlc, which is OK, since - our stdbool.h substitute should suffice. We also test - this with GCC, where it should work, to detect more - quickly whether someone messes up the test in the - future. */ - char digs[] = "0123456789"; - int xlcbug = 1 / (&(digs + 5)[-2 + (bool) 1] == &digs[4] ? 1 : -1); -# endif - /* Catch a bug in an HP-UX C compiler. See - http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html - http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html - */ - _Bool q = true; - _Bool *pq = &q; - -int -main () -{ - - *pq |= q; - *pq |= ! q; - /* Refer to every declared value, to avoid compiler optimizations. */ - return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l - + !m + !n + !o + !p + !q + !pq); - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_stdbool_h=yes -else - ac_cv_header_stdbool_h=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5 -$as_echo "$ac_cv_header_stdbool_h" >&6; } -ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default" -if test "x$ac_cv_type__Bool" = x""yes; then : - -cat >>confdefs.h <<_ACEOF -#define HAVE__BOOL 1 -_ACEOF - - -fi - -if test $ac_cv_header_stdbool_h = yes; then - -$as_echo "#define HAVE_STDBOOL_H 1" >>confdefs.h - -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5 -$as_echo_n "checking for uid_t in sys/types.h... " >&6; } -if test "${ac_cv_type_uid_t+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "uid_t" >/dev/null 2>&1; then : - ac_cv_type_uid_t=yes -else - ac_cv_type_uid_t=no -fi -rm -f conftest* - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5 -$as_echo "$ac_cv_type_uid_t" >&6; } -if test $ac_cv_type_uid_t = no; then - -$as_echo "#define uid_t int" >>confdefs.h - - -$as_echo "#define gid_t int" >>confdefs.h - -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 -$as_echo_n "checking for inline... " >&6; } -if test "${ac_cv_c_inline+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_c_inline=no -for ac_kw in inline __inline__ __inline; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifndef __cplusplus -typedef int foo_t; -static $ac_kw foo_t static_foo () {return 0; } -$ac_kw foo_t foo () {return 0; } -#endif - -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_c_inline=$ac_kw -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - test "$ac_cv_c_inline" != no && break -done - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5 -$as_echo "$ac_cv_c_inline" >&6; } - -case $ac_cv_c_inline in - inline | yes) ;; - *) - case $ac_cv_c_inline in - no) ac_val=;; - *) ac_val=$ac_cv_c_inline;; - esac - cat >>confdefs.h <<_ACEOF -#ifndef __cplusplus -#define inline $ac_val -#endif -_ACEOF - ;; -esac - -ac_fn_c_find_intX_t "$LINENO" "16" "ac_cv_c_int16_t" -case $ac_cv_c_int16_t in #( - no|yes) ;; #( - *) - -cat >>confdefs.h <<_ACEOF -#define int16_t $ac_cv_c_int16_t -_ACEOF -;; -esac - -ac_fn_c_find_intX_t "$LINENO" "32" "ac_cv_c_int32_t" -case $ac_cv_c_int32_t in #( - no|yes) ;; #( - *) - -cat >>confdefs.h <<_ACEOF -#define int32_t $ac_cv_c_int32_t -_ACEOF -;; -esac - -ac_fn_c_find_intX_t "$LINENO" "64" "ac_cv_c_int64_t" -case $ac_cv_c_int64_t in #( - no|yes) ;; #( - *) - -cat >>confdefs.h <<_ACEOF -#define int64_t $ac_cv_c_int64_t -_ACEOF -;; -esac - -ac_fn_c_find_intX_t "$LINENO" "8" "ac_cv_c_int8_t" -case $ac_cv_c_int8_t in #( - no|yes) ;; #( - *) - -cat >>confdefs.h <<_ACEOF -#define int8_t $ac_cv_c_int8_t -_ACEOF -;; -esac - -ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default" -if test "x$ac_cv_type_mode_t" = x""yes; then : - -else - -cat >>confdefs.h <<_ACEOF -#define mode_t int -_ACEOF - -fi - -ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default" -if test "x$ac_cv_type_off_t" = x""yes; then : - -else - -cat >>confdefs.h <<_ACEOF -#define off_t long int -_ACEOF - -fi - -ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default" -if test "x$ac_cv_type_pid_t" = x""yes; then : - -else - -cat >>confdefs.h <<_ACEOF -#define pid_t int -_ACEOF - -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C/C++ restrict keyword" >&5 -$as_echo_n "checking for C/C++ restrict keyword... " >&6; } -if test "${ac_cv_c_restrict+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_c_restrict=no - # The order here caters to the fact that C++ does not require restrict. - for ac_kw in __restrict __restrict__ _Restrict restrict; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -typedef int * int_ptr; - int foo (int_ptr $ac_kw ip) { - return ip[0]; - } -int -main () -{ -int s[1]; - int * $ac_kw t = s; - t[0] = 0; - return foo(t) - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_c_restrict=$ac_kw -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - test "$ac_cv_c_restrict" != no && break - done - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_restrict" >&5 -$as_echo "$ac_cv_c_restrict" >&6; } - - case $ac_cv_c_restrict in - restrict) ;; - no) $as_echo "#define restrict /**/" >>confdefs.h - ;; - *) cat >>confdefs.h <<_ACEOF -#define restrict $ac_cv_c_restrict -_ACEOF - ;; - esac - -ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" -if test "x$ac_cv_type_size_t" = x""yes; then : - -else - -cat >>confdefs.h <<_ACEOF -#define size_t unsigned int -_ACEOF - -fi - -ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default" -if test "x$ac_cv_type_ssize_t" = x""yes; then : - -else - -cat >>confdefs.h <<_ACEOF -#define ssize_t int -_ACEOF - -fi - -ac_fn_c_check_member "$LINENO" "struct stat" "st_blksize" "ac_cv_member_struct_stat_st_blksize" "$ac_includes_default" -if test "x$ac_cv_member_struct_stat_st_blksize" = x""yes; then : - -cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_STAT_ST_BLKSIZE 1 -_ACEOF - - -fi - -ac_fn_c_check_member "$LINENO" "struct stat" "st_blocks" "ac_cv_member_struct_stat_st_blocks" "$ac_includes_default" -if test "x$ac_cv_member_struct_stat_st_blocks" = x""yes; then : - -cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_STAT_ST_BLOCKS 1 -_ACEOF - - -$as_echo "#define HAVE_ST_BLOCKS 1" >>confdefs.h - -else - case " $LIBOBJS " in - *" fileblocks.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS fileblocks.$ac_objext" - ;; -esac - -fi - - -ac_fn_c_check_member "$LINENO" "struct stat" "st_rdev" "ac_cv_member_struct_stat_st_rdev" "$ac_includes_default" -if test "x$ac_cv_member_struct_stat_st_rdev" = x""yes; then : - -cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_STAT_ST_RDEV 1 -_ACEOF - - -fi - -ac_fn_c_find_uintX_t "$LINENO" "16" "ac_cv_c_uint16_t" -case $ac_cv_c_uint16_t in #( - no|yes) ;; #( - *) - - -cat >>confdefs.h <<_ACEOF -#define uint16_t $ac_cv_c_uint16_t -_ACEOF -;; - esac - -ac_fn_c_find_uintX_t "$LINENO" "32" "ac_cv_c_uint32_t" -case $ac_cv_c_uint32_t in #( - no|yes) ;; #( - *) - -$as_echo "#define _UINT32_T 1" >>confdefs.h - - -cat >>confdefs.h <<_ACEOF -#define uint32_t $ac_cv_c_uint32_t -_ACEOF -;; - esac - -ac_fn_c_find_uintX_t "$LINENO" "64" "ac_cv_c_uint64_t" -case $ac_cv_c_uint64_t in #( - no|yes) ;; #( - *) - -$as_echo "#define _UINT64_T 1" >>confdefs.h - - -cat >>confdefs.h <<_ACEOF -#define uint64_t $ac_cv_c_uint64_t -_ACEOF -;; - esac - -ac_fn_c_find_uintX_t "$LINENO" "8" "ac_cv_c_uint8_t" -case $ac_cv_c_uint8_t in #( - no|yes) ;; #( - *) - -$as_echo "#define _UINT8_T 1" >>confdefs.h - - -cat >>confdefs.h <<_ACEOF -#define uint8_t $ac_cv_c_uint8_t -_ACEOF -;; - esac - -ac_fn_c_check_type "$LINENO" "ptrdiff_t" "ac_cv_type_ptrdiff_t" "$ac_includes_default" -if test "x$ac_cv_type_ptrdiff_t" = x""yes; then : - -cat >>confdefs.h <<_ACEOF -#define HAVE_PTRDIFF_T 1 -_ACEOF - - -fi - - -# Checks for library functions. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for error_at_line" >&5 -$as_echo_n "checking for error_at_line... " >&6; } -if test "${ac_cv_lib_error_at_line+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -error_at_line (0, 0, "", 0, "an error occurred"); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_error_at_line=yes -else - ac_cv_lib_error_at_line=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_error_at_line" >&5 -$as_echo "$ac_cv_lib_error_at_line" >&6; } -if test $ac_cv_lib_error_at_line = no; then - case " $LIBOBJS " in - *" error.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS error.$ac_objext" - ;; -esac - -fi - -for ac_header in vfork.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "vfork.h" "ac_cv_header_vfork_h" "$ac_includes_default" -if test "x$ac_cv_header_vfork_h" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_VFORK_H 1 -_ACEOF - -fi - -done - -for ac_func in fork vfork -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done - -if test "x$ac_cv_func_fork" = xyes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working fork" >&5 -$as_echo_n "checking for working fork... " >&6; } -if test "${ac_cv_func_fork_works+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - ac_cv_func_fork_works=cross -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ - - /* By Ruediger Kuhlmann. */ - return fork () < 0; - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - ac_cv_func_fork_works=yes -else - ac_cv_func_fork_works=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_fork_works" >&5 -$as_echo "$ac_cv_func_fork_works" >&6; } - -else - ac_cv_func_fork_works=$ac_cv_func_fork -fi -if test "x$ac_cv_func_fork_works" = xcross; then - case $host in - *-*-amigaos* | *-*-msdosdjgpp*) - # Override, as these systems have only a dummy fork() stub - ac_cv_func_fork_works=no - ;; - *) - ac_cv_func_fork_works=yes - ;; - esac - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&5 -$as_echo "$as_me: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&2;} -fi -ac_cv_func_vfork_works=$ac_cv_func_vfork -if test "x$ac_cv_func_vfork" = xyes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working vfork" >&5 -$as_echo_n "checking for working vfork... " >&6; } -if test "${ac_cv_func_vfork_works+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - ac_cv_func_vfork_works=cross -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -/* Thanks to Paul Eggert for this test. */ -$ac_includes_default -#include -#ifdef HAVE_VFORK_H -# include -#endif -/* On some sparc systems, changes by the child to local and incoming - argument registers are propagated back to the parent. The compiler - is told about this with #include , but some compilers - (e.g. gcc -O) don't grok . Test for this by using a - static variable whose address is put into a register that is - clobbered by the vfork. */ -static void -#ifdef __cplusplus -sparc_address_test (int arg) -# else -sparc_address_test (arg) int arg; -#endif -{ - static pid_t child; - if (!child) { - child = vfork (); - if (child < 0) { - perror ("vfork"); - _exit(2); - } - if (!child) { - arg = getpid(); - write(-1, "", 0); - _exit (arg); - } - } -} - -int -main () -{ - pid_t parent = getpid (); - pid_t child; - - sparc_address_test (0); - - child = vfork (); - - if (child == 0) { - /* Here is another test for sparc vfork register problems. This - test uses lots of local variables, at least as many local - variables as main has allocated so far including compiler - temporaries. 4 locals are enough for gcc 1.40.3 on a Solaris - 4.1.3 sparc, but we use 8 to be safe. A buggy compiler should - reuse the register of parent for one of the local variables, - since it will think that parent can't possibly be used any more - in this routine. Assigning to the local variable will thus - munge parent in the parent process. */ - pid_t - p = getpid(), p1 = getpid(), p2 = getpid(), p3 = getpid(), - p4 = getpid(), p5 = getpid(), p6 = getpid(), p7 = getpid(); - /* Convince the compiler that p..p7 are live; otherwise, it might - use the same hardware register for all 8 local variables. */ - if (p != p1 || p != p2 || p != p3 || p != p4 - || p != p5 || p != p6 || p != p7) - _exit(1); - - /* On some systems (e.g. IRIX 3.3), vfork doesn't separate parent - from child file descriptors. If the child closes a descriptor - before it execs or exits, this munges the parent's descriptor - as well. Test for this by closing stdout in the child. */ - _exit(close(fileno(stdout)) != 0); - } else { - int status; - struct stat st; - - while (wait(&status) != child) - ; - return ( - /* Was there some problem with vforking? */ - child < 0 - - /* Did the child fail? (This shouldn't happen.) */ - || status - - /* Did the vfork/compiler bug occur? */ - || parent != getpid() - - /* Did the file descriptor bug occur? */ - || fstat(fileno(stdout), &st) != 0 - ); - } -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - ac_cv_func_vfork_works=yes -else - ac_cv_func_vfork_works=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_vfork_works" >&5 -$as_echo "$ac_cv_func_vfork_works" >&6; } - -fi; -if test "x$ac_cv_func_fork_works" = xcross; then - ac_cv_func_vfork_works=$ac_cv_func_vfork - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&5 -$as_echo "$as_me: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&2;} -fi - -if test "x$ac_cv_func_vfork_works" = xyes; then - -$as_echo "#define HAVE_WORKING_VFORK 1" >>confdefs.h - -else - -$as_echo "#define vfork fork" >>confdefs.h - -fi -if test "x$ac_cv_func_fork_works" = xyes; then - -$as_echo "#define HAVE_WORKING_FORK 1" >>confdefs.h - -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value needed for large files" >&5 -$as_echo_n "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; } -if test "${ac_cv_sys_largefile_source+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - while :; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include /* for off_t */ - #include -int -main () -{ -int (*fp) (FILE *, off_t, int) = fseeko; - return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_sys_largefile_source=no; break -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#define _LARGEFILE_SOURCE 1 -#include /* for off_t */ - #include -int -main () -{ -int (*fp) (FILE *, off_t, int) = fseeko; - return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_sys_largefile_source=1; break -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - ac_cv_sys_largefile_source=unknown - break -done -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_source" >&5 -$as_echo "$ac_cv_sys_largefile_source" >&6; } -case $ac_cv_sys_largefile_source in #( - no | unknown) ;; - *) -cat >>confdefs.h <<_ACEOF -#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source -_ACEOF -;; -esac -rm -rf conftest* - -# We used to try defining _XOPEN_SOURCE=500 too, to work around a bug -# in glibc 2.1.3, but that breaks too many other things. -# If you want fseeko and ftello with glibc, upgrade to a fixed glibc. -if test $ac_cv_sys_largefile_source != unknown; then - -$as_echo "#define HAVE_FSEEKO 1" >>confdefs.h - -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5 -$as_echo_n "checking whether lstat correctly handles trailing slash... " >&6; } -if test "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - rm -f conftest.sym conftest.file -echo >conftest.file -if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then - if test "$cross_compiling" = yes; then : - ac_cv_func_lstat_dereferences_slashed_symlink=no -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -struct stat sbuf; - /* Linux will dereference the symlink and fail, as required by POSIX. - That is better in the sense that it means we will not - have to compile and use the lstat wrapper. */ - return lstat ("conftest.sym/", &sbuf) == 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - ac_cv_func_lstat_dereferences_slashed_symlink=yes -else - ac_cv_func_lstat_dereferences_slashed_symlink=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -else - # If the `ln -s' command failed, then we probably don't even - # have an lstat function. - ac_cv_func_lstat_dereferences_slashed_symlink=no -fi -rm -f conftest.sym conftest.file - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5 -$as_echo "$ac_cv_func_lstat_dereferences_slashed_symlink" >&6; } - -test $ac_cv_func_lstat_dereferences_slashed_symlink = yes && - -cat >>confdefs.h <<_ACEOF -#define LSTAT_FOLLOWS_SLASHED_SYMLINK 1 -_ACEOF - - -if test "x$ac_cv_func_lstat_dereferences_slashed_symlink" = xno; then - case " $LIBOBJS " in - *" lstat.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS lstat.$ac_objext" - ;; -esac - -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether sys/types.h defines makedev" >&5 -$as_echo_n "checking whether sys/types.h defines makedev... " >&6; } -if test "${ac_cv_header_sys_types_h_makedev+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -return makedev(0, 0); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_header_sys_types_h_makedev=yes -else - ac_cv_header_sys_types_h_makedev=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_types_h_makedev" >&5 -$as_echo "$ac_cv_header_sys_types_h_makedev" >&6; } - -if test $ac_cv_header_sys_types_h_makedev = no; then -ac_fn_c_check_header_mongrel "$LINENO" "sys/mkdev.h" "ac_cv_header_sys_mkdev_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_mkdev_h" = x""yes; then : - -$as_echo "#define MAJOR_IN_MKDEV 1" >>confdefs.h - -fi - - - - if test $ac_cv_header_sys_mkdev_h = no; then - ac_fn_c_check_header_mongrel "$LINENO" "sys/sysmacros.h" "ac_cv_header_sys_sysmacros_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_sysmacros_h" = x""yes; then : - -$as_echo "#define MAJOR_IN_SYSMACROS 1" >>confdefs.h - -fi - - - fi -fi - -for ac_header in stdlib.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default" -if test "x$ac_cv_header_stdlib_h" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_STDLIB_H 1 -_ACEOF - -fi - -done - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5 -$as_echo_n "checking for GNU libc compatible malloc... " >&6; } -if test "${ac_cv_func_malloc_0_nonnull+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - ac_cv_func_malloc_0_nonnull=no -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#if defined STDC_HEADERS || defined HAVE_STDLIB_H -# include -#else -char *malloc (); -#endif - -int -main () -{ -return ! malloc (0); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - ac_cv_func_malloc_0_nonnull=yes -else - ac_cv_func_malloc_0_nonnull=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5 -$as_echo "$ac_cv_func_malloc_0_nonnull" >&6; } -if test $ac_cv_func_malloc_0_nonnull = yes; then : - -$as_echo "#define HAVE_MALLOC 1" >>confdefs.h - -else - $as_echo "#define HAVE_MALLOC 0" >>confdefs.h - - case " $LIBOBJS " in - *" malloc.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS malloc.$ac_objext" - ;; -esac - - -$as_echo "#define malloc rpl_malloc" >>confdefs.h - -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5 -$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; } -if test "${ac_cv_header_time+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include - -int -main () -{ -if ((struct tm *) 0) -return 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_time=yes -else - ac_cv_header_time=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5 -$as_echo "$ac_cv_header_time" >&6; } -if test $ac_cv_header_time = yes; then - -$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h - -fi - - - - - for ac_header in $ac_header_list -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default -" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - - - - - - - - for ac_func in $ac_func_list -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mktime" >&5 -$as_echo_n "checking for working mktime... " >&6; } -if test "${ac_cv_func_working_mktime+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - ac_cv_func_working_mktime=no -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -/* Test program from Paul Eggert and Tony Leneis. */ -#ifdef TIME_WITH_SYS_TIME -# include -# include -#else -# ifdef HAVE_SYS_TIME_H -# include -# else -# include -# endif -#endif - -#include -#include - -#ifdef HAVE_UNISTD_H -# include -#endif - -#ifndef HAVE_ALARM -# define alarm(X) /* empty */ -#endif - -/* Work around redefinition to rpl_putenv by other config tests. */ -#undef putenv - -static time_t time_t_max; -static time_t time_t_min; - -/* Values we'll use to set the TZ environment variable. */ -static const char *tz_strings[] = { - (const char *) 0, "TZ=GMT0", "TZ=JST-9", - "TZ=EST+3EDT+2,M10.1.0/00:00:00,M2.3.0/00:00:00" -}; -#define N_STRINGS (sizeof (tz_strings) / sizeof (tz_strings[0])) - -/* Return 0 if mktime fails to convert a date in the spring-forward gap. - Based on a problem report from Andreas Jaeger. */ -static int -spring_forward_gap () -{ - /* glibc (up to about 1998-10-07) failed this test. */ - struct tm tm; - - /* Use the portable POSIX.1 specification "TZ=PST8PDT,M4.1.0,M10.5.0" - instead of "TZ=America/Vancouver" in order to detect the bug even - on systems that don't support the Olson extension, or don't have the - full zoneinfo tables installed. */ - putenv ((char*) "TZ=PST8PDT,M4.1.0,M10.5.0"); - - tm.tm_year = 98; - tm.tm_mon = 3; - tm.tm_mday = 5; - tm.tm_hour = 2; - tm.tm_min = 0; - tm.tm_sec = 0; - tm.tm_isdst = -1; - return mktime (&tm) != (time_t) -1; -} - -static int -mktime_test1 (time_t now) -{ - struct tm *lt; - return ! (lt = localtime (&now)) || mktime (lt) == now; -} - -static int -mktime_test (time_t now) -{ - return (mktime_test1 (now) - && mktime_test1 ((time_t) (time_t_max - now)) - && mktime_test1 ((time_t) (time_t_min + now))); -} - -static int -irix_6_4_bug () -{ - /* Based on code from Ariel Faigon. */ - struct tm tm; - tm.tm_year = 96; - tm.tm_mon = 3; - tm.tm_mday = 0; - tm.tm_hour = 0; - tm.tm_min = 0; - tm.tm_sec = 0; - tm.tm_isdst = -1; - mktime (&tm); - return tm.tm_mon == 2 && tm.tm_mday == 31; -} - -static int -bigtime_test (int j) -{ - struct tm tm; - time_t now; - tm.tm_year = tm.tm_mon = tm.tm_mday = tm.tm_hour = tm.tm_min = tm.tm_sec = j; - now = mktime (&tm); - if (now != (time_t) -1) - { - struct tm *lt = localtime (&now); - if (! (lt - && lt->tm_year == tm.tm_year - && lt->tm_mon == tm.tm_mon - && lt->tm_mday == tm.tm_mday - && lt->tm_hour == tm.tm_hour - && lt->tm_min == tm.tm_min - && lt->tm_sec == tm.tm_sec - && lt->tm_yday == tm.tm_yday - && lt->tm_wday == tm.tm_wday - && ((lt->tm_isdst < 0 ? -1 : 0 < lt->tm_isdst) - == (tm.tm_isdst < 0 ? -1 : 0 < tm.tm_isdst)))) - return 0; - } - return 1; -} - -static int -year_2050_test () -{ - /* The correct answer for 2050-02-01 00:00:00 in Pacific time, - ignoring leap seconds. */ - unsigned long int answer = 2527315200UL; - - struct tm tm; - time_t t; - tm.tm_year = 2050 - 1900; - tm.tm_mon = 2 - 1; - tm.tm_mday = 1; - tm.tm_hour = tm.tm_min = tm.tm_sec = 0; - tm.tm_isdst = -1; - - /* Use the portable POSIX.1 specification "TZ=PST8PDT,M4.1.0,M10.5.0" - instead of "TZ=America/Vancouver" in order to detect the bug even - on systems that don't support the Olson extension, or don't have the - full zoneinfo tables installed. */ - putenv ((char*) "TZ=PST8PDT,M4.1.0,M10.5.0"); - - t = mktime (&tm); - - /* Check that the result is either a failure, or close enough - to the correct answer that we can assume the discrepancy is - due to leap seconds. */ - return (t == (time_t) -1 - || (0 < t && answer - 120 <= t && t <= answer + 120)); -} - -int -main () -{ - time_t t, delta; - int i, j; - - /* This test makes some buggy mktime implementations loop. - Give up after 60 seconds; a mktime slower than that - isn't worth using anyway. */ - alarm (60); - - for (;;) - { - t = (time_t_max << 1) + 1; - if (t <= time_t_max) - break; - time_t_max = t; - } - time_t_min = - ((time_t) ~ (time_t) 0 == (time_t) -1) - time_t_max; - - delta = time_t_max / 997; /* a suitable prime number */ - for (i = 0; i < N_STRINGS; i++) - { - if (tz_strings[i]) - putenv ((char*) tz_strings[i]); - - for (t = 0; t <= time_t_max - delta; t += delta) - if (! mktime_test (t)) - return 1; - if (! (mktime_test ((time_t) 1) - && mktime_test ((time_t) (60 * 60)) - && mktime_test ((time_t) (60 * 60 * 24)))) - return 1; - - for (j = 1; ; j <<= 1) - if (! bigtime_test (j)) - return 1; - else if (INT_MAX / 2 < j) - break; - if (! bigtime_test (INT_MAX)) - return 1; - } - return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ()); -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - ac_cv_func_working_mktime=yes -else - ac_cv_func_working_mktime=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_working_mktime" >&5 -$as_echo "$ac_cv_func_working_mktime" >&6; } -if test $ac_cv_func_working_mktime = no; then - case " $LIBOBJS " in - *" mktime.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS mktime.$ac_objext" - ;; -esac - -fi - - - - - - -for ac_func in getpagesize -do : - ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize" -if test "x$ac_cv_func_getpagesize" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_GETPAGESIZE 1 -_ACEOF - -fi -done - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5 -$as_echo_n "checking for working mmap... " >&6; } -if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - ac_cv_func_mmap_fixed_mapped=no -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_includes_default -/* malloc might have been renamed as rpl_malloc. */ -#undef malloc - -/* Thanks to Mike Haertel and Jim Avera for this test. - Here is a matrix of mmap possibilities: - mmap private not fixed - mmap private fixed at somewhere currently unmapped - mmap private fixed at somewhere already mapped - mmap shared not fixed - mmap shared fixed at somewhere currently unmapped - mmap shared fixed at somewhere already mapped - For private mappings, we should verify that changes cannot be read() - back from the file, nor mmap's back from the file at a different - address. (There have been systems where private was not correctly - implemented like the infamous i386 svr4.0, and systems where the - VM page cache was not coherent with the file system buffer cache - like early versions of FreeBSD and possibly contemporary NetBSD.) - For shared mappings, we should conversely verify that changes get - propagated back to all the places they're supposed to be. - - Grep wants private fixed already mapped. - The main things grep needs to know about mmap are: - * does it exist and is it safe to write into the mmap'd area - * how to use it (BSD variants) */ - -#include -#include - -#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H -char *malloc (); -#endif - -/* This mess was copied from the GNU getpagesize.h. */ -#ifndef HAVE_GETPAGESIZE -# ifdef _SC_PAGESIZE -# define getpagesize() sysconf(_SC_PAGESIZE) -# else /* no _SC_PAGESIZE */ -# ifdef HAVE_SYS_PARAM_H -# include -# ifdef EXEC_PAGESIZE -# define getpagesize() EXEC_PAGESIZE -# else /* no EXEC_PAGESIZE */ -# ifdef NBPG -# define getpagesize() NBPG * CLSIZE -# ifndef CLSIZE -# define CLSIZE 1 -# endif /* no CLSIZE */ -# else /* no NBPG */ -# ifdef NBPC -# define getpagesize() NBPC -# else /* no NBPC */ -# ifdef PAGESIZE -# define getpagesize() PAGESIZE -# endif /* PAGESIZE */ -# endif /* no NBPC */ -# endif /* no NBPG */ -# endif /* no EXEC_PAGESIZE */ -# else /* no HAVE_SYS_PARAM_H */ -# define getpagesize() 8192 /* punt totally */ -# endif /* no HAVE_SYS_PARAM_H */ -# endif /* no _SC_PAGESIZE */ - -#endif /* no HAVE_GETPAGESIZE */ - -int -main () -{ - char *data, *data2, *data3; - const char *cdata2; - int i, pagesize; - int fd, fd2; - - pagesize = getpagesize (); - - /* First, make a file with some known garbage in it. */ - data = (char *) malloc (pagesize); - if (!data) - return 1; - for (i = 0; i < pagesize; ++i) - *(data + i) = rand (); - umask (0); - fd = creat ("conftest.mmap", 0600); - if (fd < 0) - return 2; - if (write (fd, data, pagesize) != pagesize) - return 3; - close (fd); - - /* Next, check that the tail of a page is zero-filled. File must have - non-zero length, otherwise we risk SIGBUS for entire page. */ - fd2 = open ("conftest.txt", O_RDWR | O_CREAT | O_TRUNC, 0600); - if (fd2 < 0) - return 4; - cdata2 = ""; - if (write (fd2, cdata2, 1) != 1) - return 5; - data2 = (char *) mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L); - if (data2 == MAP_FAILED) - return 6; - for (i = 0; i < pagesize; ++i) - if (*(data2 + i)) - return 7; - close (fd2); - if (munmap (data2, pagesize)) - return 8; - - /* Next, try to mmap the file at a fixed address which already has - something else allocated at it. If we can, also make sure that - we see the same garbage. */ - fd = open ("conftest.mmap", O_RDWR); - if (fd < 0) - return 9; - if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_FIXED, fd, 0L)) - return 10; - for (i = 0; i < pagesize; ++i) - if (*(data + i) != *(data2 + i)) - return 11; - - /* Finally, make sure that changes to the mapped area do not - percolate back to the file as seen by read(). (This is a bug on - some variants of i386 svr4.0.) */ - for (i = 0; i < pagesize; ++i) - *(data2 + i) = *(data2 + i) + 1; - data3 = (char *) malloc (pagesize); - if (!data3) - return 12; - if (read (fd, data3, pagesize) != pagesize) - return 13; - for (i = 0; i < pagesize; ++i) - if (*(data + i) != *(data3 + i)) - return 14; - close (fd); - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - ac_cv_func_mmap_fixed_mapped=yes -else - ac_cv_func_mmap_fixed_mapped=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mmap_fixed_mapped" >&5 -$as_echo "$ac_cv_func_mmap_fixed_mapped" >&6; } -if test $ac_cv_func_mmap_fixed_mapped = yes; then - -$as_echo "#define HAVE_MMAP 1" >>confdefs.h - -fi -rm -f conftest.mmap conftest.txt - -for ac_header in stdlib.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default" -if test "x$ac_cv_header_stdlib_h" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_STDLIB_H 1 -_ACEOF - -fi - -done - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible realloc" >&5 -$as_echo_n "checking for GNU libc compatible realloc... " >&6; } -if test "${ac_cv_func_realloc_0_nonnull+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - ac_cv_func_realloc_0_nonnull=no -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#if defined STDC_HEADERS || defined HAVE_STDLIB_H -# include -#else -char *realloc (); -#endif - -int -main () -{ -return ! realloc (0, 0); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - ac_cv_func_realloc_0_nonnull=yes -else - ac_cv_func_realloc_0_nonnull=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_realloc_0_nonnull" >&5 -$as_echo "$ac_cv_func_realloc_0_nonnull" >&6; } -if test $ac_cv_func_realloc_0_nonnull = yes; then : - -$as_echo "#define HAVE_REALLOC 1" >>confdefs.h - -else - $as_echo "#define HAVE_REALLOC 0" >>confdefs.h - - case " $LIBOBJS " in - *" realloc.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS realloc.$ac_objext" - ;; -esac - - -$as_echo "#define realloc rpl_realloc" >>confdefs.h - -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strnlen" >&5 -$as_echo_n "checking for working strnlen... " >&6; } -if test "${ac_cv_func_strnlen_working+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - ac_cv_func_strnlen_working=no -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ - -#define S "foobar" -#define S_LEN (sizeof S - 1) - - /* At least one implementation is buggy: that of AIX 4.3 would - give strnlen (S, 1) == 3. */ - - int i; - for (i = 0; i < S_LEN + 1; ++i) - { - int expected = i <= S_LEN ? i : S_LEN; - if (strnlen (S, i) != expected) - return 1; - } - return 0; - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - ac_cv_func_strnlen_working=yes -else - ac_cv_func_strnlen_working=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strnlen_working" >&5 -$as_echo "$ac_cv_func_strnlen_working" >&6; } -test $ac_cv_func_strnlen_working = no && case " $LIBOBJS " in - *" strnlen.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS strnlen.$ac_objext" - ;; -esac - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strtod" >&5 -$as_echo_n "checking for working strtod... " >&6; } -if test "${ac_cv_func_strtod+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - ac_cv_func_strtod=no -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -$ac_includes_default -#ifndef strtod -double strtod (); -#endif -int -main() -{ - { - /* Some versions of Linux strtod mis-parse strings with leading '+'. */ - char *string = " +69"; - char *term; - double value; - value = strtod (string, &term); - if (value != 69 || term != (string + 4)) - return 1; - } - - { - /* Under Solaris 2.4, strtod returns the wrong value for the - terminating character under some conditions. */ - char *string = "NaN"; - char *term; - strtod (string, &term); - if (term != string && *(term - 1) == 0) - return 1; - } - return 0; -} - -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - ac_cv_func_strtod=yes -else - ac_cv_func_strtod=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strtod" >&5 -$as_echo "$ac_cv_func_strtod" >&6; } -if test $ac_cv_func_strtod = no; then - case " $LIBOBJS " in - *" strtod.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS strtod.$ac_objext" - ;; -esac - -ac_fn_c_check_func "$LINENO" "pow" "ac_cv_func_pow" -if test "x$ac_cv_func_pow" = x""yes; then : - -fi - -if test $ac_cv_func_pow = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pow in -lm" >&5 -$as_echo_n "checking for pow in -lm... " >&6; } -if test "${ac_cv_lib_m_pow+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lm $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char pow (); -int -main () -{ -return pow (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_m_pow=yes -else - ac_cv_lib_m_pow=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_pow" >&5 -$as_echo "$ac_cv_lib_m_pow" >&6; } -if test "x$ac_cv_lib_m_pow" = x""yes; then : - POW_LIB=-lm -else - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot find library containing definition of pow" >&5 -$as_echo "$as_me: WARNING: cannot find library containing definition of pow" >&2;} -fi - -fi - -fi - -for ac_func in \ - alarm atexit bzero clock_gettime dup2 fdatasync ftruncate \ - getcwd gethostbyname gethostname getpagesize gettimeofday \ - inet_ntoa isascii localtime_r memchr memmove memset mkdir \ - mkfifo munmap pathconf realpath regcomp rmdir select setenv \ - socket strcasecmp strchr strcspn strdup strerror strndup \ - strpbrk strrchr strspn strstr strtol strtoul strtoull tzset \ - uname \ - -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi + +fi + done diff -r e3371fc765b1 -r 078c7d4cde1d tools/configure.ac --- a/tools/configure.ac Fri May 11 18:58:56 2012 +0100 +++ b/tools/configure.ac Fri May 11 18:58:57 2012 +0100 @@ -19,9 +19,6 @@ recommended, use PREPEND_INCLUDES, PREPE APPEND_INCLUDES and APPEND_LIB instead when possible.]) ]) -AC_USE_SYSTEM_EXTENSIONS -AC_CANONICAL_HOST - # M4 Macro includes m4_include([m4/savevar.m4]) m4_include([m4/features.m4]) @@ -75,9 +72,7 @@ AC_ARG_VAR([BCC], [Path to bcc tool]) AC_ARG_VAR([IASL], [Path to iasl tool]) # Checks for programs. -AC_PROG_SED AC_PROG_CC -AC_PROG_LN_S AC_PROG_MAKE_SET AC_PROG_INSTALL AC_PATH_PROG([BISON], [bison]) @@ -137,7 +132,6 @@ AC_SUBST(libext2fs) AC_CHECK_LIB([gcrypt], [gcry_md_hash_buffer], [libgcrypt="y"], [libgcrypt="n"]) AC_SUBST(libgcrypt) AX_CHECK_PTHREAD -AC_CHECK_LIB([rt], [clock_gettime]) AC_CHECK_LIB([yajl], [yajl_alloc], [], [AC_MSG_ERROR([Could not find yajl])]) AC_CHECK_LIB([z], [deflateCopy], [], [AC_MSG_ERROR([Could not find zlib])]) @@ -145,58 +139,6 @@ AC_CHECK_LIB([iconv], [libiconv_open], [ AC_SUBST(libiconv) # Checks for header files. -AC_FUNC_ALLOCA -AC_CHECK_HEADERS([ \ - arpa/inet.h fcntl.h inttypes.h libintl.h limits.h malloc.h \ - netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h \ - strings.h sys/file.h sys/ioctl.h sys/mount.h sys/param.h \ - sys/socket.h sys/statvfs.h sys/time.h syslog.h termios.h \ - unistd.h yajl/yajl_version.h \ - ]) - -# Checks for typedefs, structures, and compiler characteristics. -AC_HEADER_STDBOOL -AC_TYPE_UID_T -AC_C_INLINE -AC_TYPE_INT16_T -AC_TYPE_INT32_T -AC_TYPE_INT64_T -AC_TYPE_INT8_T -AC_TYPE_MODE_T -AC_TYPE_OFF_T -AC_TYPE_PID_T -AC_C_RESTRICT -AC_TYPE_SIZE_T -AC_TYPE_SSIZE_T -AC_CHECK_MEMBERS([struct stat.st_blksize]) -AC_STRUCT_ST_BLOCKS -AC_CHECK_MEMBERS([struct stat.st_rdev]) -AC_TYPE_UINT16_T -AC_TYPE_UINT32_T -AC_TYPE_UINT64_T -AC_TYPE_UINT8_T -AC_CHECK_TYPES([ptrdiff_t]) - -# Checks for library functions. -AC_FUNC_ERROR_AT_LINE -AC_FUNC_FORK -AC_FUNC_FSEEKO -AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK -AC_HEADER_MAJOR -AC_FUNC_MALLOC -AC_FUNC_MKTIME -AC_FUNC_MMAP -AC_FUNC_REALLOC -AC_FUNC_STRNLEN -AC_FUNC_STRTOD -AC_CHECK_FUNCS([ \ - alarm atexit bzero clock_gettime dup2 fdatasync ftruncate \ - getcwd gethostbyname gethostname getpagesize gettimeofday \ - inet_ntoa isascii localtime_r memchr memmove memset mkdir \ - mkfifo munmap pathconf realpath regcomp rmdir select setenv \ - socket strcasecmp strchr strcspn strdup strerror strndup \ - strpbrk strrchr strspn strstr strtol strtoul strtoull tzset \ - uname \ - ]) +AC_CHECK_HEADERS([yajl/yajl_version.h]) AC_OUTPUT() --===============3226337522166469128== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog --===============3226337522166469128==-- From xen-changelog-bounces@lists.xen.org Mon May 14 16:33:02 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:33:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCk-0004zL-KM; Mon, 14 May 2012 16:33:02 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCS-0004f2-CZ for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:44 +0000 Received: from [85.158.139.83:25867] by server-10.bemta-5.messagelabs.com id DC/12-08260-AA331BF4; Mon, 14 May 2012 16:32:42 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-182.messagelabs.com!1337013159!28335167!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21319 invoked from network); 14 May 2012 16:32:41 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCN-0002v6-2H for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCN-0006ov-1W for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:39 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:38 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: log bootloader output X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1336759141 -3600 # Node ID 15e8b3366b67d54bf6717d0b1f6bc8b460eb7be8 # Parent e0bc91c320c94648836f3296f28263a6cf31b24b libxl: log bootloader output This involves adding a new log feature to libxl__datacopier, and then using it. If the bootloader exits nonzero we print the log filename in a log message from libxl. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r e0bc91c320c9 -r 15e8b3366b67 tools/libxl/libxl_aoutils.c --- a/tools/libxl/libxl_aoutils.c Fri May 11 18:59:00 2012 +0100 +++ b/tools/libxl/libxl_aoutils.c Fri May 11 18:59:01 2012 +0100 @@ -118,6 +118,16 @@ static void datacopier_readable(libxl__e libxl__ev_fd_deregister(gc, &dc->toread); break; } + if (dc->log) { + int wrote = fwrite(buf->buf + buf->used, 1, r, dc->log); + if (wrote != r) { + assert(ferror(dc->log)); + assert(errno); + LOGE(ERROR, "error logging %s", dc->copywhat); + datacopier_callback(egc, dc, 0, errno); + return; + } + } buf->used += r; dc->used += r; assert(buf->used <= sizeof(buf->buf)); diff -r e0bc91c320c9 -r 15e8b3366b67 tools/libxl/libxl_bootloader.c --- a/tools/libxl/libxl_bootloader.c Fri May 11 18:59:00 2012 +0100 +++ b/tools/libxl/libxl_bootloader.c Fri May 11 18:59:01 2012 +0100 @@ -236,6 +236,10 @@ static void bootloader_cleanup(libxl__eg libxl__carefd_close(bl->ptys[i].master); libxl__carefd_close(bl->ptys[i].slave); } + if (bl->display.log) { + fclose(bl->display.log); + bl->display.log = NULL; + } } static void bootloader_setpaths(libxl__gc *gc, libxl__bootloader_state *bl) @@ -258,6 +262,8 @@ void libxl__bootloader_run(libxl__egc *e { STATE_AO_GC(bl->ao); libxl_domain_build_info *info = bl->info; + uint32_t domid = bl->domid; + char *logfile_tmp = NULL; int rc, r; libxl__bootloader_init(bl); @@ -269,6 +275,22 @@ void libxl__bootloader_run(libxl__egc *e bootloader_setpaths(gc, bl); + const char *logfile_leaf = GCSPRINTF("bootloader.%"PRIu32, domid); + rc = libxl_create_logfile(CTX, logfile_leaf, &logfile_tmp); + if (rc) goto out; + + /* Transfer ownership of log filename to bl and the gc */ + bl->logfile = logfile_tmp; + libxl__ptr_add(gc, logfile_tmp); + logfile_tmp = NULL; + + bl->display.log = fopen(bl->logfile, "a"); + if (!bl->display.log) { + LOGE(ERROR, "failed to create bootloader logfile %s", bl->logfile); + rc = ERROR_FAIL; + goto out; + } + for (;;) { r = mkdir(bl->outputdir, 0600); if (!r) break; @@ -308,6 +330,7 @@ void libxl__bootloader_run(libxl__egc *e out: assert(rc); out_ok: + free(logfile_tmp); bootloader_callback(egc, bl, rc); } @@ -465,6 +488,7 @@ static void bootloader_finished(libxl__e libxl__datacopier_kill(&bl->display); if (status) { + LOG(ERROR, "bootloader failed - consult logfile %s", bl->logfile); libxl_report_child_exitstatus(CTX, XTL_ERROR, "bootloader", pid, status); rc = ERROR_FAIL; diff -r e0bc91c320c9 -r 15e8b3366b67 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri May 11 18:59:00 2012 +0100 +++ b/tools/libxl/libxl_internal.h Fri May 11 18:59:01 2012 +0100 @@ -1503,6 +1503,7 @@ struct libxl__datacopier_state { int readfd, writefd; ssize_t maxsz; const char *copywhat, *readwhat, *writewhat; /* for error msgs */ + FILE *log; /* gets a copy of everything */ libxl__datacopier_callback *callback; /* remaining fields are private to datacopier */ libxl__ev_fd toread, towrite; @@ -1565,7 +1566,7 @@ struct libxl__bootloader_state { libxl_device_disk *disk; uint32_t domid; /* private to libxl__run_bootloader */ - char *outputpath, *outputdir; + char *outputpath, *outputdir, *logfile; char *diskpath; /* not from gc, represents actually attached disk */ libxl__openpty_state openpty; libxl__openpty_result ptys[2]; /* [0] is for bootloader */ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:33:03 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:33:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCl-0004zj-1c; Mon, 14 May 2012 16:33:03 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCS-0004eY-DE for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:44 +0000 Received: from [85.158.143.99:61120] by server-1.bemta-4.messagelabs.com id AF/29-20925-AA331BF4; Mon, 14 May 2012 16:32:42 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-216.messagelabs.com!1337013158!27626279!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29831 invoked from network); 14 May 2012 16:32:39 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCM-0002uz-1U for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCM-0006oR-0W for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:38 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:37 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: ao: Convert libxl_run_bootloader X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1336759140 -3600 # Node ID ca1df379c8622982eee181596ee1f31049165755 # Parent bdfb4beb57fe8c8c6c571204ed4eb11530525b78 libxl: ao: Convert libxl_run_bootloader Convert libxl_run_bootloader to an ao_how-taking function. It's implemented in terms of libxl__bootloader_run, which can be used internally. The resulting code is pretty much a rewrite. Significant changes include: - We direct the bootloader's results to a file, not a pipe. This makes it simpler to deal with as we don't have to read it concurrently along with everything else. - We now issue a warning if we find unexpected statements in the bootloader results. - The arrangements for buffering of bootloader input and output are completely changed. Now we have a fixed limit of 64k on output, and 4k on input, and discard the oldest data when this overflows (which it shouldn't). There is no timeout any more. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Changes since v6: * Use libxl__ev_child_inuse rather than testing pid directly. * Fix a code style error. * Properly initialise the sub-operations' aos in _init. * Bugfixes. Committed-by: Ian Jackson --- diff -r bdfb4beb57fe -r ca1df379c862 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Fri May 11 18:58:59 2012 +0100 +++ b/tools/libxl/libxl.c Fri May 11 18:59:00 2012 +0100 @@ -1750,6 +1750,10 @@ int libxl_device_disk_local_detach(libxl * For other device types assume that the blktap2 process is * needed by the soon to be started domain and do nothing. */ + /* + * FIXME + * This appears to leak the disk in failure paths + */ return 0; } diff -r bdfb4beb57fe -r ca1df379c862 tools/libxl/libxl.h --- a/tools/libxl/libxl.h Fri May 11 18:58:59 2012 +0100 +++ b/tools/libxl/libxl.h Fri May 11 18:59:00 2012 +0100 @@ -495,7 +495,8 @@ int libxl_get_max_cpus(libxl_ctx *ctx); int libxl_run_bootloader(libxl_ctx *ctx, libxl_domain_build_info *info, libxl_device_disk *disk, - uint32_t domid); + uint32_t domid, + libxl_asyncop_how *ao_how); /* 0 means ERROR_ENOMEM, which we have logged */ diff -r bdfb4beb57fe -r ca1df379c862 tools/libxl/libxl_bootloader.c --- a/tools/libxl/libxl_bootloader.c Fri May 11 18:58:59 2012 +0100 +++ b/tools/libxl/libxl_bootloader.c Fri May 11 18:59:00 2012 +0100 @@ -15,6 +15,7 @@ #include "libxl_osdeps.h" /* must come before any other headers */ #include +#include #ifdef INCLUDE_LIBUTIL_H #include INCLUDE_LIBUTIL_H @@ -22,67 +23,80 @@ #include "libxl_internal.h" -#define XENCONSOLED_BUF_SIZE 16 -#define BOOTLOADER_BUF_SIZE 4096 -#define BOOTLOADER_TIMEOUT 1 +#define BOOTLOADER_BUF_OUT 65536 +#define BOOTLOADER_BUF_IN 4096 -static char **make_bootloader_args(libxl__gc *gc, - libxl_domain_build_info *info, - uint32_t domid, - const char *fifo, char *disk) +static void bootloader_gotptys(libxl__egc *egc, libxl__openpty_state *op); +static void bootloader_keystrokes_copyfail(libxl__egc *egc, + libxl__datacopier_state *dc, int onwrite, int errnoval); +static void bootloader_display_copyfail(libxl__egc *egc, + libxl__datacopier_state *dc, int onwrite, int errnoval); +static void bootloader_finished(libxl__egc *egc, libxl__ev_child *child, + pid_t pid, int status); + +/*----- bootloader arguments -----*/ + +static void bootloader_arg(libxl__bootloader_state *bl, const char *arg) { - flexarray_t *args; - int nr = 0; + assert(bl->nargs < bl->argsspace); + bl->args[bl->nargs++] = arg; +} - args = flexarray_make(1, 1); - if (!args) - return NULL; +static void make_bootloader_args(libxl__gc *gc, libxl__bootloader_state *bl) +{ + const libxl_domain_build_info *info = bl->info; - flexarray_set(args, nr++, (char *)info->u.pv.bootloader); + bl->argsspace = 7 + libxl_string_list_length(&info->u.pv.bootloader_args); + + GCNEW_ARRAY(bl->args, bl->argsspace); + +#define ARG(arg) bootloader_arg(bl, (arg)) + + ARG(info->u.pv.bootloader); if (info->u.pv.kernel.path) - flexarray_set(args, nr++, libxl__sprintf(gc, "--kernel=%s", - info->u.pv.kernel.path)); + ARG(libxl__sprintf(gc, "--kernel=%s", info->u.pv.kernel.path)); if (info->u.pv.ramdisk.path) - flexarray_set(args, nr++, libxl__sprintf(gc, "--ramdisk=%s", info->u.pv.ramdisk.path)); + ARG(libxl__sprintf(gc, "--ramdisk=%s", info->u.pv.ramdisk.path)); if (info->u.pv.cmdline && *info->u.pv.cmdline != '\0') - flexarray_set(args, nr++, libxl__sprintf(gc, "--args=%s", info->u.pv.cmdline)); + ARG(libxl__sprintf(gc, "--args=%s", info->u.pv.cmdline)); - flexarray_set(args, nr++, libxl__sprintf(gc, "--output=%s", fifo)); - flexarray_set(args, nr++, "--output-format=simple0"); - flexarray_set(args, nr++, libxl__sprintf(gc, "--output-directory=%s", "/var/run/libxl/")); + ARG(libxl__sprintf(gc, "--output=%s", bl->outputpath)); + ARG("--output-format=simple0"); + ARG(libxl__sprintf(gc, "--output-directory=%s", bl->outputdir)); if (info->u.pv.bootloader_args) { char **p = info->u.pv.bootloader_args; while (*p) { - flexarray_set(args, nr++, *p); + ARG(*p); p++; } } - flexarray_set(args, nr++, disk); + ARG(bl->diskpath); - /* Sentinal for execv */ - flexarray_set(args, nr++, NULL); + /* Sentinel for execv */ + ARG(NULL); - return (char **) flexarray_contents(args); /* Frees args */ +#undef ARG } -static int open_xenconsoled_pty(int *master, int *slave, char *slave_path, size_t slave_path_len) +/*----- synchronous subroutines -----*/ + +static int setup_xenconsoled_pty(libxl__egc *egc, libxl__bootloader_state *bl, + char *slave_path, size_t slave_path_len) { + STATE_AO_GC(bl->ao); struct termios termattr; - int ret; + int r, rc; + int slave = libxl__carefd_fd(bl->ptys[1].slave); + int master = libxl__carefd_fd(bl->ptys[1].master); - ret = openpty(master, slave, NULL, NULL, NULL); - if (ret < 0) - return -1; - - ret = ttyname_r(*slave, slave_path, slave_path_len); - if (ret == -1) { - close(*master); - close(*slave); - *master = *slave = -1; - return -1; + r = ttyname_r(slave, slave_path, slave_path_len); + if (r == -1) { + LOGE(ERROR,"ttyname_r failed"); + rc = ERROR_FAIL; + goto out; } /* @@ -95,310 +109,217 @@ static int open_xenconsoled_pty(int *mas * semantics on Solaris, so don't try to set any attributes * for it. */ -#if !defined(__sun__) && !defined(__NetBSD__) - tcgetattr(*master, &termattr); + tcgetattr(master, &termattr); cfmakeraw(&termattr); - tcsetattr(*master, TCSANOW, &termattr); - - close(*slave); - *slave = -1; -#else - tcgetattr(*slave, &termattr); - cfmakeraw(&termattr); - tcsetattr(*slave, TCSANOW, &termattr); -#endif - - fcntl(*master, F_SETFL, O_NDELAY); - fcntl(*master, F_SETFD, FD_CLOEXEC); + tcsetattr(master, TCSANOW, &termattr); return 0; + + out: + return rc; } -static pid_t fork_exec_bootloader(int *master, const char *arg0, char **args) +static const char *bootloader_result_command(libxl__gc *gc, const char *buf, + const char *prefix, size_t prefixlen) { + if (strncmp(buf, prefix, prefixlen)) + return 0; + + const char *rhs = buf + prefixlen; + if (!CTYPE(isspace,*rhs)) + return 0; + + while (CTYPE(isspace,*rhs)) + rhs++; + + LOG(DEBUG,"bootloader output contained %s %s", prefix, rhs); + + return rhs; +} + +static int parse_bootloader_result(libxl__egc *egc, + libxl__bootloader_state *bl) { - struct termios termattr; - pid_t pid = forkpty(master, NULL, NULL, NULL); - if (pid == -1) - return -1; - else if (pid == 0) { - setenv("TERM", "vt100", 1); - libxl__exec(-1, -1, -1, arg0, args); - return -1; + STATE_AO_GC(bl->ao); + char buf[PATH_MAX*2]; + FILE *f = 0; + int rc = ERROR_FAIL; + libxl_domain_build_info *info = bl->info; + + f = fopen(bl->outputpath, "r"); + if (!f) { + LOGE(ERROR,"open bootloader output file %s", bl->outputpath); + goto out; } - /* - * On Solaris, the master pty side does not have terminal semantics, - * so don't try to set any attributes, as it will fail. - */ -#if !defined(__sun__) - tcgetattr(*master, &termattr); - cfmakeraw(&termattr); - tcsetattr(*master, TCSANOW, &termattr); -#endif + for (;;) { + /* Read a nul-terminated "line" and put the result in + * buf, and its length (not including the nul) in l */ + int l = 0, c; + while ((c = getc(f)) != EOF && c != '\0') { + if (l < sizeof(buf)-1) + buf[l] = c; + l++; + } + if (c == EOF) { + if (ferror(f)) { + LOGE(ERROR,"read bootloader output file %s", bl->outputpath); + goto out; + } + if (!l) + break; + } + if (l >= sizeof(buf)) { + LOG(WARN,"bootloader output contained" + " overly long item `%.150s...'", buf); + continue; + } + buf[l] = 0; - fcntl(*master, F_SETFL, O_NDELAY); + const char *rhs; +#define COMMAND(s) ((rhs = bootloader_result_command(gc, buf, s, sizeof(s)-1))) - return pid; + if (COMMAND("kernel")) { + free(info->u.pv.kernel.path); + info->u.pv.kernel.path = libxl__strdup(NULL, rhs); + libxl__file_reference_map(&info->u.pv.kernel); + unlink(info->u.pv.kernel.path); + } else if (COMMAND("ramdisk")) { + free(info->u.pv.ramdisk.path); + info->u.pv.ramdisk.path = libxl__strdup(NULL, rhs); + libxl__file_reference_map(&info->u.pv.ramdisk); + unlink(info->u.pv.ramdisk.path); + } else if (COMMAND("args")) { + free(info->u.pv.cmdline); + info->u.pv.cmdline = libxl__strdup(NULL, rhs); + } else if (l) { + LOG(WARN, "unexpected output from bootloader: `%s'", buf); + } + } + rc = 0; + + out: + if (f) fclose(f); + return rc; } -/* - * filedescriptors: - * fifo_fd - bootstring output from the bootloader - * xenconsoled_fd - input/output from/to xenconsole - * bootloader_fd - input/output from/to pty that controls the bootloader - * The filedescriptors are NDELAY, so it's ok to try to read - * bigger chunks than may be available, to keep e.g. curses - * screen redraws in the bootloader efficient. xenconsoled_fd is the side that - * gets xenconsole input, which will be keystrokes, so a small number - * is sufficient. bootloader_fd is pygrub output, which will be curses screen - * updates, so a larger number (1024) is appropriate there. - * - * For writeable descriptors, only include them in the set for select - * if there is actual data to write, otherwise this would loop too fast, - * eating up CPU time. - */ -static char * bootloader_interact(libxl__gc *gc, int xenconsoled_fd, int bootloader_fd, int fifo_fd) + +/*----- init and cleanup -----*/ + +void libxl__bootloader_init(libxl__bootloader_state *bl) { - int ret; - - size_t nr_out = 0, size_out = 0; - char *output = NULL; - struct timeval wait; - - /* input from xenconsole. read on xenconsoled_fd write to bootloader_fd */ - int xenconsoled_prod = 0, xenconsoled_cons = 0; - char xenconsoled_buf[XENCONSOLED_BUF_SIZE]; - /* output from bootloader. read on bootloader_fd write to xenconsoled_fd */ - int bootloader_prod = 0, bootloader_cons = 0; - char bootloader_buf[BOOTLOADER_BUF_SIZE]; - - while(1) { - fd_set wsel, rsel; - int nfds; - - /* Set timeout to 1s before starting to discard data */ - wait.tv_sec = BOOTLOADER_TIMEOUT; - wait.tv_usec = 0; - - /* Move buffers around to drop already consumed data */ - if (xenconsoled_cons > 0) { - xenconsoled_prod -= xenconsoled_cons; - memmove(xenconsoled_buf, &xenconsoled_buf[xenconsoled_cons], - xenconsoled_prod); - xenconsoled_cons = 0; - } - if (bootloader_cons > 0) { - bootloader_prod -= bootloader_cons; - memmove(bootloader_buf, &bootloader_buf[bootloader_cons], - bootloader_prod); - bootloader_cons = 0; - } - - FD_ZERO(&rsel); - FD_SET(fifo_fd, &rsel); - nfds = fifo_fd + 1; - if (xenconsoled_prod < XENCONSOLED_BUF_SIZE) { - /* The buffer is not full, try to read more data */ - FD_SET(xenconsoled_fd, &rsel); - nfds = xenconsoled_fd + 1 > nfds ? xenconsoled_fd + 1 : nfds; - } - if (bootloader_prod < BOOTLOADER_BUF_SIZE) { - /* The buffer is not full, try to read more data */ - FD_SET(bootloader_fd, &rsel); - nfds = bootloader_fd + 1 > nfds ? bootloader_fd + 1 : nfds; - } - - FD_ZERO(&wsel); - if (bootloader_prod > 0) { - /* The buffer has data to consume */ - FD_SET(xenconsoled_fd, &wsel); - nfds = xenconsoled_fd + 1 > nfds ? xenconsoled_fd + 1 : nfds; - } - if (xenconsoled_prod > 0) { - /* The buffer has data to consume */ - FD_SET(bootloader_fd, &wsel); - nfds = bootloader_fd + 1 > nfds ? bootloader_fd + 1 : nfds; - } - - if (xenconsoled_prod == XENCONSOLED_BUF_SIZE || - bootloader_prod == BOOTLOADER_BUF_SIZE) - ret = select(nfds, &rsel, &wsel, NULL, &wait); - else - ret = select(nfds, &rsel, &wsel, NULL, NULL); - if (ret < 0) { - if (errno == EINTR) - continue; - goto out_err; - } - - /* Input from xenconsole, read xenconsoled_fd, write bootloader_fd */ - if (ret == 0 && xenconsoled_prod == XENCONSOLED_BUF_SIZE) { - /* Drop the buffer */ - xenconsoled_prod = 0; - xenconsoled_cons = 0; - } else if (FD_ISSET(xenconsoled_fd, &rsel)) { - ret = read(xenconsoled_fd, &xenconsoled_buf[xenconsoled_prod], XENCONSOLED_BUF_SIZE - xenconsoled_prod); - if (ret < 0 && errno != EIO && errno != EAGAIN) - goto out_err; - if (ret > 0) - xenconsoled_prod += ret; - } - if (FD_ISSET(bootloader_fd, &wsel)) { - ret = write(bootloader_fd, &xenconsoled_buf[xenconsoled_cons], xenconsoled_prod - xenconsoled_cons); - if (ret < 0 && errno != EIO && errno != EAGAIN) - goto out_err; - if (ret > 0) - xenconsoled_cons += ret; - } - - /* Input from bootloader, read bootloader_fd, write xenconsoled_fd */ - if (ret == 0 && bootloader_prod == BOOTLOADER_BUF_SIZE) { - /* Drop the buffer */ - bootloader_prod = 0; - bootloader_cons = 0; - } else if (FD_ISSET(bootloader_fd, &rsel)) { - ret = read(bootloader_fd, &bootloader_buf[bootloader_prod], BOOTLOADER_BUF_SIZE - bootloader_prod); - if (ret < 0 && errno != EIO && errno != EAGAIN) - goto out_err; - if (ret > 0) - bootloader_prod += ret; - } - if (FD_ISSET(xenconsoled_fd, &wsel)) { - ret = write(xenconsoled_fd, &bootloader_buf[bootloader_cons], bootloader_prod - bootloader_cons); - if (ret < 0 && errno != EIO && errno != EAGAIN) - goto out_err; - if (ret > 0) - bootloader_cons += ret; - } - - if (FD_ISSET(fifo_fd, &rsel)) { - if (size_out - nr_out < 256) { - char *temp; - size_t new_size = size_out == 0 ? 32 : size_out * 2; - - temp = realloc(output, new_size); - if (temp == NULL) - goto out_err; - output = temp; - memset(output + size_out, 0, new_size - size_out); - size_out = new_size; - } - - ret = read(fifo_fd, output + nr_out, size_out - nr_out); - if (ret > 0) - nr_out += ret; - if (ret == 0) - break; - } - } - - libxl__ptr_add(gc, output); - return output; - -out_err: - free(output); - return NULL; + assert(bl->ao); + bl->diskpath = NULL; + bl->openpty.ao = bl->ao; + bl->ptys[0].master = bl->ptys[0].slave = 0; + bl->ptys[1].master = bl->ptys[1].slave = 0; + libxl__ev_child_init(&bl->child); + bl->keystrokes.ao = bl->ao; libxl__datacopier_init(&bl->keystrokes); + bl->display.ao = bl->ao; libxl__datacopier_init(&bl->display); } -static void parse_bootloader_result(libxl__gc *gc, - libxl_domain_build_info *info, - const char *o) +static void bootloader_cleanup(libxl__egc *egc, libxl__bootloader_state *bl) { - while (*o != '\0') { - if (strncmp("kernel ", o, strlen("kernel ")) == 0) { - free(info->u.pv.kernel.path); - info->u.pv.kernel.path = strdup(o + strlen("kernel ")); - libxl__file_reference_map(&info->u.pv.kernel); - unlink(info->u.pv.kernel.path); - } else if (strncmp("ramdisk ", o, strlen("ramdisk ")) == 0) { - free(info->u.pv.ramdisk.path); - info->u.pv.ramdisk.path = strdup(o + strlen("ramdisk ")); - libxl__file_reference_map(&info->u.pv.ramdisk); - unlink(info->u.pv.ramdisk.path); - } else if (strncmp("args ", o, strlen("args ")) == 0) { - free(info->u.pv.cmdline); - info->u.pv.cmdline = strdup(o + strlen("args ")); - } + STATE_AO_GC(bl->ao); + int i; - o = o + strlen(o) + 1; + if (bl->outputpath) libxl__remove_file(gc, bl->outputpath); + if (bl->outputdir) libxl__remove_directory(gc, bl->outputdir); + + if (bl->diskpath) { + libxl_device_disk_local_detach(CTX, bl->disk); + free(bl->diskpath); + bl->diskpath = 0; + } + libxl__datacopier_kill(&bl->keystrokes); + libxl__datacopier_kill(&bl->display); + for (i=0; i<2; i++) { + libxl__carefd_close(bl->ptys[i].master); + libxl__carefd_close(bl->ptys[i].slave); } } -int libxl_run_bootloader(libxl_ctx *ctx, - libxl_domain_build_info *info, - libxl_device_disk *disk, - uint32_t domid) +static void bootloader_setpaths(libxl__gc *gc, libxl__bootloader_state *bl) { - GC_INIT(ctx); - int ret, rc = 0; - char *fifo = NULL; - char *diskpath = NULL; - char **args = NULL; + uint32_t domid = bl->domid; + bl->outputdir = GCSPRINTF(XEN_RUN_DIR "/bootloader.%"PRIu32".d", domid); + bl->outputpath = GCSPRINTF(XEN_RUN_DIR "/bootloader.%"PRIu32".out", domid); +} - char tempdir_template[] = "/var/run/libxl/bl.XXXXXX"; - char *tempdir; +static void bootloader_callback(libxl__egc *egc, libxl__bootloader_state *bl, + int rc) +{ + bootloader_cleanup(egc, bl); + bl->callback(egc, bl, rc); +} - char *dom_console_xs_path; - char dom_console_slave_tty_path[PATH_MAX]; +/*----- main flow of control -----*/ - int xenconsoled_fd = -1, xenconsoled_slave = -1; - int bootloader_fd = -1, fifo_fd = -1; +void libxl__bootloader_run(libxl__egc *egc, libxl__bootloader_state *bl) +{ + STATE_AO_GC(bl->ao); + libxl_domain_build_info *info = bl->info; + int rc, r; - int blrc; - pid_t pid; - char *blout; + libxl__bootloader_init(bl); - struct stat st_buf; + if (info->type != LIBXL_DOMAIN_TYPE_PV || !info->u.pv.bootloader) { + rc = 0; + goto out_ok; + } - rc = libxl__domain_build_info_setdefault(gc, info); + bootloader_setpaths(gc, bl); + + for (;;) { + r = mkdir(bl->outputdir, 0600); + if (!r) break; + if (errno == EINTR) continue; + if (errno == EEXIST) break; + LOGE(ERROR, "failed to create bootloader dir %s", bl->outputdir); + rc = ERROR_FAIL; + goto out; + } + + for (;;) { + r = open(bl->outputpath, O_WRONLY|O_CREAT|O_TRUNC, 0600); + if (r>=0) { close(r); break; } + if (errno == EINTR) continue; + LOGE(ERROR, "failed to precreate bootloader output %s", bl->outputpath); + rc = ERROR_FAIL; + goto out; + } + + bl->diskpath = libxl_device_disk_local_attach(CTX, bl->disk); + if (!bl->diskpath) { + rc = ERROR_FAIL; + goto out; + } + + make_bootloader_args(gc, bl); + + bl->openpty.ao = ao; + bl->openpty.callback = bootloader_gotptys; + bl->openpty.count = 2; + bl->openpty.results = bl->ptys; + rc = libxl__openptys(&bl->openpty, 0,0); if (rc) goto out; - if (info->type != LIBXL_DOMAIN_TYPE_PV || !info->u.pv.bootloader) + return; + + out: + assert(rc); + out_ok: + bootloader_callback(egc, bl, rc); +} + +static void bootloader_gotptys(libxl__egc *egc, libxl__openpty_state *op) +{ + libxl__bootloader_state *bl = CONTAINER_OF(op, *bl, openpty); + STATE_AO_GC(bl->ao); + int rc, r; + + if (bl->openpty.rc) { + rc = bl->openpty.rc; goto out; - - rc = libxl__domain_build_info_setdefault(gc, info); - if (rc) goto out; - - rc = ERROR_INVAL; - if (!disk) - goto out; - - rc = ERROR_FAIL; - ret = mkdir("/var/run/libxl/", S_IRWXU); - if (ret < 0 && errno != EEXIST) - goto out; - - ret = stat("/var/run/libxl/", &st_buf); - if (ret < 0) - goto out; - - if (!S_ISDIR(st_buf.st_mode)) - goto out; - - tempdir = mkdtemp(tempdir_template); - if (tempdir == NULL) - goto out; - - ret = asprintf(&fifo, "%s/fifo", tempdir); - if (ret < 0) { - fifo = NULL; - goto out_close; - } - - ret = mkfifo(fifo, 0600); - if (ret < 0) { - goto out_close; - } - - diskpath = libxl_device_disk_local_attach(ctx, disk); - if (!diskpath) { - goto out_close; - } - - args = make_bootloader_args(gc, info, domid, fifo, diskpath); - if (args == NULL) { - rc = ERROR_NOMEM; - goto out_close; } /* @@ -411,76 +332,188 @@ int libxl_run_bootloader(libxl_ctx *ctx, * where we copy characters between the two master fds, as well as * listening on the bootloader's fifo for the results. */ - ret = open_xenconsoled_pty(&xenconsoled_fd, &xenconsoled_slave, + + char *dom_console_xs_path; + char dom_console_slave_tty_path[PATH_MAX]; + rc = setup_xenconsoled_pty(egc, bl, &dom_console_slave_tty_path[0], sizeof(dom_console_slave_tty_path)); - if (ret < 0) { - goto out_close; + if (rc) goto out; + + char *dompath = libxl__xs_get_dompath(gc, bl->domid); + if (!dompath) { rc = ERROR_FAIL; goto out; } + + dom_console_xs_path = GCSPRINTF("%s/console/tty", dompath); + + rc = libxl__xs_write(gc, XBT_NULL, dom_console_xs_path, "%s", + dom_console_slave_tty_path); + if (rc) { + LOGE(ERROR,"xs write console path %s := %s failed", + dom_console_xs_path, dom_console_slave_tty_path); + rc = ERROR_FAIL; + goto out; } - dom_console_xs_path = libxl__sprintf(gc, "%s/console/tty", libxl__xs_get_dompath(gc, domid)); - libxl__xs_write(gc, XBT_NULL, dom_console_xs_path, "%s", dom_console_slave_tty_path); + int bootloader_master = libxl__carefd_fd(bl->ptys[0].master); + int xenconsole_master = libxl__carefd_fd(bl->ptys[1].master); - pid = fork_exec_bootloader(&bootloader_fd, info->u.pv.bootloader, args); - if (pid < 0) { - goto out_close; + libxl_fd_set_nonblock(CTX, bootloader_master, 1); + libxl_fd_set_nonblock(CTX, xenconsole_master, 1); + + bl->keystrokes.writefd = bl->display.readfd = bootloader_master; + bl->keystrokes.writewhat = bl->display.readwhat = "bootloader pty"; + + bl->keystrokes.readfd = bl->display.writefd = xenconsole_master; + bl->keystrokes.readwhat = bl->display.writewhat = "xenconsole client pty"; + + bl->keystrokes.ao = ao; + bl->keystrokes.maxsz = BOOTLOADER_BUF_OUT; + bl->keystrokes.copywhat = + GCSPRINTF("bootloader input for domain %"PRIu32, bl->domid); + bl->keystrokes.callback = bootloader_keystrokes_copyfail; + rc = libxl__datacopier_start(&bl->keystrokes); + if (rc) goto out; + + bl->display.ao = ao; + bl->display.maxsz = BOOTLOADER_BUF_IN; + bl->display.copywhat = + GCSPRINTF("bootloader output for domain %"PRIu32, bl->domid); + bl->display.callback = bootloader_display_copyfail; + rc = libxl__datacopier_start(&bl->display); + if (rc) goto out; + + LOG(DEBUG, "executing bootloader: %s", bl->args[0]); + for (const char **blarg = bl->args; + *blarg; + blarg++) + LOG(DEBUG, " bootloader arg: %s", *blarg); + + struct termios termattr; + + pid_t pid = libxl__ev_child_fork(gc, &bl->child, bootloader_finished); + if (pid == -1) { + rc = ERROR_FAIL; + goto out; } - while (1) { - if (waitpid(pid, &blrc, WNOHANG) == pid) - goto out_close; - - fifo_fd = open(fifo, O_RDONLY); - if (fifo_fd > -1) - break; - - if (errno == EINTR) - continue; - - goto out_close; + if (!pid) { + /* child */ + r = login_tty(libxl__carefd_fd(bl->ptys[0].slave)); + if (r) { LOGE(ERROR, "login_tty failed"); exit(-1); } + setenv("TERM", "vt100", 1); + libxl__exec(-1, -1, -1, bl->args[0], (char**)bl->args); + exit(-1); } - fcntl(fifo_fd, F_SETFL, O_NDELAY); + /* parent */ - blout = bootloader_interact(gc, xenconsoled_fd, bootloader_fd, fifo_fd); - if (blout == NULL) { - goto out_close; + /* + * On Solaris, the master pty side does not have terminal semantics, + * so don't try to set any attributes, as it will fail. + */ +#if !defined(__sun__) + tcgetattr(bootloader_master, &termattr); + cfmakeraw(&termattr); + tcsetattr(bootloader_master, TCSANOW, &termattr); +#endif + + return; + + out: + bootloader_callback(egc, bl, rc); +} + +/* perhaps one of these will be called, but perhaps not */ +static void bootloader_copyfail(libxl__egc *egc, const char *which, + libxl__bootloader_state *bl, int onwrite, int errnoval) +{ + STATE_AO_GC(bl->ao); + int r; + + if (!onwrite && !errnoval) + LOG(ERROR, "unexpected eof copying %s", which); + libxl__datacopier_kill(&bl->keystrokes); + libxl__datacopier_kill(&bl->display); + if (libxl__ev_child_inuse(&bl->child)) { + r = kill(bl->child.pid, SIGTERM); + if (r) LOGE(WARN, "after failure, failed to kill bootloader [%lu]", + (unsigned long)bl->child.pid); + } + bl->rc = ERROR_FAIL; +} +static void bootloader_keystrokes_copyfail(libxl__egc *egc, + libxl__datacopier_state *dc, int onwrite, int errnoval) +{ + libxl__bootloader_state *bl = CONTAINER_OF(dc, *bl, keystrokes); + bootloader_copyfail(egc, "bootloader input", bl, onwrite, errnoval); +} +static void bootloader_display_copyfail(libxl__egc *egc, + libxl__datacopier_state *dc, int onwrite, int errnoval) +{ + libxl__bootloader_state *bl = CONTAINER_OF(dc, *bl, display); + bootloader_copyfail(egc, "bootloader output", bl, onwrite, errnoval); +} + +static void bootloader_finished(libxl__egc *egc, libxl__ev_child *child, + pid_t pid, int status) +{ + libxl__bootloader_state *bl = CONTAINER_OF(child, *bl, child); + STATE_AO_GC(bl->ao); + int rc; + + libxl__datacopier_kill(&bl->keystrokes); + libxl__datacopier_kill(&bl->display); + + if (status) { + libxl_report_child_exitstatus(CTX, XTL_ERROR, "bootloader", + pid, status); + rc = ERROR_FAIL; + goto out; + } else { + LOG(DEBUG, "bootloader completed"); } - pid = waitpid(pid, &blrc, 0); - if (pid == -1 || (pid > 0 && WIFEXITED(blrc) && WEXITSTATUS(blrc) != 0)) { - goto out_close; + if (bl->rc) { + /* datacopier went wrong */ + rc = bl->rc; + goto out; } - parse_bootloader_result(gc, info, blout); + rc = parse_bootloader_result(egc, bl); + if (rc) goto out; rc = 0; -out_close: - if (diskpath) { - libxl_device_disk_local_detach(ctx, disk); - free(diskpath); - } - if (fifo_fd > -1) - close(fifo_fd); - if (bootloader_fd > -1) - close(bootloader_fd); - if (xenconsoled_fd > -1) - close(xenconsoled_fd); - if (xenconsoled_slave > -1) - close(xenconsoled_slave); + LOG(DEBUG, "bootloader execution successful"); - if (fifo) { - unlink(fifo); - free(fifo); - } + out: + bootloader_callback(egc, bl, rc); +} - rmdir(tempdir); +/*----- entrypoint for external callers -----*/ - free(args); +static void run_bootloader_done(libxl__egc *egc, + libxl__bootloader_state *st, int rc) +{ + libxl__ao_complete(egc, st->ao, rc); +} -out: - GC_FREE; - return rc; +int libxl_run_bootloader(libxl_ctx *ctx, + libxl_domain_build_info *info, + libxl_device_disk *disk, + uint32_t domid, + libxl_asyncop_how *ao_how) +{ + AO_CREATE(ctx,domid,ao_how); + libxl__bootloader_state *bl; + + GCNEW(bl); + bl->ao = ao; + bl->callback = run_bootloader_done; + bl->info = info; + bl->disk = disk; + bl->domid = domid; + libxl__bootloader_run(egc, bl); + return AO_INPROGRESS; } /* diff -r bdfb4beb57fe -r ca1df379c862 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Fri May 11 18:58:59 2012 +0100 +++ b/tools/libxl/libxl_create.c Fri May 11 18:59:00 2012 +0100 @@ -593,8 +593,12 @@ static int do_domain_create(libxl__gc *g if (ret) goto error_out; } - if ( restore_fd < 0 ) { - ret = libxl_run_bootloader(ctx, &d_config->b_info, d_config->num_disks > 0 ? &d_config->disks[0] : NULL, domid); + libxl_device_disk *bootdisk = + d_config->num_disks > 0 ? &d_config->disks[0] : NULL; + + if (restore_fd < 0 && bootdisk) { + ret = libxl_run_bootloader(ctx, &d_config->b_info, bootdisk, domid, + 0 /* fixme-ao */); if (ret) { LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "failed to run bootloader: %d", ret); diff -r bdfb4beb57fe -r ca1df379c862 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri May 11 18:58:59 2012 +0100 +++ b/tools/libxl/libxl_internal.h Fri May 11 18:59:00 2012 +0100 @@ -42,6 +42,7 @@ #include #include #include +#include #include #include @@ -440,6 +441,7 @@ _hidden int libxl__remove_file(libxl__gc _hidden int libxl__remove_directory(libxl__gc *gc, const char *path); _hidden int libxl__remove_file_or_directory(libxl__gc *gc, const char *path); + _hidden char **libxl__xs_kvs_of_flexarray(libxl__gc *gc, flexarray_t *array, int length); _hidden int libxl__xs_writev(libxl__gc *gc, xs_transaction_t t, @@ -1549,6 +1551,38 @@ int libxl__openptys(libxl__openpty_state const struct winsize *winp); +/*----- bootloader -----*/ + +typedef struct libxl__bootloader_state libxl__bootloader_state; +typedef void libxl__run_bootloader_callback(libxl__egc*, + libxl__bootloader_state*, int rc); + +struct libxl__bootloader_state { + /* caller must fill these in, and they must all remain valid */ + libxl__ao *ao; + libxl__run_bootloader_callback *callback; + libxl_domain_build_info *info; /* u.pv.{kernel,ramdisk,cmdline} updated */ + libxl_device_disk *disk; + uint32_t domid; + /* private to libxl__run_bootloader */ + char *outputpath, *outputdir; + char *diskpath; /* not from gc, represents actually attached disk */ + libxl__openpty_state openpty; + libxl__openpty_result ptys[2]; /* [0] is for bootloader */ + libxl__ev_child child; + int nargs, argsspace; + const char **args; + libxl__datacopier_state keystrokes, display; + int rc; +}; + +_hidden void libxl__bootloader_init(libxl__bootloader_state *bl); + +/* Will definitely call st->callback, perhaps reentrantly. + * If callback is passed rc==0, will have updated st->info appropriately */ +_hidden void libxl__bootloader_run(libxl__egc*, libxl__bootloader_state *st); + + /* * Convenience macros. */ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:33:03 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:33:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCl-0004zj-1c; Mon, 14 May 2012 16:33:03 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCS-0004eY-DE for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:44 +0000 Received: from [85.158.143.99:61120] by server-1.bemta-4.messagelabs.com id AF/29-20925-AA331BF4; Mon, 14 May 2012 16:32:42 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-216.messagelabs.com!1337013158!27626279!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29831 invoked from network); 14 May 2012 16:32:39 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCM-0002uz-1U for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCM-0006oR-0W for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:38 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:37 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: ao: Convert libxl_run_bootloader X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1336759140 -3600 # Node ID ca1df379c8622982eee181596ee1f31049165755 # Parent bdfb4beb57fe8c8c6c571204ed4eb11530525b78 libxl: ao: Convert libxl_run_bootloader Convert libxl_run_bootloader to an ao_how-taking function. It's implemented in terms of libxl__bootloader_run, which can be used internally. The resulting code is pretty much a rewrite. Significant changes include: - We direct the bootloader's results to a file, not a pipe. This makes it simpler to deal with as we don't have to read it concurrently along with everything else. - We now issue a warning if we find unexpected statements in the bootloader results. - The arrangements for buffering of bootloader input and output are completely changed. Now we have a fixed limit of 64k on output, and 4k on input, and discard the oldest data when this overflows (which it shouldn't). There is no timeout any more. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Changes since v6: * Use libxl__ev_child_inuse rather than testing pid directly. * Fix a code style error. * Properly initialise the sub-operations' aos in _init. * Bugfixes. Committed-by: Ian Jackson --- diff -r bdfb4beb57fe -r ca1df379c862 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Fri May 11 18:58:59 2012 +0100 +++ b/tools/libxl/libxl.c Fri May 11 18:59:00 2012 +0100 @@ -1750,6 +1750,10 @@ int libxl_device_disk_local_detach(libxl * For other device types assume that the blktap2 process is * needed by the soon to be started domain and do nothing. */ + /* + * FIXME + * This appears to leak the disk in failure paths + */ return 0; } diff -r bdfb4beb57fe -r ca1df379c862 tools/libxl/libxl.h --- a/tools/libxl/libxl.h Fri May 11 18:58:59 2012 +0100 +++ b/tools/libxl/libxl.h Fri May 11 18:59:00 2012 +0100 @@ -495,7 +495,8 @@ int libxl_get_max_cpus(libxl_ctx *ctx); int libxl_run_bootloader(libxl_ctx *ctx, libxl_domain_build_info *info, libxl_device_disk *disk, - uint32_t domid); + uint32_t domid, + libxl_asyncop_how *ao_how); /* 0 means ERROR_ENOMEM, which we have logged */ diff -r bdfb4beb57fe -r ca1df379c862 tools/libxl/libxl_bootloader.c --- a/tools/libxl/libxl_bootloader.c Fri May 11 18:58:59 2012 +0100 +++ b/tools/libxl/libxl_bootloader.c Fri May 11 18:59:00 2012 +0100 @@ -15,6 +15,7 @@ #include "libxl_osdeps.h" /* must come before any other headers */ #include +#include #ifdef INCLUDE_LIBUTIL_H #include INCLUDE_LIBUTIL_H @@ -22,67 +23,80 @@ #include "libxl_internal.h" -#define XENCONSOLED_BUF_SIZE 16 -#define BOOTLOADER_BUF_SIZE 4096 -#define BOOTLOADER_TIMEOUT 1 +#define BOOTLOADER_BUF_OUT 65536 +#define BOOTLOADER_BUF_IN 4096 -static char **make_bootloader_args(libxl__gc *gc, - libxl_domain_build_info *info, - uint32_t domid, - const char *fifo, char *disk) +static void bootloader_gotptys(libxl__egc *egc, libxl__openpty_state *op); +static void bootloader_keystrokes_copyfail(libxl__egc *egc, + libxl__datacopier_state *dc, int onwrite, int errnoval); +static void bootloader_display_copyfail(libxl__egc *egc, + libxl__datacopier_state *dc, int onwrite, int errnoval); +static void bootloader_finished(libxl__egc *egc, libxl__ev_child *child, + pid_t pid, int status); + +/*----- bootloader arguments -----*/ + +static void bootloader_arg(libxl__bootloader_state *bl, const char *arg) { - flexarray_t *args; - int nr = 0; + assert(bl->nargs < bl->argsspace); + bl->args[bl->nargs++] = arg; +} - args = flexarray_make(1, 1); - if (!args) - return NULL; +static void make_bootloader_args(libxl__gc *gc, libxl__bootloader_state *bl) +{ + const libxl_domain_build_info *info = bl->info; - flexarray_set(args, nr++, (char *)info->u.pv.bootloader); + bl->argsspace = 7 + libxl_string_list_length(&info->u.pv.bootloader_args); + + GCNEW_ARRAY(bl->args, bl->argsspace); + +#define ARG(arg) bootloader_arg(bl, (arg)) + + ARG(info->u.pv.bootloader); if (info->u.pv.kernel.path) - flexarray_set(args, nr++, libxl__sprintf(gc, "--kernel=%s", - info->u.pv.kernel.path)); + ARG(libxl__sprintf(gc, "--kernel=%s", info->u.pv.kernel.path)); if (info->u.pv.ramdisk.path) - flexarray_set(args, nr++, libxl__sprintf(gc, "--ramdisk=%s", info->u.pv.ramdisk.path)); + ARG(libxl__sprintf(gc, "--ramdisk=%s", info->u.pv.ramdisk.path)); if (info->u.pv.cmdline && *info->u.pv.cmdline != '\0') - flexarray_set(args, nr++, libxl__sprintf(gc, "--args=%s", info->u.pv.cmdline)); + ARG(libxl__sprintf(gc, "--args=%s", info->u.pv.cmdline)); - flexarray_set(args, nr++, libxl__sprintf(gc, "--output=%s", fifo)); - flexarray_set(args, nr++, "--output-format=simple0"); - flexarray_set(args, nr++, libxl__sprintf(gc, "--output-directory=%s", "/var/run/libxl/")); + ARG(libxl__sprintf(gc, "--output=%s", bl->outputpath)); + ARG("--output-format=simple0"); + ARG(libxl__sprintf(gc, "--output-directory=%s", bl->outputdir)); if (info->u.pv.bootloader_args) { char **p = info->u.pv.bootloader_args; while (*p) { - flexarray_set(args, nr++, *p); + ARG(*p); p++; } } - flexarray_set(args, nr++, disk); + ARG(bl->diskpath); - /* Sentinal for execv */ - flexarray_set(args, nr++, NULL); + /* Sentinel for execv */ + ARG(NULL); - return (char **) flexarray_contents(args); /* Frees args */ +#undef ARG } -static int open_xenconsoled_pty(int *master, int *slave, char *slave_path, size_t slave_path_len) +/*----- synchronous subroutines -----*/ + +static int setup_xenconsoled_pty(libxl__egc *egc, libxl__bootloader_state *bl, + char *slave_path, size_t slave_path_len) { + STATE_AO_GC(bl->ao); struct termios termattr; - int ret; + int r, rc; + int slave = libxl__carefd_fd(bl->ptys[1].slave); + int master = libxl__carefd_fd(bl->ptys[1].master); - ret = openpty(master, slave, NULL, NULL, NULL); - if (ret < 0) - return -1; - - ret = ttyname_r(*slave, slave_path, slave_path_len); - if (ret == -1) { - close(*master); - close(*slave); - *master = *slave = -1; - return -1; + r = ttyname_r(slave, slave_path, slave_path_len); + if (r == -1) { + LOGE(ERROR,"ttyname_r failed"); + rc = ERROR_FAIL; + goto out; } /* @@ -95,310 +109,217 @@ static int open_xenconsoled_pty(int *mas * semantics on Solaris, so don't try to set any attributes * for it. */ -#if !defined(__sun__) && !defined(__NetBSD__) - tcgetattr(*master, &termattr); + tcgetattr(master, &termattr); cfmakeraw(&termattr); - tcsetattr(*master, TCSANOW, &termattr); - - close(*slave); - *slave = -1; -#else - tcgetattr(*slave, &termattr); - cfmakeraw(&termattr); - tcsetattr(*slave, TCSANOW, &termattr); -#endif - - fcntl(*master, F_SETFL, O_NDELAY); - fcntl(*master, F_SETFD, FD_CLOEXEC); + tcsetattr(master, TCSANOW, &termattr); return 0; + + out: + return rc; } -static pid_t fork_exec_bootloader(int *master, const char *arg0, char **args) +static const char *bootloader_result_command(libxl__gc *gc, const char *buf, + const char *prefix, size_t prefixlen) { + if (strncmp(buf, prefix, prefixlen)) + return 0; + + const char *rhs = buf + prefixlen; + if (!CTYPE(isspace,*rhs)) + return 0; + + while (CTYPE(isspace,*rhs)) + rhs++; + + LOG(DEBUG,"bootloader output contained %s %s", prefix, rhs); + + return rhs; +} + +static int parse_bootloader_result(libxl__egc *egc, + libxl__bootloader_state *bl) { - struct termios termattr; - pid_t pid = forkpty(master, NULL, NULL, NULL); - if (pid == -1) - return -1; - else if (pid == 0) { - setenv("TERM", "vt100", 1); - libxl__exec(-1, -1, -1, arg0, args); - return -1; + STATE_AO_GC(bl->ao); + char buf[PATH_MAX*2]; + FILE *f = 0; + int rc = ERROR_FAIL; + libxl_domain_build_info *info = bl->info; + + f = fopen(bl->outputpath, "r"); + if (!f) { + LOGE(ERROR,"open bootloader output file %s", bl->outputpath); + goto out; } - /* - * On Solaris, the master pty side does not have terminal semantics, - * so don't try to set any attributes, as it will fail. - */ -#if !defined(__sun__) - tcgetattr(*master, &termattr); - cfmakeraw(&termattr); - tcsetattr(*master, TCSANOW, &termattr); -#endif + for (;;) { + /* Read a nul-terminated "line" and put the result in + * buf, and its length (not including the nul) in l */ + int l = 0, c; + while ((c = getc(f)) != EOF && c != '\0') { + if (l < sizeof(buf)-1) + buf[l] = c; + l++; + } + if (c == EOF) { + if (ferror(f)) { + LOGE(ERROR,"read bootloader output file %s", bl->outputpath); + goto out; + } + if (!l) + break; + } + if (l >= sizeof(buf)) { + LOG(WARN,"bootloader output contained" + " overly long item `%.150s...'", buf); + continue; + } + buf[l] = 0; - fcntl(*master, F_SETFL, O_NDELAY); + const char *rhs; +#define COMMAND(s) ((rhs = bootloader_result_command(gc, buf, s, sizeof(s)-1))) - return pid; + if (COMMAND("kernel")) { + free(info->u.pv.kernel.path); + info->u.pv.kernel.path = libxl__strdup(NULL, rhs); + libxl__file_reference_map(&info->u.pv.kernel); + unlink(info->u.pv.kernel.path); + } else if (COMMAND("ramdisk")) { + free(info->u.pv.ramdisk.path); + info->u.pv.ramdisk.path = libxl__strdup(NULL, rhs); + libxl__file_reference_map(&info->u.pv.ramdisk); + unlink(info->u.pv.ramdisk.path); + } else if (COMMAND("args")) { + free(info->u.pv.cmdline); + info->u.pv.cmdline = libxl__strdup(NULL, rhs); + } else if (l) { + LOG(WARN, "unexpected output from bootloader: `%s'", buf); + } + } + rc = 0; + + out: + if (f) fclose(f); + return rc; } -/* - * filedescriptors: - * fifo_fd - bootstring output from the bootloader - * xenconsoled_fd - input/output from/to xenconsole - * bootloader_fd - input/output from/to pty that controls the bootloader - * The filedescriptors are NDELAY, so it's ok to try to read - * bigger chunks than may be available, to keep e.g. curses - * screen redraws in the bootloader efficient. xenconsoled_fd is the side that - * gets xenconsole input, which will be keystrokes, so a small number - * is sufficient. bootloader_fd is pygrub output, which will be curses screen - * updates, so a larger number (1024) is appropriate there. - * - * For writeable descriptors, only include them in the set for select - * if there is actual data to write, otherwise this would loop too fast, - * eating up CPU time. - */ -static char * bootloader_interact(libxl__gc *gc, int xenconsoled_fd, int bootloader_fd, int fifo_fd) + +/*----- init and cleanup -----*/ + +void libxl__bootloader_init(libxl__bootloader_state *bl) { - int ret; - - size_t nr_out = 0, size_out = 0; - char *output = NULL; - struct timeval wait; - - /* input from xenconsole. read on xenconsoled_fd write to bootloader_fd */ - int xenconsoled_prod = 0, xenconsoled_cons = 0; - char xenconsoled_buf[XENCONSOLED_BUF_SIZE]; - /* output from bootloader. read on bootloader_fd write to xenconsoled_fd */ - int bootloader_prod = 0, bootloader_cons = 0; - char bootloader_buf[BOOTLOADER_BUF_SIZE]; - - while(1) { - fd_set wsel, rsel; - int nfds; - - /* Set timeout to 1s before starting to discard data */ - wait.tv_sec = BOOTLOADER_TIMEOUT; - wait.tv_usec = 0; - - /* Move buffers around to drop already consumed data */ - if (xenconsoled_cons > 0) { - xenconsoled_prod -= xenconsoled_cons; - memmove(xenconsoled_buf, &xenconsoled_buf[xenconsoled_cons], - xenconsoled_prod); - xenconsoled_cons = 0; - } - if (bootloader_cons > 0) { - bootloader_prod -= bootloader_cons; - memmove(bootloader_buf, &bootloader_buf[bootloader_cons], - bootloader_prod); - bootloader_cons = 0; - } - - FD_ZERO(&rsel); - FD_SET(fifo_fd, &rsel); - nfds = fifo_fd + 1; - if (xenconsoled_prod < XENCONSOLED_BUF_SIZE) { - /* The buffer is not full, try to read more data */ - FD_SET(xenconsoled_fd, &rsel); - nfds = xenconsoled_fd + 1 > nfds ? xenconsoled_fd + 1 : nfds; - } - if (bootloader_prod < BOOTLOADER_BUF_SIZE) { - /* The buffer is not full, try to read more data */ - FD_SET(bootloader_fd, &rsel); - nfds = bootloader_fd + 1 > nfds ? bootloader_fd + 1 : nfds; - } - - FD_ZERO(&wsel); - if (bootloader_prod > 0) { - /* The buffer has data to consume */ - FD_SET(xenconsoled_fd, &wsel); - nfds = xenconsoled_fd + 1 > nfds ? xenconsoled_fd + 1 : nfds; - } - if (xenconsoled_prod > 0) { - /* The buffer has data to consume */ - FD_SET(bootloader_fd, &wsel); - nfds = bootloader_fd + 1 > nfds ? bootloader_fd + 1 : nfds; - } - - if (xenconsoled_prod == XENCONSOLED_BUF_SIZE || - bootloader_prod == BOOTLOADER_BUF_SIZE) - ret = select(nfds, &rsel, &wsel, NULL, &wait); - else - ret = select(nfds, &rsel, &wsel, NULL, NULL); - if (ret < 0) { - if (errno == EINTR) - continue; - goto out_err; - } - - /* Input from xenconsole, read xenconsoled_fd, write bootloader_fd */ - if (ret == 0 && xenconsoled_prod == XENCONSOLED_BUF_SIZE) { - /* Drop the buffer */ - xenconsoled_prod = 0; - xenconsoled_cons = 0; - } else if (FD_ISSET(xenconsoled_fd, &rsel)) { - ret = read(xenconsoled_fd, &xenconsoled_buf[xenconsoled_prod], XENCONSOLED_BUF_SIZE - xenconsoled_prod); - if (ret < 0 && errno != EIO && errno != EAGAIN) - goto out_err; - if (ret > 0) - xenconsoled_prod += ret; - } - if (FD_ISSET(bootloader_fd, &wsel)) { - ret = write(bootloader_fd, &xenconsoled_buf[xenconsoled_cons], xenconsoled_prod - xenconsoled_cons); - if (ret < 0 && errno != EIO && errno != EAGAIN) - goto out_err; - if (ret > 0) - xenconsoled_cons += ret; - } - - /* Input from bootloader, read bootloader_fd, write xenconsoled_fd */ - if (ret == 0 && bootloader_prod == BOOTLOADER_BUF_SIZE) { - /* Drop the buffer */ - bootloader_prod = 0; - bootloader_cons = 0; - } else if (FD_ISSET(bootloader_fd, &rsel)) { - ret = read(bootloader_fd, &bootloader_buf[bootloader_prod], BOOTLOADER_BUF_SIZE - bootloader_prod); - if (ret < 0 && errno != EIO && errno != EAGAIN) - goto out_err; - if (ret > 0) - bootloader_prod += ret; - } - if (FD_ISSET(xenconsoled_fd, &wsel)) { - ret = write(xenconsoled_fd, &bootloader_buf[bootloader_cons], bootloader_prod - bootloader_cons); - if (ret < 0 && errno != EIO && errno != EAGAIN) - goto out_err; - if (ret > 0) - bootloader_cons += ret; - } - - if (FD_ISSET(fifo_fd, &rsel)) { - if (size_out - nr_out < 256) { - char *temp; - size_t new_size = size_out == 0 ? 32 : size_out * 2; - - temp = realloc(output, new_size); - if (temp == NULL) - goto out_err; - output = temp; - memset(output + size_out, 0, new_size - size_out); - size_out = new_size; - } - - ret = read(fifo_fd, output + nr_out, size_out - nr_out); - if (ret > 0) - nr_out += ret; - if (ret == 0) - break; - } - } - - libxl__ptr_add(gc, output); - return output; - -out_err: - free(output); - return NULL; + assert(bl->ao); + bl->diskpath = NULL; + bl->openpty.ao = bl->ao; + bl->ptys[0].master = bl->ptys[0].slave = 0; + bl->ptys[1].master = bl->ptys[1].slave = 0; + libxl__ev_child_init(&bl->child); + bl->keystrokes.ao = bl->ao; libxl__datacopier_init(&bl->keystrokes); + bl->display.ao = bl->ao; libxl__datacopier_init(&bl->display); } -static void parse_bootloader_result(libxl__gc *gc, - libxl_domain_build_info *info, - const char *o) +static void bootloader_cleanup(libxl__egc *egc, libxl__bootloader_state *bl) { - while (*o != '\0') { - if (strncmp("kernel ", o, strlen("kernel ")) == 0) { - free(info->u.pv.kernel.path); - info->u.pv.kernel.path = strdup(o + strlen("kernel ")); - libxl__file_reference_map(&info->u.pv.kernel); - unlink(info->u.pv.kernel.path); - } else if (strncmp("ramdisk ", o, strlen("ramdisk ")) == 0) { - free(info->u.pv.ramdisk.path); - info->u.pv.ramdisk.path = strdup(o + strlen("ramdisk ")); - libxl__file_reference_map(&info->u.pv.ramdisk); - unlink(info->u.pv.ramdisk.path); - } else if (strncmp("args ", o, strlen("args ")) == 0) { - free(info->u.pv.cmdline); - info->u.pv.cmdline = strdup(o + strlen("args ")); - } + STATE_AO_GC(bl->ao); + int i; - o = o + strlen(o) + 1; + if (bl->outputpath) libxl__remove_file(gc, bl->outputpath); + if (bl->outputdir) libxl__remove_directory(gc, bl->outputdir); + + if (bl->diskpath) { + libxl_device_disk_local_detach(CTX, bl->disk); + free(bl->diskpath); + bl->diskpath = 0; + } + libxl__datacopier_kill(&bl->keystrokes); + libxl__datacopier_kill(&bl->display); + for (i=0; i<2; i++) { + libxl__carefd_close(bl->ptys[i].master); + libxl__carefd_close(bl->ptys[i].slave); } } -int libxl_run_bootloader(libxl_ctx *ctx, - libxl_domain_build_info *info, - libxl_device_disk *disk, - uint32_t domid) +static void bootloader_setpaths(libxl__gc *gc, libxl__bootloader_state *bl) { - GC_INIT(ctx); - int ret, rc = 0; - char *fifo = NULL; - char *diskpath = NULL; - char **args = NULL; + uint32_t domid = bl->domid; + bl->outputdir = GCSPRINTF(XEN_RUN_DIR "/bootloader.%"PRIu32".d", domid); + bl->outputpath = GCSPRINTF(XEN_RUN_DIR "/bootloader.%"PRIu32".out", domid); +} - char tempdir_template[] = "/var/run/libxl/bl.XXXXXX"; - char *tempdir; +static void bootloader_callback(libxl__egc *egc, libxl__bootloader_state *bl, + int rc) +{ + bootloader_cleanup(egc, bl); + bl->callback(egc, bl, rc); +} - char *dom_console_xs_path; - char dom_console_slave_tty_path[PATH_MAX]; +/*----- main flow of control -----*/ - int xenconsoled_fd = -1, xenconsoled_slave = -1; - int bootloader_fd = -1, fifo_fd = -1; +void libxl__bootloader_run(libxl__egc *egc, libxl__bootloader_state *bl) +{ + STATE_AO_GC(bl->ao); + libxl_domain_build_info *info = bl->info; + int rc, r; - int blrc; - pid_t pid; - char *blout; + libxl__bootloader_init(bl); - struct stat st_buf; + if (info->type != LIBXL_DOMAIN_TYPE_PV || !info->u.pv.bootloader) { + rc = 0; + goto out_ok; + } - rc = libxl__domain_build_info_setdefault(gc, info); + bootloader_setpaths(gc, bl); + + for (;;) { + r = mkdir(bl->outputdir, 0600); + if (!r) break; + if (errno == EINTR) continue; + if (errno == EEXIST) break; + LOGE(ERROR, "failed to create bootloader dir %s", bl->outputdir); + rc = ERROR_FAIL; + goto out; + } + + for (;;) { + r = open(bl->outputpath, O_WRONLY|O_CREAT|O_TRUNC, 0600); + if (r>=0) { close(r); break; } + if (errno == EINTR) continue; + LOGE(ERROR, "failed to precreate bootloader output %s", bl->outputpath); + rc = ERROR_FAIL; + goto out; + } + + bl->diskpath = libxl_device_disk_local_attach(CTX, bl->disk); + if (!bl->diskpath) { + rc = ERROR_FAIL; + goto out; + } + + make_bootloader_args(gc, bl); + + bl->openpty.ao = ao; + bl->openpty.callback = bootloader_gotptys; + bl->openpty.count = 2; + bl->openpty.results = bl->ptys; + rc = libxl__openptys(&bl->openpty, 0,0); if (rc) goto out; - if (info->type != LIBXL_DOMAIN_TYPE_PV || !info->u.pv.bootloader) + return; + + out: + assert(rc); + out_ok: + bootloader_callback(egc, bl, rc); +} + +static void bootloader_gotptys(libxl__egc *egc, libxl__openpty_state *op) +{ + libxl__bootloader_state *bl = CONTAINER_OF(op, *bl, openpty); + STATE_AO_GC(bl->ao); + int rc, r; + + if (bl->openpty.rc) { + rc = bl->openpty.rc; goto out; - - rc = libxl__domain_build_info_setdefault(gc, info); - if (rc) goto out; - - rc = ERROR_INVAL; - if (!disk) - goto out; - - rc = ERROR_FAIL; - ret = mkdir("/var/run/libxl/", S_IRWXU); - if (ret < 0 && errno != EEXIST) - goto out; - - ret = stat("/var/run/libxl/", &st_buf); - if (ret < 0) - goto out; - - if (!S_ISDIR(st_buf.st_mode)) - goto out; - - tempdir = mkdtemp(tempdir_template); - if (tempdir == NULL) - goto out; - - ret = asprintf(&fifo, "%s/fifo", tempdir); - if (ret < 0) { - fifo = NULL; - goto out_close; - } - - ret = mkfifo(fifo, 0600); - if (ret < 0) { - goto out_close; - } - - diskpath = libxl_device_disk_local_attach(ctx, disk); - if (!diskpath) { - goto out_close; - } - - args = make_bootloader_args(gc, info, domid, fifo, diskpath); - if (args == NULL) { - rc = ERROR_NOMEM; - goto out_close; } /* @@ -411,76 +332,188 @@ int libxl_run_bootloader(libxl_ctx *ctx, * where we copy characters between the two master fds, as well as * listening on the bootloader's fifo for the results. */ - ret = open_xenconsoled_pty(&xenconsoled_fd, &xenconsoled_slave, + + char *dom_console_xs_path; + char dom_console_slave_tty_path[PATH_MAX]; + rc = setup_xenconsoled_pty(egc, bl, &dom_console_slave_tty_path[0], sizeof(dom_console_slave_tty_path)); - if (ret < 0) { - goto out_close; + if (rc) goto out; + + char *dompath = libxl__xs_get_dompath(gc, bl->domid); + if (!dompath) { rc = ERROR_FAIL; goto out; } + + dom_console_xs_path = GCSPRINTF("%s/console/tty", dompath); + + rc = libxl__xs_write(gc, XBT_NULL, dom_console_xs_path, "%s", + dom_console_slave_tty_path); + if (rc) { + LOGE(ERROR,"xs write console path %s := %s failed", + dom_console_xs_path, dom_console_slave_tty_path); + rc = ERROR_FAIL; + goto out; } - dom_console_xs_path = libxl__sprintf(gc, "%s/console/tty", libxl__xs_get_dompath(gc, domid)); - libxl__xs_write(gc, XBT_NULL, dom_console_xs_path, "%s", dom_console_slave_tty_path); + int bootloader_master = libxl__carefd_fd(bl->ptys[0].master); + int xenconsole_master = libxl__carefd_fd(bl->ptys[1].master); - pid = fork_exec_bootloader(&bootloader_fd, info->u.pv.bootloader, args); - if (pid < 0) { - goto out_close; + libxl_fd_set_nonblock(CTX, bootloader_master, 1); + libxl_fd_set_nonblock(CTX, xenconsole_master, 1); + + bl->keystrokes.writefd = bl->display.readfd = bootloader_master; + bl->keystrokes.writewhat = bl->display.readwhat = "bootloader pty"; + + bl->keystrokes.readfd = bl->display.writefd = xenconsole_master; + bl->keystrokes.readwhat = bl->display.writewhat = "xenconsole client pty"; + + bl->keystrokes.ao = ao; + bl->keystrokes.maxsz = BOOTLOADER_BUF_OUT; + bl->keystrokes.copywhat = + GCSPRINTF("bootloader input for domain %"PRIu32, bl->domid); + bl->keystrokes.callback = bootloader_keystrokes_copyfail; + rc = libxl__datacopier_start(&bl->keystrokes); + if (rc) goto out; + + bl->display.ao = ao; + bl->display.maxsz = BOOTLOADER_BUF_IN; + bl->display.copywhat = + GCSPRINTF("bootloader output for domain %"PRIu32, bl->domid); + bl->display.callback = bootloader_display_copyfail; + rc = libxl__datacopier_start(&bl->display); + if (rc) goto out; + + LOG(DEBUG, "executing bootloader: %s", bl->args[0]); + for (const char **blarg = bl->args; + *blarg; + blarg++) + LOG(DEBUG, " bootloader arg: %s", *blarg); + + struct termios termattr; + + pid_t pid = libxl__ev_child_fork(gc, &bl->child, bootloader_finished); + if (pid == -1) { + rc = ERROR_FAIL; + goto out; } - while (1) { - if (waitpid(pid, &blrc, WNOHANG) == pid) - goto out_close; - - fifo_fd = open(fifo, O_RDONLY); - if (fifo_fd > -1) - break; - - if (errno == EINTR) - continue; - - goto out_close; + if (!pid) { + /* child */ + r = login_tty(libxl__carefd_fd(bl->ptys[0].slave)); + if (r) { LOGE(ERROR, "login_tty failed"); exit(-1); } + setenv("TERM", "vt100", 1); + libxl__exec(-1, -1, -1, bl->args[0], (char**)bl->args); + exit(-1); } - fcntl(fifo_fd, F_SETFL, O_NDELAY); + /* parent */ - blout = bootloader_interact(gc, xenconsoled_fd, bootloader_fd, fifo_fd); - if (blout == NULL) { - goto out_close; + /* + * On Solaris, the master pty side does not have terminal semantics, + * so don't try to set any attributes, as it will fail. + */ +#if !defined(__sun__) + tcgetattr(bootloader_master, &termattr); + cfmakeraw(&termattr); + tcsetattr(bootloader_master, TCSANOW, &termattr); +#endif + + return; + + out: + bootloader_callback(egc, bl, rc); +} + +/* perhaps one of these will be called, but perhaps not */ +static void bootloader_copyfail(libxl__egc *egc, const char *which, + libxl__bootloader_state *bl, int onwrite, int errnoval) +{ + STATE_AO_GC(bl->ao); + int r; + + if (!onwrite && !errnoval) + LOG(ERROR, "unexpected eof copying %s", which); + libxl__datacopier_kill(&bl->keystrokes); + libxl__datacopier_kill(&bl->display); + if (libxl__ev_child_inuse(&bl->child)) { + r = kill(bl->child.pid, SIGTERM); + if (r) LOGE(WARN, "after failure, failed to kill bootloader [%lu]", + (unsigned long)bl->child.pid); + } + bl->rc = ERROR_FAIL; +} +static void bootloader_keystrokes_copyfail(libxl__egc *egc, + libxl__datacopier_state *dc, int onwrite, int errnoval) +{ + libxl__bootloader_state *bl = CONTAINER_OF(dc, *bl, keystrokes); + bootloader_copyfail(egc, "bootloader input", bl, onwrite, errnoval); +} +static void bootloader_display_copyfail(libxl__egc *egc, + libxl__datacopier_state *dc, int onwrite, int errnoval) +{ + libxl__bootloader_state *bl = CONTAINER_OF(dc, *bl, display); + bootloader_copyfail(egc, "bootloader output", bl, onwrite, errnoval); +} + +static void bootloader_finished(libxl__egc *egc, libxl__ev_child *child, + pid_t pid, int status) +{ + libxl__bootloader_state *bl = CONTAINER_OF(child, *bl, child); + STATE_AO_GC(bl->ao); + int rc; + + libxl__datacopier_kill(&bl->keystrokes); + libxl__datacopier_kill(&bl->display); + + if (status) { + libxl_report_child_exitstatus(CTX, XTL_ERROR, "bootloader", + pid, status); + rc = ERROR_FAIL; + goto out; + } else { + LOG(DEBUG, "bootloader completed"); } - pid = waitpid(pid, &blrc, 0); - if (pid == -1 || (pid > 0 && WIFEXITED(blrc) && WEXITSTATUS(blrc) != 0)) { - goto out_close; + if (bl->rc) { + /* datacopier went wrong */ + rc = bl->rc; + goto out; } - parse_bootloader_result(gc, info, blout); + rc = parse_bootloader_result(egc, bl); + if (rc) goto out; rc = 0; -out_close: - if (diskpath) { - libxl_device_disk_local_detach(ctx, disk); - free(diskpath); - } - if (fifo_fd > -1) - close(fifo_fd); - if (bootloader_fd > -1) - close(bootloader_fd); - if (xenconsoled_fd > -1) - close(xenconsoled_fd); - if (xenconsoled_slave > -1) - close(xenconsoled_slave); + LOG(DEBUG, "bootloader execution successful"); - if (fifo) { - unlink(fifo); - free(fifo); - } + out: + bootloader_callback(egc, bl, rc); +} - rmdir(tempdir); +/*----- entrypoint for external callers -----*/ - free(args); +static void run_bootloader_done(libxl__egc *egc, + libxl__bootloader_state *st, int rc) +{ + libxl__ao_complete(egc, st->ao, rc); +} -out: - GC_FREE; - return rc; +int libxl_run_bootloader(libxl_ctx *ctx, + libxl_domain_build_info *info, + libxl_device_disk *disk, + uint32_t domid, + libxl_asyncop_how *ao_how) +{ + AO_CREATE(ctx,domid,ao_how); + libxl__bootloader_state *bl; + + GCNEW(bl); + bl->ao = ao; + bl->callback = run_bootloader_done; + bl->info = info; + bl->disk = disk; + bl->domid = domid; + libxl__bootloader_run(egc, bl); + return AO_INPROGRESS; } /* diff -r bdfb4beb57fe -r ca1df379c862 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Fri May 11 18:58:59 2012 +0100 +++ b/tools/libxl/libxl_create.c Fri May 11 18:59:00 2012 +0100 @@ -593,8 +593,12 @@ static int do_domain_create(libxl__gc *g if (ret) goto error_out; } - if ( restore_fd < 0 ) { - ret = libxl_run_bootloader(ctx, &d_config->b_info, d_config->num_disks > 0 ? &d_config->disks[0] : NULL, domid); + libxl_device_disk *bootdisk = + d_config->num_disks > 0 ? &d_config->disks[0] : NULL; + + if (restore_fd < 0 && bootdisk) { + ret = libxl_run_bootloader(ctx, &d_config->b_info, bootdisk, domid, + 0 /* fixme-ao */); if (ret) { LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "failed to run bootloader: %d", ret); diff -r bdfb4beb57fe -r ca1df379c862 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri May 11 18:58:59 2012 +0100 +++ b/tools/libxl/libxl_internal.h Fri May 11 18:59:00 2012 +0100 @@ -42,6 +42,7 @@ #include #include #include +#include #include #include @@ -440,6 +441,7 @@ _hidden int libxl__remove_file(libxl__gc _hidden int libxl__remove_directory(libxl__gc *gc, const char *path); _hidden int libxl__remove_file_or_directory(libxl__gc *gc, const char *path); + _hidden char **libxl__xs_kvs_of_flexarray(libxl__gc *gc, flexarray_t *array, int length); _hidden int libxl__xs_writev(libxl__gc *gc, xs_transaction_t t, @@ -1549,6 +1551,38 @@ int libxl__openptys(libxl__openpty_state const struct winsize *winp); +/*----- bootloader -----*/ + +typedef struct libxl__bootloader_state libxl__bootloader_state; +typedef void libxl__run_bootloader_callback(libxl__egc*, + libxl__bootloader_state*, int rc); + +struct libxl__bootloader_state { + /* caller must fill these in, and they must all remain valid */ + libxl__ao *ao; + libxl__run_bootloader_callback *callback; + libxl_domain_build_info *info; /* u.pv.{kernel,ramdisk,cmdline} updated */ + libxl_device_disk *disk; + uint32_t domid; + /* private to libxl__run_bootloader */ + char *outputpath, *outputdir; + char *diskpath; /* not from gc, represents actually attached disk */ + libxl__openpty_state openpty; + libxl__openpty_result ptys[2]; /* [0] is for bootloader */ + libxl__ev_child child; + int nargs, argsspace; + const char **args; + libxl__datacopier_state keystrokes, display; + int rc; +}; + +_hidden void libxl__bootloader_init(libxl__bootloader_state *bl); + +/* Will definitely call st->callback, perhaps reentrantly. + * If callback is passed rc==0, will have updated st->info appropriately */ +_hidden void libxl__bootloader_run(libxl__egc*, libxl__bootloader_state *st); + + /* * Convenience macros. */ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:33:04 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:33:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCm-00051P-7H; Mon, 14 May 2012 16:33:04 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCS-0004ga-KU for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:44 +0000 Received: from [85.158.139.83:31694] by server-7.bemta-5.messagelabs.com id A6/37-16195-BA331BF4; Mon, 14 May 2012 16:32:43 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-182.messagelabs.com!1337013160!24388161!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27777 invoked from network); 14 May 2012 16:32:42 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCO-0002vK-50 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCO-0006pP-4A for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:40 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:39 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: add a dummy ao_how to libxl_domain_core_dump X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1336759142 -3600 # Node ID 0d642524dcabb76489aeb5105f8fe0aafcbd8d04 # Parent d66bee9704548312a2f79f1349b58fb808c61592 libxl: add a dummy ao_how to libxl_domain_core_dump Although this function is not currently slow it may become so in the future (this also depends somewhat on the size of the guest). Therefore arrange for it to take an ao_how which it completes immediately. This will allow us to make it asynchronous in the future without breaking API compatibility. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r d66bee970454 -r 0d642524dcab tools/libxl/libxl.c --- a/tools/libxl/libxl.c Fri May 11 18:59:01 2012 +0100 +++ b/tools/libxl/libxl.c Fri May 11 18:59:02 2012 +0100 @@ -642,16 +642,26 @@ int libxl_domain_pause(libxl_ctx *ctx, u } int libxl_domain_core_dump(libxl_ctx *ctx, uint32_t domid, - const char *filename) + const char *filename, + const libxl_asyncop_how *ao_how) { - int ret; + AO_CREATE(ctx, domid, ao_how); + int ret, rc; + ret = xc_domain_dumpcore(ctx->xch, domid, filename); if (ret<0) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "core dumping domain %d to %s", domid, filename); - return ERROR_FAIL; + rc = ERROR_FAIL; + goto out; } - return 0; + + rc = 0; +out: + + libxl__ao_complete(egc, ao, rc); + + return AO_INPROGRESS; } int libxl_domain_unpause(libxl_ctx *ctx, uint32_t domid) diff -r d66bee970454 -r 0d642524dcab tools/libxl/libxl.h --- a/tools/libxl/libxl.h Fri May 11 18:59:01 2012 +0100 +++ b/tools/libxl/libxl.h Fri May 11 18:59:02 2012 +0100 @@ -511,7 +511,9 @@ int libxl_domain_rename(libxl_ctx *ctx, int libxl_domain_pause(libxl_ctx *ctx, uint32_t domid); int libxl_domain_unpause(libxl_ctx *ctx, uint32_t domid); -int libxl_domain_core_dump(libxl_ctx *ctx, uint32_t domid, const char *filename); +int libxl_domain_core_dump(libxl_ctx *ctx, uint32_t domid, + const char *filename, + const libxl_asyncop_how *ao_how); int libxl_domain_setmaxmem(libxl_ctx *ctx, uint32_t domid, uint32_t target_memkb); int libxl_set_memory_target(libxl_ctx *ctx, uint32_t domid, int32_t target_memkb, int relative, int enforce); diff -r d66bee970454 -r 0d642524dcab tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Fri May 11 18:59:01 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Fri May 11 18:59:02 2012 +0100 @@ -1306,7 +1306,7 @@ static int handle_domain_death(libxl_ctx LOG("failed to construct core dump path"); } else { LOG("dumping core to %s", corefile); - rc=libxl_domain_core_dump(ctx, domid, corefile); + rc=libxl_domain_core_dump(ctx, domid, corefile, NULL); if (rc) LOG("core dump failed (rc=%d).", rc); } /* No point crying over spilled milk, continue on failure. */ @@ -2927,7 +2927,7 @@ static void core_dump_domain(const char { int rc; find_domain(domain_spec); - rc=libxl_domain_core_dump(ctx, domid, filename); + rc=libxl_domain_core_dump(ctx, domid, filename, NULL); if (rc) { fprintf(stderr,"core dump failed (rc=%d)\n",rc);exit(-1); } } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:33:04 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:33:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCm-00051P-7H; Mon, 14 May 2012 16:33:04 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCS-0004ga-KU for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:44 +0000 Received: from [85.158.139.83:31694] by server-7.bemta-5.messagelabs.com id A6/37-16195-BA331BF4; Mon, 14 May 2012 16:32:43 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-182.messagelabs.com!1337013160!24388161!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27777 invoked from network); 14 May 2012 16:32:42 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCO-0002vK-50 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCO-0006pP-4A for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:40 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:39 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: add a dummy ao_how to libxl_domain_core_dump X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1336759142 -3600 # Node ID 0d642524dcabb76489aeb5105f8fe0aafcbd8d04 # Parent d66bee9704548312a2f79f1349b58fb808c61592 libxl: add a dummy ao_how to libxl_domain_core_dump Although this function is not currently slow it may become so in the future (this also depends somewhat on the size of the guest). Therefore arrange for it to take an ao_how which it completes immediately. This will allow us to make it asynchronous in the future without breaking API compatibility. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r d66bee970454 -r 0d642524dcab tools/libxl/libxl.c --- a/tools/libxl/libxl.c Fri May 11 18:59:01 2012 +0100 +++ b/tools/libxl/libxl.c Fri May 11 18:59:02 2012 +0100 @@ -642,16 +642,26 @@ int libxl_domain_pause(libxl_ctx *ctx, u } int libxl_domain_core_dump(libxl_ctx *ctx, uint32_t domid, - const char *filename) + const char *filename, + const libxl_asyncop_how *ao_how) { - int ret; + AO_CREATE(ctx, domid, ao_how); + int ret, rc; + ret = xc_domain_dumpcore(ctx->xch, domid, filename); if (ret<0) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "core dumping domain %d to %s", domid, filename); - return ERROR_FAIL; + rc = ERROR_FAIL; + goto out; } - return 0; + + rc = 0; +out: + + libxl__ao_complete(egc, ao, rc); + + return AO_INPROGRESS; } int libxl_domain_unpause(libxl_ctx *ctx, uint32_t domid) diff -r d66bee970454 -r 0d642524dcab tools/libxl/libxl.h --- a/tools/libxl/libxl.h Fri May 11 18:59:01 2012 +0100 +++ b/tools/libxl/libxl.h Fri May 11 18:59:02 2012 +0100 @@ -511,7 +511,9 @@ int libxl_domain_rename(libxl_ctx *ctx, int libxl_domain_pause(libxl_ctx *ctx, uint32_t domid); int libxl_domain_unpause(libxl_ctx *ctx, uint32_t domid); -int libxl_domain_core_dump(libxl_ctx *ctx, uint32_t domid, const char *filename); +int libxl_domain_core_dump(libxl_ctx *ctx, uint32_t domid, + const char *filename, + const libxl_asyncop_how *ao_how); int libxl_domain_setmaxmem(libxl_ctx *ctx, uint32_t domid, uint32_t target_memkb); int libxl_set_memory_target(libxl_ctx *ctx, uint32_t domid, int32_t target_memkb, int relative, int enforce); diff -r d66bee970454 -r 0d642524dcab tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Fri May 11 18:59:01 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Fri May 11 18:59:02 2012 +0100 @@ -1306,7 +1306,7 @@ static int handle_domain_death(libxl_ctx LOG("failed to construct core dump path"); } else { LOG("dumping core to %s", corefile); - rc=libxl_domain_core_dump(ctx, domid, corefile); + rc=libxl_domain_core_dump(ctx, domid, corefile, NULL); if (rc) LOG("core dump failed (rc=%d).", rc); } /* No point crying over spilled milk, continue on failure. */ @@ -2927,7 +2927,7 @@ static void core_dump_domain(const char { int rc; find_domain(domain_spec); - rc=libxl_domain_core_dump(ctx, domid, filename); + rc=libxl_domain_core_dump(ctx, domid, filename, NULL); if (rc) { fprintf(stderr,"core dump failed (rc=%d)\n",rc);exit(-1); } } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:33:07 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:33:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCp-00053U-Kd; Mon, 14 May 2012 16:33:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCT-0004ZO-Fs for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:45 +0000 Received: from [85.158.139.83:33778] by server-11.bemta-5.messagelabs.com id 72/81-12959-DA331BF4; Mon, 14 May 2012 16:32:45 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-182.messagelabs.com!1337013161!28332237!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3662 invoked from network); 14 May 2012 16:32:43 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCP-0002vW-6H for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCP-0006pt-5S for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:41 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:40 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: change some structures to unit arrays X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1336759142 -3600 # Node ID 9524eb476e930960a579bd9e0219450dd4462527 # Parent 635eb1d6d43376c1897711ac6b7c012f453cca62 libxl: change some structures to unit arrays In the next patch these variables will turn into actual pointers. To clarify that patch, prepare the ground by changing these variables from "struct foo var" to "struct foo var[1]". This enables accesses to them and their members to be made as if they were pointers. No functional change. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 635eb1d6d433 -r 9524eb476e93 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Fri May 11 18:59:02 2012 +0100 +++ b/tools/libxl/libxl_create.c Fri May 11 18:59:02 2012 +0100 @@ -564,7 +564,7 @@ static int do_domain_create(libxl__gc *g { libxl_ctx *ctx = libxl__gc_owner(gc); libxl__spawner_starting *dm_starting = 0; - libxl__domain_build_state state; + libxl__domain_build_state state[1]; uint32_t domid; int i, ret; @@ -606,12 +606,12 @@ static int do_domain_create(libxl__gc *g } } - memset(&state, 0, sizeof(state)); + memset(state, 0, sizeof(*state)); if ( restore_fd >= 0 ) { - ret = domain_restore(gc, &d_config->b_info, domid, restore_fd, &state); + ret = domain_restore(gc, &d_config->b_info, domid, restore_fd, state); } else { - ret = libxl__domain_build(gc, &d_config->b_info, domid, &state); + ret = libxl__domain_build(gc, &d_config->b_info, domid, state); } if (ret) { @@ -649,7 +649,7 @@ static int do_domain_create(libxl__gc *g ret = init_console_info(&console, 0); if ( ret ) goto error_out; - libxl__device_console_add(gc, domid, &console, &state); + libxl__device_console_add(gc, domid, &console, state); libxl__device_console_dispose(&console); libxl_device_vkb_init(&vkb); @@ -657,7 +657,7 @@ static int do_domain_create(libxl__gc *g libxl_device_vkb_dispose(&vkb); ret = libxl__create_device_model(gc, domid, d_config, - &state, &dm_starting); + state, &dm_starting); if (ret < 0) { LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "failed to create device model: %d", ret); @@ -683,11 +683,11 @@ static int do_domain_create(libxl__gc *g d_config->num_vfbs, d_config->vfbs, d_config->num_disks, &d_config->disks[0]); - libxl__device_console_add(gc, domid, &console, &state); + libxl__device_console_add(gc, domid, &console, state); libxl__device_console_dispose(&console); if (need_qemu) { - libxl__create_xenpv_qemu(gc, domid, d_config, &state, &dm_starting); + libxl__create_xenpv_qemu(gc, domid, d_config, state, &dm_starting); } break; } @@ -701,7 +701,7 @@ static int do_domain_create(libxl__gc *g == LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN) { libxl__qmp_initializations(gc, domid, d_config); } - ret = libxl__confirm_device_model_startup(gc, &state, dm_starting); + ret = libxl__confirm_device_model_startup(gc, state, dm_starting); if (ret < 0) { LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "device model did not start: %d", ret); diff -r 635eb1d6d433 -r 9524eb476e93 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Fri May 11 18:59:02 2012 +0100 +++ b/tools/libxl/libxl_dm.c Fri May 11 18:59:02 2012 +0100 @@ -678,10 +678,10 @@ static int libxl__create_stubdom(libxl__ libxl_ctx *ctx = libxl__gc_owner(gc); int i, num_console = STUBDOM_SPECIAL_CONSOLES, ret; libxl__device_console *console; - libxl_domain_config dm_config; + libxl_domain_config dm_config[1]; libxl_device_vfb vfb; libxl_device_vkb vkb; - libxl__domain_build_state stubdom_state; + libxl__domain_build_state stubdom_state[1]; uint32_t dm_domid; char **args; struct xs_permissions perm[2]; @@ -694,58 +694,58 @@ static int libxl__create_stubdom(libxl__ goto out; } - libxl_domain_create_info_init(&dm_config.c_info); - dm_config.c_info.type = LIBXL_DOMAIN_TYPE_PV; - dm_config.c_info.name = libxl__sprintf(gc, "%s-dm", + libxl_domain_create_info_init(&dm_config->c_info); + dm_config->c_info.type = LIBXL_DOMAIN_TYPE_PV; + dm_config->c_info.name = libxl__sprintf(gc, "%s-dm", libxl__domid_to_name(gc, guest_domid)); - dm_config.c_info.ssidref = guest_config->b_info.device_model_ssidref; + dm_config->c_info.ssidref = guest_config->b_info.device_model_ssidref; - libxl_uuid_generate(&dm_config.c_info.uuid); + libxl_uuid_generate(&dm_config->c_info.uuid); - libxl_domain_build_info_init(&dm_config.b_info); - libxl_domain_build_info_init_type(&dm_config.b_info, LIBXL_DOMAIN_TYPE_PV); + libxl_domain_build_info_init(&dm_config->b_info); + libxl_domain_build_info_init_type(&dm_config->b_info, LIBXL_DOMAIN_TYPE_PV); - dm_config.b_info.max_vcpus = 1; - dm_config.b_info.max_memkb = 32 * 1024; - dm_config.b_info.target_memkb = dm_config.b_info.max_memkb; + dm_config->b_info.max_vcpus = 1; + dm_config->b_info.max_memkb = 32 * 1024; + dm_config->b_info.target_memkb = dm_config->b_info.max_memkb; - dm_config.b_info.u.pv.kernel.path = libxl__abs_path(gc, "ioemu-stubdom.gz", + dm_config->b_info.u.pv.kernel.path = libxl__abs_path(gc, "ioemu-stubdom.gz", libxl__xenfirmwaredir_path()); - dm_config.b_info.u.pv.cmdline = libxl__sprintf(gc, " -d %d", guest_domid); - dm_config.b_info.u.pv.ramdisk.path = ""; - dm_config.b_info.u.pv.features = ""; + dm_config->b_info.u.pv.cmdline = libxl__sprintf(gc, " -d %d", guest_domid); + dm_config->b_info.u.pv.ramdisk.path = ""; + dm_config->b_info.u.pv.features = ""; - dm_config.b_info.device_model_version = + dm_config->b_info.device_model_version = guest_config->b_info.device_model_version; - dm_config.b_info.device_model = + dm_config->b_info.device_model = guest_config->b_info.device_model; - dm_config.b_info.extra = guest_config->b_info.extra; - dm_config.b_info.extra_pv = guest_config->b_info.extra_pv; - dm_config.b_info.extra_hvm = guest_config->b_info.extra_hvm; + dm_config->b_info.extra = guest_config->b_info.extra; + dm_config->b_info.extra_pv = guest_config->b_info.extra_pv; + dm_config->b_info.extra_hvm = guest_config->b_info.extra_hvm; - dm_config.disks = guest_config->disks; - dm_config.num_disks = guest_config->num_disks; + dm_config->disks = guest_config->disks; + dm_config->num_disks = guest_config->num_disks; - dm_config.vifs = guest_config->vifs; - dm_config.num_vifs = guest_config->num_vifs; + dm_config->vifs = guest_config->vifs; + dm_config->num_vifs = guest_config->num_vifs; - ret = libxl__domain_create_info_setdefault(gc, &dm_config.c_info); + ret = libxl__domain_create_info_setdefault(gc, &dm_config->c_info); if (ret) goto out; - ret = libxl__domain_build_info_setdefault(gc, &dm_config.b_info); + ret = libxl__domain_build_info_setdefault(gc, &dm_config->b_info); if (ret) goto out; libxl__vfb_and_vkb_from_hvm_guest_config(gc, guest_config, &vfb, &vkb); - dm_config.vfbs = &vfb; - dm_config.num_vfbs = 1; - dm_config.vkbs = &vkb; - dm_config.num_vkbs = 1; + dm_config->vfbs = &vfb; + dm_config->num_vfbs = 1; + dm_config->vkbs = &vkb; + dm_config->num_vkbs = 1; /* fixme: this function can leak the stubdom if it fails */ dm_domid = 0; - ret = libxl__domain_make(gc, &dm_config.c_info, &dm_domid); + ret = libxl__domain_make(gc, &dm_config->c_info, &dm_domid); if (ret) goto out; - ret = libxl__domain_build(gc, &dm_config.b_info, dm_domid, &stubdom_state); + ret = libxl__domain_build(gc, &dm_config->b_info, dm_domid, stubdom_state); if (ret) goto out; @@ -790,20 +790,20 @@ retry_transaction: if (errno == EAGAIN) goto retry_transaction; - for (i = 0; i < dm_config.num_disks; i++) { - ret = libxl_device_disk_add(ctx, dm_domid, &dm_config.disks[i]); + for (i = 0; i < dm_config->num_disks; i++) { + ret = libxl_device_disk_add(ctx, dm_domid, &dm_config->disks[i]); if (ret) goto out_free; } - for (i = 0; i < dm_config.num_vifs; i++) { - ret = libxl_device_nic_add(ctx, dm_domid, &dm_config.vifs[i]); + for (i = 0; i < dm_config->num_vifs; i++) { + ret = libxl_device_nic_add(ctx, dm_domid, &dm_config->vifs[i]); if (ret) goto out_free; } - ret = libxl_device_vfb_add(ctx, dm_domid, &dm_config.vfbs[0]); + ret = libxl_device_vfb_add(ctx, dm_domid, &dm_config->vfbs[0]); if (ret) goto out_free; - ret = libxl_device_vkb_add(ctx, dm_domid, &dm_config.vkbs[0]); + ret = libxl_device_vkb_add(ctx, dm_domid, &dm_config->vkbs[0]); if (ret) goto out_free; @@ -847,14 +847,14 @@ retry_transaction: break; } ret = libxl__device_console_add(gc, dm_domid, &console[i], - i == STUBDOM_CONSOLE_LOGGING ? &stubdom_state : NULL); + i == STUBDOM_CONSOLE_LOGGING ? stubdom_state : NULL); if (ret) goto out_free; } if (libxl__create_xenpv_qemu(gc, dm_domid, - &dm_config, - &stubdom_state, + dm_config, + stubdom_state, &dm_starting) < 0) { ret = ERROR_FAIL; goto out_free; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:33:07 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:33:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCp-00053U-Kd; Mon, 14 May 2012 16:33:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCT-0004ZO-Fs for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:45 +0000 Received: from [85.158.139.83:33778] by server-11.bemta-5.messagelabs.com id 72/81-12959-DA331BF4; Mon, 14 May 2012 16:32:45 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-182.messagelabs.com!1337013161!28332237!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3662 invoked from network); 14 May 2012 16:32:43 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCP-0002vW-6H for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCP-0006pt-5S for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:41 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:40 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: change some structures to unit arrays X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1336759142 -3600 # Node ID 9524eb476e930960a579bd9e0219450dd4462527 # Parent 635eb1d6d43376c1897711ac6b7c012f453cca62 libxl: change some structures to unit arrays In the next patch these variables will turn into actual pointers. To clarify that patch, prepare the ground by changing these variables from "struct foo var" to "struct foo var[1]". This enables accesses to them and their members to be made as if they were pointers. No functional change. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 635eb1d6d433 -r 9524eb476e93 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Fri May 11 18:59:02 2012 +0100 +++ b/tools/libxl/libxl_create.c Fri May 11 18:59:02 2012 +0100 @@ -564,7 +564,7 @@ static int do_domain_create(libxl__gc *g { libxl_ctx *ctx = libxl__gc_owner(gc); libxl__spawner_starting *dm_starting = 0; - libxl__domain_build_state state; + libxl__domain_build_state state[1]; uint32_t domid; int i, ret; @@ -606,12 +606,12 @@ static int do_domain_create(libxl__gc *g } } - memset(&state, 0, sizeof(state)); + memset(state, 0, sizeof(*state)); if ( restore_fd >= 0 ) { - ret = domain_restore(gc, &d_config->b_info, domid, restore_fd, &state); + ret = domain_restore(gc, &d_config->b_info, domid, restore_fd, state); } else { - ret = libxl__domain_build(gc, &d_config->b_info, domid, &state); + ret = libxl__domain_build(gc, &d_config->b_info, domid, state); } if (ret) { @@ -649,7 +649,7 @@ static int do_domain_create(libxl__gc *g ret = init_console_info(&console, 0); if ( ret ) goto error_out; - libxl__device_console_add(gc, domid, &console, &state); + libxl__device_console_add(gc, domid, &console, state); libxl__device_console_dispose(&console); libxl_device_vkb_init(&vkb); @@ -657,7 +657,7 @@ static int do_domain_create(libxl__gc *g libxl_device_vkb_dispose(&vkb); ret = libxl__create_device_model(gc, domid, d_config, - &state, &dm_starting); + state, &dm_starting); if (ret < 0) { LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "failed to create device model: %d", ret); @@ -683,11 +683,11 @@ static int do_domain_create(libxl__gc *g d_config->num_vfbs, d_config->vfbs, d_config->num_disks, &d_config->disks[0]); - libxl__device_console_add(gc, domid, &console, &state); + libxl__device_console_add(gc, domid, &console, state); libxl__device_console_dispose(&console); if (need_qemu) { - libxl__create_xenpv_qemu(gc, domid, d_config, &state, &dm_starting); + libxl__create_xenpv_qemu(gc, domid, d_config, state, &dm_starting); } break; } @@ -701,7 +701,7 @@ static int do_domain_create(libxl__gc *g == LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN) { libxl__qmp_initializations(gc, domid, d_config); } - ret = libxl__confirm_device_model_startup(gc, &state, dm_starting); + ret = libxl__confirm_device_model_startup(gc, state, dm_starting); if (ret < 0) { LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "device model did not start: %d", ret); diff -r 635eb1d6d433 -r 9524eb476e93 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Fri May 11 18:59:02 2012 +0100 +++ b/tools/libxl/libxl_dm.c Fri May 11 18:59:02 2012 +0100 @@ -678,10 +678,10 @@ static int libxl__create_stubdom(libxl__ libxl_ctx *ctx = libxl__gc_owner(gc); int i, num_console = STUBDOM_SPECIAL_CONSOLES, ret; libxl__device_console *console; - libxl_domain_config dm_config; + libxl_domain_config dm_config[1]; libxl_device_vfb vfb; libxl_device_vkb vkb; - libxl__domain_build_state stubdom_state; + libxl__domain_build_state stubdom_state[1]; uint32_t dm_domid; char **args; struct xs_permissions perm[2]; @@ -694,58 +694,58 @@ static int libxl__create_stubdom(libxl__ goto out; } - libxl_domain_create_info_init(&dm_config.c_info); - dm_config.c_info.type = LIBXL_DOMAIN_TYPE_PV; - dm_config.c_info.name = libxl__sprintf(gc, "%s-dm", + libxl_domain_create_info_init(&dm_config->c_info); + dm_config->c_info.type = LIBXL_DOMAIN_TYPE_PV; + dm_config->c_info.name = libxl__sprintf(gc, "%s-dm", libxl__domid_to_name(gc, guest_domid)); - dm_config.c_info.ssidref = guest_config->b_info.device_model_ssidref; + dm_config->c_info.ssidref = guest_config->b_info.device_model_ssidref; - libxl_uuid_generate(&dm_config.c_info.uuid); + libxl_uuid_generate(&dm_config->c_info.uuid); - libxl_domain_build_info_init(&dm_config.b_info); - libxl_domain_build_info_init_type(&dm_config.b_info, LIBXL_DOMAIN_TYPE_PV); + libxl_domain_build_info_init(&dm_config->b_info); + libxl_domain_build_info_init_type(&dm_config->b_info, LIBXL_DOMAIN_TYPE_PV); - dm_config.b_info.max_vcpus = 1; - dm_config.b_info.max_memkb = 32 * 1024; - dm_config.b_info.target_memkb = dm_config.b_info.max_memkb; + dm_config->b_info.max_vcpus = 1; + dm_config->b_info.max_memkb = 32 * 1024; + dm_config->b_info.target_memkb = dm_config->b_info.max_memkb; - dm_config.b_info.u.pv.kernel.path = libxl__abs_path(gc, "ioemu-stubdom.gz", + dm_config->b_info.u.pv.kernel.path = libxl__abs_path(gc, "ioemu-stubdom.gz", libxl__xenfirmwaredir_path()); - dm_config.b_info.u.pv.cmdline = libxl__sprintf(gc, " -d %d", guest_domid); - dm_config.b_info.u.pv.ramdisk.path = ""; - dm_config.b_info.u.pv.features = ""; + dm_config->b_info.u.pv.cmdline = libxl__sprintf(gc, " -d %d", guest_domid); + dm_config->b_info.u.pv.ramdisk.path = ""; + dm_config->b_info.u.pv.features = ""; - dm_config.b_info.device_model_version = + dm_config->b_info.device_model_version = guest_config->b_info.device_model_version; - dm_config.b_info.device_model = + dm_config->b_info.device_model = guest_config->b_info.device_model; - dm_config.b_info.extra = guest_config->b_info.extra; - dm_config.b_info.extra_pv = guest_config->b_info.extra_pv; - dm_config.b_info.extra_hvm = guest_config->b_info.extra_hvm; + dm_config->b_info.extra = guest_config->b_info.extra; + dm_config->b_info.extra_pv = guest_config->b_info.extra_pv; + dm_config->b_info.extra_hvm = guest_config->b_info.extra_hvm; - dm_config.disks = guest_config->disks; - dm_config.num_disks = guest_config->num_disks; + dm_config->disks = guest_config->disks; + dm_config->num_disks = guest_config->num_disks; - dm_config.vifs = guest_config->vifs; - dm_config.num_vifs = guest_config->num_vifs; + dm_config->vifs = guest_config->vifs; + dm_config->num_vifs = guest_config->num_vifs; - ret = libxl__domain_create_info_setdefault(gc, &dm_config.c_info); + ret = libxl__domain_create_info_setdefault(gc, &dm_config->c_info); if (ret) goto out; - ret = libxl__domain_build_info_setdefault(gc, &dm_config.b_info); + ret = libxl__domain_build_info_setdefault(gc, &dm_config->b_info); if (ret) goto out; libxl__vfb_and_vkb_from_hvm_guest_config(gc, guest_config, &vfb, &vkb); - dm_config.vfbs = &vfb; - dm_config.num_vfbs = 1; - dm_config.vkbs = &vkb; - dm_config.num_vkbs = 1; + dm_config->vfbs = &vfb; + dm_config->num_vfbs = 1; + dm_config->vkbs = &vkb; + dm_config->num_vkbs = 1; /* fixme: this function can leak the stubdom if it fails */ dm_domid = 0; - ret = libxl__domain_make(gc, &dm_config.c_info, &dm_domid); + ret = libxl__domain_make(gc, &dm_config->c_info, &dm_domid); if (ret) goto out; - ret = libxl__domain_build(gc, &dm_config.b_info, dm_domid, &stubdom_state); + ret = libxl__domain_build(gc, &dm_config->b_info, dm_domid, stubdom_state); if (ret) goto out; @@ -790,20 +790,20 @@ retry_transaction: if (errno == EAGAIN) goto retry_transaction; - for (i = 0; i < dm_config.num_disks; i++) { - ret = libxl_device_disk_add(ctx, dm_domid, &dm_config.disks[i]); + for (i = 0; i < dm_config->num_disks; i++) { + ret = libxl_device_disk_add(ctx, dm_domid, &dm_config->disks[i]); if (ret) goto out_free; } - for (i = 0; i < dm_config.num_vifs; i++) { - ret = libxl_device_nic_add(ctx, dm_domid, &dm_config.vifs[i]); + for (i = 0; i < dm_config->num_vifs; i++) { + ret = libxl_device_nic_add(ctx, dm_domid, &dm_config->vifs[i]); if (ret) goto out_free; } - ret = libxl_device_vfb_add(ctx, dm_domid, &dm_config.vfbs[0]); + ret = libxl_device_vfb_add(ctx, dm_domid, &dm_config->vfbs[0]); if (ret) goto out_free; - ret = libxl_device_vkb_add(ctx, dm_domid, &dm_config.vkbs[0]); + ret = libxl_device_vkb_add(ctx, dm_domid, &dm_config->vkbs[0]); if (ret) goto out_free; @@ -847,14 +847,14 @@ retry_transaction: break; } ret = libxl__device_console_add(gc, dm_domid, &console[i], - i == STUBDOM_CONSOLE_LOGGING ? &stubdom_state : NULL); + i == STUBDOM_CONSOLE_LOGGING ? stubdom_state : NULL); if (ret) goto out_free; } if (libxl__create_xenpv_qemu(gc, dm_domid, - &dm_config, - &stubdom_state, + dm_config, + stubdom_state, &dm_starting) < 0) { ret = ERROR_FAIL; goto out_free; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:33:08 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:33:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCq-00053t-2e; Mon, 14 May 2012 16:33:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCU-0004id-4K for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:46 +0000 Received: from [85.158.138.51:34839] by server-10.bemta-3.messagelabs.com id 41/46-29478-DA331BF4; Mon, 14 May 2012 16:32:45 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-174.messagelabs.com!1337013163!27023994!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13672 invoked from network); 14 May 2012 16:32:44 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:44 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCQ-0002vg-8f for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCQ-0006qN-7w for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:42 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:41 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: set guest_domid even if libxl__domain_make fails X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Roger Pau Monne # Date 1336759143 -3600 # Node ID 86f8a5708fbfe0f8c2859041398c03f3c635d5ca # Parent 885fdd4fd7ac807a2b0e6a322ab492f0f40d1561 libxl: set guest_domid even if libxl__domain_make fails This is needed in order to perform the domain destruction if libxl__domain_make fails. Also move doc comment about error behaviour of libxl__domain_make from implementation to declaration. Signed-off-by: Roger Pau Monne Signed-off-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 885fdd4fd7ac -r 86f8a5708fbf tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Fri May 11 18:59:03 2012 +0100 +++ b/tools/libxl/libxl_create.c Fri May 11 18:59:03 2012 +0100 @@ -396,8 +396,6 @@ out: int libxl__domain_make(libxl__gc *gc, libxl_domain_create_info *info, uint32_t *domid) - /* on entry, libxl_domid_valid_guest(domid) must be false; - * on exit (even error exit), domid may be valid and refer to a domain */ { libxl_ctx *ctx = libxl__gc_owner(gc); int flags, ret, rc; @@ -600,6 +598,7 @@ static void initiate_domain_create(libxl ret = libxl__domain_make(gc, &d_config->c_info, &domid); if (ret) { LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "cannot make domain: %d", ret); + dcs->guest_domid = domid; ret = ERROR_FAIL; goto error_out; } diff -r 885fdd4fd7ac -r 86f8a5708fbf tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri May 11 18:59:03 2012 +0100 +++ b/tools/libxl/libxl_internal.h Fri May 11 18:59:03 2012 +0100 @@ -1078,9 +1078,13 @@ _hidden void libxl__exec(int stdinfd, in const char *arg0, char **args); // logs errors, never returns /* from xl_create */ + + /* on entry, libxl_domid_valid_guest(domid) must be false; + * on exit (even error exit), domid may be valid and refer to a domain */ _hidden int libxl__domain_make(libxl__gc *gc, libxl_domain_create_info *info, uint32_t *domid); + _hidden int libxl__domain_build(libxl__gc *gc, libxl_domain_build_info *info, uint32_t domid, _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:33:08 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:33:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCq-00053t-2e; Mon, 14 May 2012 16:33:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCU-0004id-4K for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:46 +0000 Received: from [85.158.138.51:34839] by server-10.bemta-3.messagelabs.com id 41/46-29478-DA331BF4; Mon, 14 May 2012 16:32:45 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-174.messagelabs.com!1337013163!27023994!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13672 invoked from network); 14 May 2012 16:32:44 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:44 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCQ-0002vg-8f for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCQ-0006qN-7w for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:42 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:41 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: set guest_domid even if libxl__domain_make fails X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Roger Pau Monne # Date 1336759143 -3600 # Node ID 86f8a5708fbfe0f8c2859041398c03f3c635d5ca # Parent 885fdd4fd7ac807a2b0e6a322ab492f0f40d1561 libxl: set guest_domid even if libxl__domain_make fails This is needed in order to perform the domain destruction if libxl__domain_make fails. Also move doc comment about error behaviour of libxl__domain_make from implementation to declaration. Signed-off-by: Roger Pau Monne Signed-off-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 885fdd4fd7ac -r 86f8a5708fbf tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Fri May 11 18:59:03 2012 +0100 +++ b/tools/libxl/libxl_create.c Fri May 11 18:59:03 2012 +0100 @@ -396,8 +396,6 @@ out: int libxl__domain_make(libxl__gc *gc, libxl_domain_create_info *info, uint32_t *domid) - /* on entry, libxl_domid_valid_guest(domid) must be false; - * on exit (even error exit), domid may be valid and refer to a domain */ { libxl_ctx *ctx = libxl__gc_owner(gc); int flags, ret, rc; @@ -600,6 +598,7 @@ static void initiate_domain_create(libxl ret = libxl__domain_make(gc, &d_config->c_info, &domid); if (ret) { LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "cannot make domain: %d", ret); + dcs->guest_domid = domid; ret = ERROR_FAIL; goto error_out; } diff -r 885fdd4fd7ac -r 86f8a5708fbf tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri May 11 18:59:03 2012 +0100 +++ b/tools/libxl/libxl_internal.h Fri May 11 18:59:03 2012 +0100 @@ -1078,9 +1078,13 @@ _hidden void libxl__exec(int stdinfd, in const char *arg0, char **args); // logs errors, never returns /* from xl_create */ + + /* on entry, libxl_domid_valid_guest(domid) must be false; + * on exit (even error exit), domid may be valid and refer to a domain */ _hidden int libxl__domain_make(libxl__gc *gc, libxl_domain_create_info *info, uint32_t *domid); + _hidden int libxl__domain_build(libxl__gc *gc, libxl_domain_build_info *info, uint32_t domid, _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:33:09 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:33:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCq-00054i-SG; Mon, 14 May 2012 16:33:08 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCU-0004eY-A3 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:46 +0000 Received: from [85.158.143.35:11597] by server-1.bemta-4.messagelabs.com id 6F/39-20925-EA331BF4; Mon, 14 May 2012 16:32:46 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-21.messagelabs.com!1337013164!12170379!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10672 invoked from network); 14 May 2012 16:32:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCS-0002w0-BP for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCS-0006rL-Ao for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:44 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:43 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: remove malloc failure handling from NEW_EVENT X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1336759145 -3600 # Node ID 30c22846e770c48c32d3a74ae36f7877a257a9eb # Parent 687512370976584f44ce21a95e6b7e74fdf3b855 libxl: remove malloc failure handling from NEW_EVENT Change to use libxl__zalloc, where allocation failure is fatal. Also remove a spurious semicolon from the helper macro. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 687512370976 -r 30c22846e770 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Fri May 11 18:59:05 2012 +0100 +++ b/tools/libxl/libxl.c Fri May 11 18:59:05 2012 +0100 @@ -789,7 +789,6 @@ static void domain_death_occurred(libxl_ *evg_upd = evg_next; libxl_event *ev = NEW_EVENT(egc, DOMAIN_DEATH, evg->domid); - if (!ev) return; libxl__event_occurred(egc, ev); @@ -876,7 +875,6 @@ static void domain_death_xswatch_callbac if (!evg->shutdown_reported && (got->flags & XEN_DOMINF_shutdown)) { libxl_event *ev = NEW_EVENT(egc, DOMAIN_SHUTDOWN, got->domain); - if (!ev) goto out; LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, " shutdown reporting"); diff -r 687512370976 -r 30c22846e770 tools/libxl/libxl_event.c --- a/tools/libxl/libxl_event.c Fri May 11 18:59:05 2012 +0100 +++ b/tools/libxl/libxl_event.c Fri May 11 18:59:05 2012 +0100 @@ -989,13 +989,7 @@ libxl_event *libxl__event_new(libxl__egc { libxl_event *ev; - ev = malloc(sizeof(*ev)); - if (!ev) { - LIBXL__EVENT_DISASTER(egc, "allocate new event", errno, type); - return NULL; - } - - memset(ev, 0, sizeof(*ev)); + ev = libxl__zalloc(0,sizeof(*ev)); ev->type = type; ev->domid = domid; diff -r 687512370976 -r 30c22846e770 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri May 11 18:59:05 2012 +0100 +++ b/tools/libxl/libxl_internal.h Fri May 11 18:59:05 2012 +0100 @@ -654,10 +654,10 @@ _hidden libxl_event *libxl__event_new(li uint32_t domid); /* Convenience function. * Allocates a new libxl_event, fills in domid and type. - * If allocation fails, calls _disaster, and returns NULL. */ + * Cannot fail. */ #define NEW_EVENT(egc, type, domid) \ - libxl__event_new((egc), LIBXL_EVENT_TYPE_##type, (domid)); + libxl__event_new((egc), LIBXL_EVENT_TYPE_##type, (domid)) /* Convenience macro. */ /* _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:33:09 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:33:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCq-00054i-SG; Mon, 14 May 2012 16:33:08 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCU-0004eY-A3 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:46 +0000 Received: from [85.158.143.35:11597] by server-1.bemta-4.messagelabs.com id 6F/39-20925-EA331BF4; Mon, 14 May 2012 16:32:46 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-21.messagelabs.com!1337013164!12170379!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10672 invoked from network); 14 May 2012 16:32:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCS-0002w0-BP for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCS-0006rL-Ao for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:44 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:43 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: remove malloc failure handling from NEW_EVENT X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1336759145 -3600 # Node ID 30c22846e770c48c32d3a74ae36f7877a257a9eb # Parent 687512370976584f44ce21a95e6b7e74fdf3b855 libxl: remove malloc failure handling from NEW_EVENT Change to use libxl__zalloc, where allocation failure is fatal. Also remove a spurious semicolon from the helper macro. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 687512370976 -r 30c22846e770 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Fri May 11 18:59:05 2012 +0100 +++ b/tools/libxl/libxl.c Fri May 11 18:59:05 2012 +0100 @@ -789,7 +789,6 @@ static void domain_death_occurred(libxl_ *evg_upd = evg_next; libxl_event *ev = NEW_EVENT(egc, DOMAIN_DEATH, evg->domid); - if (!ev) return; libxl__event_occurred(egc, ev); @@ -876,7 +875,6 @@ static void domain_death_xswatch_callbac if (!evg->shutdown_reported && (got->flags & XEN_DOMINF_shutdown)) { libxl_event *ev = NEW_EVENT(egc, DOMAIN_SHUTDOWN, got->domain); - if (!ev) goto out; LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, " shutdown reporting"); diff -r 687512370976 -r 30c22846e770 tools/libxl/libxl_event.c --- a/tools/libxl/libxl_event.c Fri May 11 18:59:05 2012 +0100 +++ b/tools/libxl/libxl_event.c Fri May 11 18:59:05 2012 +0100 @@ -989,13 +989,7 @@ libxl_event *libxl__event_new(libxl__egc { libxl_event *ev; - ev = malloc(sizeof(*ev)); - if (!ev) { - LIBXL__EVENT_DISASTER(egc, "allocate new event", errno, type); - return NULL; - } - - memset(ev, 0, sizeof(*ev)); + ev = libxl__zalloc(0,sizeof(*ev)); ev->type = type; ev->domid = domid; diff -r 687512370976 -r 30c22846e770 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri May 11 18:59:05 2012 +0100 +++ b/tools/libxl/libxl_internal.h Fri May 11 18:59:05 2012 +0100 @@ -654,10 +654,10 @@ _hidden libxl_event *libxl__event_new(li uint32_t domid); /* Convenience function. * Allocates a new libxl_event, fills in domid and type. - * If allocation fails, calls _disaster, and returns NULL. */ + * Cannot fail. */ #define NEW_EVENT(egc, type, domid) \ - libxl__event_new((egc), LIBXL_EVENT_TYPE_##type, (domid)); + libxl__event_new((egc), LIBXL_EVENT_TYPE_##type, (domid)) /* Convenience macro. */ /* _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:33:10 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:33:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCr-00054z-4b; Mon, 14 May 2012 16:33:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCU-0004id-KN for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:46 +0000 Received: from [85.158.138.51:34848] by server-10.bemta-3.messagelabs.com id 22/46-29478-DA331BF4; Mon, 14 May 2012 16:32:45 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-174.messagelabs.com!1337013163!20705844!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8558 invoked from network); 14 May 2012 16:32:44 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:44 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCR-0002vq-9q for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:43 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCR-0006qr-9C for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:43 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:42 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: Fix an ao completion bug; document locking policy X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1336759144 -3600 # Node ID 2a8686b77897517b0aaf24b28ebf7a7f782c1317 # Parent a87bde27be269a657d348c0d215a6d9e3d32d8a4 libxl: Fix an ao completion bug; document locking policy Document the concurrent access policies for libxl__ao and libxl__egc, and their corresponding gcs. Fix a violation of the policy: If an ao was submitted and a callback requested, and while the initiating function was still running on the original thread, the ao is completed on another thread, the completing thread would improperly concurrently access the ao with the initiating thread. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r a87bde27be26 -r 2a8686b77897 tools/libxl/libxl_event.c --- a/tools/libxl/libxl_event.c Fri May 11 18:59:04 2012 +0100 +++ b/tools/libxl/libxl_event.c Fri May 11 18:59:04 2012 +0100 @@ -901,6 +901,11 @@ void libxl__event_disaster(libxl__egc *e static void egc_run_callbacks(libxl__egc *egc) { + /* + * The callbacks must happen with the ctx unlocked. + * See the comment near #define EGC_GC in libxl_internal.h and + * those in the definitions of libxl__egc and libxl__ao. + */ EGC_GC; libxl_event *ev, *ev_tmp; @@ -914,9 +919,11 @@ static void egc_run_callbacks(libxl__egc entry_for_callback, ao_tmp) { LIBXL_TAILQ_REMOVE(&egc->aos_for_callback, ao, entry_for_callback); ao->how.callback(CTX, ao->rc, ao->how.u.for_callback); + CTX_LOCK; ao->notified = 1; if (!ao->in_initiator) libxl__ao__destroy(CTX, ao); + CTX_UNLOCK; } } diff -r a87bde27be26 -r 2a8686b77897 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri May 11 18:59:04 2012 +0100 +++ b/tools/libxl/libxl_internal.h Fri May 11 18:59:04 2012 +0100 @@ -359,7 +359,8 @@ struct libxl__gc { }; struct libxl__egc { - /* for event-generating functions only */ + /* For event-generating functions only. + * The egc and its gc may be accessed only on the creating thread. */ struct libxl__gc gc; struct libxl__event_list occurred_for_callback; LIBXL_TAILQ_HEAD(, libxl__ao) aos_for_callback; @@ -369,6 +370,20 @@ struct libxl__egc { #define LIBXL__AO_MAGIC_DESTROYED 0xA0DEAD00ul struct libxl__ao { + /* + * An ao and its gc may be accessed only with the ctx lock held. + * + * Special exception: If an ao has been added to + * egc->aos_for_callback, the thread owning the egc may remove the + * ao from that list and make the callback without holding the + * lock. + * + * Corresponding restriction: An ao may be added only to one + * egc->aos_for_callback, once; rc and how must already have been + * set and may not be subsequently modified. (This restriction is + * easily and obviously met since the ao is queued for callback + * only in libxl__ao_complete.) + */ uint32_t magic; unsigned constructing:1, in_initiator:1, complete:1, notified:1; int rc; @@ -1365,6 +1380,12 @@ libxl__device_model_version_running(libx * should in any case not find it necessary to call egc-creators from * within libxl. * + * The callbacks must all take place with the ctx unlocked because + * the application is entitled to reenter libxl from them. This + * would be bad not because the lock is not recursive (it is) but + * because the application might make blocking libxl calls which + * would hold the lock unreasonably long. + * * For the same reason libxl__egc_cleanup (or EGC_FREE) must be called * with the ctx *unlocked*. So the right pattern has the EGC_... * macro calls on the outside of the CTX_... ones. _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:33:09 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:33:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCr-000558-9V; Mon, 14 May 2012 16:33:09 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCU-0004eY-Mf for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:46 +0000 Received: from [85.158.143.99:61357] by server-1.bemta-4.messagelabs.com id D2/49-20925-EA331BF4; Mon, 14 May 2012 16:32:46 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-216.messagelabs.com!1337013163!22700847!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=1.4 required=7.0 tests=INFO_TLD X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21080 invoked from network); 14 May 2012 16:32:44 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:44 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCQ-0002vk-PX for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCQ-0006qc-Oo for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:42 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:42 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: make libxl_create run bootloader via callback X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1336759144 -3600 # Node ID a87bde27be269a657d348c0d215a6d9e3d32d8a4 # Parent 86f8a5708fbfe0f8c2859041398c03f3c635d5ca libxl: make libxl_create run bootloader via callback Change initiate_domain_create to properly use libxl__bootloader_run rather than improperly calling libxl_run_bootloader with NULL ao_how. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Changes since v7: * constify convenience aliases. Changes since v6: * Bugfixes from testing. Committed-by: Ian Jackson --- diff -r 86f8a5708fbf -r a87bde27be26 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Fri May 11 18:59:03 2012 +0100 +++ b/tools/libxl/libxl_create.c Fri May 11 18:59:04 2012 +0100 @@ -569,6 +569,9 @@ static int store_libxl_entry(libxl__gc * static void domcreate_devmodel_started(libxl__egc *egc, libxl__dm_spawn_state *dmss, int rc); +static void domcreate_bootloader_done(libxl__egc *egc, + libxl__bootloader_state *bl, + int rc); /* Our own function to clean up and call the user's callback. * The final call in the sequence. */ @@ -589,6 +592,7 @@ static void initiate_domain_create(libxl const int restore_fd = dcs->restore_fd; const libxl_console_ready cb = dcs->console_cb; void *const priv = dcs->console_cb_priv; + memset(&dcs->build_state, 0, sizeof(dcs->build_state)); domid = 0; @@ -619,21 +623,43 @@ static void initiate_domain_create(libxl if (ret) goto error_out; } + dcs->bl.ao = ao; libxl_device_disk *bootdisk = d_config->num_disks > 0 ? &d_config->disks[0] : NULL; if (restore_fd < 0 && bootdisk) { - ret = libxl_run_bootloader(ctx, &d_config->b_info, bootdisk, domid, - 0 /* fixme-ao */); - if (ret) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, - "failed to run bootloader: %d", ret); - goto error_out; - } + dcs->bl.callback = domcreate_bootloader_done; + dcs->bl.info = &d_config->b_info, + dcs->bl.disk = bootdisk; + dcs->bl.domid = dcs->guest_domid; + + libxl__bootloader_run(egc, &dcs->bl); + } else { + domcreate_bootloader_done(egc, &dcs->bl, 0); } + return; - memset(&dcs->build_state, 0, sizeof(dcs->build_state)); - libxl__domain_build_state *state = &dcs->build_state; +error_out: + assert(ret); + domcreate_complete(egc, dcs, ret); +} + +static void domcreate_bootloader_done(libxl__egc *egc, + libxl__bootloader_state *bl, + int ret) +{ + libxl__domain_create_state *dcs = CONTAINER_OF(bl, *dcs, bl); + STATE_AO_GC(bl->ao); + int i; + + /* convenience aliases */ + const uint32_t domid = dcs->guest_domid; + libxl_domain_config *const d_config = dcs->guest_config; + const int restore_fd = dcs->restore_fd; + libxl__domain_build_state *const state = &dcs->build_state; + libxl_ctx *const ctx = CTX; + + if (ret) goto error_out; /* We might be going to call libxl__spawn_local_dm, or _spawn_stub_dm. * Fill in any field required by either, including both relevant @@ -784,12 +810,13 @@ static void domcreate_devmodel_started(l if (d_config->c_info.type == LIBXL_DOMAIN_TYPE_PV && libxl_defbool_val(d_config->b_info.u.pv.e820_host)) { - int rc; - rc = libxl__e820_alloc(gc, domid, d_config); - if (rc) + ret = libxl__e820_alloc(gc, domid, d_config); + if (ret) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Failed while collecting E820 with: %d (errno:%d)\n", - rc, errno); + ret, errno); + goto error_out; + } } if ( cb && (d_config->c_info.type == LIBXL_DOMAIN_TYPE_HVM || (d_config->c_info.type == LIBXL_DOMAIN_TYPE_PV && diff -r 86f8a5708fbf -r a87bde27be26 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri May 11 18:59:03 2012 +0100 +++ b/tools/libxl/libxl_internal.h Fri May 11 18:59:04 2012 +0100 @@ -1689,6 +1689,7 @@ struct libxl__domain_create_state { /* private to domain_create */ int guest_domid; libxl__domain_build_state build_state; + libxl__bootloader_state bl; libxl__stub_dm_spawn_state dmss; /* If we're not doing stubdom, we use only dmss.dm, * for the non-stubdom device model. */ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:33:09 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:33:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCr-000558-9V; Mon, 14 May 2012 16:33:09 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCU-0004eY-Mf for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:46 +0000 Received: from [85.158.143.99:61357] by server-1.bemta-4.messagelabs.com id D2/49-20925-EA331BF4; Mon, 14 May 2012 16:32:46 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-216.messagelabs.com!1337013163!22700847!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=1.4 required=7.0 tests=INFO_TLD X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21080 invoked from network); 14 May 2012 16:32:44 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:44 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCQ-0002vk-PX for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCQ-0006qc-Oo for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:42 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:42 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: make libxl_create run bootloader via callback X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1336759144 -3600 # Node ID a87bde27be269a657d348c0d215a6d9e3d32d8a4 # Parent 86f8a5708fbfe0f8c2859041398c03f3c635d5ca libxl: make libxl_create run bootloader via callback Change initiate_domain_create to properly use libxl__bootloader_run rather than improperly calling libxl_run_bootloader with NULL ao_how. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Changes since v7: * constify convenience aliases. Changes since v6: * Bugfixes from testing. Committed-by: Ian Jackson --- diff -r 86f8a5708fbf -r a87bde27be26 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Fri May 11 18:59:03 2012 +0100 +++ b/tools/libxl/libxl_create.c Fri May 11 18:59:04 2012 +0100 @@ -569,6 +569,9 @@ static int store_libxl_entry(libxl__gc * static void domcreate_devmodel_started(libxl__egc *egc, libxl__dm_spawn_state *dmss, int rc); +static void domcreate_bootloader_done(libxl__egc *egc, + libxl__bootloader_state *bl, + int rc); /* Our own function to clean up and call the user's callback. * The final call in the sequence. */ @@ -589,6 +592,7 @@ static void initiate_domain_create(libxl const int restore_fd = dcs->restore_fd; const libxl_console_ready cb = dcs->console_cb; void *const priv = dcs->console_cb_priv; + memset(&dcs->build_state, 0, sizeof(dcs->build_state)); domid = 0; @@ -619,21 +623,43 @@ static void initiate_domain_create(libxl if (ret) goto error_out; } + dcs->bl.ao = ao; libxl_device_disk *bootdisk = d_config->num_disks > 0 ? &d_config->disks[0] : NULL; if (restore_fd < 0 && bootdisk) { - ret = libxl_run_bootloader(ctx, &d_config->b_info, bootdisk, domid, - 0 /* fixme-ao */); - if (ret) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, - "failed to run bootloader: %d", ret); - goto error_out; - } + dcs->bl.callback = domcreate_bootloader_done; + dcs->bl.info = &d_config->b_info, + dcs->bl.disk = bootdisk; + dcs->bl.domid = dcs->guest_domid; + + libxl__bootloader_run(egc, &dcs->bl); + } else { + domcreate_bootloader_done(egc, &dcs->bl, 0); } + return; - memset(&dcs->build_state, 0, sizeof(dcs->build_state)); - libxl__domain_build_state *state = &dcs->build_state; +error_out: + assert(ret); + domcreate_complete(egc, dcs, ret); +} + +static void domcreate_bootloader_done(libxl__egc *egc, + libxl__bootloader_state *bl, + int ret) +{ + libxl__domain_create_state *dcs = CONTAINER_OF(bl, *dcs, bl); + STATE_AO_GC(bl->ao); + int i; + + /* convenience aliases */ + const uint32_t domid = dcs->guest_domid; + libxl_domain_config *const d_config = dcs->guest_config; + const int restore_fd = dcs->restore_fd; + libxl__domain_build_state *const state = &dcs->build_state; + libxl_ctx *const ctx = CTX; + + if (ret) goto error_out; /* We might be going to call libxl__spawn_local_dm, or _spawn_stub_dm. * Fill in any field required by either, including both relevant @@ -784,12 +810,13 @@ static void domcreate_devmodel_started(l if (d_config->c_info.type == LIBXL_DOMAIN_TYPE_PV && libxl_defbool_val(d_config->b_info.u.pv.e820_host)) { - int rc; - rc = libxl__e820_alloc(gc, domid, d_config); - if (rc) + ret = libxl__e820_alloc(gc, domid, d_config); + if (ret) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Failed while collecting E820 with: %d (errno:%d)\n", - rc, errno); + ret, errno); + goto error_out; + } } if ( cb && (d_config->c_info.type == LIBXL_DOMAIN_TYPE_HVM || (d_config->c_info.type == LIBXL_DOMAIN_TYPE_PV && diff -r 86f8a5708fbf -r a87bde27be26 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri May 11 18:59:03 2012 +0100 +++ b/tools/libxl/libxl_internal.h Fri May 11 18:59:04 2012 +0100 @@ -1689,6 +1689,7 @@ struct libxl__domain_create_state { /* private to domain_create */ int guest_domid; libxl__domain_build_state build_state; + libxl__bootloader_state bl; libxl__stub_dm_spawn_state dmss; /* If we're not doing stubdom, we use only dmss.dm, * for the non-stubdom device model. */ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:33:10 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:33:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCr-00054z-4b; Mon, 14 May 2012 16:33:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCU-0004id-KN for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:46 +0000 Received: from [85.158.138.51:34848] by server-10.bemta-3.messagelabs.com id 22/46-29478-DA331BF4; Mon, 14 May 2012 16:32:45 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-174.messagelabs.com!1337013163!20705844!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8558 invoked from network); 14 May 2012 16:32:44 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:44 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCR-0002vq-9q for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:43 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCR-0006qr-9C for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:43 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:42 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: Fix an ao completion bug; document locking policy X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1336759144 -3600 # Node ID 2a8686b77897517b0aaf24b28ebf7a7f782c1317 # Parent a87bde27be269a657d348c0d215a6d9e3d32d8a4 libxl: Fix an ao completion bug; document locking policy Document the concurrent access policies for libxl__ao and libxl__egc, and their corresponding gcs. Fix a violation of the policy: If an ao was submitted and a callback requested, and while the initiating function was still running on the original thread, the ao is completed on another thread, the completing thread would improperly concurrently access the ao with the initiating thread. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r a87bde27be26 -r 2a8686b77897 tools/libxl/libxl_event.c --- a/tools/libxl/libxl_event.c Fri May 11 18:59:04 2012 +0100 +++ b/tools/libxl/libxl_event.c Fri May 11 18:59:04 2012 +0100 @@ -901,6 +901,11 @@ void libxl__event_disaster(libxl__egc *e static void egc_run_callbacks(libxl__egc *egc) { + /* + * The callbacks must happen with the ctx unlocked. + * See the comment near #define EGC_GC in libxl_internal.h and + * those in the definitions of libxl__egc and libxl__ao. + */ EGC_GC; libxl_event *ev, *ev_tmp; @@ -914,9 +919,11 @@ static void egc_run_callbacks(libxl__egc entry_for_callback, ao_tmp) { LIBXL_TAILQ_REMOVE(&egc->aos_for_callback, ao, entry_for_callback); ao->how.callback(CTX, ao->rc, ao->how.u.for_callback); + CTX_LOCK; ao->notified = 1; if (!ao->in_initiator) libxl__ao__destroy(CTX, ao); + CTX_UNLOCK; } } diff -r a87bde27be26 -r 2a8686b77897 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri May 11 18:59:04 2012 +0100 +++ b/tools/libxl/libxl_internal.h Fri May 11 18:59:04 2012 +0100 @@ -359,7 +359,8 @@ struct libxl__gc { }; struct libxl__egc { - /* for event-generating functions only */ + /* For event-generating functions only. + * The egc and its gc may be accessed only on the creating thread. */ struct libxl__gc gc; struct libxl__event_list occurred_for_callback; LIBXL_TAILQ_HEAD(, libxl__ao) aos_for_callback; @@ -369,6 +370,20 @@ struct libxl__egc { #define LIBXL__AO_MAGIC_DESTROYED 0xA0DEAD00ul struct libxl__ao { + /* + * An ao and its gc may be accessed only with the ctx lock held. + * + * Special exception: If an ao has been added to + * egc->aos_for_callback, the thread owning the egc may remove the + * ao from that list and make the callback without holding the + * lock. + * + * Corresponding restriction: An ao may be added only to one + * egc->aos_for_callback, once; rc and how must already have been + * set and may not be subsequently modified. (This restriction is + * easily and obviously met since the ao is queued for callback + * only in libxl__ao_complete.) + */ uint32_t magic; unsigned constructing:1, in_initiator:1, complete:1, notified:1; int rc; @@ -1365,6 +1380,12 @@ libxl__device_model_version_running(libx * should in any case not find it necessary to call egc-creators from * within libxl. * + * The callbacks must all take place with the ctx unlocked because + * the application is entitled to reenter libxl from them. This + * would be bad not because the lock is not recursive (it is) but + * because the application might make blocking libxl calls which + * would hold the lock unreasonably long. + * * For the same reason libxl__egc_cleanup (or EGC_FREE) must be called * with the ctx *unlocked*. So the right pattern has the EGC_... * macro calls on the outside of the CTX_... ones. _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:33:14 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:33:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCw-00057a-Op; Mon, 14 May 2012 16:33:14 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCU-0004jl-S7 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:47 +0000 Received: from [193.109.254.147:56274] by server-2.bemta-14.messagelabs.com id 2A/38-19409-EA331BF4; Mon, 14 May 2012 16:32:46 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-27.messagelabs.com!1337013162!9230720!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29409 invoked from network); 14 May 2012 16:32:43 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCP-0002vd-OZ for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCP-0006q8-NY for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:41 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:41 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: ao: convert libxl__spawn_* X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1336759143 -3600 # Node ID 885fdd4fd7ac807a2b0e6a322ab492f0f40d1561 # Parent 9524eb476e930960a579bd9e0219450dd4462527 libxl: ao: convert libxl__spawn_* libxl__spawn_spawn becomes a callback-style asynchronous function. The implementation is now in terms of libxl__ev_* including libxl_ev_child. All the callers need to be updated. This includes the device model spawning functions libxl__create_device_model and libxl__create_stubdom; these are replaced with libxl__spawn_local_dm and libxl__spawn_stubdom. libxl__confirm_device_model_startup is abolished; instead the dm spawner calls back. (The choice of which kind of device model to create is lifted out of what used to be libxl__create_device_model, because that function was indirectly recursive. Recursive callback-style operations are clumsy because they require a pointer indirection for the nested states.) Waiting for proper device model startup it is no longer notionally optional. Previously the code appeared to tolerate this by passing NULL for various libxl__spawner_starting* parameters to device model spawners. However, this was not used anywhere. Conversely, the "for_spawn" parameter to libxl__wait_for_offspring is no longer supported. It remains as an unused formal parameter to avoid updating, in this patch, all the call sites which pass NULL. libxl__wait_for_offspring is in any case itself an obsolete function, so this wrinkle will go away when its callers are updated to use the event system. Consequently libxl__spawn_check is also abolished. The "console ready" callback also remains unchanged in this patch. The API for this needs to be reviewed in the context of the event series and its reentrancy restrictions documented. Thus their callers need to be updated. These are the domain creation functions libxl_domain_create_new and _restore. These functions now take ao_hows, and have a private state structure. However domain creation remains not completely converted to the event mechanism; in particular it runs the outward-facing function libxl_run_bootloader with a NULL ao_how, which is quite wrong. As it happens in the current code this is not a bug because none of the rest of the functionality surrounding the bootloader call will mind if the event loop is reentered in the middle of its execution. The file-scope function libxl__set_fd_flag which was used by the previous spawn arrangements becomes unused and is removed; other places in libxl can use libxl_fd_set_nonblock and libxl_fd_set_cloexec, which of course remain. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Changes since v8: * Make midproc_cb callback with correct pid (that of the grandchild, not "middle" which is zero). Reported by Roger Pau Monne. Changes since v7: * Rename libxl__spawn_stubdom to libxl__spawn_stub_dm (and ..._state); rename the state's stubdom_* members to dm_*. * Eliminate the union between the two dm creation states in libxl__domain_create_state. Instead, the domain creation code simply uses libxl__stub_dm_spawn_state.dm directly, if we're taking the local dm path. * Remove a spurious "break". * In domain creation, move the PV non-qemu case into the switch. * Code style fixes. * Constify some convenience aliases. * Improve comments (including typo fixes). Committed-by: Ian Jackson --- diff -r 9524eb476e93 -r 885fdd4fd7ac tools/libxl/libxl.h --- a/tools/libxl/libxl.h Fri May 11 18:59:02 2012 +0100 +++ b/tools/libxl/libxl.h Fri May 11 18:59:03 2012 +0100 @@ -465,8 +465,18 @@ int libxl_ctx_free(libxl_ctx *ctx /* 0 i /* domain related functions */ typedef int (*libxl_console_ready)(libxl_ctx *ctx, uint32_t domid, void *priv); -int libxl_domain_create_new(libxl_ctx *ctx, libxl_domain_config *d_config, libxl_console_ready cb, void *priv, uint32_t *domid); -int libxl_domain_create_restore(libxl_ctx *ctx, libxl_domain_config *d_config, libxl_console_ready cb, void *priv, uint32_t *domid, int restore_fd); + /* fixme-ao Need to review this API. If we keep it, the reentrancy + * properties need to be documented but they may turn out to be too + * awkward */ + +int libxl_domain_create_new(libxl_ctx *ctx, libxl_domain_config *d_config, + libxl_console_ready cb, void *priv, uint32_t *domid, + const libxl_asyncop_how *ao_how); +int libxl_domain_create_restore(libxl_ctx *ctx, libxl_domain_config *d_config, + libxl_console_ready cb, void *priv, + uint32_t *domid, int restore_fd, + const libxl_asyncop_how *ao_how); + void libxl_domain_config_init(libxl_domain_config *d_config); void libxl_domain_config_dispose(libxl_domain_config *d_config); int libxl_domain_suspend(libxl_ctx *ctx, libxl_domain_suspend_info *info, diff -r 9524eb476e93 -r 885fdd4fd7ac tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Fri May 11 18:59:02 2012 +0100 +++ b/tools/libxl/libxl_create.c Fri May 11 18:59:03 2012 +0100 @@ -558,16 +558,40 @@ static int store_libxl_entry(libxl__gc * libxl_device_model_version_to_string(b_info->device_model_version)); } -static int do_domain_create(libxl__gc *gc, libxl_domain_config *d_config, - libxl_console_ready cb, void *priv, - uint32_t *domid_out, int restore_fd) +/*----- main domain creation -----*/ + +/* We have a linear control flow; only one event callback is + * outstanding at any time. Each initiation and callback function + * arranges for the next to be called, as the very last thing it + * does. (If that particular sub-operation is not needed, a + * function will call the next event callback directly.) + */ + +/* Event callbacks, in this order: */ +static void domcreate_devmodel_started(libxl__egc *egc, + libxl__dm_spawn_state *dmss, + int rc); + +/* Our own function to clean up and call the user's callback. + * The final call in the sequence. */ +static void domcreate_complete(libxl__egc *egc, + libxl__domain_create_state *dcs, + int rc); + +static void initiate_domain_create(libxl__egc *egc, + libxl__domain_create_state *dcs) { + STATE_AO_GC(dcs->ao); libxl_ctx *ctx = libxl__gc_owner(gc); - libxl__spawner_starting *dm_starting = 0; - libxl__domain_build_state state[1]; uint32_t domid; int i, ret; + /* convenience aliases */ + libxl_domain_config *const d_config = dcs->guest_config; + const int restore_fd = dcs->restore_fd; + const libxl_console_ready cb = dcs->console_cb; + void *const priv = dcs->console_cb_priv; + domid = 0; ret = libxl__domain_create_info_setdefault(gc, &d_config->c_info); @@ -580,9 +604,12 @@ static int do_domain_create(libxl__gc *g goto error_out; } + dcs->guest_domid = domid; + dcs->dmss.dm.guest_domid = 0; /* means we haven't spawned */ + if ( d_config->c_info.type == LIBXL_DOMAIN_TYPE_PV && cb ) { - if ( (*cb)(ctx, domid, priv) ) - goto error_out; + ret = (*cb)(ctx, domid, priv); + if (ret) goto error_out; } ret = libxl__domain_build_info_setdefault(gc, &d_config->b_info); @@ -606,7 +633,17 @@ static int do_domain_create(libxl__gc *g } } - memset(state, 0, sizeof(*state)); + memset(&dcs->build_state, 0, sizeof(dcs->build_state)); + libxl__domain_build_state *state = &dcs->build_state; + + /* We might be going to call libxl__spawn_local_dm, or _spawn_stub_dm. + * Fill in any field required by either, including both relevant + * callbacks (_spawn_stub_dm will overwrite our trespass if needed). */ + dcs->dmss.dm.spawn.ao = ao; + dcs->dmss.dm.guest_config = dcs->guest_config; + dcs->dmss.dm.build_state = &dcs->build_state; + dcs->dmss.dm.callback = domcreate_devmodel_started; + dcs->dmss.callback = domcreate_devmodel_started; if ( restore_fd >= 0 ) { ret = domain_restore(gc, &d_config->b_info, domid, restore_fd, state); @@ -656,14 +693,12 @@ static int do_domain_create(libxl__gc *g libxl_device_vkb_add(ctx, domid, &vkb); libxl_device_vkb_dispose(&vkb); - ret = libxl__create_device_model(gc, domid, d_config, - state, &dm_starting); - if (ret < 0) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, - "failed to create device model: %d", ret); - goto error_out; - } - break; + dcs->dmss.dm.guest_domid = domid; + if (libxl_defbool_val(d_config->b_info.device_model_stubdomain)) + libxl__spawn_stub_dm(egc, &dcs->dmss); + else + libxl__spawn_local_dm(egc, &dcs->dmss.dm); + return; } case LIBXL_DOMAIN_TYPE_PV: { @@ -687,26 +722,52 @@ static int do_domain_create(libxl__gc *g libxl__device_console_dispose(&console); if (need_qemu) { - libxl__create_xenpv_qemu(gc, domid, d_config, state, &dm_starting); + dcs->dmss.dm.guest_domid = domid; + libxl__spawn_local_dm(egc, &dcs->dmss.dm); + return; + } else { + assert(!dcs->dmss.dm.guest_domid); + domcreate_devmodel_started(egc, &dcs->dmss.dm, 0); + return; } - break; } default: ret = ERROR_INVAL; goto error_out; } + abort(); /* not reached */ - if (dm_starting) { + error_out: + assert(ret); + domcreate_complete(egc, dcs, ret); +} + +static void domcreate_devmodel_started(libxl__egc *egc, + libxl__dm_spawn_state *dmss, + int ret) +{ + libxl__domain_create_state *dcs = CONTAINER_OF(dmss, *dcs, dmss.dm); + STATE_AO_GC(dmss->spawn.ao); + int i; + libxl_ctx *ctx = CTX; + int domid = dcs->guest_domid; + + /* convenience aliases */ + libxl_domain_config *const d_config = dcs->guest_config; + const libxl_console_ready cb = dcs->console_cb; + void *const priv = dcs->console_cb_priv; + + if (ret) { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, + "device model did not start: %d", ret); + goto error_out; + } + + if (dcs->dmss.dm.guest_domid) { if (d_config->b_info.device_model_version == LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN) { libxl__qmp_initializations(gc, domid, d_config); } - ret = libxl__confirm_device_model_startup(gc, state, dm_starting); - if (ret < 0) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, - "device model did not start: %d", ret); - goto error_out; - } } for (i = 0; i < d_config->num_pcidevs; i++) @@ -734,38 +795,95 @@ static int do_domain_create(libxl__gc *g if ( cb && (d_config->c_info.type == LIBXL_DOMAIN_TYPE_HVM || (d_config->c_info.type == LIBXL_DOMAIN_TYPE_PV && d_config->b_info.u.pv.bootloader ))) { - if ( (*cb)(ctx, domid, priv) ) - goto error_out; + ret = (*cb)(ctx, domid, priv); + if (ret) goto error_out; } - *domid_out = domid; - return 0; + domcreate_complete(egc, dcs, 0); + return; error_out: - if (domid) - libxl_domain_destroy(ctx, domid); - - return ret; + assert(ret); + domcreate_complete(egc, dcs, ret); } +static void domcreate_complete(libxl__egc *egc, + libxl__domain_create_state *dcs, + int rc) +{ + STATE_AO_GC(dcs->ao); + + if (rc) { + if (dcs->guest_domid) { + int rc2 = libxl_domain_destroy(CTX, dcs->guest_domid); + if (rc2) + LOG(ERROR, "unable to destroy domain %d following" + " failed creation", dcs->guest_domid); + } + dcs->guest_domid = -1; + } + dcs->callback(egc, dcs, rc, dcs->guest_domid); +} + +/*----- application-facing domain creation interface -----*/ + +typedef struct { + libxl__domain_create_state dcs; + uint32_t *domid_out; +} libxl__app_domain_create_state; + +static void domain_create_cb(libxl__egc *egc, + libxl__domain_create_state *dcs, + int rc, uint32_t domid); + +static int do_domain_create(libxl_ctx *ctx, libxl_domain_config *d_config, + libxl_console_ready cb, void *priv, uint32_t *domid, + int restore_fd, const libxl_asyncop_how *ao_how) +{ + AO_CREATE(ctx, 0, ao_how); + libxl__app_domain_create_state *cdcs; + + GCNEW(cdcs); + cdcs->dcs.ao = ao; + cdcs->dcs.guest_config = d_config; + cdcs->dcs.restore_fd = restore_fd; + cdcs->dcs.console_cb = cb; + cdcs->dcs.console_cb_priv = priv; + cdcs->dcs.callback = domain_create_cb; + cdcs->domid_out = domid; + + initiate_domain_create(egc, &cdcs->dcs); + + return AO_INPROGRESS; +} + +static void domain_create_cb(libxl__egc *egc, + libxl__domain_create_state *dcs, + int rc, uint32_t domid) +{ + libxl__app_domain_create_state *cdcs = CONTAINER_OF(dcs, *cdcs, dcs); + STATE_AO_GC(cdcs->dcs.ao); + + if (!rc) + *cdcs->domid_out = domid; + + libxl__ao_complete(egc, ao, rc); +} + int libxl_domain_create_new(libxl_ctx *ctx, libxl_domain_config *d_config, - libxl_console_ready cb, void *priv, uint32_t *domid) + libxl_console_ready cb, void *priv, + uint32_t *domid, + const libxl_asyncop_how *ao_how) { - GC_INIT(ctx); - int rc; - rc = do_domain_create(gc, d_config, cb, priv, domid, -1); - GC_FREE; - return rc; + return do_domain_create(ctx, d_config, cb, priv, domid, -1, ao_how); } int libxl_domain_create_restore(libxl_ctx *ctx, libxl_domain_config *d_config, - libxl_console_ready cb, void *priv, uint32_t *domid, int restore_fd) + libxl_console_ready cb, void *priv, + uint32_t *domid, int restore_fd, + const libxl_asyncop_how *ao_how) { - GC_INIT(ctx); - int rc; - rc = do_domain_create(gc, d_config, cb, priv, domid, restore_fd); - GC_FREE; - return rc; + return do_domain_create(ctx, d_config, cb, priv, domid, restore_fd, ao_how); } /* diff -r 9524eb476e93 -r 885fdd4fd7ac tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Fri May 11 18:59:02 2012 +0100 +++ b/tools/libxl/libxl_dm.c Fri May 11 18:59:03 2012 +0100 @@ -669,24 +669,28 @@ retry_transaction: return 0; } -static int libxl__create_stubdom(libxl__gc *gc, - int guest_domid, - libxl_domain_config *guest_config, - libxl__domain_build_state *d_state, - libxl__spawner_starting **starting_r) +static void spawn_stubdom_pvqemu_cb(libxl__egc *egc, + libxl__dm_spawn_state *stubdom_dmss, + int rc); + +void libxl__spawn_stub_dm(libxl__egc *egc, libxl__stub_dm_spawn_state *sdss) { + STATE_AO_GC(sdss->dm.spawn.ao); libxl_ctx *ctx = libxl__gc_owner(gc); int i, num_console = STUBDOM_SPECIAL_CONSOLES, ret; libxl__device_console *console; - libxl_domain_config dm_config[1]; libxl_device_vfb vfb; libxl_device_vkb vkb; - libxl__domain_build_state stubdom_state[1]; - uint32_t dm_domid; char **args; struct xs_permissions perm[2]; xs_transaction_t t; - libxl__spawner_starting *dm_starting = 0; + + /* convenience aliases */ + libxl_domain_config *const dm_config = &sdss->dm_config; + libxl_domain_config *const guest_config = sdss->dm.guest_config; + const int guest_domid = sdss->dm.guest_domid; + libxl__domain_build_state *const d_state = sdss->dm.build_state; + libxl__domain_build_state *const stubdom_state = &sdss->dm_state; if (guest_config->b_info.device_model_version != LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL) { @@ -694,6 +698,8 @@ static int libxl__create_stubdom(libxl__ goto out; } + sdss->pvqemu.guest_domid = 0; + libxl_domain_create_info_init(&dm_config->c_info); dm_config->c_info.type = LIBXL_DOMAIN_TYPE_PV; dm_config->c_info.name = libxl__sprintf(gc, "%s-dm", @@ -741,10 +747,10 @@ static int libxl__create_stubdom(libxl__ dm_config->num_vkbs = 1; /* fixme: this function can leak the stubdom if it fails */ - dm_domid = 0; - ret = libxl__domain_make(gc, &dm_config->c_info, &dm_domid); + ret = libxl__domain_make(gc, &dm_config->c_info, &sdss->pvqemu.guest_domid); if (ret) goto out; + uint32_t dm_domid = sdss->pvqemu.guest_domid; ret = libxl__domain_build(gc, &dm_config->b_info, dm_domid, stubdom_state); if (ret) goto out; @@ -852,42 +858,67 @@ retry_transaction: goto out_free; } - if (libxl__create_xenpv_qemu(gc, dm_domid, - dm_config, - stubdom_state, - &dm_starting) < 0) { - ret = ERROR_FAIL; - goto out_free; - } - if (libxl__confirm_device_model_startup(gc, d_state, dm_starting) < 0) { - ret = ERROR_FAIL; - goto out_free; - } + sdss->pvqemu.guest_domid = dm_domid; + sdss->pvqemu.guest_config = &sdss->dm_config; + sdss->pvqemu.build_state = &sdss->dm_state; + sdss->pvqemu.callback = spawn_stubdom_pvqemu_cb; - libxl_domain_unpause(ctx, dm_domid); + libxl__spawn_local_dm(egc, &sdss->pvqemu); - if (starting_r) { - *starting_r = calloc(1, sizeof(libxl__spawner_starting)); - (*starting_r)->domid = guest_domid; - (*starting_r)->dom_path = libxl__xs_get_dompath(gc, guest_domid); - (*starting_r)->for_spawn = NULL; - } - - ret = 0; + free(args); + return; out_free: free(args); out: - return ret; + assert(ret); + spawn_stubdom_pvqemu_cb(egc, &sdss->pvqemu, ret); } -int libxl__create_device_model(libxl__gc *gc, - int domid, - libxl_domain_config *guest_config, - libxl__domain_build_state *state, - libxl__spawner_starting **starting_r) +static void spawn_stubdom_pvqemu_cb(libxl__egc *egc, + libxl__dm_spawn_state *stubdom_dmss, + int rc) { - libxl_ctx *ctx = libxl__gc_owner(gc); + libxl__stub_dm_spawn_state *sdss = + CONTAINER_OF(stubdom_dmss, *sdss, pvqemu); + STATE_AO_GC(sdss->dm.spawn.ao); + uint32_t dm_domid = sdss->pvqemu.guest_domid; + + if (rc) goto out; + + rc = libxl_domain_unpause(CTX, dm_domid); + if (rc) goto out; + + out: + if (rc) { + if (dm_domid) + libxl_domain_destroy(CTX, dm_domid); + } + sdss->callback(egc, &sdss->dm, rc); +} + +/* callbacks passed to libxl__spawn_spawn */ +static void device_model_confirm(libxl__egc *egc, libxl__spawn_state *spawn, + const char *xsdata); +static void device_model_startup_failed(libxl__egc *egc, + libxl__spawn_state *spawn); + +/* our "next step" function, called from those callbacks and elsewhere */ +static void device_model_spawn_outcome(libxl__egc *egc, + libxl__dm_spawn_state *dmss, + int rc); + +void libxl__spawn_local_dm(libxl__egc *egc, libxl__dm_spawn_state *dmss) +{ + /* convenience aliases */ + const int domid = dmss->guest_domid; + libxl__domain_build_state *const state = dmss->build_state; + libxl__spawn_state *const spawn = &dmss->spawn; + + STATE_AO_GC(dmss->spawn.ao); + + libxl_ctx *ctx = CTX; + libxl_domain_config *guest_config = dmss->guest_config; const libxl_domain_create_info *c_info = &guest_config->c_info; const libxl_domain_build_info *b_info = &guest_config->b_info; const libxl_vnc_info *vnc = libxl__dm_vnc(guest_config); @@ -895,15 +926,13 @@ int libxl__create_device_model(libxl__gc int logfile_w, null; int rc; char **args, **arg; - libxl__spawner_starting buf_starting, *p; xs_transaction_t t; char *vm_path; char **pass_stuff; const char *dm; if (libxl_defbool_val(b_info->device_model_stubdomain)) { - rc = libxl__create_stubdom(gc, domid, guest_config, state, starting_r); - goto out; + abort(); } dm = libxl__domain_device_model(gc, b_info); @@ -947,25 +976,8 @@ int libxl__create_device_model(libxl__gc free(logfile); null = open("/dev/null", O_RDONLY); - if (starting_r) { - rc = ERROR_NOMEM; - *starting_r = calloc(1, sizeof(libxl__spawner_starting)); - if (!*starting_r) - goto out_close; - p = *starting_r; - p->for_spawn = calloc(1, sizeof(libxl__spawn_starting)); - } else { - p = &buf_starting; - p->for_spawn = NULL; - } - - p->domid = domid; - p->dom_path = libxl__xs_get_dompath(gc, domid); - p->pid_path = "image/device-model-pid"; - if (!p->dom_path) { - rc = ERROR_FAIL; - goto out_close; - } + const char *dom_path = libxl__xs_get_dompath(gc, domid); + spawn->pidpath = GCSPRINTF("%s/%s", dom_path, "image/device-model-pid"); if (vnc && vnc->passwd) { /* This xenstore key will only be used by qemu-xen-traditionnal. @@ -973,7 +985,7 @@ int libxl__create_device_model(libxl__gc retry_transaction: /* Find uuid and the write the vnc password to xenstore for qemu. */ t = xs_transaction_start(ctx->xsh); - vm_path = libxl__xs_read(gc,t,libxl__sprintf(gc, "%s/vm", p->dom_path)); + vm_path = libxl__xs_read(gc,t,libxl__sprintf(gc, "%s/vm", dom_path)); if (vm_path) { /* Now write the vncpassword into it. */ pass_stuff = libxl__calloc(gc, 3, sizeof(char *)); @@ -990,8 +1002,15 @@ retry_transaction: for (arg = args; *arg; arg++) LIBXL__LOG(CTX, XTL_DEBUG, " %s", *arg); - rc = libxl__spawn_spawn(gc, p->for_spawn, "device model", - libxl_spawner_record_pid, p); + spawn->what = GCSPRINTF("domain %d device model", domid); + spawn->xspath = GCSPRINTF("/local/domain/0/device-model/%d/state", domid); + spawn->timeout_ms = LIBXL_DEVICE_MODEL_START_TIMEOUT * 1000; + spawn->pidpath = GCSPRINTF("%s/image/device-model-pid", dom_path); + spawn->midproc_cb = libxl__spawn_record_pid; + spawn->confirm_cb = device_model_confirm; + spawn->failure_cb = device_model_startup_failed; + + rc = libxl__spawn_spawn(egc, spawn); if (rc < 0) goto out_close; if (!rc) { /* inner child */ @@ -1006,30 +1025,61 @@ out_close: close(logfile_w); free(args); out: - return rc; + if (rc) + device_model_spawn_outcome(egc, dmss, rc); } -int libxl__confirm_device_model_startup(libxl__gc *gc, - libxl__domain_build_state *state, - libxl__spawner_starting *starting) +static void device_model_confirm(libxl__egc *egc, libxl__spawn_state *spawn, + const char *xsdata) { - char *path; - int domid = starting->domid; - int ret, ret2; - path = libxl__sprintf(gc, "/local/domain/0/device-model/%d/state", domid); - ret = libxl__spawn_confirm_offspring_startup(gc, - LIBXL_DEVICE_MODEL_START_TIMEOUT, - "Device Model", path, "running", starting); + libxl__dm_spawn_state *dmss = CONTAINER_OF(spawn, *dmss, spawn); + STATE_AO_GC(spawn->ao); + + if (!xsdata) + return; + + if (strcmp(xsdata, "running")) + return; + + libxl__spawn_detach(gc, spawn); + + device_model_spawn_outcome(egc, dmss, 0); +} + +static void device_model_startup_failed(libxl__egc *egc, + libxl__spawn_state *spawn) +{ + libxl__dm_spawn_state *dmss = CONTAINER_OF(spawn, *dmss, spawn); + device_model_spawn_outcome(egc, dmss, ERROR_FAIL); +} + +static void device_model_spawn_outcome(libxl__egc *egc, + libxl__dm_spawn_state *dmss, + int rc) +{ + STATE_AO_GC(dmss->spawn.ao); + int ret2; + + if (rc) + LOG(ERROR, "%s: spawn failed (rc=%d)", dmss->spawn.what, rc); + + libxl__domain_build_state *state = dmss->build_state; + if (state->saved_state) { ret2 = unlink(state->saved_state); - if (ret2) LIBXL__LOG_ERRNO(CTX, XTL_ERROR, - "failed to remove device-model state %s\n", - state->saved_state); - /* Do not clobber spawn_confirm error code with unlink error code. */ - if (!ret) ret = ret2; + if (ret2) { + LOGE(ERROR, "%s: failed to remove device-model state %s", + dmss->spawn.what, state->saved_state); + rc = ERROR_FAIL; + goto out; + } } - return ret; + + rc = 0; + + out: + dmss->callback(egc, dmss, rc); } int libxl__destroy_device_model(libxl__gc *gc, uint32_t domid) @@ -1131,15 +1181,6 @@ out: return ret; } -int libxl__create_xenpv_qemu(libxl__gc *gc, uint32_t domid, - libxl_domain_config *guest_config, - libxl__domain_build_state *state, - libxl__spawner_starting **starting_r) -{ - libxl__create_device_model(gc, domid, guest_config, state, starting_r); - return 0; -} - /* * Local variables: * mode: C diff -r 9524eb476e93 -r 885fdd4fd7ac tools/libxl/libxl_exec.c --- a/tools/libxl/libxl_exec.c Fri May 11 18:59:02 2012 +0100 +++ b/tools/libxl/libxl_exec.c Fri May 11 18:59:03 2012 +0100 @@ -127,29 +127,35 @@ void libxl_report_child_exitstatus(libxl } } -void libxl_spawner_record_pid(void *for_spawn, pid_t innerchild) +int libxl__spawn_record_pid(libxl__gc *gc, libxl__spawn_state *spawn, + pid_t innerchild) { - libxl__spawner_starting *starting = for_spawn; - struct xs_handle *xsh; - char *path = NULL, *pid = NULL; - int len; + struct xs_handle *xsh = NULL; + const char *pid = NULL; + int rc, xsok; - if (asprintf(&path, "%s/%s", starting->dom_path, starting->pid_path) < 0) - goto out; - - len = asprintf(&pid, "%d", innerchild); - if (len < 0) - goto out; + pid = GCSPRINTF("%d", innerchild); /* we mustn't use the parent's handle in the child */ xsh = xs_daemon_open(); + if (!xsh) { + LOGE(ERROR, "write %s = %s: xenstore reopen failed", + spawn->pidpath, pid); + rc = ERROR_FAIL; goto out; + } - xs_write(xsh, XBT_NULL, path, pid, len); + xsok = xs_write(xsh, XBT_NULL, spawn->pidpath, pid, strlen(pid)); + if (!xsok) { + LOGE(ERROR, + "write %s = %s: xenstore write failed", spawn->pidpath, pid); + rc = ERROR_FAIL; goto out; + } - xs_daemon_close(xsh); + rc = 0; + out: - free(path); - free(pid); + if (xsh) xs_daemon_close(xsh); + return rc ? SIGTERM : 0; } int libxl__wait_for_offspring(libxl__gc *gc, @@ -184,19 +190,9 @@ int libxl__wait_for_offspring(libxl__gc tv.tv_sec = timeout; tv.tv_usec = 0; nfds = xs_fileno(xsh) + 1; - if (spawning && spawning->fd > xs_fileno(xsh)) - nfds = spawning->fd + 1; + assert(!spawning); while (rc > 0 || (!rc && tv.tv_sec > 0)) { - if ( spawning ) { - rc = libxl__spawn_check(gc, spawning); - if ( rc ) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, - "%s died during startup", what); - rc = -1; - goto err_died; - } - } p = xs_read(xsh, XBT_NULL, path, &len); if ( NULL == p ) goto again; @@ -218,8 +214,6 @@ again: free(p); FD_ZERO(&rfds); FD_SET(xs_fileno(xsh), &rfds); - if (spawning) - FD_SET(spawning->fd, &rfds); rc = select(nfds, &rfds, NULL, NULL, &tv); if (rc > 0) { if (FD_ISSET(xs_fileno(xsh), &rfds)) { @@ -229,207 +223,215 @@ again: else goto again; } - if (spawning && FD_ISSET(spawning->fd, &rfds)) { - unsigned char dummy; - if (read(spawning->fd, &dummy, sizeof(dummy)) != 1) - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_DEBUG, - "failed to read spawn status pipe"); - } } } LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "%s not ready", what); -err_died: + xs_unwatch(xsh, path, path); xs_daemon_close(xsh); err: return -1; } -static int detach_offspring(libxl__gc *gc, - libxl__spawner_starting *starting) + +/*----- spawn implementation -----*/ + +/* + * Full set of possible states of a libxl__spawn_state and its _detachable: + * + * ss-> ss-> ss-> | ssd-> ssd-> + * timeout xswatch ssd | mid ss + * - Undefined undef undef no | - - + * - Idle Idle Idle no | - - + * - Active Active Active yes | Active yes + * - Partial Active/Idle Active/Idle maybe | Active/Idle yes (if exists) + * - Detached - - - | Active no + * + * When in state Detached, the middle process has been sent a SIGKILL. + */ + +/* Event callbacks. */ +static void spawn_watch_event(libxl__egc *egc, libxl__ev_xswatch *xsw, + const char *watch_path, const char *event_path); +static void spawn_timeout(libxl__egc *egc, libxl__ev_time *ev, + const struct timeval *requested_abs); +static void spawn_middle_death(libxl__egc *egc, libxl__ev_child *childw, + pid_t pid, int status); + +/* Precondition: Partial. Results: Detached. */ +static void spawn_cleanup(libxl__gc *gc, libxl__spawn_state *ss); + +/* Precondition: Partial; caller has logged failure reason. + * Results: Caller notified of failure; + * after return, ss may be completely invalid as caller may reuse it */ +static void spawn_failed(libxl__egc *egc, libxl__spawn_state *ss); + +void libxl__spawn_init(libxl__spawn_state *ss) { - int rc; - rc = libxl__spawn_detach(gc, starting->for_spawn); - if (starting->for_spawn) - free(starting->for_spawn); - free(starting); - return rc; + libxl__ev_time_init(&ss->timeout); + libxl__ev_xswatch_init(&ss->xswatch); + ss->ssd = 0; } -int libxl__spawn_confirm_offspring_startup(libxl__gc *gc, - uint32_t timeout, char *what, - char *path, char *state, - libxl__spawner_starting *starting) +int libxl__spawn_spawn(libxl__egc *egc, libxl__spawn_state *ss) { - int detach; - int problem = libxl__wait_for_offspring(gc, starting->domid, timeout, what, - path, state, - starting->for_spawn, NULL, NULL); - detach = detach_offspring(gc, starting); - return problem ? problem : detach; -} + STATE_AO_GC(ss->ao); + int r; + pid_t child; + int status, rc; -static int libxl__set_fd_flag(libxl__gc *gc, int fd, int flag) -{ - int flags; + libxl__spawn_init(ss); + ss->ssd = libxl__zalloc(0, sizeof(*ss->ssd)); + libxl__ev_child_init(&ss->ssd->mid); - flags = fcntl(fd, F_GETFL); - if (flags == -1) - return ERROR_FAIL; + rc = libxl__ev_time_register_rel(gc, &ss->timeout, + spawn_timeout, ss->timeout_ms); + if (rc) goto out_err; - flags |= flag; + rc = libxl__ev_xswatch_register(gc, &ss->xswatch, + spawn_watch_event, ss->xspath); + if (rc) goto out_err; - if (fcntl(fd, F_SETFL, flags) == -1) - return ERROR_FAIL; + pid_t middle = libxl__ev_child_fork(gc, &ss->ssd->mid, spawn_middle_death); + if (middle ==-1) { rc = ERROR_FAIL; goto out_err; } - return 0; -} - -int libxl__spawn_spawn(libxl__gc *gc, - libxl__spawn_starting *for_spawn, - const char *what, - void (*intermediate_hook)(void *for_spawn, - pid_t innerchild), - void *hook_data) -{ - libxl_ctx *ctx = libxl__gc_owner(gc); - pid_t child, got; - int status, rc; - pid_t intermediate; - int pipes[2]; - unsigned char dummy = 0; - - if (for_spawn) { - for_spawn->what = strdup(what); - if (!for_spawn->what) return ERROR_NOMEM; - - if (libxl_pipe(ctx, pipes) < 0) - goto err_parent; - if (libxl__set_fd_flag(gc, pipes[0], O_NONBLOCK) < 0 || - libxl__set_fd_flag(gc, pipes[1], O_NONBLOCK) < 0) - goto err_parent_pipes; - } - - intermediate = libxl_fork(ctx); - if (intermediate ==-1) - goto err_parent_pipes; - - if (intermediate) { + if (middle) { /* parent */ - if (for_spawn) { - for_spawn->intermediate = intermediate; - for_spawn->fd = pipes[0]; - close(pipes[1]); - } return 1; } - /* we are now the intermediate process */ - if (for_spawn) close(pipes[0]); + /* we are now the middle process */ child = fork(); if (child == -1) exit(255); if (!child) { - if (for_spawn) close(pipes[1]); return 0; /* caller runs child code */ } - intermediate_hook(hook_data, child); - - if (!for_spawn) _exit(0); /* just detach then */ - - got = waitpid(child, &status, 0); - assert(got == child); - - rc = (WIFEXITED(status) ? WEXITSTATUS(status) : - WIFSIGNALED(status) && WTERMSIG(status) < 127 - ? WTERMSIG(status)+128 : -1); - if (for_spawn) { - if (write(pipes[1], &dummy, sizeof(dummy)) != 1) - perror("libxl__spawn_spawn: unable to signal child exit to parent"); - } - _exit(rc); - - err_parent_pipes: - if (for_spawn) { - close(pipes[0]); - close(pipes[1]); + int failsig = ss->midproc_cb(gc, ss, child); + if (failsig) { + kill(child, failsig); + _exit(127); } - err_parent: - if (for_spawn) free(for_spawn->what); + for (;;) { + pid_t got = waitpid(child, &status, 0); + if (got == -1) { + assert(errno == EINTR); + continue; + } + assert(got == child); + break; + } - return ERROR_FAIL; + r = (WIFEXITED(status) && WEXITSTATUS(status) <= 127 ? WEXITSTATUS(status) : + WIFSIGNALED(status) && WTERMSIG(status) < 127 ? WTERMSIG(status)+128 : + -1); + _exit(r); + + out_err: + spawn_cleanup(gc, ss); + return rc; } -static void report_spawn_intermediate_status(libxl__gc *gc, - libxl__spawn_starting *for_spawn, - int status) +static void spawn_cleanup(libxl__gc *gc, libxl__spawn_state *ss) { - if (!WIFEXITED(status)) { - libxl_ctx *ctx = libxl__gc_owner(gc); - char *intermediate_what; - /* intermediate process did the logging itself if it exited */ - if ( asprintf(&intermediate_what, - "%s intermediate process (startup monitor)", - for_spawn->what) < 0 ) - intermediate_what = "intermediate process (startup monitor)"; - libxl_report_child_exitstatus(ctx, LIBXL__LOG_ERROR, intermediate_what, - for_spawn->intermediate, status); + int r; + + libxl__ev_time_deregister(gc, &ss->timeout); + libxl__ev_xswatch_deregister(gc, &ss->xswatch); + + libxl__spawn_state_detachable *ssd = ss->ssd; + if (ssd) { + if (libxl__ev_child_inuse(&ssd->mid)) { + pid_t child = ssd->mid.pid; + r = kill(child, SIGKILL); + if (r && errno != ESRCH) + LOGE(WARN, "%s: failed to kill intermediate child (pid=%lu)", + ss->what, (unsigned long)child); + } + + /* disconnect the ss and ssd from each other */ + ssd->ss = 0; + ss->ssd = 0; } } -int libxl__spawn_detach(libxl__gc *gc, - libxl__spawn_starting *for_spawn) +static void spawn_failed(libxl__egc *egc, libxl__spawn_state *ss) { - libxl_ctx *ctx = libxl__gc_owner(gc); - int r, status; - pid_t got; - int rc = 0; - - if (!for_spawn) return 0; - - if (for_spawn->intermediate) { - r = kill(for_spawn->intermediate, SIGKILL); - if (r) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, - "could not kill %s intermediate process [%ld]", - for_spawn->what, - (unsigned long)for_spawn->intermediate); - abort(); /* things are very wrong */ - } - got = waitpid(for_spawn->intermediate, &status, 0); - assert(got == for_spawn->intermediate); - if (!(WIFSIGNALED(status) && WTERMSIG(status) == SIGKILL)) { - report_spawn_intermediate_status(gc, for_spawn, status); - rc = ERROR_FAIL; - } - for_spawn->intermediate = 0; - } - - free(for_spawn->what); - for_spawn->what = 0; - - return rc; + EGC_GC; + spawn_cleanup(gc, ss); + ss->failure_cb(egc, ss); /* must be last; callback may do anything to ss */ } -int libxl__spawn_check(libxl__gc *gc, libxl__spawn_starting *for_spawn) +static void spawn_timeout(libxl__egc *egc, libxl__ev_time *ev, + const struct timeval *requested_abs) { - pid_t got; - int status; + /* Before event, was Active; is now Partial. */ + EGC_GC; + libxl__spawn_state *ss = CONTAINER_OF(ev, *ss, timeout); + LOG(ERROR, "%s: startup timed out", ss->what); + spawn_failed(egc, ss); /* must be last */ +} - if (!for_spawn) return 0; +static void spawn_watch_event(libxl__egc *egc, libxl__ev_xswatch *xsw, + const char *watch_path, const char *event_path) +{ + /* On entry, is Active. */ + EGC_GC; + libxl__spawn_state *ss = CONTAINER_OF(xsw, *ss, xswatch); + char *p = libxl__xs_read(gc, 0, ss->xspath); + if (!p && errno != ENOENT) { + LOG(ERROR, "%s: xenstore read of %s failed", ss->what, ss->xspath); + spawn_failed(egc, ss); /* must be last */ + return; + } + ss->confirm_cb(egc, ss, p); /* must be last */ +} - assert(for_spawn->intermediate); - got = waitpid(for_spawn->intermediate, &status, WNOHANG); - if (!got) return 0; +static void spawn_middle_death(libxl__egc *egc, libxl__ev_child *childw, + pid_t pid, int status) + /* Before event, was Active or Detached; + * is now Active or Detached except that ssd->mid is Idle */ +{ + EGC_GC; + libxl__spawn_state_detachable *ssd = CONTAINER_OF(childw, *ssd, mid); + libxl__spawn_state *ss = ssd->ss; - assert(got == for_spawn->intermediate); - report_spawn_intermediate_status(gc, for_spawn, status); + if (!WIFEXITED(status)) { + const char *what = + GCSPRINTF("%s intermediate process (startup monitor)", + ss ? ss->what : "(detached)"); + int loglevel = ss ? XTL_ERROR : XTL_WARN; + libxl_report_child_exitstatus(CTX, loglevel, what, pid, status); + } else if (ss) { /* otherwise it was supposed to be a daemon by now */ + if (!status) + LOG(ERROR, "%s [%ld]: unexpectedly exited with exit status 0," + " when we were waiting for it to confirm startup", + ss->what, (unsigned long)pid); + else if (status <= 127) + LOG(ERROR, "%s [%ld]: failed startup with non-zero exit status %d", + ss->what, (unsigned long)pid, status); + else if (status < 255) { + int sig = status - 128; + const char *str = strsignal(sig); + if (str) + LOG(ERROR, "%s [%ld]: died during startup due to fatal" + " signal %s", ss->what, (unsigned long)pid, str); + else + LOG(ERROR, "%s [%ld]: died during startup due to unknown fatal" + " signal number %d", ss->what, (unsigned long)pid, sig); + } + ss->ssd = 0; /* detatch the ssd to make the ss be in state Partial */ + spawn_failed(egc, ss); /* must be last use of ss */ + } + free(ssd); +} - for_spawn->intermediate = 0; - return ERROR_FAIL; +void libxl__spawn_detach(libxl__gc *gc, libxl__spawn_state *ss) +{ + spawn_cleanup(gc, ss); } /* diff -r 9524eb476e93 -r 885fdd4fd7ac tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri May 11 18:59:02 2012 +0100 +++ b/tools/libxl/libxl_internal.h Fri May 11 18:59:03 2012 +0100 @@ -847,75 +847,198 @@ _hidden int libxl__create_pci_backend(li libxl_device_pci *pcidev, int num); _hidden int libxl__device_pci_destroy_all(libxl__gc *gc, uint32_t domid); -/* xl_exec */ +/* + *----- spawn ----- + * + * Higher-level double-fork and separate detach eg as for device models + * + * Each libxl__spawn_state is in one of the conventional states + * Undefined, Idle, Active + */ - /* higher-level double-fork and separate detach eg as for device models */ +typedef struct libxl__obsolete_spawn_starting libxl__spawn_starting; +/* this type is never defined, so no objects of this type exist + * fixme-ao This should go away completely. */ -typedef struct { - /* put this in your own status structure as returned to application */ - /* all fields are private to libxl_spawn_... */ - pid_t intermediate; - int fd; - char *what; /* malloc'd in spawn_spawn */ -} libxl__spawn_starting; +typedef struct libxl__spawn_state libxl__spawn_state; -typedef struct { - char *dom_path; /* from libxl_malloc, only for libxl_spawner_record_pid */ - const char *pid_path; /* only for libxl_spawner_record_pid */ - int domid; - libxl__spawn_starting *for_spawn; -} libxl__spawner_starting; +/* Clears out a spawn state; idempotent. */ +_hidden void libxl__spawn_init(libxl__spawn_state*); /* - * libxl__spawn_spawn - Create a new process - * gc: allocation pool - * for_spawn: malloc'd pointer to libxl__spawn_starting (optional) - * what: string describing the spawned process - * intermediate_hook: helper to record pid, such as libxl_spawner_record_pid - * hook_data: data to pass to the hook function + * libxl__spawn_spawn - Create a new process which will become daemonic + * Forks twice, to allow the child to detach entirely from the parent. + * + * We call the two generated processes the "middle child" (result of + * the first fork) and the "inner child" (result of the second fork + * which takes place in the middle child). + * + * The inner child must soon exit or exec. It must also soon exit or + * notify the parent of its successful startup by writing to the + * xenstore path xspath. + * + * The user (in the parent) will be called back (confirm_cb) every + * time that xenstore path is modified. + * + * In both children, the ctx is not fully usable: gc and logging + * operations are OK, but operations on Xen and xenstore are not. + * (The restrictions are the same as those which apply to children + * made with libxl__ev_child_fork.) + * + * midproc_cb will be called in the middle child, with the pid of the + * inner child; this could for example record the pid. midproc_cb + * should be fast, and should return. It will be called (reentrantly) + * within libxl__spawn_init. + * + * failure_cb will be called in the parent on failure of the + * intermediate or final child; an error message will have been + * logged. + * + * confirm_cb and failure_cb will not be called reentrantly from + * within libxl__spawn_spawn. + * + * what: string describing the spawned process, used for logging * * Logs errors. A copy of "what" is taken. * Return values: - * < 0 error, for_spawn need not be detached - * +1 caller is the parent, must call detach on *for_spawn eventually + * < 0 error, *spawn is now Idle and need not be detached + * +1 caller is the parent, *spawn is Active and must eventually be detached * 0 caller is now the inner child, should probably call libxl__exec - * Caller, may pass 0 for for_spawn, in which case no need to detach. + * + * The spawn state must be Undefined or Idle on entry. */ -_hidden int libxl__spawn_spawn(libxl__gc *gc, - libxl__spawn_starting *for_spawn, - const char *what, - void (*intermediate_hook)(void *for_spawn, pid_t innerchild), - void *hook_data); +_hidden int libxl__spawn_spawn(libxl__egc *egc, libxl__spawn_state *spawn); + +/* + * libxl__spawn_detach - Detaches the daemonic child. + * + * Works by killing the intermediate process from spawn_spawn. + * After this function returns, failures of either child are no + * longer reported via failure_cb. + * + * If called before the inner child has been created, this may prevent + * it from running at all. Thus this should be called only when the + * inner child has notified that it is ready. Normally it will be + * called from within confirm_cb. + * + * Logs errors. + * + * The spawn state must be Active or Idle on entry and will be Idle + * on return. + */ +_hidden void libxl__spawn_detach(libxl__gc *gc, libxl__spawn_state*); + +/* + * If successful, this should return 0. + * + * Otherwise it should return a signal number, which will be + * sent to the inner child; the overall spawn will then fail. + */ +typedef int /* signal number */ +libxl__spawn_midproc_cb(libxl__gc*, libxl__spawn_state*, pid_t inner); + +/* + * Called if the spawn failed. The reason will have been logged. + * The spawn state will be Idle on entry to the callback (and + * it may be reused immediately if desired). + */ +typedef void libxl__spawn_failure_cb(libxl__egc*, libxl__spawn_state*); + +/* + * Called when the xspath watch triggers. xspath will have been read + * and the result placed in xsdata; if that failed because the key + * didn't exist, xspath==0. (If it failed for some other reason, + * the spawn machinery calls failure_cb instead.) + * + * If the child has indicated its successful startup, or a failure + * has occurred, this should call libxl__spawn_detach. + * + * If the child is still starting up, should simply return, doing + * nothing. + * + * The spawn state will be Active on entry to the callback; there + * are no restrictions on the state on return; it may even have + * been detached and reused. + */ +typedef void libxl__spawn_confirm_cb(libxl__egc*, libxl__spawn_state*, + const char *xsdata); + +typedef struct { + /* Private to the spawn implementation. + */ + /* This separate struct, from malloc, allows us to "detach" + * the child and reap it later, when our user has gone + * away and freed its libxl__spawn_state */ + struct libxl__spawn_state *ss; + libxl__ev_child mid; +} libxl__spawn_state_detachable; + +struct libxl__spawn_state { + /* must be filled in by user and remain valid */ + libxl__ao *ao; + const char *what; + const char *xspath; + const char *pidpath; /* only used by libxl__spawn_midproc_record_pid */ + int timeout_ms; /* -1 means forever */ + libxl__spawn_midproc_cb *midproc_cb; + libxl__spawn_failure_cb *failure_cb; + libxl__spawn_confirm_cb *confirm_cb; + + /* remaining fields are private to libxl_spawn_... */ + libxl__ev_time timeout; + libxl__ev_xswatch xswatch; + libxl__spawn_state_detachable *ssd; +}; + +static inline int libxl__spawn_inuse(libxl__spawn_state *ss) + { return !!ss->ssd; } /* * libxl_spawner_record_pid - Record given pid in xenstore - * for_spawn: malloc'd pointer to libxl__spawn_starting (optional) - * innerchild: pid of the child * - * This function is passed as intermediate_hook to libxl__spawn_spawn. + * This function can be passed directly as an intermediate_hook to + * libxl__spawn_spawn. On failure, returns the value SIGTERM. */ -_hidden void libxl_spawner_record_pid(void *for_spawn, pid_t innerchild); +_hidden int libxl__spawn_record_pid(libxl__gc*, libxl__spawn_state*, + pid_t innerchild); -/* - * libxl__spawn_confirm_offspring_startup - Wait for child state - * gc: allocation pool - * timeout: how many seconds to wait for the child - * what: string describing the spawned process - * path: path to the state file in xenstore - * state: expected string to wait for in path (optional) - * starting: malloc'd pointer to libxl__spawner_starting - * - * Returns 0 on success, and < 0 on error. - * - * This function waits the given timeout for the given path to appear - * in xenstore, and optionally for state in path. - * The intermediate process created in libxl__spawn_spawn is killed. - * The memory referenced by starting->for_spawn and starting is free'd. - */ -_hidden int libxl__spawn_confirm_offspring_startup(libxl__gc *gc, - uint32_t timeout, char *what, - char *path, char *state, - libxl__spawner_starting *starting); +/*----- device model creation -----*/ + +/* First layer; wraps libxl__spawn_spawn. */ + +typedef struct libxl__dm_spawn_state libxl__dm_spawn_state; + +typedef void libxl__dm_spawn_cb(libxl__egc *egc, libxl__dm_spawn_state*, + int rc /* if !0, error was logged */); + +struct libxl__dm_spawn_state { + /* mixed - spawn.ao must be initialised by user; rest is private: */ + libxl__spawn_state spawn; + /* filled in by user, must remain valid: */ + uint32_t guest_domid; /* domain being served */ + libxl_domain_config *guest_config; + libxl__domain_build_state *build_state; /* relates to guest_domid */ + libxl__dm_spawn_cb *callback; +}; + +_hidden void libxl__spawn_local_dm(libxl__egc *egc, libxl__dm_spawn_state*); + +/* Stubdom device models. */ + +typedef struct { + /* Mixed - user must fill in public parts EXCEPT callback, + * which may be undefined on entry. (See above for details) */ + libxl__dm_spawn_state dm; /* the stub domain device model */ + /* filled in by user, must remain valid: */ + libxl__dm_spawn_cb *callback; /* called as callback(,&sdss->dm,) */ + /* private to libxl__spawn_stub_dm: */ + libxl_domain_config dm_config; + libxl__domain_build_state dm_state; + libxl__dm_spawn_state pvqemu; +} libxl__stub_dm_spawn_state; + +_hidden void libxl__spawn_stub_dm(libxl__egc *egc, libxl__stub_dm_spawn_state*); + /* * libxl__wait_for_offspring - Wait for child state @@ -948,31 +1071,6 @@ _hidden int libxl__wait_for_offspring(li void *userdata), void *check_callback_userdata); -/* - * libxl__spawn_detach - Kill intermediate process from spawn_spawn - * gc: allocation pool - * for_spawn: malloc'd pointer to libxl__spawn_starting (optional) - * - * Returns 0 on success, and < 0 on error. - * - * Logs errors. Idempotent, but only permitted after successful - * call to libxl__spawn_spawn, and no point calling it again if it fails. - */ -_hidden int libxl__spawn_detach(libxl__gc *gc, - libxl__spawn_starting *for_spawn); - -/* - * libxl__spawn_check - Check intermediate child process - * gc: allocation pool - * for_spawn: malloc'd pointer to libxl__spawn_starting (optional) - * - * Returns 0 on success, and < 0 on error. - * - * Logs errors but also returns them. - * Caller must still call detach. - */ -_hidden int libxl__spawn_check(libxl__gc *gc, - libxl__spawn_starting *for_spawn); /* low-level stuff, for synchronous subprocesses etc. */ @@ -991,15 +1089,6 @@ _hidden int libxl__domain_build(libxl__g /* for device model creation */ _hidden const char *libxl__domain_device_model(libxl__gc *gc, const libxl_domain_build_info *info); -_hidden int libxl__create_device_model(libxl__gc *gc, - int domid, - libxl_domain_config *guest_config, - libxl__domain_build_state *state, - libxl__spawner_starting **starting_r); -_hidden int libxl__create_xenpv_qemu(libxl__gc *gc, uint32_t domid, - libxl_domain_config *guest_config, - libxl__domain_build_state *state, - libxl__spawner_starting **starting_r); _hidden int libxl__need_xenpv_qemu(libxl__gc *gc, int nr_consoles, libxl__device_console *consoles, int nr_vfbs, libxl_device_vfb *vfbs, @@ -1007,10 +1096,6 @@ _hidden int libxl__need_xenpv_qemu(libxl /* Caller must either: pass starting_r==0, or on successful * return pass *starting_r (which will be non-0) to * libxl__confirm_device_model_startup or libxl__detach_device_model. */ -_hidden int libxl__confirm_device_model_startup(libxl__gc *gc, - libxl__domain_build_state *state, - libxl__spawner_starting *starting); -_hidden int libxl__detach_device_model(libxl__gc *gc, libxl__spawner_starting *starting); _hidden int libxl__wait_for_device_model(libxl__gc *gc, uint32_t domid, char *state, libxl__spawn_starting *spawning, @@ -1581,6 +1666,31 @@ _hidden void libxl__bootloader_init(libx _hidden void libxl__bootloader_run(libxl__egc*, libxl__bootloader_state *st); +/*----- Domain creation -----*/ + +typedef struct libxl__domain_create_state libxl__domain_create_state; + +typedef void libxl__domain_create_cb(libxl__egc *egc, + libxl__domain_create_state*, + int rc, uint32_t domid); + +struct libxl__domain_create_state { + /* filled in by user */ + libxl__ao *ao; + libxl_domain_config *guest_config; + int restore_fd; + libxl_console_ready console_cb; + void *console_cb_priv; + libxl__domain_create_cb *callback; + /* private to domain_create */ + int guest_domid; + libxl__domain_build_state build_state; + libxl__stub_dm_spawn_state dmss; + /* If we're not doing stubdom, we use only dmss.dm, + * for the non-stubdom device model. */ +}; + + /* * Convenience macros. */ diff -r 9524eb476e93 -r 885fdd4fd7ac tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Fri May 11 18:59:02 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Fri May 11 18:59:03 2012 +0100 @@ -1695,8 +1695,8 @@ start: if ( restore_file ) { ret = libxl_domain_create_restore(ctx, &d_config, - cb, &child_console_pid, - &domid, restore_fd); + cb, &child_console_pid, + &domid, restore_fd, 0); /* * On subsequent reboot etc we should create the domain, not * restore/migrate-receive it again. @@ -1704,7 +1704,7 @@ start: restore_file = NULL; }else{ ret = libxl_domain_create_new(ctx, &d_config, - cb, &child_console_pid, &domid); + cb, &child_console_pid, &domid, 0); } if ( ret ) goto error_out; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:33:14 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:33:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCw-00057a-Op; Mon, 14 May 2012 16:33:14 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCU-0004jl-S7 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:47 +0000 Received: from [193.109.254.147:56274] by server-2.bemta-14.messagelabs.com id 2A/38-19409-EA331BF4; Mon, 14 May 2012 16:32:46 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-27.messagelabs.com!1337013162!9230720!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29409 invoked from network); 14 May 2012 16:32:43 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCP-0002vd-OZ for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCP-0006q8-NY for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:41 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:41 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: ao: convert libxl__spawn_* X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1336759143 -3600 # Node ID 885fdd4fd7ac807a2b0e6a322ab492f0f40d1561 # Parent 9524eb476e930960a579bd9e0219450dd4462527 libxl: ao: convert libxl__spawn_* libxl__spawn_spawn becomes a callback-style asynchronous function. The implementation is now in terms of libxl__ev_* including libxl_ev_child. All the callers need to be updated. This includes the device model spawning functions libxl__create_device_model and libxl__create_stubdom; these are replaced with libxl__spawn_local_dm and libxl__spawn_stubdom. libxl__confirm_device_model_startup is abolished; instead the dm spawner calls back. (The choice of which kind of device model to create is lifted out of what used to be libxl__create_device_model, because that function was indirectly recursive. Recursive callback-style operations are clumsy because they require a pointer indirection for the nested states.) Waiting for proper device model startup it is no longer notionally optional. Previously the code appeared to tolerate this by passing NULL for various libxl__spawner_starting* parameters to device model spawners. However, this was not used anywhere. Conversely, the "for_spawn" parameter to libxl__wait_for_offspring is no longer supported. It remains as an unused formal parameter to avoid updating, in this patch, all the call sites which pass NULL. libxl__wait_for_offspring is in any case itself an obsolete function, so this wrinkle will go away when its callers are updated to use the event system. Consequently libxl__spawn_check is also abolished. The "console ready" callback also remains unchanged in this patch. The API for this needs to be reviewed in the context of the event series and its reentrancy restrictions documented. Thus their callers need to be updated. These are the domain creation functions libxl_domain_create_new and _restore. These functions now take ao_hows, and have a private state structure. However domain creation remains not completely converted to the event mechanism; in particular it runs the outward-facing function libxl_run_bootloader with a NULL ao_how, which is quite wrong. As it happens in the current code this is not a bug because none of the rest of the functionality surrounding the bootloader call will mind if the event loop is reentered in the middle of its execution. The file-scope function libxl__set_fd_flag which was used by the previous spawn arrangements becomes unused and is removed; other places in libxl can use libxl_fd_set_nonblock and libxl_fd_set_cloexec, which of course remain. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Changes since v8: * Make midproc_cb callback with correct pid (that of the grandchild, not "middle" which is zero). Reported by Roger Pau Monne. Changes since v7: * Rename libxl__spawn_stubdom to libxl__spawn_stub_dm (and ..._state); rename the state's stubdom_* members to dm_*. * Eliminate the union between the two dm creation states in libxl__domain_create_state. Instead, the domain creation code simply uses libxl__stub_dm_spawn_state.dm directly, if we're taking the local dm path. * Remove a spurious "break". * In domain creation, move the PV non-qemu case into the switch. * Code style fixes. * Constify some convenience aliases. * Improve comments (including typo fixes). Committed-by: Ian Jackson --- diff -r 9524eb476e93 -r 885fdd4fd7ac tools/libxl/libxl.h --- a/tools/libxl/libxl.h Fri May 11 18:59:02 2012 +0100 +++ b/tools/libxl/libxl.h Fri May 11 18:59:03 2012 +0100 @@ -465,8 +465,18 @@ int libxl_ctx_free(libxl_ctx *ctx /* 0 i /* domain related functions */ typedef int (*libxl_console_ready)(libxl_ctx *ctx, uint32_t domid, void *priv); -int libxl_domain_create_new(libxl_ctx *ctx, libxl_domain_config *d_config, libxl_console_ready cb, void *priv, uint32_t *domid); -int libxl_domain_create_restore(libxl_ctx *ctx, libxl_domain_config *d_config, libxl_console_ready cb, void *priv, uint32_t *domid, int restore_fd); + /* fixme-ao Need to review this API. If we keep it, the reentrancy + * properties need to be documented but they may turn out to be too + * awkward */ + +int libxl_domain_create_new(libxl_ctx *ctx, libxl_domain_config *d_config, + libxl_console_ready cb, void *priv, uint32_t *domid, + const libxl_asyncop_how *ao_how); +int libxl_domain_create_restore(libxl_ctx *ctx, libxl_domain_config *d_config, + libxl_console_ready cb, void *priv, + uint32_t *domid, int restore_fd, + const libxl_asyncop_how *ao_how); + void libxl_domain_config_init(libxl_domain_config *d_config); void libxl_domain_config_dispose(libxl_domain_config *d_config); int libxl_domain_suspend(libxl_ctx *ctx, libxl_domain_suspend_info *info, diff -r 9524eb476e93 -r 885fdd4fd7ac tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Fri May 11 18:59:02 2012 +0100 +++ b/tools/libxl/libxl_create.c Fri May 11 18:59:03 2012 +0100 @@ -558,16 +558,40 @@ static int store_libxl_entry(libxl__gc * libxl_device_model_version_to_string(b_info->device_model_version)); } -static int do_domain_create(libxl__gc *gc, libxl_domain_config *d_config, - libxl_console_ready cb, void *priv, - uint32_t *domid_out, int restore_fd) +/*----- main domain creation -----*/ + +/* We have a linear control flow; only one event callback is + * outstanding at any time. Each initiation and callback function + * arranges for the next to be called, as the very last thing it + * does. (If that particular sub-operation is not needed, a + * function will call the next event callback directly.) + */ + +/* Event callbacks, in this order: */ +static void domcreate_devmodel_started(libxl__egc *egc, + libxl__dm_spawn_state *dmss, + int rc); + +/* Our own function to clean up and call the user's callback. + * The final call in the sequence. */ +static void domcreate_complete(libxl__egc *egc, + libxl__domain_create_state *dcs, + int rc); + +static void initiate_domain_create(libxl__egc *egc, + libxl__domain_create_state *dcs) { + STATE_AO_GC(dcs->ao); libxl_ctx *ctx = libxl__gc_owner(gc); - libxl__spawner_starting *dm_starting = 0; - libxl__domain_build_state state[1]; uint32_t domid; int i, ret; + /* convenience aliases */ + libxl_domain_config *const d_config = dcs->guest_config; + const int restore_fd = dcs->restore_fd; + const libxl_console_ready cb = dcs->console_cb; + void *const priv = dcs->console_cb_priv; + domid = 0; ret = libxl__domain_create_info_setdefault(gc, &d_config->c_info); @@ -580,9 +604,12 @@ static int do_domain_create(libxl__gc *g goto error_out; } + dcs->guest_domid = domid; + dcs->dmss.dm.guest_domid = 0; /* means we haven't spawned */ + if ( d_config->c_info.type == LIBXL_DOMAIN_TYPE_PV && cb ) { - if ( (*cb)(ctx, domid, priv) ) - goto error_out; + ret = (*cb)(ctx, domid, priv); + if (ret) goto error_out; } ret = libxl__domain_build_info_setdefault(gc, &d_config->b_info); @@ -606,7 +633,17 @@ static int do_domain_create(libxl__gc *g } } - memset(state, 0, sizeof(*state)); + memset(&dcs->build_state, 0, sizeof(dcs->build_state)); + libxl__domain_build_state *state = &dcs->build_state; + + /* We might be going to call libxl__spawn_local_dm, or _spawn_stub_dm. + * Fill in any field required by either, including both relevant + * callbacks (_spawn_stub_dm will overwrite our trespass if needed). */ + dcs->dmss.dm.spawn.ao = ao; + dcs->dmss.dm.guest_config = dcs->guest_config; + dcs->dmss.dm.build_state = &dcs->build_state; + dcs->dmss.dm.callback = domcreate_devmodel_started; + dcs->dmss.callback = domcreate_devmodel_started; if ( restore_fd >= 0 ) { ret = domain_restore(gc, &d_config->b_info, domid, restore_fd, state); @@ -656,14 +693,12 @@ static int do_domain_create(libxl__gc *g libxl_device_vkb_add(ctx, domid, &vkb); libxl_device_vkb_dispose(&vkb); - ret = libxl__create_device_model(gc, domid, d_config, - state, &dm_starting); - if (ret < 0) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, - "failed to create device model: %d", ret); - goto error_out; - } - break; + dcs->dmss.dm.guest_domid = domid; + if (libxl_defbool_val(d_config->b_info.device_model_stubdomain)) + libxl__spawn_stub_dm(egc, &dcs->dmss); + else + libxl__spawn_local_dm(egc, &dcs->dmss.dm); + return; } case LIBXL_DOMAIN_TYPE_PV: { @@ -687,26 +722,52 @@ static int do_domain_create(libxl__gc *g libxl__device_console_dispose(&console); if (need_qemu) { - libxl__create_xenpv_qemu(gc, domid, d_config, state, &dm_starting); + dcs->dmss.dm.guest_domid = domid; + libxl__spawn_local_dm(egc, &dcs->dmss.dm); + return; + } else { + assert(!dcs->dmss.dm.guest_domid); + domcreate_devmodel_started(egc, &dcs->dmss.dm, 0); + return; } - break; } default: ret = ERROR_INVAL; goto error_out; } + abort(); /* not reached */ - if (dm_starting) { + error_out: + assert(ret); + domcreate_complete(egc, dcs, ret); +} + +static void domcreate_devmodel_started(libxl__egc *egc, + libxl__dm_spawn_state *dmss, + int ret) +{ + libxl__domain_create_state *dcs = CONTAINER_OF(dmss, *dcs, dmss.dm); + STATE_AO_GC(dmss->spawn.ao); + int i; + libxl_ctx *ctx = CTX; + int domid = dcs->guest_domid; + + /* convenience aliases */ + libxl_domain_config *const d_config = dcs->guest_config; + const libxl_console_ready cb = dcs->console_cb; + void *const priv = dcs->console_cb_priv; + + if (ret) { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, + "device model did not start: %d", ret); + goto error_out; + } + + if (dcs->dmss.dm.guest_domid) { if (d_config->b_info.device_model_version == LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN) { libxl__qmp_initializations(gc, domid, d_config); } - ret = libxl__confirm_device_model_startup(gc, state, dm_starting); - if (ret < 0) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, - "device model did not start: %d", ret); - goto error_out; - } } for (i = 0; i < d_config->num_pcidevs; i++) @@ -734,38 +795,95 @@ static int do_domain_create(libxl__gc *g if ( cb && (d_config->c_info.type == LIBXL_DOMAIN_TYPE_HVM || (d_config->c_info.type == LIBXL_DOMAIN_TYPE_PV && d_config->b_info.u.pv.bootloader ))) { - if ( (*cb)(ctx, domid, priv) ) - goto error_out; + ret = (*cb)(ctx, domid, priv); + if (ret) goto error_out; } - *domid_out = domid; - return 0; + domcreate_complete(egc, dcs, 0); + return; error_out: - if (domid) - libxl_domain_destroy(ctx, domid); - - return ret; + assert(ret); + domcreate_complete(egc, dcs, ret); } +static void domcreate_complete(libxl__egc *egc, + libxl__domain_create_state *dcs, + int rc) +{ + STATE_AO_GC(dcs->ao); + + if (rc) { + if (dcs->guest_domid) { + int rc2 = libxl_domain_destroy(CTX, dcs->guest_domid); + if (rc2) + LOG(ERROR, "unable to destroy domain %d following" + " failed creation", dcs->guest_domid); + } + dcs->guest_domid = -1; + } + dcs->callback(egc, dcs, rc, dcs->guest_domid); +} + +/*----- application-facing domain creation interface -----*/ + +typedef struct { + libxl__domain_create_state dcs; + uint32_t *domid_out; +} libxl__app_domain_create_state; + +static void domain_create_cb(libxl__egc *egc, + libxl__domain_create_state *dcs, + int rc, uint32_t domid); + +static int do_domain_create(libxl_ctx *ctx, libxl_domain_config *d_config, + libxl_console_ready cb, void *priv, uint32_t *domid, + int restore_fd, const libxl_asyncop_how *ao_how) +{ + AO_CREATE(ctx, 0, ao_how); + libxl__app_domain_create_state *cdcs; + + GCNEW(cdcs); + cdcs->dcs.ao = ao; + cdcs->dcs.guest_config = d_config; + cdcs->dcs.restore_fd = restore_fd; + cdcs->dcs.console_cb = cb; + cdcs->dcs.console_cb_priv = priv; + cdcs->dcs.callback = domain_create_cb; + cdcs->domid_out = domid; + + initiate_domain_create(egc, &cdcs->dcs); + + return AO_INPROGRESS; +} + +static void domain_create_cb(libxl__egc *egc, + libxl__domain_create_state *dcs, + int rc, uint32_t domid) +{ + libxl__app_domain_create_state *cdcs = CONTAINER_OF(dcs, *cdcs, dcs); + STATE_AO_GC(cdcs->dcs.ao); + + if (!rc) + *cdcs->domid_out = domid; + + libxl__ao_complete(egc, ao, rc); +} + int libxl_domain_create_new(libxl_ctx *ctx, libxl_domain_config *d_config, - libxl_console_ready cb, void *priv, uint32_t *domid) + libxl_console_ready cb, void *priv, + uint32_t *domid, + const libxl_asyncop_how *ao_how) { - GC_INIT(ctx); - int rc; - rc = do_domain_create(gc, d_config, cb, priv, domid, -1); - GC_FREE; - return rc; + return do_domain_create(ctx, d_config, cb, priv, domid, -1, ao_how); } int libxl_domain_create_restore(libxl_ctx *ctx, libxl_domain_config *d_config, - libxl_console_ready cb, void *priv, uint32_t *domid, int restore_fd) + libxl_console_ready cb, void *priv, + uint32_t *domid, int restore_fd, + const libxl_asyncop_how *ao_how) { - GC_INIT(ctx); - int rc; - rc = do_domain_create(gc, d_config, cb, priv, domid, restore_fd); - GC_FREE; - return rc; + return do_domain_create(ctx, d_config, cb, priv, domid, restore_fd, ao_how); } /* diff -r 9524eb476e93 -r 885fdd4fd7ac tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Fri May 11 18:59:02 2012 +0100 +++ b/tools/libxl/libxl_dm.c Fri May 11 18:59:03 2012 +0100 @@ -669,24 +669,28 @@ retry_transaction: return 0; } -static int libxl__create_stubdom(libxl__gc *gc, - int guest_domid, - libxl_domain_config *guest_config, - libxl__domain_build_state *d_state, - libxl__spawner_starting **starting_r) +static void spawn_stubdom_pvqemu_cb(libxl__egc *egc, + libxl__dm_spawn_state *stubdom_dmss, + int rc); + +void libxl__spawn_stub_dm(libxl__egc *egc, libxl__stub_dm_spawn_state *sdss) { + STATE_AO_GC(sdss->dm.spawn.ao); libxl_ctx *ctx = libxl__gc_owner(gc); int i, num_console = STUBDOM_SPECIAL_CONSOLES, ret; libxl__device_console *console; - libxl_domain_config dm_config[1]; libxl_device_vfb vfb; libxl_device_vkb vkb; - libxl__domain_build_state stubdom_state[1]; - uint32_t dm_domid; char **args; struct xs_permissions perm[2]; xs_transaction_t t; - libxl__spawner_starting *dm_starting = 0; + + /* convenience aliases */ + libxl_domain_config *const dm_config = &sdss->dm_config; + libxl_domain_config *const guest_config = sdss->dm.guest_config; + const int guest_domid = sdss->dm.guest_domid; + libxl__domain_build_state *const d_state = sdss->dm.build_state; + libxl__domain_build_state *const stubdom_state = &sdss->dm_state; if (guest_config->b_info.device_model_version != LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL) { @@ -694,6 +698,8 @@ static int libxl__create_stubdom(libxl__ goto out; } + sdss->pvqemu.guest_domid = 0; + libxl_domain_create_info_init(&dm_config->c_info); dm_config->c_info.type = LIBXL_DOMAIN_TYPE_PV; dm_config->c_info.name = libxl__sprintf(gc, "%s-dm", @@ -741,10 +747,10 @@ static int libxl__create_stubdom(libxl__ dm_config->num_vkbs = 1; /* fixme: this function can leak the stubdom if it fails */ - dm_domid = 0; - ret = libxl__domain_make(gc, &dm_config->c_info, &dm_domid); + ret = libxl__domain_make(gc, &dm_config->c_info, &sdss->pvqemu.guest_domid); if (ret) goto out; + uint32_t dm_domid = sdss->pvqemu.guest_domid; ret = libxl__domain_build(gc, &dm_config->b_info, dm_domid, stubdom_state); if (ret) goto out; @@ -852,42 +858,67 @@ retry_transaction: goto out_free; } - if (libxl__create_xenpv_qemu(gc, dm_domid, - dm_config, - stubdom_state, - &dm_starting) < 0) { - ret = ERROR_FAIL; - goto out_free; - } - if (libxl__confirm_device_model_startup(gc, d_state, dm_starting) < 0) { - ret = ERROR_FAIL; - goto out_free; - } + sdss->pvqemu.guest_domid = dm_domid; + sdss->pvqemu.guest_config = &sdss->dm_config; + sdss->pvqemu.build_state = &sdss->dm_state; + sdss->pvqemu.callback = spawn_stubdom_pvqemu_cb; - libxl_domain_unpause(ctx, dm_domid); + libxl__spawn_local_dm(egc, &sdss->pvqemu); - if (starting_r) { - *starting_r = calloc(1, sizeof(libxl__spawner_starting)); - (*starting_r)->domid = guest_domid; - (*starting_r)->dom_path = libxl__xs_get_dompath(gc, guest_domid); - (*starting_r)->for_spawn = NULL; - } - - ret = 0; + free(args); + return; out_free: free(args); out: - return ret; + assert(ret); + spawn_stubdom_pvqemu_cb(egc, &sdss->pvqemu, ret); } -int libxl__create_device_model(libxl__gc *gc, - int domid, - libxl_domain_config *guest_config, - libxl__domain_build_state *state, - libxl__spawner_starting **starting_r) +static void spawn_stubdom_pvqemu_cb(libxl__egc *egc, + libxl__dm_spawn_state *stubdom_dmss, + int rc) { - libxl_ctx *ctx = libxl__gc_owner(gc); + libxl__stub_dm_spawn_state *sdss = + CONTAINER_OF(stubdom_dmss, *sdss, pvqemu); + STATE_AO_GC(sdss->dm.spawn.ao); + uint32_t dm_domid = sdss->pvqemu.guest_domid; + + if (rc) goto out; + + rc = libxl_domain_unpause(CTX, dm_domid); + if (rc) goto out; + + out: + if (rc) { + if (dm_domid) + libxl_domain_destroy(CTX, dm_domid); + } + sdss->callback(egc, &sdss->dm, rc); +} + +/* callbacks passed to libxl__spawn_spawn */ +static void device_model_confirm(libxl__egc *egc, libxl__spawn_state *spawn, + const char *xsdata); +static void device_model_startup_failed(libxl__egc *egc, + libxl__spawn_state *spawn); + +/* our "next step" function, called from those callbacks and elsewhere */ +static void device_model_spawn_outcome(libxl__egc *egc, + libxl__dm_spawn_state *dmss, + int rc); + +void libxl__spawn_local_dm(libxl__egc *egc, libxl__dm_spawn_state *dmss) +{ + /* convenience aliases */ + const int domid = dmss->guest_domid; + libxl__domain_build_state *const state = dmss->build_state; + libxl__spawn_state *const spawn = &dmss->spawn; + + STATE_AO_GC(dmss->spawn.ao); + + libxl_ctx *ctx = CTX; + libxl_domain_config *guest_config = dmss->guest_config; const libxl_domain_create_info *c_info = &guest_config->c_info; const libxl_domain_build_info *b_info = &guest_config->b_info; const libxl_vnc_info *vnc = libxl__dm_vnc(guest_config); @@ -895,15 +926,13 @@ int libxl__create_device_model(libxl__gc int logfile_w, null; int rc; char **args, **arg; - libxl__spawner_starting buf_starting, *p; xs_transaction_t t; char *vm_path; char **pass_stuff; const char *dm; if (libxl_defbool_val(b_info->device_model_stubdomain)) { - rc = libxl__create_stubdom(gc, domid, guest_config, state, starting_r); - goto out; + abort(); } dm = libxl__domain_device_model(gc, b_info); @@ -947,25 +976,8 @@ int libxl__create_device_model(libxl__gc free(logfile); null = open("/dev/null", O_RDONLY); - if (starting_r) { - rc = ERROR_NOMEM; - *starting_r = calloc(1, sizeof(libxl__spawner_starting)); - if (!*starting_r) - goto out_close; - p = *starting_r; - p->for_spawn = calloc(1, sizeof(libxl__spawn_starting)); - } else { - p = &buf_starting; - p->for_spawn = NULL; - } - - p->domid = domid; - p->dom_path = libxl__xs_get_dompath(gc, domid); - p->pid_path = "image/device-model-pid"; - if (!p->dom_path) { - rc = ERROR_FAIL; - goto out_close; - } + const char *dom_path = libxl__xs_get_dompath(gc, domid); + spawn->pidpath = GCSPRINTF("%s/%s", dom_path, "image/device-model-pid"); if (vnc && vnc->passwd) { /* This xenstore key will only be used by qemu-xen-traditionnal. @@ -973,7 +985,7 @@ int libxl__create_device_model(libxl__gc retry_transaction: /* Find uuid and the write the vnc password to xenstore for qemu. */ t = xs_transaction_start(ctx->xsh); - vm_path = libxl__xs_read(gc,t,libxl__sprintf(gc, "%s/vm", p->dom_path)); + vm_path = libxl__xs_read(gc,t,libxl__sprintf(gc, "%s/vm", dom_path)); if (vm_path) { /* Now write the vncpassword into it. */ pass_stuff = libxl__calloc(gc, 3, sizeof(char *)); @@ -990,8 +1002,15 @@ retry_transaction: for (arg = args; *arg; arg++) LIBXL__LOG(CTX, XTL_DEBUG, " %s", *arg); - rc = libxl__spawn_spawn(gc, p->for_spawn, "device model", - libxl_spawner_record_pid, p); + spawn->what = GCSPRINTF("domain %d device model", domid); + spawn->xspath = GCSPRINTF("/local/domain/0/device-model/%d/state", domid); + spawn->timeout_ms = LIBXL_DEVICE_MODEL_START_TIMEOUT * 1000; + spawn->pidpath = GCSPRINTF("%s/image/device-model-pid", dom_path); + spawn->midproc_cb = libxl__spawn_record_pid; + spawn->confirm_cb = device_model_confirm; + spawn->failure_cb = device_model_startup_failed; + + rc = libxl__spawn_spawn(egc, spawn); if (rc < 0) goto out_close; if (!rc) { /* inner child */ @@ -1006,30 +1025,61 @@ out_close: close(logfile_w); free(args); out: - return rc; + if (rc) + device_model_spawn_outcome(egc, dmss, rc); } -int libxl__confirm_device_model_startup(libxl__gc *gc, - libxl__domain_build_state *state, - libxl__spawner_starting *starting) +static void device_model_confirm(libxl__egc *egc, libxl__spawn_state *spawn, + const char *xsdata) { - char *path; - int domid = starting->domid; - int ret, ret2; - path = libxl__sprintf(gc, "/local/domain/0/device-model/%d/state", domid); - ret = libxl__spawn_confirm_offspring_startup(gc, - LIBXL_DEVICE_MODEL_START_TIMEOUT, - "Device Model", path, "running", starting); + libxl__dm_spawn_state *dmss = CONTAINER_OF(spawn, *dmss, spawn); + STATE_AO_GC(spawn->ao); + + if (!xsdata) + return; + + if (strcmp(xsdata, "running")) + return; + + libxl__spawn_detach(gc, spawn); + + device_model_spawn_outcome(egc, dmss, 0); +} + +static void device_model_startup_failed(libxl__egc *egc, + libxl__spawn_state *spawn) +{ + libxl__dm_spawn_state *dmss = CONTAINER_OF(spawn, *dmss, spawn); + device_model_spawn_outcome(egc, dmss, ERROR_FAIL); +} + +static void device_model_spawn_outcome(libxl__egc *egc, + libxl__dm_spawn_state *dmss, + int rc) +{ + STATE_AO_GC(dmss->spawn.ao); + int ret2; + + if (rc) + LOG(ERROR, "%s: spawn failed (rc=%d)", dmss->spawn.what, rc); + + libxl__domain_build_state *state = dmss->build_state; + if (state->saved_state) { ret2 = unlink(state->saved_state); - if (ret2) LIBXL__LOG_ERRNO(CTX, XTL_ERROR, - "failed to remove device-model state %s\n", - state->saved_state); - /* Do not clobber spawn_confirm error code with unlink error code. */ - if (!ret) ret = ret2; + if (ret2) { + LOGE(ERROR, "%s: failed to remove device-model state %s", + dmss->spawn.what, state->saved_state); + rc = ERROR_FAIL; + goto out; + } } - return ret; + + rc = 0; + + out: + dmss->callback(egc, dmss, rc); } int libxl__destroy_device_model(libxl__gc *gc, uint32_t domid) @@ -1131,15 +1181,6 @@ out: return ret; } -int libxl__create_xenpv_qemu(libxl__gc *gc, uint32_t domid, - libxl_domain_config *guest_config, - libxl__domain_build_state *state, - libxl__spawner_starting **starting_r) -{ - libxl__create_device_model(gc, domid, guest_config, state, starting_r); - return 0; -} - /* * Local variables: * mode: C diff -r 9524eb476e93 -r 885fdd4fd7ac tools/libxl/libxl_exec.c --- a/tools/libxl/libxl_exec.c Fri May 11 18:59:02 2012 +0100 +++ b/tools/libxl/libxl_exec.c Fri May 11 18:59:03 2012 +0100 @@ -127,29 +127,35 @@ void libxl_report_child_exitstatus(libxl } } -void libxl_spawner_record_pid(void *for_spawn, pid_t innerchild) +int libxl__spawn_record_pid(libxl__gc *gc, libxl__spawn_state *spawn, + pid_t innerchild) { - libxl__spawner_starting *starting = for_spawn; - struct xs_handle *xsh; - char *path = NULL, *pid = NULL; - int len; + struct xs_handle *xsh = NULL; + const char *pid = NULL; + int rc, xsok; - if (asprintf(&path, "%s/%s", starting->dom_path, starting->pid_path) < 0) - goto out; - - len = asprintf(&pid, "%d", innerchild); - if (len < 0) - goto out; + pid = GCSPRINTF("%d", innerchild); /* we mustn't use the parent's handle in the child */ xsh = xs_daemon_open(); + if (!xsh) { + LOGE(ERROR, "write %s = %s: xenstore reopen failed", + spawn->pidpath, pid); + rc = ERROR_FAIL; goto out; + } - xs_write(xsh, XBT_NULL, path, pid, len); + xsok = xs_write(xsh, XBT_NULL, spawn->pidpath, pid, strlen(pid)); + if (!xsok) { + LOGE(ERROR, + "write %s = %s: xenstore write failed", spawn->pidpath, pid); + rc = ERROR_FAIL; goto out; + } - xs_daemon_close(xsh); + rc = 0; + out: - free(path); - free(pid); + if (xsh) xs_daemon_close(xsh); + return rc ? SIGTERM : 0; } int libxl__wait_for_offspring(libxl__gc *gc, @@ -184,19 +190,9 @@ int libxl__wait_for_offspring(libxl__gc tv.tv_sec = timeout; tv.tv_usec = 0; nfds = xs_fileno(xsh) + 1; - if (spawning && spawning->fd > xs_fileno(xsh)) - nfds = spawning->fd + 1; + assert(!spawning); while (rc > 0 || (!rc && tv.tv_sec > 0)) { - if ( spawning ) { - rc = libxl__spawn_check(gc, spawning); - if ( rc ) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, - "%s died during startup", what); - rc = -1; - goto err_died; - } - } p = xs_read(xsh, XBT_NULL, path, &len); if ( NULL == p ) goto again; @@ -218,8 +214,6 @@ again: free(p); FD_ZERO(&rfds); FD_SET(xs_fileno(xsh), &rfds); - if (spawning) - FD_SET(spawning->fd, &rfds); rc = select(nfds, &rfds, NULL, NULL, &tv); if (rc > 0) { if (FD_ISSET(xs_fileno(xsh), &rfds)) { @@ -229,207 +223,215 @@ again: else goto again; } - if (spawning && FD_ISSET(spawning->fd, &rfds)) { - unsigned char dummy; - if (read(spawning->fd, &dummy, sizeof(dummy)) != 1) - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_DEBUG, - "failed to read spawn status pipe"); - } } } LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "%s not ready", what); -err_died: + xs_unwatch(xsh, path, path); xs_daemon_close(xsh); err: return -1; } -static int detach_offspring(libxl__gc *gc, - libxl__spawner_starting *starting) + +/*----- spawn implementation -----*/ + +/* + * Full set of possible states of a libxl__spawn_state and its _detachable: + * + * ss-> ss-> ss-> | ssd-> ssd-> + * timeout xswatch ssd | mid ss + * - Undefined undef undef no | - - + * - Idle Idle Idle no | - - + * - Active Active Active yes | Active yes + * - Partial Active/Idle Active/Idle maybe | Active/Idle yes (if exists) + * - Detached - - - | Active no + * + * When in state Detached, the middle process has been sent a SIGKILL. + */ + +/* Event callbacks. */ +static void spawn_watch_event(libxl__egc *egc, libxl__ev_xswatch *xsw, + const char *watch_path, const char *event_path); +static void spawn_timeout(libxl__egc *egc, libxl__ev_time *ev, + const struct timeval *requested_abs); +static void spawn_middle_death(libxl__egc *egc, libxl__ev_child *childw, + pid_t pid, int status); + +/* Precondition: Partial. Results: Detached. */ +static void spawn_cleanup(libxl__gc *gc, libxl__spawn_state *ss); + +/* Precondition: Partial; caller has logged failure reason. + * Results: Caller notified of failure; + * after return, ss may be completely invalid as caller may reuse it */ +static void spawn_failed(libxl__egc *egc, libxl__spawn_state *ss); + +void libxl__spawn_init(libxl__spawn_state *ss) { - int rc; - rc = libxl__spawn_detach(gc, starting->for_spawn); - if (starting->for_spawn) - free(starting->for_spawn); - free(starting); - return rc; + libxl__ev_time_init(&ss->timeout); + libxl__ev_xswatch_init(&ss->xswatch); + ss->ssd = 0; } -int libxl__spawn_confirm_offspring_startup(libxl__gc *gc, - uint32_t timeout, char *what, - char *path, char *state, - libxl__spawner_starting *starting) +int libxl__spawn_spawn(libxl__egc *egc, libxl__spawn_state *ss) { - int detach; - int problem = libxl__wait_for_offspring(gc, starting->domid, timeout, what, - path, state, - starting->for_spawn, NULL, NULL); - detach = detach_offspring(gc, starting); - return problem ? problem : detach; -} + STATE_AO_GC(ss->ao); + int r; + pid_t child; + int status, rc; -static int libxl__set_fd_flag(libxl__gc *gc, int fd, int flag) -{ - int flags; + libxl__spawn_init(ss); + ss->ssd = libxl__zalloc(0, sizeof(*ss->ssd)); + libxl__ev_child_init(&ss->ssd->mid); - flags = fcntl(fd, F_GETFL); - if (flags == -1) - return ERROR_FAIL; + rc = libxl__ev_time_register_rel(gc, &ss->timeout, + spawn_timeout, ss->timeout_ms); + if (rc) goto out_err; - flags |= flag; + rc = libxl__ev_xswatch_register(gc, &ss->xswatch, + spawn_watch_event, ss->xspath); + if (rc) goto out_err; - if (fcntl(fd, F_SETFL, flags) == -1) - return ERROR_FAIL; + pid_t middle = libxl__ev_child_fork(gc, &ss->ssd->mid, spawn_middle_death); + if (middle ==-1) { rc = ERROR_FAIL; goto out_err; } - return 0; -} - -int libxl__spawn_spawn(libxl__gc *gc, - libxl__spawn_starting *for_spawn, - const char *what, - void (*intermediate_hook)(void *for_spawn, - pid_t innerchild), - void *hook_data) -{ - libxl_ctx *ctx = libxl__gc_owner(gc); - pid_t child, got; - int status, rc; - pid_t intermediate; - int pipes[2]; - unsigned char dummy = 0; - - if (for_spawn) { - for_spawn->what = strdup(what); - if (!for_spawn->what) return ERROR_NOMEM; - - if (libxl_pipe(ctx, pipes) < 0) - goto err_parent; - if (libxl__set_fd_flag(gc, pipes[0], O_NONBLOCK) < 0 || - libxl__set_fd_flag(gc, pipes[1], O_NONBLOCK) < 0) - goto err_parent_pipes; - } - - intermediate = libxl_fork(ctx); - if (intermediate ==-1) - goto err_parent_pipes; - - if (intermediate) { + if (middle) { /* parent */ - if (for_spawn) { - for_spawn->intermediate = intermediate; - for_spawn->fd = pipes[0]; - close(pipes[1]); - } return 1; } - /* we are now the intermediate process */ - if (for_spawn) close(pipes[0]); + /* we are now the middle process */ child = fork(); if (child == -1) exit(255); if (!child) { - if (for_spawn) close(pipes[1]); return 0; /* caller runs child code */ } - intermediate_hook(hook_data, child); - - if (!for_spawn) _exit(0); /* just detach then */ - - got = waitpid(child, &status, 0); - assert(got == child); - - rc = (WIFEXITED(status) ? WEXITSTATUS(status) : - WIFSIGNALED(status) && WTERMSIG(status) < 127 - ? WTERMSIG(status)+128 : -1); - if (for_spawn) { - if (write(pipes[1], &dummy, sizeof(dummy)) != 1) - perror("libxl__spawn_spawn: unable to signal child exit to parent"); - } - _exit(rc); - - err_parent_pipes: - if (for_spawn) { - close(pipes[0]); - close(pipes[1]); + int failsig = ss->midproc_cb(gc, ss, child); + if (failsig) { + kill(child, failsig); + _exit(127); } - err_parent: - if (for_spawn) free(for_spawn->what); + for (;;) { + pid_t got = waitpid(child, &status, 0); + if (got == -1) { + assert(errno == EINTR); + continue; + } + assert(got == child); + break; + } - return ERROR_FAIL; + r = (WIFEXITED(status) && WEXITSTATUS(status) <= 127 ? WEXITSTATUS(status) : + WIFSIGNALED(status) && WTERMSIG(status) < 127 ? WTERMSIG(status)+128 : + -1); + _exit(r); + + out_err: + spawn_cleanup(gc, ss); + return rc; } -static void report_spawn_intermediate_status(libxl__gc *gc, - libxl__spawn_starting *for_spawn, - int status) +static void spawn_cleanup(libxl__gc *gc, libxl__spawn_state *ss) { - if (!WIFEXITED(status)) { - libxl_ctx *ctx = libxl__gc_owner(gc); - char *intermediate_what; - /* intermediate process did the logging itself if it exited */ - if ( asprintf(&intermediate_what, - "%s intermediate process (startup monitor)", - for_spawn->what) < 0 ) - intermediate_what = "intermediate process (startup monitor)"; - libxl_report_child_exitstatus(ctx, LIBXL__LOG_ERROR, intermediate_what, - for_spawn->intermediate, status); + int r; + + libxl__ev_time_deregister(gc, &ss->timeout); + libxl__ev_xswatch_deregister(gc, &ss->xswatch); + + libxl__spawn_state_detachable *ssd = ss->ssd; + if (ssd) { + if (libxl__ev_child_inuse(&ssd->mid)) { + pid_t child = ssd->mid.pid; + r = kill(child, SIGKILL); + if (r && errno != ESRCH) + LOGE(WARN, "%s: failed to kill intermediate child (pid=%lu)", + ss->what, (unsigned long)child); + } + + /* disconnect the ss and ssd from each other */ + ssd->ss = 0; + ss->ssd = 0; } } -int libxl__spawn_detach(libxl__gc *gc, - libxl__spawn_starting *for_spawn) +static void spawn_failed(libxl__egc *egc, libxl__spawn_state *ss) { - libxl_ctx *ctx = libxl__gc_owner(gc); - int r, status; - pid_t got; - int rc = 0; - - if (!for_spawn) return 0; - - if (for_spawn->intermediate) { - r = kill(for_spawn->intermediate, SIGKILL); - if (r) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, - "could not kill %s intermediate process [%ld]", - for_spawn->what, - (unsigned long)for_spawn->intermediate); - abort(); /* things are very wrong */ - } - got = waitpid(for_spawn->intermediate, &status, 0); - assert(got == for_spawn->intermediate); - if (!(WIFSIGNALED(status) && WTERMSIG(status) == SIGKILL)) { - report_spawn_intermediate_status(gc, for_spawn, status); - rc = ERROR_FAIL; - } - for_spawn->intermediate = 0; - } - - free(for_spawn->what); - for_spawn->what = 0; - - return rc; + EGC_GC; + spawn_cleanup(gc, ss); + ss->failure_cb(egc, ss); /* must be last; callback may do anything to ss */ } -int libxl__spawn_check(libxl__gc *gc, libxl__spawn_starting *for_spawn) +static void spawn_timeout(libxl__egc *egc, libxl__ev_time *ev, + const struct timeval *requested_abs) { - pid_t got; - int status; + /* Before event, was Active; is now Partial. */ + EGC_GC; + libxl__spawn_state *ss = CONTAINER_OF(ev, *ss, timeout); + LOG(ERROR, "%s: startup timed out", ss->what); + spawn_failed(egc, ss); /* must be last */ +} - if (!for_spawn) return 0; +static void spawn_watch_event(libxl__egc *egc, libxl__ev_xswatch *xsw, + const char *watch_path, const char *event_path) +{ + /* On entry, is Active. */ + EGC_GC; + libxl__spawn_state *ss = CONTAINER_OF(xsw, *ss, xswatch); + char *p = libxl__xs_read(gc, 0, ss->xspath); + if (!p && errno != ENOENT) { + LOG(ERROR, "%s: xenstore read of %s failed", ss->what, ss->xspath); + spawn_failed(egc, ss); /* must be last */ + return; + } + ss->confirm_cb(egc, ss, p); /* must be last */ +} - assert(for_spawn->intermediate); - got = waitpid(for_spawn->intermediate, &status, WNOHANG); - if (!got) return 0; +static void spawn_middle_death(libxl__egc *egc, libxl__ev_child *childw, + pid_t pid, int status) + /* Before event, was Active or Detached; + * is now Active or Detached except that ssd->mid is Idle */ +{ + EGC_GC; + libxl__spawn_state_detachable *ssd = CONTAINER_OF(childw, *ssd, mid); + libxl__spawn_state *ss = ssd->ss; - assert(got == for_spawn->intermediate); - report_spawn_intermediate_status(gc, for_spawn, status); + if (!WIFEXITED(status)) { + const char *what = + GCSPRINTF("%s intermediate process (startup monitor)", + ss ? ss->what : "(detached)"); + int loglevel = ss ? XTL_ERROR : XTL_WARN; + libxl_report_child_exitstatus(CTX, loglevel, what, pid, status); + } else if (ss) { /* otherwise it was supposed to be a daemon by now */ + if (!status) + LOG(ERROR, "%s [%ld]: unexpectedly exited with exit status 0," + " when we were waiting for it to confirm startup", + ss->what, (unsigned long)pid); + else if (status <= 127) + LOG(ERROR, "%s [%ld]: failed startup with non-zero exit status %d", + ss->what, (unsigned long)pid, status); + else if (status < 255) { + int sig = status - 128; + const char *str = strsignal(sig); + if (str) + LOG(ERROR, "%s [%ld]: died during startup due to fatal" + " signal %s", ss->what, (unsigned long)pid, str); + else + LOG(ERROR, "%s [%ld]: died during startup due to unknown fatal" + " signal number %d", ss->what, (unsigned long)pid, sig); + } + ss->ssd = 0; /* detatch the ssd to make the ss be in state Partial */ + spawn_failed(egc, ss); /* must be last use of ss */ + } + free(ssd); +} - for_spawn->intermediate = 0; - return ERROR_FAIL; +void libxl__spawn_detach(libxl__gc *gc, libxl__spawn_state *ss) +{ + spawn_cleanup(gc, ss); } /* diff -r 9524eb476e93 -r 885fdd4fd7ac tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri May 11 18:59:02 2012 +0100 +++ b/tools/libxl/libxl_internal.h Fri May 11 18:59:03 2012 +0100 @@ -847,75 +847,198 @@ _hidden int libxl__create_pci_backend(li libxl_device_pci *pcidev, int num); _hidden int libxl__device_pci_destroy_all(libxl__gc *gc, uint32_t domid); -/* xl_exec */ +/* + *----- spawn ----- + * + * Higher-level double-fork and separate detach eg as for device models + * + * Each libxl__spawn_state is in one of the conventional states + * Undefined, Idle, Active + */ - /* higher-level double-fork and separate detach eg as for device models */ +typedef struct libxl__obsolete_spawn_starting libxl__spawn_starting; +/* this type is never defined, so no objects of this type exist + * fixme-ao This should go away completely. */ -typedef struct { - /* put this in your own status structure as returned to application */ - /* all fields are private to libxl_spawn_... */ - pid_t intermediate; - int fd; - char *what; /* malloc'd in spawn_spawn */ -} libxl__spawn_starting; +typedef struct libxl__spawn_state libxl__spawn_state; -typedef struct { - char *dom_path; /* from libxl_malloc, only for libxl_spawner_record_pid */ - const char *pid_path; /* only for libxl_spawner_record_pid */ - int domid; - libxl__spawn_starting *for_spawn; -} libxl__spawner_starting; +/* Clears out a spawn state; idempotent. */ +_hidden void libxl__spawn_init(libxl__spawn_state*); /* - * libxl__spawn_spawn - Create a new process - * gc: allocation pool - * for_spawn: malloc'd pointer to libxl__spawn_starting (optional) - * what: string describing the spawned process - * intermediate_hook: helper to record pid, such as libxl_spawner_record_pid - * hook_data: data to pass to the hook function + * libxl__spawn_spawn - Create a new process which will become daemonic + * Forks twice, to allow the child to detach entirely from the parent. + * + * We call the two generated processes the "middle child" (result of + * the first fork) and the "inner child" (result of the second fork + * which takes place in the middle child). + * + * The inner child must soon exit or exec. It must also soon exit or + * notify the parent of its successful startup by writing to the + * xenstore path xspath. + * + * The user (in the parent) will be called back (confirm_cb) every + * time that xenstore path is modified. + * + * In both children, the ctx is not fully usable: gc and logging + * operations are OK, but operations on Xen and xenstore are not. + * (The restrictions are the same as those which apply to children + * made with libxl__ev_child_fork.) + * + * midproc_cb will be called in the middle child, with the pid of the + * inner child; this could for example record the pid. midproc_cb + * should be fast, and should return. It will be called (reentrantly) + * within libxl__spawn_init. + * + * failure_cb will be called in the parent on failure of the + * intermediate or final child; an error message will have been + * logged. + * + * confirm_cb and failure_cb will not be called reentrantly from + * within libxl__spawn_spawn. + * + * what: string describing the spawned process, used for logging * * Logs errors. A copy of "what" is taken. * Return values: - * < 0 error, for_spawn need not be detached - * +1 caller is the parent, must call detach on *for_spawn eventually + * < 0 error, *spawn is now Idle and need not be detached + * +1 caller is the parent, *spawn is Active and must eventually be detached * 0 caller is now the inner child, should probably call libxl__exec - * Caller, may pass 0 for for_spawn, in which case no need to detach. + * + * The spawn state must be Undefined or Idle on entry. */ -_hidden int libxl__spawn_spawn(libxl__gc *gc, - libxl__spawn_starting *for_spawn, - const char *what, - void (*intermediate_hook)(void *for_spawn, pid_t innerchild), - void *hook_data); +_hidden int libxl__spawn_spawn(libxl__egc *egc, libxl__spawn_state *spawn); + +/* + * libxl__spawn_detach - Detaches the daemonic child. + * + * Works by killing the intermediate process from spawn_spawn. + * After this function returns, failures of either child are no + * longer reported via failure_cb. + * + * If called before the inner child has been created, this may prevent + * it from running at all. Thus this should be called only when the + * inner child has notified that it is ready. Normally it will be + * called from within confirm_cb. + * + * Logs errors. + * + * The spawn state must be Active or Idle on entry and will be Idle + * on return. + */ +_hidden void libxl__spawn_detach(libxl__gc *gc, libxl__spawn_state*); + +/* + * If successful, this should return 0. + * + * Otherwise it should return a signal number, which will be + * sent to the inner child; the overall spawn will then fail. + */ +typedef int /* signal number */ +libxl__spawn_midproc_cb(libxl__gc*, libxl__spawn_state*, pid_t inner); + +/* + * Called if the spawn failed. The reason will have been logged. + * The spawn state will be Idle on entry to the callback (and + * it may be reused immediately if desired). + */ +typedef void libxl__spawn_failure_cb(libxl__egc*, libxl__spawn_state*); + +/* + * Called when the xspath watch triggers. xspath will have been read + * and the result placed in xsdata; if that failed because the key + * didn't exist, xspath==0. (If it failed for some other reason, + * the spawn machinery calls failure_cb instead.) + * + * If the child has indicated its successful startup, or a failure + * has occurred, this should call libxl__spawn_detach. + * + * If the child is still starting up, should simply return, doing + * nothing. + * + * The spawn state will be Active on entry to the callback; there + * are no restrictions on the state on return; it may even have + * been detached and reused. + */ +typedef void libxl__spawn_confirm_cb(libxl__egc*, libxl__spawn_state*, + const char *xsdata); + +typedef struct { + /* Private to the spawn implementation. + */ + /* This separate struct, from malloc, allows us to "detach" + * the child and reap it later, when our user has gone + * away and freed its libxl__spawn_state */ + struct libxl__spawn_state *ss; + libxl__ev_child mid; +} libxl__spawn_state_detachable; + +struct libxl__spawn_state { + /* must be filled in by user and remain valid */ + libxl__ao *ao; + const char *what; + const char *xspath; + const char *pidpath; /* only used by libxl__spawn_midproc_record_pid */ + int timeout_ms; /* -1 means forever */ + libxl__spawn_midproc_cb *midproc_cb; + libxl__spawn_failure_cb *failure_cb; + libxl__spawn_confirm_cb *confirm_cb; + + /* remaining fields are private to libxl_spawn_... */ + libxl__ev_time timeout; + libxl__ev_xswatch xswatch; + libxl__spawn_state_detachable *ssd; +}; + +static inline int libxl__spawn_inuse(libxl__spawn_state *ss) + { return !!ss->ssd; } /* * libxl_spawner_record_pid - Record given pid in xenstore - * for_spawn: malloc'd pointer to libxl__spawn_starting (optional) - * innerchild: pid of the child * - * This function is passed as intermediate_hook to libxl__spawn_spawn. + * This function can be passed directly as an intermediate_hook to + * libxl__spawn_spawn. On failure, returns the value SIGTERM. */ -_hidden void libxl_spawner_record_pid(void *for_spawn, pid_t innerchild); +_hidden int libxl__spawn_record_pid(libxl__gc*, libxl__spawn_state*, + pid_t innerchild); -/* - * libxl__spawn_confirm_offspring_startup - Wait for child state - * gc: allocation pool - * timeout: how many seconds to wait for the child - * what: string describing the spawned process - * path: path to the state file in xenstore - * state: expected string to wait for in path (optional) - * starting: malloc'd pointer to libxl__spawner_starting - * - * Returns 0 on success, and < 0 on error. - * - * This function waits the given timeout for the given path to appear - * in xenstore, and optionally for state in path. - * The intermediate process created in libxl__spawn_spawn is killed. - * The memory referenced by starting->for_spawn and starting is free'd. - */ -_hidden int libxl__spawn_confirm_offspring_startup(libxl__gc *gc, - uint32_t timeout, char *what, - char *path, char *state, - libxl__spawner_starting *starting); +/*----- device model creation -----*/ + +/* First layer; wraps libxl__spawn_spawn. */ + +typedef struct libxl__dm_spawn_state libxl__dm_spawn_state; + +typedef void libxl__dm_spawn_cb(libxl__egc *egc, libxl__dm_spawn_state*, + int rc /* if !0, error was logged */); + +struct libxl__dm_spawn_state { + /* mixed - spawn.ao must be initialised by user; rest is private: */ + libxl__spawn_state spawn; + /* filled in by user, must remain valid: */ + uint32_t guest_domid; /* domain being served */ + libxl_domain_config *guest_config; + libxl__domain_build_state *build_state; /* relates to guest_domid */ + libxl__dm_spawn_cb *callback; +}; + +_hidden void libxl__spawn_local_dm(libxl__egc *egc, libxl__dm_spawn_state*); + +/* Stubdom device models. */ + +typedef struct { + /* Mixed - user must fill in public parts EXCEPT callback, + * which may be undefined on entry. (See above for details) */ + libxl__dm_spawn_state dm; /* the stub domain device model */ + /* filled in by user, must remain valid: */ + libxl__dm_spawn_cb *callback; /* called as callback(,&sdss->dm,) */ + /* private to libxl__spawn_stub_dm: */ + libxl_domain_config dm_config; + libxl__domain_build_state dm_state; + libxl__dm_spawn_state pvqemu; +} libxl__stub_dm_spawn_state; + +_hidden void libxl__spawn_stub_dm(libxl__egc *egc, libxl__stub_dm_spawn_state*); + /* * libxl__wait_for_offspring - Wait for child state @@ -948,31 +1071,6 @@ _hidden int libxl__wait_for_offspring(li void *userdata), void *check_callback_userdata); -/* - * libxl__spawn_detach - Kill intermediate process from spawn_spawn - * gc: allocation pool - * for_spawn: malloc'd pointer to libxl__spawn_starting (optional) - * - * Returns 0 on success, and < 0 on error. - * - * Logs errors. Idempotent, but only permitted after successful - * call to libxl__spawn_spawn, and no point calling it again if it fails. - */ -_hidden int libxl__spawn_detach(libxl__gc *gc, - libxl__spawn_starting *for_spawn); - -/* - * libxl__spawn_check - Check intermediate child process - * gc: allocation pool - * for_spawn: malloc'd pointer to libxl__spawn_starting (optional) - * - * Returns 0 on success, and < 0 on error. - * - * Logs errors but also returns them. - * Caller must still call detach. - */ -_hidden int libxl__spawn_check(libxl__gc *gc, - libxl__spawn_starting *for_spawn); /* low-level stuff, for synchronous subprocesses etc. */ @@ -991,15 +1089,6 @@ _hidden int libxl__domain_build(libxl__g /* for device model creation */ _hidden const char *libxl__domain_device_model(libxl__gc *gc, const libxl_domain_build_info *info); -_hidden int libxl__create_device_model(libxl__gc *gc, - int domid, - libxl_domain_config *guest_config, - libxl__domain_build_state *state, - libxl__spawner_starting **starting_r); -_hidden int libxl__create_xenpv_qemu(libxl__gc *gc, uint32_t domid, - libxl_domain_config *guest_config, - libxl__domain_build_state *state, - libxl__spawner_starting **starting_r); _hidden int libxl__need_xenpv_qemu(libxl__gc *gc, int nr_consoles, libxl__device_console *consoles, int nr_vfbs, libxl_device_vfb *vfbs, @@ -1007,10 +1096,6 @@ _hidden int libxl__need_xenpv_qemu(libxl /* Caller must either: pass starting_r==0, or on successful * return pass *starting_r (which will be non-0) to * libxl__confirm_device_model_startup or libxl__detach_device_model. */ -_hidden int libxl__confirm_device_model_startup(libxl__gc *gc, - libxl__domain_build_state *state, - libxl__spawner_starting *starting); -_hidden int libxl__detach_device_model(libxl__gc *gc, libxl__spawner_starting *starting); _hidden int libxl__wait_for_device_model(libxl__gc *gc, uint32_t domid, char *state, libxl__spawn_starting *spawning, @@ -1581,6 +1666,31 @@ _hidden void libxl__bootloader_init(libx _hidden void libxl__bootloader_run(libxl__egc*, libxl__bootloader_state *st); +/*----- Domain creation -----*/ + +typedef struct libxl__domain_create_state libxl__domain_create_state; + +typedef void libxl__domain_create_cb(libxl__egc *egc, + libxl__domain_create_state*, + int rc, uint32_t domid); + +struct libxl__domain_create_state { + /* filled in by user */ + libxl__ao *ao; + libxl_domain_config *guest_config; + int restore_fd; + libxl_console_ready console_cb; + void *console_cb_priv; + libxl__domain_create_cb *callback; + /* private to domain_create */ + int guest_domid; + libxl__domain_build_state build_state; + libxl__stub_dm_spawn_state dmss; + /* If we're not doing stubdom, we use only dmss.dm, + * for the non-stubdom device model. */ +}; + + /* * Convenience macros. */ diff -r 9524eb476e93 -r 885fdd4fd7ac tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Fri May 11 18:59:02 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Fri May 11 18:59:03 2012 +0100 @@ -1695,8 +1695,8 @@ start: if ( restore_file ) { ret = libxl_domain_create_restore(ctx, &d_config, - cb, &child_console_pid, - &domid, restore_fd); + cb, &child_console_pid, + &domid, restore_fd, 0); /* * On subsequent reboot etc we should create the domain, not * restore/migrate-receive it again. @@ -1704,7 +1704,7 @@ start: restore_file = NULL; }else{ ret = libxl_domain_create_new(ctx, &d_config, - cb, &child_console_pid, &domid); + cb, &child_console_pid, &domid, 0); } if ( ret ) goto error_out; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:33:17 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:33:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCz-00059a-9z; Mon, 14 May 2012 16:33:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCV-0004kD-D4 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:47 +0000 Received: from [85.158.138.51:34940] by server-8.bemta-3.messagelabs.com id 40/C8-24428-EA331BF4; Mon, 14 May 2012 16:32:46 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-174.messagelabs.com!1337013164!19109642!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20439 invoked from network); 14 May 2012 16:32:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCR-0002vu-Qi for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:43 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCR-0006r6-Pz for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:43 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:43 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: provide progress reporting for long-running operations X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1336759145 -3600 # Node ID 687512370976584f44ce21a95e6b7e74fdf3b855 # Parent 2a8686b77897517b0aaf24b28ebf7a7f782c1317 libxl: provide progress reporting for long-running operations This will be used for reporting, during domain creation, that the console is ready. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Changes since v7: * If aop->how.callback, actually add the aop to the for_callback list (!) * Document the threadsafety of aop's, and make appropriate cross-references. * Allocate the actual aop from its thread's egc; do not free it. * Remove pointless code motion of libxl__ao_create. * Minor formatting fixes. Committed-by: Ian Jackson --- diff -r 2a8686b77897 -r 687512370976 tools/libxl/libxl.h --- a/tools/libxl/libxl.h Fri May 11 18:59:04 2012 +0100 +++ b/tools/libxl/libxl.h Fri May 11 18:59:05 2012 +0100 @@ -435,6 +435,51 @@ typedef struct { } u; } libxl_asyncop_how; +/* + * Some more complex asynchronous operations can report intermediate + * progress. How this is to be reported is controlled, for each + * function, by a parameter + * libxl_asyncprogress_how *aop_FOO_how; + * for each kind of progress FOO supported by that function. Each + * such kind of progress is associated with an event type. + * + * The function description will document whether, when, and how + * many times, the intermediate progress will be reported, and + * what the corresponding event type(s) are. + * + * If aop_FOO_how==NULL, intermediate progress reports are discarded. + * + * If aop_FOO_how->callback==NULL, intermediate progress reports + * generate libxl events which can be obtained from libxl_event_wait + * or libxl_event_check. + * + * If aop_FOO_how->callback!=NULL, libxl will report intermediate + * progress by calling callback(ctx, &event, for_callback). + * + * The rules for these events are otherwise the same as those for + * ordinary events. The reentrancy and threading rules for the + * callback are the same as those for ao completion callbacks. + * + * Note that the callback, if provided, is responsible for freeing + * the event. + * + * If callbacks are requested, they will be made, and returned, before + * the long-running libxl operation is considered finished (so if the + * long-running libxl operation was invoked with ao_how==NULL then any + * callbacks will occur strictly before the long-running operation + * returns). However, the callbacks may occur on any thread. + * + * In general, otherwise, no promises are made about the relative + * order of callbacks in a multithreaded program. In particular + * different callbacks relating to the same long-running operation may + * be delivered out of order. + */ + +typedef struct { + void (*callback)(libxl_ctx *ctx, libxl_event*, void *for_callback); + libxl_ev_user for_event; /* always used */ + void *for_callback; /* passed to callback */ +} libxl_asyncprogress_how; #define LIBXL_VERSION 0 diff -r 2a8686b77897 -r 687512370976 tools/libxl/libxl_event.c --- a/tools/libxl/libxl_event.c Fri May 11 18:59:04 2012 +0100 +++ b/tools/libxl/libxl_event.c Fri May 11 18:59:05 2012 +0100 @@ -902,18 +902,29 @@ void libxl__event_disaster(libxl__egc *e static void egc_run_callbacks(libxl__egc *egc) { /* - * The callbacks must happen with the ctx unlocked. - * See the comment near #define EGC_GC in libxl_internal.h and - * those in the definitions of libxl__egc and libxl__ao. + * The callbacks must happen with the ctx unlocked. See the + * comment near #define EGC_GC in libxl_internal.h and those in + * the definitions of libxl__egc, libxl__ao and libxl__aop. */ EGC_GC; libxl_event *ev, *ev_tmp; + libxl__aop_occurred *aop, *aop_tmp; LIBXL_TAILQ_FOREACH_SAFE(ev, &egc->occurred_for_callback, link, ev_tmp) { LIBXL_TAILQ_REMOVE(&egc->occurred_for_callback, ev, link); CTX->event_hooks->event_occurs(CTX->event_hooks_user, ev); } + LIBXL_TAILQ_FOREACH_SAFE(aop, &egc->aops_for_callback, entry, aop_tmp) { + LIBXL_TAILQ_REMOVE(&egc->aops_for_callback, aop, entry); + aop->how->callback(CTX, aop->ev, aop->how->for_callback); + + CTX_LOCK; + aop->ao->progress_reports_outstanding--; + libxl__ao_complete_check_progress_reports(egc, aop->ao); + CTX_UNLOCK; + } + libxl__ao *ao, *ao_tmp; LIBXL_TAILQ_FOREACH_SAFE(ao, &egc->aos_for_callback, entry_for_callback, ao_tmp) { @@ -1296,6 +1307,7 @@ void libxl__ao_abort(libxl__ao *ao) assert(ao->magic == LIBXL__AO_MAGIC); assert(ao->in_initiator); assert(!ao->complete); + assert(!ao->progress_reports_outstanding); libxl__ao__destroy(CTX, ao); } @@ -1306,6 +1318,24 @@ void libxl__ao_complete(libxl__egc *egc, ao->complete = 1; ao->rc = rc; + libxl__ao_complete_check_progress_reports(egc, ao); +} + +void libxl__ao_complete_check_progress_reports(libxl__egc *egc, libxl__ao *ao) +{ + /* + * We don't consider an ao complete if it has any outstanding + * callbacks. These callbacks might be outstanding on other + * threads, queued up in the other threads' egc's. Those threads + * will, after making the callback, take out the lock again, + * decrement progress_reports_outstanding, and call us again. + */ + + assert(ao->progress_reports_outstanding >= 0); + + if (!ao->complete || ao->progress_reports_outstanding) + return; + if (ao->poller) { assert(ao->in_initiator); if (!ao->constructing) @@ -1355,6 +1385,7 @@ libxl__ao *libxl__ao_create(libxl_ctx *c return NULL; } + int libxl__ao_inprogress(libxl__ao *ao) { AO_GC; @@ -1412,6 +1443,41 @@ int libxl__ao_inprogress(libxl__ao *ao) } +/* progress reporting */ + +/* The application indicates a desire to ignore events by passing NULL + * for how. But we want to copy *how. So we have this dummy function + * whose address is stored in callback if the app passed how==NULL. */ +static void dummy_asyncprogress_callback_ignore + (libxl_ctx *ctx, libxl_event *ev, void *for_callback) { } + +void libxl__ao_progress_gethow(libxl_asyncprogress_how *in_state, + const libxl_asyncprogress_how *from_app) { + if (from_app) + *in_state = *from_app; + else + in_state->callback = dummy_asyncprogress_callback_ignore; +} + +void libxl__ao_progress_report(libxl__egc *egc, libxl__ao *ao, + const libxl_asyncprogress_how *how, libxl_event *ev) +{ + ev->for_user = how->for_event; + if (how->callback == dummy_asyncprogress_callback_ignore) { + /* ignore */ + } else if (how->callback) { + libxl__aop_occurred *aop = libxl__zalloc(&egc->gc, sizeof(*aop)); + ao->progress_reports_outstanding++; + aop->ao = ao; + aop->ev = ev; + aop->how = how; + LIBXL_TAILQ_INSERT_TAIL(&egc->aops_for_callback, aop, entry); + } else { + libxl__event_occurred(egc, ev); + } +} + + /* * Local variables: * mode: C diff -r 2a8686b77897 -r 687512370976 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri May 11 18:59:04 2012 +0100 +++ b/tools/libxl/libxl_internal.h Fri May 11 18:59:05 2012 +0100 @@ -119,6 +119,7 @@ _hidden void libxl__log(libxl_ctx *ctx, typedef struct libxl__gc libxl__gc; typedef struct libxl__egc libxl__egc; typedef struct libxl__ao libxl__ao; +typedef struct libxl__aop_occurred libxl__aop_occurred; _hidden void libxl__alloc_failed(libxl_ctx *, const char *func, size_t nmemb, size_t size) __attribute__((noreturn)); @@ -364,6 +365,21 @@ struct libxl__egc { struct libxl__gc gc; struct libxl__event_list occurred_for_callback; LIBXL_TAILQ_HEAD(, libxl__ao) aos_for_callback; + LIBXL_TAILQ_HEAD(, libxl__aop_occurred) aops_for_callback; +}; + +struct libxl__aop_occurred { + /* + * An aop belongs to, and may be accessed only on, the thread + * which created it. It normally lives in that thread's egc. + * + * While an aop exists, it corresponds to one refcount in + * ao->progress_reports_outstanding, preventing ao destruction. + */ + LIBXL_TAILQ_ENTRY(libxl__aop_occurred) entry; + libxl__ao *ao; + libxl_event *ev; + const libxl_asyncprogress_how *how; }; #define LIBXL__AO_MAGIC 0xA0FACE00ul @@ -386,6 +402,7 @@ struct libxl__ao { */ uint32_t magic; unsigned constructing:1, in_initiator:1, complete:1, notified:1; + int progress_reports_outstanding; int rc; libxl__gc gc; libxl_asyncop_how how; @@ -1402,6 +1419,7 @@ libxl__device_model_version_running(libx LIBXL_INIT_GC((egc).gc,ctx); \ LIBXL_TAILQ_INIT(&(egc).occurred_for_callback); \ LIBXL_TAILQ_INIT(&(egc).aos_for_callback); \ + LIBXL_TAILQ_INIT(&(egc).aops_for_callback); \ } while(0) _hidden void libxl__egc_cleanup(libxl__egc *egc); @@ -1448,6 +1466,9 @@ _hidden void libxl__egc_cleanup(libxl__e * pointer to the internal event generation request routines * libxl__evgen_FOO, so that at some point a CALLBACK will be * made when the operation is complete. + * - if the operation provides progress reports, the aop_how(s) + * must be copied into the per-operation structure using + * libxl__ao_progress_gethow. * * - If initiation is successful, the initiating function needs * to run libxl__ao_inprogress right before unlocking and @@ -1457,6 +1478,10 @@ _hidden void libxl__egc_cleanup(libxl__e * call libxl__ao_abort before unlocking and returning whatever * error code is appropriate (AO_ABORT macro). * + * - If the operation supports progress reports, it may generate + * suitable events with NEW_EVENT and report them with + * libxl__ao_progress_report (with the ctx locked). + * * - Later, some callback function, whose callback has been requested * directly or indirectly, should call libxl__ao_complete (with the * ctx locked, as it will generally already be in any event callback @@ -1512,8 +1537,18 @@ _hidden int libxl__ao_inprogress(libxl__ _hidden void libxl__ao_abort(libxl__ao *ao); _hidden void libxl__ao_complete(libxl__egc *egc, libxl__ao *ao, int rc); +/* Can be called at any time. Use is essential for any aop user. */ +_hidden void libxl__ao_progress_gethow(libxl_asyncprogress_how *in_state, + const libxl_asyncprogress_how *from_app); + +/* Must be called with the ctx locked. Will fill in ev->for_user, + * so caller need not do that. */ +_hidden void libxl__ao_progress_report(libxl__egc *egc, libxl__ao *ao, + const libxl_asyncprogress_how *how, libxl_event *ev /* consumed */); + /* For use by ao machinery ONLY */ _hidden void libxl__ao__destroy(libxl_ctx*, libxl__ao *ao); +_hidden void libxl__ao_complete_check_progress_reports(libxl__egc*, libxl__ao*); /* _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:33:17 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:33:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCz-00059a-9z; Mon, 14 May 2012 16:33:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCV-0004kD-D4 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:47 +0000 Received: from [85.158.138.51:34940] by server-8.bemta-3.messagelabs.com id 40/C8-24428-EA331BF4; Mon, 14 May 2012 16:32:46 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-174.messagelabs.com!1337013164!19109642!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20439 invoked from network); 14 May 2012 16:32:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCR-0002vu-Qi for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:43 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCR-0006r6-Pz for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:43 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:43 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: provide progress reporting for long-running operations X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1336759145 -3600 # Node ID 687512370976584f44ce21a95e6b7e74fdf3b855 # Parent 2a8686b77897517b0aaf24b28ebf7a7f782c1317 libxl: provide progress reporting for long-running operations This will be used for reporting, during domain creation, that the console is ready. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Changes since v7: * If aop->how.callback, actually add the aop to the for_callback list (!) * Document the threadsafety of aop's, and make appropriate cross-references. * Allocate the actual aop from its thread's egc; do not free it. * Remove pointless code motion of libxl__ao_create. * Minor formatting fixes. Committed-by: Ian Jackson --- diff -r 2a8686b77897 -r 687512370976 tools/libxl/libxl.h --- a/tools/libxl/libxl.h Fri May 11 18:59:04 2012 +0100 +++ b/tools/libxl/libxl.h Fri May 11 18:59:05 2012 +0100 @@ -435,6 +435,51 @@ typedef struct { } u; } libxl_asyncop_how; +/* + * Some more complex asynchronous operations can report intermediate + * progress. How this is to be reported is controlled, for each + * function, by a parameter + * libxl_asyncprogress_how *aop_FOO_how; + * for each kind of progress FOO supported by that function. Each + * such kind of progress is associated with an event type. + * + * The function description will document whether, when, and how + * many times, the intermediate progress will be reported, and + * what the corresponding event type(s) are. + * + * If aop_FOO_how==NULL, intermediate progress reports are discarded. + * + * If aop_FOO_how->callback==NULL, intermediate progress reports + * generate libxl events which can be obtained from libxl_event_wait + * or libxl_event_check. + * + * If aop_FOO_how->callback!=NULL, libxl will report intermediate + * progress by calling callback(ctx, &event, for_callback). + * + * The rules for these events are otherwise the same as those for + * ordinary events. The reentrancy and threading rules for the + * callback are the same as those for ao completion callbacks. + * + * Note that the callback, if provided, is responsible for freeing + * the event. + * + * If callbacks are requested, they will be made, and returned, before + * the long-running libxl operation is considered finished (so if the + * long-running libxl operation was invoked with ao_how==NULL then any + * callbacks will occur strictly before the long-running operation + * returns). However, the callbacks may occur on any thread. + * + * In general, otherwise, no promises are made about the relative + * order of callbacks in a multithreaded program. In particular + * different callbacks relating to the same long-running operation may + * be delivered out of order. + */ + +typedef struct { + void (*callback)(libxl_ctx *ctx, libxl_event*, void *for_callback); + libxl_ev_user for_event; /* always used */ + void *for_callback; /* passed to callback */ +} libxl_asyncprogress_how; #define LIBXL_VERSION 0 diff -r 2a8686b77897 -r 687512370976 tools/libxl/libxl_event.c --- a/tools/libxl/libxl_event.c Fri May 11 18:59:04 2012 +0100 +++ b/tools/libxl/libxl_event.c Fri May 11 18:59:05 2012 +0100 @@ -902,18 +902,29 @@ void libxl__event_disaster(libxl__egc *e static void egc_run_callbacks(libxl__egc *egc) { /* - * The callbacks must happen with the ctx unlocked. - * See the comment near #define EGC_GC in libxl_internal.h and - * those in the definitions of libxl__egc and libxl__ao. + * The callbacks must happen with the ctx unlocked. See the + * comment near #define EGC_GC in libxl_internal.h and those in + * the definitions of libxl__egc, libxl__ao and libxl__aop. */ EGC_GC; libxl_event *ev, *ev_tmp; + libxl__aop_occurred *aop, *aop_tmp; LIBXL_TAILQ_FOREACH_SAFE(ev, &egc->occurred_for_callback, link, ev_tmp) { LIBXL_TAILQ_REMOVE(&egc->occurred_for_callback, ev, link); CTX->event_hooks->event_occurs(CTX->event_hooks_user, ev); } + LIBXL_TAILQ_FOREACH_SAFE(aop, &egc->aops_for_callback, entry, aop_tmp) { + LIBXL_TAILQ_REMOVE(&egc->aops_for_callback, aop, entry); + aop->how->callback(CTX, aop->ev, aop->how->for_callback); + + CTX_LOCK; + aop->ao->progress_reports_outstanding--; + libxl__ao_complete_check_progress_reports(egc, aop->ao); + CTX_UNLOCK; + } + libxl__ao *ao, *ao_tmp; LIBXL_TAILQ_FOREACH_SAFE(ao, &egc->aos_for_callback, entry_for_callback, ao_tmp) { @@ -1296,6 +1307,7 @@ void libxl__ao_abort(libxl__ao *ao) assert(ao->magic == LIBXL__AO_MAGIC); assert(ao->in_initiator); assert(!ao->complete); + assert(!ao->progress_reports_outstanding); libxl__ao__destroy(CTX, ao); } @@ -1306,6 +1318,24 @@ void libxl__ao_complete(libxl__egc *egc, ao->complete = 1; ao->rc = rc; + libxl__ao_complete_check_progress_reports(egc, ao); +} + +void libxl__ao_complete_check_progress_reports(libxl__egc *egc, libxl__ao *ao) +{ + /* + * We don't consider an ao complete if it has any outstanding + * callbacks. These callbacks might be outstanding on other + * threads, queued up in the other threads' egc's. Those threads + * will, after making the callback, take out the lock again, + * decrement progress_reports_outstanding, and call us again. + */ + + assert(ao->progress_reports_outstanding >= 0); + + if (!ao->complete || ao->progress_reports_outstanding) + return; + if (ao->poller) { assert(ao->in_initiator); if (!ao->constructing) @@ -1355,6 +1385,7 @@ libxl__ao *libxl__ao_create(libxl_ctx *c return NULL; } + int libxl__ao_inprogress(libxl__ao *ao) { AO_GC; @@ -1412,6 +1443,41 @@ int libxl__ao_inprogress(libxl__ao *ao) } +/* progress reporting */ + +/* The application indicates a desire to ignore events by passing NULL + * for how. But we want to copy *how. So we have this dummy function + * whose address is stored in callback if the app passed how==NULL. */ +static void dummy_asyncprogress_callback_ignore + (libxl_ctx *ctx, libxl_event *ev, void *for_callback) { } + +void libxl__ao_progress_gethow(libxl_asyncprogress_how *in_state, + const libxl_asyncprogress_how *from_app) { + if (from_app) + *in_state = *from_app; + else + in_state->callback = dummy_asyncprogress_callback_ignore; +} + +void libxl__ao_progress_report(libxl__egc *egc, libxl__ao *ao, + const libxl_asyncprogress_how *how, libxl_event *ev) +{ + ev->for_user = how->for_event; + if (how->callback == dummy_asyncprogress_callback_ignore) { + /* ignore */ + } else if (how->callback) { + libxl__aop_occurred *aop = libxl__zalloc(&egc->gc, sizeof(*aop)); + ao->progress_reports_outstanding++; + aop->ao = ao; + aop->ev = ev; + aop->how = how; + LIBXL_TAILQ_INSERT_TAIL(&egc->aops_for_callback, aop, entry); + } else { + libxl__event_occurred(egc, ev); + } +} + + /* * Local variables: * mode: C diff -r 2a8686b77897 -r 687512370976 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri May 11 18:59:04 2012 +0100 +++ b/tools/libxl/libxl_internal.h Fri May 11 18:59:05 2012 +0100 @@ -119,6 +119,7 @@ _hidden void libxl__log(libxl_ctx *ctx, typedef struct libxl__gc libxl__gc; typedef struct libxl__egc libxl__egc; typedef struct libxl__ao libxl__ao; +typedef struct libxl__aop_occurred libxl__aop_occurred; _hidden void libxl__alloc_failed(libxl_ctx *, const char *func, size_t nmemb, size_t size) __attribute__((noreturn)); @@ -364,6 +365,21 @@ struct libxl__egc { struct libxl__gc gc; struct libxl__event_list occurred_for_callback; LIBXL_TAILQ_HEAD(, libxl__ao) aos_for_callback; + LIBXL_TAILQ_HEAD(, libxl__aop_occurred) aops_for_callback; +}; + +struct libxl__aop_occurred { + /* + * An aop belongs to, and may be accessed only on, the thread + * which created it. It normally lives in that thread's egc. + * + * While an aop exists, it corresponds to one refcount in + * ao->progress_reports_outstanding, preventing ao destruction. + */ + LIBXL_TAILQ_ENTRY(libxl__aop_occurred) entry; + libxl__ao *ao; + libxl_event *ev; + const libxl_asyncprogress_how *how; }; #define LIBXL__AO_MAGIC 0xA0FACE00ul @@ -386,6 +402,7 @@ struct libxl__ao { */ uint32_t magic; unsigned constructing:1, in_initiator:1, complete:1, notified:1; + int progress_reports_outstanding; int rc; libxl__gc gc; libxl_asyncop_how how; @@ -1402,6 +1419,7 @@ libxl__device_model_version_running(libx LIBXL_INIT_GC((egc).gc,ctx); \ LIBXL_TAILQ_INIT(&(egc).occurred_for_callback); \ LIBXL_TAILQ_INIT(&(egc).aos_for_callback); \ + LIBXL_TAILQ_INIT(&(egc).aops_for_callback); \ } while(0) _hidden void libxl__egc_cleanup(libxl__egc *egc); @@ -1448,6 +1466,9 @@ _hidden void libxl__egc_cleanup(libxl__e * pointer to the internal event generation request routines * libxl__evgen_FOO, so that at some point a CALLBACK will be * made when the operation is complete. + * - if the operation provides progress reports, the aop_how(s) + * must be copied into the per-operation structure using + * libxl__ao_progress_gethow. * * - If initiation is successful, the initiating function needs * to run libxl__ao_inprogress right before unlocking and @@ -1457,6 +1478,10 @@ _hidden void libxl__egc_cleanup(libxl__e * call libxl__ao_abort before unlocking and returning whatever * error code is appropriate (AO_ABORT macro). * + * - If the operation supports progress reports, it may generate + * suitable events with NEW_EVENT and report them with + * libxl__ao_progress_report (with the ctx locked). + * * - Later, some callback function, whose callback has been requested * directly or indirectly, should call libxl__ao_complete (with the * ctx locked, as it will generally already be in any event callback @@ -1512,8 +1537,18 @@ _hidden int libxl__ao_inprogress(libxl__ _hidden void libxl__ao_abort(libxl__ao *ao); _hidden void libxl__ao_complete(libxl__egc *egc, libxl__ao *ao, int rc); +/* Can be called at any time. Use is essential for any aop user. */ +_hidden void libxl__ao_progress_gethow(libxl_asyncprogress_how *in_state, + const libxl_asyncprogress_how *from_app); + +/* Must be called with the ctx locked. Will fill in ev->for_user, + * so caller need not do that. */ +_hidden void libxl__ao_progress_report(libxl__egc *egc, libxl__ao *ao, + const libxl_asyncprogress_how *how, libxl_event *ev /* consumed */); + /* For use by ao machinery ONLY */ _hidden void libxl__ao__destroy(libxl_ctx*, libxl__ao *ao); +_hidden void libxl__ao_complete_check_progress_reports(libxl__egc*, libxl__ao*); /* _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:33:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:33:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyD0-0005AX-IG; Mon, 14 May 2012 16:33:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCW-0004lg-Cq for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:48 +0000 Received: from [85.158.138.51:38431] by server-6.bemta-3.messagelabs.com id 0A/8F-05145-FA331BF4; Mon, 14 May 2012 16:32:47 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-174.messagelabs.com!1337013165!23011945!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=1.4 required=7.0 tests=INFO_TLD X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19667 invoked from network); 14 May 2012 16:32:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCS-0002w9-T7 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCS-0006ra-SP for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:44 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:44 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: convert console callback to libxl_asyncprogress_how X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1336759146 -3600 # Node ID 1417d35592c0e47eaa7f619121bdb722b834cdde # Parent 30c22846e770c48c32d3a74ae36f7877a257a9eb libxl: convert console callback to libxl_asyncprogress_how Remove the old console callback. (Its reentrancy properties were troublesome: in principle, the event loop might be reentered during the callback, and the libxl__domain_create_state swept out from under the feet of the domain creation.) As a side effect of the new code arrangements, the console callback for non-bootloader-using PV guests now occurs near the end of domain creation, in the same place as for HVM guests, rather than near the start. The new arrangements should in principle mean that by the time the console is described as ready by the callback, the xenstore key is indeed ready. So in the future the timeout might be removed from the console client. Signed-off-by: Ian Jackson Cc: Stefano Stabellini Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 30c22846e770 -r 1417d35592c0 tools/libxl/libxl.h --- a/tools/libxl/libxl.h Fri May 11 18:59:05 2012 +0100 +++ b/tools/libxl/libxl.h Fri May 11 18:59:06 2012 +0100 @@ -509,18 +509,19 @@ int libxl_ctx_alloc(libxl_ctx **pctx, in int libxl_ctx_free(libxl_ctx *ctx /* 0 is OK */); /* domain related functions */ -typedef int (*libxl_console_ready)(libxl_ctx *ctx, uint32_t domid, void *priv); - /* fixme-ao Need to review this API. If we keep it, the reentrancy - * properties need to be documented but they may turn out to be too - * awkward */ int libxl_domain_create_new(libxl_ctx *ctx, libxl_domain_config *d_config, - libxl_console_ready cb, void *priv, uint32_t *domid, - const libxl_asyncop_how *ao_how); + uint32_t *domid, + const libxl_asyncop_how *ao_how, + const libxl_asyncprogress_how *aop_console_how); int libxl_domain_create_restore(libxl_ctx *ctx, libxl_domain_config *d_config, - libxl_console_ready cb, void *priv, uint32_t *domid, int restore_fd, - const libxl_asyncop_how *ao_how); + const libxl_asyncop_how *ao_how, + const libxl_asyncprogress_how *aop_console_how); + /* A progress report will be made via ao_console_how, of type + * domain_create_console_available, when the domain's primary + * console is available and can be connected to. + */ void libxl_domain_config_init(libxl_domain_config *d_config); void libxl_domain_config_dispose(libxl_domain_config *d_config); diff -r 30c22846e770 -r 1417d35592c0 tools/libxl/libxl_bootloader.c --- a/tools/libxl/libxl_bootloader.c Fri May 11 18:59:05 2012 +0100 +++ b/tools/libxl/libxl_bootloader.c Fri May 11 18:59:06 2012 +0100 @@ -377,6 +377,9 @@ static void bootloader_gotptys(libxl__eg goto out; } + if (bl->console_available) + bl->console_available(egc, bl); + int bootloader_master = libxl__carefd_fd(bl->ptys[0].master); int xenconsole_master = libxl__carefd_fd(bl->ptys[1].master); diff -r 30c22846e770 -r 1417d35592c0 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Fri May 11 18:59:05 2012 +0100 +++ b/tools/libxl/libxl_create.c Fri May 11 18:59:06 2012 +0100 @@ -569,10 +569,15 @@ static int store_libxl_entry(libxl__gc * static void domcreate_devmodel_started(libxl__egc *egc, libxl__dm_spawn_state *dmss, int rc); +static void domcreate_bootloader_console_available(libxl__egc *egc, + libxl__bootloader_state *bl); static void domcreate_bootloader_done(libxl__egc *egc, libxl__bootloader_state *bl, int rc); +static void domcreate_console_available(libxl__egc *egc, + libxl__domain_create_state *dcs); + /* Our own function to clean up and call the user's callback. * The final call in the sequence. */ static void domcreate_complete(libxl__egc *egc, @@ -590,8 +595,6 @@ static void initiate_domain_create(libxl /* convenience aliases */ libxl_domain_config *const d_config = dcs->guest_config; const int restore_fd = dcs->restore_fd; - const libxl_console_ready cb = dcs->console_cb; - void *const priv = dcs->console_cb_priv; memset(&dcs->build_state, 0, sizeof(dcs->build_state)); domid = 0; @@ -610,11 +613,6 @@ static void initiate_domain_create(libxl dcs->guest_domid = domid; dcs->dmss.dm.guest_domid = 0; /* means we haven't spawned */ - if ( d_config->c_info.type == LIBXL_DOMAIN_TYPE_PV && cb ) { - ret = (*cb)(ctx, domid, priv); - if (ret) goto error_out; - } - ret = libxl__domain_build_info_setdefault(gc, &d_config->b_info); if (ret) goto error_out; @@ -629,6 +627,7 @@ static void initiate_domain_create(libxl if (restore_fd < 0 && bootdisk) { dcs->bl.callback = domcreate_bootloader_done; + dcs->bl.console_available = domcreate_bootloader_console_available; dcs->bl.info = &d_config->b_info, dcs->bl.disk = bootdisk; dcs->bl.domid = dcs->guest_domid; @@ -644,6 +643,21 @@ error_out: domcreate_complete(egc, dcs, ret); } +static void domcreate_bootloader_console_available(libxl__egc *egc, + libxl__bootloader_state *bl) +{ + libxl__domain_create_state *dcs = CONTAINER_OF(bl, *dcs, bl); + STATE_AO_GC(bl->ao); + domcreate_console_available(egc, dcs); +} + +static void domcreate_console_available(libxl__egc *egc, + libxl__domain_create_state *dcs) { + libxl__ao_progress_report(egc, dcs->ao, &dcs->aop_console_how, + NEW_EVENT(egc, DOMAIN_CREATE_CONSOLE_AVAILABLE, + dcs->guest_domid)); +} + static void domcreate_bootloader_done(libxl__egc *egc, libxl__bootloader_state *bl, int ret) @@ -779,8 +793,6 @@ static void domcreate_devmodel_started(l /* convenience aliases */ libxl_domain_config *const d_config = dcs->guest_config; - const libxl_console_ready cb = dcs->console_cb; - void *const priv = dcs->console_cb_priv; if (ret) { LIBXL__LOG(ctx, LIBXL__LOG_ERROR, @@ -818,12 +830,7 @@ static void domcreate_devmodel_started(l goto error_out; } } - if ( cb && (d_config->c_info.type == LIBXL_DOMAIN_TYPE_HVM || - (d_config->c_info.type == LIBXL_DOMAIN_TYPE_PV && - d_config->b_info.u.pv.bootloader ))) { - ret = (*cb)(ctx, domid, priv); - if (ret) goto error_out; - } + domcreate_console_available(egc, dcs); domcreate_complete(egc, dcs, 0); return; @@ -863,8 +870,9 @@ static void domain_create_cb(libxl__egc int rc, uint32_t domid); static int do_domain_create(libxl_ctx *ctx, libxl_domain_config *d_config, - libxl_console_ready cb, void *priv, uint32_t *domid, - int restore_fd, const libxl_asyncop_how *ao_how) + uint32_t *domid, + int restore_fd, const libxl_asyncop_how *ao_how, + const libxl_asyncprogress_how *aop_console_how) { AO_CREATE(ctx, 0, ao_how); libxl__app_domain_create_state *cdcs; @@ -873,9 +881,8 @@ static int do_domain_create(libxl_ctx *c cdcs->dcs.ao = ao; cdcs->dcs.guest_config = d_config; cdcs->dcs.restore_fd = restore_fd; - cdcs->dcs.console_cb = cb; - cdcs->dcs.console_cb_priv = priv; cdcs->dcs.callback = domain_create_cb; + libxl__ao_progress_gethow(&cdcs->dcs.aop_console_how, aop_console_how); cdcs->domid_out = domid; initiate_domain_create(egc, &cdcs->dcs); @@ -897,19 +904,21 @@ static void domain_create_cb(libxl__egc } int libxl_domain_create_new(libxl_ctx *ctx, libxl_domain_config *d_config, - libxl_console_ready cb, void *priv, uint32_t *domid, - const libxl_asyncop_how *ao_how) + const libxl_asyncop_how *ao_how, + const libxl_asyncprogress_how *aop_console_how) { - return do_domain_create(ctx, d_config, cb, priv, domid, -1, ao_how); + return do_domain_create(ctx, d_config, domid, -1, + ao_how, aop_console_how); } int libxl_domain_create_restore(libxl_ctx *ctx, libxl_domain_config *d_config, - libxl_console_ready cb, void *priv, uint32_t *domid, int restore_fd, - const libxl_asyncop_how *ao_how) + const libxl_asyncop_how *ao_how, + const libxl_asyncprogress_how *aop_console_how) { - return do_domain_create(ctx, d_config, cb, priv, domid, restore_fd, ao_how); + return do_domain_create(ctx, d_config, domid, restore_fd, + ao_how, aop_console_how); } /* diff -r 30c22846e770 -r 1417d35592c0 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri May 11 18:59:05 2012 +0100 +++ b/tools/libxl/libxl_internal.h Fri May 11 18:59:06 2012 +0100 @@ -1699,11 +1699,14 @@ int libxl__openptys(libxl__openpty_state typedef struct libxl__bootloader_state libxl__bootloader_state; typedef void libxl__run_bootloader_callback(libxl__egc*, libxl__bootloader_state*, int rc); +typedef void libxl__bootloader_console_callback(libxl__egc*, + libxl__bootloader_state*); struct libxl__bootloader_state { /* caller must fill these in, and they must all remain valid */ libxl__ao *ao; libxl__run_bootloader_callback *callback; + libxl__bootloader_console_callback *console_available; libxl_domain_build_info *info; /* u.pv.{kernel,ramdisk,cmdline} updated */ libxl_device_disk *disk; uint32_t domid; @@ -1739,9 +1742,8 @@ struct libxl__domain_create_state { libxl__ao *ao; libxl_domain_config *guest_config; int restore_fd; - libxl_console_ready console_cb; - void *console_cb_priv; libxl__domain_create_cb *callback; + libxl_asyncprogress_how aop_console_how; /* private to domain_create */ int guest_domid; libxl__domain_build_state build_state; diff -r 30c22846e770 -r 1417d35592c0 tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Fri May 11 18:59:05 2012 +0100 +++ b/tools/libxl/libxl_types.idl Fri May 11 18:59:06 2012 +0100 @@ -459,6 +459,7 @@ libxl_event_type = Enumeration("event_ty (2, "DOMAIN_DEATH"), (3, "DISK_EJECT"), (4, "OPERATION_COMPLETE"), + (5, "DOMAIN_CREATE_CONSOLE_AVAILABLE"), ]) libxl_ev_user = UInt(64) @@ -484,4 +485,5 @@ libxl_event = Struct("event",[ ("operation_complete", Struct(None, [ ("rc", integer), ])), + ("domain_create_console_available", Struct(None, [])), ]))]) diff -r 30c22846e770 -r 1417d35592c0 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Fri May 11 18:59:05 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Fri May 11 18:59:06 2012 +0100 @@ -1457,16 +1457,18 @@ static int freemem(libxl_domain_build_in return ERROR_NOMEM; } -static int autoconnect_console(libxl_ctx *ctx, uint32_t domid, void *priv) +static void autoconnect_console(libxl_ctx *ctx, libxl_event *ev, void *priv) { pid_t *pid = priv; + libxl_event_free(ctx, ev); + *pid = fork(); if (*pid < 0) { perror("unable to fork xenconsole"); - return ERROR_FAIL; + return; } else if (*pid > 0) - return 0; + return; postfork(); @@ -1533,7 +1535,7 @@ static int create_domain(struct domain_c int config_len = 0; int restore_fd = -1; int status = 0; - libxl_console_ready cb; + const libxl_asyncprogress_how *autoconnect_console_how; pid_t child_console_pid = -1; struct save_file_header hdr; @@ -1687,24 +1689,27 @@ start: goto error_out; } + libxl_asyncprogress_how autoconnect_console_how_buf; if ( dom_info->console_autoconnect ) { - cb = autoconnect_console; + autoconnect_console_how_buf.callback = autoconnect_console; + autoconnect_console_how_buf.for_callback = &child_console_pid; + autoconnect_console_how = &autoconnect_console_how_buf; }else{ - cb = NULL; + autoconnect_console_how = 0; } if ( restore_file ) { ret = libxl_domain_create_restore(ctx, &d_config, - cb, &child_console_pid, - &domid, restore_fd, 0); + &domid, restore_fd, + 0, autoconnect_console_how); /* * On subsequent reboot etc we should create the domain, not * restore/migrate-receive it again. */ restore_file = NULL; }else{ - ret = libxl_domain_create_new(ctx, &d_config, - cb, &child_console_pid, &domid, 0); + ret = libxl_domain_create_new(ctx, &d_config, &domid, + 0, autoconnect_console_how); } if ( ret ) goto error_out; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:33:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:33:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyD0-0005AX-IG; Mon, 14 May 2012 16:33:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCW-0004lg-Cq for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:48 +0000 Received: from [85.158.138.51:38431] by server-6.bemta-3.messagelabs.com id 0A/8F-05145-FA331BF4; Mon, 14 May 2012 16:32:47 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-174.messagelabs.com!1337013165!23011945!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=1.4 required=7.0 tests=INFO_TLD X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19667 invoked from network); 14 May 2012 16:32:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCS-0002w9-T7 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCS-0006ra-SP for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:44 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:44 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: convert console callback to libxl_asyncprogress_how X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1336759146 -3600 # Node ID 1417d35592c0e47eaa7f619121bdb722b834cdde # Parent 30c22846e770c48c32d3a74ae36f7877a257a9eb libxl: convert console callback to libxl_asyncprogress_how Remove the old console callback. (Its reentrancy properties were troublesome: in principle, the event loop might be reentered during the callback, and the libxl__domain_create_state swept out from under the feet of the domain creation.) As a side effect of the new code arrangements, the console callback for non-bootloader-using PV guests now occurs near the end of domain creation, in the same place as for HVM guests, rather than near the start. The new arrangements should in principle mean that by the time the console is described as ready by the callback, the xenstore key is indeed ready. So in the future the timeout might be removed from the console client. Signed-off-by: Ian Jackson Cc: Stefano Stabellini Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 30c22846e770 -r 1417d35592c0 tools/libxl/libxl.h --- a/tools/libxl/libxl.h Fri May 11 18:59:05 2012 +0100 +++ b/tools/libxl/libxl.h Fri May 11 18:59:06 2012 +0100 @@ -509,18 +509,19 @@ int libxl_ctx_alloc(libxl_ctx **pctx, in int libxl_ctx_free(libxl_ctx *ctx /* 0 is OK */); /* domain related functions */ -typedef int (*libxl_console_ready)(libxl_ctx *ctx, uint32_t domid, void *priv); - /* fixme-ao Need to review this API. If we keep it, the reentrancy - * properties need to be documented but they may turn out to be too - * awkward */ int libxl_domain_create_new(libxl_ctx *ctx, libxl_domain_config *d_config, - libxl_console_ready cb, void *priv, uint32_t *domid, - const libxl_asyncop_how *ao_how); + uint32_t *domid, + const libxl_asyncop_how *ao_how, + const libxl_asyncprogress_how *aop_console_how); int libxl_domain_create_restore(libxl_ctx *ctx, libxl_domain_config *d_config, - libxl_console_ready cb, void *priv, uint32_t *domid, int restore_fd, - const libxl_asyncop_how *ao_how); + const libxl_asyncop_how *ao_how, + const libxl_asyncprogress_how *aop_console_how); + /* A progress report will be made via ao_console_how, of type + * domain_create_console_available, when the domain's primary + * console is available and can be connected to. + */ void libxl_domain_config_init(libxl_domain_config *d_config); void libxl_domain_config_dispose(libxl_domain_config *d_config); diff -r 30c22846e770 -r 1417d35592c0 tools/libxl/libxl_bootloader.c --- a/tools/libxl/libxl_bootloader.c Fri May 11 18:59:05 2012 +0100 +++ b/tools/libxl/libxl_bootloader.c Fri May 11 18:59:06 2012 +0100 @@ -377,6 +377,9 @@ static void bootloader_gotptys(libxl__eg goto out; } + if (bl->console_available) + bl->console_available(egc, bl); + int bootloader_master = libxl__carefd_fd(bl->ptys[0].master); int xenconsole_master = libxl__carefd_fd(bl->ptys[1].master); diff -r 30c22846e770 -r 1417d35592c0 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Fri May 11 18:59:05 2012 +0100 +++ b/tools/libxl/libxl_create.c Fri May 11 18:59:06 2012 +0100 @@ -569,10 +569,15 @@ static int store_libxl_entry(libxl__gc * static void domcreate_devmodel_started(libxl__egc *egc, libxl__dm_spawn_state *dmss, int rc); +static void domcreate_bootloader_console_available(libxl__egc *egc, + libxl__bootloader_state *bl); static void domcreate_bootloader_done(libxl__egc *egc, libxl__bootloader_state *bl, int rc); +static void domcreate_console_available(libxl__egc *egc, + libxl__domain_create_state *dcs); + /* Our own function to clean up and call the user's callback. * The final call in the sequence. */ static void domcreate_complete(libxl__egc *egc, @@ -590,8 +595,6 @@ static void initiate_domain_create(libxl /* convenience aliases */ libxl_domain_config *const d_config = dcs->guest_config; const int restore_fd = dcs->restore_fd; - const libxl_console_ready cb = dcs->console_cb; - void *const priv = dcs->console_cb_priv; memset(&dcs->build_state, 0, sizeof(dcs->build_state)); domid = 0; @@ -610,11 +613,6 @@ static void initiate_domain_create(libxl dcs->guest_domid = domid; dcs->dmss.dm.guest_domid = 0; /* means we haven't spawned */ - if ( d_config->c_info.type == LIBXL_DOMAIN_TYPE_PV && cb ) { - ret = (*cb)(ctx, domid, priv); - if (ret) goto error_out; - } - ret = libxl__domain_build_info_setdefault(gc, &d_config->b_info); if (ret) goto error_out; @@ -629,6 +627,7 @@ static void initiate_domain_create(libxl if (restore_fd < 0 && bootdisk) { dcs->bl.callback = domcreate_bootloader_done; + dcs->bl.console_available = domcreate_bootloader_console_available; dcs->bl.info = &d_config->b_info, dcs->bl.disk = bootdisk; dcs->bl.domid = dcs->guest_domid; @@ -644,6 +643,21 @@ error_out: domcreate_complete(egc, dcs, ret); } +static void domcreate_bootloader_console_available(libxl__egc *egc, + libxl__bootloader_state *bl) +{ + libxl__domain_create_state *dcs = CONTAINER_OF(bl, *dcs, bl); + STATE_AO_GC(bl->ao); + domcreate_console_available(egc, dcs); +} + +static void domcreate_console_available(libxl__egc *egc, + libxl__domain_create_state *dcs) { + libxl__ao_progress_report(egc, dcs->ao, &dcs->aop_console_how, + NEW_EVENT(egc, DOMAIN_CREATE_CONSOLE_AVAILABLE, + dcs->guest_domid)); +} + static void domcreate_bootloader_done(libxl__egc *egc, libxl__bootloader_state *bl, int ret) @@ -779,8 +793,6 @@ static void domcreate_devmodel_started(l /* convenience aliases */ libxl_domain_config *const d_config = dcs->guest_config; - const libxl_console_ready cb = dcs->console_cb; - void *const priv = dcs->console_cb_priv; if (ret) { LIBXL__LOG(ctx, LIBXL__LOG_ERROR, @@ -818,12 +830,7 @@ static void domcreate_devmodel_started(l goto error_out; } } - if ( cb && (d_config->c_info.type == LIBXL_DOMAIN_TYPE_HVM || - (d_config->c_info.type == LIBXL_DOMAIN_TYPE_PV && - d_config->b_info.u.pv.bootloader ))) { - ret = (*cb)(ctx, domid, priv); - if (ret) goto error_out; - } + domcreate_console_available(egc, dcs); domcreate_complete(egc, dcs, 0); return; @@ -863,8 +870,9 @@ static void domain_create_cb(libxl__egc int rc, uint32_t domid); static int do_domain_create(libxl_ctx *ctx, libxl_domain_config *d_config, - libxl_console_ready cb, void *priv, uint32_t *domid, - int restore_fd, const libxl_asyncop_how *ao_how) + uint32_t *domid, + int restore_fd, const libxl_asyncop_how *ao_how, + const libxl_asyncprogress_how *aop_console_how) { AO_CREATE(ctx, 0, ao_how); libxl__app_domain_create_state *cdcs; @@ -873,9 +881,8 @@ static int do_domain_create(libxl_ctx *c cdcs->dcs.ao = ao; cdcs->dcs.guest_config = d_config; cdcs->dcs.restore_fd = restore_fd; - cdcs->dcs.console_cb = cb; - cdcs->dcs.console_cb_priv = priv; cdcs->dcs.callback = domain_create_cb; + libxl__ao_progress_gethow(&cdcs->dcs.aop_console_how, aop_console_how); cdcs->domid_out = domid; initiate_domain_create(egc, &cdcs->dcs); @@ -897,19 +904,21 @@ static void domain_create_cb(libxl__egc } int libxl_domain_create_new(libxl_ctx *ctx, libxl_domain_config *d_config, - libxl_console_ready cb, void *priv, uint32_t *domid, - const libxl_asyncop_how *ao_how) + const libxl_asyncop_how *ao_how, + const libxl_asyncprogress_how *aop_console_how) { - return do_domain_create(ctx, d_config, cb, priv, domid, -1, ao_how); + return do_domain_create(ctx, d_config, domid, -1, + ao_how, aop_console_how); } int libxl_domain_create_restore(libxl_ctx *ctx, libxl_domain_config *d_config, - libxl_console_ready cb, void *priv, uint32_t *domid, int restore_fd, - const libxl_asyncop_how *ao_how) + const libxl_asyncop_how *ao_how, + const libxl_asyncprogress_how *aop_console_how) { - return do_domain_create(ctx, d_config, cb, priv, domid, restore_fd, ao_how); + return do_domain_create(ctx, d_config, domid, restore_fd, + ao_how, aop_console_how); } /* diff -r 30c22846e770 -r 1417d35592c0 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri May 11 18:59:05 2012 +0100 +++ b/tools/libxl/libxl_internal.h Fri May 11 18:59:06 2012 +0100 @@ -1699,11 +1699,14 @@ int libxl__openptys(libxl__openpty_state typedef struct libxl__bootloader_state libxl__bootloader_state; typedef void libxl__run_bootloader_callback(libxl__egc*, libxl__bootloader_state*, int rc); +typedef void libxl__bootloader_console_callback(libxl__egc*, + libxl__bootloader_state*); struct libxl__bootloader_state { /* caller must fill these in, and they must all remain valid */ libxl__ao *ao; libxl__run_bootloader_callback *callback; + libxl__bootloader_console_callback *console_available; libxl_domain_build_info *info; /* u.pv.{kernel,ramdisk,cmdline} updated */ libxl_device_disk *disk; uint32_t domid; @@ -1739,9 +1742,8 @@ struct libxl__domain_create_state { libxl__ao *ao; libxl_domain_config *guest_config; int restore_fd; - libxl_console_ready console_cb; - void *console_cb_priv; libxl__domain_create_cb *callback; + libxl_asyncprogress_how aop_console_how; /* private to domain_create */ int guest_domid; libxl__domain_build_state build_state; diff -r 30c22846e770 -r 1417d35592c0 tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Fri May 11 18:59:05 2012 +0100 +++ b/tools/libxl/libxl_types.idl Fri May 11 18:59:06 2012 +0100 @@ -459,6 +459,7 @@ libxl_event_type = Enumeration("event_ty (2, "DOMAIN_DEATH"), (3, "DISK_EJECT"), (4, "OPERATION_COMPLETE"), + (5, "DOMAIN_CREATE_CONSOLE_AVAILABLE"), ]) libxl_ev_user = UInt(64) @@ -484,4 +485,5 @@ libxl_event = Struct("event",[ ("operation_complete", Struct(None, [ ("rc", integer), ])), + ("domain_create_console_available", Struct(None, [])), ]))]) diff -r 30c22846e770 -r 1417d35592c0 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Fri May 11 18:59:05 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Fri May 11 18:59:06 2012 +0100 @@ -1457,16 +1457,18 @@ static int freemem(libxl_domain_build_in return ERROR_NOMEM; } -static int autoconnect_console(libxl_ctx *ctx, uint32_t domid, void *priv) +static void autoconnect_console(libxl_ctx *ctx, libxl_event *ev, void *priv) { pid_t *pid = priv; + libxl_event_free(ctx, ev); + *pid = fork(); if (*pid < 0) { perror("unable to fork xenconsole"); - return ERROR_FAIL; + return; } else if (*pid > 0) - return 0; + return; postfork(); @@ -1533,7 +1535,7 @@ static int create_domain(struct domain_c int config_len = 0; int restore_fd = -1; int status = 0; - libxl_console_ready cb; + const libxl_asyncprogress_how *autoconnect_console_how; pid_t child_console_pid = -1; struct save_file_header hdr; @@ -1687,24 +1689,27 @@ start: goto error_out; } + libxl_asyncprogress_how autoconnect_console_how_buf; if ( dom_info->console_autoconnect ) { - cb = autoconnect_console; + autoconnect_console_how_buf.callback = autoconnect_console; + autoconnect_console_how_buf.for_callback = &child_console_pid; + autoconnect_console_how = &autoconnect_console_how_buf; }else{ - cb = NULL; + autoconnect_console_how = 0; } if ( restore_file ) { ret = libxl_domain_create_restore(ctx, &d_config, - cb, &child_console_pid, - &domid, restore_fd, 0); + &domid, restore_fd, + 0, autoconnect_console_how); /* * On subsequent reboot etc we should create the domain, not * restore/migrate-receive it again. */ restore_file = NULL; }else{ - ret = libxl_domain_create_new(ctx, &d_config, - cb, &child_console_pid, &domid, 0); + ret = libxl_domain_create_new(ctx, &d_config, &domid, + 0, autoconnect_console_how); } if ( ret ) goto error_out; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:33:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:33:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyD9-0005Dx-2L; Mon, 14 May 2012 16:33:27 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCX-0004id-4e for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:49 +0000 Received: from [85.158.138.51:35112] by server-10.bemta-3.messagelabs.com id 40/66-29478-0B331BF4; Mon, 14 May 2012 16:32:48 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-174.messagelabs.com!1337013166!27131078!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2614 invoked from network); 14 May 2012 16:32:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCT-0002wC-DE for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCT-0006rp-Ca for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:45 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:44 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: clarify definition of "slow" operation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1336759146 -3600 # Node ID 7de97a852161631d2ce387080fcf328956b6bccc # Parent 1417d35592c0e47eaa7f619121bdb722b834cdde libxl: clarify definition of "slow" operation Update the comment in libxl_internal.h to be clearer about which application-facing libxl operations need to take an ao_how. Reported-by: Dan Magenheimer Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 1417d35592c0 -r 7de97a852161 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri May 11 18:59:06 2012 +0100 +++ b/tools/libxl/libxl_internal.h Fri May 11 18:59:06 2012 +0100 @@ -1439,17 +1439,34 @@ _hidden void libxl__egc_cleanup(libxl__e /* * Machinery for asynchronous operations ("ao") * - * All "slow" functions (includes anything that might block on a - * guest or an external script) need to use the asynchronous - * operation ("ao") machinery. The function should take a parameter - * const libxl_asyncop_how *ao_how and must start with a call to - * AO_INITIATOR_ENTRY. These functions MAY NOT be called from - * inside libxl, because they can cause reentrancy callbacks. + * All "slow" functions (see below for the exact definition) need to + * use the asynchronous operation ("ao") machinery. The function + * should take a parameter const libxl_asyncop_how *ao_how and must + * start with a call to AO_INITIATOR_ENTRY. These functions MAY NOT + * be called from inside libxl, because they can cause reentrancy + * callbacks. * * For the same reason functions taking an ao_how may make themselves * an egc with EGC_INIT (and they will generally want to, to be able * to immediately complete an ao during its setup). * + * + * "Slow" functions includes any that might block on a guest or an + * external script. More broadly, it includes any operations which + * are sufficiently slow that an application might reasonably want to + * initiate them, and then carry on doing something else, while the + * operation completes. That is, a "fast" function must be fast + * enough that we do not mind blocking all other management operations + * on the same host while it completes. + * + * There are certain primitive functions which make a libxl operation + * necessarily "slow" for API reasons. These are: + * - awaiting xenstore watches (although read-modify-write xenstore + * transactions are OK for fast functions) + * - spawning subprocesses + * - anything with a timeout + * + * * Lifecycle of an ao: * * - Created by libxl__ao_create (or the AO_CREATE convenience macro). _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:33:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:33:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyD9-0005EE-7v; Mon, 14 May 2012 16:33:27 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCX-0004nS-Je for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:49 +0000 Received: from [85.158.143.35:56312] by server-2.bemta-4.messagelabs.com id 31/CD-17550-0B331BF4; Mon, 14 May 2012 16:32:48 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-21.messagelabs.com!1337013166!15334713!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22708 invoked from network); 14 May 2012 16:32:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCU-0002wS-Fp for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCU-0006sJ-F6 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:46 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:45 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: abort bootloader invocation when domain dies X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1336759147 -3600 # Node ID cd4dd23a831d954ba530ced0fdea9685c1975d44 # Parent 78863ebe9321985c93ab54bd81c81e2f07e67198 libxl: abort bootloader invocation when domain dies Cancel the bootloader (specifically, by sending it a signal) if the domain is seen to disappear from xenstore. We use a new utility event source libxl__domaindeathcheck which provides a convenient wrapper for the xenstore watch. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Changes since v8: * Fixed the commit message summary line. Changes since v7: * Add a comment explaining why we use a watch on the domain's xenstore path rather than @releaseDomain. * Fix typo in error message. Committed-by: Ian Jackson --- diff -r 78863ebe9321 -r cd4dd23a831d tools/libxl/libxl_bootloader.c --- a/tools/libxl/libxl_bootloader.c Fri May 11 18:59:06 2012 +0100 +++ b/tools/libxl/libxl_bootloader.c Fri May 11 18:59:07 2012 +0100 @@ -31,6 +31,7 @@ static void bootloader_keystrokes_copyfa libxl__datacopier_state *dc, int onwrite, int errnoval); static void bootloader_display_copyfail(libxl__egc *egc, libxl__datacopier_state *dc, int onwrite, int errnoval); +static void bootloader_domaindeath(libxl__egc*, libxl__domaindeathcheck *dc); static void bootloader_finished(libxl__egc *egc, libxl__ev_child *child, pid_t pid, int status); @@ -213,6 +214,7 @@ void libxl__bootloader_init(libxl__bootl bl->ptys[0].master = bl->ptys[0].slave = 0; bl->ptys[1].master = bl->ptys[1].slave = 0; libxl__ev_child_init(&bl->child); + libxl__domaindeathcheck_init(&bl->deathcheck); bl->keystrokes.ao = bl->ao; libxl__datacopier_init(&bl->keystrokes); bl->display.ao = bl->ao; libxl__datacopier_init(&bl->display); } @@ -230,6 +232,7 @@ static void bootloader_cleanup(libxl__eg free(bl->diskpath); bl->diskpath = 0; } + libxl__domaindeathcheck_stop(gc,&bl->deathcheck); libxl__datacopier_kill(&bl->keystrokes); libxl__datacopier_kill(&bl->display); for (i=0; i<2; i++) { @@ -256,6 +259,23 @@ static void bootloader_callback(libxl__e bl->callback(egc, bl, rc); } +/* might be called at any time, provided it's init'd */ +static void bootloader_abort(libxl__egc *egc, + libxl__bootloader_state *bl, int rc) +{ + STATE_AO_GC(bl->ao); + int r; + + libxl__datacopier_kill(&bl->keystrokes); + libxl__datacopier_kill(&bl->display); + if (libxl__ev_child_inuse(&bl->child)) { + r = kill(bl->child.pid, SIGTERM); + if (r) LOGE(WARN, "after failure, failed to kill bootloader [%lu]", + (unsigned long)bl->child.pid); + } + bl->rc = rc; +} + /*----- main flow of control -----*/ void libxl__bootloader_run(libxl__egc *egc, libxl__bootloader_state *bl) @@ -377,6 +397,12 @@ static void bootloader_gotptys(libxl__eg goto out; } + bl->deathcheck.what = "stopping bootloader"; + bl->deathcheck.domid = bl->domid; + bl->deathcheck.callback = bootloader_domaindeath; + rc = libxl__domaindeathcheck_start(gc, &bl->deathcheck); + if (rc) goto out; + if (bl->console_available) bl->console_available(egc, bl); @@ -454,18 +480,9 @@ static void bootloader_copyfail(libxl__e libxl__bootloader_state *bl, int onwrite, int errnoval) { STATE_AO_GC(bl->ao); - int r; - if (!onwrite && !errnoval) LOG(ERROR, "unexpected eof copying %s", which); - libxl__datacopier_kill(&bl->keystrokes); - libxl__datacopier_kill(&bl->display); - if (libxl__ev_child_inuse(&bl->child)) { - r = kill(bl->child.pid, SIGTERM); - if (r) LOGE(WARN, "after failure, failed to kill bootloader [%lu]", - (unsigned long)bl->child.pid); - } - bl->rc = ERROR_FAIL; + bootloader_abort(egc, bl, ERROR_FAIL); } static void bootloader_keystrokes_copyfail(libxl__egc *egc, libxl__datacopier_state *dc, int onwrite, int errnoval) @@ -480,6 +497,12 @@ static void bootloader_display_copyfail( bootloader_copyfail(egc, "bootloader output", bl, onwrite, errnoval); } +static void bootloader_domaindeath(libxl__egc *egc, libxl__domaindeathcheck *dc) +{ + libxl__bootloader_state *bl = CONTAINER_OF(dc, *bl, deathcheck); + bootloader_abort(egc, bl, ERROR_FAIL); +} + static void bootloader_finished(libxl__egc *egc, libxl__ev_child *child, pid_t pid, int status) { diff -r 78863ebe9321 -r cd4dd23a831d tools/libxl/libxl_event.c --- a/tools/libxl/libxl_event.c Fri May 11 18:59:06 2012 +0100 +++ b/tools/libxl/libxl_event.c Fri May 11 18:59:07 2012 +0100 @@ -589,6 +589,53 @@ int libxl__ev_devstate_wait(libxl__gc *g } /* + * domain death/destruction + */ + +/* + * We use a xenstore watch on the domain's path, rather than using an + * @releaseDomain watch and asking the hypervisor. This is simpler + * because turning @releaseDomain into domain-specific information is + * complicated. + * + * It is also sufficient for our callers, which are generally trying + * to do cleanup of their own execution state on domain death, for the + * following reason: if the domain is destroyed then either (a) the + * entries in xenstore have already been deleted, in which case the + * test here works or (b) they have not in which case something has + * gone very badly wrong and we are going to leak those xenstore + * entries, in which case trying to avoid leaking other stuff is + * futile. + */ + +static void domaindeathcheck_callback(libxl__egc *egc, libxl__ev_xswatch *w, + const char *watch_path, const char *event_path) +{ + libxl__domaindeathcheck *dc = CONTAINER_OF(w, *dc, watch); + EGC_GC; + const char *p = libxl__xs_read(gc, XBT_NULL, watch_path); + if (p) return; + + if (errno!=ENOENT) { + LIBXL__EVENT_DISASTER(egc,"failed to read xenstore" + " for domain detach check", errno, 0); + return; + } + + LOG(ERROR,"%s: domain %"PRIu32" removed (%s no longer in xenstore)", + dc->what, dc->domid, watch_path); + dc->callback(egc, dc); +} + +int libxl__domaindeathcheck_start(libxl__gc *gc, + libxl__domaindeathcheck *dc) +{ + const char *path = GCSPRINTF("/local/domain/%"PRIu32, dc->domid); + return libxl__ev_xswatch_register(gc, &dc->watch, + domaindeathcheck_callback, path); +} + +/* * osevent poll */ diff -r 78863ebe9321 -r cd4dd23a831d tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri May 11 18:59:06 2012 +0100 +++ b/tools/libxl/libxl_internal.h Fri May 11 18:59:07 2012 +0100 @@ -866,6 +866,33 @@ _hidden int libxl__ev_devstate_wait(libx const char *state_path, int state, int milliseconds); +/* + * libxl__ev_domaindeathcheck_register - arranges to call back (once) + * if the domain is destroyed. If the domain dies, we log a message + * of the form ": ". + */ + +typedef struct libxl__domaindeathcheck libxl__domaindeathcheck; +typedef void libxl___domaindeathcheck_callback(libxl__egc *egc, + libxl__domaindeathcheck*); + +struct libxl__domaindeathcheck { + /* must be filled in by caller, and remain valid: */ + const char *what; + uint32_t domid; + libxl___domaindeathcheck_callback *callback; + /* private */ + libxl__ev_xswatch watch; +}; + +_hidden int libxl__domaindeathcheck_start(libxl__gc *gc, + libxl__domaindeathcheck *dc); + +static inline void libxl__domaindeathcheck_init + (libxl__domaindeathcheck *dc) { libxl__ev_xswatch_init(&dc->watch); } +static inline void libxl__domaindeathcheck_stop(libxl__gc *gc, + libxl__domaindeathcheck *dc) { libxl__ev_xswatch_deregister(gc,&dc->watch); } + /* * libxl__try_phy_backend - Check if there's support for the passed @@ -1738,6 +1765,7 @@ struct libxl__bootloader_state { libxl__openpty_state openpty; libxl__openpty_result ptys[2]; /* [0] is for bootloader */ libxl__ev_child child; + libxl__domaindeathcheck deathcheck; int nargs, argsspace; const char **args; libxl__datacopier_state keystrokes, display; @@ -1750,7 +1778,6 @@ _hidden void libxl__bootloader_init(libx * If callback is passed rc==0, will have updated st->info appropriately */ _hidden void libxl__bootloader_run(libxl__egc*, libxl__bootloader_state *st); - /*----- Domain creation -----*/ typedef struct libxl__domain_create_state libxl__domain_create_state; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:33:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:33:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyD9-0005Dx-2L; Mon, 14 May 2012 16:33:27 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCX-0004id-4e for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:49 +0000 Received: from [85.158.138.51:35112] by server-10.bemta-3.messagelabs.com id 40/66-29478-0B331BF4; Mon, 14 May 2012 16:32:48 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-174.messagelabs.com!1337013166!27131078!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2614 invoked from network); 14 May 2012 16:32:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCT-0002wC-DE for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCT-0006rp-Ca for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:45 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:44 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: clarify definition of "slow" operation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1336759146 -3600 # Node ID 7de97a852161631d2ce387080fcf328956b6bccc # Parent 1417d35592c0e47eaa7f619121bdb722b834cdde libxl: clarify definition of "slow" operation Update the comment in libxl_internal.h to be clearer about which application-facing libxl operations need to take an ao_how. Reported-by: Dan Magenheimer Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 1417d35592c0 -r 7de97a852161 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri May 11 18:59:06 2012 +0100 +++ b/tools/libxl/libxl_internal.h Fri May 11 18:59:06 2012 +0100 @@ -1439,17 +1439,34 @@ _hidden void libxl__egc_cleanup(libxl__e /* * Machinery for asynchronous operations ("ao") * - * All "slow" functions (includes anything that might block on a - * guest or an external script) need to use the asynchronous - * operation ("ao") machinery. The function should take a parameter - * const libxl_asyncop_how *ao_how and must start with a call to - * AO_INITIATOR_ENTRY. These functions MAY NOT be called from - * inside libxl, because they can cause reentrancy callbacks. + * All "slow" functions (see below for the exact definition) need to + * use the asynchronous operation ("ao") machinery. The function + * should take a parameter const libxl_asyncop_how *ao_how and must + * start with a call to AO_INITIATOR_ENTRY. These functions MAY NOT + * be called from inside libxl, because they can cause reentrancy + * callbacks. * * For the same reason functions taking an ao_how may make themselves * an egc with EGC_INIT (and they will generally want to, to be able * to immediately complete an ao during its setup). * + * + * "Slow" functions includes any that might block on a guest or an + * external script. More broadly, it includes any operations which + * are sufficiently slow that an application might reasonably want to + * initiate them, and then carry on doing something else, while the + * operation completes. That is, a "fast" function must be fast + * enough that we do not mind blocking all other management operations + * on the same host while it completes. + * + * There are certain primitive functions which make a libxl operation + * necessarily "slow" for API reasons. These are: + * - awaiting xenstore watches (although read-modify-write xenstore + * transactions are OK for fast functions) + * - spawning subprocesses + * - anything with a timeout + * + * * Lifecycle of an ao: * * - Created by libxl__ao_create (or the AO_CREATE convenience macro). _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:33:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:33:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyD9-0005EE-7v; Mon, 14 May 2012 16:33:27 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCX-0004nS-Je for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:49 +0000 Received: from [85.158.143.35:56312] by server-2.bemta-4.messagelabs.com id 31/CD-17550-0B331BF4; Mon, 14 May 2012 16:32:48 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-21.messagelabs.com!1337013166!15334713!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22708 invoked from network); 14 May 2012 16:32:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCU-0002wS-Fp for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCU-0006sJ-F6 for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:46 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:45 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: abort bootloader invocation when domain dies X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1336759147 -3600 # Node ID cd4dd23a831d954ba530ced0fdea9685c1975d44 # Parent 78863ebe9321985c93ab54bd81c81e2f07e67198 libxl: abort bootloader invocation when domain dies Cancel the bootloader (specifically, by sending it a signal) if the domain is seen to disappear from xenstore. We use a new utility event source libxl__domaindeathcheck which provides a convenient wrapper for the xenstore watch. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Changes since v8: * Fixed the commit message summary line. Changes since v7: * Add a comment explaining why we use a watch on the domain's xenstore path rather than @releaseDomain. * Fix typo in error message. Committed-by: Ian Jackson --- diff -r 78863ebe9321 -r cd4dd23a831d tools/libxl/libxl_bootloader.c --- a/tools/libxl/libxl_bootloader.c Fri May 11 18:59:06 2012 +0100 +++ b/tools/libxl/libxl_bootloader.c Fri May 11 18:59:07 2012 +0100 @@ -31,6 +31,7 @@ static void bootloader_keystrokes_copyfa libxl__datacopier_state *dc, int onwrite, int errnoval); static void bootloader_display_copyfail(libxl__egc *egc, libxl__datacopier_state *dc, int onwrite, int errnoval); +static void bootloader_domaindeath(libxl__egc*, libxl__domaindeathcheck *dc); static void bootloader_finished(libxl__egc *egc, libxl__ev_child *child, pid_t pid, int status); @@ -213,6 +214,7 @@ void libxl__bootloader_init(libxl__bootl bl->ptys[0].master = bl->ptys[0].slave = 0; bl->ptys[1].master = bl->ptys[1].slave = 0; libxl__ev_child_init(&bl->child); + libxl__domaindeathcheck_init(&bl->deathcheck); bl->keystrokes.ao = bl->ao; libxl__datacopier_init(&bl->keystrokes); bl->display.ao = bl->ao; libxl__datacopier_init(&bl->display); } @@ -230,6 +232,7 @@ static void bootloader_cleanup(libxl__eg free(bl->diskpath); bl->diskpath = 0; } + libxl__domaindeathcheck_stop(gc,&bl->deathcheck); libxl__datacopier_kill(&bl->keystrokes); libxl__datacopier_kill(&bl->display); for (i=0; i<2; i++) { @@ -256,6 +259,23 @@ static void bootloader_callback(libxl__e bl->callback(egc, bl, rc); } +/* might be called at any time, provided it's init'd */ +static void bootloader_abort(libxl__egc *egc, + libxl__bootloader_state *bl, int rc) +{ + STATE_AO_GC(bl->ao); + int r; + + libxl__datacopier_kill(&bl->keystrokes); + libxl__datacopier_kill(&bl->display); + if (libxl__ev_child_inuse(&bl->child)) { + r = kill(bl->child.pid, SIGTERM); + if (r) LOGE(WARN, "after failure, failed to kill bootloader [%lu]", + (unsigned long)bl->child.pid); + } + bl->rc = rc; +} + /*----- main flow of control -----*/ void libxl__bootloader_run(libxl__egc *egc, libxl__bootloader_state *bl) @@ -377,6 +397,12 @@ static void bootloader_gotptys(libxl__eg goto out; } + bl->deathcheck.what = "stopping bootloader"; + bl->deathcheck.domid = bl->domid; + bl->deathcheck.callback = bootloader_domaindeath; + rc = libxl__domaindeathcheck_start(gc, &bl->deathcheck); + if (rc) goto out; + if (bl->console_available) bl->console_available(egc, bl); @@ -454,18 +480,9 @@ static void bootloader_copyfail(libxl__e libxl__bootloader_state *bl, int onwrite, int errnoval) { STATE_AO_GC(bl->ao); - int r; - if (!onwrite && !errnoval) LOG(ERROR, "unexpected eof copying %s", which); - libxl__datacopier_kill(&bl->keystrokes); - libxl__datacopier_kill(&bl->display); - if (libxl__ev_child_inuse(&bl->child)) { - r = kill(bl->child.pid, SIGTERM); - if (r) LOGE(WARN, "after failure, failed to kill bootloader [%lu]", - (unsigned long)bl->child.pid); - } - bl->rc = ERROR_FAIL; + bootloader_abort(egc, bl, ERROR_FAIL); } static void bootloader_keystrokes_copyfail(libxl__egc *egc, libxl__datacopier_state *dc, int onwrite, int errnoval) @@ -480,6 +497,12 @@ static void bootloader_display_copyfail( bootloader_copyfail(egc, "bootloader output", bl, onwrite, errnoval); } +static void bootloader_domaindeath(libxl__egc *egc, libxl__domaindeathcheck *dc) +{ + libxl__bootloader_state *bl = CONTAINER_OF(dc, *bl, deathcheck); + bootloader_abort(egc, bl, ERROR_FAIL); +} + static void bootloader_finished(libxl__egc *egc, libxl__ev_child *child, pid_t pid, int status) { diff -r 78863ebe9321 -r cd4dd23a831d tools/libxl/libxl_event.c --- a/tools/libxl/libxl_event.c Fri May 11 18:59:06 2012 +0100 +++ b/tools/libxl/libxl_event.c Fri May 11 18:59:07 2012 +0100 @@ -589,6 +589,53 @@ int libxl__ev_devstate_wait(libxl__gc *g } /* + * domain death/destruction + */ + +/* + * We use a xenstore watch on the domain's path, rather than using an + * @releaseDomain watch and asking the hypervisor. This is simpler + * because turning @releaseDomain into domain-specific information is + * complicated. + * + * It is also sufficient for our callers, which are generally trying + * to do cleanup of their own execution state on domain death, for the + * following reason: if the domain is destroyed then either (a) the + * entries in xenstore have already been deleted, in which case the + * test here works or (b) they have not in which case something has + * gone very badly wrong and we are going to leak those xenstore + * entries, in which case trying to avoid leaking other stuff is + * futile. + */ + +static void domaindeathcheck_callback(libxl__egc *egc, libxl__ev_xswatch *w, + const char *watch_path, const char *event_path) +{ + libxl__domaindeathcheck *dc = CONTAINER_OF(w, *dc, watch); + EGC_GC; + const char *p = libxl__xs_read(gc, XBT_NULL, watch_path); + if (p) return; + + if (errno!=ENOENT) { + LIBXL__EVENT_DISASTER(egc,"failed to read xenstore" + " for domain detach check", errno, 0); + return; + } + + LOG(ERROR,"%s: domain %"PRIu32" removed (%s no longer in xenstore)", + dc->what, dc->domid, watch_path); + dc->callback(egc, dc); +} + +int libxl__domaindeathcheck_start(libxl__gc *gc, + libxl__domaindeathcheck *dc) +{ + const char *path = GCSPRINTF("/local/domain/%"PRIu32, dc->domid); + return libxl__ev_xswatch_register(gc, &dc->watch, + domaindeathcheck_callback, path); +} + +/* * osevent poll */ diff -r 78863ebe9321 -r cd4dd23a831d tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri May 11 18:59:06 2012 +0100 +++ b/tools/libxl/libxl_internal.h Fri May 11 18:59:07 2012 +0100 @@ -866,6 +866,33 @@ _hidden int libxl__ev_devstate_wait(libx const char *state_path, int state, int milliseconds); +/* + * libxl__ev_domaindeathcheck_register - arranges to call back (once) + * if the domain is destroyed. If the domain dies, we log a message + * of the form ": ". + */ + +typedef struct libxl__domaindeathcheck libxl__domaindeathcheck; +typedef void libxl___domaindeathcheck_callback(libxl__egc *egc, + libxl__domaindeathcheck*); + +struct libxl__domaindeathcheck { + /* must be filled in by caller, and remain valid: */ + const char *what; + uint32_t domid; + libxl___domaindeathcheck_callback *callback; + /* private */ + libxl__ev_xswatch watch; +}; + +_hidden int libxl__domaindeathcheck_start(libxl__gc *gc, + libxl__domaindeathcheck *dc); + +static inline void libxl__domaindeathcheck_init + (libxl__domaindeathcheck *dc) { libxl__ev_xswatch_init(&dc->watch); } +static inline void libxl__domaindeathcheck_stop(libxl__gc *gc, + libxl__domaindeathcheck *dc) { libxl__ev_xswatch_deregister(gc,&dc->watch); } + /* * libxl__try_phy_backend - Check if there's support for the passed @@ -1738,6 +1765,7 @@ struct libxl__bootloader_state { libxl__openpty_state openpty; libxl__openpty_result ptys[2]; /* [0] is for bootloader */ libxl__ev_child child; + libxl__domaindeathcheck deathcheck; int nargs, argsspace; const char **args; libxl__datacopier_state keystrokes, display; @@ -1750,7 +1778,6 @@ _hidden void libxl__bootloader_init(libx * If callback is passed rc==0, will have updated st->info appropriately */ _hidden void libxl__bootloader_run(libxl__egc*, libxl__bootloader_state *st); - /*----- Domain creation -----*/ typedef struct libxl__domain_create_state libxl__domain_create_state; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:33:28 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:33:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyD9-0005EP-An; Mon, 14 May 2012 16:33:27 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCX-0004jl-Vp for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:50 +0000 Received: from [193.109.254.147:56574] by server-2.bemta-14.messagelabs.com id 1D/48-19409-1B331BF4; Mon, 14 May 2012 16:32:49 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-27.messagelabs.com!1337013166!9171420!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27945 invoked from network); 14 May 2012 16:32:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCT-0002wK-VD for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCT-0006s4-UU for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:45 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:45 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: child processes cleanups X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1336759146 -3600 # Node ID 78863ebe9321985c93ab54bd81c81e2f07e67198 # Parent 7de97a852161631d2ce387080fcf328956b6bccc libxl: child processes cleanups Abolish libxl_fork. Its only callers were in xl. Its functionality is now moved elsewhere, as follows: * The "logging version of fork", which is what it was billed as, is now xl_fork, which also dies on failure. * Closing the xenstore handle in the child is now done in libxl__ev_child_fork, which is the only remaining place where fork is called in libxl. * We provide a new function libxl__ev_child_xenstore_reopen for in-libxl children to make the ctx useable for xenstore again. * Consequently libxl__spawn_record_pid now no longer needs to mess about with its own xenstore handle. As a bonus it can now just use libxl__xs_write. Also, since we have now converted all the forkers in libxl, we can always honour the fork_replacement childproc hook - so do so. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 7de97a852161 -r 78863ebe9321 tools/libxl/libxl_exec.c --- a/tools/libxl/libxl_exec.c Fri May 11 18:59:06 2012 +0100 +++ b/tools/libxl/libxl_exec.c Fri May 11 18:59:06 2012 +0100 @@ -127,34 +127,23 @@ void libxl_report_child_exitstatus(libxl } } -int libxl__spawn_record_pid(libxl__gc *gc, libxl__spawn_state *spawn, - pid_t innerchild) +int libxl__spawn_record_pid(libxl__gc *gc, libxl__spawn_state *spawn, pid_t pid) { - struct xs_handle *xsh = NULL; - const char *pid = NULL; - int rc, xsok; + int r, rc; - pid = GCSPRINTF("%d", innerchild); + rc = libxl__ev_child_xenstore_reopen(gc, spawn->what); + if (rc) goto out; - /* we mustn't use the parent's handle in the child */ - xsh = xs_daemon_open(); - if (!xsh) { - LOGE(ERROR, "write %s = %s: xenstore reopen failed", - spawn->pidpath, pid); - rc = ERROR_FAIL; goto out; - } - - xsok = xs_write(xsh, XBT_NULL, spawn->pidpath, pid, strlen(pid)); - if (!xsok) { + r = libxl__xs_write(gc, XBT_NULL, spawn->pidpath, "%d", pid); + if (r) { LOGE(ERROR, - "write %s = %s: xenstore write failed", spawn->pidpath, pid); + "write %s = %d: xenstore write failed", spawn->pidpath, pid); rc = ERROR_FAIL; goto out; } rc = 0; out: - if (xsh) xs_daemon_close(xsh); return rc ? SIGTERM : 0; } @@ -302,7 +291,15 @@ int libxl__spawn_spawn(libxl__egc *egc, /* we are now the middle process */ - child = fork(); + pid_t (*fork_replacement)(void*) = + CTX->childproc_hooks + ? CTX->childproc_hooks->fork_replacement + : 0; + child = + fork_replacement + ? fork_replacement(CTX->childproc_user) + : fork(); + if (child == -1) exit(255); if (!child) { diff -r 7de97a852161 -r 78863ebe9321 tools/libxl/libxl_fork.c --- a/tools/libxl/libxl_fork.c Fri May 11 18:59:06 2012 +0100 +++ b/tools/libxl/libxl_fork.c Fri May 11 18:59:06 2012 +0100 @@ -347,7 +347,12 @@ pid_t libxl__ev_child_fork(libxl__gc *gc if (!pid) { /* woohoo! */ - return 0; /* Yes, CTX is left locked in the child. */ + if (CTX->xsh) { + xs_daemon_destroy_postfork(CTX->xsh); + CTX->xsh = NULL; /* turns mistakes into crashes */ + } + /* Yes, CTX is left locked in the child. */ + return 0; } ch->pid = pid; @@ -395,6 +400,24 @@ const libxl_childproc_hooks libxl__child libxl_sigchld_owner_libxl, 0, 0 }; +int libxl__ev_child_xenstore_reopen(libxl__gc *gc, const char *what) { + int rc; + + assert(!CTX->xsh); + CTX->xsh = xs_daemon_open(); + if (!CTX->xsh) { + LOGE(ERROR, "%s: xenstore reopen failed", what); + rc = ERROR_FAIL; goto out; + } + + libxl_fd_set_cloexec(CTX, xs_fileno(CTX->xsh), 1); + + return 0; + + out: + return rc; +} + /* * Local variables: * mode: C diff -r 7de97a852161 -r 78863ebe9321 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri May 11 18:59:06 2012 +0100 +++ b/tools/libxl/libxl_internal.h Fri May 11 18:59:06 2012 +0100 @@ -640,6 +640,11 @@ static inline void libxl__ev_child_init( static inline int libxl__ev_child_inuse(libxl__ev_child *childw_out) { return childw_out->pid >= 0; } +/* Useable (only) in the child to once more make the ctx useable for + * xenstore operations. logs failure in the form "what: ". */ +_hidden int libxl__ev_child_xenstore_reopen(libxl__gc *gc, const char *what); + /* * Other event-handling support provided by the libxl event core to diff -r 7de97a852161 -r 78863ebe9321 tools/libxl/libxl_utils.c --- a/tools/libxl/libxl_utils.c Fri May 11 18:59:06 2012 +0100 +++ b/tools/libxl/libxl_utils.c Fri May 11 18:59:06 2012 +0100 @@ -444,27 +444,6 @@ int libxl__remove_directory(libxl__gc *g return rc; } -pid_t libxl_fork(libxl_ctx *ctx) -{ - pid_t pid; - - pid = fork(); - if (pid == -1) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "fork failed"); - return -1; - } - - if (!pid) { - if (ctx->xsh) xs_daemon_destroy_postfork(ctx->xsh); - ctx->xsh = 0; - /* This ensures that anyone who forks but doesn't exec, - * and doesn't reinitialise the libxl_ctx, is OK. - * It also means they can safely call libxl_ctx_free. */ - } - - return pid; -} - int libxl_pipe(libxl_ctx *ctx, int pipes[2]) { if (pipe(pipes) < 0) { diff -r 7de97a852161 -r 78863ebe9321 tools/libxl/libxl_utils.h --- a/tools/libxl/libxl_utils.h Fri May 11 18:59:06 2012 +0100 +++ b/tools/libxl/libxl_utils.h Fri May 11 18:59:06 2012 +0100 @@ -47,9 +47,8 @@ int libxl_write_exactly(libxl_ctx *ctx, * logged using filename (which is only used for logging) and what * (which may be 0). */ -pid_t libxl_fork(libxl_ctx *ctx); int libxl_pipe(libxl_ctx *ctx, int pipes[2]); - /* Just like fork(2), pipe(2), but log errors. */ + /* Just like pipe(2), but log errors. */ void libxl_report_child_exitstatus(libxl_ctx *ctx, xentoollog_level, const char *what, pid_t pid, int status); diff -r 7de97a852161 -r 78863ebe9321 tools/libxl/xl.c --- a/tools/libxl/xl.c Fri May 11 18:59:06 2012 +0100 +++ b/tools/libxl/xl.c Fri May 11 18:59:06 2012 +0100 @@ -105,6 +105,18 @@ void postfork(void) } } +pid_t xl_fork(libxl_ctx *ctx) { + pid_t pid; + + pid = fork(); + if (pid == -1) { + perror("fork failed"); + exit(-1); + } + + return pid; +} + int main(int argc, char **argv) { int opt = 0; diff -r 7de97a852161 -r 78863ebe9321 tools/libxl/xl.h --- a/tools/libxl/xl.h Fri May 11 18:59:06 2012 +0100 +++ b/tools/libxl/xl.h Fri May 11 18:59:06 2012 +0100 @@ -104,6 +104,7 @@ struct cmd_spec *cmdtable_lookup(const c extern libxl_ctx *ctx; extern xentoollog_logger_stdiostream *logger; +pid_t xl_fork(libxl_ctx *ctx); /* like fork, but prints and dies if it fails */ void postfork(void); /* global options */ diff -r 7de97a852161 -r 78863ebe9321 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Fri May 11 18:59:06 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Fri May 11 18:59:06 2012 +0100 @@ -1736,7 +1736,7 @@ start: pid_t child1, got_child; int nullfd; - child1 = libxl_fork(ctx); + child1 = xl_fork(ctx); if (child1) { printf("Daemon running with PID %d\n", child1); @@ -2779,8 +2779,7 @@ static void migrate_domain(const char *d MUST( libxl_pipe(ctx, sendpipe) ); MUST( libxl_pipe(ctx, recvpipe) ); - child = libxl_fork(ctx); - if (child==-1) exit(1); + child = xl_fork(ctx); if (!child) { dup2(sendpipe[0], 0); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon May 14 16:33:28 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 14 May 2012 16:33:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyD9-0005EP-An; Mon, 14 May 2012 16:33:27 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCX-0004jl-Vp for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:50 +0000 Received: from [193.109.254.147:56574] by server-2.bemta-14.messagelabs.com id 1D/48-19409-1B331BF4; Mon, 14 May 2012 16:32:49 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-27.messagelabs.com!1337013166!9171420!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27945 invoked from network); 14 May 2012 16:32:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 May 2012 16:32:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1STyCT-0002wK-VD for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1STyCT-0006s4-UU for xen-changelog@lists.xensource.com; Mon, 14 May 2012 16:32:45 +0000 Message-Id: Date: Mon, 14 May 2012 16:32:45 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: child processes cleanups X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1336759146 -3600 # Node ID 78863ebe9321985c93ab54bd81c81e2f07e67198 # Parent 7de97a852161631d2ce387080fcf328956b6bccc libxl: child processes cleanups Abolish libxl_fork. Its only callers were in xl. Its functionality is now moved elsewhere, as follows: * The "logging version of fork", which is what it was billed as, is now xl_fork, which also dies on failure. * Closing the xenstore handle in the child is now done in libxl__ev_child_fork, which is the only remaining place where fork is called in libxl. * We provide a new function libxl__ev_child_xenstore_reopen for in-libxl children to make the ctx useable for xenstore again. * Consequently libxl__spawn_record_pid now no longer needs to mess about with its own xenstore handle. As a bonus it can now just use libxl__xs_write. Also, since we have now converted all the forkers in libxl, we can always honour the fork_replacement childproc hook - so do so. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 7de97a852161 -r 78863ebe9321 tools/libxl/libxl_exec.c --- a/tools/libxl/libxl_exec.c Fri May 11 18:59:06 2012 +0100 +++ b/tools/libxl/libxl_exec.c Fri May 11 18:59:06 2012 +0100 @@ -127,34 +127,23 @@ void libxl_report_child_exitstatus(libxl } } -int libxl__spawn_record_pid(libxl__gc *gc, libxl__spawn_state *spawn, - pid_t innerchild) +int libxl__spawn_record_pid(libxl__gc *gc, libxl__spawn_state *spawn, pid_t pid) { - struct xs_handle *xsh = NULL; - const char *pid = NULL; - int rc, xsok; + int r, rc; - pid = GCSPRINTF("%d", innerchild); + rc = libxl__ev_child_xenstore_reopen(gc, spawn->what); + if (rc) goto out; - /* we mustn't use the parent's handle in the child */ - xsh = xs_daemon_open(); - if (!xsh) { - LOGE(ERROR, "write %s = %s: xenstore reopen failed", - spawn->pidpath, pid); - rc = ERROR_FAIL; goto out; - } - - xsok = xs_write(xsh, XBT_NULL, spawn->pidpath, pid, strlen(pid)); - if (!xsok) { + r = libxl__xs_write(gc, XBT_NULL, spawn->pidpath, "%d", pid); + if (r) { LOGE(ERROR, - "write %s = %s: xenstore write failed", spawn->pidpath, pid); + "write %s = %d: xenstore write failed", spawn->pidpath, pid); rc = ERROR_FAIL; goto out; } rc = 0; out: - if (xsh) xs_daemon_close(xsh); return rc ? SIGTERM : 0; } @@ -302,7 +291,15 @@ int libxl__spawn_spawn(libxl__egc *egc, /* we are now the middle process */ - child = fork(); + pid_t (*fork_replacement)(void*) = + CTX->childproc_hooks + ? CTX->childproc_hooks->fork_replacement + : 0; + child = + fork_replacement + ? fork_replacement(CTX->childproc_user) + : fork(); + if (child == -1) exit(255); if (!child) { diff -r 7de97a852161 -r 78863ebe9321 tools/libxl/libxl_fork.c --- a/tools/libxl/libxl_fork.c Fri May 11 18:59:06 2012 +0100 +++ b/tools/libxl/libxl_fork.c Fri May 11 18:59:06 2012 +0100 @@ -347,7 +347,12 @@ pid_t libxl__ev_child_fork(libxl__gc *gc if (!pid) { /* woohoo! */ - return 0; /* Yes, CTX is left locked in the child. */ + if (CTX->xsh) { + xs_daemon_destroy_postfork(CTX->xsh); + CTX->xsh = NULL; /* turns mistakes into crashes */ + } + /* Yes, CTX is left locked in the child. */ + return 0; } ch->pid = pid; @@ -395,6 +400,24 @@ const libxl_childproc_hooks libxl__child libxl_sigchld_owner_libxl, 0, 0 }; +int libxl__ev_child_xenstore_reopen(libxl__gc *gc, const char *what) { + int rc; + + assert(!CTX->xsh); + CTX->xsh = xs_daemon_open(); + if (!CTX->xsh) { + LOGE(ERROR, "%s: xenstore reopen failed", what); + rc = ERROR_FAIL; goto out; + } + + libxl_fd_set_cloexec(CTX, xs_fileno(CTX->xsh), 1); + + return 0; + + out: + return rc; +} + /* * Local variables: * mode: C diff -r 7de97a852161 -r 78863ebe9321 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri May 11 18:59:06 2012 +0100 +++ b/tools/libxl/libxl_internal.h Fri May 11 18:59:06 2012 +0100 @@ -640,6 +640,11 @@ static inline void libxl__ev_child_init( static inline int libxl__ev_child_inuse(libxl__ev_child *childw_out) { return childw_out->pid >= 0; } +/* Useable (only) in the child to once more make the ctx useable for + * xenstore operations. logs failure in the form "what: ". */ +_hidden int libxl__ev_child_xenstore_reopen(libxl__gc *gc, const char *what); + /* * Other event-handling support provided by the libxl event core to diff -r 7de97a852161 -r 78863ebe9321 tools/libxl/libxl_utils.c --- a/tools/libxl/libxl_utils.c Fri May 11 18:59:06 2012 +0100 +++ b/tools/libxl/libxl_utils.c Fri May 11 18:59:06 2012 +0100 @@ -444,27 +444,6 @@ int libxl__remove_directory(libxl__gc *g return rc; } -pid_t libxl_fork(libxl_ctx *ctx) -{ - pid_t pid; - - pid = fork(); - if (pid == -1) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "fork failed"); - return -1; - } - - if (!pid) { - if (ctx->xsh) xs_daemon_destroy_postfork(ctx->xsh); - ctx->xsh = 0; - /* This ensures that anyone who forks but doesn't exec, - * and doesn't reinitialise the libxl_ctx, is OK. - * It also means they can safely call libxl_ctx_free. */ - } - - return pid; -} - int libxl_pipe(libxl_ctx *ctx, int pipes[2]) { if (pipe(pipes) < 0) { diff -r 7de97a852161 -r 78863ebe9321 tools/libxl/libxl_utils.h --- a/tools/libxl/libxl_utils.h Fri May 11 18:59:06 2012 +0100 +++ b/tools/libxl/libxl_utils.h Fri May 11 18:59:06 2012 +0100 @@ -47,9 +47,8 @@ int libxl_write_exactly(libxl_ctx *ctx, * logged using filename (which is only used for logging) and what * (which may be 0). */ -pid_t libxl_fork(libxl_ctx *ctx); int libxl_pipe(libxl_ctx *ctx, int pipes[2]); - /* Just like fork(2), pipe(2), but log errors. */ + /* Just like pipe(2), but log errors. */ void libxl_report_child_exitstatus(libxl_ctx *ctx, xentoollog_level, const char *what, pid_t pid, int status); diff -r 7de97a852161 -r 78863ebe9321 tools/libxl/xl.c --- a/tools/libxl/xl.c Fri May 11 18:59:06 2012 +0100 +++ b/tools/libxl/xl.c Fri May 11 18:59:06 2012 +0100 @@ -105,6 +105,18 @@ void postfork(void) } } +pid_t xl_fork(libxl_ctx *ctx) { + pid_t pid; + + pid = fork(); + if (pid == -1) { + perror("fork failed"); + exit(-1); + } + + return pid; +} + int main(int argc, char **argv) { int opt = 0; diff -r 7de97a852161 -r 78863ebe9321 tools/libxl/xl.h --- a/tools/libxl/xl.h Fri May 11 18:59:06 2012 +0100 +++ b/tools/libxl/xl.h Fri May 11 18:59:06 2012 +0100 @@ -104,6 +104,7 @@ struct cmd_spec *cmdtable_lookup(const c extern libxl_ctx *ctx; extern xentoollog_logger_stdiostream *logger; +pid_t xl_fork(libxl_ctx *ctx); /* like fork, but prints and dies if it fails */ void postfork(void); /* global options */ diff -r 7de97a852161 -r 78863ebe9321 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Fri May 11 18:59:06 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Fri May 11 18:59:06 2012 +0100 @@ -1736,7 +1736,7 @@ start: pid_t child1, got_child; int nullfd; - child1 = libxl_fork(ctx); + child1 = xl_fork(ctx); if (child1) { printf("Daemon running with PID %d\n", child1); @@ -2779,8 +2779,7 @@ static void migrate_domain(const char *d MUST( libxl_pipe(ctx, sendpipe) ); MUST( libxl_pipe(ctx, recvpipe) ); - child = libxl_fork(ctx); - if (child==-1) exit(1); + child = xl_fork(ctx); if (!child) { dup2(sendpipe[0], 0); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue May 15 07:11:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 15 May 2012 07:11:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SUBuc-00068R-NC; Tue, 15 May 2012 07:11:14 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SUBua-00067w-RR for xen-changelog@lists.xensource.com; Tue, 15 May 2012 07:11:13 +0000 Received: from [85.158.143.35:4223] by server-3.bemta-4.messagelabs.com id 05/48-05853-09102BF4; Tue, 15 May 2012 07:11:12 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-21.messagelabs.com!1337065870!4406549!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7653 invoked from network); 15 May 2012 07:11:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 15 May 2012 07:11:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SUBuX-0005SF-QM for xen-changelog@lists.xensource.com; Tue, 15 May 2012 07:11:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SUBuX-0004c1-IN for xen-changelog@lists.xensource.com; Tue, 15 May 2012 07:11:09 +0000 Message-Id: Date: Tue, 15 May 2012 07:11:09 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxc: implement gnttab.set_max_grants for Linux X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Jan Beulich # Date 1337008833 -3600 # Node ID 49ce39c88aeeb0ba58e4f0e2bf865f6981f6e99d # Parent ba837f25e256ac7959feba36415eab6ba6f63139 libxc: implement gnttab.set_max_grants for Linux Legacy (non-pvops) gntdev drivers may require this operation to be performed when the number of grants intended to be used simultaneously exceeds a certain driver specific default limit, and qemu's qdisk driver is an example of needing to do so. Signed-off-by: Jan Beulich Committed-by: Ian Jackson --- diff -r ba837f25e256 -r 49ce39c88aee tools/libxc/xc_linux_osdep.c --- a/tools/libxc/xc_linux_osdep.c Mon May 14 16:17:46 2012 +0100 +++ b/tools/libxc/xc_linux_osdep.c Mon May 14 16:20:33 2012 +0100 @@ -559,6 +559,27 @@ static int linux_gnttab_close(xc_gnttab return close(fd); } +static int linux_gnttab_set_max_grants(xc_gnttab *xch, xc_osdep_handle h, + uint32_t count) +{ + int fd = (int)h, rc; + struct ioctl_gntdev_set_max_grants max_grants = { .count = count }; + + rc = ioctl(fd, IOCTL_GNTDEV_SET_MAX_GRANTS, &max_grants); + if (rc) { + /* + * Newer (e.g. pv-ops) kernels don't implement this IOCTL, + * so ignore the resulting specific failure. + */ + if (errno == ENOTTY) + rc = 0; + else + PERROR("linux_gnttab_set_max_grants: ioctl SET_MAX_GRANTS failed"); + } + + return rc; +} + static void *linux_gnttab_grant_map(xc_gnttab *xch, xc_osdep_handle h, uint32_t count, int flags, int prot, uint32_t *domids, uint32_t *refs, @@ -714,6 +735,7 @@ static struct xc_osdep_ops linux_gnttab_ .close = &linux_gnttab_close, .u.gnttab = { + .set_max_grants = linux_gnttab_set_max_grants, .grant_map = &linux_gnttab_grant_map, .munmap = &linux_gnttab_munmap, }, _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue May 15 07:11:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 15 May 2012 07:11:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SUBuc-00068R-NC; Tue, 15 May 2012 07:11:14 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SUBua-00067w-RR for xen-changelog@lists.xensource.com; Tue, 15 May 2012 07:11:13 +0000 Received: from [85.158.143.35:4223] by server-3.bemta-4.messagelabs.com id 05/48-05853-09102BF4; Tue, 15 May 2012 07:11:12 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-21.messagelabs.com!1337065870!4406549!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7653 invoked from network); 15 May 2012 07:11:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 15 May 2012 07:11:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SUBuX-0005SF-QM for xen-changelog@lists.xensource.com; Tue, 15 May 2012 07:11:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SUBuX-0004c1-IN for xen-changelog@lists.xensource.com; Tue, 15 May 2012 07:11:09 +0000 Message-Id: Date: Tue, 15 May 2012 07:11:09 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxc: implement gnttab.set_max_grants for Linux X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Jan Beulich # Date 1337008833 -3600 # Node ID 49ce39c88aeeb0ba58e4f0e2bf865f6981f6e99d # Parent ba837f25e256ac7959feba36415eab6ba6f63139 libxc: implement gnttab.set_max_grants for Linux Legacy (non-pvops) gntdev drivers may require this operation to be performed when the number of grants intended to be used simultaneously exceeds a certain driver specific default limit, and qemu's qdisk driver is an example of needing to do so. Signed-off-by: Jan Beulich Committed-by: Ian Jackson --- diff -r ba837f25e256 -r 49ce39c88aee tools/libxc/xc_linux_osdep.c --- a/tools/libxc/xc_linux_osdep.c Mon May 14 16:17:46 2012 +0100 +++ b/tools/libxc/xc_linux_osdep.c Mon May 14 16:20:33 2012 +0100 @@ -559,6 +559,27 @@ static int linux_gnttab_close(xc_gnttab return close(fd); } +static int linux_gnttab_set_max_grants(xc_gnttab *xch, xc_osdep_handle h, + uint32_t count) +{ + int fd = (int)h, rc; + struct ioctl_gntdev_set_max_grants max_grants = { .count = count }; + + rc = ioctl(fd, IOCTL_GNTDEV_SET_MAX_GRANTS, &max_grants); + if (rc) { + /* + * Newer (e.g. pv-ops) kernels don't implement this IOCTL, + * so ignore the resulting specific failure. + */ + if (errno == ENOTTY) + rc = 0; + else + PERROR("linux_gnttab_set_max_grants: ioctl SET_MAX_GRANTS failed"); + } + + return rc; +} + static void *linux_gnttab_grant_map(xc_gnttab *xch, xc_osdep_handle h, uint32_t count, int flags, int prot, uint32_t *domids, uint32_t *refs, @@ -714,6 +735,7 @@ static struct xc_osdep_ops linux_gnttab_ .close = &linux_gnttab_close, .u.gnttab = { + .set_max_grants = linux_gnttab_set_max_grants, .grant_map = &linux_gnttab_grant_map, .munmap = &linux_gnttab_munmap, }, _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue May 15 07:11:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 15 May 2012 07:11:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SUBud-00068p-2k; Tue, 15 May 2012 07:11:15 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SUBub-00067w-TR for xen-changelog@lists.xensource.com; Tue, 15 May 2012 07:11:14 +0000 Received: from [85.158.143.99:37913] by server-3.bemta-4.messagelabs.com id DC/48-05853-19102BF4; Tue, 15 May 2012 07:11:13 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-216.messagelabs.com!1337065871!22779020!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29617 invoked from network); 15 May 2012 07:11:12 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 15 May 2012 07:11:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SUBuY-0005SL-So for xen-changelog@lists.xensource.com; Tue, 15 May 2012 07:11:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SUBuY-0004cV-Kh for xen-changelog@lists.xensource.com; Tue, 15 May 2012 07:11:10 +0000 Message-Id: Date: Tue, 15 May 2012 07:11:10 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] tools: xen-lowmemd is x86 specific, only install for x86 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1337009669 -3600 # Node ID a2e3b99a9bc4a0571e8631a6c0c2da181f0026b9 # Parent dfe39bd65137a97d18f0ee7d155d3755ae5530b4 tools: xen-lowmemd is x86 specific, only install for x86 It is TARGETS-$(CONFIG_X86) so it should be INSTALL_SBIN-$(CONFIG_X86) too Signed-off-by: Ian Campbell Committed-by: Ian Jackson --- diff -r dfe39bd65137 -r a2e3b99a9bc4 tools/misc/Makefile --- a/tools/misc/Makefile Mon May 14 16:22:39 2012 +0100 +++ b/tools/misc/Makefile Mon May 14 16:34:29 2012 +0100 @@ -22,8 +22,8 @@ INSTALL_BIN-y := xencons xenpvnetboot INSTALL_BIN-$(CONFIG_X86) += xen-detect INSTALL_BIN := $(INSTALL_BIN-y) -INSTALL_SBIN-y := xm xen-bugtool xen-python-path xend xenperf xsview xenpm xen-tmem-list-parse gtraceview gtracestat xenlockprof xenwatchdogd xen-ringwatch xen-lowmemd -INSTALL_SBIN-$(CONFIG_X86) += xen-hvmctx xen-hvmcrash +INSTALL_SBIN-y := xm xen-bugtool xen-python-path xend xenperf xsview xenpm xen-tmem-list-parse gtraceview gtracestat xenlockprof xenwatchdogd xen-ringwatch +INSTALL_SBIN-$(CONFIG_X86) += xen-hvmctx xen-hvmcrash xen-lowmemd INSTALL_SBIN-$(CONFIG_MIGRATE) += xen-hptool INSTALL_SBIN := $(INSTALL_SBIN-y) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue May 15 07:11:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 15 May 2012 07:11:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SUBud-00068p-2k; Tue, 15 May 2012 07:11:15 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SUBub-00067w-TR for xen-changelog@lists.xensource.com; Tue, 15 May 2012 07:11:14 +0000 Received: from [85.158.143.99:37913] by server-3.bemta-4.messagelabs.com id DC/48-05853-19102BF4; Tue, 15 May 2012 07:11:13 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-216.messagelabs.com!1337065871!22779020!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29617 invoked from network); 15 May 2012 07:11:12 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 15 May 2012 07:11:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SUBuY-0005SL-So for xen-changelog@lists.xensource.com; Tue, 15 May 2012 07:11:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SUBuY-0004cV-Kh for xen-changelog@lists.xensource.com; Tue, 15 May 2012 07:11:10 +0000 Message-Id: Date: Tue, 15 May 2012 07:11:10 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] tools: xen-lowmemd is x86 specific, only install for x86 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1337009669 -3600 # Node ID a2e3b99a9bc4a0571e8631a6c0c2da181f0026b9 # Parent dfe39bd65137a97d18f0ee7d155d3755ae5530b4 tools: xen-lowmemd is x86 specific, only install for x86 It is TARGETS-$(CONFIG_X86) so it should be INSTALL_SBIN-$(CONFIG_X86) too Signed-off-by: Ian Campbell Committed-by: Ian Jackson --- diff -r dfe39bd65137 -r a2e3b99a9bc4 tools/misc/Makefile --- a/tools/misc/Makefile Mon May 14 16:22:39 2012 +0100 +++ b/tools/misc/Makefile Mon May 14 16:34:29 2012 +0100 @@ -22,8 +22,8 @@ INSTALL_BIN-y := xencons xenpvnetboot INSTALL_BIN-$(CONFIG_X86) += xen-detect INSTALL_BIN := $(INSTALL_BIN-y) -INSTALL_SBIN-y := xm xen-bugtool xen-python-path xend xenperf xsview xenpm xen-tmem-list-parse gtraceview gtracestat xenlockprof xenwatchdogd xen-ringwatch xen-lowmemd -INSTALL_SBIN-$(CONFIG_X86) += xen-hvmctx xen-hvmcrash +INSTALL_SBIN-y := xm xen-bugtool xen-python-path xend xenperf xsview xenpm xen-tmem-list-parse gtraceview gtracestat xenlockprof xenwatchdogd xen-ringwatch +INSTALL_SBIN-$(CONFIG_X86) += xen-hvmctx xen-hvmcrash xen-lowmemd INSTALL_SBIN-$(CONFIG_MIGRATE) += xen-hptool INSTALL_SBIN := $(INSTALL_SBIN-y) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue May 15 07:11:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 15 May 2012 07:11:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SUBud-00068u-6E; Tue, 15 May 2012 07:11:15 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SUBuc-00067w-9H for xen-changelog@lists.xensource.com; Tue, 15 May 2012 07:11:14 +0000 Received: from [85.158.143.99:37951] by server-3.bemta-4.messagelabs.com id BF/48-05853-19102BF4; Tue, 15 May 2012 07:11:13 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-216.messagelabs.com!1337065871!22779021!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29638 invoked from network); 15 May 2012 07:11:12 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 15 May 2012 07:11:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SUBuZ-0005SO-B2 for xen-changelog@lists.xensource.com; Tue, 15 May 2012 07:11:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SUBuZ-0004ck-9N for xen-changelog@lists.xensource.com; Tue, 15 May 2012 07:11:11 +0000 Message-Id: Date: Tue, 15 May 2012 07:11:10 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] x86/hvm: put value of emulated register reads into trace records X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User David Vrabel # Date 1337010892 -3600 # Node ID 53144d27a9273008c8fcf20a345d13ba0d001edc # Parent a2e3b99a9bc4a0571e8631a6c0c2da181f0026b9 x86/hvm: put value of emulated register reads into trace records The tracepoint for emulated MMIO and I/O port reads was always before the emulated read or write was done. This means that for reads the register value in the trace record was always 0. So for reads, move the tracepoint until the register value is available. Signed-off-by: David Vrabel Committed-by: Keir Fraser --- diff -r a2e3b99a9bc4 -r 53144d27a927 xen/arch/x86/hvm/emulate.c --- a/xen/arch/x86/hvm/emulate.c Mon May 14 16:34:29 2012 +0100 +++ b/xen/arch/x86/hvm/emulate.c Mon May 14 16:54:52 2012 +0100 @@ -191,7 +191,8 @@ static int hvmemul_do_io( p->df = df; p->data = value; - hvmtrace_io_assist(is_mmio, p); + if ( dir == IOREQ_WRITE ) + hvmtrace_io_assist(is_mmio, p); if ( is_mmio ) { @@ -232,6 +233,9 @@ static int hvmemul_do_io( } finish_access: + if ( dir == IOREQ_READ ) + hvmtrace_io_assist(is_mmio, p); + if ( p_data != NULL ) memcpy(p_data, &vio->io_data, size); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue May 15 07:11:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 15 May 2012 07:11:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SUBud-00068u-6E; Tue, 15 May 2012 07:11:15 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SUBuc-00067w-9H for xen-changelog@lists.xensource.com; Tue, 15 May 2012 07:11:14 +0000 Received: from [85.158.143.99:37951] by server-3.bemta-4.messagelabs.com id BF/48-05853-19102BF4; Tue, 15 May 2012 07:11:13 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-216.messagelabs.com!1337065871!22779021!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29638 invoked from network); 15 May 2012 07:11:12 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 15 May 2012 07:11:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SUBuZ-0005SO-B2 for xen-changelog@lists.xensource.com; Tue, 15 May 2012 07:11:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SUBuZ-0004ck-9N for xen-changelog@lists.xensource.com; Tue, 15 May 2012 07:11:11 +0000 Message-Id: Date: Tue, 15 May 2012 07:11:10 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] x86/hvm: put value of emulated register reads into trace records X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User David Vrabel # Date 1337010892 -3600 # Node ID 53144d27a9273008c8fcf20a345d13ba0d001edc # Parent a2e3b99a9bc4a0571e8631a6c0c2da181f0026b9 x86/hvm: put value of emulated register reads into trace records The tracepoint for emulated MMIO and I/O port reads was always before the emulated read or write was done. This means that for reads the register value in the trace record was always 0. So for reads, move the tracepoint until the register value is available. Signed-off-by: David Vrabel Committed-by: Keir Fraser --- diff -r a2e3b99a9bc4 -r 53144d27a927 xen/arch/x86/hvm/emulate.c --- a/xen/arch/x86/hvm/emulate.c Mon May 14 16:34:29 2012 +0100 +++ b/xen/arch/x86/hvm/emulate.c Mon May 14 16:54:52 2012 +0100 @@ -191,7 +191,8 @@ static int hvmemul_do_io( p->df = df; p->data = value; - hvmtrace_io_assist(is_mmio, p); + if ( dir == IOREQ_WRITE ) + hvmtrace_io_assist(is_mmio, p); if ( is_mmio ) { @@ -232,6 +233,9 @@ static int hvmemul_do_io( } finish_access: + if ( dir == IOREQ_READ ) + hvmtrace_io_assist(is_mmio, p); + if ( p_data != NULL ) memcpy(p_data, &vio->io_data, size); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue May 15 07:11:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 15 May 2012 07:11:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SUBue-00069F-8i; Tue, 15 May 2012 07:11:16 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SUBuc-00068M-NH for xen-changelog@lists.xensource.com; Tue, 15 May 2012 07:11:14 +0000 Received: from [193.109.254.147:12475] by server-8.bemta-14.messagelabs.com id 7F/A4-23244-19102BF4; Tue, 15 May 2012 07:11:13 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-27.messagelabs.com!1337065869!9297763!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28604 invoked from network); 15 May 2012 07:11:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 15 May 2012 07:11:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SUBuW-0005S9-NC for xen-changelog@lists.xensource.com; Tue, 15 May 2012 07:11:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SUBuW-0004bX-G7 for xen-changelog@lists.xensource.com; Tue, 15 May 2012 07:11:08 +0000 Message-Id: Date: Tue, 15 May 2012 07:11:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] x86/irq: fix locking for c/s 24707:96987c324a4f debugging code X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Jan Beulich # Date 1336989969 -7200 # Node ID 7fdefd89cd86f5664526aef2b4015aaddba2c54a # Parent cc7a054a5a27bbb75a9b83d3c62ed6094c209e66 x86/irq: fix locking for c/s 24707:96987c324a4f debugging code Without this, dump_irqs() may try to acquire the lock the caller is currently holding. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- diff -r cc7a054a5a27 -r 7fdefd89cd86 xen/arch/x86/irq.c --- a/xen/arch/x86/irq.c Mon May 14 12:04:27 2012 +0200 +++ b/xen/arch/x86/irq.c Mon May 14 12:06:09 2012 +0200 @@ -668,6 +668,7 @@ void irq_move_cleanup_interrupt(struct c { if ( unlikely(!test_bit(vector, desc->arch.used_vectors)) ) { + spin_unlock(&desc->lock); bitmap_scnlistprintf(keyhandler_scratch, sizeof(keyhandler_scratch), desc->arch.used_vectors->_bits, _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue May 15 07:11:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 15 May 2012 07:11:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SUBue-00069F-8i; Tue, 15 May 2012 07:11:16 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SUBuc-00068M-NH for xen-changelog@lists.xensource.com; Tue, 15 May 2012 07:11:14 +0000 Received: from [193.109.254.147:12475] by server-8.bemta-14.messagelabs.com id 7F/A4-23244-19102BF4; Tue, 15 May 2012 07:11:13 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-27.messagelabs.com!1337065869!9297763!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28604 invoked from network); 15 May 2012 07:11:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 15 May 2012 07:11:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SUBuW-0005S9-NC for xen-changelog@lists.xensource.com; Tue, 15 May 2012 07:11:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SUBuW-0004bX-G7 for xen-changelog@lists.xensource.com; Tue, 15 May 2012 07:11:08 +0000 Message-Id: Date: Tue, 15 May 2012 07:11:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] x86/irq: fix locking for c/s 24707:96987c324a4f debugging code X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Jan Beulich # Date 1336989969 -7200 # Node ID 7fdefd89cd86f5664526aef2b4015aaddba2c54a # Parent cc7a054a5a27bbb75a9b83d3c62ed6094c209e66 x86/irq: fix locking for c/s 24707:96987c324a4f debugging code Without this, dump_irqs() may try to acquire the lock the caller is currently holding. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- diff -r cc7a054a5a27 -r 7fdefd89cd86 xen/arch/x86/irq.c --- a/xen/arch/x86/irq.c Mon May 14 12:04:27 2012 +0200 +++ b/xen/arch/x86/irq.c Mon May 14 12:06:09 2012 +0200 @@ -668,6 +668,7 @@ void irq_move_cleanup_interrupt(struct c { if ( unlikely(!test_bit(vector, desc->arch.used_vectors)) ) { + spin_unlock(&desc->lock); bitmap_scnlistprintf(keyhandler_scratch, sizeof(keyhandler_scratch), desc->arch.used_vectors->_bits, _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue May 15 07:11:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 15 May 2012 07:11:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SUBuc-00068f-Sz; Tue, 15 May 2012 07:11:14 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SUBub-00067w-AI for xen-changelog@lists.xensource.com; Tue, 15 May 2012 07:11:13 +0000 Received: from [85.158.143.99:10566] by server-3.bemta-4.messagelabs.com id 86/48-05853-09102BF4; Tue, 15 May 2012 07:11:12 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-216.messagelabs.com!1337065869!28010619!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16921 invoked from network); 15 May 2012 07:11:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 15 May 2012 07:11:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SUBuX-0005SC-63 for xen-changelog@lists.xensource.com; Tue, 15 May 2012 07:11:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SUBuX-0004bm-1l for xen-changelog@lists.xensource.com; Tue, 15 May 2012 07:11:09 +0000 Message-Id: Date: Tue, 15 May 2012 07:11:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: prevent xl from doing operations on domains if xend is running X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Roger Pau Monne # Date 1337008666 -3600 # Node ID ba837f25e256ac7959feba36415eab6ba6f63139 # Parent 7fdefd89cd86f5664526aef2b4015aaddba2c54a libxl: prevent xl from doing operations on domains if xend is running Prevent xl from doing any operation if xend daemon is running. That prevents bugs that happened when xl and xend raced to close a domain. Signed-off-by: Roger Pau Monne Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 7fdefd89cd86 -r ba837f25e256 docs/man/xl.pod.1 --- a/docs/man/xl.pod.1 Mon May 14 12:06:09 2012 +0200 +++ b/docs/man/xl.pod.1 Mon May 14 16:17:46 2012 +0100 @@ -75,6 +75,12 @@ Verbose. Dry run: do not actually execute the command. +=item B<-f> + +Force execution: xl will refuse to run some commands if it detects that xend is +also running, this option will force the execution of those commands, even +though it is unsafe. + =back =head1 DOMAIN SUBCOMMANDS diff -r 7fdefd89cd86 -r ba837f25e256 tools/libxl/xl.c --- a/tools/libxl/xl.c Mon May 14 12:06:09 2012 +0200 +++ b/tools/libxl/xl.c Mon May 14 16:17:46 2012 +0100 @@ -32,8 +32,11 @@ #include "libxlutil.h" #include "xl.h" +#define XEND_LOCK { "/var/lock/subsys/xend", "/var/lock/xend" } + xentoollog_logger_stdiostream *logger; int dryrun_only; +int force_execution; int autoballoon = 1; char *lockfile; char *default_vifscript = NULL; @@ -126,8 +129,9 @@ int main(int argc, char **argv) char *config_file; void *config_data = 0; int config_len = 0; + const char *locks[] = XEND_LOCK; - while ((opt = getopt(argc, argv, "+vN")) >= 0) { + while ((opt = getopt(argc, argv, "+vfN")) >= 0) { switch (opt) { case 'v': if (minmsglevel > 0) minmsglevel--; @@ -135,6 +139,9 @@ int main(int argc, char **argv) case 'N': dryrun_only = 1; break; + case 'f': + force_execution = 1; + break; default: fprintf(stderr, "unknown global option\n"); exit(2); @@ -185,6 +192,19 @@ int main(int argc, char **argv) ret = 1; goto xit; } + if (cspec->modifies && !dryrun_only) { + for (int i = 0; i < sizeof(locks)/sizeof(locks[0]); i++) { + if (!access(locks[i], F_OK) && !force_execution) { + fprintf(stderr, +"xend is running, which prevents xl from working correctly.\n" +"If you still want to force the execution of xl please use the -f\n" +"option.\n" + ); + ret = 1; + goto xit; + } + } + } ret = cspec->cmd_impl(argc, argv); } else if (!strcmp(cmd, "help")) { help(argv[1]); diff -r 7fdefd89cd86 -r ba837f25e256 tools/libxl/xl.h --- a/tools/libxl/xl.h Mon May 14 12:06:09 2012 +0200 +++ b/tools/libxl/xl.h Mon May 14 16:17:46 2012 +0100 @@ -21,6 +21,7 @@ struct cmd_spec { char *cmd_name; int (*cmd_impl)(int argc, char **argv); int can_dryrun; + int modifies; char *cmd_desc; char *cmd_usage; char *cmd_option; diff -r 7fdefd89cd86 -r ba837f25e256 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Mon May 14 12:06:09 2012 +0200 +++ b/tools/libxl/xl_cmdimpl.c Mon May 14 16:17:46 2012 +0100 @@ -1937,7 +1937,7 @@ void help(const char *command) struct cmd_spec *cmd; if (!command || !strcmp(command, "help")) { - printf("Usage xl [-vN] [args]\n\n"); + printf("Usage xl [-vfN] [args]\n\n"); printf("xl full list of subcommands:\n\n"); for (i = 0; i < cmdtable_len; i++) { printf(" %-19s ", cmd_table[i].cmd_name); @@ -1948,7 +1948,8 @@ void help(const char *command) } else { cmd = cmdtable_lookup(command); if (cmd) { - printf("Usage: xl [-v%s] %s %s\n\n%s.\n\n", + printf("Usage: xl [-v%s%s] %s %s\n\n%s.\n\n", + cmd->modifies ? "f" : "", cmd->can_dryrun ? "N" : "", cmd->cmd_name, cmd->cmd_usage, diff -r 7fdefd89cd86 -r ba837f25e256 tools/libxl/xl_cmdtable.c --- a/tools/libxl/xl_cmdtable.c Mon May 14 12:06:09 2012 +0200 +++ b/tools/libxl/xl_cmdtable.c Mon May 14 16:17:46 2012 +0100 @@ -19,7 +19,7 @@ struct cmd_spec cmd_table[] = { { "create", - &main_create, 1, + &main_create, 1, 1, "Create a domain from config file ", " [options] [vars]", "-h Print this help.\n" @@ -33,7 +33,7 @@ struct cmd_spec cmd_table[] = { "-e Do not wait in the background for the death of the domain." }, { "config-update", - &main_config_update, 1, + &main_config_update, 1, 1, "Update a running domain's saved configuration, used when rebuilding " "the domain after reboot", " [options] [vars]", @@ -42,7 +42,7 @@ struct cmd_spec cmd_table[] = { "-d Enable debug messages.\n" }, { "list", - &main_list, 0, + &main_list, 0, 0, "List information about all/some domains", "[options] [Domain]\n", "-l, --long Output all VM details\n" @@ -50,12 +50,12 @@ struct cmd_spec cmd_table[] = { "-Z, --context Prints out security context" }, { "destroy", - &main_destroy, 0, + &main_destroy, 0, 1, "Terminate a domain immediately", "", }, { "shutdown", - &main_shutdown, 0, + &main_shutdown, 0, 1, "Issue a shutdown signal to a domain", "[options] ", "-h Print this help.\n" @@ -64,7 +64,7 @@ struct cmd_spec cmd_table[] = { "-w Wait for guest to shutdown.\n" }, { "reboot", - &main_reboot, 0, + &main_reboot, 0, 1, "Issue a reboot signal to a domain", "[options] ", "-h Print this help.\n" @@ -72,44 +72,44 @@ struct cmd_spec cmd_table[] = { " no PV drivers.\n" }, { "pci-attach", - &main_pciattach, 0, + &main_pciattach, 0, 1, "Insert a new pass-through pci device", " [Virtual Slot]", }, { "pci-detach", - &main_pcidetach, 0, + &main_pcidetach, 0, 1, "Remove a domain's pass-through pci device", " ", }, { "pci-list", - &main_pcilist, 0, + &main_pcilist, 0, 0, "List pass-through pci devices for a domain", "", }, { "pci-list-assignable-devices", - &main_pcilist_assignable, 0, + &main_pcilist_assignable, 0, 0, "List all the assignable pci devices", "", }, { "pause", - &main_pause, 0, + &main_pause, 0, 1, "Pause execution of a domain", "", }, { "unpause", - &main_unpause, 0, + &main_unpause, 0, 1, "Unpause a paused domain", "", }, { "console", - &main_console, 0, + &main_console, 0, 0, "Attach to domain's console", "[options] \n" "-t console type, pv or serial\n" "-n console number" }, { "vncviewer", - &main_vncviewer, 0, + &main_vncviewer, 0, 0, "Attach to domain's VNC server.", "[options] \n" "--autopass Pass VNC password to viewer via stdin and\n" @@ -117,14 +117,14 @@ struct cmd_spec cmd_table[] = { "--vncviewer-autopass (consistency alias for --autopass)" }, { "save", - &main_save, 0, + &main_save, 0, 1, "Save a domain state to restore later", "[options] []", "-h Print this help.\n" "-c Leave domain running after creating the snapshot." }, { "migrate", - &main_migrate, 0, + &main_migrate, 0, 1, "Save a domain state to restore later", "[options] ", "-h Print this help.\n" @@ -136,12 +136,12 @@ struct cmd_spec cmd_table[] = { " of the domain." }, { "dump-core", - &main_dump_core, 0, + &main_dump_core, 0, 1, "Core dump a domain", " " }, { "restore", - &main_restore, 0, + &main_restore, 0, 1, "Restore a domain from a saved state", "[options] [] ", "-h Print this help.\n" @@ -150,68 +150,68 @@ struct cmd_spec cmd_table[] = { "-d Enable debug messages." }, { "migrate-receive", - &main_migrate_receive, 0, + &main_migrate_receive, 0, 1, "Restore a domain from a saved state", "- for internal use only", }, { "cd-insert", - &main_cd_insert, 0, + &main_cd_insert, 0, 1, "Insert a cdrom into a guest's cd drive", " ", }, { "cd-eject", - &main_cd_eject, 0, + &main_cd_eject, 0, 1, "Eject a cdrom from a guest's cd drive", " ", }, { "mem-max", - &main_memmax, 0, + &main_memmax, 0, 1, "Set the maximum amount reservation for a domain", " ", }, { "mem-set", - &main_memset, 0, + &main_memset, 0, 1, "Set the current memory usage for a domain", " ", }, { "button-press", - &main_button_press, 0, + &main_button_press, 0, 1, "Indicate an ACPI button press to the domain", "