From xen-changelog-bounces@lists.xensource.com Wed Feb 01 11:22:16 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 01 Feb 2012 11:22: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 1RsYGR-0006Vm-Nd; Wed, 01 Feb 2012 11:22:11 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RsYGQ-0006VW-JF for xen-changelog@lists.xensource.com; Wed, 01 Feb 2012 11:22:10 +0000 Received: from [85.158.138.51:16744] by server-8.bemta-3.messagelabs.com id 2C/21-31878-160292F4; Wed, 01 Feb 2012 11:22:09 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-174.messagelabs.com!1328095328!11551930!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.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15198 invoked from network); 1 Feb 2012 11:22:09 -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; 1 Feb 2012 11:22:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RsYGN-0005qe-Ox for xen-changelog@lists.xensource.com; Wed, 01 Feb 2012 11:22:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RsYGN-0007Xp-Ng for xen-changelog@lists.xensource.com; Wed, 01 Feb 2012 11:22:07 +0000 Message-Id: Date: Wed, 01 Feb 2012 11:22:07 +0000 From: Xen patchbot-4.0-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.0-testing] vesa: flush lfb after zeroing X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Andrew Cooper # Date 1328010570 0 # Node ID 1b7e074ee1d6e263f16cded236f3819b1b9ada6d # Parent 0ea6664f8eee651ea60016a12e340d45036c00d3 vesa: flush lfb after zeroing If Xen is going to relinquish the VGA console, flush the linear frame buffer after zeroing it in vesa_endboot(). Failing to do so in some circumstances leads to the actual linear framebuffer on the graphics card still containing the output of the Xen boot console can lead to ugly graphics output when dom0 is setting up the graphics card for its own use. While the patch is quite large, it is mostly just code motion to prevent having to forward declare lfb_flush(). The only functional change to vesa_endboot() is to insert a call to lbf_flush(). Signed-off-by: Andrew Cooper Committed-by: Keir Fraser xen-unstable changeset: 24615:ac9f32525376 xen-unstable date: Sat Jan 28 13:42:25 2012 +0000 --- diff -r 0ea6664f8eee -r 1b7e074ee1d6 xen/drivers/video/vesa.c --- a/xen/drivers/video/vesa.c Tue Jan 31 11:49:15 2012 +0000 +++ b/xen/drivers/video/vesa.c Tue Jan 31 11:49:30 2012 +0000 @@ -153,24 +153,6 @@ xfree(line_len); } -void __init vesa_endboot(bool_t keep) -{ - if ( keep ) - { - xpos = 0; - vga_puts = vesa_scroll_puts; - } - else - { - unsigned int i, bpp = (vlfb_info.bits_per_pixel + 7) >> 3; - for ( i = 0; i < vlfb_info.height; i++ ) - memset(lfb + i * vlfb_info.bytes_per_line, 0, - vlfb_info.width * bpp); - } - - xfree(line_len); -} - #if defined(CONFIG_X86) #include @@ -217,6 +199,25 @@ #endif +void __init vesa_endboot(bool_t keep) +{ + if ( keep ) + { + xpos = 0; + vga_puts = vesa_scroll_puts; + } + else + { + unsigned int i, bpp = (vlfb_info.bits_per_pixel + 7) >> 3; + for ( i = 0; i < vlfb_info.height; i++ ) + memset(lfb + i * vlfb_info.bytes_per_line, 0, + vlfb_info.width * bpp); + lfb_flush(); + } + + xfree(line_len); +} + /* Render one line of text to given linear framebuffer line. */ static void vesa_show_line( const unsigned char *text_line, _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Wed Feb 01 11:22:16 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 01 Feb 2012 11:22: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 1RsYGR-0006Vm-Nd; Wed, 01 Feb 2012 11:22:11 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RsYGQ-0006VW-JF for xen-changelog@lists.xensource.com; Wed, 01 Feb 2012 11:22:10 +0000 Received: from [85.158.138.51:16744] by server-8.bemta-3.messagelabs.com id 2C/21-31878-160292F4; Wed, 01 Feb 2012 11:22:09 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-174.messagelabs.com!1328095328!11551930!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.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15198 invoked from network); 1 Feb 2012 11:22:09 -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; 1 Feb 2012 11:22:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RsYGN-0005qe-Ox for xen-changelog@lists.xensource.com; Wed, 01 Feb 2012 11:22:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RsYGN-0007Xp-Ng for xen-changelog@lists.xensource.com; Wed, 01 Feb 2012 11:22:07 +0000 Message-Id: Date: Wed, 01 Feb 2012 11:22:07 +0000 From: Xen patchbot-4.0-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.0-testing] vesa: flush lfb after zeroing X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Andrew Cooper # Date 1328010570 0 # Node ID 1b7e074ee1d6e263f16cded236f3819b1b9ada6d # Parent 0ea6664f8eee651ea60016a12e340d45036c00d3 vesa: flush lfb after zeroing If Xen is going to relinquish the VGA console, flush the linear frame buffer after zeroing it in vesa_endboot(). Failing to do so in some circumstances leads to the actual linear framebuffer on the graphics card still containing the output of the Xen boot console can lead to ugly graphics output when dom0 is setting up the graphics card for its own use. While the patch is quite large, it is mostly just code motion to prevent having to forward declare lfb_flush(). The only functional change to vesa_endboot() is to insert a call to lbf_flush(). Signed-off-by: Andrew Cooper Committed-by: Keir Fraser xen-unstable changeset: 24615:ac9f32525376 xen-unstable date: Sat Jan 28 13:42:25 2012 +0000 --- diff -r 0ea6664f8eee -r 1b7e074ee1d6 xen/drivers/video/vesa.c --- a/xen/drivers/video/vesa.c Tue Jan 31 11:49:15 2012 +0000 +++ b/xen/drivers/video/vesa.c Tue Jan 31 11:49:30 2012 +0000 @@ -153,24 +153,6 @@ xfree(line_len); } -void __init vesa_endboot(bool_t keep) -{ - if ( keep ) - { - xpos = 0; - vga_puts = vesa_scroll_puts; - } - else - { - unsigned int i, bpp = (vlfb_info.bits_per_pixel + 7) >> 3; - for ( i = 0; i < vlfb_info.height; i++ ) - memset(lfb + i * vlfb_info.bytes_per_line, 0, - vlfb_info.width * bpp); - } - - xfree(line_len); -} - #if defined(CONFIG_X86) #include @@ -217,6 +199,25 @@ #endif +void __init vesa_endboot(bool_t keep) +{ + if ( keep ) + { + xpos = 0; + vga_puts = vesa_scroll_puts; + } + else + { + unsigned int i, bpp = (vlfb_info.bits_per_pixel + 7) >> 3; + for ( i = 0; i < vlfb_info.height; i++ ) + memset(lfb + i * vlfb_info.bytes_per_line, 0, + vlfb_info.width * bpp); + lfb_flush(); + } + + xfree(line_len); +} + /* Render one line of text to given linear framebuffer line. */ static void vesa_show_line( const unsigned char *text_line, _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Wed Feb 01 11:22:17 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 01 Feb 2012 11:22: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 1RsYGR-0006Vg-L1; Wed, 01 Feb 2012 11:22:11 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RsYGQ-0006VU-J8 for xen-changelog@lists.xensource.com; Wed, 01 Feb 2012 11:22:10 +0000 Received: from [85.158.138.51:45313] by server-3.bemta-3.messagelabs.com id A2/5C-26314-160292F4; Wed, 01 Feb 2012 11:22:09 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-174.messagelabs.com!1328095327!9688750!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16053 invoked from network); 1 Feb 2012 11:22:08 -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; 1 Feb 2012 11:22:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RsYGN-0005qb-GZ for xen-changelog@lists.xensource.com; Wed, 01 Feb 2012 11:22:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RsYGN-0007XO-70 for xen-changelog@lists.xensource.com; Wed, 01 Feb 2012 11:22:07 +0000 Message-Id: Date: Wed, 01 Feb 2012 11:22:06 +0000 From: Xen patchbot-4.0-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.0-testing] Console: introduce console=none command line parameter X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Andrew Cooper # Date 1328010555 0 # Node ID 0ea6664f8eee651ea60016a12e340d45036c00d3 # Parent 271e30252c16d7e07f8e82301c4a776e35712a6c Console: introduce console=none command line parameter Currenty, not specifying 'console=' on the command line causes Xen to default to 'vga'. Alternativly, the user can explicitly specifiy 'console=vga|com1|com2'. However, there is no way to specify that neither vga nor serial should be used. Specifying 'console=' does have the effect that neither vga nor serial is set up, but at the cost of an "Bad console= option ''" warning. Therefore, expliticly support a 'console=none' option which does not set up vga and does not set up serial, but does not trigger the bad console warning. Signed-off-by: Andrew Cooper Committed-by: Keir Fraser xen-unstable changeset: 24614:f8c2cf24a26c xen-unstable date: Sat Jan 28 13:41:42 2012 +0000 --- diff -r 271e30252c16 -r 0ea6664f8eee xen/drivers/char/console.c --- a/xen/drivers/char/console.c Tue Jan 17 11:35:30 2012 +0000 +++ b/xen/drivers/char/console.c Tue Jan 31 11:49:15 2012 +0000 @@ -557,6 +557,8 @@ p++; if ( !strncmp(p, "vga", 3) ) vga_init(); + else if ( !strncmp(p, "none", 4) ) + continue; else if ( strncmp(p, "com", 3) || (sercon_handle = serial_parse_handle(p)) == -1 ) { _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Wed Feb 01 11:22:17 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 01 Feb 2012 11:22: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 1RsYGR-0006Vg-L1; Wed, 01 Feb 2012 11:22:11 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RsYGQ-0006VU-J8 for xen-changelog@lists.xensource.com; Wed, 01 Feb 2012 11:22:10 +0000 Received: from [85.158.138.51:45313] by server-3.bemta-3.messagelabs.com id A2/5C-26314-160292F4; Wed, 01 Feb 2012 11:22:09 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-174.messagelabs.com!1328095327!9688750!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16053 invoked from network); 1 Feb 2012 11:22:08 -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; 1 Feb 2012 11:22:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RsYGN-0005qb-GZ for xen-changelog@lists.xensource.com; Wed, 01 Feb 2012 11:22:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RsYGN-0007XO-70 for xen-changelog@lists.xensource.com; Wed, 01 Feb 2012 11:22:07 +0000 Message-Id: Date: Wed, 01 Feb 2012 11:22:06 +0000 From: Xen patchbot-4.0-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.0-testing] Console: introduce console=none command line parameter X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Andrew Cooper # Date 1328010555 0 # Node ID 0ea6664f8eee651ea60016a12e340d45036c00d3 # Parent 271e30252c16d7e07f8e82301c4a776e35712a6c Console: introduce console=none command line parameter Currenty, not specifying 'console=' on the command line causes Xen to default to 'vga'. Alternativly, the user can explicitly specifiy 'console=vga|com1|com2'. However, there is no way to specify that neither vga nor serial should be used. Specifying 'console=' does have the effect that neither vga nor serial is set up, but at the cost of an "Bad console= option ''" warning. Therefore, expliticly support a 'console=none' option which does not set up vga and does not set up serial, but does not trigger the bad console warning. Signed-off-by: Andrew Cooper Committed-by: Keir Fraser xen-unstable changeset: 24614:f8c2cf24a26c xen-unstable date: Sat Jan 28 13:41:42 2012 +0000 --- diff -r 271e30252c16 -r 0ea6664f8eee xen/drivers/char/console.c --- a/xen/drivers/char/console.c Tue Jan 17 11:35:30 2012 +0000 +++ b/xen/drivers/char/console.c Tue Jan 31 11:49:15 2012 +0000 @@ -557,6 +557,8 @@ p++; if ( !strncmp(p, "vga", 3) ) vga_init(); + else if ( !strncmp(p, "none", 4) ) + continue; else if ( strncmp(p, "com", 3) || (sercon_handle = serial_parse_handle(p)) == -1 ) { _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Wed Feb 01 13:11:14 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 01 Feb 2012 13:11: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 1RsZxs-0001FV-ML; Wed, 01 Feb 2012 13:11:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RsZxr-0001FQ-8F for xen-changelog@lists.xensource.com; Wed, 01 Feb 2012 13:11:07 +0000 Received: from [85.158.138.51:24977] by server-3.bemta-3.messagelabs.com id 01/33-26314-AE9392F4; Wed, 01 Feb 2012 13:11:06 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-174.messagelabs.com!1328101864!11495025!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1166 invoked from network); 1 Feb 2012 13:11: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; 1 Feb 2012 13:11:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RsZxo-00075I-Ev for xen-changelog@lists.xensource.com; Wed, 01 Feb 2012 13:11:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RsZxn-0001zW-Uk for xen-changelog@lists.xensource.com; Wed, 01 Feb 2012 13:11:03 +0000 Message-Id: Date: Wed, 01 Feb 2012 13:11:03 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] netfront: correct MAX_TX_TARGET calculation X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Wei Liu # Date 1328101144 -3600 # Node ID ddb83aec5afc6f7980aaae2497a5b171c1549eff # Parent 5aa9c1c436f6e4a478edca4d28677f4f8db03b71 netfront: correct MAX_TX_TARGET calculation Signed-off-by: Wei Liu Signed-off-by: Jan Beulich Committed-by: Jan Beulich --- diff -r 5aa9c1c436f6 -r ddb83aec5afc drivers/xen/netfront/netfront.h --- a/drivers/xen/netfront/netfront.h Wed Jan 25 12:33:11 2012 +0100 +++ b/drivers/xen/netfront/netfront.h Wed Feb 01 13:59:04 2012 +0100 @@ -177,7 +177,7 @@ struct sk_buff *tx_skbs[NET_TX_RING_SIZE+1]; struct sk_buff *rx_skbs[NET_RX_RING_SIZE]; -#define TX_MAX_TARGET min_t(int, NET_RX_RING_SIZE, 256) +#define TX_MAX_TARGET min_t(int, NET_TX_RING_SIZE, 256) grant_ref_t gref_tx_head; grant_ref_t grant_tx_ref[NET_TX_RING_SIZE + 1]; grant_ref_t gref_rx_head; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Wed Feb 01 13:11:14 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 01 Feb 2012 13:11: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 1RsZxs-0001FV-ML; Wed, 01 Feb 2012 13:11:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RsZxr-0001FQ-8F for xen-changelog@lists.xensource.com; Wed, 01 Feb 2012 13:11:07 +0000 Received: from [85.158.138.51:24977] by server-3.bemta-3.messagelabs.com id 01/33-26314-AE9392F4; Wed, 01 Feb 2012 13:11:06 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-174.messagelabs.com!1328101864!11495025!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1166 invoked from network); 1 Feb 2012 13:11: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; 1 Feb 2012 13:11:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RsZxo-00075I-Ev for xen-changelog@lists.xensource.com; Wed, 01 Feb 2012 13:11:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RsZxn-0001zW-Uk for xen-changelog@lists.xensource.com; Wed, 01 Feb 2012 13:11:03 +0000 Message-Id: Date: Wed, 01 Feb 2012 13:11:03 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] netfront: correct MAX_TX_TARGET calculation X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Wei Liu # Date 1328101144 -3600 # Node ID ddb83aec5afc6f7980aaae2497a5b171c1549eff # Parent 5aa9c1c436f6e4a478edca4d28677f4f8db03b71 netfront: correct MAX_TX_TARGET calculation Signed-off-by: Wei Liu Signed-off-by: Jan Beulich Committed-by: Jan Beulich --- diff -r 5aa9c1c436f6 -r ddb83aec5afc drivers/xen/netfront/netfront.h --- a/drivers/xen/netfront/netfront.h Wed Jan 25 12:33:11 2012 +0100 +++ b/drivers/xen/netfront/netfront.h Wed Feb 01 13:59:04 2012 +0100 @@ -177,7 +177,7 @@ struct sk_buff *tx_skbs[NET_TX_RING_SIZE+1]; struct sk_buff *rx_skbs[NET_RX_RING_SIZE]; -#define TX_MAX_TARGET min_t(int, NET_RX_RING_SIZE, 256) +#define TX_MAX_TARGET min_t(int, NET_TX_RING_SIZE, 256) grant_ref_t gref_tx_head; grant_ref_t grant_tx_ref[NET_TX_RING_SIZE + 1]; grant_ref_t gref_rx_head; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Thu Feb 02 13:55:26 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 02 Feb 2012 13:55: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 1Rsx8D-00014K-Sn; Thu, 02 Feb 2012 13:55:21 +0000 Received: from mail21.messagelabs.com ([85.158.143.35]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Rsx8C-00014F-9n for xen-changelog@lists.xensource.com; Thu, 02 Feb 2012 13:55:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1328190912!13281777!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10352 invoked from network); 2 Feb 2012 13:55:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 2 Feb 2012 13:55:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Rsx84-0002ic-6L for xen-changelog@lists.xensource.com; Thu, 02 Feb 2012 13:55:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Rsx83-0007r0-MP for xen-changelog@lists.xensource.com; Thu, 02 Feb 2012 13:55:11 +0000 Date: Thu, 02 Feb 2012 13:55:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.1-testing] e1000: bounds packet size against buffer size X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com commit 3cf61880403b4e484539596a95937cc066243388 Author: Ian Campbell Date: Thu Feb 2 13:47:06 2012 +0000 e1000: bounds packet size against buffer size Otherwise we can write beyond the buffer and corrupt memory. This is tracked as CVE-2012-0029. Signed-off-by: Anthony Liguori (Backported from qemu upstream 65f82df0d7a71ce1b10cd4c5ab08888d176ac840 by Ian Campbell.) Signed-off-by: Ian Campbell (cherry picked from commit ebe37b2a3f844bad02dcc30d081f39eda06118f8) --- hw/e1000.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/hw/e1000.c b/hw/e1000.c index bb3689e..97104ed 100644 --- a/hw/e1000.c +++ b/hw/e1000.c @@ -444,6 +444,8 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp) bytes = split_size; if (tp->size + bytes > msh) bytes = msh - tp->size; + + bytes = MIN(sizeof(tp->data) - tp->size, bytes); cpu_physical_memory_read(addr, tp->data + tp->size, bytes); if ((sz = tp->size + bytes) >= hdr && tp->size < hdr) memmove(tp->header, tp->data, hdr); @@ -459,6 +461,7 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp) // context descriptor TSE is not set, while data descriptor TSE is set DBGOUT(TXERR, "TCP segmentaion Error\n"); } else { + split_size = MIN(sizeof(tp->data) - tp->size, split_size); cpu_physical_memory_read(addr, tp->data + tp->size, split_size); tp->size += split_size; } -- generated by git-patchbot for /home/xen/git/qemu-xen-4.1-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Thu Feb 02 13:55:26 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 02 Feb 2012 13:55: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 1Rsx8D-00014K-Sn; Thu, 02 Feb 2012 13:55:21 +0000 Received: from mail21.messagelabs.com ([85.158.143.35]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Rsx8C-00014F-9n for xen-changelog@lists.xensource.com; Thu, 02 Feb 2012 13:55:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1328190912!13281777!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10352 invoked from network); 2 Feb 2012 13:55:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 2 Feb 2012 13:55:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Rsx84-0002ic-6L for xen-changelog@lists.xensource.com; Thu, 02 Feb 2012 13:55:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Rsx83-0007r0-MP for xen-changelog@lists.xensource.com; Thu, 02 Feb 2012 13:55:11 +0000 Date: Thu, 02 Feb 2012 13:55:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.1-testing] e1000: bounds packet size against buffer size X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com commit 3cf61880403b4e484539596a95937cc066243388 Author: Ian Campbell Date: Thu Feb 2 13:47:06 2012 +0000 e1000: bounds packet size against buffer size Otherwise we can write beyond the buffer and corrupt memory. This is tracked as CVE-2012-0029. Signed-off-by: Anthony Liguori (Backported from qemu upstream 65f82df0d7a71ce1b10cd4c5ab08888d176ac840 by Ian Campbell.) Signed-off-by: Ian Campbell (cherry picked from commit ebe37b2a3f844bad02dcc30d081f39eda06118f8) --- hw/e1000.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/hw/e1000.c b/hw/e1000.c index bb3689e..97104ed 100644 --- a/hw/e1000.c +++ b/hw/e1000.c @@ -444,6 +444,8 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp) bytes = split_size; if (tp->size + bytes > msh) bytes = msh - tp->size; + + bytes = MIN(sizeof(tp->data) - tp->size, bytes); cpu_physical_memory_read(addr, tp->data + tp->size, bytes); if ((sz = tp->size + bytes) >= hdr && tp->size < hdr) memmove(tp->header, tp->data, hdr); @@ -459,6 +461,7 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp) // context descriptor TSE is not set, while data descriptor TSE is set DBGOUT(TXERR, "TCP segmentaion Error\n"); } else { + split_size = MIN(sizeof(tp->data) - tp->size, split_size); cpu_physical_memory_read(addr, tp->data + tp->size, split_size); tp->size += split_size; } -- generated by git-patchbot for /home/xen/git/qemu-xen-4.1-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Thu Feb 02 14:00:21 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 02 Feb 2012 14:00: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 1RsxD0-0001B5-Cb; Thu, 02 Feb 2012 14:00:18 +0000 Received: from mail216.messagelabs.com ([85.158.143.99]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RsxCy-0001Ax-N8 for xen-changelog@lists.xensource.com; Thu, 02 Feb 2012 14:00:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-216.messagelabs.com!1328191209!9814504!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19783 invoked from network); 2 Feb 2012 14:00:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 2 Feb 2012 14:00:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RsxCq-0002rg-MG for xen-changelog@lists.xensource.com; Thu, 02 Feb 2012 14:00:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RsxCo-0001BW-Fr for xen-changelog@lists.xensource.com; Thu, 02 Feb 2012 14:00:08 +0000 Date: Thu, 02 Feb 2012 14:00:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.0-testing] e1000: bounds packet size against buffer size X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com commit 36984c285a765541b04f378bfa84d2c850c167d3 Author: Ian Campbell Date: Thu Feb 2 13:47:06 2012 +0000 e1000: bounds packet size against buffer size Otherwise we can write beyond the buffer and corrupt memory. This is tracked as CVE-2012-0029. Signed-off-by: Anthony Liguori (Backported from qemu upstream 65f82df0d7a71ce1b10cd4c5ab08888d176ac840 by Ian Campbell.) Signed-off-by: Ian Campbell (cherry picked from commit ebe37b2a3f844bad02dcc30d081f39eda06118f8) --- hw/e1000.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/hw/e1000.c b/hw/e1000.c index 1644201..e77c81e 100644 --- a/hw/e1000.c +++ b/hw/e1000.c @@ -432,6 +432,8 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp) bytes = split_size; if (tp->size + bytes > msh) bytes = msh - tp->size; + + bytes = MIN(sizeof(tp->data) - tp->size, bytes); cpu_physical_memory_read(addr, tp->data + tp->size, bytes); if ((sz = tp->size + bytes) >= hdr && tp->size < hdr) memmove(tp->header, tp->data, hdr); @@ -447,6 +449,7 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp) // context descriptor TSE is not set, while data descriptor TSE is set DBGOUT(TXERR, "TCP segmentaion Error\n"); } else { + split_size = MIN(sizeof(tp->data) - tp->size, split_size); cpu_physical_memory_read(addr, tp->data + tp->size, split_size); tp->size += split_size; } -- generated by git-patchbot for /home/xen/git/qemu-xen-4.0-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Thu Feb 02 14:00:21 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 02 Feb 2012 14:00: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 1RsxD0-0001B5-Cb; Thu, 02 Feb 2012 14:00:18 +0000 Received: from mail216.messagelabs.com ([85.158.143.99]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RsxCy-0001Ax-N8 for xen-changelog@lists.xensource.com; Thu, 02 Feb 2012 14:00:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-216.messagelabs.com!1328191209!9814504!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19783 invoked from network); 2 Feb 2012 14:00:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 2 Feb 2012 14:00:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RsxCq-0002rg-MG for xen-changelog@lists.xensource.com; Thu, 02 Feb 2012 14:00:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RsxCo-0001BW-Fr for xen-changelog@lists.xensource.com; Thu, 02 Feb 2012 14:00:08 +0000 Date: Thu, 02 Feb 2012 14:00:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.0-testing] e1000: bounds packet size against buffer size X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com commit 36984c285a765541b04f378bfa84d2c850c167d3 Author: Ian Campbell Date: Thu Feb 2 13:47:06 2012 +0000 e1000: bounds packet size against buffer size Otherwise we can write beyond the buffer and corrupt memory. This is tracked as CVE-2012-0029. Signed-off-by: Anthony Liguori (Backported from qemu upstream 65f82df0d7a71ce1b10cd4c5ab08888d176ac840 by Ian Campbell.) Signed-off-by: Ian Campbell (cherry picked from commit ebe37b2a3f844bad02dcc30d081f39eda06118f8) --- hw/e1000.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/hw/e1000.c b/hw/e1000.c index 1644201..e77c81e 100644 --- a/hw/e1000.c +++ b/hw/e1000.c @@ -432,6 +432,8 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp) bytes = split_size; if (tp->size + bytes > msh) bytes = msh - tp->size; + + bytes = MIN(sizeof(tp->data) - tp->size, bytes); cpu_physical_memory_read(addr, tp->data + tp->size, bytes); if ((sz = tp->size + bytes) >= hdr && tp->size < hdr) memmove(tp->header, tp->data, hdr); @@ -447,6 +449,7 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp) // context descriptor TSE is not set, while data descriptor TSE is set DBGOUT(TXERR, "TCP segmentaion Error\n"); } else { + split_size = MIN(sizeof(tp->data) - tp->size, split_size); cpu_physical_memory_read(addr, tp->data + tp->size, split_size); tp->size += split_size; } -- generated by git-patchbot for /home/xen/git/qemu-xen-4.0-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Thu Feb 02 14:11:15 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 02 Feb 2012 14:11: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 1RsxNY-0001iX-Cp; Thu, 02 Feb 2012 14:11:12 +0000 Received: from mail182.messagelabs.com ([85.158.139.83]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RsxNX-0001iP-0b for xen-changelog@lists.xensource.com; Thu, 02 Feb 2012 14:11:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-182.messagelabs.com!1328191863!6114563!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6903 invoked from network); 2 Feb 2012 14:11: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; 2 Feb 2012 14:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RsxNP-0002zY-Hy for xen-changelog@lists.xensource.com; Thu, 02 Feb 2012 14:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RsxNP-0004mw-4W for xen-changelog@lists.xensource.com; Thu, 02 Feb 2012 14:11:03 +0000 Date: Thu, 02 Feb 2012 14:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-unstable] e1000: bounds packet size against buffer size X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com commit ebe37b2a3f844bad02dcc30d081f39eda06118f8 Author: Ian Campbell Date: Thu Feb 2 13:47:06 2012 +0000 e1000: bounds packet size against buffer size Otherwise we can write beyond the buffer and corrupt memory. This is tracked as CVE-2012-0029. Signed-off-by: Anthony Liguori (Backported from qemu upstream 65f82df0d7a71ce1b10cd4c5ab08888d176ac840 by Ian Campbell.) Signed-off-by: Ian Campbell --- hw/e1000.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/hw/e1000.c b/hw/e1000.c index bb3689e..97104ed 100644 --- a/hw/e1000.c +++ b/hw/e1000.c @@ -444,6 +444,8 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp) bytes = split_size; if (tp->size + bytes > msh) bytes = msh - tp->size; + + bytes = MIN(sizeof(tp->data) - tp->size, bytes); cpu_physical_memory_read(addr, tp->data + tp->size, bytes); if ((sz = tp->size + bytes) >= hdr && tp->size < hdr) memmove(tp->header, tp->data, hdr); @@ -459,6 +461,7 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp) // context descriptor TSE is not set, while data descriptor TSE is set DBGOUT(TXERR, "TCP segmentaion Error\n"); } else { + split_size = MIN(sizeof(tp->data) - tp->size, split_size); cpu_physical_memory_read(addr, tp->data + tp->size, split_size); tp->size += split_size; } -- generated by git-patchbot for /home/xen/git/qemu-xen-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Thu Feb 02 14:11:15 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 02 Feb 2012 14:11: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 1RsxNY-0001iX-Cp; Thu, 02 Feb 2012 14:11:12 +0000 Received: from mail182.messagelabs.com ([85.158.139.83]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RsxNX-0001iP-0b for xen-changelog@lists.xensource.com; Thu, 02 Feb 2012 14:11:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-182.messagelabs.com!1328191863!6114563!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6903 invoked from network); 2 Feb 2012 14:11: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; 2 Feb 2012 14:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RsxNP-0002zY-Hy for xen-changelog@lists.xensource.com; Thu, 02 Feb 2012 14:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RsxNP-0004mw-4W for xen-changelog@lists.xensource.com; Thu, 02 Feb 2012 14:11:03 +0000 Date: Thu, 02 Feb 2012 14:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-unstable] e1000: bounds packet size against buffer size X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com commit ebe37b2a3f844bad02dcc30d081f39eda06118f8 Author: Ian Campbell Date: Thu Feb 2 13:47:06 2012 +0000 e1000: bounds packet size against buffer size Otherwise we can write beyond the buffer and corrupt memory. This is tracked as CVE-2012-0029. Signed-off-by: Anthony Liguori (Backported from qemu upstream 65f82df0d7a71ce1b10cd4c5ab08888d176ac840 by Ian Campbell.) Signed-off-by: Ian Campbell --- hw/e1000.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/hw/e1000.c b/hw/e1000.c index bb3689e..97104ed 100644 --- a/hw/e1000.c +++ b/hw/e1000.c @@ -444,6 +444,8 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp) bytes = split_size; if (tp->size + bytes > msh) bytes = msh - tp->size; + + bytes = MIN(sizeof(tp->data) - tp->size, bytes); cpu_physical_memory_read(addr, tp->data + tp->size, bytes); if ((sz = tp->size + bytes) >= hdr && tp->size < hdr) memmove(tp->header, tp->data, hdr); @@ -459,6 +461,7 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp) // context descriptor TSE is not set, while data descriptor TSE is set DBGOUT(TXERR, "TCP segmentaion Error\n"); } else { + split_size = MIN(sizeof(tp->data) - tp->size, split_size); cpu_physical_memory_read(addr, tp->data + tp->size, split_size); tp->size += split_size; } -- generated by git-patchbot for /home/xen/git/qemu-xen-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 05:22:25 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 05:22: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 1RtBbG-0006Ye-HY; Fri, 03 Feb 2012 05:22:18 +0000 Received: from mail216.messagelabs.com ([85.158.143.99]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtBbE-0006YP-TZ for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 05:22:17 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-216.messagelabs.com!1328246529!13766794!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7521 invoked from network); 3 Feb 2012 05:22:10 -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; 3 Feb 2012 05:22:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtBb7-0006Pg-4F for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 05:22:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtBb6-0003JA-0U for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 05:22:08 +0000 Message-Id: Date: Fri, 03 Feb 2012 05:22:07 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] Update QEMU_TAG, for CVE-2012-0029 X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Jackson # Date 1328190973 0 # Node ID cccd6c68e1b9527f556deef760713380801db9b5 # Parent 00c4b19f264811d14c83b4d0fa7eac80fd55d26e Update QEMU_TAG, for CVE-2012-0029 --- diff -r 00c4b19f2648 -r cccd6c68e1b9 Config.mk --- a/Config.mk Tue Jan 31 11:47:29 2012 +0000 +++ b/Config.mk Thu Feb 02 13:56:13 2012 +0000 @@ -179,9 +179,9 @@ # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= 3981d218912e186cb4205ee6732f446c177a36a2 -# Tue Nov 22 18:49:15 2011 +0000 -# qemu-xen: Don't redefine libpci (3.1.7) defines. +QEMU_TAG ?= 3cf61880403b4e484539596a95937cc066243388 +# Thu Feb 2 13:47:06 2012 +0000 +# e1000: bounds packet size against buffer size # Optional components XENSTAT_XENTOP ?= y _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 05:22:25 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 05:22: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 1RtBbG-0006Ye-HY; Fri, 03 Feb 2012 05:22:18 +0000 Received: from mail216.messagelabs.com ([85.158.143.99]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtBbE-0006YP-TZ for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 05:22:17 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-216.messagelabs.com!1328246529!13766794!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7521 invoked from network); 3 Feb 2012 05:22:10 -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; 3 Feb 2012 05:22:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtBb7-0006Pg-4F for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 05:22:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtBb6-0003JA-0U for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 05:22:08 +0000 Message-Id: Date: Fri, 03 Feb 2012 05:22:07 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] Update QEMU_TAG, for CVE-2012-0029 X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Jackson # Date 1328190973 0 # Node ID cccd6c68e1b9527f556deef760713380801db9b5 # Parent 00c4b19f264811d14c83b4d0fa7eac80fd55d26e Update QEMU_TAG, for CVE-2012-0029 --- diff -r 00c4b19f2648 -r cccd6c68e1b9 Config.mk --- a/Config.mk Tue Jan 31 11:47:29 2012 +0000 +++ b/Config.mk Thu Feb 02 13:56:13 2012 +0000 @@ -179,9 +179,9 @@ # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= 3981d218912e186cb4205ee6732f446c177a36a2 -# Tue Nov 22 18:49:15 2011 +0000 -# qemu-xen: Don't redefine libpci (3.1.7) defines. +QEMU_TAG ?= 3cf61880403b4e484539596a95937cc066243388 +# Thu Feb 2 13:47:06 2012 +0000 +# e1000: bounds packet size against buffer size # Optional components XENSTAT_XENTOP ?= y _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 11:44:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 11:44: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 1RtHYq-00067R-MZ; Fri, 03 Feb 2012 11:44:12 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtHYp-00067J-Iw for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 11:44:11 +0000 Received: from [193.109.254.147:30547] by server-8.bemta-14.messagelabs.com id AC/62-04706-A88CB2F4; Fri, 03 Feb 2012 11:44:10 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-27.messagelabs.com!1328269387!59618616!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16125 invoked from network); 3 Feb 2012 11:43:08 -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; 3 Feb 2012 11:43:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtHYm-0002cP-Pl for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 11:44:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtHYm-0001sS-IB for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 11:44:08 +0000 Message-Id: Date: Fri, 03 Feb 2012 11:44:08 +0000 From: Xen patchbot-4.0-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.0-testing] Update QEMU_TAG, for CVE-2012-0029 X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Jackson # Date 1328191232 0 # Node ID 3feb83eed6bdd515b90aca528c1ebd83dfb7a378 # Parent 1b7e074ee1d6e263f16cded236f3819b1b9ada6d Update QEMU_TAG, for CVE-2012-0029 --- diff -r 1b7e074ee1d6 -r 3feb83eed6bd Config.mk --- a/Config.mk Tue Jan 31 11:49:30 2012 +0000 +++ b/Config.mk Thu Feb 02 14:00:32 2012 +0000 @@ -178,10 +178,9 @@ # CONFIG_QEMU ?= ../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG := xen-4.0.3 -#QEMU_TAG ?= 6d5b7ee3acfe8cc10681d2583a38398f7470ec2a -# Wed Jan 5 23:42:03 2011 +0000 -# Change tap device mac address to prevent change of bridge's mac +QEMU_TAG := 36984c285a765541b04f378bfa84d2c850c167d3 +# Thu Feb 2 13:47:06 2012 +0000 +# e1000: bounds packet size against buffer size OCAML_XENSTORED_REPO=http://xenbits.xensource.com/ext/xen-ocaml-tools.hg _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 11:44:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 11:44: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 1RtHYq-00067R-MZ; Fri, 03 Feb 2012 11:44:12 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtHYp-00067J-Iw for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 11:44:11 +0000 Received: from [193.109.254.147:30547] by server-8.bemta-14.messagelabs.com id AC/62-04706-A88CB2F4; Fri, 03 Feb 2012 11:44:10 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-27.messagelabs.com!1328269387!59618616!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16125 invoked from network); 3 Feb 2012 11:43:08 -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; 3 Feb 2012 11:43:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtHYm-0002cP-Pl for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 11:44:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtHYm-0001sS-IB for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 11:44:08 +0000 Message-Id: Date: Fri, 03 Feb 2012 11:44:08 +0000 From: Xen patchbot-4.0-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.0-testing] Update QEMU_TAG, for CVE-2012-0029 X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Jackson # Date 1328191232 0 # Node ID 3feb83eed6bdd515b90aca528c1ebd83dfb7a378 # Parent 1b7e074ee1d6e263f16cded236f3819b1b9ada6d Update QEMU_TAG, for CVE-2012-0029 --- diff -r 1b7e074ee1d6 -r 3feb83eed6bd Config.mk --- a/Config.mk Tue Jan 31 11:49:30 2012 +0000 +++ b/Config.mk Thu Feb 02 14:00:32 2012 +0000 @@ -178,10 +178,9 @@ # CONFIG_QEMU ?= ../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG := xen-4.0.3 -#QEMU_TAG ?= 6d5b7ee3acfe8cc10681d2583a38398f7470ec2a -# Wed Jan 5 23:42:03 2011 +0000 -# Change tap device mac address to prevent change of bridge's mac +QEMU_TAG := 36984c285a765541b04f378bfa84d2c850c167d3 +# Thu Feb 2 13:47:06 2012 +0000 +# e1000: bounds packet size against buffer size OCAML_XENSTORED_REPO=http://xenbits.xensource.com/ext/xen-ocaml-tools.hg _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:55:39 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:55: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 1RtR6T-0006Du-Rv; Fri, 03 Feb 2012 21:55:33 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6S-0006Dp-06 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:32 +0000 Received: from [85.158.143.35:33296] by server-2.bemta-4.messagelabs.com id 92/2C-28657-3D75C2F4; Fri, 03 Feb 2012 21:55:31 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-21.messagelabs.com!1328306129!1917543!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17897 invoked from network); 3 Feb 2012 21:55:30 -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; 3 Feb 2012 21:55:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6P-0001hf-Cs for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR6M-0002B8-AZ for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:28 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:55:24 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xl: fix a couple of memory leaks X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Jackson # Date 1327683679 0 # Node ID f204ead7d9e4904beb7a848860b23780b480ed6c # Parent 097f5d9c32f975464462a11644177ce8b6b6e9e7 xl: fix a couple of memory leaks * dolog leaked the log message (!) * main() leaked the config_data (perhaps a false positive from valgrind, but it's nicer to tidy it up). Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 097f5d9c32f9 -r f204ead7d9e4 tools/libxl/xl.c --- a/tools/libxl/xl.c Fri Jan 27 17:01:18 2012 +0000 +++ b/tools/libxl/xl.c Fri Jan 27 17:01:19 2012 +0000 @@ -135,6 +135,7 @@ config_file, strerror(errno)); parse_global_config(config_file, config_data, config_len); free(config_file); + free(config_data); /* Reset options for per-command use of getopt. */ argv += optind; diff -r 097f5d9c32f9 -r f204ead7d9e4 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Fri Jan 27 17:01:18 2012 +0000 +++ b/tools/libxl/xl_cmdimpl.c Fri Jan 27 17:01:19 2012 +0000 @@ -278,7 +278,7 @@ static void dolog(const char *file, int line, const char *func, char *fmt, ...) { va_list ap; - char *s; + char *s = NULL; int rc; va_start(ap, fmt); @@ -286,6 +286,7 @@ va_end(ap); if (rc >= 0) libxl_write_exactly(NULL, logfile, s, rc, NULL, NULL); + free(s); } static void printf_info(int domid, _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:55:39 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:55: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 1RtR6T-0006Du-Rv; Fri, 03 Feb 2012 21:55:33 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6S-0006Dp-06 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:32 +0000 Received: from [85.158.143.35:33296] by server-2.bemta-4.messagelabs.com id 92/2C-28657-3D75C2F4; Fri, 03 Feb 2012 21:55:31 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-21.messagelabs.com!1328306129!1917543!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17897 invoked from network); 3 Feb 2012 21:55:30 -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; 3 Feb 2012 21:55:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6P-0001hf-Cs for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR6M-0002B8-AZ for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:28 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:55:24 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xl: fix a couple of memory leaks X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Jackson # Date 1327683679 0 # Node ID f204ead7d9e4904beb7a848860b23780b480ed6c # Parent 097f5d9c32f975464462a11644177ce8b6b6e9e7 xl: fix a couple of memory leaks * dolog leaked the log message (!) * main() leaked the config_data (perhaps a false positive from valgrind, but it's nicer to tidy it up). Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 097f5d9c32f9 -r f204ead7d9e4 tools/libxl/xl.c --- a/tools/libxl/xl.c Fri Jan 27 17:01:18 2012 +0000 +++ b/tools/libxl/xl.c Fri Jan 27 17:01:19 2012 +0000 @@ -135,6 +135,7 @@ config_file, strerror(errno)); parse_global_config(config_file, config_data, config_len); free(config_file); + free(config_data); /* Reset options for per-command use of getopt. */ argv += optind; diff -r 097f5d9c32f9 -r f204ead7d9e4 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Fri Jan 27 17:01:18 2012 +0000 +++ b/tools/libxl/xl_cmdimpl.c Fri Jan 27 17:01:19 2012 +0000 @@ -278,7 +278,7 @@ static void dolog(const char *file, int line, const char *func, char *fmt, ...) { va_list ap; - char *s; + char *s = NULL; int rc; va_start(ap, fmt); @@ -286,6 +286,7 @@ va_end(ap); if (rc >= 0) libxl_write_exactly(NULL, logfile, s, rc, NULL, NULL); + free(s); } static void printf_info(int domid, _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:55:40 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:55: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 1RtR6V-0006E6-Ug; Fri, 03 Feb 2012 21:55:35 +0000 Received: from mail216.messagelabs.com ([85.158.143.99]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6U-0006Do-11 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:34 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-216.messagelabs.com!1328306126!13419241!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22547 invoked from network); 3 Feb 2012 21:55:27 -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; 3 Feb 2012 21:55:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6M-0001hZ-C0 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR6E-000299-IW for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:20 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:55:17 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] .gitignore/.hgignore: New names for ioemu dirs, seabios X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Jackson # Date 1327683678 0 # Node ID 097f5d9c32f975464462a11644177ce8b6b6e9e7 # Parent e2722b24dc0962de37215320b05d1bb7c4c42864 .gitignore/.hgignore: New names for ioemu dirs, seabios * Add new seabios clone directories to .gitignore. * Add new qemu clone directories to .gitignore. * Remove old tools/ioemu (long-obsolete) from .gitignore and .hgignore. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r e2722b24dc09 -r 097f5d9c32f9 .gitignore --- a/.gitignore Thu Jan 26 17:43:31 2012 +0000 +++ b/.gitignore Fri Jan 27 17:01:18 2012 +0000 @@ -15,8 +15,6 @@ .config dist -tools/ioemu-dir -tools/ioemu-remote stubdom/*.tar.gz build-* @@ -162,20 +160,6 @@ tools/include/xen/* tools/include/xen-foreign/*.(c|h|size) tools/include/xen-foreign/checker -tools/ioemu/.pc/* -tools/ioemu/config-host.h -tools/ioemu/config-host.mak -tools/ioemu/i386-dm/Makefile -tools/ioemu/i386-dm/config.h -tools/ioemu/i386-dm/config.mak -tools/ioemu/i386-dm/qemu-dm -tools/ioemu/qemu-doc.html -tools/ioemu/qemu-img.1 -tools/ioemu/qemu-img.pod -tools/ioemu/qemu-tech.html -tools/ioemu/qemu.1 -tools/ioemu/qemu.pod -tools/ioemu/tapdisk-ioemu tools/libxc/ia64/asm/*.h tools/libxc/ia64/acpi/*.h tools/libxc/ia64/acpi/platform/*.h @@ -285,8 +269,6 @@ tools/xm-test/lib/XmTestLib/config.py tools/xm-test/lib/XmTestReport/xmtest.py tools/xm-test/tests/*.test -tools/ioemu-remote -tools/ioemu-dir tools/ocaml-xenstored* xen/.banner* xen/BLOG @@ -325,6 +307,15 @@ unmodified_drivers/linux-2.6/*.mod.c LibVNCServer* +tools/qemu-xen-dir-remote +tools/qemu-xen-dir + +tools/qemu-xen-traditional-dir-remote +tools/qemu-xen-traditional-dir + +tools/firmware/seabios-dir-remote +tools/firmware/seabios-dir + tools/firmware/rombios/_rombios_.c tools/firmware/rombios/rombios.s tools/firmware/rombios/rombios.sym diff -r e2722b24dc09 -r 097f5d9c32f9 .hgignore --- a/.hgignore Thu Jan 26 17:43:31 2012 +0000 +++ b/.hgignore Fri Jan 27 17:01:18 2012 +0000 @@ -163,20 +163,6 @@ ^tools/include/xen/.*$ ^tools/include/xen-foreign/.*\.(c|h|size)$ ^tools/include/xen-foreign/checker$ -^tools/ioemu/\.pc/.*$ -^tools/ioemu/config-host\.h$ -^tools/ioemu/config-host\.mak$ -^tools/ioemu/i386-dm/Makefile$ -^tools/ioemu/i386-dm/config\.h$ -^tools/ioemu/i386-dm/config\.mak$ -^tools/ioemu/i386-dm/qemu-dm$ -^tools/ioemu/qemu-doc\.html$ -^tools/ioemu/qemu-img\.1$ -^tools/ioemu/qemu-img\.pod$ -^tools/ioemu/qemu-tech\.html$ -^tools/ioemu/qemu\.1$ -^tools/ioemu/qemu\.pod$ -^tools/ioemu/tapdisk-ioemu$ ^tools/libxc/ia64/asm/.*\.h$ ^tools/libxc/ia64/acpi/.*\.h$ ^tools/libxc/ia64/acpi/platform/.*\.h$ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:55:40 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:55: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 1RtR6V-0006E6-Ug; Fri, 03 Feb 2012 21:55:35 +0000 Received: from mail216.messagelabs.com ([85.158.143.99]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6U-0006Do-11 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:34 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-216.messagelabs.com!1328306126!13419241!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22547 invoked from network); 3 Feb 2012 21:55:27 -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; 3 Feb 2012 21:55:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6M-0001hZ-C0 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR6E-000299-IW for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:20 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:55:17 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] .gitignore/.hgignore: New names for ioemu dirs, seabios X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Jackson # Date 1327683678 0 # Node ID 097f5d9c32f975464462a11644177ce8b6b6e9e7 # Parent e2722b24dc0962de37215320b05d1bb7c4c42864 .gitignore/.hgignore: New names for ioemu dirs, seabios * Add new seabios clone directories to .gitignore. * Add new qemu clone directories to .gitignore. * Remove old tools/ioemu (long-obsolete) from .gitignore and .hgignore. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r e2722b24dc09 -r 097f5d9c32f9 .gitignore --- a/.gitignore Thu Jan 26 17:43:31 2012 +0000 +++ b/.gitignore Fri Jan 27 17:01:18 2012 +0000 @@ -15,8 +15,6 @@ .config dist -tools/ioemu-dir -tools/ioemu-remote stubdom/*.tar.gz build-* @@ -162,20 +160,6 @@ tools/include/xen/* tools/include/xen-foreign/*.(c|h|size) tools/include/xen-foreign/checker -tools/ioemu/.pc/* -tools/ioemu/config-host.h -tools/ioemu/config-host.mak -tools/ioemu/i386-dm/Makefile -tools/ioemu/i386-dm/config.h -tools/ioemu/i386-dm/config.mak -tools/ioemu/i386-dm/qemu-dm -tools/ioemu/qemu-doc.html -tools/ioemu/qemu-img.1 -tools/ioemu/qemu-img.pod -tools/ioemu/qemu-tech.html -tools/ioemu/qemu.1 -tools/ioemu/qemu.pod -tools/ioemu/tapdisk-ioemu tools/libxc/ia64/asm/*.h tools/libxc/ia64/acpi/*.h tools/libxc/ia64/acpi/platform/*.h @@ -285,8 +269,6 @@ tools/xm-test/lib/XmTestLib/config.py tools/xm-test/lib/XmTestReport/xmtest.py tools/xm-test/tests/*.test -tools/ioemu-remote -tools/ioemu-dir tools/ocaml-xenstored* xen/.banner* xen/BLOG @@ -325,6 +307,15 @@ unmodified_drivers/linux-2.6/*.mod.c LibVNCServer* +tools/qemu-xen-dir-remote +tools/qemu-xen-dir + +tools/qemu-xen-traditional-dir-remote +tools/qemu-xen-traditional-dir + +tools/firmware/seabios-dir-remote +tools/firmware/seabios-dir + tools/firmware/rombios/_rombios_.c tools/firmware/rombios/rombios.s tools/firmware/rombios/rombios.sym diff -r e2722b24dc09 -r 097f5d9c32f9 .hgignore --- a/.hgignore Thu Jan 26 17:43:31 2012 +0000 +++ b/.hgignore Fri Jan 27 17:01:18 2012 +0000 @@ -163,20 +163,6 @@ ^tools/include/xen/.*$ ^tools/include/xen-foreign/.*\.(c|h|size)$ ^tools/include/xen-foreign/checker$ -^tools/ioemu/\.pc/.*$ -^tools/ioemu/config-host\.h$ -^tools/ioemu/config-host\.mak$ -^tools/ioemu/i386-dm/Makefile$ -^tools/ioemu/i386-dm/config\.h$ -^tools/ioemu/i386-dm/config\.mak$ -^tools/ioemu/i386-dm/qemu-dm$ -^tools/ioemu/qemu-doc\.html$ -^tools/ioemu/qemu-img\.1$ -^tools/ioemu/qemu-img\.pod$ -^tools/ioemu/qemu-tech\.html$ -^tools/ioemu/qemu\.1$ -^tools/ioemu/qemu\.pod$ -^tools/ioemu/tapdisk-ioemu$ ^tools/libxc/ia64/asm/.*\.h$ ^tools/libxc/ia64/acpi/.*\.h$ ^tools/libxc/ia64/acpi/platform/.*\.h$ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:55:45 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:55:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6d-0006FC-1g; Fri, 03 Feb 2012 21:55:43 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6b-0006Ed-3g for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:41 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-27.messagelabs.com!1328306018!62474666!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.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1759 invoked from network); 3 Feb 2012 21:53:39 -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; 3 Feb 2012 21:53:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6W-0001ho-GK for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR6V-0002Do-7O for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:35 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:55:34 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: New event generation API X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Jackson # Date 1327683682 0 # Node ID 4f3822ee1f437792ff89b53cc5e2c59d98dbf337 # Parent db9cac5b24897a5a936a516660457ace6043fc22 libxl: New event generation API Replace the existing API for retrieving high-level events (events about domains, etc.) from libxl with a new one. This changes the definition and semantics of the `libxl_event' structure, and replaces the calls for obtaining information about domain death and disk eject events. This is an incompatible change, sorry. The alternative was to try to provide both the previous horrid API and the new one, and would also involve never using the name `libxl_event' for the new interface. The new "libxl_event" structure is blacklisted in the ocaml bindings for two reasons: - It has a field name "type" (which is a keyword in ocaml); the ocaml idl generator should massage this field name on output, to "type_" perhaps. - The ocaml idl generator does not support KeyedUnion. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r db9cac5b2489 -r 4f3822ee1f43 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Fri Jan 27 17:01:21 2012 +0000 +++ b/tools/libxl/libxl.c Fri Jan 27 17:01:22 2012 +0000 @@ -45,8 +45,11 @@ * only as an initialiser, not as an expression. */ memcpy(&ctx->lock, &mutex_value, sizeof(ctx->lock)); + LIBXL_TAILQ_INIT(&ctx->occurred); + ctx->osevent_hooks = 0; + ctx->fd_polls = 0; ctx->fd_rindex = 0; LIBXL_LIST_INIT(&ctx->efds); LIBXL_TAILQ_INIT(&ctx->etimes); @@ -55,6 +58,9 @@ LIBXL_SLIST_INIT(&ctx->watch_freeslots); libxl__ev_fd_init(&ctx->watch_efd); + LIBXL_TAILQ_INIT(&ctx->death_list); + libxl__ev_xswatch_init(&ctx->death_watch); + if ( stat(XENSTORE_PID_FILE, &stat_buf) != 0 ) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Is xenstore daemon running?\n" "failed to stat %s", XENSTORE_PID_FILE); @@ -86,6 +92,20 @@ return rc; } +static void free_disable_deaths(libxl__gc *gc, + struct libxl__evgen_domain_death_list *l) { + libxl_evgen_domain_death *death; + while ((death = LIBXL_TAILQ_FIRST(l))) + libxl__evdisable_domain_death(gc, death); +} + +static void discard_events(struct libxl__event_list *l) { + /* doesn't bother unlinking from the list, so l is corrupt on return */ + libxl_event *ev; + LIBXL_TAILQ_FOREACH(ev, l, link) + libxl_event_free(0, ev); +} + int libxl_ctx_free(libxl_ctx *ctx) { if (!ctx) return 0; @@ -95,6 +115,13 @@ /* Deregister all libxl__ev_KINDs: */ + free_disable_deaths(gc, &CTX->death_list); + free_disable_deaths(gc, &CTX->death_reported); + + libxl_evgen_disk_eject *eject; + while ((eject = LIBXL_LIST_FIRST(&CTX->disk_eject_evgens))) + libxl__evdisable_disk_eject(gc, eject); + for (i = 0; i < ctx->watch_nslots; i++) assert(!libxl__watch_slot_contents(gc, i)); libxl__ev_fd_deregister(gc, &ctx->watch_efd); @@ -108,9 +135,12 @@ libxl_version_info_dispose(&ctx->version_info); if (ctx->xsh) xs_daemon_close(ctx->xsh); + free(ctx->fd_polls); free(ctx->fd_rindex); free(ctx->watch_slots); + discard_events(&ctx->occurred); + GC_FREE; free(ctx); return 0; @@ -646,117 +676,177 @@ return ret; } -int libxl_get_wait_fd(libxl_ctx *ctx, int *fd) -{ - *fd = xs_fileno(ctx->xsh); - return 0; +static void domain_death_xswatch_callback(libxl__egc *egc, libxl__ev_xswatch *w, + const char *wpath, const char *epath) { + EGC_GC; + libxl_evgen_domain_death *evg; + uint32_t domid; + int rc; + + CTX_LOCK; + + evg = LIBXL_TAILQ_FIRST(&CTX->death_list); + if (!evg) goto out; + + domid = evg->domid; + + for (;;) { + int nentries = LIBXL_TAILQ_NEXT(evg, entry) ? 200 : 1; + xc_domaininfo_t domaininfos[nentries]; + const xc_domaininfo_t *got = domaininfos, *gotend; + + rc = xc_domain_getinfolist(CTX->xch, domid, nentries, domaininfos); + if (rc == -1) { + LIBXL__EVENT_DISASTER(egc, "xc_domain_getinfolist failed while" + " processing @releaseDomain watch event", + errno, 0); + goto out; + } + gotend = &domaininfos[rc]; + + for (;;) { + if (!evg) + goto all_reported; + + if (!rc || got->domain > evg->domid) { + /* ie, the list doesn't contain evg->domid any more so + * the domain has been destroyed */ + libxl_evgen_domain_death *evg_next; + + libxl_event *ev = NEW_EVENT(egc, DOMAIN_DESTROY, evg->domid); + if (!ev) goto out; + + libxl__event_occurred(egc, ev); + + evg->death_reported = 1; + evg_next = LIBXL_TAILQ_NEXT(evg, entry); + LIBXL_TAILQ_REMOVE(&CTX->death_list, evg, entry); + LIBXL_TAILQ_INSERT_HEAD(&CTX->death_reported, evg, entry); + evg = evg_next; + + continue; + } + + if (got == gotend) + break; + + if (got->domain < evg->domid) { + got++; + continue; + } + + assert(evg->domid == got->domain); + + if (!evg->shutdown_reported && + (got->flags & XEN_DOMINF_shutdown)) { + libxl_event *ev = NEW_EVENT(egc, DOMAIN_SHUTDOWN, got->domain); + if (!ev) goto out; + + ev->u.domain_shutdown.shutdown_reason = + (got->flags >> XEN_DOMINF_shutdownshift) & + XEN_DOMINF_shutdownmask; + libxl__event_occurred(egc, ev); + + evg->shutdown_reported = 1; + } + evg = LIBXL_TAILQ_NEXT(evg, entry); + } + + assert(rc); /* rc==0 results in us eating all evgs and quitting */ + domid = gotend[-1].domain; + } + all_reported: + out: + + CTX_UNLOCK; } -int libxl_wait_for_domain_death(libxl_ctx *ctx, uint32_t domid, libxl_waiter *waiter) -{ - waiter->path = strdup("@releaseDomain"); - if (asprintf(&(waiter->token), "%d", LIBXL_EVENT_TYPE_DOMAIN_DEATH) < 0) - return -1; - if (!xs_watch(ctx->xsh, waiter->path, waiter->token)) - return -1; - return 0; -} - -int libxl_wait_for_disk_ejects(libxl_ctx *ctx, uint32_t guest_domid, libxl_device_disk *disks, int num_disks, libxl_waiter *waiter) -{ +int libxl_evenable_domain_death(libxl_ctx *ctx, uint32_t domid, + libxl_ev_user user, libxl_evgen_domain_death **evgen_out) { GC_INIT(ctx); - int i, rc = -1; - uint32_t domid = libxl_get_stubdom_id(ctx, guest_domid); - - if (!domid) - domid = guest_domid; - - for (i = 0; i < num_disks; i++) { - if (asprintf(&(waiter[i].path), "%s/device/vbd/%d/eject", - libxl__xs_get_dompath(gc, domid), - libxl__device_disk_dev_number(disks[i].vdev, - NULL, NULL)) < 0) - goto out; - if (asprintf(&(waiter[i].token), "%d", LIBXL_EVENT_TYPE_DISK_EJECT) < 0) - goto out; - xs_watch(ctx->xsh, waiter[i].path, waiter[i].token); + libxl_evgen_domain_death *evg, *evg_search; + int rc; + + CTX_LOCK; + + evg = malloc(sizeof(*evg)); if (!evg) { rc = ERROR_NOMEM; goto out; } + memset(evg, 0, sizeof(*evg)); + evg->domid = domid; + evg->user = user; + + LIBXL_TAILQ_INSERT_SORTED(&ctx->death_list, entry, evg, evg_search, , + evg->domid > evg_search->domid); + + if (!libxl__ev_xswatch_isregistered(&ctx->death_watch)) { + rc = libxl__ev_xswatch_register(gc, &ctx->death_watch, + domain_death_xswatch_callback, "@releaseDomain"); + if (rc) { libxl__evdisable_domain_death(gc, evg); goto out; } } + + *evgen_out = evg; rc = 0; -out: + + out: + CTX_UNLOCK; GC_FREE; return rc; +}; + +void libxl__evdisable_domain_death(libxl__gc *gc, + libxl_evgen_domain_death *evg) { + CTX_LOCK; + + if (!evg->death_reported) + LIBXL_TAILQ_REMOVE(&CTX->death_list, evg, entry); + else + LIBXL_TAILQ_REMOVE(&CTX->death_reported, evg, entry); + + free(evg); + + if (!LIBXL_TAILQ_FIRST(&CTX->death_list) && + libxl__ev_xswatch_isregistered(&CTX->death_watch)) + libxl__ev_xswatch_deregister(gc, &CTX->death_watch); + + CTX_UNLOCK; } -int libxl_get_event(libxl_ctx *ctx, libxl_event *event) -{ - unsigned int num; - char **events = xs_read_watch(ctx->xsh, &num); - if (num != 2) { - free(events); - return ERROR_FAIL; - } - event->path = strdup(events[XS_WATCH_PATH]); - event->token = strdup(events[XS_WATCH_TOKEN]); - event->type = atoi(event->token); - free(events); - return 0; +void libxl_evdisable_domain_death(libxl_ctx *ctx, + libxl_evgen_domain_death *evg) { + GC_INIT(ctx); + libxl__evdisable_domain_death(gc, evg); + GC_FREE; } -int libxl_stop_waiting(libxl_ctx *ctx, libxl_waiter *waiter) -{ - if (!xs_unwatch(ctx->xsh, waiter->path, waiter->token)) - return ERROR_FAIL; - else - return 0; -} - -int libxl_free_event(libxl_event *event) -{ - free(event->path); - free(event->token); - return 0; -} - -int libxl_free_waiter(libxl_waiter *waiter) -{ - free(waiter->path); - free(waiter->token); - return 0; -} - -int libxl_event_get_domain_death_info(libxl_ctx *ctx, uint32_t domid, libxl_event *event, libxl_dominfo *info) -{ - if (libxl_domain_info(ctx, info, domid) < 0) - return 0; - - if (info->running || (!info->shutdown && !info->dying)) - return ERROR_INVAL; - - return 1; -} - -int libxl_event_get_disk_eject_info(libxl_ctx *ctx, uint32_t domid, libxl_event *event, libxl_device_disk *disk) -{ - GC_INIT(ctx); - char *path; +static void disk_eject_xswatch_callback(libxl__egc *egc, libxl__ev_xswatch *w, + const char *wpath, const char *epath) { + EGC_GC; + libxl_evgen_disk_eject *evg = (void*)w; char *backend; char *value; char backend_type[BACKEND_STRING_SIZE+1]; - value = libxl__xs_read(gc, XBT_NULL, event->path); - - if (!value || strcmp(value, "eject")) { - GC_FREE; - return 0; + value = libxl__xs_read(gc, XBT_NULL, wpath); + + if (!value || strcmp(value, "eject")) + return; + + if (libxl__xs_write(gc, XBT_NULL, wpath, "")) { + LIBXL__EVENT_DISASTER(egc, "xs_write failed acknowledging eject", + errno, LIBXL_EVENT_TYPE_DISK_EJECT); + return; } - path = strdup(event->path); - path[strlen(path) - 6] = '\0'; - backend = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, "%s/backend", path)); + libxl_event *ev = NEW_EVENT(egc, DISK_EJECT, evg->domid); + libxl_device_disk *disk = &ev->u.disk_eject.disk; + + backend = libxl__xs_read(gc, XBT_NULL, + libxl__sprintf(gc, "%.*s/backend", + (int)strlen(wpath)-6, wpath)); sscanf(backend, - "/local/domain/%d/backend/%" TOSTRING(BACKEND_STRING_SIZE) "[a-z]/%*d/%*d", - &disk->backend_domid, backend_type); + "/local/domain/%d/backend/%" TOSTRING(BACKEND_STRING_SIZE) + "[a-z]/%*d/%*d", + &disk->backend_domid, backend_type); if (!strcmp(backend_type, "tap") || !strcmp(backend_type, "vbd")) { disk->backend = LIBXL_DISK_BACKEND_TAP; } else if (!strcmp(backend_type, "qdisk")) { @@ -765,19 +855,83 @@ disk->backend = LIBXL_DISK_BACKEND_UNKNOWN; } - disk->pdev_path = strdup(""); + disk->pdev_path = strdup(""); /* xxx fixme malloc failure */ disk->format = LIBXL_DISK_FORMAT_EMPTY; /* this value is returned to the user: do not free right away */ - disk->vdev = xs_read(ctx->xsh, XBT_NULL, libxl__sprintf(gc, "%s/dev", backend), NULL); + disk->vdev = xs_read(CTX->xsh, XBT_NULL, + libxl__sprintf(gc, "%s/dev", backend), NULL); disk->removable = 1; disk->readwrite = 0; disk->is_cdrom = 1; - free(path); + libxl__event_occurred(egc, ev); +} + +int libxl_evenable_disk_eject(libxl_ctx *ctx, uint32_t guest_domid, + const char *vdev, libxl_ev_user user, + libxl_evgen_disk_eject **evgen_out) { + GC_INIT(ctx); + CTX_LOCK; + int rc; + char *path; + libxl_evgen_disk_eject *evg = NULL; + + evg = malloc(sizeof(*evg)); if (!evg) { rc = ERROR_NOMEM; goto out; } + memset(evg, 0, sizeof(*evg)); + evg->user = user; + evg->domid = guest_domid; + LIBXL_LIST_INSERT_HEAD(&CTX->disk_eject_evgens, evg, entry); + + evg->vdev = strdup(vdev); + if (!evg->vdev) { rc = ERROR_NOMEM; goto out; } + + uint32_t domid = libxl_get_stubdom_id(ctx, guest_domid); + + if (!domid) + domid = guest_domid; + + path = libxl__sprintf(gc, "%s/device/vbd/%d/eject", + libxl__xs_get_dompath(gc, domid), + libxl__device_disk_dev_number(vdev, NULL, NULL)); + if (!path) { rc = ERROR_NOMEM; goto out; } + + rc = libxl__ev_xswatch_register(gc, &evg->watch, + disk_eject_xswatch_callback, path); + if (rc) goto out; + + *evgen_out = evg; + CTX_UNLOCK; GC_FREE; - return 1; + return 0; + + out: + if (evg) + libxl__evdisable_disk_eject(gc, evg); + CTX_UNLOCK; + GC_FREE; + return rc; } +void libxl__evdisable_disk_eject(libxl__gc *gc, libxl_evgen_disk_eject *evg) { + CTX_LOCK; + + LIBXL_LIST_REMOVE(evg, entry); + + if (libxl__ev_xswatch_isregistered(&evg->watch)) + libxl__ev_xswatch_deregister(gc, &evg->watch); + + free(evg->vdev); + free(evg); + + CTX_UNLOCK; +} + +void libxl_evdisable_disk_eject(libxl_ctx *ctx, libxl_evgen_disk_eject *evg) { + GC_INIT(ctx); + libxl__evdisable_disk_eject(gc, evg); + GC_FREE; +} + int libxl_domain_destroy(libxl_ctx *ctx, uint32_t domid) { GC_INIT(ctx); diff -r db9cac5b2489 -r 4f3822ee1f43 tools/libxl/libxl.h --- a/tools/libxl/libxl.h Fri Jan 27 17:01:21 2012 +0000 +++ b/tools/libxl/libxl.h Fri Jan 27 17:01:22 2012 +0000 @@ -53,7 +53,10 @@ * A public function may be called from within libxl; the call * context initialisation macros will make sure that the internal * caller's context is reused (eg, so that the same xenstore - * transaction is used). + * transaction is used). But in-libxl callers of libxl public + * functions should note that any libxl public function may cause + * recursively reentry into libxl via the application's event + * callback hook. * * Public functions have names like libxl_foobar. * @@ -152,6 +155,8 @@ typedef uint32_t libxl_hwcap[8]; +typedef uint64_t libxl_ev_user; + typedef struct { uint32_t size; /* number of bytes in map */ uint8_t *map; @@ -200,6 +205,9 @@ int v; } libxl_enum_string_table; +struct libxl_event; +typedef LIBXL_TAILQ_ENTRY(struct libxl_event) libxl_ev_link; + typedef struct libxl__ctx libxl_ctx; #include "_libxl_types.h" @@ -300,51 +308,6 @@ /* 0 means ERROR_ENOMEM, which we have logged */ -/* events handling */ - -typedef struct { - /* event type */ - libxl_event_type type; - /* data for internal use of the library */ - char *path; - char *token; -} libxl_event; - -typedef struct { - char *path; - char *token; -} libxl_waiter; - - -int libxl_get_wait_fd(libxl_ctx *ctx, int *fd); -/* waiter is allocated by the caller */ -int libxl_wait_for_domain_death(libxl_ctx *ctx, uint32_t domid, libxl_waiter *waiter); -/* waiter is a preallocated array of num_disks libxl_waiter elements */ -int libxl_wait_for_disk_ejects(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disks, int num_disks, libxl_waiter *waiter); -int libxl_get_event(libxl_ctx *ctx, libxl_event *event); -int libxl_stop_waiting(libxl_ctx *ctx, libxl_waiter *waiter); -int libxl_free_event(libxl_event *event); -int libxl_free_waiter(libxl_waiter *waiter); - -/* - * Returns: - * - 0 if the domain is dead but there is no cleanup to be done. e.g - * because someone else has already done it. - * - 1 if the domain is dead and there is cleanup to be done. - * - * Can return error if the domain exists and is still running. - * - * *info will contain valid domain state iff 1 is returned. In - * particular if 1 is returned then info->shutdown_reason is - * guaranteed to be valid since by definition the domain is - * (shutdown||dying)) - */ -int libxl_event_get_domain_death_info(libxl_ctx *ctx, uint32_t domid, libxl_event *event, libxl_dominfo *info); - -/* - * Returns true and fills *disk if the caller should eject the disk - */ -int libxl_event_get_disk_eject_info(libxl_ctx *ctx, uint32_t domid, libxl_event *event, libxl_device_disk *disk); int libxl_domain_rename(libxl_ctx *ctx, uint32_t domid, const char *old_name, const char *new_name); diff -r db9cac5b2489 -r 4f3822ee1f43 tools/libxl/libxl_event.c --- a/tools/libxl/libxl_event.c Fri Jan 27 17:01:21 2012 +0000 +++ b/tools/libxl/libxl_event.c Fri Jan 27 17:01:22 2012 +0000 @@ -510,9 +510,9 @@ * osevent poll */ -int libxl_osevent_beforepoll(libxl_ctx *ctx, int *nfds_io, - struct pollfd *fds, int *timeout_upd, - struct timeval now) +static int beforepoll_internal(libxl__gc *gc, int *nfds_io, + struct pollfd *fds, int *timeout_upd, + struct timeval now) { libxl__ev_fd *efd; int rc; @@ -524,9 +524,6 @@ * the fds array corresponds to a slot in fd_beforepolled. */ - GC_INIT(ctx); - CTX_LOCK; - if (*nfds_io) { /* * As an optimisation, we don't touch fd_rindex @@ -593,8 +590,18 @@ } out: + return rc; +} + +int libxl_osevent_beforepoll(libxl_ctx *ctx, int *nfds_io, + struct pollfd *fds, int *timeout_upd, + struct timeval now) +{ + EGC_INIT(ctx); + CTX_LOCK; + int rc = beforepoll_internal(gc, nfds_io, fds, timeout_upd, now); CTX_UNLOCK; - GC_FREE; + EGC_FREE; return rc; } @@ -623,11 +630,11 @@ return revents; } -void libxl_osevent_afterpoll(libxl_ctx *ctx, int nfds, const struct pollfd *fds, - struct timeval now) +static void afterpoll_internal(libxl__egc *egc, + int nfds, const struct pollfd *fds, + struct timeval now) { - EGC_INIT(ctx); - CTX_LOCK; + EGC_GC; libxl__ev_fd *efd; LIBXL_LIST_FOREACH(efd, &CTX->efds, entry) { @@ -653,12 +660,18 @@ etime->func(egc, etime, &etime->abs); } +} +void libxl_osevent_afterpoll(libxl_ctx *ctx, int nfds, const struct pollfd *fds, + struct timeval now) +{ + EGC_INIT(ctx); + CTX_LOCK; + afterpoll_internal(egc, nfds, fds, now); CTX_UNLOCK; EGC_FREE; } - /* * osevent hook and callback machinery */ @@ -723,11 +736,10 @@ type ? libxl_event_type_to_string(type) : "", type ? ")" : ""); - /* - * FIXME: This should call the "disaster" hook supplied to - * libxl_event_register_callbacks, which will be introduced in the - * next patch. - */ + if (CTX->event_hooks && CTX->event_hooks->disaster) { + CTX->event_hooks->disaster(CTX->event_hooks_user, type, msg, errnoval); + return; + } const char verybad[] = "DISASTER in event loop not handled by libxl application"; @@ -736,9 +748,197 @@ exit(-1); } +static void egc_run_callbacks(libxl__egc *egc) +{ + EGC_GC; + libxl_event *ev, *ev_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); + } +} + void libxl__egc_cleanup(libxl__egc *egc) { - libxl__free_all(&egc->gc); + EGC_GC; + libxl__free_all(gc); + + egc_run_callbacks(egc); +} + +/* + * Event retrieval etc. + */ + +void libxl_event_register_callbacks(libxl_ctx *ctx, + const libxl_event_hooks *hooks, void *user) +{ + ctx->event_hooks = hooks; + ctx->event_hooks_user = user; +} + +void libxl__event_occurred(libxl__egc *egc, libxl_event *event) +{ + EGC_GC; + + if (CTX->event_hooks && + (CTX->event_hooks->event_occurs_mask & (1UL << event->type))) { + /* libxl__egc_cleanup will call the callback, just before exit + * from libxl. This helps avoid reentrancy bugs: parts of + * libxl that call libxl__event_occurred do not have to worry + * that libxl might be reentered at that point. */ + LIBXL_TAILQ_INSERT_TAIL(&egc->occurred_for_callback, event, link); + return; + } else { + LIBXL_TAILQ_INSERT_TAIL(&CTX->occurred, event, link); + } +} + +void libxl_event_free(libxl_ctx *ctx, libxl_event *event) +{ + /* Exceptionally, this function may be called from libxl, with ctx==0 */ + libxl_event_dispose(event); + free(event); +} + +libxl_event *libxl__event_new(libxl__egc *egc, + libxl_event_type type, uint32_t domid) +{ + 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->type = type; + ev->domid = domid; + + return ev; +} + +static int event_check_internal(libxl__egc *egc, libxl_event **event_r, + unsigned long typemask, + libxl_event_predicate *pred, void *pred_user) +{ + EGC_GC; + libxl_event *ev; + int rc; + + LIBXL_TAILQ_FOREACH(ev, &CTX->occurred, link) { + if (!(typemask & ((uint64_t)1 << ev->type))) + continue; + + if (pred && !pred(ev, pred_user)) + continue; + + /* got one! */ + LIBXL_TAILQ_REMOVE(&CTX->occurred, ev, link); + *event_r = ev; + rc = 0; + goto out; + } + rc = ERROR_NOT_READY; + + out: + return rc; +} + +int libxl_event_check(libxl_ctx *ctx, libxl_event **event_r, + uint64_t typemask, + libxl_event_predicate *pred, void *pred_user) +{ + EGC_INIT(ctx); + CTX_LOCK; + int rc = event_check_internal(egc, event_r, typemask, pred, pred_user); + CTX_UNLOCK; + EGC_FREE; + return rc; +} + +static int eventloop_iteration(libxl__egc *egc) { + EGC_GC; + int rc; + struct timeval now; + + CTX_LOCK; + + rc = libxl__gettimeofday(gc, &now); + if (rc) goto out; + + int timeout; + + for (;;) { + int nfds = CTX->fd_polls_allocd; + timeout = -1; + rc = beforepoll_internal(gc, &nfds, CTX->fd_polls, &timeout, now); + if (!rc) break; + if (rc != ERROR_BUFFERFULL) goto out; + + struct pollfd *newarray = + (nfds > INT_MAX / sizeof(struct pollfd) / 2) ? 0 : + realloc(CTX->fd_polls, sizeof(*newarray) * nfds); + + if (!newarray) { rc = ERROR_NOMEM; goto out; } + + CTX->fd_polls = newarray; + CTX->fd_polls_allocd = nfds; + } + + rc = poll(CTX->fd_polls, CTX->fd_polls_allocd, timeout); + if (rc < 0) { + if (errno == EINTR) + return 0; /* will go round again if caller requires */ + + LIBXL__LOG_ERRNOVAL(CTX, LIBXL__LOG_ERROR, errno, "poll failed"); + rc = ERROR_FAIL; + goto out; + } + + rc = libxl__gettimeofday(gc, &now); + if (rc) goto out; + + afterpoll_internal(egc, CTX->fd_polls_allocd, CTX->fd_polls, now); + + CTX_UNLOCK; + + rc = 0; + out: + return rc; +} + +int libxl_event_wait(libxl_ctx *ctx, libxl_event **event_r, + uint64_t typemask, + libxl_event_predicate *pred, void *pred_user) +{ + int rc; + + EGC_INIT(ctx); + CTX_LOCK; + + for (;;) { + rc = event_check_internal(egc, event_r, typemask, pred, pred_user); + if (rc != ERROR_NOT_READY) goto out; + + rc = eventloop_iteration(egc); + if (rc) goto out; + + /* we unlock and cleanup the egc each time we go through this loop, + * so that (a) we don't accumulate garbage and (b) any events + * which are to be dispatched by callback are actually delivered + * in a timely fashion. + */ + CTX_UNLOCK; + libxl__egc_cleanup(egc); + CTX_LOCK; + } + + out: + CTX_UNLOCK; + EGC_FREE; + return rc; } /* diff -r db9cac5b2489 -r 4f3822ee1f43 tools/libxl/libxl_event.h --- a/tools/libxl/libxl_event.h Fri Jan 27 17:01:21 2012 +0000 +++ b/tools/libxl/libxl_event.h Fri Jan 27 17:01:22 2012 +0000 @@ -18,6 +18,181 @@ #include +/*======================================================================*/ + +/* + * Domain event handling - getting Xen events from libxl + * + * (Callers inside libxl may not call libxl_event_check or _wait.) + */ + +#define LIBXL_EVENTMASK_ALL (~(unsigned long)0) + +typedef int libxl_event_predicate(const libxl_event*, void *user); + /* Return value is 0 if the event is unwanted or non-0 if it is. + * Predicates are not allowed to fail. + */ + +int libxl_event_check(libxl_ctx *ctx, libxl_event **event_r, + uint64_t typemask, + libxl_event_predicate *predicate, void *predicate_user); + /* Searches for an event, already-happened, which matches typemask + * and predicate. predicate==0 matches any event. + * libxl_event_check returns the event, which must then later be + * freed by the caller using libxl_event_free. + * + * Returns ERROR_NOT_READY if no such event has happened. + */ + +int libxl_event_wait(libxl_ctx *ctx, libxl_event **event_r, + uint64_t typemask, + libxl_event_predicate *predicate, void *predicate_user); + /* Like libxl_event_check but blocks if no suitable events are + * available, until some are. Uses libxl_osevent_beforepoll/ + * _afterpoll so may be inefficient if very many domains are being + * handled by a single program. + */ + +void libxl_event_free(libxl_ctx *ctx, libxl_event *event); + + +/* Alternatively or additionally, the application may also use this: */ + +typedef struct libxl_event_hooks { + uint64_t event_occurs_mask; + void (*event_occurs)(void *user, const libxl_event *event); + void (*disaster)(void *user, libxl_event_type type, + const char *msg, int errnoval); +} libxl_event_hooks; + +void libxl_event_register_callbacks(libxl_ctx *ctx, + const libxl_event_hooks *hooks, void *user); + /* + * Arranges that libxl will henceforth call event_occurs for any + * events whose type is set in event_occurs_mask, rather than + * queueing the event for retrieval by libxl_event_check/wait. + * Events whose bit is clear in mask are not affected. + * + * event becomes owned by the application and must be freed, either + * by event_occurs or later. + * + * event_occurs may be NULL if mask is 0. + * + * libxl_event_register_callback also provides a way for libxl to + * report to the application that there was a problem reporting + * events; this can occur due to lack of host memory during event + * handling, or other wholly unrecoverable errors from system calls + * made by libxl. This will not happen for frivolous reasons - only + * if the system, or the Xen components of it, are badly broken. + * + * msg and errnoval will describe the action that libxl was trying + * to do, and type specifies the type of libxl events which may be + * missing. type may be 0 in which case events of all types may be + * missing. + * + * disaster may be NULL. If it is, or if _register_callbacks has + * not been called, errors of this kind are fatal to the entire + * application: libxl will print messages to its logs and to stderr + * and call exit(-1). + * + * If disaster returns, it may be the case that some or all future + * libxl calls will return errors; likewise it may be the case that + * no more events (of the specified type, if applicable) can be + * produced. An application which supplies a disaster function + * should normally react either by exiting, or by (when it has + * returned to its main event loop) shutting down libxl with + * libxl_ctx_free and perhaps trying to restart it with + * libxl_ctx_init. + * + * In any case before calling disaster, libxl will have logged a + * message with level XTL_CRITICAL. + * + * Reentrancy: it IS permitted to call libxl from within + * event_occurs. It is NOT permitted to call libxl from within + * disaster. The event_occurs and disaster callbacks may occur on + * any thread in which the application calls libxl. + * + * libxl_event_register_callbacks may be called as many times, with + * different parameters, as the application likes; the most recent + * call determines the libxl behaviour. However it is NOT safe to + * call _register_callbacks concurrently with, or reentrantly from, + * any other libxl function. + * + * Calls to _register_callbacks do not affect events which have + * already occurred. + */ + + +/* + * Events are only generated if they have been requested. + * The following functions request the generation of specific events. + * + * Each set of functions for controlling event generation has this form: + * + * typedef struct libxl__evgen_FOO libxl__evgen_FOO; + * int libxl_evenable_FOO(libxl_ctx *ctx, FURTHER PARAMETERS, + * libxl_ev_user user, libxl__evgen_FOO **evgen_out); + * void libxl_evdisable_FOO(libxl_ctx *ctx, libxl__evgen_FOO *evgen); + * + * The evenable function arranges that the events (as described in the + * doc comment for the individual function) will start to be generated + * by libxl. On success, *evgen_out is set to a non-null pointer to + * an opaque struct. + * + * The user value is returned in the generated events and may be + * used by the caller for whatever it likes. The type ev_user is + * guaranteed to be an unsigned integer type which is at least + * as big as uint64_t and is also guaranteed to be big enough to + * contain any intptr_t value. + * + * If it becomes desirable to stop generation of the relevant events, + * or to reclaim the resources in libxl associated with the evgen + * structure, the same evgen value should be passed to the evdisable + * function. However, note that events which occurred prior to the + * evdisable call may still be returned. + * + * The caller may enable identical events more than once. If they do + * so, each actual occurrence will generate several events to be + * returned by libxl_event_check, with the appropriate user value(s). + * Aside from this, each occurrence of each event is returned by + * libxl_event_check exactly once. + * + * An evgen is associated with the libxl_ctx used for its creation. + * 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 + * inside libxl indefinitely. libxl_event_check/_wait may be O(n) + * where n is the number of queued events which do not match the + * criteria specified in the arguments to check/wait. + */ + +typedef struct libxl__evgen_domain_death libxl_evgen_domain_death; +int libxl_evenable_domain_death(libxl_ctx *ctx, uint32_t domid, + libxl_ev_user, libxl_evgen_domain_death **evgen_out); +void libxl_evdisable_domain_death(libxl_ctx *ctx, libxl_evgen_domain_death*); + /* Arranges for the generation of DOMAIN_SHUTDOWN and DOMAIN_DESTROY + * events. A domain which is destroyed before it shuts down + * may generate only a DESTROY event. + */ + +typedef struct libxl__evgen_disk_eject libxl_evgen_disk_eject; +int libxl_evenable_disk_eject(libxl_ctx *ctx, uint32_t domid, const char *vdev, + libxl_ev_user, libxl_evgen_disk_eject **evgen_out); +void libxl_evdisable_disk_eject(libxl_ctx *ctx, libxl_evgen_disk_eject*); + /* Arranges for the generation of DISK_EJECT events. A copy of the + * string *vdev will be made for libxl's internal use, and a pointer + * to this (or some other) copy will be returned as the vdev + * member of event.u. + */ + /*======================================================================*/ @@ -36,10 +211,10 @@ * poll(); * libxl_osevent_afterpoll(...); * for (;;) { - * r=libxl_event_check(...); - * if (r==LIBXL_NOT_READY) break; - * if (r) handle failure; - * do something with the event; + * r = libxl_event_check(...); + * if (r==LIBXL_NOT_READY) break; + * if (r) goto error_out; + * do something with the event; * } * } * diff -r db9cac5b2489 -r 4f3822ee1f43 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri Jan 27 17:01:21 2012 +0000 +++ b/tools/libxl/libxl_internal.h Fri Jan 27 17:01:22 2012 +0000 @@ -177,11 +177,45 @@ libxl__ev_xswatch *libxl__watch_slot_contents(libxl__gc *gc, int slotnum); + +/* + * evgen structures, which are the state we use for generating + * events for the caller. + * + * In general in each case there's an internal and an external + * version of the _evdisable_FOO function; the internal one is + * used during cleanup. + */ + +struct libxl__evgen_domain_death { + uint32_t domid; + unsigned shutdown_reported:1, death_reported:1; + LIBXL_TAILQ_ENTRY(libxl_evgen_domain_death) entry; + /* on list .death_reported ? CTX->death_list : CTX->death_reported */ + libxl_ev_user user; +}; +_hidden void +libxl__evdisable_domain_death(libxl__gc*, libxl_evgen_domain_death*); + +struct libxl__evgen_disk_eject { + libxl__ev_xswatch watch; + uint32_t domid; + LIBXL_LIST_ENTRY(libxl_evgen_disk_eject) entry; + libxl_ev_user user; + char *vdev; +}; +_hidden void +libxl__evdisable_disk_eject(libxl__gc*, libxl_evgen_disk_eject*); + + struct libxl__ctx { xentoollog_logger *lg; xc_interface *xch; struct xs_handle *xsh; + const libxl_event_hooks *event_hooks; + void *event_hooks_user; + pthread_mutex_t lock; /* protects data structures hanging off the ctx */ /* Always use libxl__ctx_lock and _unlock (or the convenience * macors CTX_LOCK and CTX_UNLOCK) to manipulate this. @@ -195,12 +229,16 @@ * documented in the libxl public interface. */ + LIBXL_TAILQ_HEAD(libxl__event_list, libxl_event) occurred; + int osevent_in_hook; const libxl_osevent_hooks *osevent_hooks; void *osevent_user; /* See the comment for OSEVENT_HOOK_INTERN in libxl_event.c * for restrictions on the use of the osevent fields. */ + struct pollfd *fd_polls; + int fd_polls_allocd; int fd_rindex_allocd; int *fd_rindex; /* see libxl_osevent_beforepoll */ LIBXL_LIST_HEAD(, libxl__ev_fd) efds; @@ -212,6 +250,13 @@ uint32_t watch_counter; /* helps disambiguate slot reuse */ libxl__ev_fd watch_efd; + LIBXL_TAILQ_HEAD(libxl__evgen_domain_death_list, libxl_evgen_domain_death) + death_list /* sorted by domid */, + death_reported; + libxl__ev_xswatch death_watch; + + 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 */ @@ -252,6 +297,7 @@ struct libxl__egc { /* for event-generating functions only */ struct libxl__gc gc; + struct libxl__event_list occurred_for_callback; }; #define LIBXL_INIT_GC(gc,ctx) do{ \ @@ -396,6 +442,9 @@ * * Callers of libxl__ev_KIND_register must ensure that the * registration is undone, with _deregister, in libxl_ctx_free. + * This means that normally each kind of libxl__evgen (ie each + * application-requested event source) needs to be on a list so that + * it can be automatically deregistered as promised in libxl_event.h. */ @@ -439,6 +488,25 @@ /* + * Other event-handling support provided by the libxl event core to + * the rest of libxl. + */ + +_hidden void libxl__event_occurred(libxl__egc*, libxl_event *event); + /* Arranges to notify the application that the event has occurred. + * event should be suitable for passing to libxl_event_free. */ + +_hidden libxl_event *libxl__event_new(libxl__egc*, libxl_event_type, + uint32_t domid); + /* Convenience function. + * Allocates a new libxl_event, fills in domid and type. + * If allocation fails, calls _disaster, and returns NULL. */ + +#define NEW_EVENT(egc, type, domid) \ + libxl__event_new((egc), LIBXL_EVENT_TYPE_##type, (domid)); + /* Convenience macro. */ + +/* * In general, call this via the macro LIBXL__EVENT_DISASTER. * * Event-generating functions may call this if they might have wanted @@ -995,12 +1063,15 @@ /* egc initialisation and destruction: */ -#define LIBXL_INIT_EGC(egc,ctx) do{ \ - LIBXL_INIT_GC((egc).gc,ctx); \ - /* list of occurred events tbd */ \ +#define LIBXL_INIT_EGC(egc,ctx) do{ \ + LIBXL_INIT_GC((egc).gc,ctx); \ + LIBXL_TAILQ_INIT(&(egc).occurred_for_callback); \ } while(0) _hidden void libxl__egc_cleanup(libxl__egc *egc); + /* Frees memory allocated within this egc's gc, and and report all + * occurred events via callback, if applicable. May reenter the + * application; see restrictions above. */ /* convenience macros: */ diff -r db9cac5b2489 -r 4f3822ee1f43 tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Fri Jan 27 17:01:21 2012 +0000 +++ b/tools/libxl/libxl_types.idl Fri Jan 27 17:01:22 2012 +0000 @@ -75,11 +75,6 @@ (6, "COREDUMP_RESTART"), ]) -libxl_event_type = Enumeration("event_type", [ - (1, "DOMAIN_DEATH"), - (2, "DISK_EJECT"), - ]) - libxl_button = Enumeration("button", [ (1, "POWER"), (2, "SLEEP"), @@ -397,3 +392,32 @@ ("extratime", integer), ("weight", integer), ], dispose_fn=None) + +libxl_event_type = Enumeration("event_type", [ + (1, "DOMAIN_SHUTDOWN"), + (2, "DOMAIN_DESTROY"), + (3, "DISK_EJECT"), + ]) + +libxl_ev_user = UInt(64) + +libxl_ev_link = Builtin("ev_link", passby=PASS_BY_REFERENCE, private=True) + +libxl_event = Struct("event",[ + ("link", libxl_ev_link), + # for use by libxl; caller may use this once the event has been + # returned by libxl_event_{check,wait} + ("domid", libxl_domid), + ("domuuid", libxl_uuid), + ("for_user", libxl_ev_user), + ("type", libxl_event_type), + ("u", KeyedUnion(None, libxl_event_type, "type", + [("domain_shutdown", Struct(None, [ + ("shutdown_reason", uint8), + ])), + ("domain_destroy", Struct(None, [])), + ("disk_eject", Struct(None, [ + ("vdev", string), + ("disk", libxl_device_disk), + ])), + ]))]) diff -r db9cac5b2489 -r 4f3822ee1f43 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Fri Jan 27 17:01:21 2012 +0000 +++ b/tools/libxl/xl_cmdimpl.c Fri Jan 27 17:01:22 2012 +0000 @@ -1226,14 +1226,16 @@ xlu_cfg_destroy(config); } -/* Returns 1 if domain should be restarted, 2 if domain should be renamed then restarted */ -static int handle_domain_death(libxl_ctx *ctx, uint32_t domid, libxl_event *event, - libxl_domain_config *d_config, libxl_dominfo *info) +/* Returns 1 if domain should be restarted, + * 2 if domain should be renamed then restarted, or 0 */ +static int handle_domain_death(libxl_ctx *ctx, uint32_t domid, + libxl_event *event, + libxl_domain_config *d_config) { int restart = 0; libxl_action_on_shutdown action; - switch (info->shutdown_reason) { + switch (event->u.domain_shutdown.shutdown_reason) { case SHUTDOWN_poweroff: action = d_config->on_poweroff; break; @@ -1250,11 +1252,14 @@ action = d_config->on_watchdog; break; default: - LOG("Unknown shutdown reason code %d. Destroying domain.", info->shutdown_reason); + LOG("Unknown shutdown reason code %d. Destroying domain.", + event->u.domain_shutdown.shutdown_reason); action = LIBXL_ACTION_ON_SHUTDOWN_DESTROY; } - LOG("Action for shutdown reason code %d is %s", info->shutdown_reason, action_on_shutdown_names[action]); + LOG("Action for shutdown reason code %d is %s", + event->u.domain_shutdown.shutdown_reason, + action_on_shutdown_names[action]); if (action == LIBXL_ACTION_ON_SHUTDOWN_COREDUMP_DESTROY || action == LIBXL_ACTION_ON_SHUTDOWN_COREDUMP_RESTART) { char *corefile; @@ -1319,7 +1324,7 @@ static int preserve_domain(libxl_ctx *ctx, uint32_t domid, libxl_event *event, - libxl_domain_config *d_config, libxl_dominfo *info) + libxl_domain_config *d_config) { time_t now; struct tm tm; @@ -1432,6 +1437,40 @@ _exit(1); } +static int domain_wait_event(libxl_event **event_r) +{ + int ret; + for (;;) { + ret = libxl_event_wait(ctx, event_r, LIBXL_EVENTMASK_ALL, 0,0); + if (ret) { + LOG("Domain %d, failed to get event, quitting (rc=%d)", domid, ret); + return ret; + } + if ((*event_r)->domid != domid) { + char *evstr = libxl_event_to_json(ctx, *event_r); + LOG("INTERNAL PROBLEM - ignoring unexpected event for" + " domain %d (expected %d): event=%s", + (*event_r)->domid, domid, evstr); + free(evstr); + libxl_event_free(ctx, *event_r); + continue; + } + return ret; + } +} + +static void evdisable_disk_ejects(libxl_evgen_disk_eject **diskws, + int num_disks) +{ + int i; + + for (i = 0; i < num_disks; i++) { + if (diskws[i]) + libxl_evdisable_disk_eject(ctx, diskws[i]); + diskws[i] = NULL; + } +} + static int create_domain(struct domain_create *dom_info) { libxl_domain_config d_config; @@ -1445,10 +1484,11 @@ const char *restore_file = dom_info->restore_file; int migrate_fd = dom_info->migrate_fd; - int fd, i; + int i; int need_daemon = daemonize; int ret, rc; - libxl_waiter *w1 = NULL, *w2 = NULL; + libxl_evgen_domain_death *deathw = NULL; + libxl_evgen_disk_eject **diskws = NULL; /* one per disk */ void *config_data = 0; int config_len = 0; int restore_fd = -1; @@ -1661,14 +1701,14 @@ if (errno != EINTR) { perror("failed to wait for daemonizing child"); ret = ERROR_FAIL; - goto error_out; + goto out; } } if (status) { libxl_report_child_exitstatus(ctx, XTL_ERROR, "daemonizing child", child1, status); ret = ERROR_FAIL; - goto error_out; + goto out; } ret = domid; goto out; @@ -1705,92 +1745,105 @@ } LOG("Waiting for domain %s (domid %d) to die [pid %ld]", d_config.c_info.name, domid, (long)getpid()); - w1 = (libxl_waiter*) xmalloc(sizeof(libxl_waiter) * d_config.num_disks); - w2 = (libxl_waiter*) xmalloc(sizeof(libxl_waiter)); - libxl_wait_for_disk_ejects(ctx, domid, d_config.disks, d_config.num_disks, w1); - libxl_wait_for_domain_death(ctx, domid, w2); - libxl_get_wait_fd(ctx, &fd); + + ret = libxl_evenable_domain_death(ctx, domid, 0, &deathw); + if (ret) goto out; + + if (!diskws) { + diskws = xmalloc(sizeof(*diskws) * d_config.num_disks); + for (i = 0; i < d_config.num_disks; i++) + diskws[i] = NULL; + } + for (i = 0; i < d_config.num_disks; i++) { + if (d_config.disks[i].removable) { + ret = libxl_evenable_disk_eject(ctx, domid, d_config.disks[i].vdev, + 0, &diskws[i]); + if (ret) goto out; + } + } while (1) { - int ret; - fd_set rfds; - libxl_dominfo info; - libxl_event event; - libxl_device_disk disk; - - FD_ZERO(&rfds); - FD_SET(fd, &rfds); - - ret = select(fd + 1, &rfds, NULL, NULL, NULL); - if (!ret) - continue; - libxl_get_event(ctx, &event); - switch (event.type) { - case LIBXL_EVENT_TYPE_DOMAIN_DEATH: - ret = libxl_event_get_domain_death_info(ctx, domid, &event, &info); - - if (ret < 0) { - libxl_free_event(&event); - continue; - } - - LOG("Domain %d is dead", domid); - - if (ret) { - switch (handle_domain_death(ctx, domid, &event, &d_config, &info)) { - case 2: - if (!preserve_domain(ctx, domid, &event, &d_config, &info)) { - /* If we fail then exit leaving the old domain in place. */ - ret = -1; - goto out; - } - - /* Otherwise fall through and restart. */ - case 1: - - for (i = 0; i < d_config.num_disks; i++) - libxl_free_waiter(&w1[i]); - libxl_free_waiter(w2); - free(w1); - free(w2); - - /* - * Do not attempt to reconnect if we come round again due to a - * guest reboot -- the stdin/out will be disconnected by then. - */ - dom_info->console_autoconnect = 0; - - /* Some settings only make sense on first boot. */ - paused = 0; - if (common_domname - && strcmp(d_config.c_info.name, common_domname)) { - d_config.c_info.name = strdup(common_domname); - } - - /* - * XXX FIXME: If this sleep is not there then domain - * re-creation fails sometimes. - */ - LOG("Done. Rebooting now"); - sleep(2); - goto start; - case 0: - LOG("Done. Exiting now"); - ret = 0; - goto out; - } - } else { - LOG("Unable to get domain death info, quitting"); + libxl_event *event; + ret = domain_wait_event(&event); + if (ret) goto out; + + switch (event->type) { + + case LIBXL_EVENT_TYPE_DOMAIN_SHUTDOWN: + LOG("Domain %d has shut down, reason code %d 0x%x", domid, + event->u.domain_shutdown.shutdown_reason, + event->u.domain_shutdown.shutdown_reason); + switch (handle_domain_death(ctx, domid, event, &d_config)) { + case 2: + if (!preserve_domain(ctx, domid, event, &d_config)) { + /* If we fail then exit leaving the old domain in place. */ + ret = -1; goto out; } - break; - case LIBXL_EVENT_TYPE_DISK_EJECT: - if (libxl_event_get_disk_eject_info(ctx, domid, &event, &disk)) { - libxl_cdrom_insert(ctx, domid, &disk); - libxl_device_disk_dispose(&disk); + + /* Otherwise fall through and restart. */ + case 1: + libxl_event_free(ctx, event); + libxl_evdisable_domain_death(ctx, deathw); + deathw = NULL; + evdisable_disk_ejects(diskws, d_config.num_disks); + /* discard any other events which may have been generated */ + while (!(ret = libxl_event_check(ctx, &event, + LIBXL_EVENTMASK_ALL, 0,0))) { + libxl_event_free(ctx, event); } - break; + if (ret != ERROR_NOT_READY) { + LOG("warning, libxl_event_check (cleanup) failed (rc=%d)", + ret); + } + + /* + * Do not attempt to reconnect if we come round again due to a + * guest reboot -- the stdin/out will be disconnected by then. + */ + dom_info->console_autoconnect = 0; + + /* Some settings only make sense on first boot. */ + paused = 0; + if (common_domname + && strcmp(d_config.c_info.name, common_domname)) { + d_config.c_info.name = strdup(common_domname); + } + + /* + * XXX FIXME: If this sleep is not there then domain + * re-creation fails sometimes. + */ + LOG("Done. Rebooting now"); + sleep(2); + goto start; + + case 0: + LOG("Done. Exiting now"); + ret = 0; + goto out; + + default: + abort(); + } + + case LIBXL_EVENT_TYPE_DOMAIN_DESTROY: + LOG("Domain %d has been destroyed.", domid); + ret = 0; + goto out; + + case LIBXL_EVENT_TYPE_DISK_EJECT: + /* XXX what is this for? */ + libxl_cdrom_insert(ctx, domid, &event->u.disk_eject.disk); + break; + + default:; + char *evstr = libxl_event_to_json(ctx, event); + LOG("warning, got unexpected event type %d, event=%s", + event->type, evstr); + free(evstr); } - libxl_free_event(&event); + + libxl_event_free(ctx, event); } error_out: @@ -1811,6 +1864,13 @@ waitpid(child_console_pid, &status, 0) < 0 && errno == EINTR) goto waitpid_out; + if (deathw) + libxl_evdisable_domain_death(ctx, deathw); + if (diskws) { + evdisable_disk_ejects(diskws, d_config.num_disks); + free(diskws); + } + /* * If we have daemonized then do not return to the caller -- this has * already happened in the parent. @@ -2273,6 +2333,7 @@ static void shutdown_domain(const char *p, int wait) { int rc; + libxl_event *event; find_domain(p); rc=libxl_domain_shutdown(ctx, domid); @@ -2287,37 +2348,39 @@ } if (wait) { - libxl_waiter waiter; - int fd; - - libxl_wait_for_domain_death(ctx, domid, &waiter); - - libxl_get_wait_fd(ctx, &fd); - - while (wait) { - fd_set rfds; - libxl_event event; - libxl_dominfo info; - - FD_ZERO(&rfds); - FD_SET(fd, &rfds); - - if (!select(fd + 1, &rfds, NULL, NULL, NULL)) - continue; - - libxl_get_event(ctx, &event); - - if (event.type == LIBXL_EVENT_TYPE_DOMAIN_DEATH) { - if (libxl_event_get_domain_death_info(ctx, domid, &event, &info) < 0) - continue; - - LOG("Domain %d is dead", domid); - wait = 0; + libxl_evgen_domain_death *deathw; + + rc = libxl_evenable_domain_death(ctx, domid, 0, &deathw); + if (rc) { + fprintf(stderr,"wait for death failed (evgen, rc=%d)\n",rc); + exit(-1); + } + + for (;;) { + rc = domain_wait_event(&event); + if (rc) exit(-1); + + switch (event->type) { + + case LIBXL_EVENT_TYPE_DOMAIN_DESTROY: + LOG("Domain %d has been destroyed", domid); + goto done; + + case LIBXL_EVENT_TYPE_DOMAIN_SHUTDOWN: + LOG("Domain %d has been shut down, reason code %d %x", domid, + event->u.domain_shutdown.shutdown_reason, + event->u.domain_shutdown.shutdown_reason); + goto done; + + default: + LOG("Unexpected event type %d", event->type); + break; } - - libxl_free_event(&event); + libxl_event_free(ctx, event); } - libxl_free_waiter(&waiter); + done: + libxl_event_free(ctx, event); + libxl_evdisable_domain_death(ctx, deathw); } } diff -r db9cac5b2489 -r 4f3822ee1f43 tools/ocaml/libs/xl/genwrap.py --- a/tools/ocaml/libs/xl/genwrap.py Fri Jan 27 17:01:21 2012 +0000 +++ b/tools/ocaml/libs/xl/genwrap.py Fri Jan 27 17:01:22 2012 +0000 @@ -275,6 +275,7 @@ "device_model_info", "vcpuinfo", "topologyinfo", + "event", ] for t in blacklist: _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:55:45 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:55:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6d-0006FC-1g; Fri, 03 Feb 2012 21:55:43 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6b-0006Ed-3g for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:41 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-27.messagelabs.com!1328306018!62474666!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.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1759 invoked from network); 3 Feb 2012 21:53:39 -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; 3 Feb 2012 21:53:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6W-0001ho-GK for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR6V-0002Do-7O for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:35 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:55:34 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: New event generation API X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Jackson # Date 1327683682 0 # Node ID 4f3822ee1f437792ff89b53cc5e2c59d98dbf337 # Parent db9cac5b24897a5a936a516660457ace6043fc22 libxl: New event generation API Replace the existing API for retrieving high-level events (events about domains, etc.) from libxl with a new one. This changes the definition and semantics of the `libxl_event' structure, and replaces the calls for obtaining information about domain death and disk eject events. This is an incompatible change, sorry. The alternative was to try to provide both the previous horrid API and the new one, and would also involve never using the name `libxl_event' for the new interface. The new "libxl_event" structure is blacklisted in the ocaml bindings for two reasons: - It has a field name "type" (which is a keyword in ocaml); the ocaml idl generator should massage this field name on output, to "type_" perhaps. - The ocaml idl generator does not support KeyedUnion. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r db9cac5b2489 -r 4f3822ee1f43 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Fri Jan 27 17:01:21 2012 +0000 +++ b/tools/libxl/libxl.c Fri Jan 27 17:01:22 2012 +0000 @@ -45,8 +45,11 @@ * only as an initialiser, not as an expression. */ memcpy(&ctx->lock, &mutex_value, sizeof(ctx->lock)); + LIBXL_TAILQ_INIT(&ctx->occurred); + ctx->osevent_hooks = 0; + ctx->fd_polls = 0; ctx->fd_rindex = 0; LIBXL_LIST_INIT(&ctx->efds); LIBXL_TAILQ_INIT(&ctx->etimes); @@ -55,6 +58,9 @@ LIBXL_SLIST_INIT(&ctx->watch_freeslots); libxl__ev_fd_init(&ctx->watch_efd); + LIBXL_TAILQ_INIT(&ctx->death_list); + libxl__ev_xswatch_init(&ctx->death_watch); + if ( stat(XENSTORE_PID_FILE, &stat_buf) != 0 ) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Is xenstore daemon running?\n" "failed to stat %s", XENSTORE_PID_FILE); @@ -86,6 +92,20 @@ return rc; } +static void free_disable_deaths(libxl__gc *gc, + struct libxl__evgen_domain_death_list *l) { + libxl_evgen_domain_death *death; + while ((death = LIBXL_TAILQ_FIRST(l))) + libxl__evdisable_domain_death(gc, death); +} + +static void discard_events(struct libxl__event_list *l) { + /* doesn't bother unlinking from the list, so l is corrupt on return */ + libxl_event *ev; + LIBXL_TAILQ_FOREACH(ev, l, link) + libxl_event_free(0, ev); +} + int libxl_ctx_free(libxl_ctx *ctx) { if (!ctx) return 0; @@ -95,6 +115,13 @@ /* Deregister all libxl__ev_KINDs: */ + free_disable_deaths(gc, &CTX->death_list); + free_disable_deaths(gc, &CTX->death_reported); + + libxl_evgen_disk_eject *eject; + while ((eject = LIBXL_LIST_FIRST(&CTX->disk_eject_evgens))) + libxl__evdisable_disk_eject(gc, eject); + for (i = 0; i < ctx->watch_nslots; i++) assert(!libxl__watch_slot_contents(gc, i)); libxl__ev_fd_deregister(gc, &ctx->watch_efd); @@ -108,9 +135,12 @@ libxl_version_info_dispose(&ctx->version_info); if (ctx->xsh) xs_daemon_close(ctx->xsh); + free(ctx->fd_polls); free(ctx->fd_rindex); free(ctx->watch_slots); + discard_events(&ctx->occurred); + GC_FREE; free(ctx); return 0; @@ -646,117 +676,177 @@ return ret; } -int libxl_get_wait_fd(libxl_ctx *ctx, int *fd) -{ - *fd = xs_fileno(ctx->xsh); - return 0; +static void domain_death_xswatch_callback(libxl__egc *egc, libxl__ev_xswatch *w, + const char *wpath, const char *epath) { + EGC_GC; + libxl_evgen_domain_death *evg; + uint32_t domid; + int rc; + + CTX_LOCK; + + evg = LIBXL_TAILQ_FIRST(&CTX->death_list); + if (!evg) goto out; + + domid = evg->domid; + + for (;;) { + int nentries = LIBXL_TAILQ_NEXT(evg, entry) ? 200 : 1; + xc_domaininfo_t domaininfos[nentries]; + const xc_domaininfo_t *got = domaininfos, *gotend; + + rc = xc_domain_getinfolist(CTX->xch, domid, nentries, domaininfos); + if (rc == -1) { + LIBXL__EVENT_DISASTER(egc, "xc_domain_getinfolist failed while" + " processing @releaseDomain watch event", + errno, 0); + goto out; + } + gotend = &domaininfos[rc]; + + for (;;) { + if (!evg) + goto all_reported; + + if (!rc || got->domain > evg->domid) { + /* ie, the list doesn't contain evg->domid any more so + * the domain has been destroyed */ + libxl_evgen_domain_death *evg_next; + + libxl_event *ev = NEW_EVENT(egc, DOMAIN_DESTROY, evg->domid); + if (!ev) goto out; + + libxl__event_occurred(egc, ev); + + evg->death_reported = 1; + evg_next = LIBXL_TAILQ_NEXT(evg, entry); + LIBXL_TAILQ_REMOVE(&CTX->death_list, evg, entry); + LIBXL_TAILQ_INSERT_HEAD(&CTX->death_reported, evg, entry); + evg = evg_next; + + continue; + } + + if (got == gotend) + break; + + if (got->domain < evg->domid) { + got++; + continue; + } + + assert(evg->domid == got->domain); + + if (!evg->shutdown_reported && + (got->flags & XEN_DOMINF_shutdown)) { + libxl_event *ev = NEW_EVENT(egc, DOMAIN_SHUTDOWN, got->domain); + if (!ev) goto out; + + ev->u.domain_shutdown.shutdown_reason = + (got->flags >> XEN_DOMINF_shutdownshift) & + XEN_DOMINF_shutdownmask; + libxl__event_occurred(egc, ev); + + evg->shutdown_reported = 1; + } + evg = LIBXL_TAILQ_NEXT(evg, entry); + } + + assert(rc); /* rc==0 results in us eating all evgs and quitting */ + domid = gotend[-1].domain; + } + all_reported: + out: + + CTX_UNLOCK; } -int libxl_wait_for_domain_death(libxl_ctx *ctx, uint32_t domid, libxl_waiter *waiter) -{ - waiter->path = strdup("@releaseDomain"); - if (asprintf(&(waiter->token), "%d", LIBXL_EVENT_TYPE_DOMAIN_DEATH) < 0) - return -1; - if (!xs_watch(ctx->xsh, waiter->path, waiter->token)) - return -1; - return 0; -} - -int libxl_wait_for_disk_ejects(libxl_ctx *ctx, uint32_t guest_domid, libxl_device_disk *disks, int num_disks, libxl_waiter *waiter) -{ +int libxl_evenable_domain_death(libxl_ctx *ctx, uint32_t domid, + libxl_ev_user user, libxl_evgen_domain_death **evgen_out) { GC_INIT(ctx); - int i, rc = -1; - uint32_t domid = libxl_get_stubdom_id(ctx, guest_domid); - - if (!domid) - domid = guest_domid; - - for (i = 0; i < num_disks; i++) { - if (asprintf(&(waiter[i].path), "%s/device/vbd/%d/eject", - libxl__xs_get_dompath(gc, domid), - libxl__device_disk_dev_number(disks[i].vdev, - NULL, NULL)) < 0) - goto out; - if (asprintf(&(waiter[i].token), "%d", LIBXL_EVENT_TYPE_DISK_EJECT) < 0) - goto out; - xs_watch(ctx->xsh, waiter[i].path, waiter[i].token); + libxl_evgen_domain_death *evg, *evg_search; + int rc; + + CTX_LOCK; + + evg = malloc(sizeof(*evg)); if (!evg) { rc = ERROR_NOMEM; goto out; } + memset(evg, 0, sizeof(*evg)); + evg->domid = domid; + evg->user = user; + + LIBXL_TAILQ_INSERT_SORTED(&ctx->death_list, entry, evg, evg_search, , + evg->domid > evg_search->domid); + + if (!libxl__ev_xswatch_isregistered(&ctx->death_watch)) { + rc = libxl__ev_xswatch_register(gc, &ctx->death_watch, + domain_death_xswatch_callback, "@releaseDomain"); + if (rc) { libxl__evdisable_domain_death(gc, evg); goto out; } } + + *evgen_out = evg; rc = 0; -out: + + out: + CTX_UNLOCK; GC_FREE; return rc; +}; + +void libxl__evdisable_domain_death(libxl__gc *gc, + libxl_evgen_domain_death *evg) { + CTX_LOCK; + + if (!evg->death_reported) + LIBXL_TAILQ_REMOVE(&CTX->death_list, evg, entry); + else + LIBXL_TAILQ_REMOVE(&CTX->death_reported, evg, entry); + + free(evg); + + if (!LIBXL_TAILQ_FIRST(&CTX->death_list) && + libxl__ev_xswatch_isregistered(&CTX->death_watch)) + libxl__ev_xswatch_deregister(gc, &CTX->death_watch); + + CTX_UNLOCK; } -int libxl_get_event(libxl_ctx *ctx, libxl_event *event) -{ - unsigned int num; - char **events = xs_read_watch(ctx->xsh, &num); - if (num != 2) { - free(events); - return ERROR_FAIL; - } - event->path = strdup(events[XS_WATCH_PATH]); - event->token = strdup(events[XS_WATCH_TOKEN]); - event->type = atoi(event->token); - free(events); - return 0; +void libxl_evdisable_domain_death(libxl_ctx *ctx, + libxl_evgen_domain_death *evg) { + GC_INIT(ctx); + libxl__evdisable_domain_death(gc, evg); + GC_FREE; } -int libxl_stop_waiting(libxl_ctx *ctx, libxl_waiter *waiter) -{ - if (!xs_unwatch(ctx->xsh, waiter->path, waiter->token)) - return ERROR_FAIL; - else - return 0; -} - -int libxl_free_event(libxl_event *event) -{ - free(event->path); - free(event->token); - return 0; -} - -int libxl_free_waiter(libxl_waiter *waiter) -{ - free(waiter->path); - free(waiter->token); - return 0; -} - -int libxl_event_get_domain_death_info(libxl_ctx *ctx, uint32_t domid, libxl_event *event, libxl_dominfo *info) -{ - if (libxl_domain_info(ctx, info, domid) < 0) - return 0; - - if (info->running || (!info->shutdown && !info->dying)) - return ERROR_INVAL; - - return 1; -} - -int libxl_event_get_disk_eject_info(libxl_ctx *ctx, uint32_t domid, libxl_event *event, libxl_device_disk *disk) -{ - GC_INIT(ctx); - char *path; +static void disk_eject_xswatch_callback(libxl__egc *egc, libxl__ev_xswatch *w, + const char *wpath, const char *epath) { + EGC_GC; + libxl_evgen_disk_eject *evg = (void*)w; char *backend; char *value; char backend_type[BACKEND_STRING_SIZE+1]; - value = libxl__xs_read(gc, XBT_NULL, event->path); - - if (!value || strcmp(value, "eject")) { - GC_FREE; - return 0; + value = libxl__xs_read(gc, XBT_NULL, wpath); + + if (!value || strcmp(value, "eject")) + return; + + if (libxl__xs_write(gc, XBT_NULL, wpath, "")) { + LIBXL__EVENT_DISASTER(egc, "xs_write failed acknowledging eject", + errno, LIBXL_EVENT_TYPE_DISK_EJECT); + return; } - path = strdup(event->path); - path[strlen(path) - 6] = '\0'; - backend = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, "%s/backend", path)); + libxl_event *ev = NEW_EVENT(egc, DISK_EJECT, evg->domid); + libxl_device_disk *disk = &ev->u.disk_eject.disk; + + backend = libxl__xs_read(gc, XBT_NULL, + libxl__sprintf(gc, "%.*s/backend", + (int)strlen(wpath)-6, wpath)); sscanf(backend, - "/local/domain/%d/backend/%" TOSTRING(BACKEND_STRING_SIZE) "[a-z]/%*d/%*d", - &disk->backend_domid, backend_type); + "/local/domain/%d/backend/%" TOSTRING(BACKEND_STRING_SIZE) + "[a-z]/%*d/%*d", + &disk->backend_domid, backend_type); if (!strcmp(backend_type, "tap") || !strcmp(backend_type, "vbd")) { disk->backend = LIBXL_DISK_BACKEND_TAP; } else if (!strcmp(backend_type, "qdisk")) { @@ -765,19 +855,83 @@ disk->backend = LIBXL_DISK_BACKEND_UNKNOWN; } - disk->pdev_path = strdup(""); + disk->pdev_path = strdup(""); /* xxx fixme malloc failure */ disk->format = LIBXL_DISK_FORMAT_EMPTY; /* this value is returned to the user: do not free right away */ - disk->vdev = xs_read(ctx->xsh, XBT_NULL, libxl__sprintf(gc, "%s/dev", backend), NULL); + disk->vdev = xs_read(CTX->xsh, XBT_NULL, + libxl__sprintf(gc, "%s/dev", backend), NULL); disk->removable = 1; disk->readwrite = 0; disk->is_cdrom = 1; - free(path); + libxl__event_occurred(egc, ev); +} + +int libxl_evenable_disk_eject(libxl_ctx *ctx, uint32_t guest_domid, + const char *vdev, libxl_ev_user user, + libxl_evgen_disk_eject **evgen_out) { + GC_INIT(ctx); + CTX_LOCK; + int rc; + char *path; + libxl_evgen_disk_eject *evg = NULL; + + evg = malloc(sizeof(*evg)); if (!evg) { rc = ERROR_NOMEM; goto out; } + memset(evg, 0, sizeof(*evg)); + evg->user = user; + evg->domid = guest_domid; + LIBXL_LIST_INSERT_HEAD(&CTX->disk_eject_evgens, evg, entry); + + evg->vdev = strdup(vdev); + if (!evg->vdev) { rc = ERROR_NOMEM; goto out; } + + uint32_t domid = libxl_get_stubdom_id(ctx, guest_domid); + + if (!domid) + domid = guest_domid; + + path = libxl__sprintf(gc, "%s/device/vbd/%d/eject", + libxl__xs_get_dompath(gc, domid), + libxl__device_disk_dev_number(vdev, NULL, NULL)); + if (!path) { rc = ERROR_NOMEM; goto out; } + + rc = libxl__ev_xswatch_register(gc, &evg->watch, + disk_eject_xswatch_callback, path); + if (rc) goto out; + + *evgen_out = evg; + CTX_UNLOCK; GC_FREE; - return 1; + return 0; + + out: + if (evg) + libxl__evdisable_disk_eject(gc, evg); + CTX_UNLOCK; + GC_FREE; + return rc; } +void libxl__evdisable_disk_eject(libxl__gc *gc, libxl_evgen_disk_eject *evg) { + CTX_LOCK; + + LIBXL_LIST_REMOVE(evg, entry); + + if (libxl__ev_xswatch_isregistered(&evg->watch)) + libxl__ev_xswatch_deregister(gc, &evg->watch); + + free(evg->vdev); + free(evg); + + CTX_UNLOCK; +} + +void libxl_evdisable_disk_eject(libxl_ctx *ctx, libxl_evgen_disk_eject *evg) { + GC_INIT(ctx); + libxl__evdisable_disk_eject(gc, evg); + GC_FREE; +} + int libxl_domain_destroy(libxl_ctx *ctx, uint32_t domid) { GC_INIT(ctx); diff -r db9cac5b2489 -r 4f3822ee1f43 tools/libxl/libxl.h --- a/tools/libxl/libxl.h Fri Jan 27 17:01:21 2012 +0000 +++ b/tools/libxl/libxl.h Fri Jan 27 17:01:22 2012 +0000 @@ -53,7 +53,10 @@ * A public function may be called from within libxl; the call * context initialisation macros will make sure that the internal * caller's context is reused (eg, so that the same xenstore - * transaction is used). + * transaction is used). But in-libxl callers of libxl public + * functions should note that any libxl public function may cause + * recursively reentry into libxl via the application's event + * callback hook. * * Public functions have names like libxl_foobar. * @@ -152,6 +155,8 @@ typedef uint32_t libxl_hwcap[8]; +typedef uint64_t libxl_ev_user; + typedef struct { uint32_t size; /* number of bytes in map */ uint8_t *map; @@ -200,6 +205,9 @@ int v; } libxl_enum_string_table; +struct libxl_event; +typedef LIBXL_TAILQ_ENTRY(struct libxl_event) libxl_ev_link; + typedef struct libxl__ctx libxl_ctx; #include "_libxl_types.h" @@ -300,51 +308,6 @@ /* 0 means ERROR_ENOMEM, which we have logged */ -/* events handling */ - -typedef struct { - /* event type */ - libxl_event_type type; - /* data for internal use of the library */ - char *path; - char *token; -} libxl_event; - -typedef struct { - char *path; - char *token; -} libxl_waiter; - - -int libxl_get_wait_fd(libxl_ctx *ctx, int *fd); -/* waiter is allocated by the caller */ -int libxl_wait_for_domain_death(libxl_ctx *ctx, uint32_t domid, libxl_waiter *waiter); -/* waiter is a preallocated array of num_disks libxl_waiter elements */ -int libxl_wait_for_disk_ejects(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disks, int num_disks, libxl_waiter *waiter); -int libxl_get_event(libxl_ctx *ctx, libxl_event *event); -int libxl_stop_waiting(libxl_ctx *ctx, libxl_waiter *waiter); -int libxl_free_event(libxl_event *event); -int libxl_free_waiter(libxl_waiter *waiter); - -/* - * Returns: - * - 0 if the domain is dead but there is no cleanup to be done. e.g - * because someone else has already done it. - * - 1 if the domain is dead and there is cleanup to be done. - * - * Can return error if the domain exists and is still running. - * - * *info will contain valid domain state iff 1 is returned. In - * particular if 1 is returned then info->shutdown_reason is - * guaranteed to be valid since by definition the domain is - * (shutdown||dying)) - */ -int libxl_event_get_domain_death_info(libxl_ctx *ctx, uint32_t domid, libxl_event *event, libxl_dominfo *info); - -/* - * Returns true and fills *disk if the caller should eject the disk - */ -int libxl_event_get_disk_eject_info(libxl_ctx *ctx, uint32_t domid, libxl_event *event, libxl_device_disk *disk); int libxl_domain_rename(libxl_ctx *ctx, uint32_t domid, const char *old_name, const char *new_name); diff -r db9cac5b2489 -r 4f3822ee1f43 tools/libxl/libxl_event.c --- a/tools/libxl/libxl_event.c Fri Jan 27 17:01:21 2012 +0000 +++ b/tools/libxl/libxl_event.c Fri Jan 27 17:01:22 2012 +0000 @@ -510,9 +510,9 @@ * osevent poll */ -int libxl_osevent_beforepoll(libxl_ctx *ctx, int *nfds_io, - struct pollfd *fds, int *timeout_upd, - struct timeval now) +static int beforepoll_internal(libxl__gc *gc, int *nfds_io, + struct pollfd *fds, int *timeout_upd, + struct timeval now) { libxl__ev_fd *efd; int rc; @@ -524,9 +524,6 @@ * the fds array corresponds to a slot in fd_beforepolled. */ - GC_INIT(ctx); - CTX_LOCK; - if (*nfds_io) { /* * As an optimisation, we don't touch fd_rindex @@ -593,8 +590,18 @@ } out: + return rc; +} + +int libxl_osevent_beforepoll(libxl_ctx *ctx, int *nfds_io, + struct pollfd *fds, int *timeout_upd, + struct timeval now) +{ + EGC_INIT(ctx); + CTX_LOCK; + int rc = beforepoll_internal(gc, nfds_io, fds, timeout_upd, now); CTX_UNLOCK; - GC_FREE; + EGC_FREE; return rc; } @@ -623,11 +630,11 @@ return revents; } -void libxl_osevent_afterpoll(libxl_ctx *ctx, int nfds, const struct pollfd *fds, - struct timeval now) +static void afterpoll_internal(libxl__egc *egc, + int nfds, const struct pollfd *fds, + struct timeval now) { - EGC_INIT(ctx); - CTX_LOCK; + EGC_GC; libxl__ev_fd *efd; LIBXL_LIST_FOREACH(efd, &CTX->efds, entry) { @@ -653,12 +660,18 @@ etime->func(egc, etime, &etime->abs); } +} +void libxl_osevent_afterpoll(libxl_ctx *ctx, int nfds, const struct pollfd *fds, + struct timeval now) +{ + EGC_INIT(ctx); + CTX_LOCK; + afterpoll_internal(egc, nfds, fds, now); CTX_UNLOCK; EGC_FREE; } - /* * osevent hook and callback machinery */ @@ -723,11 +736,10 @@ type ? libxl_event_type_to_string(type) : "", type ? ")" : ""); - /* - * FIXME: This should call the "disaster" hook supplied to - * libxl_event_register_callbacks, which will be introduced in the - * next patch. - */ + if (CTX->event_hooks && CTX->event_hooks->disaster) { + CTX->event_hooks->disaster(CTX->event_hooks_user, type, msg, errnoval); + return; + } const char verybad[] = "DISASTER in event loop not handled by libxl application"; @@ -736,9 +748,197 @@ exit(-1); } +static void egc_run_callbacks(libxl__egc *egc) +{ + EGC_GC; + libxl_event *ev, *ev_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); + } +} + void libxl__egc_cleanup(libxl__egc *egc) { - libxl__free_all(&egc->gc); + EGC_GC; + libxl__free_all(gc); + + egc_run_callbacks(egc); +} + +/* + * Event retrieval etc. + */ + +void libxl_event_register_callbacks(libxl_ctx *ctx, + const libxl_event_hooks *hooks, void *user) +{ + ctx->event_hooks = hooks; + ctx->event_hooks_user = user; +} + +void libxl__event_occurred(libxl__egc *egc, libxl_event *event) +{ + EGC_GC; + + if (CTX->event_hooks && + (CTX->event_hooks->event_occurs_mask & (1UL << event->type))) { + /* libxl__egc_cleanup will call the callback, just before exit + * from libxl. This helps avoid reentrancy bugs: parts of + * libxl that call libxl__event_occurred do not have to worry + * that libxl might be reentered at that point. */ + LIBXL_TAILQ_INSERT_TAIL(&egc->occurred_for_callback, event, link); + return; + } else { + LIBXL_TAILQ_INSERT_TAIL(&CTX->occurred, event, link); + } +} + +void libxl_event_free(libxl_ctx *ctx, libxl_event *event) +{ + /* Exceptionally, this function may be called from libxl, with ctx==0 */ + libxl_event_dispose(event); + free(event); +} + +libxl_event *libxl__event_new(libxl__egc *egc, + libxl_event_type type, uint32_t domid) +{ + 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->type = type; + ev->domid = domid; + + return ev; +} + +static int event_check_internal(libxl__egc *egc, libxl_event **event_r, + unsigned long typemask, + libxl_event_predicate *pred, void *pred_user) +{ + EGC_GC; + libxl_event *ev; + int rc; + + LIBXL_TAILQ_FOREACH(ev, &CTX->occurred, link) { + if (!(typemask & ((uint64_t)1 << ev->type))) + continue; + + if (pred && !pred(ev, pred_user)) + continue; + + /* got one! */ + LIBXL_TAILQ_REMOVE(&CTX->occurred, ev, link); + *event_r = ev; + rc = 0; + goto out; + } + rc = ERROR_NOT_READY; + + out: + return rc; +} + +int libxl_event_check(libxl_ctx *ctx, libxl_event **event_r, + uint64_t typemask, + libxl_event_predicate *pred, void *pred_user) +{ + EGC_INIT(ctx); + CTX_LOCK; + int rc = event_check_internal(egc, event_r, typemask, pred, pred_user); + CTX_UNLOCK; + EGC_FREE; + return rc; +} + +static int eventloop_iteration(libxl__egc *egc) { + EGC_GC; + int rc; + struct timeval now; + + CTX_LOCK; + + rc = libxl__gettimeofday(gc, &now); + if (rc) goto out; + + int timeout; + + for (;;) { + int nfds = CTX->fd_polls_allocd; + timeout = -1; + rc = beforepoll_internal(gc, &nfds, CTX->fd_polls, &timeout, now); + if (!rc) break; + if (rc != ERROR_BUFFERFULL) goto out; + + struct pollfd *newarray = + (nfds > INT_MAX / sizeof(struct pollfd) / 2) ? 0 : + realloc(CTX->fd_polls, sizeof(*newarray) * nfds); + + if (!newarray) { rc = ERROR_NOMEM; goto out; } + + CTX->fd_polls = newarray; + CTX->fd_polls_allocd = nfds; + } + + rc = poll(CTX->fd_polls, CTX->fd_polls_allocd, timeout); + if (rc < 0) { + if (errno == EINTR) + return 0; /* will go round again if caller requires */ + + LIBXL__LOG_ERRNOVAL(CTX, LIBXL__LOG_ERROR, errno, "poll failed"); + rc = ERROR_FAIL; + goto out; + } + + rc = libxl__gettimeofday(gc, &now); + if (rc) goto out; + + afterpoll_internal(egc, CTX->fd_polls_allocd, CTX->fd_polls, now); + + CTX_UNLOCK; + + rc = 0; + out: + return rc; +} + +int libxl_event_wait(libxl_ctx *ctx, libxl_event **event_r, + uint64_t typemask, + libxl_event_predicate *pred, void *pred_user) +{ + int rc; + + EGC_INIT(ctx); + CTX_LOCK; + + for (;;) { + rc = event_check_internal(egc, event_r, typemask, pred, pred_user); + if (rc != ERROR_NOT_READY) goto out; + + rc = eventloop_iteration(egc); + if (rc) goto out; + + /* we unlock and cleanup the egc each time we go through this loop, + * so that (a) we don't accumulate garbage and (b) any events + * which are to be dispatched by callback are actually delivered + * in a timely fashion. + */ + CTX_UNLOCK; + libxl__egc_cleanup(egc); + CTX_LOCK; + } + + out: + CTX_UNLOCK; + EGC_FREE; + return rc; } /* diff -r db9cac5b2489 -r 4f3822ee1f43 tools/libxl/libxl_event.h --- a/tools/libxl/libxl_event.h Fri Jan 27 17:01:21 2012 +0000 +++ b/tools/libxl/libxl_event.h Fri Jan 27 17:01:22 2012 +0000 @@ -18,6 +18,181 @@ #include +/*======================================================================*/ + +/* + * Domain event handling - getting Xen events from libxl + * + * (Callers inside libxl may not call libxl_event_check or _wait.) + */ + +#define LIBXL_EVENTMASK_ALL (~(unsigned long)0) + +typedef int libxl_event_predicate(const libxl_event*, void *user); + /* Return value is 0 if the event is unwanted or non-0 if it is. + * Predicates are not allowed to fail. + */ + +int libxl_event_check(libxl_ctx *ctx, libxl_event **event_r, + uint64_t typemask, + libxl_event_predicate *predicate, void *predicate_user); + /* Searches for an event, already-happened, which matches typemask + * and predicate. predicate==0 matches any event. + * libxl_event_check returns the event, which must then later be + * freed by the caller using libxl_event_free. + * + * Returns ERROR_NOT_READY if no such event has happened. + */ + +int libxl_event_wait(libxl_ctx *ctx, libxl_event **event_r, + uint64_t typemask, + libxl_event_predicate *predicate, void *predicate_user); + /* Like libxl_event_check but blocks if no suitable events are + * available, until some are. Uses libxl_osevent_beforepoll/ + * _afterpoll so may be inefficient if very many domains are being + * handled by a single program. + */ + +void libxl_event_free(libxl_ctx *ctx, libxl_event *event); + + +/* Alternatively or additionally, the application may also use this: */ + +typedef struct libxl_event_hooks { + uint64_t event_occurs_mask; + void (*event_occurs)(void *user, const libxl_event *event); + void (*disaster)(void *user, libxl_event_type type, + const char *msg, int errnoval); +} libxl_event_hooks; + +void libxl_event_register_callbacks(libxl_ctx *ctx, + const libxl_event_hooks *hooks, void *user); + /* + * Arranges that libxl will henceforth call event_occurs for any + * events whose type is set in event_occurs_mask, rather than + * queueing the event for retrieval by libxl_event_check/wait. + * Events whose bit is clear in mask are not affected. + * + * event becomes owned by the application and must be freed, either + * by event_occurs or later. + * + * event_occurs may be NULL if mask is 0. + * + * libxl_event_register_callback also provides a way for libxl to + * report to the application that there was a problem reporting + * events; this can occur due to lack of host memory during event + * handling, or other wholly unrecoverable errors from system calls + * made by libxl. This will not happen for frivolous reasons - only + * if the system, or the Xen components of it, are badly broken. + * + * msg and errnoval will describe the action that libxl was trying + * to do, and type specifies the type of libxl events which may be + * missing. type may be 0 in which case events of all types may be + * missing. + * + * disaster may be NULL. If it is, or if _register_callbacks has + * not been called, errors of this kind are fatal to the entire + * application: libxl will print messages to its logs and to stderr + * and call exit(-1). + * + * If disaster returns, it may be the case that some or all future + * libxl calls will return errors; likewise it may be the case that + * no more events (of the specified type, if applicable) can be + * produced. An application which supplies a disaster function + * should normally react either by exiting, or by (when it has + * returned to its main event loop) shutting down libxl with + * libxl_ctx_free and perhaps trying to restart it with + * libxl_ctx_init. + * + * In any case before calling disaster, libxl will have logged a + * message with level XTL_CRITICAL. + * + * Reentrancy: it IS permitted to call libxl from within + * event_occurs. It is NOT permitted to call libxl from within + * disaster. The event_occurs and disaster callbacks may occur on + * any thread in which the application calls libxl. + * + * libxl_event_register_callbacks may be called as many times, with + * different parameters, as the application likes; the most recent + * call determines the libxl behaviour. However it is NOT safe to + * call _register_callbacks concurrently with, or reentrantly from, + * any other libxl function. + * + * Calls to _register_callbacks do not affect events which have + * already occurred. + */ + + +/* + * Events are only generated if they have been requested. + * The following functions request the generation of specific events. + * + * Each set of functions for controlling event generation has this form: + * + * typedef struct libxl__evgen_FOO libxl__evgen_FOO; + * int libxl_evenable_FOO(libxl_ctx *ctx, FURTHER PARAMETERS, + * libxl_ev_user user, libxl__evgen_FOO **evgen_out); + * void libxl_evdisable_FOO(libxl_ctx *ctx, libxl__evgen_FOO *evgen); + * + * The evenable function arranges that the events (as described in the + * doc comment for the individual function) will start to be generated + * by libxl. On success, *evgen_out is set to a non-null pointer to + * an opaque struct. + * + * The user value is returned in the generated events and may be + * used by the caller for whatever it likes. The type ev_user is + * guaranteed to be an unsigned integer type which is at least + * as big as uint64_t and is also guaranteed to be big enough to + * contain any intptr_t value. + * + * If it becomes desirable to stop generation of the relevant events, + * or to reclaim the resources in libxl associated with the evgen + * structure, the same evgen value should be passed to the evdisable + * function. However, note that events which occurred prior to the + * evdisable call may still be returned. + * + * The caller may enable identical events more than once. If they do + * so, each actual occurrence will generate several events to be + * returned by libxl_event_check, with the appropriate user value(s). + * Aside from this, each occurrence of each event is returned by + * libxl_event_check exactly once. + * + * An evgen is associated with the libxl_ctx used for its creation. + * 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 + * inside libxl indefinitely. libxl_event_check/_wait may be O(n) + * where n is the number of queued events which do not match the + * criteria specified in the arguments to check/wait. + */ + +typedef struct libxl__evgen_domain_death libxl_evgen_domain_death; +int libxl_evenable_domain_death(libxl_ctx *ctx, uint32_t domid, + libxl_ev_user, libxl_evgen_domain_death **evgen_out); +void libxl_evdisable_domain_death(libxl_ctx *ctx, libxl_evgen_domain_death*); + /* Arranges for the generation of DOMAIN_SHUTDOWN and DOMAIN_DESTROY + * events. A domain which is destroyed before it shuts down + * may generate only a DESTROY event. + */ + +typedef struct libxl__evgen_disk_eject libxl_evgen_disk_eject; +int libxl_evenable_disk_eject(libxl_ctx *ctx, uint32_t domid, const char *vdev, + libxl_ev_user, libxl_evgen_disk_eject **evgen_out); +void libxl_evdisable_disk_eject(libxl_ctx *ctx, libxl_evgen_disk_eject*); + /* Arranges for the generation of DISK_EJECT events. A copy of the + * string *vdev will be made for libxl's internal use, and a pointer + * to this (or some other) copy will be returned as the vdev + * member of event.u. + */ + /*======================================================================*/ @@ -36,10 +211,10 @@ * poll(); * libxl_osevent_afterpoll(...); * for (;;) { - * r=libxl_event_check(...); - * if (r==LIBXL_NOT_READY) break; - * if (r) handle failure; - * do something with the event; + * r = libxl_event_check(...); + * if (r==LIBXL_NOT_READY) break; + * if (r) goto error_out; + * do something with the event; * } * } * diff -r db9cac5b2489 -r 4f3822ee1f43 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri Jan 27 17:01:21 2012 +0000 +++ b/tools/libxl/libxl_internal.h Fri Jan 27 17:01:22 2012 +0000 @@ -177,11 +177,45 @@ libxl__ev_xswatch *libxl__watch_slot_contents(libxl__gc *gc, int slotnum); + +/* + * evgen structures, which are the state we use for generating + * events for the caller. + * + * In general in each case there's an internal and an external + * version of the _evdisable_FOO function; the internal one is + * used during cleanup. + */ + +struct libxl__evgen_domain_death { + uint32_t domid; + unsigned shutdown_reported:1, death_reported:1; + LIBXL_TAILQ_ENTRY(libxl_evgen_domain_death) entry; + /* on list .death_reported ? CTX->death_list : CTX->death_reported */ + libxl_ev_user user; +}; +_hidden void +libxl__evdisable_domain_death(libxl__gc*, libxl_evgen_domain_death*); + +struct libxl__evgen_disk_eject { + libxl__ev_xswatch watch; + uint32_t domid; + LIBXL_LIST_ENTRY(libxl_evgen_disk_eject) entry; + libxl_ev_user user; + char *vdev; +}; +_hidden void +libxl__evdisable_disk_eject(libxl__gc*, libxl_evgen_disk_eject*); + + struct libxl__ctx { xentoollog_logger *lg; xc_interface *xch; struct xs_handle *xsh; + const libxl_event_hooks *event_hooks; + void *event_hooks_user; + pthread_mutex_t lock; /* protects data structures hanging off the ctx */ /* Always use libxl__ctx_lock and _unlock (or the convenience * macors CTX_LOCK and CTX_UNLOCK) to manipulate this. @@ -195,12 +229,16 @@ * documented in the libxl public interface. */ + LIBXL_TAILQ_HEAD(libxl__event_list, libxl_event) occurred; + int osevent_in_hook; const libxl_osevent_hooks *osevent_hooks; void *osevent_user; /* See the comment for OSEVENT_HOOK_INTERN in libxl_event.c * for restrictions on the use of the osevent fields. */ + struct pollfd *fd_polls; + int fd_polls_allocd; int fd_rindex_allocd; int *fd_rindex; /* see libxl_osevent_beforepoll */ LIBXL_LIST_HEAD(, libxl__ev_fd) efds; @@ -212,6 +250,13 @@ uint32_t watch_counter; /* helps disambiguate slot reuse */ libxl__ev_fd watch_efd; + LIBXL_TAILQ_HEAD(libxl__evgen_domain_death_list, libxl_evgen_domain_death) + death_list /* sorted by domid */, + death_reported; + libxl__ev_xswatch death_watch; + + 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 */ @@ -252,6 +297,7 @@ struct libxl__egc { /* for event-generating functions only */ struct libxl__gc gc; + struct libxl__event_list occurred_for_callback; }; #define LIBXL_INIT_GC(gc,ctx) do{ \ @@ -396,6 +442,9 @@ * * Callers of libxl__ev_KIND_register must ensure that the * registration is undone, with _deregister, in libxl_ctx_free. + * This means that normally each kind of libxl__evgen (ie each + * application-requested event source) needs to be on a list so that + * it can be automatically deregistered as promised in libxl_event.h. */ @@ -439,6 +488,25 @@ /* + * Other event-handling support provided by the libxl event core to + * the rest of libxl. + */ + +_hidden void libxl__event_occurred(libxl__egc*, libxl_event *event); + /* Arranges to notify the application that the event has occurred. + * event should be suitable for passing to libxl_event_free. */ + +_hidden libxl_event *libxl__event_new(libxl__egc*, libxl_event_type, + uint32_t domid); + /* Convenience function. + * Allocates a new libxl_event, fills in domid and type. + * If allocation fails, calls _disaster, and returns NULL. */ + +#define NEW_EVENT(egc, type, domid) \ + libxl__event_new((egc), LIBXL_EVENT_TYPE_##type, (domid)); + /* Convenience macro. */ + +/* * In general, call this via the macro LIBXL__EVENT_DISASTER. * * Event-generating functions may call this if they might have wanted @@ -995,12 +1063,15 @@ /* egc initialisation and destruction: */ -#define LIBXL_INIT_EGC(egc,ctx) do{ \ - LIBXL_INIT_GC((egc).gc,ctx); \ - /* list of occurred events tbd */ \ +#define LIBXL_INIT_EGC(egc,ctx) do{ \ + LIBXL_INIT_GC((egc).gc,ctx); \ + LIBXL_TAILQ_INIT(&(egc).occurred_for_callback); \ } while(0) _hidden void libxl__egc_cleanup(libxl__egc *egc); + /* Frees memory allocated within this egc's gc, and and report all + * occurred events via callback, if applicable. May reenter the + * application; see restrictions above. */ /* convenience macros: */ diff -r db9cac5b2489 -r 4f3822ee1f43 tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Fri Jan 27 17:01:21 2012 +0000 +++ b/tools/libxl/libxl_types.idl Fri Jan 27 17:01:22 2012 +0000 @@ -75,11 +75,6 @@ (6, "COREDUMP_RESTART"), ]) -libxl_event_type = Enumeration("event_type", [ - (1, "DOMAIN_DEATH"), - (2, "DISK_EJECT"), - ]) - libxl_button = Enumeration("button", [ (1, "POWER"), (2, "SLEEP"), @@ -397,3 +392,32 @@ ("extratime", integer), ("weight", integer), ], dispose_fn=None) + +libxl_event_type = Enumeration("event_type", [ + (1, "DOMAIN_SHUTDOWN"), + (2, "DOMAIN_DESTROY"), + (3, "DISK_EJECT"), + ]) + +libxl_ev_user = UInt(64) + +libxl_ev_link = Builtin("ev_link", passby=PASS_BY_REFERENCE, private=True) + +libxl_event = Struct("event",[ + ("link", libxl_ev_link), + # for use by libxl; caller may use this once the event has been + # returned by libxl_event_{check,wait} + ("domid", libxl_domid), + ("domuuid", libxl_uuid), + ("for_user", libxl_ev_user), + ("type", libxl_event_type), + ("u", KeyedUnion(None, libxl_event_type, "type", + [("domain_shutdown", Struct(None, [ + ("shutdown_reason", uint8), + ])), + ("domain_destroy", Struct(None, [])), + ("disk_eject", Struct(None, [ + ("vdev", string), + ("disk", libxl_device_disk), + ])), + ]))]) diff -r db9cac5b2489 -r 4f3822ee1f43 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Fri Jan 27 17:01:21 2012 +0000 +++ b/tools/libxl/xl_cmdimpl.c Fri Jan 27 17:01:22 2012 +0000 @@ -1226,14 +1226,16 @@ xlu_cfg_destroy(config); } -/* Returns 1 if domain should be restarted, 2 if domain should be renamed then restarted */ -static int handle_domain_death(libxl_ctx *ctx, uint32_t domid, libxl_event *event, - libxl_domain_config *d_config, libxl_dominfo *info) +/* Returns 1 if domain should be restarted, + * 2 if domain should be renamed then restarted, or 0 */ +static int handle_domain_death(libxl_ctx *ctx, uint32_t domid, + libxl_event *event, + libxl_domain_config *d_config) { int restart = 0; libxl_action_on_shutdown action; - switch (info->shutdown_reason) { + switch (event->u.domain_shutdown.shutdown_reason) { case SHUTDOWN_poweroff: action = d_config->on_poweroff; break; @@ -1250,11 +1252,14 @@ action = d_config->on_watchdog; break; default: - LOG("Unknown shutdown reason code %d. Destroying domain.", info->shutdown_reason); + LOG("Unknown shutdown reason code %d. Destroying domain.", + event->u.domain_shutdown.shutdown_reason); action = LIBXL_ACTION_ON_SHUTDOWN_DESTROY; } - LOG("Action for shutdown reason code %d is %s", info->shutdown_reason, action_on_shutdown_names[action]); + LOG("Action for shutdown reason code %d is %s", + event->u.domain_shutdown.shutdown_reason, + action_on_shutdown_names[action]); if (action == LIBXL_ACTION_ON_SHUTDOWN_COREDUMP_DESTROY || action == LIBXL_ACTION_ON_SHUTDOWN_COREDUMP_RESTART) { char *corefile; @@ -1319,7 +1324,7 @@ static int preserve_domain(libxl_ctx *ctx, uint32_t domid, libxl_event *event, - libxl_domain_config *d_config, libxl_dominfo *info) + libxl_domain_config *d_config) { time_t now; struct tm tm; @@ -1432,6 +1437,40 @@ _exit(1); } +static int domain_wait_event(libxl_event **event_r) +{ + int ret; + for (;;) { + ret = libxl_event_wait(ctx, event_r, LIBXL_EVENTMASK_ALL, 0,0); + if (ret) { + LOG("Domain %d, failed to get event, quitting (rc=%d)", domid, ret); + return ret; + } + if ((*event_r)->domid != domid) { + char *evstr = libxl_event_to_json(ctx, *event_r); + LOG("INTERNAL PROBLEM - ignoring unexpected event for" + " domain %d (expected %d): event=%s", + (*event_r)->domid, domid, evstr); + free(evstr); + libxl_event_free(ctx, *event_r); + continue; + } + return ret; + } +} + +static void evdisable_disk_ejects(libxl_evgen_disk_eject **diskws, + int num_disks) +{ + int i; + + for (i = 0; i < num_disks; i++) { + if (diskws[i]) + libxl_evdisable_disk_eject(ctx, diskws[i]); + diskws[i] = NULL; + } +} + static int create_domain(struct domain_create *dom_info) { libxl_domain_config d_config; @@ -1445,10 +1484,11 @@ const char *restore_file = dom_info->restore_file; int migrate_fd = dom_info->migrate_fd; - int fd, i; + int i; int need_daemon = daemonize; int ret, rc; - libxl_waiter *w1 = NULL, *w2 = NULL; + libxl_evgen_domain_death *deathw = NULL; + libxl_evgen_disk_eject **diskws = NULL; /* one per disk */ void *config_data = 0; int config_len = 0; int restore_fd = -1; @@ -1661,14 +1701,14 @@ if (errno != EINTR) { perror("failed to wait for daemonizing child"); ret = ERROR_FAIL; - goto error_out; + goto out; } } if (status) { libxl_report_child_exitstatus(ctx, XTL_ERROR, "daemonizing child", child1, status); ret = ERROR_FAIL; - goto error_out; + goto out; } ret = domid; goto out; @@ -1705,92 +1745,105 @@ } LOG("Waiting for domain %s (domid %d) to die [pid %ld]", d_config.c_info.name, domid, (long)getpid()); - w1 = (libxl_waiter*) xmalloc(sizeof(libxl_waiter) * d_config.num_disks); - w2 = (libxl_waiter*) xmalloc(sizeof(libxl_waiter)); - libxl_wait_for_disk_ejects(ctx, domid, d_config.disks, d_config.num_disks, w1); - libxl_wait_for_domain_death(ctx, domid, w2); - libxl_get_wait_fd(ctx, &fd); + + ret = libxl_evenable_domain_death(ctx, domid, 0, &deathw); + if (ret) goto out; + + if (!diskws) { + diskws = xmalloc(sizeof(*diskws) * d_config.num_disks); + for (i = 0; i < d_config.num_disks; i++) + diskws[i] = NULL; + } + for (i = 0; i < d_config.num_disks; i++) { + if (d_config.disks[i].removable) { + ret = libxl_evenable_disk_eject(ctx, domid, d_config.disks[i].vdev, + 0, &diskws[i]); + if (ret) goto out; + } + } while (1) { - int ret; - fd_set rfds; - libxl_dominfo info; - libxl_event event; - libxl_device_disk disk; - - FD_ZERO(&rfds); - FD_SET(fd, &rfds); - - ret = select(fd + 1, &rfds, NULL, NULL, NULL); - if (!ret) - continue; - libxl_get_event(ctx, &event); - switch (event.type) { - case LIBXL_EVENT_TYPE_DOMAIN_DEATH: - ret = libxl_event_get_domain_death_info(ctx, domid, &event, &info); - - if (ret < 0) { - libxl_free_event(&event); - continue; - } - - LOG("Domain %d is dead", domid); - - if (ret) { - switch (handle_domain_death(ctx, domid, &event, &d_config, &info)) { - case 2: - if (!preserve_domain(ctx, domid, &event, &d_config, &info)) { - /* If we fail then exit leaving the old domain in place. */ - ret = -1; - goto out; - } - - /* Otherwise fall through and restart. */ - case 1: - - for (i = 0; i < d_config.num_disks; i++) - libxl_free_waiter(&w1[i]); - libxl_free_waiter(w2); - free(w1); - free(w2); - - /* - * Do not attempt to reconnect if we come round again due to a - * guest reboot -- the stdin/out will be disconnected by then. - */ - dom_info->console_autoconnect = 0; - - /* Some settings only make sense on first boot. */ - paused = 0; - if (common_domname - && strcmp(d_config.c_info.name, common_domname)) { - d_config.c_info.name = strdup(common_domname); - } - - /* - * XXX FIXME: If this sleep is not there then domain - * re-creation fails sometimes. - */ - LOG("Done. Rebooting now"); - sleep(2); - goto start; - case 0: - LOG("Done. Exiting now"); - ret = 0; - goto out; - } - } else { - LOG("Unable to get domain death info, quitting"); + libxl_event *event; + ret = domain_wait_event(&event); + if (ret) goto out; + + switch (event->type) { + + case LIBXL_EVENT_TYPE_DOMAIN_SHUTDOWN: + LOG("Domain %d has shut down, reason code %d 0x%x", domid, + event->u.domain_shutdown.shutdown_reason, + event->u.domain_shutdown.shutdown_reason); + switch (handle_domain_death(ctx, domid, event, &d_config)) { + case 2: + if (!preserve_domain(ctx, domid, event, &d_config)) { + /* If we fail then exit leaving the old domain in place. */ + ret = -1; goto out; } - break; - case LIBXL_EVENT_TYPE_DISK_EJECT: - if (libxl_event_get_disk_eject_info(ctx, domid, &event, &disk)) { - libxl_cdrom_insert(ctx, domid, &disk); - libxl_device_disk_dispose(&disk); + + /* Otherwise fall through and restart. */ + case 1: + libxl_event_free(ctx, event); + libxl_evdisable_domain_death(ctx, deathw); + deathw = NULL; + evdisable_disk_ejects(diskws, d_config.num_disks); + /* discard any other events which may have been generated */ + while (!(ret = libxl_event_check(ctx, &event, + LIBXL_EVENTMASK_ALL, 0,0))) { + libxl_event_free(ctx, event); } - break; + if (ret != ERROR_NOT_READY) { + LOG("warning, libxl_event_check (cleanup) failed (rc=%d)", + ret); + } + + /* + * Do not attempt to reconnect if we come round again due to a + * guest reboot -- the stdin/out will be disconnected by then. + */ + dom_info->console_autoconnect = 0; + + /* Some settings only make sense on first boot. */ + paused = 0; + if (common_domname + && strcmp(d_config.c_info.name, common_domname)) { + d_config.c_info.name = strdup(common_domname); + } + + /* + * XXX FIXME: If this sleep is not there then domain + * re-creation fails sometimes. + */ + LOG("Done. Rebooting now"); + sleep(2); + goto start; + + case 0: + LOG("Done. Exiting now"); + ret = 0; + goto out; + + default: + abort(); + } + + case LIBXL_EVENT_TYPE_DOMAIN_DESTROY: + LOG("Domain %d has been destroyed.", domid); + ret = 0; + goto out; + + case LIBXL_EVENT_TYPE_DISK_EJECT: + /* XXX what is this for? */ + libxl_cdrom_insert(ctx, domid, &event->u.disk_eject.disk); + break; + + default:; + char *evstr = libxl_event_to_json(ctx, event); + LOG("warning, got unexpected event type %d, event=%s", + event->type, evstr); + free(evstr); } - libxl_free_event(&event); + + libxl_event_free(ctx, event); } error_out: @@ -1811,6 +1864,13 @@ waitpid(child_console_pid, &status, 0) < 0 && errno == EINTR) goto waitpid_out; + if (deathw) + libxl_evdisable_domain_death(ctx, deathw); + if (diskws) { + evdisable_disk_ejects(diskws, d_config.num_disks); + free(diskws); + } + /* * If we have daemonized then do not return to the caller -- this has * already happened in the parent. @@ -2273,6 +2333,7 @@ static void shutdown_domain(const char *p, int wait) { int rc; + libxl_event *event; find_domain(p); rc=libxl_domain_shutdown(ctx, domid); @@ -2287,37 +2348,39 @@ } if (wait) { - libxl_waiter waiter; - int fd; - - libxl_wait_for_domain_death(ctx, domid, &waiter); - - libxl_get_wait_fd(ctx, &fd); - - while (wait) { - fd_set rfds; - libxl_event event; - libxl_dominfo info; - - FD_ZERO(&rfds); - FD_SET(fd, &rfds); - - if (!select(fd + 1, &rfds, NULL, NULL, NULL)) - continue; - - libxl_get_event(ctx, &event); - - if (event.type == LIBXL_EVENT_TYPE_DOMAIN_DEATH) { - if (libxl_event_get_domain_death_info(ctx, domid, &event, &info) < 0) - continue; - - LOG("Domain %d is dead", domid); - wait = 0; + libxl_evgen_domain_death *deathw; + + rc = libxl_evenable_domain_death(ctx, domid, 0, &deathw); + if (rc) { + fprintf(stderr,"wait for death failed (evgen, rc=%d)\n",rc); + exit(-1); + } + + for (;;) { + rc = domain_wait_event(&event); + if (rc) exit(-1); + + switch (event->type) { + + case LIBXL_EVENT_TYPE_DOMAIN_DESTROY: + LOG("Domain %d has been destroyed", domid); + goto done; + + case LIBXL_EVENT_TYPE_DOMAIN_SHUTDOWN: + LOG("Domain %d has been shut down, reason code %d %x", domid, + event->u.domain_shutdown.shutdown_reason, + event->u.domain_shutdown.shutdown_reason); + goto done; + + default: + LOG("Unexpected event type %d", event->type); + break; } - - libxl_free_event(&event); + libxl_event_free(ctx, event); } - libxl_free_waiter(&waiter); + done: + libxl_event_free(ctx, event); + libxl_evdisable_domain_death(ctx, deathw); } } diff -r db9cac5b2489 -r 4f3822ee1f43 tools/ocaml/libs/xl/genwrap.py --- a/tools/ocaml/libs/xl/genwrap.py Fri Jan 27 17:01:21 2012 +0000 +++ b/tools/ocaml/libs/xl/genwrap.py Fri Jan 27 17:01:22 2012 +0000 @@ -275,6 +275,7 @@ "device_model_info", "vcpuinfo", "topologyinfo", + "event", ] for t in blacklist: _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:55:45 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:55:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6d-0006FQ-7o; Fri, 03 Feb 2012 21:55:43 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6c-0006Ey-BI for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:42 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-27.messagelabs.com!1328306097!58731721!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32098 invoked from network); 3 Feb 2012 21:54:58 -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; 3 Feb 2012 21:54:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6Z-0001hr-FX for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR6X-0002ER-Fs for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:38 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:55:36 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: introduce libxl_fd_set_nonblock, rationalise _cloexec X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Jackson # Date 1327683683 0 # Node ID d503bdfaba2326b6cc11b45feb660954cc8d9b88 # Parent 4f3822ee1f437792ff89b53cc5e2c59d98dbf337 libxl: introduce libxl_fd_set_nonblock, rationalise _cloexec We want a function for setting fds to nonblocking, so introduce one. This is a very similar requirement to that for libxl_fd_set_cloexec, so make it common with that. While we're at it, fix a few deficiences that make this latter function less desirable than it could be: * Change the return from 0/-1 (like a syscall) to a libxl error code * Take a boolean parameter for turning the flag on and off * Log on error (and so, take a ctx for this purpose) Change callers of libxl_fd_set_cloexec to notice errors. (Although, such errors are highly unlikely.) Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 4f3822ee1f43 -r d503bdfaba23 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Fri Jan 27 17:01:22 2012 +0000 +++ b/tools/libxl/libxl.c Fri Jan 27 17:01:23 2012 +0000 @@ -3658,19 +3658,38 @@ return 0; } -int libxl_fd_set_cloexec(int fd) +static int fd_set_flags(libxl_ctx *ctx, int fd, + int fcntlgetop, int fcntlsetop, const char *fl, + int flagmask, int set_p) { - int flags = 0; - - if ((flags = fcntl(fd, F_GETFD)) == -1) { - flags = 0; + int flags, r; + + flags = fcntl(fd, fcntlgetop); + if (flags == -1) { + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "fcntl(,F_GET%s) failed",fl); + return ERROR_FAIL; } - if ((flags & FD_CLOEXEC)) { - return 0; + + if (set_p) + flags |= flagmask; + else + flags &= ~flagmask; + + r = fcntl(fd, fcntlsetop, flags); + if (r == -1) { + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "fcntl(,F_SET%s) failed",fl); + return ERROR_FAIL; } - return fcntl(fd, F_SETFD, flags | FD_CLOEXEC); + + return 0; } +int libxl_fd_set_cloexec(libxl_ctx *ctx, int fd, int cloexec) + { return fd_set_flags(ctx,fd, F_GETFD,F_SETFD,"FD", FD_CLOEXEC, cloexec); } + +int libxl_fd_set_nonblock(libxl_ctx *ctx, int fd, int nonblock) + { return fd_set_flags(ctx,fd, F_GETFL,F_SETFL,"FL", O_NONBLOCK, nonblock); } + /* * Local variables: * mode: C diff -r 4f3822ee1f43 -r d503bdfaba23 tools/libxl/libxl.h --- a/tools/libxl/libxl.h Fri Jan 27 17:01:22 2012 +0000 +++ b/tools/libxl/libxl.h Fri Jan 27 17:01:23 2012 +0000 @@ -613,7 +613,12 @@ const char *libxl_xenpaging_dir_path(void); /* misc */ -int libxl_fd_set_cloexec(int fd); + +/* Each of these sets or clears the flag according to whether the + * 2nd parameter is nonzero. On failure, they log, and + * return ERROR_FAIL, but also leave errno valid. */ +int libxl_fd_set_cloexec(libxl_ctx *ctx, int fd, int cloexec); +int libxl_fd_set_nonblock(libxl_ctx *ctx, int fd, int nonblock); #include diff -r 4f3822ee1f43 -r d503bdfaba23 tools/libxl/libxl_qmp.c --- a/tools/libxl/libxl_qmp.c Fri Jan 27 17:01:22 2012 +0000 +++ b/tools/libxl/libxl_qmp.c Fri Jan 27 17:01:23 2012 +0000 @@ -325,7 +325,8 @@ if (fcntl(qmp->qmp_fd, F_SETFL, flags | O_NONBLOCK) == -1) { return -1; } - libxl_fd_set_cloexec(qmp->qmp_fd); + ret = libxl_fd_set_cloexec(qmp->ctx, qmp->qmp_fd, 1); + if (ret) return -1; memset(&qmp->addr, 0, sizeof (&qmp->addr)); qmp->addr.sun_family = AF_UNIX; diff -r 4f3822ee1f43 -r d503bdfaba23 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Fri Jan 27 17:01:22 2012 +0000 +++ b/tools/libxl/xl_cmdimpl.c Fri Jan 27 17:01:23 2012 +0000 @@ -1509,7 +1509,8 @@ restore_fd = migrate_fd; } else { restore_fd = open(restore_file, O_RDONLY); - libxl_fd_set_cloexec(restore_fd); + rc = libxl_fd_set_cloexec(ctx, restore_fd, 1); + if (rc) return rc; } CHK_ERRNO( libxl_read_exactly(ctx, restore_fd, &hdr, _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:55:45 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:55:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6d-0006FQ-7o; Fri, 03 Feb 2012 21:55:43 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6c-0006Ey-BI for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:42 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-27.messagelabs.com!1328306097!58731721!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32098 invoked from network); 3 Feb 2012 21:54:58 -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; 3 Feb 2012 21:54:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6Z-0001hr-FX for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR6X-0002ER-Fs for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:38 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:55:36 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: introduce libxl_fd_set_nonblock, rationalise _cloexec X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Jackson # Date 1327683683 0 # Node ID d503bdfaba2326b6cc11b45feb660954cc8d9b88 # Parent 4f3822ee1f437792ff89b53cc5e2c59d98dbf337 libxl: introduce libxl_fd_set_nonblock, rationalise _cloexec We want a function for setting fds to nonblocking, so introduce one. This is a very similar requirement to that for libxl_fd_set_cloexec, so make it common with that. While we're at it, fix a few deficiences that make this latter function less desirable than it could be: * Change the return from 0/-1 (like a syscall) to a libxl error code * Take a boolean parameter for turning the flag on and off * Log on error (and so, take a ctx for this purpose) Change callers of libxl_fd_set_cloexec to notice errors. (Although, such errors are highly unlikely.) Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 4f3822ee1f43 -r d503bdfaba23 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Fri Jan 27 17:01:22 2012 +0000 +++ b/tools/libxl/libxl.c Fri Jan 27 17:01:23 2012 +0000 @@ -3658,19 +3658,38 @@ return 0; } -int libxl_fd_set_cloexec(int fd) +static int fd_set_flags(libxl_ctx *ctx, int fd, + int fcntlgetop, int fcntlsetop, const char *fl, + int flagmask, int set_p) { - int flags = 0; - - if ((flags = fcntl(fd, F_GETFD)) == -1) { - flags = 0; + int flags, r; + + flags = fcntl(fd, fcntlgetop); + if (flags == -1) { + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "fcntl(,F_GET%s) failed",fl); + return ERROR_FAIL; } - if ((flags & FD_CLOEXEC)) { - return 0; + + if (set_p) + flags |= flagmask; + else + flags &= ~flagmask; + + r = fcntl(fd, fcntlsetop, flags); + if (r == -1) { + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "fcntl(,F_SET%s) failed",fl); + return ERROR_FAIL; } - return fcntl(fd, F_SETFD, flags | FD_CLOEXEC); + + return 0; } +int libxl_fd_set_cloexec(libxl_ctx *ctx, int fd, int cloexec) + { return fd_set_flags(ctx,fd, F_GETFD,F_SETFD,"FD", FD_CLOEXEC, cloexec); } + +int libxl_fd_set_nonblock(libxl_ctx *ctx, int fd, int nonblock) + { return fd_set_flags(ctx,fd, F_GETFL,F_SETFL,"FL", O_NONBLOCK, nonblock); } + /* * Local variables: * mode: C diff -r 4f3822ee1f43 -r d503bdfaba23 tools/libxl/libxl.h --- a/tools/libxl/libxl.h Fri Jan 27 17:01:22 2012 +0000 +++ b/tools/libxl/libxl.h Fri Jan 27 17:01:23 2012 +0000 @@ -613,7 +613,12 @@ const char *libxl_xenpaging_dir_path(void); /* misc */ -int libxl_fd_set_cloexec(int fd); + +/* Each of these sets or clears the flag according to whether the + * 2nd parameter is nonzero. On failure, they log, and + * return ERROR_FAIL, but also leave errno valid. */ +int libxl_fd_set_cloexec(libxl_ctx *ctx, int fd, int cloexec); +int libxl_fd_set_nonblock(libxl_ctx *ctx, int fd, int nonblock); #include diff -r 4f3822ee1f43 -r d503bdfaba23 tools/libxl/libxl_qmp.c --- a/tools/libxl/libxl_qmp.c Fri Jan 27 17:01:22 2012 +0000 +++ b/tools/libxl/libxl_qmp.c Fri Jan 27 17:01:23 2012 +0000 @@ -325,7 +325,8 @@ if (fcntl(qmp->qmp_fd, F_SETFL, flags | O_NONBLOCK) == -1) { return -1; } - libxl_fd_set_cloexec(qmp->qmp_fd); + ret = libxl_fd_set_cloexec(qmp->ctx, qmp->qmp_fd, 1); + if (ret) return -1; memset(&qmp->addr, 0, sizeof (&qmp->addr)); qmp->addr.sun_family = AF_UNIX; diff -r 4f3822ee1f43 -r d503bdfaba23 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Fri Jan 27 17:01:22 2012 +0000 +++ b/tools/libxl/xl_cmdimpl.c Fri Jan 27 17:01:23 2012 +0000 @@ -1509,7 +1509,8 @@ restore_fd = migrate_fd; } else { restore_fd = open(restore_file, O_RDONLY); - libxl_fd_set_cloexec(restore_fd); + rc = libxl_fd_set_cloexec(ctx, restore_fd, 1); + if (rc) return rc; } CHK_ERRNO( libxl_read_exactly(ctx, restore_fd, &hdr, _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:55:46 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:55:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6e-0006Fm-D5; Fri, 03 Feb 2012 21:55:44 +0000 Received: from mail182.messagelabs.com ([85.158.139.83]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6c-0006EF-GK for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:43 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-182.messagelabs.com!1328306132!12800361!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.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22721 invoked from network); 3 Feb 2012 21:55:34 -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; 3 Feb 2012 21:55:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6S-0001hi-7m for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR6P-0002CD-MO for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:31 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:55:29 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: New API for providing OS events to libxl X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Jackson # Date 1327683680 0 # Node ID b3387ae40371d8d075218502b456c250d0cb60b1 # Parent f204ead7d9e4904beb7a848860b23780b480ed6c libxl: New API for providing OS events to libxl We provide a new set of functions and related structures libxl_osevent_* which are to be used by event-driven applications to receive information from libxl about which fds libxl is interested in, and what timeouts libxl is waiting for, and to pass back to libxl information about which fds are readable/writeable etc., and which timeouts have occurred. Ie, low-level events. In this patch, this new machinery is still all unused. Callers will appear in the next patch in the series, which introduces a new API for applications to receive high-level events about actual domains etc. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r f204ead7d9e4 -r b3387ae40371 tools/libxl/Makefile --- a/tools/libxl/Makefile Fri Jan 27 17:01:19 2012 +0000 +++ b/tools/libxl/Makefile Fri Jan 27 17:01:20 2012 +0000 @@ -49,7 +49,7 @@ 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_qmp.o $(LIBXL_OBJS-y) + libxl_qmp.o libxl_event.o $(LIBXL_OBJS-y) LIBXL_OBJS += _libxl_types.o libxl_flask.o _libxl_types_internal.o $(LIBXL_OBJS): CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) $(CFLAGS_libxenstore) $(CFLAGS_libblktapctl) diff -r f204ead7d9e4 -r b3387ae40371 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Fri Jan 27 17:01:19 2012 +0000 +++ b/tools/libxl/libxl.c Fri Jan 27 17:01:20 2012 +0000 @@ -45,6 +45,16 @@ * only as an initialiser, not as an expression. */ memcpy(&ctx->lock, &mutex_value, sizeof(ctx->lock)); + ctx->osevent_hooks = 0; + + ctx->fd_rindex = 0; + LIBXL_LIST_INIT(&ctx->efds); + LIBXL_TAILQ_INIT(&ctx->etimes); + + ctx->watch_slots = 0; + LIBXL_SLIST_INIT(&ctx->watch_freeslots); + libxl__ev_fd_init(&ctx->watch_efd); + if ( stat(XENSTORE_PID_FILE, &stat_buf) != 0 ) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Is xenstore daemon running?\n" "failed to stat %s", XENSTORE_PID_FILE); @@ -79,9 +89,29 @@ int libxl_ctx_free(libxl_ctx *ctx) { if (!ctx) return 0; + + int i; + GC_INIT(ctx); + + /* Deregister all libxl__ev_KINDs: */ + + for (i = 0; i < ctx->watch_nslots; i++) + assert(!libxl__watch_slot_contents(gc, i)); + libxl__ev_fd_deregister(gc, &ctx->watch_efd); + + /* Now there should be no more events requested from the application: */ + + assert(LIBXL_LIST_EMPTY(&ctx->efds)); + assert(LIBXL_TAILQ_EMPTY(&ctx->etimes)); + if (ctx->xch) xc_interface_close(ctx->xch); libxl_version_info_dispose(&ctx->version_info); if (ctx->xsh) xs_daemon_close(ctx->xsh); + + free(ctx->fd_rindex); + free(ctx->watch_slots); + + GC_FREE; free(ctx); return 0; } diff -r f204ead7d9e4 -r b3387ae40371 tools/libxl/libxl.h --- a/tools/libxl/libxl.h Fri Jan 27 17:01:19 2012 +0000 +++ b/tools/libxl/libxl.h Fri Jan 27 17:01:20 2012 +0000 @@ -137,6 +137,7 @@ #include #include +#include <_libxl_list.h> typedef uint8_t libxl_mac[6]; #define LIBXL_MAC_FMT "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx" @@ -223,6 +224,9 @@ ERROR_GUEST_TIMEDOUT = -8, ERROR_TIMEDOUT = -9, ERROR_NOPARAVIRT = -10, + ERROR_NOT_READY = -11, + ERROR_OSEVENT_REG_FAIL = -12, + ERROR_BUFFERFULL = -13, }; #define LIBXL_VERSION 0 @@ -648,6 +652,8 @@ /* misc */ int libxl_fd_set_cloexec(int fd); +#include + #endif /* LIBXL_H */ /* diff -r f204ead7d9e4 -r b3387ae40371 tools/libxl/libxl_event.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/libxl/libxl_event.c Fri Jan 27 17:01:20 2012 +0000 @@ -0,0 +1,750 @@ +/* + * Copyright (C) 2011 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. + */ +/* + * Internal event machinery for use by other parts of libxl + */ + +#include + +#include "libxl_internal.h" + +/* + * The counter osevent_in_hook is used to ensure that the application + * honours the reentrancy restriction documented in libxl_event.h. + * + * The application's registration hooks should be called ONLY via + * 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(hookname,...) \ + OSEVENT_HOOK_INTERN(0, hookname, __VA_ARGS__) + +#define OSEVENT_HOOK_VOID(hookname,...) \ + OSEVENT_HOOK_INTERN((void)0, hookname, __VA_ARGS__) + +/* + * fd events + */ + +int libxl__ev_fd_register(libxl__gc *gc, libxl__ev_fd *ev, + libxl__ev_fd_callback *func, + int fd, short events) +{ + int rc; + + assert(fd >= 0); + + CTX_LOCK; + + rc = OSEVENT_HOOK(fd_register, fd, &ev->for_app_reg, events, ev); + if (rc) goto out; + + ev->fd = fd; + ev->events = events; + ev->func = func; + + LIBXL_LIST_INSERT_HEAD(&CTX->efds, ev, entry); + + rc = 0; + + out: + CTX_UNLOCK; + return rc; +} + +int libxl__ev_fd_modify(libxl__gc *gc, libxl__ev_fd *ev, short events) +{ + int rc; + + CTX_LOCK; + assert(libxl__ev_fd_isregistered(ev)); + + rc = OSEVENT_HOOK(fd_modify, ev->fd, &ev->for_app_reg, events); + if (rc) goto out; + + ev->events = events; + + rc = 0; + out: + CTX_UNLOCK; + return rc; +} + +void libxl__ev_fd_deregister(libxl__gc *gc, libxl__ev_fd *ev) +{ + CTX_LOCK; + + if (!libxl__ev_fd_isregistered(ev)) + goto out; + + OSEVENT_HOOK_VOID(fd_deregister, ev->fd, ev->for_app_reg); + LIBXL_LIST_REMOVE(ev, entry); + ev->fd = -1; + + out: + CTX_UNLOCK; +} + +/* + * timeouts + */ + + +int libxl__gettimeofday(libxl__gc *gc, struct timeval *now_r) +{ + int rc = gettimeofday(now_r, 0); + if (rc) { + LIBXL__LOG_ERRNO(CTX, LIBXL__LOG_ERROR, "gettimeofday failed"); + return ERROR_FAIL; + } + return 0; +} + +static int time_rel_to_abs(libxl__gc *gc, int ms, struct timeval *abs_out) +{ + int rc; + struct timeval additional = { + .tv_sec = ms / 1000, + .tv_usec = (ms % 1000) * 1000 + }; + struct timeval now; + + rc = libxl__gettimeofday(gc, &now); + if (rc) return rc; + + timeradd(&now, &additional, abs_out); + return 0; +} + +static void time_insert_finite(libxl__gc *gc, libxl__ev_time *ev) +{ + libxl__ev_time *evsearch; + LIBXL_TAILQ_INSERT_SORTED(&CTX->etimes, entry, ev, evsearch, /*empty*/, + timercmp(&ev->abs, &evsearch->abs, >)); + ev->infinite = 0; +} + +static int time_register_finite(libxl__gc *gc, libxl__ev_time *ev, + struct timeval abs) +{ + int rc; + + rc = OSEVENT_HOOK(timeout_register, &ev->for_app_reg, abs, ev); + if (rc) return rc; + + ev->infinite = 0; + ev->abs = abs; + time_insert_finite(gc, ev); + + return 0; +} + +static void time_deregister(libxl__gc *gc, libxl__ev_time *ev) +{ + if (!ev->infinite) { + OSEVENT_HOOK_VOID(timeout_deregister, &ev->for_app_reg); + LIBXL_TAILQ_REMOVE(&CTX->etimes, ev, entry); + } +} + + +int libxl__ev_time_register_abs(libxl__gc *gc, libxl__ev_time *ev, + libxl__ev_time_callback *func, + struct timeval abs) +{ + int rc; + + CTX_LOCK; + + rc = time_register_finite(gc, ev, abs); + if (rc) goto out; + + ev->func = func; + + rc = 0; + out: + CTX_UNLOCK; + return rc; +} + + +int libxl__ev_time_register_rel(libxl__gc *gc, libxl__ev_time *ev, + libxl__ev_time_callback *func, + int milliseconds /* as for poll(2) */) +{ + struct timeval abs; + int rc; + + CTX_LOCK; + + if (milliseconds < 0) { + ev->infinite = 1; + } else { + rc = time_rel_to_abs(gc, milliseconds, &abs); + if (rc) goto out; + + rc = time_register_finite(gc, ev, abs); + if (rc) goto out; + } + + ev->func = func; + rc = 0; + + out: + CTX_UNLOCK; + return rc; +} + +int libxl__ev_time_modify_abs(libxl__gc *gc, libxl__ev_time *ev, + struct timeval abs) +{ + int rc; + + CTX_LOCK; + + assert(libxl__ev_time_isregistered(ev)); + + if (ev->infinite) { + rc = time_register_finite(gc, ev, abs); + if (rc) goto out; + } else { + rc = OSEVENT_HOOK(timeout_modify, &ev->for_app_reg, abs); + if (rc) goto out; + + LIBXL_TAILQ_REMOVE(&CTX->etimes, ev, entry); + ev->abs = abs; + time_insert_finite(gc, ev); + } + + rc = 0; + out: + CTX_UNLOCK; + return rc; +} + +int libxl__ev_time_modify_rel(libxl__gc *gc, libxl__ev_time *ev, + int milliseconds) +{ + struct timeval abs; + int rc; + + CTX_LOCK; + + assert(libxl__ev_time_isregistered(ev)); + + if (milliseconds < 0) { + time_deregister(gc, ev); + ev->infinite = 1; + rc = 0; + goto out; + } + + rc = time_rel_to_abs(gc, milliseconds, &abs); + if (rc) goto out; + + rc = libxl__ev_time_modify_abs(gc, ev, abs); + if (rc) goto out; + + rc = 0; + out: + CTX_UNLOCK; + return rc; +} + +void libxl__ev_time_deregister(libxl__gc *gc, libxl__ev_time *ev) +{ + CTX_LOCK; + + if (!libxl__ev_time_isregistered(ev)) + goto out; + + time_deregister(gc, ev); + ev->func = 0; + + out: + CTX_UNLOCK; + return; +} + + +/* + * xenstore watches + */ + +libxl__ev_xswatch *libxl__watch_slot_contents(libxl__gc *gc, int slotnum) +{ + libxl__ev_watch_slot *slot = &CTX->watch_slots[slotnum]; + libxl__ev_watch_slot *slotcontents = LIBXL_SLIST_NEXT(slot, empty); + + if (slotcontents == NULL || + ((uintptr_t)slotcontents >= (uintptr_t)CTX->watch_slots && + (uintptr_t)slotcontents < (uintptr_t)(CTX->watch_slots + + CTX->watch_nslots))) + /* An empty slot has either a NULL pointer (end of the + * free list), or a pointer to another entry in the array. + * So we can do a bounds check to distinguish empty from + * full slots. + */ + /* We need to do the comparisons as uintptr_t because + * comparing pointers which are not in the same object is + * undefined behaviour; if the compiler managed to figure + * out that watch_slots[0..watch_nslots-1] is all of the + * whole array object it could prove that the above bounds + * check was always true if it was legal, and remove it! + * + * uintptr_t because even on a machine with signed + * pointers, objects do not cross zero; whereas on + * machines with unsigned pointers, they may cross + * 0x8bazillion. + */ + return NULL; + + /* see comment near libxl__ev_watch_slot definition */ + return (void*)slotcontents; +} + +static void libxl__set_watch_slot_contents(libxl__ev_watch_slot *slot, + libxl__ev_xswatch *w) +{ + /* we look a bit behind the curtain of LIBXL_SLIST, to explicitly + * assign to the pointer that's the next link. See the comment + * by the definition of libxl__ev_watch_slot */ + slot->empty.sle_next = (void*)w; +} + +static void watchfd_callback(libxl__egc *egc, libxl__ev_fd *ev, + int fd, short events, short revents) +{ + EGC_GC; + + for (;;) { + char **event = xs_check_watch(CTX->xsh); + if (!event) { + if (errno == EAGAIN) break; + if (errno == EINTR) continue; + LIBXL__EVENT_DISASTER(egc, "cannot check/read watches", errno, 0); + return; + } + + const char *epath = event[0]; + const char *token = event[1]; + int slotnum; + uint32_t counterval; + int rc = sscanf(token, "%d/%"SCNx32, &slotnum, &counterval); + if (rc != 2) { + LIBXL__LOG(CTX, LIBXL__LOG_ERROR, + "watch epath=%s token=%s: failed to parse token", + epath, token); + /* oh well */ + goto ignore; + } + if (slotnum < 0 || slotnum >= CTX->watch_nslots) { + /* perhaps in the future we will make the watchslots array shrink */ + LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, "watch epath=%s token=%s:" + " slotnum %d out of range [0,%d>", + epath, token, slotnum, CTX->watch_nslots); + goto ignore; + } + + libxl__ev_xswatch *w = libxl__watch_slot_contents(gc, slotnum); + + if (!w) { + LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, + "watch epath=%s token=%s: empty slot", + epath, token); + goto ignore; + } + + if (w->counterval != counterval) { + LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, + "watch epath=%s token=%s: counter != %"PRIx32, + epath, token, w->counterval); + goto ignore; + } + + /* Now it's possible, though unlikely, that this was an event + * from a previous use of the same slot with the same counterval. + * + * In that case either: + * - the event path is a child of the watch path, in + * which case this watch would really have generated this + * event if it had been registered soon enough and we are + * OK to give this possibly-spurious event to the caller; or + * - it is not, in which case we must suppress it as the + * caller should not see events for unrelated paths. + * + * See also docs/misc/xenstore.txt. + */ + if (!xs_path_is_subpath(w->path, epath)) { + LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, + "watch epath=%s token=%s: not child of wpath=%s", + epath, token, w->path); + goto ignore; + } + + /* At last, we have checked everything! */ + LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, + "watch event: epath=%s token=%s wpath=%s w=%p", + epath, token, w->path, w); + w->callback(egc, w, w->path, epath); + + ignore: + free(event); + } +} + +static char *watch_token(libxl__gc *gc, int slotnum, uint32_t counterval) +{ + return libxl__sprintf(gc, "%d/%"PRIx32, slotnum, counterval); +} + +int libxl__ev_xswatch_register(libxl__gc *gc, libxl__ev_xswatch *w, + libxl__ev_xswatch_callback *func, + const char *path /* copied */) +{ + libxl__ev_watch_slot *use = NULL; + char *path_copy = NULL; + int rc; + + CTX_LOCK; + + if (!libxl__ev_fd_isregistered(&CTX->watch_efd)) { + rc = libxl__ev_fd_register(gc, &CTX->watch_efd, watchfd_callback, + xs_fileno(CTX->xsh), POLLIN); + if (rc) goto out_rc; + } + + if (LIBXL_SLIST_EMPTY(&CTX->watch_freeslots)) { + /* Free list is empty so there is not in fact a linked + * free list in the array and we can safely realloc it */ + int newarraysize = (CTX->watch_nslots + 1) << 2; + int i; + libxl__ev_watch_slot *newarray = + realloc(CTX->watch_slots, sizeof(*newarray) * newarraysize); + if (!newarray) goto out_nomem; + for (i = CTX->watch_nslots; i < newarraysize; i++) + LIBXL_SLIST_INSERT_HEAD(&CTX->watch_freeslots, + &newarray[i], empty); + CTX->watch_slots = newarray; + CTX->watch_nslots = newarraysize; + } + use = LIBXL_SLIST_FIRST(&CTX->watch_freeslots); + assert(use); + LIBXL_SLIST_REMOVE_HEAD(&CTX->watch_freeslots, empty); + + path_copy = strdup(path); + if (!path_copy) goto out_nomem; + + int slotnum = use - CTX->watch_slots; + w->counterval = CTX->watch_counter++; + + if (!xs_watch(CTX->xsh, path, watch_token(gc, slotnum, w->counterval))) { + LIBXL__LOG_ERRNOVAL(CTX, LIBXL__LOG_ERROR, errno, + "create watch for path %s", path); + rc = ERROR_FAIL; + goto out_rc; + } + + w->slotnum = slotnum; + w->path = path_copy; + w->callback = func; + libxl__set_watch_slot_contents(use, w); + + CTX_UNLOCK; + return 0; + + out_nomem: + rc = ERROR_NOMEM; + out_rc: + if (use) + LIBXL_SLIST_INSERT_HEAD(&CTX->watch_freeslots, use, empty); + if (path_copy) + free(path_copy); + CTX_UNLOCK; + return rc; +} + +void libxl__ev_xswatch_deregister(libxl__gc *gc, libxl__ev_xswatch *w) +{ + /* it is legal to deregister from within _callback */ + CTX_LOCK; + + if (w->slotnum >= 0) { + char *token = watch_token(gc, w->slotnum, w->counterval); + if (!xs_unwatch(CTX->xsh, w->path, token)) + /* Oh well, we will just get watch events forever more + * and ignore them. But we should complain to the log. */ + LIBXL__LOG_ERRNOVAL(CTX, LIBXL__LOG_ERROR, errno, + "remove watch for path %s", w->path); + + libxl__ev_watch_slot *slot = &CTX->watch_slots[w->slotnum]; + LIBXL_SLIST_INSERT_HEAD(&CTX->watch_freeslots, slot, empty); + w->slotnum = -1; + } + + free(w->path); + w->path = NULL; + + CTX_UNLOCK; +} + +/* + * osevent poll + */ + +int libxl_osevent_beforepoll(libxl_ctx *ctx, int *nfds_io, + struct pollfd *fds, int *timeout_upd, + struct timeval now) +{ + libxl__ev_fd *efd; + int rc; + + /* + * 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. + */ + + GC_INIT(ctx); + CTX_LOCK; + + if (*nfds_io) { + /* + * As an optimisation, we don't touch fd_rindex + * if *nfds_io is zero on entry, since in that case the + * caller just wanted to know how big an array to give us. + * + * If !*nfds_io, the unconditional parts below are guaranteed + * not to mess with fd_rindex. + */ + + int maxfd = 0; + LIBXL_LIST_FOREACH(efd, &CTX->efds, entry) { + if (!efd->events) + continue; + if (efd->fd >= maxfd) + maxfd = efd->fd + 1; + } + /* make sure our array is as big as *nfds_io */ + if (CTX->fd_rindex_allocd < maxfd) { + assert(maxfd < INT_MAX / sizeof(int) / 2); + int *newarray = realloc(CTX->fd_rindex, sizeof(int) * maxfd); + if (!newarray) { rc = ERROR_NOMEM; goto out; } + memset(newarray + CTX->fd_rindex_allocd, 0, + sizeof(int) * (maxfd - CTX->fd_rindex_allocd)); + CTX->fd_rindex = newarray; + CTX->fd_rindex_allocd = maxfd; + } + } + + int used = 0; + LIBXL_LIST_FOREACH(efd, &CTX->efds, entry) { + if (!efd->events) + continue; + if (used < *nfds_io) { + fds[used].fd = efd->fd; + fds[used].events = efd->events; + fds[used].revents = 0; + assert(efd->fd < CTX->fd_rindex_allocd); + CTX->fd_rindex[efd->fd] = used; + } + used++; + } + rc = used <= *nfds_io ? 0 : ERROR_BUFFERFULL; + + *nfds_io = used; + + libxl__ev_time *etime = LIBXL_TAILQ_FIRST(&CTX->etimes); + if (etime) { + int our_timeout; + struct timeval rel; + static struct timeval zero; + + timersub(&etime->abs, &now, &rel); + + if (timercmp(&rel, &zero, <)) { + our_timeout = 0; + } else if (rel.tv_sec >= 2000000) { + our_timeout = 2000000000; + } else { + our_timeout = rel.tv_sec * 1000 + (rel.tv_usec + 999) / 1000; + } + if (*timeout_upd < 0 || our_timeout < *timeout_upd) + *timeout_upd = our_timeout; + } + + out: + CTX_UNLOCK; + GC_FREE; + return rc; +} + +static int afterpoll_check_fd(libxl_ctx *ctx, + const struct pollfd *fds, int nfds, + int fd, int events) + /* returns mask of events which were requested and occurred */ +{ + if (fd >= ctx->fd_rindex_allocd) + /* added after we went into poll, have to try again */ + return 0; + + int slot = ctx->fd_rindex[fd]; + + if (slot >= nfds) + /* stale slot entry; again, added afterwards */ + return 0; + + if (fds[slot].fd != fd) + /* again, stale slot entry */ + return 0; + + int revents = fds[slot].revents & events; + /* we mask in case requested events have changed */ + + return revents; +} + +void libxl_osevent_afterpoll(libxl_ctx *ctx, int nfds, const struct pollfd *fds, + struct timeval now) +{ + EGC_INIT(ctx); + CTX_LOCK; + libxl__ev_fd *efd; + + LIBXL_LIST_FOREACH(efd, &CTX->efds, entry) { + if (!efd->events) + continue; + + int revents = afterpoll_check_fd(CTX,fds,nfds, efd->fd,efd->events); + if (revents) + efd->func(egc, efd, efd->fd, efd->events, revents); + } + + for (;;) { + libxl__ev_time *etime = LIBXL_TAILQ_FIRST(&CTX->etimes); + if (!etime) + break; + + assert(!etime->infinite); + + if (timercmp(&etime->abs, &now, >)) + break; + + time_deregister(gc, etime); + + etime->func(egc, etime, &etime->abs); + } + + CTX_UNLOCK; + EGC_FREE; +} + + +/* + * osevent hook and callback machinery + */ + +void libxl_osevent_register_hooks(libxl_ctx *ctx, + const libxl_osevent_hooks *hooks, + void *user) +{ + GC_INIT(ctx); + CTX_LOCK; + ctx->osevent_hooks = hooks; + ctx->osevent_user = user; + CTX_UNLOCK; + GC_FREE; +} + + +void libxl_osevent_occurred_fd(libxl_ctx *ctx, void *for_libxl, + int fd, short events, short revents) +{ + libxl__ev_fd *ev = for_libxl; + + EGC_INIT(ctx); + CTX_LOCK; + assert(!CTX->osevent_in_hook); + + assert(fd == ev->fd); + revents &= ev->events; + if (revents) + ev->func(egc, ev, fd, ev->events, revents); + + CTX_UNLOCK; + EGC_FREE; +} + +void libxl_osevent_occurred_timeout(libxl_ctx *ctx, void *for_libxl) +{ + libxl__ev_time *ev = for_libxl; + + EGC_INIT(ctx); + CTX_LOCK; + assert(!CTX->osevent_in_hook); + + assert(!ev->infinite); + LIBXL_TAILQ_REMOVE(&CTX->etimes, ev, entry); + ev->func(egc, ev, &ev->abs); + + CTX_UNLOCK; + EGC_FREE; +} + +void libxl__event_disaster(libxl__egc *egc, const char *msg, int errnoval, + libxl_event_type type /* may be 0 */, + const char *file, int line, const char *func) +{ + EGC_GC; + + libxl__log(CTX, XTL_CRITICAL, errnoval, file, line, func, + "DISASTER in event loop: %s%s%s%s", + msg, + type ? " (relates to event type " : "", + type ? libxl_event_type_to_string(type) : "", + type ? ")" : ""); + + /* + * FIXME: This should call the "disaster" hook supplied to + * libxl_event_register_callbacks, which will be introduced in the + * next patch. + */ + + const char verybad[] = + "DISASTER in event loop not handled by libxl application"; + LIBXL__LOG(CTX, XTL_CRITICAL, verybad); + fprintf(stderr, "libxl: fatal error, exiting program: %s\n", verybad); + exit(-1); +} + +void libxl__egc_cleanup(libxl__egc *egc) +{ + libxl__free_all(&egc->gc); +} + +/* + * Local variables: + * mode: C + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff -r f204ead7d9e4 -r b3387ae40371 tools/libxl/libxl_event.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/libxl/libxl_event.h Fri Jan 27 17:01:20 2012 +0000 @@ -0,0 +1,205 @@ +/* + * Copyright (C) 2011 Citrix Ltd. + * Author Ian Jackson + * + * 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. + */ + +#ifndef LIBXL_EVENT_H +#define LIBXL_EVENT_H + +#include + + +/*======================================================================*/ + +/* + * OS event handling - passing low-level OS events to libxl + * + * Event-driven programs must use these facilities to allow libxl + * to become aware of readability/writeability of file descriptors + * and the occurrence of timeouts. + * + * There are two approaches available. The first is appropriate for + * simple programs handling reasonably small numbers of domains: + * + * for (;;) { + * libxl_osevent_beforepoll(...) + * poll(); + * libxl_osevent_afterpoll(...); + * for (;;) { + * r=libxl_event_check(...); + * if (r==LIBXL_NOT_READY) break; + * if (r) handle failure; + * do something with the event; + * } + * } + * + * The second approach uses libxl_osevent_register_hooks and is + * suitable for programs which are already using a callback-based + * event library. + * + * An application may freely mix the two styles of interaction. + * + * (Callers inside libxl may not call libxl_osevent_... functions.) + */ + +struct pollfd; + +/* The caller should provide beforepoll with some space for libxl's + * fds, and tell libxl how much space is available by setting *nfds_io. + * fds points to the start of this space (and fds may be a pointer into + * a larger array, for example, if the application has some fds of + * its own that it is interested in). + * + * On return *nfds_io will in any case have been updated by libxl + * according to how many fds libxl wants to poll on. + * + * If the space was sufficient, libxl fills in fds[0..] suitably for poll(2), updates *timeout_upd if needed, + * and returns ok. + * + * If space was insufficient, fds[0..] is undefined on + * return; *nfds_io on return will be greater than the value on + * entry; *timeout_upd may or may not have been updated; and + * libxl_osevent_beforepoll returns ERROR_BUFERFULL. In this case + * the application needs to make more space (enough space for + * *nfds_io struct pollfd) and then call beforepoll again, before + * entering poll(2). Typically this will involve calling realloc. + * + * The application may call beforepoll with fds==NULL and + * *nfds_io==0 in order to find out how much space is needed. + * + * *timeout_upd is as for poll(2): it's in milliseconds, and + * negative values mean no timeout (infinity). + * libxl_osevent_beforepoll will only reduce the timeout, naturally. + */ +int libxl_osevent_beforepoll(libxl_ctx *ctx, int *nfds_io, + struct pollfd *fds, int *timeout_upd, + struct timeval now); + +/* nfds and fds[0..nfds] must be from the most recent call to + * _beforepoll, as modified by poll. (It is therefore not possible + * to have multiple threads simultaneously polling using this + * interface.) + * + * This function actually performs all of the IO and other actions, + * and generates events (libxl_event), which are implied by either + * (a) the time of day or (b) both (i) the returned information from + * _beforepoll, and (ii) the results from poll specified in + * fds[0..nfds-1]. Generated events can then be retrieved by + * libxl_event_check. + */ +void libxl_osevent_afterpoll(libxl_ctx *ctx, int nfds, const struct pollfd *fds, + struct timeval now); + + +typedef struct libxl_osevent_hooks { + int (*fd_register)(void *user, int fd, void **for_app_registration_out, + short events, void *for_libxl); + int (*fd_modify)(void *user, int fd, void **for_app_registration_update, + short events); + void (*fd_deregister)(void *user, int fd, void *for_app_registration); + int (*timeout_register)(void *user, void **for_app_registration_out, + struct timeval abs, void *for_libxl); + int (*timeout_modify)(void *user, void **for_app_registration_update, + struct timeval abs); + void (*timeout_deregister)(void *user, void *for_app_registration); +} libxl_osevent_hooks; + +/* The application which calls register_fd_hooks promises to + * maintain a register of fds and timeouts that libxl is interested + * in, and make calls into libxl (libxl_osevent_occurred_*) + * when those fd events and timeouts occur. This is more efficient + * than _beforepoll/_afterpoll if there are many fds (which can + * happen if the same libxl application is managing many domains). + * + * For an fd event, events is as for poll(). register or modify may + * be called with events==0, in which case it must still work + * normally, just not generate any events. + * + * For a timeout event, milliseconds is as for poll(). + * Specifically, negative values of milliseconds mean NO TIMEOUT. + * This is used by libxl to temporarily disable a timeout. + * + * If the register or modify hook succeeds it may update + * *for_app_registration_out/_update and must then return 0. + * On entry to register, *for_app_registration_out is always NULL. + * + * A registration or modification hook may fail, in which case it + * must leave the registration state of the fd or timeout unchanged. + * It may then either return ERROR_OSEVENT_REG_FAIL or any positive + * int. The value returned will be passed up through libxl and + * eventually returned back to the application. When register + * fails, any value stored into *for_registration_out is ignored by + * libxl; when modify fails, any changed value stored into + * *for_registration_update is honoured by libxl and will be passed + * to future modify or deregister calls. + * + * libxl will only attempt to register one callback for any one fd. + * libxl will remember the value stored in *for_app_registration_out + * (or *for_app_registration_update) by a successful call to + * register (or modify), and pass it to subsequent calls to modify + * or deregister. + * + * register_fd_hooks may be called only once for each libxl_ctx. + * libxl may make calls to register/modify/deregister from within + * any libxl function (indeed, it will usually call register from + * register_event_hooks). Conversely, the application MUST NOT make + * the event occurrence calls (libxl_osevent_occurred_*) into libxl + * reentrantly from within libxl (for example, from within the + * register/modify functions). + * + * Lock hierarchy: the register/modify/deregister functions may be + * called with locks held. These locks (the "libxl internal locks") + * are inside the libxl_ctx. Therefore, if those register functions + * acquire any locks of their own ("caller register locks") outside + * libxl, to avoid deadlock one of the following must hold for each + * such caller register lock: + * (a) "acquire libxl internal locks before caller register lock": + * No libxl function may be called with the caller register + * lock held. + * (b) "acquire caller register lock before libxl internal locks": + * No libxl function may be called _without_ the caller + * register lock held. + * Of these we would normally recommend (a). + * + * The value *hooks is not copied and must outlast the libxl_ctx. + */ +void libxl_osevent_register_hooks(libxl_ctx *ctx, + const libxl_osevent_hooks *hooks, + void *user); + +/* It is NOT legal to call _occurred_ reentrantly within any libxl + * function. Specifically it is NOT legal to call it from within + * a register callback. Conversely, libxl MAY call register/deregister + * from within libxl_event_registered_call_*. + */ + +void libxl_osevent_occurred_fd(libxl_ctx *ctx, void *for_libxl, + int fd, short events, short revents); + +/* Implicitly, on entry to this function the timeout has been + * deregistered. If _occurred_timeout is called, libxl will not + * call timeout_deregister; if it wants to requeue the timeout it + * will call timeout_register again. + */ +void libxl_osevent_occurred_timeout(libxl_ctx *ctx, void *for_libxl); + +#endif + +/* + * Local variables: + * mode: C + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff -r f204ead7d9e4 -r b3387ae40371 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri Jan 27 17:01:19 2012 +0000 +++ b/tools/libxl/libxl_internal.h Fri Jan 27 17:01:20 2012 +0000 @@ -35,6 +35,7 @@ #include #include +#include #include #include #include @@ -111,6 +112,71 @@ /* these functions preserve errno (saving and restoring) */ +typedef struct libxl__gc libxl__gc; +typedef struct libxl__egc libxl__egc; + +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); +struct libxl__ev_fd { + /* caller should include this in their own struct */ + /* read-only for caller, who may read only when registered: */ + int fd; + short events; + libxl__ev_fd_callback *func; + /* remainder is private for libxl__ev_fd... */ + LIBXL_LIST_ENTRY(libxl__ev_fd) entry; + void *for_app_reg; +}; + + +typedef struct libxl__ev_time libxl__ev_time; +typedef void libxl__ev_time_callback(libxl__egc *egc, libxl__ev_time *ev, + const struct timeval *requested_abs); +struct libxl__ev_time { + /* caller should include this in their own struct */ + /* read-only for caller, who may read only when registered: */ + libxl__ev_time_callback *func; + /* remainder is private for libxl__ev_time... */ + int infinite; /* not registered in list or with app if infinite */ + LIBXL_TAILQ_ENTRY(libxl__ev_time) entry; + struct timeval abs; + void *for_app_reg; +}; + +typedef struct libxl__ev_xswatch libxl__ev_xswatch; +typedef void libxl__ev_xswatch_callback(libxl__egc *egc, libxl__ev_xswatch*, + const char *watch_path, const char *event_path); +struct libxl__ev_xswatch { + /* caller should include this in their own struct */ + /* read-only for caller, who may read only when registered: */ + char *path; + libxl__ev_xswatch_callback *callback; + /* remainder is private for libxl__ev_xswatch... */ + int slotnum; /* registered iff slotnum >= 0 */ + uint32_t counterval; +}; + +/* + * An entry in the watch_slots table is either: + * 1. an entry in the free list, ie NULL or pointer to next free list entry + * 2. an pointer to a libxl__ev_xswatch + * + * But we don't want to use unions or type-punning because the + * compiler might "prove" that our code is wrong and misoptimise it. + * + * The rules say that all struct pointers have identical + * representation and alignment requirements (C99+TC1+TC2 6.2.5p26) so + * what we do is simply declare our array as containing only the free + * list pointers, and explicitly convert from and to our actual + * xswatch pointers when we store and retrieve them. + */ +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); + struct libxl__ctx { xentoollog_logger *lg; xc_interface *xch; @@ -129,6 +195,23 @@ * documented in the libxl public interface. */ + int osevent_in_hook; + const libxl_osevent_hooks *osevent_hooks; + void *osevent_user; + /* See the comment for OSEVENT_HOOK_INTERN in libxl_event.c + * for restrictions on the use of the osevent fields. */ + + int fd_rindex_allocd; + int *fd_rindex; /* see libxl_osevent_beforepoll */ + LIBXL_LIST_HEAD(, libxl__ev_fd) efds; + LIBXL_TAILQ_HEAD(, libxl__ev_time) etimes; + + libxl__ev_watch_slot *watch_slots; + int watch_nslots; + LIBXL_SLIST_HEAD(, libxl__ev_watch_slot) watch_freeslots; + uint32_t watch_counter; /* helps disambiguate slot reuse */ + libxl__ev_fd watch_efd; + /* 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 */ @@ -159,12 +242,17 @@ #define PRINTF_ATTRIBUTE(x, y) __attribute__((format(printf, x, y))) -typedef struct { +struct libxl__gc { /* mini-GC */ int alloc_maxsize; void **alloc_ptrs; libxl_ctx *owner; -} libxl__gc; +}; + +struct libxl__egc { + /* for event-generating functions only */ + struct libxl__gc gc; +}; #define LIBXL_INIT_GC(gc,ctx) do{ \ (gc).alloc_maxsize = 0; \ @@ -236,6 +324,140 @@ _hidden char *libxl__xs_libxl_path(libxl__gc *gc, uint32_t domid); + +/* + * Event generation functions provided by the libxl event core to the + * rest of libxl. Implemented in terms of _beforepoll/_afterpoll + * and/or the fd registration machinery, as provided by the + * application. + * + * Semantics are similar to those of the fd and timeout registration + * functions provided to libxl_osevent_register_hooks. + * + * Non-0 returns from libxl__ev_{modify,deregister} have already been + * logged by the core and should be returned unmodified to libxl's + * caller; NB that they may be valid libxl error codes but they may + * also be positive numbers supplied by the caller. + * + * In each case, there is a libxl__ev_FOO structure which can be in + * one of three states: + * + * Undefined - Might contain anything. All-bits-zero is + * an undefined state. + * + * Idle - Struct contents are defined enough to pass to any + * libxl__ev_FOO function but not registered and + * callback will not be called. The struct does not + * contain references to any allocated resources so + * can be thrown away. + * + * Active - Request for events has been registered and events + * may be generated. _deregister must be called to + * reclaim resources. + * + * These functions are provided for each kind of event KIND: + * + * int libxl__ev_KIND_register(libxl__gc *gc, libxl__ev_KIND *GEN, + * libxl__ev_KIND_callback *FUNC, + * DETAILS); + * On entry *GEN must be in state Undefined or Idle. + * Returns a libxl error code; on error return *GEN is Idle. + * On successful return *GEN is Active and FUNC wil be + * called by the event machinery in future. FUNC will + * not be called from within the call to _register. + * FUNC will be called with the context locked (with CTX_LOCK). + * + * void libxl__ev_KIND_deregister(libxl__gc *gc, libxl__ev_KIND *GEN_upd); + * On entry *GEN must be in state Active or Idle. + * On return it is Idle. (Idempotent.) + * + * void libxl__ev_KIND_init(libxl__ev_KIND *GEN); + * Provided for initialising an Undefined KIND. + * On entry *GEN must be in state Idle or Undefined. + * On return it is Idle. (Idempotent.) + * + * int libxl__ev_KIND_isregistered(const libxl__ev_KIND *GEN); + * On entry *GEN must be Idle or Active. + * Returns nonzero if it is Active, zero otherwise. + * Cannot fail. + * + * int libxl__ev_KIND_modify(libxl__gc*, libxl__ev_KIND *GEN, + * DETAILS); + * Only provided for some kinds of generator. + * On entry *GEN must be Active and on return, whether successful + * or not, it will be Active. + * Returns a libxl error code; on error the modification + * is not effective. + * + * All of these functions are fully threadsafe and may be called by + * general code in libxl even from within event callback FUNCs. + * The ctx will be locked on entry to each FUNC and FUNC should not + * unlock it. + * + * Callers of libxl__ev_KIND_register must ensure that the + * registration is undone, with _deregister, in libxl_ctx_free. + */ + + +_hidden int libxl__ev_fd_register(libxl__gc*, libxl__ev_fd *ev_out, + libxl__ev_fd_callback*, + int fd, short events /* as for poll(2) */); +_hidden int libxl__ev_fd_modify(libxl__gc*, libxl__ev_fd *ev, + short events); +_hidden void libxl__ev_fd_deregister(libxl__gc*, libxl__ev_fd *ev); +static inline void libxl__ev_fd_init(libxl__ev_fd *efd) + { efd->fd = -1; } +static inline int libxl__ev_fd_isregistered(libxl__ev_fd *efd) + { return efd->fd >= 0; } + +_hidden int libxl__ev_time_register_rel(libxl__gc*, libxl__ev_time *ev_out, + libxl__ev_time_callback*, + int milliseconds /* as for poll(2) */); +_hidden int libxl__ev_time_register_abs(libxl__gc*, libxl__ev_time *ev_out, + libxl__ev_time_callback*, + struct timeval); +_hidden int libxl__ev_time_modify_rel(libxl__gc*, libxl__ev_time *ev, + int milliseconds /* as for poll(2) */); +_hidden int libxl__ev_time_modify_abs(libxl__gc*, libxl__ev_time *ev, + struct timeval); +_hidden void libxl__ev_time_deregister(libxl__gc*, libxl__ev_time *ev); +static inline void libxl__ev_time_init(libxl__ev_time *ev) + { ev->func = 0; } +static inline int libxl__ev_time_isregistered(libxl__ev_time *ev) + { return !!ev->func; } + + +_hidden int libxl__ev_xswatch_register(libxl__gc*, libxl__ev_xswatch *xsw_out, + libxl__ev_xswatch_callback*, + const char *path /* copied */); +_hidden void libxl__ev_xswatch_deregister(libxl__gc *gc, libxl__ev_xswatch*); + +static inline void libxl__ev_xswatch_init(libxl__ev_xswatch *xswatch_out) + { xswatch_out->slotnum = -1; } +static inline int libxl__ev_xswatch_isregistered(const libxl__ev_xswatch *xw) + { return xw->slotnum >= 0; } + + +/* + * In general, call this via the macro LIBXL__EVENT_DISASTER. + * + * Event-generating functions may call this if they might have wanted + * to generate an event (either an internal one ie a + * libxl__ev_FOO_callback or an application event), but are prevented + * from doing so due to eg lack of memory. + * + * NB that this function may return and the caller isn't supposed to + * then crash, although it may fail (and henceforth leave things in a + * state where many or all calls fail). + */ +_hidden void libxl__event_disaster(libxl__egc*, const char *msg, int errnoval, + libxl_event_type type /* may be 0 */, + const char *file, int line, + const char *func); +#define LIBXL__EVENT_DISASTER(egc, msg, errnoval, type) \ + libxl__event_disaster(egc, msg, errnoval, type, __FILE__,__LINE__,__func__) + + /* 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); @@ -602,6 +824,8 @@ /* compare mac address @a and @b. 0 if the same, -ve if ab */ _hidden int libxl__compare_macs(libxl_mac *a, libxl_mac *b); +_hidden int libxl__gettimeofday(libxl__gc *gc, struct timeval *now_r); + #define STRINGIFY(x) #x #define TOSTRING(x) STRINGIFY(x) @@ -739,6 +963,55 @@ /* + * Calling context and GC for event-generating functions: + * + * These are for use by parts of libxl which directly or indirectly + * call libxl__event_occurred. These contain a gc but also a list of + * deferred events. + * + * You should never need to initialise an egc unless you are part of + * the event machinery itself. Otherwise you will always be given an + * egc if you need one. Even functions which generate specific kinds + * of events don't need to - rather, they will be passed an egc into + * their own callback function and should just use the one they're + * given. + * + * Functions using LIBXL__INIT_EGC may *not* generally be called from + * within libxl, because libxl__egc_cleanup may call back into the + * application. This should be documented near the function + * prototype(s) for callers of LIBXL__INIT_EGC and EGC_INIT. You + * should in any case not find it necessary to call egc-creators from + * within libxl. + * + * 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. + */ + +/* useful for all functions which take an egc: */ + +#define EGC_GC \ + libxl__gc *const gc = &egc->gc + +/* egc initialisation and destruction: */ + +#define LIBXL_INIT_EGC(egc,ctx) do{ \ + LIBXL_INIT_GC((egc).gc,ctx); \ + /* list of occurred events tbd */ \ + } while(0) + +_hidden void libxl__egc_cleanup(libxl__egc *egc); + +/* convenience macros: */ + +#define EGC_INIT(ctx) \ + libxl__egc egc[1]; LIBXL_INIT_EGC(egc[0],ctx); \ + EGC_GC + +#define EGC_FREE libxl__egc_cleanup(egc) + + +/* * Convenience macros. */ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:55:46 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:55:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6e-0006Fm-D5; Fri, 03 Feb 2012 21:55:44 +0000 Received: from mail182.messagelabs.com ([85.158.139.83]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6c-0006EF-GK for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:43 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-182.messagelabs.com!1328306132!12800361!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.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22721 invoked from network); 3 Feb 2012 21:55:34 -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; 3 Feb 2012 21:55:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6S-0001hi-7m for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR6P-0002CD-MO for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:31 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:55:29 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: New API for providing OS events to libxl X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Jackson # Date 1327683680 0 # Node ID b3387ae40371d8d075218502b456c250d0cb60b1 # Parent f204ead7d9e4904beb7a848860b23780b480ed6c libxl: New API for providing OS events to libxl We provide a new set of functions and related structures libxl_osevent_* which are to be used by event-driven applications to receive information from libxl about which fds libxl is interested in, and what timeouts libxl is waiting for, and to pass back to libxl information about which fds are readable/writeable etc., and which timeouts have occurred. Ie, low-level events. In this patch, this new machinery is still all unused. Callers will appear in the next patch in the series, which introduces a new API for applications to receive high-level events about actual domains etc. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r f204ead7d9e4 -r b3387ae40371 tools/libxl/Makefile --- a/tools/libxl/Makefile Fri Jan 27 17:01:19 2012 +0000 +++ b/tools/libxl/Makefile Fri Jan 27 17:01:20 2012 +0000 @@ -49,7 +49,7 @@ 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_qmp.o $(LIBXL_OBJS-y) + libxl_qmp.o libxl_event.o $(LIBXL_OBJS-y) LIBXL_OBJS += _libxl_types.o libxl_flask.o _libxl_types_internal.o $(LIBXL_OBJS): CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) $(CFLAGS_libxenstore) $(CFLAGS_libblktapctl) diff -r f204ead7d9e4 -r b3387ae40371 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Fri Jan 27 17:01:19 2012 +0000 +++ b/tools/libxl/libxl.c Fri Jan 27 17:01:20 2012 +0000 @@ -45,6 +45,16 @@ * only as an initialiser, not as an expression. */ memcpy(&ctx->lock, &mutex_value, sizeof(ctx->lock)); + ctx->osevent_hooks = 0; + + ctx->fd_rindex = 0; + LIBXL_LIST_INIT(&ctx->efds); + LIBXL_TAILQ_INIT(&ctx->etimes); + + ctx->watch_slots = 0; + LIBXL_SLIST_INIT(&ctx->watch_freeslots); + libxl__ev_fd_init(&ctx->watch_efd); + if ( stat(XENSTORE_PID_FILE, &stat_buf) != 0 ) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Is xenstore daemon running?\n" "failed to stat %s", XENSTORE_PID_FILE); @@ -79,9 +89,29 @@ int libxl_ctx_free(libxl_ctx *ctx) { if (!ctx) return 0; + + int i; + GC_INIT(ctx); + + /* Deregister all libxl__ev_KINDs: */ + + for (i = 0; i < ctx->watch_nslots; i++) + assert(!libxl__watch_slot_contents(gc, i)); + libxl__ev_fd_deregister(gc, &ctx->watch_efd); + + /* Now there should be no more events requested from the application: */ + + assert(LIBXL_LIST_EMPTY(&ctx->efds)); + assert(LIBXL_TAILQ_EMPTY(&ctx->etimes)); + if (ctx->xch) xc_interface_close(ctx->xch); libxl_version_info_dispose(&ctx->version_info); if (ctx->xsh) xs_daemon_close(ctx->xsh); + + free(ctx->fd_rindex); + free(ctx->watch_slots); + + GC_FREE; free(ctx); return 0; } diff -r f204ead7d9e4 -r b3387ae40371 tools/libxl/libxl.h --- a/tools/libxl/libxl.h Fri Jan 27 17:01:19 2012 +0000 +++ b/tools/libxl/libxl.h Fri Jan 27 17:01:20 2012 +0000 @@ -137,6 +137,7 @@ #include #include +#include <_libxl_list.h> typedef uint8_t libxl_mac[6]; #define LIBXL_MAC_FMT "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx" @@ -223,6 +224,9 @@ ERROR_GUEST_TIMEDOUT = -8, ERROR_TIMEDOUT = -9, ERROR_NOPARAVIRT = -10, + ERROR_NOT_READY = -11, + ERROR_OSEVENT_REG_FAIL = -12, + ERROR_BUFFERFULL = -13, }; #define LIBXL_VERSION 0 @@ -648,6 +652,8 @@ /* misc */ int libxl_fd_set_cloexec(int fd); +#include + #endif /* LIBXL_H */ /* diff -r f204ead7d9e4 -r b3387ae40371 tools/libxl/libxl_event.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/libxl/libxl_event.c Fri Jan 27 17:01:20 2012 +0000 @@ -0,0 +1,750 @@ +/* + * Copyright (C) 2011 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. + */ +/* + * Internal event machinery for use by other parts of libxl + */ + +#include + +#include "libxl_internal.h" + +/* + * The counter osevent_in_hook is used to ensure that the application + * honours the reentrancy restriction documented in libxl_event.h. + * + * The application's registration hooks should be called ONLY via + * 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(hookname,...) \ + OSEVENT_HOOK_INTERN(0, hookname, __VA_ARGS__) + +#define OSEVENT_HOOK_VOID(hookname,...) \ + OSEVENT_HOOK_INTERN((void)0, hookname, __VA_ARGS__) + +/* + * fd events + */ + +int libxl__ev_fd_register(libxl__gc *gc, libxl__ev_fd *ev, + libxl__ev_fd_callback *func, + int fd, short events) +{ + int rc; + + assert(fd >= 0); + + CTX_LOCK; + + rc = OSEVENT_HOOK(fd_register, fd, &ev->for_app_reg, events, ev); + if (rc) goto out; + + ev->fd = fd; + ev->events = events; + ev->func = func; + + LIBXL_LIST_INSERT_HEAD(&CTX->efds, ev, entry); + + rc = 0; + + out: + CTX_UNLOCK; + return rc; +} + +int libxl__ev_fd_modify(libxl__gc *gc, libxl__ev_fd *ev, short events) +{ + int rc; + + CTX_LOCK; + assert(libxl__ev_fd_isregistered(ev)); + + rc = OSEVENT_HOOK(fd_modify, ev->fd, &ev->for_app_reg, events); + if (rc) goto out; + + ev->events = events; + + rc = 0; + out: + CTX_UNLOCK; + return rc; +} + +void libxl__ev_fd_deregister(libxl__gc *gc, libxl__ev_fd *ev) +{ + CTX_LOCK; + + if (!libxl__ev_fd_isregistered(ev)) + goto out; + + OSEVENT_HOOK_VOID(fd_deregister, ev->fd, ev->for_app_reg); + LIBXL_LIST_REMOVE(ev, entry); + ev->fd = -1; + + out: + CTX_UNLOCK; +} + +/* + * timeouts + */ + + +int libxl__gettimeofday(libxl__gc *gc, struct timeval *now_r) +{ + int rc = gettimeofday(now_r, 0); + if (rc) { + LIBXL__LOG_ERRNO(CTX, LIBXL__LOG_ERROR, "gettimeofday failed"); + return ERROR_FAIL; + } + return 0; +} + +static int time_rel_to_abs(libxl__gc *gc, int ms, struct timeval *abs_out) +{ + int rc; + struct timeval additional = { + .tv_sec = ms / 1000, + .tv_usec = (ms % 1000) * 1000 + }; + struct timeval now; + + rc = libxl__gettimeofday(gc, &now); + if (rc) return rc; + + timeradd(&now, &additional, abs_out); + return 0; +} + +static void time_insert_finite(libxl__gc *gc, libxl__ev_time *ev) +{ + libxl__ev_time *evsearch; + LIBXL_TAILQ_INSERT_SORTED(&CTX->etimes, entry, ev, evsearch, /*empty*/, + timercmp(&ev->abs, &evsearch->abs, >)); + ev->infinite = 0; +} + +static int time_register_finite(libxl__gc *gc, libxl__ev_time *ev, + struct timeval abs) +{ + int rc; + + rc = OSEVENT_HOOK(timeout_register, &ev->for_app_reg, abs, ev); + if (rc) return rc; + + ev->infinite = 0; + ev->abs = abs; + time_insert_finite(gc, ev); + + return 0; +} + +static void time_deregister(libxl__gc *gc, libxl__ev_time *ev) +{ + if (!ev->infinite) { + OSEVENT_HOOK_VOID(timeout_deregister, &ev->for_app_reg); + LIBXL_TAILQ_REMOVE(&CTX->etimes, ev, entry); + } +} + + +int libxl__ev_time_register_abs(libxl__gc *gc, libxl__ev_time *ev, + libxl__ev_time_callback *func, + struct timeval abs) +{ + int rc; + + CTX_LOCK; + + rc = time_register_finite(gc, ev, abs); + if (rc) goto out; + + ev->func = func; + + rc = 0; + out: + CTX_UNLOCK; + return rc; +} + + +int libxl__ev_time_register_rel(libxl__gc *gc, libxl__ev_time *ev, + libxl__ev_time_callback *func, + int milliseconds /* as for poll(2) */) +{ + struct timeval abs; + int rc; + + CTX_LOCK; + + if (milliseconds < 0) { + ev->infinite = 1; + } else { + rc = time_rel_to_abs(gc, milliseconds, &abs); + if (rc) goto out; + + rc = time_register_finite(gc, ev, abs); + if (rc) goto out; + } + + ev->func = func; + rc = 0; + + out: + CTX_UNLOCK; + return rc; +} + +int libxl__ev_time_modify_abs(libxl__gc *gc, libxl__ev_time *ev, + struct timeval abs) +{ + int rc; + + CTX_LOCK; + + assert(libxl__ev_time_isregistered(ev)); + + if (ev->infinite) { + rc = time_register_finite(gc, ev, abs); + if (rc) goto out; + } else { + rc = OSEVENT_HOOK(timeout_modify, &ev->for_app_reg, abs); + if (rc) goto out; + + LIBXL_TAILQ_REMOVE(&CTX->etimes, ev, entry); + ev->abs = abs; + time_insert_finite(gc, ev); + } + + rc = 0; + out: + CTX_UNLOCK; + return rc; +} + +int libxl__ev_time_modify_rel(libxl__gc *gc, libxl__ev_time *ev, + int milliseconds) +{ + struct timeval abs; + int rc; + + CTX_LOCK; + + assert(libxl__ev_time_isregistered(ev)); + + if (milliseconds < 0) { + time_deregister(gc, ev); + ev->infinite = 1; + rc = 0; + goto out; + } + + rc = time_rel_to_abs(gc, milliseconds, &abs); + if (rc) goto out; + + rc = libxl__ev_time_modify_abs(gc, ev, abs); + if (rc) goto out; + + rc = 0; + out: + CTX_UNLOCK; + return rc; +} + +void libxl__ev_time_deregister(libxl__gc *gc, libxl__ev_time *ev) +{ + CTX_LOCK; + + if (!libxl__ev_time_isregistered(ev)) + goto out; + + time_deregister(gc, ev); + ev->func = 0; + + out: + CTX_UNLOCK; + return; +} + + +/* + * xenstore watches + */ + +libxl__ev_xswatch *libxl__watch_slot_contents(libxl__gc *gc, int slotnum) +{ + libxl__ev_watch_slot *slot = &CTX->watch_slots[slotnum]; + libxl__ev_watch_slot *slotcontents = LIBXL_SLIST_NEXT(slot, empty); + + if (slotcontents == NULL || + ((uintptr_t)slotcontents >= (uintptr_t)CTX->watch_slots && + (uintptr_t)slotcontents < (uintptr_t)(CTX->watch_slots + + CTX->watch_nslots))) + /* An empty slot has either a NULL pointer (end of the + * free list), or a pointer to another entry in the array. + * So we can do a bounds check to distinguish empty from + * full slots. + */ + /* We need to do the comparisons as uintptr_t because + * comparing pointers which are not in the same object is + * undefined behaviour; if the compiler managed to figure + * out that watch_slots[0..watch_nslots-1] is all of the + * whole array object it could prove that the above bounds + * check was always true if it was legal, and remove it! + * + * uintptr_t because even on a machine with signed + * pointers, objects do not cross zero; whereas on + * machines with unsigned pointers, they may cross + * 0x8bazillion. + */ + return NULL; + + /* see comment near libxl__ev_watch_slot definition */ + return (void*)slotcontents; +} + +static void libxl__set_watch_slot_contents(libxl__ev_watch_slot *slot, + libxl__ev_xswatch *w) +{ + /* we look a bit behind the curtain of LIBXL_SLIST, to explicitly + * assign to the pointer that's the next link. See the comment + * by the definition of libxl__ev_watch_slot */ + slot->empty.sle_next = (void*)w; +} + +static void watchfd_callback(libxl__egc *egc, libxl__ev_fd *ev, + int fd, short events, short revents) +{ + EGC_GC; + + for (;;) { + char **event = xs_check_watch(CTX->xsh); + if (!event) { + if (errno == EAGAIN) break; + if (errno == EINTR) continue; + LIBXL__EVENT_DISASTER(egc, "cannot check/read watches", errno, 0); + return; + } + + const char *epath = event[0]; + const char *token = event[1]; + int slotnum; + uint32_t counterval; + int rc = sscanf(token, "%d/%"SCNx32, &slotnum, &counterval); + if (rc != 2) { + LIBXL__LOG(CTX, LIBXL__LOG_ERROR, + "watch epath=%s token=%s: failed to parse token", + epath, token); + /* oh well */ + goto ignore; + } + if (slotnum < 0 || slotnum >= CTX->watch_nslots) { + /* perhaps in the future we will make the watchslots array shrink */ + LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, "watch epath=%s token=%s:" + " slotnum %d out of range [0,%d>", + epath, token, slotnum, CTX->watch_nslots); + goto ignore; + } + + libxl__ev_xswatch *w = libxl__watch_slot_contents(gc, slotnum); + + if (!w) { + LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, + "watch epath=%s token=%s: empty slot", + epath, token); + goto ignore; + } + + if (w->counterval != counterval) { + LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, + "watch epath=%s token=%s: counter != %"PRIx32, + epath, token, w->counterval); + goto ignore; + } + + /* Now it's possible, though unlikely, that this was an event + * from a previous use of the same slot with the same counterval. + * + * In that case either: + * - the event path is a child of the watch path, in + * which case this watch would really have generated this + * event if it had been registered soon enough and we are + * OK to give this possibly-spurious event to the caller; or + * - it is not, in which case we must suppress it as the + * caller should not see events for unrelated paths. + * + * See also docs/misc/xenstore.txt. + */ + if (!xs_path_is_subpath(w->path, epath)) { + LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, + "watch epath=%s token=%s: not child of wpath=%s", + epath, token, w->path); + goto ignore; + } + + /* At last, we have checked everything! */ + LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, + "watch event: epath=%s token=%s wpath=%s w=%p", + epath, token, w->path, w); + w->callback(egc, w, w->path, epath); + + ignore: + free(event); + } +} + +static char *watch_token(libxl__gc *gc, int slotnum, uint32_t counterval) +{ + return libxl__sprintf(gc, "%d/%"PRIx32, slotnum, counterval); +} + +int libxl__ev_xswatch_register(libxl__gc *gc, libxl__ev_xswatch *w, + libxl__ev_xswatch_callback *func, + const char *path /* copied */) +{ + libxl__ev_watch_slot *use = NULL; + char *path_copy = NULL; + int rc; + + CTX_LOCK; + + if (!libxl__ev_fd_isregistered(&CTX->watch_efd)) { + rc = libxl__ev_fd_register(gc, &CTX->watch_efd, watchfd_callback, + xs_fileno(CTX->xsh), POLLIN); + if (rc) goto out_rc; + } + + if (LIBXL_SLIST_EMPTY(&CTX->watch_freeslots)) { + /* Free list is empty so there is not in fact a linked + * free list in the array and we can safely realloc it */ + int newarraysize = (CTX->watch_nslots + 1) << 2; + int i; + libxl__ev_watch_slot *newarray = + realloc(CTX->watch_slots, sizeof(*newarray) * newarraysize); + if (!newarray) goto out_nomem; + for (i = CTX->watch_nslots; i < newarraysize; i++) + LIBXL_SLIST_INSERT_HEAD(&CTX->watch_freeslots, + &newarray[i], empty); + CTX->watch_slots = newarray; + CTX->watch_nslots = newarraysize; + } + use = LIBXL_SLIST_FIRST(&CTX->watch_freeslots); + assert(use); + LIBXL_SLIST_REMOVE_HEAD(&CTX->watch_freeslots, empty); + + path_copy = strdup(path); + if (!path_copy) goto out_nomem; + + int slotnum = use - CTX->watch_slots; + w->counterval = CTX->watch_counter++; + + if (!xs_watch(CTX->xsh, path, watch_token(gc, slotnum, w->counterval))) { + LIBXL__LOG_ERRNOVAL(CTX, LIBXL__LOG_ERROR, errno, + "create watch for path %s", path); + rc = ERROR_FAIL; + goto out_rc; + } + + w->slotnum = slotnum; + w->path = path_copy; + w->callback = func; + libxl__set_watch_slot_contents(use, w); + + CTX_UNLOCK; + return 0; + + out_nomem: + rc = ERROR_NOMEM; + out_rc: + if (use) + LIBXL_SLIST_INSERT_HEAD(&CTX->watch_freeslots, use, empty); + if (path_copy) + free(path_copy); + CTX_UNLOCK; + return rc; +} + +void libxl__ev_xswatch_deregister(libxl__gc *gc, libxl__ev_xswatch *w) +{ + /* it is legal to deregister from within _callback */ + CTX_LOCK; + + if (w->slotnum >= 0) { + char *token = watch_token(gc, w->slotnum, w->counterval); + if (!xs_unwatch(CTX->xsh, w->path, token)) + /* Oh well, we will just get watch events forever more + * and ignore them. But we should complain to the log. */ + LIBXL__LOG_ERRNOVAL(CTX, LIBXL__LOG_ERROR, errno, + "remove watch for path %s", w->path); + + libxl__ev_watch_slot *slot = &CTX->watch_slots[w->slotnum]; + LIBXL_SLIST_INSERT_HEAD(&CTX->watch_freeslots, slot, empty); + w->slotnum = -1; + } + + free(w->path); + w->path = NULL; + + CTX_UNLOCK; +} + +/* + * osevent poll + */ + +int libxl_osevent_beforepoll(libxl_ctx *ctx, int *nfds_io, + struct pollfd *fds, int *timeout_upd, + struct timeval now) +{ + libxl__ev_fd *efd; + int rc; + + /* + * 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. + */ + + GC_INIT(ctx); + CTX_LOCK; + + if (*nfds_io) { + /* + * As an optimisation, we don't touch fd_rindex + * if *nfds_io is zero on entry, since in that case the + * caller just wanted to know how big an array to give us. + * + * If !*nfds_io, the unconditional parts below are guaranteed + * not to mess with fd_rindex. + */ + + int maxfd = 0; + LIBXL_LIST_FOREACH(efd, &CTX->efds, entry) { + if (!efd->events) + continue; + if (efd->fd >= maxfd) + maxfd = efd->fd + 1; + } + /* make sure our array is as big as *nfds_io */ + if (CTX->fd_rindex_allocd < maxfd) { + assert(maxfd < INT_MAX / sizeof(int) / 2); + int *newarray = realloc(CTX->fd_rindex, sizeof(int) * maxfd); + if (!newarray) { rc = ERROR_NOMEM; goto out; } + memset(newarray + CTX->fd_rindex_allocd, 0, + sizeof(int) * (maxfd - CTX->fd_rindex_allocd)); + CTX->fd_rindex = newarray; + CTX->fd_rindex_allocd = maxfd; + } + } + + int used = 0; + LIBXL_LIST_FOREACH(efd, &CTX->efds, entry) { + if (!efd->events) + continue; + if (used < *nfds_io) { + fds[used].fd = efd->fd; + fds[used].events = efd->events; + fds[used].revents = 0; + assert(efd->fd < CTX->fd_rindex_allocd); + CTX->fd_rindex[efd->fd] = used; + } + used++; + } + rc = used <= *nfds_io ? 0 : ERROR_BUFFERFULL; + + *nfds_io = used; + + libxl__ev_time *etime = LIBXL_TAILQ_FIRST(&CTX->etimes); + if (etime) { + int our_timeout; + struct timeval rel; + static struct timeval zero; + + timersub(&etime->abs, &now, &rel); + + if (timercmp(&rel, &zero, <)) { + our_timeout = 0; + } else if (rel.tv_sec >= 2000000) { + our_timeout = 2000000000; + } else { + our_timeout = rel.tv_sec * 1000 + (rel.tv_usec + 999) / 1000; + } + if (*timeout_upd < 0 || our_timeout < *timeout_upd) + *timeout_upd = our_timeout; + } + + out: + CTX_UNLOCK; + GC_FREE; + return rc; +} + +static int afterpoll_check_fd(libxl_ctx *ctx, + const struct pollfd *fds, int nfds, + int fd, int events) + /* returns mask of events which were requested and occurred */ +{ + if (fd >= ctx->fd_rindex_allocd) + /* added after we went into poll, have to try again */ + return 0; + + int slot = ctx->fd_rindex[fd]; + + if (slot >= nfds) + /* stale slot entry; again, added afterwards */ + return 0; + + if (fds[slot].fd != fd) + /* again, stale slot entry */ + return 0; + + int revents = fds[slot].revents & events; + /* we mask in case requested events have changed */ + + return revents; +} + +void libxl_osevent_afterpoll(libxl_ctx *ctx, int nfds, const struct pollfd *fds, + struct timeval now) +{ + EGC_INIT(ctx); + CTX_LOCK; + libxl__ev_fd *efd; + + LIBXL_LIST_FOREACH(efd, &CTX->efds, entry) { + if (!efd->events) + continue; + + int revents = afterpoll_check_fd(CTX,fds,nfds, efd->fd,efd->events); + if (revents) + efd->func(egc, efd, efd->fd, efd->events, revents); + } + + for (;;) { + libxl__ev_time *etime = LIBXL_TAILQ_FIRST(&CTX->etimes); + if (!etime) + break; + + assert(!etime->infinite); + + if (timercmp(&etime->abs, &now, >)) + break; + + time_deregister(gc, etime); + + etime->func(egc, etime, &etime->abs); + } + + CTX_UNLOCK; + EGC_FREE; +} + + +/* + * osevent hook and callback machinery + */ + +void libxl_osevent_register_hooks(libxl_ctx *ctx, + const libxl_osevent_hooks *hooks, + void *user) +{ + GC_INIT(ctx); + CTX_LOCK; + ctx->osevent_hooks = hooks; + ctx->osevent_user = user; + CTX_UNLOCK; + GC_FREE; +} + + +void libxl_osevent_occurred_fd(libxl_ctx *ctx, void *for_libxl, + int fd, short events, short revents) +{ + libxl__ev_fd *ev = for_libxl; + + EGC_INIT(ctx); + CTX_LOCK; + assert(!CTX->osevent_in_hook); + + assert(fd == ev->fd); + revents &= ev->events; + if (revents) + ev->func(egc, ev, fd, ev->events, revents); + + CTX_UNLOCK; + EGC_FREE; +} + +void libxl_osevent_occurred_timeout(libxl_ctx *ctx, void *for_libxl) +{ + libxl__ev_time *ev = for_libxl; + + EGC_INIT(ctx); + CTX_LOCK; + assert(!CTX->osevent_in_hook); + + assert(!ev->infinite); + LIBXL_TAILQ_REMOVE(&CTX->etimes, ev, entry); + ev->func(egc, ev, &ev->abs); + + CTX_UNLOCK; + EGC_FREE; +} + +void libxl__event_disaster(libxl__egc *egc, const char *msg, int errnoval, + libxl_event_type type /* may be 0 */, + const char *file, int line, const char *func) +{ + EGC_GC; + + libxl__log(CTX, XTL_CRITICAL, errnoval, file, line, func, + "DISASTER in event loop: %s%s%s%s", + msg, + type ? " (relates to event type " : "", + type ? libxl_event_type_to_string(type) : "", + type ? ")" : ""); + + /* + * FIXME: This should call the "disaster" hook supplied to + * libxl_event_register_callbacks, which will be introduced in the + * next patch. + */ + + const char verybad[] = + "DISASTER in event loop not handled by libxl application"; + LIBXL__LOG(CTX, XTL_CRITICAL, verybad); + fprintf(stderr, "libxl: fatal error, exiting program: %s\n", verybad); + exit(-1); +} + +void libxl__egc_cleanup(libxl__egc *egc) +{ + libxl__free_all(&egc->gc); +} + +/* + * Local variables: + * mode: C + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff -r f204ead7d9e4 -r b3387ae40371 tools/libxl/libxl_event.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/libxl/libxl_event.h Fri Jan 27 17:01:20 2012 +0000 @@ -0,0 +1,205 @@ +/* + * Copyright (C) 2011 Citrix Ltd. + * Author Ian Jackson + * + * 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. + */ + +#ifndef LIBXL_EVENT_H +#define LIBXL_EVENT_H + +#include + + +/*======================================================================*/ + +/* + * OS event handling - passing low-level OS events to libxl + * + * Event-driven programs must use these facilities to allow libxl + * to become aware of readability/writeability of file descriptors + * and the occurrence of timeouts. + * + * There are two approaches available. The first is appropriate for + * simple programs handling reasonably small numbers of domains: + * + * for (;;) { + * libxl_osevent_beforepoll(...) + * poll(); + * libxl_osevent_afterpoll(...); + * for (;;) { + * r=libxl_event_check(...); + * if (r==LIBXL_NOT_READY) break; + * if (r) handle failure; + * do something with the event; + * } + * } + * + * The second approach uses libxl_osevent_register_hooks and is + * suitable for programs which are already using a callback-based + * event library. + * + * An application may freely mix the two styles of interaction. + * + * (Callers inside libxl may not call libxl_osevent_... functions.) + */ + +struct pollfd; + +/* The caller should provide beforepoll with some space for libxl's + * fds, and tell libxl how much space is available by setting *nfds_io. + * fds points to the start of this space (and fds may be a pointer into + * a larger array, for example, if the application has some fds of + * its own that it is interested in). + * + * On return *nfds_io will in any case have been updated by libxl + * according to how many fds libxl wants to poll on. + * + * If the space was sufficient, libxl fills in fds[0..] suitably for poll(2), updates *timeout_upd if needed, + * and returns ok. + * + * If space was insufficient, fds[0..] is undefined on + * return; *nfds_io on return will be greater than the value on + * entry; *timeout_upd may or may not have been updated; and + * libxl_osevent_beforepoll returns ERROR_BUFERFULL. In this case + * the application needs to make more space (enough space for + * *nfds_io struct pollfd) and then call beforepoll again, before + * entering poll(2). Typically this will involve calling realloc. + * + * The application may call beforepoll with fds==NULL and + * *nfds_io==0 in order to find out how much space is needed. + * + * *timeout_upd is as for poll(2): it's in milliseconds, and + * negative values mean no timeout (infinity). + * libxl_osevent_beforepoll will only reduce the timeout, naturally. + */ +int libxl_osevent_beforepoll(libxl_ctx *ctx, int *nfds_io, + struct pollfd *fds, int *timeout_upd, + struct timeval now); + +/* nfds and fds[0..nfds] must be from the most recent call to + * _beforepoll, as modified by poll. (It is therefore not possible + * to have multiple threads simultaneously polling using this + * interface.) + * + * This function actually performs all of the IO and other actions, + * and generates events (libxl_event), which are implied by either + * (a) the time of day or (b) both (i) the returned information from + * _beforepoll, and (ii) the results from poll specified in + * fds[0..nfds-1]. Generated events can then be retrieved by + * libxl_event_check. + */ +void libxl_osevent_afterpoll(libxl_ctx *ctx, int nfds, const struct pollfd *fds, + struct timeval now); + + +typedef struct libxl_osevent_hooks { + int (*fd_register)(void *user, int fd, void **for_app_registration_out, + short events, void *for_libxl); + int (*fd_modify)(void *user, int fd, void **for_app_registration_update, + short events); + void (*fd_deregister)(void *user, int fd, void *for_app_registration); + int (*timeout_register)(void *user, void **for_app_registration_out, + struct timeval abs, void *for_libxl); + int (*timeout_modify)(void *user, void **for_app_registration_update, + struct timeval abs); + void (*timeout_deregister)(void *user, void *for_app_registration); +} libxl_osevent_hooks; + +/* The application which calls register_fd_hooks promises to + * maintain a register of fds and timeouts that libxl is interested + * in, and make calls into libxl (libxl_osevent_occurred_*) + * when those fd events and timeouts occur. This is more efficient + * than _beforepoll/_afterpoll if there are many fds (which can + * happen if the same libxl application is managing many domains). + * + * For an fd event, events is as for poll(). register or modify may + * be called with events==0, in which case it must still work + * normally, just not generate any events. + * + * For a timeout event, milliseconds is as for poll(). + * Specifically, negative values of milliseconds mean NO TIMEOUT. + * This is used by libxl to temporarily disable a timeout. + * + * If the register or modify hook succeeds it may update + * *for_app_registration_out/_update and must then return 0. + * On entry to register, *for_app_registration_out is always NULL. + * + * A registration or modification hook may fail, in which case it + * must leave the registration state of the fd or timeout unchanged. + * It may then either return ERROR_OSEVENT_REG_FAIL or any positive + * int. The value returned will be passed up through libxl and + * eventually returned back to the application. When register + * fails, any value stored into *for_registration_out is ignored by + * libxl; when modify fails, any changed value stored into + * *for_registration_update is honoured by libxl and will be passed + * to future modify or deregister calls. + * + * libxl will only attempt to register one callback for any one fd. + * libxl will remember the value stored in *for_app_registration_out + * (or *for_app_registration_update) by a successful call to + * register (or modify), and pass it to subsequent calls to modify + * or deregister. + * + * register_fd_hooks may be called only once for each libxl_ctx. + * libxl may make calls to register/modify/deregister from within + * any libxl function (indeed, it will usually call register from + * register_event_hooks). Conversely, the application MUST NOT make + * the event occurrence calls (libxl_osevent_occurred_*) into libxl + * reentrantly from within libxl (for example, from within the + * register/modify functions). + * + * Lock hierarchy: the register/modify/deregister functions may be + * called with locks held. These locks (the "libxl internal locks") + * are inside the libxl_ctx. Therefore, if those register functions + * acquire any locks of their own ("caller register locks") outside + * libxl, to avoid deadlock one of the following must hold for each + * such caller register lock: + * (a) "acquire libxl internal locks before caller register lock": + * No libxl function may be called with the caller register + * lock held. + * (b) "acquire caller register lock before libxl internal locks": + * No libxl function may be called _without_ the caller + * register lock held. + * Of these we would normally recommend (a). + * + * The value *hooks is not copied and must outlast the libxl_ctx. + */ +void libxl_osevent_register_hooks(libxl_ctx *ctx, + const libxl_osevent_hooks *hooks, + void *user); + +/* It is NOT legal to call _occurred_ reentrantly within any libxl + * function. Specifically it is NOT legal to call it from within + * a register callback. Conversely, libxl MAY call register/deregister + * from within libxl_event_registered_call_*. + */ + +void libxl_osevent_occurred_fd(libxl_ctx *ctx, void *for_libxl, + int fd, short events, short revents); + +/* Implicitly, on entry to this function the timeout has been + * deregistered. If _occurred_timeout is called, libxl will not + * call timeout_deregister; if it wants to requeue the timeout it + * will call timeout_register again. + */ +void libxl_osevent_occurred_timeout(libxl_ctx *ctx, void *for_libxl); + +#endif + +/* + * Local variables: + * mode: C + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff -r f204ead7d9e4 -r b3387ae40371 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri Jan 27 17:01:19 2012 +0000 +++ b/tools/libxl/libxl_internal.h Fri Jan 27 17:01:20 2012 +0000 @@ -35,6 +35,7 @@ #include #include +#include #include #include #include @@ -111,6 +112,71 @@ /* these functions preserve errno (saving and restoring) */ +typedef struct libxl__gc libxl__gc; +typedef struct libxl__egc libxl__egc; + +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); +struct libxl__ev_fd { + /* caller should include this in their own struct */ + /* read-only for caller, who may read only when registered: */ + int fd; + short events; + libxl__ev_fd_callback *func; + /* remainder is private for libxl__ev_fd... */ + LIBXL_LIST_ENTRY(libxl__ev_fd) entry; + void *for_app_reg; +}; + + +typedef struct libxl__ev_time libxl__ev_time; +typedef void libxl__ev_time_callback(libxl__egc *egc, libxl__ev_time *ev, + const struct timeval *requested_abs); +struct libxl__ev_time { + /* caller should include this in their own struct */ + /* read-only for caller, who may read only when registered: */ + libxl__ev_time_callback *func; + /* remainder is private for libxl__ev_time... */ + int infinite; /* not registered in list or with app if infinite */ + LIBXL_TAILQ_ENTRY(libxl__ev_time) entry; + struct timeval abs; + void *for_app_reg; +}; + +typedef struct libxl__ev_xswatch libxl__ev_xswatch; +typedef void libxl__ev_xswatch_callback(libxl__egc *egc, libxl__ev_xswatch*, + const char *watch_path, const char *event_path); +struct libxl__ev_xswatch { + /* caller should include this in their own struct */ + /* read-only for caller, who may read only when registered: */ + char *path; + libxl__ev_xswatch_callback *callback; + /* remainder is private for libxl__ev_xswatch... */ + int slotnum; /* registered iff slotnum >= 0 */ + uint32_t counterval; +}; + +/* + * An entry in the watch_slots table is either: + * 1. an entry in the free list, ie NULL or pointer to next free list entry + * 2. an pointer to a libxl__ev_xswatch + * + * But we don't want to use unions or type-punning because the + * compiler might "prove" that our code is wrong and misoptimise it. + * + * The rules say that all struct pointers have identical + * representation and alignment requirements (C99+TC1+TC2 6.2.5p26) so + * what we do is simply declare our array as containing only the free + * list pointers, and explicitly convert from and to our actual + * xswatch pointers when we store and retrieve them. + */ +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); + struct libxl__ctx { xentoollog_logger *lg; xc_interface *xch; @@ -129,6 +195,23 @@ * documented in the libxl public interface. */ + int osevent_in_hook; + const libxl_osevent_hooks *osevent_hooks; + void *osevent_user; + /* See the comment for OSEVENT_HOOK_INTERN in libxl_event.c + * for restrictions on the use of the osevent fields. */ + + int fd_rindex_allocd; + int *fd_rindex; /* see libxl_osevent_beforepoll */ + LIBXL_LIST_HEAD(, libxl__ev_fd) efds; + LIBXL_TAILQ_HEAD(, libxl__ev_time) etimes; + + libxl__ev_watch_slot *watch_slots; + int watch_nslots; + LIBXL_SLIST_HEAD(, libxl__ev_watch_slot) watch_freeslots; + uint32_t watch_counter; /* helps disambiguate slot reuse */ + libxl__ev_fd watch_efd; + /* 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 */ @@ -159,12 +242,17 @@ #define PRINTF_ATTRIBUTE(x, y) __attribute__((format(printf, x, y))) -typedef struct { +struct libxl__gc { /* mini-GC */ int alloc_maxsize; void **alloc_ptrs; libxl_ctx *owner; -} libxl__gc; +}; + +struct libxl__egc { + /* for event-generating functions only */ + struct libxl__gc gc; +}; #define LIBXL_INIT_GC(gc,ctx) do{ \ (gc).alloc_maxsize = 0; \ @@ -236,6 +324,140 @@ _hidden char *libxl__xs_libxl_path(libxl__gc *gc, uint32_t domid); + +/* + * Event generation functions provided by the libxl event core to the + * rest of libxl. Implemented in terms of _beforepoll/_afterpoll + * and/or the fd registration machinery, as provided by the + * application. + * + * Semantics are similar to those of the fd and timeout registration + * functions provided to libxl_osevent_register_hooks. + * + * Non-0 returns from libxl__ev_{modify,deregister} have already been + * logged by the core and should be returned unmodified to libxl's + * caller; NB that they may be valid libxl error codes but they may + * also be positive numbers supplied by the caller. + * + * In each case, there is a libxl__ev_FOO structure which can be in + * one of three states: + * + * Undefined - Might contain anything. All-bits-zero is + * an undefined state. + * + * Idle - Struct contents are defined enough to pass to any + * libxl__ev_FOO function but not registered and + * callback will not be called. The struct does not + * contain references to any allocated resources so + * can be thrown away. + * + * Active - Request for events has been registered and events + * may be generated. _deregister must be called to + * reclaim resources. + * + * These functions are provided for each kind of event KIND: + * + * int libxl__ev_KIND_register(libxl__gc *gc, libxl__ev_KIND *GEN, + * libxl__ev_KIND_callback *FUNC, + * DETAILS); + * On entry *GEN must be in state Undefined or Idle. + * Returns a libxl error code; on error return *GEN is Idle. + * On successful return *GEN is Active and FUNC wil be + * called by the event machinery in future. FUNC will + * not be called from within the call to _register. + * FUNC will be called with the context locked (with CTX_LOCK). + * + * void libxl__ev_KIND_deregister(libxl__gc *gc, libxl__ev_KIND *GEN_upd); + * On entry *GEN must be in state Active or Idle. + * On return it is Idle. (Idempotent.) + * + * void libxl__ev_KIND_init(libxl__ev_KIND *GEN); + * Provided for initialising an Undefined KIND. + * On entry *GEN must be in state Idle or Undefined. + * On return it is Idle. (Idempotent.) + * + * int libxl__ev_KIND_isregistered(const libxl__ev_KIND *GEN); + * On entry *GEN must be Idle or Active. + * Returns nonzero if it is Active, zero otherwise. + * Cannot fail. + * + * int libxl__ev_KIND_modify(libxl__gc*, libxl__ev_KIND *GEN, + * DETAILS); + * Only provided for some kinds of generator. + * On entry *GEN must be Active and on return, whether successful + * or not, it will be Active. + * Returns a libxl error code; on error the modification + * is not effective. + * + * All of these functions are fully threadsafe and may be called by + * general code in libxl even from within event callback FUNCs. + * The ctx will be locked on entry to each FUNC and FUNC should not + * unlock it. + * + * Callers of libxl__ev_KIND_register must ensure that the + * registration is undone, with _deregister, in libxl_ctx_free. + */ + + +_hidden int libxl__ev_fd_register(libxl__gc*, libxl__ev_fd *ev_out, + libxl__ev_fd_callback*, + int fd, short events /* as for poll(2) */); +_hidden int libxl__ev_fd_modify(libxl__gc*, libxl__ev_fd *ev, + short events); +_hidden void libxl__ev_fd_deregister(libxl__gc*, libxl__ev_fd *ev); +static inline void libxl__ev_fd_init(libxl__ev_fd *efd) + { efd->fd = -1; } +static inline int libxl__ev_fd_isregistered(libxl__ev_fd *efd) + { return efd->fd >= 0; } + +_hidden int libxl__ev_time_register_rel(libxl__gc*, libxl__ev_time *ev_out, + libxl__ev_time_callback*, + int milliseconds /* as for poll(2) */); +_hidden int libxl__ev_time_register_abs(libxl__gc*, libxl__ev_time *ev_out, + libxl__ev_time_callback*, + struct timeval); +_hidden int libxl__ev_time_modify_rel(libxl__gc*, libxl__ev_time *ev, + int milliseconds /* as for poll(2) */); +_hidden int libxl__ev_time_modify_abs(libxl__gc*, libxl__ev_time *ev, + struct timeval); +_hidden void libxl__ev_time_deregister(libxl__gc*, libxl__ev_time *ev); +static inline void libxl__ev_time_init(libxl__ev_time *ev) + { ev->func = 0; } +static inline int libxl__ev_time_isregistered(libxl__ev_time *ev) + { return !!ev->func; } + + +_hidden int libxl__ev_xswatch_register(libxl__gc*, libxl__ev_xswatch *xsw_out, + libxl__ev_xswatch_callback*, + const char *path /* copied */); +_hidden void libxl__ev_xswatch_deregister(libxl__gc *gc, libxl__ev_xswatch*); + +static inline void libxl__ev_xswatch_init(libxl__ev_xswatch *xswatch_out) + { xswatch_out->slotnum = -1; } +static inline int libxl__ev_xswatch_isregistered(const libxl__ev_xswatch *xw) + { return xw->slotnum >= 0; } + + +/* + * In general, call this via the macro LIBXL__EVENT_DISASTER. + * + * Event-generating functions may call this if they might have wanted + * to generate an event (either an internal one ie a + * libxl__ev_FOO_callback or an application event), but are prevented + * from doing so due to eg lack of memory. + * + * NB that this function may return and the caller isn't supposed to + * then crash, although it may fail (and henceforth leave things in a + * state where many or all calls fail). + */ +_hidden void libxl__event_disaster(libxl__egc*, const char *msg, int errnoval, + libxl_event_type type /* may be 0 */, + const char *file, int line, + const char *func); +#define LIBXL__EVENT_DISASTER(egc, msg, errnoval, type) \ + libxl__event_disaster(egc, msg, errnoval, type, __FILE__,__LINE__,__func__) + + /* 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); @@ -602,6 +824,8 @@ /* compare mac address @a and @b. 0 if the same, -ve if ab */ _hidden int libxl__compare_macs(libxl_mac *a, libxl_mac *b); +_hidden int libxl__gettimeofday(libxl__gc *gc, struct timeval *now_r); + #define STRINGIFY(x) #x #define TOSTRING(x) STRINGIFY(x) @@ -739,6 +963,55 @@ /* + * Calling context and GC for event-generating functions: + * + * These are for use by parts of libxl which directly or indirectly + * call libxl__event_occurred. These contain a gc but also a list of + * deferred events. + * + * You should never need to initialise an egc unless you are part of + * the event machinery itself. Otherwise you will always be given an + * egc if you need one. Even functions which generate specific kinds + * of events don't need to - rather, they will be passed an egc into + * their own callback function and should just use the one they're + * given. + * + * Functions using LIBXL__INIT_EGC may *not* generally be called from + * within libxl, because libxl__egc_cleanup may call back into the + * application. This should be documented near the function + * prototype(s) for callers of LIBXL__INIT_EGC and EGC_INIT. You + * should in any case not find it necessary to call egc-creators from + * within libxl. + * + * 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. + */ + +/* useful for all functions which take an egc: */ + +#define EGC_GC \ + libxl__gc *const gc = &egc->gc + +/* egc initialisation and destruction: */ + +#define LIBXL_INIT_EGC(egc,ctx) do{ \ + LIBXL_INIT_GC((egc).gc,ctx); \ + /* list of occurred events tbd */ \ + } while(0) + +_hidden void libxl__egc_cleanup(libxl__egc *egc); + +/* convenience macros: */ + +#define EGC_INIT(ctx) \ + libxl__egc egc[1]; LIBXL_INIT_EGC(egc[0],ctx); \ + EGC_GC + +#define EGC_FREE libxl__egc_cleanup(egc) + + +/* * Convenience macros. */ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:55:46 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:55:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6d-0006FX-AR; Fri, 03 Feb 2012 21:55:43 +0000 Received: from mail216.messagelabs.com ([85.158.143.99]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6c-0006EE-DA for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:42 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-216.messagelabs.com!1328306135!13337355!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2732 invoked from network); 3 Feb 2012 21:55:36 -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; 3 Feb 2012 21:55:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6U-0001hl-WA for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR6T-0002D5-2P for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:33 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:55:31 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] ocaml, libxl: support "private" fields X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Jackson # Date 1327683681 0 # Node ID db9cac5b24897a5a936a516660457ace6043fc22 # Parent b3387ae40371d8d075218502b456c250d0cb60b1 ocaml, libxl: support "private" fields The changeset 24378:b4365e2c2595 libxl: idl: support new "private" type attribute is not complete. Actually using this feature does not work because the ocaml idl generator does not know about it. So add that support. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r b3387ae40371 -r db9cac5b2489 tools/ocaml/libs/xl/genwrap.py --- a/tools/ocaml/libs/xl/genwrap.py Fri Jan 27 17:01:20 2012 +0000 +++ b/tools/ocaml/libs/xl/genwrap.py Fri Jan 27 17:01:21 2012 +0000 @@ -93,6 +93,8 @@ s += "\t{\n" for f in ty.fields: + if f.type.private: + continue x = ocaml_instance_of(f.type, f.name) x = x.replace("\n", "\n\t\t") s += "\t\t" + x + ";\n" @@ -148,6 +150,8 @@ elif isinstance(ty, libxltypes.Aggregate) and (parent is None): n = 0 for f in ty.fields: + if f.type.private: + continue s += "%s\n" % c_val(f.type, "%s->%s" % (c, f.name), "Field(%s, %d)" % (o,n), parent="%s->" % (c)) n = n + 1 else: @@ -212,6 +216,8 @@ n = 0 for f in ty.fields: + if f.type.private: + continue s += "\n" s += "\t%s\n" % ocaml_Val(f.type, "%s_field" % ty.rawname, "%s->%s" % (c,f.name), parent="%s->" % c) s += "\tStore_field(%s, %d, %s);\n" % (o, n, "%s_field" % ty.rawname) @@ -290,6 +296,8 @@ cinc.write(autogen_header("/*", "*/")) for ty in types: + if ty.private: + continue #sys.stdout.write(" TYPE %-20s " % ty.rawname) ml.write(gen_ocaml_ml(ty, False)) ml.write("\n") _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:55:46 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:55:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6d-0006FX-AR; Fri, 03 Feb 2012 21:55:43 +0000 Received: from mail216.messagelabs.com ([85.158.143.99]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6c-0006EE-DA for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:42 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-216.messagelabs.com!1328306135!13337355!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2732 invoked from network); 3 Feb 2012 21:55:36 -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; 3 Feb 2012 21:55:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6U-0001hl-WA for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR6T-0002D5-2P for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:33 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:55:31 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] ocaml, libxl: support "private" fields X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Jackson # Date 1327683681 0 # Node ID db9cac5b24897a5a936a516660457ace6043fc22 # Parent b3387ae40371d8d075218502b456c250d0cb60b1 ocaml, libxl: support "private" fields The changeset 24378:b4365e2c2595 libxl: idl: support new "private" type attribute is not complete. Actually using this feature does not work because the ocaml idl generator does not know about it. So add that support. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r b3387ae40371 -r db9cac5b2489 tools/ocaml/libs/xl/genwrap.py --- a/tools/ocaml/libs/xl/genwrap.py Fri Jan 27 17:01:20 2012 +0000 +++ b/tools/ocaml/libs/xl/genwrap.py Fri Jan 27 17:01:21 2012 +0000 @@ -93,6 +93,8 @@ s += "\t{\n" for f in ty.fields: + if f.type.private: + continue x = ocaml_instance_of(f.type, f.name) x = x.replace("\n", "\n\t\t") s += "\t\t" + x + ";\n" @@ -148,6 +150,8 @@ elif isinstance(ty, libxltypes.Aggregate) and (parent is None): n = 0 for f in ty.fields: + if f.type.private: + continue s += "%s\n" % c_val(f.type, "%s->%s" % (c, f.name), "Field(%s, %d)" % (o,n), parent="%s->" % (c)) n = n + 1 else: @@ -212,6 +216,8 @@ n = 0 for f in ty.fields: + if f.type.private: + continue s += "\n" s += "\t%s\n" % ocaml_Val(f.type, "%s_field" % ty.rawname, "%s->%s" % (c,f.name), parent="%s->" % c) s += "\tStore_field(%s, %d, %s);\n" % (o, n, "%s_field" % ty.rawname) @@ -290,6 +296,8 @@ cinc.write(autogen_header("/*", "*/")) for ty in types: + if ty.private: + continue #sys.stdout.write(" TYPE %-20s " % ty.rawname) ml.write(gen_ocaml_ml(ty, False)) ml.write("\n") _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:55:55 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:55:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6m-0006It-Iu; Fri, 03 Feb 2012 21:55:52 +0000 Received: from mail21.messagelabs.com ([85.158.143.35]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6k-0006G1-Lx for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:51 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-21.messagelabs.com!1328306142!10016656!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16462 invoked from network); 3 Feb 2012 21:55:43 -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; 3 Feb 2012 21:55:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6c-0001hv-Ht for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR6a-0002FQ-Ek for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:41 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:55:39 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: Permit multithreaded event waiting X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Jackson # Date 1327683683 0 # Node ID cd4bff9d40507cfea619a679f524fafac79a8226 # Parent d503bdfaba2326b6cc11b45feb660954cc8d9b88 libxl: Permit multithreaded event waiting Previously, the context would be locked whenever we were waiting in libxl's own call to poll (waiting for operating system events). This would mean that multiple simultaneous calls to libxl_event_wait in different threads with different parameters would not work properly. If we simply unlock the context, it would be possible for another thread to discover the occurrence of the event we were waiting for, without us even waking up, and we would remain in poll. So we need a way to wake up other threads: a pipe, one for each thread in poll. We also need to move some variables from globals in the ctx to be per-polling-thread. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r d503bdfaba23 -r cd4bff9d4050 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Fri Jan 27 17:01:23 2012 +0000 +++ b/tools/libxl/libxl.c Fri Jan 27 17:01:23 2012 +0000 @@ -49,8 +49,9 @@ ctx->osevent_hooks = 0; - ctx->fd_polls = 0; - ctx->fd_rindex = 0; + LIBXL_LIST_INIT(&ctx->pollers_event); + LIBXL_LIST_INIT(&ctx->pollers_idle); + LIBXL_LIST_INIT(&ctx->efds); LIBXL_TAILQ_INIT(&ctx->etimes); @@ -61,6 +62,9 @@ LIBXL_TAILQ_INIT(&ctx->death_list); libxl__ev_xswatch_init(&ctx->death_watch); + rc = libxl__poller_init(ctx, &ctx->poller_app); + if (rc) goto out; + if ( stat(XENSTORE_PID_FILE, &stat_buf) != 0 ) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Is xenstore daemon running?\n" "failed to stat %s", XENSTORE_PID_FILE); @@ -135,8 +139,14 @@ libxl_version_info_dispose(&ctx->version_info); if (ctx->xsh) xs_daemon_close(ctx->xsh); - free(ctx->fd_polls); - free(ctx->fd_rindex); + libxl__poller_dispose(&ctx->poller_app); + assert(LIBXL_LIST_EMPTY(&ctx->pollers_event)); + libxl__poller *poller, *poller_tmp; + LIBXL_LIST_FOREACH_SAFE(poller, &ctx->pollers_idle, entry, poller_tmp) { + libxl__poller_dispose(poller); + free(poller); + } + free(ctx->watch_slots); discard_events(&ctx->occurred); diff -r d503bdfaba23 -r cd4bff9d4050 tools/libxl/libxl_event.c --- a/tools/libxl/libxl_event.c Fri Jan 27 17:01:23 2012 +0000 +++ b/tools/libxl/libxl_event.c Fri Jan 27 17:01:23 2012 +0000 @@ -510,9 +510,9 @@ * osevent poll */ -static int beforepoll_internal(libxl__gc *gc, int *nfds_io, - struct pollfd *fds, int *timeout_upd, - struct timeval now) +static int beforepoll_internal(libxl__gc *gc, libxl__poller *poller, + int *nfds_io, struct pollfd *fds, + int *timeout_upd, struct timeval now) { libxl__ev_fd *efd; int rc; @@ -534,7 +534,7 @@ * not to mess with fd_rindex. */ - int maxfd = 0; + int maxfd = poller->wakeup_pipe[0] + 1; LIBXL_LIST_FOREACH(efd, &CTX->efds, entry) { if (!efd->events) continue; @@ -542,30 +542,39 @@ maxfd = efd->fd + 1; } /* make sure our array is as big as *nfds_io */ - if (CTX->fd_rindex_allocd < maxfd) { + if (poller->fd_rindex_allocd < maxfd) { assert(maxfd < INT_MAX / sizeof(int) / 2); - int *newarray = realloc(CTX->fd_rindex, sizeof(int) * maxfd); + int *newarray = realloc(poller->fd_rindex, sizeof(int) * maxfd); if (!newarray) { rc = ERROR_NOMEM; goto out; } - memset(newarray + CTX->fd_rindex_allocd, 0, - sizeof(int) * (maxfd - CTX->fd_rindex_allocd)); - CTX->fd_rindex = newarray; - CTX->fd_rindex_allocd = maxfd; + memset(newarray + poller->fd_rindex_allocd, 0, + sizeof(int) * (maxfd - poller->fd_rindex_allocd)); + poller->fd_rindex = newarray; + poller->fd_rindex_allocd = maxfd; } } int used = 0; - LIBXL_LIST_FOREACH(efd, &CTX->efds, entry) { - if (!efd->events) - continue; - if (used < *nfds_io) { - fds[used].fd = efd->fd; - fds[used].events = efd->events; - fds[used].revents = 0; - assert(efd->fd < CTX->fd_rindex_allocd); - CTX->fd_rindex[efd->fd] = used; - } - used++; - } + +#define REQUIRE_FD(req_fd, req_events, efd) do{ \ + if ((req_events)) { \ + if (used < *nfds_io) { \ + 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; \ + } \ + used++; \ + } \ + }while(0) + + LIBXL_LIST_FOREACH(efd, &CTX->efds, entry) + REQUIRE_FD(efd->fd, efd->events, efd); + + REQUIRE_FD(poller->wakeup_pipe[0], POLLIN, 0); + +#undef REQUIRE_FD + rc = used <= *nfds_io ? 0 : ERROR_BUFFERFULL; *nfds_io = used; @@ -599,22 +608,23 @@ { EGC_INIT(ctx); CTX_LOCK; - int rc = beforepoll_internal(gc, nfds_io, fds, timeout_upd, now); + int rc = beforepoll_internal(gc, &ctx->poller_app, + nfds_io, fds, timeout_upd, now); CTX_UNLOCK; EGC_FREE; return rc; } -static int afterpoll_check_fd(libxl_ctx *ctx, +static int afterpoll_check_fd(libxl__poller *poller, const struct pollfd *fds, int nfds, int fd, int events) /* returns mask of events which were requested and occurred */ { - if (fd >= ctx->fd_rindex_allocd) + if (fd >= poller->fd_rindex_allocd) /* added after we went into poll, have to try again */ return 0; - int slot = ctx->fd_rindex[fd]; + int slot = poller->fd_rindex[fd]; if (slot >= nfds) /* stale slot entry; again, added afterwards */ @@ -630,22 +640,31 @@ return revents; } -static void afterpoll_internal(libxl__egc *egc, +static void afterpoll_internal(libxl__egc *egc, libxl__poller *poller, int nfds, const struct pollfd *fds, struct timeval now) { EGC_GC; libxl__ev_fd *efd; + LIBXL_LIST_FOREACH(efd, &CTX->efds, entry) { if (!efd->events) continue; - int revents = afterpoll_check_fd(CTX,fds,nfds, efd->fd,efd->events); + int revents = afterpoll_check_fd(poller,fds,nfds, efd->fd,efd->events); if (revents) efd->func(egc, efd, efd->fd, efd->events, revents); } + 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); + } + for (;;) { libxl__ev_time *etime = LIBXL_TAILQ_FIRST(&CTX->etimes); if (!etime) @@ -667,7 +686,7 @@ { EGC_INIT(ctx); CTX_LOCK; - afterpoll_internal(egc, nfds, fds, now); + afterpoll_internal(egc, &ctx->poller_app, nfds, fds, now); CTX_UNLOCK; EGC_FREE; } @@ -790,7 +809,10 @@ LIBXL_TAILQ_INSERT_TAIL(&egc->occurred_for_callback, event, link); return; } else { + libxl__poller *poller; LIBXL_TAILQ_INSERT_TAIL(&CTX->occurred, event, link); + LIBXL_LIST_FOREACH(poller, &CTX->pollers_event, entry) + libxl__poller_wakeup(egc, poller); } } @@ -858,7 +880,94 @@ return rc; } -static int eventloop_iteration(libxl__egc *egc) { +/* + * Manipulation of pollers + */ + +int libxl__poller_init(libxl_ctx *ctx, libxl__poller *p) +{ + int r, rc; + p->fd_polls = 0; + p->fd_rindex = 0; + + r = pipe(p->wakeup_pipe); + if (r) { + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "cannot create poller pipe"); + rc = ERROR_FAIL; + goto out; + } + + rc = libxl_fd_set_nonblock(ctx, p->wakeup_pipe[0], 1); + if (rc) goto out; + + rc = libxl_fd_set_nonblock(ctx, p->wakeup_pipe[1], 1); + if (rc) goto out; + + return 0; + + out: + libxl__poller_dispose(p); + return rc; +} + +void libxl__poller_dispose(libxl__poller *p) +{ + 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); +} + +libxl__poller *libxl__poller_get(libxl_ctx *ctx) +{ + /* must be called with ctx locked */ + int rc; + + libxl__poller *p = LIBXL_LIST_FIRST(&ctx->pollers_idle); + if (p) + return p; + + p = malloc(sizeof(*p)); + if (!p) { + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "cannot allocate poller"); + return 0; + } + memset(p, 0, sizeof(*p)); + + rc = libxl__poller_init(ctx, p); + if (rc) return NULL; + + return p; +} + +void libxl__poller_put(libxl_ctx *ctx, libxl__poller *p) +{ + LIBXL_LIST_INSERT_HEAD(&ctx->pollers_idle, p, entry); +} + +void libxl__poller_wakeup(libxl__egc *egc, libxl__poller *p) +{ + static const char buf[1] = ""; + + for (;;) { + int r = write(p->wakeup_pipe[1], buf, 1); + if (r==1) return; + assert(r==-1); + if (errno == EINTR) continue; + if (errno == EWOULDBLOCK) return; + LIBXL__EVENT_DISASTER(egc, "cannot poke watch pipe", errno, 0); + return; + } +} + +/* + * Main event loop iteration + */ + +static int eventloop_iteration(libxl__egc *egc, libxl__poller *poller) { + /* The CTX must be locked EXACTLY ONCE so that this function + * can unlock it when it polls. + */ EGC_GC; int rc; struct timeval now; @@ -871,23 +980,27 @@ int timeout; for (;;) { - int nfds = CTX->fd_polls_allocd; + int nfds = poller->fd_polls_allocd; timeout = -1; - rc = beforepoll_internal(gc, &nfds, CTX->fd_polls, &timeout, now); + rc = beforepoll_internal(gc, poller, &nfds, poller->fd_polls, + &timeout, now); if (!rc) break; if (rc != ERROR_BUFFERFULL) goto out; struct pollfd *newarray = (nfds > INT_MAX / sizeof(struct pollfd) / 2) ? 0 : - realloc(CTX->fd_polls, sizeof(*newarray) * nfds); + realloc(poller->fd_polls, sizeof(*newarray) * nfds); if (!newarray) { rc = ERROR_NOMEM; goto out; } - CTX->fd_polls = newarray; - CTX->fd_polls_allocd = nfds; + poller->fd_polls = newarray; + poller->fd_polls_allocd = nfds; } - rc = poll(CTX->fd_polls, CTX->fd_polls_allocd, timeout); + CTX_UNLOCK; + rc = poll(poller->fd_polls, poller->fd_polls_allocd, timeout); + CTX_LOCK; + if (rc < 0) { if (errno == EINTR) return 0; /* will go round again if caller requires */ @@ -900,7 +1013,8 @@ rc = libxl__gettimeofday(gc, &now); if (rc) goto out; - afterpoll_internal(egc, CTX->fd_polls_allocd, CTX->fd_polls, now); + afterpoll_internal(egc, poller, + poller->fd_polls_allocd, poller->fd_polls, now); CTX_UNLOCK; @@ -914,15 +1028,19 @@ libxl_event_predicate *pred, void *pred_user) { int rc; + libxl__poller *poller = NULL; EGC_INIT(ctx); CTX_LOCK; + poller = libxl__poller_get(ctx); + if (!poller) { rc = ERROR_FAIL; goto out; } + for (;;) { rc = event_check_internal(egc, event_r, typemask, pred, pred_user); if (rc != ERROR_NOT_READY) goto out; - rc = eventloop_iteration(egc); + rc = eventloop_iteration(egc, poller); if (rc) goto out; /* we unlock and cleanup the egc each time we go through this loop, @@ -936,6 +1054,8 @@ } out: + libxl__poller_put(ctx, poller); + CTX_UNLOCK; EGC_FREE; return rc; diff -r d503bdfaba23 -r cd4bff9d4050 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri Jan 27 17:01:23 2012 +0000 +++ b/tools/libxl/libxl_internal.h Fri Jan 27 17:01:23 2012 +0000 @@ -207,6 +207,33 @@ _hidden void libxl__evdisable_disk_eject(libxl__gc*, libxl_evgen_disk_eject*); +typedef struct libxl__poller libxl__poller; +struct libxl__poller { + /* + * These are used to allow other threads to wake up a thread which + * may be stuck in poll, because whatever it was waiting for + * hadn't happened yet. Threads which generate events will write + * a byte to each pipe. A thread which is waiting will empty its + * own pipe, and put its poller on the pollers_event list, before + * releasing the ctx lock and going into poll; when it comes out + * of poll it will take the poller off the pollers_event list. + * + * When a thread is done with a poller it should put it onto + * pollers_idle, where it can be reused later. + * + * The "poller_app" is never idle, but is sometimes on + * pollers_event. + */ + LIBXL_LIST_ENTRY(libxl__poller) entry; + + struct pollfd *fd_polls; + int fd_polls_allocd; + + int fd_rindex_allocd; + int *fd_rindex; /* see libxl_osevent_beforepoll */ + + int wakeup_pipe[2]; /* 0 means no fd allocated */ +}; struct libxl__ctx { xentoollog_logger *lg; @@ -237,10 +264,9 @@ /* See the comment for OSEVENT_HOOK_INTERN in libxl_event.c * for restrictions on the use of the osevent fields. */ - struct pollfd *fd_polls; - int fd_polls_allocd; - int fd_rindex_allocd; - int *fd_rindex; /* see libxl_osevent_beforepoll */ + libxl__poller poller_app; /* libxl_osevent_beforepoll and _afterpoll */ + LIBXL_LIST_HEAD(, libxl__poller) pollers_event, pollers_idle; + LIBXL_LIST_HEAD(, libxl__ev_fd) efds; LIBXL_TAILQ_HEAD(, libxl__ev_time) etimes; @@ -526,6 +552,22 @@ libxl__event_disaster(egc, msg, errnoval, type, __FILE__,__LINE__,__func__) +/* 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); + +/* 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); + +/* 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); + + /* 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); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:55:55 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:55:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6m-0006It-Iu; Fri, 03 Feb 2012 21:55:52 +0000 Received: from mail21.messagelabs.com ([85.158.143.35]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6k-0006G1-Lx for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:51 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-21.messagelabs.com!1328306142!10016656!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16462 invoked from network); 3 Feb 2012 21:55:43 -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; 3 Feb 2012 21:55:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6c-0001hv-Ht for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR6a-0002FQ-Ek for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:41 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:55:39 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: Permit multithreaded event waiting X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Jackson # Date 1327683683 0 # Node ID cd4bff9d40507cfea619a679f524fafac79a8226 # Parent d503bdfaba2326b6cc11b45feb660954cc8d9b88 libxl: Permit multithreaded event waiting Previously, the context would be locked whenever we were waiting in libxl's own call to poll (waiting for operating system events). This would mean that multiple simultaneous calls to libxl_event_wait in different threads with different parameters would not work properly. If we simply unlock the context, it would be possible for another thread to discover the occurrence of the event we were waiting for, without us even waking up, and we would remain in poll. So we need a way to wake up other threads: a pipe, one for each thread in poll. We also need to move some variables from globals in the ctx to be per-polling-thread. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r d503bdfaba23 -r cd4bff9d4050 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Fri Jan 27 17:01:23 2012 +0000 +++ b/tools/libxl/libxl.c Fri Jan 27 17:01:23 2012 +0000 @@ -49,8 +49,9 @@ ctx->osevent_hooks = 0; - ctx->fd_polls = 0; - ctx->fd_rindex = 0; + LIBXL_LIST_INIT(&ctx->pollers_event); + LIBXL_LIST_INIT(&ctx->pollers_idle); + LIBXL_LIST_INIT(&ctx->efds); LIBXL_TAILQ_INIT(&ctx->etimes); @@ -61,6 +62,9 @@ LIBXL_TAILQ_INIT(&ctx->death_list); libxl__ev_xswatch_init(&ctx->death_watch); + rc = libxl__poller_init(ctx, &ctx->poller_app); + if (rc) goto out; + if ( stat(XENSTORE_PID_FILE, &stat_buf) != 0 ) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Is xenstore daemon running?\n" "failed to stat %s", XENSTORE_PID_FILE); @@ -135,8 +139,14 @@ libxl_version_info_dispose(&ctx->version_info); if (ctx->xsh) xs_daemon_close(ctx->xsh); - free(ctx->fd_polls); - free(ctx->fd_rindex); + libxl__poller_dispose(&ctx->poller_app); + assert(LIBXL_LIST_EMPTY(&ctx->pollers_event)); + libxl__poller *poller, *poller_tmp; + LIBXL_LIST_FOREACH_SAFE(poller, &ctx->pollers_idle, entry, poller_tmp) { + libxl__poller_dispose(poller); + free(poller); + } + free(ctx->watch_slots); discard_events(&ctx->occurred); diff -r d503bdfaba23 -r cd4bff9d4050 tools/libxl/libxl_event.c --- a/tools/libxl/libxl_event.c Fri Jan 27 17:01:23 2012 +0000 +++ b/tools/libxl/libxl_event.c Fri Jan 27 17:01:23 2012 +0000 @@ -510,9 +510,9 @@ * osevent poll */ -static int beforepoll_internal(libxl__gc *gc, int *nfds_io, - struct pollfd *fds, int *timeout_upd, - struct timeval now) +static int beforepoll_internal(libxl__gc *gc, libxl__poller *poller, + int *nfds_io, struct pollfd *fds, + int *timeout_upd, struct timeval now) { libxl__ev_fd *efd; int rc; @@ -534,7 +534,7 @@ * not to mess with fd_rindex. */ - int maxfd = 0; + int maxfd = poller->wakeup_pipe[0] + 1; LIBXL_LIST_FOREACH(efd, &CTX->efds, entry) { if (!efd->events) continue; @@ -542,30 +542,39 @@ maxfd = efd->fd + 1; } /* make sure our array is as big as *nfds_io */ - if (CTX->fd_rindex_allocd < maxfd) { + if (poller->fd_rindex_allocd < maxfd) { assert(maxfd < INT_MAX / sizeof(int) / 2); - int *newarray = realloc(CTX->fd_rindex, sizeof(int) * maxfd); + int *newarray = realloc(poller->fd_rindex, sizeof(int) * maxfd); if (!newarray) { rc = ERROR_NOMEM; goto out; } - memset(newarray + CTX->fd_rindex_allocd, 0, - sizeof(int) * (maxfd - CTX->fd_rindex_allocd)); - CTX->fd_rindex = newarray; - CTX->fd_rindex_allocd = maxfd; + memset(newarray + poller->fd_rindex_allocd, 0, + sizeof(int) * (maxfd - poller->fd_rindex_allocd)); + poller->fd_rindex = newarray; + poller->fd_rindex_allocd = maxfd; } } int used = 0; - LIBXL_LIST_FOREACH(efd, &CTX->efds, entry) { - if (!efd->events) - continue; - if (used < *nfds_io) { - fds[used].fd = efd->fd; - fds[used].events = efd->events; - fds[used].revents = 0; - assert(efd->fd < CTX->fd_rindex_allocd); - CTX->fd_rindex[efd->fd] = used; - } - used++; - } + +#define REQUIRE_FD(req_fd, req_events, efd) do{ \ + if ((req_events)) { \ + if (used < *nfds_io) { \ + 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; \ + } \ + used++; \ + } \ + }while(0) + + LIBXL_LIST_FOREACH(efd, &CTX->efds, entry) + REQUIRE_FD(efd->fd, efd->events, efd); + + REQUIRE_FD(poller->wakeup_pipe[0], POLLIN, 0); + +#undef REQUIRE_FD + rc = used <= *nfds_io ? 0 : ERROR_BUFFERFULL; *nfds_io = used; @@ -599,22 +608,23 @@ { EGC_INIT(ctx); CTX_LOCK; - int rc = beforepoll_internal(gc, nfds_io, fds, timeout_upd, now); + int rc = beforepoll_internal(gc, &ctx->poller_app, + nfds_io, fds, timeout_upd, now); CTX_UNLOCK; EGC_FREE; return rc; } -static int afterpoll_check_fd(libxl_ctx *ctx, +static int afterpoll_check_fd(libxl__poller *poller, const struct pollfd *fds, int nfds, int fd, int events) /* returns mask of events which were requested and occurred */ { - if (fd >= ctx->fd_rindex_allocd) + if (fd >= poller->fd_rindex_allocd) /* added after we went into poll, have to try again */ return 0; - int slot = ctx->fd_rindex[fd]; + int slot = poller->fd_rindex[fd]; if (slot >= nfds) /* stale slot entry; again, added afterwards */ @@ -630,22 +640,31 @@ return revents; } -static void afterpoll_internal(libxl__egc *egc, +static void afterpoll_internal(libxl__egc *egc, libxl__poller *poller, int nfds, const struct pollfd *fds, struct timeval now) { EGC_GC; libxl__ev_fd *efd; + LIBXL_LIST_FOREACH(efd, &CTX->efds, entry) { if (!efd->events) continue; - int revents = afterpoll_check_fd(CTX,fds,nfds, efd->fd,efd->events); + int revents = afterpoll_check_fd(poller,fds,nfds, efd->fd,efd->events); if (revents) efd->func(egc, efd, efd->fd, efd->events, revents); } + 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); + } + for (;;) { libxl__ev_time *etime = LIBXL_TAILQ_FIRST(&CTX->etimes); if (!etime) @@ -667,7 +686,7 @@ { EGC_INIT(ctx); CTX_LOCK; - afterpoll_internal(egc, nfds, fds, now); + afterpoll_internal(egc, &ctx->poller_app, nfds, fds, now); CTX_UNLOCK; EGC_FREE; } @@ -790,7 +809,10 @@ LIBXL_TAILQ_INSERT_TAIL(&egc->occurred_for_callback, event, link); return; } else { + libxl__poller *poller; LIBXL_TAILQ_INSERT_TAIL(&CTX->occurred, event, link); + LIBXL_LIST_FOREACH(poller, &CTX->pollers_event, entry) + libxl__poller_wakeup(egc, poller); } } @@ -858,7 +880,94 @@ return rc; } -static int eventloop_iteration(libxl__egc *egc) { +/* + * Manipulation of pollers + */ + +int libxl__poller_init(libxl_ctx *ctx, libxl__poller *p) +{ + int r, rc; + p->fd_polls = 0; + p->fd_rindex = 0; + + r = pipe(p->wakeup_pipe); + if (r) { + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "cannot create poller pipe"); + rc = ERROR_FAIL; + goto out; + } + + rc = libxl_fd_set_nonblock(ctx, p->wakeup_pipe[0], 1); + if (rc) goto out; + + rc = libxl_fd_set_nonblock(ctx, p->wakeup_pipe[1], 1); + if (rc) goto out; + + return 0; + + out: + libxl__poller_dispose(p); + return rc; +} + +void libxl__poller_dispose(libxl__poller *p) +{ + 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); +} + +libxl__poller *libxl__poller_get(libxl_ctx *ctx) +{ + /* must be called with ctx locked */ + int rc; + + libxl__poller *p = LIBXL_LIST_FIRST(&ctx->pollers_idle); + if (p) + return p; + + p = malloc(sizeof(*p)); + if (!p) { + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "cannot allocate poller"); + return 0; + } + memset(p, 0, sizeof(*p)); + + rc = libxl__poller_init(ctx, p); + if (rc) return NULL; + + return p; +} + +void libxl__poller_put(libxl_ctx *ctx, libxl__poller *p) +{ + LIBXL_LIST_INSERT_HEAD(&ctx->pollers_idle, p, entry); +} + +void libxl__poller_wakeup(libxl__egc *egc, libxl__poller *p) +{ + static const char buf[1] = ""; + + for (;;) { + int r = write(p->wakeup_pipe[1], buf, 1); + if (r==1) return; + assert(r==-1); + if (errno == EINTR) continue; + if (errno == EWOULDBLOCK) return; + LIBXL__EVENT_DISASTER(egc, "cannot poke watch pipe", errno, 0); + return; + } +} + +/* + * Main event loop iteration + */ + +static int eventloop_iteration(libxl__egc *egc, libxl__poller *poller) { + /* The CTX must be locked EXACTLY ONCE so that this function + * can unlock it when it polls. + */ EGC_GC; int rc; struct timeval now; @@ -871,23 +980,27 @@ int timeout; for (;;) { - int nfds = CTX->fd_polls_allocd; + int nfds = poller->fd_polls_allocd; timeout = -1; - rc = beforepoll_internal(gc, &nfds, CTX->fd_polls, &timeout, now); + rc = beforepoll_internal(gc, poller, &nfds, poller->fd_polls, + &timeout, now); if (!rc) break; if (rc != ERROR_BUFFERFULL) goto out; struct pollfd *newarray = (nfds > INT_MAX / sizeof(struct pollfd) / 2) ? 0 : - realloc(CTX->fd_polls, sizeof(*newarray) * nfds); + realloc(poller->fd_polls, sizeof(*newarray) * nfds); if (!newarray) { rc = ERROR_NOMEM; goto out; } - CTX->fd_polls = newarray; - CTX->fd_polls_allocd = nfds; + poller->fd_polls = newarray; + poller->fd_polls_allocd = nfds; } - rc = poll(CTX->fd_polls, CTX->fd_polls_allocd, timeout); + CTX_UNLOCK; + rc = poll(poller->fd_polls, poller->fd_polls_allocd, timeout); + CTX_LOCK; + if (rc < 0) { if (errno == EINTR) return 0; /* will go round again if caller requires */ @@ -900,7 +1013,8 @@ rc = libxl__gettimeofday(gc, &now); if (rc) goto out; - afterpoll_internal(egc, CTX->fd_polls_allocd, CTX->fd_polls, now); + afterpoll_internal(egc, poller, + poller->fd_polls_allocd, poller->fd_polls, now); CTX_UNLOCK; @@ -914,15 +1028,19 @@ libxl_event_predicate *pred, void *pred_user) { int rc; + libxl__poller *poller = NULL; EGC_INIT(ctx); CTX_LOCK; + poller = libxl__poller_get(ctx); + if (!poller) { rc = ERROR_FAIL; goto out; } + for (;;) { rc = event_check_internal(egc, event_r, typemask, pred, pred_user); if (rc != ERROR_NOT_READY) goto out; - rc = eventloop_iteration(egc); + rc = eventloop_iteration(egc, poller); if (rc) goto out; /* we unlock and cleanup the egc each time we go through this loop, @@ -936,6 +1054,8 @@ } out: + libxl__poller_put(ctx, poller); + CTX_UNLOCK; EGC_FREE; return rc; diff -r d503bdfaba23 -r cd4bff9d4050 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri Jan 27 17:01:23 2012 +0000 +++ b/tools/libxl/libxl_internal.h Fri Jan 27 17:01:23 2012 +0000 @@ -207,6 +207,33 @@ _hidden void libxl__evdisable_disk_eject(libxl__gc*, libxl_evgen_disk_eject*); +typedef struct libxl__poller libxl__poller; +struct libxl__poller { + /* + * These are used to allow other threads to wake up a thread which + * may be stuck in poll, because whatever it was waiting for + * hadn't happened yet. Threads which generate events will write + * a byte to each pipe. A thread which is waiting will empty its + * own pipe, and put its poller on the pollers_event list, before + * releasing the ctx lock and going into poll; when it comes out + * of poll it will take the poller off the pollers_event list. + * + * When a thread is done with a poller it should put it onto + * pollers_idle, where it can be reused later. + * + * The "poller_app" is never idle, but is sometimes on + * pollers_event. + */ + LIBXL_LIST_ENTRY(libxl__poller) entry; + + struct pollfd *fd_polls; + int fd_polls_allocd; + + int fd_rindex_allocd; + int *fd_rindex; /* see libxl_osevent_beforepoll */ + + int wakeup_pipe[2]; /* 0 means no fd allocated */ +}; struct libxl__ctx { xentoollog_logger *lg; @@ -237,10 +264,9 @@ /* See the comment for OSEVENT_HOOK_INTERN in libxl_event.c * for restrictions on the use of the osevent fields. */ - struct pollfd *fd_polls; - int fd_polls_allocd; - int fd_rindex_allocd; - int *fd_rindex; /* see libxl_osevent_beforepoll */ + libxl__poller poller_app; /* libxl_osevent_beforepoll and _afterpoll */ + LIBXL_LIST_HEAD(, libxl__poller) pollers_event, pollers_idle; + LIBXL_LIST_HEAD(, libxl__ev_fd) efds; LIBXL_TAILQ_HEAD(, libxl__ev_time) etimes; @@ -526,6 +552,22 @@ libxl__event_disaster(egc, msg, errnoval, type, __FILE__,__LINE__,__func__) +/* 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); + +/* 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); + +/* 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); + + /* 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); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:55:58 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:55: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 1RtR6p-0006KE-M0; Fri, 03 Feb 2012 21:55:55 +0000 Received: from mail174.messagelabs.com ([85.158.138.51]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6o-0006Ht-7y for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:54 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-174.messagelabs.com!1328306145!11764436!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.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20288 invoked from network); 3 Feb 2012 21:55:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 3 Feb 2012 21:55:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6f-0001hz-Pn for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR6d-0002GW-Fp for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:45 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:55:42 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: Asynchronous/long-running operation infrastructure X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Jackson # Date 1327683684 0 # Node ID 03152893aba021053da70573a58449bcfcca4b88 # Parent cd4bff9d40507cfea619a679f524fafac79a8226 libxl: Asynchronous/long-running operation infrastructure Provide a new set of machinery for writing public libxl functions which may take a long time. The application gets to decide whether they want the function to be synchronous, or whether they'd prefer to get a callback, or an event, when the operation is complete. User(s) of this machinery will be introduced in later patch(es). Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r cd4bff9d4050 -r 03152893aba0 tools/libxl/libxl.h --- a/tools/libxl/libxl.h Fri Jan 27 17:01:23 2012 +0000 +++ b/tools/libxl/libxl.h Fri Jan 27 17:01:24 2012 +0000 @@ -237,6 +237,59 @@ ERROR_BUFFERFULL = -13, }; + +/* + * Some libxl operations can take a long time. These functions take a + * parameter to control their concurrency: + * libxl_asyncop_how *ao_how + * + * If ao_how==NULL, the function will be synchronous. + * + * If ao_how!=NULL, the function will set the operation going, and if + * this is successful will return 0. In this case the zero error + * response does NOT mean that the operation was successful; it just + * means that it has been successfully started. It will finish later, + * perhaps with an error. + * + * If ao_how->callback!=NULL, the callback will be called when the + * operation completes. The same rules as for libxl_event_hooks + * apply, including the reentrancy rules and the possibility of + * "disaster", except that libxl calls ao_how->callback instead of + * libxl_event_hooks.event_occurs. (See libxl_event.h.) + * + * If ao_how->callback==NULL, a libxl_event will be generated which + * can be obtained from libxl_event_wait or libxl_event_check. The + * event will have type OPERATION_COMPLETE (which is not used + * elsewhere). + * + * Note that it is possible for an asynchronous operation which is to + * result in a callback to complete during its initiating function + * call. In this case the initiating function will return 0 + * indicating the at the operation is "in progress", even though by + * the time it returns the operation is complete and the callback has + * already happened. + * + * The application must set and use ao_how->for_event (which will be + * copied into libxl_event.for_user) or ao_how->for_callback (passed + * to the callback) to determine which operation finished, and it must + * of course check the rc value for errors. + * + * *ao_how does not need to remain valid after the initiating function + * returns. + * + * Callbacks may occur on any thread in which the application calls + * libxl. + */ + +typedef struct { + void (*callback)(libxl_ctx *ctx, int rc, void *for_callback); + union { + libxl_ev_user for_event; /* used if callback==NULL */ + void *for_callback; /* passed to callback */ + } u; +} libxl_asyncop_how; + + #define LIBXL_VERSION 0 typedef struct { diff -r cd4bff9d4050 -r 03152893aba0 tools/libxl/libxl_event.c --- a/tools/libxl/libxl_event.c Fri Jan 27 17:01:23 2012 +0000 +++ b/tools/libxl/libxl_event.c Fri Jan 27 17:01:24 2012 +0000 @@ -771,10 +771,21 @@ { EGC_GC; libxl_event *ev, *ev_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__ao *ao, *ao_tmp; + LIBXL_TAILQ_FOREACH_SAFE(ao, &egc->aos_for_callback, + 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); + ao->notified = 1; + if (!ao->in_initiator) + libxl__ao__destroy(CTX, ao); + } } void libxl__egc_cleanup(libxl__egc *egc) @@ -1061,6 +1072,183 @@ return rc; } + + +/* + * The two possible state flow of an ao: + * + * Completion before initiator return: + * + * Initiator thread Possible other threads + * + * * ao_create allocates memory and + * initialises the struct + * + * * the initiator function does its + * work, setting up various internal + * asynchronous operations -----------> * asynchronous operations + * start to take place and + * might cause ao completion + * | + * * initiator calls ao_inprogress | + * - if synchronous, run event loop | + * until the ao completes | + * - ao completes on some thread + * - completing thread releases the lock + * <--------------' + * - ao_inprogress takes the lock + * - destroy the ao + * + * + * Completion after initiator return (asynch. only): + * + * + * Initiator thread Possible other threads + * + * * ao_create allocates memory and + * initialises the struct + * + * * the initiator function does its + * work, setting up various internal + * asynchronous operations -----------> * asynchronous operations + * start to take place and + * might cause ao completion + * | + * * initiator calls ao_inprogress | + * - observes event not yet done, | + * - returns to caller | + * | + * - ao completes on some thread + * - generate the event or call the callback + * - destroy the ao + */ + +void libxl__ao__destroy(libxl_ctx *ctx, libxl__ao *ao) +{ + if (!ao) return; + if (ao->poller) libxl__poller_put(ctx, ao->poller); + ao->magic = LIBXL__AO_MAGIC_DESTROYED; + libxl__free_all(&ao->gc); + free(ao); +} + +void libxl__ao_abort(libxl__ao *ao) +{ + AO_GC; + assert(ao->magic == LIBXL__AO_MAGIC); + assert(ao->in_initiator); + assert(!ao->complete); + libxl__ao__destroy(CTX, ao); +} + +void libxl__ao_complete(libxl__egc *egc, libxl__ao *ao, int rc) +{ + assert(ao->magic == LIBXL__AO_MAGIC); + assert(!ao->complete); + ao->complete = 1; + ao->rc = rc; + + if (ao->poller) { + assert(ao->in_initiator); + libxl__poller_wakeup(egc, ao->poller); + } else if (ao->how.callback) { + LIBXL_TAILQ_INSERT_TAIL(&egc->aos_for_callback, ao, entry_for_callback); + } else { + libxl_event *ev; + ev = NEW_EVENT(egc, OPERATION_COMPLETE, ao->domid); + if (ev) { + ev->for_user = ao->how.u.for_event; + ev->u.operation_complete.rc = ao->rc; + libxl__event_occurred(egc, ev); + } + ao->notified = 1; + } + if (!ao->in_initiator && ao->notified) + libxl__ao__destroy(libxl__gc_owner(&egc->gc), ao); +} + +libxl__ao *libxl__ao_create(libxl_ctx *ctx, uint32_t domid, + const libxl_asyncop_how *how) +{ + libxl__ao *ao; + + ao = calloc(1, sizeof(*ao)); + if (!ao) goto out; + + ao->magic = LIBXL__AO_MAGIC; + ao->in_initiator = 1; + ao->poller = 0; + ao->domid = domid; + LIBXL_INIT_GC(ao->gc, ctx); + + if (how) { + ao->how = *how; + } else { + ao->poller = libxl__poller_get(ctx); + if (!ao->poller) goto out; + } + return ao; + + out: + if (ao) libxl__ao__destroy(ctx, ao); + return NULL; +} + +int libxl__ao_inprogress(libxl__ao *ao) +{ + AO_GC; + int rc; + + assert(ao->magic == LIBXL__AO_MAGIC); + assert(ao->in_initiator); + + if (ao->poller) { + /* Caller wants it done synchronously. */ + /* We use a fresh gc, so that we can free things + * each time round the loop. */ + libxl__egc egc; + LIBXL_INIT_EGC(egc,CTX); + + for (;;) { + assert(ao->magic == LIBXL__AO_MAGIC); + + if (ao->complete) { + rc = ao->rc; + ao->notified = 1; + break; + } + + rc = eventloop_iteration(&egc,ao->poller); + if (rc) { + /* Oh dear, this is quite unfortunate. */ + LIBXL__LOG(CTX, LIBXL__LOG_ERROR, "Error waiting for" + " event during long-running operation (rc=%d)", rc); + sleep(1); + /* It's either this or return ERROR_I_DONT_KNOW_WHETHER + * _THE_THING_YOU_ASKED_FOR_WILL_BE_DONE_LATER_WHEN + * _YOU_DIDNT_EXPECT_IT, since we don't have any kind of + * cancellation ability. */ + } + + CTX_UNLOCK; + libxl__egc_cleanup(&egc); + CTX_LOCK; + } + } else { + rc = 0; + } + + ao->in_initiator = 0; + + if (ao->notified) { + assert(ao->complete); + libxl__ao__destroy(CTX,ao); + } + + return rc; +} + + /* * Local variables: * mode: C diff -r cd4bff9d4050 -r 03152893aba0 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri Jan 27 17:01:23 2012 +0000 +++ b/tools/libxl/libxl_internal.h Fri Jan 27 17:01:24 2012 +0000 @@ -114,6 +114,7 @@ typedef struct libxl__gc libxl__gc; typedef struct libxl__egc libxl__egc; +typedef struct libxl__ao libxl__ao; typedef struct libxl__ev_fd libxl__ev_fd; typedef void libxl__ev_fd_callback(libxl__egc *egc, libxl__ev_fd *ev, @@ -218,6 +219,10 @@ * releasing the ctx lock and going into poll; when it comes out * of poll it will take the poller off the pollers_event list. * + * A thread which is waiting for completion of a synchronous ao + * will allocate a poller and record it in the ao, so that other + * threads can wake it up. + * * When a thread is done with a poller it should put it onto * pollers_idle, where it can be reused later. * @@ -324,6 +329,21 @@ /* for event-generating functions only */ struct libxl__gc gc; struct libxl__event_list occurred_for_callback; + LIBXL_TAILQ_HEAD(, libxl__ao) aos_for_callback; +}; + +#define LIBXL__AO_MAGIC 0xA0FACE00ul +#define LIBXL__AO_MAGIC_DESTROYED 0xA0DEAD00ul + +struct libxl__ao { + uint32_t magic; + unsigned in_initiator:1, complete:1, notified:1; + int rc; + libxl__gc gc; + libxl_asyncop_how how; + libxl__poller *poller; + uint32_t domid; + LIBXL_TAILQ_ENTRY(libxl__ao) entry_for_callback; }; #define LIBXL_INIT_GC(gc,ctx) do{ \ @@ -1108,6 +1128,7 @@ #define LIBXL_INIT_EGC(egc,ctx) do{ \ LIBXL_INIT_GC((egc).gc,ctx); \ LIBXL_TAILQ_INIT(&(egc).occurred_for_callback); \ + LIBXL_TAILQ_INIT(&(egc).aos_for_callback); \ } while(0) _hidden void libxl__egc_cleanup(libxl__egc *egc); @@ -1125,6 +1146,92 @@ /* + * 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 + * outside libxl, because they can cause reentrancy callbacks. + * + * Lifecycle of an ao: + * + * - Created by libxl__ao_create (or the AO_CREATE convenience macro). + * + * - After creation, can be used by code which implements + * the operation as follows: + * - the ao's gc, for allocating memory for the lifetime + * of the operation (possibly with the help of the AO_GC + * macro to introduce the gc into scope) + * - the ao itself may be passed about to sub-functions + * so that they can stash it away etc. + * - in particular, the ao pointer must be stashed in some + * per-operation structure which is also passed as a user + * 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 initiation is successful, the initiating function needs + * to run libxl__ao_inprogress right before unlocking and + * returning, and return whatever it returns (AO_INPROGRESS macro). + * + * - If the initiation is unsuccessful, the initiating function must + * call libxl__ao_abort before unlocking and returning whatever + * error code is appropriate (AO_ABORT macro). + * + * - 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 + * function). This must happen exactly once for each ao (and not if + * the ao has been destroyed, obviously), and it may not happen + * until libxl__ao_inprogress has been called on the ao. + * + * - Note that during callback functions, two gcs are available: + * - The one in egc, whose lifetime is only this callback + * - The one in ao, whose lifetime is the asynchronous operation + * Usually callback function should use CONTAINER_OF + * to obtain its own structure, containing a pointer to the ao, + * and then use the gc from that ao. + */ + +#define AO_CREATE(ctx, domid, ao_how) \ + libxl__ctx_lock(ctx); \ + libxl__ao *ao = libxl__ao_create(ctx, domid, ao_how); \ + if (!ao) { libxl__ctx_unlock(ctx); return ERROR_NOMEM; } \ + AO_GC; + +#define AO_INPROGRESS ({ \ + libxl_ctx *ao__ctx = libxl__gc_owner(&ao->gc); \ + int ao__rc = libxl__ao_inprogress(ao); \ + libxl__ctx_unlock(ao__ctx); /* gc is now invalid */ \ + (ao__rc); \ + }) + +#define AO_ABORT(rc) ({ \ + libxl_ctx *ao__ctx = libxl__gc_owner(&ao->gc); \ + assert(rc); \ + libxl__ao_abort(ao); \ + libxl__ctx_unlock(ao__ctx); /* gc is now invalid */ \ + (rc); \ + }) + +#define AO_GC \ + libxl__gc *const gc = &ao->gc + + +/* All of these MUST be called with the ctx locked. + * libxl__ao_inprogress MUST be called with the ctx locked exactly once. */ +_hidden libxl__ao *libxl__ao_create(libxl_ctx*, uint32_t domid, + const libxl_asyncop_how*); +_hidden int libxl__ao_inprogress(libxl__ao *ao); +_hidden void libxl__ao_abort(libxl__ao *ao); +_hidden void libxl__ao_complete(libxl__egc *egc, libxl__ao *ao, int rc); + +/* For use by ao machinery ONLY */ +_hidden void libxl__ao__destroy(libxl_ctx*, libxl__ao *ao); + +/* * Convenience macros. */ diff -r cd4bff9d4050 -r 03152893aba0 tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Fri Jan 27 17:01:23 2012 +0000 +++ b/tools/libxl/libxl_types.idl Fri Jan 27 17:01:24 2012 +0000 @@ -397,6 +397,7 @@ (1, "DOMAIN_SHUTDOWN"), (2, "DOMAIN_DESTROY"), (3, "DISK_EJECT"), + (4, "OPERATION_COMPLETE"), ]) libxl_ev_user = UInt(64) @@ -420,4 +421,7 @@ ("vdev", string), ("disk", libxl_device_disk), ])), + ("operation_complete", Struct(None, [ + ("rc", integer), + ])), ]))]) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:55:58 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:55: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 1RtR6p-0006KE-M0; Fri, 03 Feb 2012 21:55:55 +0000 Received: from mail174.messagelabs.com ([85.158.138.51]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6o-0006Ht-7y for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:54 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-174.messagelabs.com!1328306145!11764436!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.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20288 invoked from network); 3 Feb 2012 21:55:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 3 Feb 2012 21:55:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6f-0001hz-Pn for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR6d-0002GW-Fp for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:45 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:55:42 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: Asynchronous/long-running operation infrastructure X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Jackson # Date 1327683684 0 # Node ID 03152893aba021053da70573a58449bcfcca4b88 # Parent cd4bff9d40507cfea619a679f524fafac79a8226 libxl: Asynchronous/long-running operation infrastructure Provide a new set of machinery for writing public libxl functions which may take a long time. The application gets to decide whether they want the function to be synchronous, or whether they'd prefer to get a callback, or an event, when the operation is complete. User(s) of this machinery will be introduced in later patch(es). Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r cd4bff9d4050 -r 03152893aba0 tools/libxl/libxl.h --- a/tools/libxl/libxl.h Fri Jan 27 17:01:23 2012 +0000 +++ b/tools/libxl/libxl.h Fri Jan 27 17:01:24 2012 +0000 @@ -237,6 +237,59 @@ ERROR_BUFFERFULL = -13, }; + +/* + * Some libxl operations can take a long time. These functions take a + * parameter to control their concurrency: + * libxl_asyncop_how *ao_how + * + * If ao_how==NULL, the function will be synchronous. + * + * If ao_how!=NULL, the function will set the operation going, and if + * this is successful will return 0. In this case the zero error + * response does NOT mean that the operation was successful; it just + * means that it has been successfully started. It will finish later, + * perhaps with an error. + * + * If ao_how->callback!=NULL, the callback will be called when the + * operation completes. The same rules as for libxl_event_hooks + * apply, including the reentrancy rules and the possibility of + * "disaster", except that libxl calls ao_how->callback instead of + * libxl_event_hooks.event_occurs. (See libxl_event.h.) + * + * If ao_how->callback==NULL, a libxl_event will be generated which + * can be obtained from libxl_event_wait or libxl_event_check. The + * event will have type OPERATION_COMPLETE (which is not used + * elsewhere). + * + * Note that it is possible for an asynchronous operation which is to + * result in a callback to complete during its initiating function + * call. In this case the initiating function will return 0 + * indicating the at the operation is "in progress", even though by + * the time it returns the operation is complete and the callback has + * already happened. + * + * The application must set and use ao_how->for_event (which will be + * copied into libxl_event.for_user) or ao_how->for_callback (passed + * to the callback) to determine which operation finished, and it must + * of course check the rc value for errors. + * + * *ao_how does not need to remain valid after the initiating function + * returns. + * + * Callbacks may occur on any thread in which the application calls + * libxl. + */ + +typedef struct { + void (*callback)(libxl_ctx *ctx, int rc, void *for_callback); + union { + libxl_ev_user for_event; /* used if callback==NULL */ + void *for_callback; /* passed to callback */ + } u; +} libxl_asyncop_how; + + #define LIBXL_VERSION 0 typedef struct { diff -r cd4bff9d4050 -r 03152893aba0 tools/libxl/libxl_event.c --- a/tools/libxl/libxl_event.c Fri Jan 27 17:01:23 2012 +0000 +++ b/tools/libxl/libxl_event.c Fri Jan 27 17:01:24 2012 +0000 @@ -771,10 +771,21 @@ { EGC_GC; libxl_event *ev, *ev_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__ao *ao, *ao_tmp; + LIBXL_TAILQ_FOREACH_SAFE(ao, &egc->aos_for_callback, + 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); + ao->notified = 1; + if (!ao->in_initiator) + libxl__ao__destroy(CTX, ao); + } } void libxl__egc_cleanup(libxl__egc *egc) @@ -1061,6 +1072,183 @@ return rc; } + + +/* + * The two possible state flow of an ao: + * + * Completion before initiator return: + * + * Initiator thread Possible other threads + * + * * ao_create allocates memory and + * initialises the struct + * + * * the initiator function does its + * work, setting up various internal + * asynchronous operations -----------> * asynchronous operations + * start to take place and + * might cause ao completion + * | + * * initiator calls ao_inprogress | + * - if synchronous, run event loop | + * until the ao completes | + * - ao completes on some thread + * - completing thread releases the lock + * <--------------' + * - ao_inprogress takes the lock + * - destroy the ao + * + * + * Completion after initiator return (asynch. only): + * + * + * Initiator thread Possible other threads + * + * * ao_create allocates memory and + * initialises the struct + * + * * the initiator function does its + * work, setting up various internal + * asynchronous operations -----------> * asynchronous operations + * start to take place and + * might cause ao completion + * | + * * initiator calls ao_inprogress | + * - observes event not yet done, | + * - returns to caller | + * | + * - ao completes on some thread + * - generate the event or call the callback + * - destroy the ao + */ + +void libxl__ao__destroy(libxl_ctx *ctx, libxl__ao *ao) +{ + if (!ao) return; + if (ao->poller) libxl__poller_put(ctx, ao->poller); + ao->magic = LIBXL__AO_MAGIC_DESTROYED; + libxl__free_all(&ao->gc); + free(ao); +} + +void libxl__ao_abort(libxl__ao *ao) +{ + AO_GC; + assert(ao->magic == LIBXL__AO_MAGIC); + assert(ao->in_initiator); + assert(!ao->complete); + libxl__ao__destroy(CTX, ao); +} + +void libxl__ao_complete(libxl__egc *egc, libxl__ao *ao, int rc) +{ + assert(ao->magic == LIBXL__AO_MAGIC); + assert(!ao->complete); + ao->complete = 1; + ao->rc = rc; + + if (ao->poller) { + assert(ao->in_initiator); + libxl__poller_wakeup(egc, ao->poller); + } else if (ao->how.callback) { + LIBXL_TAILQ_INSERT_TAIL(&egc->aos_for_callback, ao, entry_for_callback); + } else { + libxl_event *ev; + ev = NEW_EVENT(egc, OPERATION_COMPLETE, ao->domid); + if (ev) { + ev->for_user = ao->how.u.for_event; + ev->u.operation_complete.rc = ao->rc; + libxl__event_occurred(egc, ev); + } + ao->notified = 1; + } + if (!ao->in_initiator && ao->notified) + libxl__ao__destroy(libxl__gc_owner(&egc->gc), ao); +} + +libxl__ao *libxl__ao_create(libxl_ctx *ctx, uint32_t domid, + const libxl_asyncop_how *how) +{ + libxl__ao *ao; + + ao = calloc(1, sizeof(*ao)); + if (!ao) goto out; + + ao->magic = LIBXL__AO_MAGIC; + ao->in_initiator = 1; + ao->poller = 0; + ao->domid = domid; + LIBXL_INIT_GC(ao->gc, ctx); + + if (how) { + ao->how = *how; + } else { + ao->poller = libxl__poller_get(ctx); + if (!ao->poller) goto out; + } + return ao; + + out: + if (ao) libxl__ao__destroy(ctx, ao); + return NULL; +} + +int libxl__ao_inprogress(libxl__ao *ao) +{ + AO_GC; + int rc; + + assert(ao->magic == LIBXL__AO_MAGIC); + assert(ao->in_initiator); + + if (ao->poller) { + /* Caller wants it done synchronously. */ + /* We use a fresh gc, so that we can free things + * each time round the loop. */ + libxl__egc egc; + LIBXL_INIT_EGC(egc,CTX); + + for (;;) { + assert(ao->magic == LIBXL__AO_MAGIC); + + if (ao->complete) { + rc = ao->rc; + ao->notified = 1; + break; + } + + rc = eventloop_iteration(&egc,ao->poller); + if (rc) { + /* Oh dear, this is quite unfortunate. */ + LIBXL__LOG(CTX, LIBXL__LOG_ERROR, "Error waiting for" + " event during long-running operation (rc=%d)", rc); + sleep(1); + /* It's either this or return ERROR_I_DONT_KNOW_WHETHER + * _THE_THING_YOU_ASKED_FOR_WILL_BE_DONE_LATER_WHEN + * _YOU_DIDNT_EXPECT_IT, since we don't have any kind of + * cancellation ability. */ + } + + CTX_UNLOCK; + libxl__egc_cleanup(&egc); + CTX_LOCK; + } + } else { + rc = 0; + } + + ao->in_initiator = 0; + + if (ao->notified) { + assert(ao->complete); + libxl__ao__destroy(CTX,ao); + } + + return rc; +} + + /* * Local variables: * mode: C diff -r cd4bff9d4050 -r 03152893aba0 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri Jan 27 17:01:23 2012 +0000 +++ b/tools/libxl/libxl_internal.h Fri Jan 27 17:01:24 2012 +0000 @@ -114,6 +114,7 @@ typedef struct libxl__gc libxl__gc; typedef struct libxl__egc libxl__egc; +typedef struct libxl__ao libxl__ao; typedef struct libxl__ev_fd libxl__ev_fd; typedef void libxl__ev_fd_callback(libxl__egc *egc, libxl__ev_fd *ev, @@ -218,6 +219,10 @@ * releasing the ctx lock and going into poll; when it comes out * of poll it will take the poller off the pollers_event list. * + * A thread which is waiting for completion of a synchronous ao + * will allocate a poller and record it in the ao, so that other + * threads can wake it up. + * * When a thread is done with a poller it should put it onto * pollers_idle, where it can be reused later. * @@ -324,6 +329,21 @@ /* for event-generating functions only */ struct libxl__gc gc; struct libxl__event_list occurred_for_callback; + LIBXL_TAILQ_HEAD(, libxl__ao) aos_for_callback; +}; + +#define LIBXL__AO_MAGIC 0xA0FACE00ul +#define LIBXL__AO_MAGIC_DESTROYED 0xA0DEAD00ul + +struct libxl__ao { + uint32_t magic; + unsigned in_initiator:1, complete:1, notified:1; + int rc; + libxl__gc gc; + libxl_asyncop_how how; + libxl__poller *poller; + uint32_t domid; + LIBXL_TAILQ_ENTRY(libxl__ao) entry_for_callback; }; #define LIBXL_INIT_GC(gc,ctx) do{ \ @@ -1108,6 +1128,7 @@ #define LIBXL_INIT_EGC(egc,ctx) do{ \ LIBXL_INIT_GC((egc).gc,ctx); \ LIBXL_TAILQ_INIT(&(egc).occurred_for_callback); \ + LIBXL_TAILQ_INIT(&(egc).aos_for_callback); \ } while(0) _hidden void libxl__egc_cleanup(libxl__egc *egc); @@ -1125,6 +1146,92 @@ /* + * 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 + * outside libxl, because they can cause reentrancy callbacks. + * + * Lifecycle of an ao: + * + * - Created by libxl__ao_create (or the AO_CREATE convenience macro). + * + * - After creation, can be used by code which implements + * the operation as follows: + * - the ao's gc, for allocating memory for the lifetime + * of the operation (possibly with the help of the AO_GC + * macro to introduce the gc into scope) + * - the ao itself may be passed about to sub-functions + * so that they can stash it away etc. + * - in particular, the ao pointer must be stashed in some + * per-operation structure which is also passed as a user + * 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 initiation is successful, the initiating function needs + * to run libxl__ao_inprogress right before unlocking and + * returning, and return whatever it returns (AO_INPROGRESS macro). + * + * - If the initiation is unsuccessful, the initiating function must + * call libxl__ao_abort before unlocking and returning whatever + * error code is appropriate (AO_ABORT macro). + * + * - 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 + * function). This must happen exactly once for each ao (and not if + * the ao has been destroyed, obviously), and it may not happen + * until libxl__ao_inprogress has been called on the ao. + * + * - Note that during callback functions, two gcs are available: + * - The one in egc, whose lifetime is only this callback + * - The one in ao, whose lifetime is the asynchronous operation + * Usually callback function should use CONTAINER_OF + * to obtain its own structure, containing a pointer to the ao, + * and then use the gc from that ao. + */ + +#define AO_CREATE(ctx, domid, ao_how) \ + libxl__ctx_lock(ctx); \ + libxl__ao *ao = libxl__ao_create(ctx, domid, ao_how); \ + if (!ao) { libxl__ctx_unlock(ctx); return ERROR_NOMEM; } \ + AO_GC; + +#define AO_INPROGRESS ({ \ + libxl_ctx *ao__ctx = libxl__gc_owner(&ao->gc); \ + int ao__rc = libxl__ao_inprogress(ao); \ + libxl__ctx_unlock(ao__ctx); /* gc is now invalid */ \ + (ao__rc); \ + }) + +#define AO_ABORT(rc) ({ \ + libxl_ctx *ao__ctx = libxl__gc_owner(&ao->gc); \ + assert(rc); \ + libxl__ao_abort(ao); \ + libxl__ctx_unlock(ao__ctx); /* gc is now invalid */ \ + (rc); \ + }) + +#define AO_GC \ + libxl__gc *const gc = &ao->gc + + +/* All of these MUST be called with the ctx locked. + * libxl__ao_inprogress MUST be called with the ctx locked exactly once. */ +_hidden libxl__ao *libxl__ao_create(libxl_ctx*, uint32_t domid, + const libxl_asyncop_how*); +_hidden int libxl__ao_inprogress(libxl__ao *ao); +_hidden void libxl__ao_abort(libxl__ao *ao); +_hidden void libxl__ao_complete(libxl__egc *egc, libxl__ao *ao, int rc); + +/* For use by ao machinery ONLY */ +_hidden void libxl__ao__destroy(libxl_ctx*, libxl__ao *ao); + +/* * Convenience macros. */ diff -r cd4bff9d4050 -r 03152893aba0 tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Fri Jan 27 17:01:23 2012 +0000 +++ b/tools/libxl/libxl_types.idl Fri Jan 27 17:01:24 2012 +0000 @@ -397,6 +397,7 @@ (1, "DOMAIN_SHUTDOWN"), (2, "DOMAIN_DESTROY"), (3, "DISK_EJECT"), + (4, "OPERATION_COMPLETE"), ]) libxl_ev_user = UInt(64) @@ -420,4 +421,7 @@ ("vdev", string), ("disk", libxl_device_disk), ])), + ("operation_complete", Struct(None, [ + ("rc", integer), + ])), ]))]) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:55:58 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:55: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 1RtR6r-0006Kv-Qt; Fri, 03 Feb 2012 21:55:57 +0000 Received: from mail174.messagelabs.com ([85.158.138.51]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6q-0006IT-Jg for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:56 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-174.messagelabs.com!1328306148!11729415!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29944 invoked from network); 3 Feb 2012 21:55:49 -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; 3 Feb 2012 21:55:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6h-0001i4-UL for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR6g-0002HO-Cg for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:47 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:55:45 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: New convenience macro CONTAINER_OF X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Jackson # Date 1327683684 0 # Node ID ccc3656225ef5062ee3efbf21be31e69feffc632 # Parent 03152893aba021053da70573a58449bcfcca4b88 libxl: New convenience macro CONTAINER_OF Provide a convenient and type-safe wrapper which does the correct dance to subtract offsetof. This is very similar to the "container_of" macro in the Linux kernel, but it has an additional feature that instead of the type argument you may also pass an expression of that type; this makes initialising a variable with CONTAINER_OF easier. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 03152893aba0 -r ccc3656225ef tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri Jan 27 17:01:24 2012 +0000 +++ b/tools/libxl/libxl_internal.h Fri Jan 27 17:01:24 2012 +0000 @@ -1235,6 +1235,35 @@ * Convenience macros. */ +/* + * CONTAINER_OF work like this. Given: + * typedef struct { + * ... + * member_type member_name; + * ... + * } outer_type; + * outer_type outer, *outer_var; + * member_type *inner_ptr = &outer->member_name; + * + * Then, effectively: + * outer_type *CONTAINER_OF(member_type *inner_ptr, + * *outer_var, // or type name for outer_type + * member_name); + * + * So that: + * CONTAINER_OF(inner_ptr, *outer_var, member_name) == &outer + * CONTAINER_OF(inner_ptr, outer_type, member_name) == &outer + */ +#define CONTAINER_OF(inner_ptr, outer, member_name) \ + ({ \ + typeof(outer) *container_of_; \ + container_of_ = (void*)((char*)(inner_ptr) - \ + offsetof(typeof(outer), member_name)); \ + (void)(&container_of_->member_name == \ + (typeof(inner_ptr))0) /* type check */; \ + container_of_; \ + }) + /* * All of these assume (or define) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:55:58 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:55: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 1RtR6r-0006Kv-Qt; Fri, 03 Feb 2012 21:55:57 +0000 Received: from mail174.messagelabs.com ([85.158.138.51]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6q-0006IT-Jg for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:56 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-174.messagelabs.com!1328306148!11729415!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29944 invoked from network); 3 Feb 2012 21:55:49 -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; 3 Feb 2012 21:55:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6h-0001i4-UL for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR6g-0002HO-Cg for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:47 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:55:45 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: New convenience macro CONTAINER_OF X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Jackson # Date 1327683684 0 # Node ID ccc3656225ef5062ee3efbf21be31e69feffc632 # Parent 03152893aba021053da70573a58449bcfcca4b88 libxl: New convenience macro CONTAINER_OF Provide a convenient and type-safe wrapper which does the correct dance to subtract offsetof. This is very similar to the "container_of" macro in the Linux kernel, but it has an additional feature that instead of the type argument you may also pass an expression of that type; this makes initialising a variable with CONTAINER_OF easier. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 03152893aba0 -r ccc3656225ef tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri Jan 27 17:01:24 2012 +0000 +++ b/tools/libxl/libxl_internal.h Fri Jan 27 17:01:24 2012 +0000 @@ -1235,6 +1235,35 @@ * Convenience macros. */ +/* + * CONTAINER_OF work like this. Given: + * typedef struct { + * ... + * member_type member_name; + * ... + * } outer_type; + * outer_type outer, *outer_var; + * member_type *inner_ptr = &outer->member_name; + * + * Then, effectively: + * outer_type *CONTAINER_OF(member_type *inner_ptr, + * *outer_var, // or type name for outer_type + * member_name); + * + * So that: + * CONTAINER_OF(inner_ptr, *outer_var, member_name) == &outer + * CONTAINER_OF(inner_ptr, outer_type, member_name) == &outer + */ +#define CONTAINER_OF(inner_ptr, outer, member_name) \ + ({ \ + typeof(outer) *container_of_; \ + container_of_ = (void*)((char*)(inner_ptr) - \ + offsetof(typeof(outer), member_name)); \ + (void)(&container_of_->member_name == \ + (typeof(inner_ptr))0) /* type check */; \ + container_of_; \ + }) + /* * All of these assume (or define) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:56:01 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:56: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 1RtR6t-0006Lw-Tc; Fri, 03 Feb 2012 21:55:59 +0000 Received: from mail216.messagelabs.com ([85.158.143.99]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6s-0006J9-Ak for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:58 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-11.tower-216.messagelabs.com!1328306151!12855212!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8240 invoked from network); 3 Feb 2012 21:55:52 -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; 3 Feb 2012 21:55:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6k-0001iF-Vr for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR6j-0002I7-BV for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:49 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:55:47 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: Introduce libxl__ev_devstate X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Jackson # Date 1327683685 0 # Node ID 0fc9948457962514ab9a9a4bb9ed0bf3695dee1b # Parent ccc3656225ef5062ee3efbf21be31e69feffc632 libxl: Introduce libxl__ev_devstate Provide a new-style asynchronous facility for waiting for device states on xenbus. This will replace libxl__wait_for_device_state, after the callers have been updated in later patches. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r ccc3656225ef -r 0fc994845796 tools/libxl/libxl_event.c --- a/tools/libxl/libxl_event.c Fri Jan 27 17:01:24 2012 +0000 +++ b/tools/libxl/libxl_event.c Fri Jan 27 17:01:25 2012 +0000 @@ -507,6 +507,81 @@ } /* + * waiting for device state + */ + +static void devstate_watch_callback(libxl__egc *egc, libxl__ev_xswatch *watch, + const char *watch_path, const char *event_path) +{ + EGC_GC; + libxl__ev_devstate *ds = CONTAINER_OF(watch, *ds, watch); + int rc; + + char *sstate = libxl__xs_read(gc, XBT_NULL, watch_path); + if (!sstate) { + if (errno == ENOENT) { + LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, "backend %s wanted state %d" + " but it was removed", watch_path, ds->wanted); + rc = ERROR_INVAL; + } else { + LIBXL__LOG_ERRNO(CTX, LIBXL__LOG_ERROR, "backend %s wanted state" + " %d but read failed", watch_path, ds->wanted); + rc = ERROR_FAIL; + } + } else { + int got = atoi(sstate); + if (got == ds->wanted) { + LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, "backend %s wanted state %d ok", + watch_path, ds->wanted); + rc = 0; + } else { + LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, "backend %s wanted state %d" + " still waiting state %d", watch_path, ds->wanted, got); + return; + } + } + libxl__ev_devstate_cancel(gc, ds); + ds->callback(egc, ds, rc); +} + +static void devstate_timeout(libxl__egc *egc, libxl__ev_time *ev, + const struct timeval *requested_abs) +{ + EGC_GC; + libxl__ev_devstate *ds = CONTAINER_OF(ev, *ds, timeout); + LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, "backend %s wanted state %d " + " timed out", ds->watch.path, ds->wanted); + libxl__ev_devstate_cancel(gc, ds); + ds->callback(egc, ds, ERROR_TIMEDOUT); +} + +int libxl__ev_devstate_wait(libxl__gc *gc, libxl__ev_devstate *ds, + libxl__ev_devstate_callback cb, + const char *state_path, int state, int milliseconds) +{ + int rc; + + libxl__ev_time_init(&ds->timeout); + libxl__ev_xswatch_init(&ds->watch); + ds->wanted = state; + ds->callback = cb; + + rc = libxl__ev_time_register_rel(gc, &ds->timeout, devstate_timeout, + milliseconds); + if (rc) goto out; + + rc = libxl__ev_xswatch_register(gc, &ds->watch, devstate_watch_callback, + state_path); + if (rc) goto out; + + return 0; + + out: + libxl__ev_devstate_cancel(gc, ds); + return rc; +} + +/* * osevent poll */ diff -r ccc3656225ef -r 0fc994845796 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri Jan 27 17:01:24 2012 +0000 +++ b/tools/libxl/libxl_internal.h Fri Jan 27 17:01:25 2012 +0000 @@ -686,6 +686,47 @@ libxl__device_state_handler handler); /* + * libxl__ev_devstate - waits a given time for a device to + * reach a given state. Follows the libxl_ev_* conventions. + * Will generate only one event, and after that is automatically + * cancelled. + */ +typedef struct libxl__ev_devstate libxl__ev_devstate; +typedef void libxl__ev_devstate_callback(libxl__egc *egc, libxl__ev_devstate*, + int rc); + /* rc will be 0, ERROR_TIMEDOUT, ERROR_INVAL (meaning path was removed), + * or ERROR_FAIL if other stuff went wrong (in which latter case, logged) */ + +struct libxl__ev_devstate { + /* read-only for caller, who may read only when waiting: */ + int wanted; + libxl__ev_devstate_callback *callback; + /* as for the remainder, read-only public parts may also be + * read by the caller (notably, watch.path), but only when waiting: */ + libxl__ev_xswatch watch; + libxl__ev_time timeout; +}; + +static inline void libxl__ev_devstate_init(libxl__ev_devstate *ds) +{ + libxl__ev_time_init(&ds->timeout); + libxl__ev_xswatch_init(&ds->watch); +} + +static inline void libxl__ev_devstate_cancel(libxl__gc *gc, + libxl__ev_devstate *ds) +{ + libxl__ev_time_deregister(gc,&ds->timeout); + libxl__ev_xswatch_deregister(gc,&ds->watch); +} + +_hidden int libxl__ev_devstate_wait(libxl__gc *gc, libxl__ev_devstate *ds, + libxl__ev_devstate_callback cb, + const char *state_path, + int state, int milliseconds); + + +/* * libxl__try_phy_backend - Check if there's support for the passed * type of file using the PHY backend * st_mode: mode_t of the file, as returned by stat function _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:56:01 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:56: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 1RtR6t-0006Lw-Tc; Fri, 03 Feb 2012 21:55:59 +0000 Received: from mail216.messagelabs.com ([85.158.143.99]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6s-0006J9-Ak for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:58 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-11.tower-216.messagelabs.com!1328306151!12855212!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8240 invoked from network); 3 Feb 2012 21:55:52 -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; 3 Feb 2012 21:55:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6k-0001iF-Vr for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR6j-0002I7-BV for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:49 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:55:47 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: Introduce libxl__ev_devstate X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Jackson # Date 1327683685 0 # Node ID 0fc9948457962514ab9a9a4bb9ed0bf3695dee1b # Parent ccc3656225ef5062ee3efbf21be31e69feffc632 libxl: Introduce libxl__ev_devstate Provide a new-style asynchronous facility for waiting for device states on xenbus. This will replace libxl__wait_for_device_state, after the callers have been updated in later patches. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r ccc3656225ef -r 0fc994845796 tools/libxl/libxl_event.c --- a/tools/libxl/libxl_event.c Fri Jan 27 17:01:24 2012 +0000 +++ b/tools/libxl/libxl_event.c Fri Jan 27 17:01:25 2012 +0000 @@ -507,6 +507,81 @@ } /* + * waiting for device state + */ + +static void devstate_watch_callback(libxl__egc *egc, libxl__ev_xswatch *watch, + const char *watch_path, const char *event_path) +{ + EGC_GC; + libxl__ev_devstate *ds = CONTAINER_OF(watch, *ds, watch); + int rc; + + char *sstate = libxl__xs_read(gc, XBT_NULL, watch_path); + if (!sstate) { + if (errno == ENOENT) { + LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, "backend %s wanted state %d" + " but it was removed", watch_path, ds->wanted); + rc = ERROR_INVAL; + } else { + LIBXL__LOG_ERRNO(CTX, LIBXL__LOG_ERROR, "backend %s wanted state" + " %d but read failed", watch_path, ds->wanted); + rc = ERROR_FAIL; + } + } else { + int got = atoi(sstate); + if (got == ds->wanted) { + LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, "backend %s wanted state %d ok", + watch_path, ds->wanted); + rc = 0; + } else { + LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, "backend %s wanted state %d" + " still waiting state %d", watch_path, ds->wanted, got); + return; + } + } + libxl__ev_devstate_cancel(gc, ds); + ds->callback(egc, ds, rc); +} + +static void devstate_timeout(libxl__egc *egc, libxl__ev_time *ev, + const struct timeval *requested_abs) +{ + EGC_GC; + libxl__ev_devstate *ds = CONTAINER_OF(ev, *ds, timeout); + LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, "backend %s wanted state %d " + " timed out", ds->watch.path, ds->wanted); + libxl__ev_devstate_cancel(gc, ds); + ds->callback(egc, ds, ERROR_TIMEDOUT); +} + +int libxl__ev_devstate_wait(libxl__gc *gc, libxl__ev_devstate *ds, + libxl__ev_devstate_callback cb, + const char *state_path, int state, int milliseconds) +{ + int rc; + + libxl__ev_time_init(&ds->timeout); + libxl__ev_xswatch_init(&ds->watch); + ds->wanted = state; + ds->callback = cb; + + rc = libxl__ev_time_register_rel(gc, &ds->timeout, devstate_timeout, + milliseconds); + if (rc) goto out; + + rc = libxl__ev_xswatch_register(gc, &ds->watch, devstate_watch_callback, + state_path); + if (rc) goto out; + + return 0; + + out: + libxl__ev_devstate_cancel(gc, ds); + return rc; +} + +/* * osevent poll */ diff -r ccc3656225ef -r 0fc994845796 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri Jan 27 17:01:24 2012 +0000 +++ b/tools/libxl/libxl_internal.h Fri Jan 27 17:01:25 2012 +0000 @@ -686,6 +686,47 @@ libxl__device_state_handler handler); /* + * libxl__ev_devstate - waits a given time for a device to + * reach a given state. Follows the libxl_ev_* conventions. + * Will generate only one event, and after that is automatically + * cancelled. + */ +typedef struct libxl__ev_devstate libxl__ev_devstate; +typedef void libxl__ev_devstate_callback(libxl__egc *egc, libxl__ev_devstate*, + int rc); + /* rc will be 0, ERROR_TIMEDOUT, ERROR_INVAL (meaning path was removed), + * or ERROR_FAIL if other stuff went wrong (in which latter case, logged) */ + +struct libxl__ev_devstate { + /* read-only for caller, who may read only when waiting: */ + int wanted; + libxl__ev_devstate_callback *callback; + /* as for the remainder, read-only public parts may also be + * read by the caller (notably, watch.path), but only when waiting: */ + libxl__ev_xswatch watch; + libxl__ev_time timeout; +}; + +static inline void libxl__ev_devstate_init(libxl__ev_devstate *ds) +{ + libxl__ev_time_init(&ds->timeout); + libxl__ev_xswatch_init(&ds->watch); +} + +static inline void libxl__ev_devstate_cancel(libxl__gc *gc, + libxl__ev_devstate *ds) +{ + libxl__ev_time_deregister(gc,&ds->timeout); + libxl__ev_xswatch_deregister(gc,&ds->watch); +} + +_hidden int libxl__ev_devstate_wait(libxl__gc *gc, libxl__ev_devstate *ds, + libxl__ev_devstate_callback cb, + const char *state_path, + int state, int milliseconds); + + +/* * libxl__try_phy_backend - Check if there's support for the passed * type of file using the PHY backend * st_mode: mode_t of the file, as returned by stat function _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:56:03 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:56: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 1RtR6w-0006NC-0a; Fri, 03 Feb 2012 21:56:02 +0000 Received: from mail174.messagelabs.com ([85.158.138.51]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6u-0006JY-4S for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:00 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-174.messagelabs.com!1328306152!11910338!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1458 invoked from network); 3 Feb 2012 21:55:53 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 3 Feb 2012 21:55:53 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6l-0001iI-Uz for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR6l-0002Iv-Dp for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:51 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:55:50 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: Convert to asynchronous: device removal X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Jackson # Date 1327683686 0 # Node ID 47ea714a4e27ffe0dbcbfc8ace7bb4e189390206 # Parent 0fc9948457962514ab9a9a4bb9ed0bf3695dee1b libxl: Convert to asynchronous: device removal Convert libxl_FOO_device_remove, and the function which does the bulk of the work, libxl__device_remove, to the new async ops scheme. Adjust all callers. Also remove libxl__wait_for_device_state which is now obsolete. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 0fc994845796 -r 47ea714a4e27 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Fri Jan 27 17:01:25 2012 +0000 +++ b/tools/libxl/libxl.c Fri Jan 27 17:01:26 2012 +0000 @@ -1311,19 +1311,23 @@ } int libxl_device_disk_remove(libxl_ctx *ctx, uint32_t domid, - libxl_device_disk *disk) + libxl_device_disk *disk, + const libxl_asyncop_how *ao_how) { - GC_INIT(ctx); + AO_CREATE(ctx, domid, ao_how); libxl__device device; int rc; rc = libxl__device_from_disk(gc, domid, disk, &device); if (rc != 0) goto out; - rc = libxl__device_remove(gc, &device, 1); + rc = libxl__initiate_device_remove(ao, &device); + if (rc) goto out; + + return AO_INPROGRESS; + out: - GC_FREE; - return rc; + return AO_ABORT(rc); } int libxl_device_disk_destroy(libxl_ctx *ctx, uint32_t domid, @@ -1537,11 +1541,11 @@ ret = 0; - libxl_device_disk_remove(ctx, domid, disks + i); + libxl_device_disk_remove(ctx, domid, disks + i, 0); libxl_device_disk_add(ctx, domid, disk); stubdomid = libxl_get_stubdom_id(ctx, domid); if (stubdomid) { - libxl_device_disk_remove(ctx, stubdomid, disks + i); + libxl_device_disk_remove(ctx, stubdomid, disks + i, 0); libxl_device_disk_add(ctx, stubdomid, disk); } out: @@ -1760,19 +1764,23 @@ } int libxl_device_nic_remove(libxl_ctx *ctx, uint32_t domid, - libxl_device_nic *nic) + libxl_device_nic *nic, + const libxl_asyncop_how *ao_how) { - GC_INIT(ctx); + AO_CREATE(ctx, domid, ao_how); libxl__device device; int rc; rc = libxl__device_from_nic(gc, domid, nic, &device); if (rc != 0) goto out; - rc = libxl__device_remove(gc, &device, 1); + rc = libxl__initiate_device_remove(ao, &device); + if (rc) goto out; + + return AO_INPROGRESS; + out: - GC_FREE; - return rc; + return AO_ABORT(rc); } int libxl_device_nic_destroy(libxl_ctx *ctx, uint32_t domid, @@ -2100,19 +2108,23 @@ } int libxl_device_vkb_remove(libxl_ctx *ctx, uint32_t domid, - libxl_device_vkb *vkb) + libxl_device_vkb *vkb, + const libxl_asyncop_how *ao_how) { - GC_INIT(ctx); + AO_CREATE(ctx, domid, ao_how); libxl__device device; int rc; rc = libxl__device_from_vkb(gc, domid, vkb, &device); if (rc != 0) goto out; - rc = libxl__device_remove(gc, &device, 1); + rc = libxl__initiate_device_remove(ao, &device); + if (rc) goto out; + + return AO_INPROGRESS; + out: - GC_FREE; - return rc; + return AO_ABORT(rc); } int libxl_device_vkb_destroy(libxl_ctx *ctx, uint32_t domid, @@ -2217,19 +2229,23 @@ } int libxl_device_vfb_remove(libxl_ctx *ctx, uint32_t domid, - libxl_device_vfb *vfb) + libxl_device_vfb *vfb, + const libxl_asyncop_how *ao_how) { - GC_INIT(ctx); + AO_CREATE(ctx, domid, ao_how); libxl__device device; int rc; rc = libxl__device_from_vfb(gc, domid, vfb, &device); if (rc != 0) goto out; - rc = libxl__device_remove(gc, &device, 1); + rc = libxl__initiate_device_remove(ao, &device); + if (rc) goto out; + + return AO_INPROGRESS; + out: - GC_FREE; - return rc; + return AO_ABORT(rc); } int libxl_device_vfb_destroy(libxl_ctx *ctx, uint32_t domid, diff -r 0fc994845796 -r 47ea714a4e27 tools/libxl/libxl.h --- a/tools/libxl/libxl.h Fri Jan 27 17:01:25 2012 +0000 +++ b/tools/libxl/libxl.h Fri Jan 27 17:01:26 2012 +0000 @@ -467,7 +467,9 @@ /* Disks */ int libxl_device_disk_init(libxl_ctx *ctx, libxl_device_disk *disk); int libxl_device_disk_add(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk); -int libxl_device_disk_remove(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk); +int libxl_device_disk_remove(libxl_ctx *ctx, uint32_t domid, + libxl_device_disk *disk, + const libxl_asyncop_how *ao_how); int libxl_device_disk_destroy(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk); @@ -491,7 +493,9 @@ /* Network Interfaces */ int libxl_device_nic_init(libxl_ctx *ctx, libxl_device_nic *nic); int libxl_device_nic_add(libxl_ctx *ctx, uint32_t domid, libxl_device_nic *nic); -int libxl_device_nic_remove(libxl_ctx *ctx, uint32_t domid, libxl_device_nic *nic); +int libxl_device_nic_remove(libxl_ctx *ctx, uint32_t domid, + libxl_device_nic *nic, + const libxl_asyncop_how *ao_how); int libxl_device_nic_destroy(libxl_ctx *ctx, uint32_t domid, libxl_device_nic *nic); libxl_device_nic *libxl_device_nic_list(libxl_ctx *ctx, uint32_t domid, int *num); @@ -501,13 +505,17 @@ /* Keyboard */ int libxl_device_vkb_init(libxl_ctx *ctx, libxl_device_vkb *vkb); int libxl_device_vkb_add(libxl_ctx *ctx, uint32_t domid, libxl_device_vkb *vkb); -int libxl_device_vkb_remove(libxl_ctx *ctx, uint32_t domid, libxl_device_vkb *vkb); +int libxl_device_vkb_remove(libxl_ctx *ctx, uint32_t domid, + libxl_device_vkb *vkb, + const libxl_asyncop_how *ao_how); int libxl_device_vkb_destroy(libxl_ctx *ctx, uint32_t domid, libxl_device_vkb *vkb); /* Framebuffer */ int libxl_device_vfb_init(libxl_ctx *ctx, libxl_device_vfb *vfb); int libxl_device_vfb_add(libxl_ctx *ctx, uint32_t domid, libxl_device_vfb *vfb); -int libxl_device_vfb_remove(libxl_ctx *ctx, uint32_t domid, libxl_device_vfb *vfb); +int libxl_device_vfb_remove(libxl_ctx *ctx, uint32_t domid, + libxl_device_vfb *vfb, + const libxl_asyncop_how *ao_how); int libxl_device_vfb_destroy(libxl_ctx *ctx, uint32_t domid, libxl_device_vfb *vfb); /* PCI Passthrough */ diff -r 0fc994845796 -r 47ea714a4e27 tools/libxl/libxl_device.c --- a/tools/libxl/libxl_device.c Fri Jan 27 17:01:25 2012 +0000 +++ b/tools/libxl/libxl_device.c Fri Jan 27 17:01:26 2012 +0000 @@ -356,85 +356,36 @@ return -1; } -/* - * Returns 0 if a device is removed, ERROR_* if an error - * or timeout occurred. - */ -int libxl__wait_for_device_state(libxl__gc *gc, struct timeval *tv, - XenbusState state, - libxl__device_state_handler handler) -{ - libxl_ctx *ctx = libxl__gc_owner(gc); - int nfds, rc; - unsigned int n; - fd_set rfds; - char **l1 = NULL; -start: - rc = 1; - nfds = xs_fileno(ctx->xsh) + 1; - FD_ZERO(&rfds); - FD_SET(xs_fileno(ctx->xsh), &rfds); - switch (select(nfds, &rfds, NULL, NULL, tv)) { - case -1: - if (errno == EINTR) - goto start; - rc = ERROR_FAIL; - break; - case 0: - rc = ERROR_TIMEDOUT; - break; - default: - l1 = xs_read_watch(ctx->xsh, &n); - if (l1 != NULL) { - char *sstate = libxl__xs_read(gc, XBT_NULL, - l1[XS_WATCH_PATH]); - if (!sstate || atoi(sstate) == state) { - /* Call handler function if present */ - if (handler) - rc = handler(gc, l1, sstate); - } else { - /* State is different than expected, continue waiting... */ - goto start; - } - free(l1); - } else { - rc = ERROR_FAIL; - } - break; - } - return rc; +typedef struct { + libxl__ao *ao; + libxl__ev_devstate ds; +} libxl__ao_device_remove; + +static void device_remove_cleanup(libxl__gc *gc, + libxl__ao_device_remove *aorm) { + if (!aorm) return; + libxl__ev_devstate_cancel(gc, &aorm->ds); } -/* - * Handler function for device destruction to be passed to - * libxl__wait_for_device_state - */ -static int destroy_device(libxl__gc *gc, char **l1, char *state) -{ - libxl_ctx *ctx = libxl__gc_owner(gc); - - xs_unwatch(ctx->xsh, l1[0], l1[1]); - xs_rm(ctx->xsh, XBT_NULL, l1[XS_WATCH_TOKEN]); - LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, - "Destroyed device backend at %s", - l1[XS_WATCH_TOKEN]); - - return 0; +static void device_remove_callback(libxl__egc *egc, libxl__ev_devstate *ds, + int rc) { + libxl__ao_device_remove *aorm = CONTAINER_OF(ds, *aorm, ds); + libxl__gc *gc = &aorm->ao->gc; + libxl__ao_complete(egc, aorm->ao, rc); + device_remove_cleanup(gc, aorm); } -/* - * Returns 0 (device already destroyed) or 1 (caller must - * wait_for_dev_destroy) on success, ERROR_* on fail. - */ -int libxl__device_remove(libxl__gc *gc, libxl__device *dev, int wait) +int libxl__initiate_device_remove(libxl__ao *ao, libxl__device *dev) { + AO_GC; libxl_ctx *ctx = libxl__gc_owner(gc); xs_transaction_t t; char *be_path = libxl__device_backend_path(gc, dev); char *state_path = libxl__sprintf(gc, "%s/state", be_path); char *state = libxl__xs_read(gc, XBT_NULL, state_path); int rc = 0; + libxl__ao_device_remove *aorm = 0; if (!state) goto out; @@ -457,23 +408,21 @@ } } - xs_watch(ctx->xsh, state_path, be_path); libxl__device_destroy_tapdisk(gc, be_path); - if (wait) { - struct timeval tv; - tv.tv_sec = LIBXL_DESTROY_TIMEOUT; - tv.tv_usec = 0; - rc = libxl__wait_for_device_state(gc, &tv, XenbusStateClosed, - destroy_device); - if (rc < 0) /* an error or timeout occurred, clear watches */ - xs_unwatch(ctx->xsh, state_path, be_path); - xs_rm(ctx->xsh, XBT_NULL, libxl__device_frontend_path(gc, dev)); - } else { - rc = 1; /* Caller must wait_for_dev_destroy */ - } + aorm = libxl__zalloc(gc, sizeof(*aorm)); + aorm->ao = ao; + libxl__ev_devstate_init(&aorm->ds); -out: + rc = libxl__ev_devstate_wait(gc, &aorm->ds, device_remove_callback, + state_path, XenbusStateClosed, + LIBXL_DESTROY_TIMEOUT * 1000); + if (rc) goto out; + + return 0; + + out: + device_remove_cleanup(gc, aorm); return rc; } diff -r 0fc994845796 -r 47ea714a4e27 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri Jan 27 17:01:25 2012 +0000 +++ b/tools/libxl/libxl_internal.h Fri Jan 27 17:01:26 2012 +0000 @@ -655,35 +655,15 @@ _hidden char *libxl__device_frontend_path(libxl__gc *gc, libxl__device *device); _hidden int libxl__parse_backend_path(libxl__gc *gc, const char *path, libxl__device *dev); -_hidden int libxl__device_remove(libxl__gc *gc, libxl__device *dev, int wait); _hidden int libxl__device_destroy(libxl__gc *gc, libxl__device *dev); _hidden int libxl__devices_destroy(libxl__gc *gc, uint32_t domid); _hidden int libxl__wait_for_backend(libxl__gc *gc, char *be_path, char *state); -/* Handler for the libxl__wait_for_device_state callback */ -/* - * libxl__device_state_handler - Handler for the libxl__wait_for_device_state - * gc: allocation pool - * l1: array containing the path and token - * state: string that contains the state of the device - * - * Returns 0 on success, and < 0 on error. - */ -typedef int libxl__device_state_handler(libxl__gc *gc, char **l1, char *state); - -/* - * libxl__wait_for_device_state - waits a given time for a device to - * reach a given state - * gc: allocation pool - * tv: timeval struct containing the maximum time to wait - * state: state to wait for (check xen/io/xenbus.h) - * handler: callback function to execute when state is reached - * - * Returns 0 on success, and < 0 on error. - */ -_hidden int libxl__wait_for_device_state(libxl__gc *gc, struct timeval *tv, - XenbusState state, - libxl__device_state_handler handler); +/* Arranges that dev will be removed from its guest. When + * this is done, the ao will be completed. An error + * return from libxl__initiate_device_remove means that the ao + * will _not_ be completed and the caller must do so. */ +_hidden int libxl__initiate_device_remove(libxl__ao*, libxl__device *dev); /* * libxl__ev_devstate - waits a given time for a device to diff -r 0fc994845796 -r 47ea714a4e27 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Fri Jan 27 17:01:25 2012 +0000 +++ b/tools/libxl/xl_cmdimpl.c Fri Jan 27 17:01:26 2012 +0000 @@ -4712,7 +4712,7 @@ return 1; } } - if (libxl_device_nic_remove(ctx, domid, &nic)) { + if (libxl_device_nic_remove(ctx, domid, &nic, 0)) { fprintf(stderr, "libxl_device_nic_del failed.\n"); return 1; } @@ -4807,7 +4807,7 @@ fprintf(stderr, "Error: Device %s not connected.\n", argv[optind+1]); return 1; } - if (libxl_device_disk_remove(ctx, domid, &disk)) { + if (libxl_device_disk_remove(ctx, domid, &disk, 0)) { fprintf(stderr, "libxl_device_disk_remove failed.\n"); } return 0; diff -r 0fc994845796 -r 47ea714a4e27 tools/ocaml/libs/xl/xenlight_stubs.c --- a/tools/ocaml/libs/xl/xenlight_stubs.c Fri Jan 27 17:01:25 2012 +0000 +++ b/tools/ocaml/libs/xl/xenlight_stubs.c Fri Jan 27 17:01:26 2012 +0000 @@ -247,7 +247,7 @@ device_disk_val(&gc, &lg, &c_info, info); INIT_CTX(); - ret = libxl_device_disk_remove(ctx, Int_val(domid), &c_info); + ret = libxl_device_disk_remove(ctx, Int_val(domid), &c_info, 0); if (ret != 0) failwith_xl("disk_del", &lg); FREE_CTX(); @@ -281,7 +281,7 @@ device_nic_val(&gc, &lg, &c_info, info); INIT_CTX(); - ret = libxl_device_nic_remove(ctx, Int_val(domid), &c_info); + ret = libxl_device_nic_remove(ctx, Int_val(domid), &c_info, 0); if (ret != 0) failwith_xl("nic_del", &lg); FREE_CTX(); @@ -316,7 +316,7 @@ device_vkb_val(&gc, &lg, &c_info, info); INIT_CTX(); - ret = libxl_device_vkb_remove(ctx, Int_val(domid), &c_info); + ret = libxl_device_vkb_remove(ctx, Int_val(domid), &c_info, 0); if (ret != 0) failwith_xl("vkb_clean_shutdown", &lg); FREE_CTX(); @@ -370,7 +370,7 @@ device_vfb_val(&gc, &lg, &c_info, info); INIT_CTX(); - ret = libxl_device_vfb_remove(ctx, Int_val(domid), &c_info); + ret = libxl_device_vfb_remove(ctx, Int_val(domid), &c_info, 0); if (ret != 0) failwith_xl("vfb_clean_shutdown", &lg); FREE_CTX(); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:56:03 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:56: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 1RtR6w-0006NC-0a; Fri, 03 Feb 2012 21:56:02 +0000 Received: from mail174.messagelabs.com ([85.158.138.51]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6u-0006JY-4S for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:00 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-174.messagelabs.com!1328306152!11910338!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1458 invoked from network); 3 Feb 2012 21:55:53 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 3 Feb 2012 21:55:53 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6l-0001iI-Uz for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR6l-0002Iv-Dp for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:51 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:55:50 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: Convert to asynchronous: device removal X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Jackson # Date 1327683686 0 # Node ID 47ea714a4e27ffe0dbcbfc8ace7bb4e189390206 # Parent 0fc9948457962514ab9a9a4bb9ed0bf3695dee1b libxl: Convert to asynchronous: device removal Convert libxl_FOO_device_remove, and the function which does the bulk of the work, libxl__device_remove, to the new async ops scheme. Adjust all callers. Also remove libxl__wait_for_device_state which is now obsolete. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 0fc994845796 -r 47ea714a4e27 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Fri Jan 27 17:01:25 2012 +0000 +++ b/tools/libxl/libxl.c Fri Jan 27 17:01:26 2012 +0000 @@ -1311,19 +1311,23 @@ } int libxl_device_disk_remove(libxl_ctx *ctx, uint32_t domid, - libxl_device_disk *disk) + libxl_device_disk *disk, + const libxl_asyncop_how *ao_how) { - GC_INIT(ctx); + AO_CREATE(ctx, domid, ao_how); libxl__device device; int rc; rc = libxl__device_from_disk(gc, domid, disk, &device); if (rc != 0) goto out; - rc = libxl__device_remove(gc, &device, 1); + rc = libxl__initiate_device_remove(ao, &device); + if (rc) goto out; + + return AO_INPROGRESS; + out: - GC_FREE; - return rc; + return AO_ABORT(rc); } int libxl_device_disk_destroy(libxl_ctx *ctx, uint32_t domid, @@ -1537,11 +1541,11 @@ ret = 0; - libxl_device_disk_remove(ctx, domid, disks + i); + libxl_device_disk_remove(ctx, domid, disks + i, 0); libxl_device_disk_add(ctx, domid, disk); stubdomid = libxl_get_stubdom_id(ctx, domid); if (stubdomid) { - libxl_device_disk_remove(ctx, stubdomid, disks + i); + libxl_device_disk_remove(ctx, stubdomid, disks + i, 0); libxl_device_disk_add(ctx, stubdomid, disk); } out: @@ -1760,19 +1764,23 @@ } int libxl_device_nic_remove(libxl_ctx *ctx, uint32_t domid, - libxl_device_nic *nic) + libxl_device_nic *nic, + const libxl_asyncop_how *ao_how) { - GC_INIT(ctx); + AO_CREATE(ctx, domid, ao_how); libxl__device device; int rc; rc = libxl__device_from_nic(gc, domid, nic, &device); if (rc != 0) goto out; - rc = libxl__device_remove(gc, &device, 1); + rc = libxl__initiate_device_remove(ao, &device); + if (rc) goto out; + + return AO_INPROGRESS; + out: - GC_FREE; - return rc; + return AO_ABORT(rc); } int libxl_device_nic_destroy(libxl_ctx *ctx, uint32_t domid, @@ -2100,19 +2108,23 @@ } int libxl_device_vkb_remove(libxl_ctx *ctx, uint32_t domid, - libxl_device_vkb *vkb) + libxl_device_vkb *vkb, + const libxl_asyncop_how *ao_how) { - GC_INIT(ctx); + AO_CREATE(ctx, domid, ao_how); libxl__device device; int rc; rc = libxl__device_from_vkb(gc, domid, vkb, &device); if (rc != 0) goto out; - rc = libxl__device_remove(gc, &device, 1); + rc = libxl__initiate_device_remove(ao, &device); + if (rc) goto out; + + return AO_INPROGRESS; + out: - GC_FREE; - return rc; + return AO_ABORT(rc); } int libxl_device_vkb_destroy(libxl_ctx *ctx, uint32_t domid, @@ -2217,19 +2229,23 @@ } int libxl_device_vfb_remove(libxl_ctx *ctx, uint32_t domid, - libxl_device_vfb *vfb) + libxl_device_vfb *vfb, + const libxl_asyncop_how *ao_how) { - GC_INIT(ctx); + AO_CREATE(ctx, domid, ao_how); libxl__device device; int rc; rc = libxl__device_from_vfb(gc, domid, vfb, &device); if (rc != 0) goto out; - rc = libxl__device_remove(gc, &device, 1); + rc = libxl__initiate_device_remove(ao, &device); + if (rc) goto out; + + return AO_INPROGRESS; + out: - GC_FREE; - return rc; + return AO_ABORT(rc); } int libxl_device_vfb_destroy(libxl_ctx *ctx, uint32_t domid, diff -r 0fc994845796 -r 47ea714a4e27 tools/libxl/libxl.h --- a/tools/libxl/libxl.h Fri Jan 27 17:01:25 2012 +0000 +++ b/tools/libxl/libxl.h Fri Jan 27 17:01:26 2012 +0000 @@ -467,7 +467,9 @@ /* Disks */ int libxl_device_disk_init(libxl_ctx *ctx, libxl_device_disk *disk); int libxl_device_disk_add(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk); -int libxl_device_disk_remove(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk); +int libxl_device_disk_remove(libxl_ctx *ctx, uint32_t domid, + libxl_device_disk *disk, + const libxl_asyncop_how *ao_how); int libxl_device_disk_destroy(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk); @@ -491,7 +493,9 @@ /* Network Interfaces */ int libxl_device_nic_init(libxl_ctx *ctx, libxl_device_nic *nic); int libxl_device_nic_add(libxl_ctx *ctx, uint32_t domid, libxl_device_nic *nic); -int libxl_device_nic_remove(libxl_ctx *ctx, uint32_t domid, libxl_device_nic *nic); +int libxl_device_nic_remove(libxl_ctx *ctx, uint32_t domid, + libxl_device_nic *nic, + const libxl_asyncop_how *ao_how); int libxl_device_nic_destroy(libxl_ctx *ctx, uint32_t domid, libxl_device_nic *nic); libxl_device_nic *libxl_device_nic_list(libxl_ctx *ctx, uint32_t domid, int *num); @@ -501,13 +505,17 @@ /* Keyboard */ int libxl_device_vkb_init(libxl_ctx *ctx, libxl_device_vkb *vkb); int libxl_device_vkb_add(libxl_ctx *ctx, uint32_t domid, libxl_device_vkb *vkb); -int libxl_device_vkb_remove(libxl_ctx *ctx, uint32_t domid, libxl_device_vkb *vkb); +int libxl_device_vkb_remove(libxl_ctx *ctx, uint32_t domid, + libxl_device_vkb *vkb, + const libxl_asyncop_how *ao_how); int libxl_device_vkb_destroy(libxl_ctx *ctx, uint32_t domid, libxl_device_vkb *vkb); /* Framebuffer */ int libxl_device_vfb_init(libxl_ctx *ctx, libxl_device_vfb *vfb); int libxl_device_vfb_add(libxl_ctx *ctx, uint32_t domid, libxl_device_vfb *vfb); -int libxl_device_vfb_remove(libxl_ctx *ctx, uint32_t domid, libxl_device_vfb *vfb); +int libxl_device_vfb_remove(libxl_ctx *ctx, uint32_t domid, + libxl_device_vfb *vfb, + const libxl_asyncop_how *ao_how); int libxl_device_vfb_destroy(libxl_ctx *ctx, uint32_t domid, libxl_device_vfb *vfb); /* PCI Passthrough */ diff -r 0fc994845796 -r 47ea714a4e27 tools/libxl/libxl_device.c --- a/tools/libxl/libxl_device.c Fri Jan 27 17:01:25 2012 +0000 +++ b/tools/libxl/libxl_device.c Fri Jan 27 17:01:26 2012 +0000 @@ -356,85 +356,36 @@ return -1; } -/* - * Returns 0 if a device is removed, ERROR_* if an error - * or timeout occurred. - */ -int libxl__wait_for_device_state(libxl__gc *gc, struct timeval *tv, - XenbusState state, - libxl__device_state_handler handler) -{ - libxl_ctx *ctx = libxl__gc_owner(gc); - int nfds, rc; - unsigned int n; - fd_set rfds; - char **l1 = NULL; -start: - rc = 1; - nfds = xs_fileno(ctx->xsh) + 1; - FD_ZERO(&rfds); - FD_SET(xs_fileno(ctx->xsh), &rfds); - switch (select(nfds, &rfds, NULL, NULL, tv)) { - case -1: - if (errno == EINTR) - goto start; - rc = ERROR_FAIL; - break; - case 0: - rc = ERROR_TIMEDOUT; - break; - default: - l1 = xs_read_watch(ctx->xsh, &n); - if (l1 != NULL) { - char *sstate = libxl__xs_read(gc, XBT_NULL, - l1[XS_WATCH_PATH]); - if (!sstate || atoi(sstate) == state) { - /* Call handler function if present */ - if (handler) - rc = handler(gc, l1, sstate); - } else { - /* State is different than expected, continue waiting... */ - goto start; - } - free(l1); - } else { - rc = ERROR_FAIL; - } - break; - } - return rc; +typedef struct { + libxl__ao *ao; + libxl__ev_devstate ds; +} libxl__ao_device_remove; + +static void device_remove_cleanup(libxl__gc *gc, + libxl__ao_device_remove *aorm) { + if (!aorm) return; + libxl__ev_devstate_cancel(gc, &aorm->ds); } -/* - * Handler function for device destruction to be passed to - * libxl__wait_for_device_state - */ -static int destroy_device(libxl__gc *gc, char **l1, char *state) -{ - libxl_ctx *ctx = libxl__gc_owner(gc); - - xs_unwatch(ctx->xsh, l1[0], l1[1]); - xs_rm(ctx->xsh, XBT_NULL, l1[XS_WATCH_TOKEN]); - LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, - "Destroyed device backend at %s", - l1[XS_WATCH_TOKEN]); - - return 0; +static void device_remove_callback(libxl__egc *egc, libxl__ev_devstate *ds, + int rc) { + libxl__ao_device_remove *aorm = CONTAINER_OF(ds, *aorm, ds); + libxl__gc *gc = &aorm->ao->gc; + libxl__ao_complete(egc, aorm->ao, rc); + device_remove_cleanup(gc, aorm); } -/* - * Returns 0 (device already destroyed) or 1 (caller must - * wait_for_dev_destroy) on success, ERROR_* on fail. - */ -int libxl__device_remove(libxl__gc *gc, libxl__device *dev, int wait) +int libxl__initiate_device_remove(libxl__ao *ao, libxl__device *dev) { + AO_GC; libxl_ctx *ctx = libxl__gc_owner(gc); xs_transaction_t t; char *be_path = libxl__device_backend_path(gc, dev); char *state_path = libxl__sprintf(gc, "%s/state", be_path); char *state = libxl__xs_read(gc, XBT_NULL, state_path); int rc = 0; + libxl__ao_device_remove *aorm = 0; if (!state) goto out; @@ -457,23 +408,21 @@ } } - xs_watch(ctx->xsh, state_path, be_path); libxl__device_destroy_tapdisk(gc, be_path); - if (wait) { - struct timeval tv; - tv.tv_sec = LIBXL_DESTROY_TIMEOUT; - tv.tv_usec = 0; - rc = libxl__wait_for_device_state(gc, &tv, XenbusStateClosed, - destroy_device); - if (rc < 0) /* an error or timeout occurred, clear watches */ - xs_unwatch(ctx->xsh, state_path, be_path); - xs_rm(ctx->xsh, XBT_NULL, libxl__device_frontend_path(gc, dev)); - } else { - rc = 1; /* Caller must wait_for_dev_destroy */ - } + aorm = libxl__zalloc(gc, sizeof(*aorm)); + aorm->ao = ao; + libxl__ev_devstate_init(&aorm->ds); -out: + rc = libxl__ev_devstate_wait(gc, &aorm->ds, device_remove_callback, + state_path, XenbusStateClosed, + LIBXL_DESTROY_TIMEOUT * 1000); + if (rc) goto out; + + return 0; + + out: + device_remove_cleanup(gc, aorm); return rc; } diff -r 0fc994845796 -r 47ea714a4e27 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri Jan 27 17:01:25 2012 +0000 +++ b/tools/libxl/libxl_internal.h Fri Jan 27 17:01:26 2012 +0000 @@ -655,35 +655,15 @@ _hidden char *libxl__device_frontend_path(libxl__gc *gc, libxl__device *device); _hidden int libxl__parse_backend_path(libxl__gc *gc, const char *path, libxl__device *dev); -_hidden int libxl__device_remove(libxl__gc *gc, libxl__device *dev, int wait); _hidden int libxl__device_destroy(libxl__gc *gc, libxl__device *dev); _hidden int libxl__devices_destroy(libxl__gc *gc, uint32_t domid); _hidden int libxl__wait_for_backend(libxl__gc *gc, char *be_path, char *state); -/* Handler for the libxl__wait_for_device_state callback */ -/* - * libxl__device_state_handler - Handler for the libxl__wait_for_device_state - * gc: allocation pool - * l1: array containing the path and token - * state: string that contains the state of the device - * - * Returns 0 on success, and < 0 on error. - */ -typedef int libxl__device_state_handler(libxl__gc *gc, char **l1, char *state); - -/* - * libxl__wait_for_device_state - waits a given time for a device to - * reach a given state - * gc: allocation pool - * tv: timeval struct containing the maximum time to wait - * state: state to wait for (check xen/io/xenbus.h) - * handler: callback function to execute when state is reached - * - * Returns 0 on success, and < 0 on error. - */ -_hidden int libxl__wait_for_device_state(libxl__gc *gc, struct timeval *tv, - XenbusState state, - libxl__device_state_handler handler); +/* Arranges that dev will be removed from its guest. When + * this is done, the ao will be completed. An error + * return from libxl__initiate_device_remove means that the ao + * will _not_ be completed and the caller must do so. */ +_hidden int libxl__initiate_device_remove(libxl__ao*, libxl__device *dev); /* * libxl__ev_devstate - waits a given time for a device to diff -r 0fc994845796 -r 47ea714a4e27 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Fri Jan 27 17:01:25 2012 +0000 +++ b/tools/libxl/xl_cmdimpl.c Fri Jan 27 17:01:26 2012 +0000 @@ -4712,7 +4712,7 @@ return 1; } } - if (libxl_device_nic_remove(ctx, domid, &nic)) { + if (libxl_device_nic_remove(ctx, domid, &nic, 0)) { fprintf(stderr, "libxl_device_nic_del failed.\n"); return 1; } @@ -4807,7 +4807,7 @@ fprintf(stderr, "Error: Device %s not connected.\n", argv[optind+1]); return 1; } - if (libxl_device_disk_remove(ctx, domid, &disk)) { + if (libxl_device_disk_remove(ctx, domid, &disk, 0)) { fprintf(stderr, "libxl_device_disk_remove failed.\n"); } return 0; diff -r 0fc994845796 -r 47ea714a4e27 tools/ocaml/libs/xl/xenlight_stubs.c --- a/tools/ocaml/libs/xl/xenlight_stubs.c Fri Jan 27 17:01:25 2012 +0000 +++ b/tools/ocaml/libs/xl/xenlight_stubs.c Fri Jan 27 17:01:26 2012 +0000 @@ -247,7 +247,7 @@ device_disk_val(&gc, &lg, &c_info, info); INIT_CTX(); - ret = libxl_device_disk_remove(ctx, Int_val(domid), &c_info); + ret = libxl_device_disk_remove(ctx, Int_val(domid), &c_info, 0); if (ret != 0) failwith_xl("disk_del", &lg); FREE_CTX(); @@ -281,7 +281,7 @@ device_nic_val(&gc, &lg, &c_info, info); INIT_CTX(); - ret = libxl_device_nic_remove(ctx, Int_val(domid), &c_info); + ret = libxl_device_nic_remove(ctx, Int_val(domid), &c_info, 0); if (ret != 0) failwith_xl("nic_del", &lg); FREE_CTX(); @@ -316,7 +316,7 @@ device_vkb_val(&gc, &lg, &c_info, info); INIT_CTX(); - ret = libxl_device_vkb_remove(ctx, Int_val(domid), &c_info); + ret = libxl_device_vkb_remove(ctx, Int_val(domid), &c_info, 0); if (ret != 0) failwith_xl("vkb_clean_shutdown", &lg); FREE_CTX(); @@ -370,7 +370,7 @@ device_vfb_val(&gc, &lg, &c_info, info); INIT_CTX(); - ret = libxl_device_vfb_remove(ctx, Int_val(domid), &c_info); + ret = libxl_device_vfb_remove(ctx, Int_val(domid), &c_info, 0); if (ret != 0) failwith_xl("vfb_clean_shutdown", &lg); FREE_CTX(); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:56:03 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:56: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 1RtR6x-0006Ns-6S; Fri, 03 Feb 2012 21:56:03 +0000 Received: from mail174.messagelabs.com ([85.158.138.51]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6w-0006KU-6k for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:02 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-174.messagelabs.com!1328306154!6783297!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12295 invoked from network); 3 Feb 2012 21:55:56 -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; 3 Feb 2012 21:55:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6o-0001iT-NE for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR6o-0002KA-2e for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:54 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:55:53 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: fix mutex initialization X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Roger Pau Monne # Date 1327686494 0 # Node ID 235ac9bf133826e8089949dc7a764ca70474ae91 # Parent 8a7e07afe3ed96585ccec65c37acc581c0522a48 libxl: fix mutex initialization The macro PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP is not defined on NetBSD, so define mutex attributes manually. Signed-off-by: Roger Pau Monne Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 8a7e07afe3ed -r 235ac9bf1338 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Fri Jan 27 17:09:04 2012 +0000 +++ b/tools/libxl/libxl.c Fri Jan 27 17:48:14 2012 +0000 @@ -26,7 +26,6 @@ { libxl_ctx *ctx = NULL; struct stat stat_buf; - const pthread_mutex_t mutex_value = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; int rc; if (version != LIBXL_VERSION) { rc = ERROR_VERSION; goto out; } @@ -40,10 +39,10 @@ memset(ctx, 0, sizeof(libxl_ctx)); ctx->lg = lg; - /* This somewhat convoluted approach is needed because - * PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP is defined to be valid - * only as an initialiser, not as an expression. */ - memcpy(&ctx->lock, &mutex_value, sizeof(ctx->lock)); + if (libxl__init_recursive_mutex(ctx, &ctx->lock) < 0) { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "Failed to initialize mutex"); + return ERROR_FAIL; + } LIBXL_TAILQ_INIT(&ctx->occurred); diff -r 8a7e07afe3ed -r 235ac9bf1338 tools/libxl/libxl_internal.c --- a/tools/libxl/libxl_internal.c Fri Jan 27 17:09:04 2012 +0000 +++ b/tools/libxl/libxl_internal.c Fri Jan 27 17:48:14 2012 +0000 @@ -296,6 +296,33 @@ return 0; } +_hidden int libxl__init_recursive_mutex(libxl_ctx *ctx, pthread_mutex_t *lock) +{ + pthread_mutexattr_t attr; + int rc = 0; + + if (pthread_mutexattr_init(&attr) != 0) { + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, + "Failed to init mutex attributes\n"); + return ERROR_FAIL; + } + if (pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE) != 0) { + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, + "Failed to set mutex attributes\n"); + rc = ERROR_FAIL; + goto out; + } + if (pthread_mutex_init(lock, &attr) != 0) { + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, + "Failed to init mutex\n"); + rc = ERROR_FAIL; + goto out; + } +out: + pthread_mutexattr_destroy(&attr); + return rc; +} + libxl_device_model_version libxl__device_model_version_running(libxl__gc *gc, uint32_t domid) { diff -r 8a7e07afe3ed -r 235ac9bf1338 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri Jan 27 17:09:04 2012 +0000 +++ b/tools/libxl/libxl_internal.h Fri Jan 27 17:48:14 2012 +0000 @@ -974,6 +974,8 @@ _hidden int libxl__parse_mac(const char *s, libxl_mac mac); /* compare mac address @a and @b. 0 if the same, -ve if ab */ _hidden int libxl__compare_macs(libxl_mac *a, libxl_mac *b); +/* init a recursive mutex */ +_hidden int libxl__init_recursive_mutex(libxl_ctx *ctx, pthread_mutex_t *lock); _hidden int libxl__gettimeofday(libxl__gc *gc, struct timeval *now_r); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:56:03 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:56: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 1RtR6x-0006Ns-6S; Fri, 03 Feb 2012 21:56:03 +0000 Received: from mail174.messagelabs.com ([85.158.138.51]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6w-0006KU-6k for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:02 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-174.messagelabs.com!1328306154!6783297!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12295 invoked from network); 3 Feb 2012 21:55:56 -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; 3 Feb 2012 21:55:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6o-0001iT-NE for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR6o-0002KA-2e for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:54 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:55:53 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: fix mutex initialization X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Roger Pau Monne # Date 1327686494 0 # Node ID 235ac9bf133826e8089949dc7a764ca70474ae91 # Parent 8a7e07afe3ed96585ccec65c37acc581c0522a48 libxl: fix mutex initialization The macro PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP is not defined on NetBSD, so define mutex attributes manually. Signed-off-by: Roger Pau Monne Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 8a7e07afe3ed -r 235ac9bf1338 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Fri Jan 27 17:09:04 2012 +0000 +++ b/tools/libxl/libxl.c Fri Jan 27 17:48:14 2012 +0000 @@ -26,7 +26,6 @@ { libxl_ctx *ctx = NULL; struct stat stat_buf; - const pthread_mutex_t mutex_value = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; int rc; if (version != LIBXL_VERSION) { rc = ERROR_VERSION; goto out; } @@ -40,10 +39,10 @@ memset(ctx, 0, sizeof(libxl_ctx)); ctx->lg = lg; - /* This somewhat convoluted approach is needed because - * PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP is defined to be valid - * only as an initialiser, not as an expression. */ - memcpy(&ctx->lock, &mutex_value, sizeof(ctx->lock)); + if (libxl__init_recursive_mutex(ctx, &ctx->lock) < 0) { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "Failed to initialize mutex"); + return ERROR_FAIL; + } LIBXL_TAILQ_INIT(&ctx->occurred); diff -r 8a7e07afe3ed -r 235ac9bf1338 tools/libxl/libxl_internal.c --- a/tools/libxl/libxl_internal.c Fri Jan 27 17:09:04 2012 +0000 +++ b/tools/libxl/libxl_internal.c Fri Jan 27 17:48:14 2012 +0000 @@ -296,6 +296,33 @@ return 0; } +_hidden int libxl__init_recursive_mutex(libxl_ctx *ctx, pthread_mutex_t *lock) +{ + pthread_mutexattr_t attr; + int rc = 0; + + if (pthread_mutexattr_init(&attr) != 0) { + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, + "Failed to init mutex attributes\n"); + return ERROR_FAIL; + } + if (pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE) != 0) { + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, + "Failed to set mutex attributes\n"); + rc = ERROR_FAIL; + goto out; + } + if (pthread_mutex_init(lock, &attr) != 0) { + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, + "Failed to init mutex\n"); + rc = ERROR_FAIL; + goto out; + } +out: + pthread_mutexattr_destroy(&attr); + return rc; +} + libxl_device_model_version libxl__device_model_version_running(libxl__gc *gc, uint32_t domid) { diff -r 8a7e07afe3ed -r 235ac9bf1338 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri Jan 27 17:09:04 2012 +0000 +++ b/tools/libxl/libxl_internal.h Fri Jan 27 17:48:14 2012 +0000 @@ -974,6 +974,8 @@ _hidden int libxl__parse_mac(const char *s, libxl_mac mac); /* compare mac address @a and @b. 0 if the same, -ve if ab */ _hidden int libxl__compare_macs(libxl_mac *a, libxl_mac *b); +/* init a recursive mutex */ +_hidden int libxl__init_recursive_mutex(libxl_ctx *ctx, pthread_mutex_t *lock); _hidden int libxl__gettimeofday(libxl__gc *gc, struct timeval *now_r); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:56:05 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:56: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 1RtR6x-0006Nl-3d; Fri, 03 Feb 2012 21:56:03 +0000 Received: from mail174.messagelabs.com ([85.158.138.51]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6v-0006KC-3B for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:01 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-174.messagelabs.com!1328306153!6783294!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12275 invoked from network); 3 Feb 2012 21:55:54 -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; 3 Feb 2012 21:55:54 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6n-0001iL-Kk for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:53 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR6m-0002JR-AM for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:53 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:55:51 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: fix upstream qemu binary name to what we actually install X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1327684144 0 # Node ID 8a7e07afe3ed96585ccec65c37acc581c0522a48 # Parent 47ea714a4e27ffe0dbcbfc8ace7bb4e189390206 libxl: fix upstream qemu binary name to what we actually install Binary is always qemu-system-i386 even for a 64 bit build. Signed-off-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 47ea714a4e27 -r 8a7e07afe3ed tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Fri Jan 27 17:01:26 2012 +0000 +++ b/tools/libxl/libxl_dm.c Fri Jan 27 17:09:04 2012 +0000 @@ -50,7 +50,7 @@ dm = libxl__abs_path(gc, "qemu-dm", libxl_libexec_path()); break; case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: - dm = libxl__abs_path(gc, "qemu", libxl_libexec_path()); + dm = libxl__abs_path(gc, "qemu-system-i386", libxl_libexec_path()); break; default: LIBXL__LOG(ctx, LIBXL__LOG_ERROR, _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:56:05 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:56: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 1RtR6x-0006Nl-3d; Fri, 03 Feb 2012 21:56:03 +0000 Received: from mail174.messagelabs.com ([85.158.138.51]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6v-0006KC-3B for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:01 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-174.messagelabs.com!1328306153!6783294!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12275 invoked from network); 3 Feb 2012 21:55:54 -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; 3 Feb 2012 21:55:54 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6n-0001iL-Kk for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:53 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR6m-0002JR-AM for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:53 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:55:51 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: fix upstream qemu binary name to what we actually install X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1327684144 0 # Node ID 8a7e07afe3ed96585ccec65c37acc581c0522a48 # Parent 47ea714a4e27ffe0dbcbfc8ace7bb4e189390206 libxl: fix upstream qemu binary name to what we actually install Binary is always qemu-system-i386 even for a 64 bit build. Signed-off-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 47ea714a4e27 -r 8a7e07afe3ed tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Fri Jan 27 17:01:26 2012 +0000 +++ b/tools/libxl/libxl_dm.c Fri Jan 27 17:09:04 2012 +0000 @@ -50,7 +50,7 @@ dm = libxl__abs_path(gc, "qemu-dm", libxl_libexec_path()); break; case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: - dm = libxl__abs_path(gc, "qemu", libxl_libexec_path()); + dm = libxl__abs_path(gc, "qemu-system-i386", libxl_libexec_path()); break; default: LIBXL__LOG(ctx, LIBXL__LOG_ERROR, _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:56:09 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:56: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 1RtR71-0006Qi-B8; Fri, 03 Feb 2012 21:56:07 +0000 Received: from mail182.messagelabs.com ([85.158.139.83]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6z-0006MB-UO for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:06 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-182.messagelabs.com!1328306158!13017829!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.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7876 invoked from network); 3 Feb 2012 21:55:59 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 3 Feb 2012 21:55:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6r-0001ib-U0 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR6p-0002Kj-J0 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:57 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:55:54 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl_qmp: fix qmp_next to cope with multiple lines read in a single buffer X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Stefano Stabellini # Date 1327687100 0 # Node ID 502e0214bdb29ab5c6c8f2764e06604cc18e2635 # Parent 235ac9bf133826e8089949dc7a764ca70474ae91 libxl_qmp: fix qmp_next to cope with multiple lines read in a single buffer qmp_next doesn't handle multiple lines read together in a single buffer correctly at the moment. This patch fixes it. Signed-off-by: Stefano Stabellini Committed-by: Ian Jackson --- diff -r 235ac9bf1338 -r 502e0214bdb2 tools/libxl/libxl_qmp.c --- a/tools/libxl/libxl_qmp.c Fri Jan 27 17:48:14 2012 +0000 +++ b/tools/libxl/libxl_qmp.c Fri Jan 27 17:58:20 2012 +0000 @@ -408,17 +408,18 @@ char *end = NULL; if (incomplete) { size_t current_pos = s - incomplete; + incomplete = libxl__realloc(gc, incomplete, + incomplete_size + rd); + strncat(incomplete + incomplete_size, qmp->buffer, rd); + s = incomplete + current_pos; incomplete_size += rd; - incomplete = libxl__realloc(gc, incomplete, - incomplete_size + 1); - incomplete = strncat(incomplete, qmp->buffer, rd); - s = incomplete + current_pos; s_end = incomplete + incomplete_size; } else { incomplete = libxl__strndup(gc, qmp->buffer, rd); incomplete_size = rd; s = incomplete; s_end = s + rd; + rd = 0; } end = strstr(s, "\r\n"); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:56:09 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:56: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 1RtR71-0006Qi-B8; Fri, 03 Feb 2012 21:56:07 +0000 Received: from mail182.messagelabs.com ([85.158.139.83]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6z-0006MB-UO for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:06 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-182.messagelabs.com!1328306158!13017829!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.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7876 invoked from network); 3 Feb 2012 21:55:59 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 3 Feb 2012 21:55:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6r-0001ib-U0 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR6p-0002Kj-J0 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:55:57 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:55:54 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl_qmp: fix qmp_next to cope with multiple lines read in a single buffer X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Stefano Stabellini # Date 1327687100 0 # Node ID 502e0214bdb29ab5c6c8f2764e06604cc18e2635 # Parent 235ac9bf133826e8089949dc7a764ca70474ae91 libxl_qmp: fix qmp_next to cope with multiple lines read in a single buffer qmp_next doesn't handle multiple lines read together in a single buffer correctly at the moment. This patch fixes it. Signed-off-by: Stefano Stabellini Committed-by: Ian Jackson --- diff -r 235ac9bf1338 -r 502e0214bdb2 tools/libxl/libxl_qmp.c --- a/tools/libxl/libxl_qmp.c Fri Jan 27 17:48:14 2012 +0000 +++ b/tools/libxl/libxl_qmp.c Fri Jan 27 17:58:20 2012 +0000 @@ -408,17 +408,18 @@ char *end = NULL; if (incomplete) { size_t current_pos = s - incomplete; + incomplete = libxl__realloc(gc, incomplete, + incomplete_size + rd); + strncat(incomplete + incomplete_size, qmp->buffer, rd); + s = incomplete + current_pos; incomplete_size += rd; - incomplete = libxl__realloc(gc, incomplete, - incomplete_size + 1); - incomplete = strncat(incomplete, qmp->buffer, rd); - s = incomplete + current_pos; s_end = incomplete + incomplete_size; } else { incomplete = libxl__strndup(gc, qmp->buffer, rd); incomplete_size = rd; s = incomplete; s_end = s + rd; + rd = 0; } end = strstr(s, "\r\n"); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:56:12 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:56: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 1RtR75-0006T8-EI; Fri, 03 Feb 2012 21:56:11 +0000 Received: from mail174.messagelabs.com ([85.158.138.51]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR73-0006P7-L3 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:09 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-174.messagelabs.com!1328306162!6783309!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12455 invoked from network); 3 Feb 2012 21:56:03 -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; 3 Feb 2012 21:56:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6v-0001j9-Sr for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR6v-0002Lp-Ii for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:01 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:55:57 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] tools: memshrtool: tool to test and exercise the sharing subsystem X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Andres Lagar-Cavilla # Date 1327688622 0 # Node ID 8c0ef22c10096bc2afe50a2487e17242bfd21fb4 # Parent 502e0214bdb29ab5c6c8f2764e06604cc18e2635 tools: memshrtool: tool to test and exercise the sharing subsystem This is demo code meant to showcase how to perform sharing operations. It is useful for testing. [ Added appropriate lines to .hgignore and .gitignore -iwj ] Signed-off-by: Adin Scannell Signed-off-by: Andres Lagar-Cavilla Signed-off-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 502e0214bdb2 -r 8c0ef22c1009 .gitignore --- a/.gitignore Fri Jan 27 17:58:20 2012 +0000 +++ b/.gitignore Fri Jan 27 18:23:42 2012 +0000 @@ -210,6 +210,7 @@ tools/tests/regression/installed/* tools/tests/regression/build/* tools/tests/regression/downloads/* +tools/tests/mem-sharing/memshrtool tools/vnet/Make.local tools/vnet/build/* tools/vnet/gc diff -r 502e0214bdb2 -r 8c0ef22c1009 .hgignore --- a/.hgignore Fri Jan 27 17:58:20 2012 +0000 +++ b/.hgignore Fri Jan 27 18:23:42 2012 +0000 @@ -221,6 +221,7 @@ ^tools/tests/regression/build/.*$ ^tools/tests/regression/downloads/.*$ ^tools/tests/xen-access/xen-access$ +^tools/tests/mem-sharing/memshrtool$ ^tools/vnet/Make.local$ ^tools/vnet/build/.*$ ^tools/vnet/gc$ diff -r 502e0214bdb2 -r 8c0ef22c1009 tools/tests/mem-sharing/Makefile --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/tests/mem-sharing/Makefile Fri Jan 27 18:23:42 2012 +0000 @@ -0,0 +1,26 @@ +XEN_ROOT=$(CURDIR)/../../.. +include $(XEN_ROOT)/tools/Rules.mk + +CFLAGS += -Werror + +CFLAGS += $(CFLAGS_libxenctrl) +CFLAGS += $(CFLAGS_xeninclude) + +TARGETS-y := +TARGETS-$(CONFIG_X86) += memshrtool +TARGETS := $(TARGETS-y) + +.PHONY: all +all: build + +.PHONY: build +build: $(TARGETS) + +.PHONY: clean +clean: + $(RM) *.o $(TARGETS) *~ $(DEPS) + +memshrtool: memshrtool.o + $(CC) -o $@ $< $(LDFLAGS) $(LDLIBS_libxenctrl) + +-include $(DEPS) diff -r 502e0214bdb2 -r 8c0ef22c1009 tools/tests/mem-sharing/memshrtool.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/tests/mem-sharing/memshrtool.c Fri Jan 27 18:23:42 2012 +0000 @@ -0,0 +1,165 @@ +/* + * memshrtool.c + * + * Copyright 2011 GridCentric Inc. (Adin Scannell, Andres Lagar-Cavilla) + */ + +#include +#include +#include +#include +#include +#include + +#include "xenctrl.h" + +static int usage(const char* prog) +{ + printf("usage: %s [args...]\n", prog); + printf("where may be:\n"); + printf(" info - Display total sharing info.\n"); + printf(" enable - Enable sharing on a domain.\n"); + printf(" disable - Disable sharing on a domain.\n"); + printf(" nominate - Nominate a page for sharing.\n"); + printf(" share \n"); + printf(" - Share two pages.\n"); + printf(" unshare - Unshare a page by grabbing a writable map.\n"); + printf(" add-to-physmap \n"); + printf(" - Populate a page in a domain with a shared page.\n"); + printf(" debug-gfn - Debug a particular domain and gfn.\n"); + return 1; +} + +#define R(f) do { \ + int rc = f; \ + if ( rc < 0 ) { \ + printf("error executing %s: %s\n", #f, \ + ((errno * -1) == XEN_DOMCTL_MEM_SHARING_C_HANDLE_INVALID) ? \ + "problem with client handle" :\ + ((errno * -1) == XEN_DOMCTL_MEM_SHARING_S_HANDLE_INVALID) ? \ + "problem with source handle" : strerror(errno)); \ + return rc; \ + } \ +} while(0) + +int main(int argc, const char** argv) +{ + const char* cmd = NULL; + xc_interface *xch = xc_interface_open(0, 0, 0); + + if( argc < 2 ) + return usage(argv[0]); + + cmd = argv[1]; + + if( !strcasecmp(cmd, "info") ) + { + if( argc != 2 ) + return usage(argv[0]); + + printf("used = %ld\n", xc_sharing_used_frames(xch)); + printf("freed = %ld\n", xc_sharing_freed_pages(xch)); + } + else if( !strcasecmp(cmd, "enable") ) + { + domid_t domid; + + if( argc != 3 ) + return usage(argv[0]); + + domid = strtol(argv[2], NULL, 0); + R(xc_memshr_control(xch, domid, 1)); + } + else if( !strcasecmp(cmd, "disable") ) + { + domid_t domid; + + if( argc != 3 ) + return usage(argv[0]); + + domid = strtol(argv[2], NULL, 0); + R(xc_memshr_control(xch, domid, 0)); + } + else if( !strcasecmp(cmd, "nominate") ) + { + domid_t domid; + unsigned long gfn; + uint64_t handle; + + if( argc != 4 ) + return usage(argv[0]); + + domid = strtol(argv[2], NULL, 0); + gfn = strtol(argv[3], NULL, 0); + R(xc_memshr_nominate_gfn(xch, domid, gfn, &handle)); + printf("handle = 0x%08llx\n", (unsigned long long) handle); + } + else if( !strcasecmp(cmd, "share") ) + { + domid_t domid; + unsigned long gfn; + uint64_t handle; + domid_t source_domid; + unsigned long source_gfn; + uint64_t source_handle; + + if( argc != 8 ) + return usage(argv[0]); + + domid = strtol(argv[2], NULL, 0); + gfn = strtol(argv[3], NULL, 0); + handle = strtol(argv[4], NULL, 0); + source_domid = strtol(argv[5], NULL, 0); + source_gfn = strtol(argv[6], NULL, 0); + source_handle = strtol(argv[7], NULL, 0); + R(xc_memshr_share_gfns(xch, source_domid, source_gfn, source_handle, domid, gfn, handle)); + } + else if( !strcasecmp(cmd, "unshare") ) + { + domid_t domid; + unsigned long gfn; + void *map; + + if( argc != 4 ) + return usage(argv[0]); + + domid = strtol(argv[2], NULL, 0); + gfn = strtol(argv[3], NULL, 0); + map = xc_map_foreign_range(xch, domid, 4096, PROT_WRITE, gfn); + if( map ) + munmap(map, 4096); + R((int)!map); + } + else if( !strcasecmp(cmd, "add-to-physmap") ) + { + domid_t domid; + unsigned long gfn; + domid_t source_domid; + unsigned long source_gfn; + uint64_t source_handle; + + if( argc != 7 ) + return usage(argv[0]); + + domid = strtol(argv[2], NULL, 0); + gfn = strtol(argv[3], NULL, 0); + source_domid = strtol(argv[4], NULL, 0); + source_gfn = strtol(argv[5], NULL, 0); + source_handle = strtol(argv[6], NULL, 0); + R(xc_memshr_add_to_physmap(xch, source_domid, source_gfn, source_handle, domid, gfn)); + } + else if( !strcasecmp(cmd, "debug-gfn") ) + { + domid_t domid; + unsigned long gfn; + + if( argc != 4 ) + return usage(argv[0]); + + domid = strtol(argv[2], NULL, 0); + gfn = strtol(argv[3], NULL, 0); + R(xc_memshr_debug_gfn(xch, domid, gfn)); + } + + return 0; +} _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:56:12 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:56: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 1RtR75-0006T8-EI; Fri, 03 Feb 2012 21:56:11 +0000 Received: from mail174.messagelabs.com ([85.158.138.51]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR73-0006P7-L3 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:09 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-174.messagelabs.com!1328306162!6783309!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12455 invoked from network); 3 Feb 2012 21:56:03 -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; 3 Feb 2012 21:56:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6v-0001j9-Sr for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR6v-0002Lp-Ii for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:01 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:55:57 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] tools: memshrtool: tool to test and exercise the sharing subsystem X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Andres Lagar-Cavilla # Date 1327688622 0 # Node ID 8c0ef22c10096bc2afe50a2487e17242bfd21fb4 # Parent 502e0214bdb29ab5c6c8f2764e06604cc18e2635 tools: memshrtool: tool to test and exercise the sharing subsystem This is demo code meant to showcase how to perform sharing operations. It is useful for testing. [ Added appropriate lines to .hgignore and .gitignore -iwj ] Signed-off-by: Adin Scannell Signed-off-by: Andres Lagar-Cavilla Signed-off-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 502e0214bdb2 -r 8c0ef22c1009 .gitignore --- a/.gitignore Fri Jan 27 17:58:20 2012 +0000 +++ b/.gitignore Fri Jan 27 18:23:42 2012 +0000 @@ -210,6 +210,7 @@ tools/tests/regression/installed/* tools/tests/regression/build/* tools/tests/regression/downloads/* +tools/tests/mem-sharing/memshrtool tools/vnet/Make.local tools/vnet/build/* tools/vnet/gc diff -r 502e0214bdb2 -r 8c0ef22c1009 .hgignore --- a/.hgignore Fri Jan 27 17:58:20 2012 +0000 +++ b/.hgignore Fri Jan 27 18:23:42 2012 +0000 @@ -221,6 +221,7 @@ ^tools/tests/regression/build/.*$ ^tools/tests/regression/downloads/.*$ ^tools/tests/xen-access/xen-access$ +^tools/tests/mem-sharing/memshrtool$ ^tools/vnet/Make.local$ ^tools/vnet/build/.*$ ^tools/vnet/gc$ diff -r 502e0214bdb2 -r 8c0ef22c1009 tools/tests/mem-sharing/Makefile --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/tests/mem-sharing/Makefile Fri Jan 27 18:23:42 2012 +0000 @@ -0,0 +1,26 @@ +XEN_ROOT=$(CURDIR)/../../.. +include $(XEN_ROOT)/tools/Rules.mk + +CFLAGS += -Werror + +CFLAGS += $(CFLAGS_libxenctrl) +CFLAGS += $(CFLAGS_xeninclude) + +TARGETS-y := +TARGETS-$(CONFIG_X86) += memshrtool +TARGETS := $(TARGETS-y) + +.PHONY: all +all: build + +.PHONY: build +build: $(TARGETS) + +.PHONY: clean +clean: + $(RM) *.o $(TARGETS) *~ $(DEPS) + +memshrtool: memshrtool.o + $(CC) -o $@ $< $(LDFLAGS) $(LDLIBS_libxenctrl) + +-include $(DEPS) diff -r 502e0214bdb2 -r 8c0ef22c1009 tools/tests/mem-sharing/memshrtool.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/tests/mem-sharing/memshrtool.c Fri Jan 27 18:23:42 2012 +0000 @@ -0,0 +1,165 @@ +/* + * memshrtool.c + * + * Copyright 2011 GridCentric Inc. (Adin Scannell, Andres Lagar-Cavilla) + */ + +#include +#include +#include +#include +#include +#include + +#include "xenctrl.h" + +static int usage(const char* prog) +{ + printf("usage: %s [args...]\n", prog); + printf("where may be:\n"); + printf(" info - Display total sharing info.\n"); + printf(" enable - Enable sharing on a domain.\n"); + printf(" disable - Disable sharing on a domain.\n"); + printf(" nominate - Nominate a page for sharing.\n"); + printf(" share \n"); + printf(" - Share two pages.\n"); + printf(" unshare - Unshare a page by grabbing a writable map.\n"); + printf(" add-to-physmap \n"); + printf(" - Populate a page in a domain with a shared page.\n"); + printf(" debug-gfn - Debug a particular domain and gfn.\n"); + return 1; +} + +#define R(f) do { \ + int rc = f; \ + if ( rc < 0 ) { \ + printf("error executing %s: %s\n", #f, \ + ((errno * -1) == XEN_DOMCTL_MEM_SHARING_C_HANDLE_INVALID) ? \ + "problem with client handle" :\ + ((errno * -1) == XEN_DOMCTL_MEM_SHARING_S_HANDLE_INVALID) ? \ + "problem with source handle" : strerror(errno)); \ + return rc; \ + } \ +} while(0) + +int main(int argc, const char** argv) +{ + const char* cmd = NULL; + xc_interface *xch = xc_interface_open(0, 0, 0); + + if( argc < 2 ) + return usage(argv[0]); + + cmd = argv[1]; + + if( !strcasecmp(cmd, "info") ) + { + if( argc != 2 ) + return usage(argv[0]); + + printf("used = %ld\n", xc_sharing_used_frames(xch)); + printf("freed = %ld\n", xc_sharing_freed_pages(xch)); + } + else if( !strcasecmp(cmd, "enable") ) + { + domid_t domid; + + if( argc != 3 ) + return usage(argv[0]); + + domid = strtol(argv[2], NULL, 0); + R(xc_memshr_control(xch, domid, 1)); + } + else if( !strcasecmp(cmd, "disable") ) + { + domid_t domid; + + if( argc != 3 ) + return usage(argv[0]); + + domid = strtol(argv[2], NULL, 0); + R(xc_memshr_control(xch, domid, 0)); + } + else if( !strcasecmp(cmd, "nominate") ) + { + domid_t domid; + unsigned long gfn; + uint64_t handle; + + if( argc != 4 ) + return usage(argv[0]); + + domid = strtol(argv[2], NULL, 0); + gfn = strtol(argv[3], NULL, 0); + R(xc_memshr_nominate_gfn(xch, domid, gfn, &handle)); + printf("handle = 0x%08llx\n", (unsigned long long) handle); + } + else if( !strcasecmp(cmd, "share") ) + { + domid_t domid; + unsigned long gfn; + uint64_t handle; + domid_t source_domid; + unsigned long source_gfn; + uint64_t source_handle; + + if( argc != 8 ) + return usage(argv[0]); + + domid = strtol(argv[2], NULL, 0); + gfn = strtol(argv[3], NULL, 0); + handle = strtol(argv[4], NULL, 0); + source_domid = strtol(argv[5], NULL, 0); + source_gfn = strtol(argv[6], NULL, 0); + source_handle = strtol(argv[7], NULL, 0); + R(xc_memshr_share_gfns(xch, source_domid, source_gfn, source_handle, domid, gfn, handle)); + } + else if( !strcasecmp(cmd, "unshare") ) + { + domid_t domid; + unsigned long gfn; + void *map; + + if( argc != 4 ) + return usage(argv[0]); + + domid = strtol(argv[2], NULL, 0); + gfn = strtol(argv[3], NULL, 0); + map = xc_map_foreign_range(xch, domid, 4096, PROT_WRITE, gfn); + if( map ) + munmap(map, 4096); + R((int)!map); + } + else if( !strcasecmp(cmd, "add-to-physmap") ) + { + domid_t domid; + unsigned long gfn; + domid_t source_domid; + unsigned long source_gfn; + uint64_t source_handle; + + if( argc != 7 ) + return usage(argv[0]); + + domid = strtol(argv[2], NULL, 0); + gfn = strtol(argv[3], NULL, 0); + source_domid = strtol(argv[4], NULL, 0); + source_gfn = strtol(argv[5], NULL, 0); + source_handle = strtol(argv[6], NULL, 0); + R(xc_memshr_add_to_physmap(xch, source_domid, source_gfn, source_handle, domid, gfn)); + } + else if( !strcasecmp(cmd, "debug-gfn") ) + { + domid_t domid; + unsigned long gfn; + + if( argc != 4 ) + return usage(argv[0]); + + domid = strtol(argv[2], NULL, 0); + gfn = strtol(argv[3], NULL, 0); + R(xc_memshr_debug_gfn(xch, domid, gfn)); + } + + return 0; +} _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:56:15 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:56: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 1RtR78-0006V7-HH; Fri, 03 Feb 2012 21:56:14 +0000 Received: from mail182.messagelabs.com ([85.158.139.83]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR76-0006Qe-Ll for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:12 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-182.messagelabs.com!1328306164!13648623!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27546 invoked from network); 3 Feb 2012 21:56:06 -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; 3 Feb 2012 21:56:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6y-0001jF-I6 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR6w-0002MH-F7 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:03 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:56:01 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] tools/libxc: handle fallback in linux_privcmd_map_foreign_bulk properly X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Olaf Hering # Date 1327689175 0 # Node ID cdb1e4a3845024c474141e6962ca0a8ace062d55 # Parent 8c0ef22c10096bc2afe50a2487e17242bfd21fb4 tools/libxc: handle fallback in linux_privcmd_map_foreign_bulk properly If the first ioctl fails with ENOENT it means the command is known. If a second attempt to map each gfn happens to fail then there is no need to run the fallback code. Some gfns are paged and the fallback code would not fix the failure. Instead return the EINVAL to the caller. Signed-off-by: Olaf Hering Acked-by: Andres Lagar-Cavilla Committed-by: Ian Jackson --- diff -r 8c0ef22c1009 -r cdb1e4a38450 tools/libxc/xc_linux_osdep.c --- a/tools/libxc/xc_linux_osdep.c Fri Jan 27 18:23:42 2012 +0000 +++ b/tools/libxc/xc_linux_osdep.c Fri Jan 27 18:32:55 2012 +0000 @@ -217,6 +217,7 @@ rc = ioctl(fd, IOCTL_PRIVCMD_MMAPBATCH_V2, &ioctlx); + /* Command was recognized, some gfn in arr are in paging state */ if ( rc < 0 && errno == ENOENT ) { for ( i = rc = 0; rc == 0 && i < num; i++ ) @@ -235,8 +236,8 @@ } while ( rc < 0 && errno == ENOENT && err[i] == -ENOENT ); } } - - if ( rc < 0 && errno == EINVAL && (int)num > 0 ) + /* Command was not recognized, use fall back */ + else if ( rc < 0 && errno == EINVAL && (int)num > 0 ) { /* * IOCTL_PRIVCMD_MMAPBATCH_V2 is not supported - fall back to _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:56:15 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:56: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 1RtR78-0006V7-HH; Fri, 03 Feb 2012 21:56:14 +0000 Received: from mail182.messagelabs.com ([85.158.139.83]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR76-0006Qe-Ll for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:12 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-182.messagelabs.com!1328306164!13648623!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27546 invoked from network); 3 Feb 2012 21:56:06 -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; 3 Feb 2012 21:56:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR6y-0001jF-I6 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR6w-0002MH-F7 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:03 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:56:01 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] tools/libxc: handle fallback in linux_privcmd_map_foreign_bulk properly X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Olaf Hering # Date 1327689175 0 # Node ID cdb1e4a3845024c474141e6962ca0a8ace062d55 # Parent 8c0ef22c10096bc2afe50a2487e17242bfd21fb4 tools/libxc: handle fallback in linux_privcmd_map_foreign_bulk properly If the first ioctl fails with ENOENT it means the command is known. If a second attempt to map each gfn happens to fail then there is no need to run the fallback code. Some gfns are paged and the fallback code would not fix the failure. Instead return the EINVAL to the caller. Signed-off-by: Olaf Hering Acked-by: Andres Lagar-Cavilla Committed-by: Ian Jackson --- diff -r 8c0ef22c1009 -r cdb1e4a38450 tools/libxc/xc_linux_osdep.c --- a/tools/libxc/xc_linux_osdep.c Fri Jan 27 18:23:42 2012 +0000 +++ b/tools/libxc/xc_linux_osdep.c Fri Jan 27 18:32:55 2012 +0000 @@ -217,6 +217,7 @@ rc = ioctl(fd, IOCTL_PRIVCMD_MMAPBATCH_V2, &ioctlx); + /* Command was recognized, some gfn in arr are in paging state */ if ( rc < 0 && errno == ENOENT ) { for ( i = rc = 0; rc == 0 && i < num; i++ ) @@ -235,8 +236,8 @@ } while ( rc < 0 && errno == ENOENT && err[i] == -ENOENT ); } } - - if ( rc < 0 && errno == EINVAL && (int)num > 0 ) + /* Command was not recognized, use fall back */ + else if ( rc < 0 && errno == EINVAL && (int)num > 0 ) { /* * IOCTL_PRIVCMD_MMAPBATCH_V2 is not supported - fall back to _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:56:17 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:56: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 1RtR7A-0006Wm-K7; Fri, 03 Feb 2012 21:56:16 +0000 Received: from mail174.messagelabs.com ([85.158.138.51]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR78-0006Rw-M7 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:14 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-174.messagelabs.com!1328306167!11933597!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4461 invoked from network); 3 Feb 2012 21:56:08 -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; 3 Feb 2012 21:56:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR71-0001jO-4u for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR6z-0002NF-1H for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:06 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:56:04 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xenpaging: make file_op largefile aware X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Olaf Hering # Date 1327691017 0 # Node ID 255ae011567db6b96b083347158c28e30b656970 # Parent cdb1e4a3845024c474141e6962ca0a8ace062d55 xenpaging: make file_op largefile aware lseek() takes an off_t, the used "int << shiftsize" does not automatically convert the int into a larger type. This leads to write errors with pagefiles larger than 2G. Fix this by shifting an off_t instead of an int. Signed-off-by: Olaf Hering Committed-by: Ian Jackson --- diff -r cdb1e4a38450 -r 255ae011567d tools/xenpaging/file_ops.c --- a/tools/xenpaging/file_ops.c Fri Jan 27 18:32:55 2012 +0000 +++ b/tools/xenpaging/file_ops.c Fri Jan 27 19:03:37 2012 +0000 @@ -26,12 +26,12 @@ static int file_op(int fd, void *page, int i, ssize_t (*fn)(int, void *, size_t)) { - off_t seek_ret; + off_t offset = i; int total = 0; int bytes; - seek_ret = lseek(fd, i << PAGE_SHIFT, SEEK_SET); - if ( seek_ret == (off_t)-1 ) + offset = lseek(fd, offset << PAGE_SHIFT, SEEK_SET); + if ( offset == (off_t)-1 ) return -1; while ( total < PAGE_SIZE ) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:56:17 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:56: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 1RtR7A-0006Wm-K7; Fri, 03 Feb 2012 21:56:16 +0000 Received: from mail174.messagelabs.com ([85.158.138.51]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR78-0006Rw-M7 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:14 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-174.messagelabs.com!1328306167!11933597!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4461 invoked from network); 3 Feb 2012 21:56:08 -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; 3 Feb 2012 21:56:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR71-0001jO-4u for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR6z-0002NF-1H for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:06 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:56:04 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xenpaging: make file_op largefile aware X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Olaf Hering # Date 1327691017 0 # Node ID 255ae011567db6b96b083347158c28e30b656970 # Parent cdb1e4a3845024c474141e6962ca0a8ace062d55 xenpaging: make file_op largefile aware lseek() takes an off_t, the used "int << shiftsize" does not automatically convert the int into a larger type. This leads to write errors with pagefiles larger than 2G. Fix this by shifting an off_t instead of an int. Signed-off-by: Olaf Hering Committed-by: Ian Jackson --- diff -r cdb1e4a38450 -r 255ae011567d tools/xenpaging/file_ops.c --- a/tools/xenpaging/file_ops.c Fri Jan 27 18:32:55 2012 +0000 +++ b/tools/xenpaging/file_ops.c Fri Jan 27 19:03:37 2012 +0000 @@ -26,12 +26,12 @@ static int file_op(int fd, void *page, int i, ssize_t (*fn)(int, void *, size_t)) { - off_t seek_ret; + off_t offset = i; int total = 0; int bytes; - seek_ret = lseek(fd, i << PAGE_SHIFT, SEEK_SET); - if ( seek_ret == (off_t)-1 ) + offset = lseek(fd, offset << PAGE_SHIFT, SEEK_SET); + if ( offset == (off_t)-1 ) return -1; while ( total < PAGE_SIZE ) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:56:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:56: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 1RtR7B-0006Xq-Me; Fri, 03 Feb 2012 21:56:17 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7A-0006W6-6a for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:16 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-27.messagelabs.com!1328306126!61471755!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23353 invoked from network); 3 Feb 2012 21:55:27 -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; 3 Feb 2012 21:55:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR77-0001jh-MF for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR77-0002QA-Kg for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:13 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:56:12 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] amd iommu: disable iommu emulation on non-iommu systems X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Wei Wang # Date 1327758036 0 # Node ID 04623ceabb7296a4e3f51401397ecef4febdd659 # Parent 54000bca7a6ad096f5cdbc9318ba0d099d76e1a7 amd iommu: disable iommu emulation on non-iommu systems Introduce a new flag to disable iommu emulation on old iommu systems. This patch is taken from my v4 patch queue, which is till pending, to make old or non-iommu system to run cleanly without interfered by iommuv2 codes. This might be helpful to isolate iommuv2 code in debugging unstable regressions. The reset part of v4 will be re-based. Signed-off-by: Wei Wang Committed-by: Keir Fraser --- diff -r 54000bca7a6a -r 04623ceabb72 xen/drivers/passthrough/amd/iommu_guest.c --- a/xen/drivers/passthrough/amd/iommu_guest.c Fri Jan 27 19:17:03 2012 +0000 +++ b/xen/drivers/passthrough/amd/iommu_guest.c Sat Jan 28 13:40:36 2012 +0000 @@ -805,6 +805,9 @@ p2m_type_t t; struct guest_iommu *iommu = domain_iommu(d); + if ( !is_hvm_domain(d) || !iommu_enabled || !iommuv2_enabled ) + return 0; + if ( !iommu ) return -EACCES; @@ -867,7 +870,7 @@ struct guest_iommu *iommu; struct hvm_iommu *hd = domain_hvm_iommu(d); - if ( !is_hvm_domain(d) ) + if ( !is_hvm_domain(d) || !iommu_enabled || !iommuv2_enabled ) return 0; iommu = xzalloc(struct guest_iommu); @@ -893,7 +896,7 @@ { struct guest_iommu *iommu; - if ( !is_hvm_domain(d) ) + if ( !is_hvm_domain(d) || !iommu_enabled || !iommuv2_enabled ) return; iommu = domain_iommu(d); diff -r 54000bca7a6a -r 04623ceabb72 xen/drivers/passthrough/amd/iommu_init.c --- a/xen/drivers/passthrough/amd/iommu_init.c Fri Jan 27 19:17:03 2012 +0000 +++ b/xen/drivers/passthrough/amd/iommu_init.c Sat Jan 28 13:40:36 2012 +0000 @@ -38,6 +38,7 @@ static struct radix_tree_root ivrs_maps; struct list_head amd_iommu_head; struct table_struct device_table; +bool_t iommuv2_enabled; static int iommu_has_ht_flag(struct amd_iommu *iommu, u8 mask) { @@ -887,6 +888,9 @@ get_iommu_features(iommu); + if ( iommu->features ) + iommuv2_enabled = 1; + if ( allocate_cmd_buffer(iommu) == NULL ) goto error_out; @@ -950,6 +954,7 @@ iommu_enabled = 0; iommu_passthrough = 0; iommu_intremap = 0; + iommuv2_enabled = 0; } /* diff -r 54000bca7a6a -r 04623ceabb72 xen/include/asm-x86/amd-iommu.h --- a/xen/include/asm-x86/amd-iommu.h Fri Jan 27 19:17:03 2012 +0000 +++ b/xen/include/asm-x86/amd-iommu.h Sat Jan 28 13:40:36 2012 +0000 @@ -182,4 +182,6 @@ struct guest_iommu_msi msi; }; +extern bool_t iommuv2_enabled; + #endif /* _ASM_X86_64_AMD_IOMMU_H */ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:56:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:56: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 1RtR7B-0006Xq-Me; Fri, 03 Feb 2012 21:56:17 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7A-0006W6-6a for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:16 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-27.messagelabs.com!1328306126!61471755!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23353 invoked from network); 3 Feb 2012 21:55:27 -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; 3 Feb 2012 21:55:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR77-0001jh-MF for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR77-0002QA-Kg for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:13 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:56:12 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] amd iommu: disable iommu emulation on non-iommu systems X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Wei Wang # Date 1327758036 0 # Node ID 04623ceabb7296a4e3f51401397ecef4febdd659 # Parent 54000bca7a6ad096f5cdbc9318ba0d099d76e1a7 amd iommu: disable iommu emulation on non-iommu systems Introduce a new flag to disable iommu emulation on old iommu systems. This patch is taken from my v4 patch queue, which is till pending, to make old or non-iommu system to run cleanly without interfered by iommuv2 codes. This might be helpful to isolate iommuv2 code in debugging unstable regressions. The reset part of v4 will be re-based. Signed-off-by: Wei Wang Committed-by: Keir Fraser --- diff -r 54000bca7a6a -r 04623ceabb72 xen/drivers/passthrough/amd/iommu_guest.c --- a/xen/drivers/passthrough/amd/iommu_guest.c Fri Jan 27 19:17:03 2012 +0000 +++ b/xen/drivers/passthrough/amd/iommu_guest.c Sat Jan 28 13:40:36 2012 +0000 @@ -805,6 +805,9 @@ p2m_type_t t; struct guest_iommu *iommu = domain_iommu(d); + if ( !is_hvm_domain(d) || !iommu_enabled || !iommuv2_enabled ) + return 0; + if ( !iommu ) return -EACCES; @@ -867,7 +870,7 @@ struct guest_iommu *iommu; struct hvm_iommu *hd = domain_hvm_iommu(d); - if ( !is_hvm_domain(d) ) + if ( !is_hvm_domain(d) || !iommu_enabled || !iommuv2_enabled ) return 0; iommu = xzalloc(struct guest_iommu); @@ -893,7 +896,7 @@ { struct guest_iommu *iommu; - if ( !is_hvm_domain(d) ) + if ( !is_hvm_domain(d) || !iommu_enabled || !iommuv2_enabled ) return; iommu = domain_iommu(d); diff -r 54000bca7a6a -r 04623ceabb72 xen/drivers/passthrough/amd/iommu_init.c --- a/xen/drivers/passthrough/amd/iommu_init.c Fri Jan 27 19:17:03 2012 +0000 +++ b/xen/drivers/passthrough/amd/iommu_init.c Sat Jan 28 13:40:36 2012 +0000 @@ -38,6 +38,7 @@ static struct radix_tree_root ivrs_maps; struct list_head amd_iommu_head; struct table_struct device_table; +bool_t iommuv2_enabled; static int iommu_has_ht_flag(struct amd_iommu *iommu, u8 mask) { @@ -887,6 +888,9 @@ get_iommu_features(iommu); + if ( iommu->features ) + iommuv2_enabled = 1; + if ( allocate_cmd_buffer(iommu) == NULL ) goto error_out; @@ -950,6 +954,7 @@ iommu_enabled = 0; iommu_passthrough = 0; iommu_intremap = 0; + iommuv2_enabled = 0; } /* diff -r 54000bca7a6a -r 04623ceabb72 xen/include/asm-x86/amd-iommu.h --- a/xen/include/asm-x86/amd-iommu.h Fri Jan 27 19:17:03 2012 +0000 +++ b/xen/include/asm-x86/amd-iommu.h Sat Jan 28 13:40:36 2012 +0000 @@ -182,4 +182,6 @@ struct guest_iommu_msi msi; }; +extern bool_t iommuv2_enabled; + #endif /* _ASM_X86_64_AMD_IOMMU_H */ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:56:22 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:56: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 1RtR7F-0006ab-Q1; Fri, 03 Feb 2012 21:56:21 +0000 Received: from mail174.messagelabs.com ([85.158.138.51]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7E-0006VK-6K for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:20 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-174.messagelabs.com!1328306171!11729438!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30359 invoked from network); 3 Feb 2012 21:56:12 -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; 3 Feb 2012 21:56:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR74-0001jT-8Z for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR71-0002OH-NF for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:08 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:56:07 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: extend pCPUs specification for vcpu-pin. X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Dario Faggioli # Date 1327691640 0 # Node ID 83ed83ceddf5a086558ab87db489d2169acaa936 # Parent 255ae011567db6b96b083347158c28e30b656970 libxl: extend pCPUs specification for vcpu-pin. Allow for "^" syntax while specifying the pCPUs list during a vcpu-pin. This enables doing the following: xl vcpu-pin 1 1 0-4,^2 and achieving: xl vcpu-list Name ID VCPU CPU State Time(s) CPU Affinity ... Squeeze_pv 1 1 3 -b- 2.4 0-1,3-4 ... Negative ranges are also supported, such as "0-4,^1-2" to mean "0,3-4" Signed-off-by: Dario Faggioli Committed-by: Ian Jackson --- diff -r 255ae011567d -r 83ed83ceddf5 tools/libxl/libxl_utils.h --- a/tools/libxl/libxl_utils.h Fri Jan 27 19:03:37 2012 +0000 +++ b/tools/libxl/libxl_utils.h Fri Jan 27 19:14:00 2012 +0000 @@ -71,6 +71,8 @@ void libxl_cpumap_set(libxl_cpumap *cpumap, int cpu); void libxl_cpumap_reset(libxl_cpumap *cpumap, int cpu); #define libxl_for_each_cpu(var, map) for (var = 0; var < (map).size * 8; var++) +#define libxl_for_each_set_cpu(v, m) for (v = 0; v < (m).size * 8; v++) \ + if (libxl_cpumap_test(&(m), v)) int libxl_cpuarray_alloc(libxl_ctx *ctx, libxl_cpuarray *cpuarray); diff -r 255ae011567d -r 83ed83ceddf5 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Fri Jan 27 19:03:37 2012 +0000 +++ b/tools/libxl/xl_cmdimpl.c Fri Jan 27 19:14:00 2012 +0000 @@ -3568,13 +3568,72 @@ return 0; } +static int vcpupin_parse(char *cpu, libxl_cpumap *cpumap) +{ + libxl_cpumap exclude_cpumap; + uint32_t cpuida, cpuidb; + char *endptr, *toka, *tokb, *saveptr = NULL; + int i, rc = 0, rmcpu; + + if (!strcmp(cpu, "all")) { + memset(cpumap->map, -1, cpumap->size); + return 0; + } + + if (libxl_cpumap_alloc(ctx, &exclude_cpumap)) { + fprintf(stderr, "Error: Failed to allocate cpumap.\n"); + return ENOMEM; + } + + for (toka = strtok_r(cpu, ",", &saveptr); toka; + toka = strtok_r(NULL, ",", &saveptr)) { + rmcpu = 0; + if (*toka == '^') { + /* This (These) Cpu(s) will be removed from the map */ + toka++; + rmcpu = 1; + } + /* Extract a valid (range of) cpu(s) */ + cpuida = cpuidb = strtoul(toka, &endptr, 10); + if (endptr == toka) { + fprintf(stderr, "Error: Invalid argument.\n"); + rc = EINVAL; + goto vcpp_out; + } + if (*endptr == '-') { + tokb = endptr + 1; + cpuidb = strtoul(tokb, &endptr, 10); + if (endptr == tokb || cpuida > cpuidb) { + fprintf(stderr, "Error: Invalid argument.\n"); + rc = EINVAL; + goto vcpp_out; + } + } + while (cpuida <= cpuidb) { + rmcpu == 0 ? libxl_cpumap_set(cpumap, cpuida) : + libxl_cpumap_set(&exclude_cpumap, cpuida); + cpuida++; + } + } + + /* Clear all the cpus from the removal list */ + libxl_for_each_set_cpu(i, exclude_cpumap) { + libxl_cpumap_reset(cpumap, i); + } + +vcpp_out: + libxl_cpumap_dispose(&exclude_cpumap); + + return rc; +} + static void vcpupin(const char *d, const char *vcpu, char *cpu) { libxl_vcpuinfo *vcpuinfo; libxl_cpumap cpumap; - uint32_t vcpuid, cpuida, cpuidb; - char *endptr, *toka, *tokb; + uint32_t vcpuid; + char *endptr; int i, nb_vcpu; vcpuid = strtoul(vcpu, &endptr, 10); @@ -3591,32 +3650,9 @@ if (libxl_cpumap_alloc(ctx, &cpumap)) { goto vcpupin_out; } - if (strcmp(cpu, "all")) { - for (toka = strtok(cpu, ","), i = 0; toka; toka = strtok(NULL, ","), ++i) { - cpuida = strtoul(toka, &endptr, 10); - if (toka == endptr) { - fprintf(stderr, "Error: Invalid argument.\n"); - goto vcpupin_out1; - } - if (*endptr == '-') { - tokb = endptr + 1; - cpuidb = strtoul(tokb, &endptr, 10); - if ((tokb == endptr) || (cpuida > cpuidb)) { - fprintf(stderr, "Error: Invalid argument.\n"); - goto vcpupin_out1; - } - while (cpuida <= cpuidb) { - libxl_cpumap_set(&cpumap, cpuida); - ++cpuida; - } - } else { - libxl_cpumap_set(&cpumap, cpuida); - } - } - } - else { - memset(cpumap.map, -1, cpumap.size); - } + + if (vcpupin_parse(cpu, &cpumap)) + goto vcpupin_out1; if (vcpuid != -1) { if (libxl_set_vcpuaffinity(ctx, domid, vcpuid, &cpumap) == -1) { _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:56:22 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:56: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 1RtR7F-0006ab-Q1; Fri, 03 Feb 2012 21:56:21 +0000 Received: from mail174.messagelabs.com ([85.158.138.51]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7E-0006VK-6K for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:20 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-174.messagelabs.com!1328306171!11729438!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30359 invoked from network); 3 Feb 2012 21:56:12 -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; 3 Feb 2012 21:56:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR74-0001jT-8Z for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR71-0002OH-NF for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:08 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:56:07 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: extend pCPUs specification for vcpu-pin. X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Dario Faggioli # Date 1327691640 0 # Node ID 83ed83ceddf5a086558ab87db489d2169acaa936 # Parent 255ae011567db6b96b083347158c28e30b656970 libxl: extend pCPUs specification for vcpu-pin. Allow for "^" syntax while specifying the pCPUs list during a vcpu-pin. This enables doing the following: xl vcpu-pin 1 1 0-4,^2 and achieving: xl vcpu-list Name ID VCPU CPU State Time(s) CPU Affinity ... Squeeze_pv 1 1 3 -b- 2.4 0-1,3-4 ... Negative ranges are also supported, such as "0-4,^1-2" to mean "0,3-4" Signed-off-by: Dario Faggioli Committed-by: Ian Jackson --- diff -r 255ae011567d -r 83ed83ceddf5 tools/libxl/libxl_utils.h --- a/tools/libxl/libxl_utils.h Fri Jan 27 19:03:37 2012 +0000 +++ b/tools/libxl/libxl_utils.h Fri Jan 27 19:14:00 2012 +0000 @@ -71,6 +71,8 @@ void libxl_cpumap_set(libxl_cpumap *cpumap, int cpu); void libxl_cpumap_reset(libxl_cpumap *cpumap, int cpu); #define libxl_for_each_cpu(var, map) for (var = 0; var < (map).size * 8; var++) +#define libxl_for_each_set_cpu(v, m) for (v = 0; v < (m).size * 8; v++) \ + if (libxl_cpumap_test(&(m), v)) int libxl_cpuarray_alloc(libxl_ctx *ctx, libxl_cpuarray *cpuarray); diff -r 255ae011567d -r 83ed83ceddf5 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Fri Jan 27 19:03:37 2012 +0000 +++ b/tools/libxl/xl_cmdimpl.c Fri Jan 27 19:14:00 2012 +0000 @@ -3568,13 +3568,72 @@ return 0; } +static int vcpupin_parse(char *cpu, libxl_cpumap *cpumap) +{ + libxl_cpumap exclude_cpumap; + uint32_t cpuida, cpuidb; + char *endptr, *toka, *tokb, *saveptr = NULL; + int i, rc = 0, rmcpu; + + if (!strcmp(cpu, "all")) { + memset(cpumap->map, -1, cpumap->size); + return 0; + } + + if (libxl_cpumap_alloc(ctx, &exclude_cpumap)) { + fprintf(stderr, "Error: Failed to allocate cpumap.\n"); + return ENOMEM; + } + + for (toka = strtok_r(cpu, ",", &saveptr); toka; + toka = strtok_r(NULL, ",", &saveptr)) { + rmcpu = 0; + if (*toka == '^') { + /* This (These) Cpu(s) will be removed from the map */ + toka++; + rmcpu = 1; + } + /* Extract a valid (range of) cpu(s) */ + cpuida = cpuidb = strtoul(toka, &endptr, 10); + if (endptr == toka) { + fprintf(stderr, "Error: Invalid argument.\n"); + rc = EINVAL; + goto vcpp_out; + } + if (*endptr == '-') { + tokb = endptr + 1; + cpuidb = strtoul(tokb, &endptr, 10); + if (endptr == tokb || cpuida > cpuidb) { + fprintf(stderr, "Error: Invalid argument.\n"); + rc = EINVAL; + goto vcpp_out; + } + } + while (cpuida <= cpuidb) { + rmcpu == 0 ? libxl_cpumap_set(cpumap, cpuida) : + libxl_cpumap_set(&exclude_cpumap, cpuida); + cpuida++; + } + } + + /* Clear all the cpus from the removal list */ + libxl_for_each_set_cpu(i, exclude_cpumap) { + libxl_cpumap_reset(cpumap, i); + } + +vcpp_out: + libxl_cpumap_dispose(&exclude_cpumap); + + return rc; +} + static void vcpupin(const char *d, const char *vcpu, char *cpu) { libxl_vcpuinfo *vcpuinfo; libxl_cpumap cpumap; - uint32_t vcpuid, cpuida, cpuidb; - char *endptr, *toka, *tokb; + uint32_t vcpuid; + char *endptr; int i, nb_vcpu; vcpuid = strtoul(vcpu, &endptr, 10); @@ -3591,32 +3650,9 @@ if (libxl_cpumap_alloc(ctx, &cpumap)) { goto vcpupin_out; } - if (strcmp(cpu, "all")) { - for (toka = strtok(cpu, ","), i = 0; toka; toka = strtok(NULL, ","), ++i) { - cpuida = strtoul(toka, &endptr, 10); - if (toka == endptr) { - fprintf(stderr, "Error: Invalid argument.\n"); - goto vcpupin_out1; - } - if (*endptr == '-') { - tokb = endptr + 1; - cpuidb = strtoul(tokb, &endptr, 10); - if ((tokb == endptr) || (cpuida > cpuidb)) { - fprintf(stderr, "Error: Invalid argument.\n"); - goto vcpupin_out1; - } - while (cpuida <= cpuidb) { - libxl_cpumap_set(&cpumap, cpuida); - ++cpuida; - } - } else { - libxl_cpumap_set(&cpumap, cpuida); - } - } - } - else { - memset(cpumap.map, -1, cpumap.size); - } + + if (vcpupin_parse(cpu, &cpumap)) + goto vcpupin_out1; if (vcpuid != -1) { if (libxl_set_vcpuaffinity(ctx, domid, vcpuid, &cpumap) == -1) { _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:56:23 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:56: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 1RtR7G-0006bW-Vk; Fri, 03 Feb 2012 21:56:22 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7E-0006Xf-TP for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:21 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-27.messagelabs.com!1328306126!51346303!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8892 invoked from network); 3 Feb 2012 21:55:27 -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; 3 Feb 2012 21:55:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR79-0001jl-J4 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR78-0002RC-5g for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:15 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:56:13 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] Console: introduce console=none command line parameter X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Andrew Cooper # Date 1327758102 0 # Node ID f8c2cf24a26cc6cdaaad9140e4b1dfc54f07bab3 # Parent 04623ceabb7296a4e3f51401397ecef4febdd659 Console: introduce console=none command line parameter Currenty, not specifying 'console=' on the command line causes Xen to default to 'vga'. Alternativly, the user can explicitly specifiy 'console=vga|com1|com2'. However, there is no way to specify that neither vga nor serial should be used. Specifying 'console=' does have the effect that neither vga nor serial is set up, but at the cost of an "Bad console= option ''" warning. Therefore, expliticly support a 'console=none' option which does not set up vga and does not set up serial, but does not trigger the bad console warning. Signed-off-by: Andrew Cooper Committed-by: Keir Fraser --- diff -r 04623ceabb72 -r f8c2cf24a26c xen/drivers/char/console.c --- a/xen/drivers/char/console.c Sat Jan 28 13:40:36 2012 +0000 +++ b/xen/drivers/char/console.c Sat Jan 28 13:41:42 2012 +0000 @@ -549,6 +549,8 @@ p++; if ( !strncmp(p, "vga", 3) ) vga_init(); + else if ( !strncmp(p, "none", 4) ) + continue; else if ( strncmp(p, "com", 3) || (sercon_handle = serial_parse_handle(p)) == -1 ) { _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:56:23 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:56: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 1RtR7G-0006bW-Vk; Fri, 03 Feb 2012 21:56:22 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7E-0006Xf-TP for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:21 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-27.messagelabs.com!1328306126!51346303!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8892 invoked from network); 3 Feb 2012 21:55:27 -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; 3 Feb 2012 21:55:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR79-0001jl-J4 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR78-0002RC-5g for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:15 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:56:13 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] Console: introduce console=none command line parameter X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Andrew Cooper # Date 1327758102 0 # Node ID f8c2cf24a26cc6cdaaad9140e4b1dfc54f07bab3 # Parent 04623ceabb7296a4e3f51401397ecef4febdd659 Console: introduce console=none command line parameter Currenty, not specifying 'console=' on the command line causes Xen to default to 'vga'. Alternativly, the user can explicitly specifiy 'console=vga|com1|com2'. However, there is no way to specify that neither vga nor serial should be used. Specifying 'console=' does have the effect that neither vga nor serial is set up, but at the cost of an "Bad console= option ''" warning. Therefore, expliticly support a 'console=none' option which does not set up vga and does not set up serial, but does not trigger the bad console warning. Signed-off-by: Andrew Cooper Committed-by: Keir Fraser --- diff -r 04623ceabb72 -r f8c2cf24a26c xen/drivers/char/console.c --- a/xen/drivers/char/console.c Sat Jan 28 13:40:36 2012 +0000 +++ b/xen/drivers/char/console.c Sat Jan 28 13:41:42 2012 +0000 @@ -549,6 +549,8 @@ p++; if ( !strncmp(p, "vga", 3) ) vga_init(); + else if ( !strncmp(p, "none", 4) ) + continue; else if ( strncmp(p, "com", 3) || (sercon_handle = serial_parse_handle(p)) == -1 ) { _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:56:23 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:56: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 1RtR7H-0006bh-1t; Fri, 03 Feb 2012 21:56:23 +0000 Received: from mail174.messagelabs.com ([85.158.138.51]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7F-0006WB-7n for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:21 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-174.messagelabs.com!1328306172!11729440!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30376 invoked from network); 3 Feb 2012 21:56:13 -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; 3 Feb 2012 21:56:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR76-0001jc-4D for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR74-0002P2-0b for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:10 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:56:09 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: allow for specifying the CPU affinity in the config file. X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Dario Faggioli # Date 1327691823 0 # Node ID 54000bca7a6ad096f5cdbc9318ba0d099d76e1a7 # Parent 83ed83ceddf5a086558ab87db489d2169acaa936 libxl: allow for specifying the CPU affinity in the config file. Enable CPU affinity specification in a VM's config file with the exact syntax `xl vcpu-pin' provides. Signed-off-by: Dario Faggioli Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 83ed83ceddf5 -r 54000bca7a6a tools/libxl/libxl.c --- a/tools/libxl/libxl.c Fri Jan 27 19:14:00 2012 +0000 +++ b/tools/libxl/libxl.c Fri Jan 27 19:17:03 2012 +0000 @@ -2874,6 +2874,21 @@ return 0; } +int libxl_set_vcpuaffinity_all(libxl_ctx *ctx, uint32_t domid, + unsigned int max_vcpus, libxl_cpumap *cpumap) +{ + int i, rc = 0; + + for (i = 0; i < max_vcpus; i++) { + if (libxl_set_vcpuaffinity(ctx, domid, i, cpumap)) { + LIBXL__LOG(ctx, LIBXL__LOG_WARNING, + "failed to set affinity for %d", i); + rc = ERROR_FAIL; + } + } + return rc; +} + int libxl_set_vcpuonline(libxl_ctx *ctx, uint32_t domid, libxl_cpumap *cpumap) { GC_INIT(ctx); diff -r 83ed83ceddf5 -r 54000bca7a6a tools/libxl/libxl.h --- a/tools/libxl/libxl.h Fri Jan 27 19:14:00 2012 +0000 +++ b/tools/libxl/libxl.h Fri Jan 27 19:17:03 2012 +0000 @@ -588,6 +588,8 @@ int *nb_vcpu, int *nrcpus); int libxl_set_vcpuaffinity(libxl_ctx *ctx, uint32_t domid, uint32_t vcpuid, libxl_cpumap *cpumap); +int libxl_set_vcpuaffinity_all(libxl_ctx *ctx, uint32_t domid, + unsigned int max_vcpus, libxl_cpumap *cpumap); int libxl_set_vcpuonline(libxl_ctx *ctx, uint32_t domid, libxl_cpumap *cpumap); int libxl_get_sched_id(libxl_ctx *ctx); diff -r 83ed83ceddf5 -r 54000bca7a6a tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Fri Jan 27 19:14:00 2012 +0000 +++ b/tools/libxl/libxl_create.c Fri Jan 27 19:17:03 2012 +0000 @@ -71,6 +71,9 @@ memset(b_info, '\0', sizeof(*b_info)); b_info->max_vcpus = 1; b_info->cur_vcpus = 1; + if (libxl_cpumap_alloc(ctx, &b_info->cpumap)) + return ERROR_NOMEM; + libxl_cpumap_set_any(&b_info->cpumap); b_info->max_memkb = 32 * 1024; b_info->target_memkb = b_info->max_memkb; b_info->disable_migrate = 0; diff -r 83ed83ceddf5 -r 54000bca7a6a tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Fri Jan 27 19:14:00 2012 +0000 +++ b/tools/libxl/libxl_dom.c Fri Jan 27 19:17:03 2012 +0000 @@ -65,6 +65,7 @@ libxl_ctx *ctx = libxl__gc_owner(gc); int tsc_mode; 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); if (info->type == LIBXL_DOMAIN_TYPE_PV) xc_domain_set_memmap_limit(ctx->xch, domid, diff -r 83ed83ceddf5 -r 54000bca7a6a tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Fri Jan 27 19:14:00 2012 +0000 +++ b/tools/libxl/libxl_types.idl Fri Jan 27 19:17:03 2012 +0000 @@ -157,6 +157,7 @@ libxl_domain_build_info = Struct("domain_build_info",[ ("max_vcpus", integer), ("cur_vcpus", integer), + ("cpumap", libxl_cpumap), ("tsc_mode", libxl_tsc_mode), ("max_memkb", uint32), ("target_memkb", uint32), diff -r 83ed83ceddf5 -r 54000bca7a6a tools/libxl/libxl_utils.h --- a/tools/libxl/libxl_utils.h Fri Jan 27 19:14:00 2012 +0000 +++ b/tools/libxl/libxl_utils.h Fri Jan 27 19:17:03 2012 +0000 @@ -70,6 +70,18 @@ int libxl_cpumap_test(libxl_cpumap *cpumap, int cpu); void libxl_cpumap_set(libxl_cpumap *cpumap, int cpu); void libxl_cpumap_reset(libxl_cpumap *cpumap, int cpu); +static inline void libxl_cpumap_set_any(libxl_cpumap *cpumap) +{ + memset(cpumap->map, -1, cpumap->size); +} +static inline void libxl_cpumap_set_none(libxl_cpumap *cpumap) +{ + memset(cpumap->map, 0, cpumap->size); +} +static inline int libxl_cpumap_cpu_valid(libxl_cpumap *cpumap, int cpu) +{ + return cpu >= 0 && cpu < (cpumap->size * 8); +} #define libxl_for_each_cpu(var, map) for (var = 0; var < (map).size * 8; var++) #define libxl_for_each_set_cpu(v, m) for (v = 0; v < (m).size * 8; v++) \ if (libxl_cpumap_test(&(m), v)) diff -r 83ed83ceddf5 -r 54000bca7a6a tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Fri Jan 27 19:14:00 2012 +0000 +++ b/tools/libxl/xl_cmdimpl.c Fri Jan 27 19:17:03 2012 +0000 @@ -570,6 +570,65 @@ free(s); } +static int vcpupin_parse(char *cpu, libxl_cpumap *cpumap) +{ + libxl_cpumap exclude_cpumap; + uint32_t cpuida, cpuidb; + char *endptr, *toka, *tokb, *saveptr = NULL; + int i, rc = 0, rmcpu; + + if (!strcmp(cpu, "all")) { + libxl_cpumap_set_any(cpumap); + return 0; + } + + if (libxl_cpumap_alloc(ctx, &exclude_cpumap)) { + fprintf(stderr, "Error: Failed to allocate cpumap.\n"); + return ENOMEM; + } + + for (toka = strtok_r(cpu, ",", &saveptr); toka; + toka = strtok_r(NULL, ",", &saveptr)) { + rmcpu = 0; + if (*toka == '^') { + /* This (These) Cpu(s) will be removed from the map */ + toka++; + rmcpu = 1; + } + /* Extract a valid (range of) cpu(s) */ + cpuida = cpuidb = strtoul(toka, &endptr, 10); + if (endptr == toka) { + fprintf(stderr, "Error: Invalid argument.\n"); + rc = EINVAL; + goto vcpp_out; + } + if (*endptr == '-') { + tokb = endptr + 1; + cpuidb = strtoul(tokb, &endptr, 10); + if (endptr == tokb || cpuida > cpuidb) { + fprintf(stderr, "Error: Invalid argument.\n"); + rc = EINVAL; + goto vcpp_out; + } + } + while (cpuida <= cpuidb) { + rmcpu == 0 ? libxl_cpumap_set(cpumap, cpuida) : + libxl_cpumap_set(&exclude_cpumap, cpuida); + cpuida++; + } + } + + /* Clear all the cpus from the removal list */ + libxl_for_each_set_cpu(i, exclude_cpumap) { + libxl_cpumap_reset(cpumap, i); + } + +vcpp_out: + libxl_cpumap_dispose(&exclude_cpumap); + + return rc; +} + static void parse_config_data(const char *configfile_filename_report, const char *configfile_data, int configfile_len, @@ -579,7 +638,7 @@ const char *buf; long l; XLU_Config *config; - XLU_ConfigList *vbds, *nics, *pcis, *cvfbs, *cpuids; + XLU_ConfigList *cpus, *vbds, *nics, *pcis, *cvfbs, *cpuids; int pci_power_mgmt = 0; int pci_msitranslate = 1; int e; @@ -662,6 +721,29 @@ if (!xlu_cfg_get_long (config, "maxvcpus", &l, 0)) b_info->max_vcpus = l; + if (!xlu_cfg_get_list (config, "cpus", &cpus, 0, 1)) { + int i, n_cpus = 0; + + libxl_cpumap_set_none(&b_info->cpumap); + while ((buf = xlu_cfg_get_listitem(cpus, n_cpus)) != NULL) { + i = atoi(buf); + if (!libxl_cpumap_cpu_valid(&b_info->cpumap, i)) { + fprintf(stderr, "cpu %d illegal\n", i); + exit(1); + } + libxl_cpumap_set(&b_info->cpumap, i); + n_cpus++; + } + } + else if (!xlu_cfg_get_string (config, "cpus", &buf, 0)) { + char *buf2 = strdup(buf); + + libxl_cpumap_set_none(&b_info->cpumap); + if (vcpupin_parse(buf2, &b_info->cpumap)) + exit(1); + free(buf2); + } + if (!xlu_cfg_get_long (config, "memory", &l, 0)) { b_info->max_memkb = l * 1024; b_info->target_memkb = b_info->max_memkb; @@ -3568,65 +3650,6 @@ return 0; } -static int vcpupin_parse(char *cpu, libxl_cpumap *cpumap) -{ - libxl_cpumap exclude_cpumap; - uint32_t cpuida, cpuidb; - char *endptr, *toka, *tokb, *saveptr = NULL; - int i, rc = 0, rmcpu; - - if (!strcmp(cpu, "all")) { - memset(cpumap->map, -1, cpumap->size); - return 0; - } - - if (libxl_cpumap_alloc(ctx, &exclude_cpumap)) { - fprintf(stderr, "Error: Failed to allocate cpumap.\n"); - return ENOMEM; - } - - for (toka = strtok_r(cpu, ",", &saveptr); toka; - toka = strtok_r(NULL, ",", &saveptr)) { - rmcpu = 0; - if (*toka == '^') { - /* This (These) Cpu(s) will be removed from the map */ - toka++; - rmcpu = 1; - } - /* Extract a valid (range of) cpu(s) */ - cpuida = cpuidb = strtoul(toka, &endptr, 10); - if (endptr == toka) { - fprintf(stderr, "Error: Invalid argument.\n"); - rc = EINVAL; - goto vcpp_out; - } - if (*endptr == '-') { - tokb = endptr + 1; - cpuidb = strtoul(tokb, &endptr, 10); - if (endptr == tokb || cpuida > cpuidb) { - fprintf(stderr, "Error: Invalid argument.\n"); - rc = EINVAL; - goto vcpp_out; - } - } - while (cpuida <= cpuidb) { - rmcpu == 0 ? libxl_cpumap_set(cpumap, cpuida) : - libxl_cpumap_set(&exclude_cpumap, cpuida); - cpuida++; - } - } - - /* Clear all the cpus from the removal list */ - libxl_for_each_set_cpu(i, exclude_cpumap) { - libxl_cpumap_reset(cpumap, i); - } - -vcpp_out: - libxl_cpumap_dispose(&exclude_cpumap); - - return rc; -} - static void vcpupin(const char *d, const char *vcpu, char *cpu) { libxl_vcpuinfo *vcpuinfo; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:56:23 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:56: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 1RtR7H-0006bh-1t; Fri, 03 Feb 2012 21:56:23 +0000 Received: from mail174.messagelabs.com ([85.158.138.51]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7F-0006WB-7n for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:21 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-174.messagelabs.com!1328306172!11729440!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30376 invoked from network); 3 Feb 2012 21:56:13 -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; 3 Feb 2012 21:56:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR76-0001jc-4D for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR74-0002P2-0b for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:10 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:56:09 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: allow for specifying the CPU affinity in the config file. X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Dario Faggioli # Date 1327691823 0 # Node ID 54000bca7a6ad096f5cdbc9318ba0d099d76e1a7 # Parent 83ed83ceddf5a086558ab87db489d2169acaa936 libxl: allow for specifying the CPU affinity in the config file. Enable CPU affinity specification in a VM's config file with the exact syntax `xl vcpu-pin' provides. Signed-off-by: Dario Faggioli Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 83ed83ceddf5 -r 54000bca7a6a tools/libxl/libxl.c --- a/tools/libxl/libxl.c Fri Jan 27 19:14:00 2012 +0000 +++ b/tools/libxl/libxl.c Fri Jan 27 19:17:03 2012 +0000 @@ -2874,6 +2874,21 @@ return 0; } +int libxl_set_vcpuaffinity_all(libxl_ctx *ctx, uint32_t domid, + unsigned int max_vcpus, libxl_cpumap *cpumap) +{ + int i, rc = 0; + + for (i = 0; i < max_vcpus; i++) { + if (libxl_set_vcpuaffinity(ctx, domid, i, cpumap)) { + LIBXL__LOG(ctx, LIBXL__LOG_WARNING, + "failed to set affinity for %d", i); + rc = ERROR_FAIL; + } + } + return rc; +} + int libxl_set_vcpuonline(libxl_ctx *ctx, uint32_t domid, libxl_cpumap *cpumap) { GC_INIT(ctx); diff -r 83ed83ceddf5 -r 54000bca7a6a tools/libxl/libxl.h --- a/tools/libxl/libxl.h Fri Jan 27 19:14:00 2012 +0000 +++ b/tools/libxl/libxl.h Fri Jan 27 19:17:03 2012 +0000 @@ -588,6 +588,8 @@ int *nb_vcpu, int *nrcpus); int libxl_set_vcpuaffinity(libxl_ctx *ctx, uint32_t domid, uint32_t vcpuid, libxl_cpumap *cpumap); +int libxl_set_vcpuaffinity_all(libxl_ctx *ctx, uint32_t domid, + unsigned int max_vcpus, libxl_cpumap *cpumap); int libxl_set_vcpuonline(libxl_ctx *ctx, uint32_t domid, libxl_cpumap *cpumap); int libxl_get_sched_id(libxl_ctx *ctx); diff -r 83ed83ceddf5 -r 54000bca7a6a tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Fri Jan 27 19:14:00 2012 +0000 +++ b/tools/libxl/libxl_create.c Fri Jan 27 19:17:03 2012 +0000 @@ -71,6 +71,9 @@ memset(b_info, '\0', sizeof(*b_info)); b_info->max_vcpus = 1; b_info->cur_vcpus = 1; + if (libxl_cpumap_alloc(ctx, &b_info->cpumap)) + return ERROR_NOMEM; + libxl_cpumap_set_any(&b_info->cpumap); b_info->max_memkb = 32 * 1024; b_info->target_memkb = b_info->max_memkb; b_info->disable_migrate = 0; diff -r 83ed83ceddf5 -r 54000bca7a6a tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Fri Jan 27 19:14:00 2012 +0000 +++ b/tools/libxl/libxl_dom.c Fri Jan 27 19:17:03 2012 +0000 @@ -65,6 +65,7 @@ libxl_ctx *ctx = libxl__gc_owner(gc); int tsc_mode; 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); if (info->type == LIBXL_DOMAIN_TYPE_PV) xc_domain_set_memmap_limit(ctx->xch, domid, diff -r 83ed83ceddf5 -r 54000bca7a6a tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Fri Jan 27 19:14:00 2012 +0000 +++ b/tools/libxl/libxl_types.idl Fri Jan 27 19:17:03 2012 +0000 @@ -157,6 +157,7 @@ libxl_domain_build_info = Struct("domain_build_info",[ ("max_vcpus", integer), ("cur_vcpus", integer), + ("cpumap", libxl_cpumap), ("tsc_mode", libxl_tsc_mode), ("max_memkb", uint32), ("target_memkb", uint32), diff -r 83ed83ceddf5 -r 54000bca7a6a tools/libxl/libxl_utils.h --- a/tools/libxl/libxl_utils.h Fri Jan 27 19:14:00 2012 +0000 +++ b/tools/libxl/libxl_utils.h Fri Jan 27 19:17:03 2012 +0000 @@ -70,6 +70,18 @@ int libxl_cpumap_test(libxl_cpumap *cpumap, int cpu); void libxl_cpumap_set(libxl_cpumap *cpumap, int cpu); void libxl_cpumap_reset(libxl_cpumap *cpumap, int cpu); +static inline void libxl_cpumap_set_any(libxl_cpumap *cpumap) +{ + memset(cpumap->map, -1, cpumap->size); +} +static inline void libxl_cpumap_set_none(libxl_cpumap *cpumap) +{ + memset(cpumap->map, 0, cpumap->size); +} +static inline int libxl_cpumap_cpu_valid(libxl_cpumap *cpumap, int cpu) +{ + return cpu >= 0 && cpu < (cpumap->size * 8); +} #define libxl_for_each_cpu(var, map) for (var = 0; var < (map).size * 8; var++) #define libxl_for_each_set_cpu(v, m) for (v = 0; v < (m).size * 8; v++) \ if (libxl_cpumap_test(&(m), v)) diff -r 83ed83ceddf5 -r 54000bca7a6a tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Fri Jan 27 19:14:00 2012 +0000 +++ b/tools/libxl/xl_cmdimpl.c Fri Jan 27 19:17:03 2012 +0000 @@ -570,6 +570,65 @@ free(s); } +static int vcpupin_parse(char *cpu, libxl_cpumap *cpumap) +{ + libxl_cpumap exclude_cpumap; + uint32_t cpuida, cpuidb; + char *endptr, *toka, *tokb, *saveptr = NULL; + int i, rc = 0, rmcpu; + + if (!strcmp(cpu, "all")) { + libxl_cpumap_set_any(cpumap); + return 0; + } + + if (libxl_cpumap_alloc(ctx, &exclude_cpumap)) { + fprintf(stderr, "Error: Failed to allocate cpumap.\n"); + return ENOMEM; + } + + for (toka = strtok_r(cpu, ",", &saveptr); toka; + toka = strtok_r(NULL, ",", &saveptr)) { + rmcpu = 0; + if (*toka == '^') { + /* This (These) Cpu(s) will be removed from the map */ + toka++; + rmcpu = 1; + } + /* Extract a valid (range of) cpu(s) */ + cpuida = cpuidb = strtoul(toka, &endptr, 10); + if (endptr == toka) { + fprintf(stderr, "Error: Invalid argument.\n"); + rc = EINVAL; + goto vcpp_out; + } + if (*endptr == '-') { + tokb = endptr + 1; + cpuidb = strtoul(tokb, &endptr, 10); + if (endptr == tokb || cpuida > cpuidb) { + fprintf(stderr, "Error: Invalid argument.\n"); + rc = EINVAL; + goto vcpp_out; + } + } + while (cpuida <= cpuidb) { + rmcpu == 0 ? libxl_cpumap_set(cpumap, cpuida) : + libxl_cpumap_set(&exclude_cpumap, cpuida); + cpuida++; + } + } + + /* Clear all the cpus from the removal list */ + libxl_for_each_set_cpu(i, exclude_cpumap) { + libxl_cpumap_reset(cpumap, i); + } + +vcpp_out: + libxl_cpumap_dispose(&exclude_cpumap); + + return rc; +} + static void parse_config_data(const char *configfile_filename_report, const char *configfile_data, int configfile_len, @@ -579,7 +638,7 @@ const char *buf; long l; XLU_Config *config; - XLU_ConfigList *vbds, *nics, *pcis, *cvfbs, *cpuids; + XLU_ConfigList *cpus, *vbds, *nics, *pcis, *cvfbs, *cpuids; int pci_power_mgmt = 0; int pci_msitranslate = 1; int e; @@ -662,6 +721,29 @@ if (!xlu_cfg_get_long (config, "maxvcpus", &l, 0)) b_info->max_vcpus = l; + if (!xlu_cfg_get_list (config, "cpus", &cpus, 0, 1)) { + int i, n_cpus = 0; + + libxl_cpumap_set_none(&b_info->cpumap); + while ((buf = xlu_cfg_get_listitem(cpus, n_cpus)) != NULL) { + i = atoi(buf); + if (!libxl_cpumap_cpu_valid(&b_info->cpumap, i)) { + fprintf(stderr, "cpu %d illegal\n", i); + exit(1); + } + libxl_cpumap_set(&b_info->cpumap, i); + n_cpus++; + } + } + else if (!xlu_cfg_get_string (config, "cpus", &buf, 0)) { + char *buf2 = strdup(buf); + + libxl_cpumap_set_none(&b_info->cpumap); + if (vcpupin_parse(buf2, &b_info->cpumap)) + exit(1); + free(buf2); + } + if (!xlu_cfg_get_long (config, "memory", &l, 0)) { b_info->max_memkb = l * 1024; b_info->target_memkb = b_info->max_memkb; @@ -3568,65 +3650,6 @@ return 0; } -static int vcpupin_parse(char *cpu, libxl_cpumap *cpumap) -{ - libxl_cpumap exclude_cpumap; - uint32_t cpuida, cpuidb; - char *endptr, *toka, *tokb, *saveptr = NULL; - int i, rc = 0, rmcpu; - - if (!strcmp(cpu, "all")) { - memset(cpumap->map, -1, cpumap->size); - return 0; - } - - if (libxl_cpumap_alloc(ctx, &exclude_cpumap)) { - fprintf(stderr, "Error: Failed to allocate cpumap.\n"); - return ENOMEM; - } - - for (toka = strtok_r(cpu, ",", &saveptr); toka; - toka = strtok_r(NULL, ",", &saveptr)) { - rmcpu = 0; - if (*toka == '^') { - /* This (These) Cpu(s) will be removed from the map */ - toka++; - rmcpu = 1; - } - /* Extract a valid (range of) cpu(s) */ - cpuida = cpuidb = strtoul(toka, &endptr, 10); - if (endptr == toka) { - fprintf(stderr, "Error: Invalid argument.\n"); - rc = EINVAL; - goto vcpp_out; - } - if (*endptr == '-') { - tokb = endptr + 1; - cpuidb = strtoul(tokb, &endptr, 10); - if (endptr == tokb || cpuida > cpuidb) { - fprintf(stderr, "Error: Invalid argument.\n"); - rc = EINVAL; - goto vcpp_out; - } - } - while (cpuida <= cpuidb) { - rmcpu == 0 ? libxl_cpumap_set(cpumap, cpuida) : - libxl_cpumap_set(&exclude_cpumap, cpuida); - cpuida++; - } - } - - /* Clear all the cpus from the removal list */ - libxl_for_each_set_cpu(i, exclude_cpumap) { - libxl_cpumap_reset(cpumap, i); - } - -vcpp_out: - libxl_cpumap_dispose(&exclude_cpumap); - - return rc; -} - static void vcpupin(const char *d, const char *vcpu, char *cpu) { libxl_vcpuinfo *vcpuinfo; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:56:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:56: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 1RtR7K-0006eU-MX; Fri, 03 Feb 2012 21:56:26 +0000 Received: from mail216.messagelabs.com ([85.158.143.99]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7I-0006Yk-9X for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:24 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-216.messagelabs.com!1328306177!13423825!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.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22479 invoked from network); 3 Feb 2012 21:56:18 -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; 3 Feb 2012 21:56:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7A-0001jo-VG for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR79-0002Rt-Uy for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:16 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:56:15 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] vesa: flush lfb after zeroing X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Andrew Cooper # Date 1327758145 0 # Node ID ac9f32525376922fdf5b9efac7a1fe0ff866cc76 # Parent f8c2cf24a26cc6cdaaad9140e4b1dfc54f07bab3 vesa: flush lfb after zeroing If Xen is going to relinquish the VGA console, flush the linear frame buffer after zeroing it in vesa_endboot(). Failing to do so in some circumstances leads to the actual linear framebuffer on the graphics card still containing the output of the Xen boot console can lead to ugly graphics output when dom0 is setting up the graphics card for its own use. While the patch is quite large, it is mostly just code motion to prevent having to forward declare lfb_flush(). The only functional change to vesa_endboot() is to insert a call to lbf_flush(). Signed-off-by: Andrew Cooper Committed-by: Keir Fraser --- diff -r f8c2cf24a26c -r ac9f32525376 xen/drivers/video/vesa.c --- a/xen/drivers/video/vesa.c Sat Jan 28 13:41:42 2012 +0000 +++ b/xen/drivers/video/vesa.c Sat Jan 28 13:42:25 2012 +0000 @@ -151,24 +151,6 @@ xfree(line_len); } -void __init vesa_endboot(bool_t keep) -{ - if ( keep ) - { - xpos = 0; - vga_puts = vesa_scroll_puts; - } - else - { - unsigned int i, bpp = (vlfb_info.bits_per_pixel + 7) >> 3; - for ( i = 0; i < vlfb_info.height; i++ ) - memset(lfb + i * vlfb_info.bytes_per_line, 0, - vlfb_info.width * bpp); - } - - xfree(line_len); -} - #if defined(CONFIG_X86) #include @@ -215,6 +197,25 @@ #endif +void __init vesa_endboot(bool_t keep) +{ + if ( keep ) + { + xpos = 0; + vga_puts = vesa_scroll_puts; + } + else + { + unsigned int i, bpp = (vlfb_info.bits_per_pixel + 7) >> 3; + for ( i = 0; i < vlfb_info.height; i++ ) + memset(lfb + i * vlfb_info.bytes_per_line, 0, + vlfb_info.width * bpp); + lfb_flush(); + } + + xfree(line_len); +} + /* Render one line of text to given linear framebuffer line. */ static void vesa_show_line( const unsigned char *text_line, _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:56:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:56: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 1RtR7K-0006eU-MX; Fri, 03 Feb 2012 21:56:26 +0000 Received: from mail216.messagelabs.com ([85.158.143.99]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7I-0006Yk-9X for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:24 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-216.messagelabs.com!1328306177!13423825!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.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22479 invoked from network); 3 Feb 2012 21:56:18 -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; 3 Feb 2012 21:56:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7A-0001jo-VG for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR79-0002Rt-Uy for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:16 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:56:15 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] vesa: flush lfb after zeroing X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Andrew Cooper # Date 1327758145 0 # Node ID ac9f32525376922fdf5b9efac7a1fe0ff866cc76 # Parent f8c2cf24a26cc6cdaaad9140e4b1dfc54f07bab3 vesa: flush lfb after zeroing If Xen is going to relinquish the VGA console, flush the linear frame buffer after zeroing it in vesa_endboot(). Failing to do so in some circumstances leads to the actual linear framebuffer on the graphics card still containing the output of the Xen boot console can lead to ugly graphics output when dom0 is setting up the graphics card for its own use. While the patch is quite large, it is mostly just code motion to prevent having to forward declare lfb_flush(). The only functional change to vesa_endboot() is to insert a call to lbf_flush(). Signed-off-by: Andrew Cooper Committed-by: Keir Fraser --- diff -r f8c2cf24a26c -r ac9f32525376 xen/drivers/video/vesa.c --- a/xen/drivers/video/vesa.c Sat Jan 28 13:41:42 2012 +0000 +++ b/xen/drivers/video/vesa.c Sat Jan 28 13:42:25 2012 +0000 @@ -151,24 +151,6 @@ xfree(line_len); } -void __init vesa_endboot(bool_t keep) -{ - if ( keep ) - { - xpos = 0; - vga_puts = vesa_scroll_puts; - } - else - { - unsigned int i, bpp = (vlfb_info.bits_per_pixel + 7) >> 3; - for ( i = 0; i < vlfb_info.height; i++ ) - memset(lfb + i * vlfb_info.bytes_per_line, 0, - vlfb_info.width * bpp); - } - - xfree(line_len); -} - #if defined(CONFIG_X86) #include @@ -215,6 +197,25 @@ #endif +void __init vesa_endboot(bool_t keep) +{ + if ( keep ) + { + xpos = 0; + vga_puts = vesa_scroll_puts; + } + else + { + unsigned int i, bpp = (vlfb_info.bits_per_pixel + 7) >> 3; + for ( i = 0; i < vlfb_info.height; i++ ) + memset(lfb + i * vlfb_info.bytes_per_line, 0, + vlfb_info.width * bpp); + lfb_flush(); + } + + xfree(line_len); +} + /* Render one line of text to given linear framebuffer line. */ static void vesa_show_line( const unsigned char *text_line, _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:56:30 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:56: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 1RtR7N-0006hg-PP; Fri, 03 Feb 2012 21:56:29 +0000 Received: from mail182.messagelabs.com ([85.158.139.83]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7M-0006bl-I6 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:28 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-182.messagelabs.com!1328306180!13640284!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30319 invoked from network); 3 Feb 2012 21:56:21 -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; 3 Feb 2012 21:56:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7E-0001jx-6I for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR7C-0002So-Ii for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:19 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:56:16 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xen: introduce PHYSDEVOP_pirq_eoi_gmfn_v2 X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Stefano Stabellini # Date 1327758313 0 # Node ID 3bd3949854efa13ef1a9874711b558169408f61d # Parent ac9f32525376922fdf5b9efac7a1fe0ff866cc76 xen: introduce PHYSDEVOP_pirq_eoi_gmfn_v2 PHYSDEVOP_pirq_eoi_gmfn changes the semantics of PHYSDEVOP_eoi. In order to improve the interface this patch: - renames PHYSDEVOP_pirq_eoi_gmfn to PHYSDEVOP_pirq_eoi_gmfn_v1; - introduces PHYSDEVOP_pirq_eoi_gmfn_v2, that is like PHYSDEVOP_pirq_eoi_gmfn_v1 but it doesn't modify the behaviour of another hypercall; - bump __XEN_LATEST_INTERFACE_VERSION__; - #define PHYSDEVOP_pirq_eoi_gmfn to PHYSDEVOP_pirq_eoi_gmfn_v1 or PHYSDEVOP_pirq_eoi_gmfn_v2 depending on the __XEN_INTERFACE_VERSION. Signed-off-by: Stefano Stabellini Committed-by: Keir Fraser --- diff -r ac9f32525376 -r 3bd3949854ef xen/arch/ia64/xen/domain.c --- a/xen/arch/ia64/xen/domain.c Sat Jan 28 13:42:25 2012 +0000 +++ b/xen/arch/ia64/xen/domain.c Sat Jan 28 13:45:13 2012 +0000 @@ -1731,6 +1731,7 @@ if (d->arch.pirq_eoi_map != NULL) { put_page(virt_to_page(d->arch.pirq_eoi_map)); d->arch.pirq_eoi_map = NULL; + d->arch.auto_unmask = 0; } /* Tear down shadow mode stuff. */ diff -r ac9f32525376 -r 3bd3949854ef xen/arch/ia64/xen/hypercall.c --- a/xen/arch/ia64/xen/hypercall.c Sat Jan 28 13:42:25 2012 +0000 +++ b/xen/arch/ia64/xen/hypercall.c Sat Jan 28 13:45:13 2012 +0000 @@ -65,7 +65,7 @@ { if ( pirq < 0 || pirq >= NR_IRQS ) return -EINVAL; - if ( d->arch.pirq_eoi_map ) { + if ( d->arch.auto_unmask ) { spin_lock(&d->event_lock); evtchn_unmask(pirq_to_evtchn(d, pirq)); spin_unlock(&d->event_lock); @@ -508,7 +508,8 @@ break; } - case PHYSDEVOP_pirq_eoi_gmfn: { + case PHYSDEVOP_pirq_eoi_gmfn_v1: + case PHYSDEVOP_pirq_eoi_gmfn_v2: { struct physdev_pirq_eoi_gmfn info; unsigned long mfn; @@ -531,6 +532,8 @@ } current->domain->arch.pirq_eoi_map = mfn_to_virt(mfn); + if ( cmd == PHYSDEVOP_pirq_eoi_gmfn_v1 ) + current->domain->arch.auto_unmask = 1; ret = 0; break; } diff -r ac9f32525376 -r 3bd3949854ef xen/arch/x86/domain.c --- a/xen/arch/x86/domain.c Sat Jan 28 13:42:25 2012 +0000 +++ b/xen/arch/x86/domain.c Sat Jan 28 13:45:13 2012 +0000 @@ -2125,6 +2125,7 @@ put_page_and_type( mfn_to_page(d->arch.pv_domain.pirq_eoi_map_mfn)); d->arch.pv_domain.pirq_eoi_map = NULL; + d->arch.pv_domain.auto_unmask = 0; } } diff -r ac9f32525376 -r 3bd3949854ef xen/arch/x86/physdev.c --- a/xen/arch/x86/physdev.c Sat Jan 28 13:42:25 2012 +0000 +++ b/xen/arch/x86/physdev.c Sat Jan 28 13:45:13 2012 +0000 @@ -271,7 +271,7 @@ break; } if ( !is_hvm_domain(v->domain) && - v->domain->arch.pv_domain.pirq_eoi_map ) + v->domain->arch.pv_domain.auto_unmask ) evtchn_unmask(pirq->evtchn); if ( !is_hvm_domain(v->domain) || domain_pirq_to_irq(v->domain, eoi.irq) > 0 ) @@ -293,7 +293,8 @@ break; } - case PHYSDEVOP_pirq_eoi_gmfn: { + case PHYSDEVOP_pirq_eoi_gmfn_v2: + case PHYSDEVOP_pirq_eoi_gmfn_v1: { struct physdev_pirq_eoi_gmfn info; unsigned long mfn; @@ -329,6 +330,8 @@ ret = -ENOSPC; break; } + if ( cmd == PHYSDEVOP_pirq_eoi_gmfn_v1 ) + v->domain->arch.pv_domain.auto_unmask = 1; put_gfn(current->domain, info.gmfn); ret = 0; diff -r ac9f32525376 -r 3bd3949854ef xen/include/asm-ia64/domain.h --- a/xen/include/asm-ia64/domain.h Sat Jan 28 13:42:25 2012 +0000 +++ b/xen/include/asm-ia64/domain.h Sat Jan 28 13:45:13 2012 +0000 @@ -186,6 +186,9 @@ /* Shared page for notifying that explicit PIRQ EOI is required. */ unsigned long *pirq_eoi_map; unsigned long pirq_eoi_map_mfn; + /* set auto_unmask to 1 if you want PHYSDEVOP_eoi to automatically + * unmask the event channel */ + bool_t auto_unmask; /* Address of efi_runtime_services_t (placed in domain memory) */ void *efi_runtime; diff -r ac9f32525376 -r 3bd3949854ef xen/include/asm-x86/domain.h --- a/xen/include/asm-x86/domain.h Sat Jan 28 13:42:25 2012 +0000 +++ b/xen/include/asm-x86/domain.h Sat Jan 28 13:45:13 2012 +0000 @@ -231,6 +231,9 @@ /* Shared page for notifying that explicit PIRQ EOI is required. */ unsigned long *pirq_eoi_map; unsigned long pirq_eoi_map_mfn; + /* set auto_unmask to 1 if you want PHYSDEVOP_eoi to automatically + * unmask the event channel */ + bool_t auto_unmask; /* Pseudophysical e820 map (XENMEM_memory_map). */ spinlock_t e820_lock; diff -r ac9f32525376 -r 3bd3949854ef xen/include/public/physdev.h --- a/xen/include/public/physdev.h Sat Jan 28 13:42:25 2012 +0000 +++ b/xen/include/public/physdev.h Sat Jan 28 13:45:13 2012 +0000 @@ -49,7 +49,15 @@ * will automatically get unmasked. The page registered is used as a bit * array indexed by Xen's PIRQ value. */ -#define PHYSDEVOP_pirq_eoi_gmfn 17 +#define PHYSDEVOP_pirq_eoi_gmfn_v1 17 +/* + * Register a shared page for the hypervisor to indicate whether the + * guest must issue PHYSDEVOP_eoi. This hypercall is very similar to + * PHYSDEVOP_pirq_eoi_gmfn_v1 but it doesn't change the semantics of + * PHYSDEVOP_eoi. The page registered is used as a bit array indexed by + * Xen's PIRQ value. + */ +#define PHYSDEVOP_pirq_eoi_gmfn_v2 28 struct physdev_pirq_eoi_gmfn { /* IN */ xen_pfn_t gmfn; @@ -325,6 +333,12 @@ #define PHYSDEVOP_IRQ_NEEDS_UNMASK_NOTIFY XENIRQSTAT_needs_eoi #define PHYSDEVOP_IRQ_SHARED XENIRQSTAT_shared +#if __XEN_INTERFACE_VERSION < 0x00040200 +#define PHYSDEVOP_pirq_eoi_gmfn PHYSDEVOP_pirq_eoi_gmfn_v1 +#else +#define PHYSDEVOP_pirq_eoi_gmfn PHYSDEVOP_pirq_eoi_gmfn_v2 +#endif + #endif /* __XEN_PUBLIC_PHYSDEV_H__ */ /* diff -r ac9f32525376 -r 3bd3949854ef xen/include/public/xen-compat.h --- a/xen/include/public/xen-compat.h Sat Jan 28 13:42:25 2012 +0000 +++ b/xen/include/public/xen-compat.h Sat Jan 28 13:45:13 2012 +0000 @@ -27,7 +27,7 @@ #ifndef __XEN_PUBLIC_XEN_COMPAT_H__ #define __XEN_PUBLIC_XEN_COMPAT_H__ -#define __XEN_LATEST_INTERFACE_VERSION__ 0x0003020a +#define __XEN_LATEST_INTERFACE_VERSION__ 0x00040200 #if defined(__XEN__) || defined(__XEN_TOOLS__) /* Xen is built with matching headers and implements the latest interface. */ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:56:30 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:56: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 1RtR7N-0006hg-PP; Fri, 03 Feb 2012 21:56:29 +0000 Received: from mail182.messagelabs.com ([85.158.139.83]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7M-0006bl-I6 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:28 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-182.messagelabs.com!1328306180!13640284!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30319 invoked from network); 3 Feb 2012 21:56:21 -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; 3 Feb 2012 21:56:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7E-0001jx-6I for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR7C-0002So-Ii for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:19 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:56:16 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xen: introduce PHYSDEVOP_pirq_eoi_gmfn_v2 X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Stefano Stabellini # Date 1327758313 0 # Node ID 3bd3949854efa13ef1a9874711b558169408f61d # Parent ac9f32525376922fdf5b9efac7a1fe0ff866cc76 xen: introduce PHYSDEVOP_pirq_eoi_gmfn_v2 PHYSDEVOP_pirq_eoi_gmfn changes the semantics of PHYSDEVOP_eoi. In order to improve the interface this patch: - renames PHYSDEVOP_pirq_eoi_gmfn to PHYSDEVOP_pirq_eoi_gmfn_v1; - introduces PHYSDEVOP_pirq_eoi_gmfn_v2, that is like PHYSDEVOP_pirq_eoi_gmfn_v1 but it doesn't modify the behaviour of another hypercall; - bump __XEN_LATEST_INTERFACE_VERSION__; - #define PHYSDEVOP_pirq_eoi_gmfn to PHYSDEVOP_pirq_eoi_gmfn_v1 or PHYSDEVOP_pirq_eoi_gmfn_v2 depending on the __XEN_INTERFACE_VERSION. Signed-off-by: Stefano Stabellini Committed-by: Keir Fraser --- diff -r ac9f32525376 -r 3bd3949854ef xen/arch/ia64/xen/domain.c --- a/xen/arch/ia64/xen/domain.c Sat Jan 28 13:42:25 2012 +0000 +++ b/xen/arch/ia64/xen/domain.c Sat Jan 28 13:45:13 2012 +0000 @@ -1731,6 +1731,7 @@ if (d->arch.pirq_eoi_map != NULL) { put_page(virt_to_page(d->arch.pirq_eoi_map)); d->arch.pirq_eoi_map = NULL; + d->arch.auto_unmask = 0; } /* Tear down shadow mode stuff. */ diff -r ac9f32525376 -r 3bd3949854ef xen/arch/ia64/xen/hypercall.c --- a/xen/arch/ia64/xen/hypercall.c Sat Jan 28 13:42:25 2012 +0000 +++ b/xen/arch/ia64/xen/hypercall.c Sat Jan 28 13:45:13 2012 +0000 @@ -65,7 +65,7 @@ { if ( pirq < 0 || pirq >= NR_IRQS ) return -EINVAL; - if ( d->arch.pirq_eoi_map ) { + if ( d->arch.auto_unmask ) { spin_lock(&d->event_lock); evtchn_unmask(pirq_to_evtchn(d, pirq)); spin_unlock(&d->event_lock); @@ -508,7 +508,8 @@ break; } - case PHYSDEVOP_pirq_eoi_gmfn: { + case PHYSDEVOP_pirq_eoi_gmfn_v1: + case PHYSDEVOP_pirq_eoi_gmfn_v2: { struct physdev_pirq_eoi_gmfn info; unsigned long mfn; @@ -531,6 +532,8 @@ } current->domain->arch.pirq_eoi_map = mfn_to_virt(mfn); + if ( cmd == PHYSDEVOP_pirq_eoi_gmfn_v1 ) + current->domain->arch.auto_unmask = 1; ret = 0; break; } diff -r ac9f32525376 -r 3bd3949854ef xen/arch/x86/domain.c --- a/xen/arch/x86/domain.c Sat Jan 28 13:42:25 2012 +0000 +++ b/xen/arch/x86/domain.c Sat Jan 28 13:45:13 2012 +0000 @@ -2125,6 +2125,7 @@ put_page_and_type( mfn_to_page(d->arch.pv_domain.pirq_eoi_map_mfn)); d->arch.pv_domain.pirq_eoi_map = NULL; + d->arch.pv_domain.auto_unmask = 0; } } diff -r ac9f32525376 -r 3bd3949854ef xen/arch/x86/physdev.c --- a/xen/arch/x86/physdev.c Sat Jan 28 13:42:25 2012 +0000 +++ b/xen/arch/x86/physdev.c Sat Jan 28 13:45:13 2012 +0000 @@ -271,7 +271,7 @@ break; } if ( !is_hvm_domain(v->domain) && - v->domain->arch.pv_domain.pirq_eoi_map ) + v->domain->arch.pv_domain.auto_unmask ) evtchn_unmask(pirq->evtchn); if ( !is_hvm_domain(v->domain) || domain_pirq_to_irq(v->domain, eoi.irq) > 0 ) @@ -293,7 +293,8 @@ break; } - case PHYSDEVOP_pirq_eoi_gmfn: { + case PHYSDEVOP_pirq_eoi_gmfn_v2: + case PHYSDEVOP_pirq_eoi_gmfn_v1: { struct physdev_pirq_eoi_gmfn info; unsigned long mfn; @@ -329,6 +330,8 @@ ret = -ENOSPC; break; } + if ( cmd == PHYSDEVOP_pirq_eoi_gmfn_v1 ) + v->domain->arch.pv_domain.auto_unmask = 1; put_gfn(current->domain, info.gmfn); ret = 0; diff -r ac9f32525376 -r 3bd3949854ef xen/include/asm-ia64/domain.h --- a/xen/include/asm-ia64/domain.h Sat Jan 28 13:42:25 2012 +0000 +++ b/xen/include/asm-ia64/domain.h Sat Jan 28 13:45:13 2012 +0000 @@ -186,6 +186,9 @@ /* Shared page for notifying that explicit PIRQ EOI is required. */ unsigned long *pirq_eoi_map; unsigned long pirq_eoi_map_mfn; + /* set auto_unmask to 1 if you want PHYSDEVOP_eoi to automatically + * unmask the event channel */ + bool_t auto_unmask; /* Address of efi_runtime_services_t (placed in domain memory) */ void *efi_runtime; diff -r ac9f32525376 -r 3bd3949854ef xen/include/asm-x86/domain.h --- a/xen/include/asm-x86/domain.h Sat Jan 28 13:42:25 2012 +0000 +++ b/xen/include/asm-x86/domain.h Sat Jan 28 13:45:13 2012 +0000 @@ -231,6 +231,9 @@ /* Shared page for notifying that explicit PIRQ EOI is required. */ unsigned long *pirq_eoi_map; unsigned long pirq_eoi_map_mfn; + /* set auto_unmask to 1 if you want PHYSDEVOP_eoi to automatically + * unmask the event channel */ + bool_t auto_unmask; /* Pseudophysical e820 map (XENMEM_memory_map). */ spinlock_t e820_lock; diff -r ac9f32525376 -r 3bd3949854ef xen/include/public/physdev.h --- a/xen/include/public/physdev.h Sat Jan 28 13:42:25 2012 +0000 +++ b/xen/include/public/physdev.h Sat Jan 28 13:45:13 2012 +0000 @@ -49,7 +49,15 @@ * will automatically get unmasked. The page registered is used as a bit * array indexed by Xen's PIRQ value. */ -#define PHYSDEVOP_pirq_eoi_gmfn 17 +#define PHYSDEVOP_pirq_eoi_gmfn_v1 17 +/* + * Register a shared page for the hypervisor to indicate whether the + * guest must issue PHYSDEVOP_eoi. This hypercall is very similar to + * PHYSDEVOP_pirq_eoi_gmfn_v1 but it doesn't change the semantics of + * PHYSDEVOP_eoi. The page registered is used as a bit array indexed by + * Xen's PIRQ value. + */ +#define PHYSDEVOP_pirq_eoi_gmfn_v2 28 struct physdev_pirq_eoi_gmfn { /* IN */ xen_pfn_t gmfn; @@ -325,6 +333,12 @@ #define PHYSDEVOP_IRQ_NEEDS_UNMASK_NOTIFY XENIRQSTAT_needs_eoi #define PHYSDEVOP_IRQ_SHARED XENIRQSTAT_shared +#if __XEN_INTERFACE_VERSION < 0x00040200 +#define PHYSDEVOP_pirq_eoi_gmfn PHYSDEVOP_pirq_eoi_gmfn_v1 +#else +#define PHYSDEVOP_pirq_eoi_gmfn PHYSDEVOP_pirq_eoi_gmfn_v2 +#endif + #endif /* __XEN_PUBLIC_PHYSDEV_H__ */ /* diff -r ac9f32525376 -r 3bd3949854ef xen/include/public/xen-compat.h --- a/xen/include/public/xen-compat.h Sat Jan 28 13:42:25 2012 +0000 +++ b/xen/include/public/xen-compat.h Sat Jan 28 13:45:13 2012 +0000 @@ -27,7 +27,7 @@ #ifndef __XEN_PUBLIC_XEN_COMPAT_H__ #define __XEN_PUBLIC_XEN_COMPAT_H__ -#define __XEN_LATEST_INTERFACE_VERSION__ 0x0003020a +#define __XEN_LATEST_INTERFACE_VERSION__ 0x00040200 #if defined(__XEN__) || defined(__XEN_TOOLS__) /* Xen is built with matching headers and implements the latest interface. */ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:56:34 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:56:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7R-0006lW-SR; Fri, 03 Feb 2012 21:56:33 +0000 Received: from mail182.messagelabs.com ([85.158.139.83]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7Q-0006fA-Hg for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:32 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-182.messagelabs.com!1328306184!13639511!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.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10201 invoked from network); 3 Feb 2012 21:56:25 -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; 3 Feb 2012 21:56:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7I-0001k3-1D for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR7F-0002Tk-Hl for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:23 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:56:20 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xen: reinstate previously unused XENMEM_remove_from_physmap hypercall X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Daniel De Graaf # Date 1327758444 0 # Node ID 34c96082d69389e5891bbc1c424d0199355632df # Parent 3bd3949854efa13ef1a9874711b558169408f61d xen: reinstate previously unused XENMEM_remove_from_physmap hypercall This patch reinstates the XENMEM_remove_from_physmap hypercall which was removed in 19041:ee62aaafff46 because it was not used. However, is now needed in order to support xenstored stub domains. The xenstored stub domain is not priviliged like dom0 and so cannot unilaterally map the xenbus page of other guests into it's address space. Therefore, before creating a domU the domain builder needs to seed its grant table with a grant ref allowing the xenstored stub domain to access the new domU's xenbus page. At present domU's do not start with their grant table mapped. Instead it gets mapped when the guest requests a grant table from the hypervisor. In order to seed the grant table, the domain builder first needs to map it into dom0 address space. But the hypercall to do this requires a gpfn (guest pfn), which is an mfn for PV guest, but a pfn for HVM guests. Therfore, in order to seed the grant table of an HVM guest, dom0 needs to *temporarily* map it into the guest's "physical" address space. Hence the need to reinstate the XENMEM_remove_from_physmap hypercall. Signed-off-by: Alex Zeffertt Signed-off-by: Daniel De Graaf Acked-by: Ian Campbell Committed-by: Keir Fraser --- diff -r 3bd3949854ef -r 34c96082d693 xen/common/compat/memory.c --- a/xen/common/compat/memory.c Sat Jan 28 13:45:13 2012 +0000 +++ b/xen/common/compat/memory.c Sat Jan 28 13:47:24 2012 +0000 @@ -25,6 +25,7 @@ XEN_GUEST_HANDLE(void) hnd; struct xen_memory_reservation *rsrv; struct xen_memory_exchange *xchg; + struct xen_remove_from_physmap *xrfp; } nat; union { struct compat_memory_reservation rsrv; @@ -179,6 +180,18 @@ nat.hnd = compat; break; + case XENMEM_remove_from_physmap: + { + struct compat_remove_from_physmap cmp; + + if ( copy_from_guest(&cmp, compat, 1) ) + return -EFAULT; + + XLAT_remove_from_physmap(nat.xrfp, &cmp); + + break; + } + default: return compat_arch_memory_op(cmd, compat); } @@ -284,6 +297,7 @@ case XENMEM_current_reservation: case XENMEM_maximum_reservation: case XENMEM_maximum_gpfn: + case XENMEM_remove_from_physmap: break; default: diff -r 3bd3949854ef -r 34c96082d693 xen/common/memory.c --- a/xen/common/memory.c Sat Jan 28 13:45:13 2012 +0000 +++ b/xen/common/memory.c Sat Jan 28 13:47:24 2012 +0000 @@ -659,6 +659,43 @@ break; + case XENMEM_remove_from_physmap: + { + struct xen_remove_from_physmap xrfp; + unsigned long mfn; + struct domain *d; + + if ( copy_from_guest(&xrfp, arg, 1) ) + return -EFAULT; + + rc = rcu_lock_target_domain_by_id(xrfp.domid, &d); + if ( rc != 0 ) + return rc; + + if ( xsm_remove_from_physmap(current->domain, d) ) + { + rcu_unlock_domain(d); + return -EPERM; + } + + domain_lock(d); + + mfn = get_gfn_untyped(d, xrfp.gpfn); + + if ( mfn_valid(mfn) ) + guest_physmap_remove_page(d, xrfp.gpfn, mfn, PAGE_ORDER_4K); + else + rc = -ENOENT; + + put_gfn(d, xrfp.gpfn); + + domain_unlock(d); + + rcu_unlock_domain(d); + + break; + } + default: rc = arch_memory_op(op, arg); break; diff -r 3bd3949854ef -r 34c96082d693 xen/include/asm-ia64/mm.h --- a/xen/include/asm-ia64/mm.h Sat Jan 28 13:45:13 2012 +0000 +++ b/xen/include/asm-ia64/mm.h Sat Jan 28 13:47:24 2012 +0000 @@ -550,6 +550,7 @@ #define gmfn_to_mfn(_d, gpfn) \ gmfn_to_mfn_foreign((_d), (gpfn)) +#define get_gfn_untyped(d, gpfn) gmfn_to_mfn(d, gpfn) #define put_gfn(d, g) ((void)0) #define __gpfn_invalid(_d, gpfn) \ diff -r 3bd3949854ef -r 34c96082d693 xen/include/public/memory.h --- a/xen/include/public/memory.h Sat Jan 28 13:45:13 2012 +0000 +++ b/xen/include/public/memory.h Sat Jan 28 13:47:24 2012 +0000 @@ -229,6 +229,22 @@ typedef struct xen_add_to_physmap xen_add_to_physmap_t; DEFINE_XEN_GUEST_HANDLE(xen_add_to_physmap_t); +/* + * Unmaps the page appearing at a particular GPFN from the specified guest's + * pseudophysical address space. + * arg == addr of xen_remove_from_physmap_t. + */ +#define XENMEM_remove_from_physmap 15 +struct xen_remove_from_physmap { + /* Which domain to change the mapping for. */ + domid_t domid; + + /* GPFN of the current mapping of the page. */ + xen_pfn_t gpfn; +}; +typedef struct xen_remove_from_physmap xen_remove_from_physmap_t; +DEFINE_XEN_GUEST_HANDLE(xen_remove_from_physmap_t); + /*** REMOVED ***/ /*#define XENMEM_translate_gpfn_list 8*/ diff -r 3bd3949854ef -r 34c96082d693 xen/include/xlat.lst --- a/xen/include/xlat.lst Sat Jan 28 13:45:13 2012 +0000 +++ b/xen/include/xlat.lst Sat Jan 28 13:47:24 2012 +0000 @@ -60,6 +60,7 @@ ! memory_map memory.h ! memory_reservation memory.h ! pod_target memory.h +! remove_from_physmap memory.h ? physdev_eoi physdev.h ? physdev_get_free_pirq physdev.h ? physdev_irq physdev.h diff -r 3bd3949854ef -r 34c96082d693 xen/include/xsm/xsm.h --- a/xen/include/xsm/xsm.h Sat Jan 28 13:45:13 2012 +0000 +++ b/xen/include/xsm/xsm.h Sat Jan 28 13:47:24 2012 +0000 @@ -169,6 +169,7 @@ int (*update_va_mapping) (struct domain *d, struct domain *f, l1_pgentry_t pte); int (*add_to_physmap) (struct domain *d1, struct domain *d2); + int (*remove_from_physmap) (struct domain *d1, struct domain *d2); int (*sendtrigger) (struct domain *d); int (*bind_pt_irq) (struct domain *d, struct xen_domctl_bind_pt_irq *bind); int (*unbind_pt_irq) (struct domain *d); @@ -738,6 +739,11 @@ return xsm_call(add_to_physmap(d1, d2)); } +static inline int xsm_remove_from_physmap(struct domain *d1, struct domain *d2) +{ + return xsm_call(remove_from_physmap(d1, d2)); +} + static inline int xsm_sendtrigger(struct domain *d) { return xsm_call(sendtrigger(d)); diff -r 3bd3949854ef -r 34c96082d693 xen/xsm/dummy.c --- a/xen/xsm/dummy.c Sat Jan 28 13:45:13 2012 +0000 +++ b/xen/xsm/dummy.c Sat Jan 28 13:47:24 2012 +0000 @@ -529,6 +529,11 @@ return 0; } +static int dummy_remove_from_physmap (struct domain *d1, struct domain *d2) +{ + return 0; +} + static int dummy_sendtrigger (struct domain *d) { return 0; @@ -690,6 +695,7 @@ set_to_dummy_if_null(ops, mmu_machphys_update); set_to_dummy_if_null(ops, update_va_mapping); set_to_dummy_if_null(ops, add_to_physmap); + set_to_dummy_if_null(ops, remove_from_physmap); set_to_dummy_if_null(ops, sendtrigger); set_to_dummy_if_null(ops, bind_pt_irq); set_to_dummy_if_null(ops, pin_mem_cacheattr); diff -r 3bd3949854ef -r 34c96082d693 xen/xsm/flask/hooks.c --- a/xen/xsm/flask/hooks.c Sat Jan 28 13:45:13 2012 +0000 +++ b/xen/xsm/flask/hooks.c Sat Jan 28 13:47:24 2012 +0000 @@ -1283,6 +1283,11 @@ return domain_has_perm(d1, d2, SECCLASS_MMU, MMU__PHYSMAP); } +static int flask_remove_from_physmap(struct domain *d1, struct domain *d2) +{ + return domain_has_perm(d1, d2, SECCLASS_MMU, MMU__PHYSMAP); +} + static int flask_sendtrigger(struct domain *d) { return domain_has_perm(current->domain, d, SECCLASS_DOMAIN, DOMAIN__TRIGGER); @@ -1550,6 +1555,7 @@ .mmu_machphys_update = flask_mmu_machphys_update, .update_va_mapping = flask_update_va_mapping, .add_to_physmap = flask_add_to_physmap, + .remove_from_physmap = flask_remove_from_physmap, .sendtrigger = flask_sendtrigger, .get_device_group = flask_get_device_group, .test_assign_device = flask_test_assign_device, _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:56:34 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:56:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7R-0006lW-SR; Fri, 03 Feb 2012 21:56:33 +0000 Received: from mail182.messagelabs.com ([85.158.139.83]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7Q-0006fA-Hg for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:32 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-182.messagelabs.com!1328306184!13639511!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.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10201 invoked from network); 3 Feb 2012 21:56:25 -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; 3 Feb 2012 21:56:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7I-0001k3-1D for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR7F-0002Tk-Hl for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:23 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:56:20 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xen: reinstate previously unused XENMEM_remove_from_physmap hypercall X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Daniel De Graaf # Date 1327758444 0 # Node ID 34c96082d69389e5891bbc1c424d0199355632df # Parent 3bd3949854efa13ef1a9874711b558169408f61d xen: reinstate previously unused XENMEM_remove_from_physmap hypercall This patch reinstates the XENMEM_remove_from_physmap hypercall which was removed in 19041:ee62aaafff46 because it was not used. However, is now needed in order to support xenstored stub domains. The xenstored stub domain is not priviliged like dom0 and so cannot unilaterally map the xenbus page of other guests into it's address space. Therefore, before creating a domU the domain builder needs to seed its grant table with a grant ref allowing the xenstored stub domain to access the new domU's xenbus page. At present domU's do not start with their grant table mapped. Instead it gets mapped when the guest requests a grant table from the hypervisor. In order to seed the grant table, the domain builder first needs to map it into dom0 address space. But the hypercall to do this requires a gpfn (guest pfn), which is an mfn for PV guest, but a pfn for HVM guests. Therfore, in order to seed the grant table of an HVM guest, dom0 needs to *temporarily* map it into the guest's "physical" address space. Hence the need to reinstate the XENMEM_remove_from_physmap hypercall. Signed-off-by: Alex Zeffertt Signed-off-by: Daniel De Graaf Acked-by: Ian Campbell Committed-by: Keir Fraser --- diff -r 3bd3949854ef -r 34c96082d693 xen/common/compat/memory.c --- a/xen/common/compat/memory.c Sat Jan 28 13:45:13 2012 +0000 +++ b/xen/common/compat/memory.c Sat Jan 28 13:47:24 2012 +0000 @@ -25,6 +25,7 @@ XEN_GUEST_HANDLE(void) hnd; struct xen_memory_reservation *rsrv; struct xen_memory_exchange *xchg; + struct xen_remove_from_physmap *xrfp; } nat; union { struct compat_memory_reservation rsrv; @@ -179,6 +180,18 @@ nat.hnd = compat; break; + case XENMEM_remove_from_physmap: + { + struct compat_remove_from_physmap cmp; + + if ( copy_from_guest(&cmp, compat, 1) ) + return -EFAULT; + + XLAT_remove_from_physmap(nat.xrfp, &cmp); + + break; + } + default: return compat_arch_memory_op(cmd, compat); } @@ -284,6 +297,7 @@ case XENMEM_current_reservation: case XENMEM_maximum_reservation: case XENMEM_maximum_gpfn: + case XENMEM_remove_from_physmap: break; default: diff -r 3bd3949854ef -r 34c96082d693 xen/common/memory.c --- a/xen/common/memory.c Sat Jan 28 13:45:13 2012 +0000 +++ b/xen/common/memory.c Sat Jan 28 13:47:24 2012 +0000 @@ -659,6 +659,43 @@ break; + case XENMEM_remove_from_physmap: + { + struct xen_remove_from_physmap xrfp; + unsigned long mfn; + struct domain *d; + + if ( copy_from_guest(&xrfp, arg, 1) ) + return -EFAULT; + + rc = rcu_lock_target_domain_by_id(xrfp.domid, &d); + if ( rc != 0 ) + return rc; + + if ( xsm_remove_from_physmap(current->domain, d) ) + { + rcu_unlock_domain(d); + return -EPERM; + } + + domain_lock(d); + + mfn = get_gfn_untyped(d, xrfp.gpfn); + + if ( mfn_valid(mfn) ) + guest_physmap_remove_page(d, xrfp.gpfn, mfn, PAGE_ORDER_4K); + else + rc = -ENOENT; + + put_gfn(d, xrfp.gpfn); + + domain_unlock(d); + + rcu_unlock_domain(d); + + break; + } + default: rc = arch_memory_op(op, arg); break; diff -r 3bd3949854ef -r 34c96082d693 xen/include/asm-ia64/mm.h --- a/xen/include/asm-ia64/mm.h Sat Jan 28 13:45:13 2012 +0000 +++ b/xen/include/asm-ia64/mm.h Sat Jan 28 13:47:24 2012 +0000 @@ -550,6 +550,7 @@ #define gmfn_to_mfn(_d, gpfn) \ gmfn_to_mfn_foreign((_d), (gpfn)) +#define get_gfn_untyped(d, gpfn) gmfn_to_mfn(d, gpfn) #define put_gfn(d, g) ((void)0) #define __gpfn_invalid(_d, gpfn) \ diff -r 3bd3949854ef -r 34c96082d693 xen/include/public/memory.h --- a/xen/include/public/memory.h Sat Jan 28 13:45:13 2012 +0000 +++ b/xen/include/public/memory.h Sat Jan 28 13:47:24 2012 +0000 @@ -229,6 +229,22 @@ typedef struct xen_add_to_physmap xen_add_to_physmap_t; DEFINE_XEN_GUEST_HANDLE(xen_add_to_physmap_t); +/* + * Unmaps the page appearing at a particular GPFN from the specified guest's + * pseudophysical address space. + * arg == addr of xen_remove_from_physmap_t. + */ +#define XENMEM_remove_from_physmap 15 +struct xen_remove_from_physmap { + /* Which domain to change the mapping for. */ + domid_t domid; + + /* GPFN of the current mapping of the page. */ + xen_pfn_t gpfn; +}; +typedef struct xen_remove_from_physmap xen_remove_from_physmap_t; +DEFINE_XEN_GUEST_HANDLE(xen_remove_from_physmap_t); + /*** REMOVED ***/ /*#define XENMEM_translate_gpfn_list 8*/ diff -r 3bd3949854ef -r 34c96082d693 xen/include/xlat.lst --- a/xen/include/xlat.lst Sat Jan 28 13:45:13 2012 +0000 +++ b/xen/include/xlat.lst Sat Jan 28 13:47:24 2012 +0000 @@ -60,6 +60,7 @@ ! memory_map memory.h ! memory_reservation memory.h ! pod_target memory.h +! remove_from_physmap memory.h ? physdev_eoi physdev.h ? physdev_get_free_pirq physdev.h ? physdev_irq physdev.h diff -r 3bd3949854ef -r 34c96082d693 xen/include/xsm/xsm.h --- a/xen/include/xsm/xsm.h Sat Jan 28 13:45:13 2012 +0000 +++ b/xen/include/xsm/xsm.h Sat Jan 28 13:47:24 2012 +0000 @@ -169,6 +169,7 @@ int (*update_va_mapping) (struct domain *d, struct domain *f, l1_pgentry_t pte); int (*add_to_physmap) (struct domain *d1, struct domain *d2); + int (*remove_from_physmap) (struct domain *d1, struct domain *d2); int (*sendtrigger) (struct domain *d); int (*bind_pt_irq) (struct domain *d, struct xen_domctl_bind_pt_irq *bind); int (*unbind_pt_irq) (struct domain *d); @@ -738,6 +739,11 @@ return xsm_call(add_to_physmap(d1, d2)); } +static inline int xsm_remove_from_physmap(struct domain *d1, struct domain *d2) +{ + return xsm_call(remove_from_physmap(d1, d2)); +} + static inline int xsm_sendtrigger(struct domain *d) { return xsm_call(sendtrigger(d)); diff -r 3bd3949854ef -r 34c96082d693 xen/xsm/dummy.c --- a/xen/xsm/dummy.c Sat Jan 28 13:45:13 2012 +0000 +++ b/xen/xsm/dummy.c Sat Jan 28 13:47:24 2012 +0000 @@ -529,6 +529,11 @@ return 0; } +static int dummy_remove_from_physmap (struct domain *d1, struct domain *d2) +{ + return 0; +} + static int dummy_sendtrigger (struct domain *d) { return 0; @@ -690,6 +695,7 @@ set_to_dummy_if_null(ops, mmu_machphys_update); set_to_dummy_if_null(ops, update_va_mapping); set_to_dummy_if_null(ops, add_to_physmap); + set_to_dummy_if_null(ops, remove_from_physmap); set_to_dummy_if_null(ops, sendtrigger); set_to_dummy_if_null(ops, bind_pt_irq); set_to_dummy_if_null(ops, pin_mem_cacheattr); diff -r 3bd3949854ef -r 34c96082d693 xen/xsm/flask/hooks.c --- a/xen/xsm/flask/hooks.c Sat Jan 28 13:45:13 2012 +0000 +++ b/xen/xsm/flask/hooks.c Sat Jan 28 13:47:24 2012 +0000 @@ -1283,6 +1283,11 @@ return domain_has_perm(d1, d2, SECCLASS_MMU, MMU__PHYSMAP); } +static int flask_remove_from_physmap(struct domain *d1, struct domain *d2) +{ + return domain_has_perm(d1, d2, SECCLASS_MMU, MMU__PHYSMAP); +} + static int flask_sendtrigger(struct domain *d) { return domain_has_perm(current->domain, d, SECCLASS_DOMAIN, DOMAIN__TRIGGER); @@ -1550,6 +1555,7 @@ .mmu_machphys_update = flask_mmu_machphys_update, .update_va_mapping = flask_update_va_mapping, .add_to_physmap = flask_add_to_physmap, + .remove_from_physmap = flask_remove_from_physmap, .sendtrigger = flask_sendtrigger, .get_device_group = flask_get_device_group, .test_assign_device = flask_test_assign_device, _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:56:37 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:56: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 1RtR7V-0006nY-0w; Fri, 03 Feb 2012 21:56:37 +0000 Received: from mail182.messagelabs.com ([85.158.139.83]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7T-0006hw-IE for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:36 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-182.messagelabs.com!1328306186!13046406!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4606 invoked from network); 3 Feb 2012 21:56:28 -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; 3 Feb 2012 21:56:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7K-0001kD-Fq for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR7I-0002Uq-Vh for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:25 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:56:24 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xen: allow global VIRQ handlers to be delegated to other domains X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Daniel De Graaf # Date 1327758483 0 # Node ID 1e155189c9a4f6e9d78cf3ea955c9c0fad07d7f7 # Parent 34c96082d69389e5891bbc1c424d0199355632df xen: allow global VIRQ handlers to be delegated to other domains This patch sends global VIRQs to a domain designated as the VIRQ handler instead of sending all global VIRQ events to dom0. This is required in order to run xenstored in a stubdom, because VIRQ_DOM_EXC must be sent to xenstored for domain destruction to work properly. This patch was inspired by the xenstored stubdomain patch series sent to xen-devel by Alex Zeffertt in 2009. Signed-off-by: Diego Ongaro Signed-off-by: Alex Zeffertt Signed-off-by: Daniel De Graaf Acked-by: Ian Campbell Committed-by: Keir Fraser --- diff -r 34c96082d693 -r 1e155189c9a4 tools/flask/policy/policy/flask/access_vectors --- a/tools/flask/policy/policy/flask/access_vectors Sat Jan 28 13:47:24 2012 +0000 +++ b/tools/flask/policy/policy/flask/access_vectors Sat Jan 28 13:48:03 2012 +0000 @@ -85,6 +85,7 @@ getpodtarget setpodtarget set_misc_info + set_virq_handler } class hvm diff -r 34c96082d693 -r 1e155189c9a4 tools/libxc/xc_domain.c --- a/tools/libxc/xc_domain.c Sat Jan 28 13:47:24 2012 +0000 +++ b/tools/libxc/xc_domain.c Sat Jan 28 13:48:03 2012 +0000 @@ -1504,6 +1504,16 @@ return do_domctl(xch, &domctl); } +int xc_domain_set_virq_handler(xc_interface *xch, uint32_t domid, int virq) +{ + DECLARE_DOMCTL; + + domctl.cmd = XEN_DOMCTL_set_virq_handler; + domctl.domain = domid; + domctl.u.set_virq_handler.virq = virq; + return do_domctl(xch, &domctl); +} + /* * Local variables: * mode: C diff -r 34c96082d693 -r 1e155189c9a4 tools/libxc/xenctrl.h --- a/tools/libxc/xenctrl.h Sat Jan 28 13:47:24 2012 +0000 +++ b/tools/libxc/xenctrl.h Sat Jan 28 13:48:03 2012 +0000 @@ -749,6 +749,15 @@ int xc_domain_set_access_required(xc_interface *xch, uint32_t domid, unsigned int required); +/** + * This function sets the handler of global VIRQs sent by the hypervisor + * + * @parm xch a handle to an open hypervisor interface + * @parm domid the domain id which will handle the VIRQ + * @parm virq the virq number (VIRQ_*) + * return 0 on success, -1 on failure + */ +int xc_domain_set_virq_handler(xc_interface *xch, uint32_t domid, int virq); /* * CPUPOOL MANAGEMENT FUNCTIONS diff -r 34c96082d693 -r 1e155189c9a4 xen/arch/x86/cpu/mcheck/amd_nonfatal.c --- a/xen/arch/x86/cpu/mcheck/amd_nonfatal.c Sat Jan 28 13:47:24 2012 +0000 +++ b/xen/arch/x86/cpu/mcheck/amd_nonfatal.c Sat Jan 28 13:48:03 2012 +0000 @@ -100,7 +100,7 @@ if (dom0_vmce_enabled()) { mctelem_commit(mctc); - send_guest_global_virq(dom0, VIRQ_MCA); + send_global_virq(VIRQ_MCA); } else if (++dumpcount >= 10) { x86_mcinfo_dump((struct mc_info *)mctelem_dataptr(mctc)); mctelem_dismiss(mctc); diff -r 34c96082d693 -r 1e155189c9a4 xen/arch/x86/cpu/mcheck/mce.c --- a/xen/arch/x86/cpu/mcheck/mce.c Sat Jan 28 13:47:24 2012 +0000 +++ b/xen/arch/x86/cpu/mcheck/mce.c Sat Jan 28 13:48:03 2012 +0000 @@ -594,7 +594,7 @@ if (dom0_vmce_enabled()) { if (mctc != NULL) mctelem_commit(mctc); - send_guest_global_virq(dom0, VIRQ_MCA); + send_global_virq(VIRQ_MCA); } else { x86_mcinfo_dump(mci); if (mctc != NULL) diff -r 34c96082d693 -r 1e155189c9a4 xen/arch/x86/cpu/mcheck/mce_intel.c --- a/xen/arch/x86/cpu/mcheck/mce_intel.c Sat Jan 28 13:47:24 2012 +0000 +++ b/xen/arch/x86/cpu/mcheck/mce_intel.c Sat Jan 28 13:48:03 2012 +0000 @@ -354,7 +354,7 @@ /* Step2: Send Log to DOM0 through vIRQ */ if (dom0_vmce_enabled()) { mce_printk(MCE_VERBOSE, "MCE: send MCE# to DOM0 through virq\n"); - send_guest_global_virq(dom0, VIRQ_MCA); + send_global_virq(VIRQ_MCA); } } @@ -1085,7 +1085,7 @@ if (bs.errcnt && mctc != NULL) { if (dom0_vmce_enabled()) { mctelem_commit(mctc); - send_guest_global_virq(dom0, VIRQ_MCA); + send_global_virq(VIRQ_MCA); } else { x86_mcinfo_dump(mctelem_dataptr(mctc)); mctelem_dismiss(mctc); @@ -1205,7 +1205,7 @@ if (dom0_vmce_enabled()) { mctelem_commit(mctc); mce_printk(MCE_VERBOSE, "CMCI: send CMCI to DOM0 through virq\n"); - send_guest_global_virq(dom0, VIRQ_MCA); + send_global_virq(VIRQ_MCA); } else { x86_mcinfo_dump(mctelem_dataptr(mctc)); mctelem_dismiss(mctc); diff -r 34c96082d693 -r 1e155189c9a4 xen/arch/x86/cpu/mcheck/non-fatal.c --- a/xen/arch/x86/cpu/mcheck/non-fatal.c Sat Jan 28 13:47:24 2012 +0000 +++ b/xen/arch/x86/cpu/mcheck/non-fatal.c Sat Jan 28 13:48:03 2012 +0000 @@ -55,7 +55,7 @@ if (dom0_vmce_enabled()) { mctelem_commit(mctc); - send_guest_global_virq(dom0, VIRQ_MCA); + send_global_virq(VIRQ_MCA); } else if (++dumpcount >= 10) { x86_mcinfo_dump((struct mc_info *)mctelem_dataptr(mctc)); mctelem_dismiss(mctc); diff -r 34c96082d693 -r 1e155189c9a4 xen/common/cpu.c --- a/xen/common/cpu.c Sat Jan 28 13:47:24 2012 +0000 +++ b/xen/common/cpu.c Sat Jan 28 13:48:03 2012 +0000 @@ -108,7 +108,7 @@ notifier_rc = notifier_call_chain(&cpu_chain, CPU_DEAD, hcpu, NULL); BUG_ON(notifier_rc != NOTIFY_DONE); - send_guest_global_virq(dom0, VIRQ_PCPU_STATE); + send_global_virq(VIRQ_PCPU_STATE); cpu_hotplug_done(); return 0; @@ -148,7 +148,7 @@ notifier_rc = notifier_call_chain(&cpu_chain, CPU_ONLINE, hcpu, NULL); BUG_ON(notifier_rc != NOTIFY_DONE); - send_guest_global_virq(dom0, VIRQ_PCPU_STATE); + send_global_virq(VIRQ_PCPU_STATE); cpu_hotplug_done(); return 0; diff -r 34c96082d693 -r 1e155189c9a4 xen/common/domain.c --- a/xen/common/domain.c Sat Jan 28 13:47:24 2012 +0000 +++ b/xen/common/domain.c Sat Jan 28 13:48:03 2012 +0000 @@ -86,7 +86,7 @@ if ( (d->shutdown_code == SHUTDOWN_suspend) && d->suspend_evtchn ) evtchn_send(d, d->suspend_evtchn); else - send_guest_global_virq(dom0, VIRQ_DOM_EXC); + send_global_virq(VIRQ_DOM_EXC); } static void vcpu_check_shutdown(struct vcpu *v) @@ -480,7 +480,7 @@ } d->is_dying = DOMDYING_dead; put_domain(d); - send_guest_global_virq(dom0, VIRQ_DOM_EXC); + send_global_virq(VIRQ_DOM_EXC); /* fallthrough */ case DOMDYING_dead: break; @@ -621,7 +621,7 @@ for_each_vcpu ( d, v ) vcpu_sleep_nosync(v); - send_guest_global_virq(dom0, VIRQ_DEBUGGER); + send_global_virq(VIRQ_DEBUGGER); } /* Complete domain destroy after RCU readers are not holding old references. */ @@ -680,7 +680,7 @@ free_cpumask_var(d->domain_dirty_cpumask); free_domain_struct(d); - send_guest_global_virq(dom0, VIRQ_DOM_EXC); + send_global_virq(VIRQ_DOM_EXC); } /* Release resources belonging to task @p. */ diff -r 34c96082d693 -r 1e155189c9a4 xen/common/domctl.c --- a/xen/common/domctl.c Sat Jan 28 13:47:24 2012 +0000 +++ b/xen/common/domctl.c Sat Jan 28 13:48:03 2012 +0000 @@ -995,6 +995,23 @@ } break; + case XEN_DOMCTL_set_virq_handler: + { + struct domain *d; + uint32_t virq = op->u.set_virq_handler.virq; + + ret = -ESRCH; + d = rcu_lock_domain_by_id(op->domain); + if ( d != NULL ) + { + ret = xsm_set_virq_handler(d, virq); + if ( !ret ) + ret = set_global_virq_handler(d, virq); + rcu_unlock_domain(d); + } + } + break; + default: ret = arch_do_domctl(op, u_domctl); break; diff -r 34c96082d693 -r 1e155189c9a4 xen/common/event_channel.c --- a/xen/common/event_channel.c Sat Jan 28 13:47:24 2012 +0000 +++ b/xen/common/event_channel.c Sat Jan 28 13:48:03 2012 +0000 @@ -689,7 +689,7 @@ spin_unlock_irqrestore(&v->virq_lock, flags); } -void send_guest_global_virq(struct domain *d, int virq) +static void send_guest_global_virq(struct domain *d, int virq) { unsigned long flags; int port; @@ -739,6 +739,68 @@ return evtchn_set_pending(d->vcpu[chn->notify_vcpu_id], port); } +static struct domain *global_virq_handlers[NR_VIRQS] __read_mostly; + +static DEFINE_SPINLOCK(global_virq_handlers_lock); + +void send_global_virq(uint32_t virq) +{ + ASSERT(virq < NR_VIRQS); + ASSERT(virq_is_global(virq)); + + send_guest_global_virq(global_virq_handlers[virq] ?: dom0, virq); +} + +int set_global_virq_handler(struct domain *d, uint32_t virq) +{ + struct domain *old; + + if (virq >= NR_VIRQS) + return -EINVAL; + if (!virq_is_global(virq)) + return -EINVAL; + + if (global_virq_handlers[virq] == d) + return 0; + + if (unlikely(!get_domain(d))) + return -EINVAL; + + spin_lock(&global_virq_handlers_lock); + old = global_virq_handlers[virq]; + global_virq_handlers[virq] = d; + spin_unlock(&global_virq_handlers_lock); + + if (old != NULL) + put_domain(old); + + return 0; +} + +static void clear_global_virq_handlers(struct domain *d) +{ + uint32_t virq; + int put_count = 0; + + spin_lock(&global_virq_handlers_lock); + + for (virq = 0; virq < NR_VIRQS; virq++) + { + if (global_virq_handlers[virq] == d) + { + global_virq_handlers[virq] = NULL; + put_count++; + } + } + + spin_unlock(&global_virq_handlers_lock); + + while (put_count) + { + put_domain(d); + put_count--; + } +} static long evtchn_status(evtchn_status_t *status) { @@ -1160,6 +1222,8 @@ d->evtchn[i] = NULL; } spin_unlock(&d->event_lock); + + clear_global_virq_handlers(d); } diff -r 34c96082d693 -r 1e155189c9a4 xen/common/trace.c --- a/xen/common/trace.c Sat Jan 28 13:47:24 2012 +0000 +++ b/xen/common/trace.c Sat Jan 28 13:48:03 2012 +0000 @@ -661,7 +661,7 @@ */ static void trace_notify_dom0(unsigned long unused) { - send_guest_global_virq(dom0, VIRQ_TBUF); + send_global_virq(VIRQ_TBUF); } static DECLARE_SOFTIRQ_TASKLET(trace_notify_dom0_tasklet, trace_notify_dom0, 0); diff -r 34c96082d693 -r 1e155189c9a4 xen/drivers/char/console.c --- a/xen/drivers/char/console.c Sat Jan 28 13:47:24 2012 +0000 +++ b/xen/drivers/char/console.c Sat Jan 28 13:48:03 2012 +0000 @@ -288,7 +288,7 @@ if ( (serial_rx_prod-serial_rx_cons) != SERIAL_RX_SIZE ) serial_rx_ring[SERIAL_RX_MASK(serial_rx_prod++)] = c; /* Always notify the guest: prevents receive path from getting stuck. */ - send_guest_global_virq(dom0, VIRQ_CONSOLE); + send_global_virq(VIRQ_CONSOLE); } static void serial_rx(char c, struct cpu_user_regs *regs) @@ -315,7 +315,7 @@ static void notify_dom0_con_ring(unsigned long unused) { - send_guest_global_virq(dom0, VIRQ_CON_RING); + send_global_virq(VIRQ_CON_RING); } static DECLARE_SOFTIRQ_TASKLET(notify_dom0_con_ring_tasklet, notify_dom0_con_ring, 0); diff -r 34c96082d693 -r 1e155189c9a4 xen/include/public/domctl.h --- a/xen/include/public/domctl.h Sat Jan 28 13:47:24 2012 +0000 +++ b/xen/include/public/domctl.h Sat Jan 28 13:48:03 2012 +0000 @@ -830,6 +830,12 @@ typedef struct xen_domctl_audit_p2m xen_domctl_audit_p2m_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_audit_p2m_t); +struct xen_domctl_set_virq_handler { + uint32_t virq; /* IN */ +}; +typedef struct xen_domctl_set_virq_handler xen_domctl_set_virq_handler_t; +DEFINE_XEN_GUEST_HANDLE(xen_domctl_set_virq_handler_t); + #if defined(__i386__) || defined(__x86_64__) /* XEN_DOMCTL_setvcpuextstate */ /* XEN_DOMCTL_getvcpuextstate */ @@ -929,6 +935,7 @@ #define XEN_DOMCTL_getvcpuextstate 63 #define XEN_DOMCTL_set_access_required 64 #define XEN_DOMCTL_audit_p2m 65 +#define XEN_DOMCTL_set_virq_handler 66 #define XEN_DOMCTL_gdbsx_guestmemio 1000 #define XEN_DOMCTL_gdbsx_pausevcpu 1001 #define XEN_DOMCTL_gdbsx_unpausevcpu 1002 @@ -983,6 +990,7 @@ #endif struct xen_domctl_set_access_required access_required; struct xen_domctl_audit_p2m audit_p2m; + struct xen_domctl_set_virq_handler set_virq_handler; struct xen_domctl_gdbsx_memio gdbsx_guest_memio; struct xen_domctl_gdbsx_pauseunp_vcpu gdbsx_pauseunp_vcpu; struct xen_domctl_gdbsx_domstatus gdbsx_domstatus; diff -r 34c96082d693 -r 1e155189c9a4 xen/include/xen/event.h --- a/xen/include/xen/event.h Sat Jan 28 13:47:24 2012 +0000 +++ b/xen/include/xen/event.h Sat Jan 28 13:48:03 2012 +0000 @@ -23,11 +23,17 @@ void send_guest_vcpu_virq(struct vcpu *v, int virq); /* - * send_guest_global_virq: Notify guest via a global VIRQ. - * @d: Domain to which virtual IRQ should be sent + * send_global_virq: Notify the domain handling a global VIRQ. * @virq: Virtual IRQ number (VIRQ_*) */ -void send_guest_global_virq(struct domain *d, int virq); +void send_global_virq(uint32_t virq); + +/* + * sent_global_virq_handler: Set a global VIRQ handler. + * @d: New target domain for this VIRQ + * @virq: Virtual IRQ number (VIRQ_*), must be global + */ +int set_global_virq_handler(struct domain *d, uint32_t virq); /* * send_guest_pirq: diff -r 34c96082d693 -r 1e155189c9a4 xen/include/xsm/xsm.h --- a/xen/include/xsm/xsm.h Sat Jan 28 13:47:24 2012 +0000 +++ b/xen/include/xsm/xsm.h Sat Jan 28 13:48:03 2012 +0000 @@ -64,6 +64,7 @@ int (*domain_settime) (struct domain *d); int (*set_target) (struct domain *d, struct domain *e); int (*domctl) (struct domain *d, int cmd); + int (*set_virq_handler) (struct domain *d, uint32_t virq); int (*tbufcontrol) (void); int (*readconsole) (uint32_t clear); int (*sched_id) (void); @@ -265,6 +266,11 @@ return xsm_call(domctl(d, cmd)); } +static inline int xsm_set_virq_handler (struct domain *d, uint32_t virq) +{ + return xsm_call(set_virq_handler(d, virq)); +} + static inline int xsm_tbufcontrol (void) { return xsm_call(tbufcontrol()); diff -r 34c96082d693 -r 1e155189c9a4 xen/xsm/dummy.c --- a/xen/xsm/dummy.c Sat Jan 28 13:47:24 2012 +0000 +++ b/xen/xsm/dummy.c Sat Jan 28 13:48:03 2012 +0000 @@ -94,6 +94,11 @@ return 0; } +static int dummy_set_virq_handler(struct domain *d, uint32_t virq) +{ + return 0; +} + static int dummy_tbufcontrol (void) { return 0; @@ -596,6 +601,7 @@ set_to_dummy_if_null(ops, domain_settime); set_to_dummy_if_null(ops, set_target); set_to_dummy_if_null(ops, domctl); + set_to_dummy_if_null(ops, set_virq_handler); set_to_dummy_if_null(ops, tbufcontrol); set_to_dummy_if_null(ops, readconsole); set_to_dummy_if_null(ops, sched_id); diff -r 34c96082d693 -r 1e155189c9a4 xen/xsm/flask/hooks.c --- a/xen/xsm/flask/hooks.c Sat Jan 28 13:47:24 2012 +0000 +++ b/xen/xsm/flask/hooks.c Sat Jan 28 13:48:03 2012 +0000 @@ -597,6 +597,11 @@ return domain_has_perm(current->domain, d, SECCLASS_DOMAIN, DOMAIN__SET_MISC_INFO); } +static int flask_set_virq_handler(struct domain *d, uint32_t virq) +{ + return domain_has_perm(current->domain, d, SECCLASS_DOMAIN, DOMAIN__SET_VIRQ_HANDLER); +} + static int flask_tbufcontrol(void) { return domain_has_xen(current->domain, XEN__TBUFCONTROL); @@ -1460,6 +1465,7 @@ .domain_settime = flask_domain_settime, .set_target = flask_set_target, .domctl = flask_domctl, + .set_virq_handler = flask_set_virq_handler, .tbufcontrol = flask_tbufcontrol, .readconsole = flask_readconsole, .sched_id = flask_sched_id, diff -r 34c96082d693 -r 1e155189c9a4 xen/xsm/flask/include/av_perm_to_string.h --- a/xen/xsm/flask/include/av_perm_to_string.h Sat Jan 28 13:47:24 2012 +0000 +++ b/xen/xsm/flask/include/av_perm_to_string.h Sat Jan 28 13:48:03 2012 +0000 @@ -60,6 +60,7 @@ S_(SECCLASS_DOMAIN, DOMAIN__GETPODTARGET, "getpodtarget") S_(SECCLASS_DOMAIN, DOMAIN__SETPODTARGET, "setpodtarget") S_(SECCLASS_DOMAIN, DOMAIN__SET_MISC_INFO, "set_misc_info") + S_(SECCLASS_DOMAIN, DOMAIN__SET_VIRQ_HANDLER, "set_virq_handler") S_(SECCLASS_HVM, HVM__SETHVMC, "sethvmc") S_(SECCLASS_HVM, HVM__GETHVMC, "gethvmc") S_(SECCLASS_HVM, HVM__SETPARAM, "setparam") diff -r 34c96082d693 -r 1e155189c9a4 xen/xsm/flask/include/av_permissions.h --- a/xen/xsm/flask/include/av_permissions.h Sat Jan 28 13:47:24 2012 +0000 +++ b/xen/xsm/flask/include/av_permissions.h Sat Jan 28 13:48:03 2012 +0000 @@ -61,6 +61,7 @@ #define DOMAIN__GETPODTARGET 0x10000000UL #define DOMAIN__SETPODTARGET 0x20000000UL #define DOMAIN__SET_MISC_INFO 0x40000000UL +#define DOMAIN__SET_VIRQ_HANDLER 0x80000000UL #define HVM__SETHVMC 0x00000001UL #define HVM__GETHVMC 0x00000002UL _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:56:37 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:56: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 1RtR7V-0006nY-0w; Fri, 03 Feb 2012 21:56:37 +0000 Received: from mail182.messagelabs.com ([85.158.139.83]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7T-0006hw-IE for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:36 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-182.messagelabs.com!1328306186!13046406!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4606 invoked from network); 3 Feb 2012 21:56:28 -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; 3 Feb 2012 21:56:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7K-0001kD-Fq for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR7I-0002Uq-Vh for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:25 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:56:24 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xen: allow global VIRQ handlers to be delegated to other domains X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Daniel De Graaf # Date 1327758483 0 # Node ID 1e155189c9a4f6e9d78cf3ea955c9c0fad07d7f7 # Parent 34c96082d69389e5891bbc1c424d0199355632df xen: allow global VIRQ handlers to be delegated to other domains This patch sends global VIRQs to a domain designated as the VIRQ handler instead of sending all global VIRQ events to dom0. This is required in order to run xenstored in a stubdom, because VIRQ_DOM_EXC must be sent to xenstored for domain destruction to work properly. This patch was inspired by the xenstored stubdomain patch series sent to xen-devel by Alex Zeffertt in 2009. Signed-off-by: Diego Ongaro Signed-off-by: Alex Zeffertt Signed-off-by: Daniel De Graaf Acked-by: Ian Campbell Committed-by: Keir Fraser --- diff -r 34c96082d693 -r 1e155189c9a4 tools/flask/policy/policy/flask/access_vectors --- a/tools/flask/policy/policy/flask/access_vectors Sat Jan 28 13:47:24 2012 +0000 +++ b/tools/flask/policy/policy/flask/access_vectors Sat Jan 28 13:48:03 2012 +0000 @@ -85,6 +85,7 @@ getpodtarget setpodtarget set_misc_info + set_virq_handler } class hvm diff -r 34c96082d693 -r 1e155189c9a4 tools/libxc/xc_domain.c --- a/tools/libxc/xc_domain.c Sat Jan 28 13:47:24 2012 +0000 +++ b/tools/libxc/xc_domain.c Sat Jan 28 13:48:03 2012 +0000 @@ -1504,6 +1504,16 @@ return do_domctl(xch, &domctl); } +int xc_domain_set_virq_handler(xc_interface *xch, uint32_t domid, int virq) +{ + DECLARE_DOMCTL; + + domctl.cmd = XEN_DOMCTL_set_virq_handler; + domctl.domain = domid; + domctl.u.set_virq_handler.virq = virq; + return do_domctl(xch, &domctl); +} + /* * Local variables: * mode: C diff -r 34c96082d693 -r 1e155189c9a4 tools/libxc/xenctrl.h --- a/tools/libxc/xenctrl.h Sat Jan 28 13:47:24 2012 +0000 +++ b/tools/libxc/xenctrl.h Sat Jan 28 13:48:03 2012 +0000 @@ -749,6 +749,15 @@ int xc_domain_set_access_required(xc_interface *xch, uint32_t domid, unsigned int required); +/** + * This function sets the handler of global VIRQs sent by the hypervisor + * + * @parm xch a handle to an open hypervisor interface + * @parm domid the domain id which will handle the VIRQ + * @parm virq the virq number (VIRQ_*) + * return 0 on success, -1 on failure + */ +int xc_domain_set_virq_handler(xc_interface *xch, uint32_t domid, int virq); /* * CPUPOOL MANAGEMENT FUNCTIONS diff -r 34c96082d693 -r 1e155189c9a4 xen/arch/x86/cpu/mcheck/amd_nonfatal.c --- a/xen/arch/x86/cpu/mcheck/amd_nonfatal.c Sat Jan 28 13:47:24 2012 +0000 +++ b/xen/arch/x86/cpu/mcheck/amd_nonfatal.c Sat Jan 28 13:48:03 2012 +0000 @@ -100,7 +100,7 @@ if (dom0_vmce_enabled()) { mctelem_commit(mctc); - send_guest_global_virq(dom0, VIRQ_MCA); + send_global_virq(VIRQ_MCA); } else if (++dumpcount >= 10) { x86_mcinfo_dump((struct mc_info *)mctelem_dataptr(mctc)); mctelem_dismiss(mctc); diff -r 34c96082d693 -r 1e155189c9a4 xen/arch/x86/cpu/mcheck/mce.c --- a/xen/arch/x86/cpu/mcheck/mce.c Sat Jan 28 13:47:24 2012 +0000 +++ b/xen/arch/x86/cpu/mcheck/mce.c Sat Jan 28 13:48:03 2012 +0000 @@ -594,7 +594,7 @@ if (dom0_vmce_enabled()) { if (mctc != NULL) mctelem_commit(mctc); - send_guest_global_virq(dom0, VIRQ_MCA); + send_global_virq(VIRQ_MCA); } else { x86_mcinfo_dump(mci); if (mctc != NULL) diff -r 34c96082d693 -r 1e155189c9a4 xen/arch/x86/cpu/mcheck/mce_intel.c --- a/xen/arch/x86/cpu/mcheck/mce_intel.c Sat Jan 28 13:47:24 2012 +0000 +++ b/xen/arch/x86/cpu/mcheck/mce_intel.c Sat Jan 28 13:48:03 2012 +0000 @@ -354,7 +354,7 @@ /* Step2: Send Log to DOM0 through vIRQ */ if (dom0_vmce_enabled()) { mce_printk(MCE_VERBOSE, "MCE: send MCE# to DOM0 through virq\n"); - send_guest_global_virq(dom0, VIRQ_MCA); + send_global_virq(VIRQ_MCA); } } @@ -1085,7 +1085,7 @@ if (bs.errcnt && mctc != NULL) { if (dom0_vmce_enabled()) { mctelem_commit(mctc); - send_guest_global_virq(dom0, VIRQ_MCA); + send_global_virq(VIRQ_MCA); } else { x86_mcinfo_dump(mctelem_dataptr(mctc)); mctelem_dismiss(mctc); @@ -1205,7 +1205,7 @@ if (dom0_vmce_enabled()) { mctelem_commit(mctc); mce_printk(MCE_VERBOSE, "CMCI: send CMCI to DOM0 through virq\n"); - send_guest_global_virq(dom0, VIRQ_MCA); + send_global_virq(VIRQ_MCA); } else { x86_mcinfo_dump(mctelem_dataptr(mctc)); mctelem_dismiss(mctc); diff -r 34c96082d693 -r 1e155189c9a4 xen/arch/x86/cpu/mcheck/non-fatal.c --- a/xen/arch/x86/cpu/mcheck/non-fatal.c Sat Jan 28 13:47:24 2012 +0000 +++ b/xen/arch/x86/cpu/mcheck/non-fatal.c Sat Jan 28 13:48:03 2012 +0000 @@ -55,7 +55,7 @@ if (dom0_vmce_enabled()) { mctelem_commit(mctc); - send_guest_global_virq(dom0, VIRQ_MCA); + send_global_virq(VIRQ_MCA); } else if (++dumpcount >= 10) { x86_mcinfo_dump((struct mc_info *)mctelem_dataptr(mctc)); mctelem_dismiss(mctc); diff -r 34c96082d693 -r 1e155189c9a4 xen/common/cpu.c --- a/xen/common/cpu.c Sat Jan 28 13:47:24 2012 +0000 +++ b/xen/common/cpu.c Sat Jan 28 13:48:03 2012 +0000 @@ -108,7 +108,7 @@ notifier_rc = notifier_call_chain(&cpu_chain, CPU_DEAD, hcpu, NULL); BUG_ON(notifier_rc != NOTIFY_DONE); - send_guest_global_virq(dom0, VIRQ_PCPU_STATE); + send_global_virq(VIRQ_PCPU_STATE); cpu_hotplug_done(); return 0; @@ -148,7 +148,7 @@ notifier_rc = notifier_call_chain(&cpu_chain, CPU_ONLINE, hcpu, NULL); BUG_ON(notifier_rc != NOTIFY_DONE); - send_guest_global_virq(dom0, VIRQ_PCPU_STATE); + send_global_virq(VIRQ_PCPU_STATE); cpu_hotplug_done(); return 0; diff -r 34c96082d693 -r 1e155189c9a4 xen/common/domain.c --- a/xen/common/domain.c Sat Jan 28 13:47:24 2012 +0000 +++ b/xen/common/domain.c Sat Jan 28 13:48:03 2012 +0000 @@ -86,7 +86,7 @@ if ( (d->shutdown_code == SHUTDOWN_suspend) && d->suspend_evtchn ) evtchn_send(d, d->suspend_evtchn); else - send_guest_global_virq(dom0, VIRQ_DOM_EXC); + send_global_virq(VIRQ_DOM_EXC); } static void vcpu_check_shutdown(struct vcpu *v) @@ -480,7 +480,7 @@ } d->is_dying = DOMDYING_dead; put_domain(d); - send_guest_global_virq(dom0, VIRQ_DOM_EXC); + send_global_virq(VIRQ_DOM_EXC); /* fallthrough */ case DOMDYING_dead: break; @@ -621,7 +621,7 @@ for_each_vcpu ( d, v ) vcpu_sleep_nosync(v); - send_guest_global_virq(dom0, VIRQ_DEBUGGER); + send_global_virq(VIRQ_DEBUGGER); } /* Complete domain destroy after RCU readers are not holding old references. */ @@ -680,7 +680,7 @@ free_cpumask_var(d->domain_dirty_cpumask); free_domain_struct(d); - send_guest_global_virq(dom0, VIRQ_DOM_EXC); + send_global_virq(VIRQ_DOM_EXC); } /* Release resources belonging to task @p. */ diff -r 34c96082d693 -r 1e155189c9a4 xen/common/domctl.c --- a/xen/common/domctl.c Sat Jan 28 13:47:24 2012 +0000 +++ b/xen/common/domctl.c Sat Jan 28 13:48:03 2012 +0000 @@ -995,6 +995,23 @@ } break; + case XEN_DOMCTL_set_virq_handler: + { + struct domain *d; + uint32_t virq = op->u.set_virq_handler.virq; + + ret = -ESRCH; + d = rcu_lock_domain_by_id(op->domain); + if ( d != NULL ) + { + ret = xsm_set_virq_handler(d, virq); + if ( !ret ) + ret = set_global_virq_handler(d, virq); + rcu_unlock_domain(d); + } + } + break; + default: ret = arch_do_domctl(op, u_domctl); break; diff -r 34c96082d693 -r 1e155189c9a4 xen/common/event_channel.c --- a/xen/common/event_channel.c Sat Jan 28 13:47:24 2012 +0000 +++ b/xen/common/event_channel.c Sat Jan 28 13:48:03 2012 +0000 @@ -689,7 +689,7 @@ spin_unlock_irqrestore(&v->virq_lock, flags); } -void send_guest_global_virq(struct domain *d, int virq) +static void send_guest_global_virq(struct domain *d, int virq) { unsigned long flags; int port; @@ -739,6 +739,68 @@ return evtchn_set_pending(d->vcpu[chn->notify_vcpu_id], port); } +static struct domain *global_virq_handlers[NR_VIRQS] __read_mostly; + +static DEFINE_SPINLOCK(global_virq_handlers_lock); + +void send_global_virq(uint32_t virq) +{ + ASSERT(virq < NR_VIRQS); + ASSERT(virq_is_global(virq)); + + send_guest_global_virq(global_virq_handlers[virq] ?: dom0, virq); +} + +int set_global_virq_handler(struct domain *d, uint32_t virq) +{ + struct domain *old; + + if (virq >= NR_VIRQS) + return -EINVAL; + if (!virq_is_global(virq)) + return -EINVAL; + + if (global_virq_handlers[virq] == d) + return 0; + + if (unlikely(!get_domain(d))) + return -EINVAL; + + spin_lock(&global_virq_handlers_lock); + old = global_virq_handlers[virq]; + global_virq_handlers[virq] = d; + spin_unlock(&global_virq_handlers_lock); + + if (old != NULL) + put_domain(old); + + return 0; +} + +static void clear_global_virq_handlers(struct domain *d) +{ + uint32_t virq; + int put_count = 0; + + spin_lock(&global_virq_handlers_lock); + + for (virq = 0; virq < NR_VIRQS; virq++) + { + if (global_virq_handlers[virq] == d) + { + global_virq_handlers[virq] = NULL; + put_count++; + } + } + + spin_unlock(&global_virq_handlers_lock); + + while (put_count) + { + put_domain(d); + put_count--; + } +} static long evtchn_status(evtchn_status_t *status) { @@ -1160,6 +1222,8 @@ d->evtchn[i] = NULL; } spin_unlock(&d->event_lock); + + clear_global_virq_handlers(d); } diff -r 34c96082d693 -r 1e155189c9a4 xen/common/trace.c --- a/xen/common/trace.c Sat Jan 28 13:47:24 2012 +0000 +++ b/xen/common/trace.c Sat Jan 28 13:48:03 2012 +0000 @@ -661,7 +661,7 @@ */ static void trace_notify_dom0(unsigned long unused) { - send_guest_global_virq(dom0, VIRQ_TBUF); + send_global_virq(VIRQ_TBUF); } static DECLARE_SOFTIRQ_TASKLET(trace_notify_dom0_tasklet, trace_notify_dom0, 0); diff -r 34c96082d693 -r 1e155189c9a4 xen/drivers/char/console.c --- a/xen/drivers/char/console.c Sat Jan 28 13:47:24 2012 +0000 +++ b/xen/drivers/char/console.c Sat Jan 28 13:48:03 2012 +0000 @@ -288,7 +288,7 @@ if ( (serial_rx_prod-serial_rx_cons) != SERIAL_RX_SIZE ) serial_rx_ring[SERIAL_RX_MASK(serial_rx_prod++)] = c; /* Always notify the guest: prevents receive path from getting stuck. */ - send_guest_global_virq(dom0, VIRQ_CONSOLE); + send_global_virq(VIRQ_CONSOLE); } static void serial_rx(char c, struct cpu_user_regs *regs) @@ -315,7 +315,7 @@ static void notify_dom0_con_ring(unsigned long unused) { - send_guest_global_virq(dom0, VIRQ_CON_RING); + send_global_virq(VIRQ_CON_RING); } static DECLARE_SOFTIRQ_TASKLET(notify_dom0_con_ring_tasklet, notify_dom0_con_ring, 0); diff -r 34c96082d693 -r 1e155189c9a4 xen/include/public/domctl.h --- a/xen/include/public/domctl.h Sat Jan 28 13:47:24 2012 +0000 +++ b/xen/include/public/domctl.h Sat Jan 28 13:48:03 2012 +0000 @@ -830,6 +830,12 @@ typedef struct xen_domctl_audit_p2m xen_domctl_audit_p2m_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_audit_p2m_t); +struct xen_domctl_set_virq_handler { + uint32_t virq; /* IN */ +}; +typedef struct xen_domctl_set_virq_handler xen_domctl_set_virq_handler_t; +DEFINE_XEN_GUEST_HANDLE(xen_domctl_set_virq_handler_t); + #if defined(__i386__) || defined(__x86_64__) /* XEN_DOMCTL_setvcpuextstate */ /* XEN_DOMCTL_getvcpuextstate */ @@ -929,6 +935,7 @@ #define XEN_DOMCTL_getvcpuextstate 63 #define XEN_DOMCTL_set_access_required 64 #define XEN_DOMCTL_audit_p2m 65 +#define XEN_DOMCTL_set_virq_handler 66 #define XEN_DOMCTL_gdbsx_guestmemio 1000 #define XEN_DOMCTL_gdbsx_pausevcpu 1001 #define XEN_DOMCTL_gdbsx_unpausevcpu 1002 @@ -983,6 +990,7 @@ #endif struct xen_domctl_set_access_required access_required; struct xen_domctl_audit_p2m audit_p2m; + struct xen_domctl_set_virq_handler set_virq_handler; struct xen_domctl_gdbsx_memio gdbsx_guest_memio; struct xen_domctl_gdbsx_pauseunp_vcpu gdbsx_pauseunp_vcpu; struct xen_domctl_gdbsx_domstatus gdbsx_domstatus; diff -r 34c96082d693 -r 1e155189c9a4 xen/include/xen/event.h --- a/xen/include/xen/event.h Sat Jan 28 13:47:24 2012 +0000 +++ b/xen/include/xen/event.h Sat Jan 28 13:48:03 2012 +0000 @@ -23,11 +23,17 @@ void send_guest_vcpu_virq(struct vcpu *v, int virq); /* - * send_guest_global_virq: Notify guest via a global VIRQ. - * @d: Domain to which virtual IRQ should be sent + * send_global_virq: Notify the domain handling a global VIRQ. * @virq: Virtual IRQ number (VIRQ_*) */ -void send_guest_global_virq(struct domain *d, int virq); +void send_global_virq(uint32_t virq); + +/* + * sent_global_virq_handler: Set a global VIRQ handler. + * @d: New target domain for this VIRQ + * @virq: Virtual IRQ number (VIRQ_*), must be global + */ +int set_global_virq_handler(struct domain *d, uint32_t virq); /* * send_guest_pirq: diff -r 34c96082d693 -r 1e155189c9a4 xen/include/xsm/xsm.h --- a/xen/include/xsm/xsm.h Sat Jan 28 13:47:24 2012 +0000 +++ b/xen/include/xsm/xsm.h Sat Jan 28 13:48:03 2012 +0000 @@ -64,6 +64,7 @@ int (*domain_settime) (struct domain *d); int (*set_target) (struct domain *d, struct domain *e); int (*domctl) (struct domain *d, int cmd); + int (*set_virq_handler) (struct domain *d, uint32_t virq); int (*tbufcontrol) (void); int (*readconsole) (uint32_t clear); int (*sched_id) (void); @@ -265,6 +266,11 @@ return xsm_call(domctl(d, cmd)); } +static inline int xsm_set_virq_handler (struct domain *d, uint32_t virq) +{ + return xsm_call(set_virq_handler(d, virq)); +} + static inline int xsm_tbufcontrol (void) { return xsm_call(tbufcontrol()); diff -r 34c96082d693 -r 1e155189c9a4 xen/xsm/dummy.c --- a/xen/xsm/dummy.c Sat Jan 28 13:47:24 2012 +0000 +++ b/xen/xsm/dummy.c Sat Jan 28 13:48:03 2012 +0000 @@ -94,6 +94,11 @@ return 0; } +static int dummy_set_virq_handler(struct domain *d, uint32_t virq) +{ + return 0; +} + static int dummy_tbufcontrol (void) { return 0; @@ -596,6 +601,7 @@ set_to_dummy_if_null(ops, domain_settime); set_to_dummy_if_null(ops, set_target); set_to_dummy_if_null(ops, domctl); + set_to_dummy_if_null(ops, set_virq_handler); set_to_dummy_if_null(ops, tbufcontrol); set_to_dummy_if_null(ops, readconsole); set_to_dummy_if_null(ops, sched_id); diff -r 34c96082d693 -r 1e155189c9a4 xen/xsm/flask/hooks.c --- a/xen/xsm/flask/hooks.c Sat Jan 28 13:47:24 2012 +0000 +++ b/xen/xsm/flask/hooks.c Sat Jan 28 13:48:03 2012 +0000 @@ -597,6 +597,11 @@ return domain_has_perm(current->domain, d, SECCLASS_DOMAIN, DOMAIN__SET_MISC_INFO); } +static int flask_set_virq_handler(struct domain *d, uint32_t virq) +{ + return domain_has_perm(current->domain, d, SECCLASS_DOMAIN, DOMAIN__SET_VIRQ_HANDLER); +} + static int flask_tbufcontrol(void) { return domain_has_xen(current->domain, XEN__TBUFCONTROL); @@ -1460,6 +1465,7 @@ .domain_settime = flask_domain_settime, .set_target = flask_set_target, .domctl = flask_domctl, + .set_virq_handler = flask_set_virq_handler, .tbufcontrol = flask_tbufcontrol, .readconsole = flask_readconsole, .sched_id = flask_sched_id, diff -r 34c96082d693 -r 1e155189c9a4 xen/xsm/flask/include/av_perm_to_string.h --- a/xen/xsm/flask/include/av_perm_to_string.h Sat Jan 28 13:47:24 2012 +0000 +++ b/xen/xsm/flask/include/av_perm_to_string.h Sat Jan 28 13:48:03 2012 +0000 @@ -60,6 +60,7 @@ S_(SECCLASS_DOMAIN, DOMAIN__GETPODTARGET, "getpodtarget") S_(SECCLASS_DOMAIN, DOMAIN__SETPODTARGET, "setpodtarget") S_(SECCLASS_DOMAIN, DOMAIN__SET_MISC_INFO, "set_misc_info") + S_(SECCLASS_DOMAIN, DOMAIN__SET_VIRQ_HANDLER, "set_virq_handler") S_(SECCLASS_HVM, HVM__SETHVMC, "sethvmc") S_(SECCLASS_HVM, HVM__GETHVMC, "gethvmc") S_(SECCLASS_HVM, HVM__SETPARAM, "setparam") diff -r 34c96082d693 -r 1e155189c9a4 xen/xsm/flask/include/av_permissions.h --- a/xen/xsm/flask/include/av_permissions.h Sat Jan 28 13:47:24 2012 +0000 +++ b/xen/xsm/flask/include/av_permissions.h Sat Jan 28 13:48:03 2012 +0000 @@ -61,6 +61,7 @@ #define DOMAIN__GETPODTARGET 0x10000000UL #define DOMAIN__SETPODTARGET 0x20000000UL #define DOMAIN__SET_MISC_INFO 0x40000000UL +#define DOMAIN__SET_VIRQ_HANDLER 0x80000000UL #define HVM__SETHVMC 0x00000001UL #define HVM__GETHVMC 0x00000002UL _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:56:38 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:56: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 1RtR7W-0006oj-3d; Fri, 03 Feb 2012 21:56:38 +0000 Received: from mail216.messagelabs.com ([85.158.143.99]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7U-0006ir-Ui for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:37 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-216.messagelabs.com!1328306189!13361752!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21419 invoked from network); 3 Feb 2012 21:56:30 -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; 3 Feb 2012 21:56:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7N-0001kL-23 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR7K-0002VY-V8 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:28 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:56:26 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xen: change virq parameters from int to uint32_t X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Daniel De Graaf # Date 1327758514 0 # Node ID 1025acf332ded1a14ef44a813d13bc0595ac5386 # Parent 1e155189c9a4f6e9d78cf3ea955c9c0fad07d7f7 xen: change virq parameters from int to uint32_t Signed-off-by: Daniel De Graaf Committed-by: Keir Fraser --- diff -r 1e155189c9a4 -r 1025acf332de xen/common/event_channel.c --- a/xen/common/event_channel.c Sat Jan 28 13:48:03 2012 +0000 +++ b/xen/common/event_channel.c Sat Jan 28 13:48:34 2012 +0000 @@ -104,11 +104,11 @@ static int evtchn_set_pending(struct vcpu *v, int port); -static int virq_is_global(int virq) +static int virq_is_global(uint32_t virq) { int rc; - ASSERT((virq >= 0) && (virq < NR_VIRQS)); + ASSERT(virq < NR_VIRQS); switch ( virq ) { @@ -665,12 +665,12 @@ return 0; } -int guest_enabled_event(struct vcpu *v, int virq) +int guest_enabled_event(struct vcpu *v, uint32_t virq) { return ((v != NULL) && (v->virq_to_evtchn[virq] != 0)); } -void send_guest_vcpu_virq(struct vcpu *v, int virq) +void send_guest_vcpu_virq(struct vcpu *v, uint32_t virq) { unsigned long flags; int port; @@ -689,7 +689,7 @@ spin_unlock_irqrestore(&v->virq_lock, flags); } -static void send_guest_global_virq(struct domain *d, int virq) +static void send_guest_global_virq(struct domain *d, uint32_t virq) { unsigned long flags; int port; diff -r 1e155189c9a4 -r 1025acf332de xen/include/asm-ia64/event.h --- a/xen/include/asm-ia64/event.h Sat Jan 28 13:48:03 2012 +0000 +++ b/xen/include/asm-ia64/event.h Sat Jan 28 13:48:34 2012 +0000 @@ -63,7 +63,7 @@ current->vcpu_info->evtchn_upcall_mask = 0; } -static inline int arch_virq_is_global(int virq) +static inline int arch_virq_is_global(uint32_t virq) { int rc; diff -r 1e155189c9a4 -r 1025acf332de xen/include/asm-x86/event.h --- a/xen/include/asm-x86/event.h Sat Jan 28 13:48:03 2012 +0000 +++ b/xen/include/asm-x86/event.h Sat Jan 28 13:48:34 2012 +0000 @@ -39,7 +39,7 @@ } /* No arch specific virq definition now. Default to global. */ -static inline int arch_virq_is_global(int virq) +static inline int arch_virq_is_global(uint32_t virq) { return 1; } diff -r 1e155189c9a4 -r 1025acf332de xen/include/xen/event.h --- a/xen/include/xen/event.h Sat Jan 28 13:48:03 2012 +0000 +++ b/xen/include/xen/event.h Sat Jan 28 13:48:34 2012 +0000 @@ -20,7 +20,7 @@ * @v: VCPU to which virtual IRQ should be sent * @virq: Virtual IRQ number (VIRQ_*) */ -void send_guest_vcpu_virq(struct vcpu *v, int virq); +void send_guest_vcpu_virq(struct vcpu *v, uint32_t virq); /* * send_global_virq: Notify the domain handling a global VIRQ. @@ -65,7 +65,7 @@ struct vcpu *local_vcpu, int port); /* Query if event channel is in use by the guest */ -int guest_enabled_event(struct vcpu *v, int virq); +int guest_enabled_event(struct vcpu *v, uint32_t virq); /* Notify remote end of a Xen-attached event channel.*/ void notify_via_xen_event_channel(struct domain *ld, int lport); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:56:38 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:56: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 1RtR7W-0006oj-3d; Fri, 03 Feb 2012 21:56:38 +0000 Received: from mail216.messagelabs.com ([85.158.143.99]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7U-0006ir-Ui for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:37 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-216.messagelabs.com!1328306189!13361752!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21419 invoked from network); 3 Feb 2012 21:56:30 -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; 3 Feb 2012 21:56:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7N-0001kL-23 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR7K-0002VY-V8 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:28 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:56:26 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xen: change virq parameters from int to uint32_t X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Daniel De Graaf # Date 1327758514 0 # Node ID 1025acf332ded1a14ef44a813d13bc0595ac5386 # Parent 1e155189c9a4f6e9d78cf3ea955c9c0fad07d7f7 xen: change virq parameters from int to uint32_t Signed-off-by: Daniel De Graaf Committed-by: Keir Fraser --- diff -r 1e155189c9a4 -r 1025acf332de xen/common/event_channel.c --- a/xen/common/event_channel.c Sat Jan 28 13:48:03 2012 +0000 +++ b/xen/common/event_channel.c Sat Jan 28 13:48:34 2012 +0000 @@ -104,11 +104,11 @@ static int evtchn_set_pending(struct vcpu *v, int port); -static int virq_is_global(int virq) +static int virq_is_global(uint32_t virq) { int rc; - ASSERT((virq >= 0) && (virq < NR_VIRQS)); + ASSERT(virq < NR_VIRQS); switch ( virq ) { @@ -665,12 +665,12 @@ return 0; } -int guest_enabled_event(struct vcpu *v, int virq) +int guest_enabled_event(struct vcpu *v, uint32_t virq) { return ((v != NULL) && (v->virq_to_evtchn[virq] != 0)); } -void send_guest_vcpu_virq(struct vcpu *v, int virq) +void send_guest_vcpu_virq(struct vcpu *v, uint32_t virq) { unsigned long flags; int port; @@ -689,7 +689,7 @@ spin_unlock_irqrestore(&v->virq_lock, flags); } -static void send_guest_global_virq(struct domain *d, int virq) +static void send_guest_global_virq(struct domain *d, uint32_t virq) { unsigned long flags; int port; diff -r 1e155189c9a4 -r 1025acf332de xen/include/asm-ia64/event.h --- a/xen/include/asm-ia64/event.h Sat Jan 28 13:48:03 2012 +0000 +++ b/xen/include/asm-ia64/event.h Sat Jan 28 13:48:34 2012 +0000 @@ -63,7 +63,7 @@ current->vcpu_info->evtchn_upcall_mask = 0; } -static inline int arch_virq_is_global(int virq) +static inline int arch_virq_is_global(uint32_t virq) { int rc; diff -r 1e155189c9a4 -r 1025acf332de xen/include/asm-x86/event.h --- a/xen/include/asm-x86/event.h Sat Jan 28 13:48:03 2012 +0000 +++ b/xen/include/asm-x86/event.h Sat Jan 28 13:48:34 2012 +0000 @@ -39,7 +39,7 @@ } /* No arch specific virq definition now. Default to global. */ -static inline int arch_virq_is_global(int virq) +static inline int arch_virq_is_global(uint32_t virq) { return 1; } diff -r 1e155189c9a4 -r 1025acf332de xen/include/xen/event.h --- a/xen/include/xen/event.h Sat Jan 28 13:48:03 2012 +0000 +++ b/xen/include/xen/event.h Sat Jan 28 13:48:34 2012 +0000 @@ -20,7 +20,7 @@ * @v: VCPU to which virtual IRQ should be sent * @virq: Virtual IRQ number (VIRQ_*) */ -void send_guest_vcpu_virq(struct vcpu *v, int virq); +void send_guest_vcpu_virq(struct vcpu *v, uint32_t virq); /* * send_global_virq: Notify the domain handling a global VIRQ. @@ -65,7 +65,7 @@ struct vcpu *local_vcpu, int port); /* Query if event channel is in use by the guest */ -int guest_enabled_event(struct vcpu *v, int virq); +int guest_enabled_event(struct vcpu *v, uint32_t virq); /* Notify remote end of a Xen-attached event channel.*/ void notify_via_xen_event_channel(struct domain *ld, int lport); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:56:41 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:56: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 1RtR7Y-0006rQ-6m; Fri, 03 Feb 2012 21:56:40 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7W-0006kT-Hy for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:38 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-11.tower-27.messagelabs.com!1328306169!51504028!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27190 invoked from network); 3 Feb 2012 21:56:10 -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; 3 Feb 2012 21:56:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7P-0001kR-7N for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR7O-0002Wb-AL for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:31 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:56:29 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xen: use XSM instead of IS_PRIV for getdomaininfo X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Daniel De Graaf # Date 1327758545 0 # Node ID 926e0820d615d7224f22a44deb8bbf4ebf078cf0 # Parent 1025acf332ded1a14ef44a813d13bc0595ac5386 xen: use XSM instead of IS_PRIV for getdomaininfo The XEN_DOMCTL_getdomaininfo domctl does not allow manipulation of domains, only basic information such as size and state, so its use does not fully justify making a domain privileged. XSM modules can also provide fine-grained control over what domains are visible to domains that call getdomaininfo. If XSM is disabled (either at compile time or by using the dummy XSM module) then there is no change in behavior: only IS_PRIV domains can use this domctl. If enabled, the XSM module controls access. Signed-off-by: Daniel De Graaf Committed-by: Keir Fraser --- diff -r 1025acf332de -r 926e0820d615 xen/common/domctl.c --- a/xen/common/domctl.c Sat Jan 28 13:48:34 2012 +0000 +++ b/xen/common/domctl.c Sat Jan 28 13:49:05 2012 +0000 @@ -264,6 +264,10 @@ return -EPERM; break; } +#ifdef XSM_ENABLE + case XEN_DOMCTL_getdomaininfo: + break; +#endif default: if ( !IS_PRIV(current->domain) ) return -EPERM; diff -r 1025acf332de -r 926e0820d615 xen/xsm/dummy.c --- a/xen/xsm/dummy.c Sat Jan 28 13:48:34 2012 +0000 +++ b/xen/xsm/dummy.c Sat Jan 28 13:49:05 2012 +0000 @@ -66,6 +66,8 @@ static int dummy_getdomaininfo (struct domain *d) { + if ( !IS_PRIV(current->domain) ) + return -EPERM; return 0; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:56:41 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:56: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 1RtR7Y-0006rQ-6m; Fri, 03 Feb 2012 21:56:40 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7W-0006kT-Hy for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:38 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-11.tower-27.messagelabs.com!1328306169!51504028!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27190 invoked from network); 3 Feb 2012 21:56:10 -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; 3 Feb 2012 21:56:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7P-0001kR-7N for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR7O-0002Wb-AL for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:31 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:56:29 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xen: use XSM instead of IS_PRIV for getdomaininfo X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Daniel De Graaf # Date 1327758545 0 # Node ID 926e0820d615d7224f22a44deb8bbf4ebf078cf0 # Parent 1025acf332ded1a14ef44a813d13bc0595ac5386 xen: use XSM instead of IS_PRIV for getdomaininfo The XEN_DOMCTL_getdomaininfo domctl does not allow manipulation of domains, only basic information such as size and state, so its use does not fully justify making a domain privileged. XSM modules can also provide fine-grained control over what domains are visible to domains that call getdomaininfo. If XSM is disabled (either at compile time or by using the dummy XSM module) then there is no change in behavior: only IS_PRIV domains can use this domctl. If enabled, the XSM module controls access. Signed-off-by: Daniel De Graaf Committed-by: Keir Fraser --- diff -r 1025acf332de -r 926e0820d615 xen/common/domctl.c --- a/xen/common/domctl.c Sat Jan 28 13:48:34 2012 +0000 +++ b/xen/common/domctl.c Sat Jan 28 13:49:05 2012 +0000 @@ -264,6 +264,10 @@ return -EPERM; break; } +#ifdef XSM_ENABLE + case XEN_DOMCTL_getdomaininfo: + break; +#endif default: if ( !IS_PRIV(current->domain) ) return -EPERM; diff -r 1025acf332de -r 926e0820d615 xen/xsm/dummy.c --- a/xen/xsm/dummy.c Sat Jan 28 13:48:34 2012 +0000 +++ b/xen/xsm/dummy.c Sat Jan 28 13:49:05 2012 +0000 @@ -66,6 +66,8 @@ static int dummy_getdomaininfo (struct domain *d) { + if ( !IS_PRIV(current->domain) ) + return -EPERM; return 0; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:56:44 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:56:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7c-0006up-NV; Fri, 03 Feb 2012 21:56:44 +0000 Received: from mail182.messagelabs.com ([85.158.139.83]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7c-0006pO-1T for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:44 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-182.messagelabs.com!1328306196!13640300!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.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31521 invoked from network); 3 Feb 2012 21:56:37 -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; 3 Feb 2012 21:56:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7T-0001kZ-Ow for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR7Q-0002XU-W8 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:34 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:56:31 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xen: Preserve reserved grant entries when switching versions X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Daniel De Graaf # Date 1327758581 0 # Node ID 39df93acd4089eaae138e1decf49aec39fb19417 # Parent 926e0820d615d7224f22a44deb8bbf4ebf078cf0 xen: Preserve reserved grant entries when switching versions In order for the toolstack to use reserved grant table entries, the grant table for a guest must be initialized prior to the guest's boot. When the guest switches grant table versions (necessary if the guest is using v2 grant tables, or on kexec if switching grant versions), these initial grants will be cleared. Instead of clearing them, preserve the grants across the type change. Attempting to preserve v2-only features such as sub-page grants will produce a warning and clear the resulting v1 grant entry. Signed-off-by: Daniel De Graaf Committed-by: Keir Fraser --- diff -r 926e0820d615 -r 39df93acd408 xen/common/grant_table.c --- a/xen/common/grant_table.c Sat Jan 28 13:49:05 2012 +0000 +++ b/xen/common/grant_table.c Sat Jan 28 13:49:41 2012 +0000 @@ -2111,6 +2111,7 @@ struct domain *d = current->domain; struct grant_table *gt = d->grant_table; struct active_grant_entry *act; + grant_entry_v1_t reserved_entries[GNTTAB_NR_RESERVED_ENTRIES]; long res; int i; @@ -2127,11 +2128,12 @@ spin_lock(>->lock); /* Make sure that the grant table isn't currently in use when we - change the version number. */ - /* (You need to change the version number for e.g. kexec.) */ + change the version number, except for the first 8 entries which + are allowed to be in use (xenstore/xenconsole keeps them mapped). + (You need to change the version number for e.g. kexec.) */ if ( gt->gt_version != 0 ) { - for ( i = 0; i < nr_grant_entries(gt); i++ ) + for ( i = GNTTAB_NR_RESERVED_ENTRIES; i < nr_grant_entries(gt); i++ ) { act = &active_entry(gt, i); if ( act->pin != 0 ) @@ -2156,15 +2158,55 @@ goto out_unlock; } + /* Preserve the first 8 entries (toolstack reserved grants) */ + if ( gt->gt_version == 1 ) + { + memcpy(reserved_entries, &shared_entry_v1(gt, 0), sizeof(reserved_entries)); + } + else if ( gt->gt_version == 2 ) + { + for ( i = 0; i < GNTTAB_NR_RESERVED_ENTRIES && i < nr_grant_entries(gt); i++ ) + { + int flags = status_entry(gt, i); + flags |= shared_entry_v2(gt, i).hdr.flags; + if ((flags & GTF_type_mask) == GTF_permit_access) + { + reserved_entries[i].flags = flags; + reserved_entries[i].domid = shared_entry_v2(gt, i).hdr.domid; + reserved_entries[i].frame = shared_entry_v2(gt, i).full_page.frame; + } + else + { + if ((flags & GTF_type_mask) != GTF_invalid) + gdprintk(XENLOG_INFO, "d%d: bad flags %x in grant %d when switching grant version\n", + d->domain_id, flags, i); + memset(&reserved_entries[i], 0, sizeof(reserved_entries[i])); + } + } + } + if ( op.version < 2 && gt->gt_version == 2 ) gnttab_unpopulate_status_frames(d, gt); - if ( op.version != gt->gt_version ) + /* Make sure there's no crud left over in the table from the + old version. */ + for ( i = 0; i < nr_grant_frames(gt); i++ ) + memset(gt->shared_raw[i], 0, PAGE_SIZE); + + /* Restore the first 8 entries (toolstack reserved grants) */ + if ( gt->gt_version != 0 && op.version == 1 ) { - /* Make sure there's no crud left over in the table from the - old version. */ - for ( i = 0; i < nr_grant_frames(gt); i++ ) - memset(gt->shared_raw[i], 0, PAGE_SIZE); + memcpy(&shared_entry_v1(gt, 0), reserved_entries, sizeof(reserved_entries)); + } + else if ( gt->gt_version != 0 && op.version == 2 ) + { + for ( i = 0; i < GNTTAB_NR_RESERVED_ENTRIES; i++ ) + { + status_entry(gt, i) = reserved_entries[i].flags & (GTF_reading|GTF_writing); + shared_entry_v2(gt, i).hdr.flags = reserved_entries[i].flags & ~(GTF_reading|GTF_writing); + shared_entry_v2(gt, i).hdr.domid = reserved_entries[i].domid; + shared_entry_v2(gt, i).full_page.frame = reserved_entries[i].frame; + } } gt->gt_version = op.version; diff -r 926e0820d615 -r 39df93acd408 xen/include/public/grant_table.h --- a/xen/include/public/grant_table.h Sat Jan 28 13:49:05 2012 +0000 +++ b/xen/include/public/grant_table.h Sat Jan 28 13:49:41 2012 +0000 @@ -117,6 +117,13 @@ }; typedef struct grant_entry_v1 grant_entry_v1_t; +/* The first few grant table entries will be preserved across grant table + * version changes and may be pre-populated at domain creation by tools. + */ +#define GNTTAB_NR_RESERVED_ENTRIES 8 +#define GNTTAB_RESERVED_CONSOLE 0 +#define GNTTAB_RESERVED_XENSTORE 1 + /* * Type of grant entry. * GTF_invalid: This grant entry grants no privileges. _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:56:44 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:56:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7c-0006up-NV; Fri, 03 Feb 2012 21:56:44 +0000 Received: from mail182.messagelabs.com ([85.158.139.83]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7c-0006pO-1T for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:44 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-182.messagelabs.com!1328306196!13640300!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.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31521 invoked from network); 3 Feb 2012 21:56:37 -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; 3 Feb 2012 21:56:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7T-0001kZ-Ow for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR7Q-0002XU-W8 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:34 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:56:31 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xen: Preserve reserved grant entries when switching versions X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Daniel De Graaf # Date 1327758581 0 # Node ID 39df93acd4089eaae138e1decf49aec39fb19417 # Parent 926e0820d615d7224f22a44deb8bbf4ebf078cf0 xen: Preserve reserved grant entries when switching versions In order for the toolstack to use reserved grant table entries, the grant table for a guest must be initialized prior to the guest's boot. When the guest switches grant table versions (necessary if the guest is using v2 grant tables, or on kexec if switching grant versions), these initial grants will be cleared. Instead of clearing them, preserve the grants across the type change. Attempting to preserve v2-only features such as sub-page grants will produce a warning and clear the resulting v1 grant entry. Signed-off-by: Daniel De Graaf Committed-by: Keir Fraser --- diff -r 926e0820d615 -r 39df93acd408 xen/common/grant_table.c --- a/xen/common/grant_table.c Sat Jan 28 13:49:05 2012 +0000 +++ b/xen/common/grant_table.c Sat Jan 28 13:49:41 2012 +0000 @@ -2111,6 +2111,7 @@ struct domain *d = current->domain; struct grant_table *gt = d->grant_table; struct active_grant_entry *act; + grant_entry_v1_t reserved_entries[GNTTAB_NR_RESERVED_ENTRIES]; long res; int i; @@ -2127,11 +2128,12 @@ spin_lock(>->lock); /* Make sure that the grant table isn't currently in use when we - change the version number. */ - /* (You need to change the version number for e.g. kexec.) */ + change the version number, except for the first 8 entries which + are allowed to be in use (xenstore/xenconsole keeps them mapped). + (You need to change the version number for e.g. kexec.) */ if ( gt->gt_version != 0 ) { - for ( i = 0; i < nr_grant_entries(gt); i++ ) + for ( i = GNTTAB_NR_RESERVED_ENTRIES; i < nr_grant_entries(gt); i++ ) { act = &active_entry(gt, i); if ( act->pin != 0 ) @@ -2156,15 +2158,55 @@ goto out_unlock; } + /* Preserve the first 8 entries (toolstack reserved grants) */ + if ( gt->gt_version == 1 ) + { + memcpy(reserved_entries, &shared_entry_v1(gt, 0), sizeof(reserved_entries)); + } + else if ( gt->gt_version == 2 ) + { + for ( i = 0; i < GNTTAB_NR_RESERVED_ENTRIES && i < nr_grant_entries(gt); i++ ) + { + int flags = status_entry(gt, i); + flags |= shared_entry_v2(gt, i).hdr.flags; + if ((flags & GTF_type_mask) == GTF_permit_access) + { + reserved_entries[i].flags = flags; + reserved_entries[i].domid = shared_entry_v2(gt, i).hdr.domid; + reserved_entries[i].frame = shared_entry_v2(gt, i).full_page.frame; + } + else + { + if ((flags & GTF_type_mask) != GTF_invalid) + gdprintk(XENLOG_INFO, "d%d: bad flags %x in grant %d when switching grant version\n", + d->domain_id, flags, i); + memset(&reserved_entries[i], 0, sizeof(reserved_entries[i])); + } + } + } + if ( op.version < 2 && gt->gt_version == 2 ) gnttab_unpopulate_status_frames(d, gt); - if ( op.version != gt->gt_version ) + /* Make sure there's no crud left over in the table from the + old version. */ + for ( i = 0; i < nr_grant_frames(gt); i++ ) + memset(gt->shared_raw[i], 0, PAGE_SIZE); + + /* Restore the first 8 entries (toolstack reserved grants) */ + if ( gt->gt_version != 0 && op.version == 1 ) { - /* Make sure there's no crud left over in the table from the - old version. */ - for ( i = 0; i < nr_grant_frames(gt); i++ ) - memset(gt->shared_raw[i], 0, PAGE_SIZE); + memcpy(&shared_entry_v1(gt, 0), reserved_entries, sizeof(reserved_entries)); + } + else if ( gt->gt_version != 0 && op.version == 2 ) + { + for ( i = 0; i < GNTTAB_NR_RESERVED_ENTRIES; i++ ) + { + status_entry(gt, i) = reserved_entries[i].flags & (GTF_reading|GTF_writing); + shared_entry_v2(gt, i).hdr.flags = reserved_entries[i].flags & ~(GTF_reading|GTF_writing); + shared_entry_v2(gt, i).hdr.domid = reserved_entries[i].domid; + shared_entry_v2(gt, i).full_page.frame = reserved_entries[i].frame; + } } gt->gt_version = op.version; diff -r 926e0820d615 -r 39df93acd408 xen/include/public/grant_table.h --- a/xen/include/public/grant_table.h Sat Jan 28 13:49:05 2012 +0000 +++ b/xen/include/public/grant_table.h Sat Jan 28 13:49:41 2012 +0000 @@ -117,6 +117,13 @@ }; typedef struct grant_entry_v1 grant_entry_v1_t; +/* The first few grant table entries will be preserved across grant table + * version changes and may be pre-populated at domain creation by tools. + */ +#define GNTTAB_NR_RESERVED_ENTRIES 8 +#define GNTTAB_RESERVED_CONSOLE 0 +#define GNTTAB_RESERVED_XENSTORE 1 + /* * Type of grant entry. * GTF_invalid: This grant entry grants no privileges. _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:56:47 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:56:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7e-0006wn-So; Fri, 03 Feb 2012 21:56:46 +0000 Received: from mail216.messagelabs.com ([85.158.143.99]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7d-0006rH-D7 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:45 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-216.messagelabs.com!1328306198!13361762!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21536 invoked from network); 3 Feb 2012 21:56:39 -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; 3 Feb 2012 21:56:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7W-0001kf-5k for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR7V-0002Yl-04 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:37 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:56:35 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: domain_death_xswatch_callback: add some debug logging X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Jackson # Date 1327937018 0 # Node ID fe766513739e4b7af461dc042ab90be222956282 # Parent 39df93acd4089eaae138e1decf49aec39fb19417 libxl: domain_death_xswatch_callback: add some debug logging Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 39df93acd408 -r fe766513739e tools/libxl/libxl.c --- a/tools/libxl/libxl.c Sat Jan 28 13:49:41 2012 +0000 +++ b/tools/libxl/libxl.c Mon Jan 30 15:23:38 2012 +0000 @@ -713,15 +713,28 @@ } gotend = &domaininfos[rc]; + LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, "[evg=%p:%"PRIu32"]" + " from domid=%"PRIu32" nentries=%d rc=%d", + evg, evg->domid, domid, nentries, rc); + for (;;) { - if (!evg) + if (!evg) { + LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, "[evg=0] all reported"); goto all_reported; + } + + LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, "[evg=%p:%"PRIu32"]" + " got=domaininfos[%d] got->domain=%ld", + evg, evg->domid, (int)(got - domaininfos), + got < gotend ? (long)got->domain : -1L); if (!rc || got->domain > evg->domid) { /* ie, the list doesn't contain evg->domid any more so * the domain has been destroyed */ libxl_evgen_domain_death *evg_next; + LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, " destroyed"); + libxl_event *ev = NEW_EVENT(egc, DOMAIN_DESTROY, evg->domid); if (!ev) goto out; @@ -736,8 +749,10 @@ continue; } - if (got == gotend) + if (got == gotend) { + LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, " got==gotend"); break; + } if (got->domain < evg->domid) { got++; @@ -745,12 +760,17 @@ } assert(evg->domid == got->domain); + LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, " exists shutdown_reported=%d" + " dominf.flags=%x", + evg->shutdown_reported, got->flags); 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"); + ev->u.domain_shutdown.shutdown_reason = (got->flags >> XEN_DOMINF_shutdownshift) & XEN_DOMINF_shutdownmask; @@ -767,6 +787,8 @@ all_reported: out: + LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, "domain death search done"); + CTX_UNLOCK; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:56:47 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:56:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7e-0006wn-So; Fri, 03 Feb 2012 21:56:46 +0000 Received: from mail216.messagelabs.com ([85.158.143.99]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7d-0006rH-D7 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:45 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-216.messagelabs.com!1328306198!13361762!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21536 invoked from network); 3 Feb 2012 21:56:39 -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; 3 Feb 2012 21:56:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7W-0001kf-5k for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR7V-0002Yl-04 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:37 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:56:35 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: domain_death_xswatch_callback: add some debug logging X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Jackson # Date 1327937018 0 # Node ID fe766513739e4b7af461dc042ab90be222956282 # Parent 39df93acd4089eaae138e1decf49aec39fb19417 libxl: domain_death_xswatch_callback: add some debug logging Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 39df93acd408 -r fe766513739e tools/libxl/libxl.c --- a/tools/libxl/libxl.c Sat Jan 28 13:49:41 2012 +0000 +++ b/tools/libxl/libxl.c Mon Jan 30 15:23:38 2012 +0000 @@ -713,15 +713,28 @@ } gotend = &domaininfos[rc]; + LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, "[evg=%p:%"PRIu32"]" + " from domid=%"PRIu32" nentries=%d rc=%d", + evg, evg->domid, domid, nentries, rc); + for (;;) { - if (!evg) + if (!evg) { + LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, "[evg=0] all reported"); goto all_reported; + } + + LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, "[evg=%p:%"PRIu32"]" + " got=domaininfos[%d] got->domain=%ld", + evg, evg->domid, (int)(got - domaininfos), + got < gotend ? (long)got->domain : -1L); if (!rc || got->domain > evg->domid) { /* ie, the list doesn't contain evg->domid any more so * the domain has been destroyed */ libxl_evgen_domain_death *evg_next; + LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, " destroyed"); + libxl_event *ev = NEW_EVENT(egc, DOMAIN_DESTROY, evg->domid); if (!ev) goto out; @@ -736,8 +749,10 @@ continue; } - if (got == gotend) + if (got == gotend) { + LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, " got==gotend"); break; + } if (got->domain < evg->domid) { got++; @@ -745,12 +760,17 @@ } assert(evg->domid == got->domain); + LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, " exists shutdown_reported=%d" + " dominf.flags=%x", + evg->shutdown_reported, got->flags); 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"); + ev->u.domain_shutdown.shutdown_reason = (got->flags >> XEN_DOMINF_shutdownshift) & XEN_DOMINF_shutdownmask; @@ -767,6 +787,8 @@ all_reported: out: + LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, "domain death search done"); + CTX_UNLOCK; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:56:48 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:56:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7f-0006xs-VP; Fri, 03 Feb 2012 21:56:47 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7e-0006tl-GZ for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:46 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-27.messagelabs.com!1328306131!62530101!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28328 invoked from network); 3 Feb 2012 21:55:32 -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; 3 Feb 2012 21:55:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7Y-0001kj-Rf for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR7W-0002ZW-MY for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:40 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:56:38 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: treat "dying" domains as destroyed X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Jackson # Date 1327937019 0 # Node ID f31d8d1b534eab54178c2a73112562d46bbd6fcb # Parent fe766513739e4b7af461dc042ab90be222956282 libxl: treat "dying" domains as destroyed Rename the DOMAIN_DESTROY event to DOMAIN_DEATH and have it trigger when the domain goes into the state indicated by the domaininfo flag "dying". This fixes a race which could leak a daemonised xl process, which would have ignored the domain becoming "dying" and would then wait forever to be told the domain was destroyed. After the domain becomes "dying" we can't generate an event when it is actually destroyed because xenstored will eat the relevant VIRT_DOM_EXC virq and not generate an @releaseDomain, since xenstored discards its own record of the domain's existence as soon as it sees the domain "dying" and will not trigger @releaseDomain watches for domains it knows nothing about. Arguably this is a bug in xenstored, and the whole @releaseDomain machinery is rather poor, but let us not fix that now. Anyway, xl does not really want to know when the domain is ultimately destroyed. It is enough for xl to know that it is on the way out, in the "dying" state (which leads later to destruction by Xen). Also fix a bug where domain_death_xswatch_callback might read one domain beyond the valid data in its domaininfos array, by correctly ordering the checks for empty domain list, end of domain list, and our domain being missing. Signed-off-by: Ian Jackson Tested-by: Ian Campbell Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r fe766513739e -r f31d8d1b534e tools/libxl/libxl.c --- a/tools/libxl/libxl.c Mon Jan 30 15:23:38 2012 +0000 +++ b/tools/libxl/libxl.c Mon Jan 30 15:23:39 2012 +0000 @@ -685,6 +685,30 @@ return ret; } +static void domain_death_occurred(libxl__egc *egc, + libxl_evgen_domain_death **evg_upd, + const char *why) { + /* Removes **evg_upd from death_list and puts it on death_reported + * and advances *evg_upd to the next entry. + * Call sites in domain_death_xswatch_callback must use "continue". */ + EGC_GC; + libxl_evgen_domain_death *const evg = *evg_upd; + + LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, "%s", why); + + libxl_evgen_domain_death *evg_next = LIBXL_TAILQ_NEXT(evg, entry); + *evg_upd = evg_next; + + libxl_event *ev = NEW_EVENT(egc, DOMAIN_DEATH, evg->domid); + if (!ev) return; + + libxl__event_occurred(egc, ev); + + evg->death_reported = 1; + LIBXL_TAILQ_REMOVE(&CTX->death_list, evg, entry); + LIBXL_TAILQ_INSERT_HEAD(&CTX->death_reported, evg, entry); +} + static void domain_death_xswatch_callback(libxl__egc *egc, libxl__ev_xswatch *w, const char *wpath, const char *epath) { EGC_GC; @@ -728,32 +752,23 @@ evg, evg->domid, (int)(got - domaininfos), got < gotend ? (long)got->domain : -1L); - if (!rc || got->domain > evg->domid) { - /* ie, the list doesn't contain evg->domid any more so - * the domain has been destroyed */ - libxl_evgen_domain_death *evg_next; - - LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, " destroyed"); - - libxl_event *ev = NEW_EVENT(egc, DOMAIN_DESTROY, evg->domid); - if (!ev) goto out; - - libxl__event_occurred(egc, ev); - - evg->death_reported = 1; - evg_next = LIBXL_TAILQ_NEXT(evg, entry); - LIBXL_TAILQ_REMOVE(&CTX->death_list, evg, entry); - LIBXL_TAILQ_INSERT_HEAD(&CTX->death_reported, evg, entry); - evg = evg_next; - + if (!rc) { + domain_death_occurred(egc, &evg, "empty list"); continue; } - + if (got == gotend) { LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, " got==gotend"); break; } + if (got->domain > evg->domid) { + /* ie, the list doesn't contain evg->domid any more so + * the domain has been destroyed */ + domain_death_occurred(egc, &evg, "missing from list"); + continue; + } + if (got->domain < evg->domid) { got++; continue; @@ -764,6 +779,11 @@ " dominf.flags=%x", evg->shutdown_reported, got->flags); + if (got->flags & XEN_DOMINF_dying) { + domain_death_occurred(egc, &evg, "dying"); + continue; + } + if (!evg->shutdown_reported && (got->flags & XEN_DOMINF_shutdown)) { libxl_event *ev = NEW_EVENT(egc, DOMAIN_SHUTDOWN, got->domain); diff -r fe766513739e -r f31d8d1b534e tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Mon Jan 30 15:23:38 2012 +0000 +++ b/tools/libxl/libxl_types.idl Mon Jan 30 15:23:39 2012 +0000 @@ -396,7 +396,7 @@ libxl_event_type = Enumeration("event_type", [ (1, "DOMAIN_SHUTDOWN"), - (2, "DOMAIN_DESTROY"), + (2, "DOMAIN_DEATH"), (3, "DISK_EJECT"), (4, "OPERATION_COMPLETE"), ]) @@ -417,7 +417,7 @@ [("domain_shutdown", Struct(None, [ ("shutdown_reason", uint8), ])), - ("domain_destroy", Struct(None, [])), + ("domain_death", Struct(None, [])), ("disk_eject", Struct(None, [ ("vdev", string), ("disk", libxl_device_disk), diff -r fe766513739e -r f31d8d1b534e tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Mon Jan 30 15:23:38 2012 +0000 +++ b/tools/libxl/xl_cmdimpl.c Mon Jan 30 15:23:39 2012 +0000 @@ -1909,7 +1909,7 @@ abort(); } - case LIBXL_EVENT_TYPE_DOMAIN_DESTROY: + case LIBXL_EVENT_TYPE_DOMAIN_DEATH: LOG("Domain %d has been destroyed.", domid); ret = 0; goto out; @@ -2445,7 +2445,7 @@ switch (event->type) { - case LIBXL_EVENT_TYPE_DOMAIN_DESTROY: + case LIBXL_EVENT_TYPE_DOMAIN_DEATH: LOG("Domain %d has been destroyed", domid); goto done; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:56:48 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:56:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7f-0006xs-VP; Fri, 03 Feb 2012 21:56:47 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7e-0006tl-GZ for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:46 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-27.messagelabs.com!1328306131!62530101!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28328 invoked from network); 3 Feb 2012 21:55:32 -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; 3 Feb 2012 21:55:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7Y-0001kj-Rf for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR7W-0002ZW-MY for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:40 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:56:38 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: treat "dying" domains as destroyed X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Jackson # Date 1327937019 0 # Node ID f31d8d1b534eab54178c2a73112562d46bbd6fcb # Parent fe766513739e4b7af461dc042ab90be222956282 libxl: treat "dying" domains as destroyed Rename the DOMAIN_DESTROY event to DOMAIN_DEATH and have it trigger when the domain goes into the state indicated by the domaininfo flag "dying". This fixes a race which could leak a daemonised xl process, which would have ignored the domain becoming "dying" and would then wait forever to be told the domain was destroyed. After the domain becomes "dying" we can't generate an event when it is actually destroyed because xenstored will eat the relevant VIRT_DOM_EXC virq and not generate an @releaseDomain, since xenstored discards its own record of the domain's existence as soon as it sees the domain "dying" and will not trigger @releaseDomain watches for domains it knows nothing about. Arguably this is a bug in xenstored, and the whole @releaseDomain machinery is rather poor, but let us not fix that now. Anyway, xl does not really want to know when the domain is ultimately destroyed. It is enough for xl to know that it is on the way out, in the "dying" state (which leads later to destruction by Xen). Also fix a bug where domain_death_xswatch_callback might read one domain beyond the valid data in its domaininfos array, by correctly ordering the checks for empty domain list, end of domain list, and our domain being missing. Signed-off-by: Ian Jackson Tested-by: Ian Campbell Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r fe766513739e -r f31d8d1b534e tools/libxl/libxl.c --- a/tools/libxl/libxl.c Mon Jan 30 15:23:38 2012 +0000 +++ b/tools/libxl/libxl.c Mon Jan 30 15:23:39 2012 +0000 @@ -685,6 +685,30 @@ return ret; } +static void domain_death_occurred(libxl__egc *egc, + libxl_evgen_domain_death **evg_upd, + const char *why) { + /* Removes **evg_upd from death_list and puts it on death_reported + * and advances *evg_upd to the next entry. + * Call sites in domain_death_xswatch_callback must use "continue". */ + EGC_GC; + libxl_evgen_domain_death *const evg = *evg_upd; + + LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, "%s", why); + + libxl_evgen_domain_death *evg_next = LIBXL_TAILQ_NEXT(evg, entry); + *evg_upd = evg_next; + + libxl_event *ev = NEW_EVENT(egc, DOMAIN_DEATH, evg->domid); + if (!ev) return; + + libxl__event_occurred(egc, ev); + + evg->death_reported = 1; + LIBXL_TAILQ_REMOVE(&CTX->death_list, evg, entry); + LIBXL_TAILQ_INSERT_HEAD(&CTX->death_reported, evg, entry); +} + static void domain_death_xswatch_callback(libxl__egc *egc, libxl__ev_xswatch *w, const char *wpath, const char *epath) { EGC_GC; @@ -728,32 +752,23 @@ evg, evg->domid, (int)(got - domaininfos), got < gotend ? (long)got->domain : -1L); - if (!rc || got->domain > evg->domid) { - /* ie, the list doesn't contain evg->domid any more so - * the domain has been destroyed */ - libxl_evgen_domain_death *evg_next; - - LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, " destroyed"); - - libxl_event *ev = NEW_EVENT(egc, DOMAIN_DESTROY, evg->domid); - if (!ev) goto out; - - libxl__event_occurred(egc, ev); - - evg->death_reported = 1; - evg_next = LIBXL_TAILQ_NEXT(evg, entry); - LIBXL_TAILQ_REMOVE(&CTX->death_list, evg, entry); - LIBXL_TAILQ_INSERT_HEAD(&CTX->death_reported, evg, entry); - evg = evg_next; - + if (!rc) { + domain_death_occurred(egc, &evg, "empty list"); continue; } - + if (got == gotend) { LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, " got==gotend"); break; } + if (got->domain > evg->domid) { + /* ie, the list doesn't contain evg->domid any more so + * the domain has been destroyed */ + domain_death_occurred(egc, &evg, "missing from list"); + continue; + } + if (got->domain < evg->domid) { got++; continue; @@ -764,6 +779,11 @@ " dominf.flags=%x", evg->shutdown_reported, got->flags); + if (got->flags & XEN_DOMINF_dying) { + domain_death_occurred(egc, &evg, "dying"); + continue; + } + if (!evg->shutdown_reported && (got->flags & XEN_DOMINF_shutdown)) { libxl_event *ev = NEW_EVENT(egc, DOMAIN_SHUTDOWN, got->domain); diff -r fe766513739e -r f31d8d1b534e tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Mon Jan 30 15:23:38 2012 +0000 +++ b/tools/libxl/libxl_types.idl Mon Jan 30 15:23:39 2012 +0000 @@ -396,7 +396,7 @@ libxl_event_type = Enumeration("event_type", [ (1, "DOMAIN_SHUTDOWN"), - (2, "DOMAIN_DESTROY"), + (2, "DOMAIN_DEATH"), (3, "DISK_EJECT"), (4, "OPERATION_COMPLETE"), ]) @@ -417,7 +417,7 @@ [("domain_shutdown", Struct(None, [ ("shutdown_reason", uint8), ])), - ("domain_destroy", Struct(None, [])), + ("domain_death", Struct(None, [])), ("disk_eject", Struct(None, [ ("vdev", string), ("disk", libxl_device_disk), diff -r fe766513739e -r f31d8d1b534e tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Mon Jan 30 15:23:38 2012 +0000 +++ b/tools/libxl/xl_cmdimpl.c Mon Jan 30 15:23:39 2012 +0000 @@ -1909,7 +1909,7 @@ abort(); } - case LIBXL_EVENT_TYPE_DOMAIN_DESTROY: + case LIBXL_EVENT_TYPE_DOMAIN_DEATH: LOG("Domain %d has been destroyed.", domid); ret = 0; goto out; @@ -2445,7 +2445,7 @@ switch (event->type) { - case LIBXL_EVENT_TYPE_DOMAIN_DESTROY: + case LIBXL_EVENT_TYPE_DOMAIN_DEATH: LOG("Domain %d has been destroyed", domid); goto done; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:56:53 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:56: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 1RtR7l-00071a-1t; Fri, 03 Feb 2012 21:56:53 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7k-0006wb-2P for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:52 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-27.messagelabs.com!1328306162!58731772!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 595 invoked from network); 3 Feb 2012 21:56:03 -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; 3 Feb 2012 21:56:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7c-0001ks-LI for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR7b-0002af-0c for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:44 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:56:40 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xenpaging: unify return value in nominate and evict X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Olaf Hering # Date 1327925194 -3600 # Node ID 828639c20dcc9f48d155bd99ef6f963484ef7527 # Parent f31d8d1b534eab54178c2a73112562d46bbd6fcb xenpaging: unify return value in nominate and evict Let p2m_mem_paging_nominate and p2m_mem_paging_evict return just one error number. EINVAL is not very helpful in case of nominate, it can happen if the pager tries to nominate a ballooned page. In this case the gfn is not backed by a mfn, the pager can not know that. Similar with evict, anything can happen between nominate and evict. This change helps the pager to decide if the returned error is from the function itself, or if it happend earlier. In the latter case, it is most likely fatal and should be handled as such. nominate and evict return EBUSY, which is supposed to mean "pager request reached target function, and failed." Signed-off-by: Olaf Hering Acked-by: Tim Deegan Committed-by: Tim Deegan --- diff -r f31d8d1b534e -r 828639c20dcc xen/arch/x86/mm/p2m.c --- a/xen/arch/x86/mm/p2m.c Mon Jan 30 15:23:39 2012 +0000 +++ b/xen/arch/x86/mm/p2m.c Mon Jan 30 13:06:34 2012 +0100 @@ -735,19 +735,17 @@ p2m_type_t p2mt; p2m_access_t a; mfn_t mfn; - int ret; + int ret = -EBUSY; p2m_lock(p2m); mfn = p2m->get_entry(p2m, gfn, &p2mt, &a, p2m_query, NULL); /* Check if mfn is valid */ - ret = -EINVAL; if ( !mfn_valid(mfn) ) goto out; /* Check p2m type */ - ret = -EAGAIN; if ( !p2m_is_pageable(p2mt) ) goto out; @@ -799,7 +797,7 @@ p2m_access_t a; mfn_t mfn; struct p2m_domain *p2m = p2m_get_hostp2m(d); - int ret = -EINVAL; + int ret = -EBUSY; p2m_lock(p2m); @@ -812,7 +810,6 @@ if ( p2mt != p2m_ram_paging_out ) goto out; - ret = -EBUSY; /* Get the page so it doesn't get modified under Xen's feet */ page = mfn_to_page(mfn); if ( unlikely(!get_page(page, d)) ) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:56:53 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:56: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 1RtR7l-00071a-1t; Fri, 03 Feb 2012 21:56:53 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7k-0006wb-2P for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:52 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-27.messagelabs.com!1328306162!58731772!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 595 invoked from network); 3 Feb 2012 21:56:03 -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; 3 Feb 2012 21:56:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7c-0001ks-LI for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR7b-0002af-0c for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:44 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:56:40 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xenpaging: unify return value in nominate and evict X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Olaf Hering # Date 1327925194 -3600 # Node ID 828639c20dcc9f48d155bd99ef6f963484ef7527 # Parent f31d8d1b534eab54178c2a73112562d46bbd6fcb xenpaging: unify return value in nominate and evict Let p2m_mem_paging_nominate and p2m_mem_paging_evict return just one error number. EINVAL is not very helpful in case of nominate, it can happen if the pager tries to nominate a ballooned page. In this case the gfn is not backed by a mfn, the pager can not know that. Similar with evict, anything can happen between nominate and evict. This change helps the pager to decide if the returned error is from the function itself, or if it happend earlier. In the latter case, it is most likely fatal and should be handled as such. nominate and evict return EBUSY, which is supposed to mean "pager request reached target function, and failed." Signed-off-by: Olaf Hering Acked-by: Tim Deegan Committed-by: Tim Deegan --- diff -r f31d8d1b534e -r 828639c20dcc xen/arch/x86/mm/p2m.c --- a/xen/arch/x86/mm/p2m.c Mon Jan 30 15:23:39 2012 +0000 +++ b/xen/arch/x86/mm/p2m.c Mon Jan 30 13:06:34 2012 +0100 @@ -735,19 +735,17 @@ p2m_type_t p2mt; p2m_access_t a; mfn_t mfn; - int ret; + int ret = -EBUSY; p2m_lock(p2m); mfn = p2m->get_entry(p2m, gfn, &p2mt, &a, p2m_query, NULL); /* Check if mfn is valid */ - ret = -EINVAL; if ( !mfn_valid(mfn) ) goto out; /* Check p2m type */ - ret = -EAGAIN; if ( !p2m_is_pageable(p2mt) ) goto out; @@ -799,7 +797,7 @@ p2m_access_t a; mfn_t mfn; struct p2m_domain *p2m = p2m_get_hostp2m(d); - int ret = -EINVAL; + int ret = -EBUSY; p2m_lock(p2m); @@ -812,7 +810,6 @@ if ( p2mt != p2m_ram_paging_out ) goto out; - ret = -EBUSY; /* Get the page so it doesn't get modified under Xen's feet */ page = mfn_to_page(mfn); if ( unlikely(!get_page(page, d)) ) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:56:55 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:56:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7n-00073P-4d; Fri, 03 Feb 2012 21:56:55 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7l-00071n-OQ for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:53 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-27.messagelabs.com!1328306150!59696067!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13197 invoked from network); 3 Feb 2012 21:55:51 -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; 3 Feb 2012 21:55:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7j-0001l9-Hd for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR7g-0002ch-Vv for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:50 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:56:47 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] tools/libxc: fix bitmap_alloc usage in xc_ia64_send_vcpumap X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Olaf Hering # Date 1328009683 0 # Node ID eabfa0150f1cbc328741676e7e6d95a511585634 # Parent 03fdacb67f2cb76a24fd9517f1b0ea13e83973d2 tools/libxc: fix bitmap_alloc usage in xc_ia64_send_vcpumap Changeset 23577:607474aeefe1 introduced an error in xc_ia64_send_vcpumap(), bitmap_alloc() was not used correctly. Signed-off-by: Olaf Hering Committed-by: Keir Fraser --- diff -r 03fdacb67f2c -r eabfa0150f1c tools/libxc/ia64/xc_ia64_linux_save.c --- a/tools/libxc/ia64/xc_ia64_linux_save.c Tue Jan 31 11:33:35 2012 +0000 +++ b/tools/libxc/ia64/xc_ia64_linux_save.c Tue Jan 31 11:34:43 2012 +0000 @@ -195,8 +195,8 @@ uint64_t *vcpumap = NULL; vcpumap_size = bitmap_size(max_virt_cpus); - rc = bitmap_alloc(&vcpumap, max_virt_cpus); - if (rc < 0) { + vcpumap = bitmap_alloc(max_virt_cpus); + if (!vcpumap) { ERROR("memory alloc for vcpumap"); goto out; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:56:55 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:56:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7n-00073P-4d; Fri, 03 Feb 2012 21:56:55 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7l-00071n-OQ for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:53 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-27.messagelabs.com!1328306150!59696067!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13197 invoked from network); 3 Feb 2012 21:55:51 -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; 3 Feb 2012 21:55:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7j-0001l9-Hd for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR7g-0002ch-Vv for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:50 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:56:47 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] tools/libxc: fix bitmap_alloc usage in xc_ia64_send_vcpumap X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Olaf Hering # Date 1328009683 0 # Node ID eabfa0150f1cbc328741676e7e6d95a511585634 # Parent 03fdacb67f2cb76a24fd9517f1b0ea13e83973d2 tools/libxc: fix bitmap_alloc usage in xc_ia64_send_vcpumap Changeset 23577:607474aeefe1 introduced an error in xc_ia64_send_vcpumap(), bitmap_alloc() was not used correctly. Signed-off-by: Olaf Hering Committed-by: Keir Fraser --- diff -r 03fdacb67f2c -r eabfa0150f1c tools/libxc/ia64/xc_ia64_linux_save.c --- a/tools/libxc/ia64/xc_ia64_linux_save.c Tue Jan 31 11:33:35 2012 +0000 +++ b/tools/libxc/ia64/xc_ia64_linux_save.c Tue Jan 31 11:34:43 2012 +0000 @@ -195,8 +195,8 @@ uint64_t *vcpumap = NULL; vcpumap_size = bitmap_size(max_virt_cpus); - rc = bitmap_alloc(&vcpumap, max_virt_cpus); - if (rc < 0) { + vcpumap = bitmap_alloc(max_virt_cpus); + if (!vcpumap) { ERROR("memory alloc for vcpumap"); goto out; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:56:57 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:56:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7p-000750-7l; Fri, 03 Feb 2012 21:56:57 +0000 Received: from mail182.messagelabs.com ([85.158.139.83]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7n-0006zd-EI for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:55 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-182.messagelabs.com!1328306207!13667576!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16905 invoked from network); 3 Feb 2012 21:56:48 -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; 3 Feb 2012 21:56:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7f-0001kz-AZ for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR7d-0002bW-8x for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:46 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:56:44 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] mini-os: convert mlock macros to C functions X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Olaf Hering # Date 1328009615 0 # Node ID 03fdacb67f2cb76a24fd9517f1b0ea13e83973d2 # Parent 828639c20dcc9f48d155bd99ef6f963484ef7527 mini-os: convert mlock macros to C functions mlock and munlock are implemented as macros in mini-os. Their usage requires casting in common code. Convert them to C syntax and provide an empty dummy function. Remove the now unneeded (void) cast from two munlock calls. Signed-off-by: Olaf Hering --- diff -r 828639c20dcc -r 03fdacb67f2c extras/mini-os/include/posix/sys/mman.h --- a/extras/mini-os/include/posix/sys/mman.h Mon Jan 30 13:06:34 2012 +0100 +++ b/extras/mini-os/include/posix/sys/mman.h Tue Jan 31 11:33:35 2012 +0000 @@ -16,7 +16,7 @@ void *mmap(void *start, size_t length, int prot, int flags, int fd, off_t offset) asm("mmap64"); int munmap(void *start, size_t length); -#define munlock(addr, len) ((void)(addr), (void)(len), 0) -#define mlock(addr, len) ((void)(addr), (void)(len), 0) +static inline mlock(const void *addr, size_t len) { return 0; } +static inline munlock(const void *addr, size_t len) { return 0; } #endif /* _POSIX_SYS_MMAN_H */ diff -r 828639c20dcc -r 03fdacb67f2c tools/libxc/xc_linux_osdep.c --- a/tools/libxc/xc_linux_osdep.c Mon Jan 30 13:06:34 2012 +0100 +++ b/tools/libxc/xc_linux_osdep.c Tue Jan 31 11:33:35 2012 +0000 @@ -106,7 +106,7 @@ static void linux_privcmd_free_hypercall_buffer(xc_interface *xch, xc_osdep_handle h, void *ptr, int npages) { - (void) munlock(ptr, npages * XC_PAGE_SIZE); + munlock(ptr, npages * XC_PAGE_SIZE); free(ptr); } diff -r 828639c20dcc -r 03fdacb67f2c tools/libxc/xc_mem_paging.c --- a/tools/libxc/xc_mem_paging.c Mon Jan 30 13:06:34 2012 +0100 +++ b/tools/libxc/xc_mem_paging.c Tue Jan 31 11:33:35 2012 +0000 @@ -87,7 +87,7 @@ buffer, NULL, gfn); old_errno = errno; - (void) munlock(buffer, XC_PAGE_SIZE); + munlock(buffer, XC_PAGE_SIZE); errno = old_errno; return rc; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:56:57 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:56:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7p-000750-7l; Fri, 03 Feb 2012 21:56:57 +0000 Received: from mail182.messagelabs.com ([85.158.139.83]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7n-0006zd-EI for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:55 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-182.messagelabs.com!1328306207!13667576!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16905 invoked from network); 3 Feb 2012 21:56:48 -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; 3 Feb 2012 21:56:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7f-0001kz-AZ for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR7d-0002bW-8x for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:46 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:56:44 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] mini-os: convert mlock macros to C functions X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Olaf Hering # Date 1328009615 0 # Node ID 03fdacb67f2cb76a24fd9517f1b0ea13e83973d2 # Parent 828639c20dcc9f48d155bd99ef6f963484ef7527 mini-os: convert mlock macros to C functions mlock and munlock are implemented as macros in mini-os. Their usage requires casting in common code. Convert them to C syntax and provide an empty dummy function. Remove the now unneeded (void) cast from two munlock calls. Signed-off-by: Olaf Hering --- diff -r 828639c20dcc -r 03fdacb67f2c extras/mini-os/include/posix/sys/mman.h --- a/extras/mini-os/include/posix/sys/mman.h Mon Jan 30 13:06:34 2012 +0100 +++ b/extras/mini-os/include/posix/sys/mman.h Tue Jan 31 11:33:35 2012 +0000 @@ -16,7 +16,7 @@ void *mmap(void *start, size_t length, int prot, int flags, int fd, off_t offset) asm("mmap64"); int munmap(void *start, size_t length); -#define munlock(addr, len) ((void)(addr), (void)(len), 0) -#define mlock(addr, len) ((void)(addr), (void)(len), 0) +static inline mlock(const void *addr, size_t len) { return 0; } +static inline munlock(const void *addr, size_t len) { return 0; } #endif /* _POSIX_SYS_MMAN_H */ diff -r 828639c20dcc -r 03fdacb67f2c tools/libxc/xc_linux_osdep.c --- a/tools/libxc/xc_linux_osdep.c Mon Jan 30 13:06:34 2012 +0100 +++ b/tools/libxc/xc_linux_osdep.c Tue Jan 31 11:33:35 2012 +0000 @@ -106,7 +106,7 @@ static void linux_privcmd_free_hypercall_buffer(xc_interface *xch, xc_osdep_handle h, void *ptr, int npages) { - (void) munlock(ptr, npages * XC_PAGE_SIZE); + munlock(ptr, npages * XC_PAGE_SIZE); free(ptr); } diff -r 828639c20dcc -r 03fdacb67f2c tools/libxc/xc_mem_paging.c --- a/tools/libxc/xc_mem_paging.c Mon Jan 30 13:06:34 2012 +0100 +++ b/tools/libxc/xc_mem_paging.c Tue Jan 31 11:33:35 2012 +0000 @@ -87,7 +87,7 @@ buffer, NULL, gfn); old_errno = errno; - (void) munlock(buffer, XC_PAGE_SIZE); + munlock(buffer, XC_PAGE_SIZE); errno = old_errno; return rc; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:57:09 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:57: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 1RtR81-0007BU-Ay; Fri, 03 Feb 2012 21:57:09 +0000 Received: from mail182.messagelabs.com ([85.158.139.83]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7z-00077x-Gh for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:07 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-182.messagelabs.com!1328306219!13586087!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11985 invoked from network); 3 Feb 2012 21:57:00 -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; 3 Feb 2012 21:57:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7r-0001lN-3N for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR7l-0002eR-Pd for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:56 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:56:51 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] tools/libxc: remove volatile keyword for bitmap operations X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Olaf Hering # Date 1328009707 0 # Node ID a056dcc72ed840b576a6f94973c11261acd841e3 # Parent eabfa0150f1cbc328741676e7e6d95a511585634 tools/libxc: remove volatile keyword for bitmap operations All bitmaps maintained by xc_bitops.h are used in single threaded applications. So nothing will change the bitmaps content, adding volatile adds just unneeded memory reloads. xenpaging uses bitmaps alot and using non-volatile versions will slightly improve performance. Signed-off-by: Olaf Hering Committed-by: Keir Fraser --- diff -r eabfa0150f1c -r a056dcc72ed8 tools/libxc/xc_bitops.h --- a/tools/libxc/xc_bitops.h Tue Jan 31 11:34:43 2012 +0000 +++ b/tools/libxc/xc_bitops.h Tue Jan 31 11:35:07 2012 +0000 @@ -31,29 +31,29 @@ memset(addr, 0, bitmap_size(nr_bits)); } -static inline int test_bit(int nr, volatile unsigned long *addr) +static inline int test_bit(int nr, unsigned long *addr) { return (BITMAP_ENTRY(nr, addr) >> BITMAP_SHIFT(nr)) & 1; } -static inline void clear_bit(int nr, volatile unsigned long *addr) +static inline void clear_bit(int nr, unsigned long *addr) { BITMAP_ENTRY(nr, addr) &= ~(1UL << BITMAP_SHIFT(nr)); } -static inline void set_bit(int nr, volatile unsigned long *addr) +static inline void set_bit(int nr, unsigned long *addr) { BITMAP_ENTRY(nr, addr) |= (1UL << BITMAP_SHIFT(nr)); } -static inline int test_and_clear_bit(int nr, volatile unsigned long *addr) +static inline int test_and_clear_bit(int nr, unsigned long *addr) { int oldbit = test_bit(nr, addr); clear_bit(nr, addr); return oldbit; } -static inline int test_and_set_bit(int nr, volatile unsigned long *addr) +static inline int test_and_set_bit(int nr, unsigned long *addr) { int oldbit = test_bit(nr, addr); set_bit(nr, addr); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:57:09 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:57: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 1RtR81-0007BU-Ay; Fri, 03 Feb 2012 21:57:09 +0000 Received: from mail182.messagelabs.com ([85.158.139.83]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7z-00077x-Gh for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:07 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-182.messagelabs.com!1328306219!13586087!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11985 invoked from network); 3 Feb 2012 21:57:00 -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; 3 Feb 2012 21:57:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7r-0001lN-3N for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR7l-0002eR-Pd for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:56:56 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:56:51 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] tools/libxc: remove volatile keyword for bitmap operations X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Olaf Hering # Date 1328009707 0 # Node ID a056dcc72ed840b576a6f94973c11261acd841e3 # Parent eabfa0150f1cbc328741676e7e6d95a511585634 tools/libxc: remove volatile keyword for bitmap operations All bitmaps maintained by xc_bitops.h are used in single threaded applications. So nothing will change the bitmaps content, adding volatile adds just unneeded memory reloads. xenpaging uses bitmaps alot and using non-volatile versions will slightly improve performance. Signed-off-by: Olaf Hering Committed-by: Keir Fraser --- diff -r eabfa0150f1c -r a056dcc72ed8 tools/libxc/xc_bitops.h --- a/tools/libxc/xc_bitops.h Tue Jan 31 11:34:43 2012 +0000 +++ b/tools/libxc/xc_bitops.h Tue Jan 31 11:35:07 2012 +0000 @@ -31,29 +31,29 @@ memset(addr, 0, bitmap_size(nr_bits)); } -static inline int test_bit(int nr, volatile unsigned long *addr) +static inline int test_bit(int nr, unsigned long *addr) { return (BITMAP_ENTRY(nr, addr) >> BITMAP_SHIFT(nr)) & 1; } -static inline void clear_bit(int nr, volatile unsigned long *addr) +static inline void clear_bit(int nr, unsigned long *addr) { BITMAP_ENTRY(nr, addr) &= ~(1UL << BITMAP_SHIFT(nr)); } -static inline void set_bit(int nr, volatile unsigned long *addr) +static inline void set_bit(int nr, unsigned long *addr) { BITMAP_ENTRY(nr, addr) |= (1UL << BITMAP_SHIFT(nr)); } -static inline int test_and_clear_bit(int nr, volatile unsigned long *addr) +static inline int test_and_clear_bit(int nr, unsigned long *addr) { int oldbit = test_bit(nr, addr); clear_bit(nr, addr); return oldbit; } -static inline int test_and_set_bit(int nr, volatile unsigned long *addr) +static inline int test_and_set_bit(int nr, unsigned long *addr) { int oldbit = test_bit(nr, addr); set_bit(nr, addr); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:57:11 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:57: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 1RtR83-0007D7-Dd; Fri, 03 Feb 2012 21:57:11 +0000 Received: from mail216.messagelabs.com ([85.158.143.99]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR81-00079O-LR for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:09 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-216.messagelabs.com!1328306222!13897055!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.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 931 invoked from network); 3 Feb 2012 21:57:03 -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; 3 Feb 2012 21:57:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7u-0001lx-G0 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR7s-0002gP-DW for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:01 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:56:59 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] public/physdev.h: Fix __XEN_INTERFACE_VERSION__ typo. X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Keir Fraser # Date 1328009823 0 # Node ID 6ddc2937b0416596f85765e7d3c6a8db9bba6f76 # Parent a056dcc72ed840b576a6f94973c11261acd841e3 public/physdev.h: Fix __XEN_INTERFACE_VERSION__ typo. Signed-off-by: Keir Fraser --- diff -r a056dcc72ed8 -r 6ddc2937b041 xen/include/public/physdev.h --- a/xen/include/public/physdev.h Tue Jan 31 11:35:07 2012 +0000 +++ b/xen/include/public/physdev.h Tue Jan 31 11:37:03 2012 +0000 @@ -333,7 +333,7 @@ #define PHYSDEVOP_IRQ_NEEDS_UNMASK_NOTIFY XENIRQSTAT_needs_eoi #define PHYSDEVOP_IRQ_SHARED XENIRQSTAT_shared -#if __XEN_INTERFACE_VERSION < 0x00040200 +#if __XEN_INTERFACE_VERSION__ < 0x00040200 #define PHYSDEVOP_pirq_eoi_gmfn PHYSDEVOP_pirq_eoi_gmfn_v1 #else #define PHYSDEVOP_pirq_eoi_gmfn PHYSDEVOP_pirq_eoi_gmfn_v2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:57:11 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:57: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 1RtR83-0007D7-Dd; Fri, 03 Feb 2012 21:57:11 +0000 Received: from mail216.messagelabs.com ([85.158.143.99]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR81-00079O-LR for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:09 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-216.messagelabs.com!1328306222!13897055!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.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 931 invoked from network); 3 Feb 2012 21:57:03 -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; 3 Feb 2012 21:57:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7u-0001lx-G0 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR7s-0002gP-DW for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:01 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:56:59 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] public/physdev.h: Fix __XEN_INTERFACE_VERSION__ typo. X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Keir Fraser # Date 1328009823 0 # Node ID 6ddc2937b0416596f85765e7d3c6a8db9bba6f76 # Parent a056dcc72ed840b576a6f94973c11261acd841e3 public/physdev.h: Fix __XEN_INTERFACE_VERSION__ typo. Signed-off-by: Keir Fraser --- diff -r a056dcc72ed8 -r 6ddc2937b041 xen/include/public/physdev.h --- a/xen/include/public/physdev.h Tue Jan 31 11:35:07 2012 +0000 +++ b/xen/include/public/physdev.h Tue Jan 31 11:37:03 2012 +0000 @@ -333,7 +333,7 @@ #define PHYSDEVOP_IRQ_NEEDS_UNMASK_NOTIFY XENIRQSTAT_needs_eoi #define PHYSDEVOP_IRQ_SHARED XENIRQSTAT_shared -#if __XEN_INTERFACE_VERSION < 0x00040200 +#if __XEN_INTERFACE_VERSION__ < 0x00040200 #define PHYSDEVOP_pirq_eoi_gmfn PHYSDEVOP_pirq_eoi_gmfn_v1 #else #define PHYSDEVOP_pirq_eoi_gmfn PHYSDEVOP_pirq_eoi_gmfn_v2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:57:12 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:57: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 1RtR84-0007EL-If; Fri, 03 Feb 2012 21:57:12 +0000 Received: from mail174.messagelabs.com ([85.158.138.51]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR82-00079r-Qi for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-174.messagelabs.com!1328306223!11764518!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.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25674 invoked from network); 3 Feb 2012 21:57:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 3 Feb 2012 21:57:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7v-0001m0-Fr for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR7v-0002hJ-37 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:03 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:57:02 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xen: do not remap pirqs if !is_hvm_pv_evtchn_domain X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Stefano Stabellini # Date 1328009977 0 # Node ID 6c9a7381777031600ef3442a578d0fa3ce1491b2 # Parent 6ddc2937b0416596f85765e7d3c6a8db9bba6f76 xen: do not remap pirqs if !is_hvm_pv_evtchn_domain If the guest is an HVM guest and it is not using the vector callback mechanism, refuse to remap pirqs onto event channels. Signed-off-by: Stefano Stabellini Tested-by: Paulian Bogdan Marinca Committed-by: Keir Fraser --- diff -r 6ddc2937b041 -r 6c9a73817770 xen/arch/x86/physdev.c --- a/xen/arch/x86/physdev.c Tue Jan 31 11:37:03 2012 +0000 +++ b/xen/arch/x86/physdev.c Tue Jan 31 11:39:37 2012 +0000 @@ -93,6 +93,15 @@ if ( domid == DOMID_SELF && is_hvm_domain(d) ) { + /* + * Only makes sense for vector-based callback, else HVM-IRQ logic + * calls back into itself and deadlocks on hvm_domain.irq_lock. + */ + if ( !is_hvm_pv_evtchn_domain(d) ) + { + ret = -EINVAL; + goto free_domain; + } ret = physdev_hvm_map_pirq(d, type, index, pirq_p); goto free_domain; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:57:12 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:57: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 1RtR84-0007EL-If; Fri, 03 Feb 2012 21:57:12 +0000 Received: from mail174.messagelabs.com ([85.158.138.51]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR82-00079r-Qi for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-174.messagelabs.com!1328306223!11764518!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.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25674 invoked from network); 3 Feb 2012 21:57:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 3 Feb 2012 21:57:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR7v-0001m0-Fr for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR7v-0002hJ-37 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:03 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:57:02 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xen: do not remap pirqs if !is_hvm_pv_evtchn_domain X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Stefano Stabellini # Date 1328009977 0 # Node ID 6c9a7381777031600ef3442a578d0fa3ce1491b2 # Parent 6ddc2937b0416596f85765e7d3c6a8db9bba6f76 xen: do not remap pirqs if !is_hvm_pv_evtchn_domain If the guest is an HVM guest and it is not using the vector callback mechanism, refuse to remap pirqs onto event channels. Signed-off-by: Stefano Stabellini Tested-by: Paulian Bogdan Marinca Committed-by: Keir Fraser --- diff -r 6ddc2937b041 -r 6c9a73817770 xen/arch/x86/physdev.c --- a/xen/arch/x86/physdev.c Tue Jan 31 11:37:03 2012 +0000 +++ b/xen/arch/x86/physdev.c Tue Jan 31 11:39:37 2012 +0000 @@ -93,6 +93,15 @@ if ( domid == DOMID_SELF && is_hvm_domain(d) ) { + /* + * Only makes sense for vector-based callback, else HVM-IRQ logic + * calls back into itself and deadlocks on hvm_domain.irq_lock. + */ + if ( !is_hvm_pv_evtchn_domain(d) ) + { + ret = -EINVAL; + goto free_domain; + } ret = physdev_hvm_map_pirq(d, type, index, pirq_p); goto free_domain; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:57:22 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:57: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 1RtR8E-0007Ku-MO; Fri, 03 Feb 2012 21:57:22 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8C-0007Jn-GO for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:21 +0000 Received: from [193.109.254.147:46791] by server-4.bemta-14.messagelabs.com id E3/1D-04726-F385C2F4; Fri, 03 Feb 2012 21:57:19 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-27.messagelabs.com!1328306183!51337678!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG, UPPERCASE_25_50 X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16419 invoked from network); 3 Feb 2012 21:56:24 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 3 Feb 2012 21:56:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR84-0001m8-DV for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR7z-0002id-LS for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:11 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:57:03 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] mini-os: use BSD sys/queue.h instead of Linux list.h X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1328025974 0 # Node ID 934c14ab9f19330c91e2769beb96ac6896b2a1c8 # Parent 6c9a7381777031600ef3442a578d0fa3ce1491b2 mini-os: use BSD sys/queue.h instead of Linux list.h The latter is GPL which makes the whole of mini-os GPL rather than BSD as intended. In tree users are all GPL or GPL-compatible but we should fix this so that mini-os is BSD. Do so by using the same BSD sys/queue.h as we use in libxl. Tested with the builtin mini-os test app and qemu stubdomain, both of which appear to still function as expected. Move tools/libxl/external and the associated sed script to tools/include/xen-external to allow more sensible access from mini-os. Also add s/NULL/0/ in the sed script due to NULL not always being defined in stubdom code when mini-os/wait.h is included. As well as the obvious ABI changes there are a few API updates associated with the change: - struct rw_semaphore.wait_list is unused - remove_waiter needs to take the wait_queue_head The latter requires a qemu update, so there is also a QEMU_TAG update in this changeset. I sprinkled some extra-emacs local variables around the files I edited which didn't have them. I think this should be backported to the stable branches since external users of mini-os may have been mislead into thinking they could safely link mini-os against GPL-incompatible code. Signed-off-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 6c9a73817770 -r 934c14ab9f19 .hgignore --- a/.hgignore Tue Jan 31 11:39:37 2012 +0000 +++ b/.hgignore Tue Jan 31 16:06:14 2012 +0000 @@ -62,6 +62,7 @@ ^docs/xen-api/xenapi-datamodel-graph.eps$ ^docs/xen-api/xenapi.out$ ^extras/mini-os/arch/ia64/gen_off.s$ +^extras/mini-os/include/list\.h$ ^extras/mini-os/include/mini-os$ ^extras/mini-os/include/ia64/mini-os$ ^extras/mini-os/include/ia64/offsets.h$ diff -r 6c9a73817770 -r 934c14ab9f19 Config.mk --- a/Config.mk Tue Jan 31 11:39:37 2012 +0000 +++ b/Config.mk Tue Jan 31 16:06:14 2012 +0000 @@ -222,9 +222,9 @@ # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= bb36d632e4cabf47882adff07a45c6702c4a5b30 -# Thu Jan 5 17:16:46 2012 +0000 -# qemu-xen: adjust MSI-X related log messages +QEMU_TAG ?= de05447400930da4be216e4fb0fe52b8be81490e +# Tue Jan 31 15:42:38 2012 +0000 +# block-vbd: update to new mini-os wait queue API (new linked list API) # Short answer -- do not enable this unless you know what you are # doing and are prepared for some pain. diff -r 6c9a73817770 -r 934c14ab9f19 extras/mini-os/Makefile --- a/extras/mini-os/Makefile Tue Jan 31 11:39:37 2012 +0000 +++ b/extras/mini-os/Makefile Tue Jan 31 16:06:14 2012 +0000 @@ -52,8 +52,12 @@ $(arch_links) endif +include/list.h: $(XEN_ROOT)/tools/include/xen-external/bsd-sys-queue-h-seddery $(XEN_ROOT)/tools/include/xen-external/bsd-sys-queue.h + perl $^ --prefix=minios >$@.new + $(call move-if-changed,$@.new,$@) + .PHONY: links -links: $(ARCH_LINKS) +links: include/list.h $(ARCH_LINKS) [ -e include/xen ] || ln -sf ../../../xen/include/public include/xen [ -e include/mini-os ] || ln -sf . include/mini-os [ -e include/$(TARGET_ARCH_FAM)/mini-os ] || ln -sf . include/$(TARGET_ARCH_FAM)/mini-os @@ -97,7 +101,7 @@ APP_O=$(OBJ_DIR)/$(TARGET)_app.o endif -$(OBJ_DIR)/$(TARGET): links $(OBJS) $(APP_O) arch_lib +$(OBJ_DIR)/$(TARGET): links include/list.h $(OBJS) $(APP_O) arch_lib $(LD) -r $(LDFLAGS) $(HEAD_OBJ) $(APP_O) $(OBJS) $(LDARCHLIB) $(LDLIBS) -o $@.o $(OBJCOPY) -w -G $(GLOBAL_PREFIX)* -G _start $@.o $@.o $(LD) $(LDFLAGS) $(LDFLAGS_FINAL) $@.o $(EXTRA_OBJS) -o $@ @@ -112,6 +116,7 @@ for dir in $(addprefix $(OBJ_DIR)/,$(SUBDIRS)); do \ rm -f $$dir/*.o; \ done + rm -f include/list.h rm -f $(OBJ_DIR)/*.o *~ $(OBJ_DIR)/core $(OBJ_DIR)/$(TARGET).elf $(OBJ_DIR)/$(TARGET).raw $(OBJ_DIR)/$(TARGET) $(OBJ_DIR)/$(TARGET).gz find . $(OBJ_DIR) -type l | xargs rm -f $(RM) $(OBJ_DIR)/lwip.a $(LWO) diff -r 6c9a73817770 -r 934c14ab9f19 extras/mini-os/blkfront.c --- a/extras/mini-os/blkfront.c Tue Jan 31 11:39:37 2012 +0000 +++ b/extras/mini-os/blkfront.c Tue Jan 31 16:06:14 2012 +0000 @@ -323,7 +323,7 @@ schedule(); local_irq_save(flags); } - remove_waiter(w); + remove_waiter(w, blkfront_queue); local_irq_restore(flags); } } @@ -414,7 +414,7 @@ schedule(); local_irq_save(flags); } - remove_waiter(w); + remove_waiter(w, blkfront_queue); local_irq_restore(flags); } @@ -470,7 +470,7 @@ schedule(); local_irq_save(flags); } - remove_waiter(w); + remove_waiter(w, blkfront_queue); local_irq_restore(flags); } diff -r 6c9a73817770 -r 934c14ab9f19 extras/mini-os/fbfront.c --- a/extras/mini-os/fbfront.c Tue Jan 31 11:39:37 2012 +0000 +++ b/extras/mini-os/fbfront.c Tue Jan 31 16:06:14 2012 +0000 @@ -569,7 +569,7 @@ add_waiter(w, fbfront_queue); while (page->out_prod - page->out_cons == XENFB_OUT_RING_LEN) schedule(); - remove_waiter(w); + remove_waiter(w, fbfront_queue); prod = page->out_prod; mb(); /* ensure ring space available */ diff -r 6c9a73817770 -r 934c14ab9f19 extras/mini-os/include/list.h --- a/extras/mini-os/include/list.h Tue Jan 31 11:39:37 2012 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,190 +0,0 @@ -#ifndef _LINUX_LIST_H -#define _LINUX_LIST_H - -/* - * Simple doubly linked list implementation. - * - * Some of the internal functions ("__xxx") are useful when - * manipulating whole lists rather than single entries, as - * sometimes we already know the next/prev entries and we can - * generate better code by using them directly rather than - * using the generic single-entry routines. - */ - -struct minios_list_head { - struct minios_list_head *next, *prev; -}; - -#define MINIOS_LIST_HEAD_INIT(name) { &(name), &(name) } - -#define MINIOS_LIST_HEAD(name) \ - struct minios_list_head name = MINIOS_LIST_HEAD_INIT(name) - -#define MINIOS_INIT_LIST_HEAD(ptr) do { \ - (ptr)->next = (ptr); (ptr)->prev = (ptr); \ -} while (0) - -#define minios_list_top(head, type, member) \ -({ \ - struct minios_list_head *_head = (head); \ - minios_list_empty(_head) ? NULL : minios_list_entry(_head->next, type, member); \ -}) - -/* - * Insert a new entry between two known consecutive entries. - * - * This is only for internal list manipulation where we know - * the prev/next entries already! - */ -static __inline__ void __minios_list_add(struct minios_list_head * new, - struct minios_list_head * prev, - struct minios_list_head * next) -{ - next->prev = new; - new->next = next; - new->prev = prev; - prev->next = new; -} - -/** - * minios_list_add - add a new entry - * @new: new entry to be added - * @head: list head to add it after - * - * Insert a new entry after the specified head. - * This is good for implementing stacks. - */ -static __inline__ void minios_list_add(struct minios_list_head *new, struct minios_list_head *head) -{ - __minios_list_add(new, head, head->next); -} - -/** - * minios_list_add_tail - add a new entry - * @new: new entry to be added - * @head: list head to add it before - * - * Insert a new entry before the specified head. - * This is useful for implementing queues. - */ -static __inline__ void minios_list_add_tail(struct minios_list_head *new, struct minios_list_head *head) -{ - __minios_list_add(new, head->prev, head); -} - -/* - * Delete a list entry by making the prev/next entries - * point to each other. - * - * This is only for internal list manipulation where we know - * the prev/next entries already! - */ -static __inline__ void __minios_list_del(struct minios_list_head * prev, - struct minios_list_head * next) -{ - next->prev = prev; - prev->next = next; -} - -/** - * minios_list_del - deletes entry from list. - * @entry: the element to delete from the list. - * Note: minios_list_empty on entry does not return true after this, the entry is in an undefined state. - */ -static __inline__ void minios_list_del(struct minios_list_head *entry) -{ - __minios_list_del(entry->prev, entry->next); -} - -/** - * minios_list_del_init - deletes entry from list and reinitialize it. - * @entry: the element to delete from the list. - */ -static __inline__ void minios_list_del_init(struct minios_list_head *entry) -{ - __minios_list_del(entry->prev, entry->next); - MINIOS_INIT_LIST_HEAD(entry); -} - -/** - * minios_list_empty - tests whether a list is empty - * @head: the list to test. - */ -static __inline__ int minios_list_empty(struct minios_list_head *head) -{ - return head->next == head; -} - -/** - * minios_list_splice - join two lists - * @list: the new list to add. - * @head: the place to add it in the first list. - */ -static __inline__ void minios_list_splice(struct minios_list_head *list, struct minios_list_head *head) -{ - struct minios_list_head *first = list->next; - - if (first != list) { - struct minios_list_head *last = list->prev; - struct minios_list_head *at = head->next; - - first->prev = head; - head->next = first; - - last->next = at; - at->prev = last; - } -} - -/** - * minios_list_entry - get the struct for this entry - * @ptr: the &struct minios_list_head pointer. - * @type: the type of the struct this is embedded in. - * @member: the name of the minios_list_struct within the struct. - */ -#define minios_list_entry(ptr, type, member) \ - ((type *)((char *)(ptr)-(unsigned long)(&((type *)0)->member))) - -/** - * minios_list_for_each - iterate over a list - * @pos: the &struct minios_list_head to use as a loop counter. - * @head: the head for your list. - */ -#define minios_list_for_each(pos, head) \ - for (pos = (head)->next; pos != (head); pos = pos->next) - -/** - * minios_list_for_each_safe - iterate over a list safe against removal of list entry - * @pos: the &struct minios_list_head to use as a loop counter. - * @n: another &struct minios_list_head to use as temporary storage - * @head: the head for your list. - */ -#define minios_list_for_each_safe(pos, n, head) \ - for (pos = (head)->next, n = pos->next; pos != (head); \ - pos = n, n = pos->next) - -/** - * minios_list_for_each_entry - iterate over list of given type - * @pos: the type * to use as a loop counter. - * @head: the head for your list. - * @member: the name of the minios_list_struct within the struct. - */ -#define minios_list_for_each_entry(pos, head, member) \ - for (pos = minios_list_entry((head)->next, typeof(*pos), member); \ - &pos->member != (head); \ - pos = minios_list_entry(pos->member.next, typeof(*pos), member)) - -/** - * minios_list_for_each_entry_safe - iterate over list of given type safe against removal of list entry - * @pos: the type * to use as a loop counter. - * @n: another type * to use as temporary storage - * @head: the head for your list. - * @member: the name of the minios_list_struct within the struct. - */ -#define minios_list_for_each_entry_safe(pos, n, head, member) \ - for (pos = minios_list_entry((head)->next, typeof(*pos), member), \ - n = minios_list_entry(pos->member.next, typeof(*pos), member); \ - &pos->member != (head); \ - pos = n, n = minios_list_entry(n->member.next, typeof(*n), member)) -#endif /* _LINUX_LIST_H */ - diff -r 6c9a73817770 -r 934c14ab9f19 extras/mini-os/include/sched.h --- a/extras/mini-os/include/sched.h Tue Jan 31 11:39:37 2012 +0000 +++ b/extras/mini-os/include/sched.h Tue Jan 31 16:06:14 2012 +0000 @@ -19,7 +19,7 @@ #else /* !defined(__ia64__) */ thread_regs_t regs; #endif /* !defined(__ia64__) */ - struct minios_list_head thread_list; + MINIOS_TAILQ_ENTRY(struct thread) thread_list; uint32_t flags; s_time_t wakeup_time; #ifdef HAVE_LIBC diff -r 6c9a73817770 -r 934c14ab9f19 extras/mini-os/include/semaphore.h --- a/extras/mini-os/include/semaphore.h Tue Jan 31 11:39:37 2012 +0000 +++ b/extras/mini-os/include/semaphore.h Tue Jan 31 16:06:14 2012 +0000 @@ -21,7 +21,6 @@ struct rw_semaphore { signed long count; spinlock_t wait_lock; - struct minios_list_head wait_list; int debug; }; diff -r 6c9a73817770 -r 934c14ab9f19 extras/mini-os/include/wait.h --- a/extras/mini-os/include/wait.h Tue Jan 31 11:39:37 2012 +0000 +++ b/extras/mini-os/include/wait.h Tue Jan 31 16:06:14 2012 +0000 @@ -5,47 +5,47 @@ #include #include -#define DEFINE_WAIT(name) \ -struct wait_queue name = { \ - .thread = get_current(), \ - .thread_list = MINIOS_LIST_HEAD_INIT((name).thread_list), \ +#define DEFINE_WAIT(name) \ +struct wait_queue name = { \ + .thread = get_current(), \ + .waiting = 0, \ } static inline void init_waitqueue_head(struct wait_queue_head *h) { - MINIOS_INIT_LIST_HEAD(&h->thread_list); + MINIOS_STAILQ_INIT(h); } static inline void init_waitqueue_entry(struct wait_queue *q, struct thread *thread) { q->thread = thread; - MINIOS_INIT_LIST_HEAD(&q->thread_list); + q->waiting = 0; } - static inline void add_wait_queue(struct wait_queue_head *h, struct wait_queue *q) { - if (minios_list_empty(&q->thread_list)) - minios_list_add(&q->thread_list, &h->thread_list); + if (!q->waiting) { + MINIOS_STAILQ_INSERT_HEAD(h, q, thread_list); + q->waiting = 1; + } } -static inline void remove_wait_queue(struct wait_queue *q) +static inline void remove_wait_queue(struct wait_queue_head *h, struct wait_queue *q) { - minios_list_del(&q->thread_list); + if (q->waiting) { + MINIOS_STAILQ_REMOVE(h, q, struct wait_queue, thread_list); + q->waiting = 0; + } } static inline void wake_up(struct wait_queue_head *head) { unsigned long flags; - struct minios_list_head *tmp, *next; + struct wait_queue *curr, *tmp; local_irq_save(flags); - minios_list_for_each_safe(tmp, next, &head->thread_list) - { - struct wait_queue *curr; - curr = minios_list_entry(tmp, struct wait_queue, thread_list); + MINIOS_STAILQ_FOREACH_SAFE(curr, head, thread_list, tmp) wake(curr->thread); - } local_irq_restore(flags); } @@ -57,11 +57,11 @@ local_irq_restore(flags); \ } while (0) -#define remove_waiter(w) do { \ - unsigned long flags; \ - local_irq_save(flags); \ - remove_wait_queue(&w); \ - local_irq_restore(flags); \ +#define remove_waiter(w, wq) do { \ + unsigned long flags; \ + local_irq_save(flags); \ + remove_wait_queue(&wq, &w); \ + local_irq_restore(flags); \ } while (0) #define wait_event_deadline(wq, condition, deadline) do { \ @@ -84,7 +84,7 @@ local_irq_save(flags); \ /* need to wake up */ \ wake(get_current()); \ - remove_wait_queue(&__wait); \ + remove_wait_queue(&wq, &__wait); \ local_irq_restore(flags); \ } while(0) @@ -93,3 +93,13 @@ #endif /* __WAIT_H__ */ + +/* + * Local variables: + * mode: C + * c-set-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff -r 6c9a73817770 -r 934c14ab9f19 extras/mini-os/include/waittypes.h --- a/extras/mini-os/include/waittypes.h Tue Jan 31 11:39:37 2012 +0000 +++ b/extras/mini-os/include/waittypes.h Tue Jan 31 16:06:14 2012 +0000 @@ -6,21 +6,27 @@ struct thread; struct wait_queue { + int waiting; struct thread *thread; - struct minios_list_head thread_list; + MINIOS_STAILQ_ENTRY(struct wait_queue) thread_list; }; -struct wait_queue_head -{ - /* TODO - lock required? */ - struct minios_list_head thread_list; -}; +/* TODO - lock required? */ +MINIOS_STAILQ_HEAD(wait_queue_head, struct wait_queue); #define DECLARE_WAIT_QUEUE_HEAD(name) \ - struct wait_queue_head name = \ - { .thread_list = { &(name).thread_list, &(name).thread_list} } + struct wait_queue_head name = MINIOS_STAILQ_HEAD_INITIALIZER(name) -#define __WAIT_QUEUE_HEAD_INITIALIZER(name) { \ - .thread_list = { &(name).thread_list, &(name).thread_list } } +#define __WAIT_QUEUE_HEAD_INITIALIZER(name) MINIOS_STAILQ_HEAD_INITIALIZER(name) #endif + +/* + * Local variables: + * mode: C + * c-set-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff -r 6c9a73817770 -r 934c14ab9f19 extras/mini-os/lib/sys.c --- a/extras/mini-os/lib/sys.c Tue Jan 31 11:39:37 2012 +0000 +++ b/extras/mini-os/lib/sys.c Tue Jan 31 16:06:14 2012 +0000 @@ -234,7 +234,7 @@ break; schedule(); } - remove_waiter(w); + remove_waiter(w, console_queue); return ret; } #ifdef HAVE_LWIP @@ -705,12 +705,12 @@ fd_set myread, mywrite, myexcept; struct thread *thread = get_current(); s_time_t start = NOW(), stop; - DEFINE_WAIT(w1); - DEFINE_WAIT(w2); - DEFINE_WAIT(w3); - DEFINE_WAIT(w4); - DEFINE_WAIT(w5); - DEFINE_WAIT(w6); + DEFINE_WAIT(netfront_w); + DEFINE_WAIT(event_w); + DEFINE_WAIT(blkfront_w); + DEFINE_WAIT(xenbus_watch_w); + DEFINE_WAIT(kbdfront_w); + DEFINE_WAIT(console_w); assert(thread == main_thread); @@ -727,12 +727,12 @@ /* Tell people we're going to sleep before looking at what they are * saying, hence letting them wake us if events happen between here and * schedule() */ - add_waiter(w1, netfront_queue); - add_waiter(w2, event_queue); - add_waiter(w3, blkfront_queue); - add_waiter(w4, xenbus_watch_queue); - add_waiter(w5, kbdfront_queue); - add_waiter(w6, console_queue); + add_waiter(netfront_w, netfront_queue); + add_waiter(event_w, event_queue); + add_waiter(blkfront_w, blkfront_queue); + add_waiter(xenbus_watch_w, xenbus_watch_queue); + add_waiter(kbdfront_w, kbdfront_queue); + add_waiter(console_w, console_queue); if (readfds) myread = *readfds; @@ -814,12 +814,12 @@ ret = -1; out: - remove_waiter(w1); - remove_waiter(w2); - remove_waiter(w3); - remove_waiter(w4); - remove_waiter(w5); - remove_waiter(w6); + remove_waiter(netfront_w, netfront_queue); + remove_waiter(event_w, event_queue); + remove_waiter(blkfront_w, blkfront_queue); + remove_waiter(xenbus_watch_w, xenbus_watch_queue); + remove_waiter(kbdfront_w, kbdfront_queue); + remove_waiter(console_w, console_queue); return ret; } diff -r 6c9a73817770 -r 934c14ab9f19 extras/mini-os/lib/xmalloc.c --- a/extras/mini-os/lib/xmalloc.c Tue Jan 31 11:39:37 2012 +0000 +++ b/extras/mini-os/lib/xmalloc.c Tue Jan 31 16:06:14 2012 +0000 @@ -44,16 +44,18 @@ #include #ifndef HAVE_LIBC -static MINIOS_LIST_HEAD(freelist); /* static spinlock_t freelist_lock = SPIN_LOCK_UNLOCKED; */ struct xmalloc_hdr { /* Total including this hdr, unused padding and second hdr. */ size_t size; - struct minios_list_head freelist; + MINIOS_TAILQ_ENTRY(struct xmalloc_hdr) freelist; } __cacheline_aligned; +static MINIOS_TAILQ_HEAD(,struct xmalloc_hdr) freelist = + MINIOS_TAILQ_HEAD_INITIALIZER(freelist); + /* Unused padding data between the two hdrs. */ struct xmalloc_pad @@ -82,7 +84,7 @@ extra = (struct xmalloc_hdr *)((unsigned long)hdr + size); extra->size = leftover; /* spin_lock_irqsave(&freelist_lock, flags); */ - minios_list_add(&extra->freelist, &freelist); + MINIOS_TAILQ_INSERT_HEAD(&freelist, extra, freelist); /* spin_unlock_irqrestore(&freelist_lock, flags); */ } else @@ -91,8 +93,6 @@ } hdr->size = size; - /* Debugging aid. */ - hdr->freelist.next = hdr->freelist.prev = NULL; } static struct xmalloc_hdr *xmalloc_new_page(size_t size) @@ -128,8 +128,6 @@ return NULL; hdr->size = (1UL << (pageorder + PAGE_SHIFT)); - /* Debugging aid. */ - hdr->freelist.next = hdr->freelist.prev = NULL; ret = (char*)hdr + hdr_size; pad = (struct xmalloc_pad *) ret - 1; @@ -155,14 +153,14 @@ /* Search free list. */ /* spin_lock_irqsave(&freelist_lock, flags); */ - minios_list_for_each_entry_safe( i, tmp, &freelist, freelist ) + MINIOS_TAILQ_FOREACH_SAFE(i, &freelist, freelist, tmp) { data_begin = align_up((uintptr_t)i + hdr_size, align); if ( data_begin + size > (uintptr_t)i + i->size ) continue; - minios_list_del(&i->freelist); + MINIOS_TAILQ_REMOVE(&freelist, i, freelist); /* spin_unlock_irqrestore(&freelist_lock, flags); */ uintptr_t size_before = (data_begin - hdr_size) - (uintptr_t)i; @@ -173,7 +171,7 @@ new_i->size = i->size - size_before; i->size = size_before; /* spin_lock_irqsave(&freelist_lock, flags); */ - minios_list_add(&i->freelist, &freelist); + MINIOS_TAILQ_INSERT_HEAD(&freelist, i, freelist); /* spin_unlock_irqrestore(&freelist_lock, flags); */ i = new_i; } @@ -224,16 +222,9 @@ *(int*)0=0; } - /* Not previously freed. */ - if(hdr->freelist.next || hdr->freelist.prev) - { - printk("Should not be previously freed\n"); - *(int*)0=0; - } - /* Merge with other free block, or put in list. */ /* spin_lock_irqsave(&freelist_lock, flags); */ - minios_list_for_each_entry_safe( i, tmp, &freelist, freelist ) + MINIOS_TAILQ_FOREACH_SAFE(i, &freelist, freelist, tmp) { unsigned long _i = (unsigned long)i; unsigned long _hdr = (unsigned long)hdr; @@ -245,7 +236,7 @@ /* We follow this block? Swallow it. */ if ( (_i + i->size) == _hdr ) { - minios_list_del(&i->freelist); + MINIOS_TAILQ_REMOVE(&freelist, i, freelist); i->size += hdr->size; hdr = i; } @@ -253,7 +244,7 @@ /* We precede this block? Swallow it. */ if ( (_hdr + hdr->size) == _i ) { - minios_list_del(&i->freelist); + MINIOS_TAILQ_REMOVE(&freelist, i, freelist); hdr->size += i->size; } } @@ -270,7 +261,7 @@ } else { - minios_list_add(&hdr->freelist, &freelist); + MINIOS_TAILQ_INSERT_HEAD(&freelist, hdr, freelist); } /* spin_unlock_irqrestore(&freelist_lock, flags); */ @@ -306,3 +297,13 @@ return new; } #endif + +/* + * Local variables: + * mode: C + * c-set-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff -r 6c9a73817770 -r 934c14ab9f19 extras/mini-os/sched.c --- a/extras/mini-os/sched.c Tue Jan 31 11:39:37 2012 +0000 +++ b/extras/mini-os/sched.c Tue Jan 31 16:06:14 2012 +0000 @@ -54,19 +54,20 @@ #define DEBUG(_f, _a...) ((void)0) #endif +MINIOS_TAILQ_HEAD(thread_list, struct thread); + struct thread *idle_thread = NULL; -MINIOS_LIST_HEAD(exited_threads); +static struct thread_list exited_threads = MINIOS_TAILQ_HEAD_INITIALIZER(exited_threads); +static struct thread_list thread_list = MINIOS_TAILQ_HEAD_INITIALIZER(thread_list); static int threads_started; struct thread *main_thread; void inline print_runqueue(void) { - struct minios_list_head *it; struct thread *th; - minios_list_for_each(it, &idle_thread->thread_list) + MINIOS_TAILQ_FOREACH(th, &thread_list, thread_list) { - th = minios_list_entry(it, struct thread, thread_list); printk(" Thread \"%s\", runnable=%d\n", th->name, is_runnable(th)); } printk("\n"); @@ -74,8 +75,7 @@ void schedule(void) { - struct thread *prev, *next, *thread; - struct minios_list_head *iterator, *next_iterator; + struct thread *prev, *next, *thread, *tmp; unsigned long flags; prev = current; @@ -96,10 +96,9 @@ time when the next timeout expires, else use 10 seconds. */ s_time_t now = NOW(); s_time_t min_wakeup_time = now + SECONDS(10); - next = NULL; - minios_list_for_each_safe(iterator, next_iterator, &idle_thread->thread_list) + next = NULL; + MINIOS_TAILQ_FOREACH_SAFE(thread, &thread_list, thread_list, tmp) { - thread = minios_list_entry(iterator, struct thread, thread_list); if (!is_runnable(thread) && thread->wakeup_time != 0LL) { if (thread->wakeup_time <= now) @@ -111,8 +110,8 @@ { next = thread; /* Put this thread on the end of the list */ - minios_list_del(&thread->thread_list); - minios_list_add_tail(&thread->thread_list, &idle_thread->thread_list); + MINIOS_TAILQ_REMOVE(&thread_list, thread, thread_list); + MINIOS_TAILQ_INSERT_TAIL(&thread_list, thread, thread_list); break; } } @@ -128,12 +127,11 @@ inturrupted at the return instruction. And therefore at safe point. */ if(prev != next) switch_threads(prev, next); - minios_list_for_each_safe(iterator, next_iterator, &exited_threads) + MINIOS_TAILQ_FOREACH_SAFE(thread, &exited_threads, thread_list, tmp) { - thread = minios_list_entry(iterator, struct thread, thread_list); if(thread != prev) { - minios_list_del(&thread->thread_list); + MINIOS_TAILQ_REMOVE(&exited_threads, thread, thread_list); free_pages(thread->stack, STACK_SIZE_PAGE_ORDER); xfree(thread); } @@ -154,13 +152,7 @@ #endif set_runnable(thread); local_irq_save(flags); - if(idle_thread != NULL) { - minios_list_add_tail(&thread->thread_list, &idle_thread->thread_list); - } else if(function != idle_thread_fn) - { - printk("BUG: Not allowed to create thread before initialising scheduler.\n"); - BUG(); - } + MINIOS_TAILQ_INSERT_TAIL(&thread_list, thread, thread_list); local_irq_restore(flags); return thread; } @@ -208,10 +200,10 @@ printk("Thread \"%s\" exited.\n", thread->name); local_irq_save(flags); /* Remove from the thread list */ - minios_list_del(&thread->thread_list); + MINIOS_TAILQ_REMOVE(&thread_list, thread, thread_list); clear_runnable(thread); /* Put onto exited list */ - minios_list_add(&thread->thread_list, &exited_threads); + MINIOS_TAILQ_INSERT_HEAD(&exited_threads, thread, thread_list); local_irq_restore(flags); /* Schedule will free the resources */ while(1) @@ -296,6 +288,14 @@ _REENT_INIT_PTR((&callback_reent)) #endif idle_thread = create_thread("Idle", idle_thread_fn, NULL); - MINIOS_INIT_LIST_HEAD(&idle_thread->thread_list); } +/* + * Local variables: + * mode: C + * c-set-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff -r 6c9a73817770 -r 934c14ab9f19 extras/mini-os/xenbus/xenbus.c --- a/extras/mini-os/xenbus/xenbus.c Tue Jan 31 11:39:37 2012 +0000 +++ b/extras/mini-os/xenbus/xenbus.c Tue Jan 31 16:06:14 2012 +0000 @@ -85,7 +85,7 @@ add_waiter(w, xenbus_watch_queue); schedule(); } - remove_waiter(w); + remove_waiter(w, xenbus_watch_queue); *queue = event->next; return &event->path; } @@ -441,7 +441,7 @@ xb_write(type, id, trans, io, nr_reqs); schedule(); - remove_waiter(w); + remove_waiter(w, req_info[id].waitq); wake(current); rep = req_info[id].reply; diff -r 6c9a73817770 -r 934c14ab9f19 tools/include/xen-external/README --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/include/xen-external/README Tue Jan 31 16:06:14 2012 +0000 @@ -0,0 +1,24 @@ +WARNING - DO NOT EDIT THINGS IN THIS DIRECTORY +---------------------------------------------- + +These files were obtained elsewhere and should only be updated by +copying new versions from the source location, as documented below: + +bsd-COPYRIGHT +bsd-sys-queue.h +bsd-queue.3 + + Obtained from the FreeBSD SVN using the following commands: + svn co -r 221843 svn://svn.freebsd.org/base/head/sys/sys/ + svn co -r 221843 svn://svn.freebsd.org/base/head/share/man/man3 + svn cat -r 221843 http://svn.freebsd.org/base/head/COPYRIGHT >tools/libxl/external/bsd-COPYRIGHT + +Exceptions: + +README + + This file + +bsd-sys-queue-h-seddery + + Script to transform the above into a new namespace. diff -r 6c9a73817770 -r 934c14ab9f19 tools/include/xen-external/bsd-COPYRIGHT --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/include/xen-external/bsd-COPYRIGHT Tue Jan 31 16:06:14 2012 +0000 @@ -0,0 +1,126 @@ +# $FreeBSD$ +# @(#)COPYRIGHT 8.2 (Berkeley) 3/21/94 + +The compilation of software known as FreeBSD is distributed under the +following terms: + +Copyright (c) 1992-2011 The FreeBSD Project. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +SUCH DAMAGE. + +The 4.4BSD and 4.4BSD-Lite software is distributed under the following +terms: + +All of the documentation and software included in the 4.4BSD and 4.4BSD-Lite +Releases is copyrighted by The Regents of the University of California. + +Copyright 1979, 1980, 1983, 1986, 1988, 1989, 1991, 1992, 1993, 1994 + The Regents of the University of California. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. +3. All advertising materials mentioning features or use of this software + must display the following acknowledgement: +This product includes software developed by the University of +California, Berkeley and its contributors. +4. Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +SUCH DAMAGE. + +The Institute of Electrical and Electronics Engineers and the American +National Standards Committee X3, on Information Processing Systems have +given us permission to reprint portions of their documentation. + +In the following statement, the phrase ``this text'' refers to portions +of the system documentation. + +Portions of this text are reprinted and reproduced in electronic form in +the second BSD Networking Software Release, from IEEE Std 1003.1-1988, IEEE +Standard Portable Operating System Interface for Computer Environments +(POSIX), copyright C 1988 by the Institute of Electrical and Electronics +Engineers, Inc. In the event of any discrepancy between these versions +and the original IEEE Standard, the original IEEE Standard is the referee +document. + +In the following statement, the phrase ``This material'' refers to portions +of the system documentation. + +This material is reproduced with permission from American National +Standards Committee X3, on Information Processing Systems. Computer and +Business Equipment Manufacturers Association (CBEMA), 311 First St., NW, +Suite 500, Washington, DC 20001-2178. The developmental work of +Programming Language C was completed by the X3J11 Technical Committee. + +The views and conclusions contained in the software and documentation are +those of the authors and should not be interpreted as representing official +policies, either expressed or implied, of the Regents of the University +of California. + + +NOTE: The copyright of UC Berkeley's Berkeley Software Distribution ("BSD") +source has been updated. The copyright addendum may be found at +ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change and is +included below. + +July 22, 1999 + +To All Licensees, Distributors of Any Version of BSD: + +As you know, certain of the Berkeley Software Distribution ("BSD") source +code files require that further distributions of products containing all or +portions of the software, acknowledge within their advertising materials +that such products contain software developed by UC Berkeley and its +contributors. + +Specifically, the provision reads: + +" * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors." + +Effective immediately, licensees and distributors are no longer required to +include the acknowledgement within advertising materials. Accordingly, the +foregoing paragraph of those BSD Unix files containing it is hereby deleted +in its entirety. + +William Hoskins +Director, Office of Technology Licensing +University of California, Berkeley diff -r 6c9a73817770 -r 934c14ab9f19 tools/include/xen-external/bsd-queue.3 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/include/xen-external/bsd-queue.3 Tue Jan 31 16:06:14 2012 +0000 @@ -0,0 +1,1044 @@ +.\" Copyright (c) 1993 +.\" The Regents of the University of California. All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" 3. All advertising materials mentioning features or use of this software +.\" must display the following acknowledgement: +.\" This product includes software developed by the University of +.\" California, Berkeley and its contributors. +.\" 4. Neither the name of the University nor the names of its contributors +.\" may be used to endorse or promote products derived from this software +.\" without specific prior written permission. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" @(#)queue.3 8.2 (Berkeley) 1/24/94 +.\" $FreeBSD$ +.\" +.Dd May 13, 2011 +.Dt QUEUE 3 +.Os +.Sh NAME +.Nm SLIST_EMPTY , +.Nm SLIST_ENTRY , +.Nm SLIST_FIRST , +.Nm SLIST_FOREACH , +.Nm SLIST_FOREACH_SAFE , +.Nm SLIST_HEAD , +.Nm SLIST_HEAD_INITIALIZER , +.Nm SLIST_INIT , +.Nm SLIST_INSERT_AFTER , +.Nm SLIST_INSERT_HEAD , +.Nm SLIST_NEXT , +.Nm SLIST_REMOVE_AFTER , +.Nm SLIST_REMOVE_HEAD , +.Nm SLIST_REMOVE , +.Nm SLIST_SWAP , +.Nm STAILQ_CONCAT , +.Nm STAILQ_EMPTY , +.Nm STAILQ_ENTRY , +.Nm STAILQ_FIRST , +.Nm STAILQ_FOREACH , +.Nm STAILQ_FOREACH_SAFE , +.Nm STAILQ_HEAD , +.Nm STAILQ_HEAD_INITIALIZER , +.Nm STAILQ_INIT , +.Nm STAILQ_INSERT_AFTER , +.Nm STAILQ_INSERT_HEAD , +.Nm STAILQ_INSERT_TAIL , +.Nm STAILQ_LAST , +.Nm STAILQ_NEXT , +.Nm STAILQ_REMOVE_AFTER , +.Nm STAILQ_REMOVE_HEAD , +.Nm STAILQ_REMOVE , +.Nm STAILQ_SWAP , +.Nm LIST_EMPTY , +.Nm LIST_ENTRY , +.Nm LIST_FIRST , +.Nm LIST_FOREACH , +.Nm LIST_FOREACH_SAFE , +.Nm LIST_HEAD , +.Nm LIST_HEAD_INITIALIZER , +.Nm LIST_INIT , +.Nm LIST_INSERT_AFTER , +.Nm LIST_INSERT_BEFORE , +.Nm LIST_INSERT_HEAD , +.Nm LIST_NEXT , +.Nm LIST_REMOVE , +.Nm LIST_SWAP , +.Nm TAILQ_CONCAT , +.Nm TAILQ_EMPTY , +.Nm TAILQ_ENTRY , +.Nm TAILQ_FIRST , +.Nm TAILQ_FOREACH , +.Nm TAILQ_FOREACH_SAFE , +.Nm TAILQ_FOREACH_REVERSE , +.Nm TAILQ_FOREACH_REVERSE_SAFE , +.Nm TAILQ_HEAD , +.Nm TAILQ_HEAD_INITIALIZER , +.Nm TAILQ_INIT , +.Nm TAILQ_INSERT_AFTER , +.Nm TAILQ_INSERT_BEFORE , +.Nm TAILQ_INSERT_HEAD , +.Nm TAILQ_INSERT_TAIL , +.Nm TAILQ_LAST , +.Nm TAILQ_NEXT , +.Nm TAILQ_PREV , +.Nm TAILQ_REMOVE , +.Nm TAILQ_SWAP +.Nd implementations of singly-linked lists, singly-linked tail queues, +lists and tail queues +.Sh SYNOPSIS +.In sys/queue.h +.\" +.Fn SLIST_EMPTY "SLIST_HEAD *head" +.Fn SLIST_ENTRY "TYPE" +.Fn SLIST_FIRST "SLIST_HEAD *head" +.Fn SLIST_FOREACH "TYPE *var" "SLIST_HEAD *head" "SLIST_ENTRY NAME" +.Fn SLIST_FOREACH_SAFE "TYPE *var" "SLIST_HEAD *head" "SLIST_ENTRY NAME" "TYPE *temp_var" +.Fn SLIST_HEAD "HEADNAME" "TYPE" +.Fn SLIST_HEAD_INITIALIZER "SLIST_HEAD head" +.Fn SLIST_INIT "SLIST_HEAD *head" +.Fn SLIST_INSERT_AFTER "TYPE *listelm" "TYPE *elm" "SLIST_ENTRY NAME" +.Fn SLIST_INSERT_HEAD "SLIST_HEAD *head" "TYPE *elm" "SLIST_ENTRY NAME" +.Fn SLIST_NEXT "TYPE *elm" "SLIST_ENTRY NAME" +.Fn SLIST_REMOVE_AFTER "TYPE *elm" "SLIST_ENTRY NAME" +.Fn SLIST_REMOVE_HEAD "SLIST_HEAD *head" "SLIST_ENTRY NAME" +.Fn SLIST_REMOVE "SLIST_HEAD *head" "TYPE *elm" "TYPE" "SLIST_ENTRY NAME" +.Fn SLIST_SWAP "SLIST_HEAD *head1" "SLIST_HEAD *head2" "SLIST_ENTRY NAME" +.\" +.Fn STAILQ_CONCAT "STAILQ_HEAD *head1" "STAILQ_HEAD *head2" +.Fn STAILQ_EMPTY "STAILQ_HEAD *head" +.Fn STAILQ_ENTRY "TYPE" +.Fn STAILQ_FIRST "STAILQ_HEAD *head" +.Fn STAILQ_FOREACH "TYPE *var" "STAILQ_HEAD *head" "STAILQ_ENTRY NAME" +.Fn STAILQ_FOREACH_SAFE "TYPE *var" "STAILQ_HEAD *head" "STAILQ_ENTRY NAME" "TYPE *temp_var" +.Fn STAILQ_HEAD "HEADNAME" "TYPE" +.Fn STAILQ_HEAD_INITIALIZER "STAILQ_HEAD head" +.Fn STAILQ_INIT "STAILQ_HEAD *head" +.Fn STAILQ_INSERT_AFTER "STAILQ_HEAD *head" "TYPE *listelm" "TYPE *elm" "STAILQ_ENTRY NAME" +.Fn STAILQ_INSERT_HEAD "STAILQ_HEAD *head" "TYPE *elm" "STAILQ_ENTRY NAME" +.Fn STAILQ_INSERT_TAIL "STAILQ_HEAD *head" "TYPE *elm" "STAILQ_ENTRY NAME" +.Fn STAILQ_LAST "STAILQ_HEAD *head" "TYPE" "STAILQ_ENTRY NAME" +.Fn STAILQ_NEXT "TYPE *elm" "STAILQ_ENTRY NAME" +.Fn STAILQ_REMOVE_AFTER "STAILQ_HEAD *head" "TYPE *elm" "STAILQ_ENTRY NAME" +.Fn STAILQ_REMOVE_HEAD "STAILQ_HEAD *head" "STAILQ_ENTRY NAME" +.Fn STAILQ_REMOVE "STAILQ_HEAD *head" "TYPE *elm" "TYPE" "STAILQ_ENTRY NAME" +.Fn STAILQ_SWAP "STAILQ_HEAD *head1" "STAILQ_HEAD *head2" "STAILQ_ENTRY NAME" +.\" +.Fn LIST_EMPTY "LIST_HEAD *head" +.Fn LIST_ENTRY "TYPE" +.Fn LIST_FIRST "LIST_HEAD *head" +.Fn LIST_FOREACH "TYPE *var" "LIST_HEAD *head" "LIST_ENTRY NAME" +.Fn LIST_FOREACH_SAFE "TYPE *var" "LIST_HEAD *head" "LIST_ENTRY NAME" "TYPE *temp_var" +.Fn LIST_HEAD "HEADNAME" "TYPE" +.Fn LIST_HEAD_INITIALIZER "LIST_HEAD head" +.Fn LIST_INIT "LIST_HEAD *head" +.Fn LIST_INSERT_AFTER "TYPE *listelm" "TYPE *elm" "LIST_ENTRY NAME" +.Fn LIST_INSERT_BEFORE "TYPE *listelm" "TYPE *elm" "LIST_ENTRY NAME" +.Fn LIST_INSERT_HEAD "LIST_HEAD *head" "TYPE *elm" "LIST_ENTRY NAME" +.Fn LIST_NEXT "TYPE *elm" "LIST_ENTRY NAME" +.Fn LIST_REMOVE "TYPE *elm" "LIST_ENTRY NAME" +.Fn LIST_SWAP "LIST_HEAD *head1" "LIST_HEAD *head2" "TYPE" "LIST_ENTRY NAME" +.\" +.Fn TAILQ_CONCAT "TAILQ_HEAD *head1" "TAILQ_HEAD *head2" "TAILQ_ENTRY NAME" +.Fn TAILQ_EMPTY "TAILQ_HEAD *head" +.Fn TAILQ_ENTRY "TYPE" +.Fn TAILQ_FIRST "TAILQ_HEAD *head" +.Fn TAILQ_FOREACH "TYPE *var" "TAILQ_HEAD *head" "TAILQ_ENTRY NAME" +.Fn TAILQ_FOREACH_SAFE "TYPE *var" "TAILQ_HEAD *head" "TAILQ_ENTRY NAME" "TYPE *temp_var" +.Fn TAILQ_FOREACH_REVERSE "TYPE *var" "TAILQ_HEAD *head" "HEADNAME" "TAILQ_ENTRY NAME" +.Fn TAILQ_FOREACH_REVERSE_SAFE "TYPE *var" "TAILQ_HEAD *head" "HEADNAME" "TAILQ_ENTRY NAME" "TYPE *temp_var" +.Fn TAILQ_HEAD "HEADNAME" "TYPE" +.Fn TAILQ_HEAD_INITIALIZER "TAILQ_HEAD head" +.Fn TAILQ_INIT "TAILQ_HEAD *head" +.Fn TAILQ_INSERT_AFTER "TAILQ_HEAD *head" "TYPE *listelm" "TYPE *elm" "TAILQ_ENTRY NAME" +.Fn TAILQ_INSERT_BEFORE "TYPE *listelm" "TYPE *elm" "TAILQ_ENTRY NAME" +.Fn TAILQ_INSERT_HEAD "TAILQ_HEAD *head" "TYPE *elm" "TAILQ_ENTRY NAME" +.Fn TAILQ_INSERT_TAIL "TAILQ_HEAD *head" "TYPE *elm" "TAILQ_ENTRY NAME" +.Fn TAILQ_LAST "TAILQ_HEAD *head" "HEADNAME" +.Fn TAILQ_NEXT "TYPE *elm" "TAILQ_ENTRY NAME" +.Fn TAILQ_PREV "TYPE *elm" "HEADNAME" "TAILQ_ENTRY NAME" +.Fn TAILQ_REMOVE "TAILQ_HEAD *head" "TYPE *elm" "TAILQ_ENTRY NAME" +.Fn TAILQ_SWAP "TAILQ_HEAD *head1" "TAILQ_HEAD *head2" "TYPE" "TAILQ_ENTRY NAME" +.\" +.Sh DESCRIPTION +These macros define and operate on four types of data structures: +singly-linked lists, singly-linked tail queues, lists, and tail queues. +All four structures support the following functionality: +.Bl -enum -compact -offset indent +.It +Insertion of a new entry at the head of the list. +.It +Insertion of a new entry after any element in the list. +.It +O(1) removal of an entry from the head of the list. +.It +Forward traversal through the list. +.It +Swawpping the contents of two lists. +.El +.Pp +Singly-linked lists are the simplest of the four data structures +and support only the above functionality. +Singly-linked lists are ideal for applications with large datasets +and few or no removals, +or for implementing a LIFO queue. +Singly-linked lists add the following functionality: +.Bl -enum -compact -offset indent +.It +O(n) removal of any entry in the list. +.El +.Pp +Singly-linked tail queues add the following functionality: +.Bl -enum -compact -offset indent +.It +Entries can be added at the end of a list. +.It +O(n) removal of any entry in the list. +.It +They may be concatenated. +.El +However: +.Bl -enum -compact -offset indent +.It +All list insertions must specify the head of the list. +.It +Each head entry requires two pointers rather than one. +.It +Code size is about 15% greater and operations run about 20% slower +than singly-linked lists. +.El +.Pp +Singly-linked tailqs are ideal for applications with large datasets and +few or no removals, +or for implementing a FIFO queue. +.Pp +All doubly linked types of data structures (lists and tail queues) +additionally allow: +.Bl -enum -compact -offset indent +.It +Insertion of a new entry before any element in the list. +.It +O(1) removal of any entry in the list. +.El +However: +.Bl -enum -compact -offset indent +.It +Each element requires two pointers rather than one. +.It +Code size and execution time of operations (except for removal) is about +twice that of the singly-linked data-structures. +.El +.Pp +Linked lists are the simplest of the doubly linked data structures and support +only the above functionality over singly-linked lists. +.Pp +Tail queues add the following functionality: +.Bl -enum -compact -offset indent +.It +Entries can be added at the end of a list. +.It +They may be traversed backwards, from tail to head. +.It +They may be concatenated. +.El +However: +.Bl -enum -compact -offset indent +.It +All list insertions and removals must specify the head of the list. +.It +Each head entry requires two pointers rather than one. +.It +Code size is about 15% greater and operations run about 20% slower +than singly-linked lists. +.El +.Pp +In the macro definitions, +.Fa TYPE +is the name of a user defined structure, +that must contain a field of type +.Li SLIST_ENTRY , +.Li STAILQ_ENTRY , +.Li LIST_ENTRY , +or +.Li TAILQ_ENTRY , +named +.Fa NAME . +The argument +.Fa HEADNAME +is the name of a user defined structure that must be declared +using the macros +.Li SLIST_HEAD , +.Li STAILQ_HEAD , +.Li LIST_HEAD , +or +.Li TAILQ_HEAD . +See the examples below for further explanation of how these +macros are used. +.Sh SINGLY-LINKED LISTS +A singly-linked list is headed by a structure defined by the +.Nm SLIST_HEAD +macro. +This structure contains a single pointer to the first element +on the list. +The elements are singly linked for minimum space and pointer manipulation +overhead at the expense of O(n) removal for arbitrary elements. +New elements can be added to the list after an existing element or +at the head of the list. +An +.Fa SLIST_HEAD +structure is declared as follows: +.Bd -literal -offset indent +SLIST_HEAD(HEADNAME, TYPE) head; +.Ed +.Pp +where +.Fa HEADNAME +is the name of the structure to be defined, and +.Fa TYPE +is the type of the elements to be linked into the list. +A pointer to the head of the list can later be declared as: +.Bd -literal -offset indent +struct HEADNAME *headp; +.Ed +.Pp +(The names +.Li head +and +.Li headp +are user selectable.) +.Pp +The macro +.Nm SLIST_HEAD_INITIALIZER +evaluates to an initializer for the list +.Fa head . +.Pp +The macro +.Nm SLIST_EMPTY +evaluates to true if there are no elements in the list. +.Pp +The macro +.Nm SLIST_ENTRY +declares a structure that connects the elements in +the list. +.Pp +The macro +.Nm SLIST_FIRST +returns the first element in the list or NULL if the list is empty. +.Pp +The macro +.Nm SLIST_FOREACH +traverses the list referenced by +.Fa head +in the forward direction, assigning each element in +turn to +.Fa var . +.Pp +The macro +.Nm SLIST_FOREACH_SAFE +traverses the list referenced by +.Fa head +in the forward direction, assigning each element in +turn to +.Fa var . +However, unlike +.Fn SLIST_FOREACH +here it is permitted to both remove +.Fa var +as well as free it from within the loop safely without interfering with the +traversal. +.Pp +The macro +.Nm SLIST_INIT +initializes the list referenced by +.Fa head . +.Pp +The macro +.Nm SLIST_INSERT_HEAD +inserts the new element +.Fa elm +at the head of the list. +.Pp +The macro +.Nm SLIST_INSERT_AFTER +inserts the new element +.Fa elm +after the element +.Fa listelm . +.Pp +The macro +.Nm SLIST_NEXT +returns the next element in the list. +.Pp +The macro +.Nm SLIST_REMOVE_AFTER +removes the element after +.Fa elm +from the list. Unlike +.Fa SLIST_REMOVE , +this macro does not traverse the entire list. +.Pp +The macro +.Nm SLIST_REMOVE_HEAD +removes the element +.Fa elm +from the head of the list. +For optimum efficiency, +elements being removed from the head of the list should explicitly use +this macro instead of the generic +.Fa SLIST_REMOVE +macro. +.Pp +The macro +.Nm SLIST_REMOVE +removes the element +.Fa elm +from the list. +.Pp +The macro +.Nm SLIST_SWAP +swaps the contents of +.Fa head1 +and +.Fa head2 . +.Sh SINGLY-LINKED LIST EXAMPLE +.Bd -literal +SLIST_HEAD(slisthead, entry) head = + SLIST_HEAD_INITIALIZER(head); +struct slisthead *headp; /* Singly-linked List head. */ +struct entry { + ... + SLIST_ENTRY(entry) entries; /* Singly-linked List. */ + ... +} *n1, *n2, *n3, *np; + +SLIST_INIT(&head); /* Initialize the list. */ + +n1 = malloc(sizeof(struct entry)); /* Insert at the head. */ +SLIST_INSERT_HEAD(&head, n1, entries); + +n2 = malloc(sizeof(struct entry)); /* Insert after. */ +SLIST_INSERT_AFTER(n1, n2, entries); + +SLIST_REMOVE(&head, n2, entry, entries);/* Deletion. */ +free(n2); + +n3 = SLIST_FIRST(&head); +SLIST_REMOVE_HEAD(&head, entries); /* Deletion from the head. */ +free(n3); + /* Forward traversal. */ +SLIST_FOREACH(np, &head, entries) + np-> ... + /* Safe forward traversal. */ +SLIST_FOREACH_SAFE(np, &head, entries, np_temp) { + np->do_stuff(); + ... + SLIST_REMOVE(&head, np, entry, entries); + free(np); +} + +while (!SLIST_EMPTY(&head)) { /* List Deletion. */ + n1 = SLIST_FIRST(&head); + SLIST_REMOVE_HEAD(&head, entries); + free(n1); +} +.Ed +.Sh SINGLY-LINKED TAIL QUEUES +A singly-linked tail queue is headed by a structure defined by the +.Nm STAILQ_HEAD +macro. +This structure contains a pair of pointers, +one to the first element in the tail queue and the other to +the last element in the tail queue. +The elements are singly linked for minimum space and pointer +manipulation overhead at the expense of O(n) removal for arbitrary +elements. +New elements can be added to the tail queue after an existing element, +at the head of the tail queue, or at the end of the tail queue. +A +.Fa STAILQ_HEAD +structure is declared as follows: +.Bd -literal -offset indent +STAILQ_HEAD(HEADNAME, TYPE) head; +.Ed +.Pp +where +.Li HEADNAME +is the name of the structure to be defined, and +.Li TYPE +is the type of the elements to be linked into the tail queue. +A pointer to the head of the tail queue can later be declared as: +.Bd -literal -offset indent +struct HEADNAME *headp; +.Ed +.Pp +(The names +.Li head +and +.Li headp +are user selectable.) +.Pp +The macro +.Nm STAILQ_HEAD_INITIALIZER +evaluates to an initializer for the tail queue +.Fa head . +.Pp +The macro +.Nm STAILQ_CONCAT +concatenates the tail queue headed by +.Fa head2 +onto the end of the one headed by +.Fa head1 +removing all entries from the former. +.Pp +The macro +.Nm STAILQ_EMPTY +evaluates to true if there are no items on the tail queue. +.Pp +The macro +.Nm STAILQ_ENTRY +declares a structure that connects the elements in +the tail queue. +.Pp +The macro +.Nm STAILQ_FIRST +returns the first item on the tail queue or NULL if the tail queue +is empty. +.Pp +The macro +.Nm STAILQ_FOREACH +traverses the tail queue referenced by +.Fa head +in the forward direction, assigning each element +in turn to +.Fa var . +.Pp +The macro +.Nm STAILQ_FOREACH_SAFE +traverses the tail queue referenced by +.Fa head +in the forward direction, assigning each element +in turn to +.Fa var . +However, unlike +.Fn STAILQ_FOREACH +here it is permitted to both remove +.Fa var +as well as free it from within the loop safely without interfering with the +traversal. +.Pp +The macro +.Nm STAILQ_INIT +initializes the tail queue referenced by +.Fa head . +.Pp +The macro +.Nm STAILQ_INSERT_HEAD +inserts the new element +.Fa elm +at the head of the tail queue. +.Pp +The macro +.Nm STAILQ_INSERT_TAIL +inserts the new element +.Fa elm +at the end of the tail queue. +.Pp +The macro +.Nm STAILQ_INSERT_AFTER +inserts the new element +.Fa elm +after the element +.Fa listelm . +.Pp +The macro +.Nm STAILQ_LAST +returns the last item on the tail queue. +If the tail queue is empty the return value is +.Dv NULL . +.Pp +The macro +.Nm STAILQ_NEXT +returns the next item on the tail queue, or NULL this item is the last. +.Pp +The macro +.Nm STAILQ_REMOVE_AFTER +removes the element after +.Fa elm +from the tail queue. Unlike +.Fa STAILQ_REMOVE , +this macro does not traverse the entire tail queue. +.Pp +The macro +.Nm STAILQ_REMOVE_HEAD +removes the element at the head of the tail queue. +For optimum efficiency, +elements being removed from the head of the tail queue should +use this macro explicitly rather than the generic +.Fa STAILQ_REMOVE +macro. +.Pp +The macro +.Nm STAILQ_REMOVE +removes the element +.Fa elm +from the tail queue. +.Pp +The macro +.Nm STAILQ_SWAP +swaps the contents of +.Fa head1 +and +.Fa head2 . +.Sh SINGLY-LINKED TAIL QUEUE EXAMPLE +.Bd -literal +STAILQ_HEAD(stailhead, entry) head = + STAILQ_HEAD_INITIALIZER(head); +struct stailhead *headp; /* Singly-linked tail queue head. */ +struct entry { + ... + STAILQ_ENTRY(entry) entries; /* Tail queue. */ + ... +} *n1, *n2, *n3, *np; + +STAILQ_INIT(&head); /* Initialize the queue. */ + +n1 = malloc(sizeof(struct entry)); /* Insert at the head. */ +STAILQ_INSERT_HEAD(&head, n1, entries); + +n1 = malloc(sizeof(struct entry)); /* Insert at the tail. */ +STAILQ_INSERT_TAIL(&head, n1, entries); + +n2 = malloc(sizeof(struct entry)); /* Insert after. */ +STAILQ_INSERT_AFTER(&head, n1, n2, entries); + /* Deletion. */ +STAILQ_REMOVE(&head, n2, entry, entries); +free(n2); + /* Deletion from the head. */ +n3 = STAILQ_FIRST(&head); +STAILQ_REMOVE_HEAD(&head, entries); +free(n3); + /* Forward traversal. */ +STAILQ_FOREACH(np, &head, entries) + np-> ... + /* Safe forward traversal. */ +STAILQ_FOREACH_SAFE(np, &head, entries, np_temp) { + np->do_stuff(); + ... + STAILQ_REMOVE(&head, np, entry, entries); + free(np); +} + /* TailQ Deletion. */ +while (!STAILQ_EMPTY(&head)) { + n1 = STAILQ_FIRST(&head); + STAILQ_REMOVE_HEAD(&head, entries); + free(n1); +} + /* Faster TailQ Deletion. */ +n1 = STAILQ_FIRST(&head); +while (n1 != NULL) { + n2 = STAILQ_NEXT(n1, entries); + free(n1); + n1 = n2; +} +STAILQ_INIT(&head); +.Ed +.Sh LISTS +A list is headed by a structure defined by the +.Nm LIST_HEAD +macro. +This structure contains a single pointer to the first element +on the list. +The elements are doubly linked so that an arbitrary element can be +removed without traversing the list. +New elements can be added to the list after an existing element, +before an existing element, or at the head of the list. +A +.Fa LIST_HEAD +structure is declared as follows: +.Bd -literal -offset indent +LIST_HEAD(HEADNAME, TYPE) head; +.Ed +.Pp +where +.Fa HEADNAME +is the name of the structure to be defined, and +.Fa TYPE +is the type of the elements to be linked into the list. +A pointer to the head of the list can later be declared as: +.Bd -literal -offset indent +struct HEADNAME *headp; +.Ed +.Pp +(The names +.Li head +and +.Li headp +are user selectable.) +.Pp +The macro +.Nm LIST_HEAD_INITIALIZER +evaluates to an initializer for the list +.Fa head . +.Pp +The macro +.Nm LIST_EMPTY +evaluates to true if there are no elements in the list. +.Pp +The macro +.Nm LIST_ENTRY +declares a structure that connects the elements in +the list. +.Pp +The macro +.Nm LIST_FIRST +returns the first element in the list or NULL if the list +is empty. +.Pp +The macro +.Nm LIST_FOREACH +traverses the list referenced by +.Fa head +in the forward direction, assigning each element in turn to +.Fa var . +.Pp +The macro +.Nm LIST_FOREACH_SAFE +traverses the list referenced by +.Fa head +in the forward direction, assigning each element in turn to +.Fa var . +However, unlike +.Fn LIST_FOREACH +here it is permitted to both remove +.Fa var +as well as free it from within the loop safely without interfering with the +traversal. +.Pp +The macro +.Nm LIST_INIT +initializes the list referenced by +.Fa head . +.Pp +The macro +.Nm LIST_INSERT_HEAD +inserts the new element +.Fa elm +at the head of the list. +.Pp +The macro +.Nm LIST_INSERT_AFTER +inserts the new element +.Fa elm +after the element +.Fa listelm . +.Pp +The macro +.Nm LIST_INSERT_BEFORE +inserts the new element +.Fa elm +before the element +.Fa listelm . +.Pp +The macro +.Nm LIST_NEXT +returns the next element in the list, or NULL if this is the last. +.Pp +The macro +.Nm LIST_REMOVE +removes the element +.Fa elm +from the list. +.Pp +The macro +.Nm LIST_SWAP +swaps the contents of +.Fa head1 +and +.Fa head2 . +.Sh LIST EXAMPLE +.Bd -literal +LIST_HEAD(listhead, entry) head = + LIST_HEAD_INITIALIZER(head); +struct listhead *headp; /* List head. */ +struct entry { + ... + LIST_ENTRY(entry) entries; /* List. */ + ... +} *n1, *n2, *n3, *np, *np_temp; + +LIST_INIT(&head); /* Initialize the list. */ + +n1 = malloc(sizeof(struct entry)); /* Insert at the head. */ +LIST_INSERT_HEAD(&head, n1, entries); + +n2 = malloc(sizeof(struct entry)); /* Insert after. */ +LIST_INSERT_AFTER(n1, n2, entries); + +n3 = malloc(sizeof(struct entry)); /* Insert before. */ +LIST_INSERT_BEFORE(n2, n3, entries); + +LIST_REMOVE(n2, entries); /* Deletion. */ +free(n2); + /* Forward traversal. */ +LIST_FOREACH(np, &head, entries) + np-> ... + + /* Safe forward traversal. */ +LIST_FOREACH_SAFE(np, &head, entries, np_temp) { + np->do_stuff(); + ... + LIST_REMOVE(np, entries); + free(np); +} + +while (!LIST_EMPTY(&head)) { /* List Deletion. */ + n1 = LIST_FIRST(&head); + LIST_REMOVE(n1, entries); + free(n1); +} + +n1 = LIST_FIRST(&head); /* Faster List Deletion. */ +while (n1 != NULL) { + n2 = LIST_NEXT(n1, entries); + free(n1); + n1 = n2; +} +LIST_INIT(&head); +.Ed +.Sh TAIL QUEUES +A tail queue is headed by a structure defined by the +.Nm TAILQ_HEAD +macro. +This structure contains a pair of pointers, +one to the first element in the tail queue and the other to +the last element in the tail queue. +The elements are doubly linked so that an arbitrary element can be +removed without traversing the tail queue. +New elements can be added to the tail queue after an existing element, +before an existing element, at the head of the tail queue, +or at the end of the tail queue. +A +.Fa TAILQ_HEAD +structure is declared as follows: +.Bd -literal -offset indent +TAILQ_HEAD(HEADNAME, TYPE) head; +.Ed +.Pp +where +.Li HEADNAME +is the name of the structure to be defined, and +.Li TYPE +is the type of the elements to be linked into the tail queue. +A pointer to the head of the tail queue can later be declared as: +.Bd -literal -offset indent +struct HEADNAME *headp; +.Ed +.Pp +(The names +.Li head +and +.Li headp +are user selectable.) +.Pp +The macro +.Nm TAILQ_HEAD_INITIALIZER +evaluates to an initializer for the tail queue +.Fa head . +.Pp +The macro +.Nm TAILQ_CONCAT +concatenates the tail queue headed by +.Fa head2 +onto the end of the one headed by +.Fa head1 +removing all entries from the former. +.Pp +The macro +.Nm TAILQ_EMPTY +evaluates to true if there are no items on the tail queue. +.Pp +The macro +.Nm TAILQ_ENTRY +declares a structure that connects the elements in +the tail queue. +.Pp +The macro +.Nm TAILQ_FIRST +returns the first item on the tail queue or NULL if the tail queue +is empty. +.Pp +The macro +.Nm TAILQ_FOREACH +traverses the tail queue referenced by +.Fa head +in the forward direction, assigning each element in turn to +.Fa var . +.Fa var +is set to +.Dv NULL +if the loop completes normally, or if there were no elements. +.Pp +The macro +.Nm TAILQ_FOREACH_REVERSE +traverses the tail queue referenced by +.Fa head +in the reverse direction, assigning each element in turn to +.Fa var . +.Pp +The macros +.Nm TAILQ_FOREACH_SAFE +and +.Nm TAILQ_FOREACH_REVERSE_SAFE +traverse the list referenced by +.Fa head +in the forward or reverse direction respectively, +assigning each element in turn to +.Fa var . +However, unlike their unsafe counterparts, +.Nm TAILQ_FOREACH +and +.Nm TAILQ_FOREACH_REVERSE +permit to both remove +.Fa var +as well as free it from within the loop safely without interfering with the +traversal. +.Pp +The macro +.Nm TAILQ_INIT +initializes the tail queue referenced by +.Fa head . +.Pp +The macro +.Nm TAILQ_INSERT_HEAD +inserts the new element +.Fa elm +at the head of the tail queue. +.Pp +The macro +.Nm TAILQ_INSERT_TAIL +inserts the new element +.Fa elm +at the end of the tail queue. +.Pp +The macro +.Nm TAILQ_INSERT_AFTER +inserts the new element +.Fa elm +after the element +.Fa listelm . +.Pp +The macro +.Nm TAILQ_INSERT_BEFORE +inserts the new element +.Fa elm +before the element +.Fa listelm . +.Pp +The macro +.Nm TAILQ_LAST +returns the last item on the tail queue. +If the tail queue is empty the return value is +.Dv NULL . +.Pp +The macro +.Nm TAILQ_NEXT +returns the next item on the tail queue, or NULL if this item is the last. +.Pp +The macro +.Nm TAILQ_PREV +returns the previous item on the tail queue, or NULL if this item +is the first. +.Pp +The macro +.Nm TAILQ_REMOVE +removes the element +.Fa elm +from the tail queue. +.Pp +The macro +.Nm TAILQ_SWAP +swaps the contents of +.Fa head1 +and +.Fa head2 . +.Sh TAIL QUEUE EXAMPLE +.Bd -literal +TAILQ_HEAD(tailhead, entry) head = + TAILQ_HEAD_INITIALIZER(head); +struct tailhead *headp; /* Tail queue head. */ +struct entry { + ... + TAILQ_ENTRY(entry) entries; /* Tail queue. */ + ... +} *n1, *n2, *n3, *np; + +TAILQ_INIT(&head); /* Initialize the queue. */ + +n1 = malloc(sizeof(struct entry)); /* Insert at the head. */ +TAILQ_INSERT_HEAD(&head, n1, entries); + +n1 = malloc(sizeof(struct entry)); /* Insert at the tail. */ +TAILQ_INSERT_TAIL(&head, n1, entries); + +n2 = malloc(sizeof(struct entry)); /* Insert after. */ +TAILQ_INSERT_AFTER(&head, n1, n2, entries); + +n3 = malloc(sizeof(struct entry)); /* Insert before. */ +TAILQ_INSERT_BEFORE(n2, n3, entries); + +TAILQ_REMOVE(&head, n2, entries); /* Deletion. */ +free(n2); + /* Forward traversal. */ +TAILQ_FOREACH(np, &head, entries) + np-> ... + /* Safe forward traversal. */ +TAILQ_FOREACH_SAFE(np, &head, entries, np_temp) { + np->do_stuff(); + ... + TAILQ_REMOVE(&head, np, entries); + free(np); +} + /* Reverse traversal. */ +TAILQ_FOREACH_REVERSE(np, &head, tailhead, entries) + np-> ... + /* TailQ Deletion. */ +while (!TAILQ_EMPTY(&head)) { + n1 = TAILQ_FIRST(&head); + TAILQ_REMOVE(&head, n1, entries); + free(n1); +} + /* Faster TailQ Deletion. */ +n1 = TAILQ_FIRST(&head); +while (n1 != NULL) { + n2 = TAILQ_NEXT(n1, entries); + free(n1); + n1 = n2; +} +TAILQ_INIT(&head); +.Ed +.Sh SEE ALSO +.Xr tree 3 +.Sh HISTORY +The +.Nm queue +functions first appeared in +.Bx 4.4 . diff -r 6c9a73817770 -r 934c14ab9f19 tools/include/xen-external/bsd-sys-queue-h-seddery --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/include/xen-external/bsd-sys-queue-h-seddery Tue Jan 31 16:06:14 2012 +0000 @@ -0,0 +1,72 @@ +#!/usr/bin/perl -p +# +# This script is part of the Xen build system. It has a very +# permissive licence to avoid complicating the licence of the +# generated header file and to allow this seddery to be reused by +# other projects. +# +# Permission is hereby granted, free of charge, to any person +# obtaining a copy of this individual file (the "Software"), to deal +# in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, +# sublicense, and/or sell copies of the Software, and to permit +# persons to whom the Software is furnished to do so, subject to the +# following conditions: +# +# The above copyright notice and this permission notice shall be +# included in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS +# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. +# +# Copyright (C) 2011 Citrix Ltd + +our $namespace, $ucnamespace; + +BEGIN { + die unless @ARGV; + $namespace = pop @ARGV; + $namespace =~ s/^--prefix=// or die; + $ucnamespace = uc $namespace; + + print < + +/* + * This file defines four types of data structures: singly-linked lists, + * singly-linked tail queues, lists and tail queues. + * + * A singly-linked list is headed by a single forward pointer. The elements + * are singly linked for minimum space and pointer manipulation overhead at + * the expense of O(n) removal for arbitrary elements. New elements can be + * added to the list after an existing element or at the head of the list. + * Elements being removed from the head of the list should use the explicit + * macro for this purpose for optimum efficiency. A singly-linked list may + * only be traversed in the forward direction. Singly-linked lists are ideal + * for applications with large datasets and few or no removals or for + * implementing a LIFO queue. + * + * A singly-linked tail queue is headed by a pair of pointers, one to the + * head of the list and the other to the tail of the list. The elements are + * singly linked for minimum space and pointer manipulation overhead at the + * expense of O(n) removal for arbitrary elements. New elements can be added + * to the list after an existing element, at the head of the list, or at the + * end of the list. Elements being removed from the head of the tail queue + * should use the explicit macro for this purpose for optimum efficiency. + * A singly-linked tail queue may only be traversed in the forward direction. + * Singly-linked tail queues are ideal for applications with large datasets + * and few or no removals or for implementing a FIFO queue. + * + * A list is headed by a single forward pointer (or an array of forward + * pointers for a hash table header). The elements are doubly linked + * so that an arbitrary element can be removed without a need to + * traverse the list. New elements can be added to the list before + * or after an existing element or at the head of the list. A list + * may only be traversed in the forward direction. + * + * A tail queue is headed by a pair of pointers, one to the head of the + * list and the other to the tail of the list. The elements are doubly + * linked so that an arbitrary element can be removed without a need to + * traverse the list. New elements can be added to the list before or + * after an existing element, at the head of the list, or at the end of + * the list. A tail queue may be traversed in either direction. + * + * For details on the use of these macros, see the queue(3) manual page. + * + * + * SLIST LIST STAILQ TAILQ + * _HEAD + + + + + * _HEAD_INITIALIZER + + + + + * _ENTRY + + + + + * _INIT + + + + + * _EMPTY + + + + + * _FIRST + + + + + * _NEXT + + + + + * _PREV - - - + + * _LAST - - + + + * _FOREACH + + + + + * _FOREACH_SAFE + + + + + * _FOREACH_REVERSE - - - + + * _FOREACH_REVERSE_SAFE - - - + + * _INSERT_HEAD + + + + + * _INSERT_BEFORE - + - + + * _INSERT_AFTER + + + + + * _INSERT_TAIL - - + + + * _CONCAT - - + + + * _REMOVE_AFTER + - + - + * _REMOVE_HEAD + - + - + * _REMOVE + + + + + * _SWAP + + + + + * + */ +#ifdef QUEUE_MACRO_DEBUG +/* Store the last 2 places the queue element or head was altered */ +struct qm_trace { + char * lastfile; + int lastline; + char * prevfile; + int prevline; +}; + +#define TRACEBUF struct qm_trace trace; +#define TRASHIT(x) do {(x) = (void *)-1;} while (0) +#define QMD_SAVELINK(name, link) void **name = (void *)&(link) + +#define QMD_TRACE_HEAD(head) do { \ + (head)->trace.prevline = (head)->trace.lastline; \ + (head)->trace.prevfile = (head)->trace.lastfile; \ + (head)->trace.lastline = __LINE__; \ + (head)->trace.lastfile = __FILE__; \ +} while (0) + +#define QMD_TRACE_ELEM(elem) do { \ + (elem)->trace.prevline = (elem)->trace.lastline; \ + (elem)->trace.prevfile = (elem)->trace.lastfile; \ + (elem)->trace.lastline = __LINE__; \ + (elem)->trace.lastfile = __FILE__; \ +} while (0) + +#else +#define QMD_TRACE_ELEM(elem) +#define QMD_TRACE_HEAD(head) +#define QMD_SAVELINK(name, link) +#define TRACEBUF +#define TRASHIT(x) +#endif /* QUEUE_MACRO_DEBUG */ + +/* + * Singly-linked List declarations. + */ +#define SLIST_HEAD(name, type) \ +struct name { \ + struct type *slh_first; /* first element */ \ +} + +#define SLIST_HEAD_INITIALIZER(head) \ + { NULL } + +#define SLIST_ENTRY(type) \ +struct { \ + struct type *sle_next; /* next element */ \ +} + +/* + * Singly-linked List functions. + */ +#define SLIST_EMPTY(head) ((head)->slh_first == NULL) + +#define SLIST_FIRST(head) ((head)->slh_first) + +#define SLIST_FOREACH(var, head, field) \ + for ((var) = SLIST_FIRST((head)); \ + (var); \ + (var) = SLIST_NEXT((var), field)) + +#define SLIST_FOREACH_SAFE(var, head, field, tvar) \ + for ((var) = SLIST_FIRST((head)); \ + (var) && ((tvar) = SLIST_NEXT((var), field), 1); \ + (var) = (tvar)) + +#define SLIST_FOREACH_PREVPTR(var, varp, head, field) \ + for ((varp) = &SLIST_FIRST((head)); \ + ((var) = *(varp)) != NULL; \ + (varp) = &SLIST_NEXT((var), field)) + +#define SLIST_INIT(head) do { \ + SLIST_FIRST((head)) = NULL; \ +} while (0) + +#define SLIST_INSERT_AFTER(slistelm, elm, field) do { \ + SLIST_NEXT((elm), field) = SLIST_NEXT((slistelm), field); \ + SLIST_NEXT((slistelm), field) = (elm); \ +} while (0) + +#define SLIST_INSERT_HEAD(head, elm, field) do { \ + SLIST_NEXT((elm), field) = SLIST_FIRST((head)); \ + SLIST_FIRST((head)) = (elm); \ +} while (0) + +#define SLIST_NEXT(elm, field) ((elm)->field.sle_next) + +#define SLIST_REMOVE(head, elm, type, field) do { \ + QMD_SAVELINK(oldnext, (elm)->field.sle_next); \ + if (SLIST_FIRST((head)) == (elm)) { \ + SLIST_REMOVE_HEAD((head), field); \ + } \ + else { \ + struct type *curelm = SLIST_FIRST((head)); \ + while (SLIST_NEXT(curelm, field) != (elm)) \ + curelm = SLIST_NEXT(curelm, field); \ + SLIST_REMOVE_AFTER(curelm, field); \ + } \ + TRASHIT(*oldnext); \ +} while (0) + +#define SLIST_REMOVE_AFTER(elm, field) do { \ + SLIST_NEXT(elm, field) = \ + SLIST_NEXT(SLIST_NEXT(elm, field), field); \ +} while (0) + +#define SLIST_REMOVE_HEAD(head, field) do { \ + SLIST_FIRST((head)) = SLIST_NEXT(SLIST_FIRST((head)), field); \ +} while (0) + +#define SLIST_SWAP(head1, head2, type) do { \ + struct type *swap_first = SLIST_FIRST(head1); \ + SLIST_FIRST(head1) = SLIST_FIRST(head2); \ + SLIST_FIRST(head2) = swap_first; \ +} while (0) + +/* + * Singly-linked Tail queue declarations. + */ +#define STAILQ_HEAD(name, type) \ +struct name { \ + struct type *stqh_first;/* first element */ \ + struct type **stqh_last;/* addr of last next element */ \ +} + +#define STAILQ_HEAD_INITIALIZER(head) \ + { NULL, &(head).stqh_first } + +#define STAILQ_ENTRY(type) \ +struct { \ + struct type *stqe_next; /* next element */ \ +} + +/* + * Singly-linked Tail queue functions. + */ +#define STAILQ_CONCAT(head1, head2) do { \ + if (!STAILQ_EMPTY((head2))) { \ + *(head1)->stqh_last = (head2)->stqh_first; \ + (head1)->stqh_last = (head2)->stqh_last; \ + STAILQ_INIT((head2)); \ + } \ +} while (0) + +#define STAILQ_EMPTY(head) ((head)->stqh_first == NULL) + +#define STAILQ_FIRST(head) ((head)->stqh_first) + +#define STAILQ_FOREACH(var, head, field) \ + for((var) = STAILQ_FIRST((head)); \ + (var); \ + (var) = STAILQ_NEXT((var), field)) + + +#define STAILQ_FOREACH_SAFE(var, head, field, tvar) \ + for ((var) = STAILQ_FIRST((head)); \ + (var) && ((tvar) = STAILQ_NEXT((var), field), 1); \ + (var) = (tvar)) + +#define STAILQ_INIT(head) do { \ + STAILQ_FIRST((head)) = NULL; \ + (head)->stqh_last = &STAILQ_FIRST((head)); \ +} while (0) + +#define STAILQ_INSERT_AFTER(head, tqelm, elm, field) do { \ + if ((STAILQ_NEXT((elm), field) = STAILQ_NEXT((tqelm), field)) == NULL)\ + (head)->stqh_last = &STAILQ_NEXT((elm), field); \ + STAILQ_NEXT((tqelm), field) = (elm); \ +} while (0) + +#define STAILQ_INSERT_HEAD(head, elm, field) do { \ + if ((STAILQ_NEXT((elm), field) = STAILQ_FIRST((head))) == NULL) \ + (head)->stqh_last = &STAILQ_NEXT((elm), field); \ + STAILQ_FIRST((head)) = (elm); \ +} while (0) + +#define STAILQ_INSERT_TAIL(head, elm, field) do { \ + STAILQ_NEXT((elm), field) = NULL; \ + *(head)->stqh_last = (elm); \ + (head)->stqh_last = &STAILQ_NEXT((elm), field); \ +} while (0) + +#define STAILQ_LAST(head, type, field) \ + (STAILQ_EMPTY((head)) ? \ + NULL : \ + ((struct type *)(void *) \ + ((char *)((head)->stqh_last) - __offsetof(struct type, field)))) + +#define STAILQ_NEXT(elm, field) ((elm)->field.stqe_next) + +#define STAILQ_REMOVE(head, elm, type, field) do { \ + QMD_SAVELINK(oldnext, (elm)->field.stqe_next); \ + if (STAILQ_FIRST((head)) == (elm)) { \ + STAILQ_REMOVE_HEAD((head), field); \ + } \ + else { \ + struct type *curelm = STAILQ_FIRST((head)); \ + while (STAILQ_NEXT(curelm, field) != (elm)) \ + curelm = STAILQ_NEXT(curelm, field); \ + STAILQ_REMOVE_AFTER(head, curelm, field); \ + } \ + TRASHIT(*oldnext); \ +} while (0) + +#define STAILQ_REMOVE_AFTER(head, elm, field) do { \ + if ((STAILQ_NEXT(elm, field) = \ + STAILQ_NEXT(STAILQ_NEXT(elm, field), field)) == NULL) \ + (head)->stqh_last = &STAILQ_NEXT((elm), field); \ +} while (0) + +#define STAILQ_REMOVE_HEAD(head, field) do { \ + if ((STAILQ_FIRST((head)) = \ + STAILQ_NEXT(STAILQ_FIRST((head)), field)) == NULL) \ + (head)->stqh_last = &STAILQ_FIRST((head)); \ +} while (0) + +#define STAILQ_SWAP(head1, head2, type) do { \ + struct type *swap_first = STAILQ_FIRST(head1); \ + struct type **swap_last = (head1)->stqh_last; \ + STAILQ_FIRST(head1) = STAILQ_FIRST(head2); \ + (head1)->stqh_last = (head2)->stqh_last; \ + STAILQ_FIRST(head2) = swap_first; \ + (head2)->stqh_last = swap_last; \ + if (STAILQ_EMPTY(head1)) \ + (head1)->stqh_last = &STAILQ_FIRST(head1); \ + if (STAILQ_EMPTY(head2)) \ + (head2)->stqh_last = &STAILQ_FIRST(head2); \ +} while (0) + + +/* + * List declarations. + */ +#define LIST_HEAD(name, type) \ +struct name { \ + struct type *lh_first; /* first element */ \ +} + +#define LIST_HEAD_INITIALIZER(head) \ + { NULL } + +#define LIST_ENTRY(type) \ +struct { \ + struct type *le_next; /* next element */ \ + struct type **le_prev; /* address of previous next element */ \ +} + +/* + * List functions. + */ + +#if (defined(_KERNEL) && defined(INVARIANTS)) +#define QMD_LIST_CHECK_HEAD(head, field) do { \ + if (LIST_FIRST((head)) != NULL && \ + LIST_FIRST((head))->field.le_prev != \ + &LIST_FIRST((head))) \ + panic("Bad list head %p first->prev != head", (head)); \ +} while (0) + +#define QMD_LIST_CHECK_NEXT(elm, field) do { \ + if (LIST_NEXT((elm), field) != NULL && \ + LIST_NEXT((elm), field)->field.le_prev != \ + &((elm)->field.le_next)) \ + panic("Bad link elm %p next->prev != elm", (elm)); \ +} while (0) + +#define QMD_LIST_CHECK_PREV(elm, field) do { \ + if (*(elm)->field.le_prev != (elm)) \ + panic("Bad link elm %p prev->next != elm", (elm)); \ +} while (0) +#else +#define QMD_LIST_CHECK_HEAD(head, field) +#define QMD_LIST_CHECK_NEXT(elm, field) +#define QMD_LIST_CHECK_PREV(elm, field) +#endif /* (_KERNEL && INVARIANTS) */ + +#define LIST_EMPTY(head) ((head)->lh_first == NULL) + +#define LIST_FIRST(head) ((head)->lh_first) + +#define LIST_FOREACH(var, head, field) \ + for ((var) = LIST_FIRST((head)); \ + (var); \ + (var) = LIST_NEXT((var), field)) + +#define LIST_FOREACH_SAFE(var, head, field, tvar) \ + for ((var) = LIST_FIRST((head)); \ + (var) && ((tvar) = LIST_NEXT((var), field), 1); \ + (var) = (tvar)) + +#define LIST_INIT(head) do { \ + LIST_FIRST((head)) = NULL; \ +} while (0) + +#define LIST_INSERT_AFTER(listelm, elm, field) do { \ + QMD_LIST_CHECK_NEXT(listelm, field); \ + if ((LIST_NEXT((elm), field) = LIST_NEXT((listelm), field)) != NULL)\ + LIST_NEXT((listelm), field)->field.le_prev = \ + &LIST_NEXT((elm), field); \ + LIST_NEXT((listelm), field) = (elm); \ + (elm)->field.le_prev = &LIST_NEXT((listelm), field); \ +} while (0) + +#define LIST_INSERT_BEFORE(listelm, elm, field) do { \ + QMD_LIST_CHECK_PREV(listelm, field); \ + (elm)->field.le_prev = (listelm)->field.le_prev; \ + LIST_NEXT((elm), field) = (listelm); \ + *(listelm)->field.le_prev = (elm); \ + (listelm)->field.le_prev = &LIST_NEXT((elm), field); \ +} while (0) + +#define LIST_INSERT_HEAD(head, elm, field) do { \ + QMD_LIST_CHECK_HEAD((head), field); \ + if ((LIST_NEXT((elm), field) = LIST_FIRST((head))) != NULL) \ + LIST_FIRST((head))->field.le_prev = &LIST_NEXT((elm), field);\ + LIST_FIRST((head)) = (elm); \ + (elm)->field.le_prev = &LIST_FIRST((head)); \ +} while (0) + +#define LIST_NEXT(elm, field) ((elm)->field.le_next) + +#define LIST_REMOVE(elm, field) do { \ + QMD_SAVELINK(oldnext, (elm)->field.le_next); \ + QMD_SAVELINK(oldprev, (elm)->field.le_prev); \ + QMD_LIST_CHECK_NEXT(elm, field); \ + QMD_LIST_CHECK_PREV(elm, field); \ + if (LIST_NEXT((elm), field) != NULL) \ + LIST_NEXT((elm), field)->field.le_prev = \ + (elm)->field.le_prev; \ + *(elm)->field.le_prev = LIST_NEXT((elm), field); \ + TRASHIT(*oldnext); \ + TRASHIT(*oldprev); \ +} while (0) + +#define LIST_SWAP(head1, head2, type, field) do { \ + struct type *swap_tmp = LIST_FIRST((head1)); \ + LIST_FIRST((head1)) = LIST_FIRST((head2)); \ + LIST_FIRST((head2)) = swap_tmp; \ + if ((swap_tmp = LIST_FIRST((head1))) != NULL) \ + swap_tmp->field.le_prev = &LIST_FIRST((head1)); \ + if ((swap_tmp = LIST_FIRST((head2))) != NULL) \ + swap_tmp->field.le_prev = &LIST_FIRST((head2)); \ +} while (0) + +/* + * Tail queue declarations. + */ +#define TAILQ_HEAD(name, type) \ +struct name { \ + struct type *tqh_first; /* first element */ \ + struct type **tqh_last; /* addr of last next element */ \ + TRACEBUF \ +} + +#define TAILQ_HEAD_INITIALIZER(head) \ + { NULL, &(head).tqh_first } + +#define TAILQ_ENTRY(type) \ +struct { \ + struct type *tqe_next; /* next element */ \ + struct type **tqe_prev; /* address of previous next element */ \ + TRACEBUF \ +} + +/* + * Tail queue functions. + */ +#if (defined(_KERNEL) && defined(INVARIANTS)) +#define QMD_TAILQ_CHECK_HEAD(head, field) do { \ + if (!TAILQ_EMPTY(head) && \ + TAILQ_FIRST((head))->field.tqe_prev != \ + &TAILQ_FIRST((head))) \ + panic("Bad tailq head %p first->prev != head", (head)); \ +} while (0) + +#define QMD_TAILQ_CHECK_TAIL(head, field) do { \ + if (*(head)->tqh_last != NULL) \ + panic("Bad tailq NEXT(%p->tqh_last) != NULL", (head)); \ +} while (0) + +#define QMD_TAILQ_CHECK_NEXT(elm, field) do { \ + if (TAILQ_NEXT((elm), field) != NULL && \ + TAILQ_NEXT((elm), field)->field.tqe_prev != \ + &((elm)->field.tqe_next)) \ + panic("Bad link elm %p next->prev != elm", (elm)); \ +} while (0) + +#define QMD_TAILQ_CHECK_PREV(elm, field) do { \ + if (*(elm)->field.tqe_prev != (elm)) \ + panic("Bad link elm %p prev->next != elm", (elm)); \ +} while (0) +#else +#define QMD_TAILQ_CHECK_HEAD(head, field) +#define QMD_TAILQ_CHECK_TAIL(head, headname) +#define QMD_TAILQ_CHECK_NEXT(elm, field) +#define QMD_TAILQ_CHECK_PREV(elm, field) +#endif /* (_KERNEL && INVARIANTS) */ + +#define TAILQ_CONCAT(head1, head2, field) do { \ + if (!TAILQ_EMPTY(head2)) { \ + *(head1)->tqh_last = (head2)->tqh_first; \ + (head2)->tqh_first->field.tqe_prev = (head1)->tqh_last; \ + (head1)->tqh_last = (head2)->tqh_last; \ + TAILQ_INIT((head2)); \ + QMD_TRACE_HEAD(head1); \ + QMD_TRACE_HEAD(head2); \ + } \ +} while (0) + +#define TAILQ_EMPTY(head) ((head)->tqh_first == NULL) + +#define TAILQ_FIRST(head) ((head)->tqh_first) + +#define TAILQ_FOREACH(var, head, field) \ + for ((var) = TAILQ_FIRST((head)); \ + (var); \ + (var) = TAILQ_NEXT((var), field)) + +#define TAILQ_FOREACH_SAFE(var, head, field, tvar) \ + for ((var) = TAILQ_FIRST((head)); \ + (var) && ((tvar) = TAILQ_NEXT((var), field), 1); \ + (var) = (tvar)) + +#define TAILQ_FOREACH_REVERSE(var, head, headname, field) \ + for ((var) = TAILQ_LAST((head), headname); \ + (var); \ + (var) = TAILQ_PREV((var), headname, field)) + +#define TAILQ_FOREACH_REVERSE_SAFE(var, head, headname, field, tvar) \ + for ((var) = TAILQ_LAST((head), headname); \ + (var) && ((tvar) = TAILQ_PREV((var), headname, field), 1); \ + (var) = (tvar)) + +#define TAILQ_INIT(head) do { \ + TAILQ_FIRST((head)) = NULL; \ + (head)->tqh_last = &TAILQ_FIRST((head)); \ + QMD_TRACE_HEAD(head); \ +} while (0) + +#define TAILQ_INSERT_AFTER(head, listelm, elm, field) do { \ + QMD_TAILQ_CHECK_NEXT(listelm, field); \ + if ((TAILQ_NEXT((elm), field) = TAILQ_NEXT((listelm), field)) != NULL)\ + TAILQ_NEXT((elm), field)->field.tqe_prev = \ + &TAILQ_NEXT((elm), field); \ + else { \ + (head)->tqh_last = &TAILQ_NEXT((elm), field); \ + QMD_TRACE_HEAD(head); \ + } \ + TAILQ_NEXT((listelm), field) = (elm); \ + (elm)->field.tqe_prev = &TAILQ_NEXT((listelm), field); \ + QMD_TRACE_ELEM(&(elm)->field); \ + QMD_TRACE_ELEM(&listelm->field); \ +} while (0) + +#define TAILQ_INSERT_BEFORE(listelm, elm, field) do { \ + QMD_TAILQ_CHECK_PREV(listelm, field); \ + (elm)->field.tqe_prev = (listelm)->field.tqe_prev; \ + TAILQ_NEXT((elm), field) = (listelm); \ + *(listelm)->field.tqe_prev = (elm); \ + (listelm)->field.tqe_prev = &TAILQ_NEXT((elm), field); \ + QMD_TRACE_ELEM(&(elm)->field); \ + QMD_TRACE_ELEM(&listelm->field); \ +} while (0) + +#define TAILQ_INSERT_HEAD(head, elm, field) do { \ + QMD_TAILQ_CHECK_HEAD(head, field); \ + if ((TAILQ_NEXT((elm), field) = TAILQ_FIRST((head))) != NULL) \ + TAILQ_FIRST((head))->field.tqe_prev = \ + &TAILQ_NEXT((elm), field); \ + else \ + (head)->tqh_last = &TAILQ_NEXT((elm), field); \ + TAILQ_FIRST((head)) = (elm); \ + (elm)->field.tqe_prev = &TAILQ_FIRST((head)); \ + QMD_TRACE_HEAD(head); \ + QMD_TRACE_ELEM(&(elm)->field); \ +} while (0) + +#define TAILQ_INSERT_TAIL(head, elm, field) do { \ + QMD_TAILQ_CHECK_TAIL(head, field); \ + TAILQ_NEXT((elm), field) = NULL; \ + (elm)->field.tqe_prev = (head)->tqh_last; \ + *(head)->tqh_last = (elm); \ + (head)->tqh_last = &TAILQ_NEXT((elm), field); \ + QMD_TRACE_HEAD(head); \ + QMD_TRACE_ELEM(&(elm)->field); \ +} while (0) + +#define TAILQ_LAST(head, headname) \ + (*(((struct headname *)((head)->tqh_last))->tqh_last)) + +#define TAILQ_NEXT(elm, field) ((elm)->field.tqe_next) + +#define TAILQ_PREV(elm, headname, field) \ + (*(((struct headname *)((elm)->field.tqe_prev))->tqh_last)) + +#define TAILQ_REMOVE(head, elm, field) do { \ + QMD_SAVELINK(oldnext, (elm)->field.tqe_next); \ + QMD_SAVELINK(oldprev, (elm)->field.tqe_prev); \ + QMD_TAILQ_CHECK_NEXT(elm, field); \ + QMD_TAILQ_CHECK_PREV(elm, field); \ + if ((TAILQ_NEXT((elm), field)) != NULL) \ + TAILQ_NEXT((elm), field)->field.tqe_prev = \ + (elm)->field.tqe_prev; \ + else { \ + (head)->tqh_last = (elm)->field.tqe_prev; \ + QMD_TRACE_HEAD(head); \ + } \ + *(elm)->field.tqe_prev = TAILQ_NEXT((elm), field); \ + TRASHIT(*oldnext); \ + TRASHIT(*oldprev); \ + QMD_TRACE_ELEM(&(elm)->field); \ +} while (0) + +#define TAILQ_SWAP(head1, head2, type, field) do { \ + struct type *swap_first = (head1)->tqh_first; \ + struct type **swap_last = (head1)->tqh_last; \ + (head1)->tqh_first = (head2)->tqh_first; \ + (head1)->tqh_last = (head2)->tqh_last; \ + (head2)->tqh_first = swap_first; \ + (head2)->tqh_last = swap_last; \ + if ((swap_first = (head1)->tqh_first) != NULL) \ + swap_first->field.tqe_prev = &(head1)->tqh_first; \ + else \ + (head1)->tqh_last = &(head1)->tqh_first; \ + if ((swap_first = (head2)->tqh_first) != NULL) \ + swap_first->field.tqe_prev = &(head2)->tqh_first; \ + else \ + (head2)->tqh_last = &(head2)->tqh_first; \ +} while (0) + +#endif /* !_SYS_QUEUE_H_ */ diff -r 6c9a73817770 -r 934c14ab9f19 tools/libxl/Makefile --- a/tools/libxl/Makefile Tue Jan 31 11:39:37 2012 +0000 +++ b/tools/libxl/Makefile Tue Jan 31 16:06:14 2012 +0000 @@ -93,8 +93,8 @@ rm -f $@.tmp $(call move-if-changed,$@.2.tmp,$@) -_libxl_list.h: bsd-sys-queue-h-seddery external/bsd-sys-queue.h - perl ./$^ --prefix=libxl >$@.new +_libxl_list.h: $(XEN_INCLUDE)/xen-external/bsd-sys-queue-h-seddery $(XEN_INCLUDE)/xen-external/bsd-sys-queue.h + perl $^ --prefix=libxl >$@.new $(call move-if-changed,$@.new,$@) libxl_paths.c: _libxl_paths.h diff -r 6c9a73817770 -r 934c14ab9f19 tools/libxl/bsd-sys-queue-h-seddery --- a/tools/libxl/bsd-sys-queue-h-seddery Tue Jan 31 11:39:37 2012 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,70 +0,0 @@ -#!/usr/bin/perl -p -# -# This script is part of the Xen build system. It has a very -# permissive licence to avoid complicating the licence of the -# generated header file and to allow this seddery to be reused by -# other projects. -# -# Permission is hereby granted, free of charge, to any person -# obtaining a copy of this individual file (the "Software"), to deal -# in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, -# sublicense, and/or sell copies of the Software, and to permit -# persons to whom the Software is furnished to do so, subject to the -# following conditions: -# -# The above copyright notice and this permission notice shall be -# included in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS -# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN -# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. -# -# Copyright (C) 2011 Citrix Ltd - -our $namespace, $ucnamespace; - -BEGIN { - die unless @ARGV; - $namespace = pop @ARGV; - $namespace =~ s/^--prefix=// or die; - $ucnamespace = uc $namespace; - - print <tools/libxl/external/bsd-COPYRIGHT diff -r 6c9a73817770 -r 934c14ab9f19 tools/libxl/external/bsd-COPYRIGHT --- a/tools/libxl/external/bsd-COPYRIGHT Tue Jan 31 11:39:37 2012 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,126 +0,0 @@ -# $FreeBSD$ -# @(#)COPYRIGHT 8.2 (Berkeley) 3/21/94 - -The compilation of software known as FreeBSD is distributed under the -following terms: - -Copyright (c) 1992-2011 The FreeBSD Project. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -SUCH DAMAGE. - -The 4.4BSD and 4.4BSD-Lite software is distributed under the following -terms: - -All of the documentation and software included in the 4.4BSD and 4.4BSD-Lite -Releases is copyrighted by The Regents of the University of California. - -Copyright 1979, 1980, 1983, 1986, 1988, 1989, 1991, 1992, 1993, 1994 - The Regents of the University of California. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. -3. All advertising materials mentioning features or use of this software - must display the following acknowledgement: -This product includes software developed by the University of -California, Berkeley and its contributors. -4. Neither the name of the University nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -SUCH DAMAGE. - -The Institute of Electrical and Electronics Engineers and the American -National Standards Committee X3, on Information Processing Systems have -given us permission to reprint portions of their documentation. - -In the following statement, the phrase ``this text'' refers to portions -of the system documentation. - -Portions of this text are reprinted and reproduced in electronic form in -the second BSD Networking Software Release, from IEEE Std 1003.1-1988, IEEE -Standard Portable Operating System Interface for Computer Environments -(POSIX), copyright C 1988 by the Institute of Electrical and Electronics -Engineers, Inc. In the event of any discrepancy between these versions -and the original IEEE Standard, the original IEEE Standard is the referee -document. - -In the following statement, the phrase ``This material'' refers to portions -of the system documentation. - -This material is reproduced with permission from American National -Standards Committee X3, on Information Processing Systems. Computer and -Business Equipment Manufacturers Association (CBEMA), 311 First St., NW, -Suite 500, Washington, DC 20001-2178. The developmental work of -Programming Language C was completed by the X3J11 Technical Committee. - -The views and conclusions contained in the software and documentation are -those of the authors and should not be interpreted as representing official -policies, either expressed or implied, of the Regents of the University -of California. - - -NOTE: The copyright of UC Berkeley's Berkeley Software Distribution ("BSD") -source has been updated. The copyright addendum may be found at -ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change and is -included below. - -July 22, 1999 - -To All Licensees, Distributors of Any Version of BSD: - -As you know, certain of the Berkeley Software Distribution ("BSD") source -code files require that further distributions of products containing all or -portions of the software, acknowledge within their advertising materials -that such products contain software developed by UC Berkeley and its -contributors. - -Specifically, the provision reads: - -" * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors." - -Effective immediately, licensees and distributors are no longer required to -include the acknowledgement within advertising materials. Accordingly, the -foregoing paragraph of those BSD Unix files containing it is hereby deleted -in its entirety. - -William Hoskins -Director, Office of Technology Licensing -University of California, Berkeley diff -r 6c9a73817770 -r 934c14ab9f19 tools/libxl/external/bsd-queue.3 --- a/tools/libxl/external/bsd-queue.3 Tue Jan 31 11:39:37 2012 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1044 +0,0 @@ -.\" Copyright (c) 1993 -.\" The Regents of the University of California. All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" 3. All advertising materials mentioning features or use of this software -.\" must display the following acknowledgement: -.\" This product includes software developed by the University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors -.\" may be used to endorse or promote products derived from this software -.\" without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.\" @(#)queue.3 8.2 (Berkeley) 1/24/94 -.\" $FreeBSD$ -.\" -.Dd May 13, 2011 -.Dt QUEUE 3 -.Os -.Sh NAME -.Nm SLIST_EMPTY , -.Nm SLIST_ENTRY , -.Nm SLIST_FIRST , -.Nm SLIST_FOREACH , -.Nm SLIST_FOREACH_SAFE , -.Nm SLIST_HEAD , -.Nm SLIST_HEAD_INITIALIZER , -.Nm SLIST_INIT , -.Nm SLIST_INSERT_AFTER , -.Nm SLIST_INSERT_HEAD , -.Nm SLIST_NEXT , -.Nm SLIST_REMOVE_AFTER , -.Nm SLIST_REMOVE_HEAD , -.Nm SLIST_REMOVE , -.Nm SLIST_SWAP , -.Nm STAILQ_CONCAT , -.Nm STAILQ_EMPTY , -.Nm STAILQ_ENTRY , -.Nm STAILQ_FIRST , -.Nm STAILQ_FOREACH , -.Nm STAILQ_FOREACH_SAFE , -.Nm STAILQ_HEAD , -.Nm STAILQ_HEAD_INITIALIZER , -.Nm STAILQ_INIT , -.Nm STAILQ_INSERT_AFTER , -.Nm STAILQ_INSERT_HEAD , -.Nm STAILQ_INSERT_TAIL , -.Nm STAILQ_LAST , -.Nm STAILQ_NEXT , -.Nm STAILQ_REMOVE_AFTER , -.Nm STAILQ_REMOVE_HEAD , -.Nm STAILQ_REMOVE , -.Nm STAILQ_SWAP , -.Nm LIST_EMPTY , -.Nm LIST_ENTRY , -.Nm LIST_FIRST , -.Nm LIST_FOREACH , -.Nm LIST_FOREACH_SAFE , -.Nm LIST_HEAD , -.Nm LIST_HEAD_INITIALIZER , -.Nm LIST_INIT , -.Nm LIST_INSERT_AFTER , -.Nm LIST_INSERT_BEFORE , -.Nm LIST_INSERT_HEAD , -.Nm LIST_NEXT , -.Nm LIST_REMOVE , -.Nm LIST_SWAP , -.Nm TAILQ_CONCAT , -.Nm TAILQ_EMPTY , -.Nm TAILQ_ENTRY , -.Nm TAILQ_FIRST , -.Nm TAILQ_FOREACH , -.Nm TAILQ_FOREACH_SAFE , -.Nm TAILQ_FOREACH_REVERSE , -.Nm TAILQ_FOREACH_REVERSE_SAFE , -.Nm TAILQ_HEAD , -.Nm TAILQ_HEAD_INITIALIZER , -.Nm TAILQ_INIT , -.Nm TAILQ_INSERT_AFTER , -.Nm TAILQ_INSERT_BEFORE , -.Nm TAILQ_INSERT_HEAD , -.Nm TAILQ_INSERT_TAIL , -.Nm TAILQ_LAST , -.Nm TAILQ_NEXT , -.Nm TAILQ_PREV , -.Nm TAILQ_REMOVE , -.Nm TAILQ_SWAP -.Nd implementations of singly-linked lists, singly-linked tail queues, -lists and tail queues -.Sh SYNOPSIS -.In sys/queue.h -.\" -.Fn SLIST_EMPTY "SLIST_HEAD *head" -.Fn SLIST_ENTRY "TYPE" -.Fn SLIST_FIRST "SLIST_HEAD *head" -.Fn SLIST_FOREACH "TYPE *var" "SLIST_HEAD *head" "SLIST_ENTRY NAME" -.Fn SLIST_FOREACH_SAFE "TYPE *var" "SLIST_HEAD *head" "SLIST_ENTRY NAME" "TYPE *temp_var" -.Fn SLIST_HEAD "HEADNAME" "TYPE" -.Fn SLIST_HEAD_INITIALIZER "SLIST_HEAD head" -.Fn SLIST_INIT "SLIST_HEAD *head" -.Fn SLIST_INSERT_AFTER "TYPE *listelm" "TYPE *elm" "SLIST_ENTRY NAME" -.Fn SLIST_INSERT_HEAD "SLIST_HEAD *head" "TYPE *elm" "SLIST_ENTRY NAME" -.Fn SLIST_NEXT "TYPE *elm" "SLIST_ENTRY NAME" -.Fn SLIST_REMOVE_AFTER "TYPE *elm" "SLIST_ENTRY NAME" -.Fn SLIST_REMOVE_HEAD "SLIST_HEAD *head" "SLIST_ENTRY NAME" -.Fn SLIST_REMOVE "SLIST_HEAD *head" "TYPE *elm" "TYPE" "SLIST_ENTRY NAME" -.Fn SLIST_SWAP "SLIST_HEAD *head1" "SLIST_HEAD *head2" "SLIST_ENTRY NAME" -.\" -.Fn STAILQ_CONCAT "STAILQ_HEAD *head1" "STAILQ_HEAD *head2" -.Fn STAILQ_EMPTY "STAILQ_HEAD *head" -.Fn STAILQ_ENTRY "TYPE" -.Fn STAILQ_FIRST "STAILQ_HEAD *head" -.Fn STAILQ_FOREACH "TYPE *var" "STAILQ_HEAD *head" "STAILQ_ENTRY NAME" -.Fn STAILQ_FOREACH_SAFE "TYPE *var" "STAILQ_HEAD *head" "STAILQ_ENTRY NAME" "TYPE *temp_var" -.Fn STAILQ_HEAD "HEADNAME" "TYPE" -.Fn STAILQ_HEAD_INITIALIZER "STAILQ_HEAD head" -.Fn STAILQ_INIT "STAILQ_HEAD *head" -.Fn STAILQ_INSERT_AFTER "STAILQ_HEAD *head" "TYPE *listelm" "TYPE *elm" "STAILQ_ENTRY NAME" -.Fn STAILQ_INSERT_HEAD "STAILQ_HEAD *head" "TYPE *elm" "STAILQ_ENTRY NAME" -.Fn STAILQ_INSERT_TAIL "STAILQ_HEAD *head" "TYPE *elm" "STAILQ_ENTRY NAME" -.Fn STAILQ_LAST "STAILQ_HEAD *head" "TYPE" "STAILQ_ENTRY NAME" -.Fn STAILQ_NEXT "TYPE *elm" "STAILQ_ENTRY NAME" -.Fn STAILQ_REMOVE_AFTER "STAILQ_HEAD *head" "TYPE *elm" "STAILQ_ENTRY NAME" -.Fn STAILQ_REMOVE_HEAD "STAILQ_HEAD *head" "STAILQ_ENTRY NAME" -.Fn STAILQ_REMOVE "STAILQ_HEAD *head" "TYPE *elm" "TYPE" "STAILQ_ENTRY NAME" -.Fn STAILQ_SWAP "STAILQ_HEAD *head1" "STAILQ_HEAD *head2" "STAILQ_ENTRY NAME" -.\" -.Fn LIST_EMPTY "LIST_HEAD *head" -.Fn LIST_ENTRY "TYPE" -.Fn LIST_FIRST "LIST_HEAD *head" -.Fn LIST_FOREACH "TYPE *var" "LIST_HEAD *head" "LIST_ENTRY NAME" -.Fn LIST_FOREACH_SAFE "TYPE *var" "LIST_HEAD *head" "LIST_ENTRY NAME" "TYPE *temp_var" -.Fn LIST_HEAD "HEADNAME" "TYPE" -.Fn LIST_HEAD_INITIALIZER "LIST_HEAD head" -.Fn LIST_INIT "LIST_HEAD *head" -.Fn LIST_INSERT_AFTER "TYPE *listelm" "TYPE *elm" "LIST_ENTRY NAME" -.Fn LIST_INSERT_BEFORE "TYPE *listelm" "TYPE *elm" "LIST_ENTRY NAME" -.Fn LIST_INSERT_HEAD "LIST_HEAD *head" "TYPE *elm" "LIST_ENTRY NAME" -.Fn LIST_NEXT "TYPE *elm" "LIST_ENTRY NAME" -.Fn LIST_REMOVE "TYPE *elm" "LIST_ENTRY NAME" -.Fn LIST_SWAP "LIST_HEAD *head1" "LIST_HEAD *head2" "TYPE" "LIST_ENTRY NAME" -.\" -.Fn TAILQ_CONCAT "TAILQ_HEAD *head1" "TAILQ_HEAD *head2" "TAILQ_ENTRY NAME" -.Fn TAILQ_EMPTY "TAILQ_HEAD *head" -.Fn TAILQ_ENTRY "TYPE" -.Fn TAILQ_FIRST "TAILQ_HEAD *head" -.Fn TAILQ_FOREACH "TYPE *var" "TAILQ_HEAD *head" "TAILQ_ENTRY NAME" -.Fn TAILQ_FOREACH_SAFE "TYPE *var" "TAILQ_HEAD *head" "TAILQ_ENTRY NAME" "TYPE *temp_var" -.Fn TAILQ_FOREACH_REVERSE "TYPE *var" "TAILQ_HEAD *head" "HEADNAME" "TAILQ_ENTRY NAME" -.Fn TAILQ_FOREACH_REVERSE_SAFE "TYPE *var" "TAILQ_HEAD *head" "HEADNAME" "TAILQ_ENTRY NAME" "TYPE *temp_var" -.Fn TAILQ_HEAD "HEADNAME" "TYPE" -.Fn TAILQ_HEAD_INITIALIZER "TAILQ_HEAD head" -.Fn TAILQ_INIT "TAILQ_HEAD *head" -.Fn TAILQ_INSERT_AFTER "TAILQ_HEAD *head" "TYPE *listelm" "TYPE *elm" "TAILQ_ENTRY NAME" -.Fn TAILQ_INSERT_BEFORE "TYPE *listelm" "TYPE *elm" "TAILQ_ENTRY NAME" -.Fn TAILQ_INSERT_HEAD "TAILQ_HEAD *head" "TYPE *elm" "TAILQ_ENTRY NAME" -.Fn TAILQ_INSERT_TAIL "TAILQ_HEAD *head" "TYPE *elm" "TAILQ_ENTRY NAME" -.Fn TAILQ_LAST "TAILQ_HEAD *head" "HEADNAME" -.Fn TAILQ_NEXT "TYPE *elm" "TAILQ_ENTRY NAME" -.Fn TAILQ_PREV "TYPE *elm" "HEADNAME" "TAILQ_ENTRY NAME" -.Fn TAILQ_REMOVE "TAILQ_HEAD *head" "TYPE *elm" "TAILQ_ENTRY NAME" -.Fn TAILQ_SWAP "TAILQ_HEAD *head1" "TAILQ_HEAD *head2" "TYPE" "TAILQ_ENTRY NAME" -.\" -.Sh DESCRIPTION -These macros define and operate on four types of data structures: -singly-linked lists, singly-linked tail queues, lists, and tail queues. -All four structures support the following functionality: -.Bl -enum -compact -offset indent -.It -Insertion of a new entry at the head of the list. -.It -Insertion of a new entry after any element in the list. -.It -O(1) removal of an entry from the head of the list. -.It -Forward traversal through the list. -.It -Swawpping the contents of two lists. -.El -.Pp -Singly-linked lists are the simplest of the four data structures -and support only the above functionality. -Singly-linked lists are ideal for applications with large datasets -and few or no removals, -or for implementing a LIFO queue. -Singly-linked lists add the following functionality: -.Bl -enum -compact -offset indent -.It -O(n) removal of any entry in the list. -.El -.Pp -Singly-linked tail queues add the following functionality: -.Bl -enum -compact -offset indent -.It -Entries can be added at the end of a list. -.It -O(n) removal of any entry in the list. -.It -They may be concatenated. -.El -However: -.Bl -enum -compact -offset indent -.It -All list insertions must specify the head of the list. -.It -Each head entry requires two pointers rather than one. -.It -Code size is about 15% greater and operations run about 20% slower -than singly-linked lists. -.El -.Pp -Singly-linked tailqs are ideal for applications with large datasets and -few or no removals, -or for implementing a FIFO queue. -.Pp -All doubly linked types of data structures (lists and tail queues) -additionally allow: -.Bl -enum -compact -offset indent -.It -Insertion of a new entry before any element in the list. -.It -O(1) removal of any entry in the list. -.El -However: -.Bl -enum -compact -offset indent -.It -Each element requires two pointers rather than one. -.It -Code size and execution time of operations (except for removal) is about -twice that of the singly-linked data-structures. -.El -.Pp -Linked lists are the simplest of the doubly linked data structures and support -only the above functionality over singly-linked lists. -.Pp -Tail queues add the following functionality: -.Bl -enum -compact -offset indent -.It -Entries can be added at the end of a list. -.It -They may be traversed backwards, from tail to head. -.It -They may be concatenated. -.El -However: -.Bl -enum -compact -offset indent -.It -All list insertions and removals must specify the head of the list. -.It -Each head entry requires two pointers rather than one. -.It -Code size is about 15% greater and operations run about 20% slower -than singly-linked lists. -.El -.Pp -In the macro definitions, -.Fa TYPE -is the name of a user defined structure, -that must contain a field of type -.Li SLIST_ENTRY , -.Li STAILQ_ENTRY , -.Li LIST_ENTRY , -or -.Li TAILQ_ENTRY , -named -.Fa NAME . -The argument -.Fa HEADNAME -is the name of a user defined structure that must be declared -using the macros -.Li SLIST_HEAD , -.Li STAILQ_HEAD , -.Li LIST_HEAD , -or -.Li TAILQ_HEAD . -See the examples below for further explanation of how these -macros are used. -.Sh SINGLY-LINKED LISTS -A singly-linked list is headed by a structure defined by the -.Nm SLIST_HEAD -macro. -This structure contains a single pointer to the first element -on the list. -The elements are singly linked for minimum space and pointer manipulation -overhead at the expense of O(n) removal for arbitrary elements. -New elements can be added to the list after an existing element or -at the head of the list. -An -.Fa SLIST_HEAD -structure is declared as follows: -.Bd -literal -offset indent -SLIST_HEAD(HEADNAME, TYPE) head; -.Ed -.Pp -where -.Fa HEADNAME -is the name of the structure to be defined, and -.Fa TYPE -is the type of the elements to be linked into the list. -A pointer to the head of the list can later be declared as: -.Bd -literal -offset indent -struct HEADNAME *headp; -.Ed -.Pp -(The names -.Li head -and -.Li headp -are user selectable.) -.Pp -The macro -.Nm SLIST_HEAD_INITIALIZER -evaluates to an initializer for the list -.Fa head . -.Pp -The macro -.Nm SLIST_EMPTY -evaluates to true if there are no elements in the list. -.Pp -The macro -.Nm SLIST_ENTRY -declares a structure that connects the elements in -the list. -.Pp -The macro -.Nm SLIST_FIRST -returns the first element in the list or NULL if the list is empty. -.Pp -The macro -.Nm SLIST_FOREACH -traverses the list referenced by -.Fa head -in the forward direction, assigning each element in -turn to -.Fa var . -.Pp -The macro -.Nm SLIST_FOREACH_SAFE -traverses the list referenced by -.Fa head -in the forward direction, assigning each element in -turn to -.Fa var . -However, unlike -.Fn SLIST_FOREACH -here it is permitted to both remove -.Fa var -as well as free it from within the loop safely without interfering with the -traversal. -.Pp -The macro -.Nm SLIST_INIT -initializes the list referenced by -.Fa head . -.Pp -The macro -.Nm SLIST_INSERT_HEAD -inserts the new element -.Fa elm -at the head of the list. -.Pp -The macro -.Nm SLIST_INSERT_AFTER -inserts the new element -.Fa elm -after the element -.Fa listelm . -.Pp -The macro -.Nm SLIST_NEXT -returns the next element in the list. -.Pp -The macro -.Nm SLIST_REMOVE_AFTER -removes the element after -.Fa elm -from the list. Unlike -.Fa SLIST_REMOVE , -this macro does not traverse the entire list. -.Pp -The macro -.Nm SLIST_REMOVE_HEAD -removes the element -.Fa elm -from the head of the list. -For optimum efficiency, -elements being removed from the head of the list should explicitly use -this macro instead of the generic -.Fa SLIST_REMOVE -macro. -.Pp -The macro -.Nm SLIST_REMOVE -removes the element -.Fa elm -from the list. -.Pp -The macro -.Nm SLIST_SWAP -swaps the contents of -.Fa head1 -and -.Fa head2 . -.Sh SINGLY-LINKED LIST EXAMPLE -.Bd -literal -SLIST_HEAD(slisthead, entry) head = - SLIST_HEAD_INITIALIZER(head); -struct slisthead *headp; /* Singly-linked List head. */ -struct entry { - ... - SLIST_ENTRY(entry) entries; /* Singly-linked List. */ - ... -} *n1, *n2, *n3, *np; - -SLIST_INIT(&head); /* Initialize the list. */ - -n1 = malloc(sizeof(struct entry)); /* Insert at the head. */ -SLIST_INSERT_HEAD(&head, n1, entries); - -n2 = malloc(sizeof(struct entry)); /* Insert after. */ -SLIST_INSERT_AFTER(n1, n2, entries); - -SLIST_REMOVE(&head, n2, entry, entries);/* Deletion. */ -free(n2); - -n3 = SLIST_FIRST(&head); -SLIST_REMOVE_HEAD(&head, entries); /* Deletion from the head. */ -free(n3); - /* Forward traversal. */ -SLIST_FOREACH(np, &head, entries) - np-> ... - /* Safe forward traversal. */ -SLIST_FOREACH_SAFE(np, &head, entries, np_temp) { - np->do_stuff(); - ... - SLIST_REMOVE(&head, np, entry, entries); - free(np); -} - -while (!SLIST_EMPTY(&head)) { /* List Deletion. */ - n1 = SLIST_FIRST(&head); - SLIST_REMOVE_HEAD(&head, entries); - free(n1); -} -.Ed -.Sh SINGLY-LINKED TAIL QUEUES -A singly-linked tail queue is headed by a structure defined by the -.Nm STAILQ_HEAD -macro. -This structure contains a pair of pointers, -one to the first element in the tail queue and the other to -the last element in the tail queue. -The elements are singly linked for minimum space and pointer -manipulation overhead at the expense of O(n) removal for arbitrary -elements. -New elements can be added to the tail queue after an existing element, -at the head of the tail queue, or at the end of the tail queue. -A -.Fa STAILQ_HEAD -structure is declared as follows: -.Bd -literal -offset indent -STAILQ_HEAD(HEADNAME, TYPE) head; -.Ed -.Pp -where -.Li HEADNAME -is the name of the structure to be defined, and -.Li TYPE -is the type of the elements to be linked into the tail queue. -A pointer to the head of the tail queue can later be declared as: -.Bd -literal -offset indent -struct HEADNAME *headp; -.Ed -.Pp -(The names -.Li head -and -.Li headp -are user selectable.) -.Pp -The macro -.Nm STAILQ_HEAD_INITIALIZER -evaluates to an initializer for the tail queue -.Fa head . -.Pp -The macro -.Nm STAILQ_CONCAT -concatenates the tail queue headed by -.Fa head2 -onto the end of the one headed by -.Fa head1 -removing all entries from the former. -.Pp -The macro -.Nm STAILQ_EMPTY -evaluates to true if there are no items on the tail queue. -.Pp -The macro -.Nm STAILQ_ENTRY -declares a structure that connects the elements in -the tail queue. -.Pp -The macro -.Nm STAILQ_FIRST -returns the first item on the tail queue or NULL if the tail queue -is empty. -.Pp -The macro -.Nm STAILQ_FOREACH -traverses the tail queue referenced by -.Fa head -in the forward direction, assigning each element -in turn to -.Fa var . -.Pp -The macro -.Nm STAILQ_FOREACH_SAFE -traverses the tail queue referenced by -.Fa head -in the forward direction, assigning each element -in turn to -.Fa var . -However, unlike -.Fn STAILQ_FOREACH -here it is permitted to both remove -.Fa var -as well as free it from within the loop safely without interfering with the -traversal. -.Pp -The macro -.Nm STAILQ_INIT -initializes the tail queue referenced by -.Fa head . -.Pp -The macro -.Nm STAILQ_INSERT_HEAD -inserts the new element -.Fa elm -at the head of the tail queue. -.Pp -The macro -.Nm STAILQ_INSERT_TAIL -inserts the new element -.Fa elm -at the end of the tail queue. -.Pp -The macro -.Nm STAILQ_INSERT_AFTER -inserts the new element -.Fa elm -after the element -.Fa listelm . -.Pp -The macro -.Nm STAILQ_LAST -returns the last item on the tail queue. -If the tail queue is empty the return value is -.Dv NULL . -.Pp -The macro -.Nm STAILQ_NEXT -returns the next item on the tail queue, or NULL this item is the last. -.Pp -The macro -.Nm STAILQ_REMOVE_AFTER -removes the element after -.Fa elm -from the tail queue. Unlike -.Fa STAILQ_REMOVE , -this macro does not traverse the entire tail queue. -.Pp -The macro -.Nm STAILQ_REMOVE_HEAD -removes the element at the head of the tail queue. -For optimum efficiency, -elements being removed from the head of the tail queue should -use this macro explicitly rather than the generic -.Fa STAILQ_REMOVE -macro. -.Pp -The macro -.Nm STAILQ_REMOVE -removes the element -.Fa elm -from the tail queue. -.Pp -The macro -.Nm STAILQ_SWAP -swaps the contents of -.Fa head1 -and -.Fa head2 . -.Sh SINGLY-LINKED TAIL QUEUE EXAMPLE -.Bd -literal -STAILQ_HEAD(stailhead, entry) head = - STAILQ_HEAD_INITIALIZER(head); -struct stailhead *headp; /* Singly-linked tail queue head. */ -struct entry { - ... - STAILQ_ENTRY(entry) entries; /* Tail queue. */ - ... -} *n1, *n2, *n3, *np; - -STAILQ_INIT(&head); /* Initialize the queue. */ - -n1 = malloc(sizeof(struct entry)); /* Insert at the head. */ -STAILQ_INSERT_HEAD(&head, n1, entries); - -n1 = malloc(sizeof(struct entry)); /* Insert at the tail. */ -STAILQ_INSERT_TAIL(&head, n1, entries); - -n2 = malloc(sizeof(struct entry)); /* Insert after. */ -STAILQ_INSERT_AFTER(&head, n1, n2, entries); - /* Deletion. */ -STAILQ_REMOVE(&head, n2, entry, entries); -free(n2); - /* Deletion from the head. */ -n3 = STAILQ_FIRST(&head); -STAILQ_REMOVE_HEAD(&head, entries); -free(n3); - /* Forward traversal. */ -STAILQ_FOREACH(np, &head, entries) - np-> ... - /* Safe forward traversal. */ -STAILQ_FOREACH_SAFE(np, &head, entries, np_temp) { - np->do_stuff(); - ... - STAILQ_REMOVE(&head, np, entry, entries); - free(np); -} - /* TailQ Deletion. */ -while (!STAILQ_EMPTY(&head)) { - n1 = STAILQ_FIRST(&head); - STAILQ_REMOVE_HEAD(&head, entries); - free(n1); -} - /* Faster TailQ Deletion. */ -n1 = STAILQ_FIRST(&head); -while (n1 != NULL) { - n2 = STAILQ_NEXT(n1, entries); - free(n1); - n1 = n2; -} -STAILQ_INIT(&head); -.Ed -.Sh LISTS -A list is headed by a structure defined by the -.Nm LIST_HEAD -macro. -This structure contains a single pointer to the first element -on the list. -The elements are doubly linked so that an arbitrary element can be -removed without traversing the list. -New elements can be added to the list after an existing element, -before an existing element, or at the head of the list. -A -.Fa LIST_HEAD -structure is declared as follows: -.Bd -literal -offset indent -LIST_HEAD(HEADNAME, TYPE) head; -.Ed -.Pp -where -.Fa HEADNAME -is the name of the structure to be defined, and -.Fa TYPE -is the type of the elements to be linked into the list. -A pointer to the head of the list can later be declared as: -.Bd -literal -offset indent -struct HEADNAME *headp; -.Ed -.Pp -(The names -.Li head -and -.Li headp -are user selectable.) -.Pp -The macro -.Nm LIST_HEAD_INITIALIZER -evaluates to an initializer for the list -.Fa head . -.Pp -The macro -.Nm LIST_EMPTY -evaluates to true if there are no elements in the list. -.Pp -The macro -.Nm LIST_ENTRY -declares a structure that connects the elements in -the list. -.Pp -The macro -.Nm LIST_FIRST -returns the first element in the list or NULL if the list -is empty. -.Pp -The macro -.Nm LIST_FOREACH -traverses the list referenced by -.Fa head -in the forward direction, assigning each element in turn to -.Fa var . -.Pp -The macro -.Nm LIST_FOREACH_SAFE -traverses the list referenced by -.Fa head -in the forward direction, assigning each element in turn to -.Fa var . -However, unlike -.Fn LIST_FOREACH -here it is permitted to both remove -.Fa var -as well as free it from within the loop safely without interfering with the -traversal. -.Pp -The macro -.Nm LIST_INIT -initializes the list referenced by -.Fa head . -.Pp -The macro -.Nm LIST_INSERT_HEAD -inserts the new element -.Fa elm -at the head of the list. -.Pp -The macro -.Nm LIST_INSERT_AFTER -inserts the new element -.Fa elm -after the element -.Fa listelm . -.Pp -The macro -.Nm LIST_INSERT_BEFORE -inserts the new element -.Fa elm -before the element -.Fa listelm . -.Pp -The macro -.Nm LIST_NEXT -returns the next element in the list, or NULL if this is the last. -.Pp -The macro -.Nm LIST_REMOVE -removes the element -.Fa elm -from the list. -.Pp -The macro -.Nm LIST_SWAP -swaps the contents of -.Fa head1 -and -.Fa head2 . -.Sh LIST EXAMPLE -.Bd -literal -LIST_HEAD(listhead, entry) head = - LIST_HEAD_INITIALIZER(head); -struct listhead *headp; /* List head. */ -struct entry { - ... - LIST_ENTRY(entry) entries; /* List. */ - ... -} *n1, *n2, *n3, *np, *np_temp; - -LIST_INIT(&head); /* Initialize the list. */ - -n1 = malloc(sizeof(struct entry)); /* Insert at the head. */ -LIST_INSERT_HEAD(&head, n1, entries); - -n2 = malloc(sizeof(struct entry)); /* Insert after. */ -LIST_INSERT_AFTER(n1, n2, entries); - -n3 = malloc(sizeof(struct entry)); /* Insert before. */ -LIST_INSERT_BEFORE(n2, n3, entries); - -LIST_REMOVE(n2, entries); /* Deletion. */ -free(n2); - /* Forward traversal. */ -LIST_FOREACH(np, &head, entries) - np-> ... - - /* Safe forward traversal. */ -LIST_FOREACH_SAFE(np, &head, entries, np_temp) { - np->do_stuff(); - ... - LIST_REMOVE(np, entries); - free(np); -} - -while (!LIST_EMPTY(&head)) { /* List Deletion. */ - n1 = LIST_FIRST(&head); - LIST_REMOVE(n1, entries); - free(n1); -} - -n1 = LIST_FIRST(&head); /* Faster List Deletion. */ -while (n1 != NULL) { - n2 = LIST_NEXT(n1, entries); - free(n1); - n1 = n2; -} -LIST_INIT(&head); -.Ed -.Sh TAIL QUEUES -A tail queue is headed by a structure defined by the -.Nm TAILQ_HEAD -macro. -This structure contains a pair of pointers, -one to the first element in the tail queue and the other to -the last element in the tail queue. -The elements are doubly linked so that an arbitrary element can be -removed without traversing the tail queue. -New elements can be added to the tail queue after an existing element, -before an existing element, at the head of the tail queue, -or at the end of the tail queue. -A -.Fa TAILQ_HEAD -structure is declared as follows: -.Bd -literal -offset indent -TAILQ_HEAD(HEADNAME, TYPE) head; -.Ed -.Pp -where -.Li HEADNAME -is the name of the structure to be defined, and -.Li TYPE -is the type of the elements to be linked into the tail queue. -A pointer to the head of the tail queue can later be declared as: -.Bd -literal -offset indent -struct HEADNAME *headp; -.Ed -.Pp -(The names -.Li head -and -.Li headp -are user selectable.) -.Pp -The macro -.Nm TAILQ_HEAD_INITIALIZER -evaluates to an initializer for the tail queue -.Fa head . -.Pp -The macro -.Nm TAILQ_CONCAT -concatenates the tail queue headed by -.Fa head2 -onto the end of the one headed by -.Fa head1 -removing all entries from the former. -.Pp -The macro -.Nm TAILQ_EMPTY -evaluates to true if there are no items on the tail queue. -.Pp -The macro -.Nm TAILQ_ENTRY -declares a structure that connects the elements in -the tail queue. -.Pp -The macro -.Nm TAILQ_FIRST -returns the first item on the tail queue or NULL if the tail queue -is empty. -.Pp -The macro -.Nm TAILQ_FOREACH -traverses the tail queue referenced by -.Fa head -in the forward direction, assigning each element in turn to -.Fa var . -.Fa var -is set to -.Dv NULL -if the loop completes normally, or if there were no elements. -.Pp -The macro -.Nm TAILQ_FOREACH_REVERSE -traverses the tail queue referenced by -.Fa head -in the reverse direction, assigning each element in turn to -.Fa var . -.Pp -The macros -.Nm TAILQ_FOREACH_SAFE -and -.Nm TAILQ_FOREACH_REVERSE_SAFE -traverse the list referenced by -.Fa head -in the forward or reverse direction respectively, -assigning each element in turn to -.Fa var . -However, unlike their unsafe counterparts, -.Nm TAILQ_FOREACH -and -.Nm TAILQ_FOREACH_REVERSE -permit to both remove -.Fa var -as well as free it from within the loop safely without interfering with the -traversal. -.Pp -The macro -.Nm TAILQ_INIT -initializes the tail queue referenced by -.Fa head . -.Pp -The macro -.Nm TAILQ_INSERT_HEAD -inserts the new element -.Fa elm -at the head of the tail queue. -.Pp -The macro -.Nm TAILQ_INSERT_TAIL -inserts the new element -.Fa elm -at the end of the tail queue. -.Pp -The macro -.Nm TAILQ_INSERT_AFTER -inserts the new element -.Fa elm -after the element -.Fa listelm . -.Pp -The macro -.Nm TAILQ_INSERT_BEFORE -inserts the new element -.Fa elm -before the element -.Fa listelm . -.Pp -The macro -.Nm TAILQ_LAST -returns the last item on the tail queue. -If the tail queue is empty the return value is -.Dv NULL . -.Pp -The macro -.Nm TAILQ_NEXT -returns the next item on the tail queue, or NULL if this item is the last. -.Pp -The macro -.Nm TAILQ_PREV -returns the previous item on the tail queue, or NULL if this item -is the first. -.Pp -The macro -.Nm TAILQ_REMOVE -removes the element -.Fa elm -from the tail queue. -.Pp -The macro -.Nm TAILQ_SWAP -swaps the contents of -.Fa head1 -and -.Fa head2 . -.Sh TAIL QUEUE EXAMPLE -.Bd -literal -TAILQ_HEAD(tailhead, entry) head = - TAILQ_HEAD_INITIALIZER(head); -struct tailhead *headp; /* Tail queue head. */ -struct entry { - ... - TAILQ_ENTRY(entry) entries; /* Tail queue. */ - ... -} *n1, *n2, *n3, *np; - -TAILQ_INIT(&head); /* Initialize the queue. */ - -n1 = malloc(sizeof(struct entry)); /* Insert at the head. */ -TAILQ_INSERT_HEAD(&head, n1, entries); - -n1 = malloc(sizeof(struct entry)); /* Insert at the tail. */ -TAILQ_INSERT_TAIL(&head, n1, entries); - -n2 = malloc(sizeof(struct entry)); /* Insert after. */ -TAILQ_INSERT_AFTER(&head, n1, n2, entries); - -n3 = malloc(sizeof(struct entry)); /* Insert before. */ -TAILQ_INSERT_BEFORE(n2, n3, entries); - -TAILQ_REMOVE(&head, n2, entries); /* Deletion. */ -free(n2); - /* Forward traversal. */ -TAILQ_FOREACH(np, &head, entries) - np-> ... - /* Safe forward traversal. */ -TAILQ_FOREACH_SAFE(np, &head, entries, np_temp) { - np->do_stuff(); - ... - TAILQ_REMOVE(&head, np, entries); - free(np); -} - /* Reverse traversal. */ -TAILQ_FOREACH_REVERSE(np, &head, tailhead, entries) - np-> ... - /* TailQ Deletion. */ -while (!TAILQ_EMPTY(&head)) { - n1 = TAILQ_FIRST(&head); - TAILQ_REMOVE(&head, n1, entries); - free(n1); -} - /* Faster TailQ Deletion. */ -n1 = TAILQ_FIRST(&head); -while (n1 != NULL) { - n2 = TAILQ_NEXT(n1, entries); - free(n1); - n1 = n2; -} -TAILQ_INIT(&head); -.Ed -.Sh SEE ALSO -.Xr tree 3 -.Sh HISTORY -The -.Nm queue -functions first appeared in -.Bx 4.4 . diff -r 6c9a73817770 -r 934c14ab9f19 tools/libxl/external/bsd-sys-queue.h --- a/tools/libxl/external/bsd-sys-queue.h Tue Jan 31 11:39:37 2012 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,637 +0,0 @@ -/*- - * Copyright (c) 1991, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)queue.h 8.5 (Berkeley) 8/20/94 - * $FreeBSD$ - */ - -#ifndef _SYS_QUEUE_H_ -#define _SYS_QUEUE_H_ - -#include - -/* - * This file defines four types of data structures: singly-linked lists, - * singly-linked tail queues, lists and tail queues. - * - * A singly-linked list is headed by a single forward pointer. The elements - * are singly linked for minimum space and pointer manipulation overhead at - * the expense of O(n) removal for arbitrary elements. New elements can be - * added to the list after an existing element or at the head of the list. - * Elements being removed from the head of the list should use the explicit - * macro for this purpose for optimum efficiency. A singly-linked list may - * only be traversed in the forward direction. Singly-linked lists are ideal - * for applications with large datasets and few or no removals or for - * implementing a LIFO queue. - * - * A singly-linked tail queue is headed by a pair of pointers, one to the - * head of the list and the other to the tail of the list. The elements are - * singly linked for minimum space and pointer manipulation overhead at the - * expense of O(n) removal for arbitrary elements. New elements can be added - * to the list after an existing element, at the head of the list, or at the - * end of the list. Elements being removed from the head of the tail queue - * should use the explicit macro for this purpose for optimum efficiency. - * A singly-linked tail queue may only be traversed in the forward direction. - * Singly-linked tail queues are ideal for applications with large datasets - * and few or no removals or for implementing a FIFO queue. - * - * A list is headed by a single forward pointer (or an array of forward - * pointers for a hash table header). The elements are doubly linked - * so that an arbitrary element can be removed without a need to - * traverse the list. New elements can be added to the list before - * or after an existing element or at the head of the list. A list - * may only be traversed in the forward direction. - * - * A tail queue is headed by a pair of pointers, one to the head of the - * list and the other to the tail of the list. The elements are doubly - * linked so that an arbitrary element can be removed without a need to - * traverse the list. New elements can be added to the list before or - * after an existing element, at the head of the list, or at the end of - * the list. A tail queue may be traversed in either direction. - * - * For details on the use of these macros, see the queue(3) manual page. - * - * - * SLIST LIST STAILQ TAILQ - * _HEAD + + + + - * _HEAD_INITIALIZER + + + + - * _ENTRY + + + + - * _INIT + + + + - * _EMPTY + + + + - * _FIRST + + + + - * _NEXT + + + + - * _PREV - - - + - * _LAST - - + + - * _FOREACH + + + + - * _FOREACH_SAFE + + + + - * _FOREACH_REVERSE - - - + - * _FOREACH_REVERSE_SAFE - - - + - * _INSERT_HEAD + + + + - * _INSERT_BEFORE - + - + - * _INSERT_AFTER + + + + - * _INSERT_TAIL - - + + - * _CONCAT - - + + - * _REMOVE_AFTER + - + - - * _REMOVE_HEAD + - + - - * _REMOVE + + + + - * _SWAP + + + + - * - */ -#ifdef QUEUE_MACRO_DEBUG -/* Store the last 2 places the queue element or head was altered */ -struct qm_trace { - char * lastfile; - int lastline; - char * prevfile; - int prevline; -}; - -#define TRACEBUF struct qm_trace trace; -#define TRASHIT(x) do {(x) = (void *)-1;} while (0) -#define QMD_SAVELINK(name, link) void **name = (void *)&(link) - -#define QMD_TRACE_HEAD(head) do { \ - (head)->trace.prevline = (head)->trace.lastline; \ - (head)->trace.prevfile = (head)->trace.lastfile; \ - (head)->trace.lastline = __LINE__; \ - (head)->trace.lastfile = __FILE__; \ -} while (0) - -#define QMD_TRACE_ELEM(elem) do { \ - (elem)->trace.prevline = (elem)->trace.lastline; \ - (elem)->trace.prevfile = (elem)->trace.lastfile; \ - (elem)->trace.lastline = __LINE__; \ - (elem)->trace.lastfile = __FILE__; \ -} while (0) - -#else -#define QMD_TRACE_ELEM(elem) -#define QMD_TRACE_HEAD(head) -#define QMD_SAVELINK(name, link) -#define TRACEBUF -#define TRASHIT(x) -#endif /* QUEUE_MACRO_DEBUG */ - -/* - * Singly-linked List declarations. - */ -#define SLIST_HEAD(name, type) \ -struct name { \ - struct type *slh_first; /* first element */ \ -} - -#define SLIST_HEAD_INITIALIZER(head) \ - { NULL } - -#define SLIST_ENTRY(type) \ -struct { \ - struct type *sle_next; /* next element */ \ -} - -/* - * Singly-linked List functions. - */ -#define SLIST_EMPTY(head) ((head)->slh_first == NULL) - -#define SLIST_FIRST(head) ((head)->slh_first) - -#define SLIST_FOREACH(var, head, field) \ - for ((var) = SLIST_FIRST((head)); \ - (var); \ - (var) = SLIST_NEXT((var), field)) - -#define SLIST_FOREACH_SAFE(var, head, field, tvar) \ - for ((var) = SLIST_FIRST((head)); \ - (var) && ((tvar) = SLIST_NEXT((var), field), 1); \ - (var) = (tvar)) - -#define SLIST_FOREACH_PREVPTR(var, varp, head, field) \ - for ((varp) = &SLIST_FIRST((head)); \ - ((var) = *(varp)) != NULL; \ - (varp) = &SLIST_NEXT((var), field)) - -#define SLIST_INIT(head) do { \ - SLIST_FIRST((head)) = NULL; \ -} while (0) - -#define SLIST_INSERT_AFTER(slistelm, elm, field) do { \ - SLIST_NEXT((elm), field) = SLIST_NEXT((slistelm), field); \ - SLIST_NEXT((slistelm), field) = (elm); \ -} while (0) - -#define SLIST_INSERT_HEAD(head, elm, field) do { \ - SLIST_NEXT((elm), field) = SLIST_FIRST((head)); \ - SLIST_FIRST((head)) = (elm); \ -} while (0) - -#define SLIST_NEXT(elm, field) ((elm)->field.sle_next) - -#define SLIST_REMOVE(head, elm, type, field) do { \ - QMD_SAVELINK(oldnext, (elm)->field.sle_next); \ - if (SLIST_FIRST((head)) == (elm)) { \ - SLIST_REMOVE_HEAD((head), field); \ - } \ - else { \ - struct type *curelm = SLIST_FIRST((head)); \ - while (SLIST_NEXT(curelm, field) != (elm)) \ - curelm = SLIST_NEXT(curelm, field); \ - SLIST_REMOVE_AFTER(curelm, field); \ - } \ - TRASHIT(*oldnext); \ -} while (0) - -#define SLIST_REMOVE_AFTER(elm, field) do { \ - SLIST_NEXT(elm, field) = \ - SLIST_NEXT(SLIST_NEXT(elm, field), field); \ -} while (0) - -#define SLIST_REMOVE_HEAD(head, field) do { \ - SLIST_FIRST((head)) = SLIST_NEXT(SLIST_FIRST((head)), field); \ -} while (0) - -#define SLIST_SWAP(head1, head2, type) do { \ - struct type *swap_first = SLIST_FIRST(head1); \ - SLIST_FIRST(head1) = SLIST_FIRST(head2); \ - SLIST_FIRST(head2) = swap_first; \ -} while (0) - -/* - * Singly-linked Tail queue declarations. - */ -#define STAILQ_HEAD(name, type) \ -struct name { \ - struct type *stqh_first;/* first element */ \ - struct type **stqh_last;/* addr of last next element */ \ -} - -#define STAILQ_HEAD_INITIALIZER(head) \ - { NULL, &(head).stqh_first } - -#define STAILQ_ENTRY(type) \ -struct { \ - struct type *stqe_next; /* next element */ \ -} - -/* - * Singly-linked Tail queue functions. - */ -#define STAILQ_CONCAT(head1, head2) do { \ - if (!STAILQ_EMPTY((head2))) { \ - *(head1)->stqh_last = (head2)->stqh_first; \ - (head1)->stqh_last = (head2)->stqh_last; \ - STAILQ_INIT((head2)); \ - } \ -} while (0) - -#define STAILQ_EMPTY(head) ((head)->stqh_first == NULL) - -#define STAILQ_FIRST(head) ((head)->stqh_first) - -#define STAILQ_FOREACH(var, head, field) \ - for((var) = STAILQ_FIRST((head)); \ - (var); \ - (var) = STAILQ_NEXT((var), field)) - - -#define STAILQ_FOREACH_SAFE(var, head, field, tvar) \ - for ((var) = STAILQ_FIRST((head)); \ - (var) && ((tvar) = STAILQ_NEXT((var), field), 1); \ - (var) = (tvar)) - -#define STAILQ_INIT(head) do { \ - STAILQ_FIRST((head)) = NULL; \ - (head)->stqh_last = &STAILQ_FIRST((head)); \ -} while (0) - -#define STAILQ_INSERT_AFTER(head, tqelm, elm, field) do { \ - if ((STAILQ_NEXT((elm), field) = STAILQ_NEXT((tqelm), field)) == NULL)\ - (head)->stqh_last = &STAILQ_NEXT((elm), field); \ - STAILQ_NEXT((tqelm), field) = (elm); \ -} while (0) - -#define STAILQ_INSERT_HEAD(head, elm, field) do { \ - if ((STAILQ_NEXT((elm), field) = STAILQ_FIRST((head))) == NULL) \ - (head)->stqh_last = &STAILQ_NEXT((elm), field); \ - STAILQ_FIRST((head)) = (elm); \ -} while (0) - -#define STAILQ_INSERT_TAIL(head, elm, field) do { \ - STAILQ_NEXT((elm), field) = NULL; \ - *(head)->stqh_last = (elm); \ - (head)->stqh_last = &STAILQ_NEXT((elm), field); \ -} while (0) - -#define STAILQ_LAST(head, type, field) \ - (STAILQ_EMPTY((head)) ? \ - NULL : \ - ((struct type *)(void *) \ - ((char *)((head)->stqh_last) - __offsetof(struct type, field)))) - -#define STAILQ_NEXT(elm, field) ((elm)->field.stqe_next) - -#define STAILQ_REMOVE(head, elm, type, field) do { \ - QMD_SAVELINK(oldnext, (elm)->field.stqe_next); \ - if (STAILQ_FIRST((head)) == (elm)) { \ - STAILQ_REMOVE_HEAD((head), field); \ - } \ - else { \ - struct type *curelm = STAILQ_FIRST((head)); \ - while (STAILQ_NEXT(curelm, field) != (elm)) \ - curelm = STAILQ_NEXT(curelm, field); \ - STAILQ_REMOVE_AFTER(head, curelm, field); \ - } \ - TRASHIT(*oldnext); \ -} while (0) - -#define STAILQ_REMOVE_AFTER(head, elm, field) do { \ - if ((STAILQ_NEXT(elm, field) = \ - STAILQ_NEXT(STAILQ_NEXT(elm, field), field)) == NULL) \ - (head)->stqh_last = &STAILQ_NEXT((elm), field); \ -} while (0) - -#define STAILQ_REMOVE_HEAD(head, field) do { \ - if ((STAILQ_FIRST((head)) = \ - STAILQ_NEXT(STAILQ_FIRST((head)), field)) == NULL) \ - (head)->stqh_last = &STAILQ_FIRST((head)); \ -} while (0) - -#define STAILQ_SWAP(head1, head2, type) do { \ - struct type *swap_first = STAILQ_FIRST(head1); \ - struct type **swap_last = (head1)->stqh_last; \ - STAILQ_FIRST(head1) = STAILQ_FIRST(head2); \ - (head1)->stqh_last = (head2)->stqh_last; \ - STAILQ_FIRST(head2) = swap_first; \ - (head2)->stqh_last = swap_last; \ - if (STAILQ_EMPTY(head1)) \ - (head1)->stqh_last = &STAILQ_FIRST(head1); \ - if (STAILQ_EMPTY(head2)) \ - (head2)->stqh_last = &STAILQ_FIRST(head2); \ -} while (0) - - -/* - * List declarations. - */ -#define LIST_HEAD(name, type) \ -struct name { \ - struct type *lh_first; /* first element */ \ -} - -#define LIST_HEAD_INITIALIZER(head) \ - { NULL } - -#define LIST_ENTRY(type) \ -struct { \ - struct type *le_next; /* next element */ \ - struct type **le_prev; /* address of previous next element */ \ -} - -/* - * List functions. - */ - -#if (defined(_KERNEL) && defined(INVARIANTS)) -#define QMD_LIST_CHECK_HEAD(head, field) do { \ - if (LIST_FIRST((head)) != NULL && \ - LIST_FIRST((head))->field.le_prev != \ - &LIST_FIRST((head))) \ - panic("Bad list head %p first->prev != head", (head)); \ -} while (0) - -#define QMD_LIST_CHECK_NEXT(elm, field) do { \ - if (LIST_NEXT((elm), field) != NULL && \ - LIST_NEXT((elm), field)->field.le_prev != \ - &((elm)->field.le_next)) \ - panic("Bad link elm %p next->prev != elm", (elm)); \ -} while (0) - -#define QMD_LIST_CHECK_PREV(elm, field) do { \ - if (*(elm)->field.le_prev != (elm)) \ - panic("Bad link elm %p prev->next != elm", (elm)); \ -} while (0) -#else -#define QMD_LIST_CHECK_HEAD(head, field) -#define QMD_LIST_CHECK_NEXT(elm, field) -#define QMD_LIST_CHECK_PREV(elm, field) -#endif /* (_KERNEL && INVARIANTS) */ - -#define LIST_EMPTY(head) ((head)->lh_first == NULL) - -#define LIST_FIRST(head) ((head)->lh_first) - -#define LIST_FOREACH(var, head, field) \ - for ((var) = LIST_FIRST((head)); \ - (var); \ - (var) = LIST_NEXT((var), field)) - -#define LIST_FOREACH_SAFE(var, head, field, tvar) \ - for ((var) = LIST_FIRST((head)); \ - (var) && ((tvar) = LIST_NEXT((var), field), 1); \ - (var) = (tvar)) - -#define LIST_INIT(head) do { \ - LIST_FIRST((head)) = NULL; \ -} while (0) - -#define LIST_INSERT_AFTER(listelm, elm, field) do { \ - QMD_LIST_CHECK_NEXT(listelm, field); \ - if ((LIST_NEXT((elm), field) = LIST_NEXT((listelm), field)) != NULL)\ - LIST_NEXT((listelm), field)->field.le_prev = \ - &LIST_NEXT((elm), field); \ - LIST_NEXT((listelm), field) = (elm); \ - (elm)->field.le_prev = &LIST_NEXT((listelm), field); \ -} while (0) - -#define LIST_INSERT_BEFORE(listelm, elm, field) do { \ - QMD_LIST_CHECK_PREV(listelm, field); \ - (elm)->field.le_prev = (listelm)->field.le_prev; \ - LIST_NEXT((elm), field) = (listelm); \ - *(listelm)->field.le_prev = (elm); \ - (listelm)->field.le_prev = &LIST_NEXT((elm), field); \ -} while (0) - -#define LIST_INSERT_HEAD(head, elm, field) do { \ - QMD_LIST_CHECK_HEAD((head), field); \ - if ((LIST_NEXT((elm), field) = LIST_FIRST((head))) != NULL) \ - LIST_FIRST((head))->field.le_prev = &LIST_NEXT((elm), field);\ - LIST_FIRST((head)) = (elm); \ - (elm)->field.le_prev = &LIST_FIRST((head)); \ -} while (0) - -#define LIST_NEXT(elm, field) ((elm)->field.le_next) - -#define LIST_REMOVE(elm, field) do { \ - QMD_SAVELINK(oldnext, (elm)->field.le_next); \ - QMD_SAVELINK(oldprev, (elm)->field.le_prev); \ - QMD_LIST_CHECK_NEXT(elm, field); \ - QMD_LIST_CHECK_PREV(elm, field); \ - if (LIST_NEXT((elm), field) != NULL) \ - LIST_NEXT((elm), field)->field.le_prev = \ - (elm)->field.le_prev; \ - *(elm)->field.le_prev = LIST_NEXT((elm), field); \ - TRASHIT(*oldnext); \ - TRASHIT(*oldprev); \ -} while (0) - -#define LIST_SWAP(head1, head2, type, field) do { \ - struct type *swap_tmp = LIST_FIRST((head1)); \ - LIST_FIRST((head1)) = LIST_FIRST((head2)); \ - LIST_FIRST((head2)) = swap_tmp; \ - if ((swap_tmp = LIST_FIRST((head1))) != NULL) \ - swap_tmp->field.le_prev = &LIST_FIRST((head1)); \ - if ((swap_tmp = LIST_FIRST((head2))) != NULL) \ - swap_tmp->field.le_prev = &LIST_FIRST((head2)); \ -} while (0) - -/* - * Tail queue declarations. - */ -#define TAILQ_HEAD(name, type) \ -struct name { \ - struct type *tqh_first; /* first element */ \ - struct type **tqh_last; /* addr of last next element */ \ - TRACEBUF \ -} - -#define TAILQ_HEAD_INITIALIZER(head) \ - { NULL, &(head).tqh_first } - -#define TAILQ_ENTRY(type) \ -struct { \ - struct type *tqe_next; /* next element */ \ - struct type **tqe_prev; /* address of previous next element */ \ - TRACEBUF \ -} - -/* - * Tail queue functions. - */ -#if (defined(_KERNEL) && defined(INVARIANTS)) -#define QMD_TAILQ_CHECK_HEAD(head, field) do { \ - if (!TAILQ_EMPTY(head) && \ - TAILQ_FIRST((head))->field.tqe_prev != \ - &TAILQ_FIRST((head))) \ - panic("Bad tailq head %p first->prev != head", (head)); \ -} while (0) - -#define QMD_TAILQ_CHECK_TAIL(head, field) do { \ - if (*(head)->tqh_last != NULL) \ - panic("Bad tailq NEXT(%p->tqh_last) != NULL", (head)); \ -} while (0) - -#define QMD_TAILQ_CHECK_NEXT(elm, field) do { \ - if (TAILQ_NEXT((elm), field) != NULL && \ - TAILQ_NEXT((elm), field)->field.tqe_prev != \ - &((elm)->field.tqe_next)) \ - panic("Bad link elm %p next->prev != elm", (elm)); \ -} while (0) - -#define QMD_TAILQ_CHECK_PREV(elm, field) do { \ - if (*(elm)->field.tqe_prev != (elm)) \ - panic("Bad link elm %p prev->next != elm", (elm)); \ -} while (0) -#else -#define QMD_TAILQ_CHECK_HEAD(head, field) -#define QMD_TAILQ_CHECK_TAIL(head, headname) -#define QMD_TAILQ_CHECK_NEXT(elm, field) -#define QMD_TAILQ_CHECK_PREV(elm, field) -#endif /* (_KERNEL && INVARIANTS) */ - -#define TAILQ_CONCAT(head1, head2, field) do { \ - if (!TAILQ_EMPTY(head2)) { \ - *(head1)->tqh_last = (head2)->tqh_first; \ - (head2)->tqh_first->field.tqe_prev = (head1)->tqh_last; \ - (head1)->tqh_last = (head2)->tqh_last; \ - TAILQ_INIT((head2)); \ - QMD_TRACE_HEAD(head1); \ - QMD_TRACE_HEAD(head2); \ - } \ -} while (0) - -#define TAILQ_EMPTY(head) ((head)->tqh_first == NULL) - -#define TAILQ_FIRST(head) ((head)->tqh_first) - -#define TAILQ_FOREACH(var, head, field) \ - for ((var) = TAILQ_FIRST((head)); \ - (var); \ - (var) = TAILQ_NEXT((var), field)) - -#define TAILQ_FOREACH_SAFE(var, head, field, tvar) \ - for ((var) = TAILQ_FIRST((head)); \ - (var) && ((tvar) = TAILQ_NEXT((var), field), 1); \ - (var) = (tvar)) - -#define TAILQ_FOREACH_REVERSE(var, head, headname, field) \ - for ((var) = TAILQ_LAST((head), headname); \ - (var); \ - (var) = TAILQ_PREV((var), headname, field)) - -#define TAILQ_FOREACH_REVERSE_SAFE(var, head, headname, field, tvar) \ - for ((var) = TAILQ_LAST((head), headname); \ - (var) && ((tvar) = TAILQ_PREV((var), headname, field), 1); \ - (var) = (tvar)) - -#define TAILQ_INIT(head) do { \ - TAILQ_FIRST((head)) = NULL; \ - (head)->tqh_last = &TAILQ_FIRST((head)); \ - QMD_TRACE_HEAD(head); \ -} while (0) - -#define TAILQ_INSERT_AFTER(head, listelm, elm, field) do { \ - QMD_TAILQ_CHECK_NEXT(listelm, field); \ - if ((TAILQ_NEXT((elm), field) = TAILQ_NEXT((listelm), field)) != NULL)\ - TAILQ_NEXT((elm), field)->field.tqe_prev = \ - &TAILQ_NEXT((elm), field); \ - else { \ - (head)->tqh_last = &TAILQ_NEXT((elm), field); \ - QMD_TRACE_HEAD(head); \ - } \ - TAILQ_NEXT((listelm), field) = (elm); \ - (elm)->field.tqe_prev = &TAILQ_NEXT((listelm), field); \ - QMD_TRACE_ELEM(&(elm)->field); \ - QMD_TRACE_ELEM(&listelm->field); \ -} while (0) - -#define TAILQ_INSERT_BEFORE(listelm, elm, field) do { \ - QMD_TAILQ_CHECK_PREV(listelm, field); \ - (elm)->field.tqe_prev = (listelm)->field.tqe_prev; \ - TAILQ_NEXT((elm), field) = (listelm); \ - *(listelm)->field.tqe_prev = (elm); \ - (listelm)->field.tqe_prev = &TAILQ_NEXT((elm), field); \ - QMD_TRACE_ELEM(&(elm)->field); \ - QMD_TRACE_ELEM(&listelm->field); \ -} while (0) - -#define TAILQ_INSERT_HEAD(head, elm, field) do { \ - QMD_TAILQ_CHECK_HEAD(head, field); \ - if ((TAILQ_NEXT((elm), field) = TAILQ_FIRST((head))) != NULL) \ - TAILQ_FIRST((head))->field.tqe_prev = \ - &TAILQ_NEXT((elm), field); \ - else \ - (head)->tqh_last = &TAILQ_NEXT((elm), field); \ - TAILQ_FIRST((head)) = (elm); \ - (elm)->field.tqe_prev = &TAILQ_FIRST((head)); \ - QMD_TRACE_HEAD(head); \ - QMD_TRACE_ELEM(&(elm)->field); \ -} while (0) - -#define TAILQ_INSERT_TAIL(head, elm, field) do { \ - QMD_TAILQ_CHECK_TAIL(head, field); \ - TAILQ_NEXT((elm), field) = NULL; \ - (elm)->field.tqe_prev = (head)->tqh_last; \ - *(head)->tqh_last = (elm); \ - (head)->tqh_last = &TAILQ_NEXT((elm), field); \ - QMD_TRACE_HEAD(head); \ - QMD_TRACE_ELEM(&(elm)->field); \ -} while (0) - -#define TAILQ_LAST(head, headname) \ - (*(((struct headname *)((head)->tqh_last))->tqh_last)) - -#define TAILQ_NEXT(elm, field) ((elm)->field.tqe_next) - -#define TAILQ_PREV(elm, headname, field) \ - (*(((struct headname *)((elm)->field.tqe_prev))->tqh_last)) - -#define TAILQ_REMOVE(head, elm, field) do { \ - QMD_SAVELINK(oldnext, (elm)->field.tqe_next); \ - QMD_SAVELINK(oldprev, (elm)->field.tqe_prev); \ - QMD_TAILQ_CHECK_NEXT(elm, field); \ - QMD_TAILQ_CHECK_PREV(elm, field); \ - if ((TAILQ_NEXT((elm), field)) != NULL) \ - TAILQ_NEXT((elm), field)->field.tqe_prev = \ - (elm)->field.tqe_prev; \ - else { \ - (head)->tqh_last = (elm)->field.tqe_prev; \ - QMD_TRACE_HEAD(head); \ - } \ - *(elm)->field.tqe_prev = TAILQ_NEXT((elm), field); \ - TRASHIT(*oldnext); \ - TRASHIT(*oldprev); \ - QMD_TRACE_ELEM(&(elm)->field); \ -} while (0) - -#define TAILQ_SWAP(head1, head2, type, field) do { \ - struct type *swap_first = (head1)->tqh_first; \ - struct type **swap_last = (head1)->tqh_last; \ - (head1)->tqh_first = (head2)->tqh_first; \ - (head1)->tqh_last = (head2)->tqh_last; \ - (head2)->tqh_first = swap_first; \ - (head2)->tqh_last = swap_last; \ - if ((swap_first = (head1)->tqh_first) != NULL) \ - swap_first->field.tqe_prev = &(head1)->tqh_first; \ - else \ - (head1)->tqh_last = &(head1)->tqh_first; \ - if ((swap_first = (head2)->tqh_first) != NULL) \ - swap_first->field.tqe_prev = &(head2)->tqh_first; \ - else \ - (head2)->tqh_last = &(head2)->tqh_first; \ -} while (0) - -#endif /* !_SYS_QUEUE_H_ */ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:57:22 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:57: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 1RtR8E-0007Ku-MO; Fri, 03 Feb 2012 21:57:22 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8C-0007Jn-GO for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:21 +0000 Received: from [193.109.254.147:46791] by server-4.bemta-14.messagelabs.com id E3/1D-04726-F385C2F4; Fri, 03 Feb 2012 21:57:19 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-27.messagelabs.com!1328306183!51337678!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG, UPPERCASE_25_50 X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16419 invoked from network); 3 Feb 2012 21:56:24 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 3 Feb 2012 21:56:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR84-0001m8-DV for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR7z-0002id-LS for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:11 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:57:03 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] mini-os: use BSD sys/queue.h instead of Linux list.h X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1328025974 0 # Node ID 934c14ab9f19330c91e2769beb96ac6896b2a1c8 # Parent 6c9a7381777031600ef3442a578d0fa3ce1491b2 mini-os: use BSD sys/queue.h instead of Linux list.h The latter is GPL which makes the whole of mini-os GPL rather than BSD as intended. In tree users are all GPL or GPL-compatible but we should fix this so that mini-os is BSD. Do so by using the same BSD sys/queue.h as we use in libxl. Tested with the builtin mini-os test app and qemu stubdomain, both of which appear to still function as expected. Move tools/libxl/external and the associated sed script to tools/include/xen-external to allow more sensible access from mini-os. Also add s/NULL/0/ in the sed script due to NULL not always being defined in stubdom code when mini-os/wait.h is included. As well as the obvious ABI changes there are a few API updates associated with the change: - struct rw_semaphore.wait_list is unused - remove_waiter needs to take the wait_queue_head The latter requires a qemu update, so there is also a QEMU_TAG update in this changeset. I sprinkled some extra-emacs local variables around the files I edited which didn't have them. I think this should be backported to the stable branches since external users of mini-os may have been mislead into thinking they could safely link mini-os against GPL-incompatible code. Signed-off-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 6c9a73817770 -r 934c14ab9f19 .hgignore --- a/.hgignore Tue Jan 31 11:39:37 2012 +0000 +++ b/.hgignore Tue Jan 31 16:06:14 2012 +0000 @@ -62,6 +62,7 @@ ^docs/xen-api/xenapi-datamodel-graph.eps$ ^docs/xen-api/xenapi.out$ ^extras/mini-os/arch/ia64/gen_off.s$ +^extras/mini-os/include/list\.h$ ^extras/mini-os/include/mini-os$ ^extras/mini-os/include/ia64/mini-os$ ^extras/mini-os/include/ia64/offsets.h$ diff -r 6c9a73817770 -r 934c14ab9f19 Config.mk --- a/Config.mk Tue Jan 31 11:39:37 2012 +0000 +++ b/Config.mk Tue Jan 31 16:06:14 2012 +0000 @@ -222,9 +222,9 @@ # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= bb36d632e4cabf47882adff07a45c6702c4a5b30 -# Thu Jan 5 17:16:46 2012 +0000 -# qemu-xen: adjust MSI-X related log messages +QEMU_TAG ?= de05447400930da4be216e4fb0fe52b8be81490e +# Tue Jan 31 15:42:38 2012 +0000 +# block-vbd: update to new mini-os wait queue API (new linked list API) # Short answer -- do not enable this unless you know what you are # doing and are prepared for some pain. diff -r 6c9a73817770 -r 934c14ab9f19 extras/mini-os/Makefile --- a/extras/mini-os/Makefile Tue Jan 31 11:39:37 2012 +0000 +++ b/extras/mini-os/Makefile Tue Jan 31 16:06:14 2012 +0000 @@ -52,8 +52,12 @@ $(arch_links) endif +include/list.h: $(XEN_ROOT)/tools/include/xen-external/bsd-sys-queue-h-seddery $(XEN_ROOT)/tools/include/xen-external/bsd-sys-queue.h + perl $^ --prefix=minios >$@.new + $(call move-if-changed,$@.new,$@) + .PHONY: links -links: $(ARCH_LINKS) +links: include/list.h $(ARCH_LINKS) [ -e include/xen ] || ln -sf ../../../xen/include/public include/xen [ -e include/mini-os ] || ln -sf . include/mini-os [ -e include/$(TARGET_ARCH_FAM)/mini-os ] || ln -sf . include/$(TARGET_ARCH_FAM)/mini-os @@ -97,7 +101,7 @@ APP_O=$(OBJ_DIR)/$(TARGET)_app.o endif -$(OBJ_DIR)/$(TARGET): links $(OBJS) $(APP_O) arch_lib +$(OBJ_DIR)/$(TARGET): links include/list.h $(OBJS) $(APP_O) arch_lib $(LD) -r $(LDFLAGS) $(HEAD_OBJ) $(APP_O) $(OBJS) $(LDARCHLIB) $(LDLIBS) -o $@.o $(OBJCOPY) -w -G $(GLOBAL_PREFIX)* -G _start $@.o $@.o $(LD) $(LDFLAGS) $(LDFLAGS_FINAL) $@.o $(EXTRA_OBJS) -o $@ @@ -112,6 +116,7 @@ for dir in $(addprefix $(OBJ_DIR)/,$(SUBDIRS)); do \ rm -f $$dir/*.o; \ done + rm -f include/list.h rm -f $(OBJ_DIR)/*.o *~ $(OBJ_DIR)/core $(OBJ_DIR)/$(TARGET).elf $(OBJ_DIR)/$(TARGET).raw $(OBJ_DIR)/$(TARGET) $(OBJ_DIR)/$(TARGET).gz find . $(OBJ_DIR) -type l | xargs rm -f $(RM) $(OBJ_DIR)/lwip.a $(LWO) diff -r 6c9a73817770 -r 934c14ab9f19 extras/mini-os/blkfront.c --- a/extras/mini-os/blkfront.c Tue Jan 31 11:39:37 2012 +0000 +++ b/extras/mini-os/blkfront.c Tue Jan 31 16:06:14 2012 +0000 @@ -323,7 +323,7 @@ schedule(); local_irq_save(flags); } - remove_waiter(w); + remove_waiter(w, blkfront_queue); local_irq_restore(flags); } } @@ -414,7 +414,7 @@ schedule(); local_irq_save(flags); } - remove_waiter(w); + remove_waiter(w, blkfront_queue); local_irq_restore(flags); } @@ -470,7 +470,7 @@ schedule(); local_irq_save(flags); } - remove_waiter(w); + remove_waiter(w, blkfront_queue); local_irq_restore(flags); } diff -r 6c9a73817770 -r 934c14ab9f19 extras/mini-os/fbfront.c --- a/extras/mini-os/fbfront.c Tue Jan 31 11:39:37 2012 +0000 +++ b/extras/mini-os/fbfront.c Tue Jan 31 16:06:14 2012 +0000 @@ -569,7 +569,7 @@ add_waiter(w, fbfront_queue); while (page->out_prod - page->out_cons == XENFB_OUT_RING_LEN) schedule(); - remove_waiter(w); + remove_waiter(w, fbfront_queue); prod = page->out_prod; mb(); /* ensure ring space available */ diff -r 6c9a73817770 -r 934c14ab9f19 extras/mini-os/include/list.h --- a/extras/mini-os/include/list.h Tue Jan 31 11:39:37 2012 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,190 +0,0 @@ -#ifndef _LINUX_LIST_H -#define _LINUX_LIST_H - -/* - * Simple doubly linked list implementation. - * - * Some of the internal functions ("__xxx") are useful when - * manipulating whole lists rather than single entries, as - * sometimes we already know the next/prev entries and we can - * generate better code by using them directly rather than - * using the generic single-entry routines. - */ - -struct minios_list_head { - struct minios_list_head *next, *prev; -}; - -#define MINIOS_LIST_HEAD_INIT(name) { &(name), &(name) } - -#define MINIOS_LIST_HEAD(name) \ - struct minios_list_head name = MINIOS_LIST_HEAD_INIT(name) - -#define MINIOS_INIT_LIST_HEAD(ptr) do { \ - (ptr)->next = (ptr); (ptr)->prev = (ptr); \ -} while (0) - -#define minios_list_top(head, type, member) \ -({ \ - struct minios_list_head *_head = (head); \ - minios_list_empty(_head) ? NULL : minios_list_entry(_head->next, type, member); \ -}) - -/* - * Insert a new entry between two known consecutive entries. - * - * This is only for internal list manipulation where we know - * the prev/next entries already! - */ -static __inline__ void __minios_list_add(struct minios_list_head * new, - struct minios_list_head * prev, - struct minios_list_head * next) -{ - next->prev = new; - new->next = next; - new->prev = prev; - prev->next = new; -} - -/** - * minios_list_add - add a new entry - * @new: new entry to be added - * @head: list head to add it after - * - * Insert a new entry after the specified head. - * This is good for implementing stacks. - */ -static __inline__ void minios_list_add(struct minios_list_head *new, struct minios_list_head *head) -{ - __minios_list_add(new, head, head->next); -} - -/** - * minios_list_add_tail - add a new entry - * @new: new entry to be added - * @head: list head to add it before - * - * Insert a new entry before the specified head. - * This is useful for implementing queues. - */ -static __inline__ void minios_list_add_tail(struct minios_list_head *new, struct minios_list_head *head) -{ - __minios_list_add(new, head->prev, head); -} - -/* - * Delete a list entry by making the prev/next entries - * point to each other. - * - * This is only for internal list manipulation where we know - * the prev/next entries already! - */ -static __inline__ void __minios_list_del(struct minios_list_head * prev, - struct minios_list_head * next) -{ - next->prev = prev; - prev->next = next; -} - -/** - * minios_list_del - deletes entry from list. - * @entry: the element to delete from the list. - * Note: minios_list_empty on entry does not return true after this, the entry is in an undefined state. - */ -static __inline__ void minios_list_del(struct minios_list_head *entry) -{ - __minios_list_del(entry->prev, entry->next); -} - -/** - * minios_list_del_init - deletes entry from list and reinitialize it. - * @entry: the element to delete from the list. - */ -static __inline__ void minios_list_del_init(struct minios_list_head *entry) -{ - __minios_list_del(entry->prev, entry->next); - MINIOS_INIT_LIST_HEAD(entry); -} - -/** - * minios_list_empty - tests whether a list is empty - * @head: the list to test. - */ -static __inline__ int minios_list_empty(struct minios_list_head *head) -{ - return head->next == head; -} - -/** - * minios_list_splice - join two lists - * @list: the new list to add. - * @head: the place to add it in the first list. - */ -static __inline__ void minios_list_splice(struct minios_list_head *list, struct minios_list_head *head) -{ - struct minios_list_head *first = list->next; - - if (first != list) { - struct minios_list_head *last = list->prev; - struct minios_list_head *at = head->next; - - first->prev = head; - head->next = first; - - last->next = at; - at->prev = last; - } -} - -/** - * minios_list_entry - get the struct for this entry - * @ptr: the &struct minios_list_head pointer. - * @type: the type of the struct this is embedded in. - * @member: the name of the minios_list_struct within the struct. - */ -#define minios_list_entry(ptr, type, member) \ - ((type *)((char *)(ptr)-(unsigned long)(&((type *)0)->member))) - -/** - * minios_list_for_each - iterate over a list - * @pos: the &struct minios_list_head to use as a loop counter. - * @head: the head for your list. - */ -#define minios_list_for_each(pos, head) \ - for (pos = (head)->next; pos != (head); pos = pos->next) - -/** - * minios_list_for_each_safe - iterate over a list safe against removal of list entry - * @pos: the &struct minios_list_head to use as a loop counter. - * @n: another &struct minios_list_head to use as temporary storage - * @head: the head for your list. - */ -#define minios_list_for_each_safe(pos, n, head) \ - for (pos = (head)->next, n = pos->next; pos != (head); \ - pos = n, n = pos->next) - -/** - * minios_list_for_each_entry - iterate over list of given type - * @pos: the type * to use as a loop counter. - * @head: the head for your list. - * @member: the name of the minios_list_struct within the struct. - */ -#define minios_list_for_each_entry(pos, head, member) \ - for (pos = minios_list_entry((head)->next, typeof(*pos), member); \ - &pos->member != (head); \ - pos = minios_list_entry(pos->member.next, typeof(*pos), member)) - -/** - * minios_list_for_each_entry_safe - iterate over list of given type safe against removal of list entry - * @pos: the type * to use as a loop counter. - * @n: another type * to use as temporary storage - * @head: the head for your list. - * @member: the name of the minios_list_struct within the struct. - */ -#define minios_list_for_each_entry_safe(pos, n, head, member) \ - for (pos = minios_list_entry((head)->next, typeof(*pos), member), \ - n = minios_list_entry(pos->member.next, typeof(*pos), member); \ - &pos->member != (head); \ - pos = n, n = minios_list_entry(n->member.next, typeof(*n), member)) -#endif /* _LINUX_LIST_H */ - diff -r 6c9a73817770 -r 934c14ab9f19 extras/mini-os/include/sched.h --- a/extras/mini-os/include/sched.h Tue Jan 31 11:39:37 2012 +0000 +++ b/extras/mini-os/include/sched.h Tue Jan 31 16:06:14 2012 +0000 @@ -19,7 +19,7 @@ #else /* !defined(__ia64__) */ thread_regs_t regs; #endif /* !defined(__ia64__) */ - struct minios_list_head thread_list; + MINIOS_TAILQ_ENTRY(struct thread) thread_list; uint32_t flags; s_time_t wakeup_time; #ifdef HAVE_LIBC diff -r 6c9a73817770 -r 934c14ab9f19 extras/mini-os/include/semaphore.h --- a/extras/mini-os/include/semaphore.h Tue Jan 31 11:39:37 2012 +0000 +++ b/extras/mini-os/include/semaphore.h Tue Jan 31 16:06:14 2012 +0000 @@ -21,7 +21,6 @@ struct rw_semaphore { signed long count; spinlock_t wait_lock; - struct minios_list_head wait_list; int debug; }; diff -r 6c9a73817770 -r 934c14ab9f19 extras/mini-os/include/wait.h --- a/extras/mini-os/include/wait.h Tue Jan 31 11:39:37 2012 +0000 +++ b/extras/mini-os/include/wait.h Tue Jan 31 16:06:14 2012 +0000 @@ -5,47 +5,47 @@ #include #include -#define DEFINE_WAIT(name) \ -struct wait_queue name = { \ - .thread = get_current(), \ - .thread_list = MINIOS_LIST_HEAD_INIT((name).thread_list), \ +#define DEFINE_WAIT(name) \ +struct wait_queue name = { \ + .thread = get_current(), \ + .waiting = 0, \ } static inline void init_waitqueue_head(struct wait_queue_head *h) { - MINIOS_INIT_LIST_HEAD(&h->thread_list); + MINIOS_STAILQ_INIT(h); } static inline void init_waitqueue_entry(struct wait_queue *q, struct thread *thread) { q->thread = thread; - MINIOS_INIT_LIST_HEAD(&q->thread_list); + q->waiting = 0; } - static inline void add_wait_queue(struct wait_queue_head *h, struct wait_queue *q) { - if (minios_list_empty(&q->thread_list)) - minios_list_add(&q->thread_list, &h->thread_list); + if (!q->waiting) { + MINIOS_STAILQ_INSERT_HEAD(h, q, thread_list); + q->waiting = 1; + } } -static inline void remove_wait_queue(struct wait_queue *q) +static inline void remove_wait_queue(struct wait_queue_head *h, struct wait_queue *q) { - minios_list_del(&q->thread_list); + if (q->waiting) { + MINIOS_STAILQ_REMOVE(h, q, struct wait_queue, thread_list); + q->waiting = 0; + } } static inline void wake_up(struct wait_queue_head *head) { unsigned long flags; - struct minios_list_head *tmp, *next; + struct wait_queue *curr, *tmp; local_irq_save(flags); - minios_list_for_each_safe(tmp, next, &head->thread_list) - { - struct wait_queue *curr; - curr = minios_list_entry(tmp, struct wait_queue, thread_list); + MINIOS_STAILQ_FOREACH_SAFE(curr, head, thread_list, tmp) wake(curr->thread); - } local_irq_restore(flags); } @@ -57,11 +57,11 @@ local_irq_restore(flags); \ } while (0) -#define remove_waiter(w) do { \ - unsigned long flags; \ - local_irq_save(flags); \ - remove_wait_queue(&w); \ - local_irq_restore(flags); \ +#define remove_waiter(w, wq) do { \ + unsigned long flags; \ + local_irq_save(flags); \ + remove_wait_queue(&wq, &w); \ + local_irq_restore(flags); \ } while (0) #define wait_event_deadline(wq, condition, deadline) do { \ @@ -84,7 +84,7 @@ local_irq_save(flags); \ /* need to wake up */ \ wake(get_current()); \ - remove_wait_queue(&__wait); \ + remove_wait_queue(&wq, &__wait); \ local_irq_restore(flags); \ } while(0) @@ -93,3 +93,13 @@ #endif /* __WAIT_H__ */ + +/* + * Local variables: + * mode: C + * c-set-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff -r 6c9a73817770 -r 934c14ab9f19 extras/mini-os/include/waittypes.h --- a/extras/mini-os/include/waittypes.h Tue Jan 31 11:39:37 2012 +0000 +++ b/extras/mini-os/include/waittypes.h Tue Jan 31 16:06:14 2012 +0000 @@ -6,21 +6,27 @@ struct thread; struct wait_queue { + int waiting; struct thread *thread; - struct minios_list_head thread_list; + MINIOS_STAILQ_ENTRY(struct wait_queue) thread_list; }; -struct wait_queue_head -{ - /* TODO - lock required? */ - struct minios_list_head thread_list; -}; +/* TODO - lock required? */ +MINIOS_STAILQ_HEAD(wait_queue_head, struct wait_queue); #define DECLARE_WAIT_QUEUE_HEAD(name) \ - struct wait_queue_head name = \ - { .thread_list = { &(name).thread_list, &(name).thread_list} } + struct wait_queue_head name = MINIOS_STAILQ_HEAD_INITIALIZER(name) -#define __WAIT_QUEUE_HEAD_INITIALIZER(name) { \ - .thread_list = { &(name).thread_list, &(name).thread_list } } +#define __WAIT_QUEUE_HEAD_INITIALIZER(name) MINIOS_STAILQ_HEAD_INITIALIZER(name) #endif + +/* + * Local variables: + * mode: C + * c-set-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff -r 6c9a73817770 -r 934c14ab9f19 extras/mini-os/lib/sys.c --- a/extras/mini-os/lib/sys.c Tue Jan 31 11:39:37 2012 +0000 +++ b/extras/mini-os/lib/sys.c Tue Jan 31 16:06:14 2012 +0000 @@ -234,7 +234,7 @@ break; schedule(); } - remove_waiter(w); + remove_waiter(w, console_queue); return ret; } #ifdef HAVE_LWIP @@ -705,12 +705,12 @@ fd_set myread, mywrite, myexcept; struct thread *thread = get_current(); s_time_t start = NOW(), stop; - DEFINE_WAIT(w1); - DEFINE_WAIT(w2); - DEFINE_WAIT(w3); - DEFINE_WAIT(w4); - DEFINE_WAIT(w5); - DEFINE_WAIT(w6); + DEFINE_WAIT(netfront_w); + DEFINE_WAIT(event_w); + DEFINE_WAIT(blkfront_w); + DEFINE_WAIT(xenbus_watch_w); + DEFINE_WAIT(kbdfront_w); + DEFINE_WAIT(console_w); assert(thread == main_thread); @@ -727,12 +727,12 @@ /* Tell people we're going to sleep before looking at what they are * saying, hence letting them wake us if events happen between here and * schedule() */ - add_waiter(w1, netfront_queue); - add_waiter(w2, event_queue); - add_waiter(w3, blkfront_queue); - add_waiter(w4, xenbus_watch_queue); - add_waiter(w5, kbdfront_queue); - add_waiter(w6, console_queue); + add_waiter(netfront_w, netfront_queue); + add_waiter(event_w, event_queue); + add_waiter(blkfront_w, blkfront_queue); + add_waiter(xenbus_watch_w, xenbus_watch_queue); + add_waiter(kbdfront_w, kbdfront_queue); + add_waiter(console_w, console_queue); if (readfds) myread = *readfds; @@ -814,12 +814,12 @@ ret = -1; out: - remove_waiter(w1); - remove_waiter(w2); - remove_waiter(w3); - remove_waiter(w4); - remove_waiter(w5); - remove_waiter(w6); + remove_waiter(netfront_w, netfront_queue); + remove_waiter(event_w, event_queue); + remove_waiter(blkfront_w, blkfront_queue); + remove_waiter(xenbus_watch_w, xenbus_watch_queue); + remove_waiter(kbdfront_w, kbdfront_queue); + remove_waiter(console_w, console_queue); return ret; } diff -r 6c9a73817770 -r 934c14ab9f19 extras/mini-os/lib/xmalloc.c --- a/extras/mini-os/lib/xmalloc.c Tue Jan 31 11:39:37 2012 +0000 +++ b/extras/mini-os/lib/xmalloc.c Tue Jan 31 16:06:14 2012 +0000 @@ -44,16 +44,18 @@ #include #ifndef HAVE_LIBC -static MINIOS_LIST_HEAD(freelist); /* static spinlock_t freelist_lock = SPIN_LOCK_UNLOCKED; */ struct xmalloc_hdr { /* Total including this hdr, unused padding and second hdr. */ size_t size; - struct minios_list_head freelist; + MINIOS_TAILQ_ENTRY(struct xmalloc_hdr) freelist; } __cacheline_aligned; +static MINIOS_TAILQ_HEAD(,struct xmalloc_hdr) freelist = + MINIOS_TAILQ_HEAD_INITIALIZER(freelist); + /* Unused padding data between the two hdrs. */ struct xmalloc_pad @@ -82,7 +84,7 @@ extra = (struct xmalloc_hdr *)((unsigned long)hdr + size); extra->size = leftover; /* spin_lock_irqsave(&freelist_lock, flags); */ - minios_list_add(&extra->freelist, &freelist); + MINIOS_TAILQ_INSERT_HEAD(&freelist, extra, freelist); /* spin_unlock_irqrestore(&freelist_lock, flags); */ } else @@ -91,8 +93,6 @@ } hdr->size = size; - /* Debugging aid. */ - hdr->freelist.next = hdr->freelist.prev = NULL; } static struct xmalloc_hdr *xmalloc_new_page(size_t size) @@ -128,8 +128,6 @@ return NULL; hdr->size = (1UL << (pageorder + PAGE_SHIFT)); - /* Debugging aid. */ - hdr->freelist.next = hdr->freelist.prev = NULL; ret = (char*)hdr + hdr_size; pad = (struct xmalloc_pad *) ret - 1; @@ -155,14 +153,14 @@ /* Search free list. */ /* spin_lock_irqsave(&freelist_lock, flags); */ - minios_list_for_each_entry_safe( i, tmp, &freelist, freelist ) + MINIOS_TAILQ_FOREACH_SAFE(i, &freelist, freelist, tmp) { data_begin = align_up((uintptr_t)i + hdr_size, align); if ( data_begin + size > (uintptr_t)i + i->size ) continue; - minios_list_del(&i->freelist); + MINIOS_TAILQ_REMOVE(&freelist, i, freelist); /* spin_unlock_irqrestore(&freelist_lock, flags); */ uintptr_t size_before = (data_begin - hdr_size) - (uintptr_t)i; @@ -173,7 +171,7 @@ new_i->size = i->size - size_before; i->size = size_before; /* spin_lock_irqsave(&freelist_lock, flags); */ - minios_list_add(&i->freelist, &freelist); + MINIOS_TAILQ_INSERT_HEAD(&freelist, i, freelist); /* spin_unlock_irqrestore(&freelist_lock, flags); */ i = new_i; } @@ -224,16 +222,9 @@ *(int*)0=0; } - /* Not previously freed. */ - if(hdr->freelist.next || hdr->freelist.prev) - { - printk("Should not be previously freed\n"); - *(int*)0=0; - } - /* Merge with other free block, or put in list. */ /* spin_lock_irqsave(&freelist_lock, flags); */ - minios_list_for_each_entry_safe( i, tmp, &freelist, freelist ) + MINIOS_TAILQ_FOREACH_SAFE(i, &freelist, freelist, tmp) { unsigned long _i = (unsigned long)i; unsigned long _hdr = (unsigned long)hdr; @@ -245,7 +236,7 @@ /* We follow this block? Swallow it. */ if ( (_i + i->size) == _hdr ) { - minios_list_del(&i->freelist); + MINIOS_TAILQ_REMOVE(&freelist, i, freelist); i->size += hdr->size; hdr = i; } @@ -253,7 +244,7 @@ /* We precede this block? Swallow it. */ if ( (_hdr + hdr->size) == _i ) { - minios_list_del(&i->freelist); + MINIOS_TAILQ_REMOVE(&freelist, i, freelist); hdr->size += i->size; } } @@ -270,7 +261,7 @@ } else { - minios_list_add(&hdr->freelist, &freelist); + MINIOS_TAILQ_INSERT_HEAD(&freelist, hdr, freelist); } /* spin_unlock_irqrestore(&freelist_lock, flags); */ @@ -306,3 +297,13 @@ return new; } #endif + +/* + * Local variables: + * mode: C + * c-set-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff -r 6c9a73817770 -r 934c14ab9f19 extras/mini-os/sched.c --- a/extras/mini-os/sched.c Tue Jan 31 11:39:37 2012 +0000 +++ b/extras/mini-os/sched.c Tue Jan 31 16:06:14 2012 +0000 @@ -54,19 +54,20 @@ #define DEBUG(_f, _a...) ((void)0) #endif +MINIOS_TAILQ_HEAD(thread_list, struct thread); + struct thread *idle_thread = NULL; -MINIOS_LIST_HEAD(exited_threads); +static struct thread_list exited_threads = MINIOS_TAILQ_HEAD_INITIALIZER(exited_threads); +static struct thread_list thread_list = MINIOS_TAILQ_HEAD_INITIALIZER(thread_list); static int threads_started; struct thread *main_thread; void inline print_runqueue(void) { - struct minios_list_head *it; struct thread *th; - minios_list_for_each(it, &idle_thread->thread_list) + MINIOS_TAILQ_FOREACH(th, &thread_list, thread_list) { - th = minios_list_entry(it, struct thread, thread_list); printk(" Thread \"%s\", runnable=%d\n", th->name, is_runnable(th)); } printk("\n"); @@ -74,8 +75,7 @@ void schedule(void) { - struct thread *prev, *next, *thread; - struct minios_list_head *iterator, *next_iterator; + struct thread *prev, *next, *thread, *tmp; unsigned long flags; prev = current; @@ -96,10 +96,9 @@ time when the next timeout expires, else use 10 seconds. */ s_time_t now = NOW(); s_time_t min_wakeup_time = now + SECONDS(10); - next = NULL; - minios_list_for_each_safe(iterator, next_iterator, &idle_thread->thread_list) + next = NULL; + MINIOS_TAILQ_FOREACH_SAFE(thread, &thread_list, thread_list, tmp) { - thread = minios_list_entry(iterator, struct thread, thread_list); if (!is_runnable(thread) && thread->wakeup_time != 0LL) { if (thread->wakeup_time <= now) @@ -111,8 +110,8 @@ { next = thread; /* Put this thread on the end of the list */ - minios_list_del(&thread->thread_list); - minios_list_add_tail(&thread->thread_list, &idle_thread->thread_list); + MINIOS_TAILQ_REMOVE(&thread_list, thread, thread_list); + MINIOS_TAILQ_INSERT_TAIL(&thread_list, thread, thread_list); break; } } @@ -128,12 +127,11 @@ inturrupted at the return instruction. And therefore at safe point. */ if(prev != next) switch_threads(prev, next); - minios_list_for_each_safe(iterator, next_iterator, &exited_threads) + MINIOS_TAILQ_FOREACH_SAFE(thread, &exited_threads, thread_list, tmp) { - thread = minios_list_entry(iterator, struct thread, thread_list); if(thread != prev) { - minios_list_del(&thread->thread_list); + MINIOS_TAILQ_REMOVE(&exited_threads, thread, thread_list); free_pages(thread->stack, STACK_SIZE_PAGE_ORDER); xfree(thread); } @@ -154,13 +152,7 @@ #endif set_runnable(thread); local_irq_save(flags); - if(idle_thread != NULL) { - minios_list_add_tail(&thread->thread_list, &idle_thread->thread_list); - } else if(function != idle_thread_fn) - { - printk("BUG: Not allowed to create thread before initialising scheduler.\n"); - BUG(); - } + MINIOS_TAILQ_INSERT_TAIL(&thread_list, thread, thread_list); local_irq_restore(flags); return thread; } @@ -208,10 +200,10 @@ printk("Thread \"%s\" exited.\n", thread->name); local_irq_save(flags); /* Remove from the thread list */ - minios_list_del(&thread->thread_list); + MINIOS_TAILQ_REMOVE(&thread_list, thread, thread_list); clear_runnable(thread); /* Put onto exited list */ - minios_list_add(&thread->thread_list, &exited_threads); + MINIOS_TAILQ_INSERT_HEAD(&exited_threads, thread, thread_list); local_irq_restore(flags); /* Schedule will free the resources */ while(1) @@ -296,6 +288,14 @@ _REENT_INIT_PTR((&callback_reent)) #endif idle_thread = create_thread("Idle", idle_thread_fn, NULL); - MINIOS_INIT_LIST_HEAD(&idle_thread->thread_list); } +/* + * Local variables: + * mode: C + * c-set-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff -r 6c9a73817770 -r 934c14ab9f19 extras/mini-os/xenbus/xenbus.c --- a/extras/mini-os/xenbus/xenbus.c Tue Jan 31 11:39:37 2012 +0000 +++ b/extras/mini-os/xenbus/xenbus.c Tue Jan 31 16:06:14 2012 +0000 @@ -85,7 +85,7 @@ add_waiter(w, xenbus_watch_queue); schedule(); } - remove_waiter(w); + remove_waiter(w, xenbus_watch_queue); *queue = event->next; return &event->path; } @@ -441,7 +441,7 @@ xb_write(type, id, trans, io, nr_reqs); schedule(); - remove_waiter(w); + remove_waiter(w, req_info[id].waitq); wake(current); rep = req_info[id].reply; diff -r 6c9a73817770 -r 934c14ab9f19 tools/include/xen-external/README --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/include/xen-external/README Tue Jan 31 16:06:14 2012 +0000 @@ -0,0 +1,24 @@ +WARNING - DO NOT EDIT THINGS IN THIS DIRECTORY +---------------------------------------------- + +These files were obtained elsewhere and should only be updated by +copying new versions from the source location, as documented below: + +bsd-COPYRIGHT +bsd-sys-queue.h +bsd-queue.3 + + Obtained from the FreeBSD SVN using the following commands: + svn co -r 221843 svn://svn.freebsd.org/base/head/sys/sys/ + svn co -r 221843 svn://svn.freebsd.org/base/head/share/man/man3 + svn cat -r 221843 http://svn.freebsd.org/base/head/COPYRIGHT >tools/libxl/external/bsd-COPYRIGHT + +Exceptions: + +README + + This file + +bsd-sys-queue-h-seddery + + Script to transform the above into a new namespace. diff -r 6c9a73817770 -r 934c14ab9f19 tools/include/xen-external/bsd-COPYRIGHT --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/include/xen-external/bsd-COPYRIGHT Tue Jan 31 16:06:14 2012 +0000 @@ -0,0 +1,126 @@ +# $FreeBSD$ +# @(#)COPYRIGHT 8.2 (Berkeley) 3/21/94 + +The compilation of software known as FreeBSD is distributed under the +following terms: + +Copyright (c) 1992-2011 The FreeBSD Project. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +SUCH DAMAGE. + +The 4.4BSD and 4.4BSD-Lite software is distributed under the following +terms: + +All of the documentation and software included in the 4.4BSD and 4.4BSD-Lite +Releases is copyrighted by The Regents of the University of California. + +Copyright 1979, 1980, 1983, 1986, 1988, 1989, 1991, 1992, 1993, 1994 + The Regents of the University of California. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. +3. All advertising materials mentioning features or use of this software + must display the following acknowledgement: +This product includes software developed by the University of +California, Berkeley and its contributors. +4. Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +SUCH DAMAGE. + +The Institute of Electrical and Electronics Engineers and the American +National Standards Committee X3, on Information Processing Systems have +given us permission to reprint portions of their documentation. + +In the following statement, the phrase ``this text'' refers to portions +of the system documentation. + +Portions of this text are reprinted and reproduced in electronic form in +the second BSD Networking Software Release, from IEEE Std 1003.1-1988, IEEE +Standard Portable Operating System Interface for Computer Environments +(POSIX), copyright C 1988 by the Institute of Electrical and Electronics +Engineers, Inc. In the event of any discrepancy between these versions +and the original IEEE Standard, the original IEEE Standard is the referee +document. + +In the following statement, the phrase ``This material'' refers to portions +of the system documentation. + +This material is reproduced with permission from American National +Standards Committee X3, on Information Processing Systems. Computer and +Business Equipment Manufacturers Association (CBEMA), 311 First St., NW, +Suite 500, Washington, DC 20001-2178. The developmental work of +Programming Language C was completed by the X3J11 Technical Committee. + +The views and conclusions contained in the software and documentation are +those of the authors and should not be interpreted as representing official +policies, either expressed or implied, of the Regents of the University +of California. + + +NOTE: The copyright of UC Berkeley's Berkeley Software Distribution ("BSD") +source has been updated. The copyright addendum may be found at +ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change and is +included below. + +July 22, 1999 + +To All Licensees, Distributors of Any Version of BSD: + +As you know, certain of the Berkeley Software Distribution ("BSD") source +code files require that further distributions of products containing all or +portions of the software, acknowledge within their advertising materials +that such products contain software developed by UC Berkeley and its +contributors. + +Specifically, the provision reads: + +" * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors." + +Effective immediately, licensees and distributors are no longer required to +include the acknowledgement within advertising materials. Accordingly, the +foregoing paragraph of those BSD Unix files containing it is hereby deleted +in its entirety. + +William Hoskins +Director, Office of Technology Licensing +University of California, Berkeley diff -r 6c9a73817770 -r 934c14ab9f19 tools/include/xen-external/bsd-queue.3 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/include/xen-external/bsd-queue.3 Tue Jan 31 16:06:14 2012 +0000 @@ -0,0 +1,1044 @@ +.\" Copyright (c) 1993 +.\" The Regents of the University of California. All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" 3. All advertising materials mentioning features or use of this software +.\" must display the following acknowledgement: +.\" This product includes software developed by the University of +.\" California, Berkeley and its contributors. +.\" 4. Neither the name of the University nor the names of its contributors +.\" may be used to endorse or promote products derived from this software +.\" without specific prior written permission. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" @(#)queue.3 8.2 (Berkeley) 1/24/94 +.\" $FreeBSD$ +.\" +.Dd May 13, 2011 +.Dt QUEUE 3 +.Os +.Sh NAME +.Nm SLIST_EMPTY , +.Nm SLIST_ENTRY , +.Nm SLIST_FIRST , +.Nm SLIST_FOREACH , +.Nm SLIST_FOREACH_SAFE , +.Nm SLIST_HEAD , +.Nm SLIST_HEAD_INITIALIZER , +.Nm SLIST_INIT , +.Nm SLIST_INSERT_AFTER , +.Nm SLIST_INSERT_HEAD , +.Nm SLIST_NEXT , +.Nm SLIST_REMOVE_AFTER , +.Nm SLIST_REMOVE_HEAD , +.Nm SLIST_REMOVE , +.Nm SLIST_SWAP , +.Nm STAILQ_CONCAT , +.Nm STAILQ_EMPTY , +.Nm STAILQ_ENTRY , +.Nm STAILQ_FIRST , +.Nm STAILQ_FOREACH , +.Nm STAILQ_FOREACH_SAFE , +.Nm STAILQ_HEAD , +.Nm STAILQ_HEAD_INITIALIZER , +.Nm STAILQ_INIT , +.Nm STAILQ_INSERT_AFTER , +.Nm STAILQ_INSERT_HEAD , +.Nm STAILQ_INSERT_TAIL , +.Nm STAILQ_LAST , +.Nm STAILQ_NEXT , +.Nm STAILQ_REMOVE_AFTER , +.Nm STAILQ_REMOVE_HEAD , +.Nm STAILQ_REMOVE , +.Nm STAILQ_SWAP , +.Nm LIST_EMPTY , +.Nm LIST_ENTRY , +.Nm LIST_FIRST , +.Nm LIST_FOREACH , +.Nm LIST_FOREACH_SAFE , +.Nm LIST_HEAD , +.Nm LIST_HEAD_INITIALIZER , +.Nm LIST_INIT , +.Nm LIST_INSERT_AFTER , +.Nm LIST_INSERT_BEFORE , +.Nm LIST_INSERT_HEAD , +.Nm LIST_NEXT , +.Nm LIST_REMOVE , +.Nm LIST_SWAP , +.Nm TAILQ_CONCAT , +.Nm TAILQ_EMPTY , +.Nm TAILQ_ENTRY , +.Nm TAILQ_FIRST , +.Nm TAILQ_FOREACH , +.Nm TAILQ_FOREACH_SAFE , +.Nm TAILQ_FOREACH_REVERSE , +.Nm TAILQ_FOREACH_REVERSE_SAFE , +.Nm TAILQ_HEAD , +.Nm TAILQ_HEAD_INITIALIZER , +.Nm TAILQ_INIT , +.Nm TAILQ_INSERT_AFTER , +.Nm TAILQ_INSERT_BEFORE , +.Nm TAILQ_INSERT_HEAD , +.Nm TAILQ_INSERT_TAIL , +.Nm TAILQ_LAST , +.Nm TAILQ_NEXT , +.Nm TAILQ_PREV , +.Nm TAILQ_REMOVE , +.Nm TAILQ_SWAP +.Nd implementations of singly-linked lists, singly-linked tail queues, +lists and tail queues +.Sh SYNOPSIS +.In sys/queue.h +.\" +.Fn SLIST_EMPTY "SLIST_HEAD *head" +.Fn SLIST_ENTRY "TYPE" +.Fn SLIST_FIRST "SLIST_HEAD *head" +.Fn SLIST_FOREACH "TYPE *var" "SLIST_HEAD *head" "SLIST_ENTRY NAME" +.Fn SLIST_FOREACH_SAFE "TYPE *var" "SLIST_HEAD *head" "SLIST_ENTRY NAME" "TYPE *temp_var" +.Fn SLIST_HEAD "HEADNAME" "TYPE" +.Fn SLIST_HEAD_INITIALIZER "SLIST_HEAD head" +.Fn SLIST_INIT "SLIST_HEAD *head" +.Fn SLIST_INSERT_AFTER "TYPE *listelm" "TYPE *elm" "SLIST_ENTRY NAME" +.Fn SLIST_INSERT_HEAD "SLIST_HEAD *head" "TYPE *elm" "SLIST_ENTRY NAME" +.Fn SLIST_NEXT "TYPE *elm" "SLIST_ENTRY NAME" +.Fn SLIST_REMOVE_AFTER "TYPE *elm" "SLIST_ENTRY NAME" +.Fn SLIST_REMOVE_HEAD "SLIST_HEAD *head" "SLIST_ENTRY NAME" +.Fn SLIST_REMOVE "SLIST_HEAD *head" "TYPE *elm" "TYPE" "SLIST_ENTRY NAME" +.Fn SLIST_SWAP "SLIST_HEAD *head1" "SLIST_HEAD *head2" "SLIST_ENTRY NAME" +.\" +.Fn STAILQ_CONCAT "STAILQ_HEAD *head1" "STAILQ_HEAD *head2" +.Fn STAILQ_EMPTY "STAILQ_HEAD *head" +.Fn STAILQ_ENTRY "TYPE" +.Fn STAILQ_FIRST "STAILQ_HEAD *head" +.Fn STAILQ_FOREACH "TYPE *var" "STAILQ_HEAD *head" "STAILQ_ENTRY NAME" +.Fn STAILQ_FOREACH_SAFE "TYPE *var" "STAILQ_HEAD *head" "STAILQ_ENTRY NAME" "TYPE *temp_var" +.Fn STAILQ_HEAD "HEADNAME" "TYPE" +.Fn STAILQ_HEAD_INITIALIZER "STAILQ_HEAD head" +.Fn STAILQ_INIT "STAILQ_HEAD *head" +.Fn STAILQ_INSERT_AFTER "STAILQ_HEAD *head" "TYPE *listelm" "TYPE *elm" "STAILQ_ENTRY NAME" +.Fn STAILQ_INSERT_HEAD "STAILQ_HEAD *head" "TYPE *elm" "STAILQ_ENTRY NAME" +.Fn STAILQ_INSERT_TAIL "STAILQ_HEAD *head" "TYPE *elm" "STAILQ_ENTRY NAME" +.Fn STAILQ_LAST "STAILQ_HEAD *head" "TYPE" "STAILQ_ENTRY NAME" +.Fn STAILQ_NEXT "TYPE *elm" "STAILQ_ENTRY NAME" +.Fn STAILQ_REMOVE_AFTER "STAILQ_HEAD *head" "TYPE *elm" "STAILQ_ENTRY NAME" +.Fn STAILQ_REMOVE_HEAD "STAILQ_HEAD *head" "STAILQ_ENTRY NAME" +.Fn STAILQ_REMOVE "STAILQ_HEAD *head" "TYPE *elm" "TYPE" "STAILQ_ENTRY NAME" +.Fn STAILQ_SWAP "STAILQ_HEAD *head1" "STAILQ_HEAD *head2" "STAILQ_ENTRY NAME" +.\" +.Fn LIST_EMPTY "LIST_HEAD *head" +.Fn LIST_ENTRY "TYPE" +.Fn LIST_FIRST "LIST_HEAD *head" +.Fn LIST_FOREACH "TYPE *var" "LIST_HEAD *head" "LIST_ENTRY NAME" +.Fn LIST_FOREACH_SAFE "TYPE *var" "LIST_HEAD *head" "LIST_ENTRY NAME" "TYPE *temp_var" +.Fn LIST_HEAD "HEADNAME" "TYPE" +.Fn LIST_HEAD_INITIALIZER "LIST_HEAD head" +.Fn LIST_INIT "LIST_HEAD *head" +.Fn LIST_INSERT_AFTER "TYPE *listelm" "TYPE *elm" "LIST_ENTRY NAME" +.Fn LIST_INSERT_BEFORE "TYPE *listelm" "TYPE *elm" "LIST_ENTRY NAME" +.Fn LIST_INSERT_HEAD "LIST_HEAD *head" "TYPE *elm" "LIST_ENTRY NAME" +.Fn LIST_NEXT "TYPE *elm" "LIST_ENTRY NAME" +.Fn LIST_REMOVE "TYPE *elm" "LIST_ENTRY NAME" +.Fn LIST_SWAP "LIST_HEAD *head1" "LIST_HEAD *head2" "TYPE" "LIST_ENTRY NAME" +.\" +.Fn TAILQ_CONCAT "TAILQ_HEAD *head1" "TAILQ_HEAD *head2" "TAILQ_ENTRY NAME" +.Fn TAILQ_EMPTY "TAILQ_HEAD *head" +.Fn TAILQ_ENTRY "TYPE" +.Fn TAILQ_FIRST "TAILQ_HEAD *head" +.Fn TAILQ_FOREACH "TYPE *var" "TAILQ_HEAD *head" "TAILQ_ENTRY NAME" +.Fn TAILQ_FOREACH_SAFE "TYPE *var" "TAILQ_HEAD *head" "TAILQ_ENTRY NAME" "TYPE *temp_var" +.Fn TAILQ_FOREACH_REVERSE "TYPE *var" "TAILQ_HEAD *head" "HEADNAME" "TAILQ_ENTRY NAME" +.Fn TAILQ_FOREACH_REVERSE_SAFE "TYPE *var" "TAILQ_HEAD *head" "HEADNAME" "TAILQ_ENTRY NAME" "TYPE *temp_var" +.Fn TAILQ_HEAD "HEADNAME" "TYPE" +.Fn TAILQ_HEAD_INITIALIZER "TAILQ_HEAD head" +.Fn TAILQ_INIT "TAILQ_HEAD *head" +.Fn TAILQ_INSERT_AFTER "TAILQ_HEAD *head" "TYPE *listelm" "TYPE *elm" "TAILQ_ENTRY NAME" +.Fn TAILQ_INSERT_BEFORE "TYPE *listelm" "TYPE *elm" "TAILQ_ENTRY NAME" +.Fn TAILQ_INSERT_HEAD "TAILQ_HEAD *head" "TYPE *elm" "TAILQ_ENTRY NAME" +.Fn TAILQ_INSERT_TAIL "TAILQ_HEAD *head" "TYPE *elm" "TAILQ_ENTRY NAME" +.Fn TAILQ_LAST "TAILQ_HEAD *head" "HEADNAME" +.Fn TAILQ_NEXT "TYPE *elm" "TAILQ_ENTRY NAME" +.Fn TAILQ_PREV "TYPE *elm" "HEADNAME" "TAILQ_ENTRY NAME" +.Fn TAILQ_REMOVE "TAILQ_HEAD *head" "TYPE *elm" "TAILQ_ENTRY NAME" +.Fn TAILQ_SWAP "TAILQ_HEAD *head1" "TAILQ_HEAD *head2" "TYPE" "TAILQ_ENTRY NAME" +.\" +.Sh DESCRIPTION +These macros define and operate on four types of data structures: +singly-linked lists, singly-linked tail queues, lists, and tail queues. +All four structures support the following functionality: +.Bl -enum -compact -offset indent +.It +Insertion of a new entry at the head of the list. +.It +Insertion of a new entry after any element in the list. +.It +O(1) removal of an entry from the head of the list. +.It +Forward traversal through the list. +.It +Swawpping the contents of two lists. +.El +.Pp +Singly-linked lists are the simplest of the four data structures +and support only the above functionality. +Singly-linked lists are ideal for applications with large datasets +and few or no removals, +or for implementing a LIFO queue. +Singly-linked lists add the following functionality: +.Bl -enum -compact -offset indent +.It +O(n) removal of any entry in the list. +.El +.Pp +Singly-linked tail queues add the following functionality: +.Bl -enum -compact -offset indent +.It +Entries can be added at the end of a list. +.It +O(n) removal of any entry in the list. +.It +They may be concatenated. +.El +However: +.Bl -enum -compact -offset indent +.It +All list insertions must specify the head of the list. +.It +Each head entry requires two pointers rather than one. +.It +Code size is about 15% greater and operations run about 20% slower +than singly-linked lists. +.El +.Pp +Singly-linked tailqs are ideal for applications with large datasets and +few or no removals, +or for implementing a FIFO queue. +.Pp +All doubly linked types of data structures (lists and tail queues) +additionally allow: +.Bl -enum -compact -offset indent +.It +Insertion of a new entry before any element in the list. +.It +O(1) removal of any entry in the list. +.El +However: +.Bl -enum -compact -offset indent +.It +Each element requires two pointers rather than one. +.It +Code size and execution time of operations (except for removal) is about +twice that of the singly-linked data-structures. +.El +.Pp +Linked lists are the simplest of the doubly linked data structures and support +only the above functionality over singly-linked lists. +.Pp +Tail queues add the following functionality: +.Bl -enum -compact -offset indent +.It +Entries can be added at the end of a list. +.It +They may be traversed backwards, from tail to head. +.It +They may be concatenated. +.El +However: +.Bl -enum -compact -offset indent +.It +All list insertions and removals must specify the head of the list. +.It +Each head entry requires two pointers rather than one. +.It +Code size is about 15% greater and operations run about 20% slower +than singly-linked lists. +.El +.Pp +In the macro definitions, +.Fa TYPE +is the name of a user defined structure, +that must contain a field of type +.Li SLIST_ENTRY , +.Li STAILQ_ENTRY , +.Li LIST_ENTRY , +or +.Li TAILQ_ENTRY , +named +.Fa NAME . +The argument +.Fa HEADNAME +is the name of a user defined structure that must be declared +using the macros +.Li SLIST_HEAD , +.Li STAILQ_HEAD , +.Li LIST_HEAD , +or +.Li TAILQ_HEAD . +See the examples below for further explanation of how these +macros are used. +.Sh SINGLY-LINKED LISTS +A singly-linked list is headed by a structure defined by the +.Nm SLIST_HEAD +macro. +This structure contains a single pointer to the first element +on the list. +The elements are singly linked for minimum space and pointer manipulation +overhead at the expense of O(n) removal for arbitrary elements. +New elements can be added to the list after an existing element or +at the head of the list. +An +.Fa SLIST_HEAD +structure is declared as follows: +.Bd -literal -offset indent +SLIST_HEAD(HEADNAME, TYPE) head; +.Ed +.Pp +where +.Fa HEADNAME +is the name of the structure to be defined, and +.Fa TYPE +is the type of the elements to be linked into the list. +A pointer to the head of the list can later be declared as: +.Bd -literal -offset indent +struct HEADNAME *headp; +.Ed +.Pp +(The names +.Li head +and +.Li headp +are user selectable.) +.Pp +The macro +.Nm SLIST_HEAD_INITIALIZER +evaluates to an initializer for the list +.Fa head . +.Pp +The macro +.Nm SLIST_EMPTY +evaluates to true if there are no elements in the list. +.Pp +The macro +.Nm SLIST_ENTRY +declares a structure that connects the elements in +the list. +.Pp +The macro +.Nm SLIST_FIRST +returns the first element in the list or NULL if the list is empty. +.Pp +The macro +.Nm SLIST_FOREACH +traverses the list referenced by +.Fa head +in the forward direction, assigning each element in +turn to +.Fa var . +.Pp +The macro +.Nm SLIST_FOREACH_SAFE +traverses the list referenced by +.Fa head +in the forward direction, assigning each element in +turn to +.Fa var . +However, unlike +.Fn SLIST_FOREACH +here it is permitted to both remove +.Fa var +as well as free it from within the loop safely without interfering with the +traversal. +.Pp +The macro +.Nm SLIST_INIT +initializes the list referenced by +.Fa head . +.Pp +The macro +.Nm SLIST_INSERT_HEAD +inserts the new element +.Fa elm +at the head of the list. +.Pp +The macro +.Nm SLIST_INSERT_AFTER +inserts the new element +.Fa elm +after the element +.Fa listelm . +.Pp +The macro +.Nm SLIST_NEXT +returns the next element in the list. +.Pp +The macro +.Nm SLIST_REMOVE_AFTER +removes the element after +.Fa elm +from the list. Unlike +.Fa SLIST_REMOVE , +this macro does not traverse the entire list. +.Pp +The macro +.Nm SLIST_REMOVE_HEAD +removes the element +.Fa elm +from the head of the list. +For optimum efficiency, +elements being removed from the head of the list should explicitly use +this macro instead of the generic +.Fa SLIST_REMOVE +macro. +.Pp +The macro +.Nm SLIST_REMOVE +removes the element +.Fa elm +from the list. +.Pp +The macro +.Nm SLIST_SWAP +swaps the contents of +.Fa head1 +and +.Fa head2 . +.Sh SINGLY-LINKED LIST EXAMPLE +.Bd -literal +SLIST_HEAD(slisthead, entry) head = + SLIST_HEAD_INITIALIZER(head); +struct slisthead *headp; /* Singly-linked List head. */ +struct entry { + ... + SLIST_ENTRY(entry) entries; /* Singly-linked List. */ + ... +} *n1, *n2, *n3, *np; + +SLIST_INIT(&head); /* Initialize the list. */ + +n1 = malloc(sizeof(struct entry)); /* Insert at the head. */ +SLIST_INSERT_HEAD(&head, n1, entries); + +n2 = malloc(sizeof(struct entry)); /* Insert after. */ +SLIST_INSERT_AFTER(n1, n2, entries); + +SLIST_REMOVE(&head, n2, entry, entries);/* Deletion. */ +free(n2); + +n3 = SLIST_FIRST(&head); +SLIST_REMOVE_HEAD(&head, entries); /* Deletion from the head. */ +free(n3); + /* Forward traversal. */ +SLIST_FOREACH(np, &head, entries) + np-> ... + /* Safe forward traversal. */ +SLIST_FOREACH_SAFE(np, &head, entries, np_temp) { + np->do_stuff(); + ... + SLIST_REMOVE(&head, np, entry, entries); + free(np); +} + +while (!SLIST_EMPTY(&head)) { /* List Deletion. */ + n1 = SLIST_FIRST(&head); + SLIST_REMOVE_HEAD(&head, entries); + free(n1); +} +.Ed +.Sh SINGLY-LINKED TAIL QUEUES +A singly-linked tail queue is headed by a structure defined by the +.Nm STAILQ_HEAD +macro. +This structure contains a pair of pointers, +one to the first element in the tail queue and the other to +the last element in the tail queue. +The elements are singly linked for minimum space and pointer +manipulation overhead at the expense of O(n) removal for arbitrary +elements. +New elements can be added to the tail queue after an existing element, +at the head of the tail queue, or at the end of the tail queue. +A +.Fa STAILQ_HEAD +structure is declared as follows: +.Bd -literal -offset indent +STAILQ_HEAD(HEADNAME, TYPE) head; +.Ed +.Pp +where +.Li HEADNAME +is the name of the structure to be defined, and +.Li TYPE +is the type of the elements to be linked into the tail queue. +A pointer to the head of the tail queue can later be declared as: +.Bd -literal -offset indent +struct HEADNAME *headp; +.Ed +.Pp +(The names +.Li head +and +.Li headp +are user selectable.) +.Pp +The macro +.Nm STAILQ_HEAD_INITIALIZER +evaluates to an initializer for the tail queue +.Fa head . +.Pp +The macro +.Nm STAILQ_CONCAT +concatenates the tail queue headed by +.Fa head2 +onto the end of the one headed by +.Fa head1 +removing all entries from the former. +.Pp +The macro +.Nm STAILQ_EMPTY +evaluates to true if there are no items on the tail queue. +.Pp +The macro +.Nm STAILQ_ENTRY +declares a structure that connects the elements in +the tail queue. +.Pp +The macro +.Nm STAILQ_FIRST +returns the first item on the tail queue or NULL if the tail queue +is empty. +.Pp +The macro +.Nm STAILQ_FOREACH +traverses the tail queue referenced by +.Fa head +in the forward direction, assigning each element +in turn to +.Fa var . +.Pp +The macro +.Nm STAILQ_FOREACH_SAFE +traverses the tail queue referenced by +.Fa head +in the forward direction, assigning each element +in turn to +.Fa var . +However, unlike +.Fn STAILQ_FOREACH +here it is permitted to both remove +.Fa var +as well as free it from within the loop safely without interfering with the +traversal. +.Pp +The macro +.Nm STAILQ_INIT +initializes the tail queue referenced by +.Fa head . +.Pp +The macro +.Nm STAILQ_INSERT_HEAD +inserts the new element +.Fa elm +at the head of the tail queue. +.Pp +The macro +.Nm STAILQ_INSERT_TAIL +inserts the new element +.Fa elm +at the end of the tail queue. +.Pp +The macro +.Nm STAILQ_INSERT_AFTER +inserts the new element +.Fa elm +after the element +.Fa listelm . +.Pp +The macro +.Nm STAILQ_LAST +returns the last item on the tail queue. +If the tail queue is empty the return value is +.Dv NULL . +.Pp +The macro +.Nm STAILQ_NEXT +returns the next item on the tail queue, or NULL this item is the last. +.Pp +The macro +.Nm STAILQ_REMOVE_AFTER +removes the element after +.Fa elm +from the tail queue. Unlike +.Fa STAILQ_REMOVE , +this macro does not traverse the entire tail queue. +.Pp +The macro +.Nm STAILQ_REMOVE_HEAD +removes the element at the head of the tail queue. +For optimum efficiency, +elements being removed from the head of the tail queue should +use this macro explicitly rather than the generic +.Fa STAILQ_REMOVE +macro. +.Pp +The macro +.Nm STAILQ_REMOVE +removes the element +.Fa elm +from the tail queue. +.Pp +The macro +.Nm STAILQ_SWAP +swaps the contents of +.Fa head1 +and +.Fa head2 . +.Sh SINGLY-LINKED TAIL QUEUE EXAMPLE +.Bd -literal +STAILQ_HEAD(stailhead, entry) head = + STAILQ_HEAD_INITIALIZER(head); +struct stailhead *headp; /* Singly-linked tail queue head. */ +struct entry { + ... + STAILQ_ENTRY(entry) entries; /* Tail queue. */ + ... +} *n1, *n2, *n3, *np; + +STAILQ_INIT(&head); /* Initialize the queue. */ + +n1 = malloc(sizeof(struct entry)); /* Insert at the head. */ +STAILQ_INSERT_HEAD(&head, n1, entries); + +n1 = malloc(sizeof(struct entry)); /* Insert at the tail. */ +STAILQ_INSERT_TAIL(&head, n1, entries); + +n2 = malloc(sizeof(struct entry)); /* Insert after. */ +STAILQ_INSERT_AFTER(&head, n1, n2, entries); + /* Deletion. */ +STAILQ_REMOVE(&head, n2, entry, entries); +free(n2); + /* Deletion from the head. */ +n3 = STAILQ_FIRST(&head); +STAILQ_REMOVE_HEAD(&head, entries); +free(n3); + /* Forward traversal. */ +STAILQ_FOREACH(np, &head, entries) + np-> ... + /* Safe forward traversal. */ +STAILQ_FOREACH_SAFE(np, &head, entries, np_temp) { + np->do_stuff(); + ... + STAILQ_REMOVE(&head, np, entry, entries); + free(np); +} + /* TailQ Deletion. */ +while (!STAILQ_EMPTY(&head)) { + n1 = STAILQ_FIRST(&head); + STAILQ_REMOVE_HEAD(&head, entries); + free(n1); +} + /* Faster TailQ Deletion. */ +n1 = STAILQ_FIRST(&head); +while (n1 != NULL) { + n2 = STAILQ_NEXT(n1, entries); + free(n1); + n1 = n2; +} +STAILQ_INIT(&head); +.Ed +.Sh LISTS +A list is headed by a structure defined by the +.Nm LIST_HEAD +macro. +This structure contains a single pointer to the first element +on the list. +The elements are doubly linked so that an arbitrary element can be +removed without traversing the list. +New elements can be added to the list after an existing element, +before an existing element, or at the head of the list. +A +.Fa LIST_HEAD +structure is declared as follows: +.Bd -literal -offset indent +LIST_HEAD(HEADNAME, TYPE) head; +.Ed +.Pp +where +.Fa HEADNAME +is the name of the structure to be defined, and +.Fa TYPE +is the type of the elements to be linked into the list. +A pointer to the head of the list can later be declared as: +.Bd -literal -offset indent +struct HEADNAME *headp; +.Ed +.Pp +(The names +.Li head +and +.Li headp +are user selectable.) +.Pp +The macro +.Nm LIST_HEAD_INITIALIZER +evaluates to an initializer for the list +.Fa head . +.Pp +The macro +.Nm LIST_EMPTY +evaluates to true if there are no elements in the list. +.Pp +The macro +.Nm LIST_ENTRY +declares a structure that connects the elements in +the list. +.Pp +The macro +.Nm LIST_FIRST +returns the first element in the list or NULL if the list +is empty. +.Pp +The macro +.Nm LIST_FOREACH +traverses the list referenced by +.Fa head +in the forward direction, assigning each element in turn to +.Fa var . +.Pp +The macro +.Nm LIST_FOREACH_SAFE +traverses the list referenced by +.Fa head +in the forward direction, assigning each element in turn to +.Fa var . +However, unlike +.Fn LIST_FOREACH +here it is permitted to both remove +.Fa var +as well as free it from within the loop safely without interfering with the +traversal. +.Pp +The macro +.Nm LIST_INIT +initializes the list referenced by +.Fa head . +.Pp +The macro +.Nm LIST_INSERT_HEAD +inserts the new element +.Fa elm +at the head of the list. +.Pp +The macro +.Nm LIST_INSERT_AFTER +inserts the new element +.Fa elm +after the element +.Fa listelm . +.Pp +The macro +.Nm LIST_INSERT_BEFORE +inserts the new element +.Fa elm +before the element +.Fa listelm . +.Pp +The macro +.Nm LIST_NEXT +returns the next element in the list, or NULL if this is the last. +.Pp +The macro +.Nm LIST_REMOVE +removes the element +.Fa elm +from the list. +.Pp +The macro +.Nm LIST_SWAP +swaps the contents of +.Fa head1 +and +.Fa head2 . +.Sh LIST EXAMPLE +.Bd -literal +LIST_HEAD(listhead, entry) head = + LIST_HEAD_INITIALIZER(head); +struct listhead *headp; /* List head. */ +struct entry { + ... + LIST_ENTRY(entry) entries; /* List. */ + ... +} *n1, *n2, *n3, *np, *np_temp; + +LIST_INIT(&head); /* Initialize the list. */ + +n1 = malloc(sizeof(struct entry)); /* Insert at the head. */ +LIST_INSERT_HEAD(&head, n1, entries); + +n2 = malloc(sizeof(struct entry)); /* Insert after. */ +LIST_INSERT_AFTER(n1, n2, entries); + +n3 = malloc(sizeof(struct entry)); /* Insert before. */ +LIST_INSERT_BEFORE(n2, n3, entries); + +LIST_REMOVE(n2, entries); /* Deletion. */ +free(n2); + /* Forward traversal. */ +LIST_FOREACH(np, &head, entries) + np-> ... + + /* Safe forward traversal. */ +LIST_FOREACH_SAFE(np, &head, entries, np_temp) { + np->do_stuff(); + ... + LIST_REMOVE(np, entries); + free(np); +} + +while (!LIST_EMPTY(&head)) { /* List Deletion. */ + n1 = LIST_FIRST(&head); + LIST_REMOVE(n1, entries); + free(n1); +} + +n1 = LIST_FIRST(&head); /* Faster List Deletion. */ +while (n1 != NULL) { + n2 = LIST_NEXT(n1, entries); + free(n1); + n1 = n2; +} +LIST_INIT(&head); +.Ed +.Sh TAIL QUEUES +A tail queue is headed by a structure defined by the +.Nm TAILQ_HEAD +macro. +This structure contains a pair of pointers, +one to the first element in the tail queue and the other to +the last element in the tail queue. +The elements are doubly linked so that an arbitrary element can be +removed without traversing the tail queue. +New elements can be added to the tail queue after an existing element, +before an existing element, at the head of the tail queue, +or at the end of the tail queue. +A +.Fa TAILQ_HEAD +structure is declared as follows: +.Bd -literal -offset indent +TAILQ_HEAD(HEADNAME, TYPE) head; +.Ed +.Pp +where +.Li HEADNAME +is the name of the structure to be defined, and +.Li TYPE +is the type of the elements to be linked into the tail queue. +A pointer to the head of the tail queue can later be declared as: +.Bd -literal -offset indent +struct HEADNAME *headp; +.Ed +.Pp +(The names +.Li head +and +.Li headp +are user selectable.) +.Pp +The macro +.Nm TAILQ_HEAD_INITIALIZER +evaluates to an initializer for the tail queue +.Fa head . +.Pp +The macro +.Nm TAILQ_CONCAT +concatenates the tail queue headed by +.Fa head2 +onto the end of the one headed by +.Fa head1 +removing all entries from the former. +.Pp +The macro +.Nm TAILQ_EMPTY +evaluates to true if there are no items on the tail queue. +.Pp +The macro +.Nm TAILQ_ENTRY +declares a structure that connects the elements in +the tail queue. +.Pp +The macro +.Nm TAILQ_FIRST +returns the first item on the tail queue or NULL if the tail queue +is empty. +.Pp +The macro +.Nm TAILQ_FOREACH +traverses the tail queue referenced by +.Fa head +in the forward direction, assigning each element in turn to +.Fa var . +.Fa var +is set to +.Dv NULL +if the loop completes normally, or if there were no elements. +.Pp +The macro +.Nm TAILQ_FOREACH_REVERSE +traverses the tail queue referenced by +.Fa head +in the reverse direction, assigning each element in turn to +.Fa var . +.Pp +The macros +.Nm TAILQ_FOREACH_SAFE +and +.Nm TAILQ_FOREACH_REVERSE_SAFE +traverse the list referenced by +.Fa head +in the forward or reverse direction respectively, +assigning each element in turn to +.Fa var . +However, unlike their unsafe counterparts, +.Nm TAILQ_FOREACH +and +.Nm TAILQ_FOREACH_REVERSE +permit to both remove +.Fa var +as well as free it from within the loop safely without interfering with the +traversal. +.Pp +The macro +.Nm TAILQ_INIT +initializes the tail queue referenced by +.Fa head . +.Pp +The macro +.Nm TAILQ_INSERT_HEAD +inserts the new element +.Fa elm +at the head of the tail queue. +.Pp +The macro +.Nm TAILQ_INSERT_TAIL +inserts the new element +.Fa elm +at the end of the tail queue. +.Pp +The macro +.Nm TAILQ_INSERT_AFTER +inserts the new element +.Fa elm +after the element +.Fa listelm . +.Pp +The macro +.Nm TAILQ_INSERT_BEFORE +inserts the new element +.Fa elm +before the element +.Fa listelm . +.Pp +The macro +.Nm TAILQ_LAST +returns the last item on the tail queue. +If the tail queue is empty the return value is +.Dv NULL . +.Pp +The macro +.Nm TAILQ_NEXT +returns the next item on the tail queue, or NULL if this item is the last. +.Pp +The macro +.Nm TAILQ_PREV +returns the previous item on the tail queue, or NULL if this item +is the first. +.Pp +The macro +.Nm TAILQ_REMOVE +removes the element +.Fa elm +from the tail queue. +.Pp +The macro +.Nm TAILQ_SWAP +swaps the contents of +.Fa head1 +and +.Fa head2 . +.Sh TAIL QUEUE EXAMPLE +.Bd -literal +TAILQ_HEAD(tailhead, entry) head = + TAILQ_HEAD_INITIALIZER(head); +struct tailhead *headp; /* Tail queue head. */ +struct entry { + ... + TAILQ_ENTRY(entry) entries; /* Tail queue. */ + ... +} *n1, *n2, *n3, *np; + +TAILQ_INIT(&head); /* Initialize the queue. */ + +n1 = malloc(sizeof(struct entry)); /* Insert at the head. */ +TAILQ_INSERT_HEAD(&head, n1, entries); + +n1 = malloc(sizeof(struct entry)); /* Insert at the tail. */ +TAILQ_INSERT_TAIL(&head, n1, entries); + +n2 = malloc(sizeof(struct entry)); /* Insert after. */ +TAILQ_INSERT_AFTER(&head, n1, n2, entries); + +n3 = malloc(sizeof(struct entry)); /* Insert before. */ +TAILQ_INSERT_BEFORE(n2, n3, entries); + +TAILQ_REMOVE(&head, n2, entries); /* Deletion. */ +free(n2); + /* Forward traversal. */ +TAILQ_FOREACH(np, &head, entries) + np-> ... + /* Safe forward traversal. */ +TAILQ_FOREACH_SAFE(np, &head, entries, np_temp) { + np->do_stuff(); + ... + TAILQ_REMOVE(&head, np, entries); + free(np); +} + /* Reverse traversal. */ +TAILQ_FOREACH_REVERSE(np, &head, tailhead, entries) + np-> ... + /* TailQ Deletion. */ +while (!TAILQ_EMPTY(&head)) { + n1 = TAILQ_FIRST(&head); + TAILQ_REMOVE(&head, n1, entries); + free(n1); +} + /* Faster TailQ Deletion. */ +n1 = TAILQ_FIRST(&head); +while (n1 != NULL) { + n2 = TAILQ_NEXT(n1, entries); + free(n1); + n1 = n2; +} +TAILQ_INIT(&head); +.Ed +.Sh SEE ALSO +.Xr tree 3 +.Sh HISTORY +The +.Nm queue +functions first appeared in +.Bx 4.4 . diff -r 6c9a73817770 -r 934c14ab9f19 tools/include/xen-external/bsd-sys-queue-h-seddery --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/include/xen-external/bsd-sys-queue-h-seddery Tue Jan 31 16:06:14 2012 +0000 @@ -0,0 +1,72 @@ +#!/usr/bin/perl -p +# +# This script is part of the Xen build system. It has a very +# permissive licence to avoid complicating the licence of the +# generated header file and to allow this seddery to be reused by +# other projects. +# +# Permission is hereby granted, free of charge, to any person +# obtaining a copy of this individual file (the "Software"), to deal +# in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, +# sublicense, and/or sell copies of the Software, and to permit +# persons to whom the Software is furnished to do so, subject to the +# following conditions: +# +# The above copyright notice and this permission notice shall be +# included in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS +# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. +# +# Copyright (C) 2011 Citrix Ltd + +our $namespace, $ucnamespace; + +BEGIN { + die unless @ARGV; + $namespace = pop @ARGV; + $namespace =~ s/^--prefix=// or die; + $ucnamespace = uc $namespace; + + print < + +/* + * This file defines four types of data structures: singly-linked lists, + * singly-linked tail queues, lists and tail queues. + * + * A singly-linked list is headed by a single forward pointer. The elements + * are singly linked for minimum space and pointer manipulation overhead at + * the expense of O(n) removal for arbitrary elements. New elements can be + * added to the list after an existing element or at the head of the list. + * Elements being removed from the head of the list should use the explicit + * macro for this purpose for optimum efficiency. A singly-linked list may + * only be traversed in the forward direction. Singly-linked lists are ideal + * for applications with large datasets and few or no removals or for + * implementing a LIFO queue. + * + * A singly-linked tail queue is headed by a pair of pointers, one to the + * head of the list and the other to the tail of the list. The elements are + * singly linked for minimum space and pointer manipulation overhead at the + * expense of O(n) removal for arbitrary elements. New elements can be added + * to the list after an existing element, at the head of the list, or at the + * end of the list. Elements being removed from the head of the tail queue + * should use the explicit macro for this purpose for optimum efficiency. + * A singly-linked tail queue may only be traversed in the forward direction. + * Singly-linked tail queues are ideal for applications with large datasets + * and few or no removals or for implementing a FIFO queue. + * + * A list is headed by a single forward pointer (or an array of forward + * pointers for a hash table header). The elements are doubly linked + * so that an arbitrary element can be removed without a need to + * traverse the list. New elements can be added to the list before + * or after an existing element or at the head of the list. A list + * may only be traversed in the forward direction. + * + * A tail queue is headed by a pair of pointers, one to the head of the + * list and the other to the tail of the list. The elements are doubly + * linked so that an arbitrary element can be removed without a need to + * traverse the list. New elements can be added to the list before or + * after an existing element, at the head of the list, or at the end of + * the list. A tail queue may be traversed in either direction. + * + * For details on the use of these macros, see the queue(3) manual page. + * + * + * SLIST LIST STAILQ TAILQ + * _HEAD + + + + + * _HEAD_INITIALIZER + + + + + * _ENTRY + + + + + * _INIT + + + + + * _EMPTY + + + + + * _FIRST + + + + + * _NEXT + + + + + * _PREV - - - + + * _LAST - - + + + * _FOREACH + + + + + * _FOREACH_SAFE + + + + + * _FOREACH_REVERSE - - - + + * _FOREACH_REVERSE_SAFE - - - + + * _INSERT_HEAD + + + + + * _INSERT_BEFORE - + - + + * _INSERT_AFTER + + + + + * _INSERT_TAIL - - + + + * _CONCAT - - + + + * _REMOVE_AFTER + - + - + * _REMOVE_HEAD + - + - + * _REMOVE + + + + + * _SWAP + + + + + * + */ +#ifdef QUEUE_MACRO_DEBUG +/* Store the last 2 places the queue element or head was altered */ +struct qm_trace { + char * lastfile; + int lastline; + char * prevfile; + int prevline; +}; + +#define TRACEBUF struct qm_trace trace; +#define TRASHIT(x) do {(x) = (void *)-1;} while (0) +#define QMD_SAVELINK(name, link) void **name = (void *)&(link) + +#define QMD_TRACE_HEAD(head) do { \ + (head)->trace.prevline = (head)->trace.lastline; \ + (head)->trace.prevfile = (head)->trace.lastfile; \ + (head)->trace.lastline = __LINE__; \ + (head)->trace.lastfile = __FILE__; \ +} while (0) + +#define QMD_TRACE_ELEM(elem) do { \ + (elem)->trace.prevline = (elem)->trace.lastline; \ + (elem)->trace.prevfile = (elem)->trace.lastfile; \ + (elem)->trace.lastline = __LINE__; \ + (elem)->trace.lastfile = __FILE__; \ +} while (0) + +#else +#define QMD_TRACE_ELEM(elem) +#define QMD_TRACE_HEAD(head) +#define QMD_SAVELINK(name, link) +#define TRACEBUF +#define TRASHIT(x) +#endif /* QUEUE_MACRO_DEBUG */ + +/* + * Singly-linked List declarations. + */ +#define SLIST_HEAD(name, type) \ +struct name { \ + struct type *slh_first; /* first element */ \ +} + +#define SLIST_HEAD_INITIALIZER(head) \ + { NULL } + +#define SLIST_ENTRY(type) \ +struct { \ + struct type *sle_next; /* next element */ \ +} + +/* + * Singly-linked List functions. + */ +#define SLIST_EMPTY(head) ((head)->slh_first == NULL) + +#define SLIST_FIRST(head) ((head)->slh_first) + +#define SLIST_FOREACH(var, head, field) \ + for ((var) = SLIST_FIRST((head)); \ + (var); \ + (var) = SLIST_NEXT((var), field)) + +#define SLIST_FOREACH_SAFE(var, head, field, tvar) \ + for ((var) = SLIST_FIRST((head)); \ + (var) && ((tvar) = SLIST_NEXT((var), field), 1); \ + (var) = (tvar)) + +#define SLIST_FOREACH_PREVPTR(var, varp, head, field) \ + for ((varp) = &SLIST_FIRST((head)); \ + ((var) = *(varp)) != NULL; \ + (varp) = &SLIST_NEXT((var), field)) + +#define SLIST_INIT(head) do { \ + SLIST_FIRST((head)) = NULL; \ +} while (0) + +#define SLIST_INSERT_AFTER(slistelm, elm, field) do { \ + SLIST_NEXT((elm), field) = SLIST_NEXT((slistelm), field); \ + SLIST_NEXT((slistelm), field) = (elm); \ +} while (0) + +#define SLIST_INSERT_HEAD(head, elm, field) do { \ + SLIST_NEXT((elm), field) = SLIST_FIRST((head)); \ + SLIST_FIRST((head)) = (elm); \ +} while (0) + +#define SLIST_NEXT(elm, field) ((elm)->field.sle_next) + +#define SLIST_REMOVE(head, elm, type, field) do { \ + QMD_SAVELINK(oldnext, (elm)->field.sle_next); \ + if (SLIST_FIRST((head)) == (elm)) { \ + SLIST_REMOVE_HEAD((head), field); \ + } \ + else { \ + struct type *curelm = SLIST_FIRST((head)); \ + while (SLIST_NEXT(curelm, field) != (elm)) \ + curelm = SLIST_NEXT(curelm, field); \ + SLIST_REMOVE_AFTER(curelm, field); \ + } \ + TRASHIT(*oldnext); \ +} while (0) + +#define SLIST_REMOVE_AFTER(elm, field) do { \ + SLIST_NEXT(elm, field) = \ + SLIST_NEXT(SLIST_NEXT(elm, field), field); \ +} while (0) + +#define SLIST_REMOVE_HEAD(head, field) do { \ + SLIST_FIRST((head)) = SLIST_NEXT(SLIST_FIRST((head)), field); \ +} while (0) + +#define SLIST_SWAP(head1, head2, type) do { \ + struct type *swap_first = SLIST_FIRST(head1); \ + SLIST_FIRST(head1) = SLIST_FIRST(head2); \ + SLIST_FIRST(head2) = swap_first; \ +} while (0) + +/* + * Singly-linked Tail queue declarations. + */ +#define STAILQ_HEAD(name, type) \ +struct name { \ + struct type *stqh_first;/* first element */ \ + struct type **stqh_last;/* addr of last next element */ \ +} + +#define STAILQ_HEAD_INITIALIZER(head) \ + { NULL, &(head).stqh_first } + +#define STAILQ_ENTRY(type) \ +struct { \ + struct type *stqe_next; /* next element */ \ +} + +/* + * Singly-linked Tail queue functions. + */ +#define STAILQ_CONCAT(head1, head2) do { \ + if (!STAILQ_EMPTY((head2))) { \ + *(head1)->stqh_last = (head2)->stqh_first; \ + (head1)->stqh_last = (head2)->stqh_last; \ + STAILQ_INIT((head2)); \ + } \ +} while (0) + +#define STAILQ_EMPTY(head) ((head)->stqh_first == NULL) + +#define STAILQ_FIRST(head) ((head)->stqh_first) + +#define STAILQ_FOREACH(var, head, field) \ + for((var) = STAILQ_FIRST((head)); \ + (var); \ + (var) = STAILQ_NEXT((var), field)) + + +#define STAILQ_FOREACH_SAFE(var, head, field, tvar) \ + for ((var) = STAILQ_FIRST((head)); \ + (var) && ((tvar) = STAILQ_NEXT((var), field), 1); \ + (var) = (tvar)) + +#define STAILQ_INIT(head) do { \ + STAILQ_FIRST((head)) = NULL; \ + (head)->stqh_last = &STAILQ_FIRST((head)); \ +} while (0) + +#define STAILQ_INSERT_AFTER(head, tqelm, elm, field) do { \ + if ((STAILQ_NEXT((elm), field) = STAILQ_NEXT((tqelm), field)) == NULL)\ + (head)->stqh_last = &STAILQ_NEXT((elm), field); \ + STAILQ_NEXT((tqelm), field) = (elm); \ +} while (0) + +#define STAILQ_INSERT_HEAD(head, elm, field) do { \ + if ((STAILQ_NEXT((elm), field) = STAILQ_FIRST((head))) == NULL) \ + (head)->stqh_last = &STAILQ_NEXT((elm), field); \ + STAILQ_FIRST((head)) = (elm); \ +} while (0) + +#define STAILQ_INSERT_TAIL(head, elm, field) do { \ + STAILQ_NEXT((elm), field) = NULL; \ + *(head)->stqh_last = (elm); \ + (head)->stqh_last = &STAILQ_NEXT((elm), field); \ +} while (0) + +#define STAILQ_LAST(head, type, field) \ + (STAILQ_EMPTY((head)) ? \ + NULL : \ + ((struct type *)(void *) \ + ((char *)((head)->stqh_last) - __offsetof(struct type, field)))) + +#define STAILQ_NEXT(elm, field) ((elm)->field.stqe_next) + +#define STAILQ_REMOVE(head, elm, type, field) do { \ + QMD_SAVELINK(oldnext, (elm)->field.stqe_next); \ + if (STAILQ_FIRST((head)) == (elm)) { \ + STAILQ_REMOVE_HEAD((head), field); \ + } \ + else { \ + struct type *curelm = STAILQ_FIRST((head)); \ + while (STAILQ_NEXT(curelm, field) != (elm)) \ + curelm = STAILQ_NEXT(curelm, field); \ + STAILQ_REMOVE_AFTER(head, curelm, field); \ + } \ + TRASHIT(*oldnext); \ +} while (0) + +#define STAILQ_REMOVE_AFTER(head, elm, field) do { \ + if ((STAILQ_NEXT(elm, field) = \ + STAILQ_NEXT(STAILQ_NEXT(elm, field), field)) == NULL) \ + (head)->stqh_last = &STAILQ_NEXT((elm), field); \ +} while (0) + +#define STAILQ_REMOVE_HEAD(head, field) do { \ + if ((STAILQ_FIRST((head)) = \ + STAILQ_NEXT(STAILQ_FIRST((head)), field)) == NULL) \ + (head)->stqh_last = &STAILQ_FIRST((head)); \ +} while (0) + +#define STAILQ_SWAP(head1, head2, type) do { \ + struct type *swap_first = STAILQ_FIRST(head1); \ + struct type **swap_last = (head1)->stqh_last; \ + STAILQ_FIRST(head1) = STAILQ_FIRST(head2); \ + (head1)->stqh_last = (head2)->stqh_last; \ + STAILQ_FIRST(head2) = swap_first; \ + (head2)->stqh_last = swap_last; \ + if (STAILQ_EMPTY(head1)) \ + (head1)->stqh_last = &STAILQ_FIRST(head1); \ + if (STAILQ_EMPTY(head2)) \ + (head2)->stqh_last = &STAILQ_FIRST(head2); \ +} while (0) + + +/* + * List declarations. + */ +#define LIST_HEAD(name, type) \ +struct name { \ + struct type *lh_first; /* first element */ \ +} + +#define LIST_HEAD_INITIALIZER(head) \ + { NULL } + +#define LIST_ENTRY(type) \ +struct { \ + struct type *le_next; /* next element */ \ + struct type **le_prev; /* address of previous next element */ \ +} + +/* + * List functions. + */ + +#if (defined(_KERNEL) && defined(INVARIANTS)) +#define QMD_LIST_CHECK_HEAD(head, field) do { \ + if (LIST_FIRST((head)) != NULL && \ + LIST_FIRST((head))->field.le_prev != \ + &LIST_FIRST((head))) \ + panic("Bad list head %p first->prev != head", (head)); \ +} while (0) + +#define QMD_LIST_CHECK_NEXT(elm, field) do { \ + if (LIST_NEXT((elm), field) != NULL && \ + LIST_NEXT((elm), field)->field.le_prev != \ + &((elm)->field.le_next)) \ + panic("Bad link elm %p next->prev != elm", (elm)); \ +} while (0) + +#define QMD_LIST_CHECK_PREV(elm, field) do { \ + if (*(elm)->field.le_prev != (elm)) \ + panic("Bad link elm %p prev->next != elm", (elm)); \ +} while (0) +#else +#define QMD_LIST_CHECK_HEAD(head, field) +#define QMD_LIST_CHECK_NEXT(elm, field) +#define QMD_LIST_CHECK_PREV(elm, field) +#endif /* (_KERNEL && INVARIANTS) */ + +#define LIST_EMPTY(head) ((head)->lh_first == NULL) + +#define LIST_FIRST(head) ((head)->lh_first) + +#define LIST_FOREACH(var, head, field) \ + for ((var) = LIST_FIRST((head)); \ + (var); \ + (var) = LIST_NEXT((var), field)) + +#define LIST_FOREACH_SAFE(var, head, field, tvar) \ + for ((var) = LIST_FIRST((head)); \ + (var) && ((tvar) = LIST_NEXT((var), field), 1); \ + (var) = (tvar)) + +#define LIST_INIT(head) do { \ + LIST_FIRST((head)) = NULL; \ +} while (0) + +#define LIST_INSERT_AFTER(listelm, elm, field) do { \ + QMD_LIST_CHECK_NEXT(listelm, field); \ + if ((LIST_NEXT((elm), field) = LIST_NEXT((listelm), field)) != NULL)\ + LIST_NEXT((listelm), field)->field.le_prev = \ + &LIST_NEXT((elm), field); \ + LIST_NEXT((listelm), field) = (elm); \ + (elm)->field.le_prev = &LIST_NEXT((listelm), field); \ +} while (0) + +#define LIST_INSERT_BEFORE(listelm, elm, field) do { \ + QMD_LIST_CHECK_PREV(listelm, field); \ + (elm)->field.le_prev = (listelm)->field.le_prev; \ + LIST_NEXT((elm), field) = (listelm); \ + *(listelm)->field.le_prev = (elm); \ + (listelm)->field.le_prev = &LIST_NEXT((elm), field); \ +} while (0) + +#define LIST_INSERT_HEAD(head, elm, field) do { \ + QMD_LIST_CHECK_HEAD((head), field); \ + if ((LIST_NEXT((elm), field) = LIST_FIRST((head))) != NULL) \ + LIST_FIRST((head))->field.le_prev = &LIST_NEXT((elm), field);\ + LIST_FIRST((head)) = (elm); \ + (elm)->field.le_prev = &LIST_FIRST((head)); \ +} while (0) + +#define LIST_NEXT(elm, field) ((elm)->field.le_next) + +#define LIST_REMOVE(elm, field) do { \ + QMD_SAVELINK(oldnext, (elm)->field.le_next); \ + QMD_SAVELINK(oldprev, (elm)->field.le_prev); \ + QMD_LIST_CHECK_NEXT(elm, field); \ + QMD_LIST_CHECK_PREV(elm, field); \ + if (LIST_NEXT((elm), field) != NULL) \ + LIST_NEXT((elm), field)->field.le_prev = \ + (elm)->field.le_prev; \ + *(elm)->field.le_prev = LIST_NEXT((elm), field); \ + TRASHIT(*oldnext); \ + TRASHIT(*oldprev); \ +} while (0) + +#define LIST_SWAP(head1, head2, type, field) do { \ + struct type *swap_tmp = LIST_FIRST((head1)); \ + LIST_FIRST((head1)) = LIST_FIRST((head2)); \ + LIST_FIRST((head2)) = swap_tmp; \ + if ((swap_tmp = LIST_FIRST((head1))) != NULL) \ + swap_tmp->field.le_prev = &LIST_FIRST((head1)); \ + if ((swap_tmp = LIST_FIRST((head2))) != NULL) \ + swap_tmp->field.le_prev = &LIST_FIRST((head2)); \ +} while (0) + +/* + * Tail queue declarations. + */ +#define TAILQ_HEAD(name, type) \ +struct name { \ + struct type *tqh_first; /* first element */ \ + struct type **tqh_last; /* addr of last next element */ \ + TRACEBUF \ +} + +#define TAILQ_HEAD_INITIALIZER(head) \ + { NULL, &(head).tqh_first } + +#define TAILQ_ENTRY(type) \ +struct { \ + struct type *tqe_next; /* next element */ \ + struct type **tqe_prev; /* address of previous next element */ \ + TRACEBUF \ +} + +/* + * Tail queue functions. + */ +#if (defined(_KERNEL) && defined(INVARIANTS)) +#define QMD_TAILQ_CHECK_HEAD(head, field) do { \ + if (!TAILQ_EMPTY(head) && \ + TAILQ_FIRST((head))->field.tqe_prev != \ + &TAILQ_FIRST((head))) \ + panic("Bad tailq head %p first->prev != head", (head)); \ +} while (0) + +#define QMD_TAILQ_CHECK_TAIL(head, field) do { \ + if (*(head)->tqh_last != NULL) \ + panic("Bad tailq NEXT(%p->tqh_last) != NULL", (head)); \ +} while (0) + +#define QMD_TAILQ_CHECK_NEXT(elm, field) do { \ + if (TAILQ_NEXT((elm), field) != NULL && \ + TAILQ_NEXT((elm), field)->field.tqe_prev != \ + &((elm)->field.tqe_next)) \ + panic("Bad link elm %p next->prev != elm", (elm)); \ +} while (0) + +#define QMD_TAILQ_CHECK_PREV(elm, field) do { \ + if (*(elm)->field.tqe_prev != (elm)) \ + panic("Bad link elm %p prev->next != elm", (elm)); \ +} while (0) +#else +#define QMD_TAILQ_CHECK_HEAD(head, field) +#define QMD_TAILQ_CHECK_TAIL(head, headname) +#define QMD_TAILQ_CHECK_NEXT(elm, field) +#define QMD_TAILQ_CHECK_PREV(elm, field) +#endif /* (_KERNEL && INVARIANTS) */ + +#define TAILQ_CONCAT(head1, head2, field) do { \ + if (!TAILQ_EMPTY(head2)) { \ + *(head1)->tqh_last = (head2)->tqh_first; \ + (head2)->tqh_first->field.tqe_prev = (head1)->tqh_last; \ + (head1)->tqh_last = (head2)->tqh_last; \ + TAILQ_INIT((head2)); \ + QMD_TRACE_HEAD(head1); \ + QMD_TRACE_HEAD(head2); \ + } \ +} while (0) + +#define TAILQ_EMPTY(head) ((head)->tqh_first == NULL) + +#define TAILQ_FIRST(head) ((head)->tqh_first) + +#define TAILQ_FOREACH(var, head, field) \ + for ((var) = TAILQ_FIRST((head)); \ + (var); \ + (var) = TAILQ_NEXT((var), field)) + +#define TAILQ_FOREACH_SAFE(var, head, field, tvar) \ + for ((var) = TAILQ_FIRST((head)); \ + (var) && ((tvar) = TAILQ_NEXT((var), field), 1); \ + (var) = (tvar)) + +#define TAILQ_FOREACH_REVERSE(var, head, headname, field) \ + for ((var) = TAILQ_LAST((head), headname); \ + (var); \ + (var) = TAILQ_PREV((var), headname, field)) + +#define TAILQ_FOREACH_REVERSE_SAFE(var, head, headname, field, tvar) \ + for ((var) = TAILQ_LAST((head), headname); \ + (var) && ((tvar) = TAILQ_PREV((var), headname, field), 1); \ + (var) = (tvar)) + +#define TAILQ_INIT(head) do { \ + TAILQ_FIRST((head)) = NULL; \ + (head)->tqh_last = &TAILQ_FIRST((head)); \ + QMD_TRACE_HEAD(head); \ +} while (0) + +#define TAILQ_INSERT_AFTER(head, listelm, elm, field) do { \ + QMD_TAILQ_CHECK_NEXT(listelm, field); \ + if ((TAILQ_NEXT((elm), field) = TAILQ_NEXT((listelm), field)) != NULL)\ + TAILQ_NEXT((elm), field)->field.tqe_prev = \ + &TAILQ_NEXT((elm), field); \ + else { \ + (head)->tqh_last = &TAILQ_NEXT((elm), field); \ + QMD_TRACE_HEAD(head); \ + } \ + TAILQ_NEXT((listelm), field) = (elm); \ + (elm)->field.tqe_prev = &TAILQ_NEXT((listelm), field); \ + QMD_TRACE_ELEM(&(elm)->field); \ + QMD_TRACE_ELEM(&listelm->field); \ +} while (0) + +#define TAILQ_INSERT_BEFORE(listelm, elm, field) do { \ + QMD_TAILQ_CHECK_PREV(listelm, field); \ + (elm)->field.tqe_prev = (listelm)->field.tqe_prev; \ + TAILQ_NEXT((elm), field) = (listelm); \ + *(listelm)->field.tqe_prev = (elm); \ + (listelm)->field.tqe_prev = &TAILQ_NEXT((elm), field); \ + QMD_TRACE_ELEM(&(elm)->field); \ + QMD_TRACE_ELEM(&listelm->field); \ +} while (0) + +#define TAILQ_INSERT_HEAD(head, elm, field) do { \ + QMD_TAILQ_CHECK_HEAD(head, field); \ + if ((TAILQ_NEXT((elm), field) = TAILQ_FIRST((head))) != NULL) \ + TAILQ_FIRST((head))->field.tqe_prev = \ + &TAILQ_NEXT((elm), field); \ + else \ + (head)->tqh_last = &TAILQ_NEXT((elm), field); \ + TAILQ_FIRST((head)) = (elm); \ + (elm)->field.tqe_prev = &TAILQ_FIRST((head)); \ + QMD_TRACE_HEAD(head); \ + QMD_TRACE_ELEM(&(elm)->field); \ +} while (0) + +#define TAILQ_INSERT_TAIL(head, elm, field) do { \ + QMD_TAILQ_CHECK_TAIL(head, field); \ + TAILQ_NEXT((elm), field) = NULL; \ + (elm)->field.tqe_prev = (head)->tqh_last; \ + *(head)->tqh_last = (elm); \ + (head)->tqh_last = &TAILQ_NEXT((elm), field); \ + QMD_TRACE_HEAD(head); \ + QMD_TRACE_ELEM(&(elm)->field); \ +} while (0) + +#define TAILQ_LAST(head, headname) \ + (*(((struct headname *)((head)->tqh_last))->tqh_last)) + +#define TAILQ_NEXT(elm, field) ((elm)->field.tqe_next) + +#define TAILQ_PREV(elm, headname, field) \ + (*(((struct headname *)((elm)->field.tqe_prev))->tqh_last)) + +#define TAILQ_REMOVE(head, elm, field) do { \ + QMD_SAVELINK(oldnext, (elm)->field.tqe_next); \ + QMD_SAVELINK(oldprev, (elm)->field.tqe_prev); \ + QMD_TAILQ_CHECK_NEXT(elm, field); \ + QMD_TAILQ_CHECK_PREV(elm, field); \ + if ((TAILQ_NEXT((elm), field)) != NULL) \ + TAILQ_NEXT((elm), field)->field.tqe_prev = \ + (elm)->field.tqe_prev; \ + else { \ + (head)->tqh_last = (elm)->field.tqe_prev; \ + QMD_TRACE_HEAD(head); \ + } \ + *(elm)->field.tqe_prev = TAILQ_NEXT((elm), field); \ + TRASHIT(*oldnext); \ + TRASHIT(*oldprev); \ + QMD_TRACE_ELEM(&(elm)->field); \ +} while (0) + +#define TAILQ_SWAP(head1, head2, type, field) do { \ + struct type *swap_first = (head1)->tqh_first; \ + struct type **swap_last = (head1)->tqh_last; \ + (head1)->tqh_first = (head2)->tqh_first; \ + (head1)->tqh_last = (head2)->tqh_last; \ + (head2)->tqh_first = swap_first; \ + (head2)->tqh_last = swap_last; \ + if ((swap_first = (head1)->tqh_first) != NULL) \ + swap_first->field.tqe_prev = &(head1)->tqh_first; \ + else \ + (head1)->tqh_last = &(head1)->tqh_first; \ + if ((swap_first = (head2)->tqh_first) != NULL) \ + swap_first->field.tqe_prev = &(head2)->tqh_first; \ + else \ + (head2)->tqh_last = &(head2)->tqh_first; \ +} while (0) + +#endif /* !_SYS_QUEUE_H_ */ diff -r 6c9a73817770 -r 934c14ab9f19 tools/libxl/Makefile --- a/tools/libxl/Makefile Tue Jan 31 11:39:37 2012 +0000 +++ b/tools/libxl/Makefile Tue Jan 31 16:06:14 2012 +0000 @@ -93,8 +93,8 @@ rm -f $@.tmp $(call move-if-changed,$@.2.tmp,$@) -_libxl_list.h: bsd-sys-queue-h-seddery external/bsd-sys-queue.h - perl ./$^ --prefix=libxl >$@.new +_libxl_list.h: $(XEN_INCLUDE)/xen-external/bsd-sys-queue-h-seddery $(XEN_INCLUDE)/xen-external/bsd-sys-queue.h + perl $^ --prefix=libxl >$@.new $(call move-if-changed,$@.new,$@) libxl_paths.c: _libxl_paths.h diff -r 6c9a73817770 -r 934c14ab9f19 tools/libxl/bsd-sys-queue-h-seddery --- a/tools/libxl/bsd-sys-queue-h-seddery Tue Jan 31 11:39:37 2012 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,70 +0,0 @@ -#!/usr/bin/perl -p -# -# This script is part of the Xen build system. It has a very -# permissive licence to avoid complicating the licence of the -# generated header file and to allow this seddery to be reused by -# other projects. -# -# Permission is hereby granted, free of charge, to any person -# obtaining a copy of this individual file (the "Software"), to deal -# in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, -# sublicense, and/or sell copies of the Software, and to permit -# persons to whom the Software is furnished to do so, subject to the -# following conditions: -# -# The above copyright notice and this permission notice shall be -# included in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS -# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN -# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. -# -# Copyright (C) 2011 Citrix Ltd - -our $namespace, $ucnamespace; - -BEGIN { - die unless @ARGV; - $namespace = pop @ARGV; - $namespace =~ s/^--prefix=// or die; - $ucnamespace = uc $namespace; - - print <tools/libxl/external/bsd-COPYRIGHT diff -r 6c9a73817770 -r 934c14ab9f19 tools/libxl/external/bsd-COPYRIGHT --- a/tools/libxl/external/bsd-COPYRIGHT Tue Jan 31 11:39:37 2012 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,126 +0,0 @@ -# $FreeBSD$ -# @(#)COPYRIGHT 8.2 (Berkeley) 3/21/94 - -The compilation of software known as FreeBSD is distributed under the -following terms: - -Copyright (c) 1992-2011 The FreeBSD Project. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -SUCH DAMAGE. - -The 4.4BSD and 4.4BSD-Lite software is distributed under the following -terms: - -All of the documentation and software included in the 4.4BSD and 4.4BSD-Lite -Releases is copyrighted by The Regents of the University of California. - -Copyright 1979, 1980, 1983, 1986, 1988, 1989, 1991, 1992, 1993, 1994 - The Regents of the University of California. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. -3. All advertising materials mentioning features or use of this software - must display the following acknowledgement: -This product includes software developed by the University of -California, Berkeley and its contributors. -4. Neither the name of the University nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -SUCH DAMAGE. - -The Institute of Electrical and Electronics Engineers and the American -National Standards Committee X3, on Information Processing Systems have -given us permission to reprint portions of their documentation. - -In the following statement, the phrase ``this text'' refers to portions -of the system documentation. - -Portions of this text are reprinted and reproduced in electronic form in -the second BSD Networking Software Release, from IEEE Std 1003.1-1988, IEEE -Standard Portable Operating System Interface for Computer Environments -(POSIX), copyright C 1988 by the Institute of Electrical and Electronics -Engineers, Inc. In the event of any discrepancy between these versions -and the original IEEE Standard, the original IEEE Standard is the referee -document. - -In the following statement, the phrase ``This material'' refers to portions -of the system documentation. - -This material is reproduced with permission from American National -Standards Committee X3, on Information Processing Systems. Computer and -Business Equipment Manufacturers Association (CBEMA), 311 First St., NW, -Suite 500, Washington, DC 20001-2178. The developmental work of -Programming Language C was completed by the X3J11 Technical Committee. - -The views and conclusions contained in the software and documentation are -those of the authors and should not be interpreted as representing official -policies, either expressed or implied, of the Regents of the University -of California. - - -NOTE: The copyright of UC Berkeley's Berkeley Software Distribution ("BSD") -source has been updated. The copyright addendum may be found at -ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change and is -included below. - -July 22, 1999 - -To All Licensees, Distributors of Any Version of BSD: - -As you know, certain of the Berkeley Software Distribution ("BSD") source -code files require that further distributions of products containing all or -portions of the software, acknowledge within their advertising materials -that such products contain software developed by UC Berkeley and its -contributors. - -Specifically, the provision reads: - -" * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors." - -Effective immediately, licensees and distributors are no longer required to -include the acknowledgement within advertising materials. Accordingly, the -foregoing paragraph of those BSD Unix files containing it is hereby deleted -in its entirety. - -William Hoskins -Director, Office of Technology Licensing -University of California, Berkeley diff -r 6c9a73817770 -r 934c14ab9f19 tools/libxl/external/bsd-queue.3 --- a/tools/libxl/external/bsd-queue.3 Tue Jan 31 11:39:37 2012 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1044 +0,0 @@ -.\" Copyright (c) 1993 -.\" The Regents of the University of California. All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" 3. All advertising materials mentioning features or use of this software -.\" must display the following acknowledgement: -.\" This product includes software developed by the University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors -.\" may be used to endorse or promote products derived from this software -.\" without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.\" @(#)queue.3 8.2 (Berkeley) 1/24/94 -.\" $FreeBSD$ -.\" -.Dd May 13, 2011 -.Dt QUEUE 3 -.Os -.Sh NAME -.Nm SLIST_EMPTY , -.Nm SLIST_ENTRY , -.Nm SLIST_FIRST , -.Nm SLIST_FOREACH , -.Nm SLIST_FOREACH_SAFE , -.Nm SLIST_HEAD , -.Nm SLIST_HEAD_INITIALIZER , -.Nm SLIST_INIT , -.Nm SLIST_INSERT_AFTER , -.Nm SLIST_INSERT_HEAD , -.Nm SLIST_NEXT , -.Nm SLIST_REMOVE_AFTER , -.Nm SLIST_REMOVE_HEAD , -.Nm SLIST_REMOVE , -.Nm SLIST_SWAP , -.Nm STAILQ_CONCAT , -.Nm STAILQ_EMPTY , -.Nm STAILQ_ENTRY , -.Nm STAILQ_FIRST , -.Nm STAILQ_FOREACH , -.Nm STAILQ_FOREACH_SAFE , -.Nm STAILQ_HEAD , -.Nm STAILQ_HEAD_INITIALIZER , -.Nm STAILQ_INIT , -.Nm STAILQ_INSERT_AFTER , -.Nm STAILQ_INSERT_HEAD , -.Nm STAILQ_INSERT_TAIL , -.Nm STAILQ_LAST , -.Nm STAILQ_NEXT , -.Nm STAILQ_REMOVE_AFTER , -.Nm STAILQ_REMOVE_HEAD , -.Nm STAILQ_REMOVE , -.Nm STAILQ_SWAP , -.Nm LIST_EMPTY , -.Nm LIST_ENTRY , -.Nm LIST_FIRST , -.Nm LIST_FOREACH , -.Nm LIST_FOREACH_SAFE , -.Nm LIST_HEAD , -.Nm LIST_HEAD_INITIALIZER , -.Nm LIST_INIT , -.Nm LIST_INSERT_AFTER , -.Nm LIST_INSERT_BEFORE , -.Nm LIST_INSERT_HEAD , -.Nm LIST_NEXT , -.Nm LIST_REMOVE , -.Nm LIST_SWAP , -.Nm TAILQ_CONCAT , -.Nm TAILQ_EMPTY , -.Nm TAILQ_ENTRY , -.Nm TAILQ_FIRST , -.Nm TAILQ_FOREACH , -.Nm TAILQ_FOREACH_SAFE , -.Nm TAILQ_FOREACH_REVERSE , -.Nm TAILQ_FOREACH_REVERSE_SAFE , -.Nm TAILQ_HEAD , -.Nm TAILQ_HEAD_INITIALIZER , -.Nm TAILQ_INIT , -.Nm TAILQ_INSERT_AFTER , -.Nm TAILQ_INSERT_BEFORE , -.Nm TAILQ_INSERT_HEAD , -.Nm TAILQ_INSERT_TAIL , -.Nm TAILQ_LAST , -.Nm TAILQ_NEXT , -.Nm TAILQ_PREV , -.Nm TAILQ_REMOVE , -.Nm TAILQ_SWAP -.Nd implementations of singly-linked lists, singly-linked tail queues, -lists and tail queues -.Sh SYNOPSIS -.In sys/queue.h -.\" -.Fn SLIST_EMPTY "SLIST_HEAD *head" -.Fn SLIST_ENTRY "TYPE" -.Fn SLIST_FIRST "SLIST_HEAD *head" -.Fn SLIST_FOREACH "TYPE *var" "SLIST_HEAD *head" "SLIST_ENTRY NAME" -.Fn SLIST_FOREACH_SAFE "TYPE *var" "SLIST_HEAD *head" "SLIST_ENTRY NAME" "TYPE *temp_var" -.Fn SLIST_HEAD "HEADNAME" "TYPE" -.Fn SLIST_HEAD_INITIALIZER "SLIST_HEAD head" -.Fn SLIST_INIT "SLIST_HEAD *head" -.Fn SLIST_INSERT_AFTER "TYPE *listelm" "TYPE *elm" "SLIST_ENTRY NAME" -.Fn SLIST_INSERT_HEAD "SLIST_HEAD *head" "TYPE *elm" "SLIST_ENTRY NAME" -.Fn SLIST_NEXT "TYPE *elm" "SLIST_ENTRY NAME" -.Fn SLIST_REMOVE_AFTER "TYPE *elm" "SLIST_ENTRY NAME" -.Fn SLIST_REMOVE_HEAD "SLIST_HEAD *head" "SLIST_ENTRY NAME" -.Fn SLIST_REMOVE "SLIST_HEAD *head" "TYPE *elm" "TYPE" "SLIST_ENTRY NAME" -.Fn SLIST_SWAP "SLIST_HEAD *head1" "SLIST_HEAD *head2" "SLIST_ENTRY NAME" -.\" -.Fn STAILQ_CONCAT "STAILQ_HEAD *head1" "STAILQ_HEAD *head2" -.Fn STAILQ_EMPTY "STAILQ_HEAD *head" -.Fn STAILQ_ENTRY "TYPE" -.Fn STAILQ_FIRST "STAILQ_HEAD *head" -.Fn STAILQ_FOREACH "TYPE *var" "STAILQ_HEAD *head" "STAILQ_ENTRY NAME" -.Fn STAILQ_FOREACH_SAFE "TYPE *var" "STAILQ_HEAD *head" "STAILQ_ENTRY NAME" "TYPE *temp_var" -.Fn STAILQ_HEAD "HEADNAME" "TYPE" -.Fn STAILQ_HEAD_INITIALIZER "STAILQ_HEAD head" -.Fn STAILQ_INIT "STAILQ_HEAD *head" -.Fn STAILQ_INSERT_AFTER "STAILQ_HEAD *head" "TYPE *listelm" "TYPE *elm" "STAILQ_ENTRY NAME" -.Fn STAILQ_INSERT_HEAD "STAILQ_HEAD *head" "TYPE *elm" "STAILQ_ENTRY NAME" -.Fn STAILQ_INSERT_TAIL "STAILQ_HEAD *head" "TYPE *elm" "STAILQ_ENTRY NAME" -.Fn STAILQ_LAST "STAILQ_HEAD *head" "TYPE" "STAILQ_ENTRY NAME" -.Fn STAILQ_NEXT "TYPE *elm" "STAILQ_ENTRY NAME" -.Fn STAILQ_REMOVE_AFTER "STAILQ_HEAD *head" "TYPE *elm" "STAILQ_ENTRY NAME" -.Fn STAILQ_REMOVE_HEAD "STAILQ_HEAD *head" "STAILQ_ENTRY NAME" -.Fn STAILQ_REMOVE "STAILQ_HEAD *head" "TYPE *elm" "TYPE" "STAILQ_ENTRY NAME" -.Fn STAILQ_SWAP "STAILQ_HEAD *head1" "STAILQ_HEAD *head2" "STAILQ_ENTRY NAME" -.\" -.Fn LIST_EMPTY "LIST_HEAD *head" -.Fn LIST_ENTRY "TYPE" -.Fn LIST_FIRST "LIST_HEAD *head" -.Fn LIST_FOREACH "TYPE *var" "LIST_HEAD *head" "LIST_ENTRY NAME" -.Fn LIST_FOREACH_SAFE "TYPE *var" "LIST_HEAD *head" "LIST_ENTRY NAME" "TYPE *temp_var" -.Fn LIST_HEAD "HEADNAME" "TYPE" -.Fn LIST_HEAD_INITIALIZER "LIST_HEAD head" -.Fn LIST_INIT "LIST_HEAD *head" -.Fn LIST_INSERT_AFTER "TYPE *listelm" "TYPE *elm" "LIST_ENTRY NAME" -.Fn LIST_INSERT_BEFORE "TYPE *listelm" "TYPE *elm" "LIST_ENTRY NAME" -.Fn LIST_INSERT_HEAD "LIST_HEAD *head" "TYPE *elm" "LIST_ENTRY NAME" -.Fn LIST_NEXT "TYPE *elm" "LIST_ENTRY NAME" -.Fn LIST_REMOVE "TYPE *elm" "LIST_ENTRY NAME" -.Fn LIST_SWAP "LIST_HEAD *head1" "LIST_HEAD *head2" "TYPE" "LIST_ENTRY NAME" -.\" -.Fn TAILQ_CONCAT "TAILQ_HEAD *head1" "TAILQ_HEAD *head2" "TAILQ_ENTRY NAME" -.Fn TAILQ_EMPTY "TAILQ_HEAD *head" -.Fn TAILQ_ENTRY "TYPE" -.Fn TAILQ_FIRST "TAILQ_HEAD *head" -.Fn TAILQ_FOREACH "TYPE *var" "TAILQ_HEAD *head" "TAILQ_ENTRY NAME" -.Fn TAILQ_FOREACH_SAFE "TYPE *var" "TAILQ_HEAD *head" "TAILQ_ENTRY NAME" "TYPE *temp_var" -.Fn TAILQ_FOREACH_REVERSE "TYPE *var" "TAILQ_HEAD *head" "HEADNAME" "TAILQ_ENTRY NAME" -.Fn TAILQ_FOREACH_REVERSE_SAFE "TYPE *var" "TAILQ_HEAD *head" "HEADNAME" "TAILQ_ENTRY NAME" "TYPE *temp_var" -.Fn TAILQ_HEAD "HEADNAME" "TYPE" -.Fn TAILQ_HEAD_INITIALIZER "TAILQ_HEAD head" -.Fn TAILQ_INIT "TAILQ_HEAD *head" -.Fn TAILQ_INSERT_AFTER "TAILQ_HEAD *head" "TYPE *listelm" "TYPE *elm" "TAILQ_ENTRY NAME" -.Fn TAILQ_INSERT_BEFORE "TYPE *listelm" "TYPE *elm" "TAILQ_ENTRY NAME" -.Fn TAILQ_INSERT_HEAD "TAILQ_HEAD *head" "TYPE *elm" "TAILQ_ENTRY NAME" -.Fn TAILQ_INSERT_TAIL "TAILQ_HEAD *head" "TYPE *elm" "TAILQ_ENTRY NAME" -.Fn TAILQ_LAST "TAILQ_HEAD *head" "HEADNAME" -.Fn TAILQ_NEXT "TYPE *elm" "TAILQ_ENTRY NAME" -.Fn TAILQ_PREV "TYPE *elm" "HEADNAME" "TAILQ_ENTRY NAME" -.Fn TAILQ_REMOVE "TAILQ_HEAD *head" "TYPE *elm" "TAILQ_ENTRY NAME" -.Fn TAILQ_SWAP "TAILQ_HEAD *head1" "TAILQ_HEAD *head2" "TYPE" "TAILQ_ENTRY NAME" -.\" -.Sh DESCRIPTION -These macros define and operate on four types of data structures: -singly-linked lists, singly-linked tail queues, lists, and tail queues. -All four structures support the following functionality: -.Bl -enum -compact -offset indent -.It -Insertion of a new entry at the head of the list. -.It -Insertion of a new entry after any element in the list. -.It -O(1) removal of an entry from the head of the list. -.It -Forward traversal through the list. -.It -Swawpping the contents of two lists. -.El -.Pp -Singly-linked lists are the simplest of the four data structures -and support only the above functionality. -Singly-linked lists are ideal for applications with large datasets -and few or no removals, -or for implementing a LIFO queue. -Singly-linked lists add the following functionality: -.Bl -enum -compact -offset indent -.It -O(n) removal of any entry in the list. -.El -.Pp -Singly-linked tail queues add the following functionality: -.Bl -enum -compact -offset indent -.It -Entries can be added at the end of a list. -.It -O(n) removal of any entry in the list. -.It -They may be concatenated. -.El -However: -.Bl -enum -compact -offset indent -.It -All list insertions must specify the head of the list. -.It -Each head entry requires two pointers rather than one. -.It -Code size is about 15% greater and operations run about 20% slower -than singly-linked lists. -.El -.Pp -Singly-linked tailqs are ideal for applications with large datasets and -few or no removals, -or for implementing a FIFO queue. -.Pp -All doubly linked types of data structures (lists and tail queues) -additionally allow: -.Bl -enum -compact -offset indent -.It -Insertion of a new entry before any element in the list. -.It -O(1) removal of any entry in the list. -.El -However: -.Bl -enum -compact -offset indent -.It -Each element requires two pointers rather than one. -.It -Code size and execution time of operations (except for removal) is about -twice that of the singly-linked data-structures. -.El -.Pp -Linked lists are the simplest of the doubly linked data structures and support -only the above functionality over singly-linked lists. -.Pp -Tail queues add the following functionality: -.Bl -enum -compact -offset indent -.It -Entries can be added at the end of a list. -.It -They may be traversed backwards, from tail to head. -.It -They may be concatenated. -.El -However: -.Bl -enum -compact -offset indent -.It -All list insertions and removals must specify the head of the list. -.It -Each head entry requires two pointers rather than one. -.It -Code size is about 15% greater and operations run about 20% slower -than singly-linked lists. -.El -.Pp -In the macro definitions, -.Fa TYPE -is the name of a user defined structure, -that must contain a field of type -.Li SLIST_ENTRY , -.Li STAILQ_ENTRY , -.Li LIST_ENTRY , -or -.Li TAILQ_ENTRY , -named -.Fa NAME . -The argument -.Fa HEADNAME -is the name of a user defined structure that must be declared -using the macros -.Li SLIST_HEAD , -.Li STAILQ_HEAD , -.Li LIST_HEAD , -or -.Li TAILQ_HEAD . -See the examples below for further explanation of how these -macros are used. -.Sh SINGLY-LINKED LISTS -A singly-linked list is headed by a structure defined by the -.Nm SLIST_HEAD -macro. -This structure contains a single pointer to the first element -on the list. -The elements are singly linked for minimum space and pointer manipulation -overhead at the expense of O(n) removal for arbitrary elements. -New elements can be added to the list after an existing element or -at the head of the list. -An -.Fa SLIST_HEAD -structure is declared as follows: -.Bd -literal -offset indent -SLIST_HEAD(HEADNAME, TYPE) head; -.Ed -.Pp -where -.Fa HEADNAME -is the name of the structure to be defined, and -.Fa TYPE -is the type of the elements to be linked into the list. -A pointer to the head of the list can later be declared as: -.Bd -literal -offset indent -struct HEADNAME *headp; -.Ed -.Pp -(The names -.Li head -and -.Li headp -are user selectable.) -.Pp -The macro -.Nm SLIST_HEAD_INITIALIZER -evaluates to an initializer for the list -.Fa head . -.Pp -The macro -.Nm SLIST_EMPTY -evaluates to true if there are no elements in the list. -.Pp -The macro -.Nm SLIST_ENTRY -declares a structure that connects the elements in -the list. -.Pp -The macro -.Nm SLIST_FIRST -returns the first element in the list or NULL if the list is empty. -.Pp -The macro -.Nm SLIST_FOREACH -traverses the list referenced by -.Fa head -in the forward direction, assigning each element in -turn to -.Fa var . -.Pp -The macro -.Nm SLIST_FOREACH_SAFE -traverses the list referenced by -.Fa head -in the forward direction, assigning each element in -turn to -.Fa var . -However, unlike -.Fn SLIST_FOREACH -here it is permitted to both remove -.Fa var -as well as free it from within the loop safely without interfering with the -traversal. -.Pp -The macro -.Nm SLIST_INIT -initializes the list referenced by -.Fa head . -.Pp -The macro -.Nm SLIST_INSERT_HEAD -inserts the new element -.Fa elm -at the head of the list. -.Pp -The macro -.Nm SLIST_INSERT_AFTER -inserts the new element -.Fa elm -after the element -.Fa listelm . -.Pp -The macro -.Nm SLIST_NEXT -returns the next element in the list. -.Pp -The macro -.Nm SLIST_REMOVE_AFTER -removes the element after -.Fa elm -from the list. Unlike -.Fa SLIST_REMOVE , -this macro does not traverse the entire list. -.Pp -The macro -.Nm SLIST_REMOVE_HEAD -removes the element -.Fa elm -from the head of the list. -For optimum efficiency, -elements being removed from the head of the list should explicitly use -this macro instead of the generic -.Fa SLIST_REMOVE -macro. -.Pp -The macro -.Nm SLIST_REMOVE -removes the element -.Fa elm -from the list. -.Pp -The macro -.Nm SLIST_SWAP -swaps the contents of -.Fa head1 -and -.Fa head2 . -.Sh SINGLY-LINKED LIST EXAMPLE -.Bd -literal -SLIST_HEAD(slisthead, entry) head = - SLIST_HEAD_INITIALIZER(head); -struct slisthead *headp; /* Singly-linked List head. */ -struct entry { - ... - SLIST_ENTRY(entry) entries; /* Singly-linked List. */ - ... -} *n1, *n2, *n3, *np; - -SLIST_INIT(&head); /* Initialize the list. */ - -n1 = malloc(sizeof(struct entry)); /* Insert at the head. */ -SLIST_INSERT_HEAD(&head, n1, entries); - -n2 = malloc(sizeof(struct entry)); /* Insert after. */ -SLIST_INSERT_AFTER(n1, n2, entries); - -SLIST_REMOVE(&head, n2, entry, entries);/* Deletion. */ -free(n2); - -n3 = SLIST_FIRST(&head); -SLIST_REMOVE_HEAD(&head, entries); /* Deletion from the head. */ -free(n3); - /* Forward traversal. */ -SLIST_FOREACH(np, &head, entries) - np-> ... - /* Safe forward traversal. */ -SLIST_FOREACH_SAFE(np, &head, entries, np_temp) { - np->do_stuff(); - ... - SLIST_REMOVE(&head, np, entry, entries); - free(np); -} - -while (!SLIST_EMPTY(&head)) { /* List Deletion. */ - n1 = SLIST_FIRST(&head); - SLIST_REMOVE_HEAD(&head, entries); - free(n1); -} -.Ed -.Sh SINGLY-LINKED TAIL QUEUES -A singly-linked tail queue is headed by a structure defined by the -.Nm STAILQ_HEAD -macro. -This structure contains a pair of pointers, -one to the first element in the tail queue and the other to -the last element in the tail queue. -The elements are singly linked for minimum space and pointer -manipulation overhead at the expense of O(n) removal for arbitrary -elements. -New elements can be added to the tail queue after an existing element, -at the head of the tail queue, or at the end of the tail queue. -A -.Fa STAILQ_HEAD -structure is declared as follows: -.Bd -literal -offset indent -STAILQ_HEAD(HEADNAME, TYPE) head; -.Ed -.Pp -where -.Li HEADNAME -is the name of the structure to be defined, and -.Li TYPE -is the type of the elements to be linked into the tail queue. -A pointer to the head of the tail queue can later be declared as: -.Bd -literal -offset indent -struct HEADNAME *headp; -.Ed -.Pp -(The names -.Li head -and -.Li headp -are user selectable.) -.Pp -The macro -.Nm STAILQ_HEAD_INITIALIZER -evaluates to an initializer for the tail queue -.Fa head . -.Pp -The macro -.Nm STAILQ_CONCAT -concatenates the tail queue headed by -.Fa head2 -onto the end of the one headed by -.Fa head1 -removing all entries from the former. -.Pp -The macro -.Nm STAILQ_EMPTY -evaluates to true if there are no items on the tail queue. -.Pp -The macro -.Nm STAILQ_ENTRY -declares a structure that connects the elements in -the tail queue. -.Pp -The macro -.Nm STAILQ_FIRST -returns the first item on the tail queue or NULL if the tail queue -is empty. -.Pp -The macro -.Nm STAILQ_FOREACH -traverses the tail queue referenced by -.Fa head -in the forward direction, assigning each element -in turn to -.Fa var . -.Pp -The macro -.Nm STAILQ_FOREACH_SAFE -traverses the tail queue referenced by -.Fa head -in the forward direction, assigning each element -in turn to -.Fa var . -However, unlike -.Fn STAILQ_FOREACH -here it is permitted to both remove -.Fa var -as well as free it from within the loop safely without interfering with the -traversal. -.Pp -The macro -.Nm STAILQ_INIT -initializes the tail queue referenced by -.Fa head . -.Pp -The macro -.Nm STAILQ_INSERT_HEAD -inserts the new element -.Fa elm -at the head of the tail queue. -.Pp -The macro -.Nm STAILQ_INSERT_TAIL -inserts the new element -.Fa elm -at the end of the tail queue. -.Pp -The macro -.Nm STAILQ_INSERT_AFTER -inserts the new element -.Fa elm -after the element -.Fa listelm . -.Pp -The macro -.Nm STAILQ_LAST -returns the last item on the tail queue. -If the tail queue is empty the return value is -.Dv NULL . -.Pp -The macro -.Nm STAILQ_NEXT -returns the next item on the tail queue, or NULL this item is the last. -.Pp -The macro -.Nm STAILQ_REMOVE_AFTER -removes the element after -.Fa elm -from the tail queue. Unlike -.Fa STAILQ_REMOVE , -this macro does not traverse the entire tail queue. -.Pp -The macro -.Nm STAILQ_REMOVE_HEAD -removes the element at the head of the tail queue. -For optimum efficiency, -elements being removed from the head of the tail queue should -use this macro explicitly rather than the generic -.Fa STAILQ_REMOVE -macro. -.Pp -The macro -.Nm STAILQ_REMOVE -removes the element -.Fa elm -from the tail queue. -.Pp -The macro -.Nm STAILQ_SWAP -swaps the contents of -.Fa head1 -and -.Fa head2 . -.Sh SINGLY-LINKED TAIL QUEUE EXAMPLE -.Bd -literal -STAILQ_HEAD(stailhead, entry) head = - STAILQ_HEAD_INITIALIZER(head); -struct stailhead *headp; /* Singly-linked tail queue head. */ -struct entry { - ... - STAILQ_ENTRY(entry) entries; /* Tail queue. */ - ... -} *n1, *n2, *n3, *np; - -STAILQ_INIT(&head); /* Initialize the queue. */ - -n1 = malloc(sizeof(struct entry)); /* Insert at the head. */ -STAILQ_INSERT_HEAD(&head, n1, entries); - -n1 = malloc(sizeof(struct entry)); /* Insert at the tail. */ -STAILQ_INSERT_TAIL(&head, n1, entries); - -n2 = malloc(sizeof(struct entry)); /* Insert after. */ -STAILQ_INSERT_AFTER(&head, n1, n2, entries); - /* Deletion. */ -STAILQ_REMOVE(&head, n2, entry, entries); -free(n2); - /* Deletion from the head. */ -n3 = STAILQ_FIRST(&head); -STAILQ_REMOVE_HEAD(&head, entries); -free(n3); - /* Forward traversal. */ -STAILQ_FOREACH(np, &head, entries) - np-> ... - /* Safe forward traversal. */ -STAILQ_FOREACH_SAFE(np, &head, entries, np_temp) { - np->do_stuff(); - ... - STAILQ_REMOVE(&head, np, entry, entries); - free(np); -} - /* TailQ Deletion. */ -while (!STAILQ_EMPTY(&head)) { - n1 = STAILQ_FIRST(&head); - STAILQ_REMOVE_HEAD(&head, entries); - free(n1); -} - /* Faster TailQ Deletion. */ -n1 = STAILQ_FIRST(&head); -while (n1 != NULL) { - n2 = STAILQ_NEXT(n1, entries); - free(n1); - n1 = n2; -} -STAILQ_INIT(&head); -.Ed -.Sh LISTS -A list is headed by a structure defined by the -.Nm LIST_HEAD -macro. -This structure contains a single pointer to the first element -on the list. -The elements are doubly linked so that an arbitrary element can be -removed without traversing the list. -New elements can be added to the list after an existing element, -before an existing element, or at the head of the list. -A -.Fa LIST_HEAD -structure is declared as follows: -.Bd -literal -offset indent -LIST_HEAD(HEADNAME, TYPE) head; -.Ed -.Pp -where -.Fa HEADNAME -is the name of the structure to be defined, and -.Fa TYPE -is the type of the elements to be linked into the list. -A pointer to the head of the list can later be declared as: -.Bd -literal -offset indent -struct HEADNAME *headp; -.Ed -.Pp -(The names -.Li head -and -.Li headp -are user selectable.) -.Pp -The macro -.Nm LIST_HEAD_INITIALIZER -evaluates to an initializer for the list -.Fa head . -.Pp -The macro -.Nm LIST_EMPTY -evaluates to true if there are no elements in the list. -.Pp -The macro -.Nm LIST_ENTRY -declares a structure that connects the elements in -the list. -.Pp -The macro -.Nm LIST_FIRST -returns the first element in the list or NULL if the list -is empty. -.Pp -The macro -.Nm LIST_FOREACH -traverses the list referenced by -.Fa head -in the forward direction, assigning each element in turn to -.Fa var . -.Pp -The macro -.Nm LIST_FOREACH_SAFE -traverses the list referenced by -.Fa head -in the forward direction, assigning each element in turn to -.Fa var . -However, unlike -.Fn LIST_FOREACH -here it is permitted to both remove -.Fa var -as well as free it from within the loop safely without interfering with the -traversal. -.Pp -The macro -.Nm LIST_INIT -initializes the list referenced by -.Fa head . -.Pp -The macro -.Nm LIST_INSERT_HEAD -inserts the new element -.Fa elm -at the head of the list. -.Pp -The macro -.Nm LIST_INSERT_AFTER -inserts the new element -.Fa elm -after the element -.Fa listelm . -.Pp -The macro -.Nm LIST_INSERT_BEFORE -inserts the new element -.Fa elm -before the element -.Fa listelm . -.Pp -The macro -.Nm LIST_NEXT -returns the next element in the list, or NULL if this is the last. -.Pp -The macro -.Nm LIST_REMOVE -removes the element -.Fa elm -from the list. -.Pp -The macro -.Nm LIST_SWAP -swaps the contents of -.Fa head1 -and -.Fa head2 . -.Sh LIST EXAMPLE -.Bd -literal -LIST_HEAD(listhead, entry) head = - LIST_HEAD_INITIALIZER(head); -struct listhead *headp; /* List head. */ -struct entry { - ... - LIST_ENTRY(entry) entries; /* List. */ - ... -} *n1, *n2, *n3, *np, *np_temp; - -LIST_INIT(&head); /* Initialize the list. */ - -n1 = malloc(sizeof(struct entry)); /* Insert at the head. */ -LIST_INSERT_HEAD(&head, n1, entries); - -n2 = malloc(sizeof(struct entry)); /* Insert after. */ -LIST_INSERT_AFTER(n1, n2, entries); - -n3 = malloc(sizeof(struct entry)); /* Insert before. */ -LIST_INSERT_BEFORE(n2, n3, entries); - -LIST_REMOVE(n2, entries); /* Deletion. */ -free(n2); - /* Forward traversal. */ -LIST_FOREACH(np, &head, entries) - np-> ... - - /* Safe forward traversal. */ -LIST_FOREACH_SAFE(np, &head, entries, np_temp) { - np->do_stuff(); - ... - LIST_REMOVE(np, entries); - free(np); -} - -while (!LIST_EMPTY(&head)) { /* List Deletion. */ - n1 = LIST_FIRST(&head); - LIST_REMOVE(n1, entries); - free(n1); -} - -n1 = LIST_FIRST(&head); /* Faster List Deletion. */ -while (n1 != NULL) { - n2 = LIST_NEXT(n1, entries); - free(n1); - n1 = n2; -} -LIST_INIT(&head); -.Ed -.Sh TAIL QUEUES -A tail queue is headed by a structure defined by the -.Nm TAILQ_HEAD -macro. -This structure contains a pair of pointers, -one to the first element in the tail queue and the other to -the last element in the tail queue. -The elements are doubly linked so that an arbitrary element can be -removed without traversing the tail queue. -New elements can be added to the tail queue after an existing element, -before an existing element, at the head of the tail queue, -or at the end of the tail queue. -A -.Fa TAILQ_HEAD -structure is declared as follows: -.Bd -literal -offset indent -TAILQ_HEAD(HEADNAME, TYPE) head; -.Ed -.Pp -where -.Li HEADNAME -is the name of the structure to be defined, and -.Li TYPE -is the type of the elements to be linked into the tail queue. -A pointer to the head of the tail queue can later be declared as: -.Bd -literal -offset indent -struct HEADNAME *headp; -.Ed -.Pp -(The names -.Li head -and -.Li headp -are user selectable.) -.Pp -The macro -.Nm TAILQ_HEAD_INITIALIZER -evaluates to an initializer for the tail queue -.Fa head . -.Pp -The macro -.Nm TAILQ_CONCAT -concatenates the tail queue headed by -.Fa head2 -onto the end of the one headed by -.Fa head1 -removing all entries from the former. -.Pp -The macro -.Nm TAILQ_EMPTY -evaluates to true if there are no items on the tail queue. -.Pp -The macro -.Nm TAILQ_ENTRY -declares a structure that connects the elements in -the tail queue. -.Pp -The macro -.Nm TAILQ_FIRST -returns the first item on the tail queue or NULL if the tail queue -is empty. -.Pp -The macro -.Nm TAILQ_FOREACH -traverses the tail queue referenced by -.Fa head -in the forward direction, assigning each element in turn to -.Fa var . -.Fa var -is set to -.Dv NULL -if the loop completes normally, or if there were no elements. -.Pp -The macro -.Nm TAILQ_FOREACH_REVERSE -traverses the tail queue referenced by -.Fa head -in the reverse direction, assigning each element in turn to -.Fa var . -.Pp -The macros -.Nm TAILQ_FOREACH_SAFE -and -.Nm TAILQ_FOREACH_REVERSE_SAFE -traverse the list referenced by -.Fa head -in the forward or reverse direction respectively, -assigning each element in turn to -.Fa var . -However, unlike their unsafe counterparts, -.Nm TAILQ_FOREACH -and -.Nm TAILQ_FOREACH_REVERSE -permit to both remove -.Fa var -as well as free it from within the loop safely without interfering with the -traversal. -.Pp -The macro -.Nm TAILQ_INIT -initializes the tail queue referenced by -.Fa head . -.Pp -The macro -.Nm TAILQ_INSERT_HEAD -inserts the new element -.Fa elm -at the head of the tail queue. -.Pp -The macro -.Nm TAILQ_INSERT_TAIL -inserts the new element -.Fa elm -at the end of the tail queue. -.Pp -The macro -.Nm TAILQ_INSERT_AFTER -inserts the new element -.Fa elm -after the element -.Fa listelm . -.Pp -The macro -.Nm TAILQ_INSERT_BEFORE -inserts the new element -.Fa elm -before the element -.Fa listelm . -.Pp -The macro -.Nm TAILQ_LAST -returns the last item on the tail queue. -If the tail queue is empty the return value is -.Dv NULL . -.Pp -The macro -.Nm TAILQ_NEXT -returns the next item on the tail queue, or NULL if this item is the last. -.Pp -The macro -.Nm TAILQ_PREV -returns the previous item on the tail queue, or NULL if this item -is the first. -.Pp -The macro -.Nm TAILQ_REMOVE -removes the element -.Fa elm -from the tail queue. -.Pp -The macro -.Nm TAILQ_SWAP -swaps the contents of -.Fa head1 -and -.Fa head2 . -.Sh TAIL QUEUE EXAMPLE -.Bd -literal -TAILQ_HEAD(tailhead, entry) head = - TAILQ_HEAD_INITIALIZER(head); -struct tailhead *headp; /* Tail queue head. */ -struct entry { - ... - TAILQ_ENTRY(entry) entries; /* Tail queue. */ - ... -} *n1, *n2, *n3, *np; - -TAILQ_INIT(&head); /* Initialize the queue. */ - -n1 = malloc(sizeof(struct entry)); /* Insert at the head. */ -TAILQ_INSERT_HEAD(&head, n1, entries); - -n1 = malloc(sizeof(struct entry)); /* Insert at the tail. */ -TAILQ_INSERT_TAIL(&head, n1, entries); - -n2 = malloc(sizeof(struct entry)); /* Insert after. */ -TAILQ_INSERT_AFTER(&head, n1, n2, entries); - -n3 = malloc(sizeof(struct entry)); /* Insert before. */ -TAILQ_INSERT_BEFORE(n2, n3, entries); - -TAILQ_REMOVE(&head, n2, entries); /* Deletion. */ -free(n2); - /* Forward traversal. */ -TAILQ_FOREACH(np, &head, entries) - np-> ... - /* Safe forward traversal. */ -TAILQ_FOREACH_SAFE(np, &head, entries, np_temp) { - np->do_stuff(); - ... - TAILQ_REMOVE(&head, np, entries); - free(np); -} - /* Reverse traversal. */ -TAILQ_FOREACH_REVERSE(np, &head, tailhead, entries) - np-> ... - /* TailQ Deletion. */ -while (!TAILQ_EMPTY(&head)) { - n1 = TAILQ_FIRST(&head); - TAILQ_REMOVE(&head, n1, entries); - free(n1); -} - /* Faster TailQ Deletion. */ -n1 = TAILQ_FIRST(&head); -while (n1 != NULL) { - n2 = TAILQ_NEXT(n1, entries); - free(n1); - n1 = n2; -} -TAILQ_INIT(&head); -.Ed -.Sh SEE ALSO -.Xr tree 3 -.Sh HISTORY -The -.Nm queue -functions first appeared in -.Bx 4.4 . diff -r 6c9a73817770 -r 934c14ab9f19 tools/libxl/external/bsd-sys-queue.h --- a/tools/libxl/external/bsd-sys-queue.h Tue Jan 31 11:39:37 2012 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,637 +0,0 @@ -/*- - * Copyright (c) 1991, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)queue.h 8.5 (Berkeley) 8/20/94 - * $FreeBSD$ - */ - -#ifndef _SYS_QUEUE_H_ -#define _SYS_QUEUE_H_ - -#include - -/* - * This file defines four types of data structures: singly-linked lists, - * singly-linked tail queues, lists and tail queues. - * - * A singly-linked list is headed by a single forward pointer. The elements - * are singly linked for minimum space and pointer manipulation overhead at - * the expense of O(n) removal for arbitrary elements. New elements can be - * added to the list after an existing element or at the head of the list. - * Elements being removed from the head of the list should use the explicit - * macro for this purpose for optimum efficiency. A singly-linked list may - * only be traversed in the forward direction. Singly-linked lists are ideal - * for applications with large datasets and few or no removals or for - * implementing a LIFO queue. - * - * A singly-linked tail queue is headed by a pair of pointers, one to the - * head of the list and the other to the tail of the list. The elements are - * singly linked for minimum space and pointer manipulation overhead at the - * expense of O(n) removal for arbitrary elements. New elements can be added - * to the list after an existing element, at the head of the list, or at the - * end of the list. Elements being removed from the head of the tail queue - * should use the explicit macro for this purpose for optimum efficiency. - * A singly-linked tail queue may only be traversed in the forward direction. - * Singly-linked tail queues are ideal for applications with large datasets - * and few or no removals or for implementing a FIFO queue. - * - * A list is headed by a single forward pointer (or an array of forward - * pointers for a hash table header). The elements are doubly linked - * so that an arbitrary element can be removed without a need to - * traverse the list. New elements can be added to the list before - * or after an existing element or at the head of the list. A list - * may only be traversed in the forward direction. - * - * A tail queue is headed by a pair of pointers, one to the head of the - * list and the other to the tail of the list. The elements are doubly - * linked so that an arbitrary element can be removed without a need to - * traverse the list. New elements can be added to the list before or - * after an existing element, at the head of the list, or at the end of - * the list. A tail queue may be traversed in either direction. - * - * For details on the use of these macros, see the queue(3) manual page. - * - * - * SLIST LIST STAILQ TAILQ - * _HEAD + + + + - * _HEAD_INITIALIZER + + + + - * _ENTRY + + + + - * _INIT + + + + - * _EMPTY + + + + - * _FIRST + + + + - * _NEXT + + + + - * _PREV - - - + - * _LAST - - + + - * _FOREACH + + + + - * _FOREACH_SAFE + + + + - * _FOREACH_REVERSE - - - + - * _FOREACH_REVERSE_SAFE - - - + - * _INSERT_HEAD + + + + - * _INSERT_BEFORE - + - + - * _INSERT_AFTER + + + + - * _INSERT_TAIL - - + + - * _CONCAT - - + + - * _REMOVE_AFTER + - + - - * _REMOVE_HEAD + - + - - * _REMOVE + + + + - * _SWAP + + + + - * - */ -#ifdef QUEUE_MACRO_DEBUG -/* Store the last 2 places the queue element or head was altered */ -struct qm_trace { - char * lastfile; - int lastline; - char * prevfile; - int prevline; -}; - -#define TRACEBUF struct qm_trace trace; -#define TRASHIT(x) do {(x) = (void *)-1;} while (0) -#define QMD_SAVELINK(name, link) void **name = (void *)&(link) - -#define QMD_TRACE_HEAD(head) do { \ - (head)->trace.prevline = (head)->trace.lastline; \ - (head)->trace.prevfile = (head)->trace.lastfile; \ - (head)->trace.lastline = __LINE__; \ - (head)->trace.lastfile = __FILE__; \ -} while (0) - -#define QMD_TRACE_ELEM(elem) do { \ - (elem)->trace.prevline = (elem)->trace.lastline; \ - (elem)->trace.prevfile = (elem)->trace.lastfile; \ - (elem)->trace.lastline = __LINE__; \ - (elem)->trace.lastfile = __FILE__; \ -} while (0) - -#else -#define QMD_TRACE_ELEM(elem) -#define QMD_TRACE_HEAD(head) -#define QMD_SAVELINK(name, link) -#define TRACEBUF -#define TRASHIT(x) -#endif /* QUEUE_MACRO_DEBUG */ - -/* - * Singly-linked List declarations. - */ -#define SLIST_HEAD(name, type) \ -struct name { \ - struct type *slh_first; /* first element */ \ -} - -#define SLIST_HEAD_INITIALIZER(head) \ - { NULL } - -#define SLIST_ENTRY(type) \ -struct { \ - struct type *sle_next; /* next element */ \ -} - -/* - * Singly-linked List functions. - */ -#define SLIST_EMPTY(head) ((head)->slh_first == NULL) - -#define SLIST_FIRST(head) ((head)->slh_first) - -#define SLIST_FOREACH(var, head, field) \ - for ((var) = SLIST_FIRST((head)); \ - (var); \ - (var) = SLIST_NEXT((var), field)) - -#define SLIST_FOREACH_SAFE(var, head, field, tvar) \ - for ((var) = SLIST_FIRST((head)); \ - (var) && ((tvar) = SLIST_NEXT((var), field), 1); \ - (var) = (tvar)) - -#define SLIST_FOREACH_PREVPTR(var, varp, head, field) \ - for ((varp) = &SLIST_FIRST((head)); \ - ((var) = *(varp)) != NULL; \ - (varp) = &SLIST_NEXT((var), field)) - -#define SLIST_INIT(head) do { \ - SLIST_FIRST((head)) = NULL; \ -} while (0) - -#define SLIST_INSERT_AFTER(slistelm, elm, field) do { \ - SLIST_NEXT((elm), field) = SLIST_NEXT((slistelm), field); \ - SLIST_NEXT((slistelm), field) = (elm); \ -} while (0) - -#define SLIST_INSERT_HEAD(head, elm, field) do { \ - SLIST_NEXT((elm), field) = SLIST_FIRST((head)); \ - SLIST_FIRST((head)) = (elm); \ -} while (0) - -#define SLIST_NEXT(elm, field) ((elm)->field.sle_next) - -#define SLIST_REMOVE(head, elm, type, field) do { \ - QMD_SAVELINK(oldnext, (elm)->field.sle_next); \ - if (SLIST_FIRST((head)) == (elm)) { \ - SLIST_REMOVE_HEAD((head), field); \ - } \ - else { \ - struct type *curelm = SLIST_FIRST((head)); \ - while (SLIST_NEXT(curelm, field) != (elm)) \ - curelm = SLIST_NEXT(curelm, field); \ - SLIST_REMOVE_AFTER(curelm, field); \ - } \ - TRASHIT(*oldnext); \ -} while (0) - -#define SLIST_REMOVE_AFTER(elm, field) do { \ - SLIST_NEXT(elm, field) = \ - SLIST_NEXT(SLIST_NEXT(elm, field), field); \ -} while (0) - -#define SLIST_REMOVE_HEAD(head, field) do { \ - SLIST_FIRST((head)) = SLIST_NEXT(SLIST_FIRST((head)), field); \ -} while (0) - -#define SLIST_SWAP(head1, head2, type) do { \ - struct type *swap_first = SLIST_FIRST(head1); \ - SLIST_FIRST(head1) = SLIST_FIRST(head2); \ - SLIST_FIRST(head2) = swap_first; \ -} while (0) - -/* - * Singly-linked Tail queue declarations. - */ -#define STAILQ_HEAD(name, type) \ -struct name { \ - struct type *stqh_first;/* first element */ \ - struct type **stqh_last;/* addr of last next element */ \ -} - -#define STAILQ_HEAD_INITIALIZER(head) \ - { NULL, &(head).stqh_first } - -#define STAILQ_ENTRY(type) \ -struct { \ - struct type *stqe_next; /* next element */ \ -} - -/* - * Singly-linked Tail queue functions. - */ -#define STAILQ_CONCAT(head1, head2) do { \ - if (!STAILQ_EMPTY((head2))) { \ - *(head1)->stqh_last = (head2)->stqh_first; \ - (head1)->stqh_last = (head2)->stqh_last; \ - STAILQ_INIT((head2)); \ - } \ -} while (0) - -#define STAILQ_EMPTY(head) ((head)->stqh_first == NULL) - -#define STAILQ_FIRST(head) ((head)->stqh_first) - -#define STAILQ_FOREACH(var, head, field) \ - for((var) = STAILQ_FIRST((head)); \ - (var); \ - (var) = STAILQ_NEXT((var), field)) - - -#define STAILQ_FOREACH_SAFE(var, head, field, tvar) \ - for ((var) = STAILQ_FIRST((head)); \ - (var) && ((tvar) = STAILQ_NEXT((var), field), 1); \ - (var) = (tvar)) - -#define STAILQ_INIT(head) do { \ - STAILQ_FIRST((head)) = NULL; \ - (head)->stqh_last = &STAILQ_FIRST((head)); \ -} while (0) - -#define STAILQ_INSERT_AFTER(head, tqelm, elm, field) do { \ - if ((STAILQ_NEXT((elm), field) = STAILQ_NEXT((tqelm), field)) == NULL)\ - (head)->stqh_last = &STAILQ_NEXT((elm), field); \ - STAILQ_NEXT((tqelm), field) = (elm); \ -} while (0) - -#define STAILQ_INSERT_HEAD(head, elm, field) do { \ - if ((STAILQ_NEXT((elm), field) = STAILQ_FIRST((head))) == NULL) \ - (head)->stqh_last = &STAILQ_NEXT((elm), field); \ - STAILQ_FIRST((head)) = (elm); \ -} while (0) - -#define STAILQ_INSERT_TAIL(head, elm, field) do { \ - STAILQ_NEXT((elm), field) = NULL; \ - *(head)->stqh_last = (elm); \ - (head)->stqh_last = &STAILQ_NEXT((elm), field); \ -} while (0) - -#define STAILQ_LAST(head, type, field) \ - (STAILQ_EMPTY((head)) ? \ - NULL : \ - ((struct type *)(void *) \ - ((char *)((head)->stqh_last) - __offsetof(struct type, field)))) - -#define STAILQ_NEXT(elm, field) ((elm)->field.stqe_next) - -#define STAILQ_REMOVE(head, elm, type, field) do { \ - QMD_SAVELINK(oldnext, (elm)->field.stqe_next); \ - if (STAILQ_FIRST((head)) == (elm)) { \ - STAILQ_REMOVE_HEAD((head), field); \ - } \ - else { \ - struct type *curelm = STAILQ_FIRST((head)); \ - while (STAILQ_NEXT(curelm, field) != (elm)) \ - curelm = STAILQ_NEXT(curelm, field); \ - STAILQ_REMOVE_AFTER(head, curelm, field); \ - } \ - TRASHIT(*oldnext); \ -} while (0) - -#define STAILQ_REMOVE_AFTER(head, elm, field) do { \ - if ((STAILQ_NEXT(elm, field) = \ - STAILQ_NEXT(STAILQ_NEXT(elm, field), field)) == NULL) \ - (head)->stqh_last = &STAILQ_NEXT((elm), field); \ -} while (0) - -#define STAILQ_REMOVE_HEAD(head, field) do { \ - if ((STAILQ_FIRST((head)) = \ - STAILQ_NEXT(STAILQ_FIRST((head)), field)) == NULL) \ - (head)->stqh_last = &STAILQ_FIRST((head)); \ -} while (0) - -#define STAILQ_SWAP(head1, head2, type) do { \ - struct type *swap_first = STAILQ_FIRST(head1); \ - struct type **swap_last = (head1)->stqh_last; \ - STAILQ_FIRST(head1) = STAILQ_FIRST(head2); \ - (head1)->stqh_last = (head2)->stqh_last; \ - STAILQ_FIRST(head2) = swap_first; \ - (head2)->stqh_last = swap_last; \ - if (STAILQ_EMPTY(head1)) \ - (head1)->stqh_last = &STAILQ_FIRST(head1); \ - if (STAILQ_EMPTY(head2)) \ - (head2)->stqh_last = &STAILQ_FIRST(head2); \ -} while (0) - - -/* - * List declarations. - */ -#define LIST_HEAD(name, type) \ -struct name { \ - struct type *lh_first; /* first element */ \ -} - -#define LIST_HEAD_INITIALIZER(head) \ - { NULL } - -#define LIST_ENTRY(type) \ -struct { \ - struct type *le_next; /* next element */ \ - struct type **le_prev; /* address of previous next element */ \ -} - -/* - * List functions. - */ - -#if (defined(_KERNEL) && defined(INVARIANTS)) -#define QMD_LIST_CHECK_HEAD(head, field) do { \ - if (LIST_FIRST((head)) != NULL && \ - LIST_FIRST((head))->field.le_prev != \ - &LIST_FIRST((head))) \ - panic("Bad list head %p first->prev != head", (head)); \ -} while (0) - -#define QMD_LIST_CHECK_NEXT(elm, field) do { \ - if (LIST_NEXT((elm), field) != NULL && \ - LIST_NEXT((elm), field)->field.le_prev != \ - &((elm)->field.le_next)) \ - panic("Bad link elm %p next->prev != elm", (elm)); \ -} while (0) - -#define QMD_LIST_CHECK_PREV(elm, field) do { \ - if (*(elm)->field.le_prev != (elm)) \ - panic("Bad link elm %p prev->next != elm", (elm)); \ -} while (0) -#else -#define QMD_LIST_CHECK_HEAD(head, field) -#define QMD_LIST_CHECK_NEXT(elm, field) -#define QMD_LIST_CHECK_PREV(elm, field) -#endif /* (_KERNEL && INVARIANTS) */ - -#define LIST_EMPTY(head) ((head)->lh_first == NULL) - -#define LIST_FIRST(head) ((head)->lh_first) - -#define LIST_FOREACH(var, head, field) \ - for ((var) = LIST_FIRST((head)); \ - (var); \ - (var) = LIST_NEXT((var), field)) - -#define LIST_FOREACH_SAFE(var, head, field, tvar) \ - for ((var) = LIST_FIRST((head)); \ - (var) && ((tvar) = LIST_NEXT((var), field), 1); \ - (var) = (tvar)) - -#define LIST_INIT(head) do { \ - LIST_FIRST((head)) = NULL; \ -} while (0) - -#define LIST_INSERT_AFTER(listelm, elm, field) do { \ - QMD_LIST_CHECK_NEXT(listelm, field); \ - if ((LIST_NEXT((elm), field) = LIST_NEXT((listelm), field)) != NULL)\ - LIST_NEXT((listelm), field)->field.le_prev = \ - &LIST_NEXT((elm), field); \ - LIST_NEXT((listelm), field) = (elm); \ - (elm)->field.le_prev = &LIST_NEXT((listelm), field); \ -} while (0) - -#define LIST_INSERT_BEFORE(listelm, elm, field) do { \ - QMD_LIST_CHECK_PREV(listelm, field); \ - (elm)->field.le_prev = (listelm)->field.le_prev; \ - LIST_NEXT((elm), field) = (listelm); \ - *(listelm)->field.le_prev = (elm); \ - (listelm)->field.le_prev = &LIST_NEXT((elm), field); \ -} while (0) - -#define LIST_INSERT_HEAD(head, elm, field) do { \ - QMD_LIST_CHECK_HEAD((head), field); \ - if ((LIST_NEXT((elm), field) = LIST_FIRST((head))) != NULL) \ - LIST_FIRST((head))->field.le_prev = &LIST_NEXT((elm), field);\ - LIST_FIRST((head)) = (elm); \ - (elm)->field.le_prev = &LIST_FIRST((head)); \ -} while (0) - -#define LIST_NEXT(elm, field) ((elm)->field.le_next) - -#define LIST_REMOVE(elm, field) do { \ - QMD_SAVELINK(oldnext, (elm)->field.le_next); \ - QMD_SAVELINK(oldprev, (elm)->field.le_prev); \ - QMD_LIST_CHECK_NEXT(elm, field); \ - QMD_LIST_CHECK_PREV(elm, field); \ - if (LIST_NEXT((elm), field) != NULL) \ - LIST_NEXT((elm), field)->field.le_prev = \ - (elm)->field.le_prev; \ - *(elm)->field.le_prev = LIST_NEXT((elm), field); \ - TRASHIT(*oldnext); \ - TRASHIT(*oldprev); \ -} while (0) - -#define LIST_SWAP(head1, head2, type, field) do { \ - struct type *swap_tmp = LIST_FIRST((head1)); \ - LIST_FIRST((head1)) = LIST_FIRST((head2)); \ - LIST_FIRST((head2)) = swap_tmp; \ - if ((swap_tmp = LIST_FIRST((head1))) != NULL) \ - swap_tmp->field.le_prev = &LIST_FIRST((head1)); \ - if ((swap_tmp = LIST_FIRST((head2))) != NULL) \ - swap_tmp->field.le_prev = &LIST_FIRST((head2)); \ -} while (0) - -/* - * Tail queue declarations. - */ -#define TAILQ_HEAD(name, type) \ -struct name { \ - struct type *tqh_first; /* first element */ \ - struct type **tqh_last; /* addr of last next element */ \ - TRACEBUF \ -} - -#define TAILQ_HEAD_INITIALIZER(head) \ - { NULL, &(head).tqh_first } - -#define TAILQ_ENTRY(type) \ -struct { \ - struct type *tqe_next; /* next element */ \ - struct type **tqe_prev; /* address of previous next element */ \ - TRACEBUF \ -} - -/* - * Tail queue functions. - */ -#if (defined(_KERNEL) && defined(INVARIANTS)) -#define QMD_TAILQ_CHECK_HEAD(head, field) do { \ - if (!TAILQ_EMPTY(head) && \ - TAILQ_FIRST((head))->field.tqe_prev != \ - &TAILQ_FIRST((head))) \ - panic("Bad tailq head %p first->prev != head", (head)); \ -} while (0) - -#define QMD_TAILQ_CHECK_TAIL(head, field) do { \ - if (*(head)->tqh_last != NULL) \ - panic("Bad tailq NEXT(%p->tqh_last) != NULL", (head)); \ -} while (0) - -#define QMD_TAILQ_CHECK_NEXT(elm, field) do { \ - if (TAILQ_NEXT((elm), field) != NULL && \ - TAILQ_NEXT((elm), field)->field.tqe_prev != \ - &((elm)->field.tqe_next)) \ - panic("Bad link elm %p next->prev != elm", (elm)); \ -} while (0) - -#define QMD_TAILQ_CHECK_PREV(elm, field) do { \ - if (*(elm)->field.tqe_prev != (elm)) \ - panic("Bad link elm %p prev->next != elm", (elm)); \ -} while (0) -#else -#define QMD_TAILQ_CHECK_HEAD(head, field) -#define QMD_TAILQ_CHECK_TAIL(head, headname) -#define QMD_TAILQ_CHECK_NEXT(elm, field) -#define QMD_TAILQ_CHECK_PREV(elm, field) -#endif /* (_KERNEL && INVARIANTS) */ - -#define TAILQ_CONCAT(head1, head2, field) do { \ - if (!TAILQ_EMPTY(head2)) { \ - *(head1)->tqh_last = (head2)->tqh_first; \ - (head2)->tqh_first->field.tqe_prev = (head1)->tqh_last; \ - (head1)->tqh_last = (head2)->tqh_last; \ - TAILQ_INIT((head2)); \ - QMD_TRACE_HEAD(head1); \ - QMD_TRACE_HEAD(head2); \ - } \ -} while (0) - -#define TAILQ_EMPTY(head) ((head)->tqh_first == NULL) - -#define TAILQ_FIRST(head) ((head)->tqh_first) - -#define TAILQ_FOREACH(var, head, field) \ - for ((var) = TAILQ_FIRST((head)); \ - (var); \ - (var) = TAILQ_NEXT((var), field)) - -#define TAILQ_FOREACH_SAFE(var, head, field, tvar) \ - for ((var) = TAILQ_FIRST((head)); \ - (var) && ((tvar) = TAILQ_NEXT((var), field), 1); \ - (var) = (tvar)) - -#define TAILQ_FOREACH_REVERSE(var, head, headname, field) \ - for ((var) = TAILQ_LAST((head), headname); \ - (var); \ - (var) = TAILQ_PREV((var), headname, field)) - -#define TAILQ_FOREACH_REVERSE_SAFE(var, head, headname, field, tvar) \ - for ((var) = TAILQ_LAST((head), headname); \ - (var) && ((tvar) = TAILQ_PREV((var), headname, field), 1); \ - (var) = (tvar)) - -#define TAILQ_INIT(head) do { \ - TAILQ_FIRST((head)) = NULL; \ - (head)->tqh_last = &TAILQ_FIRST((head)); \ - QMD_TRACE_HEAD(head); \ -} while (0) - -#define TAILQ_INSERT_AFTER(head, listelm, elm, field) do { \ - QMD_TAILQ_CHECK_NEXT(listelm, field); \ - if ((TAILQ_NEXT((elm), field) = TAILQ_NEXT((listelm), field)) != NULL)\ - TAILQ_NEXT((elm), field)->field.tqe_prev = \ - &TAILQ_NEXT((elm), field); \ - else { \ - (head)->tqh_last = &TAILQ_NEXT((elm), field); \ - QMD_TRACE_HEAD(head); \ - } \ - TAILQ_NEXT((listelm), field) = (elm); \ - (elm)->field.tqe_prev = &TAILQ_NEXT((listelm), field); \ - QMD_TRACE_ELEM(&(elm)->field); \ - QMD_TRACE_ELEM(&listelm->field); \ -} while (0) - -#define TAILQ_INSERT_BEFORE(listelm, elm, field) do { \ - QMD_TAILQ_CHECK_PREV(listelm, field); \ - (elm)->field.tqe_prev = (listelm)->field.tqe_prev; \ - TAILQ_NEXT((elm), field) = (listelm); \ - *(listelm)->field.tqe_prev = (elm); \ - (listelm)->field.tqe_prev = &TAILQ_NEXT((elm), field); \ - QMD_TRACE_ELEM(&(elm)->field); \ - QMD_TRACE_ELEM(&listelm->field); \ -} while (0) - -#define TAILQ_INSERT_HEAD(head, elm, field) do { \ - QMD_TAILQ_CHECK_HEAD(head, field); \ - if ((TAILQ_NEXT((elm), field) = TAILQ_FIRST((head))) != NULL) \ - TAILQ_FIRST((head))->field.tqe_prev = \ - &TAILQ_NEXT((elm), field); \ - else \ - (head)->tqh_last = &TAILQ_NEXT((elm), field); \ - TAILQ_FIRST((head)) = (elm); \ - (elm)->field.tqe_prev = &TAILQ_FIRST((head)); \ - QMD_TRACE_HEAD(head); \ - QMD_TRACE_ELEM(&(elm)->field); \ -} while (0) - -#define TAILQ_INSERT_TAIL(head, elm, field) do { \ - QMD_TAILQ_CHECK_TAIL(head, field); \ - TAILQ_NEXT((elm), field) = NULL; \ - (elm)->field.tqe_prev = (head)->tqh_last; \ - *(head)->tqh_last = (elm); \ - (head)->tqh_last = &TAILQ_NEXT((elm), field); \ - QMD_TRACE_HEAD(head); \ - QMD_TRACE_ELEM(&(elm)->field); \ -} while (0) - -#define TAILQ_LAST(head, headname) \ - (*(((struct headname *)((head)->tqh_last))->tqh_last)) - -#define TAILQ_NEXT(elm, field) ((elm)->field.tqe_next) - -#define TAILQ_PREV(elm, headname, field) \ - (*(((struct headname *)((elm)->field.tqe_prev))->tqh_last)) - -#define TAILQ_REMOVE(head, elm, field) do { \ - QMD_SAVELINK(oldnext, (elm)->field.tqe_next); \ - QMD_SAVELINK(oldprev, (elm)->field.tqe_prev); \ - QMD_TAILQ_CHECK_NEXT(elm, field); \ - QMD_TAILQ_CHECK_PREV(elm, field); \ - if ((TAILQ_NEXT((elm), field)) != NULL) \ - TAILQ_NEXT((elm), field)->field.tqe_prev = \ - (elm)->field.tqe_prev; \ - else { \ - (head)->tqh_last = (elm)->field.tqe_prev; \ - QMD_TRACE_HEAD(head); \ - } \ - *(elm)->field.tqe_prev = TAILQ_NEXT((elm), field); \ - TRASHIT(*oldnext); \ - TRASHIT(*oldprev); \ - QMD_TRACE_ELEM(&(elm)->field); \ -} while (0) - -#define TAILQ_SWAP(head1, head2, type, field) do { \ - struct type *swap_first = (head1)->tqh_first; \ - struct type **swap_last = (head1)->tqh_last; \ - (head1)->tqh_first = (head2)->tqh_first; \ - (head1)->tqh_last = (head2)->tqh_last; \ - (head2)->tqh_first = swap_first; \ - (head2)->tqh_last = swap_last; \ - if ((swap_first = (head1)->tqh_first) != NULL) \ - swap_first->field.tqe_prev = &(head1)->tqh_first; \ - else \ - (head1)->tqh_last = &(head1)->tqh_first; \ - if ((swap_first = (head2)->tqh_first) != NULL) \ - swap_first->field.tqe_prev = &(head2)->tqh_first; \ - else \ - (head2)->tqh_last = &(head2)->tqh_first; \ -} while (0) - -#endif /* !_SYS_QUEUE_H_ */ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:57:23 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:57: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 1RtR8E-0007LJ-Vj; Fri, 03 Feb 2012 21:57:22 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8D-0007KQ-Tr for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:22 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-27.messagelabs.com!1328306202!51036611!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20912 invoked from network); 3 Feb 2012 21:56:43 -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; 3 Feb 2012 21:56:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8B-0001mK-Eq for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR89-0002m8-Ms for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:18 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:57:16 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] x86: Use defines for bits of MSR_IA32_DEBUGCTLMSR instead of numbers X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Dietmar Hahn # Date 1328111154 -3600 # Node ID 84b896135fd1b51cc4605129f1200786c795f453 # Parent ab397bd22b565ed3dfa68e02c0b641a225b10762 x86: Use defines for bits of MSR_IA32_DEBUGCTLMSR instead of numbers Signed-off-by: Dietmar Hahn Committed-by: Jan Beulich --- diff -r ab397bd22b56 -r 84b896135fd1 xen/arch/x86/hvm/vmx/vmx.c --- a/xen/arch/x86/hvm/vmx/vmx.c Tue Jan 31 16:48:06 2012 +0000 +++ b/xen/arch/x86/hvm/vmx/vmx.c Wed Feb 01 16:45:54 2012 +0100 @@ -1944,11 +1944,12 @@ break; case MSR_IA32_DEBUGCTLMSR: { int i, rc = 0; - - if ( !msr_content || (msr_content & ~3) ) + uint64_t supported = IA32_DEBUGCTLMSR_LBR | IA32_DEBUGCTLMSR_BTF; + + if ( !msr_content || (msr_content & ~supported) ) break; - if ( msr_content & 1 ) + if ( msr_content & IA32_DEBUGCTLMSR_LBR ) { const struct lbr_info *lbr = last_branch_msr_get(); if ( lbr == NULL ) diff -r ab397bd22b56 -r 84b896135fd1 xen/arch/x86/traps.c --- a/xen/arch/x86/traps.c Tue Jan 31 16:48:06 2012 +0000 +++ b/xen/arch/x86/traps.c Wed Feb 01 16:45:54 2012 +0100 @@ -3376,12 +3376,12 @@ static void ler_enable(void) { u64 debugctl; - + if ( !this_cpu(ler_msr) ) return; rdmsrl(MSR_IA32_DEBUGCTLMSR, debugctl); - wrmsrl(MSR_IA32_DEBUGCTLMSR, debugctl | 1); + wrmsrl(MSR_IA32_DEBUGCTLMSR, debugctl | IA32_DEBUGCTLMSR_LBR); } void do_debug(struct cpu_user_regs *regs) diff -r ab397bd22b56 -r 84b896135fd1 xen/include/asm-x86/msr-index.h --- a/xen/include/asm-x86/msr-index.h Tue Jan 31 16:48:06 2012 +0000 +++ b/xen/include/asm-x86/msr-index.h Wed Feb 01 16:45:54 2012 +0100 @@ -65,11 +65,14 @@ #define MSR_MTRRdefType 0x000002ff #define MSR_IA32_DEBUGCTLMSR 0x000001d9 +#define IA32_DEBUGCTLMSR_LBR (1<<0) /* Last Branch Record */ +#define IA32_DEBUGCTLMSR_BTF (1<<1) /* Single Step on Branches */ + #define MSR_IA32_LASTBRANCHFROMIP 0x000001db #define MSR_IA32_LASTBRANCHTOIP 0x000001dc #define MSR_IA32_LASTINTFROMIP 0x000001dd #define MSR_IA32_LASTINTTOIP 0x000001de - + #define MSR_IA32_MTRR_PHYSBASE0 0x00000200 #define MSR_IA32_MTRR_PHYSMASK0 0x00000201 #define MSR_IA32_MTRR_PHYSBASE1 0x00000202 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:57:23 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:57: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 1RtR8E-0007LJ-Vj; Fri, 03 Feb 2012 21:57:22 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8D-0007KQ-Tr for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:22 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-27.messagelabs.com!1328306202!51036611!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20912 invoked from network); 3 Feb 2012 21:56:43 -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; 3 Feb 2012 21:56:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8B-0001mK-Eq for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR89-0002m8-Ms for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:18 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:57:16 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] x86: Use defines for bits of MSR_IA32_DEBUGCTLMSR instead of numbers X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Dietmar Hahn # Date 1328111154 -3600 # Node ID 84b896135fd1b51cc4605129f1200786c795f453 # Parent ab397bd22b565ed3dfa68e02c0b641a225b10762 x86: Use defines for bits of MSR_IA32_DEBUGCTLMSR instead of numbers Signed-off-by: Dietmar Hahn Committed-by: Jan Beulich --- diff -r ab397bd22b56 -r 84b896135fd1 xen/arch/x86/hvm/vmx/vmx.c --- a/xen/arch/x86/hvm/vmx/vmx.c Tue Jan 31 16:48:06 2012 +0000 +++ b/xen/arch/x86/hvm/vmx/vmx.c Wed Feb 01 16:45:54 2012 +0100 @@ -1944,11 +1944,12 @@ break; case MSR_IA32_DEBUGCTLMSR: { int i, rc = 0; - - if ( !msr_content || (msr_content & ~3) ) + uint64_t supported = IA32_DEBUGCTLMSR_LBR | IA32_DEBUGCTLMSR_BTF; + + if ( !msr_content || (msr_content & ~supported) ) break; - if ( msr_content & 1 ) + if ( msr_content & IA32_DEBUGCTLMSR_LBR ) { const struct lbr_info *lbr = last_branch_msr_get(); if ( lbr == NULL ) diff -r ab397bd22b56 -r 84b896135fd1 xen/arch/x86/traps.c --- a/xen/arch/x86/traps.c Tue Jan 31 16:48:06 2012 +0000 +++ b/xen/arch/x86/traps.c Wed Feb 01 16:45:54 2012 +0100 @@ -3376,12 +3376,12 @@ static void ler_enable(void) { u64 debugctl; - + if ( !this_cpu(ler_msr) ) return; rdmsrl(MSR_IA32_DEBUGCTLMSR, debugctl); - wrmsrl(MSR_IA32_DEBUGCTLMSR, debugctl | 1); + wrmsrl(MSR_IA32_DEBUGCTLMSR, debugctl | IA32_DEBUGCTLMSR_LBR); } void do_debug(struct cpu_user_regs *regs) diff -r ab397bd22b56 -r 84b896135fd1 xen/include/asm-x86/msr-index.h --- a/xen/include/asm-x86/msr-index.h Tue Jan 31 16:48:06 2012 +0000 +++ b/xen/include/asm-x86/msr-index.h Wed Feb 01 16:45:54 2012 +0100 @@ -65,11 +65,14 @@ #define MSR_MTRRdefType 0x000002ff #define MSR_IA32_DEBUGCTLMSR 0x000001d9 +#define IA32_DEBUGCTLMSR_LBR (1<<0) /* Last Branch Record */ +#define IA32_DEBUGCTLMSR_BTF (1<<1) /* Single Step on Branches */ + #define MSR_IA32_LASTBRANCHFROMIP 0x000001db #define MSR_IA32_LASTBRANCHTOIP 0x000001dc #define MSR_IA32_LASTINTFROMIP 0x000001dd #define MSR_IA32_LASTINTTOIP 0x000001de - + #define MSR_IA32_MTRR_PHYSBASE0 0x00000200 #define MSR_IA32_MTRR_PHYSMASK0 0x00000201 #define MSR_IA32_MTRR_PHYSBASE1 0x00000202 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:57:25 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:57: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 1RtR8H-0007Me-2L; Fri, 03 Feb 2012 21:57:25 +0000 Received: from mail216.messagelabs.com ([85.158.143.99]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8G-0007JI-3o for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:24 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-216.messagelabs.com!1328306236!12799688!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18843 invoked from network); 3 Feb 2012 21:57:17 -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; 3 Feb 2012 21:57:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR88-0001mD-H8 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR85-0002kT-OR for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:15 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:57:12 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: add support for yajl 2.x X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Roger Pau Monne # Date 1328028486 0 # Node ID ab397bd22b565ed3dfa68e02c0b641a225b10762 # Parent 934c14ab9f19330c91e2769beb96ac6896b2a1c8 libxl: add support for yajl 2.x This patch adds support for yajl versions 2.x, while retaining 1.x compatibility. All the needed ifdefs can be found in libxl_json.h. Signed-off-by: Roger Pau Monne Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 934c14ab9f19 -r ab397bd22b56 Config.mk --- a/Config.mk Tue Jan 31 16:06:14 2012 +0000 +++ b/Config.mk Tue Jan 31 16:48:06 2012 +0000 @@ -186,6 +186,11 @@ . $(XEN_ROOT)/tools/check/funcs.sh; \ has_lib libiconv.so && echo 'y' || echo 'n') +CONFIG_YAJL_VERSION := $(shell export OS="`uname -s`"; \ + export CHECK_INCLUDES="$(CHECK_INCLUDES)"; \ + . $(XEN_ROOT)/tools/check/funcs.sh; \ + has_header yajl/yajl_version.h && echo 'y' || echo 'n') + # Enable XSM security module (by default, Flask). XSM_ENABLE ?= n FLASK_ENABLE ?= $(XSM_ENABLE) diff -r 934c14ab9f19 -r ab397bd22b56 tools/check/check_yajl_lib --- a/tools/check/check_yajl_lib Tue Jan 31 16:06:14 2012 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -#!/bin/sh -# CHECK-BUILD CHECK-INSTALL - -. ./funcs.sh - -has_lib libyajl.so.1 || fail "can't find libyajl.so.1 version 1" diff -r 934c14ab9f19 -r ab397bd22b56 tools/libxl/Makefile --- a/tools/libxl/Makefile Tue Jan 31 16:06:14 2012 +0000 +++ b/tools/libxl/Makefile Tue Jan 31 16:48:06 2012 +0000 @@ -19,6 +19,10 @@ LIBUUID_LIBS += -luuid endif +ifeq ($(CONFIG_YAJL_VERSION),y) +CFLAGS += -DHAVE_YAJL_VERSION +endif + LIBXL_LIBS = LIBXL_LIBS = $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) $(LDLIBS_libblktapctl) $(UTIL_LIBS) $(LIBUUID_LIBS) diff -r 934c14ab9f19 -r ab397bd22b56 tools/libxl/libxl_json.c --- a/tools/libxl/libxl_json.c Tue Jan 31 16:06:14 2012 +0000 +++ b/tools/libxl/libxl_json.c Tue Jan 31 16:48:06 2012 +0000 @@ -517,7 +517,7 @@ return false; } -static int json_callback_number(void *opaque, const char *s, unsigned int len) +static int json_callback_number(void *opaque, const char *s, libxl_yajl_length len) { libxl__yajl_ctx *ctx = opaque; libxl__json_object *obj = NULL; @@ -574,7 +574,7 @@ } static int json_callback_string(void *opaque, const unsigned char *str, - unsigned int len) + libxl_yajl_length len) { libxl__yajl_ctx *ctx = opaque; char *t = NULL; @@ -607,7 +607,7 @@ } static int json_callback_map_key(void *opaque, const unsigned char *str, - unsigned int len) + libxl_yajl_length len) { libxl__yajl_ctx *ctx = opaque; char *t = NULL; @@ -770,17 +770,13 @@ DEBUG_GEN_ALLOC(&yajl_ctx); if (yajl_ctx.hand == NULL) { - yajl_parser_config cfg = { - .allowComments = 1, - .checkUTF8 = 1, - }; - yajl_ctx.hand = yajl_alloc(&callbacks, &cfg, NULL, &yajl_ctx); + yajl_ctx.hand = libxl__yajl_alloc(&callbacks, NULL, &yajl_ctx); } status = yajl_parse(yajl_ctx.hand, (const unsigned char *)s, strlen(s)); if (status != yajl_status_ok) goto out; - status = yajl_parse_complete(yajl_ctx.hand); + status = yajl_complete_parse(yajl_ctx.hand); if (status != yajl_status_ok) goto out; @@ -832,14 +828,13 @@ char *libxl__object_to_json(libxl_ctx *ctx, const char *type, libxl__gen_json_callback gen, void *p) { - yajl_gen_config conf = { 1, " " }; const unsigned char *buf; char *ret = NULL; - unsigned int len = 0; + libxl_yajl_length len = 0; yajl_gen_status s; yajl_gen hand; - hand = yajl_gen_alloc(&conf, NULL); + hand = libxl__yajl_gen_alloc(NULL); if (!hand) return NULL; diff -r 934c14ab9f19 -r ab397bd22b56 tools/libxl/libxl_json.h --- a/tools/libxl/libxl_json.h Tue Jan 31 16:06:14 2012 +0000 +++ b/tools/libxl/libxl_json.h Tue Jan 31 16:48:06 2012 +0000 @@ -16,7 +16,58 @@ #define LIBXL_JSON_H #include +#include + +#ifdef HAVE_YAJL_VERSION +# include +#endif #include <_libxl_types_json.h> +/* YAJL version check */ +#if defined(YAJL_MAJOR) && (YAJL_MAJOR > 1) +# define HAVE_YAJL_V2 1 +#endif + +#ifdef HAVE_YAJL_V2 + +typedef size_t libxl_yajl_length; + +static inline yajl_handle libxl__yajl_alloc(const yajl_callbacks *callbacks, + yajl_alloc_funcs *allocFuncs, + void *ctx) +{ + return yajl_alloc(callbacks, allocFuncs, ctx); +} + +static inline yajl_gen libxl__yajl_gen_alloc(const yajl_alloc_funcs *allocFuncs) +{ + return yajl_gen_alloc(allocFuncs); +} + +#else /* !HAVE_YAJL_V2 */ + +#define yajl_complete_parse yajl_parse_complete + +typedef unsigned int libxl_yajl_length; + +static inline yajl_handle libxl__yajl_alloc(const yajl_callbacks *callbacks, + const yajl_alloc_funcs *allocFuncs, + void *ctx) +{ + yajl_parser_config cfg = { + .allowComments = 1, + .checkUTF8 = 1, + }; + return yajl_alloc(callbacks, &cfg, allocFuncs, ctx); +} + +static inline yajl_gen libxl__yajl_gen_alloc(const yajl_alloc_funcs *allocFuncs) +{ + yajl_gen_config conf = { 1, " " }; + return yajl_gen_alloc(&conf, allocFuncs); +} + +#endif /* !HAVE_YAJL_V2 */ + #endif /* LIBXL_JSON_H */ diff -r 934c14ab9f19 -r ab397bd22b56 tools/libxl/libxl_qmp.c --- a/tools/libxl/libxl_qmp.c Tue Jan 31 16:06:14 2012 +0000 +++ b/tools/libxl/libxl_qmp.c Tue Jan 31 16:48:06 2012 +0000 @@ -454,15 +454,15 @@ qmp_callback_t callback, void *opaque, qmp_request_context *context) { - yajl_gen_config conf = { 0, NULL }; const unsigned char *buf = NULL; char *ret = NULL; - unsigned int len = 0; + libxl_yajl_length len = 0; yajl_gen_status s; yajl_gen hand; callback_id_pair *elm = NULL; - hand = yajl_gen_alloc(&conf, NULL); + hand = libxl__yajl_gen_alloc(NULL); + if (!hand) { return NULL; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:57:25 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:57: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 1RtR8H-0007Me-2L; Fri, 03 Feb 2012 21:57:25 +0000 Received: from mail216.messagelabs.com ([85.158.143.99]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8G-0007JI-3o for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:24 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-216.messagelabs.com!1328306236!12799688!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18843 invoked from network); 3 Feb 2012 21:57:17 -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; 3 Feb 2012 21:57:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR88-0001mD-H8 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR85-0002kT-OR for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:15 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:57:12 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: add support for yajl 2.x X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Roger Pau Monne # Date 1328028486 0 # Node ID ab397bd22b565ed3dfa68e02c0b641a225b10762 # Parent 934c14ab9f19330c91e2769beb96ac6896b2a1c8 libxl: add support for yajl 2.x This patch adds support for yajl versions 2.x, while retaining 1.x compatibility. All the needed ifdefs can be found in libxl_json.h. Signed-off-by: Roger Pau Monne Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 934c14ab9f19 -r ab397bd22b56 Config.mk --- a/Config.mk Tue Jan 31 16:06:14 2012 +0000 +++ b/Config.mk Tue Jan 31 16:48:06 2012 +0000 @@ -186,6 +186,11 @@ . $(XEN_ROOT)/tools/check/funcs.sh; \ has_lib libiconv.so && echo 'y' || echo 'n') +CONFIG_YAJL_VERSION := $(shell export OS="`uname -s`"; \ + export CHECK_INCLUDES="$(CHECK_INCLUDES)"; \ + . $(XEN_ROOT)/tools/check/funcs.sh; \ + has_header yajl/yajl_version.h && echo 'y' || echo 'n') + # Enable XSM security module (by default, Flask). XSM_ENABLE ?= n FLASK_ENABLE ?= $(XSM_ENABLE) diff -r 934c14ab9f19 -r ab397bd22b56 tools/check/check_yajl_lib --- a/tools/check/check_yajl_lib Tue Jan 31 16:06:14 2012 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -#!/bin/sh -# CHECK-BUILD CHECK-INSTALL - -. ./funcs.sh - -has_lib libyajl.so.1 || fail "can't find libyajl.so.1 version 1" diff -r 934c14ab9f19 -r ab397bd22b56 tools/libxl/Makefile --- a/tools/libxl/Makefile Tue Jan 31 16:06:14 2012 +0000 +++ b/tools/libxl/Makefile Tue Jan 31 16:48:06 2012 +0000 @@ -19,6 +19,10 @@ LIBUUID_LIBS += -luuid endif +ifeq ($(CONFIG_YAJL_VERSION),y) +CFLAGS += -DHAVE_YAJL_VERSION +endif + LIBXL_LIBS = LIBXL_LIBS = $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) $(LDLIBS_libblktapctl) $(UTIL_LIBS) $(LIBUUID_LIBS) diff -r 934c14ab9f19 -r ab397bd22b56 tools/libxl/libxl_json.c --- a/tools/libxl/libxl_json.c Tue Jan 31 16:06:14 2012 +0000 +++ b/tools/libxl/libxl_json.c Tue Jan 31 16:48:06 2012 +0000 @@ -517,7 +517,7 @@ return false; } -static int json_callback_number(void *opaque, const char *s, unsigned int len) +static int json_callback_number(void *opaque, const char *s, libxl_yajl_length len) { libxl__yajl_ctx *ctx = opaque; libxl__json_object *obj = NULL; @@ -574,7 +574,7 @@ } static int json_callback_string(void *opaque, const unsigned char *str, - unsigned int len) + libxl_yajl_length len) { libxl__yajl_ctx *ctx = opaque; char *t = NULL; @@ -607,7 +607,7 @@ } static int json_callback_map_key(void *opaque, const unsigned char *str, - unsigned int len) + libxl_yajl_length len) { libxl__yajl_ctx *ctx = opaque; char *t = NULL; @@ -770,17 +770,13 @@ DEBUG_GEN_ALLOC(&yajl_ctx); if (yajl_ctx.hand == NULL) { - yajl_parser_config cfg = { - .allowComments = 1, - .checkUTF8 = 1, - }; - yajl_ctx.hand = yajl_alloc(&callbacks, &cfg, NULL, &yajl_ctx); + yajl_ctx.hand = libxl__yajl_alloc(&callbacks, NULL, &yajl_ctx); } status = yajl_parse(yajl_ctx.hand, (const unsigned char *)s, strlen(s)); if (status != yajl_status_ok) goto out; - status = yajl_parse_complete(yajl_ctx.hand); + status = yajl_complete_parse(yajl_ctx.hand); if (status != yajl_status_ok) goto out; @@ -832,14 +828,13 @@ char *libxl__object_to_json(libxl_ctx *ctx, const char *type, libxl__gen_json_callback gen, void *p) { - yajl_gen_config conf = { 1, " " }; const unsigned char *buf; char *ret = NULL; - unsigned int len = 0; + libxl_yajl_length len = 0; yajl_gen_status s; yajl_gen hand; - hand = yajl_gen_alloc(&conf, NULL); + hand = libxl__yajl_gen_alloc(NULL); if (!hand) return NULL; diff -r 934c14ab9f19 -r ab397bd22b56 tools/libxl/libxl_json.h --- a/tools/libxl/libxl_json.h Tue Jan 31 16:06:14 2012 +0000 +++ b/tools/libxl/libxl_json.h Tue Jan 31 16:48:06 2012 +0000 @@ -16,7 +16,58 @@ #define LIBXL_JSON_H #include +#include + +#ifdef HAVE_YAJL_VERSION +# include +#endif #include <_libxl_types_json.h> +/* YAJL version check */ +#if defined(YAJL_MAJOR) && (YAJL_MAJOR > 1) +# define HAVE_YAJL_V2 1 +#endif + +#ifdef HAVE_YAJL_V2 + +typedef size_t libxl_yajl_length; + +static inline yajl_handle libxl__yajl_alloc(const yajl_callbacks *callbacks, + yajl_alloc_funcs *allocFuncs, + void *ctx) +{ + return yajl_alloc(callbacks, allocFuncs, ctx); +} + +static inline yajl_gen libxl__yajl_gen_alloc(const yajl_alloc_funcs *allocFuncs) +{ + return yajl_gen_alloc(allocFuncs); +} + +#else /* !HAVE_YAJL_V2 */ + +#define yajl_complete_parse yajl_parse_complete + +typedef unsigned int libxl_yajl_length; + +static inline yajl_handle libxl__yajl_alloc(const yajl_callbacks *callbacks, + const yajl_alloc_funcs *allocFuncs, + void *ctx) +{ + yajl_parser_config cfg = { + .allowComments = 1, + .checkUTF8 = 1, + }; + return yajl_alloc(callbacks, &cfg, allocFuncs, ctx); +} + +static inline yajl_gen libxl__yajl_gen_alloc(const yajl_alloc_funcs *allocFuncs) +{ + yajl_gen_config conf = { 1, " " }; + return yajl_gen_alloc(&conf, allocFuncs); +} + +#endif /* !HAVE_YAJL_V2 */ + #endif /* LIBXL_JSON_H */ diff -r 934c14ab9f19 -r ab397bd22b56 tools/libxl/libxl_qmp.c --- a/tools/libxl/libxl_qmp.c Tue Jan 31 16:06:14 2012 +0000 +++ b/tools/libxl/libxl_qmp.c Tue Jan 31 16:48:06 2012 +0000 @@ -454,15 +454,15 @@ qmp_callback_t callback, void *opaque, qmp_request_context *context) { - yajl_gen_config conf = { 0, NULL }; const unsigned char *buf = NULL; char *ret = NULL; - unsigned int len = 0; + libxl_yajl_length len = 0; yajl_gen_status s; yajl_gen hand; callback_id_pair *elm = NULL; - hand = yajl_gen_alloc(&conf, NULL); + hand = libxl__yajl_gen_alloc(NULL); + if (!hand) { return NULL; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:57:31 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:57: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 1RtR8N-0007Pv-5a; Fri, 03 Feb 2012 21:57:31 +0000 Received: from mail182.messagelabs.com ([85.158.139.83]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8M-0007MO-0Q for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:30 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-182.messagelabs.com!1328306242!13586107!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13648 invoked from network); 3 Feb 2012 21:57:23 -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; 3 Feb 2012 21:57:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8D-0001mP-Ml for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR8B-0002mv-Uq for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:20 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:57:19 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: remove libxl_domain_create_info.poolname X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1328020797 0 # Node ID e712efb526da5fc5ebf83b859ce8cb3bf849490b # Parent 84b896135fd1b51cc4605129f1200786c795f453 libxl: remove libxl_domain_create_info.poolname It is redundant with poolid and allowing the user to specify both opens up the possibility of a disconnect. Signed-off-by: Ian Campbell Acked-by: juergen.gross@ts.fujitsu.com [since v2 - correct default is 0 not -1] Committed-by: Ian Jackson --- diff -r 84b896135fd1 -r e712efb526da tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Wed Feb 01 16:45:54 2012 +0100 +++ b/tools/libxl/libxl_create.c Tue Jan 31 14:39:57 2012 +0000 @@ -441,8 +441,9 @@ xs_write(ctx->xsh, t, libxl__sprintf(gc, "%s/uuid", vm_path), uuid_string, strlen(uuid_string)); xs_write(ctx->xsh, t, libxl__sprintf(gc, "%s/name", vm_path), info->name, strlen(info->name)); - if (info->poolname) - xs_write(ctx->xsh, t, libxl__sprintf(gc, "%s/pool_name", vm_path), info->poolname, strlen(info->poolname)); + if (info->poolid != -1) + libxl__xs_write(gc, t, libxl__sprintf(gc, "%s/pool_name", vm_path), + "%s", libxl__cpupoolid_to_name(gc, info->poolid)); libxl__xs_writev(gc, t, dom_path, info->xsdata); libxl__xs_writev(gc, t, libxl__sprintf(gc, "%s/platform", dom_path), info->platformdata); diff -r 84b896135fd1 -r e712efb526da tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Wed Feb 01 16:45:54 2012 +0100 +++ b/tools/libxl/libxl_types.idl Tue Jan 31 14:39:57 2012 +0000 @@ -151,7 +151,6 @@ ("xsdata", libxl_key_value_list), ("platformdata", libxl_key_value_list), ("poolid", uint32), - ("poolname", string), ]) libxl_domain_build_info = Struct("domain_build_info",[ diff -r 84b896135fd1 -r e712efb526da tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Wed Feb 01 16:45:54 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Tue Jan 31 14:39:57 2012 +0000 @@ -316,7 +316,7 @@ printf("\t(uuid )\n"); } - printf("\t(cpupool %s)\n", c_info->poolname); + printf("\t(cpupool %s)\n", libxl_cpupoolid_to_name(ctx, c_info->poolid)); if (c_info->xsdata) printf("\t(xsdata contains data)\n"); else @@ -703,8 +703,7 @@ c_info->poolid = -1; cpupool_qualifier_to_cpupoolid(buf, &c_info->poolid, NULL); } - c_info->poolname = libxl_cpupoolid_to_name(ctx, c_info->poolid); - if (!c_info->poolname) { + if (!libxl_cpupoolid_to_name(ctx, c_info->poolid)) { fprintf(stderr, "Illegal pool specified\n"); exit(1); } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:57:31 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:57: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 1RtR8N-0007Pv-5a; Fri, 03 Feb 2012 21:57:31 +0000 Received: from mail182.messagelabs.com ([85.158.139.83]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8M-0007MO-0Q for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:30 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-182.messagelabs.com!1328306242!13586107!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13648 invoked from network); 3 Feb 2012 21:57:23 -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; 3 Feb 2012 21:57:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8D-0001mP-Ml for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR8B-0002mv-Uq for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:20 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:57:19 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: remove libxl_domain_create_info.poolname X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1328020797 0 # Node ID e712efb526da5fc5ebf83b859ce8cb3bf849490b # Parent 84b896135fd1b51cc4605129f1200786c795f453 libxl: remove libxl_domain_create_info.poolname It is redundant with poolid and allowing the user to specify both opens up the possibility of a disconnect. Signed-off-by: Ian Campbell Acked-by: juergen.gross@ts.fujitsu.com [since v2 - correct default is 0 not -1] Committed-by: Ian Jackson --- diff -r 84b896135fd1 -r e712efb526da tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Wed Feb 01 16:45:54 2012 +0100 +++ b/tools/libxl/libxl_create.c Tue Jan 31 14:39:57 2012 +0000 @@ -441,8 +441,9 @@ xs_write(ctx->xsh, t, libxl__sprintf(gc, "%s/uuid", vm_path), uuid_string, strlen(uuid_string)); xs_write(ctx->xsh, t, libxl__sprintf(gc, "%s/name", vm_path), info->name, strlen(info->name)); - if (info->poolname) - xs_write(ctx->xsh, t, libxl__sprintf(gc, "%s/pool_name", vm_path), info->poolname, strlen(info->poolname)); + if (info->poolid != -1) + libxl__xs_write(gc, t, libxl__sprintf(gc, "%s/pool_name", vm_path), + "%s", libxl__cpupoolid_to_name(gc, info->poolid)); libxl__xs_writev(gc, t, dom_path, info->xsdata); libxl__xs_writev(gc, t, libxl__sprintf(gc, "%s/platform", dom_path), info->platformdata); diff -r 84b896135fd1 -r e712efb526da tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Wed Feb 01 16:45:54 2012 +0100 +++ b/tools/libxl/libxl_types.idl Tue Jan 31 14:39:57 2012 +0000 @@ -151,7 +151,6 @@ ("xsdata", libxl_key_value_list), ("platformdata", libxl_key_value_list), ("poolid", uint32), - ("poolname", string), ]) libxl_domain_build_info = Struct("domain_build_info",[ diff -r 84b896135fd1 -r e712efb526da tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Wed Feb 01 16:45:54 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Tue Jan 31 14:39:57 2012 +0000 @@ -316,7 +316,7 @@ printf("\t(uuid )\n"); } - printf("\t(cpupool %s)\n", c_info->poolname); + printf("\t(cpupool %s)\n", libxl_cpupoolid_to_name(ctx, c_info->poolid)); if (c_info->xsdata) printf("\t(xsdata contains data)\n"); else @@ -703,8 +703,7 @@ c_info->poolid = -1; cpupool_qualifier_to_cpupoolid(buf, &c_info->poolid, NULL); } - c_info->poolname = libxl_cpupoolid_to_name(ctx, c_info->poolid); - if (!c_info->poolname) { + if (!libxl_cpupoolid_to_name(ctx, c_info->poolid)) { fprintf(stderr, "Illegal pool specified\n"); exit(1); } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:57:34 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:57:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8Q-0007Rk-8n; Fri, 03 Feb 2012 21:57:34 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8O-0007Qf-Qx for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:33 +0000 Received: from [193.109.254.147:47026] by server-8.bemta-14.messagelabs.com id A2/F1-04706-C485C2F4; Fri, 03 Feb 2012 21:57:32 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-27.messagelabs.com!1328306200!51337698!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16776 invoked from network); 3 Feb 2012 21:56:41 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 3 Feb 2012 21:56:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8M-0001md-4f for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR8J-0002p2-6s for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:29 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:57:26 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: do not write/maintain "pool_name" in XenStore X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1328020797 0 # Node ID 58a608e1a100d243352459a6a1ce95236ef832ce # Parent 66efe32847da7e266b537747ae7f7e6156b8dc3b libxl: do not write/maintain "pool_name" in XenStore Nothing that I can find ever reads this key. Signed-off-by: Ian Campbell Acked-by: juergen.gross@ts.fujitsu.com Committed-by: Ian Jackson --- diff -r 66efe32847da -r 58a608e1a100 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Tue Jan 31 14:39:57 2012 +0000 +++ b/tools/libxl/libxl.c Tue Jan 31 14:39:57 2012 +0000 @@ -3702,16 +3702,6 @@ { GC_INIT(ctx); int rc; - char *dom_path; - char *vm_path; - char *poolname; - xs_transaction_t t; - - dom_path = libxl__xs_get_dompath(gc, domid); - if (!dom_path) { - GC_FREE; - return ERROR_FAIL; - } rc = xc_cpupool_movedomain(ctx->xch, poolid, domid); if (rc) { @@ -3721,21 +3711,6 @@ return ERROR_FAIL; } - for (;;) { - t = xs_transaction_start(ctx->xsh); - - poolname = libxl__cpupoolid_to_name(gc, poolid); - vm_path = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, "%s/vm", dom_path)); - if (!vm_path) - break; - - libxl__xs_write(gc, t, libxl__sprintf(gc, "%s/pool_name", vm_path), - "%s", poolname); - - if (xs_transaction_end(ctx->xsh, t, 0) || (errno != EAGAIN)) - break; - } - GC_FREE; return 0; } diff -r 66efe32847da -r 58a608e1a100 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Tue Jan 31 14:39:57 2012 +0000 +++ b/tools/libxl/libxl_create.c Tue Jan 31 14:39:57 2012 +0000 @@ -441,9 +441,6 @@ xs_write(ctx->xsh, t, libxl__sprintf(gc, "%s/uuid", vm_path), uuid_string, strlen(uuid_string)); xs_write(ctx->xsh, t, libxl__sprintf(gc, "%s/name", vm_path), info->name, strlen(info->name)); - if (info->poolid != -1) - libxl__xs_write(gc, t, libxl__sprintf(gc, "%s/pool_name", vm_path), - "%s", libxl__cpupoolid_to_name(gc, info->poolid)); libxl__xs_writev(gc, t, dom_path, info->xsdata); libxl__xs_writev(gc, t, libxl__sprintf(gc, "%s/platform", dom_path), info->platformdata); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:57:34 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:57:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8Q-0007Rk-8n; Fri, 03 Feb 2012 21:57:34 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8O-0007Qf-Qx for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:33 +0000 Received: from [193.109.254.147:47026] by server-8.bemta-14.messagelabs.com id A2/F1-04706-C485C2F4; Fri, 03 Feb 2012 21:57:32 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-27.messagelabs.com!1328306200!51337698!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16776 invoked from network); 3 Feb 2012 21:56:41 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 3 Feb 2012 21:56:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8M-0001md-4f for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR8J-0002p2-6s for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:29 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:57:26 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: do not write/maintain "pool_name" in XenStore X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1328020797 0 # Node ID 58a608e1a100d243352459a6a1ce95236ef832ce # Parent 66efe32847da7e266b537747ae7f7e6156b8dc3b libxl: do not write/maintain "pool_name" in XenStore Nothing that I can find ever reads this key. Signed-off-by: Ian Campbell Acked-by: juergen.gross@ts.fujitsu.com Committed-by: Ian Jackson --- diff -r 66efe32847da -r 58a608e1a100 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Tue Jan 31 14:39:57 2012 +0000 +++ b/tools/libxl/libxl.c Tue Jan 31 14:39:57 2012 +0000 @@ -3702,16 +3702,6 @@ { GC_INIT(ctx); int rc; - char *dom_path; - char *vm_path; - char *poolname; - xs_transaction_t t; - - dom_path = libxl__xs_get_dompath(gc, domid); - if (!dom_path) { - GC_FREE; - return ERROR_FAIL; - } rc = xc_cpupool_movedomain(ctx->xch, poolid, domid); if (rc) { @@ -3721,21 +3711,6 @@ return ERROR_FAIL; } - for (;;) { - t = xs_transaction_start(ctx->xsh); - - poolname = libxl__cpupoolid_to_name(gc, poolid); - vm_path = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, "%s/vm", dom_path)); - if (!vm_path) - break; - - libxl__xs_write(gc, t, libxl__sprintf(gc, "%s/pool_name", vm_path), - "%s", poolname); - - if (xs_transaction_end(ctx->xsh, t, 0) || (errno != EAGAIN)) - break; - } - GC_FREE; return 0; } diff -r 66efe32847da -r 58a608e1a100 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Tue Jan 31 14:39:57 2012 +0000 +++ b/tools/libxl/libxl_create.c Tue Jan 31 14:39:57 2012 +0000 @@ -441,9 +441,6 @@ xs_write(ctx->xsh, t, libxl__sprintf(gc, "%s/uuid", vm_path), uuid_string, strlen(uuid_string)); xs_write(ctx->xsh, t, libxl__sprintf(gc, "%s/name", vm_path), info->name, strlen(info->name)); - if (info->poolid != -1) - libxl__xs_write(gc, t, libxl__sprintf(gc, "%s/pool_name", vm_path), - "%s", libxl__cpupoolid_to_name(gc, info->poolid)); libxl__xs_writev(gc, t, dom_path, info->xsdata); libxl__xs_writev(gc, t, libxl__sprintf(gc, "%s/platform", dom_path), info->platformdata); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:57:35 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:57: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 1RtR8R-0007Sc-Bj; Fri, 03 Feb 2012 21:57:35 +0000 Received: from mail216.messagelabs.com ([85.158.143.99]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8P-0007Ow-UK for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:34 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-216.messagelabs.com!1328306246!12799701!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19008 invoked from network); 3 Feb 2012 21:57:27 -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; 3 Feb 2012 21:57:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8I-0001mT-HT for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR8F-0002nq-80 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:25 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:57:21 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: name libxl_create_cpupool consistent with other functions. X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1328020797 0 # Node ID 66efe32847da7e266b537747ae7f7e6156b8dc3b # Parent e712efb526da5fc5ebf83b859ce8cb3bf849490b libxl: name libxl_create_cpupool consistent with other functions. The pattern for the other cpupool functions is libxl_cpupool_ and in general we use libxl__ Signed-off-by: Ian Campbell Acked-by: juergen.gross@ts.fujitsu.com Committed-by: Ian Jackson --- diff -r e712efb526da -r 66efe32847da tools/libxl/libxl.c --- a/tools/libxl/libxl.c Tue Jan 31 14:39:57 2012 +0000 +++ b/tools/libxl/libxl.c Tue Jan 31 14:39:57 2012 +0000 @@ -3440,7 +3440,7 @@ return 0; } -int libxl_create_cpupool(libxl_ctx *ctx, const char *name, int schedid, +int libxl_cpupool_create(libxl_ctx *ctx, const char *name, int schedid, libxl_cpumap cpumap, libxl_uuid *uuid, uint32_t *poolid) { diff -r e712efb526da -r 66efe32847da tools/libxl/libxl.h --- a/tools/libxl/libxl.h Tue Jan 31 14:39:57 2012 +0000 +++ b/tools/libxl/libxl.h Tue Jan 31 14:39:57 2012 +0000 @@ -635,7 +635,7 @@ int libxl_tmem_freeable(libxl_ctx *ctx); int libxl_get_freecpus(libxl_ctx *ctx, libxl_cpumap *cpumap); -int libxl_create_cpupool(libxl_ctx *ctx, const char *name, int schedid, +int libxl_cpupool_create(libxl_ctx *ctx, const char *name, int schedid, libxl_cpumap cpumap, libxl_uuid *uuid, uint32_t *poolid); int libxl_cpupool_destroy(libxl_ctx *ctx, uint32_t poolid); diff -r e712efb526da -r 66efe32847da tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Tue Jan 31 14:39:57 2012 +0000 +++ b/tools/libxl/xl_cmdimpl.c Tue Jan 31 14:39:57 2012 +0000 @@ -5523,7 +5523,7 @@ return 0; poolid = 0; - if (libxl_create_cpupool(ctx, name, schedid, cpumap, &uuid, &poolid)) { + if (libxl_cpupool_create(ctx, name, schedid, cpumap, &uuid, &poolid)) { fprintf(stderr, "error on creating cpupool\n"); return -ERROR_FAIL; } @@ -5897,7 +5897,7 @@ snprintf(name, 15, "Pool-node%d", node); libxl_uuid_generate(&uuid); poolid = 0; - ret = -libxl_create_cpupool(ctx, name, schedid, cpumap, &uuid, &poolid); + ret = -libxl_cpupool_create(ctx, name, schedid, cpumap, &uuid, &poolid); if (ret) { fprintf(stderr, "error on creating cpupool\n"); goto out; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:57:35 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:57: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 1RtR8R-0007Sc-Bj; Fri, 03 Feb 2012 21:57:35 +0000 Received: from mail216.messagelabs.com ([85.158.143.99]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8P-0007Ow-UK for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:34 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-216.messagelabs.com!1328306246!12799701!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19008 invoked from network); 3 Feb 2012 21:57:27 -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; 3 Feb 2012 21:57:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8I-0001mT-HT for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR8F-0002nq-80 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:25 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:57:21 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: name libxl_create_cpupool consistent with other functions. X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1328020797 0 # Node ID 66efe32847da7e266b537747ae7f7e6156b8dc3b # Parent e712efb526da5fc5ebf83b859ce8cb3bf849490b libxl: name libxl_create_cpupool consistent with other functions. The pattern for the other cpupool functions is libxl_cpupool_ and in general we use libxl__ Signed-off-by: Ian Campbell Acked-by: juergen.gross@ts.fujitsu.com Committed-by: Ian Jackson --- diff -r e712efb526da -r 66efe32847da tools/libxl/libxl.c --- a/tools/libxl/libxl.c Tue Jan 31 14:39:57 2012 +0000 +++ b/tools/libxl/libxl.c Tue Jan 31 14:39:57 2012 +0000 @@ -3440,7 +3440,7 @@ return 0; } -int libxl_create_cpupool(libxl_ctx *ctx, const char *name, int schedid, +int libxl_cpupool_create(libxl_ctx *ctx, const char *name, int schedid, libxl_cpumap cpumap, libxl_uuid *uuid, uint32_t *poolid) { diff -r e712efb526da -r 66efe32847da tools/libxl/libxl.h --- a/tools/libxl/libxl.h Tue Jan 31 14:39:57 2012 +0000 +++ b/tools/libxl/libxl.h Tue Jan 31 14:39:57 2012 +0000 @@ -635,7 +635,7 @@ int libxl_tmem_freeable(libxl_ctx *ctx); int libxl_get_freecpus(libxl_ctx *ctx, libxl_cpumap *cpumap); -int libxl_create_cpupool(libxl_ctx *ctx, const char *name, int schedid, +int libxl_cpupool_create(libxl_ctx *ctx, const char *name, int schedid, libxl_cpumap cpumap, libxl_uuid *uuid, uint32_t *poolid); int libxl_cpupool_destroy(libxl_ctx *ctx, uint32_t poolid); diff -r e712efb526da -r 66efe32847da tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Tue Jan 31 14:39:57 2012 +0000 +++ b/tools/libxl/xl_cmdimpl.c Tue Jan 31 14:39:57 2012 +0000 @@ -5523,7 +5523,7 @@ return 0; poolid = 0; - if (libxl_create_cpupool(ctx, name, schedid, cpumap, &uuid, &poolid)) { + if (libxl_cpupool_create(ctx, name, schedid, cpumap, &uuid, &poolid)) { fprintf(stderr, "error on creating cpupool\n"); return -ERROR_FAIL; } @@ -5897,7 +5897,7 @@ snprintf(name, 15, "Pool-node%d", node); libxl_uuid_generate(&uuid); poolid = 0; - ret = -libxl_create_cpupool(ctx, name, schedid, cpumap, &uuid, &poolid); + ret = -libxl_cpupool_create(ctx, name, schedid, cpumap, &uuid, &poolid); if (ret) { fprintf(stderr, "error on creating cpupool\n"); goto out; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:57:43 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:57: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 1RtR8Z-0007Wp-FW; Fri, 03 Feb 2012 21:57:43 +0000 Received: from mail216.messagelabs.com ([85.158.143.99]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8X-0007TE-FS for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:41 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-216.messagelabs.com!1328306253!13877599!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6060 invoked from network); 3 Feb 2012 21:57:34 -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; 3 Feb 2012 21:57:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8P-0001mi-CD for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR8M-0002q7-Ks for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:32 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:57:30 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: remove comment support from IDL X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1328020797 0 # Node ID 996c95a3e7e01f85186e5ac02e3070bc442ff580 # Parent 58a608e1a100d243352459a6a1ce95236ef832ce libxl: remove comment support from IDL People typically don't look for comments in generated source and the syntax for specifying them in the IDL makes things harder to follow. Instead just use source code comments in the IDL itself. I dropped a bunch of "foo bool # enable or disable foo" type comments. A lot of the remainder still aren't terribly useful though. No change to the generate code other than the comments being removed. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 58a608e1a100 -r 996c95a3e7e0 tools/libxl/gentypes.py --- a/tools/libxl/gentypes.py Tue Jan 31 14:39:57 2012 +0000 +++ b/tools/libxl/gentypes.py Tue Jan 31 14:39:57 2012 +0000 @@ -5,19 +5,6 @@ import libxltypes -def format_comment(level, comment): - indent = reduce(lambda x,y: x + " ", range(level), "") - s = "%s/*\n" % indent - s += "%s * " % indent - comment = comment.replace("\n", "\n%s * " % indent) - x = re.compile(r'^%s \* $' % indent, re.MULTILINE) - comment = x.sub("%s *" % indent, comment) - s += comment - s += "\n" - s += "%s */" % indent - s += "\n" - return s - def libxl_C_instance_of(ty, instancename): if isinstance(ty, libxltypes.Aggregate) and ty.typename is None: if instancename is None: @@ -30,17 +17,12 @@ def libxl_C_type_define(ty, indent = ""): s = "" if isinstance(ty, libxltypes.Enumeration): - if ty.comment is not None: - s += format_comment(0, ty.comment) - if ty.typename is None: s += "enum {\n" else: s += "typedef enum %s {\n" % ty.typename for v in ty.values: - if v.comment is not None: - s += format_comment(4, v.comment) x = "%s = %d" % (v.name, v.value) x = x.replace("\n", "\n ") s += " " + x + ",\n" @@ -50,17 +32,12 @@ s += "} %s" % ty.typename elif isinstance(ty, libxltypes.Aggregate): - if ty.comment is not None: - s += format_comment(0, ty.comment) - if ty.typename is None: s += "%s {\n" % ty.kind else: s += "typedef %s %s {\n" % (ty.kind, ty.typename) for f in ty.fields: - if f.comment is not None: - s += format_comment(4, f.comment) x = libxl_C_instance_of(f.type, f.name) if f.const: x = "const " + x diff -r 58a608e1a100 -r 996c95a3e7e0 tools/libxl/idl.txt --- a/tools/libxl/idl.txt Tue Jan 31 14:39:57 2012 +0000 +++ b/tools/libxl/idl.txt Tue Jan 31 14:39:57 2012 +0000 @@ -20,10 +20,6 @@ apply to all types. The properties are set by passing a named parameter to the constructor. -Type.comment: - - A free text comment which describes the type. - Type.namespace: (default: "libxl_") The namespace in which the type resides. Usually this is "libxl_" but @@ -98,7 +94,6 @@ name of the containing Enumeration and any namespace (e.g. "VALUE") EnumerationValue.value The integer value associated with this name. - EnumerationValue.comment A free text comment which describes the member. libxltype.Aggregate @@ -115,7 +110,6 @@ Field.name The name of the member (can be None for anonymous fields). Field.const Boolean, true if the member is const. - Field.comment A free text comment which describes the member. libxltype.Struct diff -r 58a608e1a100 -r 996c95a3e7e0 tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Tue Jan 31 14:39:57 2012 +0000 +++ b/tools/libxl/libxl_types.idl Tue Jan 31 14:39:57 2012 +0000 @@ -28,8 +28,8 @@ ]) libxl_device_model_version = Enumeration("device_model_version", [ - (1, "QEMU_XEN_TRADITIONAL", "Historical qemu-xen device model (qemu-dm)"), - (2, "QEMU_XEN", "Upstream based qemu-xen device model"), + (1, "QEMU_XEN_TRADITIONAL"), # Historical qemu-xen device model (qemu-dm) + (2, "QEMU_XEN"), # Upstream based qemu-xen device model ]) libxl_console_type = Enumeration("console_type", [ @@ -93,18 +93,18 @@ libxl_dominfo = Struct("dominfo",[ ("uuid", libxl_uuid), ("domid", libxl_domid), - ("ssidref", uint32), + ("ssidref", uint32), ("running", bool), ("blocked", bool), ("paused", bool), ("shutdown", bool), ("dying", bool), - ("shutdown_reason", uint8, False, -"""Valid SHUTDOWN_* value from xen/sched.h iff (shutdown||dying). - -Otherwise set to a value guaranteed not to clash with any valid -SHUTDOWN_* constant."""), + # Valid SHUTDOWN_* value from xen/sched.h iff (shutdown||dying). + # + # Otherwise set to a value guaranteed not to clash with any valid + # SHUTDOWN_* constant. + ("shutdown_reason", uint8), ("current_memkb", uint64), ("shared_memkb", uint64), ("max_memkb", uint64), @@ -153,6 +153,11 @@ ("poolid", uint32), ]) +# 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 +# then the user is responsible for calling +# libxl_file_reference_unmap. libxl_domain_build_info = Struct("domain_build_info",[ ("max_vcpus", integer), ("cur_vcpus", integer), @@ -188,84 +193,87 @@ ("cmdline", string), ("ramdisk", libxl_file_reference), ("features", string, True), - ("e820_host", bool, False, "Use host's E820 for PCI passthrough."), + # Use host's E820 for PCI passthrough. + ("e820_host", bool), ])), ])), ], - comment = -"""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 -then the user is responsible for calling -libxl_file_reference_unmap.""") +) +# Device Model Information libxl_device_model_info = Struct("device_model_info",[ ("domid", libxl_domid), - ("uuid", libxl_uuid, False, "this is use only with stubdom, and must be different from the domain uuid"), + + # uuid is used only with stubdom, and must be different from the + # domain uuid + ("uuid", libxl_uuid), ("dom_name", string), ("device_model_version", libxl_device_model_version), ("device_model_stubdomain", bool), - ("device_model", string, False, "if you set this you must set device_model_version too"), + # you set device_model you must set device_model_version too + ("device_model", string), ("saved_state", string), ("type", libxl_domain_type), ("target_ram", uint32), - ("videoram", integer, False, "size of the videoram in MB"), - ("stdvga", bool, False, "stdvga enabled or disabled"), - ("vnc", bool, False, "vnc enabled or disabled"), - ("vnclisten", string, False, "address:port that should be listened on for the VNC server if vnc is set"), - ("vncpasswd", string, False, "the VNC password"), - ("vncdisplay", integer, False, "set VNC display number"), - ("vncunused", bool, False, "try to find an unused port for the VNC server"), - ("keymap", string, False, "set keyboard layout, default is en-us keyboard"), - ("sdl", bool, False, "sdl enabled or disabled"), - ("opengl", bool, False, "opengl enabled or disabled (if enabled requires sdl enabled)"), - ("spice", bool, False, - "spice enabled or disabled"), - ("spiceport", integer, False, - "the port that should be listened on for the spice server"), - ("spicetls_port", integer, False, """the tls port -that should be listened on for the spice server, -at least one of the port or tls port must be given"""), - ("spicehost", string, False, """the interface -that should be listened on if given otherwise any interface"""), - ("spicedisable_ticketing", bool, False, - "enable client connection with no password"), - ("spicepasswd", string, False, """set ticket password -witch must be used by a client for connection. -The password never expires"""), - ("spiceagent_mouse", bool, False, - "Whether spice agent is used for client mouse mode(default is on)"), - ("nographic", bool, False, "no graphics, use serial port"), - ("gfx_passthru", bool, False, "graphics passthrough enabled or disabled"), - ("serial", string, False, "serial port re-direct to pty deivce"), - ("boot", string, False, "boot order, for example dca"), - ("usb", bool, False, "usb support enabled or disabled"), - ("usbdevice", string, False, "enable usb mouse: tablet for absolute mouse, mouse for PS/2 protocol relative mouse"), - ("soundhw", string, False, "enable sound hardware"), - ("acpi", bool, False, "acpi enabled or disabled"), - ("vcpus", integer, False, "max number of vcpus"), - ("vcpu_avail", integer, False, "vcpus actually available"), - ("xen_platform_pci", bool, False, "enable/disable the xen platform pci device"), - ("extra", libxl_string_list, False, "extra parameters pass directly to qemu, NULL terminated"), - ("extra_pv", libxl_string_list, False, "extra parameters pass directly to qemu for PV guest, NULL terminated"), - ("extra_hvm", libxl_string_list, False, "extra parameters pass directly to qemu for HVM guest, NULL terminated"), + # size of the videoram in MB + ("videoram", integer), + ("stdvga", bool), + ("vnc", bool), + # "address:port" that should be listened on for the VNC server + ("vnclisten", string), + ("vncpasswd", string), + # VNC display number + ("vncdisplay", integer), + # If set then try to find an unused port for the VNC server + ("vncunused", bool), + # keyboard layout, default is en-us keyboard + ("keymap", string), + ("sdl", bool), + ("opengl", bool), # (requires sdl enabled) + ("spice", bool), + # At least one of spice port or spicetls_post must be given + ("spiceport", integer), + ("spicetls_port", integer), + # Interface to bind to + ("spicehost", string), + # enable client connection with no password + ("spicedisable_ticketing", bool), + ("spicepasswd", string), + ("spiceagent_mouse", bool), + ("nographic", bool), + ("gfx_passthru", bool), + ("serial", string), + ("boot", string), + ("usb", bool), + # usbdevice: "tablet" for absolute mouse, "mouse" for PS/2 protocol relative mouse + ("usbdevice", string), + ("soundhw", string), + ("acpi", bool), + ("vcpus", integer), # max number of vcpus + ("vcpu_avail", integer), # vcpus actually available + ("xen_platform_pci", bool), + # extra parameters pass directly to qemu, NULL terminated + ("extra", libxl_string_list), + # extra parameters pass directly to qemu for PV guest, NULL terminated + ("extra_pv", libxl_string_list), + # extra parameters pass directly to qemu for HVM guest, NULL terminated + ("extra_hvm", libxl_string_list), ], - comment= -"""Device Model information. - -Network is missing""") +) libxl_device_vfb = Struct("device_vfb", [ ("backend_domid", libxl_domid), ("devid", integer), - ("vnc", bool, False, "vnc enabled or disabled"), - ("vnclisten", string, False, "address:port that should be listened on for the VNC server if vnc is set"), - ("vncpasswd", string, False, "the VNC password"), - ("vncdisplay", integer, False, "set VNC display number"), - ("vncunused", bool, False, "try to find an unused port for the VNC server"), - ("keymap", string, False, "set keyboard layout, default is en-us keyboard"), - ("sdl", bool, False, "sdl enabled or disabled"), - ("opengl", bool, False, "opengl enabled or disabled (if enabled requires sdl enabled)"), + ("vnc", bool), + # address:port that should be listened on for the VNC server if vnc is set + ("vnclisten", string), + ("vncpasswd", string), + ("vncdisplay", integer), + ("vncunused", bool), + # set keyboard layout, default is en-us keyboard + ("keymap", string), + ("sdl", bool), + ("opengl", bool), # (if enabled requires sdl enabled) ("display", string), ("xauthority", string), ]) @@ -342,13 +350,13 @@ ]) libxl_vcpuinfo = Struct("vcpuinfo", [ - ("vcpuid", uint32, False, "vcpu's id"), - ("cpu", uint32, False, "current mapping"), - ("online", bool, False, "currently online (not hotplugged)?"), - ("blocked", bool, False, "blocked waiting for an event?"), - ("running", bool, False, "currently scheduled on its CPU?"), - ("vcpu_time", uint64, False, "total vcpu time ran (ns)"), - ("cpumap", libxl_cpumap, False, "current cpu's affinities"), + ("vcpuid", uint32), + ("cpu", uint32), + ("online", bool), + ("blocked", bool), + ("running", bool), + ("vcpu_time", uint64), # total vcpu time ran (ns) + ("cpumap", libxl_cpumap), # current cpu's affinities ]) libxl_physinfo = Struct("physinfo", [ @@ -371,9 +379,9 @@ ], dispose_fn=None, dir=DIR_OUT) libxl_topologyinfo = Struct("topologyinfo", [ - ("coremap", libxl_cpuarray, False, "cpu to core map"), - ("socketmap", libxl_cpuarray, False, "cpu to socket map"), - ("nodemap", libxl_cpuarray, False, "cpu to node map"), + ("coremap", libxl_cpuarray), # cpu to core map + ("socketmap", libxl_cpuarray), # cpu to socket map + ("nodemap", libxl_cpuarray), # cpu to node map ]) libxl_sched_credit = Struct("sched_credit", [ diff -r 58a608e1a100 -r 996c95a3e7e0 tools/libxl/libxltypes.py --- a/tools/libxl/libxltypes.py Tue Jan 31 14:39:57 2012 +0000 +++ b/tools/libxl/libxltypes.py Tue Jan 31 14:39:57 2012 +0000 @@ -22,7 +22,6 @@ class Type(object): def __init__(self, typename, **kwargs): - self.comment = kwargs.setdefault('comment', None) self.namespace = kwargs.setdefault('namespace', _get_default_namespace()) self.dir = kwargs.setdefault('dir', DIR_BOTH) @@ -120,7 +119,6 @@ self.rawname = str.upper(enum.rawname) + "_" + self.valuename self.name = str.upper(enum.namespace) + self.rawname self.value = value - self.comment = kwargs.setdefault("comment", None) class Enumeration(Type): def __init__(self, typename, values, **kwargs): @@ -129,16 +127,9 @@ self.values = [] for v in values: - # (value, name[, comment=None]) - if len(v) == 2: - (num,name) = v - comment = None - elif len(v) == 3: - num,name,comment = v - else: - raise "" + # (value, name) + (num,name) = v self.values.append(EnumerationValue(self, num, name, - comment=comment, typename=self.rawname)) def lookup(self, name): for v in self.values: @@ -152,7 +143,6 @@ self.type = type self.name = name self.const = kwargs.setdefault('const', False) - self.comment = kwargs.setdefault('comment', None) self.enumname = kwargs.setdefault('enumname', None) class Aggregate(Type): @@ -164,19 +154,17 @@ self.fields = [] for f in fields: - # (name, type[, const=False[, comment=None]]) + # (name, type[, const=False]) if len(f) == 2: n,t = f const = False - comment = None elif len(f) == 3: n,t,const = f - comment = None else: - n,t,const,comment = f + raise ValueError if n is None: raise ValueError - self.fields.append(Field(t,n,const=const,comment=comment)) + self.fields.append(Field(t,n,const=const)) # Returns a tuple (stem, field-expr) # _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:57:43 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:57: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 1RtR8Z-0007Wp-FW; Fri, 03 Feb 2012 21:57:43 +0000 Received: from mail216.messagelabs.com ([85.158.143.99]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8X-0007TE-FS for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:41 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-216.messagelabs.com!1328306253!13877599!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6060 invoked from network); 3 Feb 2012 21:57:34 -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; 3 Feb 2012 21:57:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8P-0001mi-CD for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR8M-0002q7-Ks for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:32 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:57:30 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: remove comment support from IDL X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1328020797 0 # Node ID 996c95a3e7e01f85186e5ac02e3070bc442ff580 # Parent 58a608e1a100d243352459a6a1ce95236ef832ce libxl: remove comment support from IDL People typically don't look for comments in generated source and the syntax for specifying them in the IDL makes things harder to follow. Instead just use source code comments in the IDL itself. I dropped a bunch of "foo bool # enable or disable foo" type comments. A lot of the remainder still aren't terribly useful though. No change to the generate code other than the comments being removed. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 58a608e1a100 -r 996c95a3e7e0 tools/libxl/gentypes.py --- a/tools/libxl/gentypes.py Tue Jan 31 14:39:57 2012 +0000 +++ b/tools/libxl/gentypes.py Tue Jan 31 14:39:57 2012 +0000 @@ -5,19 +5,6 @@ import libxltypes -def format_comment(level, comment): - indent = reduce(lambda x,y: x + " ", range(level), "") - s = "%s/*\n" % indent - s += "%s * " % indent - comment = comment.replace("\n", "\n%s * " % indent) - x = re.compile(r'^%s \* $' % indent, re.MULTILINE) - comment = x.sub("%s *" % indent, comment) - s += comment - s += "\n" - s += "%s */" % indent - s += "\n" - return s - def libxl_C_instance_of(ty, instancename): if isinstance(ty, libxltypes.Aggregate) and ty.typename is None: if instancename is None: @@ -30,17 +17,12 @@ def libxl_C_type_define(ty, indent = ""): s = "" if isinstance(ty, libxltypes.Enumeration): - if ty.comment is not None: - s += format_comment(0, ty.comment) - if ty.typename is None: s += "enum {\n" else: s += "typedef enum %s {\n" % ty.typename for v in ty.values: - if v.comment is not None: - s += format_comment(4, v.comment) x = "%s = %d" % (v.name, v.value) x = x.replace("\n", "\n ") s += " " + x + ",\n" @@ -50,17 +32,12 @@ s += "} %s" % ty.typename elif isinstance(ty, libxltypes.Aggregate): - if ty.comment is not None: - s += format_comment(0, ty.comment) - if ty.typename is None: s += "%s {\n" % ty.kind else: s += "typedef %s %s {\n" % (ty.kind, ty.typename) for f in ty.fields: - if f.comment is not None: - s += format_comment(4, f.comment) x = libxl_C_instance_of(f.type, f.name) if f.const: x = "const " + x diff -r 58a608e1a100 -r 996c95a3e7e0 tools/libxl/idl.txt --- a/tools/libxl/idl.txt Tue Jan 31 14:39:57 2012 +0000 +++ b/tools/libxl/idl.txt Tue Jan 31 14:39:57 2012 +0000 @@ -20,10 +20,6 @@ apply to all types. The properties are set by passing a named parameter to the constructor. -Type.comment: - - A free text comment which describes the type. - Type.namespace: (default: "libxl_") The namespace in which the type resides. Usually this is "libxl_" but @@ -98,7 +94,6 @@ name of the containing Enumeration and any namespace (e.g. "VALUE") EnumerationValue.value The integer value associated with this name. - EnumerationValue.comment A free text comment which describes the member. libxltype.Aggregate @@ -115,7 +110,6 @@ Field.name The name of the member (can be None for anonymous fields). Field.const Boolean, true if the member is const. - Field.comment A free text comment which describes the member. libxltype.Struct diff -r 58a608e1a100 -r 996c95a3e7e0 tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Tue Jan 31 14:39:57 2012 +0000 +++ b/tools/libxl/libxl_types.idl Tue Jan 31 14:39:57 2012 +0000 @@ -28,8 +28,8 @@ ]) libxl_device_model_version = Enumeration("device_model_version", [ - (1, "QEMU_XEN_TRADITIONAL", "Historical qemu-xen device model (qemu-dm)"), - (2, "QEMU_XEN", "Upstream based qemu-xen device model"), + (1, "QEMU_XEN_TRADITIONAL"), # Historical qemu-xen device model (qemu-dm) + (2, "QEMU_XEN"), # Upstream based qemu-xen device model ]) libxl_console_type = Enumeration("console_type", [ @@ -93,18 +93,18 @@ libxl_dominfo = Struct("dominfo",[ ("uuid", libxl_uuid), ("domid", libxl_domid), - ("ssidref", uint32), + ("ssidref", uint32), ("running", bool), ("blocked", bool), ("paused", bool), ("shutdown", bool), ("dying", bool), - ("shutdown_reason", uint8, False, -"""Valid SHUTDOWN_* value from xen/sched.h iff (shutdown||dying). - -Otherwise set to a value guaranteed not to clash with any valid -SHUTDOWN_* constant."""), + # Valid SHUTDOWN_* value from xen/sched.h iff (shutdown||dying). + # + # Otherwise set to a value guaranteed not to clash with any valid + # SHUTDOWN_* constant. + ("shutdown_reason", uint8), ("current_memkb", uint64), ("shared_memkb", uint64), ("max_memkb", uint64), @@ -153,6 +153,11 @@ ("poolid", uint32), ]) +# 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 +# then the user is responsible for calling +# libxl_file_reference_unmap. libxl_domain_build_info = Struct("domain_build_info",[ ("max_vcpus", integer), ("cur_vcpus", integer), @@ -188,84 +193,87 @@ ("cmdline", string), ("ramdisk", libxl_file_reference), ("features", string, True), - ("e820_host", bool, False, "Use host's E820 for PCI passthrough."), + # Use host's E820 for PCI passthrough. + ("e820_host", bool), ])), ])), ], - comment = -"""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 -then the user is responsible for calling -libxl_file_reference_unmap.""") +) +# Device Model Information libxl_device_model_info = Struct("device_model_info",[ ("domid", libxl_domid), - ("uuid", libxl_uuid, False, "this is use only with stubdom, and must be different from the domain uuid"), + + # uuid is used only with stubdom, and must be different from the + # domain uuid + ("uuid", libxl_uuid), ("dom_name", string), ("device_model_version", libxl_device_model_version), ("device_model_stubdomain", bool), - ("device_model", string, False, "if you set this you must set device_model_version too"), + # you set device_model you must set device_model_version too + ("device_model", string), ("saved_state", string), ("type", libxl_domain_type), ("target_ram", uint32), - ("videoram", integer, False, "size of the videoram in MB"), - ("stdvga", bool, False, "stdvga enabled or disabled"), - ("vnc", bool, False, "vnc enabled or disabled"), - ("vnclisten", string, False, "address:port that should be listened on for the VNC server if vnc is set"), - ("vncpasswd", string, False, "the VNC password"), - ("vncdisplay", integer, False, "set VNC display number"), - ("vncunused", bool, False, "try to find an unused port for the VNC server"), - ("keymap", string, False, "set keyboard layout, default is en-us keyboard"), - ("sdl", bool, False, "sdl enabled or disabled"), - ("opengl", bool, False, "opengl enabled or disabled (if enabled requires sdl enabled)"), - ("spice", bool, False, - "spice enabled or disabled"), - ("spiceport", integer, False, - "the port that should be listened on for the spice server"), - ("spicetls_port", integer, False, """the tls port -that should be listened on for the spice server, -at least one of the port or tls port must be given"""), - ("spicehost", string, False, """the interface -that should be listened on if given otherwise any interface"""), - ("spicedisable_ticketing", bool, False, - "enable client connection with no password"), - ("spicepasswd", string, False, """set ticket password -witch must be used by a client for connection. -The password never expires"""), - ("spiceagent_mouse", bool, False, - "Whether spice agent is used for client mouse mode(default is on)"), - ("nographic", bool, False, "no graphics, use serial port"), - ("gfx_passthru", bool, False, "graphics passthrough enabled or disabled"), - ("serial", string, False, "serial port re-direct to pty deivce"), - ("boot", string, False, "boot order, for example dca"), - ("usb", bool, False, "usb support enabled or disabled"), - ("usbdevice", string, False, "enable usb mouse: tablet for absolute mouse, mouse for PS/2 protocol relative mouse"), - ("soundhw", string, False, "enable sound hardware"), - ("acpi", bool, False, "acpi enabled or disabled"), - ("vcpus", integer, False, "max number of vcpus"), - ("vcpu_avail", integer, False, "vcpus actually available"), - ("xen_platform_pci", bool, False, "enable/disable the xen platform pci device"), - ("extra", libxl_string_list, False, "extra parameters pass directly to qemu, NULL terminated"), - ("extra_pv", libxl_string_list, False, "extra parameters pass directly to qemu for PV guest, NULL terminated"), - ("extra_hvm", libxl_string_list, False, "extra parameters pass directly to qemu for HVM guest, NULL terminated"), + # size of the videoram in MB + ("videoram", integer), + ("stdvga", bool), + ("vnc", bool), + # "address:port" that should be listened on for the VNC server + ("vnclisten", string), + ("vncpasswd", string), + # VNC display number + ("vncdisplay", integer), + # If set then try to find an unused port for the VNC server + ("vncunused", bool), + # keyboard layout, default is en-us keyboard + ("keymap", string), + ("sdl", bool), + ("opengl", bool), # (requires sdl enabled) + ("spice", bool), + # At least one of spice port or spicetls_post must be given + ("spiceport", integer), + ("spicetls_port", integer), + # Interface to bind to + ("spicehost", string), + # enable client connection with no password + ("spicedisable_ticketing", bool), + ("spicepasswd", string), + ("spiceagent_mouse", bool), + ("nographic", bool), + ("gfx_passthru", bool), + ("serial", string), + ("boot", string), + ("usb", bool), + # usbdevice: "tablet" for absolute mouse, "mouse" for PS/2 protocol relative mouse + ("usbdevice", string), + ("soundhw", string), + ("acpi", bool), + ("vcpus", integer), # max number of vcpus + ("vcpu_avail", integer), # vcpus actually available + ("xen_platform_pci", bool), + # extra parameters pass directly to qemu, NULL terminated + ("extra", libxl_string_list), + # extra parameters pass directly to qemu for PV guest, NULL terminated + ("extra_pv", libxl_string_list), + # extra parameters pass directly to qemu for HVM guest, NULL terminated + ("extra_hvm", libxl_string_list), ], - comment= -"""Device Model information. - -Network is missing""") +) libxl_device_vfb = Struct("device_vfb", [ ("backend_domid", libxl_domid), ("devid", integer), - ("vnc", bool, False, "vnc enabled or disabled"), - ("vnclisten", string, False, "address:port that should be listened on for the VNC server if vnc is set"), - ("vncpasswd", string, False, "the VNC password"), - ("vncdisplay", integer, False, "set VNC display number"), - ("vncunused", bool, False, "try to find an unused port for the VNC server"), - ("keymap", string, False, "set keyboard layout, default is en-us keyboard"), - ("sdl", bool, False, "sdl enabled or disabled"), - ("opengl", bool, False, "opengl enabled or disabled (if enabled requires sdl enabled)"), + ("vnc", bool), + # address:port that should be listened on for the VNC server if vnc is set + ("vnclisten", string), + ("vncpasswd", string), + ("vncdisplay", integer), + ("vncunused", bool), + # set keyboard layout, default is en-us keyboard + ("keymap", string), + ("sdl", bool), + ("opengl", bool), # (if enabled requires sdl enabled) ("display", string), ("xauthority", string), ]) @@ -342,13 +350,13 @@ ]) libxl_vcpuinfo = Struct("vcpuinfo", [ - ("vcpuid", uint32, False, "vcpu's id"), - ("cpu", uint32, False, "current mapping"), - ("online", bool, False, "currently online (not hotplugged)?"), - ("blocked", bool, False, "blocked waiting for an event?"), - ("running", bool, False, "currently scheduled on its CPU?"), - ("vcpu_time", uint64, False, "total vcpu time ran (ns)"), - ("cpumap", libxl_cpumap, False, "current cpu's affinities"), + ("vcpuid", uint32), + ("cpu", uint32), + ("online", bool), + ("blocked", bool), + ("running", bool), + ("vcpu_time", uint64), # total vcpu time ran (ns) + ("cpumap", libxl_cpumap), # current cpu's affinities ]) libxl_physinfo = Struct("physinfo", [ @@ -371,9 +379,9 @@ ], dispose_fn=None, dir=DIR_OUT) libxl_topologyinfo = Struct("topologyinfo", [ - ("coremap", libxl_cpuarray, False, "cpu to core map"), - ("socketmap", libxl_cpuarray, False, "cpu to socket map"), - ("nodemap", libxl_cpuarray, False, "cpu to node map"), + ("coremap", libxl_cpuarray), # cpu to core map + ("socketmap", libxl_cpuarray), # cpu to socket map + ("nodemap", libxl_cpuarray), # cpu to node map ]) libxl_sched_credit = Struct("sched_credit", [ diff -r 58a608e1a100 -r 996c95a3e7e0 tools/libxl/libxltypes.py --- a/tools/libxl/libxltypes.py Tue Jan 31 14:39:57 2012 +0000 +++ b/tools/libxl/libxltypes.py Tue Jan 31 14:39:57 2012 +0000 @@ -22,7 +22,6 @@ class Type(object): def __init__(self, typename, **kwargs): - self.comment = kwargs.setdefault('comment', None) self.namespace = kwargs.setdefault('namespace', _get_default_namespace()) self.dir = kwargs.setdefault('dir', DIR_BOTH) @@ -120,7 +119,6 @@ self.rawname = str.upper(enum.rawname) + "_" + self.valuename self.name = str.upper(enum.namespace) + self.rawname self.value = value - self.comment = kwargs.setdefault("comment", None) class Enumeration(Type): def __init__(self, typename, values, **kwargs): @@ -129,16 +127,9 @@ self.values = [] for v in values: - # (value, name[, comment=None]) - if len(v) == 2: - (num,name) = v - comment = None - elif len(v) == 3: - num,name,comment = v - else: - raise "" + # (value, name) + (num,name) = v self.values.append(EnumerationValue(self, num, name, - comment=comment, typename=self.rawname)) def lookup(self, name): for v in self.values: @@ -152,7 +143,6 @@ self.type = type self.name = name self.const = kwargs.setdefault('const', False) - self.comment = kwargs.setdefault('comment', None) self.enumname = kwargs.setdefault('enumname', None) class Aggregate(Type): @@ -164,19 +154,17 @@ self.fields = [] for f in fields: - # (name, type[, const=False[, comment=None]]) + # (name, type[, const=False]) if len(f) == 2: n,t = f const = False - comment = None elif len(f) == 3: n,t,const = f - comment = None else: - n,t,const,comment = f + raise ValueError if n is None: raise ValueError - self.fields.append(Field(t,n,const=const,comment=comment)) + self.fields.append(Field(t,n,const=const)) # Returns a tuple (stem, field-expr) # _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:57:44 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:57:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8a-0007Xg-Kz; Fri, 03 Feb 2012 21:57:44 +0000 Received: from mail216.messagelabs.com ([85.158.143.99]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8Y-0007UI-UG for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:43 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-11.tower-216.messagelabs.com!1328306255!12855327!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10680 invoked from network); 3 Feb 2012 21:57:36 -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; 3 Feb 2012 21:57:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8R-0001mo-Lq for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR8Q-0002rK-NP for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:35 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:57:33 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: use keyword arguments for field definitions in aggregate types. X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1328020797 0 # Node ID 1a93393b700209a5863a49961eb802e6796dd661 # Parent 996c95a3e7e01f85186e5ac02e3070bc442ff580 libxl: use keyword arguments for field definitions in aggregate types. The original code is not so bad now that the comments are gone but this is still a bit cleaner. No change in the generated code. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 996c95a3e7e0 -r 1a93393b7002 tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Tue Jan 31 14:39:57 2012 +0000 +++ b/tools/libxl/libxl_types.idl Tue Jan 31 14:39:57 2012 +0000 @@ -192,7 +192,7 @@ ("bootloader_args", libxl_string_list), ("cmdline", string), ("ramdisk", libxl_file_reference), - ("features", string, True), + ("features", string, {'const': True}), # Use host's E820 for PCI passthrough. ("e820_host", bool), ])), diff -r 996c95a3e7e0 -r 1a93393b7002 tools/libxl/libxltypes.py --- a/tools/libxl/libxltypes.py Tue Jan 31 14:39:57 2012 +0000 +++ b/tools/libxl/libxltypes.py Tue Jan 31 14:39:57 2012 +0000 @@ -154,17 +154,17 @@ self.fields = [] for f in fields: - # (name, type[, const=False]) + # (name, type[, {kw args}]) if len(f) == 2: n,t = f - const = False + kw = {} elif len(f) == 3: - n,t,const = f + n,t,kw = f else: raise ValueError if n is None: raise ValueError - self.fields.append(Field(t,n,const=const)) + self.fields.append(Field(t,n,**kw)) # Returns a tuple (stem, field-expr) # _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:57:44 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:57:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8a-0007Xg-Kz; Fri, 03 Feb 2012 21:57:44 +0000 Received: from mail216.messagelabs.com ([85.158.143.99]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8Y-0007UI-UG for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:43 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-11.tower-216.messagelabs.com!1328306255!12855327!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10680 invoked from network); 3 Feb 2012 21:57:36 -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; 3 Feb 2012 21:57:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8R-0001mo-Lq for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR8Q-0002rK-NP for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:35 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:57:33 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: use keyword arguments for field definitions in aggregate types. X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1328020797 0 # Node ID 1a93393b700209a5863a49961eb802e6796dd661 # Parent 996c95a3e7e01f85186e5ac02e3070bc442ff580 libxl: use keyword arguments for field definitions in aggregate types. The original code is not so bad now that the comments are gone but this is still a bit cleaner. No change in the generated code. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 996c95a3e7e0 -r 1a93393b7002 tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Tue Jan 31 14:39:57 2012 +0000 +++ b/tools/libxl/libxl_types.idl Tue Jan 31 14:39:57 2012 +0000 @@ -192,7 +192,7 @@ ("bootloader_args", libxl_string_list), ("cmdline", string), ("ramdisk", libxl_file_reference), - ("features", string, True), + ("features", string, {'const': True}), # Use host's E820 for PCI passthrough. ("e820_host", bool), ])), diff -r 996c95a3e7e0 -r 1a93393b7002 tools/libxl/libxltypes.py --- a/tools/libxl/libxltypes.py Tue Jan 31 14:39:57 2012 +0000 +++ b/tools/libxl/libxltypes.py Tue Jan 31 14:39:57 2012 +0000 @@ -154,17 +154,17 @@ self.fields = [] for f in fields: - # (name, type[, const=False]) + # (name, type[, {kw args}]) if len(f) == 2: n,t = f - const = False + kw = {} elif len(f) == 3: - n,t,const = f + n,t,kw = f else: raise ValueError if n is None: raise ValueError - self.fields.append(Field(t,n,const=const)) + self.fields.append(Field(t,n,**kw)) # Returns a tuple (stem, field-expr) # _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:57:46 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:57:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8c-0007ZI-Nd; Fri, 03 Feb 2012 21:57:46 +0000 Received: from mail174.messagelabs.com ([85.158.138.51]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8b-0007V0-2a for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:45 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-174.messagelabs.com!1328306257!11933586!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23381 invoked from network); 3 Feb 2012 21:57:38 -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; 3 Feb 2012 21:57:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8T-0001ms-IC for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR8S-0002sD-QL for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:37 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:57:35 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] ocaml: use libxl IDL type helpers for C argument passing X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1328020808 0 # Node ID 88b630f0406e026f8aa958f9f5130b4a07e0d134 # Parent 1a93393b700209a5863a49961eb802e6796dd661 ocaml: use libxl IDL type helpers for C argument passing Makes handling of nested structs more correct. Only change to the generated code right now is that the FOO_Val (C->ocamlC) function for Enumeration types now takes the C argument by value instead of reference. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 1a93393b7002 -r 88b630f0406e tools/ocaml/libs/xl/genwrap.py --- a/tools/ocaml/libs/xl/genwrap.py Tue Jan 31 14:39:57 2012 +0000 +++ b/tools/ocaml/libs/xl/genwrap.py Tue Jan 31 14:40:08 2012 +0000 @@ -114,11 +114,6 @@ return s.replace("\n", "\n%s" % indent) def c_val(ty, c, o, indent="", parent = None): - if ty.passby == libxltypes.PASS_BY_REFERENCE: - makeref = "" - else: - makeref = "&" - s = indent if isinstance(ty,libxltypes.UInt): if ty.width in [8, 16]: @@ -152,17 +147,18 @@ for f in ty.fields: if f.type.private: continue - s += "%s\n" % c_val(f.type, "%s->%s" % (c, f.name), "Field(%s, %d)" % (o,n), parent="%s->" % (c)) + (nparent,fexpr) = ty.member(c, f, parent is None) + s += "%s\n" % c_val(f.type, fexpr, "Field(%s, %d)" % (o,n), parent=nparent) n = n + 1 else: - s += "%s_val(gc, lg, %s, %s);" % (ty.rawname, makeref + c, o) + s += "%s_val(gc, lg, %s, %s);" % (ty.rawname, ty.pass_arg(c, parent is None, passby=libxltypes.PASS_BY_REFERENCE), o) return s.replace("\n", "\n%s" % indent) def gen_c_val(ty, indent=""): s = "/* Convert caml value to %s */\n" % ty.rawname - s += "static int %s_val (caml_gc *gc, struct caml_logger *lg, %s *c_val, value v)\n" % (ty.rawname, ty.typename) + s += "static int %s_val (caml_gc *gc, struct caml_logger *lg, %s, value v)\n" % (ty.rawname, ty.make_arg("c_val", passby=libxltypes.PASS_BY_REFERENCE)) s += "{\n" s += "\tCAMLparam1(v);\n" s += "\n" @@ -175,11 +171,6 @@ return s.replace("\n", "\n%s" % indent) def ocaml_Val(ty, o, c, indent="", parent = None): - if ty.passby == libxltypes.PASS_BY_REFERENCE: - makeref = "" - else: - makeref = "&" - s = indent if isinstance(ty,libxltypes.UInt): if ty.width in [8, 16]: @@ -202,7 +193,7 @@ s += "%s = %s;" % (o, fn % { "c": c }) elif isinstance(ty,libxltypes.Enumeration) and (parent is None): n = 0 - s += "switch(*%s) {\n" % c + s += "switch(%s) {\n" % c for e in ty.values: s += " case %s: %s = Int_val(%d); break;\n" % (e.name, o, n) n += 1 @@ -218,20 +209,23 @@ for f in ty.fields: if f.type.private: continue + + (nparent,fexpr) = ty.member(c, f, parent is None) + s += "\n" - s += "\t%s\n" % ocaml_Val(f.type, "%s_field" % ty.rawname, "%s->%s" % (c,f.name), parent="%s->" % c) + s += "\t%s\n" % ocaml_Val(f.type, "%s_field" % ty.rawname, ty.pass_arg(fexpr, c), parent=nparent) s += "\tStore_field(%s, %d, %s);\n" % (o, n, "%s_field" % ty.rawname) n = n + 1 s += "}" else: - s += "%s = Val_%s(gc, lg, %s);" % (o, ty.rawname, makeref + c) + s += "%s = Val_%s(gc, lg, %s);" % (o, ty.rawname, ty.pass_arg(c, parent is None)) return s.replace("\n", "\n%s" % indent).rstrip(indent) def gen_Val_ocaml(ty, indent=""): s = "/* Convert %s to a caml value */\n" % ty.rawname - s += "static value Val_%s (caml_gc *gc, struct caml_logger *lg, %s *%s_c)\n" % (ty.rawname, ty.typename, ty.rawname) + s += "static value Val_%s (caml_gc *gc, struct caml_logger *lg, %s)\n" % (ty.rawname, ty.make_arg(ty.rawname+"_c")) s += "{\n" s += "\tCAMLparam0();\n" s += "\tCAMLlocal1(%s_ocaml);\n" % ty.rawname _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:57:46 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:57:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8c-0007ZI-Nd; Fri, 03 Feb 2012 21:57:46 +0000 Received: from mail174.messagelabs.com ([85.158.138.51]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8b-0007V0-2a for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:45 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-174.messagelabs.com!1328306257!11933586!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23381 invoked from network); 3 Feb 2012 21:57:38 -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; 3 Feb 2012 21:57:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8T-0001ms-IC for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR8S-0002sD-QL for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:37 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:57:35 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] ocaml: use libxl IDL type helpers for C argument passing X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1328020808 0 # Node ID 88b630f0406e026f8aa958f9f5130b4a07e0d134 # Parent 1a93393b700209a5863a49961eb802e6796dd661 ocaml: use libxl IDL type helpers for C argument passing Makes handling of nested structs more correct. Only change to the generated code right now is that the FOO_Val (C->ocamlC) function for Enumeration types now takes the C argument by value instead of reference. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 1a93393b7002 -r 88b630f0406e tools/ocaml/libs/xl/genwrap.py --- a/tools/ocaml/libs/xl/genwrap.py Tue Jan 31 14:39:57 2012 +0000 +++ b/tools/ocaml/libs/xl/genwrap.py Tue Jan 31 14:40:08 2012 +0000 @@ -114,11 +114,6 @@ return s.replace("\n", "\n%s" % indent) def c_val(ty, c, o, indent="", parent = None): - if ty.passby == libxltypes.PASS_BY_REFERENCE: - makeref = "" - else: - makeref = "&" - s = indent if isinstance(ty,libxltypes.UInt): if ty.width in [8, 16]: @@ -152,17 +147,18 @@ for f in ty.fields: if f.type.private: continue - s += "%s\n" % c_val(f.type, "%s->%s" % (c, f.name), "Field(%s, %d)" % (o,n), parent="%s->" % (c)) + (nparent,fexpr) = ty.member(c, f, parent is None) + s += "%s\n" % c_val(f.type, fexpr, "Field(%s, %d)" % (o,n), parent=nparent) n = n + 1 else: - s += "%s_val(gc, lg, %s, %s);" % (ty.rawname, makeref + c, o) + s += "%s_val(gc, lg, %s, %s);" % (ty.rawname, ty.pass_arg(c, parent is None, passby=libxltypes.PASS_BY_REFERENCE), o) return s.replace("\n", "\n%s" % indent) def gen_c_val(ty, indent=""): s = "/* Convert caml value to %s */\n" % ty.rawname - s += "static int %s_val (caml_gc *gc, struct caml_logger *lg, %s *c_val, value v)\n" % (ty.rawname, ty.typename) + s += "static int %s_val (caml_gc *gc, struct caml_logger *lg, %s, value v)\n" % (ty.rawname, ty.make_arg("c_val", passby=libxltypes.PASS_BY_REFERENCE)) s += "{\n" s += "\tCAMLparam1(v);\n" s += "\n" @@ -175,11 +171,6 @@ return s.replace("\n", "\n%s" % indent) def ocaml_Val(ty, o, c, indent="", parent = None): - if ty.passby == libxltypes.PASS_BY_REFERENCE: - makeref = "" - else: - makeref = "&" - s = indent if isinstance(ty,libxltypes.UInt): if ty.width in [8, 16]: @@ -202,7 +193,7 @@ s += "%s = %s;" % (o, fn % { "c": c }) elif isinstance(ty,libxltypes.Enumeration) and (parent is None): n = 0 - s += "switch(*%s) {\n" % c + s += "switch(%s) {\n" % c for e in ty.values: s += " case %s: %s = Int_val(%d); break;\n" % (e.name, o, n) n += 1 @@ -218,20 +209,23 @@ for f in ty.fields: if f.type.private: continue + + (nparent,fexpr) = ty.member(c, f, parent is None) + s += "\n" - s += "\t%s\n" % ocaml_Val(f.type, "%s_field" % ty.rawname, "%s->%s" % (c,f.name), parent="%s->" % c) + s += "\t%s\n" % ocaml_Val(f.type, "%s_field" % ty.rawname, ty.pass_arg(fexpr, c), parent=nparent) s += "\tStore_field(%s, %d, %s);\n" % (o, n, "%s_field" % ty.rawname) n = n + 1 s += "}" else: - s += "%s = Val_%s(gc, lg, %s);" % (o, ty.rawname, makeref + c) + s += "%s = Val_%s(gc, lg, %s);" % (o, ty.rawname, ty.pass_arg(c, parent is None)) return s.replace("\n", "\n%s" % indent).rstrip(indent) def gen_Val_ocaml(ty, indent=""): s = "/* Convert %s to a caml value */\n" % ty.rawname - s += "static value Val_%s (caml_gc *gc, struct caml_logger *lg, %s *%s_c)\n" % (ty.rawname, ty.typename, ty.rawname) + s += "static value Val_%s (caml_gc *gc, struct caml_logger *lg, %s)\n" % (ty.rawname, ty.make_arg(ty.rawname+"_c")) s += "{\n" s += "\tCAMLparam0();\n" s += "\tCAMLlocal1(%s_ocaml);\n" % ty.rawname _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:57:47 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:57:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8c-0007ZU-Q1; Fri, 03 Feb 2012 21:57:46 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8b-0007Y3-By for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:45 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-27.messagelabs.com!1328306240!64435687!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31590 invoked from network); 3 Feb 2012 21:57:21 -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; 3 Feb 2012 21:57:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8Y-0001my-59 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR8V-0002t2-B3 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:41 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:57:37 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: define libxl_vnc_info to hold all info about the vnc info X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1328020859 0 # Node ID b1580167b3b255072395a75976d9da216e725ef6 # Parent 88b630f0406e026f8aa958f9f5130b4a07e0d134 libxl: define libxl_vnc_info to hold all info about the vnc info Reduces duplication in libxl_vfb and libxl_device_model. Updated bindings but the python ones in particular are unlikely to be useful until a user presents itself and fixes them up. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 88b630f0406e -r b1580167b3b2 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Tue Jan 31 14:40:08 2012 +0000 +++ b/tools/libxl/libxl.c Tue Jan 31 14:40:59 2012 +0000 @@ -2190,11 +2190,11 @@ memset(vfb, 0x00, sizeof(libxl_device_vfb)); vfb->display = NULL; vfb->xauthority = NULL; - vfb->vnc = 1; - vfb->vncpasswd = NULL; - vfb->vnclisten = strdup("127.0.0.1"); - vfb->vncdisplay = 0; - vfb->vncunused = 1; + vfb->vnc.enable = 1; + vfb->vnc.passwd = NULL; + vfb->vnc.listen = strdup("127.0.0.1"); + vfb->vnc.display = 0; + vfb->vnc.findunused = 1; vfb->keymap = NULL; vfb->sdl = 0; vfb->opengl = 0; @@ -2240,11 +2240,14 @@ flexarray_append_pair(back, "online", "1"); flexarray_append_pair(back, "state", libxl__sprintf(gc, "%d", 1)); flexarray_append_pair(back, "domain", libxl__domid_to_name(gc, domid)); - flexarray_append_pair(back, "vnc", libxl__sprintf(gc, "%d", vfb->vnc)); - flexarray_append_pair(back, "vnclisten", vfb->vnclisten); - flexarray_append_pair(back, "vncpasswd", vfb->vncpasswd); - flexarray_append_pair(back, "vncdisplay", libxl__sprintf(gc, "%d", vfb->vncdisplay)); - flexarray_append_pair(back, "vncunused", libxl__sprintf(gc, "%d", vfb->vncunused)); + flexarray_append_pair(back, "vnc", + libxl__sprintf(gc, "%d", vfb->vnc.enable)); + flexarray_append_pair(back, "vnclisten", vfb->vnc.listen); + flexarray_append_pair(back, "vncpasswd", vfb->vnc.passwd); + flexarray_append_pair(back, "vncdisplay", + libxl__sprintf(gc, "%d", vfb->vnc.display)); + flexarray_append_pair(back, "vncunused", + libxl__sprintf(gc, "%d", vfb->vnc.findunused)); flexarray_append_pair(back, "sdl", libxl__sprintf(gc, "%d", vfb->sdl)); flexarray_append_pair(back, "opengl", libxl__sprintf(gc, "%d", vfb->opengl)); if (vfb->xauthority) { diff -r 88b630f0406e -r b1580167b3b2 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Tue Jan 31 14:40:08 2012 +0000 +++ b/tools/libxl/libxl_create.c Tue Jan 31 14:40:59 2012 +0000 @@ -129,10 +129,10 @@ dm_info->vcpu_avail = b_info->cur_vcpus; dm_info->stdvga = 0; - dm_info->vnc = 1; - dm_info->vnclisten = strdup("127.0.0.1"); - dm_info->vncdisplay = 0; - dm_info->vncunused = 1; + dm_info->vnc.enable = 1; + dm_info->vnc.listen = strdup("127.0.0.1"); + dm_info->vnc.display = 0; + dm_info->vnc.findunused = 1; dm_info->keymap = NULL; dm_info->sdl = 0; dm_info->opengl = 0; diff -r 88b630f0406e -r b1580167b3b2 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Tue Jan 31 14:40:08 2012 +0000 +++ b/tools/libxl/libxl_dm.c Tue Jan 31 14:40:59 2012 +0000 @@ -92,31 +92,31 @@ if (info->dom_name) flexarray_vappend(dm_args, "-domain-name", info->dom_name, NULL); - if (info->vnc) { + if (info->vnc.enable) { char *vncarg; - if (info->vncdisplay) { - if (info->vnclisten && strchr(info->vnclisten, ':') == NULL) { + if (info->vnc.display) { + if (info->vnc.listen && strchr(info->vnc.listen, ':') == NULL) { vncarg = libxl__sprintf(gc, "%s:%d", - info->vnclisten, - info->vncdisplay); + info->vnc.listen, + info->vnc.display); } else { - vncarg = libxl__sprintf(gc, "127.0.0.1:%d", info->vncdisplay); + vncarg = libxl__sprintf(gc, "127.0.0.1:%d", info->vnc.display); } - } else if (info->vnclisten) { - if (strchr(info->vnclisten, ':') != NULL) { - vncarg = info->vnclisten; + } else if (info->vnc.listen) { + if (strchr(info->vnc.listen, ':') != NULL) { + vncarg = info->vnc.listen; } else { - vncarg = libxl__sprintf(gc, "%s:0", info->vnclisten); + vncarg = libxl__sprintf(gc, "%s:0", info->vnc.listen); } } else { vncarg = "127.0.0.1:0"; } - if (info->vncpasswd && (info->vncpasswd[0] != '\0')) + if (info->vnc.passwd && (info->vnc.passwd[0] != '\0')) vncarg = libxl__sprintf(gc, "%s,password", vncarg); flexarray_append(dm_args, "-vnc"); flexarray_append(dm_args, vncarg); - if (info->vncunused) { + if (info->vnc.findunused) { flexarray_append(dm_args, "-vncunused"); } } @@ -129,7 +129,7 @@ if (info->keymap) { flexarray_vappend(dm_args, "-k", info->keymap, NULL); } - if (info->nographic && (!info->sdl && !info->vnc)) { + if (info->nographic && (!info->sdl && !info->vnc.enable)) { flexarray_append(dm_args, "-nographic"); } if (info->serial) { @@ -260,32 +260,32 @@ if (info->dom_name) { flexarray_vappend(dm_args, "-name", info->dom_name, NULL); } - if (info->vnc) { + if (info->vnc.enable) { int display = 0; const char *listen = "127.0.0.1"; - if (info->vncpasswd && info->vncpasswd[0]) { + if (info->vnc.passwd && info->vnc.passwd[0]) { assert(!"missing code for supplying vnc password to qemu"); } flexarray_append(dm_args, "-vnc"); - if (info->vncdisplay) { - display = info->vncdisplay; - if (info->vnclisten && strchr(info->vnclisten, ':') == NULL) { - listen = info->vnclisten; + if (info->vnc.display) { + display = info->vnc.display; + if (info->vnc.listen && strchr(info->vnc.listen, ':') == NULL) { + listen = info->vnc.listen; } - } else if (info->vnclisten) { - listen = info->vnclisten; + } else if (info->vnc.listen) { + listen = info->vnc.listen; } if (strchr(listen, ':') != NULL) flexarray_append(dm_args, libxl__sprintf(gc, "%s%s", listen, - info->vncunused ? ",to=99" : "")); + info->vnc.findunused ? ",to=99" : "")); else flexarray_append(dm_args, libxl__sprintf(gc, "%s:%d%s", listen, display, - info->vncunused ? ",to=99" : "")); + info->vnc.findunused ? ",to=99" : "")); } if (info->sdl) { flexarray_append(dm_args, "-sdl"); @@ -335,7 +335,7 @@ if (info->keymap) { flexarray_vappend(dm_args, "-k", info->keymap, NULL); } - if (info->nographic && (!info->sdl && !info->vnc)) { + if (info->nographic && (!info->sdl && !info->vnc.enable)) { flexarray_append(dm_args, "-nographic"); } if (info->serial) { @@ -524,10 +524,6 @@ vfb->backend_domid = 0; vfb->devid = 0; vfb->vnc = info->vnc; - vfb->vnclisten = info->vnclisten; - vfb->vncdisplay = info->vncdisplay; - vfb->vncunused = info->vncunused; - vfb->vncpasswd = info->vncpasswd; vfb->keymap = info->keymap; vfb->sdl = info->sdl; vfb->opengl = info->opengl; @@ -851,7 +847,7 @@ goto out_close; } - if (info->vncpasswd) { + if (info->vnc.passwd) { retry_transaction: /* Find uuid and the write the vnc password to xenstore for qemu. */ t = xs_transaction_start(ctx->xsh); @@ -860,7 +856,7 @@ /* Now write the vncpassword into it. */ pass_stuff = libxl__calloc(gc, 3, sizeof(char *)); pass_stuff[0] = "vncpasswd"; - pass_stuff[1] = info->vncpasswd; + pass_stuff[1] = info->vnc.passwd; libxl__xs_writev(gc,t,vm_path,pass_stuff); if (!xs_transaction_end(ctx->xsh, t, 0)) if (errno == EAGAIN) @@ -975,13 +971,13 @@ libxl_ctx *ctx = libxl__gc_owner(gc); if (vfb != NULL) { - info->vnc = vfb->vnc; - if (vfb->vnclisten) - info->vnclisten = libxl__strdup(gc, vfb->vnclisten); - info->vncdisplay = vfb->vncdisplay; - info->vncunused = vfb->vncunused; - if (vfb->vncpasswd) - info->vncpasswd = vfb->vncpasswd; + info->vnc.enable = vfb->vnc.enable; + if (vfb->vnc.listen) + info->vnc.listen = libxl__strdup(gc, vfb->vnc.listen); + info->vnc.display = vfb->vnc.display; + info->vnc.findunused = vfb->vnc.findunused; + if (vfb->vnc.passwd) + info->vnc.passwd = vfb->vnc.passwd; if (vfb->keymap) info->keymap = libxl__strdup(gc, vfb->keymap); info->sdl = vfb->sdl; diff -r 88b630f0406e -r b1580167b3b2 tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Tue Jan 31 14:40:08 2012 +0000 +++ b/tools/libxl/libxl_types.idl Tue Jan 31 14:40:59 2012 +0000 @@ -90,6 +90,16 @@ # # Complex libxl types # +libxl_vnc_info = Struct("vnc_info", [ + ("enable", bool), + # "address:port" that should be listened on + ("listen", string), + ("passwd", string), + ("display", integer), + # If set then try to find an unused port + ("findunused", bool), + ]) + libxl_dominfo = Struct("dominfo",[ ("uuid", libxl_uuid), ("domid", libxl_domid), @@ -218,14 +228,7 @@ # size of the videoram in MB ("videoram", integer), ("stdvga", bool), - ("vnc", bool), - # "address:port" that should be listened on for the VNC server - ("vnclisten", string), - ("vncpasswd", string), - # VNC display number - ("vncdisplay", integer), - # If set then try to find an unused port for the VNC server - ("vncunused", bool), + ("vnc", libxl_vnc_info), # keyboard layout, default is en-us keyboard ("keymap", string), ("sdl", bool), @@ -264,12 +267,7 @@ libxl_device_vfb = Struct("device_vfb", [ ("backend_domid", libxl_domid), ("devid", integer), - ("vnc", bool), - # address:port that should be listened on for the VNC server if vnc is set - ("vnclisten", string), - ("vncpasswd", string), - ("vncdisplay", integer), - ("vncunused", bool), + ("vnc", libxl_vnc_info), # set keyboard layout, default is en-us keyboard ("keymap", string), ("sdl", bool), diff -r 88b630f0406e -r b1580167b3b2 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Tue Jan 31 14:40:08 2012 +0000 +++ b/tools/libxl/xl_cmdimpl.c Tue Jan 31 14:40:59 2012 +0000 @@ -367,10 +367,10 @@ printf("\t\t\t(device_model %s)\n", dm_info->device_model ? : "default"); printf("\t\t\t(videoram %d)\n", dm_info->videoram); printf("\t\t\t(stdvga %d)\n", dm_info->stdvga); - printf("\t\t\t(vnc %d)\n", dm_info->vnc); - printf("\t\t\t(vnclisten %s)\n", dm_info->vnclisten); - printf("\t\t\t(vncdisplay %d)\n", dm_info->vncdisplay); - printf("\t\t\t(vncunused %d)\n", dm_info->vncunused); + printf("\t\t\t(vnc %d)\n", dm_info->vnc.enable); + printf("\t\t\t(vnclisten %s)\n", dm_info->vnc.listen); + printf("\t\t\t(vncdisplay %d)\n", dm_info->vnc.display); + printf("\t\t\t(vncunused %d)\n", dm_info->vnc.findunused); printf("\t\t\t(keymap %s)\n", dm_info->keymap); printf("\t\t\t(sdl %d)\n", dm_info->sdl); printf("\t\t\t(gfx_passthru %d)\n", dm_info->gfx_passthru); @@ -457,10 +457,10 @@ printf("\t\t\t(backend_domid %d)\n", d_config->vfbs[i].backend_domid); printf("\t\t\t(frontend_domid %d)\n", domid); printf("\t\t\t(devid %d)\n", d_config->vfbs[i].devid); - printf("\t\t\t(vnc %d)\n", d_config->vfbs[i].vnc); - printf("\t\t\t(vnclisten %s)\n", d_config->vfbs[i].vnclisten); - printf("\t\t\t(vncdisplay %d)\n", d_config->vfbs[i].vncdisplay); - printf("\t\t\t(vncunused %d)\n", d_config->vfbs[i].vncunused); + printf("\t\t\t(vnc %d)\n", d_config->vfbs[i].vnc.enable); + printf("\t\t\t(vnclisten %s)\n", d_config->vfbs[i].vnc.listen); + printf("\t\t\t(vncdisplay %d)\n", d_config->vfbs[i].vnc.display); + printf("\t\t\t(vncunused %d)\n", d_config->vfbs[i].vnc.findunused); printf("\t\t\t(keymap %s)\n", d_config->vfbs[i].keymap); printf("\t\t\t(sdl %d)\n", d_config->vfbs[i].sdl); printf("\t\t\t(opengl %d)\n", d_config->vfbs[i].opengl); @@ -1045,17 +1045,17 @@ break; *p2 = '\0'; if (!strcmp(p, "vnc")) { - vfb->vnc = atoi(p2 + 1); + vfb->vnc.enable = atoi(p2 + 1); } else if (!strcmp(p, "vnclisten")) { - free(vfb->vnclisten); - vfb->vnclisten = strdup(p2 + 1); + free(vfb->vnc.listen); + vfb->vnc.listen = strdup(p2 + 1); } else if (!strcmp(p, "vncpasswd")) { - free(vfb->vncpasswd); - vfb->vncpasswd = strdup(p2 + 1); + free(vfb->vnc.passwd); + vfb->vnc.passwd = strdup(p2 + 1); } else if (!strcmp(p, "vncdisplay")) { - vfb->vncdisplay = atoi(p2 + 1); + vfb->vnc.display = atoi(p2 + 1); } else if (!strcmp(p, "vncunused")) { - vfb->vncunused = atoi(p2 + 1); + vfb->vnc.findunused = atoi(p2 + 1); } else if (!strcmp(p, "keymap")) { free(vfb->keymap); vfb->keymap = strdup(p2 + 1); @@ -1262,13 +1262,13 @@ if (!xlu_cfg_get_long (config, "stdvga", &l, 0)) dm_info->stdvga = l; if (!xlu_cfg_get_long (config, "vnc", &l, 0)) - dm_info->vnc = l; - xlu_cfg_replace_string (config, "vnclisten", &dm_info->vnclisten, 0); - xlu_cfg_replace_string (config, "vncpasswd", &dm_info->vncpasswd, 0); + dm_info->vnc.enable = l; + xlu_cfg_replace_string (config, "vnclisten", &dm_info->vnc.listen, 0); + xlu_cfg_replace_string (config, "vncpasswd", &dm_info->vnc.passwd, 0); if (!xlu_cfg_get_long (config, "vncdisplay", &l, 0)) - dm_info->vncdisplay = l; + dm_info->vnc.display = l; if (!xlu_cfg_get_long (config, "vncunused", &l, 0)) - dm_info->vncunused = l; + dm_info->vnc.findunused = l; xlu_cfg_replace_string (config, "keymap", &dm_info->keymap, 0); if (!xlu_cfg_get_long (config, "sdl", &l, 0)) dm_info->sdl = l; diff -r 88b630f0406e -r b1580167b3b2 tools/python/genwrap.py --- a/tools/python/genwrap.py Tue Jan 31 14:40:08 2012 +0000 +++ b/tools/python/genwrap.py Tue Jan 31 14:40:59 2012 +0000 @@ -4,7 +4,7 @@ import libxltypes -(TYPE_BOOL, TYPE_INT, TYPE_UINT, TYPE_STRING) = range(4) +(TYPE_BOOL, TYPE_INT, TYPE_UINT, TYPE_STRING, TYPE_AGGREGATE) = range(5) def py_type(ty): if ty == libxltypes.bool: @@ -16,6 +16,8 @@ return TYPE_INT else: return TYPE_UINT + if isinstance(ty, libxltypes.Aggregate): + return TYPE_AGGREGATE if ty == libxltypes.string: return TYPE_STRING return None @@ -66,6 +68,9 @@ l.append(' return genwrap__ull_get(self->obj.%s);'%f.name) elif t == TYPE_STRING: l.append(' return genwrap__string_get(&self->obj.%s);'%f.name) + elif t == TYPE_AGGREGATE: + l.append(' PyErr_SetString(PyExc_NotImplementedError, "Getting %s");'%ty.typename) + l.append(' return NULL;') else: tn = f.type.typename l.append(' return attrib__%s_get((%s *)&self->obj.%s);'%(fsanitize(tn), tn, f.name)) @@ -92,6 +97,9 @@ l.append(' return ret;') elif t == TYPE_STRING: l.append(' return genwrap__string_set(v, &self->obj.%s);'%f.name) + elif t == TYPE_AGGREGATE: + l.append(' PyErr_SetString(PyExc_NotImplementedError, "Setting %s");'%ty.typename) + l.append(' return -1;') else: tn = f.type.typename l.append(' return attrib__%s_set(v, (%s *)&self->obj.%s);'%(fsanitize(tn), tn, f.name)) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:57:47 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:57:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8c-0007ZU-Q1; Fri, 03 Feb 2012 21:57:46 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8b-0007Y3-By for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:45 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-27.messagelabs.com!1328306240!64435687!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31590 invoked from network); 3 Feb 2012 21:57:21 -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; 3 Feb 2012 21:57:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8Y-0001my-59 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR8V-0002t2-B3 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:41 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:57:37 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: define libxl_vnc_info to hold all info about the vnc info X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1328020859 0 # Node ID b1580167b3b255072395a75976d9da216e725ef6 # Parent 88b630f0406e026f8aa958f9f5130b4a07e0d134 libxl: define libxl_vnc_info to hold all info about the vnc info Reduces duplication in libxl_vfb and libxl_device_model. Updated bindings but the python ones in particular are unlikely to be useful until a user presents itself and fixes them up. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 88b630f0406e -r b1580167b3b2 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Tue Jan 31 14:40:08 2012 +0000 +++ b/tools/libxl/libxl.c Tue Jan 31 14:40:59 2012 +0000 @@ -2190,11 +2190,11 @@ memset(vfb, 0x00, sizeof(libxl_device_vfb)); vfb->display = NULL; vfb->xauthority = NULL; - vfb->vnc = 1; - vfb->vncpasswd = NULL; - vfb->vnclisten = strdup("127.0.0.1"); - vfb->vncdisplay = 0; - vfb->vncunused = 1; + vfb->vnc.enable = 1; + vfb->vnc.passwd = NULL; + vfb->vnc.listen = strdup("127.0.0.1"); + vfb->vnc.display = 0; + vfb->vnc.findunused = 1; vfb->keymap = NULL; vfb->sdl = 0; vfb->opengl = 0; @@ -2240,11 +2240,14 @@ flexarray_append_pair(back, "online", "1"); flexarray_append_pair(back, "state", libxl__sprintf(gc, "%d", 1)); flexarray_append_pair(back, "domain", libxl__domid_to_name(gc, domid)); - flexarray_append_pair(back, "vnc", libxl__sprintf(gc, "%d", vfb->vnc)); - flexarray_append_pair(back, "vnclisten", vfb->vnclisten); - flexarray_append_pair(back, "vncpasswd", vfb->vncpasswd); - flexarray_append_pair(back, "vncdisplay", libxl__sprintf(gc, "%d", vfb->vncdisplay)); - flexarray_append_pair(back, "vncunused", libxl__sprintf(gc, "%d", vfb->vncunused)); + flexarray_append_pair(back, "vnc", + libxl__sprintf(gc, "%d", vfb->vnc.enable)); + flexarray_append_pair(back, "vnclisten", vfb->vnc.listen); + flexarray_append_pair(back, "vncpasswd", vfb->vnc.passwd); + flexarray_append_pair(back, "vncdisplay", + libxl__sprintf(gc, "%d", vfb->vnc.display)); + flexarray_append_pair(back, "vncunused", + libxl__sprintf(gc, "%d", vfb->vnc.findunused)); flexarray_append_pair(back, "sdl", libxl__sprintf(gc, "%d", vfb->sdl)); flexarray_append_pair(back, "opengl", libxl__sprintf(gc, "%d", vfb->opengl)); if (vfb->xauthority) { diff -r 88b630f0406e -r b1580167b3b2 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Tue Jan 31 14:40:08 2012 +0000 +++ b/tools/libxl/libxl_create.c Tue Jan 31 14:40:59 2012 +0000 @@ -129,10 +129,10 @@ dm_info->vcpu_avail = b_info->cur_vcpus; dm_info->stdvga = 0; - dm_info->vnc = 1; - dm_info->vnclisten = strdup("127.0.0.1"); - dm_info->vncdisplay = 0; - dm_info->vncunused = 1; + dm_info->vnc.enable = 1; + dm_info->vnc.listen = strdup("127.0.0.1"); + dm_info->vnc.display = 0; + dm_info->vnc.findunused = 1; dm_info->keymap = NULL; dm_info->sdl = 0; dm_info->opengl = 0; diff -r 88b630f0406e -r b1580167b3b2 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Tue Jan 31 14:40:08 2012 +0000 +++ b/tools/libxl/libxl_dm.c Tue Jan 31 14:40:59 2012 +0000 @@ -92,31 +92,31 @@ if (info->dom_name) flexarray_vappend(dm_args, "-domain-name", info->dom_name, NULL); - if (info->vnc) { + if (info->vnc.enable) { char *vncarg; - if (info->vncdisplay) { - if (info->vnclisten && strchr(info->vnclisten, ':') == NULL) { + if (info->vnc.display) { + if (info->vnc.listen && strchr(info->vnc.listen, ':') == NULL) { vncarg = libxl__sprintf(gc, "%s:%d", - info->vnclisten, - info->vncdisplay); + info->vnc.listen, + info->vnc.display); } else { - vncarg = libxl__sprintf(gc, "127.0.0.1:%d", info->vncdisplay); + vncarg = libxl__sprintf(gc, "127.0.0.1:%d", info->vnc.display); } - } else if (info->vnclisten) { - if (strchr(info->vnclisten, ':') != NULL) { - vncarg = info->vnclisten; + } else if (info->vnc.listen) { + if (strchr(info->vnc.listen, ':') != NULL) { + vncarg = info->vnc.listen; } else { - vncarg = libxl__sprintf(gc, "%s:0", info->vnclisten); + vncarg = libxl__sprintf(gc, "%s:0", info->vnc.listen); } } else { vncarg = "127.0.0.1:0"; } - if (info->vncpasswd && (info->vncpasswd[0] != '\0')) + if (info->vnc.passwd && (info->vnc.passwd[0] != '\0')) vncarg = libxl__sprintf(gc, "%s,password", vncarg); flexarray_append(dm_args, "-vnc"); flexarray_append(dm_args, vncarg); - if (info->vncunused) { + if (info->vnc.findunused) { flexarray_append(dm_args, "-vncunused"); } } @@ -129,7 +129,7 @@ if (info->keymap) { flexarray_vappend(dm_args, "-k", info->keymap, NULL); } - if (info->nographic && (!info->sdl && !info->vnc)) { + if (info->nographic && (!info->sdl && !info->vnc.enable)) { flexarray_append(dm_args, "-nographic"); } if (info->serial) { @@ -260,32 +260,32 @@ if (info->dom_name) { flexarray_vappend(dm_args, "-name", info->dom_name, NULL); } - if (info->vnc) { + if (info->vnc.enable) { int display = 0; const char *listen = "127.0.0.1"; - if (info->vncpasswd && info->vncpasswd[0]) { + if (info->vnc.passwd && info->vnc.passwd[0]) { assert(!"missing code for supplying vnc password to qemu"); } flexarray_append(dm_args, "-vnc"); - if (info->vncdisplay) { - display = info->vncdisplay; - if (info->vnclisten && strchr(info->vnclisten, ':') == NULL) { - listen = info->vnclisten; + if (info->vnc.display) { + display = info->vnc.display; + if (info->vnc.listen && strchr(info->vnc.listen, ':') == NULL) { + listen = info->vnc.listen; } - } else if (info->vnclisten) { - listen = info->vnclisten; + } else if (info->vnc.listen) { + listen = info->vnc.listen; } if (strchr(listen, ':') != NULL) flexarray_append(dm_args, libxl__sprintf(gc, "%s%s", listen, - info->vncunused ? ",to=99" : "")); + info->vnc.findunused ? ",to=99" : "")); else flexarray_append(dm_args, libxl__sprintf(gc, "%s:%d%s", listen, display, - info->vncunused ? ",to=99" : "")); + info->vnc.findunused ? ",to=99" : "")); } if (info->sdl) { flexarray_append(dm_args, "-sdl"); @@ -335,7 +335,7 @@ if (info->keymap) { flexarray_vappend(dm_args, "-k", info->keymap, NULL); } - if (info->nographic && (!info->sdl && !info->vnc)) { + if (info->nographic && (!info->sdl && !info->vnc.enable)) { flexarray_append(dm_args, "-nographic"); } if (info->serial) { @@ -524,10 +524,6 @@ vfb->backend_domid = 0; vfb->devid = 0; vfb->vnc = info->vnc; - vfb->vnclisten = info->vnclisten; - vfb->vncdisplay = info->vncdisplay; - vfb->vncunused = info->vncunused; - vfb->vncpasswd = info->vncpasswd; vfb->keymap = info->keymap; vfb->sdl = info->sdl; vfb->opengl = info->opengl; @@ -851,7 +847,7 @@ goto out_close; } - if (info->vncpasswd) { + if (info->vnc.passwd) { retry_transaction: /* Find uuid and the write the vnc password to xenstore for qemu. */ t = xs_transaction_start(ctx->xsh); @@ -860,7 +856,7 @@ /* Now write the vncpassword into it. */ pass_stuff = libxl__calloc(gc, 3, sizeof(char *)); pass_stuff[0] = "vncpasswd"; - pass_stuff[1] = info->vncpasswd; + pass_stuff[1] = info->vnc.passwd; libxl__xs_writev(gc,t,vm_path,pass_stuff); if (!xs_transaction_end(ctx->xsh, t, 0)) if (errno == EAGAIN) @@ -975,13 +971,13 @@ libxl_ctx *ctx = libxl__gc_owner(gc); if (vfb != NULL) { - info->vnc = vfb->vnc; - if (vfb->vnclisten) - info->vnclisten = libxl__strdup(gc, vfb->vnclisten); - info->vncdisplay = vfb->vncdisplay; - info->vncunused = vfb->vncunused; - if (vfb->vncpasswd) - info->vncpasswd = vfb->vncpasswd; + info->vnc.enable = vfb->vnc.enable; + if (vfb->vnc.listen) + info->vnc.listen = libxl__strdup(gc, vfb->vnc.listen); + info->vnc.display = vfb->vnc.display; + info->vnc.findunused = vfb->vnc.findunused; + if (vfb->vnc.passwd) + info->vnc.passwd = vfb->vnc.passwd; if (vfb->keymap) info->keymap = libxl__strdup(gc, vfb->keymap); info->sdl = vfb->sdl; diff -r 88b630f0406e -r b1580167b3b2 tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Tue Jan 31 14:40:08 2012 +0000 +++ b/tools/libxl/libxl_types.idl Tue Jan 31 14:40:59 2012 +0000 @@ -90,6 +90,16 @@ # # Complex libxl types # +libxl_vnc_info = Struct("vnc_info", [ + ("enable", bool), + # "address:port" that should be listened on + ("listen", string), + ("passwd", string), + ("display", integer), + # If set then try to find an unused port + ("findunused", bool), + ]) + libxl_dominfo = Struct("dominfo",[ ("uuid", libxl_uuid), ("domid", libxl_domid), @@ -218,14 +228,7 @@ # size of the videoram in MB ("videoram", integer), ("stdvga", bool), - ("vnc", bool), - # "address:port" that should be listened on for the VNC server - ("vnclisten", string), - ("vncpasswd", string), - # VNC display number - ("vncdisplay", integer), - # If set then try to find an unused port for the VNC server - ("vncunused", bool), + ("vnc", libxl_vnc_info), # keyboard layout, default is en-us keyboard ("keymap", string), ("sdl", bool), @@ -264,12 +267,7 @@ libxl_device_vfb = Struct("device_vfb", [ ("backend_domid", libxl_domid), ("devid", integer), - ("vnc", bool), - # address:port that should be listened on for the VNC server if vnc is set - ("vnclisten", string), - ("vncpasswd", string), - ("vncdisplay", integer), - ("vncunused", bool), + ("vnc", libxl_vnc_info), # set keyboard layout, default is en-us keyboard ("keymap", string), ("sdl", bool), diff -r 88b630f0406e -r b1580167b3b2 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Tue Jan 31 14:40:08 2012 +0000 +++ b/tools/libxl/xl_cmdimpl.c Tue Jan 31 14:40:59 2012 +0000 @@ -367,10 +367,10 @@ printf("\t\t\t(device_model %s)\n", dm_info->device_model ? : "default"); printf("\t\t\t(videoram %d)\n", dm_info->videoram); printf("\t\t\t(stdvga %d)\n", dm_info->stdvga); - printf("\t\t\t(vnc %d)\n", dm_info->vnc); - printf("\t\t\t(vnclisten %s)\n", dm_info->vnclisten); - printf("\t\t\t(vncdisplay %d)\n", dm_info->vncdisplay); - printf("\t\t\t(vncunused %d)\n", dm_info->vncunused); + printf("\t\t\t(vnc %d)\n", dm_info->vnc.enable); + printf("\t\t\t(vnclisten %s)\n", dm_info->vnc.listen); + printf("\t\t\t(vncdisplay %d)\n", dm_info->vnc.display); + printf("\t\t\t(vncunused %d)\n", dm_info->vnc.findunused); printf("\t\t\t(keymap %s)\n", dm_info->keymap); printf("\t\t\t(sdl %d)\n", dm_info->sdl); printf("\t\t\t(gfx_passthru %d)\n", dm_info->gfx_passthru); @@ -457,10 +457,10 @@ printf("\t\t\t(backend_domid %d)\n", d_config->vfbs[i].backend_domid); printf("\t\t\t(frontend_domid %d)\n", domid); printf("\t\t\t(devid %d)\n", d_config->vfbs[i].devid); - printf("\t\t\t(vnc %d)\n", d_config->vfbs[i].vnc); - printf("\t\t\t(vnclisten %s)\n", d_config->vfbs[i].vnclisten); - printf("\t\t\t(vncdisplay %d)\n", d_config->vfbs[i].vncdisplay); - printf("\t\t\t(vncunused %d)\n", d_config->vfbs[i].vncunused); + printf("\t\t\t(vnc %d)\n", d_config->vfbs[i].vnc.enable); + printf("\t\t\t(vnclisten %s)\n", d_config->vfbs[i].vnc.listen); + printf("\t\t\t(vncdisplay %d)\n", d_config->vfbs[i].vnc.display); + printf("\t\t\t(vncunused %d)\n", d_config->vfbs[i].vnc.findunused); printf("\t\t\t(keymap %s)\n", d_config->vfbs[i].keymap); printf("\t\t\t(sdl %d)\n", d_config->vfbs[i].sdl); printf("\t\t\t(opengl %d)\n", d_config->vfbs[i].opengl); @@ -1045,17 +1045,17 @@ break; *p2 = '\0'; if (!strcmp(p, "vnc")) { - vfb->vnc = atoi(p2 + 1); + vfb->vnc.enable = atoi(p2 + 1); } else if (!strcmp(p, "vnclisten")) { - free(vfb->vnclisten); - vfb->vnclisten = strdup(p2 + 1); + free(vfb->vnc.listen); + vfb->vnc.listen = strdup(p2 + 1); } else if (!strcmp(p, "vncpasswd")) { - free(vfb->vncpasswd); - vfb->vncpasswd = strdup(p2 + 1); + free(vfb->vnc.passwd); + vfb->vnc.passwd = strdup(p2 + 1); } else if (!strcmp(p, "vncdisplay")) { - vfb->vncdisplay = atoi(p2 + 1); + vfb->vnc.display = atoi(p2 + 1); } else if (!strcmp(p, "vncunused")) { - vfb->vncunused = atoi(p2 + 1); + vfb->vnc.findunused = atoi(p2 + 1); } else if (!strcmp(p, "keymap")) { free(vfb->keymap); vfb->keymap = strdup(p2 + 1); @@ -1262,13 +1262,13 @@ if (!xlu_cfg_get_long (config, "stdvga", &l, 0)) dm_info->stdvga = l; if (!xlu_cfg_get_long (config, "vnc", &l, 0)) - dm_info->vnc = l; - xlu_cfg_replace_string (config, "vnclisten", &dm_info->vnclisten, 0); - xlu_cfg_replace_string (config, "vncpasswd", &dm_info->vncpasswd, 0); + dm_info->vnc.enable = l; + xlu_cfg_replace_string (config, "vnclisten", &dm_info->vnc.listen, 0); + xlu_cfg_replace_string (config, "vncpasswd", &dm_info->vnc.passwd, 0); if (!xlu_cfg_get_long (config, "vncdisplay", &l, 0)) - dm_info->vncdisplay = l; + dm_info->vnc.display = l; if (!xlu_cfg_get_long (config, "vncunused", &l, 0)) - dm_info->vncunused = l; + dm_info->vnc.findunused = l; xlu_cfg_replace_string (config, "keymap", &dm_info->keymap, 0); if (!xlu_cfg_get_long (config, "sdl", &l, 0)) dm_info->sdl = l; diff -r 88b630f0406e -r b1580167b3b2 tools/python/genwrap.py --- a/tools/python/genwrap.py Tue Jan 31 14:40:08 2012 +0000 +++ b/tools/python/genwrap.py Tue Jan 31 14:40:59 2012 +0000 @@ -4,7 +4,7 @@ import libxltypes -(TYPE_BOOL, TYPE_INT, TYPE_UINT, TYPE_STRING) = range(4) +(TYPE_BOOL, TYPE_INT, TYPE_UINT, TYPE_STRING, TYPE_AGGREGATE) = range(5) def py_type(ty): if ty == libxltypes.bool: @@ -16,6 +16,8 @@ return TYPE_INT else: return TYPE_UINT + if isinstance(ty, libxltypes.Aggregate): + return TYPE_AGGREGATE if ty == libxltypes.string: return TYPE_STRING return None @@ -66,6 +68,9 @@ l.append(' return genwrap__ull_get(self->obj.%s);'%f.name) elif t == TYPE_STRING: l.append(' return genwrap__string_get(&self->obj.%s);'%f.name) + elif t == TYPE_AGGREGATE: + l.append(' PyErr_SetString(PyExc_NotImplementedError, "Getting %s");'%ty.typename) + l.append(' return NULL;') else: tn = f.type.typename l.append(' return attrib__%s_get((%s *)&self->obj.%s);'%(fsanitize(tn), tn, f.name)) @@ -92,6 +97,9 @@ l.append(' return ret;') elif t == TYPE_STRING: l.append(' return genwrap__string_set(v, &self->obj.%s);'%f.name) + elif t == TYPE_AGGREGATE: + l.append(' PyErr_SetString(PyExc_NotImplementedError, "Setting %s");'%ty.typename) + l.append(' return -1;') else: tn = f.type.typename l.append(' return attrib__%s_set(v, (%s *)&self->obj.%s);'%(fsanitize(tn), tn, f.name)) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:57:57 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:57:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8m-0007eh-TE; Fri, 03 Feb 2012 21:57:56 +0000 Received: from mail182.messagelabs.com ([85.158.139.83]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8l-0007bn-9g for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:55 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-182.messagelabs.com!1328306267!6221342!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4213 invoked from network); 3 Feb 2012 21:57:48 -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; 3 Feb 2012 21:57:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8d-0001n7-05 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR8a-0002uM-Ui for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:46 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:57:42 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: define libxl_spice_info to hold all info about the spice server X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1328020860 0 # Node ID 5d9e86d7e448f365daa05f1f1b6d70948e927400 # Parent b1580167b3b255072395a75976d9da216e725ef6 libxl: define libxl_spice_info to hold all info about the spice server Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r b1580167b3b2 -r 5d9e86d7e448 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Tue Jan 31 14:40:59 2012 +0000 +++ b/tools/libxl/libxl_dm.c Tue Jan 31 14:41:00 2012 +0000 @@ -290,39 +290,39 @@ if (info->sdl) { flexarray_append(dm_args, "-sdl"); } - if (info->spice) { + if (info->spice.enable) { char *spiceoptions = NULL; - if (!info->spiceport && !info->spicetls_port) { + if (!info->spice.port && !info->spice.tls_port) { LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "at least one of the spiceport or tls_port must be provided"); return NULL; } - if (!info->spicedisable_ticketing) { - if (!info->spicepasswd) { + if (!info->spice.disable_ticketing) { + if (!info->spice.passwd) { LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "spice ticketing is enabled but missing password"); return NULL; } - else if (!info->spicepasswd[0]) { + else if (!info->spice.passwd[0]) { LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "spice password can't be empty"); return NULL; } } spiceoptions = libxl__sprintf(gc, "port=%d,tls-port=%d", - info->spiceport, info->spicetls_port); - if (info->spicehost) + info->spice.port, info->spice.tls_port); + if (info->spice.host) spiceoptions = libxl__sprintf(gc, - "%s,addr=%s", spiceoptions, info->spicehost); - if (info->spicedisable_ticketing) + "%s,addr=%s", spiceoptions, info->spice.host); + if (info->spice.disable_ticketing) spiceoptions = libxl__sprintf(gc, "%s,disable-ticketing", spiceoptions); else spiceoptions = libxl__sprintf(gc, - "%s,password=%s", spiceoptions, info->spicepasswd); + "%s,password=%s", spiceoptions, info->spice.passwd); spiceoptions = libxl__sprintf(gc, "%s,agent-mouse=%s", spiceoptions, - info->spiceagent_mouse ? "on" : "off"); + info->spice.agent_mouse ? "on" : "off"); flexarray_append(dm_args, "-spice"); flexarray_append(dm_args, spiceoptions); diff -r b1580167b3b2 -r 5d9e86d7e448 tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Tue Jan 31 14:40:59 2012 +0000 +++ b/tools/libxl/libxl_types.idl Tue Jan 31 14:41:00 2012 +0000 @@ -100,6 +100,26 @@ ("findunused", bool), ]) +libxl_spice_info = Struct("spice_info", [ + ("enable", bool), + # At least one of spice port or spicetls_post must be given + ("port", integer), + ("tls_port", integer), + # Interface to bind to + ("host", string), + # enable client connection with no password + ("disable_ticketing", bool), + ("passwd", string), + ("agent_mouse", bool), + ]) + +libxl_sdl_info = Struct("sdl_info", [ + ("enable", bool), + ("opengl", bool), + ("display", string), + ("xauthority", string), + ]) + libxl_dominfo = Struct("dominfo",[ ("uuid", libxl_uuid), ("domid", libxl_domid), @@ -233,16 +253,7 @@ ("keymap", string), ("sdl", bool), ("opengl", bool), # (requires sdl enabled) - ("spice", bool), - # At least one of spice port or spicetls_post must be given - ("spiceport", integer), - ("spicetls_port", integer), - # Interface to bind to - ("spicehost", string), - # enable client connection with no password - ("spicedisable_ticketing", bool), - ("spicepasswd", string), - ("spiceagent_mouse", bool), + ("spice", libxl_spice_info), ("nographic", bool), ("gfx_passthru", bool), ("serial", string), diff -r b1580167b3b2 -r 5d9e86d7e448 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Tue Jan 31 14:40:59 2012 +0000 +++ b/tools/libxl/xl_cmdimpl.c Tue Jan 31 14:41:00 2012 +0000 @@ -381,13 +381,13 @@ printf("\t\t\t(usb %d)\n", dm_info->usb); printf("\t\t\t(usbdevice %s)\n", dm_info->usbdevice); printf("\t\t\t(acpi %d)\n", dm_info->acpi); - printf("\t\t\t(spice %d)\n", dm_info->spice); - printf("\t\t\t(spiceport %d)\n", dm_info->spiceport); - printf("\t\t\t(spicetls_port %d)\n", dm_info->spicetls_port); - printf("\t\t\t(spicehost %s)\n", dm_info->spicehost); + printf("\t\t\t(spice %d)\n", dm_info->spice.enable); + printf("\t\t\t(spiceport %d)\n", dm_info->spice.port); + printf("\t\t\t(spicetls_port %d)\n", dm_info->spice.tls_port); + printf("\t\t\t(spicehost %s)\n", dm_info->spice.host); printf("\t\t\t(spicedisable_ticketing %d)\n", - dm_info->spicedisable_ticketing); - printf("\t\t\t(spiceagent_mouse %d)\n", dm_info->spiceagent_mouse); + dm_info->spice.disable_ticketing); + printf("\t\t\t(spiceagent_mouse %d)\n", dm_info->spice.agent_mouse); printf("\t\t)\n"); break; case LIBXL_DOMAIN_TYPE_PV: @@ -1275,19 +1275,20 @@ if (!xlu_cfg_get_long (config, "opengl", &l, 0)) dm_info->opengl = l; if (!xlu_cfg_get_long (config, "spice", &l, 0)) - dm_info->spice = l; + dm_info->spice.enable = l; if (!xlu_cfg_get_long (config, "spiceport", &l, 0)) - dm_info->spiceport = l; + dm_info->spice.port = l; if (!xlu_cfg_get_long (config, "spicetls_port", &l, 0)) - dm_info->spicetls_port = l; - xlu_cfg_replace_string (config, "spicehost", &dm_info->spicehost, 0); + dm_info->spice.tls_port = l; + xlu_cfg_replace_string (config, "spicehost", &dm_info->spice.host, 0); if (!xlu_cfg_get_long (config, "spicedisable_ticketing", &l, 0)) - dm_info->spicedisable_ticketing = l; - xlu_cfg_replace_string (config, "spicepasswd", &dm_info->spicepasswd, 0); + dm_info->spice.disable_ticketing = l; + xlu_cfg_replace_string (config, "spicepasswd", + &dm_info->spice.passwd, 0); if (!xlu_cfg_get_long (config, "spiceagent_mouse", &l, 0)) - dm_info->spiceagent_mouse = l; + dm_info->spice.agent_mouse = l; else - dm_info->spiceagent_mouse = 1; + dm_info->spice.agent_mouse = 1; if (!xlu_cfg_get_long (config, "nographic", &l, 0)) dm_info->nographic = l; if (!xlu_cfg_get_long (config, "gfx_passthru", &l, 0)) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:57:57 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:57:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8m-0007eh-TE; Fri, 03 Feb 2012 21:57:56 +0000 Received: from mail182.messagelabs.com ([85.158.139.83]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8l-0007bn-9g for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:55 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-182.messagelabs.com!1328306267!6221342!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4213 invoked from network); 3 Feb 2012 21:57:48 -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; 3 Feb 2012 21:57:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8d-0001n7-05 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR8a-0002uM-Ui for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:46 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:57:42 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: define libxl_spice_info to hold all info about the spice server X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1328020860 0 # Node ID 5d9e86d7e448f365daa05f1f1b6d70948e927400 # Parent b1580167b3b255072395a75976d9da216e725ef6 libxl: define libxl_spice_info to hold all info about the spice server Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r b1580167b3b2 -r 5d9e86d7e448 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Tue Jan 31 14:40:59 2012 +0000 +++ b/tools/libxl/libxl_dm.c Tue Jan 31 14:41:00 2012 +0000 @@ -290,39 +290,39 @@ if (info->sdl) { flexarray_append(dm_args, "-sdl"); } - if (info->spice) { + if (info->spice.enable) { char *spiceoptions = NULL; - if (!info->spiceport && !info->spicetls_port) { + if (!info->spice.port && !info->spice.tls_port) { LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "at least one of the spiceport or tls_port must be provided"); return NULL; } - if (!info->spicedisable_ticketing) { - if (!info->spicepasswd) { + if (!info->spice.disable_ticketing) { + if (!info->spice.passwd) { LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "spice ticketing is enabled but missing password"); return NULL; } - else if (!info->spicepasswd[0]) { + else if (!info->spice.passwd[0]) { LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "spice password can't be empty"); return NULL; } } spiceoptions = libxl__sprintf(gc, "port=%d,tls-port=%d", - info->spiceport, info->spicetls_port); - if (info->spicehost) + info->spice.port, info->spice.tls_port); + if (info->spice.host) spiceoptions = libxl__sprintf(gc, - "%s,addr=%s", spiceoptions, info->spicehost); - if (info->spicedisable_ticketing) + "%s,addr=%s", spiceoptions, info->spice.host); + if (info->spice.disable_ticketing) spiceoptions = libxl__sprintf(gc, "%s,disable-ticketing", spiceoptions); else spiceoptions = libxl__sprintf(gc, - "%s,password=%s", spiceoptions, info->spicepasswd); + "%s,password=%s", spiceoptions, info->spice.passwd); spiceoptions = libxl__sprintf(gc, "%s,agent-mouse=%s", spiceoptions, - info->spiceagent_mouse ? "on" : "off"); + info->spice.agent_mouse ? "on" : "off"); flexarray_append(dm_args, "-spice"); flexarray_append(dm_args, spiceoptions); diff -r b1580167b3b2 -r 5d9e86d7e448 tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Tue Jan 31 14:40:59 2012 +0000 +++ b/tools/libxl/libxl_types.idl Tue Jan 31 14:41:00 2012 +0000 @@ -100,6 +100,26 @@ ("findunused", bool), ]) +libxl_spice_info = Struct("spice_info", [ + ("enable", bool), + # At least one of spice port or spicetls_post must be given + ("port", integer), + ("tls_port", integer), + # Interface to bind to + ("host", string), + # enable client connection with no password + ("disable_ticketing", bool), + ("passwd", string), + ("agent_mouse", bool), + ]) + +libxl_sdl_info = Struct("sdl_info", [ + ("enable", bool), + ("opengl", bool), + ("display", string), + ("xauthority", string), + ]) + libxl_dominfo = Struct("dominfo",[ ("uuid", libxl_uuid), ("domid", libxl_domid), @@ -233,16 +253,7 @@ ("keymap", string), ("sdl", bool), ("opengl", bool), # (requires sdl enabled) - ("spice", bool), - # At least one of spice port or spicetls_post must be given - ("spiceport", integer), - ("spicetls_port", integer), - # Interface to bind to - ("spicehost", string), - # enable client connection with no password - ("spicedisable_ticketing", bool), - ("spicepasswd", string), - ("spiceagent_mouse", bool), + ("spice", libxl_spice_info), ("nographic", bool), ("gfx_passthru", bool), ("serial", string), diff -r b1580167b3b2 -r 5d9e86d7e448 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Tue Jan 31 14:40:59 2012 +0000 +++ b/tools/libxl/xl_cmdimpl.c Tue Jan 31 14:41:00 2012 +0000 @@ -381,13 +381,13 @@ printf("\t\t\t(usb %d)\n", dm_info->usb); printf("\t\t\t(usbdevice %s)\n", dm_info->usbdevice); printf("\t\t\t(acpi %d)\n", dm_info->acpi); - printf("\t\t\t(spice %d)\n", dm_info->spice); - printf("\t\t\t(spiceport %d)\n", dm_info->spiceport); - printf("\t\t\t(spicetls_port %d)\n", dm_info->spicetls_port); - printf("\t\t\t(spicehost %s)\n", dm_info->spicehost); + printf("\t\t\t(spice %d)\n", dm_info->spice.enable); + printf("\t\t\t(spiceport %d)\n", dm_info->spice.port); + printf("\t\t\t(spicetls_port %d)\n", dm_info->spice.tls_port); + printf("\t\t\t(spicehost %s)\n", dm_info->spice.host); printf("\t\t\t(spicedisable_ticketing %d)\n", - dm_info->spicedisable_ticketing); - printf("\t\t\t(spiceagent_mouse %d)\n", dm_info->spiceagent_mouse); + dm_info->spice.disable_ticketing); + printf("\t\t\t(spiceagent_mouse %d)\n", dm_info->spice.agent_mouse); printf("\t\t)\n"); break; case LIBXL_DOMAIN_TYPE_PV: @@ -1275,19 +1275,20 @@ if (!xlu_cfg_get_long (config, "opengl", &l, 0)) dm_info->opengl = l; if (!xlu_cfg_get_long (config, "spice", &l, 0)) - dm_info->spice = l; + dm_info->spice.enable = l; if (!xlu_cfg_get_long (config, "spiceport", &l, 0)) - dm_info->spiceport = l; + dm_info->spice.port = l; if (!xlu_cfg_get_long (config, "spicetls_port", &l, 0)) - dm_info->spicetls_port = l; - xlu_cfg_replace_string (config, "spicehost", &dm_info->spicehost, 0); + dm_info->spice.tls_port = l; + xlu_cfg_replace_string (config, "spicehost", &dm_info->spice.host, 0); if (!xlu_cfg_get_long (config, "spicedisable_ticketing", &l, 0)) - dm_info->spicedisable_ticketing = l; - xlu_cfg_replace_string (config, "spicepasswd", &dm_info->spicepasswd, 0); + dm_info->spice.disable_ticketing = l; + xlu_cfg_replace_string (config, "spicepasswd", + &dm_info->spice.passwd, 0); if (!xlu_cfg_get_long (config, "spiceagent_mouse", &l, 0)) - dm_info->spiceagent_mouse = l; + dm_info->spice.agent_mouse = l; else - dm_info->spiceagent_mouse = 1; + dm_info->spice.agent_mouse = 1; if (!xlu_cfg_get_long (config, "nographic", &l, 0)) dm_info->nographic = l; if (!xlu_cfg_get_long (config, "gfx_passthru", &l, 0)) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:58:00 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:58: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 1RtR8q-0007gc-1f; Fri, 03 Feb 2012 21:58:00 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8o-0007fd-AA for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:58 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-27.messagelabs.com!1328306157!62474789!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10659 invoked from network); 3 Feb 2012 21:55:58 -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; 3 Feb 2012 21:55:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8l-0001nO-A3 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR8k-0002xC-8a for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:54 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:57:53 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: plumb libxl_domain_config down into device model creation. X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1328020860 0 # Node ID 919ad96e3e2886bc5171bfed5205ad56a2390a5b # Parent 9f0c4da3cbef636e730280f6755f5968873b2344 libxl: plumb libxl_domain_config down into device model creation. Creating the device model derives lots of bits from the guest configuration. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 9f0c4da3cbef -r 919ad96e3e28 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Tue Jan 31 14:41:00 2012 +0000 +++ b/tools/libxl/libxl_create.c Tue Jan 31 14:41:00 2012 +0000 @@ -571,7 +571,7 @@ libxl_device_vkb_dispose(&vkb); dm_info->domid = domid; - ret = libxl__create_device_model(gc, dm_info, + ret = libxl__create_device_model(gc, d_config, dm_info, d_config->disks, d_config->num_disks, d_config->vifs, d_config->num_vifs, &dm_starting); @@ -618,7 +618,8 @@ xenpv_dm_info.extra_pv = d_config->dm_info.extra_pv; xenpv_dm_info.extra_hvm = d_config->dm_info.extra_hvm; - libxl__create_xenpv_qemu(gc, domid, &xenpv_dm_info, + libxl__create_xenpv_qemu(gc, domid, + d_config, &xenpv_dm_info, d_config->vfbs, &dm_starting); } break; diff -r 9f0c4da3cbef -r 919ad96e3e28 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Tue Jan 31 14:41:00 2012 +0000 +++ b/tools/libxl/libxl_dm.c Tue Jan 31 14:41:00 2012 +0000 @@ -74,10 +74,11 @@ } static char ** libxl__build_device_model_args_old(libxl__gc *gc, - const char *dm, - libxl_device_model_info *info, - libxl_device_disk *disks, int num_disks, - libxl_device_nic *vifs, int num_vifs) + const char *dm, + const libxl_domain_config *guest_config, + const libxl_device_model_info *info, + const libxl_device_disk *disks, int num_disks, + const libxl_device_nic *vifs, int num_vifs) { int i; flexarray_t *dm_args; @@ -228,10 +229,11 @@ } static char ** libxl__build_device_model_args_new(libxl__gc *gc, - const char *dm, - libxl_device_model_info *info, - libxl_device_disk *disks, int num_disks, - libxl_device_nic *vifs, int num_vifs) + const char *dm, + const libxl_domain_config *guest_config, + const libxl_device_model_info *info, + const libxl_device_disk *disks, int num_disks, + const libxl_device_nic *vifs, int num_vifs) { libxl_ctx *ctx = libxl__gc_owner(gc); flexarray_t *dm_args; @@ -492,20 +494,21 @@ } static char ** libxl__build_device_model_args(libxl__gc *gc, - const char *dm, - libxl_device_model_info *info, - libxl_device_disk *disks, int num_disks, - libxl_device_nic *vifs, int num_vifs) + const char *dm, + const libxl_domain_config *guest_config, + const libxl_device_model_info *info, + const libxl_device_disk *disks, int num_disks, + const libxl_device_nic *vifs, int num_vifs) { libxl_ctx *ctx = libxl__gc_owner(gc); switch (info->device_model_version) { case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: - return libxl__build_device_model_args_old(gc, dm, info, + return libxl__build_device_model_args_old(gc, dm, guest_config, info, disks, num_disks, vifs, num_vifs); case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: - return libxl__build_device_model_args_new(gc, dm, info, + return libxl__build_device_model_args_new(gc, dm, guest_config, info, disks, num_disks, vifs, num_vifs); default: @@ -516,9 +519,9 @@ } static int libxl__vfb_and_vkb_from_device_model_info(libxl__gc *gc, - libxl_device_model_info *info, - libxl_device_vfb *vfb, - libxl_device_vkb *vkb) + const libxl_device_model_info *info, + libxl_device_vfb *vfb, + libxl_device_vkb *vkb) { memset(vfb, 0x00, sizeof(libxl_device_vfb)); memset(vkb, 0x00, sizeof(libxl_device_vkb)); @@ -583,6 +586,7 @@ } static int libxl__create_stubdom(libxl__gc *gc, + libxl_domain_config *guest_config, libxl_device_model_info *info, libxl_device_disk *disks, int num_disks, libxl_device_nic *vifs, int num_vifs, @@ -593,8 +597,7 @@ libxl_ctx *ctx = libxl__gc_owner(gc); int i, num_console = STUBDOM_SPECIAL_CONSOLES, ret; libxl_device_console *console; - libxl_domain_create_info c_info; - libxl_domain_build_info b_info; + libxl_domain_config dm_config; libxl__domain_build_state state; uint32_t domid; char **args; @@ -608,7 +611,35 @@ goto out; } - args = libxl__build_device_model_args(gc, "stubdom-dm", info, + memset(&dm_config.c_info, 0x00, sizeof(libxl_domain_create_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, info->domid)); + + libxl_uuid_copy(&dm_config.c_info.uuid, &info->uuid); + + memset(&dm_config.b_info, 0x00, sizeof(libxl_domain_build_info)); + 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.type = LIBXL_DOMAIN_TYPE_PV; + 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", info->domid); + dm_config.b_info.u.pv.ramdisk.path = ""; + dm_config.b_info.u.pv.features = ""; + + /* fixme: this function can leak the stubdom if it fails */ + domid = 0; + ret = libxl__domain_make(gc, &dm_config.c_info, &domid); + if (ret) + goto out; + ret = libxl__domain_build(gc, &dm_config.b_info, info, domid, &state); + if (ret) + goto out; + + args = libxl__build_device_model_args(gc, "stubdom-dm", + guest_config, info, disks, num_disks, vifs, num_vifs); if (!args) { @@ -616,33 +647,6 @@ goto out; } - memset(&c_info, 0x00, sizeof(libxl_domain_create_info)); - c_info.type = LIBXL_DOMAIN_TYPE_PV; - c_info.name = libxl__sprintf(gc, "%s-dm", libxl__domid_to_name(gc, info->domid)); - - libxl_uuid_copy(&c_info.uuid, &info->uuid); - - memset(&b_info, 0x00, sizeof(libxl_domain_build_info)); - b_info.max_vcpus = 1; - b_info.max_memkb = 32 * 1024; - b_info.target_memkb = b_info.max_memkb; - - b_info.type = LIBXL_DOMAIN_TYPE_PV; - b_info.u.pv.kernel.path = libxl__abs_path(gc, "ioemu-stubdom.gz", - libxl_xenfirmwaredir_path()); - b_info.u.pv.cmdline = libxl__sprintf(gc, " -d %d", info->domid); - b_info.u.pv.ramdisk.path = ""; - b_info.u.pv.features = ""; - - /* fixme: this function can leak the stubdom if it fails */ - domid = 0; - ret = libxl__domain_make(gc, &c_info, &domid); - if (ret) - goto out_free; - ret = libxl__domain_build(gc, &b_info, info, domid, &state); - if (ret) - goto out_free; - libxl__write_dmargs(gc, domid, info->domid, args); libxl__xs_write(gc, XBT_NULL, libxl__sprintf(gc, "%s/image/device-model-domid", libxl__xs_get_dompath(gc, info->domid)), @@ -739,6 +743,7 @@ xenpv_dm_info.extra_hvm = info->extra_hvm; if (libxl__create_xenpv_qemu(gc, domid, + &dm_config, &xenpv_dm_info, vfb, &dm_starting) < 0) { ret = ERROR_FAIL; @@ -768,6 +773,7 @@ } int libxl__create_device_model(libxl__gc *gc, + libxl_domain_config *guest_config, libxl_device_model_info *info, libxl_device_disk *disks, int num_disks, libxl_device_nic *vifs, int num_vifs, @@ -789,7 +795,7 @@ libxl_device_vkb vkb; libxl__vfb_and_vkb_from_device_model_info(gc, info, &vfb, &vkb); - rc = libxl__create_stubdom(gc, info, + rc = libxl__create_stubdom(gc, guest_config, info, disks, num_disks, vifs, num_vifs, &vfb, &vkb, starting_r); @@ -807,7 +813,8 @@ rc = ERROR_FAIL; goto out; } - args = libxl__build_device_model_args(gc, dm, info, disks, num_disks, + args = libxl__build_device_model_args(gc, dm, guest_config, info, + disks, num_disks, vifs, num_vifs); if (!args) { rc = ERROR_FAIL; @@ -1027,12 +1034,13 @@ } int libxl__create_xenpv_qemu(libxl__gc *gc, uint32_t domid, + libxl_domain_config *guest_config, libxl_device_model_info *info, libxl_device_vfb *vfb, libxl__spawner_starting **starting_r) { libxl__build_xenpv_qemu_args(gc, domid, vfb, info); - libxl__create_device_model(gc, info, NULL, 0, NULL, 0, starting_r); + libxl__create_device_model(gc, guest_config, info, NULL, 0, NULL, 0, starting_r); return 0; } diff -r 9f0c4da3cbef -r 919ad96e3e28 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Tue Jan 31 14:41:00 2012 +0000 +++ b/tools/libxl/libxl_internal.h Tue Jan 31 14:41:00 2012 +0000 @@ -866,11 +866,13 @@ _hidden const char *libxl__domain_device_model(libxl__gc *gc, libxl_device_model_info *info); _hidden int libxl__create_device_model(libxl__gc *gc, + libxl_domain_config *guest_config, libxl_device_model_info *info, - libxl_device_disk *disk, int num_disks, + libxl_device_disk *disks, int num_disks, libxl_device_nic *vifs, int num_vifs, libxl__spawner_starting **starting_r); _hidden int libxl__create_xenpv_qemu(libxl__gc *gc, uint32_t domid, + libxl_domain_config *guest_config, libxl_device_model_info *dm_info, libxl_device_vfb *vfb, libxl__spawner_starting **starting_r); diff -r 9f0c4da3cbef -r 919ad96e3e28 tools/libxl/libxl_uuid.c --- a/tools/libxl/libxl_uuid.c Tue Jan 31 14:41:00 2012 +0000 +++ b/tools/libxl/libxl_uuid.c Tue Jan 31 14:41:00 2012 +0000 @@ -35,7 +35,7 @@ return uuid_parse(in, uuid->uuid); } -void libxl_uuid_copy(libxl_uuid *dst, libxl_uuid *src) +void libxl_uuid_copy(libxl_uuid *dst, const libxl_uuid *src) { uuid_copy(dst->uuid, src->uuid); } @@ -82,7 +82,7 @@ } #undef LIBXL__UUID_PTRS -void libxl_uuid_copy(libxl_uuid *dst, libxl_uuid *src) +void libxl_uuid_copy(libxl_uuid *dst, const libxl_uuid *src) { memcpy(dst->uuid, src->uuid, sizeof(dst->uuid)); } diff -r 9f0c4da3cbef -r 919ad96e3e28 tools/libxl/libxl_uuid.h --- a/tools/libxl/libxl_uuid.h Tue Jan 31 14:41:00 2012 +0000 +++ b/tools/libxl/libxl_uuid.h Tue Jan 31 14:41:00 2012 +0000 @@ -56,7 +56,7 @@ int libxl_uuid_is_nil(libxl_uuid *uuid); void libxl_uuid_generate(libxl_uuid *uuid); int libxl_uuid_from_string(libxl_uuid *uuid, const char *in); -void libxl_uuid_copy(libxl_uuid *dst, libxl_uuid *src); +void libxl_uuid_copy(libxl_uuid *dst, const libxl_uuid *src); void libxl_uuid_clear(libxl_uuid *uuid); int libxl_uuid_compare(libxl_uuid *uuid1, libxl_uuid *uuid2); uint8_t *libxl_uuid_bytearray(libxl_uuid *uuid); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:58:00 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:58: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 1RtR8q-0007gc-1f; Fri, 03 Feb 2012 21:58:00 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8o-0007fd-AA for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:58 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-27.messagelabs.com!1328306157!62474789!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10659 invoked from network); 3 Feb 2012 21:55:58 -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; 3 Feb 2012 21:55:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8l-0001nO-A3 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR8k-0002xC-8a for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:54 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:57:53 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: plumb libxl_domain_config down into device model creation. X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1328020860 0 # Node ID 919ad96e3e2886bc5171bfed5205ad56a2390a5b # Parent 9f0c4da3cbef636e730280f6755f5968873b2344 libxl: plumb libxl_domain_config down into device model creation. Creating the device model derives lots of bits from the guest configuration. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 9f0c4da3cbef -r 919ad96e3e28 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Tue Jan 31 14:41:00 2012 +0000 +++ b/tools/libxl/libxl_create.c Tue Jan 31 14:41:00 2012 +0000 @@ -571,7 +571,7 @@ libxl_device_vkb_dispose(&vkb); dm_info->domid = domid; - ret = libxl__create_device_model(gc, dm_info, + ret = libxl__create_device_model(gc, d_config, dm_info, d_config->disks, d_config->num_disks, d_config->vifs, d_config->num_vifs, &dm_starting); @@ -618,7 +618,8 @@ xenpv_dm_info.extra_pv = d_config->dm_info.extra_pv; xenpv_dm_info.extra_hvm = d_config->dm_info.extra_hvm; - libxl__create_xenpv_qemu(gc, domid, &xenpv_dm_info, + libxl__create_xenpv_qemu(gc, domid, + d_config, &xenpv_dm_info, d_config->vfbs, &dm_starting); } break; diff -r 9f0c4da3cbef -r 919ad96e3e28 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Tue Jan 31 14:41:00 2012 +0000 +++ b/tools/libxl/libxl_dm.c Tue Jan 31 14:41:00 2012 +0000 @@ -74,10 +74,11 @@ } static char ** libxl__build_device_model_args_old(libxl__gc *gc, - const char *dm, - libxl_device_model_info *info, - libxl_device_disk *disks, int num_disks, - libxl_device_nic *vifs, int num_vifs) + const char *dm, + const libxl_domain_config *guest_config, + const libxl_device_model_info *info, + const libxl_device_disk *disks, int num_disks, + const libxl_device_nic *vifs, int num_vifs) { int i; flexarray_t *dm_args; @@ -228,10 +229,11 @@ } static char ** libxl__build_device_model_args_new(libxl__gc *gc, - const char *dm, - libxl_device_model_info *info, - libxl_device_disk *disks, int num_disks, - libxl_device_nic *vifs, int num_vifs) + const char *dm, + const libxl_domain_config *guest_config, + const libxl_device_model_info *info, + const libxl_device_disk *disks, int num_disks, + const libxl_device_nic *vifs, int num_vifs) { libxl_ctx *ctx = libxl__gc_owner(gc); flexarray_t *dm_args; @@ -492,20 +494,21 @@ } static char ** libxl__build_device_model_args(libxl__gc *gc, - const char *dm, - libxl_device_model_info *info, - libxl_device_disk *disks, int num_disks, - libxl_device_nic *vifs, int num_vifs) + const char *dm, + const libxl_domain_config *guest_config, + const libxl_device_model_info *info, + const libxl_device_disk *disks, int num_disks, + const libxl_device_nic *vifs, int num_vifs) { libxl_ctx *ctx = libxl__gc_owner(gc); switch (info->device_model_version) { case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: - return libxl__build_device_model_args_old(gc, dm, info, + return libxl__build_device_model_args_old(gc, dm, guest_config, info, disks, num_disks, vifs, num_vifs); case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: - return libxl__build_device_model_args_new(gc, dm, info, + return libxl__build_device_model_args_new(gc, dm, guest_config, info, disks, num_disks, vifs, num_vifs); default: @@ -516,9 +519,9 @@ } static int libxl__vfb_and_vkb_from_device_model_info(libxl__gc *gc, - libxl_device_model_info *info, - libxl_device_vfb *vfb, - libxl_device_vkb *vkb) + const libxl_device_model_info *info, + libxl_device_vfb *vfb, + libxl_device_vkb *vkb) { memset(vfb, 0x00, sizeof(libxl_device_vfb)); memset(vkb, 0x00, sizeof(libxl_device_vkb)); @@ -583,6 +586,7 @@ } static int libxl__create_stubdom(libxl__gc *gc, + libxl_domain_config *guest_config, libxl_device_model_info *info, libxl_device_disk *disks, int num_disks, libxl_device_nic *vifs, int num_vifs, @@ -593,8 +597,7 @@ libxl_ctx *ctx = libxl__gc_owner(gc); int i, num_console = STUBDOM_SPECIAL_CONSOLES, ret; libxl_device_console *console; - libxl_domain_create_info c_info; - libxl_domain_build_info b_info; + libxl_domain_config dm_config; libxl__domain_build_state state; uint32_t domid; char **args; @@ -608,7 +611,35 @@ goto out; } - args = libxl__build_device_model_args(gc, "stubdom-dm", info, + memset(&dm_config.c_info, 0x00, sizeof(libxl_domain_create_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, info->domid)); + + libxl_uuid_copy(&dm_config.c_info.uuid, &info->uuid); + + memset(&dm_config.b_info, 0x00, sizeof(libxl_domain_build_info)); + 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.type = LIBXL_DOMAIN_TYPE_PV; + 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", info->domid); + dm_config.b_info.u.pv.ramdisk.path = ""; + dm_config.b_info.u.pv.features = ""; + + /* fixme: this function can leak the stubdom if it fails */ + domid = 0; + ret = libxl__domain_make(gc, &dm_config.c_info, &domid); + if (ret) + goto out; + ret = libxl__domain_build(gc, &dm_config.b_info, info, domid, &state); + if (ret) + goto out; + + args = libxl__build_device_model_args(gc, "stubdom-dm", + guest_config, info, disks, num_disks, vifs, num_vifs); if (!args) { @@ -616,33 +647,6 @@ goto out; } - memset(&c_info, 0x00, sizeof(libxl_domain_create_info)); - c_info.type = LIBXL_DOMAIN_TYPE_PV; - c_info.name = libxl__sprintf(gc, "%s-dm", libxl__domid_to_name(gc, info->domid)); - - libxl_uuid_copy(&c_info.uuid, &info->uuid); - - memset(&b_info, 0x00, sizeof(libxl_domain_build_info)); - b_info.max_vcpus = 1; - b_info.max_memkb = 32 * 1024; - b_info.target_memkb = b_info.max_memkb; - - b_info.type = LIBXL_DOMAIN_TYPE_PV; - b_info.u.pv.kernel.path = libxl__abs_path(gc, "ioemu-stubdom.gz", - libxl_xenfirmwaredir_path()); - b_info.u.pv.cmdline = libxl__sprintf(gc, " -d %d", info->domid); - b_info.u.pv.ramdisk.path = ""; - b_info.u.pv.features = ""; - - /* fixme: this function can leak the stubdom if it fails */ - domid = 0; - ret = libxl__domain_make(gc, &c_info, &domid); - if (ret) - goto out_free; - ret = libxl__domain_build(gc, &b_info, info, domid, &state); - if (ret) - goto out_free; - libxl__write_dmargs(gc, domid, info->domid, args); libxl__xs_write(gc, XBT_NULL, libxl__sprintf(gc, "%s/image/device-model-domid", libxl__xs_get_dompath(gc, info->domid)), @@ -739,6 +743,7 @@ xenpv_dm_info.extra_hvm = info->extra_hvm; if (libxl__create_xenpv_qemu(gc, domid, + &dm_config, &xenpv_dm_info, vfb, &dm_starting) < 0) { ret = ERROR_FAIL; @@ -768,6 +773,7 @@ } int libxl__create_device_model(libxl__gc *gc, + libxl_domain_config *guest_config, libxl_device_model_info *info, libxl_device_disk *disks, int num_disks, libxl_device_nic *vifs, int num_vifs, @@ -789,7 +795,7 @@ libxl_device_vkb vkb; libxl__vfb_and_vkb_from_device_model_info(gc, info, &vfb, &vkb); - rc = libxl__create_stubdom(gc, info, + rc = libxl__create_stubdom(gc, guest_config, info, disks, num_disks, vifs, num_vifs, &vfb, &vkb, starting_r); @@ -807,7 +813,8 @@ rc = ERROR_FAIL; goto out; } - args = libxl__build_device_model_args(gc, dm, info, disks, num_disks, + args = libxl__build_device_model_args(gc, dm, guest_config, info, + disks, num_disks, vifs, num_vifs); if (!args) { rc = ERROR_FAIL; @@ -1027,12 +1034,13 @@ } int libxl__create_xenpv_qemu(libxl__gc *gc, uint32_t domid, + libxl_domain_config *guest_config, libxl_device_model_info *info, libxl_device_vfb *vfb, libxl__spawner_starting **starting_r) { libxl__build_xenpv_qemu_args(gc, domid, vfb, info); - libxl__create_device_model(gc, info, NULL, 0, NULL, 0, starting_r); + libxl__create_device_model(gc, guest_config, info, NULL, 0, NULL, 0, starting_r); return 0; } diff -r 9f0c4da3cbef -r 919ad96e3e28 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Tue Jan 31 14:41:00 2012 +0000 +++ b/tools/libxl/libxl_internal.h Tue Jan 31 14:41:00 2012 +0000 @@ -866,11 +866,13 @@ _hidden const char *libxl__domain_device_model(libxl__gc *gc, libxl_device_model_info *info); _hidden int libxl__create_device_model(libxl__gc *gc, + libxl_domain_config *guest_config, libxl_device_model_info *info, - libxl_device_disk *disk, int num_disks, + libxl_device_disk *disks, int num_disks, libxl_device_nic *vifs, int num_vifs, libxl__spawner_starting **starting_r); _hidden int libxl__create_xenpv_qemu(libxl__gc *gc, uint32_t domid, + libxl_domain_config *guest_config, libxl_device_model_info *dm_info, libxl_device_vfb *vfb, libxl__spawner_starting **starting_r); diff -r 9f0c4da3cbef -r 919ad96e3e28 tools/libxl/libxl_uuid.c --- a/tools/libxl/libxl_uuid.c Tue Jan 31 14:41:00 2012 +0000 +++ b/tools/libxl/libxl_uuid.c Tue Jan 31 14:41:00 2012 +0000 @@ -35,7 +35,7 @@ return uuid_parse(in, uuid->uuid); } -void libxl_uuid_copy(libxl_uuid *dst, libxl_uuid *src) +void libxl_uuid_copy(libxl_uuid *dst, const libxl_uuid *src) { uuid_copy(dst->uuid, src->uuid); } @@ -82,7 +82,7 @@ } #undef LIBXL__UUID_PTRS -void libxl_uuid_copy(libxl_uuid *dst, libxl_uuid *src) +void libxl_uuid_copy(libxl_uuid *dst, const libxl_uuid *src) { memcpy(dst->uuid, src->uuid, sizeof(dst->uuid)); } diff -r 9f0c4da3cbef -r 919ad96e3e28 tools/libxl/libxl_uuid.h --- a/tools/libxl/libxl_uuid.h Tue Jan 31 14:41:00 2012 +0000 +++ b/tools/libxl/libxl_uuid.h Tue Jan 31 14:41:00 2012 +0000 @@ -56,7 +56,7 @@ int libxl_uuid_is_nil(libxl_uuid *uuid); void libxl_uuid_generate(libxl_uuid *uuid); int libxl_uuid_from_string(libxl_uuid *uuid, const char *in); -void libxl_uuid_copy(libxl_uuid *dst, libxl_uuid *src); +void libxl_uuid_copy(libxl_uuid *dst, const libxl_uuid *src); void libxl_uuid_clear(libxl_uuid *uuid); int libxl_uuid_compare(libxl_uuid *uuid1, libxl_uuid *uuid2); uint8_t *libxl_uuid_bytearray(libxl_uuid *uuid); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:58:02 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:58: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 1RtR8s-0007i9-4g; Fri, 03 Feb 2012 21:58:02 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8q-0007gN-08 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:00 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-27.messagelabs.com!1328306222!55318792!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16992 invoked from network); 3 Feb 2012 21:57:03 -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; 3 Feb 2012 21:57:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8n-0001nT-07 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR8l-0002xt-PN for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:56 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:57:55 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: now that dm creation takes domain_config stop passing down devices. X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1328023311 0 # Node ID 05435cdb21d323c2865cdd883fa0a7c2cdcdec0b # Parent 919ad96e3e2886bc5171bfed5205ad56a2390a5b libxl: now that dm creation takes domain_config stop passing down devices. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 919ad96e3e28 -r 05435cdb21d3 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Tue Jan 31 14:41:00 2012 +0000 +++ b/tools/libxl/libxl_create.c Tue Jan 31 15:21:51 2012 +0000 @@ -572,8 +572,6 @@ dm_info->domid = domid; ret = libxl__create_device_model(gc, d_config, dm_info, - d_config->disks, d_config->num_disks, - d_config->vifs, d_config->num_vifs, &dm_starting); if (ret < 0) { LIBXL__LOG(ctx, LIBXL__LOG_ERROR, @@ -619,8 +617,7 @@ xenpv_dm_info.extra_hvm = d_config->dm_info.extra_hvm; libxl__create_xenpv_qemu(gc, domid, - d_config, &xenpv_dm_info, - d_config->vfbs, &dm_starting); + d_config, &xenpv_dm_info, &dm_starting); } break; } diff -r 919ad96e3e28 -r 05435cdb21d3 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Tue Jan 31 14:41:00 2012 +0000 +++ b/tools/libxl/libxl_dm.c Tue Jan 31 15:21:51 2012 +0000 @@ -76,10 +76,10 @@ static char ** libxl__build_device_model_args_old(libxl__gc *gc, const char *dm, const libxl_domain_config *guest_config, - const libxl_device_model_info *info, - const libxl_device_disk *disks, int num_disks, - const libxl_device_nic *vifs, int num_vifs) + const libxl_device_model_info *info) { + const libxl_device_nic *vifs = guest_config->vifs; + const int num_vifs = guest_config->num_vifs; int i; flexarray_t *dm_args; dm_args = flexarray_make(16, 1); @@ -231,11 +231,13 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, const char *dm, const libxl_domain_config *guest_config, - const libxl_device_model_info *info, - const libxl_device_disk *disks, int num_disks, - const libxl_device_nic *vifs, int num_vifs) + const libxl_device_model_info *info) { libxl_ctx *ctx = libxl__gc_owner(gc); + const libxl_device_disk *disks = guest_config->disks; + const libxl_device_nic *vifs = guest_config->vifs; + const int num_disks = guest_config->num_disks; + const int num_vifs = guest_config->num_vifs; flexarray_t *dm_args; int i; @@ -496,21 +498,15 @@ static char ** libxl__build_device_model_args(libxl__gc *gc, const char *dm, const libxl_domain_config *guest_config, - const libxl_device_model_info *info, - const libxl_device_disk *disks, int num_disks, - const libxl_device_nic *vifs, int num_vifs) + const libxl_device_model_info *info) { libxl_ctx *ctx = libxl__gc_owner(gc); switch (info->device_model_version) { case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: - return libxl__build_device_model_args_old(gc, dm, guest_config, info, - disks, num_disks, - vifs, num_vifs); + return libxl__build_device_model_args_old(gc, dm, guest_config, info); case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: - return libxl__build_device_model_args_new(gc, dm, guest_config, info, - disks, num_disks, - vifs, num_vifs); + return libxl__build_device_model_args_new(gc, dm, guest_config, info); default: LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "unknown device model version %d", info->device_model_version); @@ -588,16 +584,14 @@ static int libxl__create_stubdom(libxl__gc *gc, libxl_domain_config *guest_config, libxl_device_model_info *info, - libxl_device_disk *disks, int num_disks, - libxl_device_nic *vifs, int num_vifs, - libxl_device_vfb *vfb, - libxl_device_vkb *vkb, libxl__spawner_starting **starting_r) { 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_device_vfb vfb; + libxl_device_vkb vkb; libxl__domain_build_state state; uint32_t domid; char **args; @@ -629,6 +623,19 @@ dm_config.b_info.u.pv.ramdisk.path = ""; dm_config.b_info.u.pv.features = ""; + 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; + + libxl__vfb_and_vkb_from_device_model_info(gc, info, &vfb, &vkb); + + 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 */ domid = 0; ret = libxl__domain_make(gc, &dm_config.c_info, &domid); @@ -639,9 +646,7 @@ goto out; args = libxl__build_device_model_args(gc, "stubdom-dm", - guest_config, info, - disks, num_disks, - vifs, num_vifs); + guest_config, info); if (!args) { ret = ERROR_FAIL; goto out; @@ -674,20 +679,20 @@ if (errno == EAGAIN) goto retry_transaction; - for (i = 0; i < num_disks; i++) { - ret = libxl_device_disk_add(ctx, domid, &disks[i]); + for (i = 0; i < dm_config.num_disks; i++) { + ret = libxl_device_disk_add(ctx, domid, &dm_config.disks[i]); if (ret) goto out_free; } - for (i = 0; i < num_vifs; i++) { - ret = libxl_device_nic_add(ctx, domid, &vifs[i]); + for (i = 0; i < dm_config.num_vifs; i++) { + ret = libxl_device_nic_add(ctx, domid, &dm_config.vifs[i]); if (ret) goto out_free; } - ret = libxl_device_vfb_add(ctx, domid, vfb); + ret = libxl_device_vfb_add(ctx, domid, &dm_config.vfbs[0]); if (ret) goto out_free; - ret = libxl_device_vkb_add(ctx, domid, vkb); + ret = libxl_device_vkb_add(ctx, domid, &dm_config.vkbs[0]); if (ret) goto out_free; @@ -745,7 +750,7 @@ if (libxl__create_xenpv_qemu(gc, domid, &dm_config, &xenpv_dm_info, - vfb, &dm_starting) < 0) { + &dm_starting) < 0) { ret = ERROR_FAIL; goto out_free; } @@ -775,8 +780,6 @@ int libxl__create_device_model(libxl__gc *gc, libxl_domain_config *guest_config, libxl_device_model_info *info, - libxl_device_disk *disks, int num_disks, - libxl_device_nic *vifs, int num_vifs, libxl__spawner_starting **starting_r) { libxl_ctx *ctx = libxl__gc_owner(gc); @@ -791,14 +794,7 @@ const char *dm; if (info->device_model_stubdomain) { - libxl_device_vfb vfb; - libxl_device_vkb vkb; - - libxl__vfb_and_vkb_from_device_model_info(gc, info, &vfb, &vkb); - rc = libxl__create_stubdom(gc, guest_config, info, - disks, num_disks, - vifs, num_vifs, - &vfb, &vkb, starting_r); + rc = libxl__create_stubdom(gc, guest_config, info, starting_r); goto out; } @@ -813,9 +809,7 @@ rc = ERROR_FAIL; goto out; } - args = libxl__build_device_model_args(gc, dm, guest_config, info, - disks, num_disks, - vifs, num_vifs); + args = libxl__build_device_model_args(gc, dm, guest_config, info); if (!args) { rc = ERROR_FAIL; goto out; @@ -1036,11 +1030,10 @@ int libxl__create_xenpv_qemu(libxl__gc *gc, uint32_t domid, libxl_domain_config *guest_config, libxl_device_model_info *info, - libxl_device_vfb *vfb, libxl__spawner_starting **starting_r) { - libxl__build_xenpv_qemu_args(gc, domid, vfb, info); - libxl__create_device_model(gc, guest_config, info, NULL, 0, NULL, 0, starting_r); + libxl__build_xenpv_qemu_args(gc, domid, &guest_config->vfbs[0], info); + libxl__create_device_model(gc, guest_config, info, starting_r); return 0; } diff -r 919ad96e3e28 -r 05435cdb21d3 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Tue Jan 31 14:41:00 2012 +0000 +++ b/tools/libxl/libxl_internal.h Tue Jan 31 15:21:51 2012 +0000 @@ -868,13 +868,10 @@ _hidden int libxl__create_device_model(libxl__gc *gc, libxl_domain_config *guest_config, libxl_device_model_info *info, - libxl_device_disk *disks, int num_disks, - libxl_device_nic *vifs, int num_vifs, libxl__spawner_starting **starting_r); _hidden int libxl__create_xenpv_qemu(libxl__gc *gc, uint32_t domid, libxl_domain_config *guest_config, libxl_device_model_info *dm_info, - libxl_device_vfb *vfb, libxl__spawner_starting **starting_r); _hidden int libxl__need_xenpv_qemu(libxl__gc *gc, int nr_consoles, libxl_device_console *consoles, _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:58:02 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:58: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 1RtR8s-0007i9-4g; Fri, 03 Feb 2012 21:58:02 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8q-0007gN-08 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:00 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-27.messagelabs.com!1328306222!55318792!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16992 invoked from network); 3 Feb 2012 21:57:03 -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; 3 Feb 2012 21:57:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8n-0001nT-07 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR8l-0002xt-PN for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:56 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:57:55 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: now that dm creation takes domain_config stop passing down devices. X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1328023311 0 # Node ID 05435cdb21d323c2865cdd883fa0a7c2cdcdec0b # Parent 919ad96e3e2886bc5171bfed5205ad56a2390a5b libxl: now that dm creation takes domain_config stop passing down devices. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 919ad96e3e28 -r 05435cdb21d3 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Tue Jan 31 14:41:00 2012 +0000 +++ b/tools/libxl/libxl_create.c Tue Jan 31 15:21:51 2012 +0000 @@ -572,8 +572,6 @@ dm_info->domid = domid; ret = libxl__create_device_model(gc, d_config, dm_info, - d_config->disks, d_config->num_disks, - d_config->vifs, d_config->num_vifs, &dm_starting); if (ret < 0) { LIBXL__LOG(ctx, LIBXL__LOG_ERROR, @@ -619,8 +617,7 @@ xenpv_dm_info.extra_hvm = d_config->dm_info.extra_hvm; libxl__create_xenpv_qemu(gc, domid, - d_config, &xenpv_dm_info, - d_config->vfbs, &dm_starting); + d_config, &xenpv_dm_info, &dm_starting); } break; } diff -r 919ad96e3e28 -r 05435cdb21d3 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Tue Jan 31 14:41:00 2012 +0000 +++ b/tools/libxl/libxl_dm.c Tue Jan 31 15:21:51 2012 +0000 @@ -76,10 +76,10 @@ static char ** libxl__build_device_model_args_old(libxl__gc *gc, const char *dm, const libxl_domain_config *guest_config, - const libxl_device_model_info *info, - const libxl_device_disk *disks, int num_disks, - const libxl_device_nic *vifs, int num_vifs) + const libxl_device_model_info *info) { + const libxl_device_nic *vifs = guest_config->vifs; + const int num_vifs = guest_config->num_vifs; int i; flexarray_t *dm_args; dm_args = flexarray_make(16, 1); @@ -231,11 +231,13 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, const char *dm, const libxl_domain_config *guest_config, - const libxl_device_model_info *info, - const libxl_device_disk *disks, int num_disks, - const libxl_device_nic *vifs, int num_vifs) + const libxl_device_model_info *info) { libxl_ctx *ctx = libxl__gc_owner(gc); + const libxl_device_disk *disks = guest_config->disks; + const libxl_device_nic *vifs = guest_config->vifs; + const int num_disks = guest_config->num_disks; + const int num_vifs = guest_config->num_vifs; flexarray_t *dm_args; int i; @@ -496,21 +498,15 @@ static char ** libxl__build_device_model_args(libxl__gc *gc, const char *dm, const libxl_domain_config *guest_config, - const libxl_device_model_info *info, - const libxl_device_disk *disks, int num_disks, - const libxl_device_nic *vifs, int num_vifs) + const libxl_device_model_info *info) { libxl_ctx *ctx = libxl__gc_owner(gc); switch (info->device_model_version) { case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: - return libxl__build_device_model_args_old(gc, dm, guest_config, info, - disks, num_disks, - vifs, num_vifs); + return libxl__build_device_model_args_old(gc, dm, guest_config, info); case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: - return libxl__build_device_model_args_new(gc, dm, guest_config, info, - disks, num_disks, - vifs, num_vifs); + return libxl__build_device_model_args_new(gc, dm, guest_config, info); default: LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "unknown device model version %d", info->device_model_version); @@ -588,16 +584,14 @@ static int libxl__create_stubdom(libxl__gc *gc, libxl_domain_config *guest_config, libxl_device_model_info *info, - libxl_device_disk *disks, int num_disks, - libxl_device_nic *vifs, int num_vifs, - libxl_device_vfb *vfb, - libxl_device_vkb *vkb, libxl__spawner_starting **starting_r) { 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_device_vfb vfb; + libxl_device_vkb vkb; libxl__domain_build_state state; uint32_t domid; char **args; @@ -629,6 +623,19 @@ dm_config.b_info.u.pv.ramdisk.path = ""; dm_config.b_info.u.pv.features = ""; + 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; + + libxl__vfb_and_vkb_from_device_model_info(gc, info, &vfb, &vkb); + + 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 */ domid = 0; ret = libxl__domain_make(gc, &dm_config.c_info, &domid); @@ -639,9 +646,7 @@ goto out; args = libxl__build_device_model_args(gc, "stubdom-dm", - guest_config, info, - disks, num_disks, - vifs, num_vifs); + guest_config, info); if (!args) { ret = ERROR_FAIL; goto out; @@ -674,20 +679,20 @@ if (errno == EAGAIN) goto retry_transaction; - for (i = 0; i < num_disks; i++) { - ret = libxl_device_disk_add(ctx, domid, &disks[i]); + for (i = 0; i < dm_config.num_disks; i++) { + ret = libxl_device_disk_add(ctx, domid, &dm_config.disks[i]); if (ret) goto out_free; } - for (i = 0; i < num_vifs; i++) { - ret = libxl_device_nic_add(ctx, domid, &vifs[i]); + for (i = 0; i < dm_config.num_vifs; i++) { + ret = libxl_device_nic_add(ctx, domid, &dm_config.vifs[i]); if (ret) goto out_free; } - ret = libxl_device_vfb_add(ctx, domid, vfb); + ret = libxl_device_vfb_add(ctx, domid, &dm_config.vfbs[0]); if (ret) goto out_free; - ret = libxl_device_vkb_add(ctx, domid, vkb); + ret = libxl_device_vkb_add(ctx, domid, &dm_config.vkbs[0]); if (ret) goto out_free; @@ -745,7 +750,7 @@ if (libxl__create_xenpv_qemu(gc, domid, &dm_config, &xenpv_dm_info, - vfb, &dm_starting) < 0) { + &dm_starting) < 0) { ret = ERROR_FAIL; goto out_free; } @@ -775,8 +780,6 @@ int libxl__create_device_model(libxl__gc *gc, libxl_domain_config *guest_config, libxl_device_model_info *info, - libxl_device_disk *disks, int num_disks, - libxl_device_nic *vifs, int num_vifs, libxl__spawner_starting **starting_r) { libxl_ctx *ctx = libxl__gc_owner(gc); @@ -791,14 +794,7 @@ const char *dm; if (info->device_model_stubdomain) { - libxl_device_vfb vfb; - libxl_device_vkb vkb; - - libxl__vfb_and_vkb_from_device_model_info(gc, info, &vfb, &vkb); - rc = libxl__create_stubdom(gc, guest_config, info, - disks, num_disks, - vifs, num_vifs, - &vfb, &vkb, starting_r); + rc = libxl__create_stubdom(gc, guest_config, info, starting_r); goto out; } @@ -813,9 +809,7 @@ rc = ERROR_FAIL; goto out; } - args = libxl__build_device_model_args(gc, dm, guest_config, info, - disks, num_disks, - vifs, num_vifs); + args = libxl__build_device_model_args(gc, dm, guest_config, info); if (!args) { rc = ERROR_FAIL; goto out; @@ -1036,11 +1030,10 @@ int libxl__create_xenpv_qemu(libxl__gc *gc, uint32_t domid, libxl_domain_config *guest_config, libxl_device_model_info *info, - libxl_device_vfb *vfb, libxl__spawner_starting **starting_r) { - libxl__build_xenpv_qemu_args(gc, domid, vfb, info); - libxl__create_device_model(gc, guest_config, info, NULL, 0, NULL, 0, starting_r); + libxl__build_xenpv_qemu_args(gc, domid, &guest_config->vfbs[0], info); + libxl__create_device_model(gc, guest_config, info, starting_r); return 0; } diff -r 919ad96e3e28 -r 05435cdb21d3 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Tue Jan 31 14:41:00 2012 +0000 +++ b/tools/libxl/libxl_internal.h Tue Jan 31 15:21:51 2012 +0000 @@ -868,13 +868,10 @@ _hidden int libxl__create_device_model(libxl__gc *gc, libxl_domain_config *guest_config, libxl_device_model_info *info, - libxl_device_disk *disks, int num_disks, - libxl_device_nic *vifs, int num_vifs, libxl__spawner_starting **starting_r); _hidden int libxl__create_xenpv_qemu(libxl__gc *gc, uint32_t domid, libxl_domain_config *guest_config, libxl_device_model_info *dm_info, - libxl_device_vfb *vfb, libxl__spawner_starting **starting_r); _hidden int libxl__need_xenpv_qemu(libxl__gc *gc, int nr_consoles, libxl_device_console *consoles, _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:58:03 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:58: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 1RtR8t-0007jI-83; Fri, 03 Feb 2012 21:58:03 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8r-0007e8-1K for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:01 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-27.messagelabs.com!1328306218!55318787!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16937 invoked from network); 3 Feb 2012 21:56:59 -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; 3 Feb 2012 21:56:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8j-0001nG-AC for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:53 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR8e-0002vW-WC for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:50 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:57:46 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: define libxl_sdl_info to hold all info about the SDL config X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1328020860 0 # Node ID 9f0c4da3cbef636e730280f6755f5968873b2344 # Parent 5d9e86d7e448f365daa05f1f1b6d70948e927400 libxl: define libxl_sdl_info to hold all info about the SDL config Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 5d9e86d7e448 -r 9f0c4da3cbef tools/libxl/libxl.c --- a/tools/libxl/libxl.c Tue Jan 31 14:41:00 2012 +0000 +++ b/tools/libxl/libxl.c Tue Jan 31 14:41:00 2012 +0000 @@ -2188,16 +2188,16 @@ int libxl_device_vfb_init(libxl_ctx *ctx, libxl_device_vfb *vfb) { memset(vfb, 0x00, sizeof(libxl_device_vfb)); - vfb->display = NULL; - vfb->xauthority = NULL; vfb->vnc.enable = 1; vfb->vnc.passwd = NULL; vfb->vnc.listen = strdup("127.0.0.1"); vfb->vnc.display = 0; vfb->vnc.findunused = 1; vfb->keymap = NULL; - vfb->sdl = 0; - vfb->opengl = 0; + vfb->sdl.enable = 0; + vfb->sdl.opengl = 0; + vfb->sdl.display = NULL; + vfb->sdl.xauthority = NULL; return 0; } @@ -2248,16 +2248,19 @@ libxl__sprintf(gc, "%d", vfb->vnc.display)); flexarray_append_pair(back, "vncunused", libxl__sprintf(gc, "%d", vfb->vnc.findunused)); - flexarray_append_pair(back, "sdl", libxl__sprintf(gc, "%d", vfb->sdl)); - flexarray_append_pair(back, "opengl", libxl__sprintf(gc, "%d", vfb->opengl)); - if (vfb->xauthority) { - flexarray_append_pair(back, "xauthority", vfb->xauthority); + flexarray_append_pair(back, "sdl", + libxl__sprintf(gc, "%d", vfb->sdl.enable)); + flexarray_append_pair(back, "opengl", + libxl__sprintf(gc, "%d", vfb->sdl.opengl)); + if (vfb->sdl.xauthority) { + flexarray_append_pair(back, "xauthority", vfb->sdl.xauthority); } - if (vfb->display) { - flexarray_append_pair(back, "display", vfb->display); + if (vfb->sdl.display) { + flexarray_append_pair(back, "display", vfb->sdl.display); } - flexarray_append_pair(front, "backend-id", libxl__sprintf(gc, "%d", vfb->backend_domid)); + flexarray_append_pair(front, "backend-id", + libxl__sprintf(gc, "%d", vfb->backend_domid)); flexarray_append_pair(front, "state", libxl__sprintf(gc, "%d", 1)); libxl__device_generic_add(gc, &device, diff -r 5d9e86d7e448 -r 9f0c4da3cbef tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Tue Jan 31 14:41:00 2012 +0000 +++ b/tools/libxl/libxl_create.c Tue Jan 31 14:41:00 2012 +0000 @@ -134,8 +134,8 @@ dm_info->vnc.display = 0; dm_info->vnc.findunused = 1; dm_info->keymap = NULL; - dm_info->sdl = 0; - dm_info->opengl = 0; + dm_info->sdl.enable = 0; + dm_info->sdl.opengl = 0; dm_info->nographic = 0; dm_info->serial = NULL; dm_info->boot = strdup("cda"); diff -r 5d9e86d7e448 -r 9f0c4da3cbef tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Tue Jan 31 14:41:00 2012 +0000 +++ b/tools/libxl/libxl_dm.c Tue Jan 31 14:41:00 2012 +0000 @@ -120,16 +120,17 @@ flexarray_append(dm_args, "-vncunused"); } } - if (info->sdl) { + if (info->sdl.enable) { flexarray_append(dm_args, "-sdl"); - if (!info->opengl) { + if (!info->sdl.opengl) { flexarray_append(dm_args, "-disable-opengl"); } + /* XXX info->sdl.{display,xauthority} into $DISPLAY/$XAUTHORITY */ } if (info->keymap) { flexarray_vappend(dm_args, "-k", info->keymap, NULL); } - if (info->nographic && (!info->sdl && !info->vnc.enable)) { + if (info->nographic && (!info->sdl.enable && !info->vnc.enable)) { flexarray_append(dm_args, "-nographic"); } if (info->serial) { @@ -287,8 +288,9 @@ libxl__sprintf(gc, "%s:%d%s", listen, display, info->vnc.findunused ? ",to=99" : "")); } - if (info->sdl) { + if (info->sdl.enable) { flexarray_append(dm_args, "-sdl"); + /* XXX info->sdl.{display,xauthority} into $DISPLAY/$XAUTHORITY */ } if (info->spice.enable) { char *spiceoptions = NULL; @@ -335,7 +337,7 @@ if (info->keymap) { flexarray_vappend(dm_args, "-k", info->keymap, NULL); } - if (info->nographic && (!info->sdl && !info->vnc.enable)) { + if (info->nographic && (!info->sdl.enable && !info->vnc.enable)) { flexarray_append(dm_args, "-nographic"); } if (info->serial) { @@ -526,7 +528,6 @@ vfb->vnc = info->vnc; vfb->keymap = info->keymap; vfb->sdl = info->sdl; - vfb->opengl = info->opengl; vkb->backend_domid = 0; vkb->devid = 0; @@ -981,7 +982,6 @@ if (vfb->keymap) info->keymap = libxl__strdup(gc, vfb->keymap); info->sdl = vfb->sdl; - info->opengl = vfb->opengl; } else info->nographic = 1; info->domid = domid; diff -r 5d9e86d7e448 -r 9f0c4da3cbef tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Tue Jan 31 14:41:00 2012 +0000 +++ b/tools/libxl/libxl_types.idl Tue Jan 31 14:41:00 2012 +0000 @@ -251,8 +251,7 @@ ("vnc", libxl_vnc_info), # keyboard layout, default is en-us keyboard ("keymap", string), - ("sdl", bool), - ("opengl", bool), # (requires sdl enabled) + ("sdl", libxl_sdl_info), ("spice", libxl_spice_info), ("nographic", bool), ("gfx_passthru", bool), @@ -279,12 +278,9 @@ ("backend_domid", libxl_domid), ("devid", integer), ("vnc", libxl_vnc_info), + ("sdl", libxl_sdl_info), # set keyboard layout, default is en-us keyboard ("keymap", string), - ("sdl", bool), - ("opengl", bool), # (if enabled requires sdl enabled) - ("display", string), - ("xauthority", string), ]) libxl_device_vkb = Struct("device_vkb", [ diff -r 5d9e86d7e448 -r 9f0c4da3cbef tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Tue Jan 31 14:41:00 2012 +0000 +++ b/tools/libxl/xl_cmdimpl.c Tue Jan 31 14:41:00 2012 +0000 @@ -372,9 +372,9 @@ printf("\t\t\t(vncdisplay %d)\n", dm_info->vnc.display); printf("\t\t\t(vncunused %d)\n", dm_info->vnc.findunused); printf("\t\t\t(keymap %s)\n", dm_info->keymap); - printf("\t\t\t(sdl %d)\n", dm_info->sdl); + printf("\t\t\t(sdl %d)\n", dm_info->sdl.enable); printf("\t\t\t(gfx_passthru %d)\n", dm_info->gfx_passthru); - printf("\t\t\t(opengl %d)\n", dm_info->opengl); + printf("\t\t\t(opengl %d)\n", dm_info->sdl.opengl); printf("\t\t\t(nographic %d)\n", dm_info->nographic); printf("\t\t\t(serial %s)\n", dm_info->serial); printf("\t\t\t(boot %s)\n", dm_info->boot); @@ -462,10 +462,10 @@ printf("\t\t\t(vncdisplay %d)\n", d_config->vfbs[i].vnc.display); printf("\t\t\t(vncunused %d)\n", d_config->vfbs[i].vnc.findunused); printf("\t\t\t(keymap %s)\n", d_config->vfbs[i].keymap); - printf("\t\t\t(sdl %d)\n", d_config->vfbs[i].sdl); - printf("\t\t\t(opengl %d)\n", d_config->vfbs[i].opengl); - printf("\t\t\t(display %s)\n", d_config->vfbs[i].display); - printf("\t\t\t(xauthority %s)\n", d_config->vfbs[i].xauthority); + printf("\t\t\t(sdl %d)\n", d_config->vfbs[i].sdl.enable); + printf("\t\t\t(opengl %d)\n", d_config->vfbs[i].sdl.opengl); + printf("\t\t\t(display %s)\n", d_config->vfbs[i].sdl.display); + printf("\t\t\t(xauthority %s)\n", d_config->vfbs[i].sdl.xauthority); printf("\t\t)\n"); printf("\t)\n"); } @@ -1060,15 +1060,15 @@ free(vfb->keymap); vfb->keymap = strdup(p2 + 1); } else if (!strcmp(p, "sdl")) { - vfb->sdl = atoi(p2 + 1); + vfb->sdl.enable = atoi(p2 + 1); } else if (!strcmp(p, "opengl")) { - vfb->opengl = atoi(p2 + 1); + vfb->sdl.opengl = atoi(p2 + 1); } else if (!strcmp(p, "display")) { - free(vfb->display); - vfb->display = strdup(p2 + 1); + free(vfb->sdl.display); + vfb->sdl.display = strdup(p2 + 1); } else if (!strcmp(p, "xauthority")) { - free(vfb->xauthority); - vfb->xauthority = strdup(p2 + 1); + free(vfb->sdl.xauthority); + vfb->sdl.xauthority = strdup(p2 + 1); } } while ((p = strtok(NULL, ",")) != NULL); skip_vfb: @@ -1271,9 +1271,9 @@ dm_info->vnc.findunused = l; xlu_cfg_replace_string (config, "keymap", &dm_info->keymap, 0); if (!xlu_cfg_get_long (config, "sdl", &l, 0)) - dm_info->sdl = l; + dm_info->sdl.enable = l; if (!xlu_cfg_get_long (config, "opengl", &l, 0)) - dm_info->opengl = l; + dm_info->sdl.opengl = l; if (!xlu_cfg_get_long (config, "spice", &l, 0)) dm_info->spice.enable = l; if (!xlu_cfg_get_long (config, "spiceport", &l, 0)) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:58:03 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:58: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 1RtR8t-0007jI-83; Fri, 03 Feb 2012 21:58:03 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8r-0007e8-1K for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:01 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-27.messagelabs.com!1328306218!55318787!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16937 invoked from network); 3 Feb 2012 21:56:59 -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; 3 Feb 2012 21:56:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8j-0001nG-AC for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:53 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR8e-0002vW-WC for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:50 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:57:46 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: define libxl_sdl_info to hold all info about the SDL config X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1328020860 0 # Node ID 9f0c4da3cbef636e730280f6755f5968873b2344 # Parent 5d9e86d7e448f365daa05f1f1b6d70948e927400 libxl: define libxl_sdl_info to hold all info about the SDL config Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 5d9e86d7e448 -r 9f0c4da3cbef tools/libxl/libxl.c --- a/tools/libxl/libxl.c Tue Jan 31 14:41:00 2012 +0000 +++ b/tools/libxl/libxl.c Tue Jan 31 14:41:00 2012 +0000 @@ -2188,16 +2188,16 @@ int libxl_device_vfb_init(libxl_ctx *ctx, libxl_device_vfb *vfb) { memset(vfb, 0x00, sizeof(libxl_device_vfb)); - vfb->display = NULL; - vfb->xauthority = NULL; vfb->vnc.enable = 1; vfb->vnc.passwd = NULL; vfb->vnc.listen = strdup("127.0.0.1"); vfb->vnc.display = 0; vfb->vnc.findunused = 1; vfb->keymap = NULL; - vfb->sdl = 0; - vfb->opengl = 0; + vfb->sdl.enable = 0; + vfb->sdl.opengl = 0; + vfb->sdl.display = NULL; + vfb->sdl.xauthority = NULL; return 0; } @@ -2248,16 +2248,19 @@ libxl__sprintf(gc, "%d", vfb->vnc.display)); flexarray_append_pair(back, "vncunused", libxl__sprintf(gc, "%d", vfb->vnc.findunused)); - flexarray_append_pair(back, "sdl", libxl__sprintf(gc, "%d", vfb->sdl)); - flexarray_append_pair(back, "opengl", libxl__sprintf(gc, "%d", vfb->opengl)); - if (vfb->xauthority) { - flexarray_append_pair(back, "xauthority", vfb->xauthority); + flexarray_append_pair(back, "sdl", + libxl__sprintf(gc, "%d", vfb->sdl.enable)); + flexarray_append_pair(back, "opengl", + libxl__sprintf(gc, "%d", vfb->sdl.opengl)); + if (vfb->sdl.xauthority) { + flexarray_append_pair(back, "xauthority", vfb->sdl.xauthority); } - if (vfb->display) { - flexarray_append_pair(back, "display", vfb->display); + if (vfb->sdl.display) { + flexarray_append_pair(back, "display", vfb->sdl.display); } - flexarray_append_pair(front, "backend-id", libxl__sprintf(gc, "%d", vfb->backend_domid)); + flexarray_append_pair(front, "backend-id", + libxl__sprintf(gc, "%d", vfb->backend_domid)); flexarray_append_pair(front, "state", libxl__sprintf(gc, "%d", 1)); libxl__device_generic_add(gc, &device, diff -r 5d9e86d7e448 -r 9f0c4da3cbef tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Tue Jan 31 14:41:00 2012 +0000 +++ b/tools/libxl/libxl_create.c Tue Jan 31 14:41:00 2012 +0000 @@ -134,8 +134,8 @@ dm_info->vnc.display = 0; dm_info->vnc.findunused = 1; dm_info->keymap = NULL; - dm_info->sdl = 0; - dm_info->opengl = 0; + dm_info->sdl.enable = 0; + dm_info->sdl.opengl = 0; dm_info->nographic = 0; dm_info->serial = NULL; dm_info->boot = strdup("cda"); diff -r 5d9e86d7e448 -r 9f0c4da3cbef tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Tue Jan 31 14:41:00 2012 +0000 +++ b/tools/libxl/libxl_dm.c Tue Jan 31 14:41:00 2012 +0000 @@ -120,16 +120,17 @@ flexarray_append(dm_args, "-vncunused"); } } - if (info->sdl) { + if (info->sdl.enable) { flexarray_append(dm_args, "-sdl"); - if (!info->opengl) { + if (!info->sdl.opengl) { flexarray_append(dm_args, "-disable-opengl"); } + /* XXX info->sdl.{display,xauthority} into $DISPLAY/$XAUTHORITY */ } if (info->keymap) { flexarray_vappend(dm_args, "-k", info->keymap, NULL); } - if (info->nographic && (!info->sdl && !info->vnc.enable)) { + if (info->nographic && (!info->sdl.enable && !info->vnc.enable)) { flexarray_append(dm_args, "-nographic"); } if (info->serial) { @@ -287,8 +288,9 @@ libxl__sprintf(gc, "%s:%d%s", listen, display, info->vnc.findunused ? ",to=99" : "")); } - if (info->sdl) { + if (info->sdl.enable) { flexarray_append(dm_args, "-sdl"); + /* XXX info->sdl.{display,xauthority} into $DISPLAY/$XAUTHORITY */ } if (info->spice.enable) { char *spiceoptions = NULL; @@ -335,7 +337,7 @@ if (info->keymap) { flexarray_vappend(dm_args, "-k", info->keymap, NULL); } - if (info->nographic && (!info->sdl && !info->vnc.enable)) { + if (info->nographic && (!info->sdl.enable && !info->vnc.enable)) { flexarray_append(dm_args, "-nographic"); } if (info->serial) { @@ -526,7 +528,6 @@ vfb->vnc = info->vnc; vfb->keymap = info->keymap; vfb->sdl = info->sdl; - vfb->opengl = info->opengl; vkb->backend_domid = 0; vkb->devid = 0; @@ -981,7 +982,6 @@ if (vfb->keymap) info->keymap = libxl__strdup(gc, vfb->keymap); info->sdl = vfb->sdl; - info->opengl = vfb->opengl; } else info->nographic = 1; info->domid = domid; diff -r 5d9e86d7e448 -r 9f0c4da3cbef tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Tue Jan 31 14:41:00 2012 +0000 +++ b/tools/libxl/libxl_types.idl Tue Jan 31 14:41:00 2012 +0000 @@ -251,8 +251,7 @@ ("vnc", libxl_vnc_info), # keyboard layout, default is en-us keyboard ("keymap", string), - ("sdl", bool), - ("opengl", bool), # (requires sdl enabled) + ("sdl", libxl_sdl_info), ("spice", libxl_spice_info), ("nographic", bool), ("gfx_passthru", bool), @@ -279,12 +278,9 @@ ("backend_domid", libxl_domid), ("devid", integer), ("vnc", libxl_vnc_info), + ("sdl", libxl_sdl_info), # set keyboard layout, default is en-us keyboard ("keymap", string), - ("sdl", bool), - ("opengl", bool), # (if enabled requires sdl enabled) - ("display", string), - ("xauthority", string), ]) libxl_device_vkb = Struct("device_vkb", [ diff -r 5d9e86d7e448 -r 9f0c4da3cbef tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Tue Jan 31 14:41:00 2012 +0000 +++ b/tools/libxl/xl_cmdimpl.c Tue Jan 31 14:41:00 2012 +0000 @@ -372,9 +372,9 @@ printf("\t\t\t(vncdisplay %d)\n", dm_info->vnc.display); printf("\t\t\t(vncunused %d)\n", dm_info->vnc.findunused); printf("\t\t\t(keymap %s)\n", dm_info->keymap); - printf("\t\t\t(sdl %d)\n", dm_info->sdl); + printf("\t\t\t(sdl %d)\n", dm_info->sdl.enable); printf("\t\t\t(gfx_passthru %d)\n", dm_info->gfx_passthru); - printf("\t\t\t(opengl %d)\n", dm_info->opengl); + printf("\t\t\t(opengl %d)\n", dm_info->sdl.opengl); printf("\t\t\t(nographic %d)\n", dm_info->nographic); printf("\t\t\t(serial %s)\n", dm_info->serial); printf("\t\t\t(boot %s)\n", dm_info->boot); @@ -462,10 +462,10 @@ printf("\t\t\t(vncdisplay %d)\n", d_config->vfbs[i].vnc.display); printf("\t\t\t(vncunused %d)\n", d_config->vfbs[i].vnc.findunused); printf("\t\t\t(keymap %s)\n", d_config->vfbs[i].keymap); - printf("\t\t\t(sdl %d)\n", d_config->vfbs[i].sdl); - printf("\t\t\t(opengl %d)\n", d_config->vfbs[i].opengl); - printf("\t\t\t(display %s)\n", d_config->vfbs[i].display); - printf("\t\t\t(xauthority %s)\n", d_config->vfbs[i].xauthority); + printf("\t\t\t(sdl %d)\n", d_config->vfbs[i].sdl.enable); + printf("\t\t\t(opengl %d)\n", d_config->vfbs[i].sdl.opengl); + printf("\t\t\t(display %s)\n", d_config->vfbs[i].sdl.display); + printf("\t\t\t(xauthority %s)\n", d_config->vfbs[i].sdl.xauthority); printf("\t\t)\n"); printf("\t)\n"); } @@ -1060,15 +1060,15 @@ free(vfb->keymap); vfb->keymap = strdup(p2 + 1); } else if (!strcmp(p, "sdl")) { - vfb->sdl = atoi(p2 + 1); + vfb->sdl.enable = atoi(p2 + 1); } else if (!strcmp(p, "opengl")) { - vfb->opengl = atoi(p2 + 1); + vfb->sdl.opengl = atoi(p2 + 1); } else if (!strcmp(p, "display")) { - free(vfb->display); - vfb->display = strdup(p2 + 1); + free(vfb->sdl.display); + vfb->sdl.display = strdup(p2 + 1); } else if (!strcmp(p, "xauthority")) { - free(vfb->xauthority); - vfb->xauthority = strdup(p2 + 1); + free(vfb->sdl.xauthority); + vfb->sdl.xauthority = strdup(p2 + 1); } } while ((p = strtok(NULL, ",")) != NULL); skip_vfb: @@ -1271,9 +1271,9 @@ dm_info->vnc.findunused = l; xlu_cfg_replace_string (config, "keymap", &dm_info->keymap, 0); if (!xlu_cfg_get_long (config, "sdl", &l, 0)) - dm_info->sdl = l; + dm_info->sdl.enable = l; if (!xlu_cfg_get_long (config, "opengl", &l, 0)) - dm_info->opengl = l; + dm_info->sdl.opengl = l; if (!xlu_cfg_get_long (config, "spice", &l, 0)) dm_info->spice.enable = l; if (!xlu_cfg_get_long (config, "spiceport", &l, 0)) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:58:03 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:58: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 1RtR8t-0007jU-AP; Fri, 03 Feb 2012 21:58:03 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8r-0007hI-6a for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:01 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-27.messagelabs.com!1328306160!62474792!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10714 invoked from network); 3 Feb 2012 21:56:01 -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; 3 Feb 2012 21:56:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8o-0001nW-Eq for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR8n-0002yf-Gc for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:58 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:57:56 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: remove redundant info from dm info. X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1328023311 0 # Node ID 6cf421073cabaa219a70ae4f04b517e99a90f7d4 # Parent 05435cdb21d323c2865cdd883fa0a7c2cdcdec0b libxl: remove redundant info from dm info. Remove "target_ram", "acpi", "vcpus" and "vcpu_avail" from device model info and use domain_build_info instead. These must all be consistently specified to both the domain and the device model, there is no need (and a great deal of danger) in exposing a way for a user of libxl to set them differently. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 05435cdb21d3 -r 6cf421073cab tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Tue Jan 31 15:21:51 2012 +0000 +++ b/tools/libxl/libxl_create.c Tue Jan 31 15:21:51 2012 +0000 @@ -122,11 +122,7 @@ dm_info->device_model_version = LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL; dm_info->device_model_stubdomain = false; dm_info->device_model = NULL; - dm_info->target_ram = libxl__sizekb_to_mb(b_info->target_memkb); dm_info->videoram = libxl__sizekb_to_mb(b_info->video_memkb); - dm_info->acpi = b_info->u.hvm.acpi; - dm_info->vcpus = b_info->max_vcpus; - dm_info->vcpu_avail = b_info->cur_vcpus; dm_info->stdvga = 0; dm_info->vnc.enable = 1; diff -r 05435cdb21d3 -r 6cf421073cab tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Tue Jan 31 15:21:51 2012 +0000 +++ b/tools/libxl/libxl_dm.c Tue Jan 31 15:21:51 2012 +0000 @@ -78,6 +78,7 @@ const libxl_domain_config *guest_config, const libxl_device_model_info *info) { + const libxl_domain_build_info *b_info = &guest_config->b_info; const libxl_device_nic *vifs = guest_config->vifs; const int num_vifs = guest_config->num_vifs; int i; @@ -159,14 +160,18 @@ if (info->soundhw) { flexarray_vappend(dm_args, "-soundhw", info->soundhw, NULL); } - if (info->acpi) { + if (b_info->u.hvm.acpi) { flexarray_append(dm_args, "-acpi"); } - if (info->vcpus > 1) { - flexarray_vappend(dm_args, "-vcpus", libxl__sprintf(gc, "%d", info->vcpus), NULL); + if (b_info->max_vcpus > 1) { + flexarray_vappend(dm_args, "-vcpus", + libxl__sprintf(gc, "%d", b_info->max_vcpus), + NULL); } - if (info->vcpu_avail) { - flexarray_vappend(dm_args, "-vcpu_avail", libxl__sprintf(gc, "0x%x", info->vcpu_avail), NULL); + if (b_info->cur_vcpus) { + flexarray_vappend(dm_args, "-vcpu_avail", + libxl__sprintf(gc, "0x%x", b_info->cur_vcpus), + NULL); } for (i = 0; i < num_vifs; i++) { if (vifs[i].nictype == LIBXL_NIC_TYPE_IOEMU) { @@ -234,6 +239,7 @@ const libxl_device_model_info *info) { libxl_ctx *ctx = libxl__gc_owner(gc); + const libxl_domain_build_info *b_info = &guest_config->b_info; const libxl_device_disk *disks = guest_config->disks; const libxl_device_nic *vifs = guest_config->vifs; const int num_disks = guest_config->num_disks; @@ -366,15 +372,18 @@ if (info->soundhw) { flexarray_vappend(dm_args, "-soundhw", info->soundhw, NULL); } - if (!info->acpi) { + if (!b_info->u.hvm.acpi) { flexarray_append(dm_args, "-no-acpi"); } - if (info->vcpus > 1) { + if (b_info->max_vcpus > 1) { flexarray_append(dm_args, "-smp"); - if (info->vcpu_avail) - flexarray_append(dm_args, libxl__sprintf(gc, "%d,maxcpus=%d", info->vcpus, info->vcpu_avail)); + if (b_info->cur_vcpus) + flexarray_append(dm_args, libxl__sprintf(gc, "%d,maxcpus=%d", + b_info->max_vcpus, + b_info->cur_vcpus)); else - flexarray_append(dm_args, libxl__sprintf(gc, "%d", info->vcpus)); + flexarray_append(dm_args, libxl__sprintf(gc, "%d", + b_info->max_vcpus)); } for (i = 0; i < num_vifs; i++) { if (vifs[i].nictype == LIBXL_NIC_TYPE_IOEMU) { @@ -432,7 +441,9 @@ /* RAM Size */ flexarray_append(dm_args, "-m"); - flexarray_append(dm_args, libxl__sprintf(gc, "%d", info->target_ram)); + flexarray_append(dm_args, + libxl__sprintf(gc, "%d", + libxl__sizekb_to_mb(b_info->target_memkb))); if (info->type == LIBXL_DOMAIN_TYPE_HVM) { for (i = 0; i < num_disks; i++) { diff -r 05435cdb21d3 -r 6cf421073cab tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Tue Jan 31 15:21:51 2012 +0000 +++ b/tools/libxl/libxl_types.idl Tue Jan 31 15:21:51 2012 +0000 @@ -244,7 +244,6 @@ ("device_model", string), ("saved_state", string), ("type", libxl_domain_type), - ("target_ram", uint32), # size of the videoram in MB ("videoram", integer), ("stdvga", bool), @@ -261,9 +260,6 @@ # usbdevice: "tablet" for absolute mouse, "mouse" for PS/2 protocol relative mouse ("usbdevice", string), ("soundhw", string), - ("acpi", bool), - ("vcpus", integer), # max number of vcpus - ("vcpu_avail", integer), # vcpus actually available ("xen_platform_pci", bool), # extra parameters pass directly to qemu, NULL terminated ("extra", libxl_string_list), diff -r 05435cdb21d3 -r 6cf421073cab tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Tue Jan 31 15:21:51 2012 +0000 +++ b/tools/libxl/xl_cmdimpl.c Tue Jan 31 15:21:51 2012 +0000 @@ -380,7 +380,6 @@ printf("\t\t\t(boot %s)\n", dm_info->boot); printf("\t\t\t(usb %d)\n", dm_info->usb); printf("\t\t\t(usbdevice %s)\n", dm_info->usbdevice); - printf("\t\t\t(acpi %d)\n", dm_info->acpi); printf("\t\t\t(spice %d)\n", dm_info->spice.enable); printf("\t\t\t(spiceport %d)\n", dm_info->spice.port); printf("\t\t\t(spicetls_port %d)\n", dm_info->spice.tls_port); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:58:03 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:58: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 1RtR8t-0007jU-AP; Fri, 03 Feb 2012 21:58:03 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8r-0007hI-6a for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:01 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-27.messagelabs.com!1328306160!62474792!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10714 invoked from network); 3 Feb 2012 21:56:01 -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; 3 Feb 2012 21:56:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8o-0001nW-Eq for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR8n-0002yf-Gc for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:58 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:57:56 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: remove redundant info from dm info. X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1328023311 0 # Node ID 6cf421073cabaa219a70ae4f04b517e99a90f7d4 # Parent 05435cdb21d323c2865cdd883fa0a7c2cdcdec0b libxl: remove redundant info from dm info. Remove "target_ram", "acpi", "vcpus" and "vcpu_avail" from device model info and use domain_build_info instead. These must all be consistently specified to both the domain and the device model, there is no need (and a great deal of danger) in exposing a way for a user of libxl to set them differently. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 05435cdb21d3 -r 6cf421073cab tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Tue Jan 31 15:21:51 2012 +0000 +++ b/tools/libxl/libxl_create.c Tue Jan 31 15:21:51 2012 +0000 @@ -122,11 +122,7 @@ dm_info->device_model_version = LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL; dm_info->device_model_stubdomain = false; dm_info->device_model = NULL; - dm_info->target_ram = libxl__sizekb_to_mb(b_info->target_memkb); dm_info->videoram = libxl__sizekb_to_mb(b_info->video_memkb); - dm_info->acpi = b_info->u.hvm.acpi; - dm_info->vcpus = b_info->max_vcpus; - dm_info->vcpu_avail = b_info->cur_vcpus; dm_info->stdvga = 0; dm_info->vnc.enable = 1; diff -r 05435cdb21d3 -r 6cf421073cab tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Tue Jan 31 15:21:51 2012 +0000 +++ b/tools/libxl/libxl_dm.c Tue Jan 31 15:21:51 2012 +0000 @@ -78,6 +78,7 @@ const libxl_domain_config *guest_config, const libxl_device_model_info *info) { + const libxl_domain_build_info *b_info = &guest_config->b_info; const libxl_device_nic *vifs = guest_config->vifs; const int num_vifs = guest_config->num_vifs; int i; @@ -159,14 +160,18 @@ if (info->soundhw) { flexarray_vappend(dm_args, "-soundhw", info->soundhw, NULL); } - if (info->acpi) { + if (b_info->u.hvm.acpi) { flexarray_append(dm_args, "-acpi"); } - if (info->vcpus > 1) { - flexarray_vappend(dm_args, "-vcpus", libxl__sprintf(gc, "%d", info->vcpus), NULL); + if (b_info->max_vcpus > 1) { + flexarray_vappend(dm_args, "-vcpus", + libxl__sprintf(gc, "%d", b_info->max_vcpus), + NULL); } - if (info->vcpu_avail) { - flexarray_vappend(dm_args, "-vcpu_avail", libxl__sprintf(gc, "0x%x", info->vcpu_avail), NULL); + if (b_info->cur_vcpus) { + flexarray_vappend(dm_args, "-vcpu_avail", + libxl__sprintf(gc, "0x%x", b_info->cur_vcpus), + NULL); } for (i = 0; i < num_vifs; i++) { if (vifs[i].nictype == LIBXL_NIC_TYPE_IOEMU) { @@ -234,6 +239,7 @@ const libxl_device_model_info *info) { libxl_ctx *ctx = libxl__gc_owner(gc); + const libxl_domain_build_info *b_info = &guest_config->b_info; const libxl_device_disk *disks = guest_config->disks; const libxl_device_nic *vifs = guest_config->vifs; const int num_disks = guest_config->num_disks; @@ -366,15 +372,18 @@ if (info->soundhw) { flexarray_vappend(dm_args, "-soundhw", info->soundhw, NULL); } - if (!info->acpi) { + if (!b_info->u.hvm.acpi) { flexarray_append(dm_args, "-no-acpi"); } - if (info->vcpus > 1) { + if (b_info->max_vcpus > 1) { flexarray_append(dm_args, "-smp"); - if (info->vcpu_avail) - flexarray_append(dm_args, libxl__sprintf(gc, "%d,maxcpus=%d", info->vcpus, info->vcpu_avail)); + if (b_info->cur_vcpus) + flexarray_append(dm_args, libxl__sprintf(gc, "%d,maxcpus=%d", + b_info->max_vcpus, + b_info->cur_vcpus)); else - flexarray_append(dm_args, libxl__sprintf(gc, "%d", info->vcpus)); + flexarray_append(dm_args, libxl__sprintf(gc, "%d", + b_info->max_vcpus)); } for (i = 0; i < num_vifs; i++) { if (vifs[i].nictype == LIBXL_NIC_TYPE_IOEMU) { @@ -432,7 +441,9 @@ /* RAM Size */ flexarray_append(dm_args, "-m"); - flexarray_append(dm_args, libxl__sprintf(gc, "%d", info->target_ram)); + flexarray_append(dm_args, + libxl__sprintf(gc, "%d", + libxl__sizekb_to_mb(b_info->target_memkb))); if (info->type == LIBXL_DOMAIN_TYPE_HVM) { for (i = 0; i < num_disks; i++) { diff -r 05435cdb21d3 -r 6cf421073cab tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Tue Jan 31 15:21:51 2012 +0000 +++ b/tools/libxl/libxl_types.idl Tue Jan 31 15:21:51 2012 +0000 @@ -244,7 +244,6 @@ ("device_model", string), ("saved_state", string), ("type", libxl_domain_type), - ("target_ram", uint32), # size of the videoram in MB ("videoram", integer), ("stdvga", bool), @@ -261,9 +260,6 @@ # usbdevice: "tablet" for absolute mouse, "mouse" for PS/2 protocol relative mouse ("usbdevice", string), ("soundhw", string), - ("acpi", bool), - ("vcpus", integer), # max number of vcpus - ("vcpu_avail", integer), # vcpus actually available ("xen_platform_pci", bool), # extra parameters pass directly to qemu, NULL terminated ("extra", libxl_string_list), diff -r 05435cdb21d3 -r 6cf421073cab tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Tue Jan 31 15:21:51 2012 +0000 +++ b/tools/libxl/xl_cmdimpl.c Tue Jan 31 15:21:51 2012 +0000 @@ -380,7 +380,6 @@ printf("\t\t\t(boot %s)\n", dm_info->boot); printf("\t\t\t(usb %d)\n", dm_info->usb); printf("\t\t\t(usbdevice %s)\n", dm_info->usbdevice); - printf("\t\t\t(acpi %d)\n", dm_info->acpi); printf("\t\t\t(spice %d)\n", dm_info->spice.enable); printf("\t\t\t(spiceport %d)\n", dm_info->spice.port); printf("\t\t\t(spicetls_port %d)\n", dm_info->spice.tls_port); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:58:03 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:58: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 1RtR8t-0007ji-Es; Fri, 03 Feb 2012 21:58:03 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8s-0007i7-KV for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:02 +0000 Received: from [193.109.254.147:47382] by server-6.bemta-14.messagelabs.com id 35/D1-05782-9685C2F4; Fri, 03 Feb 2012 21:58:01 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-27.messagelabs.com!1328306230!51337710!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16939 invoked from network); 3 Feb 2012 21:57:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 3 Feb 2012 21:57:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8p-0001na-R2 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR8p-0002zO-9L for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:59 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:57:58 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: drop dm_info.dom_name X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1328023311 0 # Node ID 5ebec91f5f101b454ed781a19a8c4d41b0149bd9 # Parent 6cf421073cabaa219a70ae4f04b517e99a90f7d4 libxl: drop dm_info.dom_name This is always the same as the c_info name which we now have available. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 6cf421073cab -r 5ebec91f5f10 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Tue Jan 31 15:21:51 2012 +0000 +++ b/tools/libxl/libxl_create.c Tue Jan 31 15:21:51 2012 +0000 @@ -118,7 +118,6 @@ libxl_uuid_generate(&dm_info->uuid); - dm_info->dom_name = strdup(c_info->name); dm_info->device_model_version = LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL; dm_info->device_model_stubdomain = false; dm_info->device_model = NULL; diff -r 6cf421073cab -r 5ebec91f5f10 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Tue Jan 31 15:21:51 2012 +0000 +++ b/tools/libxl/libxl_dm.c Tue Jan 31 15:21:51 2012 +0000 @@ -78,6 +78,7 @@ const libxl_domain_config *guest_config, const libxl_device_model_info *info) { + const libxl_domain_create_info *c_info = &guest_config->c_info; const libxl_domain_build_info *b_info = &guest_config->b_info; const libxl_device_nic *vifs = guest_config->vifs; const int num_vifs = guest_config->num_vifs; @@ -91,8 +92,8 @@ flexarray_vappend(dm_args, dm, "-d", libxl__sprintf(gc, "%d", info->domid), NULL); - if (info->dom_name) - flexarray_vappend(dm_args, "-domain-name", info->dom_name, NULL); + if (c_info->name) + flexarray_vappend(dm_args, "-domain-name", c_info->name, NULL); if (info->vnc.enable) { char *vncarg; @@ -239,6 +240,7 @@ const libxl_device_model_info *info) { libxl_ctx *ctx = libxl__gc_owner(gc); + const libxl_domain_create_info *c_info = &guest_config->c_info; const libxl_domain_build_info *b_info = &guest_config->b_info; const libxl_device_disk *disks = guest_config->disks; const libxl_device_nic *vifs = guest_config->vifs; @@ -268,8 +270,8 @@ flexarray_append(dm_args, "-xen-attach"); } - if (info->dom_name) { - flexarray_vappend(dm_args, "-name", info->dom_name, NULL); + if (c_info->name) { + flexarray_vappend(dm_args, "-name", c_info->name, NULL); } if (info->vnc.enable) { int display = 0; @@ -793,6 +795,7 @@ libxl_device_model_info *info, libxl__spawner_starting **starting_r) { + const libxl_domain_create_info *c_info = &guest_config->c_info; libxl_ctx *ctx = libxl__gc_owner(gc); char *path, *logfile; int logfile_w, null; @@ -835,7 +838,9 @@ xs_mkdir(ctx->xsh, XBT_NULL, path); libxl__xs_write(gc, XBT_NULL, libxl__sprintf(gc, "%s/disable_pf", path), "%d", !info->xen_platform_pci); - libxl_create_logfile(ctx, libxl__sprintf(gc, "qemu-dm-%s", info->dom_name), &logfile); + libxl_create_logfile(ctx, + libxl__sprintf(gc, "qemu-dm-%s", c_info->name), + &logfile); logfile_w = open(logfile, O_WRONLY|O_CREAT|O_APPEND, 0644); free(logfile); null = open("/dev/null", O_RDONLY); @@ -981,8 +986,6 @@ libxl_device_vfb *vfb, libxl_device_model_info *info) { - libxl_ctx *ctx = libxl__gc_owner(gc); - if (vfb != NULL) { info->vnc.enable = vfb->vnc.enable; if (vfb->vnc.listen) @@ -997,7 +1000,6 @@ } else info->nographic = 1; info->domid = domid; - info->dom_name = libxl_domid_to_name(ctx, domid); return 0; } diff -r 6cf421073cab -r 5ebec91f5f10 tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Tue Jan 31 15:21:51 2012 +0000 +++ b/tools/libxl/libxl_types.idl Tue Jan 31 15:21:51 2012 +0000 @@ -237,7 +237,6 @@ # uuid is used only with stubdom, and must be different from the # domain uuid ("uuid", libxl_uuid), - ("dom_name", string), ("device_model_version", libxl_device_model_version), ("device_model_stubdomain", bool), # you set device_model you must set device_model_version too _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:58:03 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:58: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 1RtR8t-0007ji-Es; Fri, 03 Feb 2012 21:58:03 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8s-0007i7-KV for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:02 +0000 Received: from [193.109.254.147:47382] by server-6.bemta-14.messagelabs.com id 35/D1-05782-9685C2F4; Fri, 03 Feb 2012 21:58:01 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-27.messagelabs.com!1328306230!51337710!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16939 invoked from network); 3 Feb 2012 21:57:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 3 Feb 2012 21:57:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8p-0001na-R2 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR8p-0002zO-9L for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:57:59 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:57:58 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: drop dm_info.dom_name X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1328023311 0 # Node ID 5ebec91f5f101b454ed781a19a8c4d41b0149bd9 # Parent 6cf421073cabaa219a70ae4f04b517e99a90f7d4 libxl: drop dm_info.dom_name This is always the same as the c_info name which we now have available. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 6cf421073cab -r 5ebec91f5f10 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Tue Jan 31 15:21:51 2012 +0000 +++ b/tools/libxl/libxl_create.c Tue Jan 31 15:21:51 2012 +0000 @@ -118,7 +118,6 @@ libxl_uuid_generate(&dm_info->uuid); - dm_info->dom_name = strdup(c_info->name); dm_info->device_model_version = LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL; dm_info->device_model_stubdomain = false; dm_info->device_model = NULL; diff -r 6cf421073cab -r 5ebec91f5f10 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Tue Jan 31 15:21:51 2012 +0000 +++ b/tools/libxl/libxl_dm.c Tue Jan 31 15:21:51 2012 +0000 @@ -78,6 +78,7 @@ const libxl_domain_config *guest_config, const libxl_device_model_info *info) { + const libxl_domain_create_info *c_info = &guest_config->c_info; const libxl_domain_build_info *b_info = &guest_config->b_info; const libxl_device_nic *vifs = guest_config->vifs; const int num_vifs = guest_config->num_vifs; @@ -91,8 +92,8 @@ flexarray_vappend(dm_args, dm, "-d", libxl__sprintf(gc, "%d", info->domid), NULL); - if (info->dom_name) - flexarray_vappend(dm_args, "-domain-name", info->dom_name, NULL); + if (c_info->name) + flexarray_vappend(dm_args, "-domain-name", c_info->name, NULL); if (info->vnc.enable) { char *vncarg; @@ -239,6 +240,7 @@ const libxl_device_model_info *info) { libxl_ctx *ctx = libxl__gc_owner(gc); + const libxl_domain_create_info *c_info = &guest_config->c_info; const libxl_domain_build_info *b_info = &guest_config->b_info; const libxl_device_disk *disks = guest_config->disks; const libxl_device_nic *vifs = guest_config->vifs; @@ -268,8 +270,8 @@ flexarray_append(dm_args, "-xen-attach"); } - if (info->dom_name) { - flexarray_vappend(dm_args, "-name", info->dom_name, NULL); + if (c_info->name) { + flexarray_vappend(dm_args, "-name", c_info->name, NULL); } if (info->vnc.enable) { int display = 0; @@ -793,6 +795,7 @@ libxl_device_model_info *info, libxl__spawner_starting **starting_r) { + const libxl_domain_create_info *c_info = &guest_config->c_info; libxl_ctx *ctx = libxl__gc_owner(gc); char *path, *logfile; int logfile_w, null; @@ -835,7 +838,9 @@ xs_mkdir(ctx->xsh, XBT_NULL, path); libxl__xs_write(gc, XBT_NULL, libxl__sprintf(gc, "%s/disable_pf", path), "%d", !info->xen_platform_pci); - libxl_create_logfile(ctx, libxl__sprintf(gc, "qemu-dm-%s", info->dom_name), &logfile); + libxl_create_logfile(ctx, + libxl__sprintf(gc, "qemu-dm-%s", c_info->name), + &logfile); logfile_w = open(logfile, O_WRONLY|O_CREAT|O_APPEND, 0644); free(logfile); null = open("/dev/null", O_RDONLY); @@ -981,8 +986,6 @@ libxl_device_vfb *vfb, libxl_device_model_info *info) { - libxl_ctx *ctx = libxl__gc_owner(gc); - if (vfb != NULL) { info->vnc.enable = vfb->vnc.enable; if (vfb->vnc.listen) @@ -997,7 +1000,6 @@ } else info->nographic = 1; info->domid = domid; - info->dom_name = libxl_domid_to_name(ctx, domid); return 0; } diff -r 6cf421073cab -r 5ebec91f5f10 tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Tue Jan 31 15:21:51 2012 +0000 +++ b/tools/libxl/libxl_types.idl Tue Jan 31 15:21:51 2012 +0000 @@ -237,7 +237,6 @@ # uuid is used only with stubdom, and must be different from the # domain uuid ("uuid", libxl_uuid), - ("dom_name", string), ("device_model_version", libxl_device_model_version), ("device_model_stubdomain", bool), # you set device_model you must set device_model_version too _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:58:10 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:58: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 1RtR90-0007on-Hm; Fri, 03 Feb 2012 21:58:10 +0000 Received: from mail182.messagelabs.com ([85.158.139.83]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8z-0007l8-Qt for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:10 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-11.tower-182.messagelabs.com!1328306281!13617432!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13589 invoked from network); 3 Feb 2012 21:58:02 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 3 Feb 2012 21:58:02 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8r-0001ng-CT for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR8q-000301-Tg for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:00 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:57:59 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: use vfb[0] directly for xenpv device model X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1328023311 0 # Node ID 211964199f93589ad26c23596ba685cfe3921188 # Parent 5ebec91f5f101b454ed781a19a8c4d41b0149bd9 libxl: use vfb[0] directly for xenpv device model Rather than laundering it via dm info. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 5ebec91f5f10 -r 211964199f93 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Tue Jan 31 15:21:51 2012 +0000 +++ b/tools/libxl/libxl_dm.c Tue Jan 31 15:21:51 2012 +0000 @@ -73,6 +73,30 @@ } } +static const libxl_vnc_info *dm_vnc(const libxl_domain_config *guest_config, + const libxl_device_model_info *info) +{ + const libxl_vnc_info *vnc = NULL; + if (info->type == LIBXL_DOMAIN_TYPE_HVM) { + vnc = &info->vnc; + } else if (guest_config->num_vfbs > 0) { + vnc = &guest_config->vfbs[0].vnc; + } + return vnc && vnc->enable ? vnc : NULL; +} + +static const libxl_sdl_info *dm_sdl(const libxl_domain_config *guest_config, + const libxl_device_model_info *info) +{ + const libxl_sdl_info *sdl = NULL; + if (info->type == LIBXL_DOMAIN_TYPE_HVM) { + sdl = &info->sdl; + } else if (guest_config->num_vfbs > 0) { + sdl = &guest_config->vfbs[0].sdl; + } + return sdl && sdl->enable ? sdl : NULL; +} + static char ** libxl__build_device_model_args_old(libxl__gc *gc, const char *dm, const libxl_domain_config *guest_config, @@ -81,6 +105,8 @@ const libxl_domain_create_info *c_info = &guest_config->c_info; const libxl_domain_build_info *b_info = &guest_config->b_info; const libxl_device_nic *vifs = guest_config->vifs; + const libxl_vnc_info *vnc = dm_vnc(guest_config, info); + const libxl_sdl_info *sdl = dm_sdl(guest_config, info); const int num_vifs = guest_config->num_vifs; int i; flexarray_t *dm_args; @@ -95,45 +121,45 @@ if (c_info->name) flexarray_vappend(dm_args, "-domain-name", c_info->name, NULL); - if (info->vnc.enable) { + if (vnc) { char *vncarg; - if (info->vnc.display) { - if (info->vnc.listen && strchr(info->vnc.listen, ':') == NULL) { + if (vnc->display) { + if (vnc->listen && strchr(vnc->listen, ':') == NULL) { vncarg = libxl__sprintf(gc, "%s:%d", - info->vnc.listen, - info->vnc.display); + vnc->listen, + vnc->display); } else { - vncarg = libxl__sprintf(gc, "127.0.0.1:%d", info->vnc.display); + vncarg = libxl__sprintf(gc, "127.0.0.1:%d", vnc->display); } - } else if (info->vnc.listen) { - if (strchr(info->vnc.listen, ':') != NULL) { - vncarg = info->vnc.listen; + } else if (vnc->listen) { + if (strchr(vnc->listen, ':') != NULL) { + vncarg = vnc->listen; } else { - vncarg = libxl__sprintf(gc, "%s:0", info->vnc.listen); + vncarg = libxl__sprintf(gc, "%s:0", vnc->listen); } } else { vncarg = "127.0.0.1:0"; } - if (info->vnc.passwd && (info->vnc.passwd[0] != '\0')) + if (vnc->passwd && (vnc->passwd[0] != '\0')) vncarg = libxl__sprintf(gc, "%s,password", vncarg); flexarray_append(dm_args, "-vnc"); flexarray_append(dm_args, vncarg); - if (info->vnc.findunused) { + if (vnc->findunused) { flexarray_append(dm_args, "-vncunused"); } } - if (info->sdl.enable) { + if (sdl) { flexarray_append(dm_args, "-sdl"); - if (!info->sdl.opengl) { + if (!sdl->opengl) { flexarray_append(dm_args, "-disable-opengl"); } - /* XXX info->sdl.{display,xauthority} into $DISPLAY/$XAUTHORITY */ + /* XXX sdl->{display,xauthority} into $DISPLAY/$XAUTHORITY */ } if (info->keymap) { flexarray_vappend(dm_args, "-k", info->keymap, NULL); } - if (info->nographic && (!info->sdl.enable && !info->vnc.enable)) { + if (info->nographic && (!sdl && !vnc)) { flexarray_append(dm_args, "-nographic"); } if (info->serial) { @@ -246,6 +272,8 @@ const libxl_device_nic *vifs = guest_config->vifs; const int num_disks = guest_config->num_disks; const int num_vifs = guest_config->num_vifs; + const libxl_vnc_info *vnc = dm_vnc(guest_config, info); + const libxl_sdl_info *sdl = dm_sdl(guest_config, info); flexarray_t *dm_args; int i; @@ -273,36 +301,36 @@ if (c_info->name) { flexarray_vappend(dm_args, "-name", c_info->name, NULL); } - if (info->vnc.enable) { + if (vnc) { int display = 0; const char *listen = "127.0.0.1"; - if (info->vnc.passwd && info->vnc.passwd[0]) { + if (vnc->passwd && vnc->passwd[0]) { assert(!"missing code for supplying vnc password to qemu"); } flexarray_append(dm_args, "-vnc"); - if (info->vnc.display) { - display = info->vnc.display; - if (info->vnc.listen && strchr(info->vnc.listen, ':') == NULL) { - listen = info->vnc.listen; + if (vnc->display) { + display = vnc->display; + if (vnc->listen && strchr(vnc->listen, ':') == NULL) { + listen = vnc->listen; } - } else if (info->vnc.listen) { - listen = info->vnc.listen; + } else if (vnc->listen) { + listen = vnc->listen; } if (strchr(listen, ':') != NULL) flexarray_append(dm_args, libxl__sprintf(gc, "%s%s", listen, - info->vnc.findunused ? ",to=99" : "")); + vnc->findunused ? ",to=99" : "")); else flexarray_append(dm_args, libxl__sprintf(gc, "%s:%d%s", listen, display, - info->vnc.findunused ? ",to=99" : "")); + vnc->findunused ? ",to=99" : "")); } - if (info->sdl.enable) { + if (sdl) { flexarray_append(dm_args, "-sdl"); - /* XXX info->sdl.{display,xauthority} into $DISPLAY/$XAUTHORITY */ + /* XXX sdl->{display,xauthority} into $DISPLAY/$XAUTHORITY */ } if (info->spice.enable) { char *spiceoptions = NULL; @@ -349,7 +377,7 @@ if (info->keymap) { flexarray_vappend(dm_args, "-k", info->keymap, NULL); } - if (info->nographic && (!info->sdl.enable && !info->vnc.enable)) { + if (info->nographic && (!sdl && !vnc)) { flexarray_append(dm_args, "-nographic"); } if (info->serial) { @@ -795,8 +823,9 @@ libxl_device_model_info *info, libxl__spawner_starting **starting_r) { + libxl_ctx *ctx = libxl__gc_owner(gc); const libxl_domain_create_info *c_info = &guest_config->c_info; - libxl_ctx *ctx = libxl__gc_owner(gc); + const libxl_vnc_info *vnc = dm_vnc(guest_config, info); char *path, *logfile; int logfile_w, null; int rc; @@ -865,7 +894,7 @@ goto out_close; } - if (info->vnc.passwd) { + if (vnc && vnc->passwd) { retry_transaction: /* Find uuid and the write the vnc password to xenstore for qemu. */ t = xs_transaction_start(ctx->xsh); @@ -874,7 +903,7 @@ /* Now write the vncpassword into it. */ pass_stuff = libxl__calloc(gc, 3, sizeof(char *)); pass_stuff[0] = "vncpasswd"; - pass_stuff[1] = info->vnc.passwd; + pass_stuff[1] = vnc->passwd; libxl__xs_writev(gc,t,vm_path,pass_stuff); if (!xs_transaction_end(ctx->xsh, t, 0)) if (errno == EAGAIN) @@ -983,22 +1012,8 @@ static int libxl__build_xenpv_qemu_args(libxl__gc *gc, uint32_t domid, - libxl_device_vfb *vfb, libxl_device_model_info *info) { - if (vfb != NULL) { - info->vnc.enable = vfb->vnc.enable; - if (vfb->vnc.listen) - info->vnc.listen = libxl__strdup(gc, vfb->vnc.listen); - info->vnc.display = vfb->vnc.display; - info->vnc.findunused = vfb->vnc.findunused; - if (vfb->vnc.passwd) - info->vnc.passwd = vfb->vnc.passwd; - if (vfb->keymap) - info->keymap = libxl__strdup(gc, vfb->keymap); - info->sdl = vfb->sdl; - } else - info->nographic = 1; info->domid = domid; return 0; } @@ -1045,7 +1060,7 @@ libxl_device_model_info *info, libxl__spawner_starting **starting_r) { - libxl__build_xenpv_qemu_args(gc, domid, &guest_config->vfbs[0], info); + libxl__build_xenpv_qemu_args(gc, domid, info); libxl__create_device_model(gc, guest_config, info, starting_r); return 0; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:58:10 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:58: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 1RtR90-0007on-Hm; Fri, 03 Feb 2012 21:58:10 +0000 Received: from mail182.messagelabs.com ([85.158.139.83]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8z-0007l8-Qt for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:10 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-11.tower-182.messagelabs.com!1328306281!13617432!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13589 invoked from network); 3 Feb 2012 21:58:02 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 3 Feb 2012 21:58:02 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8r-0001ng-CT for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR8q-000301-Tg for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:00 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:57:59 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: use vfb[0] directly for xenpv device model X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1328023311 0 # Node ID 211964199f93589ad26c23596ba685cfe3921188 # Parent 5ebec91f5f101b454ed781a19a8c4d41b0149bd9 libxl: use vfb[0] directly for xenpv device model Rather than laundering it via dm info. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 5ebec91f5f10 -r 211964199f93 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Tue Jan 31 15:21:51 2012 +0000 +++ b/tools/libxl/libxl_dm.c Tue Jan 31 15:21:51 2012 +0000 @@ -73,6 +73,30 @@ } } +static const libxl_vnc_info *dm_vnc(const libxl_domain_config *guest_config, + const libxl_device_model_info *info) +{ + const libxl_vnc_info *vnc = NULL; + if (info->type == LIBXL_DOMAIN_TYPE_HVM) { + vnc = &info->vnc; + } else if (guest_config->num_vfbs > 0) { + vnc = &guest_config->vfbs[0].vnc; + } + return vnc && vnc->enable ? vnc : NULL; +} + +static const libxl_sdl_info *dm_sdl(const libxl_domain_config *guest_config, + const libxl_device_model_info *info) +{ + const libxl_sdl_info *sdl = NULL; + if (info->type == LIBXL_DOMAIN_TYPE_HVM) { + sdl = &info->sdl; + } else if (guest_config->num_vfbs > 0) { + sdl = &guest_config->vfbs[0].sdl; + } + return sdl && sdl->enable ? sdl : NULL; +} + static char ** libxl__build_device_model_args_old(libxl__gc *gc, const char *dm, const libxl_domain_config *guest_config, @@ -81,6 +105,8 @@ const libxl_domain_create_info *c_info = &guest_config->c_info; const libxl_domain_build_info *b_info = &guest_config->b_info; const libxl_device_nic *vifs = guest_config->vifs; + const libxl_vnc_info *vnc = dm_vnc(guest_config, info); + const libxl_sdl_info *sdl = dm_sdl(guest_config, info); const int num_vifs = guest_config->num_vifs; int i; flexarray_t *dm_args; @@ -95,45 +121,45 @@ if (c_info->name) flexarray_vappend(dm_args, "-domain-name", c_info->name, NULL); - if (info->vnc.enable) { + if (vnc) { char *vncarg; - if (info->vnc.display) { - if (info->vnc.listen && strchr(info->vnc.listen, ':') == NULL) { + if (vnc->display) { + if (vnc->listen && strchr(vnc->listen, ':') == NULL) { vncarg = libxl__sprintf(gc, "%s:%d", - info->vnc.listen, - info->vnc.display); + vnc->listen, + vnc->display); } else { - vncarg = libxl__sprintf(gc, "127.0.0.1:%d", info->vnc.display); + vncarg = libxl__sprintf(gc, "127.0.0.1:%d", vnc->display); } - } else if (info->vnc.listen) { - if (strchr(info->vnc.listen, ':') != NULL) { - vncarg = info->vnc.listen; + } else if (vnc->listen) { + if (strchr(vnc->listen, ':') != NULL) { + vncarg = vnc->listen; } else { - vncarg = libxl__sprintf(gc, "%s:0", info->vnc.listen); + vncarg = libxl__sprintf(gc, "%s:0", vnc->listen); } } else { vncarg = "127.0.0.1:0"; } - if (info->vnc.passwd && (info->vnc.passwd[0] != '\0')) + if (vnc->passwd && (vnc->passwd[0] != '\0')) vncarg = libxl__sprintf(gc, "%s,password", vncarg); flexarray_append(dm_args, "-vnc"); flexarray_append(dm_args, vncarg); - if (info->vnc.findunused) { + if (vnc->findunused) { flexarray_append(dm_args, "-vncunused"); } } - if (info->sdl.enable) { + if (sdl) { flexarray_append(dm_args, "-sdl"); - if (!info->sdl.opengl) { + if (!sdl->opengl) { flexarray_append(dm_args, "-disable-opengl"); } - /* XXX info->sdl.{display,xauthority} into $DISPLAY/$XAUTHORITY */ + /* XXX sdl->{display,xauthority} into $DISPLAY/$XAUTHORITY */ } if (info->keymap) { flexarray_vappend(dm_args, "-k", info->keymap, NULL); } - if (info->nographic && (!info->sdl.enable && !info->vnc.enable)) { + if (info->nographic && (!sdl && !vnc)) { flexarray_append(dm_args, "-nographic"); } if (info->serial) { @@ -246,6 +272,8 @@ const libxl_device_nic *vifs = guest_config->vifs; const int num_disks = guest_config->num_disks; const int num_vifs = guest_config->num_vifs; + const libxl_vnc_info *vnc = dm_vnc(guest_config, info); + const libxl_sdl_info *sdl = dm_sdl(guest_config, info); flexarray_t *dm_args; int i; @@ -273,36 +301,36 @@ if (c_info->name) { flexarray_vappend(dm_args, "-name", c_info->name, NULL); } - if (info->vnc.enable) { + if (vnc) { int display = 0; const char *listen = "127.0.0.1"; - if (info->vnc.passwd && info->vnc.passwd[0]) { + if (vnc->passwd && vnc->passwd[0]) { assert(!"missing code for supplying vnc password to qemu"); } flexarray_append(dm_args, "-vnc"); - if (info->vnc.display) { - display = info->vnc.display; - if (info->vnc.listen && strchr(info->vnc.listen, ':') == NULL) { - listen = info->vnc.listen; + if (vnc->display) { + display = vnc->display; + if (vnc->listen && strchr(vnc->listen, ':') == NULL) { + listen = vnc->listen; } - } else if (info->vnc.listen) { - listen = info->vnc.listen; + } else if (vnc->listen) { + listen = vnc->listen; } if (strchr(listen, ':') != NULL) flexarray_append(dm_args, libxl__sprintf(gc, "%s%s", listen, - info->vnc.findunused ? ",to=99" : "")); + vnc->findunused ? ",to=99" : "")); else flexarray_append(dm_args, libxl__sprintf(gc, "%s:%d%s", listen, display, - info->vnc.findunused ? ",to=99" : "")); + vnc->findunused ? ",to=99" : "")); } - if (info->sdl.enable) { + if (sdl) { flexarray_append(dm_args, "-sdl"); - /* XXX info->sdl.{display,xauthority} into $DISPLAY/$XAUTHORITY */ + /* XXX sdl->{display,xauthority} into $DISPLAY/$XAUTHORITY */ } if (info->spice.enable) { char *spiceoptions = NULL; @@ -349,7 +377,7 @@ if (info->keymap) { flexarray_vappend(dm_args, "-k", info->keymap, NULL); } - if (info->nographic && (!info->sdl.enable && !info->vnc.enable)) { + if (info->nographic && (!sdl && !vnc)) { flexarray_append(dm_args, "-nographic"); } if (info->serial) { @@ -795,8 +823,9 @@ libxl_device_model_info *info, libxl__spawner_starting **starting_r) { + libxl_ctx *ctx = libxl__gc_owner(gc); const libxl_domain_create_info *c_info = &guest_config->c_info; - libxl_ctx *ctx = libxl__gc_owner(gc); + const libxl_vnc_info *vnc = dm_vnc(guest_config, info); char *path, *logfile; int logfile_w, null; int rc; @@ -865,7 +894,7 @@ goto out_close; } - if (info->vnc.passwd) { + if (vnc && vnc->passwd) { retry_transaction: /* Find uuid and the write the vnc password to xenstore for qemu. */ t = xs_transaction_start(ctx->xsh); @@ -874,7 +903,7 @@ /* Now write the vncpassword into it. */ pass_stuff = libxl__calloc(gc, 3, sizeof(char *)); pass_stuff[0] = "vncpasswd"; - pass_stuff[1] = info->vnc.passwd; + pass_stuff[1] = vnc->passwd; libxl__xs_writev(gc,t,vm_path,pass_stuff); if (!xs_transaction_end(ctx->xsh, t, 0)) if (errno == EAGAIN) @@ -983,22 +1012,8 @@ static int libxl__build_xenpv_qemu_args(libxl__gc *gc, uint32_t domid, - libxl_device_vfb *vfb, libxl_device_model_info *info) { - if (vfb != NULL) { - info->vnc.enable = vfb->vnc.enable; - if (vfb->vnc.listen) - info->vnc.listen = libxl__strdup(gc, vfb->vnc.listen); - info->vnc.display = vfb->vnc.display; - info->vnc.findunused = vfb->vnc.findunused; - if (vfb->vnc.passwd) - info->vnc.passwd = vfb->vnc.passwd; - if (vfb->keymap) - info->keymap = libxl__strdup(gc, vfb->keymap); - info->sdl = vfb->sdl; - } else - info->nographic = 1; info->domid = domid; return 0; } @@ -1045,7 +1060,7 @@ libxl_device_model_info *info, libxl__spawner_starting **starting_r) { - libxl__build_xenpv_qemu_args(gc, domid, &guest_config->vfbs[0], info); + libxl__build_xenpv_qemu_args(gc, domid, info); libxl__create_device_model(gc, guest_config, info, starting_r); return 0; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:58:14 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:58: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 1RtR94-0007rJ-Ke; Fri, 03 Feb 2012 21:58:14 +0000 Received: from mail174.messagelabs.com ([85.158.138.51]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR93-0007n5-Aa for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:13 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-174.messagelabs.com!1328306285!11933613!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23968 invoked from network); 3 Feb 2012 21:58:06 -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; 3 Feb 2012 21:58:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8v-0001oD-3B for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR8s-00030Z-Mu for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:04 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:58:01 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: move HVM emulated GFX support into b_info->u.hvm X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1328023311 0 # Node ID 6ccdda2c9b42ceb01ea995685546ab12a54edffa # Parent 211964199f93589ad26c23596ba685cfe3921188 libxl: move HVM emulated GFX support into b_info->u.hvm Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 211964199f93 -r 6ccdda2c9b42 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Tue Jan 31 15:21:51 2012 +0000 +++ b/tools/libxl/libxl_create.c Tue Jan 31 15:21:51 2012 +0000 @@ -96,6 +96,16 @@ b_info->u.hvm.timer_mode = 1; b_info->u.hvm.nested_hvm = 0; b_info->u.hvm.no_incr_generationid = 0; + + b_info->u.hvm.stdvga = 0; + b_info->u.hvm.vnc.enable = 1; + b_info->u.hvm.vnc.listen = strdup("127.0.0.1"); + b_info->u.hvm.vnc.display = 0; + b_info->u.hvm.vnc.findunused = 1; + b_info->u.hvm.keymap = NULL; + b_info->u.hvm.sdl.enable = 0; + b_info->u.hvm.sdl.opengl = 0; + b_info->u.hvm.nographic = 0; break; case LIBXL_DOMAIN_TYPE_PV: b_info->u.pv.slack_memkb = 8 * 1024; @@ -121,17 +131,7 @@ dm_info->device_model_version = LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL; dm_info->device_model_stubdomain = false; dm_info->device_model = NULL; - dm_info->videoram = libxl__sizekb_to_mb(b_info->video_memkb); - dm_info->stdvga = 0; - dm_info->vnc.enable = 1; - dm_info->vnc.listen = strdup("127.0.0.1"); - dm_info->vnc.display = 0; - dm_info->vnc.findunused = 1; - dm_info->keymap = NULL; - dm_info->sdl.enable = 0; - dm_info->sdl.opengl = 0; - dm_info->nographic = 0; dm_info->serial = NULL; dm_info->boot = strdup("cda"); dm_info->usb = 0; diff -r 211964199f93 -r 6ccdda2c9b42 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Tue Jan 31 15:21:51 2012 +0000 +++ b/tools/libxl/libxl_dm.c Tue Jan 31 15:21:51 2012 +0000 @@ -78,7 +78,7 @@ { const libxl_vnc_info *vnc = NULL; if (info->type == LIBXL_DOMAIN_TYPE_HVM) { - vnc = &info->vnc; + vnc = &guest_config->b_info.u.hvm.vnc; } else if (guest_config->num_vfbs > 0) { vnc = &guest_config->vfbs[0].vnc; } @@ -90,13 +90,24 @@ { const libxl_sdl_info *sdl = NULL; if (info->type == LIBXL_DOMAIN_TYPE_HVM) { - sdl = &info->sdl; + sdl = &guest_config->b_info.u.hvm.sdl; } else if (guest_config->num_vfbs > 0) { sdl = &guest_config->vfbs[0].sdl; } return sdl && sdl->enable ? sdl : NULL; } +static const char *dm_keymap(const libxl_domain_config *guest_config, + const libxl_device_model_info *info) +{ + if (info->type == LIBXL_DOMAIN_TYPE_HVM) { + return guest_config->b_info.u.hvm.keymap; + } else if (guest_config->num_vfbs > 0) { + return guest_config->vfbs[0].keymap; + } else + return NULL; +} + static char ** libxl__build_device_model_args_old(libxl__gc *gc, const char *dm, const libxl_domain_config *guest_config, @@ -108,6 +119,7 @@ const libxl_vnc_info *vnc = dm_vnc(guest_config, info); const libxl_sdl_info *sdl = dm_sdl(guest_config, info); const int num_vifs = guest_config->num_vifs; + const char *keymap = dm_keymap(guest_config, info); int i; flexarray_t *dm_args; dm_args = flexarray_make(16, 1); @@ -156,11 +168,8 @@ } /* XXX sdl->{display,xauthority} into $DISPLAY/$XAUTHORITY */ } - if (info->keymap) { - flexarray_vappend(dm_args, "-k", info->keymap, NULL); - } - if (info->nographic && (!sdl && !vnc)) { - flexarray_append(dm_args, "-nographic"); + if (keymap) { + flexarray_vappend(dm_args, "-k", keymap, NULL); } if (info->serial) { flexarray_vappend(dm_args, "-serial", info->serial, NULL); @@ -168,10 +177,17 @@ if (info->type == LIBXL_DOMAIN_TYPE_HVM) { int ioemu_vifs = 0; - if (info->videoram) { - flexarray_vappend(dm_args, "-videoram", libxl__sprintf(gc, "%d", info->videoram), NULL); + if (b_info->u.hvm.nographic && (!sdl && !vnc)) { + flexarray_append(dm_args, "-nographic"); } - if (info->stdvga) { + + if (b_info->video_memkb) { + flexarray_vappend(dm_args, "-videoram", + libxl__sprintf(gc, "%d", + libxl__sizekb_to_mb(b_info->video_memkb)), + NULL); + } + if (b_info->u.hvm.stdvga) { flexarray_append(dm_args, "-std-vga"); } @@ -225,7 +241,11 @@ if (info->gfx_passthru) { flexarray_append(dm_args, "-gfx_passthru"); } + } else { + if (!sdl && !vnc) + flexarray_append(dm_args, "-nographic"); } + if (info->saved_state) { flexarray_vappend(dm_args, "-loadvm", info->saved_state, NULL); } @@ -260,6 +280,42 @@ } } +static char *dm_spice_options(libxl__gc *gc, + const libxl_spice_info *spice) +{ + char *opt; + + if (!spice->port && !spice->tls_port) { + LIBXL__LOG(CTX, LIBXL__LOG_ERROR, + "at least one of the spiceport or tls_port must be provided"); + return NULL; + } + + if (!spice->disable_ticketing) { + if (!spice->passwd) { + LIBXL__LOG(CTX, LIBXL__LOG_ERROR, + "spice ticketing is enabled but missing password"); + return NULL; + } + else if (!spice->passwd[0]) { + LIBXL__LOG(CTX, LIBXL__LOG_ERROR, + "spice password can't be empty"); + return NULL; + } + } + opt = libxl__sprintf(gc, "port=%d,tls-port=%d", + spice->port, spice->tls_port); + if (spice->host) + opt = libxl__sprintf(gc, "%s,addr=%s", opt, spice->host); + if (spice->disable_ticketing) + opt = libxl__sprintf(gc, "%s,disable-ticketing", opt); + else + opt = libxl__sprintf(gc, "%s,password=%s", opt, spice->passwd); + opt = libxl__sprintf(gc, "%s,agent-mouse=%s", opt, + spice->agent_mouse ? "on" : "off"); + return opt; +} + static char ** libxl__build_device_model_args_new(libxl__gc *gc, const char *dm, const libxl_domain_config *guest_config, @@ -274,6 +330,7 @@ const int num_vifs = guest_config->num_vifs; const libxl_vnc_info *vnc = dm_vnc(guest_config, info); const libxl_sdl_info *sdl = dm_sdl(guest_config, info); + const char *keymap = dm_keymap(guest_config, info); flexarray_t *dm_args; int i; @@ -332,61 +389,36 @@ flexarray_append(dm_args, "-sdl"); /* XXX sdl->{display,xauthority} into $DISPLAY/$XAUTHORITY */ } - if (info->spice.enable) { - char *spiceoptions = NULL; - if (!info->spice.port && !info->spice.tls_port) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, - "at least one of the spiceport or tls_port must be provided"); - return NULL; - } - if (!info->spice.disable_ticketing) { - if (!info->spice.passwd) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, - "spice ticketing is enabled but missing password"); - return NULL; - } - else if (!info->spice.passwd[0]) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, - "spice password can't be empty"); - return NULL; - } - } - spiceoptions = libxl__sprintf(gc, "port=%d,tls-port=%d", - info->spice.port, info->spice.tls_port); - if (info->spice.host) - spiceoptions = libxl__sprintf(gc, - "%s,addr=%s", spiceoptions, info->spice.host); - if (info->spice.disable_ticketing) - spiceoptions = libxl__sprintf(gc, "%s,disable-ticketing", - spiceoptions); - else - spiceoptions = libxl__sprintf(gc, - "%s,password=%s", spiceoptions, info->spice.passwd); - spiceoptions = libxl__sprintf(gc, "%s,agent-mouse=%s", spiceoptions, - info->spice.agent_mouse ? "on" : "off"); + /*if (info->type == LIBXL_DOMAIN_TYPE_PV && !b_info->nographic) { + flexarray_vappend(dm_args, "-vga", "xenfb", NULL); + } never was possible?*/ - flexarray_append(dm_args, "-spice"); - flexarray_append(dm_args, spiceoptions); + if (keymap) { + flexarray_vappend(dm_args, "-k", keymap, NULL); } - if (info->type == LIBXL_DOMAIN_TYPE_PV && !info->nographic) { - flexarray_vappend(dm_args, "-vga", "xenfb", NULL); - } - - if (info->keymap) { - flexarray_vappend(dm_args, "-k", info->keymap, NULL); - } - if (info->nographic && (!sdl && !vnc)) { - flexarray_append(dm_args, "-nographic"); - } if (info->serial) { flexarray_vappend(dm_args, "-serial", info->serial, NULL); } if (info->type == LIBXL_DOMAIN_TYPE_HVM) { int ioemu_vifs = 0; - if (info->stdvga) { + if (b_info->u.hvm.nographic && (!sdl && !vnc)) { + flexarray_append(dm_args, "-nographic"); + } + + if (b_info->u.hvm.spice.enable) { + const libxl_spice_info *spice = &b_info->u.hvm.spice; + char *spiceoptions = dm_spice_options(gc, spice); + if (!spiceoptions) + return NULL; + + flexarray_append(dm_args, "-spice"); + flexarray_append(dm_args, spiceoptions); + } + + if (b_info->u.hvm.stdvga) { flexarray_vappend(dm_args, "-vga", "std", NULL); } @@ -446,7 +478,12 @@ if (info->gfx_passthru) { flexarray_append(dm_args, "-gfx_passthru"); } + } else { + if (!sdl && !vnc) { + flexarray_append(dm_args, "-nographic"); + } } + if (info->saved_state) { /* This file descriptor is meant to be used by QEMU */ int migration_fd = open(info->saved_state, O_RDONLY); @@ -555,19 +592,24 @@ } } -static int libxl__vfb_and_vkb_from_device_model_info(libxl__gc *gc, - const libxl_device_model_info *info, +static int libxl__vfb_and_vkb_from_hvm_guest_config(libxl__gc *gc, + const libxl_domain_config *guest_config, libxl_device_vfb *vfb, libxl_device_vkb *vkb) { + const libxl_domain_build_info *b_info = &guest_config->b_info; + + if (b_info->type != LIBXL_DOMAIN_TYPE_HVM) + return ERROR_INVAL; + memset(vfb, 0x00, sizeof(libxl_device_vfb)); memset(vkb, 0x00, sizeof(libxl_device_vkb)); vfb->backend_domid = 0; vfb->devid = 0; - vfb->vnc = info->vnc; - vfb->keymap = info->keymap; - vfb->sdl = info->sdl; + vfb->vnc = b_info->u.hvm.vnc; + vfb->keymap = b_info->u.hvm.keymap; + vfb->sdl = b_info->u.hvm.sdl; vkb->backend_domid = 0; vkb->devid = 0; @@ -670,8 +712,7 @@ dm_config.vifs = guest_config->vifs; dm_config.num_vifs = guest_config->num_vifs; - libxl__vfb_and_vkb_from_device_model_info(gc, info, &vfb, &vkb); - + 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; diff -r 211964199f93 -r 6ccdda2c9b42 tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Tue Jan 31 15:21:51 2012 +0000 +++ b/tools/libxl/libxl_types.idl Tue Jan 31 15:21:51 2012 +0000 @@ -215,6 +215,13 @@ ("timer_mode", integer), ("nested_hvm", bool), ("no_incr_generationid", bool), + ("nographic", bool), + ("stdvga", bool), + ("vnc", libxl_vnc_info), + # keyboard layout, default is en-us keyboard + ("keymap", string), + ("sdl", libxl_sdl_info), + ("spice", libxl_spice_info), ])), ("pv", Struct(None, [("kernel", libxl_file_reference), ("slack_memkb", uint32), @@ -243,15 +250,6 @@ ("device_model", string), ("saved_state", string), ("type", libxl_domain_type), - # size of the videoram in MB - ("videoram", integer), - ("stdvga", bool), - ("vnc", libxl_vnc_info), - # keyboard layout, default is en-us keyboard - ("keymap", string), - ("sdl", libxl_sdl_info), - ("spice", libxl_spice_info), - ("nographic", bool), ("gfx_passthru", bool), ("serial", string), ("boot", string), diff -r 211964199f93 -r 6ccdda2c9b42 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Tue Jan 31 15:21:51 2012 +0000 +++ b/tools/libxl/xl_cmdimpl.c Tue Jan 31 15:21:51 2012 +0000 @@ -364,29 +364,29 @@ printf("\t\t\t(no_incr_generationid %d)\n", b_info->u.hvm.no_incr_generationid); + printf("\t\t\t(stdvga %d)\n", b_info->u.hvm.stdvga); + printf("\t\t\t(vnc %d)\n", b_info->u.hvm.vnc.enable); + printf("\t\t\t(vnclisten %s)\n", b_info->u.hvm.vnc.listen); + printf("\t\t\t(vncdisplay %d)\n", b_info->u.hvm.vnc.display); + printf("\t\t\t(vncunused %d)\n", b_info->u.hvm.vnc.findunused); + printf("\t\t\t(keymap %s)\n", b_info->u.hvm.keymap); + printf("\t\t\t(sdl %d)\n", b_info->u.hvm.sdl.enable); + printf("\t\t\t(opengl %d)\n", b_info->u.hvm.sdl.opengl); + printf("\t\t\t(nographic %d)\n", b_info->u.hvm.nographic); + printf("\t\t\t(spice %d)\n", b_info->u.hvm.spice.enable); + printf("\t\t\t(spiceport %d)\n", b_info->u.hvm.spice.port); + printf("\t\t\t(spicetls_port %d)\n", b_info->u.hvm.spice.tls_port); + printf("\t\t\t(spicehost %s)\n", b_info->u.hvm.spice.host); + printf("\t\t\t(spicedisable_ticketing %d)\n", + b_info->u.hvm.spice.disable_ticketing); + printf("\t\t\t(spiceagent_mouse %d)\n", b_info->u.hvm.spice.agent_mouse); + printf("\t\t\t(device_model %s)\n", dm_info->device_model ? : "default"); - printf("\t\t\t(videoram %d)\n", dm_info->videoram); - printf("\t\t\t(stdvga %d)\n", dm_info->stdvga); - printf("\t\t\t(vnc %d)\n", dm_info->vnc.enable); - printf("\t\t\t(vnclisten %s)\n", dm_info->vnc.listen); - printf("\t\t\t(vncdisplay %d)\n", dm_info->vnc.display); - printf("\t\t\t(vncunused %d)\n", dm_info->vnc.findunused); - printf("\t\t\t(keymap %s)\n", dm_info->keymap); - printf("\t\t\t(sdl %d)\n", dm_info->sdl.enable); printf("\t\t\t(gfx_passthru %d)\n", dm_info->gfx_passthru); - printf("\t\t\t(opengl %d)\n", dm_info->sdl.opengl); - printf("\t\t\t(nographic %d)\n", dm_info->nographic); printf("\t\t\t(serial %s)\n", dm_info->serial); printf("\t\t\t(boot %s)\n", dm_info->boot); printf("\t\t\t(usb %d)\n", dm_info->usb); printf("\t\t\t(usbdevice %s)\n", dm_info->usbdevice); - printf("\t\t\t(spice %d)\n", dm_info->spice.enable); - printf("\t\t\t(spiceport %d)\n", dm_info->spice.port); - printf("\t\t\t(spicetls_port %d)\n", dm_info->spice.tls_port); - printf("\t\t\t(spicehost %s)\n", dm_info->spice.host); - printf("\t\t\t(spicedisable_ticketing %d)\n", - dm_info->spice.disable_ticketing); - printf("\t\t\t(spiceagent_mouse %d)\n", dm_info->spice.agent_mouse); printf("\t\t)\n"); break; case LIBXL_DOMAIN_TYPE_PV: @@ -1259,37 +1259,38 @@ if (c_info->type == LIBXL_DOMAIN_TYPE_HVM) { if (!xlu_cfg_get_long (config, "stdvga", &l, 0)) - dm_info->stdvga = l; + b_info->u.hvm.stdvga = l; if (!xlu_cfg_get_long (config, "vnc", &l, 0)) - dm_info->vnc.enable = l; - xlu_cfg_replace_string (config, "vnclisten", &dm_info->vnc.listen, 0); - xlu_cfg_replace_string (config, "vncpasswd", &dm_info->vnc.passwd, 0); + b_info->u.hvm.vnc.enable = l; + xlu_cfg_replace_string (config, "vnclisten", &b_info->u.hvm.vnc.listen, 0); + xlu_cfg_replace_string (config, "vncpasswd", &b_info->u.hvm.vnc.passwd, 0); if (!xlu_cfg_get_long (config, "vncdisplay", &l, 0)) - dm_info->vnc.display = l; + b_info->u.hvm.vnc.display = l; if (!xlu_cfg_get_long (config, "vncunused", &l, 0)) - dm_info->vnc.findunused = l; - xlu_cfg_replace_string (config, "keymap", &dm_info->keymap, 0); + b_info->u.hvm.vnc.findunused = l; + xlu_cfg_replace_string (config, "keymap", &b_info->u.hvm.keymap, 0); if (!xlu_cfg_get_long (config, "sdl", &l, 0)) - dm_info->sdl.enable = l; + b_info->u.hvm.sdl.enable = l; if (!xlu_cfg_get_long (config, "opengl", &l, 0)) - dm_info->sdl.opengl = l; + b_info->u.hvm.sdl.opengl = l; if (!xlu_cfg_get_long (config, "spice", &l, 0)) - dm_info->spice.enable = l; + b_info->u.hvm.spice.enable = l; if (!xlu_cfg_get_long (config, "spiceport", &l, 0)) - dm_info->spice.port = l; + b_info->u.hvm.spice.port = l; if (!xlu_cfg_get_long (config, "spicetls_port", &l, 0)) - dm_info->spice.tls_port = l; - xlu_cfg_replace_string (config, "spicehost", &dm_info->spice.host, 0); + b_info->u.hvm.spice.tls_port = l; + xlu_cfg_replace_string (config, "spicehost", + &b_info->u.hvm.spice.host, 0); if (!xlu_cfg_get_long (config, "spicedisable_ticketing", &l, 0)) - dm_info->spice.disable_ticketing = l; + b_info->u.hvm.spice.disable_ticketing = l; xlu_cfg_replace_string (config, "spicepasswd", - &dm_info->spice.passwd, 0); + &b_info->u.hvm.spice.passwd, 0); if (!xlu_cfg_get_long (config, "spiceagent_mouse", &l, 0)) - dm_info->spice.agent_mouse = l; + b_info->u.hvm.spice.agent_mouse = l; else - dm_info->spice.agent_mouse = 1; + b_info->u.hvm.spice.agent_mouse = 1; if (!xlu_cfg_get_long (config, "nographic", &l, 0)) - dm_info->nographic = l; + b_info->u.hvm.nographic = l; if (!xlu_cfg_get_long (config, "gfx_passthru", &l, 0)) dm_info->gfx_passthru = l; xlu_cfg_replace_string (config, "serial", &dm_info->serial, 0); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:58:14 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:58: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 1RtR94-0007rJ-Ke; Fri, 03 Feb 2012 21:58:14 +0000 Received: from mail174.messagelabs.com ([85.158.138.51]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR93-0007n5-Aa for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:13 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-174.messagelabs.com!1328306285!11933613!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23968 invoked from network); 3 Feb 2012 21:58:06 -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; 3 Feb 2012 21:58:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8v-0001oD-3B for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR8s-00030Z-Mu for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:04 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:58:01 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: move HVM emulated GFX support into b_info->u.hvm X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1328023311 0 # Node ID 6ccdda2c9b42ceb01ea995685546ab12a54edffa # Parent 211964199f93589ad26c23596ba685cfe3921188 libxl: move HVM emulated GFX support into b_info->u.hvm Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 211964199f93 -r 6ccdda2c9b42 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Tue Jan 31 15:21:51 2012 +0000 +++ b/tools/libxl/libxl_create.c Tue Jan 31 15:21:51 2012 +0000 @@ -96,6 +96,16 @@ b_info->u.hvm.timer_mode = 1; b_info->u.hvm.nested_hvm = 0; b_info->u.hvm.no_incr_generationid = 0; + + b_info->u.hvm.stdvga = 0; + b_info->u.hvm.vnc.enable = 1; + b_info->u.hvm.vnc.listen = strdup("127.0.0.1"); + b_info->u.hvm.vnc.display = 0; + b_info->u.hvm.vnc.findunused = 1; + b_info->u.hvm.keymap = NULL; + b_info->u.hvm.sdl.enable = 0; + b_info->u.hvm.sdl.opengl = 0; + b_info->u.hvm.nographic = 0; break; case LIBXL_DOMAIN_TYPE_PV: b_info->u.pv.slack_memkb = 8 * 1024; @@ -121,17 +131,7 @@ dm_info->device_model_version = LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL; dm_info->device_model_stubdomain = false; dm_info->device_model = NULL; - dm_info->videoram = libxl__sizekb_to_mb(b_info->video_memkb); - dm_info->stdvga = 0; - dm_info->vnc.enable = 1; - dm_info->vnc.listen = strdup("127.0.0.1"); - dm_info->vnc.display = 0; - dm_info->vnc.findunused = 1; - dm_info->keymap = NULL; - dm_info->sdl.enable = 0; - dm_info->sdl.opengl = 0; - dm_info->nographic = 0; dm_info->serial = NULL; dm_info->boot = strdup("cda"); dm_info->usb = 0; diff -r 211964199f93 -r 6ccdda2c9b42 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Tue Jan 31 15:21:51 2012 +0000 +++ b/tools/libxl/libxl_dm.c Tue Jan 31 15:21:51 2012 +0000 @@ -78,7 +78,7 @@ { const libxl_vnc_info *vnc = NULL; if (info->type == LIBXL_DOMAIN_TYPE_HVM) { - vnc = &info->vnc; + vnc = &guest_config->b_info.u.hvm.vnc; } else if (guest_config->num_vfbs > 0) { vnc = &guest_config->vfbs[0].vnc; } @@ -90,13 +90,24 @@ { const libxl_sdl_info *sdl = NULL; if (info->type == LIBXL_DOMAIN_TYPE_HVM) { - sdl = &info->sdl; + sdl = &guest_config->b_info.u.hvm.sdl; } else if (guest_config->num_vfbs > 0) { sdl = &guest_config->vfbs[0].sdl; } return sdl && sdl->enable ? sdl : NULL; } +static const char *dm_keymap(const libxl_domain_config *guest_config, + const libxl_device_model_info *info) +{ + if (info->type == LIBXL_DOMAIN_TYPE_HVM) { + return guest_config->b_info.u.hvm.keymap; + } else if (guest_config->num_vfbs > 0) { + return guest_config->vfbs[0].keymap; + } else + return NULL; +} + static char ** libxl__build_device_model_args_old(libxl__gc *gc, const char *dm, const libxl_domain_config *guest_config, @@ -108,6 +119,7 @@ const libxl_vnc_info *vnc = dm_vnc(guest_config, info); const libxl_sdl_info *sdl = dm_sdl(guest_config, info); const int num_vifs = guest_config->num_vifs; + const char *keymap = dm_keymap(guest_config, info); int i; flexarray_t *dm_args; dm_args = flexarray_make(16, 1); @@ -156,11 +168,8 @@ } /* XXX sdl->{display,xauthority} into $DISPLAY/$XAUTHORITY */ } - if (info->keymap) { - flexarray_vappend(dm_args, "-k", info->keymap, NULL); - } - if (info->nographic && (!sdl && !vnc)) { - flexarray_append(dm_args, "-nographic"); + if (keymap) { + flexarray_vappend(dm_args, "-k", keymap, NULL); } if (info->serial) { flexarray_vappend(dm_args, "-serial", info->serial, NULL); @@ -168,10 +177,17 @@ if (info->type == LIBXL_DOMAIN_TYPE_HVM) { int ioemu_vifs = 0; - if (info->videoram) { - flexarray_vappend(dm_args, "-videoram", libxl__sprintf(gc, "%d", info->videoram), NULL); + if (b_info->u.hvm.nographic && (!sdl && !vnc)) { + flexarray_append(dm_args, "-nographic"); } - if (info->stdvga) { + + if (b_info->video_memkb) { + flexarray_vappend(dm_args, "-videoram", + libxl__sprintf(gc, "%d", + libxl__sizekb_to_mb(b_info->video_memkb)), + NULL); + } + if (b_info->u.hvm.stdvga) { flexarray_append(dm_args, "-std-vga"); } @@ -225,7 +241,11 @@ if (info->gfx_passthru) { flexarray_append(dm_args, "-gfx_passthru"); } + } else { + if (!sdl && !vnc) + flexarray_append(dm_args, "-nographic"); } + if (info->saved_state) { flexarray_vappend(dm_args, "-loadvm", info->saved_state, NULL); } @@ -260,6 +280,42 @@ } } +static char *dm_spice_options(libxl__gc *gc, + const libxl_spice_info *spice) +{ + char *opt; + + if (!spice->port && !spice->tls_port) { + LIBXL__LOG(CTX, LIBXL__LOG_ERROR, + "at least one of the spiceport or tls_port must be provided"); + return NULL; + } + + if (!spice->disable_ticketing) { + if (!spice->passwd) { + LIBXL__LOG(CTX, LIBXL__LOG_ERROR, + "spice ticketing is enabled but missing password"); + return NULL; + } + else if (!spice->passwd[0]) { + LIBXL__LOG(CTX, LIBXL__LOG_ERROR, + "spice password can't be empty"); + return NULL; + } + } + opt = libxl__sprintf(gc, "port=%d,tls-port=%d", + spice->port, spice->tls_port); + if (spice->host) + opt = libxl__sprintf(gc, "%s,addr=%s", opt, spice->host); + if (spice->disable_ticketing) + opt = libxl__sprintf(gc, "%s,disable-ticketing", opt); + else + opt = libxl__sprintf(gc, "%s,password=%s", opt, spice->passwd); + opt = libxl__sprintf(gc, "%s,agent-mouse=%s", opt, + spice->agent_mouse ? "on" : "off"); + return opt; +} + static char ** libxl__build_device_model_args_new(libxl__gc *gc, const char *dm, const libxl_domain_config *guest_config, @@ -274,6 +330,7 @@ const int num_vifs = guest_config->num_vifs; const libxl_vnc_info *vnc = dm_vnc(guest_config, info); const libxl_sdl_info *sdl = dm_sdl(guest_config, info); + const char *keymap = dm_keymap(guest_config, info); flexarray_t *dm_args; int i; @@ -332,61 +389,36 @@ flexarray_append(dm_args, "-sdl"); /* XXX sdl->{display,xauthority} into $DISPLAY/$XAUTHORITY */ } - if (info->spice.enable) { - char *spiceoptions = NULL; - if (!info->spice.port && !info->spice.tls_port) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, - "at least one of the spiceport or tls_port must be provided"); - return NULL; - } - if (!info->spice.disable_ticketing) { - if (!info->spice.passwd) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, - "spice ticketing is enabled but missing password"); - return NULL; - } - else if (!info->spice.passwd[0]) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, - "spice password can't be empty"); - return NULL; - } - } - spiceoptions = libxl__sprintf(gc, "port=%d,tls-port=%d", - info->spice.port, info->spice.tls_port); - if (info->spice.host) - spiceoptions = libxl__sprintf(gc, - "%s,addr=%s", spiceoptions, info->spice.host); - if (info->spice.disable_ticketing) - spiceoptions = libxl__sprintf(gc, "%s,disable-ticketing", - spiceoptions); - else - spiceoptions = libxl__sprintf(gc, - "%s,password=%s", spiceoptions, info->spice.passwd); - spiceoptions = libxl__sprintf(gc, "%s,agent-mouse=%s", spiceoptions, - info->spice.agent_mouse ? "on" : "off"); + /*if (info->type == LIBXL_DOMAIN_TYPE_PV && !b_info->nographic) { + flexarray_vappend(dm_args, "-vga", "xenfb", NULL); + } never was possible?*/ - flexarray_append(dm_args, "-spice"); - flexarray_append(dm_args, spiceoptions); + if (keymap) { + flexarray_vappend(dm_args, "-k", keymap, NULL); } - if (info->type == LIBXL_DOMAIN_TYPE_PV && !info->nographic) { - flexarray_vappend(dm_args, "-vga", "xenfb", NULL); - } - - if (info->keymap) { - flexarray_vappend(dm_args, "-k", info->keymap, NULL); - } - if (info->nographic && (!sdl && !vnc)) { - flexarray_append(dm_args, "-nographic"); - } if (info->serial) { flexarray_vappend(dm_args, "-serial", info->serial, NULL); } if (info->type == LIBXL_DOMAIN_TYPE_HVM) { int ioemu_vifs = 0; - if (info->stdvga) { + if (b_info->u.hvm.nographic && (!sdl && !vnc)) { + flexarray_append(dm_args, "-nographic"); + } + + if (b_info->u.hvm.spice.enable) { + const libxl_spice_info *spice = &b_info->u.hvm.spice; + char *spiceoptions = dm_spice_options(gc, spice); + if (!spiceoptions) + return NULL; + + flexarray_append(dm_args, "-spice"); + flexarray_append(dm_args, spiceoptions); + } + + if (b_info->u.hvm.stdvga) { flexarray_vappend(dm_args, "-vga", "std", NULL); } @@ -446,7 +478,12 @@ if (info->gfx_passthru) { flexarray_append(dm_args, "-gfx_passthru"); } + } else { + if (!sdl && !vnc) { + flexarray_append(dm_args, "-nographic"); + } } + if (info->saved_state) { /* This file descriptor is meant to be used by QEMU */ int migration_fd = open(info->saved_state, O_RDONLY); @@ -555,19 +592,24 @@ } } -static int libxl__vfb_and_vkb_from_device_model_info(libxl__gc *gc, - const libxl_device_model_info *info, +static int libxl__vfb_and_vkb_from_hvm_guest_config(libxl__gc *gc, + const libxl_domain_config *guest_config, libxl_device_vfb *vfb, libxl_device_vkb *vkb) { + const libxl_domain_build_info *b_info = &guest_config->b_info; + + if (b_info->type != LIBXL_DOMAIN_TYPE_HVM) + return ERROR_INVAL; + memset(vfb, 0x00, sizeof(libxl_device_vfb)); memset(vkb, 0x00, sizeof(libxl_device_vkb)); vfb->backend_domid = 0; vfb->devid = 0; - vfb->vnc = info->vnc; - vfb->keymap = info->keymap; - vfb->sdl = info->sdl; + vfb->vnc = b_info->u.hvm.vnc; + vfb->keymap = b_info->u.hvm.keymap; + vfb->sdl = b_info->u.hvm.sdl; vkb->backend_domid = 0; vkb->devid = 0; @@ -670,8 +712,7 @@ dm_config.vifs = guest_config->vifs; dm_config.num_vifs = guest_config->num_vifs; - libxl__vfb_and_vkb_from_device_model_info(gc, info, &vfb, &vkb); - + 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; diff -r 211964199f93 -r 6ccdda2c9b42 tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Tue Jan 31 15:21:51 2012 +0000 +++ b/tools/libxl/libxl_types.idl Tue Jan 31 15:21:51 2012 +0000 @@ -215,6 +215,13 @@ ("timer_mode", integer), ("nested_hvm", bool), ("no_incr_generationid", bool), + ("nographic", bool), + ("stdvga", bool), + ("vnc", libxl_vnc_info), + # keyboard layout, default is en-us keyboard + ("keymap", string), + ("sdl", libxl_sdl_info), + ("spice", libxl_spice_info), ])), ("pv", Struct(None, [("kernel", libxl_file_reference), ("slack_memkb", uint32), @@ -243,15 +250,6 @@ ("device_model", string), ("saved_state", string), ("type", libxl_domain_type), - # size of the videoram in MB - ("videoram", integer), - ("stdvga", bool), - ("vnc", libxl_vnc_info), - # keyboard layout, default is en-us keyboard - ("keymap", string), - ("sdl", libxl_sdl_info), - ("spice", libxl_spice_info), - ("nographic", bool), ("gfx_passthru", bool), ("serial", string), ("boot", string), diff -r 211964199f93 -r 6ccdda2c9b42 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Tue Jan 31 15:21:51 2012 +0000 +++ b/tools/libxl/xl_cmdimpl.c Tue Jan 31 15:21:51 2012 +0000 @@ -364,29 +364,29 @@ printf("\t\t\t(no_incr_generationid %d)\n", b_info->u.hvm.no_incr_generationid); + printf("\t\t\t(stdvga %d)\n", b_info->u.hvm.stdvga); + printf("\t\t\t(vnc %d)\n", b_info->u.hvm.vnc.enable); + printf("\t\t\t(vnclisten %s)\n", b_info->u.hvm.vnc.listen); + printf("\t\t\t(vncdisplay %d)\n", b_info->u.hvm.vnc.display); + printf("\t\t\t(vncunused %d)\n", b_info->u.hvm.vnc.findunused); + printf("\t\t\t(keymap %s)\n", b_info->u.hvm.keymap); + printf("\t\t\t(sdl %d)\n", b_info->u.hvm.sdl.enable); + printf("\t\t\t(opengl %d)\n", b_info->u.hvm.sdl.opengl); + printf("\t\t\t(nographic %d)\n", b_info->u.hvm.nographic); + printf("\t\t\t(spice %d)\n", b_info->u.hvm.spice.enable); + printf("\t\t\t(spiceport %d)\n", b_info->u.hvm.spice.port); + printf("\t\t\t(spicetls_port %d)\n", b_info->u.hvm.spice.tls_port); + printf("\t\t\t(spicehost %s)\n", b_info->u.hvm.spice.host); + printf("\t\t\t(spicedisable_ticketing %d)\n", + b_info->u.hvm.spice.disable_ticketing); + printf("\t\t\t(spiceagent_mouse %d)\n", b_info->u.hvm.spice.agent_mouse); + printf("\t\t\t(device_model %s)\n", dm_info->device_model ? : "default"); - printf("\t\t\t(videoram %d)\n", dm_info->videoram); - printf("\t\t\t(stdvga %d)\n", dm_info->stdvga); - printf("\t\t\t(vnc %d)\n", dm_info->vnc.enable); - printf("\t\t\t(vnclisten %s)\n", dm_info->vnc.listen); - printf("\t\t\t(vncdisplay %d)\n", dm_info->vnc.display); - printf("\t\t\t(vncunused %d)\n", dm_info->vnc.findunused); - printf("\t\t\t(keymap %s)\n", dm_info->keymap); - printf("\t\t\t(sdl %d)\n", dm_info->sdl.enable); printf("\t\t\t(gfx_passthru %d)\n", dm_info->gfx_passthru); - printf("\t\t\t(opengl %d)\n", dm_info->sdl.opengl); - printf("\t\t\t(nographic %d)\n", dm_info->nographic); printf("\t\t\t(serial %s)\n", dm_info->serial); printf("\t\t\t(boot %s)\n", dm_info->boot); printf("\t\t\t(usb %d)\n", dm_info->usb); printf("\t\t\t(usbdevice %s)\n", dm_info->usbdevice); - printf("\t\t\t(spice %d)\n", dm_info->spice.enable); - printf("\t\t\t(spiceport %d)\n", dm_info->spice.port); - printf("\t\t\t(spicetls_port %d)\n", dm_info->spice.tls_port); - printf("\t\t\t(spicehost %s)\n", dm_info->spice.host); - printf("\t\t\t(spicedisable_ticketing %d)\n", - dm_info->spice.disable_ticketing); - printf("\t\t\t(spiceagent_mouse %d)\n", dm_info->spice.agent_mouse); printf("\t\t)\n"); break; case LIBXL_DOMAIN_TYPE_PV: @@ -1259,37 +1259,38 @@ if (c_info->type == LIBXL_DOMAIN_TYPE_HVM) { if (!xlu_cfg_get_long (config, "stdvga", &l, 0)) - dm_info->stdvga = l; + b_info->u.hvm.stdvga = l; if (!xlu_cfg_get_long (config, "vnc", &l, 0)) - dm_info->vnc.enable = l; - xlu_cfg_replace_string (config, "vnclisten", &dm_info->vnc.listen, 0); - xlu_cfg_replace_string (config, "vncpasswd", &dm_info->vnc.passwd, 0); + b_info->u.hvm.vnc.enable = l; + xlu_cfg_replace_string (config, "vnclisten", &b_info->u.hvm.vnc.listen, 0); + xlu_cfg_replace_string (config, "vncpasswd", &b_info->u.hvm.vnc.passwd, 0); if (!xlu_cfg_get_long (config, "vncdisplay", &l, 0)) - dm_info->vnc.display = l; + b_info->u.hvm.vnc.display = l; if (!xlu_cfg_get_long (config, "vncunused", &l, 0)) - dm_info->vnc.findunused = l; - xlu_cfg_replace_string (config, "keymap", &dm_info->keymap, 0); + b_info->u.hvm.vnc.findunused = l; + xlu_cfg_replace_string (config, "keymap", &b_info->u.hvm.keymap, 0); if (!xlu_cfg_get_long (config, "sdl", &l, 0)) - dm_info->sdl.enable = l; + b_info->u.hvm.sdl.enable = l; if (!xlu_cfg_get_long (config, "opengl", &l, 0)) - dm_info->sdl.opengl = l; + b_info->u.hvm.sdl.opengl = l; if (!xlu_cfg_get_long (config, "spice", &l, 0)) - dm_info->spice.enable = l; + b_info->u.hvm.spice.enable = l; if (!xlu_cfg_get_long (config, "spiceport", &l, 0)) - dm_info->spice.port = l; + b_info->u.hvm.spice.port = l; if (!xlu_cfg_get_long (config, "spicetls_port", &l, 0)) - dm_info->spice.tls_port = l; - xlu_cfg_replace_string (config, "spicehost", &dm_info->spice.host, 0); + b_info->u.hvm.spice.tls_port = l; + xlu_cfg_replace_string (config, "spicehost", + &b_info->u.hvm.spice.host, 0); if (!xlu_cfg_get_long (config, "spicedisable_ticketing", &l, 0)) - dm_info->spice.disable_ticketing = l; + b_info->u.hvm.spice.disable_ticketing = l; xlu_cfg_replace_string (config, "spicepasswd", - &dm_info->spice.passwd, 0); + &b_info->u.hvm.spice.passwd, 0); if (!xlu_cfg_get_long (config, "spiceagent_mouse", &l, 0)) - dm_info->spice.agent_mouse = l; + b_info->u.hvm.spice.agent_mouse = l; else - dm_info->spice.agent_mouse = 1; + b_info->u.hvm.spice.agent_mouse = 1; if (!xlu_cfg_get_long (config, "nographic", &l, 0)) - dm_info->nographic = l; + b_info->u.hvm.nographic = l; if (!xlu_cfg_get_long (config, "gfx_passthru", &l, 0)) dm_info->gfx_passthru = l; xlu_cfg_replace_string (config, "serial", &dm_info->serial, 0); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:58:17 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:58: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 1RtR96-0007tK-Qe; Fri, 03 Feb 2012 21:58:16 +0000 Received: from mail182.messagelabs.com ([85.158.139.83]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR95-0007oP-IE for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:15 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-11.tower-182.messagelabs.com!1328306287!13617439!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14058 invoked from network); 3 Feb 2012 21:58:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 3 Feb 2012 21:58:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8x-0001oJ-8Y for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR8w-00031p-HB for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:06 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:58:05 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: HVM device configuration info build_info->u.hvm X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1328023312 0 # Node ID 304726ed52e61bd6a064541b0e1dcfb7edb3f9ff # Parent 6ccdda2c9b42ceb01ea995685546ab12a54edffa libxl: HVM device configuration info build_info->u.hvm Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 6ccdda2c9b42 -r 304726ed52e6 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Tue Jan 31 15:21:51 2012 +0000 +++ b/tools/libxl/libxl_create.c Tue Jan 31 15:21:52 2012 +0000 @@ -106,6 +106,11 @@ b_info->u.hvm.sdl.enable = 0; b_info->u.hvm.sdl.opengl = 0; b_info->u.hvm.nographic = 0; + b_info->u.hvm.serial = NULL; + b_info->u.hvm.boot = strdup("cda"); + b_info->u.hvm.usb = 0; + b_info->u.hvm.usbdevice = NULL; + b_info->u.hvm.xen_platform_pci = 1; break; case LIBXL_DOMAIN_TYPE_PV: b_info->u.pv.slack_memkb = 8 * 1024; @@ -132,11 +137,6 @@ dm_info->device_model_stubdomain = false; dm_info->device_model = NULL; - dm_info->serial = NULL; - dm_info->boot = strdup("cda"); - dm_info->usb = 0; - dm_info->usbdevice = NULL; - dm_info->xen_platform_pci = 1; return 0; } diff -r 6ccdda2c9b42 -r 304726ed52e6 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Tue Jan 31 15:21:51 2012 +0000 +++ b/tools/libxl/libxl_dm.c Tue Jan 31 15:21:52 2012 +0000 @@ -171,12 +171,13 @@ if (keymap) { flexarray_vappend(dm_args, "-k", keymap, NULL); } - if (info->serial) { - flexarray_vappend(dm_args, "-serial", info->serial, NULL); - } if (info->type == LIBXL_DOMAIN_TYPE_HVM) { int ioemu_vifs = 0; + if (b_info->u.hvm.serial) { + flexarray_vappend(dm_args, "-serial", b_info->u.hvm.serial, NULL); + } + if (b_info->u.hvm.nographic && (!sdl && !vnc)) { flexarray_append(dm_args, "-nographic"); } @@ -191,17 +192,18 @@ flexarray_append(dm_args, "-std-vga"); } - if (info->boot) { - flexarray_vappend(dm_args, "-boot", info->boot, NULL); + if (b_info->u.hvm.boot) { + flexarray_vappend(dm_args, "-boot", b_info->u.hvm.boot, NULL); } - if (info->usb || info->usbdevice) { + if (b_info->u.hvm.usb || b_info->u.hvm.usbdevice) { flexarray_append(dm_args, "-usb"); - if (info->usbdevice) { - flexarray_vappend(dm_args, "-usbdevice", info->usbdevice, NULL); + if (b_info->u.hvm.usbdevice) { + flexarray_vappend(dm_args, + "-usbdevice", b_info->u.hvm.usbdevice, NULL); } } - if (info->soundhw) { - flexarray_vappend(dm_args, "-soundhw", info->soundhw, NULL); + if (b_info->u.hvm.soundhw) { + flexarray_vappend(dm_args, "-soundhw", b_info->u.hvm.soundhw, NULL); } if (b_info->u.hvm.acpi) { flexarray_append(dm_args, "-acpi"); @@ -398,12 +400,13 @@ flexarray_vappend(dm_args, "-k", keymap, NULL); } - if (info->serial) { - flexarray_vappend(dm_args, "-serial", info->serial, NULL); - } if (info->type == LIBXL_DOMAIN_TYPE_HVM) { int ioemu_vifs = 0; + if (b_info->u.hvm.serial) { + flexarray_vappend(dm_args, "-serial", b_info->u.hvm.serial, NULL); + } + if (b_info->u.hvm.nographic && (!sdl && !vnc)) { flexarray_append(dm_args, "-nographic"); } @@ -422,17 +425,19 @@ flexarray_vappend(dm_args, "-vga", "std", NULL); } - if (info->boot) { - flexarray_vappend(dm_args, "-boot", libxl__sprintf(gc, "order=%s", info->boot), NULL); + if (b_info->u.hvm.boot) { + flexarray_vappend(dm_args, "-boot", + libxl__sprintf(gc, "order=%s", b_info->u.hvm.boot), NULL); } - if (info->usb || info->usbdevice) { + if (b_info->u.hvm.usb || b_info->u.hvm.usbdevice) { flexarray_append(dm_args, "-usb"); - if (info->usbdevice) { - flexarray_vappend(dm_args, "-usbdevice", info->usbdevice, NULL); + if (b_info->u.hvm.usbdevice) { + flexarray_vappend(dm_args, + "-usbdevice", b_info->u.hvm.usbdevice, NULL); } } - if (info->soundhw) { - flexarray_vappend(dm_args, "-soundhw", info->soundhw, NULL); + if (b_info->u.hvm.soundhw) { + flexarray_vappend(dm_args, "-soundhw", b_info->u.hvm.soundhw, NULL); } if (!b_info->u.hvm.acpi) { flexarray_append(dm_args, "-no-acpi"); @@ -778,7 +783,7 @@ if (ret) goto out_free; - if (info->serial) + if (guest_config->b_info.u.hvm.serial) num_console++; console = libxl__calloc(gc, num_console, sizeof(libxl_device_console)); @@ -906,7 +911,8 @@ path = libxl__sprintf(gc, "/local/domain/0/device-model/%d", info->domid); xs_mkdir(ctx->xsh, XBT_NULL, path); - libxl__xs_write(gc, XBT_NULL, libxl__sprintf(gc, "%s/disable_pf", path), "%d", !info->xen_platform_pci); + libxl__xs_write(gc, XBT_NULL, libxl__sprintf(gc, "%s/disable_pf", path), + "%d", !guest_config->b_info.u.hvm.xen_platform_pci); libxl_create_logfile(ctx, libxl__sprintf(gc, "qemu-dm-%s", c_info->name), diff -r 6ccdda2c9b42 -r 304726ed52e6 tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Tue Jan 31 15:21:51 2012 +0000 +++ b/tools/libxl/libxl_types.idl Tue Jan 31 15:21:52 2012 +0000 @@ -222,6 +222,16 @@ ("keymap", string), ("sdl", libxl_sdl_info), ("spice", libxl_spice_info), + + ("serial", string), + ("boot", string), + ("usb", bool), + # usbdevice: + # - "tablet" for absolute mouse, + # - "mouse" for PS/2 protocol relative mouse + ("usbdevice", string), + ("soundhw", string), + ("xen_platform_pci", bool), ])), ("pv", Struct(None, [("kernel", libxl_file_reference), ("slack_memkb", uint32), @@ -251,13 +261,6 @@ ("saved_state", string), ("type", libxl_domain_type), ("gfx_passthru", bool), - ("serial", string), - ("boot", string), - ("usb", bool), - # usbdevice: "tablet" for absolute mouse, "mouse" for PS/2 protocol relative mouse - ("usbdevice", string), - ("soundhw", string), - ("xen_platform_pci", bool), # extra parameters pass directly to qemu, NULL terminated ("extra", libxl_string_list), # extra parameters pass directly to qemu for PV guest, NULL terminated diff -r 6ccdda2c9b42 -r 304726ed52e6 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Tue Jan 31 15:21:51 2012 +0000 +++ b/tools/libxl/xl_cmdimpl.c Tue Jan 31 15:21:52 2012 +0000 @@ -383,10 +383,10 @@ printf("\t\t\t(device_model %s)\n", dm_info->device_model ? : "default"); printf("\t\t\t(gfx_passthru %d)\n", dm_info->gfx_passthru); - printf("\t\t\t(serial %s)\n", dm_info->serial); - printf("\t\t\t(boot %s)\n", dm_info->boot); - printf("\t\t\t(usb %d)\n", dm_info->usb); - printf("\t\t\t(usbdevice %s)\n", dm_info->usbdevice); + printf("\t\t\t(serial %s)\n", b_info->u.hvm.serial); + printf("\t\t\t(boot %s)\n", b_info->u.hvm.boot); + printf("\t\t\t(usb %d)\n", b_info->u.hvm.usb); + printf("\t\t\t(usbdevice %s)\n", b_info->u.hvm.usbdevice); printf("\t\t)\n"); break; case LIBXL_DOMAIN_TYPE_PV: @@ -1293,14 +1293,14 @@ b_info->u.hvm.nographic = l; if (!xlu_cfg_get_long (config, "gfx_passthru", &l, 0)) dm_info->gfx_passthru = l; - xlu_cfg_replace_string (config, "serial", &dm_info->serial, 0); - xlu_cfg_replace_string (config, "boot", &dm_info->boot, 0); + xlu_cfg_replace_string (config, "serial", &b_info->u.hvm.serial, 0); + xlu_cfg_replace_string (config, "boot", &b_info->u.hvm.boot, 0); if (!xlu_cfg_get_long (config, "usb", &l, 0)) - dm_info->usb = l; - xlu_cfg_replace_string (config, "usbdevice", &dm_info->usbdevice, 0); - xlu_cfg_replace_string (config, "soundhw", &dm_info->soundhw, 0); + b_info->u.hvm.usb = l; + xlu_cfg_replace_string (config, "usbdevice", &b_info->u.hvm.usbdevice, 0); + xlu_cfg_replace_string (config, "soundhw", &b_info->u.hvm.soundhw, 0); if (!xlu_cfg_get_long (config, "xen_platform_pci", &l, 0)) - dm_info->xen_platform_pci = l; + b_info->u.hvm.xen_platform_pci = l; } dm_info->type = c_info->type; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:58:17 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:58: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 1RtR96-0007tK-Qe; Fri, 03 Feb 2012 21:58:16 +0000 Received: from mail182.messagelabs.com ([85.158.139.83]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR95-0007oP-IE for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:15 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-11.tower-182.messagelabs.com!1328306287!13617439!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14058 invoked from network); 3 Feb 2012 21:58:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 3 Feb 2012 21:58:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR8x-0001oJ-8Y for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR8w-00031p-HB for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:06 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:58:05 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: HVM device configuration info build_info->u.hvm X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1328023312 0 # Node ID 304726ed52e61bd6a064541b0e1dcfb7edb3f9ff # Parent 6ccdda2c9b42ceb01ea995685546ab12a54edffa libxl: HVM device configuration info build_info->u.hvm Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 6ccdda2c9b42 -r 304726ed52e6 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Tue Jan 31 15:21:51 2012 +0000 +++ b/tools/libxl/libxl_create.c Tue Jan 31 15:21:52 2012 +0000 @@ -106,6 +106,11 @@ b_info->u.hvm.sdl.enable = 0; b_info->u.hvm.sdl.opengl = 0; b_info->u.hvm.nographic = 0; + b_info->u.hvm.serial = NULL; + b_info->u.hvm.boot = strdup("cda"); + b_info->u.hvm.usb = 0; + b_info->u.hvm.usbdevice = NULL; + b_info->u.hvm.xen_platform_pci = 1; break; case LIBXL_DOMAIN_TYPE_PV: b_info->u.pv.slack_memkb = 8 * 1024; @@ -132,11 +137,6 @@ dm_info->device_model_stubdomain = false; dm_info->device_model = NULL; - dm_info->serial = NULL; - dm_info->boot = strdup("cda"); - dm_info->usb = 0; - dm_info->usbdevice = NULL; - dm_info->xen_platform_pci = 1; return 0; } diff -r 6ccdda2c9b42 -r 304726ed52e6 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Tue Jan 31 15:21:51 2012 +0000 +++ b/tools/libxl/libxl_dm.c Tue Jan 31 15:21:52 2012 +0000 @@ -171,12 +171,13 @@ if (keymap) { flexarray_vappend(dm_args, "-k", keymap, NULL); } - if (info->serial) { - flexarray_vappend(dm_args, "-serial", info->serial, NULL); - } if (info->type == LIBXL_DOMAIN_TYPE_HVM) { int ioemu_vifs = 0; + if (b_info->u.hvm.serial) { + flexarray_vappend(dm_args, "-serial", b_info->u.hvm.serial, NULL); + } + if (b_info->u.hvm.nographic && (!sdl && !vnc)) { flexarray_append(dm_args, "-nographic"); } @@ -191,17 +192,18 @@ flexarray_append(dm_args, "-std-vga"); } - if (info->boot) { - flexarray_vappend(dm_args, "-boot", info->boot, NULL); + if (b_info->u.hvm.boot) { + flexarray_vappend(dm_args, "-boot", b_info->u.hvm.boot, NULL); } - if (info->usb || info->usbdevice) { + if (b_info->u.hvm.usb || b_info->u.hvm.usbdevice) { flexarray_append(dm_args, "-usb"); - if (info->usbdevice) { - flexarray_vappend(dm_args, "-usbdevice", info->usbdevice, NULL); + if (b_info->u.hvm.usbdevice) { + flexarray_vappend(dm_args, + "-usbdevice", b_info->u.hvm.usbdevice, NULL); } } - if (info->soundhw) { - flexarray_vappend(dm_args, "-soundhw", info->soundhw, NULL); + if (b_info->u.hvm.soundhw) { + flexarray_vappend(dm_args, "-soundhw", b_info->u.hvm.soundhw, NULL); } if (b_info->u.hvm.acpi) { flexarray_append(dm_args, "-acpi"); @@ -398,12 +400,13 @@ flexarray_vappend(dm_args, "-k", keymap, NULL); } - if (info->serial) { - flexarray_vappend(dm_args, "-serial", info->serial, NULL); - } if (info->type == LIBXL_DOMAIN_TYPE_HVM) { int ioemu_vifs = 0; + if (b_info->u.hvm.serial) { + flexarray_vappend(dm_args, "-serial", b_info->u.hvm.serial, NULL); + } + if (b_info->u.hvm.nographic && (!sdl && !vnc)) { flexarray_append(dm_args, "-nographic"); } @@ -422,17 +425,19 @@ flexarray_vappend(dm_args, "-vga", "std", NULL); } - if (info->boot) { - flexarray_vappend(dm_args, "-boot", libxl__sprintf(gc, "order=%s", info->boot), NULL); + if (b_info->u.hvm.boot) { + flexarray_vappend(dm_args, "-boot", + libxl__sprintf(gc, "order=%s", b_info->u.hvm.boot), NULL); } - if (info->usb || info->usbdevice) { + if (b_info->u.hvm.usb || b_info->u.hvm.usbdevice) { flexarray_append(dm_args, "-usb"); - if (info->usbdevice) { - flexarray_vappend(dm_args, "-usbdevice", info->usbdevice, NULL); + if (b_info->u.hvm.usbdevice) { + flexarray_vappend(dm_args, + "-usbdevice", b_info->u.hvm.usbdevice, NULL); } } - if (info->soundhw) { - flexarray_vappend(dm_args, "-soundhw", info->soundhw, NULL); + if (b_info->u.hvm.soundhw) { + flexarray_vappend(dm_args, "-soundhw", b_info->u.hvm.soundhw, NULL); } if (!b_info->u.hvm.acpi) { flexarray_append(dm_args, "-no-acpi"); @@ -778,7 +783,7 @@ if (ret) goto out_free; - if (info->serial) + if (guest_config->b_info.u.hvm.serial) num_console++; console = libxl__calloc(gc, num_console, sizeof(libxl_device_console)); @@ -906,7 +911,8 @@ path = libxl__sprintf(gc, "/local/domain/0/device-model/%d", info->domid); xs_mkdir(ctx->xsh, XBT_NULL, path); - libxl__xs_write(gc, XBT_NULL, libxl__sprintf(gc, "%s/disable_pf", path), "%d", !info->xen_platform_pci); + libxl__xs_write(gc, XBT_NULL, libxl__sprintf(gc, "%s/disable_pf", path), + "%d", !guest_config->b_info.u.hvm.xen_platform_pci); libxl_create_logfile(ctx, libxl__sprintf(gc, "qemu-dm-%s", c_info->name), diff -r 6ccdda2c9b42 -r 304726ed52e6 tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Tue Jan 31 15:21:51 2012 +0000 +++ b/tools/libxl/libxl_types.idl Tue Jan 31 15:21:52 2012 +0000 @@ -222,6 +222,16 @@ ("keymap", string), ("sdl", libxl_sdl_info), ("spice", libxl_spice_info), + + ("serial", string), + ("boot", string), + ("usb", bool), + # usbdevice: + # - "tablet" for absolute mouse, + # - "mouse" for PS/2 protocol relative mouse + ("usbdevice", string), + ("soundhw", string), + ("xen_platform_pci", bool), ])), ("pv", Struct(None, [("kernel", libxl_file_reference), ("slack_memkb", uint32), @@ -251,13 +261,6 @@ ("saved_state", string), ("type", libxl_domain_type), ("gfx_passthru", bool), - ("serial", string), - ("boot", string), - ("usb", bool), - # usbdevice: "tablet" for absolute mouse, "mouse" for PS/2 protocol relative mouse - ("usbdevice", string), - ("soundhw", string), - ("xen_platform_pci", bool), # extra parameters pass directly to qemu, NULL terminated ("extra", libxl_string_list), # extra parameters pass directly to qemu for PV guest, NULL terminated diff -r 6ccdda2c9b42 -r 304726ed52e6 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Tue Jan 31 15:21:51 2012 +0000 +++ b/tools/libxl/xl_cmdimpl.c Tue Jan 31 15:21:52 2012 +0000 @@ -383,10 +383,10 @@ printf("\t\t\t(device_model %s)\n", dm_info->device_model ? : "default"); printf("\t\t\t(gfx_passthru %d)\n", dm_info->gfx_passthru); - printf("\t\t\t(serial %s)\n", dm_info->serial); - printf("\t\t\t(boot %s)\n", dm_info->boot); - printf("\t\t\t(usb %d)\n", dm_info->usb); - printf("\t\t\t(usbdevice %s)\n", dm_info->usbdevice); + printf("\t\t\t(serial %s)\n", b_info->u.hvm.serial); + printf("\t\t\t(boot %s)\n", b_info->u.hvm.boot); + printf("\t\t\t(usb %d)\n", b_info->u.hvm.usb); + printf("\t\t\t(usbdevice %s)\n", b_info->u.hvm.usbdevice); printf("\t\t)\n"); break; case LIBXL_DOMAIN_TYPE_PV: @@ -1293,14 +1293,14 @@ b_info->u.hvm.nographic = l; if (!xlu_cfg_get_long (config, "gfx_passthru", &l, 0)) dm_info->gfx_passthru = l; - xlu_cfg_replace_string (config, "serial", &dm_info->serial, 0); - xlu_cfg_replace_string (config, "boot", &dm_info->boot, 0); + xlu_cfg_replace_string (config, "serial", &b_info->u.hvm.serial, 0); + xlu_cfg_replace_string (config, "boot", &b_info->u.hvm.boot, 0); if (!xlu_cfg_get_long (config, "usb", &l, 0)) - dm_info->usb = l; - xlu_cfg_replace_string (config, "usbdevice", &dm_info->usbdevice, 0); - xlu_cfg_replace_string (config, "soundhw", &dm_info->soundhw, 0); + b_info->u.hvm.usb = l; + xlu_cfg_replace_string (config, "usbdevice", &b_info->u.hvm.usbdevice, 0); + xlu_cfg_replace_string (config, "soundhw", &b_info->u.hvm.soundhw, 0); if (!xlu_cfg_get_long (config, "xen_platform_pci", &l, 0)) - dm_info->xen_platform_pci = l; + b_info->u.hvm.xen_platform_pci = l; } dm_info->type = c_info->type; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:58:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:58: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 1RtR97-0007uL-TZ; Fri, 03 Feb 2012 21:58:17 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR96-0007si-Es for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:16 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-27.messagelabs.com!1328306251!58731857!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2003 invoked from network); 3 Feb 2012 21:57:32 -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; 3 Feb 2012 21:57:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR94-0001of-4L for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR92-00034I-PT for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:13 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:58:11 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: remove uuid from device model info. X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1328023312 0 # Node ID 0b4c3c9609dde29dd9d332fa315de499dfa0c3df # Parent a0a55668f3f593ff6d7d79c4270b33ee1ceb4797 libxl: remove uuid from device model info. This should be managed by libxl and need not be exposed to the user. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r a0a55668f3f5 -r 0b4c3c9609dd tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Tue Jan 31 15:21:52 2012 +0000 +++ b/tools/libxl/libxl_create.c Tue Jan 31 15:21:52 2012 +0000 @@ -131,8 +131,6 @@ { memset(dm_info, '\0', sizeof(*dm_info)); - libxl_uuid_generate(&dm_info->uuid); - dm_info->device_model_version = LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL; dm_info->device_model_stubdomain = false; dm_info->device_model = NULL; diff -r a0a55668f3f5 -r 0b4c3c9609dd tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Tue Jan 31 15:21:52 2012 +0000 +++ b/tools/libxl/libxl_dm.c Tue Jan 31 15:21:52 2012 +0000 @@ -697,7 +697,7 @@ dm_config.c_info.type = LIBXL_DOMAIN_TYPE_PV; dm_config.c_info.name = libxl__sprintf(gc, "%s-dm", libxl__domid_to_name(gc, info->domid)); - libxl_uuid_copy(&dm_config.c_info.uuid, &info->uuid); + libxl_uuid_generate(&dm_config.c_info.uuid); memset(&dm_config.b_info, 0x00, sizeof(libxl_domain_build_info)); dm_config.b_info.type = dm_config.c_info.type; diff -r a0a55668f3f5 -r 0b4c3c9609dd tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Tue Jan 31 15:21:52 2012 +0000 +++ b/tools/libxl/libxl_types.idl Tue Jan 31 15:21:52 2012 +0000 @@ -253,9 +253,6 @@ libxl_device_model_info = Struct("device_model_info",[ ("domid", libxl_domid), - # uuid is used only with stubdom, and must be different from the - # domain uuid - ("uuid", libxl_uuid), ("device_model_version", libxl_device_model_version), ("device_model_stubdomain", bool), # you set device_model you must set device_model_version too _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:58:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:58: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 1RtR97-0007uL-TZ; Fri, 03 Feb 2012 21:58:17 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR96-0007si-Es for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:16 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-27.messagelabs.com!1328306251!58731857!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2003 invoked from network); 3 Feb 2012 21:57:32 -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; 3 Feb 2012 21:57:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR94-0001of-4L for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR92-00034I-PT for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:13 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:58:11 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: remove uuid from device model info. X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1328023312 0 # Node ID 0b4c3c9609dde29dd9d332fa315de499dfa0c3df # Parent a0a55668f3f593ff6d7d79c4270b33ee1ceb4797 libxl: remove uuid from device model info. This should be managed by libxl and need not be exposed to the user. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r a0a55668f3f5 -r 0b4c3c9609dd tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Tue Jan 31 15:21:52 2012 +0000 +++ b/tools/libxl/libxl_create.c Tue Jan 31 15:21:52 2012 +0000 @@ -131,8 +131,6 @@ { memset(dm_info, '\0', sizeof(*dm_info)); - libxl_uuid_generate(&dm_info->uuid); - dm_info->device_model_version = LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL; dm_info->device_model_stubdomain = false; dm_info->device_model = NULL; diff -r a0a55668f3f5 -r 0b4c3c9609dd tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Tue Jan 31 15:21:52 2012 +0000 +++ b/tools/libxl/libxl_dm.c Tue Jan 31 15:21:52 2012 +0000 @@ -697,7 +697,7 @@ dm_config.c_info.type = LIBXL_DOMAIN_TYPE_PV; dm_config.c_info.name = libxl__sprintf(gc, "%s-dm", libxl__domid_to_name(gc, info->domid)); - libxl_uuid_copy(&dm_config.c_info.uuid, &info->uuid); + libxl_uuid_generate(&dm_config.c_info.uuid); memset(&dm_config.b_info, 0x00, sizeof(libxl_domain_build_info)); dm_config.b_info.type = dm_config.c_info.type; diff -r a0a55668f3f5 -r 0b4c3c9609dd tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Tue Jan 31 15:21:52 2012 +0000 +++ b/tools/libxl/libxl_types.idl Tue Jan 31 15:21:52 2012 +0000 @@ -253,9 +253,6 @@ libxl_device_model_info = Struct("device_model_info",[ ("domid", libxl_domid), - # uuid is used only with stubdom, and must be different from the - # domain uuid - ("uuid", libxl_uuid), ("device_model_version", libxl_device_model_version), ("device_model_stubdomain", bool), # you set device_model you must set device_model_version too _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:58:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:58: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 1RtR9A-0007wC-0Q; Fri, 03 Feb 2012 21:58:20 +0000 Received: from mail182.messagelabs.com ([85.158.139.83]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR98-0007qs-SJ for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:19 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-182.messagelabs.com!1328306290!13568357!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29666 invoked from network); 3 Feb 2012 21:58:11 -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; 3 Feb 2012 21:58:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR90-0001oO-2M for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR8y-00032c-Lb for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:09 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:58:07 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: move gfx_passthru setting to b_info->u.hvm X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1328023312 0 # Node ID 2708eb2a3fc76915d6e7407caf3215b38a2dc819 # Parent 304726ed52e61bd6a064541b0e1dcfb7edb3f9ff libxl: move gfx_passthru setting to b_info->u.hvm Although xl parsed this value for both PV and HVM domains (and then a second time for HVM domains) inside libxl it only impacts HVM guests so I think this is the right place for it. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 304726ed52e6 -r 2708eb2a3fc7 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Tue Jan 31 15:21:52 2012 +0000 +++ b/tools/libxl/libxl_dm.c Tue Jan 31 15:21:52 2012 +0000 @@ -240,7 +240,7 @@ if ( ioemu_vifs == 0 ) { flexarray_vappend(dm_args, "-net", "none", NULL); } - if (info->gfx_passthru) { + if (b_info->u.hvm.gfx_passthru) { flexarray_append(dm_args, "-gfx_passthru"); } } else { @@ -480,7 +480,7 @@ flexarray_append(dm_args, "-net"); flexarray_append(dm_args, "none"); } - if (info->gfx_passthru) { + if (b_info->u.hvm.gfx_passthru) { flexarray_append(dm_args, "-gfx_passthru"); } } else { diff -r 304726ed52e6 -r 2708eb2a3fc7 tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Tue Jan 31 15:21:52 2012 +0000 +++ b/tools/libxl/libxl_types.idl Tue Jan 31 15:21:52 2012 +0000 @@ -223,6 +223,8 @@ ("sdl", libxl_sdl_info), ("spice", libxl_spice_info), + ("gfx_passthru", bool), + ("serial", string), ("boot", string), ("usb", bool), @@ -260,7 +262,6 @@ ("device_model", string), ("saved_state", string), ("type", libxl_domain_type), - ("gfx_passthru", bool), # extra parameters pass directly to qemu, NULL terminated ("extra", libxl_string_list), # extra parameters pass directly to qemu for PV guest, NULL terminated diff -r 304726ed52e6 -r 2708eb2a3fc7 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Tue Jan 31 15:21:52 2012 +0000 +++ b/tools/libxl/xl_cmdimpl.c Tue Jan 31 15:21:52 2012 +0000 @@ -382,7 +382,7 @@ printf("\t\t\t(spiceagent_mouse %d)\n", b_info->u.hvm.spice.agent_mouse); printf("\t\t\t(device_model %s)\n", dm_info->device_model ? : "default"); - printf("\t\t\t(gfx_passthru %d)\n", dm_info->gfx_passthru); + printf("\t\t\t(gfx_passthru %d)\n", b_info->u.hvm.gfx_passthru); printf("\t\t\t(serial %s)\n", b_info->u.hvm.serial); printf("\t\t\t(boot %s)\n", b_info->u.hvm.boot); printf("\t\t\t(usb %d)\n", b_info->u.hvm.usb); @@ -816,9 +816,6 @@ if (!xlu_cfg_get_long (config, "videoram", &l, 0)) b_info->video_memkb = l * 1024; - if (!xlu_cfg_get_long (config, "gfx_passthru", &l, 0)) - dm_info->gfx_passthru = l; - switch(c_info->type) { case LIBXL_DOMAIN_TYPE_HVM: if (!xlu_cfg_get_string (config, "kernel", &buf, 0)) @@ -1292,7 +1289,7 @@ if (!xlu_cfg_get_long (config, "nographic", &l, 0)) b_info->u.hvm.nographic = l; if (!xlu_cfg_get_long (config, "gfx_passthru", &l, 0)) - dm_info->gfx_passthru = l; + b_info->u.hvm.gfx_passthru = l; xlu_cfg_replace_string (config, "serial", &b_info->u.hvm.serial, 0); xlu_cfg_replace_string (config, "boot", &b_info->u.hvm.boot, 0); if (!xlu_cfg_get_long (config, "usb", &l, 0)) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:58:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:58: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 1RtR9A-0007wC-0Q; Fri, 03 Feb 2012 21:58:20 +0000 Received: from mail182.messagelabs.com ([85.158.139.83]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR98-0007qs-SJ for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:19 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-182.messagelabs.com!1328306290!13568357!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29666 invoked from network); 3 Feb 2012 21:58:11 -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; 3 Feb 2012 21:58:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR90-0001oO-2M for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR8y-00032c-Lb for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:09 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:58:07 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: move gfx_passthru setting to b_info->u.hvm X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1328023312 0 # Node ID 2708eb2a3fc76915d6e7407caf3215b38a2dc819 # Parent 304726ed52e61bd6a064541b0e1dcfb7edb3f9ff libxl: move gfx_passthru setting to b_info->u.hvm Although xl parsed this value for both PV and HVM domains (and then a second time for HVM domains) inside libxl it only impacts HVM guests so I think this is the right place for it. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 304726ed52e6 -r 2708eb2a3fc7 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Tue Jan 31 15:21:52 2012 +0000 +++ b/tools/libxl/libxl_dm.c Tue Jan 31 15:21:52 2012 +0000 @@ -240,7 +240,7 @@ if ( ioemu_vifs == 0 ) { flexarray_vappend(dm_args, "-net", "none", NULL); } - if (info->gfx_passthru) { + if (b_info->u.hvm.gfx_passthru) { flexarray_append(dm_args, "-gfx_passthru"); } } else { @@ -480,7 +480,7 @@ flexarray_append(dm_args, "-net"); flexarray_append(dm_args, "none"); } - if (info->gfx_passthru) { + if (b_info->u.hvm.gfx_passthru) { flexarray_append(dm_args, "-gfx_passthru"); } } else { diff -r 304726ed52e6 -r 2708eb2a3fc7 tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Tue Jan 31 15:21:52 2012 +0000 +++ b/tools/libxl/libxl_types.idl Tue Jan 31 15:21:52 2012 +0000 @@ -223,6 +223,8 @@ ("sdl", libxl_sdl_info), ("spice", libxl_spice_info), + ("gfx_passthru", bool), + ("serial", string), ("boot", string), ("usb", bool), @@ -260,7 +262,6 @@ ("device_model", string), ("saved_state", string), ("type", libxl_domain_type), - ("gfx_passthru", bool), # extra parameters pass directly to qemu, NULL terminated ("extra", libxl_string_list), # extra parameters pass directly to qemu for PV guest, NULL terminated diff -r 304726ed52e6 -r 2708eb2a3fc7 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Tue Jan 31 15:21:52 2012 +0000 +++ b/tools/libxl/xl_cmdimpl.c Tue Jan 31 15:21:52 2012 +0000 @@ -382,7 +382,7 @@ printf("\t\t\t(spiceagent_mouse %d)\n", b_info->u.hvm.spice.agent_mouse); printf("\t\t\t(device_model %s)\n", dm_info->device_model ? : "default"); - printf("\t\t\t(gfx_passthru %d)\n", dm_info->gfx_passthru); + printf("\t\t\t(gfx_passthru %d)\n", b_info->u.hvm.gfx_passthru); printf("\t\t\t(serial %s)\n", b_info->u.hvm.serial); printf("\t\t\t(boot %s)\n", b_info->u.hvm.boot); printf("\t\t\t(usb %d)\n", b_info->u.hvm.usb); @@ -816,9 +816,6 @@ if (!xlu_cfg_get_long (config, "videoram", &l, 0)) b_info->video_memkb = l * 1024; - if (!xlu_cfg_get_long (config, "gfx_passthru", &l, 0)) - dm_info->gfx_passthru = l; - switch(c_info->type) { case LIBXL_DOMAIN_TYPE_HVM: if (!xlu_cfg_get_string (config, "kernel", &buf, 0)) @@ -1292,7 +1289,7 @@ if (!xlu_cfg_get_long (config, "nographic", &l, 0)) b_info->u.hvm.nographic = l; if (!xlu_cfg_get_long (config, "gfx_passthru", &l, 0)) - dm_info->gfx_passthru = l; + b_info->u.hvm.gfx_passthru = l; xlu_cfg_replace_string (config, "serial", &b_info->u.hvm.serial, 0); xlu_cfg_replace_string (config, "boot", &b_info->u.hvm.boot, 0); if (!xlu_cfg_get_long (config, "usb", &l, 0)) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:58:21 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:58: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 1RtR9B-0007xD-3b; Fri, 03 Feb 2012 21:58:21 +0000 Received: from mail174.messagelabs.com ([85.158.138.51]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR99-0007r8-EB for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:19 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-174.messagelabs.com!1328306292!11878749!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16935 invoked from network); 3 Feb 2012 21:58:13 -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; 3 Feb 2012 21:58:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR91-0001oZ-SC for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR90-00033O-Hc for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:11 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:58:10 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: Remove libxl_device_model_info.type. X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1328023312 0 # Node ID a0a55668f3f593ff6d7d79c4270b33ee1ceb4797 # Parent 2708eb2a3fc76915d6e7407caf3215b38a2dc819 libxl: Remove libxl_device_model_info.type. This is the type of the target guest which is part of the guest config. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 2708eb2a3fc7 -r a0a55668f3f5 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Tue Jan 31 15:21:52 2012 +0000 +++ b/tools/libxl/libxl_create.c Tue Jan 31 15:21:52 2012 +0000 @@ -605,7 +605,6 @@ memset((void*)&xenpv_dm_info, 0, sizeof(libxl_device_model_info)); xenpv_dm_info.device_model_version = d_config->dm_info.device_model_version; - xenpv_dm_info.type = d_config->dm_info.type; xenpv_dm_info.device_model = d_config->dm_info.device_model; xenpv_dm_info.extra = d_config->dm_info.extra; xenpv_dm_info.extra_pv = d_config->dm_info.extra_pv; diff -r 2708eb2a3fc7 -r a0a55668f3f5 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Tue Jan 31 15:21:52 2012 +0000 +++ b/tools/libxl/libxl_dm.c Tue Jan 31 15:21:52 2012 +0000 @@ -77,7 +77,7 @@ const libxl_device_model_info *info) { const libxl_vnc_info *vnc = NULL; - if (info->type == LIBXL_DOMAIN_TYPE_HVM) { + if (guest_config->b_info.type == LIBXL_DOMAIN_TYPE_HVM) { vnc = &guest_config->b_info.u.hvm.vnc; } else if (guest_config->num_vfbs > 0) { vnc = &guest_config->vfbs[0].vnc; @@ -89,7 +89,7 @@ const libxl_device_model_info *info) { const libxl_sdl_info *sdl = NULL; - if (info->type == LIBXL_DOMAIN_TYPE_HVM) { + if (guest_config->b_info.type == LIBXL_DOMAIN_TYPE_HVM) { sdl = &guest_config->b_info.u.hvm.sdl; } else if (guest_config->num_vfbs > 0) { sdl = &guest_config->vfbs[0].sdl; @@ -100,7 +100,7 @@ static const char *dm_keymap(const libxl_domain_config *guest_config, const libxl_device_model_info *info) { - if (info->type == LIBXL_DOMAIN_TYPE_HVM) { + if (guest_config->b_info.type == LIBXL_DOMAIN_TYPE_HVM) { return guest_config->b_info.u.hvm.keymap; } else if (guest_config->num_vfbs > 0) { return guest_config->vfbs[0].keymap; @@ -171,7 +171,7 @@ if (keymap) { flexarray_vappend(dm_args, "-k", keymap, NULL); } - if (info->type == LIBXL_DOMAIN_TYPE_HVM) { + if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) { int ioemu_vifs = 0; if (b_info->u.hvm.serial) { @@ -254,7 +254,7 @@ for (i = 0; info->extra && info->extra[i] != NULL; i++) flexarray_append(dm_args, info->extra[i]); flexarray_append(dm_args, "-M"); - switch (info->type) { + switch (b_info->type) { case LIBXL_DOMAIN_TYPE_PV: flexarray_append(dm_args, "xenpv"); for (i = 0; info->extra_pv && info->extra_pv[i] != NULL; i++) @@ -353,7 +353,7 @@ flexarray_append(dm_args, "-mon"); flexarray_append(dm_args, "chardev=libxl-cmd,mode=control"); - if (info->type == LIBXL_DOMAIN_TYPE_PV) { + if (b_info->type == LIBXL_DOMAIN_TYPE_PV) { flexarray_append(dm_args, "-xen-attach"); } @@ -400,7 +400,7 @@ flexarray_vappend(dm_args, "-k", keymap, NULL); } - if (info->type == LIBXL_DOMAIN_TYPE_HVM) { + if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) { int ioemu_vifs = 0; if (b_info->u.hvm.serial) { @@ -498,7 +498,7 @@ for (i = 0; info->extra && info->extra[i] != NULL; i++) flexarray_append(dm_args, info->extra[i]); flexarray_append(dm_args, "-M"); - switch (info->type) { + switch (b_info->type) { case LIBXL_DOMAIN_TYPE_PV: flexarray_append(dm_args, "xenpv"); for (i = 0; info->extra_pv && info->extra_pv[i] != NULL; i++) @@ -517,7 +517,7 @@ libxl__sprintf(gc, "%d", libxl__sizekb_to_mb(b_info->target_memkb))); - if (info->type == LIBXL_DOMAIN_TYPE_HVM) { + if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) { for (i = 0; i < num_disks; i++) { int disk, part; int dev_number = @@ -700,6 +700,7 @@ libxl_uuid_copy(&dm_config.c_info.uuid, &info->uuid); memset(&dm_config.b_info, 0x00, sizeof(libxl_domain_build_info)); + dm_config.b_info.type = dm_config.c_info.type; 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; @@ -828,7 +829,6 @@ memset((void*)&xenpv_dm_info, 0, sizeof(libxl_device_model_info)); xenpv_dm_info.device_model_version = info->device_model_version; - xenpv_dm_info.type = LIBXL_DOMAIN_TYPE_PV; xenpv_dm_info.device_model = info->device_model; xenpv_dm_info.extra = info->extra; xenpv_dm_info.extra_pv = info->extra_pv; diff -r 2708eb2a3fc7 -r a0a55668f3f5 tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Tue Jan 31 15:21:52 2012 +0000 +++ b/tools/libxl/libxl_types.idl Tue Jan 31 15:21:52 2012 +0000 @@ -261,7 +261,6 @@ # you set device_model you must set device_model_version too ("device_model", string), ("saved_state", string), - ("type", libxl_domain_type), # extra parameters pass directly to qemu, NULL terminated ("extra", libxl_string_list), # extra parameters pass directly to qemu for PV guest, NULL terminated diff -r 2708eb2a3fc7 -r a0a55668f3f5 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Tue Jan 31 15:21:52 2012 +0000 +++ b/tools/libxl/xl_cmdimpl.c Tue Jan 31 15:21:52 2012 +0000 @@ -1300,8 +1300,6 @@ b_info->u.hvm.xen_platform_pci = l; } - dm_info->type = c_info->type; - xlu_cfg_destroy(config); } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:58:21 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:58: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 1RtR9B-0007xD-3b; Fri, 03 Feb 2012 21:58:21 +0000 Received: from mail174.messagelabs.com ([85.158.138.51]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR99-0007r8-EB for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:19 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-174.messagelabs.com!1328306292!11878749!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16935 invoked from network); 3 Feb 2012 21:58:13 -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; 3 Feb 2012 21:58:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR91-0001oZ-SC for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR90-00033O-Hc for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:11 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:58:10 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: Remove libxl_device_model_info.type. X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1328023312 0 # Node ID a0a55668f3f593ff6d7d79c4270b33ee1ceb4797 # Parent 2708eb2a3fc76915d6e7407caf3215b38a2dc819 libxl: Remove libxl_device_model_info.type. This is the type of the target guest which is part of the guest config. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 2708eb2a3fc7 -r a0a55668f3f5 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Tue Jan 31 15:21:52 2012 +0000 +++ b/tools/libxl/libxl_create.c Tue Jan 31 15:21:52 2012 +0000 @@ -605,7 +605,6 @@ memset((void*)&xenpv_dm_info, 0, sizeof(libxl_device_model_info)); xenpv_dm_info.device_model_version = d_config->dm_info.device_model_version; - xenpv_dm_info.type = d_config->dm_info.type; xenpv_dm_info.device_model = d_config->dm_info.device_model; xenpv_dm_info.extra = d_config->dm_info.extra; xenpv_dm_info.extra_pv = d_config->dm_info.extra_pv; diff -r 2708eb2a3fc7 -r a0a55668f3f5 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Tue Jan 31 15:21:52 2012 +0000 +++ b/tools/libxl/libxl_dm.c Tue Jan 31 15:21:52 2012 +0000 @@ -77,7 +77,7 @@ const libxl_device_model_info *info) { const libxl_vnc_info *vnc = NULL; - if (info->type == LIBXL_DOMAIN_TYPE_HVM) { + if (guest_config->b_info.type == LIBXL_DOMAIN_TYPE_HVM) { vnc = &guest_config->b_info.u.hvm.vnc; } else if (guest_config->num_vfbs > 0) { vnc = &guest_config->vfbs[0].vnc; @@ -89,7 +89,7 @@ const libxl_device_model_info *info) { const libxl_sdl_info *sdl = NULL; - if (info->type == LIBXL_DOMAIN_TYPE_HVM) { + if (guest_config->b_info.type == LIBXL_DOMAIN_TYPE_HVM) { sdl = &guest_config->b_info.u.hvm.sdl; } else if (guest_config->num_vfbs > 0) { sdl = &guest_config->vfbs[0].sdl; @@ -100,7 +100,7 @@ static const char *dm_keymap(const libxl_domain_config *guest_config, const libxl_device_model_info *info) { - if (info->type == LIBXL_DOMAIN_TYPE_HVM) { + if (guest_config->b_info.type == LIBXL_DOMAIN_TYPE_HVM) { return guest_config->b_info.u.hvm.keymap; } else if (guest_config->num_vfbs > 0) { return guest_config->vfbs[0].keymap; @@ -171,7 +171,7 @@ if (keymap) { flexarray_vappend(dm_args, "-k", keymap, NULL); } - if (info->type == LIBXL_DOMAIN_TYPE_HVM) { + if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) { int ioemu_vifs = 0; if (b_info->u.hvm.serial) { @@ -254,7 +254,7 @@ for (i = 0; info->extra && info->extra[i] != NULL; i++) flexarray_append(dm_args, info->extra[i]); flexarray_append(dm_args, "-M"); - switch (info->type) { + switch (b_info->type) { case LIBXL_DOMAIN_TYPE_PV: flexarray_append(dm_args, "xenpv"); for (i = 0; info->extra_pv && info->extra_pv[i] != NULL; i++) @@ -353,7 +353,7 @@ flexarray_append(dm_args, "-mon"); flexarray_append(dm_args, "chardev=libxl-cmd,mode=control"); - if (info->type == LIBXL_DOMAIN_TYPE_PV) { + if (b_info->type == LIBXL_DOMAIN_TYPE_PV) { flexarray_append(dm_args, "-xen-attach"); } @@ -400,7 +400,7 @@ flexarray_vappend(dm_args, "-k", keymap, NULL); } - if (info->type == LIBXL_DOMAIN_TYPE_HVM) { + if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) { int ioemu_vifs = 0; if (b_info->u.hvm.serial) { @@ -498,7 +498,7 @@ for (i = 0; info->extra && info->extra[i] != NULL; i++) flexarray_append(dm_args, info->extra[i]); flexarray_append(dm_args, "-M"); - switch (info->type) { + switch (b_info->type) { case LIBXL_DOMAIN_TYPE_PV: flexarray_append(dm_args, "xenpv"); for (i = 0; info->extra_pv && info->extra_pv[i] != NULL; i++) @@ -517,7 +517,7 @@ libxl__sprintf(gc, "%d", libxl__sizekb_to_mb(b_info->target_memkb))); - if (info->type == LIBXL_DOMAIN_TYPE_HVM) { + if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) { for (i = 0; i < num_disks; i++) { int disk, part; int dev_number = @@ -700,6 +700,7 @@ libxl_uuid_copy(&dm_config.c_info.uuid, &info->uuid); memset(&dm_config.b_info, 0x00, sizeof(libxl_domain_build_info)); + dm_config.b_info.type = dm_config.c_info.type; 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; @@ -828,7 +829,6 @@ memset((void*)&xenpv_dm_info, 0, sizeof(libxl_device_model_info)); xenpv_dm_info.device_model_version = info->device_model_version; - xenpv_dm_info.type = LIBXL_DOMAIN_TYPE_PV; xenpv_dm_info.device_model = info->device_model; xenpv_dm_info.extra = info->extra; xenpv_dm_info.extra_pv = info->extra_pv; diff -r 2708eb2a3fc7 -r a0a55668f3f5 tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Tue Jan 31 15:21:52 2012 +0000 +++ b/tools/libxl/libxl_types.idl Tue Jan 31 15:21:52 2012 +0000 @@ -261,7 +261,6 @@ # you set device_model you must set device_model_version too ("device_model", string), ("saved_state", string), - ("type", libxl_domain_type), # extra parameters pass directly to qemu, NULL terminated ("extra", libxl_string_list), # extra parameters pass directly to qemu for PV guest, NULL terminated diff -r 2708eb2a3fc7 -r a0a55668f3f5 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Tue Jan 31 15:21:52 2012 +0000 +++ b/tools/libxl/xl_cmdimpl.c Tue Jan 31 15:21:52 2012 +0000 @@ -1300,8 +1300,6 @@ b_info->u.hvm.xen_platform_pci = l; } - dm_info->type = c_info->type; - xlu_cfg_destroy(config); } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:58:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:58: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 1RtR9H-00081S-6g; Fri, 03 Feb 2012 21:58:27 +0000 Received: from mail174.messagelabs.com ([85.158.138.51]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR9F-0007vl-25 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:25 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-174.messagelabs.com!1328306297!7715946!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.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26446 invoked from network); 3 Feb 2012 21:58:18 -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; 3 Feb 2012 21:58:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR96-0001oi-Vf for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR95-000360-5q for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:16 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:58:14 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: move device model selection variables to b_info. X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1328027672 0 # Node ID f7cc388711c8bebca5fc806b4365d25ef50e8540 # Parent 0b4c3c9609dde29dd9d332fa315de499dfa0c3df libxl: move device model selection variables to b_info. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 0b4c3c9609dd -r f7cc388711c8 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Tue Jan 31 15:21:52 2012 +0000 +++ b/tools/libxl/libxl.c Tue Jan 31 16:34:32 2012 +0000 @@ -2629,7 +2629,7 @@ switch (b_info->type) { case LIBXL_DOMAIN_TYPE_HVM: *need_memkb += b_info->shadow_memkb + LIBXL_HVM_EXTRA_MEMORY; - if (dm_info->device_model_stubdomain) + if (b_info->device_model_stubdomain) *need_memkb += 32 * 1024; break; case LIBXL_DOMAIN_TYPE_PV: diff -r 0b4c3c9609dd -r f7cc388711c8 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Tue Jan 31 15:21:52 2012 +0000 +++ b/tools/libxl/libxl_create.c Tue Jan 31 16:34:32 2012 +0000 @@ -80,6 +80,12 @@ b_info->cpuid = NULL; b_info->shadow_memkb = 0; b_info->type = c_info->type; + + b_info->device_model_version = + LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL; + b_info->device_model_stubdomain = false; + b_info->device_model = NULL; + switch (b_info->type) { case LIBXL_DOMAIN_TYPE_HVM: b_info->video_memkb = 8 * 1024; @@ -131,9 +137,6 @@ { memset(dm_info, '\0', sizeof(*dm_info)); - dm_info->device_model_version = LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL; - dm_info->device_model_stubdomain = false; - dm_info->device_model = NULL; return 0; } @@ -459,14 +462,14 @@ } static int store_libxl_entry(libxl__gc *gc, uint32_t domid, - libxl_device_model_info *dm_info) + libxl_domain_build_info *b_info) { char *path = NULL; path = libxl__xs_libxl_path(gc, domid); path = libxl__sprintf(gc, "%s/dm-version", path); return libxl__xs_write(gc, XBT_NULL, path, "%s", - libxl_device_model_version_to_string(dm_info->device_model_version)); + libxl_device_model_version_to_string(b_info->device_model_version)); } static int do_domain_create(libxl__gc *gc, libxl_domain_config *d_config, @@ -525,7 +528,7 @@ goto error_out; } - store_libxl_entry(gc, domid, dm_info); + store_libxl_entry(gc, domid, &d_config->b_info); for (i = 0; i < d_config->num_disks; i++) { ret = libxl_device_disk_add(ctx, domid, &d_config->disks[i]); @@ -601,12 +604,6 @@ if (need_qemu) { /* only copy those useful configs */ memset((void*)&xenpv_dm_info, 0, sizeof(libxl_device_model_info)); - xenpv_dm_info.device_model_version = - d_config->dm_info.device_model_version; - xenpv_dm_info.device_model = d_config->dm_info.device_model; - xenpv_dm_info.extra = d_config->dm_info.extra; - xenpv_dm_info.extra_pv = d_config->dm_info.extra_pv; - xenpv_dm_info.extra_hvm = d_config->dm_info.extra_hvm; libxl__create_xenpv_qemu(gc, domid, d_config, &xenpv_dm_info, &dm_starting); @@ -619,7 +616,7 @@ } if (dm_starting) { - if (dm_info->device_model_version + if (d_config->b_info.device_model_version == LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN) { libxl__qmp_initializations(ctx, domid); } diff -r 0b4c3c9609dd -r f7cc388711c8 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Tue Jan 31 15:21:52 2012 +0000 +++ b/tools/libxl/libxl_dm.c Tue Jan 31 16:34:32 2012 +0000 @@ -34,7 +34,7 @@ } const char *libxl__domain_device_model(libxl__gc *gc, - libxl_device_model_info *info) + const libxl_domain_build_info *info) { libxl_ctx *ctx = libxl__gc_owner(gc); const char *dm; @@ -64,7 +64,7 @@ } static const char *libxl__domain_bios(libxl__gc *gc, - libxl_device_model_info *info) + const libxl_domain_build_info *info) { switch (info->device_model_version) { case 1: return "rombios"; @@ -251,19 +251,19 @@ if (info->saved_state) { flexarray_vappend(dm_args, "-loadvm", info->saved_state, NULL); } - for (i = 0; info->extra && info->extra[i] != NULL; i++) - flexarray_append(dm_args, info->extra[i]); + for (i = 0; b_info->extra && b_info->extra[i] != NULL; i++) + flexarray_append(dm_args, b_info->extra[i]); flexarray_append(dm_args, "-M"); switch (b_info->type) { case LIBXL_DOMAIN_TYPE_PV: flexarray_append(dm_args, "xenpv"); - for (i = 0; info->extra_pv && info->extra_pv[i] != NULL; i++) - flexarray_append(dm_args, info->extra_pv[i]); + for (i = 0; b_info->extra_pv && b_info->extra_pv[i] != NULL; i++) + flexarray_append(dm_args, b_info->extra_pv[i]); break; case LIBXL_DOMAIN_TYPE_HVM: flexarray_append(dm_args, "xenfv"); - for (i = 0; info->extra_hvm && info->extra_hvm[i] != NULL; i++) - flexarray_append(dm_args, info->extra_hvm[i]); + for (i = 0; b_info->extra_hvm && b_info->extra_hvm[i] != NULL; i++) + flexarray_append(dm_args, b_info->extra_hvm[i]); break; } flexarray_append(dm_args, NULL); @@ -495,19 +495,19 @@ flexarray_append(dm_args, "-incoming"); flexarray_append(dm_args, libxl__sprintf(gc, "fd:%d", migration_fd)); } - for (i = 0; info->extra && info->extra[i] != NULL; i++) - flexarray_append(dm_args, info->extra[i]); + for (i = 0; b_info->extra && b_info->extra[i] != NULL; i++) + flexarray_append(dm_args, b_info->extra[i]); flexarray_append(dm_args, "-M"); switch (b_info->type) { case LIBXL_DOMAIN_TYPE_PV: flexarray_append(dm_args, "xenpv"); - for (i = 0; info->extra_pv && info->extra_pv[i] != NULL; i++) - flexarray_append(dm_args, info->extra_pv[i]); + for (i = 0; b_info->extra_pv && b_info->extra_pv[i] != NULL; i++) + flexarray_append(dm_args, b_info->extra_pv[i]); break; case LIBXL_DOMAIN_TYPE_HVM: flexarray_append(dm_args, "xenfv"); - for (i = 0; info->extra_hvm && info->extra_hvm[i] != NULL; i++) - flexarray_append(dm_args, info->extra_hvm[i]); + for (i = 0; b_info->extra_hvm && b_info->extra_hvm[i] != NULL; i++) + flexarray_append(dm_args, b_info->extra_hvm[i]); break; } @@ -585,14 +585,14 @@ { libxl_ctx *ctx = libxl__gc_owner(gc); - switch (info->device_model_version) { + switch (guest_config->b_info.device_model_version) { case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: return libxl__build_device_model_args_old(gc, dm, guest_config, info); case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: return libxl__build_device_model_args_new(gc, dm, guest_config, info); default: LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "unknown device model version %d", - info->device_model_version); + guest_config->b_info.device_model_version); return NULL; } } @@ -688,7 +688,8 @@ libxl__spawner_starting *dm_starting = 0; libxl_device_model_info xenpv_dm_info; - if (info->device_model_version != LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL) { + if (guest_config->b_info.device_model_version != + LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL) { ret = ERROR_INVAL; goto out; } @@ -712,6 +713,14 @@ dm_config.b_info.u.pv.ramdisk.path = ""; dm_config.b_info.u.pv.features = ""; + dm_config.b_info.device_model_version = + guest_config->b_info.device_model_version; + 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.disks = guest_config->disks; dm_config.num_disks = guest_config->num_disks; @@ -828,11 +837,6 @@ } memset((void*)&xenpv_dm_info, 0, sizeof(libxl_device_model_info)); - xenpv_dm_info.device_model_version = info->device_model_version; - xenpv_dm_info.device_model = info->device_model; - xenpv_dm_info.extra = info->extra; - xenpv_dm_info.extra_pv = info->extra_pv; - xenpv_dm_info.extra_hvm = info->extra_hvm; if (libxl__create_xenpv_qemu(gc, domid, &dm_config, @@ -871,6 +875,7 @@ { libxl_ctx *ctx = libxl__gc_owner(gc); 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 = dm_vnc(guest_config, info); char *path, *logfile; int logfile_w, null; @@ -882,12 +887,12 @@ char **pass_stuff; const char *dm; - if (info->device_model_stubdomain) { + if (b_info->device_model_stubdomain) { rc = libxl__create_stubdom(gc, guest_config, info, starting_r); goto out; } - dm = libxl__domain_device_model(gc, info); + dm = libxl__domain_device_model(gc, b_info); if (!dm) { rc = ERROR_FAIL; goto out; @@ -906,13 +911,13 @@ path = xs_get_domain_path(ctx->xsh, info->domid); libxl__xs_write(gc, XBT_NULL, libxl__sprintf(gc, "%s/hvmloader/bios", path), - "%s", libxl__domain_bios(gc, info)); + "%s", libxl__domain_bios(gc, b_info)); free(path); path = libxl__sprintf(gc, "/local/domain/0/device-model/%d", info->domid); xs_mkdir(ctx->xsh, XBT_NULL, path); libxl__xs_write(gc, XBT_NULL, libxl__sprintf(gc, "%s/disable_pf", path), - "%d", !guest_config->b_info.u.hvm.xen_platform_pci); + "%d", !b_info->u.hvm.xen_platform_pci); libxl_create_logfile(ctx, libxl__sprintf(gc, "qemu-dm-%s", c_info->name), diff -r 0b4c3c9609dd -r f7cc388711c8 tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Tue Jan 31 15:21:52 2012 +0000 +++ b/tools/libxl/libxl_dom.c Tue Jan 31 16:34:32 2012 +0000 @@ -300,7 +300,7 @@ if (info->u.hvm.firmware) firmware = info->u.hvm.firmware; else { - switch (dm_info->device_model_version) + switch (info->device_model_version) { case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: firmware = "hvmloader"; @@ -310,7 +310,7 @@ break; default: LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "invalid device model version %d", - dm_info->device_model_version); + info->device_model_version); return NULL; break; } diff -r 0b4c3c9609dd -r f7cc388711c8 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Tue Jan 31 15:21:52 2012 +0000 +++ b/tools/libxl/libxl_internal.h Tue Jan 31 16:34:32 2012 +0000 @@ -864,7 +864,7 @@ /* for device model creation */ _hidden const char *libxl__domain_device_model(libxl__gc *gc, - libxl_device_model_info *info); + const libxl_domain_build_info *info); _hidden int libxl__create_device_model(libxl__gc *gc, libxl_domain_config *guest_config, libxl_device_model_info *info, diff -r 0b4c3c9609dd -r f7cc388711c8 tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Tue Jan 31 15:21:52 2012 +0000 +++ b/tools/libxl/libxl_types.idl Tue Jan 31 16:34:32 2012 +0000 @@ -200,6 +200,19 @@ ("disable_migrate", bool), ("cpuid", libxl_cpuid_policy_list), ("type", libxl_domain_type), + + ("device_model_version", libxl_device_model_version), + ("device_model_stubdomain", bool), + # you set device_model you must set device_model_version too + ("device_model", string), + + # extra parameters pass directly to qemu, NULL terminated + ("extra", libxl_string_list), + # extra parameters pass directly to qemu for PV guest, NULL terminated + ("extra_pv", libxl_string_list), + # extra parameters pass directly to qemu for HVM guest, NULL terminated + ("extra_hvm", libxl_string_list), + ("u", KeyedUnion(None, libxl_domain_type, "type", [("hvm", Struct(None, [("firmware", string), ("pae", bool), @@ -253,17 +266,7 @@ libxl_device_model_info = Struct("device_model_info",[ ("domid", libxl_domid), - ("device_model_version", libxl_device_model_version), - ("device_model_stubdomain", bool), - # you set device_model you must set device_model_version too - ("device_model", string), ("saved_state", string), - # extra parameters pass directly to qemu, NULL terminated - ("extra", libxl_string_list), - # extra parameters pass directly to qemu for PV guest, NULL terminated - ("extra_pv", libxl_string_list), - # extra parameters pass directly to qemu for HVM guest, NULL terminated - ("extra_hvm", libxl_string_list), ], ) diff -r 0b4c3c9609dd -r f7cc388711c8 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Tue Jan 31 15:21:52 2012 +0000 +++ b/tools/libxl/xl_cmdimpl.c Tue Jan 31 16:34:32 2012 +0000 @@ -381,7 +381,7 @@ b_info->u.hvm.spice.disable_ticketing); printf("\t\t\t(spiceagent_mouse %d)\n", b_info->u.hvm.spice.agent_mouse); - printf("\t\t\t(device_model %s)\n", dm_info->device_model ? : "default"); + printf("\t\t\t(device_model %s)\n", b_info->device_model ? : "default"); printf("\t\t\t(gfx_passthru %d)\n", b_info->u.hvm.gfx_passthru); printf("\t\t\t(serial %s)\n", b_info->u.hvm.serial); printf("\t\t\t(boot %s)\n", b_info->u.hvm.boot); @@ -1217,27 +1217,27 @@ xlu_cfg_replace_string (config, "device_model_override", - &dm_info->device_model, 0); + &b_info->device_model, 0); if (!xlu_cfg_get_string (config, "device_model_version", &buf, 0)) { if (!strcmp(buf, "qemu-xen-traditional")) { - dm_info->device_model_version + b_info->device_model_version = LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL; } else if (!strcmp(buf, "qemu-xen")) { - dm_info->device_model_version + b_info->device_model_version = LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN; } else { fprintf(stderr, "Unknown device_model_version \"%s\" specified\n", buf); exit(1); } - } else if (dm_info->device_model) + } else if (b_info->device_model) fprintf(stderr, "WARNING: device model override given without specific DM version\n"); if (!xlu_cfg_get_long (config, "device_model_stubdomain_override", &l, 0)) - dm_info->device_model_stubdomain = l; + b_info->device_model_stubdomain = l; #define parse_extra_args(type) \ e = xlu_cfg_get_list_as_string_list(config, "device_model_args"#type, \ - &dm_info->extra##type, 0); \ + &b_info->extra##type, 0); \ if (e && e != ESRCH) { \ fprintf(stderr,"xl: Unable to parse device_model_args"#type".\n");\ exit(-ERROR_FAIL); \ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:58:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:58: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 1RtR9H-00081S-6g; Fri, 03 Feb 2012 21:58:27 +0000 Received: from mail174.messagelabs.com ([85.158.138.51]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR9F-0007vl-25 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:25 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-174.messagelabs.com!1328306297!7715946!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.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26446 invoked from network); 3 Feb 2012 21:58:18 -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; 3 Feb 2012 21:58:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR96-0001oi-Vf for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR95-000360-5q for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:16 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:58:14 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: move device model selection variables to b_info. X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1328027672 0 # Node ID f7cc388711c8bebca5fc806b4365d25ef50e8540 # Parent 0b4c3c9609dde29dd9d332fa315de499dfa0c3df libxl: move device model selection variables to b_info. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 0b4c3c9609dd -r f7cc388711c8 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Tue Jan 31 15:21:52 2012 +0000 +++ b/tools/libxl/libxl.c Tue Jan 31 16:34:32 2012 +0000 @@ -2629,7 +2629,7 @@ switch (b_info->type) { case LIBXL_DOMAIN_TYPE_HVM: *need_memkb += b_info->shadow_memkb + LIBXL_HVM_EXTRA_MEMORY; - if (dm_info->device_model_stubdomain) + if (b_info->device_model_stubdomain) *need_memkb += 32 * 1024; break; case LIBXL_DOMAIN_TYPE_PV: diff -r 0b4c3c9609dd -r f7cc388711c8 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Tue Jan 31 15:21:52 2012 +0000 +++ b/tools/libxl/libxl_create.c Tue Jan 31 16:34:32 2012 +0000 @@ -80,6 +80,12 @@ b_info->cpuid = NULL; b_info->shadow_memkb = 0; b_info->type = c_info->type; + + b_info->device_model_version = + LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL; + b_info->device_model_stubdomain = false; + b_info->device_model = NULL; + switch (b_info->type) { case LIBXL_DOMAIN_TYPE_HVM: b_info->video_memkb = 8 * 1024; @@ -131,9 +137,6 @@ { memset(dm_info, '\0', sizeof(*dm_info)); - dm_info->device_model_version = LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL; - dm_info->device_model_stubdomain = false; - dm_info->device_model = NULL; return 0; } @@ -459,14 +462,14 @@ } static int store_libxl_entry(libxl__gc *gc, uint32_t domid, - libxl_device_model_info *dm_info) + libxl_domain_build_info *b_info) { char *path = NULL; path = libxl__xs_libxl_path(gc, domid); path = libxl__sprintf(gc, "%s/dm-version", path); return libxl__xs_write(gc, XBT_NULL, path, "%s", - libxl_device_model_version_to_string(dm_info->device_model_version)); + libxl_device_model_version_to_string(b_info->device_model_version)); } static int do_domain_create(libxl__gc *gc, libxl_domain_config *d_config, @@ -525,7 +528,7 @@ goto error_out; } - store_libxl_entry(gc, domid, dm_info); + store_libxl_entry(gc, domid, &d_config->b_info); for (i = 0; i < d_config->num_disks; i++) { ret = libxl_device_disk_add(ctx, domid, &d_config->disks[i]); @@ -601,12 +604,6 @@ if (need_qemu) { /* only copy those useful configs */ memset((void*)&xenpv_dm_info, 0, sizeof(libxl_device_model_info)); - xenpv_dm_info.device_model_version = - d_config->dm_info.device_model_version; - xenpv_dm_info.device_model = d_config->dm_info.device_model; - xenpv_dm_info.extra = d_config->dm_info.extra; - xenpv_dm_info.extra_pv = d_config->dm_info.extra_pv; - xenpv_dm_info.extra_hvm = d_config->dm_info.extra_hvm; libxl__create_xenpv_qemu(gc, domid, d_config, &xenpv_dm_info, &dm_starting); @@ -619,7 +616,7 @@ } if (dm_starting) { - if (dm_info->device_model_version + if (d_config->b_info.device_model_version == LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN) { libxl__qmp_initializations(ctx, domid); } diff -r 0b4c3c9609dd -r f7cc388711c8 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Tue Jan 31 15:21:52 2012 +0000 +++ b/tools/libxl/libxl_dm.c Tue Jan 31 16:34:32 2012 +0000 @@ -34,7 +34,7 @@ } const char *libxl__domain_device_model(libxl__gc *gc, - libxl_device_model_info *info) + const libxl_domain_build_info *info) { libxl_ctx *ctx = libxl__gc_owner(gc); const char *dm; @@ -64,7 +64,7 @@ } static const char *libxl__domain_bios(libxl__gc *gc, - libxl_device_model_info *info) + const libxl_domain_build_info *info) { switch (info->device_model_version) { case 1: return "rombios"; @@ -251,19 +251,19 @@ if (info->saved_state) { flexarray_vappend(dm_args, "-loadvm", info->saved_state, NULL); } - for (i = 0; info->extra && info->extra[i] != NULL; i++) - flexarray_append(dm_args, info->extra[i]); + for (i = 0; b_info->extra && b_info->extra[i] != NULL; i++) + flexarray_append(dm_args, b_info->extra[i]); flexarray_append(dm_args, "-M"); switch (b_info->type) { case LIBXL_DOMAIN_TYPE_PV: flexarray_append(dm_args, "xenpv"); - for (i = 0; info->extra_pv && info->extra_pv[i] != NULL; i++) - flexarray_append(dm_args, info->extra_pv[i]); + for (i = 0; b_info->extra_pv && b_info->extra_pv[i] != NULL; i++) + flexarray_append(dm_args, b_info->extra_pv[i]); break; case LIBXL_DOMAIN_TYPE_HVM: flexarray_append(dm_args, "xenfv"); - for (i = 0; info->extra_hvm && info->extra_hvm[i] != NULL; i++) - flexarray_append(dm_args, info->extra_hvm[i]); + for (i = 0; b_info->extra_hvm && b_info->extra_hvm[i] != NULL; i++) + flexarray_append(dm_args, b_info->extra_hvm[i]); break; } flexarray_append(dm_args, NULL); @@ -495,19 +495,19 @@ flexarray_append(dm_args, "-incoming"); flexarray_append(dm_args, libxl__sprintf(gc, "fd:%d", migration_fd)); } - for (i = 0; info->extra && info->extra[i] != NULL; i++) - flexarray_append(dm_args, info->extra[i]); + for (i = 0; b_info->extra && b_info->extra[i] != NULL; i++) + flexarray_append(dm_args, b_info->extra[i]); flexarray_append(dm_args, "-M"); switch (b_info->type) { case LIBXL_DOMAIN_TYPE_PV: flexarray_append(dm_args, "xenpv"); - for (i = 0; info->extra_pv && info->extra_pv[i] != NULL; i++) - flexarray_append(dm_args, info->extra_pv[i]); + for (i = 0; b_info->extra_pv && b_info->extra_pv[i] != NULL; i++) + flexarray_append(dm_args, b_info->extra_pv[i]); break; case LIBXL_DOMAIN_TYPE_HVM: flexarray_append(dm_args, "xenfv"); - for (i = 0; info->extra_hvm && info->extra_hvm[i] != NULL; i++) - flexarray_append(dm_args, info->extra_hvm[i]); + for (i = 0; b_info->extra_hvm && b_info->extra_hvm[i] != NULL; i++) + flexarray_append(dm_args, b_info->extra_hvm[i]); break; } @@ -585,14 +585,14 @@ { libxl_ctx *ctx = libxl__gc_owner(gc); - switch (info->device_model_version) { + switch (guest_config->b_info.device_model_version) { case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: return libxl__build_device_model_args_old(gc, dm, guest_config, info); case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: return libxl__build_device_model_args_new(gc, dm, guest_config, info); default: LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "unknown device model version %d", - info->device_model_version); + guest_config->b_info.device_model_version); return NULL; } } @@ -688,7 +688,8 @@ libxl__spawner_starting *dm_starting = 0; libxl_device_model_info xenpv_dm_info; - if (info->device_model_version != LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL) { + if (guest_config->b_info.device_model_version != + LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL) { ret = ERROR_INVAL; goto out; } @@ -712,6 +713,14 @@ dm_config.b_info.u.pv.ramdisk.path = ""; dm_config.b_info.u.pv.features = ""; + dm_config.b_info.device_model_version = + guest_config->b_info.device_model_version; + 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.disks = guest_config->disks; dm_config.num_disks = guest_config->num_disks; @@ -828,11 +837,6 @@ } memset((void*)&xenpv_dm_info, 0, sizeof(libxl_device_model_info)); - xenpv_dm_info.device_model_version = info->device_model_version; - xenpv_dm_info.device_model = info->device_model; - xenpv_dm_info.extra = info->extra; - xenpv_dm_info.extra_pv = info->extra_pv; - xenpv_dm_info.extra_hvm = info->extra_hvm; if (libxl__create_xenpv_qemu(gc, domid, &dm_config, @@ -871,6 +875,7 @@ { libxl_ctx *ctx = libxl__gc_owner(gc); 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 = dm_vnc(guest_config, info); char *path, *logfile; int logfile_w, null; @@ -882,12 +887,12 @@ char **pass_stuff; const char *dm; - if (info->device_model_stubdomain) { + if (b_info->device_model_stubdomain) { rc = libxl__create_stubdom(gc, guest_config, info, starting_r); goto out; } - dm = libxl__domain_device_model(gc, info); + dm = libxl__domain_device_model(gc, b_info); if (!dm) { rc = ERROR_FAIL; goto out; @@ -906,13 +911,13 @@ path = xs_get_domain_path(ctx->xsh, info->domid); libxl__xs_write(gc, XBT_NULL, libxl__sprintf(gc, "%s/hvmloader/bios", path), - "%s", libxl__domain_bios(gc, info)); + "%s", libxl__domain_bios(gc, b_info)); free(path); path = libxl__sprintf(gc, "/local/domain/0/device-model/%d", info->domid); xs_mkdir(ctx->xsh, XBT_NULL, path); libxl__xs_write(gc, XBT_NULL, libxl__sprintf(gc, "%s/disable_pf", path), - "%d", !guest_config->b_info.u.hvm.xen_platform_pci); + "%d", !b_info->u.hvm.xen_platform_pci); libxl_create_logfile(ctx, libxl__sprintf(gc, "qemu-dm-%s", c_info->name), diff -r 0b4c3c9609dd -r f7cc388711c8 tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Tue Jan 31 15:21:52 2012 +0000 +++ b/tools/libxl/libxl_dom.c Tue Jan 31 16:34:32 2012 +0000 @@ -300,7 +300,7 @@ if (info->u.hvm.firmware) firmware = info->u.hvm.firmware; else { - switch (dm_info->device_model_version) + switch (info->device_model_version) { case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: firmware = "hvmloader"; @@ -310,7 +310,7 @@ break; default: LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "invalid device model version %d", - dm_info->device_model_version); + info->device_model_version); return NULL; break; } diff -r 0b4c3c9609dd -r f7cc388711c8 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Tue Jan 31 15:21:52 2012 +0000 +++ b/tools/libxl/libxl_internal.h Tue Jan 31 16:34:32 2012 +0000 @@ -864,7 +864,7 @@ /* for device model creation */ _hidden const char *libxl__domain_device_model(libxl__gc *gc, - libxl_device_model_info *info); + const libxl_domain_build_info *info); _hidden int libxl__create_device_model(libxl__gc *gc, libxl_domain_config *guest_config, libxl_device_model_info *info, diff -r 0b4c3c9609dd -r f7cc388711c8 tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Tue Jan 31 15:21:52 2012 +0000 +++ b/tools/libxl/libxl_types.idl Tue Jan 31 16:34:32 2012 +0000 @@ -200,6 +200,19 @@ ("disable_migrate", bool), ("cpuid", libxl_cpuid_policy_list), ("type", libxl_domain_type), + + ("device_model_version", libxl_device_model_version), + ("device_model_stubdomain", bool), + # you set device_model you must set device_model_version too + ("device_model", string), + + # extra parameters pass directly to qemu, NULL terminated + ("extra", libxl_string_list), + # extra parameters pass directly to qemu for PV guest, NULL terminated + ("extra_pv", libxl_string_list), + # extra parameters pass directly to qemu for HVM guest, NULL terminated + ("extra_hvm", libxl_string_list), + ("u", KeyedUnion(None, libxl_domain_type, "type", [("hvm", Struct(None, [("firmware", string), ("pae", bool), @@ -253,17 +266,7 @@ libxl_device_model_info = Struct("device_model_info",[ ("domid", libxl_domid), - ("device_model_version", libxl_device_model_version), - ("device_model_stubdomain", bool), - # you set device_model you must set device_model_version too - ("device_model", string), ("saved_state", string), - # extra parameters pass directly to qemu, NULL terminated - ("extra", libxl_string_list), - # extra parameters pass directly to qemu for PV guest, NULL terminated - ("extra_pv", libxl_string_list), - # extra parameters pass directly to qemu for HVM guest, NULL terminated - ("extra_hvm", libxl_string_list), ], ) diff -r 0b4c3c9609dd -r f7cc388711c8 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Tue Jan 31 15:21:52 2012 +0000 +++ b/tools/libxl/xl_cmdimpl.c Tue Jan 31 16:34:32 2012 +0000 @@ -381,7 +381,7 @@ b_info->u.hvm.spice.disable_ticketing); printf("\t\t\t(spiceagent_mouse %d)\n", b_info->u.hvm.spice.agent_mouse); - printf("\t\t\t(device_model %s)\n", dm_info->device_model ? : "default"); + printf("\t\t\t(device_model %s)\n", b_info->device_model ? : "default"); printf("\t\t\t(gfx_passthru %d)\n", b_info->u.hvm.gfx_passthru); printf("\t\t\t(serial %s)\n", b_info->u.hvm.serial); printf("\t\t\t(boot %s)\n", b_info->u.hvm.boot); @@ -1217,27 +1217,27 @@ xlu_cfg_replace_string (config, "device_model_override", - &dm_info->device_model, 0); + &b_info->device_model, 0); if (!xlu_cfg_get_string (config, "device_model_version", &buf, 0)) { if (!strcmp(buf, "qemu-xen-traditional")) { - dm_info->device_model_version + b_info->device_model_version = LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL; } else if (!strcmp(buf, "qemu-xen")) { - dm_info->device_model_version + b_info->device_model_version = LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN; } else { fprintf(stderr, "Unknown device_model_version \"%s\" specified\n", buf); exit(1); } - } else if (dm_info->device_model) + } else if (b_info->device_model) fprintf(stderr, "WARNING: device model override given without specific DM version\n"); if (!xlu_cfg_get_long (config, "device_model_stubdomain_override", &l, 0)) - dm_info->device_model_stubdomain = l; + b_info->device_model_stubdomain = l; #define parse_extra_args(type) \ e = xlu_cfg_get_list_as_string_list(config, "device_model_args"#type, \ - &dm_info->extra##type, 0); \ + &b_info->extra##type, 0); \ if (e && e != ESRCH) { \ fprintf(stderr,"xl: Unable to parse device_model_args"#type".\n");\ exit(-ERROR_FAIL); \ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:58:30 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:58: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 1RtR9K-00083Z-Bk; Fri, 03 Feb 2012 21:58:30 +0000 Received: from mail174.messagelabs.com ([85.158.138.51]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR9I-0007zK-To for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:29 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-174.messagelabs.com!1328306301!11933633!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24277 invoked from network); 3 Feb 2012 21:58:22 -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; 3 Feb 2012 21:58:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR9A-0001oo-W4 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR97-00036t-Sp for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:18 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:58:16 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: move "saved_state" to libxl__domain_build_state. X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1328027678 0 # Node ID 9356938a851d93571fc16c5922f5db8242d7daf7 # Parent f7cc388711c8bebca5fc806b4365d25ef50e8540 libxl: move "saved_state" to libxl__domain_build_state. This is internal to the library and need not be exposed to the user. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r f7cc388711c8 -r 9356938a851d tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Tue Jan 31 16:34:32 2012 +0000 +++ b/tools/libxl/libxl_create.c Tue Jan 31 16:34:38 2012 +0000 @@ -278,9 +278,8 @@ if (ret) goto out; - dm_info->saved_state = NULL; if (info->type == LIBXL_DOMAIN_TYPE_HVM) { - ret = asprintf(&dm_info->saved_state, + ret = asprintf(&state->saved_state, XC_DEVICE_MODEL_RESTORE_FILE".%d", domid); ret = (ret < 0) ? ERROR_FAIL : 0; } @@ -512,13 +511,11 @@ } } + memset(&state, 0, sizeof(state)); + if ( restore_fd >= 0 ) { ret = domain_restore(gc, &d_config->b_info, domid, restore_fd, &state, dm_info); } else { - if (dm_info->saved_state) { - free(dm_info->saved_state); - dm_info->saved_state = NULL; - } ret = libxl__domain_build(gc, &d_config->b_info, dm_info, domid, &state); } @@ -568,7 +565,7 @@ dm_info->domid = domid; ret = libxl__create_device_model(gc, d_config, dm_info, - &dm_starting); + &state, &dm_starting); if (ret < 0) { LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "failed to create device model: %d", ret); @@ -605,8 +602,8 @@ /* only copy those useful configs */ memset((void*)&xenpv_dm_info, 0, sizeof(libxl_device_model_info)); - libxl__create_xenpv_qemu(gc, domid, - d_config, &xenpv_dm_info, &dm_starting); + libxl__create_xenpv_qemu(gc, domid, d_config, + &xenpv_dm_info, &state, &dm_starting); } break; } @@ -620,7 +617,7 @@ == LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN) { libxl__qmp_initializations(ctx, domid); } - ret = libxl__confirm_device_model_startup(gc, dm_info, 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 f7cc388711c8 -r 9356938a851d tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Tue Jan 31 16:34:32 2012 +0000 +++ b/tools/libxl/libxl_dm.c Tue Jan 31 16:34:38 2012 +0000 @@ -111,7 +111,8 @@ static char ** libxl__build_device_model_args_old(libxl__gc *gc, const char *dm, const libxl_domain_config *guest_config, - const libxl_device_model_info *info) + const libxl_device_model_info *info, + const libxl__domain_build_state *state) { const libxl_domain_create_info *c_info = &guest_config->c_info; const libxl_domain_build_info *b_info = &guest_config->b_info; @@ -248,8 +249,8 @@ flexarray_append(dm_args, "-nographic"); } - if (info->saved_state) { - flexarray_vappend(dm_args, "-loadvm", info->saved_state, NULL); + if (state->saved_state) { + flexarray_vappend(dm_args, "-loadvm", state->saved_state, NULL); } for (i = 0; b_info->extra && b_info->extra[i] != NULL; i++) flexarray_append(dm_args, b_info->extra[i]); @@ -321,7 +322,8 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, const char *dm, const libxl_domain_config *guest_config, - const libxl_device_model_info *info) + const libxl_device_model_info *info, + const libxl__domain_build_state *state) { libxl_ctx *ctx = libxl__gc_owner(gc); const libxl_domain_create_info *c_info = &guest_config->c_info; @@ -489,9 +491,9 @@ } } - if (info->saved_state) { + if (state->saved_state) { /* This file descriptor is meant to be used by QEMU */ - int migration_fd = open(info->saved_state, O_RDONLY); + int migration_fd = open(state->saved_state, O_RDONLY); flexarray_append(dm_args, "-incoming"); flexarray_append(dm_args, libxl__sprintf(gc, "fd:%d", migration_fd)); } @@ -581,15 +583,16 @@ static char ** libxl__build_device_model_args(libxl__gc *gc, const char *dm, const libxl_domain_config *guest_config, - const libxl_device_model_info *info) + const libxl_device_model_info *info, + const libxl__domain_build_state *state) { libxl_ctx *ctx = libxl__gc_owner(gc); switch (guest_config->b_info.device_model_version) { case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: - return libxl__build_device_model_args_old(gc, dm, guest_config, info); + return libxl__build_device_model_args_old(gc, dm, guest_config, info, state); case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: - return libxl__build_device_model_args_new(gc, dm, guest_config, info); + return libxl__build_device_model_args_new(gc, dm, guest_config, info, state); default: LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "unknown device model version %d", guest_config->b_info.device_model_version); @@ -672,6 +675,7 @@ static int libxl__create_stubdom(libxl__gc *gc, libxl_domain_config *guest_config, libxl_device_model_info *info, + libxl__domain_build_state *d_state, libxl__spawner_starting **starting_r) { libxl_ctx *ctx = libxl__gc_owner(gc); @@ -680,7 +684,7 @@ libxl_domain_config dm_config; libxl_device_vfb vfb; libxl_device_vkb vkb; - libxl__domain_build_state state; + libxl__domain_build_state stubdom_state; uint32_t domid; char **args; struct xs_permissions perm[2]; @@ -738,12 +742,12 @@ ret = libxl__domain_make(gc, &dm_config.c_info, &domid); if (ret) goto out; - ret = libxl__domain_build(gc, &dm_config.b_info, info, domid, &state); + ret = libxl__domain_build(gc, &dm_config.b_info, info, domid, &stubdom_state); if (ret) goto out; args = libxl__build_device_model_args(gc, "stubdom-dm", - guest_config, info); + guest_config, info, d_state); if (!args) { ret = ERROR_FAIL; goto out; @@ -813,7 +817,8 @@ char *filename; char *name; case STUBDOM_CONSOLE_LOGGING: - name = libxl__sprintf(gc, "qemu-dm-%s", libxl_domid_to_name(ctx, info->domid)); + name = libxl__sprintf(gc, "qemu-dm-%s", + libxl_domid_to_name(ctx, info->domid)); libxl_create_logfile(ctx, name, &filename); console[i].output = libxl__sprintf(gc, "file:%s", filename); free(filename); @@ -823,15 +828,16 @@ libxl__device_model_savefile(gc, info->domid)); break; case STUBDOM_CONSOLE_RESTORE: - if (info->saved_state) - console[i].output = libxl__sprintf(gc, "pipe:%s", info->saved_state); + if (d_state->saved_state) + console[i].output = + libxl__sprintf(gc, "pipe:%s", d_state->saved_state); break; default: console[i].output = "pty"; break; } ret = libxl__device_console_add(gc, domid, &console[i], - i == STUBDOM_CONSOLE_LOGGING ? &state : NULL); + i == STUBDOM_CONSOLE_LOGGING ? &stubdom_state : NULL); if (ret) goto out_free; } @@ -841,12 +847,12 @@ if (libxl__create_xenpv_qemu(gc, domid, &dm_config, &xenpv_dm_info, + &stubdom_state, &dm_starting) < 0) { ret = ERROR_FAIL; goto out_free; } - if (libxl__confirm_device_model_startup(gc, &xenpv_dm_info, - dm_starting) < 0) { + if (libxl__confirm_device_model_startup(gc, d_state, dm_starting) < 0) { ret = ERROR_FAIL; goto out_free; } @@ -871,6 +877,7 @@ int libxl__create_device_model(libxl__gc *gc, libxl_domain_config *guest_config, libxl_device_model_info *info, + libxl__domain_build_state *state, libxl__spawner_starting **starting_r) { libxl_ctx *ctx = libxl__gc_owner(gc); @@ -888,7 +895,7 @@ const char *dm; if (b_info->device_model_stubdomain) { - rc = libxl__create_stubdom(gc, guest_config, info, starting_r); + rc = libxl__create_stubdom(gc, guest_config, info, state, starting_r); goto out; } @@ -903,7 +910,7 @@ rc = ERROR_FAIL; goto out; } - args = libxl__build_device_model_args(gc, dm, guest_config, info); + args = libxl__build_device_model_args(gc, dm, guest_config, info, state); if (!args) { rc = ERROR_FAIL; goto out; @@ -984,10 +991,9 @@ int libxl__confirm_device_model_startup(libxl__gc *gc, - libxl_device_model_info *dm_info, + libxl__domain_build_state *state, libxl__spawner_starting *starting) { - libxl_ctx *ctx = libxl__gc_owner(gc); char *path; int domid = starting->domid; int ret, ret2; @@ -995,11 +1001,11 @@ ret = libxl__spawn_confirm_offspring_startup(gc, LIBXL_DEVICE_MODEL_START_TIMEOUT, "Device Model", path, "running", starting); - if (dm_info->saved_state) { - ret2 = unlink(dm_info->saved_state); - if (ret2) LIBXL__LOG_ERRNO(ctx, XTL_ERROR, + 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", - dm_info->saved_state); + state->saved_state); /* Do not clobber spawn_confirm error code with unlink error code. */ if (!ret) ret = ret2; } @@ -1110,10 +1116,11 @@ int libxl__create_xenpv_qemu(libxl__gc *gc, uint32_t domid, libxl_domain_config *guest_config, libxl_device_model_info *info, + libxl__domain_build_state *state, libxl__spawner_starting **starting_r) { libxl__build_xenpv_qemu_args(gc, domid, info); - libxl__create_device_model(gc, guest_config, info, starting_r); + libxl__create_device_model(gc, guest_config, info, state, starting_r); return 0; } diff -r f7cc388711c8 -r 9356938a851d tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Tue Jan 31 16:34:32 2012 +0000 +++ b/tools/libxl/libxl_internal.h Tue Jan 31 16:34:38 2012 +0000 @@ -599,7 +599,10 @@ uint32_t console_port; unsigned long console_mfn; + unsigned long vm_generationid_addr; + + char *saved_state; } libxl__domain_build_state; _hidden int libxl__build_pre(libxl__gc *gc, uint32_t domid, @@ -868,10 +871,12 @@ _hidden int libxl__create_device_model(libxl__gc *gc, libxl_domain_config *guest_config, libxl_device_model_info *info, + 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_device_model_info *dm_info, + 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, @@ -881,7 +886,7 @@ * 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_device_model_info *dm_info, + 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, diff -r f7cc388711c8 -r 9356938a851d tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Tue Jan 31 16:34:32 2012 +0000 +++ b/tools/libxl/libxl_types.idl Tue Jan 31 16:34:38 2012 +0000 @@ -265,8 +265,6 @@ # Device Model Information libxl_device_model_info = Struct("device_model_info",[ ("domid", libxl_domid), - - ("saved_state", string), ], ) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:58:30 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:58: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 1RtR9K-00083Z-Bk; Fri, 03 Feb 2012 21:58:30 +0000 Received: from mail174.messagelabs.com ([85.158.138.51]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR9I-0007zK-To for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:29 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-174.messagelabs.com!1328306301!11933633!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24277 invoked from network); 3 Feb 2012 21:58:22 -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; 3 Feb 2012 21:58:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR9A-0001oo-W4 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR97-00036t-Sp for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:18 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:58:16 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: move "saved_state" to libxl__domain_build_state. X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1328027678 0 # Node ID 9356938a851d93571fc16c5922f5db8242d7daf7 # Parent f7cc388711c8bebca5fc806b4365d25ef50e8540 libxl: move "saved_state" to libxl__domain_build_state. This is internal to the library and need not be exposed to the user. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r f7cc388711c8 -r 9356938a851d tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Tue Jan 31 16:34:32 2012 +0000 +++ b/tools/libxl/libxl_create.c Tue Jan 31 16:34:38 2012 +0000 @@ -278,9 +278,8 @@ if (ret) goto out; - dm_info->saved_state = NULL; if (info->type == LIBXL_DOMAIN_TYPE_HVM) { - ret = asprintf(&dm_info->saved_state, + ret = asprintf(&state->saved_state, XC_DEVICE_MODEL_RESTORE_FILE".%d", domid); ret = (ret < 0) ? ERROR_FAIL : 0; } @@ -512,13 +511,11 @@ } } + memset(&state, 0, sizeof(state)); + if ( restore_fd >= 0 ) { ret = domain_restore(gc, &d_config->b_info, domid, restore_fd, &state, dm_info); } else { - if (dm_info->saved_state) { - free(dm_info->saved_state); - dm_info->saved_state = NULL; - } ret = libxl__domain_build(gc, &d_config->b_info, dm_info, domid, &state); } @@ -568,7 +565,7 @@ dm_info->domid = domid; ret = libxl__create_device_model(gc, d_config, dm_info, - &dm_starting); + &state, &dm_starting); if (ret < 0) { LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "failed to create device model: %d", ret); @@ -605,8 +602,8 @@ /* only copy those useful configs */ memset((void*)&xenpv_dm_info, 0, sizeof(libxl_device_model_info)); - libxl__create_xenpv_qemu(gc, domid, - d_config, &xenpv_dm_info, &dm_starting); + libxl__create_xenpv_qemu(gc, domid, d_config, + &xenpv_dm_info, &state, &dm_starting); } break; } @@ -620,7 +617,7 @@ == LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN) { libxl__qmp_initializations(ctx, domid); } - ret = libxl__confirm_device_model_startup(gc, dm_info, 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 f7cc388711c8 -r 9356938a851d tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Tue Jan 31 16:34:32 2012 +0000 +++ b/tools/libxl/libxl_dm.c Tue Jan 31 16:34:38 2012 +0000 @@ -111,7 +111,8 @@ static char ** libxl__build_device_model_args_old(libxl__gc *gc, const char *dm, const libxl_domain_config *guest_config, - const libxl_device_model_info *info) + const libxl_device_model_info *info, + const libxl__domain_build_state *state) { const libxl_domain_create_info *c_info = &guest_config->c_info; const libxl_domain_build_info *b_info = &guest_config->b_info; @@ -248,8 +249,8 @@ flexarray_append(dm_args, "-nographic"); } - if (info->saved_state) { - flexarray_vappend(dm_args, "-loadvm", info->saved_state, NULL); + if (state->saved_state) { + flexarray_vappend(dm_args, "-loadvm", state->saved_state, NULL); } for (i = 0; b_info->extra && b_info->extra[i] != NULL; i++) flexarray_append(dm_args, b_info->extra[i]); @@ -321,7 +322,8 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, const char *dm, const libxl_domain_config *guest_config, - const libxl_device_model_info *info) + const libxl_device_model_info *info, + const libxl__domain_build_state *state) { libxl_ctx *ctx = libxl__gc_owner(gc); const libxl_domain_create_info *c_info = &guest_config->c_info; @@ -489,9 +491,9 @@ } } - if (info->saved_state) { + if (state->saved_state) { /* This file descriptor is meant to be used by QEMU */ - int migration_fd = open(info->saved_state, O_RDONLY); + int migration_fd = open(state->saved_state, O_RDONLY); flexarray_append(dm_args, "-incoming"); flexarray_append(dm_args, libxl__sprintf(gc, "fd:%d", migration_fd)); } @@ -581,15 +583,16 @@ static char ** libxl__build_device_model_args(libxl__gc *gc, const char *dm, const libxl_domain_config *guest_config, - const libxl_device_model_info *info) + const libxl_device_model_info *info, + const libxl__domain_build_state *state) { libxl_ctx *ctx = libxl__gc_owner(gc); switch (guest_config->b_info.device_model_version) { case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: - return libxl__build_device_model_args_old(gc, dm, guest_config, info); + return libxl__build_device_model_args_old(gc, dm, guest_config, info, state); case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: - return libxl__build_device_model_args_new(gc, dm, guest_config, info); + return libxl__build_device_model_args_new(gc, dm, guest_config, info, state); default: LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "unknown device model version %d", guest_config->b_info.device_model_version); @@ -672,6 +675,7 @@ static int libxl__create_stubdom(libxl__gc *gc, libxl_domain_config *guest_config, libxl_device_model_info *info, + libxl__domain_build_state *d_state, libxl__spawner_starting **starting_r) { libxl_ctx *ctx = libxl__gc_owner(gc); @@ -680,7 +684,7 @@ libxl_domain_config dm_config; libxl_device_vfb vfb; libxl_device_vkb vkb; - libxl__domain_build_state state; + libxl__domain_build_state stubdom_state; uint32_t domid; char **args; struct xs_permissions perm[2]; @@ -738,12 +742,12 @@ ret = libxl__domain_make(gc, &dm_config.c_info, &domid); if (ret) goto out; - ret = libxl__domain_build(gc, &dm_config.b_info, info, domid, &state); + ret = libxl__domain_build(gc, &dm_config.b_info, info, domid, &stubdom_state); if (ret) goto out; args = libxl__build_device_model_args(gc, "stubdom-dm", - guest_config, info); + guest_config, info, d_state); if (!args) { ret = ERROR_FAIL; goto out; @@ -813,7 +817,8 @@ char *filename; char *name; case STUBDOM_CONSOLE_LOGGING: - name = libxl__sprintf(gc, "qemu-dm-%s", libxl_domid_to_name(ctx, info->domid)); + name = libxl__sprintf(gc, "qemu-dm-%s", + libxl_domid_to_name(ctx, info->domid)); libxl_create_logfile(ctx, name, &filename); console[i].output = libxl__sprintf(gc, "file:%s", filename); free(filename); @@ -823,15 +828,16 @@ libxl__device_model_savefile(gc, info->domid)); break; case STUBDOM_CONSOLE_RESTORE: - if (info->saved_state) - console[i].output = libxl__sprintf(gc, "pipe:%s", info->saved_state); + if (d_state->saved_state) + console[i].output = + libxl__sprintf(gc, "pipe:%s", d_state->saved_state); break; default: console[i].output = "pty"; break; } ret = libxl__device_console_add(gc, domid, &console[i], - i == STUBDOM_CONSOLE_LOGGING ? &state : NULL); + i == STUBDOM_CONSOLE_LOGGING ? &stubdom_state : NULL); if (ret) goto out_free; } @@ -841,12 +847,12 @@ if (libxl__create_xenpv_qemu(gc, domid, &dm_config, &xenpv_dm_info, + &stubdom_state, &dm_starting) < 0) { ret = ERROR_FAIL; goto out_free; } - if (libxl__confirm_device_model_startup(gc, &xenpv_dm_info, - dm_starting) < 0) { + if (libxl__confirm_device_model_startup(gc, d_state, dm_starting) < 0) { ret = ERROR_FAIL; goto out_free; } @@ -871,6 +877,7 @@ int libxl__create_device_model(libxl__gc *gc, libxl_domain_config *guest_config, libxl_device_model_info *info, + libxl__domain_build_state *state, libxl__spawner_starting **starting_r) { libxl_ctx *ctx = libxl__gc_owner(gc); @@ -888,7 +895,7 @@ const char *dm; if (b_info->device_model_stubdomain) { - rc = libxl__create_stubdom(gc, guest_config, info, starting_r); + rc = libxl__create_stubdom(gc, guest_config, info, state, starting_r); goto out; } @@ -903,7 +910,7 @@ rc = ERROR_FAIL; goto out; } - args = libxl__build_device_model_args(gc, dm, guest_config, info); + args = libxl__build_device_model_args(gc, dm, guest_config, info, state); if (!args) { rc = ERROR_FAIL; goto out; @@ -984,10 +991,9 @@ int libxl__confirm_device_model_startup(libxl__gc *gc, - libxl_device_model_info *dm_info, + libxl__domain_build_state *state, libxl__spawner_starting *starting) { - libxl_ctx *ctx = libxl__gc_owner(gc); char *path; int domid = starting->domid; int ret, ret2; @@ -995,11 +1001,11 @@ ret = libxl__spawn_confirm_offspring_startup(gc, LIBXL_DEVICE_MODEL_START_TIMEOUT, "Device Model", path, "running", starting); - if (dm_info->saved_state) { - ret2 = unlink(dm_info->saved_state); - if (ret2) LIBXL__LOG_ERRNO(ctx, XTL_ERROR, + 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", - dm_info->saved_state); + state->saved_state); /* Do not clobber spawn_confirm error code with unlink error code. */ if (!ret) ret = ret2; } @@ -1110,10 +1116,11 @@ int libxl__create_xenpv_qemu(libxl__gc *gc, uint32_t domid, libxl_domain_config *guest_config, libxl_device_model_info *info, + libxl__domain_build_state *state, libxl__spawner_starting **starting_r) { libxl__build_xenpv_qemu_args(gc, domid, info); - libxl__create_device_model(gc, guest_config, info, starting_r); + libxl__create_device_model(gc, guest_config, info, state, starting_r); return 0; } diff -r f7cc388711c8 -r 9356938a851d tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Tue Jan 31 16:34:32 2012 +0000 +++ b/tools/libxl/libxl_internal.h Tue Jan 31 16:34:38 2012 +0000 @@ -599,7 +599,10 @@ uint32_t console_port; unsigned long console_mfn; + unsigned long vm_generationid_addr; + + char *saved_state; } libxl__domain_build_state; _hidden int libxl__build_pre(libxl__gc *gc, uint32_t domid, @@ -868,10 +871,12 @@ _hidden int libxl__create_device_model(libxl__gc *gc, libxl_domain_config *guest_config, libxl_device_model_info *info, + 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_device_model_info *dm_info, + 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, @@ -881,7 +886,7 @@ * 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_device_model_info *dm_info, + 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, diff -r f7cc388711c8 -r 9356938a851d tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Tue Jan 31 16:34:32 2012 +0000 +++ b/tools/libxl/libxl_types.idl Tue Jan 31 16:34:38 2012 +0000 @@ -265,8 +265,6 @@ # Device Model Information libxl_device_model_info = Struct("device_model_info",[ ("domid", libxl_domid), - - ("saved_state", string), ], ) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:58:33 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:58: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 1RtR9N-00085v-Eu; Fri, 03 Feb 2012 21:58:33 +0000 Received: from mail182.messagelabs.com ([85.158.139.83]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR9L-000811-S0 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:32 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-182.messagelabs.com!1328306302!13568369!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30058 invoked from network); 3 Feb 2012 21:58:23 -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; 3 Feb 2012 21:58:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR9C-0001os-DC for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR9B-000385-H9 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:22 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:58:20 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: remove libxl_device_model_info. X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1328027678 0 # Node ID 05310d1a73ed310e3c0c18f9829a4356a40f8cb6 # Parent 9356938a851d93571fc16c5922f5db8242d7daf7 libxl: remove libxl_device_model_info. All that is left here is the target domain's domid which we can pass around as a parameter. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 9356938a851d -r 05310d1a73ed tools/libxl/libxl.c --- a/tools/libxl/libxl.c Tue Jan 31 16:34:38 2012 +0000 +++ b/tools/libxl/libxl.c Tue Jan 31 16:34:38 2012 +0000 @@ -2621,7 +2621,7 @@ } int libxl_domain_need_memory(libxl_ctx *ctx, libxl_domain_build_info *b_info, - libxl_device_model_info *dm_info, uint32_t *need_memkb) + uint32_t *need_memkb) { GC_INIT(ctx); int rc = ERROR_INVAL; diff -r 9356938a851d -r 05310d1a73ed tools/libxl/libxl.h --- a/tools/libxl/libxl.h Tue Jan 31 16:34:38 2012 +0000 +++ b/tools/libxl/libxl.h Tue Jan 31 16:34:38 2012 +0000 @@ -295,7 +295,6 @@ typedef struct { libxl_domain_create_info c_info; libxl_domain_build_info b_info; - libxl_device_model_info dm_info; int num_disks, num_vifs, num_pcidevs, num_vfbs, num_vkbs; @@ -323,10 +322,6 @@ int libxl_init_build_info(libxl_ctx *ctx, libxl_domain_build_info *b_info, libxl_domain_create_info *c_info); -int libxl_init_dm_info(libxl_ctx *ctx, - libxl_device_model_info *dm_info, - libxl_domain_create_info *c_info, - libxl_domain_build_info *b_info); 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); @@ -379,7 +374,7 @@ int libxl_get_memory_target(libxl_ctx *ctx, uint32_t domid, uint32_t *out_target); /* how much free memory in the system a domain needs to be built */ int libxl_domain_need_memory(libxl_ctx *ctx, libxl_domain_build_info *b_info, - libxl_device_model_info *dm_info, uint32_t *need_memkb); + uint32_t *need_memkb); /* how much free memory is available in the system */ int libxl_get_free_memory(libxl_ctx *ctx, uint32_t *memkb); /* wait for a given amount of memory to be free in the system */ diff -r 9356938a851d -r 05310d1a73ed tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Tue Jan 31 16:34:38 2012 +0000 +++ b/tools/libxl/libxl_create.c Tue Jan 31 16:34:38 2012 +0000 @@ -48,7 +48,6 @@ libxl_domain_create_info_dispose(&d_config->c_info); libxl_domain_build_info_dispose(&d_config->b_info); - libxl_device_model_info_dispose(&d_config->dm_info); } int libxl_init_create_info(libxl_ctx *ctx, libxl_domain_create_info *c_info) @@ -130,17 +129,6 @@ return 0; } -int libxl_init_dm_info(libxl_ctx *ctx, - libxl_device_model_info *dm_info, - libxl_domain_create_info *c_info, - libxl_domain_build_info *b_info) -{ - memset(dm_info, '\0', sizeof(*dm_info)); - - - return 0; -} - static int init_console_info(libxl_device_console *console, int dev_num) { memset(console, 0x00, sizeof(libxl_device_console)); @@ -154,7 +142,6 @@ int libxl__domain_build(libxl__gc *gc, libxl_domain_build_info *info, - libxl_device_model_info *dm_info, uint32_t domid, libxl__domain_build_state *state) { @@ -170,7 +157,7 @@ switch (info->type) { case LIBXL_DOMAIN_TYPE_HVM: - ret = libxl__build_hvm(gc, domid, info, dm_info, state); + ret = libxl__build_hvm(gc, domid, info, state); if (ret) goto out; @@ -224,8 +211,7 @@ static int domain_restore(libxl__gc *gc, libxl_domain_build_info *info, uint32_t domid, int fd, - libxl__domain_build_state *state, - libxl_device_model_info *dm_info) + libxl__domain_build_state *state) { libxl_ctx *ctx = libxl__gc_owner(gc); char **vments = NULL, **localents = NULL; @@ -477,7 +463,6 @@ { libxl_ctx *ctx = libxl__gc_owner(gc); libxl__spawner_starting *dm_starting = 0; - libxl_device_model_info *dm_info = &d_config->dm_info; libxl__domain_build_state state; uint32_t domid; int i, ret; @@ -514,9 +499,9 @@ memset(&state, 0, sizeof(state)); if ( restore_fd >= 0 ) { - ret = domain_restore(gc, &d_config->b_info, domid, restore_fd, &state, dm_info); + ret = domain_restore(gc, &d_config->b_info, domid, restore_fd, &state); } else { - ret = libxl__domain_build(gc, &d_config->b_info, dm_info, domid, &state); + ret = libxl__domain_build(gc, &d_config->b_info, domid, &state); } if (ret) { @@ -563,8 +548,7 @@ libxl_device_vkb_add(ctx, domid, &vkb); libxl_device_vkb_dispose(&vkb); - dm_info->domid = domid; - ret = libxl__create_device_model(gc, d_config, dm_info, + ret = libxl__create_device_model(gc, domid, d_config, &state, &dm_starting); if (ret < 0) { LIBXL__LOG(ctx, LIBXL__LOG_ERROR, @@ -577,7 +561,6 @@ { int need_qemu = 0; libxl_device_console console; - libxl_device_model_info xenpv_dm_info; for (i = 0; i < d_config->num_vfbs; i++) { libxl_device_vfb_add(ctx, domid, &d_config->vfbs[i]); @@ -599,11 +582,7 @@ libxl_device_console_dispose(&console); if (need_qemu) { - /* only copy those useful configs */ - memset((void*)&xenpv_dm_info, 0, sizeof(libxl_device_model_info)); - - libxl__create_xenpv_qemu(gc, domid, d_config, - &xenpv_dm_info, &state, &dm_starting); + libxl__create_xenpv_qemu(gc, domid, d_config, &state, &dm_starting); } break; } diff -r 9356938a851d -r 05310d1a73ed tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Tue Jan 31 16:34:38 2012 +0000 +++ b/tools/libxl/libxl_dm.c Tue Jan 31 16:34:38 2012 +0000 @@ -73,8 +73,7 @@ } } -static const libxl_vnc_info *dm_vnc(const libxl_domain_config *guest_config, - const libxl_device_model_info *info) +static const libxl_vnc_info *dm_vnc(const libxl_domain_config *guest_config) { const libxl_vnc_info *vnc = NULL; if (guest_config->b_info.type == LIBXL_DOMAIN_TYPE_HVM) { @@ -85,8 +84,7 @@ return vnc && vnc->enable ? vnc : NULL; } -static const libxl_sdl_info *dm_sdl(const libxl_domain_config *guest_config, - const libxl_device_model_info *info) +static const libxl_sdl_info *dm_sdl(const libxl_domain_config *guest_config) { const libxl_sdl_info *sdl = NULL; if (guest_config->b_info.type == LIBXL_DOMAIN_TYPE_HVM) { @@ -97,8 +95,7 @@ return sdl && sdl->enable ? sdl : NULL; } -static const char *dm_keymap(const libxl_domain_config *guest_config, - const libxl_device_model_info *info) +static const char *dm_keymap(const libxl_domain_config *guest_config) { if (guest_config->b_info.type == LIBXL_DOMAIN_TYPE_HVM) { return guest_config->b_info.u.hvm.keymap; @@ -109,18 +106,17 @@ } static char ** libxl__build_device_model_args_old(libxl__gc *gc, - const char *dm, + const char *dm, int domid, const libxl_domain_config *guest_config, - const libxl_device_model_info *info, const libxl__domain_build_state *state) { const libxl_domain_create_info *c_info = &guest_config->c_info; const libxl_domain_build_info *b_info = &guest_config->b_info; const libxl_device_nic *vifs = guest_config->vifs; - const libxl_vnc_info *vnc = dm_vnc(guest_config, info); - const libxl_sdl_info *sdl = dm_sdl(guest_config, info); + const libxl_vnc_info *vnc = dm_vnc(guest_config); + const libxl_sdl_info *sdl = dm_sdl(guest_config); const int num_vifs = guest_config->num_vifs; - const char *keymap = dm_keymap(guest_config, info); + const char *keymap = dm_keymap(guest_config); int i; flexarray_t *dm_args; dm_args = flexarray_make(16, 1); @@ -129,7 +125,7 @@ return NULL; flexarray_vappend(dm_args, dm, - "-d", libxl__sprintf(gc, "%d", info->domid), NULL); + "-d", libxl__sprintf(gc, "%d", domid), NULL); if (c_info->name) flexarray_vappend(dm_args, "-domain-name", c_info->name, NULL); @@ -225,7 +221,8 @@ LIBXL_MAC_FMT, LIBXL_MAC_BYTES(vifs[i].mac)); char *ifname; if (!vifs[i].ifname) - ifname = libxl__sprintf(gc, "tap%d.%d", info->domid, vifs[i].devid); + ifname = libxl__sprintf(gc, + "tap%d.%d", domid, vifs[i].devid); else ifname = vifs[i].ifname; flexarray_vappend(dm_args, @@ -320,9 +317,8 @@ } static char ** libxl__build_device_model_args_new(libxl__gc *gc, - const char *dm, + const char *dm, int guest_domid, const libxl_domain_config *guest_config, - const libxl_device_model_info *info, const libxl__domain_build_state *state) { libxl_ctx *ctx = libxl__gc_owner(gc); @@ -332,9 +328,9 @@ const libxl_device_nic *vifs = guest_config->vifs; const int num_disks = guest_config->num_disks; const int num_vifs = guest_config->num_vifs; - const libxl_vnc_info *vnc = dm_vnc(guest_config, info); - const libxl_sdl_info *sdl = dm_sdl(guest_config, info); - const char *keymap = dm_keymap(guest_config, info); + const libxl_vnc_info *vnc = dm_vnc(guest_config); + const libxl_sdl_info *sdl = dm_sdl(guest_config); + const char *keymap = dm_keymap(guest_config); flexarray_t *dm_args; int i; @@ -343,14 +339,14 @@ return NULL; flexarray_vappend(dm_args, dm, - "-xen-domid", libxl__sprintf(gc, "%d", info->domid), NULL); + "-xen-domid", + libxl__sprintf(gc, "%d", guest_domid), NULL); flexarray_append(dm_args, "-chardev"); flexarray_append(dm_args, libxl__sprintf(gc, "socket,id=libxl-cmd," "path=%s/qmp-libxl-%d,server,nowait", - libxl_run_dir_path(), - info->domid)); + libxl_run_dir_path(), guest_domid)); flexarray_append(dm_args, "-mon"); flexarray_append(dm_args, "chardev=libxl-cmd,mode=control"); @@ -460,7 +456,8 @@ LIBXL_MAC_FMT, LIBXL_MAC_BYTES(vifs[i].mac)); char *ifname; if (!vifs[i].ifname) { - ifname = libxl__sprintf(gc, "tap%d.%d", info->domid, vifs[i].devid); + ifname = libxl__sprintf(gc, "tap%d.%d", + guest_domid, vifs[i].devid); } else { ifname = vifs[i].ifname; } @@ -581,18 +578,21 @@ } static char ** libxl__build_device_model_args(libxl__gc *gc, - const char *dm, + const char *dm, int guest_domid, const libxl_domain_config *guest_config, - const libxl_device_model_info *info, const libxl__domain_build_state *state) { libxl_ctx *ctx = libxl__gc_owner(gc); switch (guest_config->b_info.device_model_version) { case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: - return libxl__build_device_model_args_old(gc, dm, guest_config, info, state); + return libxl__build_device_model_args_old(gc, dm, + guest_domid, guest_config, + state); case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: - return libxl__build_device_model_args_new(gc, dm, guest_config, info, state); + return libxl__build_device_model_args_new(gc, dm, + guest_domid, guest_config, + state); default: LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "unknown device model version %d", guest_config->b_info.device_model_version); @@ -624,7 +624,9 @@ return 0; } -static int libxl__write_dmargs(libxl__gc *gc, int domid, int guest_domid, char **args) +static int libxl__write_stub_dmargs(libxl__gc *gc, + int dm_domid, int guest_domid, + char **args) { libxl_ctx *ctx = libxl__gc_owner(gc); int i; @@ -636,7 +638,7 @@ roperm[0].id = 0; roperm[0].perms = XS_PERM_NONE; - roperm[1].id = domid; + roperm[1].id = dm_domid; roperm[1].perms = XS_PERM_READ; vm_path = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, "/local/domain/%d/vm", guest_domid)); @@ -673,8 +675,8 @@ } static int libxl__create_stubdom(libxl__gc *gc, + int guest_domid, libxl_domain_config *guest_config, - libxl_device_model_info *info, libxl__domain_build_state *d_state, libxl__spawner_starting **starting_r) { @@ -685,12 +687,11 @@ libxl_device_vfb vfb; libxl_device_vkb vkb; libxl__domain_build_state stubdom_state; - uint32_t domid; + uint32_t dm_domid; char **args; struct xs_permissions perm[2]; xs_transaction_t t; libxl__spawner_starting *dm_starting = 0; - libxl_device_model_info xenpv_dm_info; if (guest_config->b_info.device_model_version != LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL) { @@ -700,7 +701,8 @@ memset(&dm_config.c_info, 0x00, sizeof(libxl_domain_create_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, info->domid)); + dm_config.c_info.name = libxl__sprintf(gc, "%s-dm", + libxl__domid_to_name(gc, guest_domid)); libxl_uuid_generate(&dm_config.c_info.uuid); @@ -713,7 +715,7 @@ dm_config.b_info.type = LIBXL_DOMAIN_TYPE_PV; 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", info->domid); + 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 = ""; @@ -738,62 +740,69 @@ dm_config.num_vkbs = 1; /* fixme: this function can leak the stubdom if it fails */ - domid = 0; - ret = libxl__domain_make(gc, &dm_config.c_info, &domid); + dm_domid = 0; + ret = libxl__domain_make(gc, &dm_config.c_info, &dm_domid); if (ret) goto out; - ret = libxl__domain_build(gc, &dm_config.b_info, info, domid, &stubdom_state); + ret = libxl__domain_build(gc, &dm_config.b_info, dm_domid, &stubdom_state); if (ret) goto out; - args = libxl__build_device_model_args(gc, "stubdom-dm", - guest_config, info, d_state); + args = libxl__build_device_model_args(gc, "stubdom-dm", guest_domid, + guest_config, d_state); if (!args) { ret = ERROR_FAIL; goto out; } - libxl__write_dmargs(gc, domid, info->domid, args); + libxl__write_stub_dmargs(gc, dm_domid, guest_domid, args); libxl__xs_write(gc, XBT_NULL, - libxl__sprintf(gc, "%s/image/device-model-domid", libxl__xs_get_dompath(gc, info->domid)), - "%d", domid); + libxl__sprintf(gc, "%s/image/device-model-domid", + libxl__xs_get_dompath(gc, guest_domid)), + "%d", dm_domid); libxl__xs_write(gc, XBT_NULL, - libxl__sprintf(gc, "%s/target", libxl__xs_get_dompath(gc, domid)), - "%d", info->domid); - ret = xc_domain_set_target(ctx->xch, domid, info->domid); + libxl__sprintf(gc, "%s/target", + libxl__xs_get_dompath(gc, dm_domid)), + "%d", guest_domid); + ret = xc_domain_set_target(ctx->xch, dm_domid, guest_domid); if (ret<0) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "setting target domain %d -> %d", domid, info->domid); + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, + "setting target domain %d -> %d", + dm_domid, guest_domid); ret = ERROR_FAIL; goto out_free; } - xs_set_target(ctx->xsh, domid, info->domid); + xs_set_target(ctx->xsh, dm_domid, guest_domid); - perm[0].id = domid; + perm[0].id = dm_domid; perm[0].perms = XS_PERM_NONE; - perm[1].id = info->domid; + perm[1].id = guest_domid; perm[1].perms = XS_PERM_READ; retry_transaction: t = xs_transaction_start(ctx->xsh); - xs_mkdir(ctx->xsh, t, libxl__sprintf(gc, "/local/domain/0/device-model/%d", info->domid)); - xs_set_permissions(ctx->xsh, t, libxl__sprintf(gc, "/local/domain/0/device-model/%d", info->domid), perm, ARRAY_SIZE(perm)); + xs_mkdir(ctx->xsh, t, + libxl__sprintf(gc, "/local/domain/0/device-model/%d", guest_domid)); + xs_set_permissions(ctx->xsh, t, + libxl__sprintf(gc, "/local/domain/0/device-model/%d", guest_domid), + perm, ARRAY_SIZE(perm)); if (!xs_transaction_end(ctx->xsh, t, 0)) if (errno == EAGAIN) goto retry_transaction; for (i = 0; i < dm_config.num_disks; i++) { - ret = libxl_device_disk_add(ctx, domid, &dm_config.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, domid, &dm_config.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, 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, domid, &dm_config.vkbs[0]); + ret = libxl_device_vkb_add(ctx, dm_domid, &dm_config.vkbs[0]); if (ret) goto out_free; @@ -818,14 +827,14 @@ char *name; case STUBDOM_CONSOLE_LOGGING: name = libxl__sprintf(gc, "qemu-dm-%s", - libxl_domid_to_name(ctx, info->domid)); + libxl_domid_to_name(ctx, guest_domid)); libxl_create_logfile(ctx, name, &filename); console[i].output = libxl__sprintf(gc, "file:%s", filename); free(filename); break; case STUBDOM_CONSOLE_SAVE: console[i].output = libxl__sprintf(gc, "file:%s", - libxl__device_model_savefile(gc, info->domid)); + libxl__device_model_savefile(gc, guest_domid)); break; case STUBDOM_CONSOLE_RESTORE: if (d_state->saved_state) @@ -836,17 +845,14 @@ console[i].output = "pty"; break; } - ret = libxl__device_console_add(gc, domid, &console[i], + ret = libxl__device_console_add(gc, dm_domid, &console[i], i == STUBDOM_CONSOLE_LOGGING ? &stubdom_state : NULL); if (ret) goto out_free; } - memset((void*)&xenpv_dm_info, 0, sizeof(libxl_device_model_info)); - - if (libxl__create_xenpv_qemu(gc, domid, + if (libxl__create_xenpv_qemu(gc, dm_domid, &dm_config, - &xenpv_dm_info, &stubdom_state, &dm_starting) < 0) { ret = ERROR_FAIL; @@ -857,12 +863,12 @@ goto out_free; } - libxl_domain_unpause(ctx, domid); + libxl_domain_unpause(ctx, dm_domid); if (starting_r) { *starting_r = calloc(1, sizeof(libxl__spawner_starting)); - (*starting_r)->domid = info->domid; - (*starting_r)->dom_path = libxl__xs_get_dompath(gc, info->domid); + (*starting_r)->domid = guest_domid; + (*starting_r)->dom_path = libxl__xs_get_dompath(gc, guest_domid); (*starting_r)->for_spawn = NULL; } @@ -875,15 +881,15 @@ } int libxl__create_device_model(libxl__gc *gc, + int domid, libxl_domain_config *guest_config, - libxl_device_model_info *info, libxl__domain_build_state *state, libxl__spawner_starting **starting_r) { libxl_ctx *ctx = libxl__gc_owner(gc); 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 = dm_vnc(guest_config, info); + const libxl_vnc_info *vnc = dm_vnc(guest_config); char *path, *logfile; int logfile_w, null; int rc; @@ -895,7 +901,7 @@ const char *dm; if (b_info->device_model_stubdomain) { - rc = libxl__create_stubdom(gc, guest_config, info, state, starting_r); + rc = libxl__create_stubdom(gc, domid, guest_config, state, starting_r); goto out; } @@ -910,18 +916,18 @@ rc = ERROR_FAIL; goto out; } - args = libxl__build_device_model_args(gc, dm, guest_config, info, state); + args = libxl__build_device_model_args(gc, dm, domid, guest_config, state); if (!args) { rc = ERROR_FAIL; goto out; } - path = xs_get_domain_path(ctx->xsh, info->domid); + path = xs_get_domain_path(ctx->xsh, domid); libxl__xs_write(gc, XBT_NULL, libxl__sprintf(gc, "%s/hvmloader/bios", path), "%s", libxl__domain_bios(gc, b_info)); free(path); - path = libxl__sprintf(gc, "/local/domain/0/device-model/%d", info->domid); + path = libxl__sprintf(gc, "/local/domain/0/device-model/%d", domid); xs_mkdir(ctx->xsh, XBT_NULL, path); libxl__xs_write(gc, XBT_NULL, libxl__sprintf(gc, "%s/disable_pf", path), "%d", !b_info->u.hvm.xen_platform_pci); @@ -945,8 +951,8 @@ p->for_spawn = NULL; } - p->domid = info->domid; - p->dom_path = libxl__xs_get_dompath(gc, info->domid); + 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; @@ -1068,14 +1074,6 @@ return ret; } -static int libxl__build_xenpv_qemu_args(libxl__gc *gc, - uint32_t domid, - libxl_device_model_info *info) -{ - info->domid = domid; - return 0; -} - int libxl__need_xenpv_qemu(libxl__gc *gc, int nr_consoles, libxl_device_console *consoles, int nr_vfbs, libxl_device_vfb *vfbs, @@ -1115,12 +1113,10 @@ int libxl__create_xenpv_qemu(libxl__gc *gc, uint32_t domid, libxl_domain_config *guest_config, - libxl_device_model_info *info, libxl__domain_build_state *state, libxl__spawner_starting **starting_r) { - libxl__build_xenpv_qemu_args(gc, domid, info); - libxl__create_device_model(gc, guest_config, info, state, starting_r); + libxl__create_device_model(gc, domid, guest_config, state, starting_r); return 0; } diff -r 9356938a851d -r 05310d1a73ed tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Tue Jan 31 16:34:38 2012 +0000 +++ b/tools/libxl/libxl_dom.c Tue Jan 31 16:34:38 2012 +0000 @@ -291,8 +291,7 @@ } static const char *libxl__domain_firmware(libxl__gc *gc, - libxl_domain_build_info *info, - libxl_device_model_info *dm_info) + libxl_domain_build_info *info) { libxl_ctx *ctx = libxl__gc_owner(gc); const char *firmware; @@ -320,12 +319,11 @@ int libxl__build_hvm(libxl__gc *gc, uint32_t domid, libxl_domain_build_info *info, - libxl_device_model_info *dm_info, libxl__domain_build_state *state) { libxl_ctx *ctx = libxl__gc_owner(gc); int ret, rc = ERROR_FAIL; - const char *firmware = libxl__domain_firmware(gc, info, dm_info); + const char *firmware = libxl__domain_firmware(gc, info); if (!firmware) goto out; diff -r 9356938a851d -r 05310d1a73ed tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Tue Jan 31 16:34:38 2012 +0000 +++ b/tools/libxl/libxl_internal.h Tue Jan 31 16:34:38 2012 +0000 @@ -615,7 +615,6 @@ libxl_domain_build_info *info, libxl__domain_build_state *state); _hidden int libxl__build_hvm(libxl__gc *gc, uint32_t domid, libxl_domain_build_info *info, - libxl_device_model_info *dm_info, libxl__domain_build_state *state); _hidden int libxl__domain_rename(libxl__gc *gc, uint32_t domid, @@ -858,10 +857,11 @@ const char *arg0, char **args); // logs errors, never returns /* from xl_create */ -_hidden int libxl__domain_make(libxl__gc *gc, libxl_domain_create_info *info, uint32_t *domid); +_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, - libxl_device_model_info *dm_info, uint32_t domid, libxl__domain_build_state *state); @@ -869,13 +869,12 @@ _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_device_model_info *info, 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_device_model_info *dm_info, libxl__domain_build_state *state, libxl__spawner_starting **starting_r); _hidden int libxl__need_xenpv_qemu(libxl__gc *gc, diff -r 9356938a851d -r 05310d1a73ed tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Tue Jan 31 16:34:38 2012 +0000 +++ b/tools/libxl/libxl_types.idl Tue Jan 31 16:34:38 2012 +0000 @@ -262,12 +262,6 @@ ], ) -# Device Model Information -libxl_device_model_info = Struct("device_model_info",[ - ("domid", libxl_domid), - ], -) - libxl_device_vfb = Struct("device_vfb", [ ("backend_domid", libxl_domid), ("devid", integer), diff -r 9356938a851d -r 05310d1a73ed tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Tue Jan 31 16:34:38 2012 +0000 +++ b/tools/libxl/xl_cmdimpl.c Tue Jan 31 16:34:38 2012 +0000 @@ -290,8 +290,7 @@ } static void printf_info(int domid, - libxl_domain_config *d_config, - libxl_device_model_info *dm_info) + libxl_domain_config *d_config) { int i; libxl_dominfo info; @@ -631,8 +630,7 @@ static void parse_config_data(const char *configfile_filename_report, const char *configfile_data, int configfile_len, - libxl_domain_config *d_config, - libxl_device_model_info *dm_info) + libxl_domain_config *d_config) { const char *buf; long l; @@ -1194,9 +1192,6 @@ break; } - /* init dm from c and b */ - if (libxl_init_dm_info(ctx, dm_info, c_info, b_info)) - exit(1); /* parse device model arguments, this works for pv, hvm and stubdom */ if (!xlu_cfg_get_string (config, "device_model", &buf, 0)) { fprintf(stderr, @@ -1452,7 +1447,7 @@ int no_incr_generationid; }; -static int freemem(libxl_domain_build_info *b_info, libxl_device_model_info *dm_info) +static int freemem(libxl_domain_build_info *b_info) { int rc, retries = 3; uint32_t need_memkb, free_memkb; @@ -1460,7 +1455,7 @@ if (!autoballoon) return 0; - rc = libxl_domain_need_memory(ctx, b_info, dm_info, &need_memkb); + rc = libxl_domain_need_memory(ctx, b_info, &need_memkb); if (rc < 0) return rc; @@ -1679,7 +1674,7 @@ if (!dom_info->quiet) printf("Parsing config file %s\n", config_file); - parse_config_data(config_file, config_data, config_len, &d_config, &d_config.dm_info); + parse_config_data(config_file, config_data, config_len, &d_config); if (migrate_fd >= 0) { if (d_config.c_info.name) { @@ -1704,7 +1699,7 @@ dom_info->no_incr_generationid; if (debug || dom_info->dryrun) - printf_info(-1, &d_config, &d_config.dm_info); + printf_info(-1, &d_config); ret = 0; if (dom_info->dryrun) @@ -1717,7 +1712,7 @@ if (rc < 0) goto error_out; - ret = freemem(&d_config.b_info, &d_config.dm_info); + ret = freemem(&d_config.b_info); if (ret < 0) { fprintf(stderr, "failed to free memory for the domain\n"); ret = ERROR_FAIL; @@ -2484,7 +2479,6 @@ char *config_file; uint8_t *data; int i, len, rc; - libxl_device_model_info dm_info; for (i = 0; i < nb_domain; i++) { /* no detailed info available on dom0 */ @@ -2495,8 +2489,8 @@ continue; CHK_ERRNO(asprintf(&config_file, "", info[i].domid)); memset(&d_config, 0x00, sizeof(d_config)); - parse_config_data(config_file, (char *)data, len, &d_config, &dm_info); - printf_info(info[i].domid, &d_config, &dm_info); + parse_config_data(config_file, (char *)data, len, &d_config); + printf_info(info[i].domid, &d_config); libxl_domain_config_dispose(&d_config); free(data); free(config_file); diff -r 9356938a851d -r 05310d1a73ed tools/ocaml/libs/xl/genwrap.py --- a/tools/ocaml/libs/xl/genwrap.py Tue Jan 31 16:34:38 2012 +0000 +++ b/tools/ocaml/libs/xl/genwrap.py Tue Jan 31 16:34:38 2012 +0000 @@ -266,7 +266,6 @@ "cpupoolinfo", "domain_create_info", "domain_build_info", - "device_model_info", "vcpuinfo", "topologyinfo", "event", _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:58:33 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:58: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 1RtR9N-00085v-Eu; Fri, 03 Feb 2012 21:58:33 +0000 Received: from mail182.messagelabs.com ([85.158.139.83]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR9L-000811-S0 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:32 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-182.messagelabs.com!1328306302!13568369!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30058 invoked from network); 3 Feb 2012 21:58:23 -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; 3 Feb 2012 21:58:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR9C-0001os-DC for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR9B-000385-H9 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:22 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:58:20 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: remove libxl_device_model_info. X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1328027678 0 # Node ID 05310d1a73ed310e3c0c18f9829a4356a40f8cb6 # Parent 9356938a851d93571fc16c5922f5db8242d7daf7 libxl: remove libxl_device_model_info. All that is left here is the target domain's domid which we can pass around as a parameter. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 9356938a851d -r 05310d1a73ed tools/libxl/libxl.c --- a/tools/libxl/libxl.c Tue Jan 31 16:34:38 2012 +0000 +++ b/tools/libxl/libxl.c Tue Jan 31 16:34:38 2012 +0000 @@ -2621,7 +2621,7 @@ } int libxl_domain_need_memory(libxl_ctx *ctx, libxl_domain_build_info *b_info, - libxl_device_model_info *dm_info, uint32_t *need_memkb) + uint32_t *need_memkb) { GC_INIT(ctx); int rc = ERROR_INVAL; diff -r 9356938a851d -r 05310d1a73ed tools/libxl/libxl.h --- a/tools/libxl/libxl.h Tue Jan 31 16:34:38 2012 +0000 +++ b/tools/libxl/libxl.h Tue Jan 31 16:34:38 2012 +0000 @@ -295,7 +295,6 @@ typedef struct { libxl_domain_create_info c_info; libxl_domain_build_info b_info; - libxl_device_model_info dm_info; int num_disks, num_vifs, num_pcidevs, num_vfbs, num_vkbs; @@ -323,10 +322,6 @@ int libxl_init_build_info(libxl_ctx *ctx, libxl_domain_build_info *b_info, libxl_domain_create_info *c_info); -int libxl_init_dm_info(libxl_ctx *ctx, - libxl_device_model_info *dm_info, - libxl_domain_create_info *c_info, - libxl_domain_build_info *b_info); 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); @@ -379,7 +374,7 @@ int libxl_get_memory_target(libxl_ctx *ctx, uint32_t domid, uint32_t *out_target); /* how much free memory in the system a domain needs to be built */ int libxl_domain_need_memory(libxl_ctx *ctx, libxl_domain_build_info *b_info, - libxl_device_model_info *dm_info, uint32_t *need_memkb); + uint32_t *need_memkb); /* how much free memory is available in the system */ int libxl_get_free_memory(libxl_ctx *ctx, uint32_t *memkb); /* wait for a given amount of memory to be free in the system */ diff -r 9356938a851d -r 05310d1a73ed tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Tue Jan 31 16:34:38 2012 +0000 +++ b/tools/libxl/libxl_create.c Tue Jan 31 16:34:38 2012 +0000 @@ -48,7 +48,6 @@ libxl_domain_create_info_dispose(&d_config->c_info); libxl_domain_build_info_dispose(&d_config->b_info); - libxl_device_model_info_dispose(&d_config->dm_info); } int libxl_init_create_info(libxl_ctx *ctx, libxl_domain_create_info *c_info) @@ -130,17 +129,6 @@ return 0; } -int libxl_init_dm_info(libxl_ctx *ctx, - libxl_device_model_info *dm_info, - libxl_domain_create_info *c_info, - libxl_domain_build_info *b_info) -{ - memset(dm_info, '\0', sizeof(*dm_info)); - - - return 0; -} - static int init_console_info(libxl_device_console *console, int dev_num) { memset(console, 0x00, sizeof(libxl_device_console)); @@ -154,7 +142,6 @@ int libxl__domain_build(libxl__gc *gc, libxl_domain_build_info *info, - libxl_device_model_info *dm_info, uint32_t domid, libxl__domain_build_state *state) { @@ -170,7 +157,7 @@ switch (info->type) { case LIBXL_DOMAIN_TYPE_HVM: - ret = libxl__build_hvm(gc, domid, info, dm_info, state); + ret = libxl__build_hvm(gc, domid, info, state); if (ret) goto out; @@ -224,8 +211,7 @@ static int domain_restore(libxl__gc *gc, libxl_domain_build_info *info, uint32_t domid, int fd, - libxl__domain_build_state *state, - libxl_device_model_info *dm_info) + libxl__domain_build_state *state) { libxl_ctx *ctx = libxl__gc_owner(gc); char **vments = NULL, **localents = NULL; @@ -477,7 +463,6 @@ { libxl_ctx *ctx = libxl__gc_owner(gc); libxl__spawner_starting *dm_starting = 0; - libxl_device_model_info *dm_info = &d_config->dm_info; libxl__domain_build_state state; uint32_t domid; int i, ret; @@ -514,9 +499,9 @@ memset(&state, 0, sizeof(state)); if ( restore_fd >= 0 ) { - ret = domain_restore(gc, &d_config->b_info, domid, restore_fd, &state, dm_info); + ret = domain_restore(gc, &d_config->b_info, domid, restore_fd, &state); } else { - ret = libxl__domain_build(gc, &d_config->b_info, dm_info, domid, &state); + ret = libxl__domain_build(gc, &d_config->b_info, domid, &state); } if (ret) { @@ -563,8 +548,7 @@ libxl_device_vkb_add(ctx, domid, &vkb); libxl_device_vkb_dispose(&vkb); - dm_info->domid = domid; - ret = libxl__create_device_model(gc, d_config, dm_info, + ret = libxl__create_device_model(gc, domid, d_config, &state, &dm_starting); if (ret < 0) { LIBXL__LOG(ctx, LIBXL__LOG_ERROR, @@ -577,7 +561,6 @@ { int need_qemu = 0; libxl_device_console console; - libxl_device_model_info xenpv_dm_info; for (i = 0; i < d_config->num_vfbs; i++) { libxl_device_vfb_add(ctx, domid, &d_config->vfbs[i]); @@ -599,11 +582,7 @@ libxl_device_console_dispose(&console); if (need_qemu) { - /* only copy those useful configs */ - memset((void*)&xenpv_dm_info, 0, sizeof(libxl_device_model_info)); - - libxl__create_xenpv_qemu(gc, domid, d_config, - &xenpv_dm_info, &state, &dm_starting); + libxl__create_xenpv_qemu(gc, domid, d_config, &state, &dm_starting); } break; } diff -r 9356938a851d -r 05310d1a73ed tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Tue Jan 31 16:34:38 2012 +0000 +++ b/tools/libxl/libxl_dm.c Tue Jan 31 16:34:38 2012 +0000 @@ -73,8 +73,7 @@ } } -static const libxl_vnc_info *dm_vnc(const libxl_domain_config *guest_config, - const libxl_device_model_info *info) +static const libxl_vnc_info *dm_vnc(const libxl_domain_config *guest_config) { const libxl_vnc_info *vnc = NULL; if (guest_config->b_info.type == LIBXL_DOMAIN_TYPE_HVM) { @@ -85,8 +84,7 @@ return vnc && vnc->enable ? vnc : NULL; } -static const libxl_sdl_info *dm_sdl(const libxl_domain_config *guest_config, - const libxl_device_model_info *info) +static const libxl_sdl_info *dm_sdl(const libxl_domain_config *guest_config) { const libxl_sdl_info *sdl = NULL; if (guest_config->b_info.type == LIBXL_DOMAIN_TYPE_HVM) { @@ -97,8 +95,7 @@ return sdl && sdl->enable ? sdl : NULL; } -static const char *dm_keymap(const libxl_domain_config *guest_config, - const libxl_device_model_info *info) +static const char *dm_keymap(const libxl_domain_config *guest_config) { if (guest_config->b_info.type == LIBXL_DOMAIN_TYPE_HVM) { return guest_config->b_info.u.hvm.keymap; @@ -109,18 +106,17 @@ } static char ** libxl__build_device_model_args_old(libxl__gc *gc, - const char *dm, + const char *dm, int domid, const libxl_domain_config *guest_config, - const libxl_device_model_info *info, const libxl__domain_build_state *state) { const libxl_domain_create_info *c_info = &guest_config->c_info; const libxl_domain_build_info *b_info = &guest_config->b_info; const libxl_device_nic *vifs = guest_config->vifs; - const libxl_vnc_info *vnc = dm_vnc(guest_config, info); - const libxl_sdl_info *sdl = dm_sdl(guest_config, info); + const libxl_vnc_info *vnc = dm_vnc(guest_config); + const libxl_sdl_info *sdl = dm_sdl(guest_config); const int num_vifs = guest_config->num_vifs; - const char *keymap = dm_keymap(guest_config, info); + const char *keymap = dm_keymap(guest_config); int i; flexarray_t *dm_args; dm_args = flexarray_make(16, 1); @@ -129,7 +125,7 @@ return NULL; flexarray_vappend(dm_args, dm, - "-d", libxl__sprintf(gc, "%d", info->domid), NULL); + "-d", libxl__sprintf(gc, "%d", domid), NULL); if (c_info->name) flexarray_vappend(dm_args, "-domain-name", c_info->name, NULL); @@ -225,7 +221,8 @@ LIBXL_MAC_FMT, LIBXL_MAC_BYTES(vifs[i].mac)); char *ifname; if (!vifs[i].ifname) - ifname = libxl__sprintf(gc, "tap%d.%d", info->domid, vifs[i].devid); + ifname = libxl__sprintf(gc, + "tap%d.%d", domid, vifs[i].devid); else ifname = vifs[i].ifname; flexarray_vappend(dm_args, @@ -320,9 +317,8 @@ } static char ** libxl__build_device_model_args_new(libxl__gc *gc, - const char *dm, + const char *dm, int guest_domid, const libxl_domain_config *guest_config, - const libxl_device_model_info *info, const libxl__domain_build_state *state) { libxl_ctx *ctx = libxl__gc_owner(gc); @@ -332,9 +328,9 @@ const libxl_device_nic *vifs = guest_config->vifs; const int num_disks = guest_config->num_disks; const int num_vifs = guest_config->num_vifs; - const libxl_vnc_info *vnc = dm_vnc(guest_config, info); - const libxl_sdl_info *sdl = dm_sdl(guest_config, info); - const char *keymap = dm_keymap(guest_config, info); + const libxl_vnc_info *vnc = dm_vnc(guest_config); + const libxl_sdl_info *sdl = dm_sdl(guest_config); + const char *keymap = dm_keymap(guest_config); flexarray_t *dm_args; int i; @@ -343,14 +339,14 @@ return NULL; flexarray_vappend(dm_args, dm, - "-xen-domid", libxl__sprintf(gc, "%d", info->domid), NULL); + "-xen-domid", + libxl__sprintf(gc, "%d", guest_domid), NULL); flexarray_append(dm_args, "-chardev"); flexarray_append(dm_args, libxl__sprintf(gc, "socket,id=libxl-cmd," "path=%s/qmp-libxl-%d,server,nowait", - libxl_run_dir_path(), - info->domid)); + libxl_run_dir_path(), guest_domid)); flexarray_append(dm_args, "-mon"); flexarray_append(dm_args, "chardev=libxl-cmd,mode=control"); @@ -460,7 +456,8 @@ LIBXL_MAC_FMT, LIBXL_MAC_BYTES(vifs[i].mac)); char *ifname; if (!vifs[i].ifname) { - ifname = libxl__sprintf(gc, "tap%d.%d", info->domid, vifs[i].devid); + ifname = libxl__sprintf(gc, "tap%d.%d", + guest_domid, vifs[i].devid); } else { ifname = vifs[i].ifname; } @@ -581,18 +578,21 @@ } static char ** libxl__build_device_model_args(libxl__gc *gc, - const char *dm, + const char *dm, int guest_domid, const libxl_domain_config *guest_config, - const libxl_device_model_info *info, const libxl__domain_build_state *state) { libxl_ctx *ctx = libxl__gc_owner(gc); switch (guest_config->b_info.device_model_version) { case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: - return libxl__build_device_model_args_old(gc, dm, guest_config, info, state); + return libxl__build_device_model_args_old(gc, dm, + guest_domid, guest_config, + state); case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: - return libxl__build_device_model_args_new(gc, dm, guest_config, info, state); + return libxl__build_device_model_args_new(gc, dm, + guest_domid, guest_config, + state); default: LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "unknown device model version %d", guest_config->b_info.device_model_version); @@ -624,7 +624,9 @@ return 0; } -static int libxl__write_dmargs(libxl__gc *gc, int domid, int guest_domid, char **args) +static int libxl__write_stub_dmargs(libxl__gc *gc, + int dm_domid, int guest_domid, + char **args) { libxl_ctx *ctx = libxl__gc_owner(gc); int i; @@ -636,7 +638,7 @@ roperm[0].id = 0; roperm[0].perms = XS_PERM_NONE; - roperm[1].id = domid; + roperm[1].id = dm_domid; roperm[1].perms = XS_PERM_READ; vm_path = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, "/local/domain/%d/vm", guest_domid)); @@ -673,8 +675,8 @@ } static int libxl__create_stubdom(libxl__gc *gc, + int guest_domid, libxl_domain_config *guest_config, - libxl_device_model_info *info, libxl__domain_build_state *d_state, libxl__spawner_starting **starting_r) { @@ -685,12 +687,11 @@ libxl_device_vfb vfb; libxl_device_vkb vkb; libxl__domain_build_state stubdom_state; - uint32_t domid; + uint32_t dm_domid; char **args; struct xs_permissions perm[2]; xs_transaction_t t; libxl__spawner_starting *dm_starting = 0; - libxl_device_model_info xenpv_dm_info; if (guest_config->b_info.device_model_version != LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL) { @@ -700,7 +701,8 @@ memset(&dm_config.c_info, 0x00, sizeof(libxl_domain_create_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, info->domid)); + dm_config.c_info.name = libxl__sprintf(gc, "%s-dm", + libxl__domid_to_name(gc, guest_domid)); libxl_uuid_generate(&dm_config.c_info.uuid); @@ -713,7 +715,7 @@ dm_config.b_info.type = LIBXL_DOMAIN_TYPE_PV; 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", info->domid); + 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 = ""; @@ -738,62 +740,69 @@ dm_config.num_vkbs = 1; /* fixme: this function can leak the stubdom if it fails */ - domid = 0; - ret = libxl__domain_make(gc, &dm_config.c_info, &domid); + dm_domid = 0; + ret = libxl__domain_make(gc, &dm_config.c_info, &dm_domid); if (ret) goto out; - ret = libxl__domain_build(gc, &dm_config.b_info, info, domid, &stubdom_state); + ret = libxl__domain_build(gc, &dm_config.b_info, dm_domid, &stubdom_state); if (ret) goto out; - args = libxl__build_device_model_args(gc, "stubdom-dm", - guest_config, info, d_state); + args = libxl__build_device_model_args(gc, "stubdom-dm", guest_domid, + guest_config, d_state); if (!args) { ret = ERROR_FAIL; goto out; } - libxl__write_dmargs(gc, domid, info->domid, args); + libxl__write_stub_dmargs(gc, dm_domid, guest_domid, args); libxl__xs_write(gc, XBT_NULL, - libxl__sprintf(gc, "%s/image/device-model-domid", libxl__xs_get_dompath(gc, info->domid)), - "%d", domid); + libxl__sprintf(gc, "%s/image/device-model-domid", + libxl__xs_get_dompath(gc, guest_domid)), + "%d", dm_domid); libxl__xs_write(gc, XBT_NULL, - libxl__sprintf(gc, "%s/target", libxl__xs_get_dompath(gc, domid)), - "%d", info->domid); - ret = xc_domain_set_target(ctx->xch, domid, info->domid); + libxl__sprintf(gc, "%s/target", + libxl__xs_get_dompath(gc, dm_domid)), + "%d", guest_domid); + ret = xc_domain_set_target(ctx->xch, dm_domid, guest_domid); if (ret<0) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "setting target domain %d -> %d", domid, info->domid); + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, + "setting target domain %d -> %d", + dm_domid, guest_domid); ret = ERROR_FAIL; goto out_free; } - xs_set_target(ctx->xsh, domid, info->domid); + xs_set_target(ctx->xsh, dm_domid, guest_domid); - perm[0].id = domid; + perm[0].id = dm_domid; perm[0].perms = XS_PERM_NONE; - perm[1].id = info->domid; + perm[1].id = guest_domid; perm[1].perms = XS_PERM_READ; retry_transaction: t = xs_transaction_start(ctx->xsh); - xs_mkdir(ctx->xsh, t, libxl__sprintf(gc, "/local/domain/0/device-model/%d", info->domid)); - xs_set_permissions(ctx->xsh, t, libxl__sprintf(gc, "/local/domain/0/device-model/%d", info->domid), perm, ARRAY_SIZE(perm)); + xs_mkdir(ctx->xsh, t, + libxl__sprintf(gc, "/local/domain/0/device-model/%d", guest_domid)); + xs_set_permissions(ctx->xsh, t, + libxl__sprintf(gc, "/local/domain/0/device-model/%d", guest_domid), + perm, ARRAY_SIZE(perm)); if (!xs_transaction_end(ctx->xsh, t, 0)) if (errno == EAGAIN) goto retry_transaction; for (i = 0; i < dm_config.num_disks; i++) { - ret = libxl_device_disk_add(ctx, domid, &dm_config.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, domid, &dm_config.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, 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, domid, &dm_config.vkbs[0]); + ret = libxl_device_vkb_add(ctx, dm_domid, &dm_config.vkbs[0]); if (ret) goto out_free; @@ -818,14 +827,14 @@ char *name; case STUBDOM_CONSOLE_LOGGING: name = libxl__sprintf(gc, "qemu-dm-%s", - libxl_domid_to_name(ctx, info->domid)); + libxl_domid_to_name(ctx, guest_domid)); libxl_create_logfile(ctx, name, &filename); console[i].output = libxl__sprintf(gc, "file:%s", filename); free(filename); break; case STUBDOM_CONSOLE_SAVE: console[i].output = libxl__sprintf(gc, "file:%s", - libxl__device_model_savefile(gc, info->domid)); + libxl__device_model_savefile(gc, guest_domid)); break; case STUBDOM_CONSOLE_RESTORE: if (d_state->saved_state) @@ -836,17 +845,14 @@ console[i].output = "pty"; break; } - ret = libxl__device_console_add(gc, domid, &console[i], + ret = libxl__device_console_add(gc, dm_domid, &console[i], i == STUBDOM_CONSOLE_LOGGING ? &stubdom_state : NULL); if (ret) goto out_free; } - memset((void*)&xenpv_dm_info, 0, sizeof(libxl_device_model_info)); - - if (libxl__create_xenpv_qemu(gc, domid, + if (libxl__create_xenpv_qemu(gc, dm_domid, &dm_config, - &xenpv_dm_info, &stubdom_state, &dm_starting) < 0) { ret = ERROR_FAIL; @@ -857,12 +863,12 @@ goto out_free; } - libxl_domain_unpause(ctx, domid); + libxl_domain_unpause(ctx, dm_domid); if (starting_r) { *starting_r = calloc(1, sizeof(libxl__spawner_starting)); - (*starting_r)->domid = info->domid; - (*starting_r)->dom_path = libxl__xs_get_dompath(gc, info->domid); + (*starting_r)->domid = guest_domid; + (*starting_r)->dom_path = libxl__xs_get_dompath(gc, guest_domid); (*starting_r)->for_spawn = NULL; } @@ -875,15 +881,15 @@ } int libxl__create_device_model(libxl__gc *gc, + int domid, libxl_domain_config *guest_config, - libxl_device_model_info *info, libxl__domain_build_state *state, libxl__spawner_starting **starting_r) { libxl_ctx *ctx = libxl__gc_owner(gc); 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 = dm_vnc(guest_config, info); + const libxl_vnc_info *vnc = dm_vnc(guest_config); char *path, *logfile; int logfile_w, null; int rc; @@ -895,7 +901,7 @@ const char *dm; if (b_info->device_model_stubdomain) { - rc = libxl__create_stubdom(gc, guest_config, info, state, starting_r); + rc = libxl__create_stubdom(gc, domid, guest_config, state, starting_r); goto out; } @@ -910,18 +916,18 @@ rc = ERROR_FAIL; goto out; } - args = libxl__build_device_model_args(gc, dm, guest_config, info, state); + args = libxl__build_device_model_args(gc, dm, domid, guest_config, state); if (!args) { rc = ERROR_FAIL; goto out; } - path = xs_get_domain_path(ctx->xsh, info->domid); + path = xs_get_domain_path(ctx->xsh, domid); libxl__xs_write(gc, XBT_NULL, libxl__sprintf(gc, "%s/hvmloader/bios", path), "%s", libxl__domain_bios(gc, b_info)); free(path); - path = libxl__sprintf(gc, "/local/domain/0/device-model/%d", info->domid); + path = libxl__sprintf(gc, "/local/domain/0/device-model/%d", domid); xs_mkdir(ctx->xsh, XBT_NULL, path); libxl__xs_write(gc, XBT_NULL, libxl__sprintf(gc, "%s/disable_pf", path), "%d", !b_info->u.hvm.xen_platform_pci); @@ -945,8 +951,8 @@ p->for_spawn = NULL; } - p->domid = info->domid; - p->dom_path = libxl__xs_get_dompath(gc, info->domid); + 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; @@ -1068,14 +1074,6 @@ return ret; } -static int libxl__build_xenpv_qemu_args(libxl__gc *gc, - uint32_t domid, - libxl_device_model_info *info) -{ - info->domid = domid; - return 0; -} - int libxl__need_xenpv_qemu(libxl__gc *gc, int nr_consoles, libxl_device_console *consoles, int nr_vfbs, libxl_device_vfb *vfbs, @@ -1115,12 +1113,10 @@ int libxl__create_xenpv_qemu(libxl__gc *gc, uint32_t domid, libxl_domain_config *guest_config, - libxl_device_model_info *info, libxl__domain_build_state *state, libxl__spawner_starting **starting_r) { - libxl__build_xenpv_qemu_args(gc, domid, info); - libxl__create_device_model(gc, guest_config, info, state, starting_r); + libxl__create_device_model(gc, domid, guest_config, state, starting_r); return 0; } diff -r 9356938a851d -r 05310d1a73ed tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Tue Jan 31 16:34:38 2012 +0000 +++ b/tools/libxl/libxl_dom.c Tue Jan 31 16:34:38 2012 +0000 @@ -291,8 +291,7 @@ } static const char *libxl__domain_firmware(libxl__gc *gc, - libxl_domain_build_info *info, - libxl_device_model_info *dm_info) + libxl_domain_build_info *info) { libxl_ctx *ctx = libxl__gc_owner(gc); const char *firmware; @@ -320,12 +319,11 @@ int libxl__build_hvm(libxl__gc *gc, uint32_t domid, libxl_domain_build_info *info, - libxl_device_model_info *dm_info, libxl__domain_build_state *state) { libxl_ctx *ctx = libxl__gc_owner(gc); int ret, rc = ERROR_FAIL; - const char *firmware = libxl__domain_firmware(gc, info, dm_info); + const char *firmware = libxl__domain_firmware(gc, info); if (!firmware) goto out; diff -r 9356938a851d -r 05310d1a73ed tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Tue Jan 31 16:34:38 2012 +0000 +++ b/tools/libxl/libxl_internal.h Tue Jan 31 16:34:38 2012 +0000 @@ -615,7 +615,6 @@ libxl_domain_build_info *info, libxl__domain_build_state *state); _hidden int libxl__build_hvm(libxl__gc *gc, uint32_t domid, libxl_domain_build_info *info, - libxl_device_model_info *dm_info, libxl__domain_build_state *state); _hidden int libxl__domain_rename(libxl__gc *gc, uint32_t domid, @@ -858,10 +857,11 @@ const char *arg0, char **args); // logs errors, never returns /* from xl_create */ -_hidden int libxl__domain_make(libxl__gc *gc, libxl_domain_create_info *info, uint32_t *domid); +_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, - libxl_device_model_info *dm_info, uint32_t domid, libxl__domain_build_state *state); @@ -869,13 +869,12 @@ _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_device_model_info *info, 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_device_model_info *dm_info, libxl__domain_build_state *state, libxl__spawner_starting **starting_r); _hidden int libxl__need_xenpv_qemu(libxl__gc *gc, diff -r 9356938a851d -r 05310d1a73ed tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Tue Jan 31 16:34:38 2012 +0000 +++ b/tools/libxl/libxl_types.idl Tue Jan 31 16:34:38 2012 +0000 @@ -262,12 +262,6 @@ ], ) -# Device Model Information -libxl_device_model_info = Struct("device_model_info",[ - ("domid", libxl_domid), - ], -) - libxl_device_vfb = Struct("device_vfb", [ ("backend_domid", libxl_domid), ("devid", integer), diff -r 9356938a851d -r 05310d1a73ed tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Tue Jan 31 16:34:38 2012 +0000 +++ b/tools/libxl/xl_cmdimpl.c Tue Jan 31 16:34:38 2012 +0000 @@ -290,8 +290,7 @@ } static void printf_info(int domid, - libxl_domain_config *d_config, - libxl_device_model_info *dm_info) + libxl_domain_config *d_config) { int i; libxl_dominfo info; @@ -631,8 +630,7 @@ static void parse_config_data(const char *configfile_filename_report, const char *configfile_data, int configfile_len, - libxl_domain_config *d_config, - libxl_device_model_info *dm_info) + libxl_domain_config *d_config) { const char *buf; long l; @@ -1194,9 +1192,6 @@ break; } - /* init dm from c and b */ - if (libxl_init_dm_info(ctx, dm_info, c_info, b_info)) - exit(1); /* parse device model arguments, this works for pv, hvm and stubdom */ if (!xlu_cfg_get_string (config, "device_model", &buf, 0)) { fprintf(stderr, @@ -1452,7 +1447,7 @@ int no_incr_generationid; }; -static int freemem(libxl_domain_build_info *b_info, libxl_device_model_info *dm_info) +static int freemem(libxl_domain_build_info *b_info) { int rc, retries = 3; uint32_t need_memkb, free_memkb; @@ -1460,7 +1455,7 @@ if (!autoballoon) return 0; - rc = libxl_domain_need_memory(ctx, b_info, dm_info, &need_memkb); + rc = libxl_domain_need_memory(ctx, b_info, &need_memkb); if (rc < 0) return rc; @@ -1679,7 +1674,7 @@ if (!dom_info->quiet) printf("Parsing config file %s\n", config_file); - parse_config_data(config_file, config_data, config_len, &d_config, &d_config.dm_info); + parse_config_data(config_file, config_data, config_len, &d_config); if (migrate_fd >= 0) { if (d_config.c_info.name) { @@ -1704,7 +1699,7 @@ dom_info->no_incr_generationid; if (debug || dom_info->dryrun) - printf_info(-1, &d_config, &d_config.dm_info); + printf_info(-1, &d_config); ret = 0; if (dom_info->dryrun) @@ -1717,7 +1712,7 @@ if (rc < 0) goto error_out; - ret = freemem(&d_config.b_info, &d_config.dm_info); + ret = freemem(&d_config.b_info); if (ret < 0) { fprintf(stderr, "failed to free memory for the domain\n"); ret = ERROR_FAIL; @@ -2484,7 +2479,6 @@ char *config_file; uint8_t *data; int i, len, rc; - libxl_device_model_info dm_info; for (i = 0; i < nb_domain; i++) { /* no detailed info available on dom0 */ @@ -2495,8 +2489,8 @@ continue; CHK_ERRNO(asprintf(&config_file, "", info[i].domid)); memset(&d_config, 0x00, sizeof(d_config)); - parse_config_data(config_file, (char *)data, len, &d_config, &dm_info); - printf_info(info[i].domid, &d_config, &dm_info); + parse_config_data(config_file, (char *)data, len, &d_config); + printf_info(info[i].domid, &d_config); libxl_domain_config_dispose(&d_config); free(data); free(config_file); diff -r 9356938a851d -r 05310d1a73ed tools/ocaml/libs/xl/genwrap.py --- a/tools/ocaml/libs/xl/genwrap.py Tue Jan 31 16:34:38 2012 +0000 +++ b/tools/ocaml/libs/xl/genwrap.py Tue Jan 31 16:34:38 2012 +0000 @@ -266,7 +266,6 @@ "cpupoolinfo", "domain_create_info", "domain_build_info", - "device_model_info", "vcpuinfo", "topologyinfo", "event", _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:58:33 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:58: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 1RtR9N-000864-Ha; Fri, 03 Feb 2012 21:58:33 +0000 Received: from mail174.messagelabs.com ([85.158.138.51]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR9M-00081I-9H for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:32 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-174.messagelabs.com!1328306304!7715953!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26555 invoked from network); 3 Feb 2012 21:58:25 -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; 3 Feb 2012 21:58:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR9E-0001oy-DV for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR9D-00038u-RW for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:24 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:58:22 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: only write "disable_pf" key to xenstore when it makes sense X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1328027678 0 # Node ID 61ac1bf881ea15bdafe1b1b43911286cca5d48c8 # Parent 05310d1a73ed310e3c0c18f9829a4356a40f8cb6 libxl: only write "disable_pf" key to xenstore when it makes sense This key is only used by the traditional qemu-dm when servicing an HVM domain. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 05310d1a73ed -r 61ac1bf881ea tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Tue Jan 31 16:34:38 2012 +0000 +++ b/tools/libxl/libxl_dm.c Tue Jan 31 16:34:38 2012 +0000 @@ -929,8 +929,12 @@ path = libxl__sprintf(gc, "/local/domain/0/device-model/%d", domid); xs_mkdir(ctx->xsh, XBT_NULL, path); - libxl__xs_write(gc, XBT_NULL, libxl__sprintf(gc, "%s/disable_pf", path), - "%d", !b_info->u.hvm.xen_platform_pci); + + if (b_info->type == LIBXL_DOMAIN_TYPE_HVM && + b_info->device_model_version + == LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL) + libxl__xs_write(gc, XBT_NULL, libxl__sprintf(gc, "%s/disable_pf", path), + "%d", !b_info->u.hvm.xen_platform_pci); libxl_create_logfile(ctx, libxl__sprintf(gc, "qemu-dm-%s", c_info->name), _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:58:33 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:58: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 1RtR9N-000864-Ha; Fri, 03 Feb 2012 21:58:33 +0000 Received: from mail174.messagelabs.com ([85.158.138.51]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR9M-00081I-9H for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:32 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-174.messagelabs.com!1328306304!7715953!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26555 invoked from network); 3 Feb 2012 21:58:25 -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; 3 Feb 2012 21:58:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR9E-0001oy-DV for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR9D-00038u-RW for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:24 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:58:22 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: only write "disable_pf" key to xenstore when it makes sense X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1328027678 0 # Node ID 61ac1bf881ea15bdafe1b1b43911286cca5d48c8 # Parent 05310d1a73ed310e3c0c18f9829a4356a40f8cb6 libxl: only write "disable_pf" key to xenstore when it makes sense This key is only used by the traditional qemu-dm when servicing an HVM domain. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 05310d1a73ed -r 61ac1bf881ea tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Tue Jan 31 16:34:38 2012 +0000 +++ b/tools/libxl/libxl_dm.c Tue Jan 31 16:34:38 2012 +0000 @@ -929,8 +929,12 @@ path = libxl__sprintf(gc, "/local/domain/0/device-model/%d", domid); xs_mkdir(ctx->xsh, XBT_NULL, path); - libxl__xs_write(gc, XBT_NULL, libxl__sprintf(gc, "%s/disable_pf", path), - "%d", !b_info->u.hvm.xen_platform_pci); + + if (b_info->type == LIBXL_DOMAIN_TYPE_HVM && + b_info->device_model_version + == LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL) + libxl__xs_write(gc, XBT_NULL, libxl__sprintf(gc, "%s/disable_pf", path), + "%d", !b_info->u.hvm.xen_platform_pci); libxl_create_logfile(ctx, libxl__sprintf(gc, "qemu-dm-%s", c_info->name), _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:58:38 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:58: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 1RtR9S-0008AJ-Np; Fri, 03 Feb 2012 21:58:38 +0000 Received: from mail174.messagelabs.com ([85.158.138.51]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR9Q-00084F-F8 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:36 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-174.messagelabs.com!1328306309!11908956!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.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4361 invoked from network); 3 Feb 2012 21:58:30 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 3 Feb 2012 21:58:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR9I-0001pB-VN for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR9H-0003AE-Eq for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:28 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:58:26 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: de-hard-tabbify idl.txt X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1328027679 0 # Node ID a322bdbd43deaa67fbe1c4072fee38a797f51923 # Parent e61ac54bbf1c3ef7cb05965dc68dc66e8f372094 libxl: de-hard-tabbify idl.txt Hard tabs were in the minority, nuke them. Also we no longer supply the inaddr_ip builtin. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r e61ac54bbf1c -r a322bdbd43de tools/libxl/idl.txt --- a/tools/libxl/idl.txt Tue Jan 31 16:34:38 2012 +0000 +++ b/tools/libxl/idl.txt Tue Jan 31 16:34:39 2012 +0000 @@ -2,10 +2,9 @@ --------- Each type in the libxl interface is represented by an object of type -idl.Type (or a subclass thereof). Every local variable defined by -the .idl file must be an instance of idl.Type (e.g. you may not -define Python functions or any other construct other than defining -variables) +idl.Type (or a subclass thereof). Every local variable defined by the +.idl file must be an instance of idl.Type (e.g. you may not define +Python functions or any other construct other than defining variables) The name of the type must be passed as the first argument to the constructor when defining a new type. The name given should not @@ -16,9 +15,9 @@ namespace element while Type.rawname is always set to the 'base' name of the type. -The idl.Type base class has several other properties which apply -to all types. The properties are set by passing a named parameter to -the constructor. +The idl.Type base class has several other properties which apply to +all types. The properties are set by passing a named parameter to the +constructor. Type.namespace: (default: "libxl_") @@ -81,7 +80,7 @@ Each EnumerationValue has the following properties: - EnumerationValue.enum Reference to containing Enumeration + EnumerationValue.enum Reference to containing Enumeration EnumerationValue.name The C name of this value, including the namespace and typename of the containing Enumeration (e.g. @@ -90,10 +89,10 @@ the namespace but including the typename of the containing Enumeration (e.g. "FOOENUM_VALUE") - EnumerationValue.valuename The name of this value, excluding the - name of the containing Enumeration - and any namespace (e.g. "VALUE") - EnumerationValue.value The integer value associated with this name. + EnumerationValue.valuename The name of this value, excluding the + name of the containing Enumeration + and any namespace (e.g. "VALUE") + EnumerationValue.value The integer value associated with this name. idl.Aggregate @@ -106,10 +105,10 @@ Each field has the following properties: - Field.type The type of the member (a idl.Type). + Field.type The type of the member (a idl.Type). Field.name The name of the member (can be None for anonymous - fields). - Field.const Boolean, true if the member is const. + fields). + Field.const Boolean, true if the member is const. idl.Struct @@ -139,15 +138,13 @@ Several standard types a predefined. They are -void (void pointer type) +void (void pointer type) bool size_t -integer 24 bit signed integer. +integer 24 bit signed integer. -uint{8,16,32,64} uint{8,16,32,64}_t +uint{8,16,32,64} uint{8,16,32,64}_t -domid Domain ID +domid Domain ID -string NULL terminated string - -inaddr_ip struct in_addr +string NULL terminated string _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:58:38 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:58: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 1RtR9S-0008AJ-Np; Fri, 03 Feb 2012 21:58:38 +0000 Received: from mail174.messagelabs.com ([85.158.138.51]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR9Q-00084F-F8 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:36 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-174.messagelabs.com!1328306309!11908956!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.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4361 invoked from network); 3 Feb 2012 21:58:30 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 3 Feb 2012 21:58:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR9I-0001pB-VN for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR9H-0003AE-Eq for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:28 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:58:26 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: de-hard-tabbify idl.txt X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1328027679 0 # Node ID a322bdbd43deaa67fbe1c4072fee38a797f51923 # Parent e61ac54bbf1c3ef7cb05965dc68dc66e8f372094 libxl: de-hard-tabbify idl.txt Hard tabs were in the minority, nuke them. Also we no longer supply the inaddr_ip builtin. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r e61ac54bbf1c -r a322bdbd43de tools/libxl/idl.txt --- a/tools/libxl/idl.txt Tue Jan 31 16:34:38 2012 +0000 +++ b/tools/libxl/idl.txt Tue Jan 31 16:34:39 2012 +0000 @@ -2,10 +2,9 @@ --------- Each type in the libxl interface is represented by an object of type -idl.Type (or a subclass thereof). Every local variable defined by -the .idl file must be an instance of idl.Type (e.g. you may not -define Python functions or any other construct other than defining -variables) +idl.Type (or a subclass thereof). Every local variable defined by the +.idl file must be an instance of idl.Type (e.g. you may not define +Python functions or any other construct other than defining variables) The name of the type must be passed as the first argument to the constructor when defining a new type. The name given should not @@ -16,9 +15,9 @@ namespace element while Type.rawname is always set to the 'base' name of the type. -The idl.Type base class has several other properties which apply -to all types. The properties are set by passing a named parameter to -the constructor. +The idl.Type base class has several other properties which apply to +all types. The properties are set by passing a named parameter to the +constructor. Type.namespace: (default: "libxl_") @@ -81,7 +80,7 @@ Each EnumerationValue has the following properties: - EnumerationValue.enum Reference to containing Enumeration + EnumerationValue.enum Reference to containing Enumeration EnumerationValue.name The C name of this value, including the namespace and typename of the containing Enumeration (e.g. @@ -90,10 +89,10 @@ the namespace but including the typename of the containing Enumeration (e.g. "FOOENUM_VALUE") - EnumerationValue.valuename The name of this value, excluding the - name of the containing Enumeration - and any namespace (e.g. "VALUE") - EnumerationValue.value The integer value associated with this name. + EnumerationValue.valuename The name of this value, excluding the + name of the containing Enumeration + and any namespace (e.g. "VALUE") + EnumerationValue.value The integer value associated with this name. idl.Aggregate @@ -106,10 +105,10 @@ Each field has the following properties: - Field.type The type of the member (a idl.Type). + Field.type The type of the member (a idl.Type). Field.name The name of the member (can be None for anonymous - fields). - Field.const Boolean, true if the member is const. + fields). + Field.const Boolean, true if the member is const. idl.Struct @@ -139,15 +138,13 @@ Several standard types a predefined. They are -void (void pointer type) +void (void pointer type) bool size_t -integer 24 bit signed integer. +integer 24 bit signed integer. -uint{8,16,32,64} uint{8,16,32,64}_t +uint{8,16,32,64} uint{8,16,32,64}_t -domid Domain ID +domid Domain ID -string NULL terminated string - -inaddr_ip struct in_addr +string NULL terminated string _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:58:40 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:58: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 1RtR9T-0008BM-Qk; Fri, 03 Feb 2012 21:58:39 +0000 Received: from mail174.messagelabs.com ([85.158.138.51]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR9R-00084g-AJ for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:37 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-174.messagelabs.com!1328306306!11933728!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.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12435 invoked from network); 3 Feb 2012 21:58:27 -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; 3 Feb 2012 21:58:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR9G-0001p5-Ox for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR9E-00039L-SA for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:26 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:58:24 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: Rename libxl IDL infrastructure. X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1328027678 0 # Node ID e61ac54bbf1c3ef7cb05965dc68dc66e8f372094 # Parent 61ac1bf881ea15bdafe1b1b43911286cca5d48c8 libxl: Rename libxl IDL infrastructure. Originally libxltypes.py provided the infrastructure and libxl.idl provided the specific types. In 23887:a543e10211f7 libxl.idl became libxl_types.idl (to allow for libxl_types_internal.idl) which means we now have libxl_types.FOO and libxltypes.FOO providing different things and annoying people in tab completion. Rename the infrastructure as idl. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 61ac1bf881ea -r e61ac54bbf1c tools/libxl/Makefile --- a/tools/libxl/Makefile Tue Jan 31 16:34:38 2012 +0000 +++ b/tools/libxl/Makefile Tue Jan 31 16:34:38 2012 +0000 @@ -111,7 +111,7 @@ $(LIBXL_OBJS) $(LIBXLU_OBJS) $(XL_OBJS): libxl.h $(LIBXL_OBJS): libxl_internal.h -_libxl_type%.h _libxl_type%_json.h _libxl_type%.c: libxl_type%.idl gentypes.py libxltypes.py +_libxl_type%.h _libxl_type%_json.h _libxl_type%.c: libxl_type%.idl gentypes.py idl.py $(PYTHON) gentypes.py libxl_type$*.idl __libxl_type$*.h __libxl_type$*_json.h __libxl_type$*.c $(call move-if-changed,__libxl_type$*.h,_libxl_type$*.h) $(call move-if-changed,__libxl_type$*_json.h,_libxl_type$*_json.h) diff -r 61ac1bf881ea -r e61ac54bbf1c tools/libxl/gentest.py --- a/tools/libxl/gentest.py Tue Jan 31 16:34:38 2012 +0000 +++ b/tools/libxl/gentest.py Tue Jan 31 16:34:38 2012 +0000 @@ -4,7 +4,7 @@ import re import random -import libxltypes +import idl def randomize_char(c): if random.random() < 0.5: @@ -25,9 +25,9 @@ def gen_rand_init(ty, v, indent = " ", parent = None): s = "" - if isinstance(ty, libxltypes.Enumeration): + if isinstance(ty, idl.Enumeration): s += "%s = %s;\n" % (ty.pass_arg(v, parent is None), randomize_enum(ty)) - elif isinstance(ty, libxltypes.KeyedUnion): + elif isinstance(ty, idl.KeyedUnion): if parent is None: raise Exception("KeyedUnion type must have a parent") s += "switch (%s) {\n" % (parent + ty.keyvar_name) @@ -37,7 +37,7 @@ s += gen_rand_init(f.type, fexpr, indent + " ", nparent) s += " break;\n" s += "}\n" - elif isinstance(ty, libxltypes.Struct) \ + elif isinstance(ty, idl.Struct) \ and (parent is None or ty.json_fn is None): for f in [f for f in ty.fields if not f.const]: (nparent,fexpr) = ty.member(v, f, parent is None) @@ -45,10 +45,10 @@ elif hasattr(ty, "rand_init") and ty.rand_init is not None: s += "%s(%s);\n" % (ty.rand_init, ty.pass_arg(v, isref=parent is None, - passby=libxltypes.PASS_BY_REFERENCE)) + passby=idl.PASS_BY_REFERENCE)) elif ty.typename in ["libxl_uuid", "libxl_mac", "libxl_hwcap"]: s += "rand_bytes((uint8_t *)%s, sizeof(*%s));\n" % (v,v) - elif ty.typename in ["libxl_domid"] or isinstance(ty, libxltypes.Number): + elif ty.typename in ["libxl_domid"] or isinstance(ty, idl.Number): s += "%s = rand() %% (sizeof(%s)*8);\n" % \ (ty.pass_arg(v, parent is None), ty.pass_arg(v, parent is None)) @@ -74,8 +74,7 @@ random.seed() - idl = sys.argv[1] - (builtins,types) = libxltypes.parse(idl) + (builtins,types) = idl.parse(sys.argv[1]) impl = sys.argv[2] f = open(impl, "w") @@ -215,10 +214,10 @@ if ty.typename not in handcoded: f.write("static void %s_rand_init(%s);\n" % \ (ty.typename, - ty.make_arg("p", passby=libxltypes.PASS_BY_REFERENCE))) + ty.make_arg("p", passby=idl.PASS_BY_REFERENCE))) f.write("static void %s_rand_init(%s)\n" % \ (ty.typename, - ty.make_arg("p", passby=libxltypes.PASS_BY_REFERENCE))) + ty.make_arg("p", passby=idl.PASS_BY_REFERENCE))) f.write("{\n") f.write(gen_rand_init(ty, "p")) f.write("}\n") @@ -252,7 +251,7 @@ for ty in [t for t in types if t.json_fn is not None]: arg = ty.typename + "_val" f.write(" %s_rand_init(%s);\n" % (ty.typename, \ - ty.pass_arg(arg, isref=False, passby=libxltypes.PASS_BY_REFERENCE))) + ty.pass_arg(arg, isref=False, passby=idl.PASS_BY_REFERENCE))) f.write(" s = %s_to_json(ctx, %s);\n" % \ (ty.typename, ty.pass_arg(arg, isref=False))) f.write(" printf(\"%%s: %%s\\n\", \"%s\", s);\n" % ty.typename) @@ -265,7 +264,7 @@ f.write(" printf(\"Testing Enumerations\\n\");\n") f.write(" printf(\"--------------------\\n\");\n") f.write(" printf(\"\\n\");\n") - for ty in [t for t in types if isinstance(t,libxltypes.Enumeration)]: + for ty in [t for t in types if isinstance(t,idl.Enumeration)]: f.write(" printf(\"%s -- to string:\\n\");\n" % (ty.typename)) for v in ty.values: f.write(" printf(\"\\t%s = %%d = \\\"%%s\\\"\\n\", " \ diff -r 61ac1bf881ea -r e61ac54bbf1c tools/libxl/gentypes.py --- a/tools/libxl/gentypes.py Tue Jan 31 16:34:38 2012 +0000 +++ b/tools/libxl/gentypes.py Tue Jan 31 16:34:38 2012 +0000 @@ -3,10 +3,10 @@ import sys import re -import libxltypes +import idl def libxl_C_instance_of(ty, instancename): - if isinstance(ty, libxltypes.Aggregate) and ty.typename is None: + if isinstance(ty, idl.Aggregate) and ty.typename is None: if instancename is None: return libxl_C_type_define(ty) else: @@ -16,7 +16,7 @@ def libxl_C_type_define(ty, indent = ""): s = "" - if isinstance(ty, libxltypes.Enumeration): + if isinstance(ty, idl.Enumeration): if ty.typename is None: s += "enum {\n" else: @@ -31,7 +31,7 @@ else: s += "} %s" % ty.typename - elif isinstance(ty, libxltypes.Aggregate): + elif isinstance(ty, idl.Aggregate): if ty.typename is None: s += "%s {\n" % ty.kind else: @@ -53,7 +53,7 @@ def libxl_C_type_dispose(ty, v, indent = " ", parent = None): s = "" - if isinstance(ty, libxltypes.KeyedUnion): + if isinstance(ty, idl.KeyedUnion): if parent is None: raise Exception("KeyedUnion type must have a parent") s += "switch (%s) {\n" % (parent + ty.keyvar_name) @@ -63,7 +63,7 @@ s += libxl_C_type_dispose(f.type, fexpr, indent + " ", nparent) s += " break;\n" s += "}\n" - elif isinstance(ty, libxltypes.Struct) and (parent is None or ty.dispose_fn is None): + elif isinstance(ty, idl.Struct) and (parent is None or ty.dispose_fn is None): for f in [f for f in ty.fields if not f.const]: (nparent,fexpr) = ty.member(v, f, parent is None) s += libxl_C_type_dispose(f.type, fexpr, "", nparent) @@ -79,11 +79,11 @@ s = "" if parent is None: s += "yajl_gen_status s;\n" - if isinstance(ty, libxltypes.Enumeration): + if isinstance(ty, idl.Enumeration): s += "s = libxl__yajl_gen_enum(hand, %s_to_string(%s));\n" % (ty.typename, ty.pass_arg(v, parent is None)) s += "if (s != yajl_gen_status_ok)\n" s += " goto out;\n" - elif isinstance(ty, libxltypes.KeyedUnion): + elif isinstance(ty, idl.KeyedUnion): if parent is None: raise Exception("KeyedUnion type must have a parent") s += "switch (%s) {\n" % (parent + ty.keyvar_name) @@ -93,7 +93,7 @@ s += libxl_C_type_gen_json(f.type, fexpr, indent + " ", nparent) s += " break;\n" s += "}\n" - elif isinstance(ty, libxltypes.Struct) and (parent is None or ty.json_fn is None): + elif isinstance(ty, idl.Struct) and (parent is None or ty.json_fn is None): s += "s = yajl_gen_map_open(hand);\n" s += "if (s != yajl_gen_status_ok)\n" s += " goto out;\n" @@ -123,7 +123,7 @@ def libxl_C_type_to_json(ty, v, indent = " "): s = "" gen = "(libxl__gen_json_callback)&%s_gen_json" % ty.typename - s += "return libxl__object_to_json(ctx, \"%s\", %s, (void *)%s);\n" % (ty.typename, gen, ty.pass_arg(v, passby=libxltypes.PASS_BY_REFERENCE)) + s += "return libxl__object_to_json(ctx, \"%s\", %s, (void *)%s);\n" % (ty.typename, gen, ty.pass_arg(v, passby=idl.PASS_BY_REFERENCE)) if s != "": s = indent + s @@ -171,9 +171,9 @@ print >>sys.stderr, "Usage: gentypes.py
" sys.exit(1) - (_, idl, header, header_json, impl) = sys.argv + (_, idlname, header, header_json, impl) = sys.argv - (builtins,types) = libxltypes.parse(idl) + (builtins,types) = idl.parse(idlname) print "outputting libxl type definitions to %s" % header @@ -198,9 +198,9 @@ f.write("void %s(%s);\n" % (ty.dispose_fn, ty.make_arg("p"))) if ty.json_fn is not None: f.write("char *%s_to_json(libxl_ctx *ctx, %s);\n" % (ty.typename, ty.make_arg("p"))) - if isinstance(ty, libxltypes.Enumeration): + 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=libxltypes.PASS_BY_REFERENCE))) + 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("\n") @@ -225,7 +225,7 @@ """ % (header_json_define, header_json_define, " ".join(sys.argv))) for ty in [ty for ty in types+builtins 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=libxltypes.PASS_BY_REFERENCE))) + 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("\n") f.write("""#endif /* %s */\n""" % header_json_define) @@ -262,7 +262,7 @@ f.write("}\n") f.write("\n") - for ty in [t for t in types if isinstance(t,libxltypes.Enumeration)]: + for ty in [t for t in types if isinstance(t,idl.Enumeration)]: f.write("const char *%s_to_string(%s e)\n" % (ty.typename, ty.typename)) f.write("{\n") f.write(libxl_C_enum_to_string(ty, "e")) @@ -278,7 +278,7 @@ f.write("\n") for ty in [t for t in types if t.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=libxltypes.PASS_BY_REFERENCE))) + 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("{\n") f.write(libxl_C_type_gen_json(ty, "p")) f.write("}\n") diff -r 61ac1bf881ea -r e61ac54bbf1c tools/libxl/idl.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/libxl/idl.py Tue Jan 31 16:34:38 2012 +0000 @@ -0,0 +1,294 @@ +import sys + +PASS_BY_VALUE = 1 +PASS_BY_REFERENCE = 2 + +DIR_NONE = 0 +DIR_IN = 1 +DIR_OUT = 2 +DIR_BOTH = 3 + +_default_namespace = "" +def namespace(s): + if type(s) != str: + raise TypeError, "Require a string for the default namespace." + global _default_namespace + _default_namespace = s + +def _get_default_namespace(): + global _default_namespace + return _default_namespace + + +class Type(object): + def __init__(self, typename, **kwargs): + self.namespace = kwargs.setdefault('namespace', + _get_default_namespace()) + self.dir = kwargs.setdefault('dir', DIR_BOTH) + if self.dir not in [DIR_NONE, DIR_IN, DIR_OUT, DIR_BOTH]: + raise ValueError + + self.passby = kwargs.setdefault('passby', PASS_BY_VALUE) + if self.passby not in [PASS_BY_VALUE, PASS_BY_REFERENCE]: + raise ValueError + + self.private = kwargs.setdefault('private', False) + + if typename is None: # Anonymous type + self.typename = None + self.rawname = None + elif self.namespace is None: # e.g. system provided types + self.typename = typename + self.rawname = typename + else: + self.typename = self.namespace + typename + self.rawname = typename + + if self.typename is not None: + self.dispose_fn = kwargs.setdefault('dispose_fn', self.typename + "_dispose") + else: + self.dispose_fn = kwargs.setdefault('dispose_fn', None) + + self.autogenerate_dispose_fn = kwargs.setdefault('autogenerate_dispose_fn', True) + + if self.typename is not None and not self.private: + self.json_fn = kwargs.setdefault('json_fn', self.typename + "_gen_json") + else: + self.json_fn = kwargs.setdefault('json_fn', None) + + self.autogenerate_json = kwargs.setdefault('autogenerate_json', True) + + def marshal_in(self): + return self.dir in [DIR_IN, DIR_BOTH] + def marshal_out(self): + return self.dir in [DIR_OUT, DIR_BOTH] + + def make_arg(self, n, passby=None): + if passby is None: passby = self.passby + + if passby == PASS_BY_REFERENCE: + return "%s *%s" % (self.typename, n) + else: + return "%s %s" % (self.typename, n) + + def pass_arg(self, n, isref=None, passby=None): + if passby is None: passby = self.passby + if isref is None: isref = self.passby == PASS_BY_REFERENCE + + if passby == PASS_BY_REFERENCE: + if isref: + return "%s" % (n) + else: + return "&%s" % (n) + else: + if isref: + return "*%s" % (n) + else: + return "%s" % (n) + +class Builtin(Type): + """Builtin type""" + def __init__(self, typename, **kwargs): + kwargs.setdefault('dispose_fn', None) + kwargs.setdefault('autogenerate_dispose_fn', False) + kwargs.setdefault('autogenerate_json', False) + Type.__init__(self, typename, **kwargs) + +class Number(Builtin): + def __init__(self, ctype, **kwargs): + kwargs.setdefault('namespace', None) + kwargs.setdefault('dispose_fn', None) + kwargs.setdefault('signed', False) + kwargs.setdefault('json_fn', "yajl_gen_integer") + self.signed = kwargs['signed'] + Builtin.__init__(self, ctype, **kwargs) + +class UInt(Number): + def __init__(self, w, **kwargs): + kwargs.setdefault('namespace', None) + kwargs.setdefault('dispose_fn', None) + Number.__init__(self, "uint%d_t" % w, **kwargs) + + self.width = w + +class EnumerationValue(object): + def __init__(self, enum, value, name, **kwargs): + self.enum = enum + + self.valuename = str.upper(name) + self.rawname = str.upper(enum.rawname) + "_" + self.valuename + self.name = str.upper(enum.namespace) + self.rawname + self.value = value + +class Enumeration(Type): + def __init__(self, typename, values, **kwargs): + kwargs.setdefault('dispose_fn', None) + Type.__init__(self, typename, **kwargs) + + self.values = [] + for v in values: + # (value, name) + (num,name) = v + self.values.append(EnumerationValue(self, num, name, + typename=self.rawname)) + def lookup(self, name): + for v in self.values: + if v.valuename == str.upper(name): + return v + return ValueError + +class Field(object): + """An element of an Aggregate type""" + def __init__(self, type, name, **kwargs): + self.type = type + self.name = name + self.const = kwargs.setdefault('const', False) + self.enumname = kwargs.setdefault('enumname', None) + +class Aggregate(Type): + """A type containing a collection of other types""" + def __init__(self, kind, typename, fields, **kwargs): + Type.__init__(self, typename, **kwargs) + + self.kind = kind + + self.fields = [] + for f in fields: + # (name, type[, {kw args}]) + if len(f) == 2: + n,t = f + kw = {} + elif len(f) == 3: + n,t,kw = f + else: + raise ValueError + if n is None: + raise ValueError + self.fields.append(Field(t,n,**kw)) + + # Returns a tuple (stem, field-expr) + # + # field-expr is a C expression for a field "f" within the struct + # "v". + # + # stem is the stem common to both "f" and any other sibbling field + # within the "v". + def member(self, v, f, isref): + if isref: + deref = v + "->" + else: + deref = v + "." + + if f.name is None: # Anonymous + return (deref, deref) + else: + return (deref, deref + f.name) + +class Struct(Aggregate): + def __init__(self, name, fields, **kwargs): + kwargs.setdefault('passby', PASS_BY_REFERENCE) + Aggregate.__init__(self, "struct", name, fields, **kwargs) + +class Union(Aggregate): + def __init__(self, name, fields, **kwargs): + # Generally speaking some intelligence is required to free a + # union therefore any specific instance of this class will + # need to provide an explicit destructor function. + kwargs.setdefault('passby', PASS_BY_REFERENCE) + kwargs.setdefault('dispose_fn', None) + Aggregate.__init__(self, "union", name, fields, **kwargs) + +class KeyedUnion(Aggregate): + """A union which is keyed of another variable in the parent structure""" + def __init__(self, name, keyvar_type, keyvar_name, fields, **kwargs): + Aggregate.__init__(self, "union", name, [], **kwargs) + + if not isinstance(keyvar_type, Enumeration): + raise ValueError + + self.keyvar_name = keyvar_name + self.keyvar_type = keyvar_type + + for f in fields: + # (name, enum, type) + e, ty = f + ev = keyvar_type.lookup(e) + en = ev.name + self.fields.append(Field(ty, e, enumname=en)) + +# +# Standard Types +# + +void = Builtin("void *", namespace = None) +bool = Builtin("bool", namespace = None, + json_fn = "yajl_gen_bool", + autogenerate_json = False) + +size_t = Number("size_t", namespace = None) + +integer = Number("int", namespace = None, signed = True) + +uint8 = UInt(8) +uint16 = UInt(16) +uint32 = UInt(32) +uint64 = UInt(64) + +string = Builtin("char *", namespace = None, dispose_fn = "free", + json_fn = "libxl__string_gen_json", + autogenerate_json = False) + +class OrderedDict(dict): + """A dictionary which remembers insertion order. + + push to back on duplicate insertion""" + + def __init__(self): + dict.__init__(self) + self.__ordered = [] + + def __setitem__(self, key, value): + try: + self.__ordered.remove(key) + except ValueError: + pass + + self.__ordered.append(key) + dict.__setitem__(self, key, value) + + def ordered_keys(self): + return self.__ordered + def ordered_values(self): + return [self[x] for x in self.__ordered] + def ordered_items(self): + return [(x,self[x]) for x in self.__ordered] + +def parse(f): + print >>sys.stderr, "Parsing %s" % f + + globs = {} + locs = OrderedDict() + + for n,t in globals().items(): + if isinstance(t, Type): + globs[n] = t + elif isinstance(t,type(object)) and issubclass(t, Type): + globs[n] = t + elif n in ['PASS_BY_REFERENCE', 'PASS_BY_VALUE', + 'DIR_NONE', 'DIR_IN', 'DIR_OUT', 'DIR_BOTH', + 'namespace']: + globs[n] = t + + try: + execfile(f, globs, locs) + except SyntaxError,e: + raise SyntaxError, \ + "Errors were found at line %d while processing %s:\n\t%s"\ + %(e.lineno,f,e.text) + + types = [t for t in locs.ordered_values() if isinstance(t,Type)] + + builtins = [t for t in types if isinstance(t,Builtin)] + types = [t for t in types if not isinstance(t,Builtin)] + + return (builtins,types) diff -r 61ac1bf881ea -r e61ac54bbf1c tools/libxl/idl.txt --- a/tools/libxl/idl.txt Tue Jan 31 16:34:38 2012 +0000 +++ b/tools/libxl/idl.txt Tue Jan 31 16:34:38 2012 +0000 @@ -1,10 +1,10 @@ -libxltypes IDL --------------- +libxl IDL +--------- Each type in the libxl interface is represented by an object of type -libxltypes.Type (or a subclass thereof). Every local variable defined -by the .idl file must be an instance of libxltypes.Type (e.g. you may -not define Python functions or any other construct other than defining +idl.Type (or a subclass thereof). Every local variable defined by +the .idl file must be an instance of idl.Type (e.g. you may not +define Python functions or any other construct other than defining variables) The name of the type must be passed as the first argument to the @@ -16,9 +16,9 @@ namespace element while Type.rawname is always set to the 'base' name of the type. -The libxltypes.Type base class has several other properties which -apply to all types. The properties are set by passing a named -parameter to the constructor. +The idl.Type base class has several other properties which apply +to all types. The properties are set by passing a named parameter to +the constructor. Type.namespace: (default: "libxl_") @@ -28,12 +28,12 @@ If the typename is not None then the namespace is prepended to the type. -Type.passby: (default: libxltypes.PASS_BY_VALUE) +Type.passby: (default: idl.PASS_BY_VALUE) Defines the manner in which a type should be passed to C functions. Valid values for this fields are: - libxltypes.PASS_BY_VALUE - libxltypes.PASS_BY_REFERENCE + idl.PASS_BY_VALUE + idl.PASS_BY_REFERENCE Type.dispose_fn: (default: typename + "_dispose" or None if type == None) @@ -57,12 +57,12 @@ Other simple type-Classes ------------------------- -libxltype.Builtin +idl.Builtin Instances of this class represent types which are predefined within the system. -libxltype.UInt +idl.UInt Instances of this class represent the standard uint_t types. @@ -72,12 +72,12 @@ Complex type-Classes -------------------- -libxltype.Enumeration +idl.Enumeration A class representing an enumeration (named integer values). The values are available in the list Enumeration.values. Each - element in the list is of type libxltype.EnumerationValue. + element in the list is of type idl.EnumerationValue. Each EnumerationValue has the following properties: @@ -95,37 +95,37 @@ and any namespace (e.g. "VALUE") EnumerationValue.value The integer value associated with this name. -libxltype.Aggregate +idl.Aggregate Base class for type-Classes which contain a number of other types (e.g. structs and unions). The contained types are available in the list Aggregate.fields. Each - element in the list is of type libxltype.Field representing a member - of the aggregate. + element in the list is of type idl.Field representing a member of the + aggregate. Each field has the following properties: - Field.type The type of the member (a libxltypes.Type). + Field.type The type of the member (a idl.Type). Field.name The name of the member (can be None for anonymous fields). Field.const Boolean, true if the member is const. -libxltype.Struct +idl.Struct - A subclass of libxltype.Aggregate representing the C struct type. + A subclass of idl.Aggregate representing the C struct type. Struct.kind == "struct" -libxltype.Union +idl.Union - A subclass of libxltype.Aggregate representing the C union type. + A subclass of idl.Aggregate representing the C union type. Union.kind == "union" -libxltype.KeyedUnion +idl.KeyedUnion - A subclass of libxltype.Aggregate which represents the C union type + A subclass of idl.Aggregate which represents the C union type where the currently valid member of the union can be determined based upon another member in the containing type. diff -r 61ac1bf881ea -r e61ac54bbf1c tools/libxl/libxltypes.py --- a/tools/libxl/libxltypes.py Tue Jan 31 16:34:38 2012 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,294 +0,0 @@ -import sys - -PASS_BY_VALUE = 1 -PASS_BY_REFERENCE = 2 - -DIR_NONE = 0 -DIR_IN = 1 -DIR_OUT = 2 -DIR_BOTH = 3 - -_default_namespace = "" -def namespace(s): - if type(s) != str: - raise TypeError, "Require a string for the default namespace." - global _default_namespace - _default_namespace = s - -def _get_default_namespace(): - global _default_namespace - return _default_namespace - - -class Type(object): - def __init__(self, typename, **kwargs): - self.namespace = kwargs.setdefault('namespace', - _get_default_namespace()) - self.dir = kwargs.setdefault('dir', DIR_BOTH) - if self.dir not in [DIR_NONE, DIR_IN, DIR_OUT, DIR_BOTH]: - raise ValueError - - self.passby = kwargs.setdefault('passby', PASS_BY_VALUE) - if self.passby not in [PASS_BY_VALUE, PASS_BY_REFERENCE]: - raise ValueError - - self.private = kwargs.setdefault('private', False) - - if typename is None: # Anonymous type - self.typename = None - self.rawname = None - elif self.namespace is None: # e.g. system provided types - self.typename = typename - self.rawname = typename - else: - self.typename = self.namespace + typename - self.rawname = typename - - if self.typename is not None: - self.dispose_fn = kwargs.setdefault('dispose_fn', self.typename + "_dispose") - else: - self.dispose_fn = kwargs.setdefault('dispose_fn', None) - - self.autogenerate_dispose_fn = kwargs.setdefault('autogenerate_dispose_fn', True) - - if self.typename is not None and not self.private: - self.json_fn = kwargs.setdefault('json_fn', self.typename + "_gen_json") - else: - self.json_fn = kwargs.setdefault('json_fn', None) - - self.autogenerate_json = kwargs.setdefault('autogenerate_json', True) - - def marshal_in(self): - return self.dir in [DIR_IN, DIR_BOTH] - def marshal_out(self): - return self.dir in [DIR_OUT, DIR_BOTH] - - def make_arg(self, n, passby=None): - if passby is None: passby = self.passby - - if passby == PASS_BY_REFERENCE: - return "%s *%s" % (self.typename, n) - else: - return "%s %s" % (self.typename, n) - - def pass_arg(self, n, isref=None, passby=None): - if passby is None: passby = self.passby - if isref is None: isref = self.passby == PASS_BY_REFERENCE - - if passby == PASS_BY_REFERENCE: - if isref: - return "%s" % (n) - else: - return "&%s" % (n) - else: - if isref: - return "*%s" % (n) - else: - return "%s" % (n) - -class Builtin(Type): - """Builtin type""" - def __init__(self, typename, **kwargs): - kwargs.setdefault('dispose_fn', None) - kwargs.setdefault('autogenerate_dispose_fn', False) - kwargs.setdefault('autogenerate_json', False) - Type.__init__(self, typename, **kwargs) - -class Number(Builtin): - def __init__(self, ctype, **kwargs): - kwargs.setdefault('namespace', None) - kwargs.setdefault('dispose_fn', None) - kwargs.setdefault('signed', False) - kwargs.setdefault('json_fn', "yajl_gen_integer") - self.signed = kwargs['signed'] - Builtin.__init__(self, ctype, **kwargs) - -class UInt(Number): - def __init__(self, w, **kwargs): - kwargs.setdefault('namespace', None) - kwargs.setdefault('dispose_fn', None) - Number.__init__(self, "uint%d_t" % w, **kwargs) - - self.width = w - -class EnumerationValue(object): - def __init__(self, enum, value, name, **kwargs): - self.enum = enum - - self.valuename = str.upper(name) - self.rawname = str.upper(enum.rawname) + "_" + self.valuename - self.name = str.upper(enum.namespace) + self.rawname - self.value = value - -class Enumeration(Type): - def __init__(self, typename, values, **kwargs): - kwargs.setdefault('dispose_fn', None) - Type.__init__(self, typename, **kwargs) - - self.values = [] - for v in values: - # (value, name) - (num,name) = v - self.values.append(EnumerationValue(self, num, name, - typename=self.rawname)) - def lookup(self, name): - for v in self.values: - if v.valuename == str.upper(name): - return v - return ValueError - -class Field(object): - """An element of an Aggregate type""" - def __init__(self, type, name, **kwargs): - self.type = type - self.name = name - self.const = kwargs.setdefault('const', False) - self.enumname = kwargs.setdefault('enumname', None) - -class Aggregate(Type): - """A type containing a collection of other types""" - def __init__(self, kind, typename, fields, **kwargs): - Type.__init__(self, typename, **kwargs) - - self.kind = kind - - self.fields = [] - for f in fields: - # (name, type[, {kw args}]) - if len(f) == 2: - n,t = f - kw = {} - elif len(f) == 3: - n,t,kw = f - else: - raise ValueError - if n is None: - raise ValueError - self.fields.append(Field(t,n,**kw)) - - # Returns a tuple (stem, field-expr) - # - # field-expr is a C expression for a field "f" within the struct - # "v". - # - # stem is the stem common to both "f" and any other sibbling field - # within the "v". - def member(self, v, f, isref): - if isref: - deref = v + "->" - else: - deref = v + "." - - if f.name is None: # Anonymous - return (deref, deref) - else: - return (deref, deref + f.name) - -class Struct(Aggregate): - def __init__(self, name, fields, **kwargs): - kwargs.setdefault('passby', PASS_BY_REFERENCE) - Aggregate.__init__(self, "struct", name, fields, **kwargs) - -class Union(Aggregate): - def __init__(self, name, fields, **kwargs): - # Generally speaking some intelligence is required to free a - # union therefore any specific instance of this class will - # need to provide an explicit destructor function. - kwargs.setdefault('passby', PASS_BY_REFERENCE) - kwargs.setdefault('dispose_fn', None) - Aggregate.__init__(self, "union", name, fields, **kwargs) - -class KeyedUnion(Aggregate): - """A union which is keyed of another variable in the parent structure""" - def __init__(self, name, keyvar_type, keyvar_name, fields, **kwargs): - Aggregate.__init__(self, "union", name, [], **kwargs) - - if not isinstance(keyvar_type, Enumeration): - raise ValueError - - self.keyvar_name = keyvar_name - self.keyvar_type = keyvar_type - - for f in fields: - # (name, enum, type) - e, ty = f - ev = keyvar_type.lookup(e) - en = ev.name - self.fields.append(Field(ty, e, enumname=en)) - -# -# Standard Types -# - -void = Builtin("void *", namespace = None) -bool = Builtin("bool", namespace = None, - json_fn = "yajl_gen_bool", - autogenerate_json = False) - -size_t = Number("size_t", namespace = None) - -integer = Number("int", namespace = None, signed = True) - -uint8 = UInt(8) -uint16 = UInt(16) -uint32 = UInt(32) -uint64 = UInt(64) - -string = Builtin("char *", namespace = None, dispose_fn = "free", - json_fn = "libxl__string_gen_json", - autogenerate_json = False) - -class OrderedDict(dict): - """A dictionary which remembers insertion order. - - push to back on duplicate insertion""" - - def __init__(self): - dict.__init__(self) - self.__ordered = [] - - def __setitem__(self, key, value): - try: - self.__ordered.remove(key) - except ValueError: - pass - - self.__ordered.append(key) - dict.__setitem__(self, key, value) - - def ordered_keys(self): - return self.__ordered - def ordered_values(self): - return [self[x] for x in self.__ordered] - def ordered_items(self): - return [(x,self[x]) for x in self.__ordered] - -def parse(f): - print >>sys.stderr, "Parsing %s" % f - - globs = {} - locs = OrderedDict() - - for n,t in globals().items(): - if isinstance(t, Type): - globs[n] = t - elif isinstance(t,type(object)) and issubclass(t, Type): - globs[n] = t - elif n in ['PASS_BY_REFERENCE', 'PASS_BY_VALUE', - 'DIR_NONE', 'DIR_IN', 'DIR_OUT', 'DIR_BOTH', - 'namespace']: - globs[n] = t - - try: - execfile(f, globs, locs) - except SyntaxError,e: - raise SyntaxError, \ - "Errors were found at line %d while processing %s:\n\t%s"\ - %(e.lineno,f,e.text) - - types = [t for t in locs.ordered_values() if isinstance(t,Type)] - - builtins = [t for t in types if isinstance(t,Builtin)] - types = [t for t in types if not isinstance(t,Builtin)] - - return (builtins,types) diff -r 61ac1bf881ea -r e61ac54bbf1c tools/ocaml/libs/xl/Makefile --- a/tools/ocaml/libs/xl/Makefile Tue Jan 31 16:34:38 2012 +0000 +++ b/tools/ocaml/libs/xl/Makefile Tue Jan 31 16:34:38 2012 +0000 @@ -46,7 +46,7 @@ $(Q)mv xenlight.mli.tmp xenlight.mli _libxl_types.ml.in _libxl_types.mli.in _libxl_types.inc: genwrap.py $(XEN_ROOT)/tools/libxl/libxl_types.idl \ - $(XEN_ROOT)/tools/libxl/libxltypes.py + $(XEN_ROOT)/tools/libxl/idl.py PYTHONPATH=$(XEN_ROOT)/tools/libxl $(PYTHON) genwrap.py \ $(XEN_ROOT)/tools/libxl/libxl_types.idl \ _libxl_types.mli.in _libxl_types.ml.in _libxl_types.inc diff -r 61ac1bf881ea -r e61ac54bbf1c tools/ocaml/libs/xl/genwrap.py --- a/tools/ocaml/libs/xl/genwrap.py Tue Jan 31 16:34:38 2012 +0000 +++ b/tools/ocaml/libs/xl/genwrap.py Tue Jan 31 16:34:38 2012 +0000 @@ -2,7 +2,7 @@ import sys,os -import libxltypes +import idl # typename -> ( ocaml_type, c_from_ocaml, ocaml_from_c ) builtins = { @@ -39,7 +39,7 @@ def ocaml_type_of(ty): if ty.rawname == "domid": return "domid" - elif isinstance(ty,libxltypes.UInt): + elif isinstance(ty,idl.UInt): if ty.width in [8, 16]: # handle as ints width = None @@ -52,14 +52,14 @@ else: return "int" - elif isinstance(ty,libxltypes.Builtin): + elif isinstance(ty,idl.Builtin): if not builtins.has_key(ty.typename): raise NotImplementedError("Unknown Builtin %s (%s)" % (ty.typename, type(ty))) typename,_,_ = builtins[ty.typename] if not typename: raise NotImplementedError("No typename for Builtin %s (%s)" % (ty.typename, type(ty))) return typename - elif isinstance(ty,libxltypes.Aggregate): + elif isinstance(ty,idl.Aggregate): return ty.rawname.capitalize() + ".t" else: return ty.rawname @@ -73,11 +73,11 @@ s = ("""(* %s interface *)\n""" % ty.typename) else: s = ("""(* %s implementation *)\n""" % ty.typename) - if isinstance(ty, libxltypes.Enumeration): + if isinstance(ty, idl.Enumeration): s = "type %s = \n" % ty.rawname for v in ty.values: s += "\t | %s\n" % v.rawname - elif isinstance(ty, libxltypes.Aggregate): + elif isinstance(ty, idl.Aggregate): s = "" if ty.typename is None: raise NotImplementedError("%s has no typename" % type(ty)) @@ -115,7 +115,7 @@ def c_val(ty, c, o, indent="", parent = None): s = indent - if isinstance(ty,libxltypes.UInt): + if isinstance(ty,idl.UInt): if ty.width in [8, 16]: # handle as ints width = None @@ -127,14 +127,14 @@ s += "%s = Int%d_val(%s);" % (c, width, o) else: s += "%s = Int_val(%s);" % (c, o) - elif isinstance(ty,libxltypes.Builtin): + elif isinstance(ty,idl.Builtin): if not builtins.has_key(ty.typename): raise NotImplementedError("Unknown Builtin %s (%s)" % (ty.typename, type(ty))) _,fn,_ = builtins[ty.typename] if not fn: raise NotImplementedError("No c_val fn for Builtin %s (%s)" % (ty.typename, type(ty))) s += "%s;" % (fn % { "o": o, "c": c }) - elif isinstance(ty,libxltypes.Enumeration) and (parent is None): + elif isinstance(ty,idl.Enumeration) and (parent is None): n = 0 s += "switch(Int_val(%s)) {\n" % o for e in ty.values: @@ -142,7 +142,7 @@ n += 1 s += " default: failwith_xl(\"cannot convert value to %s\", lg); break;\n" % ty.typename s += "}" - elif isinstance(ty, libxltypes.Aggregate) and (parent is None): + elif isinstance(ty, idl.Aggregate) and (parent is None): n = 0 for f in ty.fields: if f.type.private: @@ -151,14 +151,14 @@ s += "%s\n" % c_val(f.type, fexpr, "Field(%s, %d)" % (o,n), parent=nparent) n = n + 1 else: - s += "%s_val(gc, lg, %s, %s);" % (ty.rawname, ty.pass_arg(c, parent is None, passby=libxltypes.PASS_BY_REFERENCE), o) + s += "%s_val(gc, lg, %s, %s);" % (ty.rawname, ty.pass_arg(c, parent is None, passby=idl.PASS_BY_REFERENCE), o) return s.replace("\n", "\n%s" % indent) def gen_c_val(ty, indent=""): s = "/* Convert caml value to %s */\n" % ty.rawname - s += "static int %s_val (caml_gc *gc, struct caml_logger *lg, %s, value v)\n" % (ty.rawname, ty.make_arg("c_val", passby=libxltypes.PASS_BY_REFERENCE)) + s += "static int %s_val (caml_gc *gc, struct caml_logger *lg, %s, value v)\n" % (ty.rawname, ty.make_arg("c_val", passby=idl.PASS_BY_REFERENCE)) s += "{\n" s += "\tCAMLparam1(v);\n" s += "\n" @@ -172,7 +172,7 @@ def ocaml_Val(ty, o, c, indent="", parent = None): s = indent - if isinstance(ty,libxltypes.UInt): + if isinstance(ty,idl.UInt): if ty.width in [8, 16]: # handle as ints width = None @@ -184,14 +184,14 @@ s += "%s = caml_copy_int%d(%s);" % (o, width, c) else: s += "%s = Val_int(%s);" % (o, c) - elif isinstance(ty,libxltypes.Builtin): + elif isinstance(ty,idl.Builtin): if not builtins.has_key(ty.typename): raise NotImplementedError("Unknown Builtin %s (%s)" % (ty.typename, type(ty))) _,_,fn = builtins[ty.typename] if not fn: raise NotImplementedError("No ocaml Val fn for Builtin %s (%s)" % (ty.typename, type(ty))) s += "%s = %s;" % (o, fn % { "c": c }) - elif isinstance(ty,libxltypes.Enumeration) and (parent is None): + elif isinstance(ty,idl.Enumeration) and (parent is None): n = 0 s += "switch(%s) {\n" % c for e in ty.values: @@ -199,7 +199,7 @@ n += 1 s += " default: failwith_xl(\"cannot convert value from %s\", lg); break;\n" % ty.typename s += "}" - elif isinstance(ty,libxltypes.Aggregate) and (parent is None): + elif isinstance(ty,idl.Aggregate) and (parent is None): s += "{\n" s += "\tvalue %s_field;\n" % ty.rawname s += "\n" @@ -258,8 +258,7 @@ print >>sys.stderr, "Usage: genwrap.py " sys.exit(1) - idl = sys.argv[1] - (_,types) = libxltypes.parse(idl) + (_,types) = idl.parse(sys.argv[1]) # Do not generate these yet. blacklist = [ diff -r 61ac1bf881ea -r e61ac54bbf1c tools/python/Makefile --- a/tools/python/Makefile Tue Jan 31 16:34:38 2012 +0000 +++ b/tools/python/Makefile Tue Jan 31 16:34:38 2012 +0000 @@ -11,7 +11,7 @@ .PHONY: build build: genpath genwrap.py $(XEN_ROOT)/tools/libxl/libxl_types.idl \ - $(XEN_ROOT)/tools/libxl/libxltypes.py + $(XEN_ROOT)/tools/libxl/idl.py PYTHONPATH=$(XEN_ROOT)/tools/libxl $(PYTHON) genwrap.py \ $(XEN_ROOT)/tools/libxl/libxl_types.idl \ xen/lowlevel/xl/_pyxl_types.h \ diff -r 61ac1bf881ea -r e61ac54bbf1c tools/python/genwrap.py --- a/tools/python/genwrap.py Tue Jan 31 16:34:38 2012 +0000 +++ b/tools/python/genwrap.py Tue Jan 31 16:34:38 2012 +0000 @@ -2,23 +2,23 @@ import sys,os -import libxltypes +import idl (TYPE_BOOL, TYPE_INT, TYPE_UINT, TYPE_STRING, TYPE_AGGREGATE) = range(5) def py_type(ty): - if ty == libxltypes.bool: + if ty == idl.bool: return TYPE_BOOL - if isinstance(ty, libxltypes.Enumeration): + if isinstance(ty, idl.Enumeration): return TYPE_UINT - if isinstance(ty, libxltypes.Number): + if isinstance(ty, idl.Number): if ty.signed: return TYPE_INT else: return TYPE_UINT - if isinstance(ty, libxltypes.Aggregate): + if isinstance(ty, idl.Aggregate): return TYPE_AGGREGATE - if ty == libxltypes.string: + if ty == idl.string: return TYPE_STRING return None @@ -38,7 +38,7 @@ def py_decls(ty): l = [] - if isinstance(ty, libxltypes.Aggregate): + if isinstance(ty, idl.Aggregate): l.append('_hidden Py_%s *Py%s_New(void);\n'%(ty.rawname, ty.rawname)) l.append('_hidden int Py%s_Check(PyObject *self);\n'%ty.rawname) for f in ty.fields: @@ -211,10 +211,10 @@ l.append('void genwrap__init(PyObject *m)') l.append('{') for ty in types: - if isinstance(ty, libxltypes.Enumeration): + if isinstance(ty, idl.Enumeration): for v in ty.values: l.append(' PyModule_AddIntConstant(m, "%s", %s);' % (v.rawname, v.name)) - elif isinstance(ty, libxltypes.Aggregate): + elif isinstance(ty, idl.Aggregate): l.append(' if (PyType_Ready(&Py%s_Type) >= 0) {'%ty.rawname) l.append(' Py_INCREF(&Py%s_Type);'%ty.rawname) l.append(' PyModule_AddObject(m, "%s", (PyObject *)&Py%s_Type);'%(ty.rawname, ty.rawname)) @@ -227,7 +227,7 @@ def tree_frob(types): ret = types[:] - for ty in [ty for ty in ret if isinstance(ty, libxltypes.Aggregate)]: + for ty in [ty for ty in ret if isinstance(ty, idl.Aggregate)]: ty.fields = filter(lambda f:f.name is not None and f.type.typename is not None, ty.fields) return ret @@ -236,8 +236,7 @@ print >>sys.stderr, "Usage: genwrap.py " sys.exit(1) - idl = sys.argv[1] - (_,types) = libxltypes.parse(idl) + (_,types) = idl.parse(sys.argv[1]) types = tree_frob(types) @@ -278,7 +277,7 @@ _hidden int genwrap__ll_set(PyObject *v, long long *val, long long mask); """ % " ".join(sys.argv)) - for ty in [ty for ty in types if isinstance(ty, libxltypes.Aggregate)]: + for ty in [ty for ty in types if isinstance(ty, idl.Aggregate)]: f.write('/* Internal API for %s wrapper */\n'%ty.typename) f.write(py_wrapstruct(ty)) f.write(py_decls(ty)) @@ -307,7 +306,7 @@ for ty in types: if ty.private: continue - if isinstance(ty, libxltypes.Aggregate): + if isinstance(ty, idl.Aggregate): f.write('/* Attribute get/set functions for %s */\n'%ty.typename) for a in ty.fields: if a.type.private: _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:58:40 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:58: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 1RtR9T-0008BM-Qk; Fri, 03 Feb 2012 21:58:39 +0000 Received: from mail174.messagelabs.com ([85.158.138.51]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR9R-00084g-AJ for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:37 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-174.messagelabs.com!1328306306!11933728!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.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12435 invoked from network); 3 Feb 2012 21:58:27 -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; 3 Feb 2012 21:58:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR9G-0001p5-Ox for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR9E-00039L-SA for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:26 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:58:24 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: Rename libxl IDL infrastructure. X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1328027678 0 # Node ID e61ac54bbf1c3ef7cb05965dc68dc66e8f372094 # Parent 61ac1bf881ea15bdafe1b1b43911286cca5d48c8 libxl: Rename libxl IDL infrastructure. Originally libxltypes.py provided the infrastructure and libxl.idl provided the specific types. In 23887:a543e10211f7 libxl.idl became libxl_types.idl (to allow for libxl_types_internal.idl) which means we now have libxl_types.FOO and libxltypes.FOO providing different things and annoying people in tab completion. Rename the infrastructure as idl. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 61ac1bf881ea -r e61ac54bbf1c tools/libxl/Makefile --- a/tools/libxl/Makefile Tue Jan 31 16:34:38 2012 +0000 +++ b/tools/libxl/Makefile Tue Jan 31 16:34:38 2012 +0000 @@ -111,7 +111,7 @@ $(LIBXL_OBJS) $(LIBXLU_OBJS) $(XL_OBJS): libxl.h $(LIBXL_OBJS): libxl_internal.h -_libxl_type%.h _libxl_type%_json.h _libxl_type%.c: libxl_type%.idl gentypes.py libxltypes.py +_libxl_type%.h _libxl_type%_json.h _libxl_type%.c: libxl_type%.idl gentypes.py idl.py $(PYTHON) gentypes.py libxl_type$*.idl __libxl_type$*.h __libxl_type$*_json.h __libxl_type$*.c $(call move-if-changed,__libxl_type$*.h,_libxl_type$*.h) $(call move-if-changed,__libxl_type$*_json.h,_libxl_type$*_json.h) diff -r 61ac1bf881ea -r e61ac54bbf1c tools/libxl/gentest.py --- a/tools/libxl/gentest.py Tue Jan 31 16:34:38 2012 +0000 +++ b/tools/libxl/gentest.py Tue Jan 31 16:34:38 2012 +0000 @@ -4,7 +4,7 @@ import re import random -import libxltypes +import idl def randomize_char(c): if random.random() < 0.5: @@ -25,9 +25,9 @@ def gen_rand_init(ty, v, indent = " ", parent = None): s = "" - if isinstance(ty, libxltypes.Enumeration): + if isinstance(ty, idl.Enumeration): s += "%s = %s;\n" % (ty.pass_arg(v, parent is None), randomize_enum(ty)) - elif isinstance(ty, libxltypes.KeyedUnion): + elif isinstance(ty, idl.KeyedUnion): if parent is None: raise Exception("KeyedUnion type must have a parent") s += "switch (%s) {\n" % (parent + ty.keyvar_name) @@ -37,7 +37,7 @@ s += gen_rand_init(f.type, fexpr, indent + " ", nparent) s += " break;\n" s += "}\n" - elif isinstance(ty, libxltypes.Struct) \ + elif isinstance(ty, idl.Struct) \ and (parent is None or ty.json_fn is None): for f in [f for f in ty.fields if not f.const]: (nparent,fexpr) = ty.member(v, f, parent is None) @@ -45,10 +45,10 @@ elif hasattr(ty, "rand_init") and ty.rand_init is not None: s += "%s(%s);\n" % (ty.rand_init, ty.pass_arg(v, isref=parent is None, - passby=libxltypes.PASS_BY_REFERENCE)) + passby=idl.PASS_BY_REFERENCE)) elif ty.typename in ["libxl_uuid", "libxl_mac", "libxl_hwcap"]: s += "rand_bytes((uint8_t *)%s, sizeof(*%s));\n" % (v,v) - elif ty.typename in ["libxl_domid"] or isinstance(ty, libxltypes.Number): + elif ty.typename in ["libxl_domid"] or isinstance(ty, idl.Number): s += "%s = rand() %% (sizeof(%s)*8);\n" % \ (ty.pass_arg(v, parent is None), ty.pass_arg(v, parent is None)) @@ -74,8 +74,7 @@ random.seed() - idl = sys.argv[1] - (builtins,types) = libxltypes.parse(idl) + (builtins,types) = idl.parse(sys.argv[1]) impl = sys.argv[2] f = open(impl, "w") @@ -215,10 +214,10 @@ if ty.typename not in handcoded: f.write("static void %s_rand_init(%s);\n" % \ (ty.typename, - ty.make_arg("p", passby=libxltypes.PASS_BY_REFERENCE))) + ty.make_arg("p", passby=idl.PASS_BY_REFERENCE))) f.write("static void %s_rand_init(%s)\n" % \ (ty.typename, - ty.make_arg("p", passby=libxltypes.PASS_BY_REFERENCE))) + ty.make_arg("p", passby=idl.PASS_BY_REFERENCE))) f.write("{\n") f.write(gen_rand_init(ty, "p")) f.write("}\n") @@ -252,7 +251,7 @@ for ty in [t for t in types if t.json_fn is not None]: arg = ty.typename + "_val" f.write(" %s_rand_init(%s);\n" % (ty.typename, \ - ty.pass_arg(arg, isref=False, passby=libxltypes.PASS_BY_REFERENCE))) + ty.pass_arg(arg, isref=False, passby=idl.PASS_BY_REFERENCE))) f.write(" s = %s_to_json(ctx, %s);\n" % \ (ty.typename, ty.pass_arg(arg, isref=False))) f.write(" printf(\"%%s: %%s\\n\", \"%s\", s);\n" % ty.typename) @@ -265,7 +264,7 @@ f.write(" printf(\"Testing Enumerations\\n\");\n") f.write(" printf(\"--------------------\\n\");\n") f.write(" printf(\"\\n\");\n") - for ty in [t for t in types if isinstance(t,libxltypes.Enumeration)]: + for ty in [t for t in types if isinstance(t,idl.Enumeration)]: f.write(" printf(\"%s -- to string:\\n\");\n" % (ty.typename)) for v in ty.values: f.write(" printf(\"\\t%s = %%d = \\\"%%s\\\"\\n\", " \ diff -r 61ac1bf881ea -r e61ac54bbf1c tools/libxl/gentypes.py --- a/tools/libxl/gentypes.py Tue Jan 31 16:34:38 2012 +0000 +++ b/tools/libxl/gentypes.py Tue Jan 31 16:34:38 2012 +0000 @@ -3,10 +3,10 @@ import sys import re -import libxltypes +import idl def libxl_C_instance_of(ty, instancename): - if isinstance(ty, libxltypes.Aggregate) and ty.typename is None: + if isinstance(ty, idl.Aggregate) and ty.typename is None: if instancename is None: return libxl_C_type_define(ty) else: @@ -16,7 +16,7 @@ def libxl_C_type_define(ty, indent = ""): s = "" - if isinstance(ty, libxltypes.Enumeration): + if isinstance(ty, idl.Enumeration): if ty.typename is None: s += "enum {\n" else: @@ -31,7 +31,7 @@ else: s += "} %s" % ty.typename - elif isinstance(ty, libxltypes.Aggregate): + elif isinstance(ty, idl.Aggregate): if ty.typename is None: s += "%s {\n" % ty.kind else: @@ -53,7 +53,7 @@ def libxl_C_type_dispose(ty, v, indent = " ", parent = None): s = "" - if isinstance(ty, libxltypes.KeyedUnion): + if isinstance(ty, idl.KeyedUnion): if parent is None: raise Exception("KeyedUnion type must have a parent") s += "switch (%s) {\n" % (parent + ty.keyvar_name) @@ -63,7 +63,7 @@ s += libxl_C_type_dispose(f.type, fexpr, indent + " ", nparent) s += " break;\n" s += "}\n" - elif isinstance(ty, libxltypes.Struct) and (parent is None or ty.dispose_fn is None): + elif isinstance(ty, idl.Struct) and (parent is None or ty.dispose_fn is None): for f in [f for f in ty.fields if not f.const]: (nparent,fexpr) = ty.member(v, f, parent is None) s += libxl_C_type_dispose(f.type, fexpr, "", nparent) @@ -79,11 +79,11 @@ s = "" if parent is None: s += "yajl_gen_status s;\n" - if isinstance(ty, libxltypes.Enumeration): + if isinstance(ty, idl.Enumeration): s += "s = libxl__yajl_gen_enum(hand, %s_to_string(%s));\n" % (ty.typename, ty.pass_arg(v, parent is None)) s += "if (s != yajl_gen_status_ok)\n" s += " goto out;\n" - elif isinstance(ty, libxltypes.KeyedUnion): + elif isinstance(ty, idl.KeyedUnion): if parent is None: raise Exception("KeyedUnion type must have a parent") s += "switch (%s) {\n" % (parent + ty.keyvar_name) @@ -93,7 +93,7 @@ s += libxl_C_type_gen_json(f.type, fexpr, indent + " ", nparent) s += " break;\n" s += "}\n" - elif isinstance(ty, libxltypes.Struct) and (parent is None or ty.json_fn is None): + elif isinstance(ty, idl.Struct) and (parent is None or ty.json_fn is None): s += "s = yajl_gen_map_open(hand);\n" s += "if (s != yajl_gen_status_ok)\n" s += " goto out;\n" @@ -123,7 +123,7 @@ def libxl_C_type_to_json(ty, v, indent = " "): s = "" gen = "(libxl__gen_json_callback)&%s_gen_json" % ty.typename - s += "return libxl__object_to_json(ctx, \"%s\", %s, (void *)%s);\n" % (ty.typename, gen, ty.pass_arg(v, passby=libxltypes.PASS_BY_REFERENCE)) + s += "return libxl__object_to_json(ctx, \"%s\", %s, (void *)%s);\n" % (ty.typename, gen, ty.pass_arg(v, passby=idl.PASS_BY_REFERENCE)) if s != "": s = indent + s @@ -171,9 +171,9 @@ print >>sys.stderr, "Usage: gentypes.py
" sys.exit(1) - (_, idl, header, header_json, impl) = sys.argv + (_, idlname, header, header_json, impl) = sys.argv - (builtins,types) = libxltypes.parse(idl) + (builtins,types) = idl.parse(idlname) print "outputting libxl type definitions to %s" % header @@ -198,9 +198,9 @@ f.write("void %s(%s);\n" % (ty.dispose_fn, ty.make_arg("p"))) if ty.json_fn is not None: f.write("char *%s_to_json(libxl_ctx *ctx, %s);\n" % (ty.typename, ty.make_arg("p"))) - if isinstance(ty, libxltypes.Enumeration): + 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=libxltypes.PASS_BY_REFERENCE))) + 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("\n") @@ -225,7 +225,7 @@ """ % (header_json_define, header_json_define, " ".join(sys.argv))) for ty in [ty for ty in types+builtins 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=libxltypes.PASS_BY_REFERENCE))) + 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("\n") f.write("""#endif /* %s */\n""" % header_json_define) @@ -262,7 +262,7 @@ f.write("}\n") f.write("\n") - for ty in [t for t in types if isinstance(t,libxltypes.Enumeration)]: + for ty in [t for t in types if isinstance(t,idl.Enumeration)]: f.write("const char *%s_to_string(%s e)\n" % (ty.typename, ty.typename)) f.write("{\n") f.write(libxl_C_enum_to_string(ty, "e")) @@ -278,7 +278,7 @@ f.write("\n") for ty in [t for t in types if t.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=libxltypes.PASS_BY_REFERENCE))) + 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("{\n") f.write(libxl_C_type_gen_json(ty, "p")) f.write("}\n") diff -r 61ac1bf881ea -r e61ac54bbf1c tools/libxl/idl.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/libxl/idl.py Tue Jan 31 16:34:38 2012 +0000 @@ -0,0 +1,294 @@ +import sys + +PASS_BY_VALUE = 1 +PASS_BY_REFERENCE = 2 + +DIR_NONE = 0 +DIR_IN = 1 +DIR_OUT = 2 +DIR_BOTH = 3 + +_default_namespace = "" +def namespace(s): + if type(s) != str: + raise TypeError, "Require a string for the default namespace." + global _default_namespace + _default_namespace = s + +def _get_default_namespace(): + global _default_namespace + return _default_namespace + + +class Type(object): + def __init__(self, typename, **kwargs): + self.namespace = kwargs.setdefault('namespace', + _get_default_namespace()) + self.dir = kwargs.setdefault('dir', DIR_BOTH) + if self.dir not in [DIR_NONE, DIR_IN, DIR_OUT, DIR_BOTH]: + raise ValueError + + self.passby = kwargs.setdefault('passby', PASS_BY_VALUE) + if self.passby not in [PASS_BY_VALUE, PASS_BY_REFERENCE]: + raise ValueError + + self.private = kwargs.setdefault('private', False) + + if typename is None: # Anonymous type + self.typename = None + self.rawname = None + elif self.namespace is None: # e.g. system provided types + self.typename = typename + self.rawname = typename + else: + self.typename = self.namespace + typename + self.rawname = typename + + if self.typename is not None: + self.dispose_fn = kwargs.setdefault('dispose_fn', self.typename + "_dispose") + else: + self.dispose_fn = kwargs.setdefault('dispose_fn', None) + + self.autogenerate_dispose_fn = kwargs.setdefault('autogenerate_dispose_fn', True) + + if self.typename is not None and not self.private: + self.json_fn = kwargs.setdefault('json_fn', self.typename + "_gen_json") + else: + self.json_fn = kwargs.setdefault('json_fn', None) + + self.autogenerate_json = kwargs.setdefault('autogenerate_json', True) + + def marshal_in(self): + return self.dir in [DIR_IN, DIR_BOTH] + def marshal_out(self): + return self.dir in [DIR_OUT, DIR_BOTH] + + def make_arg(self, n, passby=None): + if passby is None: passby = self.passby + + if passby == PASS_BY_REFERENCE: + return "%s *%s" % (self.typename, n) + else: + return "%s %s" % (self.typename, n) + + def pass_arg(self, n, isref=None, passby=None): + if passby is None: passby = self.passby + if isref is None: isref = self.passby == PASS_BY_REFERENCE + + if passby == PASS_BY_REFERENCE: + if isref: + return "%s" % (n) + else: + return "&%s" % (n) + else: + if isref: + return "*%s" % (n) + else: + return "%s" % (n) + +class Builtin(Type): + """Builtin type""" + def __init__(self, typename, **kwargs): + kwargs.setdefault('dispose_fn', None) + kwargs.setdefault('autogenerate_dispose_fn', False) + kwargs.setdefault('autogenerate_json', False) + Type.__init__(self, typename, **kwargs) + +class Number(Builtin): + def __init__(self, ctype, **kwargs): + kwargs.setdefault('namespace', None) + kwargs.setdefault('dispose_fn', None) + kwargs.setdefault('signed', False) + kwargs.setdefault('json_fn', "yajl_gen_integer") + self.signed = kwargs['signed'] + Builtin.__init__(self, ctype, **kwargs) + +class UInt(Number): + def __init__(self, w, **kwargs): + kwargs.setdefault('namespace', None) + kwargs.setdefault('dispose_fn', None) + Number.__init__(self, "uint%d_t" % w, **kwargs) + + self.width = w + +class EnumerationValue(object): + def __init__(self, enum, value, name, **kwargs): + self.enum = enum + + self.valuename = str.upper(name) + self.rawname = str.upper(enum.rawname) + "_" + self.valuename + self.name = str.upper(enum.namespace) + self.rawname + self.value = value + +class Enumeration(Type): + def __init__(self, typename, values, **kwargs): + kwargs.setdefault('dispose_fn', None) + Type.__init__(self, typename, **kwargs) + + self.values = [] + for v in values: + # (value, name) + (num,name) = v + self.values.append(EnumerationValue(self, num, name, + typename=self.rawname)) + def lookup(self, name): + for v in self.values: + if v.valuename == str.upper(name): + return v + return ValueError + +class Field(object): + """An element of an Aggregate type""" + def __init__(self, type, name, **kwargs): + self.type = type + self.name = name + self.const = kwargs.setdefault('const', False) + self.enumname = kwargs.setdefault('enumname', None) + +class Aggregate(Type): + """A type containing a collection of other types""" + def __init__(self, kind, typename, fields, **kwargs): + Type.__init__(self, typename, **kwargs) + + self.kind = kind + + self.fields = [] + for f in fields: + # (name, type[, {kw args}]) + if len(f) == 2: + n,t = f + kw = {} + elif len(f) == 3: + n,t,kw = f + else: + raise ValueError + if n is None: + raise ValueError + self.fields.append(Field(t,n,**kw)) + + # Returns a tuple (stem, field-expr) + # + # field-expr is a C expression for a field "f" within the struct + # "v". + # + # stem is the stem common to both "f" and any other sibbling field + # within the "v". + def member(self, v, f, isref): + if isref: + deref = v + "->" + else: + deref = v + "." + + if f.name is None: # Anonymous + return (deref, deref) + else: + return (deref, deref + f.name) + +class Struct(Aggregate): + def __init__(self, name, fields, **kwargs): + kwargs.setdefault('passby', PASS_BY_REFERENCE) + Aggregate.__init__(self, "struct", name, fields, **kwargs) + +class Union(Aggregate): + def __init__(self, name, fields, **kwargs): + # Generally speaking some intelligence is required to free a + # union therefore any specific instance of this class will + # need to provide an explicit destructor function. + kwargs.setdefault('passby', PASS_BY_REFERENCE) + kwargs.setdefault('dispose_fn', None) + Aggregate.__init__(self, "union", name, fields, **kwargs) + +class KeyedUnion(Aggregate): + """A union which is keyed of another variable in the parent structure""" + def __init__(self, name, keyvar_type, keyvar_name, fields, **kwargs): + Aggregate.__init__(self, "union", name, [], **kwargs) + + if not isinstance(keyvar_type, Enumeration): + raise ValueError + + self.keyvar_name = keyvar_name + self.keyvar_type = keyvar_type + + for f in fields: + # (name, enum, type) + e, ty = f + ev = keyvar_type.lookup(e) + en = ev.name + self.fields.append(Field(ty, e, enumname=en)) + +# +# Standard Types +# + +void = Builtin("void *", namespace = None) +bool = Builtin("bool", namespace = None, + json_fn = "yajl_gen_bool", + autogenerate_json = False) + +size_t = Number("size_t", namespace = None) + +integer = Number("int", namespace = None, signed = True) + +uint8 = UInt(8) +uint16 = UInt(16) +uint32 = UInt(32) +uint64 = UInt(64) + +string = Builtin("char *", namespace = None, dispose_fn = "free", + json_fn = "libxl__string_gen_json", + autogenerate_json = False) + +class OrderedDict(dict): + """A dictionary which remembers insertion order. + + push to back on duplicate insertion""" + + def __init__(self): + dict.__init__(self) + self.__ordered = [] + + def __setitem__(self, key, value): + try: + self.__ordered.remove(key) + except ValueError: + pass + + self.__ordered.append(key) + dict.__setitem__(self, key, value) + + def ordered_keys(self): + return self.__ordered + def ordered_values(self): + return [self[x] for x in self.__ordered] + def ordered_items(self): + return [(x,self[x]) for x in self.__ordered] + +def parse(f): + print >>sys.stderr, "Parsing %s" % f + + globs = {} + locs = OrderedDict() + + for n,t in globals().items(): + if isinstance(t, Type): + globs[n] = t + elif isinstance(t,type(object)) and issubclass(t, Type): + globs[n] = t + elif n in ['PASS_BY_REFERENCE', 'PASS_BY_VALUE', + 'DIR_NONE', 'DIR_IN', 'DIR_OUT', 'DIR_BOTH', + 'namespace']: + globs[n] = t + + try: + execfile(f, globs, locs) + except SyntaxError,e: + raise SyntaxError, \ + "Errors were found at line %d while processing %s:\n\t%s"\ + %(e.lineno,f,e.text) + + types = [t for t in locs.ordered_values() if isinstance(t,Type)] + + builtins = [t for t in types if isinstance(t,Builtin)] + types = [t for t in types if not isinstance(t,Builtin)] + + return (builtins,types) diff -r 61ac1bf881ea -r e61ac54bbf1c tools/libxl/idl.txt --- a/tools/libxl/idl.txt Tue Jan 31 16:34:38 2012 +0000 +++ b/tools/libxl/idl.txt Tue Jan 31 16:34:38 2012 +0000 @@ -1,10 +1,10 @@ -libxltypes IDL --------------- +libxl IDL +--------- Each type in the libxl interface is represented by an object of type -libxltypes.Type (or a subclass thereof). Every local variable defined -by the .idl file must be an instance of libxltypes.Type (e.g. you may -not define Python functions or any other construct other than defining +idl.Type (or a subclass thereof). Every local variable defined by +the .idl file must be an instance of idl.Type (e.g. you may not +define Python functions or any other construct other than defining variables) The name of the type must be passed as the first argument to the @@ -16,9 +16,9 @@ namespace element while Type.rawname is always set to the 'base' name of the type. -The libxltypes.Type base class has several other properties which -apply to all types. The properties are set by passing a named -parameter to the constructor. +The idl.Type base class has several other properties which apply +to all types. The properties are set by passing a named parameter to +the constructor. Type.namespace: (default: "libxl_") @@ -28,12 +28,12 @@ If the typename is not None then the namespace is prepended to the type. -Type.passby: (default: libxltypes.PASS_BY_VALUE) +Type.passby: (default: idl.PASS_BY_VALUE) Defines the manner in which a type should be passed to C functions. Valid values for this fields are: - libxltypes.PASS_BY_VALUE - libxltypes.PASS_BY_REFERENCE + idl.PASS_BY_VALUE + idl.PASS_BY_REFERENCE Type.dispose_fn: (default: typename + "_dispose" or None if type == None) @@ -57,12 +57,12 @@ Other simple type-Classes ------------------------- -libxltype.Builtin +idl.Builtin Instances of this class represent types which are predefined within the system. -libxltype.UInt +idl.UInt Instances of this class represent the standard uint_t types. @@ -72,12 +72,12 @@ Complex type-Classes -------------------- -libxltype.Enumeration +idl.Enumeration A class representing an enumeration (named integer values). The values are available in the list Enumeration.values. Each - element in the list is of type libxltype.EnumerationValue. + element in the list is of type idl.EnumerationValue. Each EnumerationValue has the following properties: @@ -95,37 +95,37 @@ and any namespace (e.g. "VALUE") EnumerationValue.value The integer value associated with this name. -libxltype.Aggregate +idl.Aggregate Base class for type-Classes which contain a number of other types (e.g. structs and unions). The contained types are available in the list Aggregate.fields. Each - element in the list is of type libxltype.Field representing a member - of the aggregate. + element in the list is of type idl.Field representing a member of the + aggregate. Each field has the following properties: - Field.type The type of the member (a libxltypes.Type). + Field.type The type of the member (a idl.Type). Field.name The name of the member (can be None for anonymous fields). Field.const Boolean, true if the member is const. -libxltype.Struct +idl.Struct - A subclass of libxltype.Aggregate representing the C struct type. + A subclass of idl.Aggregate representing the C struct type. Struct.kind == "struct" -libxltype.Union +idl.Union - A subclass of libxltype.Aggregate representing the C union type. + A subclass of idl.Aggregate representing the C union type. Union.kind == "union" -libxltype.KeyedUnion +idl.KeyedUnion - A subclass of libxltype.Aggregate which represents the C union type + A subclass of idl.Aggregate which represents the C union type where the currently valid member of the union can be determined based upon another member in the containing type. diff -r 61ac1bf881ea -r e61ac54bbf1c tools/libxl/libxltypes.py --- a/tools/libxl/libxltypes.py Tue Jan 31 16:34:38 2012 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,294 +0,0 @@ -import sys - -PASS_BY_VALUE = 1 -PASS_BY_REFERENCE = 2 - -DIR_NONE = 0 -DIR_IN = 1 -DIR_OUT = 2 -DIR_BOTH = 3 - -_default_namespace = "" -def namespace(s): - if type(s) != str: - raise TypeError, "Require a string for the default namespace." - global _default_namespace - _default_namespace = s - -def _get_default_namespace(): - global _default_namespace - return _default_namespace - - -class Type(object): - def __init__(self, typename, **kwargs): - self.namespace = kwargs.setdefault('namespace', - _get_default_namespace()) - self.dir = kwargs.setdefault('dir', DIR_BOTH) - if self.dir not in [DIR_NONE, DIR_IN, DIR_OUT, DIR_BOTH]: - raise ValueError - - self.passby = kwargs.setdefault('passby', PASS_BY_VALUE) - if self.passby not in [PASS_BY_VALUE, PASS_BY_REFERENCE]: - raise ValueError - - self.private = kwargs.setdefault('private', False) - - if typename is None: # Anonymous type - self.typename = None - self.rawname = None - elif self.namespace is None: # e.g. system provided types - self.typename = typename - self.rawname = typename - else: - self.typename = self.namespace + typename - self.rawname = typename - - if self.typename is not None: - self.dispose_fn = kwargs.setdefault('dispose_fn', self.typename + "_dispose") - else: - self.dispose_fn = kwargs.setdefault('dispose_fn', None) - - self.autogenerate_dispose_fn = kwargs.setdefault('autogenerate_dispose_fn', True) - - if self.typename is not None and not self.private: - self.json_fn = kwargs.setdefault('json_fn', self.typename + "_gen_json") - else: - self.json_fn = kwargs.setdefault('json_fn', None) - - self.autogenerate_json = kwargs.setdefault('autogenerate_json', True) - - def marshal_in(self): - return self.dir in [DIR_IN, DIR_BOTH] - def marshal_out(self): - return self.dir in [DIR_OUT, DIR_BOTH] - - def make_arg(self, n, passby=None): - if passby is None: passby = self.passby - - if passby == PASS_BY_REFERENCE: - return "%s *%s" % (self.typename, n) - else: - return "%s %s" % (self.typename, n) - - def pass_arg(self, n, isref=None, passby=None): - if passby is None: passby = self.passby - if isref is None: isref = self.passby == PASS_BY_REFERENCE - - if passby == PASS_BY_REFERENCE: - if isref: - return "%s" % (n) - else: - return "&%s" % (n) - else: - if isref: - return "*%s" % (n) - else: - return "%s" % (n) - -class Builtin(Type): - """Builtin type""" - def __init__(self, typename, **kwargs): - kwargs.setdefault('dispose_fn', None) - kwargs.setdefault('autogenerate_dispose_fn', False) - kwargs.setdefault('autogenerate_json', False) - Type.__init__(self, typename, **kwargs) - -class Number(Builtin): - def __init__(self, ctype, **kwargs): - kwargs.setdefault('namespace', None) - kwargs.setdefault('dispose_fn', None) - kwargs.setdefault('signed', False) - kwargs.setdefault('json_fn', "yajl_gen_integer") - self.signed = kwargs['signed'] - Builtin.__init__(self, ctype, **kwargs) - -class UInt(Number): - def __init__(self, w, **kwargs): - kwargs.setdefault('namespace', None) - kwargs.setdefault('dispose_fn', None) - Number.__init__(self, "uint%d_t" % w, **kwargs) - - self.width = w - -class EnumerationValue(object): - def __init__(self, enum, value, name, **kwargs): - self.enum = enum - - self.valuename = str.upper(name) - self.rawname = str.upper(enum.rawname) + "_" + self.valuename - self.name = str.upper(enum.namespace) + self.rawname - self.value = value - -class Enumeration(Type): - def __init__(self, typename, values, **kwargs): - kwargs.setdefault('dispose_fn', None) - Type.__init__(self, typename, **kwargs) - - self.values = [] - for v in values: - # (value, name) - (num,name) = v - self.values.append(EnumerationValue(self, num, name, - typename=self.rawname)) - def lookup(self, name): - for v in self.values: - if v.valuename == str.upper(name): - return v - return ValueError - -class Field(object): - """An element of an Aggregate type""" - def __init__(self, type, name, **kwargs): - self.type = type - self.name = name - self.const = kwargs.setdefault('const', False) - self.enumname = kwargs.setdefault('enumname', None) - -class Aggregate(Type): - """A type containing a collection of other types""" - def __init__(self, kind, typename, fields, **kwargs): - Type.__init__(self, typename, **kwargs) - - self.kind = kind - - self.fields = [] - for f in fields: - # (name, type[, {kw args}]) - if len(f) == 2: - n,t = f - kw = {} - elif len(f) == 3: - n,t,kw = f - else: - raise ValueError - if n is None: - raise ValueError - self.fields.append(Field(t,n,**kw)) - - # Returns a tuple (stem, field-expr) - # - # field-expr is a C expression for a field "f" within the struct - # "v". - # - # stem is the stem common to both "f" and any other sibbling field - # within the "v". - def member(self, v, f, isref): - if isref: - deref = v + "->" - else: - deref = v + "." - - if f.name is None: # Anonymous - return (deref, deref) - else: - return (deref, deref + f.name) - -class Struct(Aggregate): - def __init__(self, name, fields, **kwargs): - kwargs.setdefault('passby', PASS_BY_REFERENCE) - Aggregate.__init__(self, "struct", name, fields, **kwargs) - -class Union(Aggregate): - def __init__(self, name, fields, **kwargs): - # Generally speaking some intelligence is required to free a - # union therefore any specific instance of this class will - # need to provide an explicit destructor function. - kwargs.setdefault('passby', PASS_BY_REFERENCE) - kwargs.setdefault('dispose_fn', None) - Aggregate.__init__(self, "union", name, fields, **kwargs) - -class KeyedUnion(Aggregate): - """A union which is keyed of another variable in the parent structure""" - def __init__(self, name, keyvar_type, keyvar_name, fields, **kwargs): - Aggregate.__init__(self, "union", name, [], **kwargs) - - if not isinstance(keyvar_type, Enumeration): - raise ValueError - - self.keyvar_name = keyvar_name - self.keyvar_type = keyvar_type - - for f in fields: - # (name, enum, type) - e, ty = f - ev = keyvar_type.lookup(e) - en = ev.name - self.fields.append(Field(ty, e, enumname=en)) - -# -# Standard Types -# - -void = Builtin("void *", namespace = None) -bool = Builtin("bool", namespace = None, - json_fn = "yajl_gen_bool", - autogenerate_json = False) - -size_t = Number("size_t", namespace = None) - -integer = Number("int", namespace = None, signed = True) - -uint8 = UInt(8) -uint16 = UInt(16) -uint32 = UInt(32) -uint64 = UInt(64) - -string = Builtin("char *", namespace = None, dispose_fn = "free", - json_fn = "libxl__string_gen_json", - autogenerate_json = False) - -class OrderedDict(dict): - """A dictionary which remembers insertion order. - - push to back on duplicate insertion""" - - def __init__(self): - dict.__init__(self) - self.__ordered = [] - - def __setitem__(self, key, value): - try: - self.__ordered.remove(key) - except ValueError: - pass - - self.__ordered.append(key) - dict.__setitem__(self, key, value) - - def ordered_keys(self): - return self.__ordered - def ordered_values(self): - return [self[x] for x in self.__ordered] - def ordered_items(self): - return [(x,self[x]) for x in self.__ordered] - -def parse(f): - print >>sys.stderr, "Parsing %s" % f - - globs = {} - locs = OrderedDict() - - for n,t in globals().items(): - if isinstance(t, Type): - globs[n] = t - elif isinstance(t,type(object)) and issubclass(t, Type): - globs[n] = t - elif n in ['PASS_BY_REFERENCE', 'PASS_BY_VALUE', - 'DIR_NONE', 'DIR_IN', 'DIR_OUT', 'DIR_BOTH', - 'namespace']: - globs[n] = t - - try: - execfile(f, globs, locs) - except SyntaxError,e: - raise SyntaxError, \ - "Errors were found at line %d while processing %s:\n\t%s"\ - %(e.lineno,f,e.text) - - types = [t for t in locs.ordered_values() if isinstance(t,Type)] - - builtins = [t for t in types if isinstance(t,Builtin)] - types = [t for t in types if not isinstance(t,Builtin)] - - return (builtins,types) diff -r 61ac1bf881ea -r e61ac54bbf1c tools/ocaml/libs/xl/Makefile --- a/tools/ocaml/libs/xl/Makefile Tue Jan 31 16:34:38 2012 +0000 +++ b/tools/ocaml/libs/xl/Makefile Tue Jan 31 16:34:38 2012 +0000 @@ -46,7 +46,7 @@ $(Q)mv xenlight.mli.tmp xenlight.mli _libxl_types.ml.in _libxl_types.mli.in _libxl_types.inc: genwrap.py $(XEN_ROOT)/tools/libxl/libxl_types.idl \ - $(XEN_ROOT)/tools/libxl/libxltypes.py + $(XEN_ROOT)/tools/libxl/idl.py PYTHONPATH=$(XEN_ROOT)/tools/libxl $(PYTHON) genwrap.py \ $(XEN_ROOT)/tools/libxl/libxl_types.idl \ _libxl_types.mli.in _libxl_types.ml.in _libxl_types.inc diff -r 61ac1bf881ea -r e61ac54bbf1c tools/ocaml/libs/xl/genwrap.py --- a/tools/ocaml/libs/xl/genwrap.py Tue Jan 31 16:34:38 2012 +0000 +++ b/tools/ocaml/libs/xl/genwrap.py Tue Jan 31 16:34:38 2012 +0000 @@ -2,7 +2,7 @@ import sys,os -import libxltypes +import idl # typename -> ( ocaml_type, c_from_ocaml, ocaml_from_c ) builtins = { @@ -39,7 +39,7 @@ def ocaml_type_of(ty): if ty.rawname == "domid": return "domid" - elif isinstance(ty,libxltypes.UInt): + elif isinstance(ty,idl.UInt): if ty.width in [8, 16]: # handle as ints width = None @@ -52,14 +52,14 @@ else: return "int" - elif isinstance(ty,libxltypes.Builtin): + elif isinstance(ty,idl.Builtin): if not builtins.has_key(ty.typename): raise NotImplementedError("Unknown Builtin %s (%s)" % (ty.typename, type(ty))) typename,_,_ = builtins[ty.typename] if not typename: raise NotImplementedError("No typename for Builtin %s (%s)" % (ty.typename, type(ty))) return typename - elif isinstance(ty,libxltypes.Aggregate): + elif isinstance(ty,idl.Aggregate): return ty.rawname.capitalize() + ".t" else: return ty.rawname @@ -73,11 +73,11 @@ s = ("""(* %s interface *)\n""" % ty.typename) else: s = ("""(* %s implementation *)\n""" % ty.typename) - if isinstance(ty, libxltypes.Enumeration): + if isinstance(ty, idl.Enumeration): s = "type %s = \n" % ty.rawname for v in ty.values: s += "\t | %s\n" % v.rawname - elif isinstance(ty, libxltypes.Aggregate): + elif isinstance(ty, idl.Aggregate): s = "" if ty.typename is None: raise NotImplementedError("%s has no typename" % type(ty)) @@ -115,7 +115,7 @@ def c_val(ty, c, o, indent="", parent = None): s = indent - if isinstance(ty,libxltypes.UInt): + if isinstance(ty,idl.UInt): if ty.width in [8, 16]: # handle as ints width = None @@ -127,14 +127,14 @@ s += "%s = Int%d_val(%s);" % (c, width, o) else: s += "%s = Int_val(%s);" % (c, o) - elif isinstance(ty,libxltypes.Builtin): + elif isinstance(ty,idl.Builtin): if not builtins.has_key(ty.typename): raise NotImplementedError("Unknown Builtin %s (%s)" % (ty.typename, type(ty))) _,fn,_ = builtins[ty.typename] if not fn: raise NotImplementedError("No c_val fn for Builtin %s (%s)" % (ty.typename, type(ty))) s += "%s;" % (fn % { "o": o, "c": c }) - elif isinstance(ty,libxltypes.Enumeration) and (parent is None): + elif isinstance(ty,idl.Enumeration) and (parent is None): n = 0 s += "switch(Int_val(%s)) {\n" % o for e in ty.values: @@ -142,7 +142,7 @@ n += 1 s += " default: failwith_xl(\"cannot convert value to %s\", lg); break;\n" % ty.typename s += "}" - elif isinstance(ty, libxltypes.Aggregate) and (parent is None): + elif isinstance(ty, idl.Aggregate) and (parent is None): n = 0 for f in ty.fields: if f.type.private: @@ -151,14 +151,14 @@ s += "%s\n" % c_val(f.type, fexpr, "Field(%s, %d)" % (o,n), parent=nparent) n = n + 1 else: - s += "%s_val(gc, lg, %s, %s);" % (ty.rawname, ty.pass_arg(c, parent is None, passby=libxltypes.PASS_BY_REFERENCE), o) + s += "%s_val(gc, lg, %s, %s);" % (ty.rawname, ty.pass_arg(c, parent is None, passby=idl.PASS_BY_REFERENCE), o) return s.replace("\n", "\n%s" % indent) def gen_c_val(ty, indent=""): s = "/* Convert caml value to %s */\n" % ty.rawname - s += "static int %s_val (caml_gc *gc, struct caml_logger *lg, %s, value v)\n" % (ty.rawname, ty.make_arg("c_val", passby=libxltypes.PASS_BY_REFERENCE)) + s += "static int %s_val (caml_gc *gc, struct caml_logger *lg, %s, value v)\n" % (ty.rawname, ty.make_arg("c_val", passby=idl.PASS_BY_REFERENCE)) s += "{\n" s += "\tCAMLparam1(v);\n" s += "\n" @@ -172,7 +172,7 @@ def ocaml_Val(ty, o, c, indent="", parent = None): s = indent - if isinstance(ty,libxltypes.UInt): + if isinstance(ty,idl.UInt): if ty.width in [8, 16]: # handle as ints width = None @@ -184,14 +184,14 @@ s += "%s = caml_copy_int%d(%s);" % (o, width, c) else: s += "%s = Val_int(%s);" % (o, c) - elif isinstance(ty,libxltypes.Builtin): + elif isinstance(ty,idl.Builtin): if not builtins.has_key(ty.typename): raise NotImplementedError("Unknown Builtin %s (%s)" % (ty.typename, type(ty))) _,_,fn = builtins[ty.typename] if not fn: raise NotImplementedError("No ocaml Val fn for Builtin %s (%s)" % (ty.typename, type(ty))) s += "%s = %s;" % (o, fn % { "c": c }) - elif isinstance(ty,libxltypes.Enumeration) and (parent is None): + elif isinstance(ty,idl.Enumeration) and (parent is None): n = 0 s += "switch(%s) {\n" % c for e in ty.values: @@ -199,7 +199,7 @@ n += 1 s += " default: failwith_xl(\"cannot convert value from %s\", lg); break;\n" % ty.typename s += "}" - elif isinstance(ty,libxltypes.Aggregate) and (parent is None): + elif isinstance(ty,idl.Aggregate) and (parent is None): s += "{\n" s += "\tvalue %s_field;\n" % ty.rawname s += "\n" @@ -258,8 +258,7 @@ print >>sys.stderr, "Usage: genwrap.py " sys.exit(1) - idl = sys.argv[1] - (_,types) = libxltypes.parse(idl) + (_,types) = idl.parse(sys.argv[1]) # Do not generate these yet. blacklist = [ diff -r 61ac1bf881ea -r e61ac54bbf1c tools/python/Makefile --- a/tools/python/Makefile Tue Jan 31 16:34:38 2012 +0000 +++ b/tools/python/Makefile Tue Jan 31 16:34:38 2012 +0000 @@ -11,7 +11,7 @@ .PHONY: build build: genpath genwrap.py $(XEN_ROOT)/tools/libxl/libxl_types.idl \ - $(XEN_ROOT)/tools/libxl/libxltypes.py + $(XEN_ROOT)/tools/libxl/idl.py PYTHONPATH=$(XEN_ROOT)/tools/libxl $(PYTHON) genwrap.py \ $(XEN_ROOT)/tools/libxl/libxl_types.idl \ xen/lowlevel/xl/_pyxl_types.h \ diff -r 61ac1bf881ea -r e61ac54bbf1c tools/python/genwrap.py --- a/tools/python/genwrap.py Tue Jan 31 16:34:38 2012 +0000 +++ b/tools/python/genwrap.py Tue Jan 31 16:34:38 2012 +0000 @@ -2,23 +2,23 @@ import sys,os -import libxltypes +import idl (TYPE_BOOL, TYPE_INT, TYPE_UINT, TYPE_STRING, TYPE_AGGREGATE) = range(5) def py_type(ty): - if ty == libxltypes.bool: + if ty == idl.bool: return TYPE_BOOL - if isinstance(ty, libxltypes.Enumeration): + if isinstance(ty, idl.Enumeration): return TYPE_UINT - if isinstance(ty, libxltypes.Number): + if isinstance(ty, idl.Number): if ty.signed: return TYPE_INT else: return TYPE_UINT - if isinstance(ty, libxltypes.Aggregate): + if isinstance(ty, idl.Aggregate): return TYPE_AGGREGATE - if ty == libxltypes.string: + if ty == idl.string: return TYPE_STRING return None @@ -38,7 +38,7 @@ def py_decls(ty): l = [] - if isinstance(ty, libxltypes.Aggregate): + if isinstance(ty, idl.Aggregate): l.append('_hidden Py_%s *Py%s_New(void);\n'%(ty.rawname, ty.rawname)) l.append('_hidden int Py%s_Check(PyObject *self);\n'%ty.rawname) for f in ty.fields: @@ -211,10 +211,10 @@ l.append('void genwrap__init(PyObject *m)') l.append('{') for ty in types: - if isinstance(ty, libxltypes.Enumeration): + if isinstance(ty, idl.Enumeration): for v in ty.values: l.append(' PyModule_AddIntConstant(m, "%s", %s);' % (v.rawname, v.name)) - elif isinstance(ty, libxltypes.Aggregate): + elif isinstance(ty, idl.Aggregate): l.append(' if (PyType_Ready(&Py%s_Type) >= 0) {'%ty.rawname) l.append(' Py_INCREF(&Py%s_Type);'%ty.rawname) l.append(' PyModule_AddObject(m, "%s", (PyObject *)&Py%s_Type);'%(ty.rawname, ty.rawname)) @@ -227,7 +227,7 @@ def tree_frob(types): ret = types[:] - for ty in [ty for ty in ret if isinstance(ty, libxltypes.Aggregate)]: + for ty in [ty for ty in ret if isinstance(ty, idl.Aggregate)]: ty.fields = filter(lambda f:f.name is not None and f.type.typename is not None, ty.fields) return ret @@ -236,8 +236,7 @@ print >>sys.stderr, "Usage: genwrap.py " sys.exit(1) - idl = sys.argv[1] - (_,types) = libxltypes.parse(idl) + (_,types) = idl.parse(sys.argv[1]) types = tree_frob(types) @@ -278,7 +277,7 @@ _hidden int genwrap__ll_set(PyObject *v, long long *val, long long mask); """ % " ".join(sys.argv)) - for ty in [ty for ty in types if isinstance(ty, libxltypes.Aggregate)]: + for ty in [ty for ty in types if isinstance(ty, idl.Aggregate)]: f.write('/* Internal API for %s wrapper */\n'%ty.typename) f.write(py_wrapstruct(ty)) f.write(py_decls(ty)) @@ -307,7 +306,7 @@ for ty in types: if ty.private: continue - if isinstance(ty, libxltypes.Aggregate): + if isinstance(ty, idl.Aggregate): f.write('/* Attribute get/set functions for %s */\n'%ty.typename) for a in ty.fields: if a.type.private: _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Fri Feb 03 21:58:42 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Feb 2012 21:58: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 1RtR9V-0008D8-WC; Fri, 03 Feb 2012 21:58:42 +0000 Received: from mail174.messagelabs.com ([85.158.138.51]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR9V-000881-12 for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:41 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-174.messagelabs.com!1328306313!11933734!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12512 invoked from network); 3 Feb 2012 21:58:34 -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; 3 Feb 2012 21:58:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1RtR9N-0001pM-1Z for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RtR9K-0003B7-HV for xen-changelog@lists.xensource.com; Fri, 03 Feb 2012 21:58:32 +0000 Message-Id: Date: Fri, 03 Feb 2012 21:58:28 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: remove libxl_button_press in favour of libxl_send_trigger. X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1328027679 0 # Node ID 44ee4d37384faf3c7129545a5c4e067f28ec04e5 # Parent a322bdbd43deaa67fbe1c4072fee38a797f51923 libxl: remove libxl_button_press in favour of libxl_send_trigger. send_trigger already included all the operations covered by button_press. Rework send_trigger to take an enum instead of a string. I stopped short at removing the xl "button-press" command but instead have marked it as deprecated. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r a322bdbd43de -r 44ee4d37384f docs/man/xl.pod.1 --- a/docs/man/xl.pod.1 Tue Jan 31 16:34:39 2012 +0000 +++ b/docs/man/xl.pod.1 Tue Jan 31 16:34:39 2012 +0000 @@ -86,6 +86,8 @@ =item B I I