From xen-changelog-bounces@lists.xen.org Wed Aug 01 00:22:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 01 Aug 2012 00:22:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwMha-0005co-11; Wed, 01 Aug 2012 00:22:14 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwMhY-0005cW-OZ for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 00:22:12 +0000 Received: from [85.158.138.51:44511] by server-7.bemta-3.messagelabs.com id 30/B8-21158-3B678105; Wed, 01 Aug 2012 00:22:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-174.messagelabs.com!1343780530!29750693!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=2.0 required=7.0 tests=SUBJECT_RANDOMQ X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13482 invoked from network); 1 Aug 2012 00:22:11 -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; 1 Aug 2012 00:22:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwMhV-0004Ob-Mp for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 00:22:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SwMhV-0000M9-F1 for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 00:22:09 +0000 Message-Id: Date: Wed, 01 Aug 2012 00:22:09 +0000 From: Xen patchbot-4.0-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.0-testing] x86: fix off-by-one in nr_irqs_gsi calculation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Jan Beulich # Date 1343651987 -3600 # Node ID 6d7ae840463c5d6d15c710199b3f4b2bb2a33000 # Parent 58516d1a539e166e20472ade13bdef6b4ed016fa x86: fix off-by-one in nr_irqs_gsi calculation highest_gsi() returns the last valid GSI, not a count. Signed-off-by: Jan Beulich Acked-by: Joe Jin Acked-by: Keir Fraser xen-unstable changeset: 25688:e6266fc76d08 xen-unstable date: Fri Jul 27 12:22:13 2012 +0200 --- diff -r 58516d1a539e -r 6d7ae840463c xen/arch/x86/io_apic.c --- a/xen/arch/x86/io_apic.c Mon Jul 30 13:39:31 2012 +0100 +++ b/xen/arch/x86/io_apic.c Mon Jul 30 13:39:47 2012 +0100 @@ -2589,7 +2589,7 @@ void __init init_ioapic_mappings(void) } } - nr_irqs_gsi = max(nr_irqs_gsi, highest_gsi()); + nr_irqs_gsi = max(nr_irqs_gsi, highest_gsi() + 1); if ( !smp_found_config || skip_ioapic_setup || nr_irqs_gsi < 16 ) nr_irqs_gsi = 16; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 01 00:22:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 01 Aug 2012 00:22:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwMhZ-0005cj-Um; Wed, 01 Aug 2012 00:22:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwMhY-0005cU-5b for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 00:22:12 +0000 Received: from [85.158.139.83:37931] by server-2.bemta-5.messagelabs.com id C5/C2-04598-3B678105; Wed, 01 Aug 2012 00:22:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-182.messagelabs.com!1343780529!29620200!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24647 invoked from network); 1 Aug 2012 00:22:10 -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; 1 Aug 2012 00:22:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwMhV-0004OX-5B for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 00:22:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SwMhV-0000Lt-0M for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 00:22:09 +0000 Message-Id: Date: Wed, 01 Aug 2012 00:22:08 +0000 From: Xen patchbot-4.0-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.0-testing] vt-d: fix wrong addr in IOTLB invalidation descriptor X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Yang Zhang # Date 1343651971 -3600 # Node ID 58516d1a539e166e20472ade13bdef6b4ed016fa # Parent 79aaaf1e89ba5451374ab7dd3b7ca927282a4bd1 vt-d: fix wrong addr in IOTLB invalidation descriptor According to vt-d specs, the addr in IOTLB invalidation descriptor should be 4K page aligned. Signed-off-by: Yang Zhang Committed-by: Keir Fraser xen-unstable changeset: 25617:75eb78d6cf54 xen-unstable date: Thu Jul 19 15:46:02 2012 +0100 --- diff -r 79aaaf1e89ba -r 58516d1a539e xen/drivers/passthrough/vtd/qinval.c --- a/xen/drivers/passthrough/vtd/qinval.c Mon Jul 30 13:34:57 2012 +0100 +++ b/xen/drivers/passthrough/vtd/qinval.c Mon Jul 30 13:39:31 2012 +0100 @@ -140,7 +140,7 @@ static int gen_iotlb_inv_dsc(struct iomm qinval_entry->q.iotlb_inv_dsc.hi.am = am; qinval_entry->q.iotlb_inv_dsc.hi.ih = ih; qinval_entry->q.iotlb_inv_dsc.hi.res_1 = 0; - qinval_entry->q.iotlb_inv_dsc.hi.addr = addr; + qinval_entry->q.iotlb_inv_dsc.hi.addr = addr >> PAGE_SHIFT_4K; unmap_vtd_domain_page(qinval_entries); spin_unlock_irqrestore(&qi_ctrl->qinval_lock, flags); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 01 00:22:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 01 Aug 2012 00:22:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwMha-0005co-11; Wed, 01 Aug 2012 00:22:14 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwMhY-0005cW-OZ for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 00:22:12 +0000 Received: from [85.158.138.51:44511] by server-7.bemta-3.messagelabs.com id 30/B8-21158-3B678105; Wed, 01 Aug 2012 00:22:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-174.messagelabs.com!1343780530!29750693!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=2.0 required=7.0 tests=SUBJECT_RANDOMQ X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13482 invoked from network); 1 Aug 2012 00:22:11 -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; 1 Aug 2012 00:22:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwMhV-0004Ob-Mp for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 00:22:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SwMhV-0000M9-F1 for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 00:22:09 +0000 Message-Id: Date: Wed, 01 Aug 2012 00:22:09 +0000 From: Xen patchbot-4.0-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.0-testing] x86: fix off-by-one in nr_irqs_gsi calculation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Jan Beulich # Date 1343651987 -3600 # Node ID 6d7ae840463c5d6d15c710199b3f4b2bb2a33000 # Parent 58516d1a539e166e20472ade13bdef6b4ed016fa x86: fix off-by-one in nr_irqs_gsi calculation highest_gsi() returns the last valid GSI, not a count. Signed-off-by: Jan Beulich Acked-by: Joe Jin Acked-by: Keir Fraser xen-unstable changeset: 25688:e6266fc76d08 xen-unstable date: Fri Jul 27 12:22:13 2012 +0200 --- diff -r 58516d1a539e -r 6d7ae840463c xen/arch/x86/io_apic.c --- a/xen/arch/x86/io_apic.c Mon Jul 30 13:39:31 2012 +0100 +++ b/xen/arch/x86/io_apic.c Mon Jul 30 13:39:47 2012 +0100 @@ -2589,7 +2589,7 @@ void __init init_ioapic_mappings(void) } } - nr_irqs_gsi = max(nr_irqs_gsi, highest_gsi()); + nr_irqs_gsi = max(nr_irqs_gsi, highest_gsi() + 1); if ( !smp_found_config || skip_ioapic_setup || nr_irqs_gsi < 16 ) nr_irqs_gsi = 16; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 01 00:22:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 01 Aug 2012 00:22:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwMhZ-0005cj-Um; Wed, 01 Aug 2012 00:22:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwMhY-0005cU-5b for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 00:22:12 +0000 Received: from [85.158.139.83:37931] by server-2.bemta-5.messagelabs.com id C5/C2-04598-3B678105; Wed, 01 Aug 2012 00:22:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-182.messagelabs.com!1343780529!29620200!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24647 invoked from network); 1 Aug 2012 00:22:10 -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; 1 Aug 2012 00:22:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwMhV-0004OX-5B for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 00:22:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SwMhV-0000Lt-0M for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 00:22:09 +0000 Message-Id: Date: Wed, 01 Aug 2012 00:22:08 +0000 From: Xen patchbot-4.0-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.0-testing] vt-d: fix wrong addr in IOTLB invalidation descriptor X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Yang Zhang # Date 1343651971 -3600 # Node ID 58516d1a539e166e20472ade13bdef6b4ed016fa # Parent 79aaaf1e89ba5451374ab7dd3b7ca927282a4bd1 vt-d: fix wrong addr in IOTLB invalidation descriptor According to vt-d specs, the addr in IOTLB invalidation descriptor should be 4K page aligned. Signed-off-by: Yang Zhang Committed-by: Keir Fraser xen-unstable changeset: 25617:75eb78d6cf54 xen-unstable date: Thu Jul 19 15:46:02 2012 +0100 --- diff -r 79aaaf1e89ba -r 58516d1a539e xen/drivers/passthrough/vtd/qinval.c --- a/xen/drivers/passthrough/vtd/qinval.c Mon Jul 30 13:34:57 2012 +0100 +++ b/xen/drivers/passthrough/vtd/qinval.c Mon Jul 30 13:39:31 2012 +0100 @@ -140,7 +140,7 @@ static int gen_iotlb_inv_dsc(struct iomm qinval_entry->q.iotlb_inv_dsc.hi.am = am; qinval_entry->q.iotlb_inv_dsc.hi.ih = ih; qinval_entry->q.iotlb_inv_dsc.hi.res_1 = 0; - qinval_entry->q.iotlb_inv_dsc.hi.addr = addr; + qinval_entry->q.iotlb_inv_dsc.hi.addr = addr >> PAGE_SHIFT_4K; unmap_vtd_domain_page(qinval_entries); spin_unlock_irqrestore(&qi_ctrl->qinval_lock, flags); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 01 00:22:21 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 01 Aug 2012 00:22: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 1SwMhe-0005d4-3l; Wed, 01 Aug 2012 00:22:18 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwMhc-0005cS-FZ for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 00:22:16 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-11.tower-27.messagelabs.com!1343780529!1742183!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7912 invoked from network); 1 Aug 2012 00:22: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; 1 Aug 2012 00:22:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwMhU-0004OV-Ta for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 00:22:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SwMhU-0000Le-Ds for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 00:22:08 +0000 Message-Id: Date: Wed, 01 Aug 2012 00:22:07 +0000 From: Xen patchbot-4.0-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.0-testing] Update Xen version to 4.0.4-rc4-pre X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Keir Fraser # Date 1343651697 -3600 # Node ID 79aaaf1e89ba5451374ab7dd3b7ca927282a4bd1 # Parent 82fcf3a5dc3aafc5be375d52a901e00ecbe01fa4 Update Xen version to 4.0.4-rc4-pre --- diff -r 82fcf3a5dc3a -r 79aaaf1e89ba xen/Makefile --- a/xen/Makefile Thu Jul 26 16:57:18 2012 +0100 +++ b/xen/Makefile Mon Jul 30 13:34:57 2012 +0100 @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 0 -export XEN_EXTRAVERSION ?= .4-rc3$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .4-rc4-pre$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 01 00:22:21 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 01 Aug 2012 00:22: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 1SwMhe-0005d4-3l; Wed, 01 Aug 2012 00:22:18 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwMhc-0005cS-FZ for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 00:22:16 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-11.tower-27.messagelabs.com!1343780529!1742183!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7912 invoked from network); 1 Aug 2012 00:22: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; 1 Aug 2012 00:22:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwMhU-0004OV-Ta for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 00:22:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SwMhU-0000Le-Ds for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 00:22:08 +0000 Message-Id: Date: Wed, 01 Aug 2012 00:22:07 +0000 From: Xen patchbot-4.0-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.0-testing] Update Xen version to 4.0.4-rc4-pre X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Keir Fraser # Date 1343651697 -3600 # Node ID 79aaaf1e89ba5451374ab7dd3b7ca927282a4bd1 # Parent 82fcf3a5dc3aafc5be375d52a901e00ecbe01fa4 Update Xen version to 4.0.4-rc4-pre --- diff -r 82fcf3a5dc3a -r 79aaaf1e89ba xen/Makefile --- a/xen/Makefile Thu Jul 26 16:57:18 2012 +0100 +++ b/xen/Makefile Mon Jul 30 13:34:57 2012 +0100 @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 0 -export XEN_EXTRAVERSION ?= .4-rc3$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .4-rc4-pre$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 01 21:11:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 01 Aug 2012 21:11:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwgCH-0008RD-1U; Wed, 01 Aug 2012 21:11:13 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwgCF-0008Qv-QH for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 21:11:12 +0000 Received: from [85.158.143.99:2561] by server-2.bemta-4.messagelabs.com id 46/9D-17938-F6B99105; Wed, 01 Aug 2012 21:11:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-216.messagelabs.com!1343855469!26461018!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15030 invoked from network); 1 Aug 2012 21:11: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; 1 Aug 2012 21:11:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwgCD-0004xB-0m for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 21:11:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SwgCC-0000wW-By for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 21:11:08 +0000 Message-Id: Date: Wed, 01 Aug 2012 21:11:07 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] Some automatic NUMA placement documentation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Dario Faggioli # Date 1343821606 -3600 # Node ID f4b5a21f93add32ff66494ed2a8605abbabec309 # Parent cf0e661cb321b1c898c9008dc17ba21db434c976 Some automatic NUMA placement documentation About rationale, usage and (some small bits of) API. Signed-off-by: Dario Faggioli Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r cf0e661cb321 -r f4b5a21f93ad docs/misc/xl-numa-placement.markdown --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/docs/misc/xl-numa-placement.markdown Wed Aug 01 12:46:46 2012 +0100 @@ -0,0 +1,111 @@ +# Guest Automatic NUMA Placement in libxl and xl # + +## Rationale ## + +NUMA (which stands for Non-Uniform Memory Access) means that the memory +accessing times of a program running on a CPU depends on the relative +distance between that CPU and that memory. In fact, most of the NUMA +systems are built in such a way that each processor has its local memory, +on which it can operate very fast. On the other hand, getting and storing +data from and on remote memory (that is, memory local to some other processor) +is quite more complex and slow. On these machines, a NUMA node is usually +defined as a set of processor cores (typically a physical CPU package) and +the memory directly attached to the set of cores. + +The Xen hypervisor deals with NUMA machines by assigning to each domain +a "node affinity", i.e., a set of NUMA nodes of the host from which they +get their memory allocated. + +NUMA awareness becomes very important as soon as many domains start +running memory-intensive workloads on a shared host. In fact, the cost +of accessing non node-local memory locations is very high, and the +performance degradation is likely to be noticeable. + +## Guest Placement in xl ## + +If using xl for creating and managing guests, it is very easy to ask for +both manual or automatic placement of them across the host's NUMA nodes. + +Note that xm/xend does the very same thing, the only differences residing +in the details of the heuristics adopted for the placement (see below). + +### Manual Guest Placement with xl ### + +Thanks to the "cpus=" option, it is possible to specify where a domain +should be created and scheduled on, directly in its config file. This +affects NUMA placement and memory accesses as the hypervisor constructs +the node affinity of a VM basing right on its CPU affinity when it is +created. + +This is very simple and effective, but requires the user/system +administrator to explicitly specify affinities for each and every domain, +or Xen won't be able to guarantee the locality for their memory accesses. + +It is also possible to deal with NUMA by partitioning the system using +cpupools. Again, this could be "The Right Answer" for many needs and +occasions, but has to be carefully considered and setup by hand. + +### Automatic Guest Placement with xl ### + +If no "cpus=" option is specified in the config file, libxl tries +to figure out on its own on which node(s) the domain could fit best. +It is worthwhile noting that optimally fitting a set of VMs on the NUMA +nodes of an host is an incarnation of the Bin Packing Problem. In fact, +the various VMs with different memory sizes are the items to be packed, +and the host nodes are the bins. As such problem is known to be NP-hard, +we will be using some heuristics. + +The first thing to do is find the nodes or the sets of nodes (from now +on referred to as 'candidates') that have enough free memory and enough +physical CPUs for accommodating the new domain. The idea is to find a +spot for the domain with at least as much free memory as it has configured +to have, and as much pCPUs as it has vCPUs. After that, the actual +decision on which candidate to pick happens accordingly to the following +heuristics: + + * candidates involving fewer nodes are considered better. In case + two (or more) candidates span the same number of nodes, + * candidates with a smaller number of vCPUs runnable on them (due + to previous placement and/or plain vCPU pinning) are considered + better. In case the same number of vCPUs can run on two (or more) + candidates, + * the candidate with with the greatest amount of free memory is + considered to be the best one. + +Giving preference to candidates with fewer nodes ensures better +performance for the guest, as it avoid spreading its memory among +different nodes. Favoring candidates with fewer vCPUs already runnable +there ensures a good balance of the overall host load. Finally, if more +candidates fulfil these criteria, prioritizing the nodes that have the +largest amounts of free memory helps keeping the memory fragmentation +small, and maximizes the probability of being able to put more domains +there. + +## Guest Placement within libxl ## + +xl achieves automatic NUMA placement because that is what libxl does +by default. No API is provided (yet) for modifying the behaviour of +the placement algorithm. However, if your program is calling libxl, +it is possible to set the `numa_placement` build info key to `false` +(it is `true` by default) with something like the below, to prevent +any placement from happening: + + libxl_defbool_set(&domain_build_info->numa_placement, false); + +Also, if `numa_placement` is set to `true`, the domain must not +have any cpu affinity (i.e., `domain_build_info->cpumap` must +have all its bits set, as it is by default), or domain creation +will fail returning `ERROR_INVAL`. + +Besides than that, looking and/or tweaking the placement algorithm +search "Automatic NUMA placement" in libxl\_internal.h. + +Note this may change in future versions of Xen/libxl. + +## Limitations ## + +Analyzing various possible placement solutions is what makes the +algorithm flexible and quite effective. However, that also means +it won't scale well to systems with arbitrary number of nodes. +For this reason, automatic placement is disabled (with a warning) +if it is requested on a host with more than 16 NUMA nodes. _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 01 21:11:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 01 Aug 2012 21:11:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwgCH-0008RN-75; Wed, 01 Aug 2012 21:11:13 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwgCG-0008Qx-GH for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 21:11:12 +0000 Received: from [85.158.143.99:2591] by server-3.bemta-4.messagelabs.com id C3/3D-01511-F6B99105; Wed, 01 Aug 2012 21:11:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-216.messagelabs.com!1343855470!22787489!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22584 invoked from network); 1 Aug 2012 21:11:11 -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; 1 Aug 2012 21:11:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwgCD-0004xH-Va for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 21:11:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SwgCD-0000x0-O8 for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 21:11:09 +0000 Message-Id: Date: Wed, 01 Aug 2012 21:11:09 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: call hotplug scripts from xl for NetBSD X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Roger Pau Monne # Date 1343821607 -3600 # Node ID 84a78045e701ad743bcd369acbae6d0fb258a0f8 # Parent e20085770cb556940d41b8f6ef8f860787da88bf libxl: call hotplug scripts from xl for NetBSD Add the missing NetBSD functions to call hotplug scripts, and disable xenbackendd if libxl/disable_udev is not set. Signed-off-by: Roger Pau Monne Acked-by: Ian Jackson Acked-by: Christoph Egger Committed-by: Ian Campbell --- diff -r e20085770cb5 -r 84a78045e701 tools/libxl/libxl_netbsd.c --- a/tools/libxl/libxl_netbsd.c Wed Aug 01 12:46:47 2012 +0100 +++ b/tools/libxl/libxl_netbsd.c Wed Aug 01 12:46:47 2012 +0100 @@ -32,10 +32,65 @@ char *libxl__devid_to_localdev(libxl__gc } /* Hotplug scripts caller functions */ +static int libxl__hotplug(libxl__gc *gc, libxl__device *dev, char ***args, + libxl__device_action action) +{ + char *be_path = libxl__device_backend_path(gc, dev); + char *script; + int nr = 0, rc = 0, arraysize = 4; + + script = libxl__xs_read(gc, XBT_NULL, + GCSPRINTF("%s/%s", be_path, "script")); + if (!script) { + LOGEV(ERROR, errno, "unable to read script from %s", be_path); + rc = ERROR_FAIL; + goto out; + } + + GCNEW_ARRAY(*args, arraysize); + (*args)[nr++] = script; + (*args)[nr++] = be_path; + (*args)[nr++] = GCSPRINTF("%d", action == DEVICE_CONNECT ? + XenbusStateInitWait : XenbusStateClosed); + (*args)[nr++] = NULL; + assert(nr == arraysize); + +out: + return rc; +} + int libxl__get_hotplug_script_info(libxl__gc *gc, libxl__device *dev, char ***args, char ***env, libxl__device_action action, int num_exec) { - return 0; + char *disable_udev = libxl__xs_read(gc, XBT_NULL, DISABLE_UDEV_PATH); + int rc; + + /* Check if we have to run hotplug scripts */ + if (!disable_udev || num_exec > 0) { + rc = 0; + goto out; + } + + switch (dev->backend_kind) { + case LIBXL__DEVICE_KIND_VBD: + case LIBXL__DEVICE_KIND_VIF: + if (num_exec != 0) { + rc = 0; + goto out; + } + rc = libxl__hotplug(gc, dev, args, action); + if (!rc) rc = 1; + break; + default: + /* If no need to execute any hotplug scripts, + * call the callback manually + */ + rc = 0; + break; + } + +out: + return rc; } diff -r e20085770cb5 -r 84a78045e701 tools/xenbackendd/xenbackendd.c --- a/tools/xenbackendd/xenbackendd.c Wed Aug 01 12:46:47 2012 +0100 +++ b/tools/xenbackendd/xenbackendd.c Wed Aug 01 12:46:47 2012 +0100 @@ -33,6 +33,7 @@ #define DEVTYPE_UNKNOWN 0 #define DEVTYPE_VIF 1 #define DEVTYPE_VBD 2 +#define DISABLE_EXEC "libxl/disable_udev" #define DOMAIN_PATH "/local/domain/0" @@ -149,7 +150,7 @@ main(int argc, char * const argv[]) unsigned int num; char *s; int state; - char *sstate; + char *sstate, *sdisable; char *p; char buf[80]; int type; @@ -245,6 +246,10 @@ main(int argc, char * const argv[]) continue; } + sdisable = xs_read(xs, XBT_NULL, DISABLE_EXEC, 0); + if (sdisable) + goto next1; + if (strlen(vec[XS_WATCH_PATH]) < sizeof("state")) goto next1; @@ -314,6 +319,7 @@ next2: free(sstate); next1: + free(sdisable); free(vec); } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 01 21:11:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 01 Aug 2012 21:11:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwgCH-0008RD-1U; Wed, 01 Aug 2012 21:11:13 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwgCF-0008Qv-QH for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 21:11:12 +0000 Received: from [85.158.143.99:2561] by server-2.bemta-4.messagelabs.com id 46/9D-17938-F6B99105; Wed, 01 Aug 2012 21:11:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-216.messagelabs.com!1343855469!26461018!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15030 invoked from network); 1 Aug 2012 21:11: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; 1 Aug 2012 21:11:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwgCD-0004xB-0m for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 21:11:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SwgCC-0000wW-By for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 21:11:08 +0000 Message-Id: Date: Wed, 01 Aug 2012 21:11:07 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] Some automatic NUMA placement documentation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Dario Faggioli # Date 1343821606 -3600 # Node ID f4b5a21f93add32ff66494ed2a8605abbabec309 # Parent cf0e661cb321b1c898c9008dc17ba21db434c976 Some automatic NUMA placement documentation About rationale, usage and (some small bits of) API. Signed-off-by: Dario Faggioli Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r cf0e661cb321 -r f4b5a21f93ad docs/misc/xl-numa-placement.markdown --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/docs/misc/xl-numa-placement.markdown Wed Aug 01 12:46:46 2012 +0100 @@ -0,0 +1,111 @@ +# Guest Automatic NUMA Placement in libxl and xl # + +## Rationale ## + +NUMA (which stands for Non-Uniform Memory Access) means that the memory +accessing times of a program running on a CPU depends on the relative +distance between that CPU and that memory. In fact, most of the NUMA +systems are built in such a way that each processor has its local memory, +on which it can operate very fast. On the other hand, getting and storing +data from and on remote memory (that is, memory local to some other processor) +is quite more complex and slow. On these machines, a NUMA node is usually +defined as a set of processor cores (typically a physical CPU package) and +the memory directly attached to the set of cores. + +The Xen hypervisor deals with NUMA machines by assigning to each domain +a "node affinity", i.e., a set of NUMA nodes of the host from which they +get their memory allocated. + +NUMA awareness becomes very important as soon as many domains start +running memory-intensive workloads on a shared host. In fact, the cost +of accessing non node-local memory locations is very high, and the +performance degradation is likely to be noticeable. + +## Guest Placement in xl ## + +If using xl for creating and managing guests, it is very easy to ask for +both manual or automatic placement of them across the host's NUMA nodes. + +Note that xm/xend does the very same thing, the only differences residing +in the details of the heuristics adopted for the placement (see below). + +### Manual Guest Placement with xl ### + +Thanks to the "cpus=" option, it is possible to specify where a domain +should be created and scheduled on, directly in its config file. This +affects NUMA placement and memory accesses as the hypervisor constructs +the node affinity of a VM basing right on its CPU affinity when it is +created. + +This is very simple and effective, but requires the user/system +administrator to explicitly specify affinities for each and every domain, +or Xen won't be able to guarantee the locality for their memory accesses. + +It is also possible to deal with NUMA by partitioning the system using +cpupools. Again, this could be "The Right Answer" for many needs and +occasions, but has to be carefully considered and setup by hand. + +### Automatic Guest Placement with xl ### + +If no "cpus=" option is specified in the config file, libxl tries +to figure out on its own on which node(s) the domain could fit best. +It is worthwhile noting that optimally fitting a set of VMs on the NUMA +nodes of an host is an incarnation of the Bin Packing Problem. In fact, +the various VMs with different memory sizes are the items to be packed, +and the host nodes are the bins. As such problem is known to be NP-hard, +we will be using some heuristics. + +The first thing to do is find the nodes or the sets of nodes (from now +on referred to as 'candidates') that have enough free memory and enough +physical CPUs for accommodating the new domain. The idea is to find a +spot for the domain with at least as much free memory as it has configured +to have, and as much pCPUs as it has vCPUs. After that, the actual +decision on which candidate to pick happens accordingly to the following +heuristics: + + * candidates involving fewer nodes are considered better. In case + two (or more) candidates span the same number of nodes, + * candidates with a smaller number of vCPUs runnable on them (due + to previous placement and/or plain vCPU pinning) are considered + better. In case the same number of vCPUs can run on two (or more) + candidates, + * the candidate with with the greatest amount of free memory is + considered to be the best one. + +Giving preference to candidates with fewer nodes ensures better +performance for the guest, as it avoid spreading its memory among +different nodes. Favoring candidates with fewer vCPUs already runnable +there ensures a good balance of the overall host load. Finally, if more +candidates fulfil these criteria, prioritizing the nodes that have the +largest amounts of free memory helps keeping the memory fragmentation +small, and maximizes the probability of being able to put more domains +there. + +## Guest Placement within libxl ## + +xl achieves automatic NUMA placement because that is what libxl does +by default. No API is provided (yet) for modifying the behaviour of +the placement algorithm. However, if your program is calling libxl, +it is possible to set the `numa_placement` build info key to `false` +(it is `true` by default) with something like the below, to prevent +any placement from happening: + + libxl_defbool_set(&domain_build_info->numa_placement, false); + +Also, if `numa_placement` is set to `true`, the domain must not +have any cpu affinity (i.e., `domain_build_info->cpumap` must +have all its bits set, as it is by default), or domain creation +will fail returning `ERROR_INVAL`. + +Besides than that, looking and/or tweaking the placement algorithm +search "Automatic NUMA placement" in libxl\_internal.h. + +Note this may change in future versions of Xen/libxl. + +## Limitations ## + +Analyzing various possible placement solutions is what makes the +algorithm flexible and quite effective. However, that also means +it won't scale well to systems with arbitrary number of nodes. +For this reason, automatic placement is disabled (with a warning) +if it is requested on a host with more than 16 NUMA nodes. _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 01 21:11:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 01 Aug 2012 21:11:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwgCH-0008RN-75; Wed, 01 Aug 2012 21:11:13 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwgCG-0008Qx-GH for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 21:11:12 +0000 Received: from [85.158.143.99:2591] by server-3.bemta-4.messagelabs.com id C3/3D-01511-F6B99105; Wed, 01 Aug 2012 21:11:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-216.messagelabs.com!1343855470!22787489!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22584 invoked from network); 1 Aug 2012 21:11:11 -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; 1 Aug 2012 21:11:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwgCD-0004xH-Va for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 21:11:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SwgCD-0000x0-O8 for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 21:11:09 +0000 Message-Id: Date: Wed, 01 Aug 2012 21:11:09 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: call hotplug scripts from xl for NetBSD X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Roger Pau Monne # Date 1343821607 -3600 # Node ID 84a78045e701ad743bcd369acbae6d0fb258a0f8 # Parent e20085770cb556940d41b8f6ef8f860787da88bf libxl: call hotplug scripts from xl for NetBSD Add the missing NetBSD functions to call hotplug scripts, and disable xenbackendd if libxl/disable_udev is not set. Signed-off-by: Roger Pau Monne Acked-by: Ian Jackson Acked-by: Christoph Egger Committed-by: Ian Campbell --- diff -r e20085770cb5 -r 84a78045e701 tools/libxl/libxl_netbsd.c --- a/tools/libxl/libxl_netbsd.c Wed Aug 01 12:46:47 2012 +0100 +++ b/tools/libxl/libxl_netbsd.c Wed Aug 01 12:46:47 2012 +0100 @@ -32,10 +32,65 @@ char *libxl__devid_to_localdev(libxl__gc } /* Hotplug scripts caller functions */ +static int libxl__hotplug(libxl__gc *gc, libxl__device *dev, char ***args, + libxl__device_action action) +{ + char *be_path = libxl__device_backend_path(gc, dev); + char *script; + int nr = 0, rc = 0, arraysize = 4; + + script = libxl__xs_read(gc, XBT_NULL, + GCSPRINTF("%s/%s", be_path, "script")); + if (!script) { + LOGEV(ERROR, errno, "unable to read script from %s", be_path); + rc = ERROR_FAIL; + goto out; + } + + GCNEW_ARRAY(*args, arraysize); + (*args)[nr++] = script; + (*args)[nr++] = be_path; + (*args)[nr++] = GCSPRINTF("%d", action == DEVICE_CONNECT ? + XenbusStateInitWait : XenbusStateClosed); + (*args)[nr++] = NULL; + assert(nr == arraysize); + +out: + return rc; +} + int libxl__get_hotplug_script_info(libxl__gc *gc, libxl__device *dev, char ***args, char ***env, libxl__device_action action, int num_exec) { - return 0; + char *disable_udev = libxl__xs_read(gc, XBT_NULL, DISABLE_UDEV_PATH); + int rc; + + /* Check if we have to run hotplug scripts */ + if (!disable_udev || num_exec > 0) { + rc = 0; + goto out; + } + + switch (dev->backend_kind) { + case LIBXL__DEVICE_KIND_VBD: + case LIBXL__DEVICE_KIND_VIF: + if (num_exec != 0) { + rc = 0; + goto out; + } + rc = libxl__hotplug(gc, dev, args, action); + if (!rc) rc = 1; + break; + default: + /* If no need to execute any hotplug scripts, + * call the callback manually + */ + rc = 0; + break; + } + +out: + return rc; } diff -r e20085770cb5 -r 84a78045e701 tools/xenbackendd/xenbackendd.c --- a/tools/xenbackendd/xenbackendd.c Wed Aug 01 12:46:47 2012 +0100 +++ b/tools/xenbackendd/xenbackendd.c Wed Aug 01 12:46:47 2012 +0100 @@ -33,6 +33,7 @@ #define DEVTYPE_UNKNOWN 0 #define DEVTYPE_VIF 1 #define DEVTYPE_VBD 2 +#define DISABLE_EXEC "libxl/disable_udev" #define DOMAIN_PATH "/local/domain/0" @@ -149,7 +150,7 @@ main(int argc, char * const argv[]) unsigned int num; char *s; int state; - char *sstate; + char *sstate, *sdisable; char *p; char buf[80]; int type; @@ -245,6 +246,10 @@ main(int argc, char * const argv[]) continue; } + sdisable = xs_read(xs, XBT_NULL, DISABLE_EXEC, 0); + if (sdisable) + goto next1; + if (strlen(vec[XS_WATCH_PATH]) < sizeof("state")) goto next1; @@ -314,6 +319,7 @@ next2: free(sstate); next1: + free(sdisable); free(vec); } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 01 21:11:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 01 Aug 2012 21:11:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwgCH-0008RI-45; Wed, 01 Aug 2012 21:11:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwgCG-0008Qw-4T for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 21:11:12 +0000 Received: from [85.158.139.83:55291] by server-5.bemta-5.messagelabs.com id B8/D5-02722-F6B99105; Wed, 01 Aug 2012 21:11:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-182.messagelabs.com!1343855469!24126228!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7264 invoked from network); 1 Aug 2012 21:11:10 -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; 1 Aug 2012 21:11:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwgCD-0004xE-Ed for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 21:11:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SwgCD-0000wl-6o for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 21:11:09 +0000 Message-Id: Date: Wed, 01 Aug 2012 21:11:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] tools/build: fix pygrub linking X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Roger Pau Monne # Date 1343821607 -3600 # Node ID e20085770cb556940d41b8f6ef8f860787da88bf # Parent f4b5a21f93add32ff66494ed2a8605abbabec309 tools/build: fix pygrub linking Prevent creating a symlink to $(DESTDIR)/$(BINDIR) if it is the same as $(PRIVATE_BINDIR) This fixes NetBSD install, where $(DESTDIR)/$(BINDIR) == $(PRIVATE_BINDIR). Cc: Ian Jackson Cc: Christoph Egger Signed-off-by: Roger Pau Monne Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r f4b5a21f93ad -r e20085770cb5 tools/pygrub/Makefile --- a/tools/pygrub/Makefile Wed Aug 01 12:46:46 2012 +0100 +++ b/tools/pygrub/Makefile Wed Aug 01 12:46:47 2012 +0100 @@ -14,7 +14,10 @@ install: all $(PYTHON_PREFIX_ARG) --root="$(DESTDIR)" \ --install-scripts=$(PRIVATE_BINDIR) --force $(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot - ln -sf $(PRIVATE_BINDIR)/pygrub $(DESTDIR)/$(BINDIR) + set -e; if [ `readlink -f $(DESTDIR)/$(BINDIR)` != \ + `readlink -f $(PRIVATE_BINDIR)` ]; then \ + ln -sf $(PRIVATE_BINDIR)/pygrub $(DESTDIR)/$(BINDIR); \ + fi .PHONY: clean clean: _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 01 21:11:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 01 Aug 2012 21:11:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwgCH-0008RI-45; Wed, 01 Aug 2012 21:11:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwgCG-0008Qw-4T for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 21:11:12 +0000 Received: from [85.158.139.83:55291] by server-5.bemta-5.messagelabs.com id B8/D5-02722-F6B99105; Wed, 01 Aug 2012 21:11:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-182.messagelabs.com!1343855469!24126228!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7264 invoked from network); 1 Aug 2012 21:11:10 -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; 1 Aug 2012 21:11:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwgCD-0004xE-Ed for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 21:11:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SwgCD-0000wl-6o for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 21:11:09 +0000 Message-Id: Date: Wed, 01 Aug 2012 21:11:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] tools/build: fix pygrub linking X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Roger Pau Monne # Date 1343821607 -3600 # Node ID e20085770cb556940d41b8f6ef8f860787da88bf # Parent f4b5a21f93add32ff66494ed2a8605abbabec309 tools/build: fix pygrub linking Prevent creating a symlink to $(DESTDIR)/$(BINDIR) if it is the same as $(PRIVATE_BINDIR) This fixes NetBSD install, where $(DESTDIR)/$(BINDIR) == $(PRIVATE_BINDIR). Cc: Ian Jackson Cc: Christoph Egger Signed-off-by: Roger Pau Monne Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r f4b5a21f93ad -r e20085770cb5 tools/pygrub/Makefile --- a/tools/pygrub/Makefile Wed Aug 01 12:46:46 2012 +0100 +++ b/tools/pygrub/Makefile Wed Aug 01 12:46:47 2012 +0100 @@ -14,7 +14,10 @@ install: all $(PYTHON_PREFIX_ARG) --root="$(DESTDIR)" \ --install-scripts=$(PRIVATE_BINDIR) --force $(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot - ln -sf $(PRIVATE_BINDIR)/pygrub $(DESTDIR)/$(BINDIR) + set -e; if [ `readlink -f $(DESTDIR)/$(BINDIR)` != \ + `readlink -f $(PRIVATE_BINDIR)` ]; then \ + ln -sf $(PRIVATE_BINDIR)/pygrub $(DESTDIR)/$(BINDIR); \ + fi .PHONY: clean clean: _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 01 21:11:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 01 Aug 2012 21:11:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwgCK-0008Rq-CH; Wed, 01 Aug 2012 21:11:16 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwgCJ-0008Qv-Ed for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 21:11:15 +0000 Received: from [85.158.143.35:41230] by server-2.bemta-4.messagelabs.com id 2D/9D-17938-37B99105; Wed, 01 Aug 2012 21:11:15 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-21.messagelabs.com!1343855471!5538307!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32013 invoked from network); 1 Aug 2012 21:11:12 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 1 Aug 2012 21:11:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwgCE-0004xK-KX for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 21:11:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SwgCE-0000xG-Ab for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 21:11:10 +0000 Message-Id: Date: Wed, 01 Aug 2012 21:11:09 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] init/NetBSD: move xenbackendd to xend init script X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Roger Pau Monne # Date 1343821608 -3600 # Node ID 433624c658af4f3bf21ae53ef090528e870fdf58 # Parent 84a78045e701ad743bcd369acbae6d0fb258a0f8 init/NetBSD: move xenbackendd to xend init script xenbackendd is not needed by the xl toolstack, so move it's launch to the xend script. We have to iterate until we are sure there are no xend processes left, since doing a single pkill usually leaves xend processes running. Signed-off-by: Roger Pau Monne Acked-by: Christoph Egger Acked-by: Ian Jackson Tested-by: Christoph Egger Committed-by: Ian Campbell --- diff -r 84a78045e701 -r 433624c658af tools/hotplug/NetBSD/rc.d/xencommons --- a/tools/hotplug/NetBSD/rc.d/xencommons Wed Aug 01 12:46:47 2012 +0100 +++ b/tools/hotplug/NetBSD/rc.d/xencommons Wed Aug 01 12:46:48 2012 +0100 @@ -29,8 +29,6 @@ XENBACKENDD_PIDFILE="/var/run/xenbackend xen_precmd() { - mkdir -p /var/run/xend || exit 1 - mkdir -p /var/run/xend/boot || exit 1 mkdir -p /var/run/xenstored || exit 1 } @@ -46,7 +44,7 @@ xen_startcmd() XENSTORED_ROOTDIR="/var/lib/xenstored" fi rm -f ${XENSTORED_ROOTDIR}/tdb* >/dev/null 2>&1 - printf "Starting xenservices: xenstored, xenconsoled, xenbackendd." + printf "Starting xenservices: xenstored, xenconsoled." XENSTORED_ARGS=" --pid-file ${XENSTORED_PIDFILE}" if [ -n "${XENSTORED_TRACE}" ]; then XENSTORED_ARGS="${XENSTORED_ARGS} -T /var/log/xen/xenstored-trace.log" @@ -58,7 +56,7 @@ xen_startcmd() sleep 1 done else - printf "Starting xenservices: xenconsoled, xenbackendd." + printf "Starting xenservices: xenconsoled." fi XENCONSOLED_ARGS="" @@ -68,13 +66,6 @@ xen_startcmd() ${SBINDIR}/xenconsoled ${XENCONSOLED_ARGS} - XENBACKENDD_ARGS="" - if [ -n "${XENBACKENDD_DEBUG}" ]; then - XENBACKENDD_ARGS="${XENBACKENDD_ARGS} -d" - fi - - ${SBINDIR}/xenbackendd ${XENBACKENDD_ARGS} - printf "\n" printf "Setting domain 0 name.\n" @@ -87,8 +78,6 @@ xen_stop() printf "Stopping xencommons.\n" printf "WARNING: Not stopping xenstored, as it cannot be restarted.\n" - rc_pid=$(check_pidfile ${XENBACKENDD_PIDFILE} ${SBINDIR}/xenbackendd) - pids="$pids $rc_pid" rc_pid=$(check_pidfile ${XENCONSOLED_PIDFILE} ${SBINDIR}/xenconsoled) pids="$pids $rc_pid" @@ -108,17 +97,12 @@ xen_status() pids="$pids $xenconsoled_pid" fi - xenbackend_pid=$(check_pidfile ${XENBACKENDD_PIDFILE} ${SBINDIR}/xenbackendd) - if test -n ${xenbackend_pid}; then - pids="$pids $xenbackend_pid" - fi - - if test -n "$xenbackend_pid" -a -n "$xenconsoled_pid" -a -n "$xenstored_pid"; + if test -n "$xenconsoled_pid" -a -n "$xenstored_pid"; then echo "xencommons are running as pids $pids." return 0 fi - if test -z "$xenbackend_pid" -a -z "$xenconsoled_pid" -a -z "$xenstored_pid"; + if test -z "$xenconsoled_pid" -a -z "$xenstored_pid"; then echo "xencommons are not running." return 0 @@ -134,11 +118,6 @@ xen_status() else echo "xenconsoled is not running." fi - if test -n $xenbackend_pid; then - echo "xenbackendd is running as pid $xenbackend_pid." - else - echo "xenbackendd is not running." - fi } load_rc_config $name diff -r 84a78045e701 -r 433624c658af tools/hotplug/NetBSD/rc.d/xend --- a/tools/hotplug/NetBSD/rc.d/xend Wed Aug 01 12:46:47 2012 +0100 +++ b/tools/hotplug/NetBSD/rc.d/xend Wed Aug 01 12:46:48 2012 +0100 @@ -15,10 +15,57 @@ export PATH name="xend" rcvar=$name -command="${SBINDIR}/xend" -command_args="start" -command_interpreter=`head -n 1 ${command} | awk '{ print substr($0,3) }'` -sig_stop="SIGKILL" +start_precmd="xend_precmd" +start_cmd="xend_startcmd" +stop_cmd="xend_stop" +status_cmd="xend_status" +extra_commands="status" +required_files="/kern/xen/privcmd" + +XENBACKENDD_PIDFILE="/var/run/xenbackendd.pid" +#XENBACKENDD_DEBUG=1 + +xend_precmd() +{ + mkdir -p /var/run/xend || exit 1 + mkdir -p /var/run/xend/boot || exit 1 +} + +xend_startcmd() +{ + printf "Starting xenbackendd.\n" + + XENBACKENDD_ARGS="" + if [ -n "${XENBACKENDD_DEBUG}" ]; then + XENBACKENDD_ARGS="${XENBACKENDD_ARGS} -d" + fi + + ${SBINDIR}/xenbackendd ${XENBACKENDD_ARGS} + + printf "Starting xend.\n" + ${SBINDIR}/xend start >/dev/null 2>&1 +} + +xend_stop() +{ + printf "Stopping xenbackendd, xend\n" + xb_pid=$(check_pidfile ${XENBACKENDD_PIDFILE} ${SBINDIR}/xenbackendd) + if test -n "$xb_pid"; + then + kill -${sig_stop:-TERM} $xb_pid + fi + while pgrep -f ${SBINDIR}/xend >/dev/null 2>&1; do + pkill -${sig_stop:-KILL} -f ${SBINDIR}/xend + done + wait_for_pids $xb_pid + rm -f /var/lock/subsys/xend /var/lock/xend /var/run/xenbackendd.pid +} + +xend_status() +{ + ${SBINDIR}/xend status +} load_rc_config $name run_rc_command "$1" + _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 01 21:11:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 01 Aug 2012 21:11:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwgCK-0008Rq-CH; Wed, 01 Aug 2012 21:11:16 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwgCJ-0008Qv-Ed for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 21:11:15 +0000 Received: from [85.158.143.35:41230] by server-2.bemta-4.messagelabs.com id 2D/9D-17938-37B99105; Wed, 01 Aug 2012 21:11:15 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-21.messagelabs.com!1343855471!5538307!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32013 invoked from network); 1 Aug 2012 21:11:12 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 1 Aug 2012 21:11:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwgCE-0004xK-KX for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 21:11:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SwgCE-0000xG-Ab for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 21:11:10 +0000 Message-Id: Date: Wed, 01 Aug 2012 21:11:09 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] init/NetBSD: move xenbackendd to xend init script X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Roger Pau Monne # Date 1343821608 -3600 # Node ID 433624c658af4f3bf21ae53ef090528e870fdf58 # Parent 84a78045e701ad743bcd369acbae6d0fb258a0f8 init/NetBSD: move xenbackendd to xend init script xenbackendd is not needed by the xl toolstack, so move it's launch to the xend script. We have to iterate until we are sure there are no xend processes left, since doing a single pkill usually leaves xend processes running. Signed-off-by: Roger Pau Monne Acked-by: Christoph Egger Acked-by: Ian Jackson Tested-by: Christoph Egger Committed-by: Ian Campbell --- diff -r 84a78045e701 -r 433624c658af tools/hotplug/NetBSD/rc.d/xencommons --- a/tools/hotplug/NetBSD/rc.d/xencommons Wed Aug 01 12:46:47 2012 +0100 +++ b/tools/hotplug/NetBSD/rc.d/xencommons Wed Aug 01 12:46:48 2012 +0100 @@ -29,8 +29,6 @@ XENBACKENDD_PIDFILE="/var/run/xenbackend xen_precmd() { - mkdir -p /var/run/xend || exit 1 - mkdir -p /var/run/xend/boot || exit 1 mkdir -p /var/run/xenstored || exit 1 } @@ -46,7 +44,7 @@ xen_startcmd() XENSTORED_ROOTDIR="/var/lib/xenstored" fi rm -f ${XENSTORED_ROOTDIR}/tdb* >/dev/null 2>&1 - printf "Starting xenservices: xenstored, xenconsoled, xenbackendd." + printf "Starting xenservices: xenstored, xenconsoled." XENSTORED_ARGS=" --pid-file ${XENSTORED_PIDFILE}" if [ -n "${XENSTORED_TRACE}" ]; then XENSTORED_ARGS="${XENSTORED_ARGS} -T /var/log/xen/xenstored-trace.log" @@ -58,7 +56,7 @@ xen_startcmd() sleep 1 done else - printf "Starting xenservices: xenconsoled, xenbackendd." + printf "Starting xenservices: xenconsoled." fi XENCONSOLED_ARGS="" @@ -68,13 +66,6 @@ xen_startcmd() ${SBINDIR}/xenconsoled ${XENCONSOLED_ARGS} - XENBACKENDD_ARGS="" - if [ -n "${XENBACKENDD_DEBUG}" ]; then - XENBACKENDD_ARGS="${XENBACKENDD_ARGS} -d" - fi - - ${SBINDIR}/xenbackendd ${XENBACKENDD_ARGS} - printf "\n" printf "Setting domain 0 name.\n" @@ -87,8 +78,6 @@ xen_stop() printf "Stopping xencommons.\n" printf "WARNING: Not stopping xenstored, as it cannot be restarted.\n" - rc_pid=$(check_pidfile ${XENBACKENDD_PIDFILE} ${SBINDIR}/xenbackendd) - pids="$pids $rc_pid" rc_pid=$(check_pidfile ${XENCONSOLED_PIDFILE} ${SBINDIR}/xenconsoled) pids="$pids $rc_pid" @@ -108,17 +97,12 @@ xen_status() pids="$pids $xenconsoled_pid" fi - xenbackend_pid=$(check_pidfile ${XENBACKENDD_PIDFILE} ${SBINDIR}/xenbackendd) - if test -n ${xenbackend_pid}; then - pids="$pids $xenbackend_pid" - fi - - if test -n "$xenbackend_pid" -a -n "$xenconsoled_pid" -a -n "$xenstored_pid"; + if test -n "$xenconsoled_pid" -a -n "$xenstored_pid"; then echo "xencommons are running as pids $pids." return 0 fi - if test -z "$xenbackend_pid" -a -z "$xenconsoled_pid" -a -z "$xenstored_pid"; + if test -z "$xenconsoled_pid" -a -z "$xenstored_pid"; then echo "xencommons are not running." return 0 @@ -134,11 +118,6 @@ xen_status() else echo "xenconsoled is not running." fi - if test -n $xenbackend_pid; then - echo "xenbackendd is running as pid $xenbackend_pid." - else - echo "xenbackendd is not running." - fi } load_rc_config $name diff -r 84a78045e701 -r 433624c658af tools/hotplug/NetBSD/rc.d/xend --- a/tools/hotplug/NetBSD/rc.d/xend Wed Aug 01 12:46:47 2012 +0100 +++ b/tools/hotplug/NetBSD/rc.d/xend Wed Aug 01 12:46:48 2012 +0100 @@ -15,10 +15,57 @@ export PATH name="xend" rcvar=$name -command="${SBINDIR}/xend" -command_args="start" -command_interpreter=`head -n 1 ${command} | awk '{ print substr($0,3) }'` -sig_stop="SIGKILL" +start_precmd="xend_precmd" +start_cmd="xend_startcmd" +stop_cmd="xend_stop" +status_cmd="xend_status" +extra_commands="status" +required_files="/kern/xen/privcmd" + +XENBACKENDD_PIDFILE="/var/run/xenbackendd.pid" +#XENBACKENDD_DEBUG=1 + +xend_precmd() +{ + mkdir -p /var/run/xend || exit 1 + mkdir -p /var/run/xend/boot || exit 1 +} + +xend_startcmd() +{ + printf "Starting xenbackendd.\n" + + XENBACKENDD_ARGS="" + if [ -n "${XENBACKENDD_DEBUG}" ]; then + XENBACKENDD_ARGS="${XENBACKENDD_ARGS} -d" + fi + + ${SBINDIR}/xenbackendd ${XENBACKENDD_ARGS} + + printf "Starting xend.\n" + ${SBINDIR}/xend start >/dev/null 2>&1 +} + +xend_stop() +{ + printf "Stopping xenbackendd, xend\n" + xb_pid=$(check_pidfile ${XENBACKENDD_PIDFILE} ${SBINDIR}/xenbackendd) + if test -n "$xb_pid"; + then + kill -${sig_stop:-TERM} $xb_pid + fi + while pgrep -f ${SBINDIR}/xend >/dev/null 2>&1; do + pkill -${sig_stop:-KILL} -f ${SBINDIR}/xend + done + wait_for_pids $xb_pid + rm -f /var/lock/subsys/xend /var/lock/xend /var/run/xenbackendd.pid +} + +xend_status() +{ + ${SBINDIR}/xend status +} load_rc_config $name run_rc_command "$1" + _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 01 21:11:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 01 Aug 2012 21:11:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwgCK-0008Rl-9t; Wed, 01 Aug 2012 21:11:16 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwgCJ-0008RZ-8j for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 21:11:15 +0000 Received: from [85.158.138.51:2512] by server-1.bemta-3.messagelabs.com id 0F/EB-31934-27B99105; Wed, 01 Aug 2012 21:11:14 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-11.tower-174.messagelabs.com!1343855472!29952088!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32462 invoked from network); 1 Aug 2012 21:11:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 1 Aug 2012 21:11:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwgCG-0004xT-As for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 21:11:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SwgCG-0000y1-4x for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 21:11:12 +0000 Message-Id: Date: Wed, 01 Aug 2012 21:11:11 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] tools/config: Allow building of components to be controlled from .config X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Andrew Cooper # Date 1343821611 -3600 # Node ID d801c1c1fec8b5d2b27b519d61f884e714405460 # Parent 9d52ee4e4e6f15ba3215c72bee0a58dc0c177379 tools/config: Allow building of components to be controlled from .config For build systems which build certain Xen components separately, allow certain components to be conditionally built based on .config, rather than always building them. This patch allows qemu and blktap to be configured in this manner. Signed-off-by: Andrew Cooper Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r 9d52ee4e4e6f -r d801c1c1fec8 config/x86_32.mk --- a/config/x86_32.mk Wed Aug 01 12:46:50 2012 +0100 +++ b/config/x86_32.mk Wed Aug 01 12:46:51 2012 +0100 @@ -5,7 +5,7 @@ CONFIG_X86_$(XEN_OS) := y CONFIG_HVM := y CONFIG_MIGRATE := y CONFIG_XCUTILS := y -CONFIG_IOEMU := y +CONFIG_IOEMU ?= y CFLAGS += -m32 -march=i686 diff -r 9d52ee4e4e6f -r d801c1c1fec8 config/x86_64.mk --- a/config/x86_64.mk Wed Aug 01 12:46:50 2012 +0100 +++ b/config/x86_64.mk Wed Aug 01 12:46:51 2012 +0100 @@ -6,7 +6,7 @@ CONFIG_COMPAT := y CONFIG_HVM := y CONFIG_MIGRATE := y CONFIG_XCUTILS := y -CONFIG_IOEMU := y +CONFIG_IOEMU ?= y CFLAGS += -m64 diff -r 9d52ee4e4e6f -r d801c1c1fec8 tools/Rules.mk --- a/tools/Rules.mk Wed Aug 01 12:46:50 2012 +0100 +++ b/tools/Rules.mk Wed Aug 01 12:46:51 2012 +0100 @@ -40,9 +40,9 @@ LDLIBS_libxenvchan = $(SHLIB_libxenctrl) SHLIB_libxenvchan = -Wl,-rpath-link=$(XEN_LIBVCHAN) ifeq ($(CONFIG_Linux),y) -LIBXL_BLKTAP = y +LIBXL_BLKTAP ?= y else -LIBXL_BLKTAP = n +LIBXL_BLKTAP ?= n endif ifeq ($(LIBXL_BLKTAP),y) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 01 21:11:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 01 Aug 2012 21:11:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwgCK-0008Rl-9t; Wed, 01 Aug 2012 21:11:16 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwgCJ-0008RZ-8j for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 21:11:15 +0000 Received: from [85.158.138.51:2512] by server-1.bemta-3.messagelabs.com id 0F/EB-31934-27B99105; Wed, 01 Aug 2012 21:11:14 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-11.tower-174.messagelabs.com!1343855472!29952088!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32462 invoked from network); 1 Aug 2012 21:11:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 1 Aug 2012 21:11:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwgCG-0004xT-As for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 21:11:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SwgCG-0000y1-4x for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 21:11:12 +0000 Message-Id: Date: Wed, 01 Aug 2012 21:11:11 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] tools/config: Allow building of components to be controlled from .config X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Andrew Cooper # Date 1343821611 -3600 # Node ID d801c1c1fec8b5d2b27b519d61f884e714405460 # Parent 9d52ee4e4e6f15ba3215c72bee0a58dc0c177379 tools/config: Allow building of components to be controlled from .config For build systems which build certain Xen components separately, allow certain components to be conditionally built based on .config, rather than always building them. This patch allows qemu and blktap to be configured in this manner. Signed-off-by: Andrew Cooper Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r 9d52ee4e4e6f -r d801c1c1fec8 config/x86_32.mk --- a/config/x86_32.mk Wed Aug 01 12:46:50 2012 +0100 +++ b/config/x86_32.mk Wed Aug 01 12:46:51 2012 +0100 @@ -5,7 +5,7 @@ CONFIG_X86_$(XEN_OS) := y CONFIG_HVM := y CONFIG_MIGRATE := y CONFIG_XCUTILS := y -CONFIG_IOEMU := y +CONFIG_IOEMU ?= y CFLAGS += -m32 -march=i686 diff -r 9d52ee4e4e6f -r d801c1c1fec8 config/x86_64.mk --- a/config/x86_64.mk Wed Aug 01 12:46:50 2012 +0100 +++ b/config/x86_64.mk Wed Aug 01 12:46:51 2012 +0100 @@ -6,7 +6,7 @@ CONFIG_COMPAT := y CONFIG_HVM := y CONFIG_MIGRATE := y CONFIG_XCUTILS := y -CONFIG_IOEMU := y +CONFIG_IOEMU ?= y CFLAGS += -m64 diff -r 9d52ee4e4e6f -r d801c1c1fec8 tools/Rules.mk --- a/tools/Rules.mk Wed Aug 01 12:46:50 2012 +0100 +++ b/tools/Rules.mk Wed Aug 01 12:46:51 2012 +0100 @@ -40,9 +40,9 @@ LDLIBS_libxenvchan = $(SHLIB_libxenctrl) SHLIB_libxenvchan = -Wl,-rpath-link=$(XEN_LIBVCHAN) ifeq ($(CONFIG_Linux),y) -LIBXL_BLKTAP = y +LIBXL_BLKTAP ?= y else -LIBXL_BLKTAP = n +LIBXL_BLKTAP ?= n endif ifeq ($(LIBXL_BLKTAP),y) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 01 21:11:25 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 01 Aug 2012 21:11: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 1SwgCP-0008Te-Eh; Wed, 01 Aug 2012 21:11:21 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwgCN-0008RY-J0 for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 21:11:19 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-11.tower-27.messagelabs.com!1343855472!1902611!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24887 invoked from network); 1 Aug 2012 21:11:13 -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; 1 Aug 2012 21:11:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwgCF-0004xQ-Sm for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 21:11:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SwgCF-0000xm-KS for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 21:11:11 +0000 Message-Id: Date: Wed, 01 Aug 2012 21:11:11 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] tools/ocaml: ignore and clean .spot and .spit files X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Andrew Cooper # Date 1343821610 -3600 # Node ID 9d52ee4e4e6f15ba3215c72bee0a58dc0c177379 # Parent c379e77870aff938ca941a3acb760831039c19a6 tools/ocaml: ignore and clean .spot and .spit files Newer ocaml toolchains generate .spot and .spit files which are ocaml metadata about their respective source files. Add them to the clean rules as well as the .{hg,git}ignore files. Signed-off-by: Andrew Cooper Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r c379e77870af -r 9d52ee4e4e6f .gitignore --- a/.gitignore Wed Aug 01 12:46:49 2012 +0100 +++ b/.gitignore Wed Aug 01 12:46:50 2012 +0100 @@ -11,6 +11,8 @@ *.bin *.bak *.tmp +*.spot +*.spit TAGS cscope.files cscope.in.out diff -r c379e77870af -r 9d52ee4e4e6f .hgignore --- a/.hgignore Wed Aug 01 12:46:49 2012 +0100 +++ b/.hgignore Wed Aug 01 12:46:50 2012 +0100 @@ -15,6 +15,8 @@ .*\.flc$ .*\.orig$ .*\.rej$ +.*\.spot$ +.*\.spit$ .*/a\.out$ .*/Modules\.symvers$ .*/cscope\..*$ diff -r c379e77870af -r 9d52ee4e4e6f tools/ocaml/Makefile.rules --- a/tools/ocaml/Makefile.rules Wed Aug 01 12:46:49 2012 +0100 +++ b/tools/ocaml/Makefile.rules Wed Aug 01 12:46:50 2012 +0100 @@ -45,7 +45,7 @@ ALL_OCAML_OBJ_SOURCES=$(addsuffix .ml, $ $(call quiet-command, $(OCAMLDEP) $(ALL_OCAML_OBJ_SOURCES) *.mli $o,MLDEP,) clean: $(CLEAN_HOOKS) - $(Q)rm -f .*.d *.o *.so *.a *.cmo *.cmi *.cma *.cmx *.cmxa *.annot $(LIBS) $(PROGRAMS) $(GENERATED_FILES) .ocamldep.make + $(Q)rm -f .*.d *.o *.so *.a *.cmo *.cmi *.cma *.cmx *.cmxa *.annot *.spot *.spit $(LIBS) $(PROGRAMS) $(GENERATED_FILES) .ocamldep.make quiet-command = $(if $(V),$1,@printf " %-8s %s\n" "$2" "$3" && $1) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 01 21:11:25 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 01 Aug 2012 21:11: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 1SwgCP-0008Te-Eh; Wed, 01 Aug 2012 21:11:21 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwgCN-0008RY-J0 for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 21:11:19 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-11.tower-27.messagelabs.com!1343855472!1902611!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24887 invoked from network); 1 Aug 2012 21:11:13 -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; 1 Aug 2012 21:11:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwgCF-0004xQ-Sm for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 21:11:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SwgCF-0000xm-KS for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 21:11:11 +0000 Message-Id: Date: Wed, 01 Aug 2012 21:11:11 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] tools/ocaml: ignore and clean .spot and .spit files X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Andrew Cooper # Date 1343821610 -3600 # Node ID 9d52ee4e4e6f15ba3215c72bee0a58dc0c177379 # Parent c379e77870aff938ca941a3acb760831039c19a6 tools/ocaml: ignore and clean .spot and .spit files Newer ocaml toolchains generate .spot and .spit files which are ocaml metadata about their respective source files. Add them to the clean rules as well as the .{hg,git}ignore files. Signed-off-by: Andrew Cooper Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r c379e77870af -r 9d52ee4e4e6f .gitignore --- a/.gitignore Wed Aug 01 12:46:49 2012 +0100 +++ b/.gitignore Wed Aug 01 12:46:50 2012 +0100 @@ -11,6 +11,8 @@ *.bin *.bak *.tmp +*.spot +*.spit TAGS cscope.files cscope.in.out diff -r c379e77870af -r 9d52ee4e4e6f .hgignore --- a/.hgignore Wed Aug 01 12:46:49 2012 +0100 +++ b/.hgignore Wed Aug 01 12:46:50 2012 +0100 @@ -15,6 +15,8 @@ .*\.flc$ .*\.orig$ .*\.rej$ +.*\.spot$ +.*\.spit$ .*/a\.out$ .*/Modules\.symvers$ .*/cscope\..*$ diff -r c379e77870af -r 9d52ee4e4e6f tools/ocaml/Makefile.rules --- a/tools/ocaml/Makefile.rules Wed Aug 01 12:46:49 2012 +0100 +++ b/tools/ocaml/Makefile.rules Wed Aug 01 12:46:50 2012 +0100 @@ -45,7 +45,7 @@ ALL_OCAML_OBJ_SOURCES=$(addsuffix .ml, $ $(call quiet-command, $(OCAMLDEP) $(ALL_OCAML_OBJ_SOURCES) *.mli $o,MLDEP,) clean: $(CLEAN_HOOKS) - $(Q)rm -f .*.d *.o *.so *.a *.cmo *.cmi *.cma *.cmx *.cmxa *.annot $(LIBS) $(PROGRAMS) $(GENERATED_FILES) .ocamldep.make + $(Q)rm -f .*.d *.o *.so *.a *.cmo *.cmi *.cma *.cmx *.cmxa *.annot *.spot *.spit $(LIBS) $(PROGRAMS) $(GENERATED_FILES) .ocamldep.make quiet-command = $(if $(V),$1,@printf " %-8s %s\n" "$2" "$3" && $1) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 01 21:11:26 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 01 Aug 2012 21:11: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 1SwgCR-0008UF-KA; Wed, 01 Aug 2012 21:11:23 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwgCP-0008Rv-W9 for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 21:11:22 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-27.messagelabs.com!1343855473!10330254!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4098 invoked from network); 1 Aug 2012 21:11:14 -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; 1 Aug 2012 21:11:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwgCG-0004xW-U1 for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 21:11:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SwgCG-0000yG-OM for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 21:11:12 +0000 Message-Id: Date: Wed, 01 Aug 2012 21:11:12 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: enforce prohibitions of internal callers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1343821612 -3600 # Node ID 3d622e2c7cfb15b37498e9bb8f1005516fe99f2f # Parent d801c1c1fec8b5d2b27b519d61f884e714405460 libxl: enforce prohibitions of internal callers libxl_internal.h says: * Functions using LIBXL__INIT_EGC may *not* generally be called from * within libxl, because libxl__egc_cleanup may call back into the * application. ... and * ... [Functions which take an ao_how] MAY NOT * be called from inside libxl, because they can cause reentrancy * callbacks. However, this was not enforced. Particularly the latter restriction is easy to overlook, especially since during the transition period to the new event system we have bent this rule a couple of times, and the bad pattern simply involves passing 0 or NULL for the ao_how. So use the compiler to enforce this property, as follows: - Mark all functions which take a libxl_asyncop_how, or which use EGC_INIT or LIBXL__INIT_EGC, with a new annotation LIBXL_EXTERNAL_CALLERS_ONLY in the public header. - Change the documentation comment for asynch operations and egcs to say that this should always be done. - Arrange that if libxl.h is included via libxl_internal.h, LIBXL_EXTERNAL_CALLERS_ONLY expands to __attribute__((warning(...))), which generates a message like this: libxl.c:1772: warning: call to 'libxl_device_disk_remove' declared with attribute warning: may not be called from within libxl Otherwise, the annotation expands to nothing, so external callers are unaffected. - Forbid inclusion of both libxl.h and libxl_internal.h unless libxl_internal.h came first, so that the above check doesn't have any loopholes. Files which include libxl_internal.h should not include libxl.h as well. This is enforced explicitly using #error. However, in practice with the current tree it just changes the error message when this mistake is made; otherwise we would carry on to immediately following #define which would cause the compiler to complain that LIBXL_EXTERNAL_CALLERS_ONLY was redefined. Then the developer might be tempted to add a #ifndef which would be wrong - it would leave the affected translation unit unprotected by the new enforcement regime. So let's be explicit. - Fix the one source of files which violate the above principle, the output from the idl compiler, by removing the redundant inclusion of libxl.h from the output. Also introduce a new script "check-libxl-api-rules" which contains some ad-hoc regexps to spot and complain when libxl.h contains functions which mention libxl_asyncop_how but not LIBXL_EXTERNAL_CALLERS_ONLY. This isn't a full C parser but is likely to get the common cases right and err on the side of complaining. While we are here, the invocation of perl for the bsd queue.h seddery to $(PERL). Signed-off-by: Ian Jackson Cc: Roger Pau Monne Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r d801c1c1fec8 -r 3d622e2c7cfb .gitignore --- a/.gitignore Wed Aug 01 12:46:51 2012 +0100 +++ b/.gitignore Wed Aug 01 12:46:52 2012 +0100 @@ -189,6 +189,7 @@ tools/libxl/xl tools/libxl/testenum tools/libxl/testenum.c tools/libxl/tmp.* +tools/libxl/libxl.api-for-check tools/libaio/src/*.ol tools/libaio/src/*.os tools/misc/cpuperf/cpuperf-perfcntr diff -r d801c1c1fec8 -r 3d622e2c7cfb .hgignore --- a/.hgignore Wed Aug 01 12:46:51 2012 +0100 +++ b/.hgignore Wed Aug 01 12:46:52 2012 +0100 @@ -187,6 +187,7 @@ ^tools/libxl/testidl\.c$ ^tools/libxl/tmp\..*$ ^tools/libxl/.*\.new$ +^tools/libxl/libxl\.api-for-check ^tools/libvchan/vchan-node[12]$ ^tools/libaio/src/.*\.ol$ ^tools/libaio/src/.*\.os$ diff -r d801c1c1fec8 -r 3d622e2c7cfb tools/libxl/Makefile --- a/tools/libxl/Makefile Wed Aug 01 12:46:51 2012 +0100 +++ b/tools/libxl/Makefile Wed Aug 01 12:46:52 2012 +0100 @@ -74,7 +74,8 @@ LIBXL_OBJS += _libxl_types.o libxl_flask $(LIBXL_OBJS): CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) $(CFLAGS_libxenstore) $(CFLAGS_libblktapctl) -include $(XEN_ROOT)/tools/config.h AUTOINCS= libxlu_cfg_y.h libxlu_cfg_l.h _libxl_list.h _paths.h \ - _libxl_save_msgs_callout.h _libxl_save_msgs_helper.h + _libxl_save_msgs_callout.h _libxl_save_msgs_helper.h \ + libxl.api-ok AUTOSRCS= libxlu_cfg_y.c libxlu_cfg_l.c AUTOSRCS += _libxl_save_msgs_callout.c _libxl_save_msgs_helper.c LIBXLU_OBJS = libxlu_cfg_y.o libxlu_cfg_l.o libxlu_cfg.o \ @@ -113,13 +114,22 @@ all: $(CLIENTS) libxenlight.so libxenlig genpath-target = $(call buildmakevars2file,_paths.h.tmp) $(eval $(genpath-target)) +libxl.api-ok: check-libxl-api-rules libxl.api-for-check + $(PERL) $^ + +%.api-for-check: %.h + $(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_$*.o) -c -E $< $(APPEND_CFLAGS) \ + -DLIBXL_EXTERNAL_CALLERS_ONLY=LIBXL_EXTERNAL_CALLERS_ONLY \ + >$@.new + $(call move-if-changed,$@.new,$@) + _paths.h: genpath sed -e "s/\([^=]*\)=\(.*\)/#define \1 \2/g" $@.tmp >$@.2.tmp rm -f $@.tmp $(call move-if-changed,$@.2.tmp,$@) _libxl_list.h: $(XEN_INCLUDE)/xen-external/bsd-sys-queue-h-seddery $(XEN_INCLUDE)/xen-external/bsd-sys-queue.h - perl $^ --prefix=libxl >$@.new + $(PERL) $^ --prefix=libxl >$@.new $(call move-if-changed,$@.new,$@) _libxl_save_msgs_helper.c _libxl_save_msgs_callout.c \ @@ -200,7 +210,7 @@ install: all .PHONY: clean clean: $(RM) -f _*.h *.o *.so* *.a $(CLIENTS) $(DEPS) - $(RM) -f _*.c *.pyc _paths.*.tmp + $(RM) -f _*.c *.pyc _paths.*.tmp *.api-for-check $(RM) -f testidl.c.new testidl.c # $(RM) -f $(AUTOSRCS) $(AUTOINCS) diff -r d801c1c1fec8 -r 3d622e2c7cfb tools/libxl/check-libxl-api-rules --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/libxl/check-libxl-api-rules Wed Aug 01 12:46:52 2012 +0100 @@ -0,0 +1,23 @@ +#!/usr/bin/perl -w +use strict; +our $needed=0; +our $speclineoffset=0; +our $specfile; +while (<>) { + if (m/^\# (\d+) \"(.*)\"$/) { + $speclineoffset = $1 - $. -1; + $specfile = $2; + } + my $file = defined($specfile) ? $specfile : $ARGV; + my $line = $speclineoffset + $.; + if (m/libxl_asyncop_how[^;]/) { + $needed=1; + } + if (m/LIBXL_EXTERNAL_CALLERS_ONLY/) { + $needed=0; + } + next unless $needed; + if (m/\;/) { + die "$file:$line:missing LIBXL_EXTERNAL_CALLERS_ONLY"; + } +} diff -r d801c1c1fec8 -r 3d622e2c7cfb tools/libxl/gentypes.py --- a/tools/libxl/gentypes.py Wed Aug 01 12:46:51 2012 +0100 +++ b/tools/libxl/gentypes.py Wed Aug 01 12:46:52 2012 +0100 @@ -377,7 +377,6 @@ if __name__ == '__main__': #include #include -#include "libxl.h" #include "libxl_internal.h" #define LIBXL_DTOR_POISON 0xa5 diff -r d801c1c1fec8 -r 3d622e2c7cfb tools/libxl/libxl.h --- a/tools/libxl/libxl.h Wed Aug 01 12:46:51 2012 +0100 +++ b/tools/libxl/libxl.h Wed Aug 01 12:46:52 2012 +0100 @@ -266,6 +266,13 @@ #endif #endif +/* Functions annotated with LIBXL_EXTERNAL_CALLERS_ONLY may not be + * called from within libxl itself. Callers outside libxl, who + * do not #include libxl_internal.h, are fine. */ +#ifndef LIBXL_EXTERNAL_CALLERS_ONLY +#define LIBXL_EXTERNAL_CALLERS_ONLY /* disappears for callers outside libxl */ +#endif + typedef uint8_t libxl_mac[6]; #define LIBXL_MAC_FMT "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx" #define LIBXL_MAC_FMTLEN ((2*6)+5) /* 6 hex bytes plus 5 colons */ @@ -496,11 +503,13 @@ int libxl_ctx_free(libxl_ctx *ctx /* 0 i int libxl_domain_create_new(libxl_ctx *ctx, libxl_domain_config *d_config, uint32_t *domid, const libxl_asyncop_how *ao_how, - const libxl_asyncprogress_how *aop_console_how); + const libxl_asyncprogress_how *aop_console_how) + LIBXL_EXTERNAL_CALLERS_ONLY; int libxl_domain_create_restore(libxl_ctx *ctx, libxl_domain_config *d_config, uint32_t *domid, int restore_fd, const libxl_asyncop_how *ao_how, - const libxl_asyncprogress_how *aop_console_how); + const libxl_asyncprogress_how *aop_console_how) + LIBXL_EXTERNAL_CALLERS_ONLY; /* A progress report will be made via ao_console_how, of type * domain_create_console_available, when the domain's primary * console is available and can be connected to. @@ -511,7 +520,8 @@ void libxl_domain_config_dispose(libxl_d int libxl_domain_suspend(libxl_ctx *ctx, uint32_t domid, int fd, int flags, /* LIBXL_SUSPEND_* */ - const libxl_asyncop_how *ao_how); + const libxl_asyncop_how *ao_how) + LIBXL_EXTERNAL_CALLERS_ONLY; #define LIBXL_SUSPEND_DEBUG 1 #define LIBXL_SUSPEND_LIVE 2 @@ -523,12 +533,14 @@ int libxl_domain_resume(libxl_ctx *ctx, int libxl_domain_remus_start(libxl_ctx *ctx, libxl_domain_remus_info *info, uint32_t domid, int send_fd, int recv_fd, - const libxl_asyncop_how *ao_how); + const libxl_asyncop_how *ao_how) + LIBXL_EXTERNAL_CALLERS_ONLY; int libxl_domain_shutdown(libxl_ctx *ctx, uint32_t domid); int libxl_domain_reboot(libxl_ctx *ctx, uint32_t domid); int libxl_domain_destroy(libxl_ctx *ctx, uint32_t domid, - const libxl_asyncop_how *ao_how); + const libxl_asyncop_how *ao_how) + LIBXL_EXTERNAL_CALLERS_ONLY; int libxl_domain_preserve(libxl_ctx *ctx, uint32_t domid, libxl_domain_create_info *info, const char *name_suffix, libxl_uuid new_uuid); /* get max. number of cpus supported by hypervisor */ @@ -549,7 +561,8 @@ int libxl_domain_unpause(libxl_ctx *ctx, int libxl_domain_core_dump(libxl_ctx *ctx, uint32_t domid, const char *filename, - const libxl_asyncop_how *ao_how); + const libxl_asyncop_how *ao_how) + LIBXL_EXTERNAL_CALLERS_ONLY; int libxl_domain_setmaxmem(libxl_ctx *ctx, uint32_t domid, uint32_t target_memkb); int libxl_set_memory_target(libxl_ctx *ctx, uint32_t domid, int32_t target_memkb, int relative, int enforce); @@ -677,13 +690,16 @@ void libxl_vcpuinfo_list_free(libxl_vcpu /* Disks */ int libxl_device_disk_add(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk, - const libxl_asyncop_how *ao_how); + const libxl_asyncop_how *ao_how) + LIBXL_EXTERNAL_CALLERS_ONLY; int libxl_device_disk_remove(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk, - const libxl_asyncop_how *ao_how); + const libxl_asyncop_how *ao_how) + LIBXL_EXTERNAL_CALLERS_ONLY; int libxl_device_disk_destroy(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk, - const libxl_asyncop_how *ao_how); + const libxl_asyncop_how *ao_how) + LIBXL_EXTERNAL_CALLERS_ONLY; libxl_device_disk *libxl_device_disk_list(libxl_ctx *ctx, uint32_t domid, int *num); int libxl_device_disk_getinfo(libxl_ctx *ctx, uint32_t domid, @@ -694,17 +710,21 @@ int libxl_device_disk_getinfo(libxl_ctx * be attached to the guest. */ int libxl_cdrom_insert(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk, - const libxl_asyncop_how *ao_how); + const libxl_asyncop_how *ao_how) + LIBXL_EXTERNAL_CALLERS_ONLY; /* Network Interfaces */ int libxl_device_nic_add(libxl_ctx *ctx, uint32_t domid, libxl_device_nic *nic, - const libxl_asyncop_how *ao_how); + const libxl_asyncop_how *ao_how) + LIBXL_EXTERNAL_CALLERS_ONLY; int libxl_device_nic_remove(libxl_ctx *ctx, uint32_t domid, libxl_device_nic *nic, - const libxl_asyncop_how *ao_how); + const libxl_asyncop_how *ao_how) + LIBXL_EXTERNAL_CALLERS_ONLY; int libxl_device_nic_destroy(libxl_ctx *ctx, uint32_t domid, libxl_device_nic *nic, - const libxl_asyncop_how *ao_how); + const libxl_asyncop_how *ao_how) + LIBXL_EXTERNAL_CALLERS_ONLY; libxl_device_nic *libxl_device_nic_list(libxl_ctx *ctx, uint32_t domid, int *num); int libxl_device_nic_getinfo(libxl_ctx *ctx, uint32_t domid, @@ -712,23 +732,29 @@ int libxl_device_nic_getinfo(libxl_ctx * /* Keyboard */ int libxl_device_vkb_add(libxl_ctx *ctx, uint32_t domid, libxl_device_vkb *vkb, - const libxl_asyncop_how *ao_how); + const libxl_asyncop_how *ao_how) + LIBXL_EXTERNAL_CALLERS_ONLY; int libxl_device_vkb_remove(libxl_ctx *ctx, uint32_t domid, libxl_device_vkb *vkb, - const libxl_asyncop_how *ao_how); + const libxl_asyncop_how *ao_how) + LIBXL_EXTERNAL_CALLERS_ONLY; int libxl_device_vkb_destroy(libxl_ctx *ctx, uint32_t domid, libxl_device_vkb *vkb, - const libxl_asyncop_how *ao_how); + const libxl_asyncop_how *ao_how) + LIBXL_EXTERNAL_CALLERS_ONLY; /* Framebuffer */ int libxl_device_vfb_add(libxl_ctx *ctx, uint32_t domid, libxl_device_vfb *vfb, - const libxl_asyncop_how *ao_how); + const libxl_asyncop_how *ao_how) + LIBXL_EXTERNAL_CALLERS_ONLY; int libxl_device_vfb_remove(libxl_ctx *ctx, uint32_t domid, libxl_device_vfb *vfb, - const libxl_asyncop_how *ao_how); + const libxl_asyncop_how *ao_how) + LIBXL_EXTERNAL_CALLERS_ONLY; int libxl_device_vfb_destroy(libxl_ctx *ctx, uint32_t domid, libxl_device_vfb *vfb, - const libxl_asyncop_how *ao_how); + const libxl_asyncop_how *ao_how) + LIBXL_EXTERNAL_CALLERS_ONLY; /* PCI Passthrough */ int libxl_device_pci_add(libxl_ctx *ctx, uint32_t domid, libxl_device_pci *pcidev); diff -r d801c1c1fec8 -r 3d622e2c7cfb tools/libxl/libxl_event.h --- a/tools/libxl/libxl_event.h Wed Aug 01 12:46:51 2012 +0100 +++ b/tools/libxl/libxl_event.h Wed Aug 01 12:46:52 2012 +0100 @@ -37,7 +37,8 @@ typedef int libxl_event_predicate(const int libxl_event_check(libxl_ctx *ctx, libxl_event **event_r, uint64_t typemask, - libxl_event_predicate *predicate, void *predicate_user); + libxl_event_predicate *predicate, void *predicate_user) + LIBXL_EXTERNAL_CALLERS_ONLY; /* 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 @@ -48,7 +49,8 @@ int libxl_event_check(libxl_ctx *ctx, li int libxl_event_wait(libxl_ctx *ctx, libxl_event **event_r, uint64_t typemask, - libxl_event_predicate *predicate, void *predicate_user); + libxl_event_predicate *predicate, void *predicate_user) + LIBXL_EXTERNAL_CALLERS_ONLY; /* 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 @@ -256,7 +258,8 @@ struct pollfd; */ int libxl_osevent_beforepoll(libxl_ctx *ctx, int *nfds_io, struct pollfd *fds, int *timeout_upd, - struct timeval now); + struct timeval now) + LIBXL_EXTERNAL_CALLERS_ONLY; /* nfds and fds[0..nfds] must be from the most recent call to * _beforepoll, as modified by poll. (It is therefore not possible @@ -271,7 +274,8 @@ int libxl_osevent_beforepoll(libxl_ctx * * libxl_event_check. */ void libxl_osevent_afterpoll(libxl_ctx *ctx, int nfds, const struct pollfd *fds, - struct timeval now); + struct timeval now) + LIBXL_EXTERNAL_CALLERS_ONLY; typedef struct libxl_osevent_hooks { @@ -357,14 +361,16 @@ void libxl_osevent_register_hooks(libxl_ */ void libxl_osevent_occurred_fd(libxl_ctx *ctx, void *for_libxl, - int fd, short events, short revents); + int fd, short events, short revents) + LIBXL_EXTERNAL_CALLERS_ONLY; /* 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); +void libxl_osevent_occurred_timeout(libxl_ctx *ctx, void *for_libxl) + LIBXL_EXTERNAL_CALLERS_ONLY; /*======================================================================*/ @@ -506,7 +512,8 @@ void libxl_childproc_setmode(libxl_ctx * * certainly need to use the self-pipe trick (or a working pselect or * ppoll) to implement this. */ -int libxl_childproc_reaped(libxl_ctx *ctx, pid_t, int status); +int libxl_childproc_reaped(libxl_ctx *ctx, pid_t, int status) + LIBXL_EXTERNAL_CALLERS_ONLY; /* diff -r d801c1c1fec8 -r 3d622e2c7cfb tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Wed Aug 01 12:46:51 2012 +0100 +++ b/tools/libxl/libxl_internal.h Wed Aug 01 12:46:52 2012 +0100 @@ -52,6 +52,12 @@ #include +#ifdef LIBXL_H +# error libxl.h should be included via libxl_internal.h, not separately +#endif +#define LIBXL_EXTERNAL_CALLERS_ONLY \ + __attribute__((warning("may not be called from within libxl"))) + #include "libxl.h" #include "_paths.h" #include "_libxl_save_msgs_callout.h" @@ -1534,10 +1540,10 @@ int libxl__hotplug_settings(libxl__gc *g * * 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. + * application. This should be enforced by declaring all such + * functions in libxl.h or libxl_event.h with + * LIBXL_EXTERNAL_CALLERS_ONLY. You should in any case not find it + * necessary to call egc-creators from within libxl. * * The callbacks must all take place with the ctx unlocked because * the application is entitled to reenter libxl from them. This _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 01 21:11:26 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 01 Aug 2012 21:11: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 1SwgCR-0008UF-KA; Wed, 01 Aug 2012 21:11:23 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwgCP-0008Rv-W9 for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 21:11:22 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-27.messagelabs.com!1343855473!10330254!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4098 invoked from network); 1 Aug 2012 21:11:14 -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; 1 Aug 2012 21:11:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwgCG-0004xW-U1 for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 21:11:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SwgCG-0000yG-OM for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 21:11:12 +0000 Message-Id: Date: Wed, 01 Aug 2012 21:11:12 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: enforce prohibitions of internal callers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1343821612 -3600 # Node ID 3d622e2c7cfb15b37498e9bb8f1005516fe99f2f # Parent d801c1c1fec8b5d2b27b519d61f884e714405460 libxl: enforce prohibitions of internal callers libxl_internal.h says: * Functions using LIBXL__INIT_EGC may *not* generally be called from * within libxl, because libxl__egc_cleanup may call back into the * application. ... and * ... [Functions which take an ao_how] MAY NOT * be called from inside libxl, because they can cause reentrancy * callbacks. However, this was not enforced. Particularly the latter restriction is easy to overlook, especially since during the transition period to the new event system we have bent this rule a couple of times, and the bad pattern simply involves passing 0 or NULL for the ao_how. So use the compiler to enforce this property, as follows: - Mark all functions which take a libxl_asyncop_how, or which use EGC_INIT or LIBXL__INIT_EGC, with a new annotation LIBXL_EXTERNAL_CALLERS_ONLY in the public header. - Change the documentation comment for asynch operations and egcs to say that this should always be done. - Arrange that if libxl.h is included via libxl_internal.h, LIBXL_EXTERNAL_CALLERS_ONLY expands to __attribute__((warning(...))), which generates a message like this: libxl.c:1772: warning: call to 'libxl_device_disk_remove' declared with attribute warning: may not be called from within libxl Otherwise, the annotation expands to nothing, so external callers are unaffected. - Forbid inclusion of both libxl.h and libxl_internal.h unless libxl_internal.h came first, so that the above check doesn't have any loopholes. Files which include libxl_internal.h should not include libxl.h as well. This is enforced explicitly using #error. However, in practice with the current tree it just changes the error message when this mistake is made; otherwise we would carry on to immediately following #define which would cause the compiler to complain that LIBXL_EXTERNAL_CALLERS_ONLY was redefined. Then the developer might be tempted to add a #ifndef which would be wrong - it would leave the affected translation unit unprotected by the new enforcement regime. So let's be explicit. - Fix the one source of files which violate the above principle, the output from the idl compiler, by removing the redundant inclusion of libxl.h from the output. Also introduce a new script "check-libxl-api-rules" which contains some ad-hoc regexps to spot and complain when libxl.h contains functions which mention libxl_asyncop_how but not LIBXL_EXTERNAL_CALLERS_ONLY. This isn't a full C parser but is likely to get the common cases right and err on the side of complaining. While we are here, the invocation of perl for the bsd queue.h seddery to $(PERL). Signed-off-by: Ian Jackson Cc: Roger Pau Monne Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r d801c1c1fec8 -r 3d622e2c7cfb .gitignore --- a/.gitignore Wed Aug 01 12:46:51 2012 +0100 +++ b/.gitignore Wed Aug 01 12:46:52 2012 +0100 @@ -189,6 +189,7 @@ tools/libxl/xl tools/libxl/testenum tools/libxl/testenum.c tools/libxl/tmp.* +tools/libxl/libxl.api-for-check tools/libaio/src/*.ol tools/libaio/src/*.os tools/misc/cpuperf/cpuperf-perfcntr diff -r d801c1c1fec8 -r 3d622e2c7cfb .hgignore --- a/.hgignore Wed Aug 01 12:46:51 2012 +0100 +++ b/.hgignore Wed Aug 01 12:46:52 2012 +0100 @@ -187,6 +187,7 @@ ^tools/libxl/testidl\.c$ ^tools/libxl/tmp\..*$ ^tools/libxl/.*\.new$ +^tools/libxl/libxl\.api-for-check ^tools/libvchan/vchan-node[12]$ ^tools/libaio/src/.*\.ol$ ^tools/libaio/src/.*\.os$ diff -r d801c1c1fec8 -r 3d622e2c7cfb tools/libxl/Makefile --- a/tools/libxl/Makefile Wed Aug 01 12:46:51 2012 +0100 +++ b/tools/libxl/Makefile Wed Aug 01 12:46:52 2012 +0100 @@ -74,7 +74,8 @@ LIBXL_OBJS += _libxl_types.o libxl_flask $(LIBXL_OBJS): CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) $(CFLAGS_libxenstore) $(CFLAGS_libblktapctl) -include $(XEN_ROOT)/tools/config.h AUTOINCS= libxlu_cfg_y.h libxlu_cfg_l.h _libxl_list.h _paths.h \ - _libxl_save_msgs_callout.h _libxl_save_msgs_helper.h + _libxl_save_msgs_callout.h _libxl_save_msgs_helper.h \ + libxl.api-ok AUTOSRCS= libxlu_cfg_y.c libxlu_cfg_l.c AUTOSRCS += _libxl_save_msgs_callout.c _libxl_save_msgs_helper.c LIBXLU_OBJS = libxlu_cfg_y.o libxlu_cfg_l.o libxlu_cfg.o \ @@ -113,13 +114,22 @@ all: $(CLIENTS) libxenlight.so libxenlig genpath-target = $(call buildmakevars2file,_paths.h.tmp) $(eval $(genpath-target)) +libxl.api-ok: check-libxl-api-rules libxl.api-for-check + $(PERL) $^ + +%.api-for-check: %.h + $(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_$*.o) -c -E $< $(APPEND_CFLAGS) \ + -DLIBXL_EXTERNAL_CALLERS_ONLY=LIBXL_EXTERNAL_CALLERS_ONLY \ + >$@.new + $(call move-if-changed,$@.new,$@) + _paths.h: genpath sed -e "s/\([^=]*\)=\(.*\)/#define \1 \2/g" $@.tmp >$@.2.tmp rm -f $@.tmp $(call move-if-changed,$@.2.tmp,$@) _libxl_list.h: $(XEN_INCLUDE)/xen-external/bsd-sys-queue-h-seddery $(XEN_INCLUDE)/xen-external/bsd-sys-queue.h - perl $^ --prefix=libxl >$@.new + $(PERL) $^ --prefix=libxl >$@.new $(call move-if-changed,$@.new,$@) _libxl_save_msgs_helper.c _libxl_save_msgs_callout.c \ @@ -200,7 +210,7 @@ install: all .PHONY: clean clean: $(RM) -f _*.h *.o *.so* *.a $(CLIENTS) $(DEPS) - $(RM) -f _*.c *.pyc _paths.*.tmp + $(RM) -f _*.c *.pyc _paths.*.tmp *.api-for-check $(RM) -f testidl.c.new testidl.c # $(RM) -f $(AUTOSRCS) $(AUTOINCS) diff -r d801c1c1fec8 -r 3d622e2c7cfb tools/libxl/check-libxl-api-rules --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/libxl/check-libxl-api-rules Wed Aug 01 12:46:52 2012 +0100 @@ -0,0 +1,23 @@ +#!/usr/bin/perl -w +use strict; +our $needed=0; +our $speclineoffset=0; +our $specfile; +while (<>) { + if (m/^\# (\d+) \"(.*)\"$/) { + $speclineoffset = $1 - $. -1; + $specfile = $2; + } + my $file = defined($specfile) ? $specfile : $ARGV; + my $line = $speclineoffset + $.; + if (m/libxl_asyncop_how[^;]/) { + $needed=1; + } + if (m/LIBXL_EXTERNAL_CALLERS_ONLY/) { + $needed=0; + } + next unless $needed; + if (m/\;/) { + die "$file:$line:missing LIBXL_EXTERNAL_CALLERS_ONLY"; + } +} diff -r d801c1c1fec8 -r 3d622e2c7cfb tools/libxl/gentypes.py --- a/tools/libxl/gentypes.py Wed Aug 01 12:46:51 2012 +0100 +++ b/tools/libxl/gentypes.py Wed Aug 01 12:46:52 2012 +0100 @@ -377,7 +377,6 @@ if __name__ == '__main__': #include #include -#include "libxl.h" #include "libxl_internal.h" #define LIBXL_DTOR_POISON 0xa5 diff -r d801c1c1fec8 -r 3d622e2c7cfb tools/libxl/libxl.h --- a/tools/libxl/libxl.h Wed Aug 01 12:46:51 2012 +0100 +++ b/tools/libxl/libxl.h Wed Aug 01 12:46:52 2012 +0100 @@ -266,6 +266,13 @@ #endif #endif +/* Functions annotated with LIBXL_EXTERNAL_CALLERS_ONLY may not be + * called from within libxl itself. Callers outside libxl, who + * do not #include libxl_internal.h, are fine. */ +#ifndef LIBXL_EXTERNAL_CALLERS_ONLY +#define LIBXL_EXTERNAL_CALLERS_ONLY /* disappears for callers outside libxl */ +#endif + typedef uint8_t libxl_mac[6]; #define LIBXL_MAC_FMT "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx" #define LIBXL_MAC_FMTLEN ((2*6)+5) /* 6 hex bytes plus 5 colons */ @@ -496,11 +503,13 @@ int libxl_ctx_free(libxl_ctx *ctx /* 0 i int libxl_domain_create_new(libxl_ctx *ctx, libxl_domain_config *d_config, uint32_t *domid, const libxl_asyncop_how *ao_how, - const libxl_asyncprogress_how *aop_console_how); + const libxl_asyncprogress_how *aop_console_how) + LIBXL_EXTERNAL_CALLERS_ONLY; int libxl_domain_create_restore(libxl_ctx *ctx, libxl_domain_config *d_config, uint32_t *domid, int restore_fd, const libxl_asyncop_how *ao_how, - const libxl_asyncprogress_how *aop_console_how); + const libxl_asyncprogress_how *aop_console_how) + LIBXL_EXTERNAL_CALLERS_ONLY; /* A progress report will be made via ao_console_how, of type * domain_create_console_available, when the domain's primary * console is available and can be connected to. @@ -511,7 +520,8 @@ void libxl_domain_config_dispose(libxl_d int libxl_domain_suspend(libxl_ctx *ctx, uint32_t domid, int fd, int flags, /* LIBXL_SUSPEND_* */ - const libxl_asyncop_how *ao_how); + const libxl_asyncop_how *ao_how) + LIBXL_EXTERNAL_CALLERS_ONLY; #define LIBXL_SUSPEND_DEBUG 1 #define LIBXL_SUSPEND_LIVE 2 @@ -523,12 +533,14 @@ int libxl_domain_resume(libxl_ctx *ctx, int libxl_domain_remus_start(libxl_ctx *ctx, libxl_domain_remus_info *info, uint32_t domid, int send_fd, int recv_fd, - const libxl_asyncop_how *ao_how); + const libxl_asyncop_how *ao_how) + LIBXL_EXTERNAL_CALLERS_ONLY; int libxl_domain_shutdown(libxl_ctx *ctx, uint32_t domid); int libxl_domain_reboot(libxl_ctx *ctx, uint32_t domid); int libxl_domain_destroy(libxl_ctx *ctx, uint32_t domid, - const libxl_asyncop_how *ao_how); + const libxl_asyncop_how *ao_how) + LIBXL_EXTERNAL_CALLERS_ONLY; int libxl_domain_preserve(libxl_ctx *ctx, uint32_t domid, libxl_domain_create_info *info, const char *name_suffix, libxl_uuid new_uuid); /* get max. number of cpus supported by hypervisor */ @@ -549,7 +561,8 @@ int libxl_domain_unpause(libxl_ctx *ctx, int libxl_domain_core_dump(libxl_ctx *ctx, uint32_t domid, const char *filename, - const libxl_asyncop_how *ao_how); + const libxl_asyncop_how *ao_how) + LIBXL_EXTERNAL_CALLERS_ONLY; int libxl_domain_setmaxmem(libxl_ctx *ctx, uint32_t domid, uint32_t target_memkb); int libxl_set_memory_target(libxl_ctx *ctx, uint32_t domid, int32_t target_memkb, int relative, int enforce); @@ -677,13 +690,16 @@ void libxl_vcpuinfo_list_free(libxl_vcpu /* Disks */ int libxl_device_disk_add(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk, - const libxl_asyncop_how *ao_how); + const libxl_asyncop_how *ao_how) + LIBXL_EXTERNAL_CALLERS_ONLY; int libxl_device_disk_remove(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk, - const libxl_asyncop_how *ao_how); + const libxl_asyncop_how *ao_how) + LIBXL_EXTERNAL_CALLERS_ONLY; int libxl_device_disk_destroy(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk, - const libxl_asyncop_how *ao_how); + const libxl_asyncop_how *ao_how) + LIBXL_EXTERNAL_CALLERS_ONLY; libxl_device_disk *libxl_device_disk_list(libxl_ctx *ctx, uint32_t domid, int *num); int libxl_device_disk_getinfo(libxl_ctx *ctx, uint32_t domid, @@ -694,17 +710,21 @@ int libxl_device_disk_getinfo(libxl_ctx * be attached to the guest. */ int libxl_cdrom_insert(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk, - const libxl_asyncop_how *ao_how); + const libxl_asyncop_how *ao_how) + LIBXL_EXTERNAL_CALLERS_ONLY; /* Network Interfaces */ int libxl_device_nic_add(libxl_ctx *ctx, uint32_t domid, libxl_device_nic *nic, - const libxl_asyncop_how *ao_how); + const libxl_asyncop_how *ao_how) + LIBXL_EXTERNAL_CALLERS_ONLY; int libxl_device_nic_remove(libxl_ctx *ctx, uint32_t domid, libxl_device_nic *nic, - const libxl_asyncop_how *ao_how); + const libxl_asyncop_how *ao_how) + LIBXL_EXTERNAL_CALLERS_ONLY; int libxl_device_nic_destroy(libxl_ctx *ctx, uint32_t domid, libxl_device_nic *nic, - const libxl_asyncop_how *ao_how); + const libxl_asyncop_how *ao_how) + LIBXL_EXTERNAL_CALLERS_ONLY; libxl_device_nic *libxl_device_nic_list(libxl_ctx *ctx, uint32_t domid, int *num); int libxl_device_nic_getinfo(libxl_ctx *ctx, uint32_t domid, @@ -712,23 +732,29 @@ int libxl_device_nic_getinfo(libxl_ctx * /* Keyboard */ int libxl_device_vkb_add(libxl_ctx *ctx, uint32_t domid, libxl_device_vkb *vkb, - const libxl_asyncop_how *ao_how); + const libxl_asyncop_how *ao_how) + LIBXL_EXTERNAL_CALLERS_ONLY; int libxl_device_vkb_remove(libxl_ctx *ctx, uint32_t domid, libxl_device_vkb *vkb, - const libxl_asyncop_how *ao_how); + const libxl_asyncop_how *ao_how) + LIBXL_EXTERNAL_CALLERS_ONLY; int libxl_device_vkb_destroy(libxl_ctx *ctx, uint32_t domid, libxl_device_vkb *vkb, - const libxl_asyncop_how *ao_how); + const libxl_asyncop_how *ao_how) + LIBXL_EXTERNAL_CALLERS_ONLY; /* Framebuffer */ int libxl_device_vfb_add(libxl_ctx *ctx, uint32_t domid, libxl_device_vfb *vfb, - const libxl_asyncop_how *ao_how); + const libxl_asyncop_how *ao_how) + LIBXL_EXTERNAL_CALLERS_ONLY; int libxl_device_vfb_remove(libxl_ctx *ctx, uint32_t domid, libxl_device_vfb *vfb, - const libxl_asyncop_how *ao_how); + const libxl_asyncop_how *ao_how) + LIBXL_EXTERNAL_CALLERS_ONLY; int libxl_device_vfb_destroy(libxl_ctx *ctx, uint32_t domid, libxl_device_vfb *vfb, - const libxl_asyncop_how *ao_how); + const libxl_asyncop_how *ao_how) + LIBXL_EXTERNAL_CALLERS_ONLY; /* PCI Passthrough */ int libxl_device_pci_add(libxl_ctx *ctx, uint32_t domid, libxl_device_pci *pcidev); diff -r d801c1c1fec8 -r 3d622e2c7cfb tools/libxl/libxl_event.h --- a/tools/libxl/libxl_event.h Wed Aug 01 12:46:51 2012 +0100 +++ b/tools/libxl/libxl_event.h Wed Aug 01 12:46:52 2012 +0100 @@ -37,7 +37,8 @@ typedef int libxl_event_predicate(const int libxl_event_check(libxl_ctx *ctx, libxl_event **event_r, uint64_t typemask, - libxl_event_predicate *predicate, void *predicate_user); + libxl_event_predicate *predicate, void *predicate_user) + LIBXL_EXTERNAL_CALLERS_ONLY; /* 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 @@ -48,7 +49,8 @@ int libxl_event_check(libxl_ctx *ctx, li int libxl_event_wait(libxl_ctx *ctx, libxl_event **event_r, uint64_t typemask, - libxl_event_predicate *predicate, void *predicate_user); + libxl_event_predicate *predicate, void *predicate_user) + LIBXL_EXTERNAL_CALLERS_ONLY; /* 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 @@ -256,7 +258,8 @@ struct pollfd; */ int libxl_osevent_beforepoll(libxl_ctx *ctx, int *nfds_io, struct pollfd *fds, int *timeout_upd, - struct timeval now); + struct timeval now) + LIBXL_EXTERNAL_CALLERS_ONLY; /* nfds and fds[0..nfds] must be from the most recent call to * _beforepoll, as modified by poll. (It is therefore not possible @@ -271,7 +274,8 @@ int libxl_osevent_beforepoll(libxl_ctx * * libxl_event_check. */ void libxl_osevent_afterpoll(libxl_ctx *ctx, int nfds, const struct pollfd *fds, - struct timeval now); + struct timeval now) + LIBXL_EXTERNAL_CALLERS_ONLY; typedef struct libxl_osevent_hooks { @@ -357,14 +361,16 @@ void libxl_osevent_register_hooks(libxl_ */ void libxl_osevent_occurred_fd(libxl_ctx *ctx, void *for_libxl, - int fd, short events, short revents); + int fd, short events, short revents) + LIBXL_EXTERNAL_CALLERS_ONLY; /* 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); +void libxl_osevent_occurred_timeout(libxl_ctx *ctx, void *for_libxl) + LIBXL_EXTERNAL_CALLERS_ONLY; /*======================================================================*/ @@ -506,7 +512,8 @@ void libxl_childproc_setmode(libxl_ctx * * certainly need to use the self-pipe trick (or a working pselect or * ppoll) to implement this. */ -int libxl_childproc_reaped(libxl_ctx *ctx, pid_t, int status); +int libxl_childproc_reaped(libxl_ctx *ctx, pid_t, int status) + LIBXL_EXTERNAL_CALLERS_ONLY; /* diff -r d801c1c1fec8 -r 3d622e2c7cfb tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Wed Aug 01 12:46:51 2012 +0100 +++ b/tools/libxl/libxl_internal.h Wed Aug 01 12:46:52 2012 +0100 @@ -52,6 +52,12 @@ #include +#ifdef LIBXL_H +# error libxl.h should be included via libxl_internal.h, not separately +#endif +#define LIBXL_EXTERNAL_CALLERS_ONLY \ + __attribute__((warning("may not be called from within libxl"))) + #include "libxl.h" #include "_paths.h" #include "_libxl_save_msgs_callout.h" @@ -1534,10 +1540,10 @@ int libxl__hotplug_settings(libxl__gc *g * * 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. + * application. This should be enforced by declaring all such + * functions in libxl.h or libxl_event.h with + * LIBXL_EXTERNAL_CALLERS_ONLY. You should in any case not find it + * necessary to call egc-creators from within libxl. * * The callbacks must all take place with the ctx unlocked because * the application is entitled to reenter libxl from them. This _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 01 21:11:55 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 01 Aug 2012 21:11: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 1SwgCu-00009T-O1; Wed, 01 Aug 2012 21:11:52 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwgCs-00009B-VJ for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 21:11:51 +0000 Received: from [85.158.143.35:42400] by server-3.bemta-4.messagelabs.com id D3/8D-01511-69B99105; Wed, 01 Aug 2012 21:11:50 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-21.messagelabs.com!1343855471!13028039!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17900 invoked from network); 1 Aug 2012 21:11:12 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 1 Aug 2012 21:11:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwgCF-0004xN-4b for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 21:11:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SwgCF-0000xX-1Q for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 21:11:11 +0000 Message-Id: Date: Wed, 01 Aug 2012 21:11:10 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: fix unitialized variables in libxl__primary_console_find X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Olaf Hering # Date 1343821609 -3600 # Node ID c379e77870aff938ca941a3acb760831039c19a6 # Parent 433624c658af4f3bf21ae53ef090528e870fdf58 libxl: fix unitialized variables in libxl__primary_console_find gcc 4.5 as shipped with openSuSE 11.4 does not recognize the case of LIBXL_DOMAIN_TYPE_INVALID properly: cc1: warnings being treated as errors libxl.c: In function 'libxl_primary_console_exec': libxl.c:1408:14: error: 'domid' may be used uninitialized in this function libxl.c:1409:9: error: 'cons_num' may be used uninitialized in this function libxl.c:1410:24: error: 'type' may be used uninitialized in this function libxl.c: In function 'libxl_primary_console_get_tty': libxl.c:1421:14: error: 'domid' may be used uninitialized in this function libxl.c:1422:9: error: 'cons_num' may be used uninitialized in this function libxl.c:1423:24: error: 'type' may be used uninitialized in this function make[3]: *** [libxl.o] Error 1 Fix this by adding a default case. Signed-off-by: Olaf Hering Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r 433624c658af -r c379e77870af tools/libxl/libxl.c --- a/tools/libxl/libxl.c Wed Aug 01 12:46:48 2012 +0100 +++ b/tools/libxl/libxl.c Wed Aug 01 12:46:49 2012 +0100 @@ -1590,6 +1590,7 @@ static int libxl__primary_console_find(l case LIBXL_DOMAIN_TYPE_INVALID: rc = ERROR_INVAL; goto out; + default: abort(); } } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 01 21:11:55 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 01 Aug 2012 21:11: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 1SwgCu-00009T-O1; Wed, 01 Aug 2012 21:11:52 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwgCs-00009B-VJ for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 21:11:51 +0000 Received: from [85.158.143.35:42400] by server-3.bemta-4.messagelabs.com id D3/8D-01511-69B99105; Wed, 01 Aug 2012 21:11:50 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-21.messagelabs.com!1343855471!13028039!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17900 invoked from network); 1 Aug 2012 21:11:12 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 1 Aug 2012 21:11:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwgCF-0004xN-4b for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 21:11:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SwgCF-0000xX-1Q for xen-changelog@lists.xensource.com; Wed, 01 Aug 2012 21:11:11 +0000 Message-Id: Date: Wed, 01 Aug 2012 21:11:10 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: fix unitialized variables in libxl__primary_console_find X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Olaf Hering # Date 1343821609 -3600 # Node ID c379e77870aff938ca941a3acb760831039c19a6 # Parent 433624c658af4f3bf21ae53ef090528e870fdf58 libxl: fix unitialized variables in libxl__primary_console_find gcc 4.5 as shipped with openSuSE 11.4 does not recognize the case of LIBXL_DOMAIN_TYPE_INVALID properly: cc1: warnings being treated as errors libxl.c: In function 'libxl_primary_console_exec': libxl.c:1408:14: error: 'domid' may be used uninitialized in this function libxl.c:1409:9: error: 'cons_num' may be used uninitialized in this function libxl.c:1410:24: error: 'type' may be used uninitialized in this function libxl.c: In function 'libxl_primary_console_get_tty': libxl.c:1421:14: error: 'domid' may be used uninitialized in this function libxl.c:1422:9: error: 'cons_num' may be used uninitialized in this function libxl.c:1423:24: error: 'type' may be used uninitialized in this function make[3]: *** [libxl.o] Error 1 Fix this by adding a default case. Signed-off-by: Olaf Hering Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r 433624c658af -r c379e77870af tools/libxl/libxl.c --- a/tools/libxl/libxl.c Wed Aug 01 12:46:48 2012 +0100 +++ b/tools/libxl/libxl.c Wed Aug 01 12:46:49 2012 +0100 @@ -1590,6 +1590,7 @@ static int libxl__primary_console_find(l case LIBXL_DOMAIN_TYPE_INVALID: rc = ERROR_INVAL; goto out; + default: abort(); } } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Aug 02 16:44:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 02 Aug 2012 16: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 1SwyVP-0006fM-4H; Thu, 02 Aug 2012 16:44:11 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwyVO-0006f6-6E for xen-changelog@lists.xensource.com; Thu, 02 Aug 2012 16:44:10 +0000 Received: from [85.158.143.99:42058] by server-3.bemta-4.messagelabs.com id 53/E6-01511-95EAA105; Thu, 02 Aug 2012 16:44:09 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-216.messagelabs.com!1343925848!29373480!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3082 invoked from network); 2 Aug 2012 16:44:08 -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; 2 Aug 2012 16:44:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwyVL-00055y-P1 for xen-changelog@lists.xensource.com; Thu, 02 Aug 2012 16:44:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SwyVL-0004Tp-JS for xen-changelog@lists.xensource.com; Thu, 02 Aug 2012 16:44:07 +0000 Message-Id: Date: Thu, 02 Aug 2012 16:44:07 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] pygrub: add quoting to install receipe X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Olaf Hering # Date 1343900762 -3600 # Node ID 619c4298f055f4e4b4c82b5d703acaf344f8bc62 # Parent 3d622e2c7cfb15b37498e9bb8f1005516fe99f2f pygrub: add quoting to install receipe The changeset 25694:e20085770cb5 causes a syntax error if readline returns nothing due to non-existant path: [ 148s] set -e; if [ `readlink -f /home/abuild/rpmbuild/BUILD/xen-4.2.25700/non-dbg/dist/install//usr/bin` != \ [ 148s] `readlink -f /usr/lib64/xen/bin` ]; then \ [ 148s] ln -sf /usr/lib64/xen/bin/pygrub /home/abuild/rpmbuild/BUILD/xen-4.2.25700/non-dbg/dist/install//usr/bin; \ [ 148s] fi [ 148s] /bin/sh: line 0: [: /home/abuild/rpmbuild/BUILD/xen-4.2.25700/non-dbg/dist/install/usr/bin: unary operator expected Add quoting to fix the error. Signed-off-by: Olaf Hering Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r 3d622e2c7cfb -r 619c4298f055 tools/pygrub/Makefile --- a/tools/pygrub/Makefile Wed Aug 01 12:46:52 2012 +0100 +++ b/tools/pygrub/Makefile Thu Aug 02 10:46:02 2012 +0100 @@ -14,8 +14,8 @@ install: all $(PYTHON_PREFIX_ARG) --root="$(DESTDIR)" \ --install-scripts=$(PRIVATE_BINDIR) --force $(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot - set -e; if [ `readlink -f $(DESTDIR)/$(BINDIR)` != \ - `readlink -f $(PRIVATE_BINDIR)` ]; then \ + set -e; if [ "`readlink -f $(DESTDIR)/$(BINDIR)`" != \ + "`readlink -f $(PRIVATE_BINDIR)`" ]; then \ ln -sf $(PRIVATE_BINDIR)/pygrub $(DESTDIR)/$(BINDIR); \ fi _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Aug 02 16:44:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 02 Aug 2012 16: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 1SwyVP-0006fM-4H; Thu, 02 Aug 2012 16:44:11 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwyVO-0006f6-6E for xen-changelog@lists.xensource.com; Thu, 02 Aug 2012 16:44:10 +0000 Received: from [85.158.143.99:42058] by server-3.bemta-4.messagelabs.com id 53/E6-01511-95EAA105; Thu, 02 Aug 2012 16:44:09 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-216.messagelabs.com!1343925848!29373480!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3082 invoked from network); 2 Aug 2012 16:44:08 -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; 2 Aug 2012 16:44:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwyVL-00055y-P1 for xen-changelog@lists.xensource.com; Thu, 02 Aug 2012 16:44:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SwyVL-0004Tp-JS for xen-changelog@lists.xensource.com; Thu, 02 Aug 2012 16:44:07 +0000 Message-Id: Date: Thu, 02 Aug 2012 16:44:07 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] pygrub: add quoting to install receipe X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Olaf Hering # Date 1343900762 -3600 # Node ID 619c4298f055f4e4b4c82b5d703acaf344f8bc62 # Parent 3d622e2c7cfb15b37498e9bb8f1005516fe99f2f pygrub: add quoting to install receipe The changeset 25694:e20085770cb5 causes a syntax error if readline returns nothing due to non-existant path: [ 148s] set -e; if [ `readlink -f /home/abuild/rpmbuild/BUILD/xen-4.2.25700/non-dbg/dist/install//usr/bin` != \ [ 148s] `readlink -f /usr/lib64/xen/bin` ]; then \ [ 148s] ln -sf /usr/lib64/xen/bin/pygrub /home/abuild/rpmbuild/BUILD/xen-4.2.25700/non-dbg/dist/install//usr/bin; \ [ 148s] fi [ 148s] /bin/sh: line 0: [: /home/abuild/rpmbuild/BUILD/xen-4.2.25700/non-dbg/dist/install/usr/bin: unary operator expected Add quoting to fix the error. Signed-off-by: Olaf Hering Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r 3d622e2c7cfb -r 619c4298f055 tools/pygrub/Makefile --- a/tools/pygrub/Makefile Wed Aug 01 12:46:52 2012 +0100 +++ b/tools/pygrub/Makefile Thu Aug 02 10:46:02 2012 +0100 @@ -14,8 +14,8 @@ install: all $(PYTHON_PREFIX_ARG) --root="$(DESTDIR)" \ --install-scripts=$(PRIVATE_BINDIR) --force $(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot - set -e; if [ `readlink -f $(DESTDIR)/$(BINDIR)` != \ - `readlink -f $(PRIVATE_BINDIR)` ]; then \ + set -e; if [ "`readlink -f $(DESTDIR)/$(BINDIR)`" != \ + "`readlink -f $(PRIVATE_BINDIR)`" ]; then \ ln -sf $(PRIVATE_BINDIR)/pygrub $(DESTDIR)/$(BINDIR); \ fi _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Aug 02 16:44:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 02 Aug 2012 16:44:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwyVR-0006ff-7H; Thu, 02 Aug 2012 16:44:13 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwyVP-0006fK-IF for xen-changelog@lists.xensource.com; Thu, 02 Aug 2012 16:44:11 +0000 Received: from [85.158.138.51:28957] by server-8.bemta-3.messagelabs.com id 0A/FE-10412-A5EAA105; Thu, 02 Aug 2012 16:44:10 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-174.messagelabs.com!1343925849!26074246!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10398 invoked from network); 2 Aug 2012 16:44:10 -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; 2 Aug 2012 16:44:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwyVM-000561-KR for xen-changelog@lists.xensource.com; Thu, 02 Aug 2012 16:44:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SwyVM-0004U4-6h for xen-changelog@lists.xensource.com; Thu, 02 Aug 2012 16:44:08 +0000 Message-Id: Date: Thu, 02 Aug 2012 16:44:07 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] x86: also allow disabling LAPIC NMI watchdog on newer CPUs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Jan Beulich # Date 1343900977 -7200 # Node ID 3d17148e465ce87ddd8f555a001280348d848419 # Parent 619c4298f055f4e4b4c82b5d703acaf344f8bc62 x86: also allow disabling LAPIC NMI watchdog on newer CPUs This complements c/s 9146:941897e98591, and also replaces a literal zero with a proper manifest constant. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- diff -r 619c4298f055 -r 3d17148e465c xen/arch/x86/nmi.c --- a/xen/arch/x86/nmi.c Thu Aug 02 10:46:02 2012 +0100 +++ b/xen/arch/x86/nmi.c Thu Aug 02 11:49:37 2012 +0200 @@ -175,15 +175,9 @@ static void disable_lapic_nmi_watchdog(v case X86_VENDOR_INTEL: switch (boot_cpu_data.x86) { case 6: - if (boot_cpu_data.x86_model > 0xd) - break; - wrmsr(MSR_P6_EVNTSEL0, 0, 0); break; case 15: - if (boot_cpu_data.x86_model > 0x4) - break; - wrmsr(MSR_P4_IQ_CCCR0, 0, 0); wrmsr(MSR_P4_CRU_ESCR0, 0, 0); break; @@ -192,7 +186,7 @@ static void disable_lapic_nmi_watchdog(v } nmi_active = -1; /* tell do_nmi() and others that we're not active any more */ - nmi_watchdog = 0; + nmi_watchdog = NMI_NONE; } static void enable_lapic_nmi_watchdog(void) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Aug 02 16:44:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 02 Aug 2012 16:44:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwyVR-0006ff-7H; Thu, 02 Aug 2012 16:44:13 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwyVP-0006fK-IF for xen-changelog@lists.xensource.com; Thu, 02 Aug 2012 16:44:11 +0000 Received: from [85.158.138.51:28957] by server-8.bemta-3.messagelabs.com id 0A/FE-10412-A5EAA105; Thu, 02 Aug 2012 16:44:10 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-174.messagelabs.com!1343925849!26074246!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10398 invoked from network); 2 Aug 2012 16:44:10 -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; 2 Aug 2012 16:44:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwyVM-000561-KR for xen-changelog@lists.xensource.com; Thu, 02 Aug 2012 16:44:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SwyVM-0004U4-6h for xen-changelog@lists.xensource.com; Thu, 02 Aug 2012 16:44:08 +0000 Message-Id: Date: Thu, 02 Aug 2012 16:44:07 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] x86: also allow disabling LAPIC NMI watchdog on newer CPUs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Jan Beulich # Date 1343900977 -7200 # Node ID 3d17148e465ce87ddd8f555a001280348d848419 # Parent 619c4298f055f4e4b4c82b5d703acaf344f8bc62 x86: also allow disabling LAPIC NMI watchdog on newer CPUs This complements c/s 9146:941897e98591, and also replaces a literal zero with a proper manifest constant. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- diff -r 619c4298f055 -r 3d17148e465c xen/arch/x86/nmi.c --- a/xen/arch/x86/nmi.c Thu Aug 02 10:46:02 2012 +0100 +++ b/xen/arch/x86/nmi.c Thu Aug 02 11:49:37 2012 +0200 @@ -175,15 +175,9 @@ static void disable_lapic_nmi_watchdog(v case X86_VENDOR_INTEL: switch (boot_cpu_data.x86) { case 6: - if (boot_cpu_data.x86_model > 0xd) - break; - wrmsr(MSR_P6_EVNTSEL0, 0, 0); break; case 15: - if (boot_cpu_data.x86_model > 0x4) - break; - wrmsr(MSR_P4_IQ_CCCR0, 0, 0); wrmsr(MSR_P4_CRU_ESCR0, 0, 0); break; @@ -192,7 +186,7 @@ static void disable_lapic_nmi_watchdog(v } nmi_active = -1; /* tell do_nmi() and others that we're not active any more */ - nmi_watchdog = 0; + nmi_watchdog = NMI_NONE; } static void enable_lapic_nmi_watchdog(void) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 06:22:16 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 06: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 1SydBC-0005B3-2o; Tue, 07 Aug 2012 06:22:10 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SydBA-0005AV-3P for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 06:22:08 +0000 Received: from [85.158.139.83:16003] by server-7.bemta-5.messagelabs.com id 26/CC-00857-F04B0205; Tue, 07 Aug 2012 06:22:07 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-182.messagelabs.com!1344320525!30565548!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20640 invoked from network); 7 Aug 2012 06:22: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; 7 Aug 2012 06:22:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SydB6-0001rQ-V6 for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 06:22:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SydB6-0007bq-E7 for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 06:22:04 +0000 Message-Id: Date: Tue, 07 Aug 2012 06:22:04 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] mm: properly frame Xen additions with CONFIG_XEN conditionals X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Jan Beulich # Date 1344319692 -7200 # Node ID 2d3239c1550132c77c2c306f294b2cd01d57ec81 # Parent f628814a279a118f4b1b7c121ccc1b8be4d44f9d mm: properly frame Xen additions with CONFIG_XEN conditionals There's no need and no good reason to affect native kernels built from the same sources. Also eliminate a compiler warning triggered by various versions, and adjust some white space. Signed-off-by: Jan Beulich --- diff -r f628814a279a -r 2d3239c15501 include/linux/mm.h --- a/include/linux/mm.h Tue Aug 07 08:07:12 2012 +0200 +++ b/include/linux/mm.h Tue Aug 07 08:08:12 2012 +0200 @@ -209,14 +209,15 @@ struct vm_operations_struct { /* notification that a previously read-only page is about to become * writable, if an error is returned it will cause a SIGBUS */ int (*page_mkwrite)(struct vm_area_struct *vma, struct page *page); +#ifdef CONFIG_XEN /* Area-specific function for clearing the PTE at @ptep. Returns the * original value of @ptep. */ - pte_t (*zap_pte)(struct vm_area_struct *vma, + pte_t (*zap_pte)(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep, int is_fullmm); - /* called before close() to indicate no more pages should be mapped */ - void (*unmap)(struct vm_area_struct *area); - + /* called before close() to indicate no more pages should be mapped */ + void (*unmap)(struct vm_area_struct *area); +#endif #ifdef CONFIG_NUMA int (*set_policy)(struct vm_area_struct *vma, struct mempolicy *new); struct mempolicy *(*get_policy)(struct vm_area_struct *vma, diff -r f628814a279a -r 2d3239c15501 mm/memory.c --- a/mm/memory.c Tue Aug 07 08:07:12 2012 +0200 +++ b/mm/memory.c Tue Aug 07 08:08:12 2012 +0200 @@ -409,7 +409,9 @@ struct page *vm_normal_page(struct vm_ar * and that the resulting page looks ok. */ if (unlikely(!pfn_valid(pfn))) { +#ifdef CONFIG_XEN if (!(vma->vm_flags & VM_RESERVED)) +#endif print_bad_pte(vma, pte, addr); return NULL; } @@ -665,10 +667,12 @@ static unsigned long zap_pte_range(struc page->index > details->last_index)) continue; } +#ifdef CONFIG_XEN if (unlikely(vma->vm_ops && vma->vm_ops->zap_pte)) ptent = vma->vm_ops->zap_pte(vma, addr, pte, tlb->fullmm); else +#endif ptent = ptep_get_and_clear_full(mm, addr, pte, tlb->fullmm); tlb_remove_tlb_entry(tlb, pte, addr); @@ -1425,7 +1429,7 @@ static inline int apply_to_pte_range(str spinlock_t *ptl; pte = (mm == &init_mm) ? - pte_alloc_kernel(pmd, addr) : + ptl = NULL, pte_alloc_kernel(pmd, addr) : pte_alloc_map_lock(mm, pmd, addr, &ptl); if (!pte) return -ENOMEM; diff -r f628814a279a -r 2d3239c15501 mm/mmap.c --- a/mm/mmap.c Tue Aug 07 08:07:12 2012 +0200 +++ b/mm/mmap.c Tue Aug 07 08:08:12 2012 +0200 @@ -1689,8 +1689,10 @@ static void unmap_region(struct mm_struc static inline void unmap_vma(struct vm_area_struct *vma) { +#ifdef CONFIG_XEN if (unlikely(vma->vm_ops && vma->vm_ops->unmap)) vma->vm_ops->unmap(vma); +#endif } /* @@ -1966,7 +1968,7 @@ EXPORT_SYMBOL(do_brk); void exit_mmap(struct mm_struct *mm) { struct mmu_gather *tlb; - struct vm_area_struct *vma_tmp, *vma = mm->mmap; + struct vm_area_struct *vma = mm->mmap; unsigned long nr_accounted = 0; unsigned long end; @@ -1974,8 +1976,11 @@ void exit_mmap(struct mm_struct *mm) arch_exit_mmap(mm); #endif - for (vma_tmp = mm->mmap; vma_tmp; vma_tmp = vma_tmp->vm_next) - unmap_vma(vma_tmp); +#ifdef CONFIG_XEN + for (; vma; vma = vma->vm_next) + unmap_vma(vma); + vma = mm->mmap; +#endif lru_add_drain(); flush_cache_mm(mm); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 06:22:16 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 06: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 1SydBC-0005B3-2o; Tue, 07 Aug 2012 06:22:10 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SydBA-0005AV-3P for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 06:22:08 +0000 Received: from [85.158.139.83:16003] by server-7.bemta-5.messagelabs.com id 26/CC-00857-F04B0205; Tue, 07 Aug 2012 06:22:07 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-182.messagelabs.com!1344320525!30565548!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20640 invoked from network); 7 Aug 2012 06:22: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; 7 Aug 2012 06:22:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SydB6-0001rQ-V6 for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 06:22:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SydB6-0007bq-E7 for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 06:22:04 +0000 Message-Id: Date: Tue, 07 Aug 2012 06:22:04 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] mm: properly frame Xen additions with CONFIG_XEN conditionals X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Jan Beulich # Date 1344319692 -7200 # Node ID 2d3239c1550132c77c2c306f294b2cd01d57ec81 # Parent f628814a279a118f4b1b7c121ccc1b8be4d44f9d mm: properly frame Xen additions with CONFIG_XEN conditionals There's no need and no good reason to affect native kernels built from the same sources. Also eliminate a compiler warning triggered by various versions, and adjust some white space. Signed-off-by: Jan Beulich --- diff -r f628814a279a -r 2d3239c15501 include/linux/mm.h --- a/include/linux/mm.h Tue Aug 07 08:07:12 2012 +0200 +++ b/include/linux/mm.h Tue Aug 07 08:08:12 2012 +0200 @@ -209,14 +209,15 @@ struct vm_operations_struct { /* notification that a previously read-only page is about to become * writable, if an error is returned it will cause a SIGBUS */ int (*page_mkwrite)(struct vm_area_struct *vma, struct page *page); +#ifdef CONFIG_XEN /* Area-specific function for clearing the PTE at @ptep. Returns the * original value of @ptep. */ - pte_t (*zap_pte)(struct vm_area_struct *vma, + pte_t (*zap_pte)(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep, int is_fullmm); - /* called before close() to indicate no more pages should be mapped */ - void (*unmap)(struct vm_area_struct *area); - + /* called before close() to indicate no more pages should be mapped */ + void (*unmap)(struct vm_area_struct *area); +#endif #ifdef CONFIG_NUMA int (*set_policy)(struct vm_area_struct *vma, struct mempolicy *new); struct mempolicy *(*get_policy)(struct vm_area_struct *vma, diff -r f628814a279a -r 2d3239c15501 mm/memory.c --- a/mm/memory.c Tue Aug 07 08:07:12 2012 +0200 +++ b/mm/memory.c Tue Aug 07 08:08:12 2012 +0200 @@ -409,7 +409,9 @@ struct page *vm_normal_page(struct vm_ar * and that the resulting page looks ok. */ if (unlikely(!pfn_valid(pfn))) { +#ifdef CONFIG_XEN if (!(vma->vm_flags & VM_RESERVED)) +#endif print_bad_pte(vma, pte, addr); return NULL; } @@ -665,10 +667,12 @@ static unsigned long zap_pte_range(struc page->index > details->last_index)) continue; } +#ifdef CONFIG_XEN if (unlikely(vma->vm_ops && vma->vm_ops->zap_pte)) ptent = vma->vm_ops->zap_pte(vma, addr, pte, tlb->fullmm); else +#endif ptent = ptep_get_and_clear_full(mm, addr, pte, tlb->fullmm); tlb_remove_tlb_entry(tlb, pte, addr); @@ -1425,7 +1429,7 @@ static inline int apply_to_pte_range(str spinlock_t *ptl; pte = (mm == &init_mm) ? - pte_alloc_kernel(pmd, addr) : + ptl = NULL, pte_alloc_kernel(pmd, addr) : pte_alloc_map_lock(mm, pmd, addr, &ptl); if (!pte) return -ENOMEM; diff -r f628814a279a -r 2d3239c15501 mm/mmap.c --- a/mm/mmap.c Tue Aug 07 08:07:12 2012 +0200 +++ b/mm/mmap.c Tue Aug 07 08:08:12 2012 +0200 @@ -1689,8 +1689,10 @@ static void unmap_region(struct mm_struc static inline void unmap_vma(struct vm_area_struct *vma) { +#ifdef CONFIG_XEN if (unlikely(vma->vm_ops && vma->vm_ops->unmap)) vma->vm_ops->unmap(vma); +#endif } /* @@ -1966,7 +1968,7 @@ EXPORT_SYMBOL(do_brk); void exit_mmap(struct mm_struct *mm) { struct mmu_gather *tlb; - struct vm_area_struct *vma_tmp, *vma = mm->mmap; + struct vm_area_struct *vma = mm->mmap; unsigned long nr_accounted = 0; unsigned long end; @@ -1974,8 +1976,11 @@ void exit_mmap(struct mm_struct *mm) arch_exit_mmap(mm); #endif - for (vma_tmp = mm->mmap; vma_tmp; vma_tmp = vma_tmp->vm_next) - unmap_vma(vma_tmp); +#ifdef CONFIG_XEN + for (; vma; vma = vma->vm_next) + unmap_vma(vma); + vma = mm->mmap; +#endif lru_add_drain(); flush_cache_mm(mm); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 06:22:16 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 06: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 1SydBB-0005Af-0S; Tue, 07 Aug 2012 06:22:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SydB9-0005AU-Id for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 06:22:07 +0000 Received: from [85.158.138.51:41373] by server-12.bemta-3.messagelabs.com id B9/7F-21301-E04B0205; Tue, 07 Aug 2012 06:22:06 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-174.messagelabs.com!1344320525!26701272!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7359 invoked from network); 7 Aug 2012 06:22:06 -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; 7 Aug 2012 06:22:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SydB6-0001rN-GR for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 06:22:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SydB5-0007bb-MS for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 06:22:04 +0000 Message-Id: Date: Tue, 07 Aug 2012 06:22:03 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] x86: fix context switch on debug hypervisor after 1183:5e3c342a325e X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Jan Beulich # Date 1344319632 -7200 # Node ID f628814a279a118f4b1b7c121ccc1b8be4d44f9d # Parent d5afea2ab44ff42e3a12e3952efa35a60ca2d1de x86: fix context switch on debug hypervisor after 1183:5e3c342a325e Looking at anything but the result field of a multicall structure after issuing the multicall is invalid - the debug hypervisor intentionally clobbers all other fields. On i386 also remove some left over, unused debugging code. Signed-off-by: Jan Beulich --- diff -r d5afea2ab44f -r f628814a279a arch/i386/kernel/process-xen.c --- a/arch/i386/kernel/process-xen.c Tue Jul 03 11:07:47 2012 +0200 +++ b/arch/i386/kernel/process-xen.c Tue Aug 07 08:07:12 2012 +0200 @@ -548,7 +548,7 @@ struct task_struct fastcall * __switch_t { struct thread_struct *prev = &prev_p->thread, *next = &next_p->thread; - int cpu = smp_processor_id(); + int cpu = smp_processor_id(), cr0_ts; #ifndef CONFIG_X86_NO_TSS struct tss_struct *tss = &per_cpu(init_tss, cpu); #endif @@ -575,9 +575,6 @@ struct task_struct fastcall * __switch_t mcl->args[0] = 1; mcl++; } -#if 0 /* lazy fpu sanity check */ - else BUG_ON(!(read_cr0() & 8)); -#endif /* * Reload esp0. @@ -639,11 +636,14 @@ struct task_struct fastcall * __switch_t BUG_ON(pdo > _pdo + ARRAY_SIZE(_pdo)); #endif BUG_ON(mcl > _mcl + ARRAY_SIZE(_mcl)); - if (_mcl->op == __HYPERVISOR_fpu_taskswitch) + if (_mcl->op == __HYPERVISOR_fpu_taskswitch) { __get_cpu_var(xen_x86_cr0_upd) = X86_CR0_TS; + cr0_ts = 1; + } else + cr0_ts = 0; if (unlikely(HYPERVISOR_multicall_check(_mcl, mcl - _mcl, NULL))) BUG(); - if (_mcl->op == __HYPERVISOR_fpu_taskswitch) { + if (cr0_ts) { __get_cpu_var(xen_x86_cr0) |= X86_CR0_TS; xen_clear_cr0_upd(); } diff -r d5afea2ab44f -r f628814a279a arch/x86_64/kernel/process-xen.c --- a/arch/x86_64/kernel/process-xen.c Tue Jul 03 11:07:47 2012 +0200 +++ b/arch/x86_64/kernel/process-xen.c Tue Aug 07 08:07:12 2012 +0200 @@ -486,7 +486,7 @@ __switch_to(struct task_struct *prev_p, { struct thread_struct *prev = &prev_p->thread, *next = &next_p->thread; - int cpu = smp_processor_id(); + int cpu = smp_processor_id(), cr0_ts; #ifndef CONFIG_X86_NO_TSS struct tss_struct *tss = &per_cpu(init_tss, cpu); #endif @@ -572,11 +572,14 @@ __switch_to(struct task_struct *prev_p, BUG_ON(pdo > _pdo + ARRAY_SIZE(_pdo)); #endif BUG_ON(mcl > _mcl + ARRAY_SIZE(_mcl)); - if (_mcl->op == __HYPERVISOR_fpu_taskswitch) + if (_mcl->op == __HYPERVISOR_fpu_taskswitch) { __get_cpu_var(xen_x86_cr0_upd) = X86_CR0_TS; + cr0_ts = 1; + } else + cr0_ts = 0; if (unlikely(HYPERVISOR_multicall_check(_mcl, mcl - _mcl, NULL))) BUG(); - if (_mcl->op == __HYPERVISOR_fpu_taskswitch) { + if (cr0_ts) { __get_cpu_var(xen_x86_cr0) |= X86_CR0_TS; xen_clear_cr0_upd(); } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 06:22:16 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 06: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 1SydBB-0005Af-0S; Tue, 07 Aug 2012 06:22:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SydB9-0005AU-Id for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 06:22:07 +0000 Received: from [85.158.138.51:41373] by server-12.bemta-3.messagelabs.com id B9/7F-21301-E04B0205; Tue, 07 Aug 2012 06:22:06 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-174.messagelabs.com!1344320525!26701272!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7359 invoked from network); 7 Aug 2012 06:22:06 -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; 7 Aug 2012 06:22:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SydB6-0001rN-GR for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 06:22:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SydB5-0007bb-MS for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 06:22:04 +0000 Message-Id: Date: Tue, 07 Aug 2012 06:22:03 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] x86: fix context switch on debug hypervisor after 1183:5e3c342a325e X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Jan Beulich # Date 1344319632 -7200 # Node ID f628814a279a118f4b1b7c121ccc1b8be4d44f9d # Parent d5afea2ab44ff42e3a12e3952efa35a60ca2d1de x86: fix context switch on debug hypervisor after 1183:5e3c342a325e Looking at anything but the result field of a multicall structure after issuing the multicall is invalid - the debug hypervisor intentionally clobbers all other fields. On i386 also remove some left over, unused debugging code. Signed-off-by: Jan Beulich --- diff -r d5afea2ab44f -r f628814a279a arch/i386/kernel/process-xen.c --- a/arch/i386/kernel/process-xen.c Tue Jul 03 11:07:47 2012 +0200 +++ b/arch/i386/kernel/process-xen.c Tue Aug 07 08:07:12 2012 +0200 @@ -548,7 +548,7 @@ struct task_struct fastcall * __switch_t { struct thread_struct *prev = &prev_p->thread, *next = &next_p->thread; - int cpu = smp_processor_id(); + int cpu = smp_processor_id(), cr0_ts; #ifndef CONFIG_X86_NO_TSS struct tss_struct *tss = &per_cpu(init_tss, cpu); #endif @@ -575,9 +575,6 @@ struct task_struct fastcall * __switch_t mcl->args[0] = 1; mcl++; } -#if 0 /* lazy fpu sanity check */ - else BUG_ON(!(read_cr0() & 8)); -#endif /* * Reload esp0. @@ -639,11 +636,14 @@ struct task_struct fastcall * __switch_t BUG_ON(pdo > _pdo + ARRAY_SIZE(_pdo)); #endif BUG_ON(mcl > _mcl + ARRAY_SIZE(_mcl)); - if (_mcl->op == __HYPERVISOR_fpu_taskswitch) + if (_mcl->op == __HYPERVISOR_fpu_taskswitch) { __get_cpu_var(xen_x86_cr0_upd) = X86_CR0_TS; + cr0_ts = 1; + } else + cr0_ts = 0; if (unlikely(HYPERVISOR_multicall_check(_mcl, mcl - _mcl, NULL))) BUG(); - if (_mcl->op == __HYPERVISOR_fpu_taskswitch) { + if (cr0_ts) { __get_cpu_var(xen_x86_cr0) |= X86_CR0_TS; xen_clear_cr0_upd(); } diff -r d5afea2ab44f -r f628814a279a arch/x86_64/kernel/process-xen.c --- a/arch/x86_64/kernel/process-xen.c Tue Jul 03 11:07:47 2012 +0200 +++ b/arch/x86_64/kernel/process-xen.c Tue Aug 07 08:07:12 2012 +0200 @@ -486,7 +486,7 @@ __switch_to(struct task_struct *prev_p, { struct thread_struct *prev = &prev_p->thread, *next = &next_p->thread; - int cpu = smp_processor_id(); + int cpu = smp_processor_id(), cr0_ts; #ifndef CONFIG_X86_NO_TSS struct tss_struct *tss = &per_cpu(init_tss, cpu); #endif @@ -572,11 +572,14 @@ __switch_to(struct task_struct *prev_p, BUG_ON(pdo > _pdo + ARRAY_SIZE(_pdo)); #endif BUG_ON(mcl > _mcl + ARRAY_SIZE(_mcl)); - if (_mcl->op == __HYPERVISOR_fpu_taskswitch) + if (_mcl->op == __HYPERVISOR_fpu_taskswitch) { __get_cpu_var(xen_x86_cr0_upd) = X86_CR0_TS; + cr0_ts = 1; + } else + cr0_ts = 0; if (unlikely(HYPERVISOR_multicall_check(_mcl, mcl - _mcl, NULL))) BUG(); - if (_mcl->op == __HYPERVISOR_fpu_taskswitch) { + if (cr0_ts) { __get_cpu_var(xen_x86_cr0) |= X86_CR0_TS; xen_clear_cr0_upd(); } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 15:01:36 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 15:01:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SylHm-0003ew-Ir; Tue, 07 Aug 2012 15:01:30 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SylHl-0003en-B1 for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 15:01:29 +0000 Received: from [85.158.139.83:54406] by server-3.bemta-5.messagelabs.com id E7/8D-31899-8CD21205; Tue, 07 Aug 2012 15:01:28 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-11.tower-182.messagelabs.com!1344351686!23492080!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23508 invoked from network); 7 Aug 2012 15:01:27 -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; 7 Aug 2012 15:01:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SylHh-0008Ba-T4 for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 15:01:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SylHh-0003kY-HH for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 15:01:25 +0000 Message-Id: Date: Tue, 07 Aug 2012 15:01:24 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] nestedhvm: fix nested page fault build error on 32-bit X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1343987004 -3600 # Node ID f8f8912b3de00ba4451894c29419ca95e13af38e # Parent 5a65d6a1aab79b80e4b4cd7bf2621707e507a546 nestedhvm: fix nested page fault build error on 32-bit cc1: warnings being treated as errors hvm.c: In function ?hvm_hap_nested_page_fault?: hvm.c:1282: error: passing argument 2 of ?nestedhvm_hap_nested_page_fault? from incompatible pointer type /local/scratch/ianc/devel/xen-unstable.hg/xen/include/asm/hvm/nestedhvm.h:55: note: expected ?paddr_t *? but argument is of type ?long unsigned int *? hvm_hap_nested_page_fault takes an unsigned long gpa and passes &gpa to nestedhvm_hap_nested_page_fault which takes a paddr_t *. Since both of the callers of hvm_hap_nested_page_fault (svm_do_nested_pgfault and ept_handle_violation) actually have the gpa which they pass to hvm_hap_nested_page_fault as a paddr_t I think it makes sense to change the argument to hvm_hap_nested_page_fault. The other user of gpa in hvm_hap_nested_page_fault is a call to p2m_mem_access_check, which currently also takes a paddr_t gpa but I think a paddr_t is appropriate there too. Jan points out that this is also an issue for >4GB guests on the 32 bit hypervisor. Signed-off-by: Ian Campbell Acked-by: Jan Beulich Acked-by: Tim Deegan Committed-by: Ian Campbell xen-unstable changeset: 25724:612898732e66 xen-unstable date: Fri Aug 03 09:54:17 2012 +0100 Backported-by: Keir Fraser --- diff -r 5a65d6a1aab7 -r f8f8912b3de0 xen/arch/x86/hvm/hvm.c --- a/xen/arch/x86/hvm/hvm.c Fri Aug 03 10:39:13 2012 +0100 +++ b/xen/arch/x86/hvm/hvm.c Fri Aug 03 10:43:24 2012 +0100 @@ -1109,7 +1109,7 @@ void hvm_triple_fault(void) domain_shutdown(v->domain, SHUTDOWN_reboot); } -bool_t hvm_hap_nested_page_fault(unsigned long gpa, +bool_t hvm_hap_nested_page_fault(paddr_t gpa, bool_t gla_valid, unsigned long gla, bool_t access_valid, diff -r 5a65d6a1aab7 -r f8f8912b3de0 xen/arch/x86/mm/p2m.c --- a/xen/arch/x86/mm/p2m.c Fri Aug 03 10:39:13 2012 +0100 +++ b/xen/arch/x86/mm/p2m.c Fri Aug 03 10:43:24 2012 +0100 @@ -3032,7 +3032,7 @@ void p2m_mem_paging_resume(struct p2m_do mem_event_unpause_vcpus(d); } -void p2m_mem_access_check(unsigned long gpa, bool_t gla_valid, unsigned long gla, +void p2m_mem_access_check(paddr_t gpa, bool_t gla_valid, unsigned long gla, bool_t access_r, bool_t access_w, bool_t access_x) { struct vcpu *v = current; diff -r 5a65d6a1aab7 -r f8f8912b3de0 xen/include/asm-x86/hvm/hvm.h --- a/xen/include/asm-x86/hvm/hvm.h Fri Aug 03 10:39:13 2012 +0100 +++ b/xen/include/asm-x86/hvm/hvm.h Fri Aug 03 10:43:24 2012 +0100 @@ -368,7 +368,7 @@ static inline void hvm_set_info_guest(st int hvm_debug_op(struct vcpu *v, int32_t op); -bool_t hvm_hap_nested_page_fault(unsigned long gpa, +bool_t hvm_hap_nested_page_fault(paddr_t gpa, bool_t gla_valid, unsigned long gla, bool_t access_valid, bool_t access_r, diff -r 5a65d6a1aab7 -r f8f8912b3de0 xen/include/asm-x86/p2m.h --- a/xen/include/asm-x86/p2m.h Fri Aug 03 10:39:13 2012 +0100 +++ b/xen/include/asm-x86/p2m.h Fri Aug 03 10:43:24 2012 +0100 @@ -539,12 +539,12 @@ static inline void p2m_mem_paging_popula #ifdef __x86_64__ /* Send mem event based on the access (gla is -1ull if not available). Handles * the rw2rx conversion */ -void p2m_mem_access_check(unsigned long gpa, bool_t gla_valid, unsigned long gla, +void p2m_mem_access_check(paddr_t gpa, bool_t gla_valid, unsigned long gla, bool_t access_r, bool_t access_w, bool_t access_x); /* Resumes the running of the VCPU, restarting the last instruction */ void p2m_mem_access_resume(struct p2m_domain *p2m); #else -static inline void p2m_mem_access_check(unsigned long gpa, bool_t gla_valid, +static inline void p2m_mem_access_check(paddr_t gpa, bool_t gla_valid, unsigned long gla, bool_t access_r, bool_t access_w, bool_t access_x) { } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 15:01:36 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 15:01:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SylHm-0003ew-Ir; Tue, 07 Aug 2012 15:01:30 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SylHl-0003en-B1 for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 15:01:29 +0000 Received: from [85.158.139.83:54406] by server-3.bemta-5.messagelabs.com id E7/8D-31899-8CD21205; Tue, 07 Aug 2012 15:01:28 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-11.tower-182.messagelabs.com!1344351686!23492080!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23508 invoked from network); 7 Aug 2012 15:01:27 -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; 7 Aug 2012 15:01:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SylHh-0008Ba-T4 for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 15:01:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SylHh-0003kY-HH for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 15:01:25 +0000 Message-Id: Date: Tue, 07 Aug 2012 15:01:24 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] nestedhvm: fix nested page fault build error on 32-bit X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1343987004 -3600 # Node ID f8f8912b3de00ba4451894c29419ca95e13af38e # Parent 5a65d6a1aab79b80e4b4cd7bf2621707e507a546 nestedhvm: fix nested page fault build error on 32-bit cc1: warnings being treated as errors hvm.c: In function ?hvm_hap_nested_page_fault?: hvm.c:1282: error: passing argument 2 of ?nestedhvm_hap_nested_page_fault? from incompatible pointer type /local/scratch/ianc/devel/xen-unstable.hg/xen/include/asm/hvm/nestedhvm.h:55: note: expected ?paddr_t *? but argument is of type ?long unsigned int *? hvm_hap_nested_page_fault takes an unsigned long gpa and passes &gpa to nestedhvm_hap_nested_page_fault which takes a paddr_t *. Since both of the callers of hvm_hap_nested_page_fault (svm_do_nested_pgfault and ept_handle_violation) actually have the gpa which they pass to hvm_hap_nested_page_fault as a paddr_t I think it makes sense to change the argument to hvm_hap_nested_page_fault. The other user of gpa in hvm_hap_nested_page_fault is a call to p2m_mem_access_check, which currently also takes a paddr_t gpa but I think a paddr_t is appropriate there too. Jan points out that this is also an issue for >4GB guests on the 32 bit hypervisor. Signed-off-by: Ian Campbell Acked-by: Jan Beulich Acked-by: Tim Deegan Committed-by: Ian Campbell xen-unstable changeset: 25724:612898732e66 xen-unstable date: Fri Aug 03 09:54:17 2012 +0100 Backported-by: Keir Fraser --- diff -r 5a65d6a1aab7 -r f8f8912b3de0 xen/arch/x86/hvm/hvm.c --- a/xen/arch/x86/hvm/hvm.c Fri Aug 03 10:39:13 2012 +0100 +++ b/xen/arch/x86/hvm/hvm.c Fri Aug 03 10:43:24 2012 +0100 @@ -1109,7 +1109,7 @@ void hvm_triple_fault(void) domain_shutdown(v->domain, SHUTDOWN_reboot); } -bool_t hvm_hap_nested_page_fault(unsigned long gpa, +bool_t hvm_hap_nested_page_fault(paddr_t gpa, bool_t gla_valid, unsigned long gla, bool_t access_valid, diff -r 5a65d6a1aab7 -r f8f8912b3de0 xen/arch/x86/mm/p2m.c --- a/xen/arch/x86/mm/p2m.c Fri Aug 03 10:39:13 2012 +0100 +++ b/xen/arch/x86/mm/p2m.c Fri Aug 03 10:43:24 2012 +0100 @@ -3032,7 +3032,7 @@ void p2m_mem_paging_resume(struct p2m_do mem_event_unpause_vcpus(d); } -void p2m_mem_access_check(unsigned long gpa, bool_t gla_valid, unsigned long gla, +void p2m_mem_access_check(paddr_t gpa, bool_t gla_valid, unsigned long gla, bool_t access_r, bool_t access_w, bool_t access_x) { struct vcpu *v = current; diff -r 5a65d6a1aab7 -r f8f8912b3de0 xen/include/asm-x86/hvm/hvm.h --- a/xen/include/asm-x86/hvm/hvm.h Fri Aug 03 10:39:13 2012 +0100 +++ b/xen/include/asm-x86/hvm/hvm.h Fri Aug 03 10:43:24 2012 +0100 @@ -368,7 +368,7 @@ static inline void hvm_set_info_guest(st int hvm_debug_op(struct vcpu *v, int32_t op); -bool_t hvm_hap_nested_page_fault(unsigned long gpa, +bool_t hvm_hap_nested_page_fault(paddr_t gpa, bool_t gla_valid, unsigned long gla, bool_t access_valid, bool_t access_r, diff -r 5a65d6a1aab7 -r f8f8912b3de0 xen/include/asm-x86/p2m.h --- a/xen/include/asm-x86/p2m.h Fri Aug 03 10:39:13 2012 +0100 +++ b/xen/include/asm-x86/p2m.h Fri Aug 03 10:43:24 2012 +0100 @@ -539,12 +539,12 @@ static inline void p2m_mem_paging_popula #ifdef __x86_64__ /* Send mem event based on the access (gla is -1ull if not available). Handles * the rw2rx conversion */ -void p2m_mem_access_check(unsigned long gpa, bool_t gla_valid, unsigned long gla, +void p2m_mem_access_check(paddr_t gpa, bool_t gla_valid, unsigned long gla, bool_t access_r, bool_t access_w, bool_t access_x); /* Resumes the running of the VCPU, restarting the last instruction */ void p2m_mem_access_resume(struct p2m_domain *p2m); #else -static inline void p2m_mem_access_check(unsigned long gpa, bool_t gla_valid, +static inline void p2m_mem_access_check(paddr_t gpa, bool_t gla_valid, unsigned long gla, bool_t access_r, bool_t access_w, bool_t access_x) { } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 15:02:21 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 15:02: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 1SylIU-0003hj-N6; Tue, 07 Aug 2012 15:02:14 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SylIU-0003hI-2p for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 15:02:14 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-27.messagelabs.com!1344351685!4275518!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27250 invoked from network); 7 Aug 2012 15:01:27 -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; 7 Aug 2012 15:01:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SylHh-0008BX-Ak for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 15:01:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SylGe-0003hf-18 for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 15:00:26 +0000 Message-Id: Date: Tue, 07 Aug 2012 15:00:18 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] Intel VT-d: Dump IOMMU supported page sizes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Santosh Jodh # Date 1343986753 -3600 # Node ID 5a65d6a1aab79b80e4b4cd7bf2621707e507a546 # Parent fa34499e8f6c579d20d18b308c51fc8640b7e0b3 Intel VT-d: Dump IOMMU supported page sizes Signed-off-by: Santosh Jodh xen-unstable changeset: 25725:9ad379939b78 xen-unstable date: Fri Aug 03 10:38:04 2012 +0100 --- diff -r fa34499e8f6c -r 5a65d6a1aab7 xen/drivers/passthrough/vtd/iommu.c --- a/xen/drivers/passthrough/vtd/iommu.c Mon Jul 30 13:38:58 2012 +0100 +++ b/xen/drivers/passthrough/vtd/iommu.c Fri Aug 03 10:39:13 2012 +0100 @@ -2158,6 +2158,15 @@ int __init intel_vtd_setup(void) { iommu = drhd->iommu; + printk("Intel VT-d supported page sizes: 4kB"); + if (cap_sps_2mb(iommu->cap)) + printk(", 2MB"); + + if (cap_sps_1gb(iommu->cap)) + printk(", 1GB"); + + printk(".\n"); + if ( iommu_snoop && !ecap_snp_ctl(iommu->ecap) ) iommu_snoop = 0; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 15:02:21 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 15:02: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 1SylIU-0003hj-N6; Tue, 07 Aug 2012 15:02:14 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SylIU-0003hI-2p for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 15:02:14 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-27.messagelabs.com!1344351685!4275518!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27250 invoked from network); 7 Aug 2012 15:01:27 -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; 7 Aug 2012 15:01:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SylHh-0008BX-Ak for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 15:01:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SylGe-0003hf-18 for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 15:00:26 +0000 Message-Id: Date: Tue, 07 Aug 2012 15:00:18 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] Intel VT-d: Dump IOMMU supported page sizes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Santosh Jodh # Date 1343986753 -3600 # Node ID 5a65d6a1aab79b80e4b4cd7bf2621707e507a546 # Parent fa34499e8f6c579d20d18b308c51fc8640b7e0b3 Intel VT-d: Dump IOMMU supported page sizes Signed-off-by: Santosh Jodh xen-unstable changeset: 25725:9ad379939b78 xen-unstable date: Fri Aug 03 10:38:04 2012 +0100 --- diff -r fa34499e8f6c -r 5a65d6a1aab7 xen/drivers/passthrough/vtd/iommu.c --- a/xen/drivers/passthrough/vtd/iommu.c Mon Jul 30 13:38:58 2012 +0100 +++ b/xen/drivers/passthrough/vtd/iommu.c Fri Aug 03 10:39:13 2012 +0100 @@ -2158,6 +2158,15 @@ int __init intel_vtd_setup(void) { iommu = drhd->iommu; + printk("Intel VT-d supported page sizes: 4kB"); + if (cap_sps_2mb(iommu->cap)) + printk(", 2MB"); + + if (cap_sps_1gb(iommu->cap)) + printk(", 1GB"); + + printk(".\n"); + if ( iommu_snoop && !ecap_snp_ctl(iommu->ecap) ) iommu_snoop = 0; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 17:33:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 17:33:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Synea-00084z-Qn; Tue, 07 Aug 2012 17:33:12 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyneZ-00084S-NO for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 17:33:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1344360783!11986385!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5222 invoked from network); 7 Aug 2012 17:33:04 -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; 7 Aug 2012 17:33:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyneR-0001mm-GV for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 17:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SyneR-0007NM-5v for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 17:33:03 +0000 Date: Tue, 07 Aug 2012 17:33:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-unstable] mapcache: Fix invalidate if memory requested was not bucket aligned X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d94efd9aa814f17f3243dae91476dc42b5ad052e Author: Frediano Ziglio Date: Tue Aug 7 18:17:27 2012 +0100 mapcache: Fix invalidate if memory requested was not bucket aligned When memory is mapped in qemu_map_cache with lock != 0 a reverse mapping is created pointing to the virtual address of location requested. The cached mapped entry is saved in last_address_vaddr with the memory location of the base virtual address (without bucket offset). However when this entry is invalidated the virtual address saved in the reverse mapping is used. This cause that the mapping is freed but the last_address_vaddr is not reset. Signed-off-by: Frediano Ziglio Acked-by: Ian Jackson Committed-by: Ian Jackson --- hw/xen_machine_fv.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/xen_machine_fv.c b/hw/xen_machine_fv.c index fdad42a..b385d6a 100644 --- a/hw/xen_machine_fv.c +++ b/hw/xen_machine_fv.c @@ -181,9 +181,6 @@ void qemu_invalidate_entry(uint8_t *buffer) unsigned long paddr_index; int found = 0; - if (last_address_vaddr == buffer) - last_address_page = ~0UL; - TAILQ_FOREACH(reventry, &locked_entries, next) { if (reventry->vaddr_req == buffer) { paddr_index = reventry->paddr_index; @@ -201,6 +198,10 @@ void qemu_invalidate_entry(uint8_t *buffer) TAILQ_REMOVE(&locked_entries, reventry, next); qemu_free(reventry); + if (last_address_page >> (MCACHE_BUCKET_SHIFT - XC_PAGE_SHIFT) == paddr_index) { + last_address_page = ~0UL; + } + entry = &mapcache_entry[paddr_index % nr_buckets]; while (entry && entry->paddr_index != paddr_index) { pentry = entry; -- generated by git-patchbot for /home/xen/git/qemu-xen-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 17:33:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 17:33:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Synea-00084z-Qn; Tue, 07 Aug 2012 17:33:12 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyneZ-00084S-NO for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 17:33:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1344360783!11986385!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5222 invoked from network); 7 Aug 2012 17:33:04 -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; 7 Aug 2012 17:33:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyneR-0001mm-GV for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 17:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SyneR-0007NM-5v for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 17:33:03 +0000 Date: Tue, 07 Aug 2012 17:33:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-unstable] mapcache: Fix invalidate if memory requested was not bucket aligned X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d94efd9aa814f17f3243dae91476dc42b5ad052e Author: Frediano Ziglio Date: Tue Aug 7 18:17:27 2012 +0100 mapcache: Fix invalidate if memory requested was not bucket aligned When memory is mapped in qemu_map_cache with lock != 0 a reverse mapping is created pointing to the virtual address of location requested. The cached mapped entry is saved in last_address_vaddr with the memory location of the base virtual address (without bucket offset). However when this entry is invalidated the virtual address saved in the reverse mapping is used. This cause that the mapping is freed but the last_address_vaddr is not reset. Signed-off-by: Frediano Ziglio Acked-by: Ian Jackson Committed-by: Ian Jackson --- hw/xen_machine_fv.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/xen_machine_fv.c b/hw/xen_machine_fv.c index fdad42a..b385d6a 100644 --- a/hw/xen_machine_fv.c +++ b/hw/xen_machine_fv.c @@ -181,9 +181,6 @@ void qemu_invalidate_entry(uint8_t *buffer) unsigned long paddr_index; int found = 0; - if (last_address_vaddr == buffer) - last_address_page = ~0UL; - TAILQ_FOREACH(reventry, &locked_entries, next) { if (reventry->vaddr_req == buffer) { paddr_index = reventry->paddr_index; @@ -201,6 +198,10 @@ void qemu_invalidate_entry(uint8_t *buffer) TAILQ_REMOVE(&locked_entries, reventry, next); qemu_free(reventry); + if (last_address_page >> (MCACHE_BUCKET_SHIFT - XC_PAGE_SHIFT) == paddr_index) { + last_address_page = ~0UL; + } + entry = &mapcache_entry[paddr_index % nr_buckets]; while (entry && entry->paddr_index != paddr_index) { pentry = entry; -- generated by git-patchbot for /home/xen/git/qemu-xen-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 20:33:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 20:33: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 1SyqSq-0005RQ-B7; Tue, 07 Aug 2012 20:33:16 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSp-0005RB-2U for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:15 +0000 Received: from [85.158.143.35:5388] by server-3.bemta-4.messagelabs.com id 06/C5-01511-A8B71205; Tue, 07 Aug 2012 20:33:14 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-21.messagelabs.com!1344371592!13940765!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4539 invoked from network); 7 Aug 2012 20:33:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2012 20:33:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSm-00040m-0R for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SyqSl-0003H6-Rp for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:11 +0000 Message-Id: Date: Tue, 07 Aug 2012 20:33:11 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: prefix *.for-check with _ to mark it as a generated file. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1343984045 -3600 # Node ID a3cfa3666857ada79c3fad002a41e382568332b6 # Parent 1de861eb86540eae6fbd84fb903875573d8907ae libxl: prefix *.for-check with _ to mark it as a generated file. Keeps it out of my greps etc. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r 1de861eb8654 -r a3cfa3666857 .hgignore --- a/.hgignore Fri Aug 03 09:54:04 2012 +0100 +++ b/.hgignore Fri Aug 03 09:54:05 2012 +0100 @@ -187,7 +187,7 @@ ^tools/libxl/testidl\.c$ ^tools/libxl/tmp\..*$ ^tools/libxl/.*\.new$ -^tools/libxl/libxl\.api-for-check +^tools/libxl/_libxl\.api-for-check ^tools/libvchan/vchan-node[12]$ ^tools/libaio/src/.*\.ol$ ^tools/libaio/src/.*\.os$ diff -r 1de861eb8654 -r a3cfa3666857 tools/libxl/Makefile --- a/tools/libxl/Makefile Fri Aug 03 09:54:04 2012 +0100 +++ b/tools/libxl/Makefile Fri Aug 03 09:54:05 2012 +0100 @@ -114,10 +114,10 @@ all: $(CLIENTS) libxenlight.so libxenlig genpath-target = $(call buildmakevars2file,_paths.h.tmp) $(eval $(genpath-target)) -libxl.api-ok: check-libxl-api-rules libxl.api-for-check +libxl.api-ok: check-libxl-api-rules _libxl.api-for-check $(PERL) $^ -%.api-for-check: %.h +_%.api-for-check: %.h $(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_$*.o) -c -E $< $(APPEND_CFLAGS) \ -DLIBXL_EXTERNAL_CALLERS_ONLY=LIBXL_EXTERNAL_CALLERS_ONLY \ >$@.new @@ -210,7 +210,7 @@ install: all .PHONY: clean clean: $(RM) -f _*.h *.o *.so* *.a $(CLIENTS) $(DEPS) - $(RM) -f _*.c *.pyc _paths.*.tmp *.api-for-check + $(RM) -f _*.c *.pyc _paths.*.tmp _*.api-for-check $(RM) -f testidl.c.new testidl.c # $(RM) -f $(AUTOSRCS) $(AUTOINCS) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 20:33:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 20:33: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 1SyqSq-0005RQ-B7; Tue, 07 Aug 2012 20:33:16 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSp-0005RB-2U for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:15 +0000 Received: from [85.158.143.35:5388] by server-3.bemta-4.messagelabs.com id 06/C5-01511-A8B71205; Tue, 07 Aug 2012 20:33:14 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-21.messagelabs.com!1344371592!13940765!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4539 invoked from network); 7 Aug 2012 20:33:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2012 20:33:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSm-00040m-0R for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SyqSl-0003H6-Rp for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:11 +0000 Message-Id: Date: Tue, 07 Aug 2012 20:33:11 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: prefix *.for-check with _ to mark it as a generated file. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1343984045 -3600 # Node ID a3cfa3666857ada79c3fad002a41e382568332b6 # Parent 1de861eb86540eae6fbd84fb903875573d8907ae libxl: prefix *.for-check with _ to mark it as a generated file. Keeps it out of my greps etc. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r 1de861eb8654 -r a3cfa3666857 .hgignore --- a/.hgignore Fri Aug 03 09:54:04 2012 +0100 +++ b/.hgignore Fri Aug 03 09:54:05 2012 +0100 @@ -187,7 +187,7 @@ ^tools/libxl/testidl\.c$ ^tools/libxl/tmp\..*$ ^tools/libxl/.*\.new$ -^tools/libxl/libxl\.api-for-check +^tools/libxl/_libxl\.api-for-check ^tools/libvchan/vchan-node[12]$ ^tools/libaio/src/.*\.ol$ ^tools/libaio/src/.*\.os$ diff -r 1de861eb8654 -r a3cfa3666857 tools/libxl/Makefile --- a/tools/libxl/Makefile Fri Aug 03 09:54:04 2012 +0100 +++ b/tools/libxl/Makefile Fri Aug 03 09:54:05 2012 +0100 @@ -114,10 +114,10 @@ all: $(CLIENTS) libxenlight.so libxenlig genpath-target = $(call buildmakevars2file,_paths.h.tmp) $(eval $(genpath-target)) -libxl.api-ok: check-libxl-api-rules libxl.api-for-check +libxl.api-ok: check-libxl-api-rules _libxl.api-for-check $(PERL) $^ -%.api-for-check: %.h +_%.api-for-check: %.h $(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_$*.o) -c -E $< $(APPEND_CFLAGS) \ -DLIBXL_EXTERNAL_CALLERS_ONLY=LIBXL_EXTERNAL_CALLERS_ONLY \ >$@.new @@ -210,7 +210,7 @@ install: all .PHONY: clean clean: $(RM) -f _*.h *.o *.so* *.a $(CLIENTS) $(DEPS) - $(RM) -f _*.c *.pyc _paths.*.tmp *.api-for-check + $(RM) -f _*.c *.pyc _paths.*.tmp _*.api-for-check $(RM) -f testidl.c.new testidl.c # $(RM) -f $(AUTOSRCS) $(AUTOINCS) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 20:33:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 20:33: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 1SyqSr-0005Ru-Fe; Tue, 07 Aug 2012 20:33:17 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSq-0005Qw-HC for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:16 +0000 Received: from [85.158.143.99:37184] by server-2.bemta-4.messagelabs.com id 81/16-17938-C8B71205; Tue, 07 Aug 2012 20:33:16 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-216.messagelabs.com!1344371594!20959384!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22578 invoked from network); 7 Aug 2012 20:33:15 -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; 7 Aug 2012 20:33:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSo-00040y-5j for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SyqSn-0003I5-Ud for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:13 +0000 Message-Id: Date: Tue, 07 Aug 2012 20:33:13 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: react correctly to bootloader pty master POLLHUP X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1343984048 -3600 # Node ID ba32a6202e64a59d1ae9622e740d73faf54c77ba # Parent e661d09c5117fa271291a1780521344a345426e5 libxl: react correctly to bootloader pty master POLLHUP Receive POLLHUP on the bootloader master pty is not an error. Hopefully it means that the bootloader has exited and therefore the pty slave side has no process group any more. (At least NetBSD indicates POLLHUP on the master in this case.) So send the bootloader SIGTERM; if it has already exited then this has no effect (except that on some versions of NetBSD it erroneously returns ESRCH and we print a harmless warning) and we will then collect the bootloader's exit status and be satisfied. However, we remember that we have done this so that if we got POLLHUP for some other reason than that the bootloader exited we report something resembling a useful message. In order to implement this we need to provide a way for users of datacopier to handle POLLHUP rather than treating it as fatal. We rename bootloader_abort to bootloader_stop since it now no longer only applies to error situations. Signed-off-by: Roger Pau Monne Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r e661d09c5117 -r ba32a6202e64 tools/libxl/libxl_aoutils.c --- a/tools/libxl/libxl_aoutils.c Fri Aug 03 09:54:07 2012 +0100 +++ b/tools/libxl/libxl_aoutils.c Fri Aug 03 09:54:08 2012 +0100 @@ -97,11 +97,31 @@ void libxl__datacopier_prefixdata(libxl_ LIBXL_TAILQ_INSERT_TAIL(&dc->bufs, buf, entry); } +static int datacopier_pollhup_handled(libxl__egc *egc, + libxl__datacopier_state *dc, + short revents, int onwrite) +{ + STATE_AO_GC(dc->ao); + + if (dc->callback_pollhup && (revents & POLLHUP)) { + LOG(DEBUG, "received POLLHUP on %s during copy of %s", + onwrite ? dc->writewhat : dc->readwhat, + dc->copywhat); + libxl__datacopier_kill(dc); + dc->callback_pollhup(egc, dc, onwrite, -1); + return 1; + } + return 0; +} + static void datacopier_readable(libxl__egc *egc, libxl__ev_fd *ev, int fd, short events, short revents) { libxl__datacopier_state *dc = CONTAINER_OF(ev, *dc, toread); STATE_AO_GC(dc->ao); + if (datacopier_pollhup_handled(egc, dc, revents, 0)) + return; + if (revents & ~POLLIN) { LOG(ERROR, "unexpected poll event 0x%x (should be POLLIN)" " on %s during copy of %s", revents, dc->readwhat, dc->copywhat); @@ -163,6 +183,9 @@ static void datacopier_writable(libxl__e libxl__datacopier_state *dc = CONTAINER_OF(ev, *dc, towrite); STATE_AO_GC(dc->ao); + if (datacopier_pollhup_handled(egc, dc, revents, 1)) + return; + if (revents & ~POLLOUT) { LOG(ERROR, "unexpected poll event 0x%x (should be POLLOUT)" " on %s during copy of %s", revents, dc->writewhat, dc->copywhat); diff -r e661d09c5117 -r ba32a6202e64 tools/libxl/libxl_bootloader.c --- a/tools/libxl/libxl_bootloader.c Fri Aug 03 09:54:07 2012 +0100 +++ b/tools/libxl/libxl_bootloader.c Fri Aug 03 09:54:08 2012 +0100 @@ -215,6 +215,7 @@ void libxl__bootloader_init(libxl__bootl libxl__domaindeathcheck_init(&bl->deathcheck); bl->keystrokes.ao = bl->ao; libxl__datacopier_init(&bl->keystrokes); bl->display.ao = bl->ao; libxl__datacopier_init(&bl->display); + bl->got_pollhup = 0; } static void bootloader_cleanup(libxl__egc *egc, libxl__bootloader_state *bl) @@ -275,7 +276,7 @@ static void bootloader_local_detached_cb } /* might be called at any time, provided it's init'd */ -static void bootloader_abort(libxl__egc *egc, +static void bootloader_stop(libxl__egc *egc, libxl__bootloader_state *bl, int rc) { STATE_AO_GC(bl->ao); @@ -285,8 +286,8 @@ static void bootloader_abort(libxl__egc libxl__datacopier_kill(&bl->display); if (libxl__ev_child_inuse(&bl->child)) { r = kill(bl->child.pid, SIGTERM); - if (r) LOGE(WARN, "after failure, failed to kill bootloader [%lu]", - (unsigned long)bl->child.pid); + if (r) LOGE(WARN, "%sfailed to kill bootloader [%lu]", + rc ? "after failure, " : "", (unsigned long)bl->child.pid); } bl->rc = rc; } @@ -508,7 +509,10 @@ static void bootloader_gotptys(libxl__eg bl->keystrokes.maxsz = BOOTLOADER_BUF_OUT; bl->keystrokes.copywhat = GCSPRINTF("bootloader input for domain %"PRIu32, bl->domid); - bl->keystrokes.callback = bootloader_keystrokes_copyfail; + bl->keystrokes.callback = bootloader_keystrokes_copyfail; + bl->keystrokes.callback_pollhup = bootloader_keystrokes_copyfail; + /* pollhup gets called with errnoval==-1 which is not otherwise + * possible since errnos are nonnegative, so it's unambiguous */ rc = libxl__datacopier_start(&bl->keystrokes); if (rc) goto out; @@ -516,7 +520,8 @@ static void bootloader_gotptys(libxl__eg bl->display.maxsz = BOOTLOADER_BUF_IN; bl->display.copywhat = GCSPRINTF("bootloader output for domain %"PRIu32, bl->domid); - bl->display.callback = bootloader_display_copyfail; + bl->display.callback = bootloader_display_copyfail; + bl->display.callback_pollhup = bootloader_display_copyfail; rc = libxl__datacopier_start(&bl->display); if (rc) goto out; @@ -562,30 +567,42 @@ static void bootloader_gotptys(libxl__eg /* perhaps one of these will be called, but perhaps not */ static void bootloader_copyfail(libxl__egc *egc, const char *which, - libxl__bootloader_state *bl, int onwrite, int errnoval) + libxl__bootloader_state *bl, int ondisplay, int onwrite, int errnoval) { STATE_AO_GC(bl->ao); + int rc = ERROR_FAIL; + + if (errnoval==-1) { + /* POLLHUP */ + if (!!ondisplay != !!onwrite) { + rc = 0; + bl->got_pollhup = 1; + } else { + LOG(ERROR, "unexpected POLLHUP on %s", which); + } + } if (!onwrite && !errnoval) LOG(ERROR, "unexpected eof copying %s", which); - bootloader_abort(egc, bl, ERROR_FAIL); + + bootloader_stop(egc, bl, rc); } static void bootloader_keystrokes_copyfail(libxl__egc *egc, libxl__datacopier_state *dc, int onwrite, int errnoval) { libxl__bootloader_state *bl = CONTAINER_OF(dc, *bl, keystrokes); - bootloader_copyfail(egc, "bootloader input", bl, onwrite, errnoval); + bootloader_copyfail(egc, "bootloader input", bl, 0, onwrite, errnoval); } static void bootloader_display_copyfail(libxl__egc *egc, libxl__datacopier_state *dc, int onwrite, int errnoval) { libxl__bootloader_state *bl = CONTAINER_OF(dc, *bl, display); - bootloader_copyfail(egc, "bootloader output", bl, onwrite, errnoval); + bootloader_copyfail(egc, "bootloader output", bl, 1, onwrite, errnoval); } static void bootloader_domaindeath(libxl__egc *egc, libxl__domaindeathcheck *dc) { libxl__bootloader_state *bl = CONTAINER_OF(dc, *bl, deathcheck); - bootloader_abort(egc, bl, ERROR_FAIL); + bootloader_stop(egc, bl, ERROR_FAIL); } static void bootloader_finished(libxl__egc *egc, libxl__ev_child *child, @@ -599,6 +616,8 @@ static void bootloader_finished(libxl__e libxl__datacopier_kill(&bl->display); if (status) { + if (bl->got_pollhup && WIFSIGNALED(status) && WTERMSIG(status)==SIGTERM) + LOG(ERROR, "got POLLHUP, sent SIGTERM"); LOG(ERROR, "bootloader failed - consult logfile %s", bl->logfile); libxl_report_child_exitstatus(CTX, XTL_ERROR, "bootloader", pid, status); diff -r e661d09c5117 -r ba32a6202e64 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri Aug 03 09:54:07 2012 +0100 +++ b/tools/libxl/libxl_internal.h Fri Aug 03 09:54:08 2012 +0100 @@ -2076,7 +2076,9 @@ typedef struct libxl__datacopier_buf lib * errnoval==0 means we got eof and all data was written * errnoval!=0 means we had a read error, logged * onwrite==-1 means some other internal failure, errnoval not valid, logged - * in all cases copier is killed before calling this callback */ + * If we get POLLHUP, we call callback_pollhup(..., onwrite, -1); + * or if callback_pollhup==0 this is an internal failure, as above. + * In all cases copier is killed before calling this callback */ typedef void libxl__datacopier_callback(libxl__egc *egc, libxl__datacopier_state *dc, int onwrite, int errnoval); @@ -2095,6 +2097,7 @@ struct libxl__datacopier_state { const char *copywhat, *readwhat, *writewhat; /* for error msgs */ FILE *log; /* gets a copy of everything */ libxl__datacopier_callback *callback; + libxl__datacopier_callback *callback_pollhup; /* remaining fields are private to datacopier */ libxl__ev_fd toread, towrite; ssize_t used; @@ -2279,7 +2282,7 @@ struct libxl__bootloader_state { int nargs, argsspace; const char **args; libxl__datacopier_state keystrokes, display; - int rc; + int rc, got_pollhup; }; _hidden void libxl__bootloader_init(libxl__bootloader_state *bl); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 20:33:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 20:33: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 1SyqSr-0005Ru-Fe; Tue, 07 Aug 2012 20:33:17 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSq-0005Qw-HC for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:16 +0000 Received: from [85.158.143.99:37184] by server-2.bemta-4.messagelabs.com id 81/16-17938-C8B71205; Tue, 07 Aug 2012 20:33:16 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-216.messagelabs.com!1344371594!20959384!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22578 invoked from network); 7 Aug 2012 20:33:15 -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; 7 Aug 2012 20:33:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSo-00040y-5j for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SyqSn-0003I5-Ud for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:13 +0000 Message-Id: Date: Tue, 07 Aug 2012 20:33:13 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: react correctly to bootloader pty master POLLHUP X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1343984048 -3600 # Node ID ba32a6202e64a59d1ae9622e740d73faf54c77ba # Parent e661d09c5117fa271291a1780521344a345426e5 libxl: react correctly to bootloader pty master POLLHUP Receive POLLHUP on the bootloader master pty is not an error. Hopefully it means that the bootloader has exited and therefore the pty slave side has no process group any more. (At least NetBSD indicates POLLHUP on the master in this case.) So send the bootloader SIGTERM; if it has already exited then this has no effect (except that on some versions of NetBSD it erroneously returns ESRCH and we print a harmless warning) and we will then collect the bootloader's exit status and be satisfied. However, we remember that we have done this so that if we got POLLHUP for some other reason than that the bootloader exited we report something resembling a useful message. In order to implement this we need to provide a way for users of datacopier to handle POLLHUP rather than treating it as fatal. We rename bootloader_abort to bootloader_stop since it now no longer only applies to error situations. Signed-off-by: Roger Pau Monne Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r e661d09c5117 -r ba32a6202e64 tools/libxl/libxl_aoutils.c --- a/tools/libxl/libxl_aoutils.c Fri Aug 03 09:54:07 2012 +0100 +++ b/tools/libxl/libxl_aoutils.c Fri Aug 03 09:54:08 2012 +0100 @@ -97,11 +97,31 @@ void libxl__datacopier_prefixdata(libxl_ LIBXL_TAILQ_INSERT_TAIL(&dc->bufs, buf, entry); } +static int datacopier_pollhup_handled(libxl__egc *egc, + libxl__datacopier_state *dc, + short revents, int onwrite) +{ + STATE_AO_GC(dc->ao); + + if (dc->callback_pollhup && (revents & POLLHUP)) { + LOG(DEBUG, "received POLLHUP on %s during copy of %s", + onwrite ? dc->writewhat : dc->readwhat, + dc->copywhat); + libxl__datacopier_kill(dc); + dc->callback_pollhup(egc, dc, onwrite, -1); + return 1; + } + return 0; +} + static void datacopier_readable(libxl__egc *egc, libxl__ev_fd *ev, int fd, short events, short revents) { libxl__datacopier_state *dc = CONTAINER_OF(ev, *dc, toread); STATE_AO_GC(dc->ao); + if (datacopier_pollhup_handled(egc, dc, revents, 0)) + return; + if (revents & ~POLLIN) { LOG(ERROR, "unexpected poll event 0x%x (should be POLLIN)" " on %s during copy of %s", revents, dc->readwhat, dc->copywhat); @@ -163,6 +183,9 @@ static void datacopier_writable(libxl__e libxl__datacopier_state *dc = CONTAINER_OF(ev, *dc, towrite); STATE_AO_GC(dc->ao); + if (datacopier_pollhup_handled(egc, dc, revents, 1)) + return; + if (revents & ~POLLOUT) { LOG(ERROR, "unexpected poll event 0x%x (should be POLLOUT)" " on %s during copy of %s", revents, dc->writewhat, dc->copywhat); diff -r e661d09c5117 -r ba32a6202e64 tools/libxl/libxl_bootloader.c --- a/tools/libxl/libxl_bootloader.c Fri Aug 03 09:54:07 2012 +0100 +++ b/tools/libxl/libxl_bootloader.c Fri Aug 03 09:54:08 2012 +0100 @@ -215,6 +215,7 @@ void libxl__bootloader_init(libxl__bootl libxl__domaindeathcheck_init(&bl->deathcheck); bl->keystrokes.ao = bl->ao; libxl__datacopier_init(&bl->keystrokes); bl->display.ao = bl->ao; libxl__datacopier_init(&bl->display); + bl->got_pollhup = 0; } static void bootloader_cleanup(libxl__egc *egc, libxl__bootloader_state *bl) @@ -275,7 +276,7 @@ static void bootloader_local_detached_cb } /* might be called at any time, provided it's init'd */ -static void bootloader_abort(libxl__egc *egc, +static void bootloader_stop(libxl__egc *egc, libxl__bootloader_state *bl, int rc) { STATE_AO_GC(bl->ao); @@ -285,8 +286,8 @@ static void bootloader_abort(libxl__egc libxl__datacopier_kill(&bl->display); if (libxl__ev_child_inuse(&bl->child)) { r = kill(bl->child.pid, SIGTERM); - if (r) LOGE(WARN, "after failure, failed to kill bootloader [%lu]", - (unsigned long)bl->child.pid); + if (r) LOGE(WARN, "%sfailed to kill bootloader [%lu]", + rc ? "after failure, " : "", (unsigned long)bl->child.pid); } bl->rc = rc; } @@ -508,7 +509,10 @@ static void bootloader_gotptys(libxl__eg bl->keystrokes.maxsz = BOOTLOADER_BUF_OUT; bl->keystrokes.copywhat = GCSPRINTF("bootloader input for domain %"PRIu32, bl->domid); - bl->keystrokes.callback = bootloader_keystrokes_copyfail; + bl->keystrokes.callback = bootloader_keystrokes_copyfail; + bl->keystrokes.callback_pollhup = bootloader_keystrokes_copyfail; + /* pollhup gets called with errnoval==-1 which is not otherwise + * possible since errnos are nonnegative, so it's unambiguous */ rc = libxl__datacopier_start(&bl->keystrokes); if (rc) goto out; @@ -516,7 +520,8 @@ static void bootloader_gotptys(libxl__eg bl->display.maxsz = BOOTLOADER_BUF_IN; bl->display.copywhat = GCSPRINTF("bootloader output for domain %"PRIu32, bl->domid); - bl->display.callback = bootloader_display_copyfail; + bl->display.callback = bootloader_display_copyfail; + bl->display.callback_pollhup = bootloader_display_copyfail; rc = libxl__datacopier_start(&bl->display); if (rc) goto out; @@ -562,30 +567,42 @@ static void bootloader_gotptys(libxl__eg /* perhaps one of these will be called, but perhaps not */ static void bootloader_copyfail(libxl__egc *egc, const char *which, - libxl__bootloader_state *bl, int onwrite, int errnoval) + libxl__bootloader_state *bl, int ondisplay, int onwrite, int errnoval) { STATE_AO_GC(bl->ao); + int rc = ERROR_FAIL; + + if (errnoval==-1) { + /* POLLHUP */ + if (!!ondisplay != !!onwrite) { + rc = 0; + bl->got_pollhup = 1; + } else { + LOG(ERROR, "unexpected POLLHUP on %s", which); + } + } if (!onwrite && !errnoval) LOG(ERROR, "unexpected eof copying %s", which); - bootloader_abort(egc, bl, ERROR_FAIL); + + bootloader_stop(egc, bl, rc); } static void bootloader_keystrokes_copyfail(libxl__egc *egc, libxl__datacopier_state *dc, int onwrite, int errnoval) { libxl__bootloader_state *bl = CONTAINER_OF(dc, *bl, keystrokes); - bootloader_copyfail(egc, "bootloader input", bl, onwrite, errnoval); + bootloader_copyfail(egc, "bootloader input", bl, 0, onwrite, errnoval); } static void bootloader_display_copyfail(libxl__egc *egc, libxl__datacopier_state *dc, int onwrite, int errnoval) { libxl__bootloader_state *bl = CONTAINER_OF(dc, *bl, display); - bootloader_copyfail(egc, "bootloader output", bl, onwrite, errnoval); + bootloader_copyfail(egc, "bootloader output", bl, 1, onwrite, errnoval); } static void bootloader_domaindeath(libxl__egc *egc, libxl__domaindeathcheck *dc) { libxl__bootloader_state *bl = CONTAINER_OF(dc, *bl, deathcheck); - bootloader_abort(egc, bl, ERROR_FAIL); + bootloader_stop(egc, bl, ERROR_FAIL); } static void bootloader_finished(libxl__egc *egc, libxl__ev_child *child, @@ -599,6 +616,8 @@ static void bootloader_finished(libxl__e libxl__datacopier_kill(&bl->display); if (status) { + if (bl->got_pollhup && WIFSIGNALED(status) && WTERMSIG(status)==SIGTERM) + LOG(ERROR, "got POLLHUP, sent SIGTERM"); LOG(ERROR, "bootloader failed - consult logfile %s", bl->logfile); libxl_report_child_exitstatus(CTX, XTL_ERROR, "bootloader", pid, status); diff -r e661d09c5117 -r ba32a6202e64 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri Aug 03 09:54:07 2012 +0100 +++ b/tools/libxl/libxl_internal.h Fri Aug 03 09:54:08 2012 +0100 @@ -2076,7 +2076,9 @@ typedef struct libxl__datacopier_buf lib * errnoval==0 means we got eof and all data was written * errnoval!=0 means we had a read error, logged * onwrite==-1 means some other internal failure, errnoval not valid, logged - * in all cases copier is killed before calling this callback */ + * If we get POLLHUP, we call callback_pollhup(..., onwrite, -1); + * or if callback_pollhup==0 this is an internal failure, as above. + * In all cases copier is killed before calling this callback */ typedef void libxl__datacopier_callback(libxl__egc *egc, libxl__datacopier_state *dc, int onwrite, int errnoval); @@ -2095,6 +2097,7 @@ struct libxl__datacopier_state { const char *copywhat, *readwhat, *writewhat; /* for error msgs */ FILE *log; /* gets a copy of everything */ libxl__datacopier_callback *callback; + libxl__datacopier_callback *callback_pollhup; /* remaining fields are private to datacopier */ libxl__ev_fd toread, towrite; ssize_t used; @@ -2279,7 +2282,7 @@ struct libxl__bootloader_state { int nargs, argsspace; const char **args; libxl__datacopier_state keystrokes, display; - int rc; + int rc, got_pollhup; }; _hidden void libxl__bootloader_init(libxl__bootloader_state *bl); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 20:33:21 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 20:33: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 1SyqSs-0005SR-MR; Tue, 07 Aug 2012 20:33:18 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSr-0005Rk-HR for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:17 +0000 Received: from [85.158.143.99:39372] by server-1.bemta-4.messagelabs.com id 00/CB-24392-C8B71205; Tue, 07 Aug 2012 20:33:16 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-216.messagelabs.com!1344371595!30375980!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21883 invoked from network); 7 Aug 2012 20:33:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2012 20:33:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSp-000414-2p for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SyqSp-0003IZ-0y for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:15 +0000 Message-Id: Date: Tue, 07 Aug 2012 20:33:14 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: fix formatting of DEFINE_DEVICES_ADD X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1343984050 -3600 # Node ID 8897bc3d8a3029d6a6e6cba9dfcdc08f94016bd7 # Parent 7697fc6ff332b9d4be4b54a959352fe509573bfb libxl: fix formatting of DEFINE_DEVICES_ADD These lines were exactly 80 columns wide, which produces hideous wrap damage in an 80 column emacs. Reformat using emacs's C-c \, which puts the \ in column 72 (by default) where possible. Whitespace change only. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r 7697fc6ff332 -r 8897bc3d8a30 tools/libxl/libxl_device.c --- a/tools/libxl/libxl_device.c Fri Aug 03 09:54:09 2012 +0100 +++ b/tools/libxl/libxl_device.c Fri Aug 03 09:54:10 2012 +0100 @@ -483,19 +483,19 @@ void libxl__multidev_prepared(libxl__egc * libxl__add_nics */ -#define DEFINE_DEVICES_ADD(type) \ - void libxl__add_##type##s(libxl__egc *egc, libxl__ao *ao, uint32_t domid, \ - int start, libxl_domain_config *d_config, \ - libxl__ao_devices *aodevs) \ - { \ - AO_GC; \ - int i; \ - int end = start + d_config->num_##type##s; \ - for (i = start; i < end; i++) { \ - libxl__ao_device *aodev = libxl__multidev_prepare(aodevs); \ - libxl__device_##type##_add(egc, domid, &d_config->type##s[i-start],\ - aodev); \ - } \ +#define DEFINE_DEVICES_ADD(type) \ + void libxl__add_##type##s(libxl__egc *egc, libxl__ao *ao, uint32_t domid, \ + int start, libxl_domain_config *d_config, \ + libxl__ao_devices *aodevs) \ + { \ + AO_GC; \ + int i; \ + int end = start + d_config->num_##type##s; \ + for (i = start; i < end; i++) { \ + libxl__ao_device *aodev = libxl__multidev_prepare(aodevs); \ + libxl__device_##type##_add(egc, domid, &d_config->type##s[i-start], \ + aodev); \ + } \ } DEFINE_DEVICES_ADD(disk) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 20:33:21 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 20:33: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 1SyqSs-0005SR-MR; Tue, 07 Aug 2012 20:33:18 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSr-0005Rk-HR for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:17 +0000 Received: from [85.158.143.99:39372] by server-1.bemta-4.messagelabs.com id 00/CB-24392-C8B71205; Tue, 07 Aug 2012 20:33:16 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-216.messagelabs.com!1344371595!30375980!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21883 invoked from network); 7 Aug 2012 20:33:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2012 20:33:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSp-000414-2p for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SyqSp-0003IZ-0y for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:15 +0000 Message-Id: Date: Tue, 07 Aug 2012 20:33:14 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: fix formatting of DEFINE_DEVICES_ADD X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1343984050 -3600 # Node ID 8897bc3d8a3029d6a6e6cba9dfcdc08f94016bd7 # Parent 7697fc6ff332b9d4be4b54a959352fe509573bfb libxl: fix formatting of DEFINE_DEVICES_ADD These lines were exactly 80 columns wide, which produces hideous wrap damage in an 80 column emacs. Reformat using emacs's C-c \, which puts the \ in column 72 (by default) where possible. Whitespace change only. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r 7697fc6ff332 -r 8897bc3d8a30 tools/libxl/libxl_device.c --- a/tools/libxl/libxl_device.c Fri Aug 03 09:54:09 2012 +0100 +++ b/tools/libxl/libxl_device.c Fri Aug 03 09:54:10 2012 +0100 @@ -483,19 +483,19 @@ void libxl__multidev_prepared(libxl__egc * libxl__add_nics */ -#define DEFINE_DEVICES_ADD(type) \ - void libxl__add_##type##s(libxl__egc *egc, libxl__ao *ao, uint32_t domid, \ - int start, libxl_domain_config *d_config, \ - libxl__ao_devices *aodevs) \ - { \ - AO_GC; \ - int i; \ - int end = start + d_config->num_##type##s; \ - for (i = start; i < end; i++) { \ - libxl__ao_device *aodev = libxl__multidev_prepare(aodevs); \ - libxl__device_##type##_add(egc, domid, &d_config->type##s[i-start],\ - aodev); \ - } \ +#define DEFINE_DEVICES_ADD(type) \ + void libxl__add_##type##s(libxl__egc *egc, libxl__ao *ao, uint32_t domid, \ + int start, libxl_domain_config *d_config, \ + libxl__ao_devices *aodevs) \ + { \ + AO_GC; \ + int i; \ + int end = start + d_config->num_##type##s; \ + for (i = start; i < end; i++) { \ + libxl__ao_device *aodev = libxl__multidev_prepare(aodevs); \ + libxl__device_##type##_add(egc, domid, &d_config->type##s[i-start], \ + aodev); \ + } \ } DEFINE_DEVICES_ADD(disk) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 20:33:21 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 20:33: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 1SyqSp-0005RC-8A; Tue, 07 Aug 2012 20:33:15 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSo-0005R1-Ei for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:14 +0000 Received: from [85.158.138.51:58321] by server-8.bemta-3.messagelabs.com id 32/CE-25919-98B71205; Tue, 07 Aug 2012 20:33:13 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-174.messagelabs.com!1344371591!21375495!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8034 invoked from network); 7 Aug 2012 20:33:12 -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; 7 Aug 2012 20:33:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSl-00040j-CX for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SyqSl-0003Gp-BH for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:11 +0000 Message-Id: Date: Tue, 07 Aug 2012 20:33:10 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: fix gic_init_secondary_cpu. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1343984044 -3600 # Node ID 1de861eb86540eae6fbd84fb903875573d8907ae # Parent 65ae31da1c536b2551c6465d796642ba42e594a2 arm: fix gic_init_secondary_cpu. Using spin_lock_irq here is unnecessary (interrupts are not yet enabled) and wrong (since they will get unexpectedly renabled by spin_unlock_irq). We can just use spin_lock/spin_unlock. Signed-off-by: Ian Campbell Acked-by: Tim Deegan Committed-by: Ian Campbell --- diff -r 65ae31da1c53 -r 1de861eb8654 xen/arch/arm/gic.c --- a/xen/arch/arm/gic.c Fri Aug 03 09:54:03 2012 +0100 +++ b/xen/arch/arm/gic.c Fri Aug 03 09:54:04 2012 +0100 @@ -323,10 +323,10 @@ int __init gic_init(void) /* Set up the per-CPU parts of the GIC for a secondary CPU */ void __cpuinit gic_init_secondary_cpu(void) { - spin_lock_irq(&gic.lock); + spin_lock(&gic.lock); gic_cpu_init(); gic_hyp_init(); - spin_unlock_irq(&gic.lock); + spin_unlock(&gic.lock); } /* Shut down the per-CPU GIC interface */ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 20:33:21 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 20:33: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 1SyqSp-0005RC-8A; Tue, 07 Aug 2012 20:33:15 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSo-0005R1-Ei for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:14 +0000 Received: from [85.158.138.51:58321] by server-8.bemta-3.messagelabs.com id 32/CE-25919-98B71205; Tue, 07 Aug 2012 20:33:13 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-174.messagelabs.com!1344371591!21375495!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8034 invoked from network); 7 Aug 2012 20:33:12 -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; 7 Aug 2012 20:33:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSl-00040j-CX for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SyqSl-0003Gp-BH for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:11 +0000 Message-Id: Date: Tue, 07 Aug 2012 20:33:10 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: fix gic_init_secondary_cpu. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1343984044 -3600 # Node ID 1de861eb86540eae6fbd84fb903875573d8907ae # Parent 65ae31da1c536b2551c6465d796642ba42e594a2 arm: fix gic_init_secondary_cpu. Using spin_lock_irq here is unnecessary (interrupts are not yet enabled) and wrong (since they will get unexpectedly renabled by spin_unlock_irq). We can just use spin_lock/spin_unlock. Signed-off-by: Ian Campbell Acked-by: Tim Deegan Committed-by: Ian Campbell --- diff -r 65ae31da1c53 -r 1de861eb8654 xen/arch/arm/gic.c --- a/xen/arch/arm/gic.c Fri Aug 03 09:54:03 2012 +0100 +++ b/xen/arch/arm/gic.c Fri Aug 03 09:54:04 2012 +0100 @@ -323,10 +323,10 @@ int __init gic_init(void) /* Set up the per-CPU parts of the GIC for a secondary CPU */ void __cpuinit gic_init_secondary_cpu(void) { - spin_lock_irq(&gic.lock); + spin_lock(&gic.lock); gic_cpu_init(); gic_hyp_init(); - spin_unlock_irq(&gic.lock); + spin_unlock(&gic.lock); } /* Shut down the per-CPU GIC interface */ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 20:33:21 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 20:33: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 1SyqSo-0005R2-5c; Tue, 07 Aug 2012 20:33:14 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSn-0005Qw-6P for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:13 +0000 Received: from [85.158.143.99:39201] by server-2.bemta-4.messagelabs.com id B6/06-17938-88B71205; Tue, 07 Aug 2012 20:33:12 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-216.messagelabs.com!1344371590!30375971!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21666 invoked from network); 7 Aug 2012 20:33:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2012 20:33:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSk-00040d-Jr for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SyqSk-0003GL-3e for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:10 +0000 Message-Id: Date: Tue, 07 Aug 2012 20:33:09 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] cpufreq: P state stats aren't available if there is no cpufreq driver X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User David Vrabel # Date 1343980228 -7200 # Node ID 7fd5facb608427b7e5890ff10cee8ed0da6a7703 # Parent 983ea7521badb3e05d3379044fb283732ef558d6 cpufreq: P state stats aren't available if there is no cpufreq driver If there is no cpufreq driver (e.g., with an AMD Opteron 8212) then reading the P state statistics causes a deadlock as an uninitialized spinlock is locked in do_get_pm_info(). The spinlock is initialized in cpufreq_statistic_init() which is not called if cpufreq_driver == NULL. Signed-off-by: David Vrabel Committed-by: Jan Beulich --- diff -r 983ea7521bad -r 7fd5facb6084 xen/drivers/acpi/pmstat.c --- a/xen/drivers/acpi/pmstat.c Thu Aug 02 14:44:53 2012 +0100 +++ b/xen/drivers/acpi/pmstat.c Fri Aug 03 09:50:28 2012 +0200 @@ -66,6 +66,8 @@ int do_get_pm_info(struct xen_sysctl_get case PMSTAT_PX: if ( !(xen_processor_pmbits & XEN_PROCESSOR_PM_PX) ) return -ENODEV; + if ( !cpufreq_driver ) + return -ENODEV; if ( !pmpt || !(pmpt->perf.init & XEN_PX_INIT) ) return -EINVAL; break; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 20:33:21 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 20:33: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 1SyqSo-0005R2-5c; Tue, 07 Aug 2012 20:33:14 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSn-0005Qw-6P for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:13 +0000 Received: from [85.158.143.99:39201] by server-2.bemta-4.messagelabs.com id B6/06-17938-88B71205; Tue, 07 Aug 2012 20:33:12 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-216.messagelabs.com!1344371590!30375971!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21666 invoked from network); 7 Aug 2012 20:33:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2012 20:33:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSk-00040d-Jr for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SyqSk-0003GL-3e for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:10 +0000 Message-Id: Date: Tue, 07 Aug 2012 20:33:09 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] cpufreq: P state stats aren't available if there is no cpufreq driver X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User David Vrabel # Date 1343980228 -7200 # Node ID 7fd5facb608427b7e5890ff10cee8ed0da6a7703 # Parent 983ea7521badb3e05d3379044fb283732ef558d6 cpufreq: P state stats aren't available if there is no cpufreq driver If there is no cpufreq driver (e.g., with an AMD Opteron 8212) then reading the P state statistics causes a deadlock as an uninitialized spinlock is locked in do_get_pm_info(). The spinlock is initialized in cpufreq_statistic_init() which is not called if cpufreq_driver == NULL. Signed-off-by: David Vrabel Committed-by: Jan Beulich --- diff -r 983ea7521bad -r 7fd5facb6084 xen/drivers/acpi/pmstat.c --- a/xen/drivers/acpi/pmstat.c Thu Aug 02 14:44:53 2012 +0100 +++ b/xen/drivers/acpi/pmstat.c Fri Aug 03 09:50:28 2012 +0200 @@ -66,6 +66,8 @@ int do_get_pm_info(struct xen_sysctl_get case PMSTAT_PX: if ( !(xen_processor_pmbits & XEN_PROCESSOR_PM_PX) ) return -ENODEV; + if ( !cpufreq_driver ) + return -ENODEV; if ( !pmpt || !(pmpt->perf.init & XEN_PX_INIT) ) return -EINVAL; break; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 20:33:21 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 20:33: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 1SyqSr-0005Rp-DP; Tue, 07 Aug 2012 20:33:17 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSq-0005RP-EX for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:16 +0000 Received: from [85.158.139.83:59395] by server-6.bemta-5.messagelabs.com id 52/88-27759-B8B71205; Tue, 07 Aug 2012 20:33:15 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-182.messagelabs.com!1344371593!26010736!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32735 invoked from network); 7 Aug 2012 20:33:14 -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; 7 Aug 2012 20:33:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSn-00040v-Ed for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SyqSn-0003Hq-DE for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:13 +0000 Message-Id: Date: Tue, 07 Aug 2012 20:33:12 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: unify libxl__device_destroy and device_hotplug_done X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1343984047 -3600 # Node ID e661d09c5117fa271291a1780521344a345426e5 # Parent d153e1abe5b665b88737fed35ca46be6555a27e0 libxl: unify libxl__device_destroy and device_hotplug_done device_hotplug_done contains an open-coded but improved version of libxl__device_destroy. So move the contents of device_hotplug_done into libxl__device_destroy, deleting the old code, and replace it at its old location with a function call. Add the missing call to libxl__xs_transaction_abort (which was present in neither version and technically speaking is always a no-op with this code as it stands at the moment because no-one does "goto out" other than after libxl__xs_transaction_start or _commit). Also fix the error handling: the rc from the destroy should be propagated into the aodev. Reported-by: Ian Campbell Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r d153e1abe5b6 -r e661d09c5117 tools/libxl/libxl_device.c --- a/tools/libxl/libxl_device.c Fri Aug 03 09:54:07 2012 +0100 +++ b/tools/libxl/libxl_device.c Fri Aug 03 09:54:07 2012 +0100 @@ -513,22 +513,24 @@ int libxl__device_destroy(libxl__gc *gc, char *be_path = libxl__device_backend_path(gc, dev); char *fe_path = libxl__device_frontend_path(gc, dev); xs_transaction_t t = 0; - int rc = 0; + int rc; - do { - t = xs_transaction_start(CTX->xsh); + for (;;) { + rc = libxl__xs_transaction_start(gc, &t); + if (rc) goto out; + libxl__xs_path_cleanup(gc, t, fe_path); libxl__xs_path_cleanup(gc, t, be_path); - rc = !xs_transaction_end(CTX->xsh, t, 0); - } while (rc && errno == EAGAIN); - if (rc) { - LOGE(ERROR, "unable to finish transaction"); - goto out; + + rc = libxl__xs_transaction_commit(gc, &t); + if (!rc) break; + if (rc < 0) goto out; } libxl__device_destroy_tapdisk(gc, be_path); out: + libxl__xs_transaction_abort(gc, &t); return rc; } @@ -993,29 +995,17 @@ error: static void device_hotplug_done(libxl__egc *egc, libxl__ao_device *aodev) { STATE_AO_GC(aodev->ao); - char *be_path = libxl__device_backend_path(gc, aodev->dev); - char *fe_path = libxl__device_frontend_path(gc, aodev->dev); - xs_transaction_t t = 0; int rc; device_hotplug_clean(gc, aodev); /* Clean xenstore if it's a disconnection */ if (aodev->action == DEVICE_DISCONNECT) { - for (;;) { - rc = libxl__xs_transaction_start(gc, &t); - if (rc) goto out; - - libxl__xs_path_cleanup(gc, t, fe_path); - libxl__xs_path_cleanup(gc, t, be_path); - - rc = libxl__xs_transaction_commit(gc, &t); - if (!rc) break; - if (rc < 0) goto out; - } + rc = libxl__device_destroy(gc, aodev->dev); + if (!aodev->rc) + aodev->rc = rc; } -out: aodev->callback(egc, aodev); return; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 20:33:21 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 20:33: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 1SyqSr-0005Rp-DP; Tue, 07 Aug 2012 20:33:17 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSq-0005RP-EX for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:16 +0000 Received: from [85.158.139.83:59395] by server-6.bemta-5.messagelabs.com id 52/88-27759-B8B71205; Tue, 07 Aug 2012 20:33:15 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-182.messagelabs.com!1344371593!26010736!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32735 invoked from network); 7 Aug 2012 20:33:14 -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; 7 Aug 2012 20:33:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSn-00040v-Ed for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SyqSn-0003Hq-DE for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:13 +0000 Message-Id: Date: Tue, 07 Aug 2012 20:33:12 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: unify libxl__device_destroy and device_hotplug_done X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1343984047 -3600 # Node ID e661d09c5117fa271291a1780521344a345426e5 # Parent d153e1abe5b665b88737fed35ca46be6555a27e0 libxl: unify libxl__device_destroy and device_hotplug_done device_hotplug_done contains an open-coded but improved version of libxl__device_destroy. So move the contents of device_hotplug_done into libxl__device_destroy, deleting the old code, and replace it at its old location with a function call. Add the missing call to libxl__xs_transaction_abort (which was present in neither version and technically speaking is always a no-op with this code as it stands at the moment because no-one does "goto out" other than after libxl__xs_transaction_start or _commit). Also fix the error handling: the rc from the destroy should be propagated into the aodev. Reported-by: Ian Campbell Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r d153e1abe5b6 -r e661d09c5117 tools/libxl/libxl_device.c --- a/tools/libxl/libxl_device.c Fri Aug 03 09:54:07 2012 +0100 +++ b/tools/libxl/libxl_device.c Fri Aug 03 09:54:07 2012 +0100 @@ -513,22 +513,24 @@ int libxl__device_destroy(libxl__gc *gc, char *be_path = libxl__device_backend_path(gc, dev); char *fe_path = libxl__device_frontend_path(gc, dev); xs_transaction_t t = 0; - int rc = 0; + int rc; - do { - t = xs_transaction_start(CTX->xsh); + for (;;) { + rc = libxl__xs_transaction_start(gc, &t); + if (rc) goto out; + libxl__xs_path_cleanup(gc, t, fe_path); libxl__xs_path_cleanup(gc, t, be_path); - rc = !xs_transaction_end(CTX->xsh, t, 0); - } while (rc && errno == EAGAIN); - if (rc) { - LOGE(ERROR, "unable to finish transaction"); - goto out; + + rc = libxl__xs_transaction_commit(gc, &t); + if (!rc) break; + if (rc < 0) goto out; } libxl__device_destroy_tapdisk(gc, be_path); out: + libxl__xs_transaction_abort(gc, &t); return rc; } @@ -993,29 +995,17 @@ error: static void device_hotplug_done(libxl__egc *egc, libxl__ao_device *aodev) { STATE_AO_GC(aodev->ao); - char *be_path = libxl__device_backend_path(gc, aodev->dev); - char *fe_path = libxl__device_frontend_path(gc, aodev->dev); - xs_transaction_t t = 0; int rc; device_hotplug_clean(gc, aodev); /* Clean xenstore if it's a disconnection */ if (aodev->action == DEVICE_DISCONNECT) { - for (;;) { - rc = libxl__xs_transaction_start(gc, &t); - if (rc) goto out; - - libxl__xs_path_cleanup(gc, t, fe_path); - libxl__xs_path_cleanup(gc, t, be_path); - - rc = libxl__xs_transaction_commit(gc, &t); - if (!rc) break; - if (rc < 0) goto out; - } + rc = libxl__device_destroy(gc, aodev->dev); + if (!aodev->rc) + aodev->rc = rc; } -out: aodev->callback(egc, aodev); return; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 20:33:21 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 20:33: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 1SyqSs-0005SL-KB; Tue, 07 Aug 2012 20:33:18 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSr-0005RB-3T for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:17 +0000 Received: from [85.158.143.35:5451] by server-3.bemta-4.messagelabs.com id 7D/C5-01511-C8B71205; Tue, 07 Aug 2012 20:33:16 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-21.messagelabs.com!1344371594!19145420!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27862 invoked from network); 7 Aug 2012 20:33:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2012 20:33:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSm-00040s-UB for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SyqSm-0003Ha-Sq for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:12 +0000 Message-Id: Date: Tue, 07 Aug 2012 20:33:12 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] tools/vtpm: fix tpm_version.h error during parallel build X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Olaf Hering # Date 1343984047 -3600 # Node ID d153e1abe5b665b88737fed35ca46be6555a27e0 # Parent 428014e272914d21cb2fc63a651a556543242a7d tools/vtpm: fix tpm_version.h error during parallel build Generating the tpm_version.h is not make -j safe: In file included from ../tpm/tpm_emulator.h:25:0, from ../tpm/tpm_startup.c:18: ../tpm/tpm_version.h:1:0: error: unterminated #ifndef make[5]: *** [tpm_startup.o] Error 1 This happens because make can not know that 'all-recursive' depends on 'version'. Fix this by calling the individual make targets. Doing it this way avoids adding yet another patch to the downloaded source. Signed-off-by: Olaf Hering Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r 428014e27291 -r d153e1abe5b6 tools/vtpm/Makefile --- a/tools/vtpm/Makefile Fri Aug 03 09:54:06 2012 +0100 +++ b/tools/vtpm/Makefile Fri Aug 03 09:54:07 2012 +0100 @@ -23,7 +23,7 @@ build: build_sub .PHONY: install install: build - $(MAKE) -C $(VTPM_DIR) $@ + $(MAKE) -C $(VTPM_DIR) install-recursive .PHONY: clean clean: @@ -66,7 +66,8 @@ updatepatches: clean orig .PHONY: build_sub build_sub: $(VTPM_DIR)/tpmd/tpmd set -e; if [ -e $(GMP_HEADER) ]; then \ - $(MAKE) -C $(VTPM_DIR); \ + $(MAKE) -C $(VTPM_DIR) version; \ + $(MAKE) -C $(VTPM_DIR) all-recursive; \ else \ echo "=== Unable to build VTPMs. libgmp could not be found."; \ fi _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 20:33:21 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 20:33: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 1SyqSs-0005SL-KB; Tue, 07 Aug 2012 20:33:18 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSr-0005RB-3T for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:17 +0000 Received: from [85.158.143.35:5451] by server-3.bemta-4.messagelabs.com id 7D/C5-01511-C8B71205; Tue, 07 Aug 2012 20:33:16 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-21.messagelabs.com!1344371594!19145420!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27862 invoked from network); 7 Aug 2012 20:33:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2012 20:33:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSm-00040s-UB for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SyqSm-0003Ha-Sq for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:12 +0000 Message-Id: Date: Tue, 07 Aug 2012 20:33:12 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] tools/vtpm: fix tpm_version.h error during parallel build X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Olaf Hering # Date 1343984047 -3600 # Node ID d153e1abe5b665b88737fed35ca46be6555a27e0 # Parent 428014e272914d21cb2fc63a651a556543242a7d tools/vtpm: fix tpm_version.h error during parallel build Generating the tpm_version.h is not make -j safe: In file included from ../tpm/tpm_emulator.h:25:0, from ../tpm/tpm_startup.c:18: ../tpm/tpm_version.h:1:0: error: unterminated #ifndef make[5]: *** [tpm_startup.o] Error 1 This happens because make can not know that 'all-recursive' depends on 'version'. Fix this by calling the individual make targets. Doing it this way avoids adding yet another patch to the downloaded source. Signed-off-by: Olaf Hering Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r 428014e27291 -r d153e1abe5b6 tools/vtpm/Makefile --- a/tools/vtpm/Makefile Fri Aug 03 09:54:06 2012 +0100 +++ b/tools/vtpm/Makefile Fri Aug 03 09:54:07 2012 +0100 @@ -23,7 +23,7 @@ build: build_sub .PHONY: install install: build - $(MAKE) -C $(VTPM_DIR) $@ + $(MAKE) -C $(VTPM_DIR) install-recursive .PHONY: clean clean: @@ -66,7 +66,8 @@ updatepatches: clean orig .PHONY: build_sub build_sub: $(VTPM_DIR)/tpmd/tpmd set -e; if [ -e $(GMP_HEADER) ]; then \ - $(MAKE) -C $(VTPM_DIR); \ + $(MAKE) -C $(VTPM_DIR) version; \ + $(MAKE) -C $(VTPM_DIR) all-recursive; \ else \ echo "=== Unable to build VTPMs. libgmp could not be found."; \ fi _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 20:33:22 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 20:33: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 1SyqSu-0005T9-Ox; Tue, 07 Aug 2012 20:33:20 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSt-0005Qw-RT for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:19 +0000 Received: from [85.158.143.35:33971] by server-2.bemta-4.messagelabs.com id B9/16-17938-F8B71205; Tue, 07 Aug 2012 20:33:19 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-21.messagelabs.com!1344371597!16620142!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11428 invoked from network); 7 Aug 2012 20:33:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2012 20:33:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSr-00041J-OL for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SyqSr-0003Jn-N6 for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:17 +0000 Message-Id: Date: Tue, 07 Aug 2012 20:33:17 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: remove an unused numainfo parameter X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1343984054 -3600 # Node ID aa93fe2d5a60770c697a44fc9635918417b1f5b5 # Parent 646a1deabd189fca948385fc0c0c1d28a7c63664 libxl: remove an unused numainfo parameter Signed-off-by: Ian Jackson Acked-by: Ian Campbell Acked-by: Dario Faggioli Committed-by: Ian Campbell --- diff -r 646a1deabd18 -r aa93fe2d5a60 tools/libxl/libxl_numa.c --- a/tools/libxl/libxl_numa.c Fri Aug 03 09:54:13 2012 +0100 +++ b/tools/libxl/libxl_numa.c Fri Aug 03 09:54:14 2012 +0100 @@ -231,7 +231,7 @@ static int nodemap_to_nr_vcpus(libxl__gc * candidates with just one node). */ static int count_cpus_per_node(libxl_cputopology *tinfo, int nr_cpus, - libxl_numainfo *ninfo, int nr_nodes) + int nr_nodes) { int cpus_per_node = 0; int j, i; @@ -340,7 +340,7 @@ int libxl__get_numa_candidate(libxl__gc if (!min_nodes) { int cpus_per_node; - cpus_per_node = count_cpus_per_node(tinfo, nr_cpus, ninfo, nr_nodes); + cpus_per_node = count_cpus_per_node(tinfo, nr_cpus, nr_nodes); if (cpus_per_node == 0) min_nodes = 1; else _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 20:33:22 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 20:33: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 1SyqSu-0005T9-Ox; Tue, 07 Aug 2012 20:33:20 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSt-0005Qw-RT for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:19 +0000 Received: from [85.158.143.35:33971] by server-2.bemta-4.messagelabs.com id B9/16-17938-F8B71205; Tue, 07 Aug 2012 20:33:19 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-21.messagelabs.com!1344371597!16620142!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11428 invoked from network); 7 Aug 2012 20:33:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2012 20:33:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSr-00041J-OL for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SyqSr-0003Jn-N6 for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:17 +0000 Message-Id: Date: Tue, 07 Aug 2012 20:33:17 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: remove an unused numainfo parameter X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1343984054 -3600 # Node ID aa93fe2d5a60770c697a44fc9635918417b1f5b5 # Parent 646a1deabd189fca948385fc0c0c1d28a7c63664 libxl: remove an unused numainfo parameter Signed-off-by: Ian Jackson Acked-by: Ian Campbell Acked-by: Dario Faggioli Committed-by: Ian Campbell --- diff -r 646a1deabd18 -r aa93fe2d5a60 tools/libxl/libxl_numa.c --- a/tools/libxl/libxl_numa.c Fri Aug 03 09:54:13 2012 +0100 +++ b/tools/libxl/libxl_numa.c Fri Aug 03 09:54:14 2012 +0100 @@ -231,7 +231,7 @@ static int nodemap_to_nr_vcpus(libxl__gc * candidates with just one node). */ static int count_cpus_per_node(libxl_cputopology *tinfo, int nr_cpus, - libxl_numainfo *ninfo, int nr_nodes) + int nr_nodes) { int cpus_per_node = 0; int j, i; @@ -340,7 +340,7 @@ int libxl__get_numa_candidate(libxl__gc if (!min_nodes) { int cpus_per_node; - cpus_per_node = count_cpus_per_node(tinfo, nr_cpus, ninfo, nr_nodes); + cpus_per_node = count_cpus_per_node(tinfo, nr_cpus, nr_nodes); if (cpus_per_node == 0) min_nodes = 1; else _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 20:33:23 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 20:33: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 1SyqSv-0005V8-W7; Tue, 07 Aug 2012 20:33:21 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSu-0005Rk-F1 for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:20 +0000 Received: from [85.158.143.99:37320] by server-1.bemta-4.messagelabs.com id 26/CB-24392-09B71205; Tue, 07 Aug 2012 20:33:20 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-216.messagelabs.com!1344371596!20959391!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22643 invoked from network); 7 Aug 2012 20:33:17 -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; 7 Aug 2012 20:33:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSq-00041A-6Q for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SyqSq-0003J4-59 for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:16 +0000 Message-Id: Date: Tue, 07 Aug 2012 20:33:15 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: rename aodevs to multidev X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1343984051 -3600 # Node ID a1b583ffbcb0503ad3907253c41986bd65f56ac7 # Parent ee32ae1631266f0f6cce3d8c95ba15a68ec258a4 libxl: rename aodevs to multidev To be consistent with the new function naming, rename libxl__ao_devices to libxl__multidev and all variables aodevs to multidev. No functional change. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r ee32ae163126 -r a1b583ffbcb0 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Fri Aug 03 09:54:11 2012 +0100 +++ b/tools/libxl/libxl_create.c Fri Aug 03 09:54:11 2012 +0100 @@ -599,10 +599,10 @@ static void domcreate_bootloader_done(li libxl__bootloader_state *bl, int rc); -static void domcreate_launch_dm(libxl__egc *egc, libxl__ao_devices *aodevs, +static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *aodevs, int ret); -static void domcreate_attach_pci(libxl__egc *egc, libxl__ao_devices *aodevs, +static void domcreate_attach_pci(libxl__egc *egc, libxl__multidev *aodevs, int ret); static void domcreate_console_available(libxl__egc *egc, @@ -909,10 +909,10 @@ static void domcreate_rebuild_done(libxl store_libxl_entry(gc, domid, &d_config->b_info); - libxl__multidev_begin(ao, &dcs->aodevs); - dcs->aodevs.callback = domcreate_launch_dm; - libxl__add_disks(egc, ao, domid, d_config, &dcs->aodevs); - libxl__multidev_prepared(egc, &dcs->aodevs, 0); + libxl__multidev_begin(ao, &dcs->multidev); + dcs->multidev.callback = domcreate_launch_dm; + libxl__add_disks(egc, ao, domid, d_config, &dcs->multidev); + libxl__multidev_prepared(egc, &dcs->multidev, 0); return; @@ -921,10 +921,10 @@ static void domcreate_rebuild_done(libxl domcreate_complete(egc, dcs, ret); } -static void domcreate_launch_dm(libxl__egc *egc, libxl__ao_devices *aodevs, +static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev, int ret) { - libxl__domain_create_state *dcs = CONTAINER_OF(aodevs, *dcs, aodevs); + libxl__domain_create_state *dcs = CONTAINER_OF(multidev, *dcs, multidev); STATE_AO_GC(dcs->ao); int i; @@ -1039,14 +1039,14 @@ static void domcreate_devmodel_started(l /* Plug nic interfaces */ if (d_config->num_nics > 0) { /* Attach nics */ - libxl__multidev_begin(ao, &dcs->aodevs); - dcs->aodevs.callback = domcreate_attach_pci; - libxl__add_nics(egc, ao, domid, d_config, &dcs->aodevs); - libxl__multidev_prepared(egc, &dcs->aodevs, 0); + libxl__multidev_begin(ao, &dcs->multidev); + dcs->multidev.callback = domcreate_attach_pci; + libxl__add_nics(egc, ao, domid, d_config, &dcs->multidev); + libxl__multidev_prepared(egc, &dcs->multidev, 0); return; } - domcreate_attach_pci(egc, &dcs->aodevs, 0); + domcreate_attach_pci(egc, &dcs->multidev, 0); return; error_out: @@ -1054,10 +1054,10 @@ error_out: domcreate_complete(egc, dcs, ret); } -static void domcreate_attach_pci(libxl__egc *egc, libxl__ao_devices *aodevs, +static void domcreate_attach_pci(libxl__egc *egc, libxl__multidev *multidev, int ret) { - libxl__domain_create_state *dcs = CONTAINER_OF(aodevs, *dcs, aodevs); + libxl__domain_create_state *dcs = CONTAINER_OF(multidev, *dcs, multidev); STATE_AO_GC(dcs->ao); int i; libxl_ctx *ctx = CTX; diff -r ee32ae163126 -r a1b583ffbcb0 tools/libxl/libxl_device.c --- a/tools/libxl/libxl_device.c Fri Aug 03 09:54:11 2012 +0100 +++ b/tools/libxl/libxl_device.c Fri Aug 03 09:54:11 2012 +0100 @@ -403,13 +403,13 @@ void libxl__prepare_ao_device(libxl__ao /* multidev */ -void libxl__multidev_begin(libxl__ao *ao, libxl__ao_devices *aodevs) +void libxl__multidev_begin(libxl__ao *ao, libxl__multidev *multidev) { AO_GC; - aodevs->ao = ao; - aodevs->array = 0; - aodevs->used = aodevs->allocd = 0; + multidev->ao = ao; + multidev->array = 0; + multidev->used = multidev->allocd = 0; /* We allocate an aodev to represent the operation of preparing * all of the other operations. This operation is completed when @@ -422,25 +422,25 @@ void libxl__multidev_begin(libxl__ao *ao * (iii) we have a nice consistent way to deal with any * error that might occur while deciding what to initiate */ - aodevs->preparation = libxl__multidev_prepare(aodevs); + multidev->preparation = libxl__multidev_prepare(multidev); } static void multidev_one_callback(libxl__egc *egc, libxl__ao_device *aodev); -libxl__ao_device *libxl__multidev_prepare(libxl__ao_devices *aodevs) { - STATE_AO_GC(aodevs->ao); +libxl__ao_device *libxl__multidev_prepare(libxl__multidev *multidev) { + STATE_AO_GC(multidev->ao); libxl__ao_device *aodev; GCNEW(aodev); - aodev->aodevs = aodevs; + aodev->multidev = multidev; aodev->callback = multidev_one_callback; libxl__prepare_ao_device(ao, aodev); - if (aodevs->used >= aodevs->allocd) { - aodevs->allocd = aodevs->used * 2 + 5; - GCREALLOC_ARRAY(aodevs->array, aodevs->allocd); + if (multidev->used >= multidev->allocd) { + multidev->allocd = multidev->used * 2 + 5; + GCREALLOC_ARRAY(multidev->array, multidev->allocd); } - aodevs->array[aodevs->used++] = aodev; + multidev->array[multidev->used++] = aodev; return aodev; } @@ -448,28 +448,28 @@ libxl__ao_device *libxl__multidev_prepar static void multidev_one_callback(libxl__egc *egc, libxl__ao_device *aodev) { STATE_AO_GC(aodev->ao); - libxl__ao_devices *aodevs = aodev->aodevs; + libxl__multidev *multidev = aodev->multidev; int i, error = 0; aodev->active = 0; - for (i = 0; i < aodevs->used; i++) { - if (aodevs->array[i]->active) + for (i = 0; i < multidev->used; i++) { + if (multidev->array[i]->active) return; - if (aodevs->array[i]->rc) - error = aodevs->array[i]->rc; + if (multidev->array[i]->rc) + error = multidev->array[i]->rc; } - aodevs->callback(egc, aodevs, error); + multidev->callback(egc, multidev, error); return; } -void libxl__multidev_prepared(libxl__egc *egc, libxl__ao_devices *aodevs, - int rc) +void libxl__multidev_prepared(libxl__egc *egc, + libxl__multidev *multidev, int rc) { - aodevs->preparation->rc = rc; - multidev_one_callback(egc, aodevs->preparation); + multidev->preparation->rc = rc; + multidev_one_callback(egc, multidev->preparation); } /******************************************************************************/ @@ -486,12 +486,12 @@ void libxl__multidev_prepared(libxl__egc #define DEFINE_DEVICES_ADD(type) \ void libxl__add_##type##s(libxl__egc *egc, libxl__ao *ao, uint32_t domid, \ libxl_domain_config *d_config, \ - libxl__ao_devices *aodevs) \ + libxl__multidev *multidev) \ { \ AO_GC; \ int i; \ for (i = 0; i < d_config->num_##type##s; i++) { \ - libxl__ao_device *aodev = libxl__multidev_prepare(aodevs); \ + libxl__ao_device *aodev = libxl__multidev_prepare(multidev); \ libxl__device_##type##_add(egc, domid, &d_config->type##s[i], \ aodev); \ } \ @@ -532,8 +532,8 @@ out: /* Callback for device destruction */ -static void devices_remove_callback(libxl__egc *egc, libxl__ao_devices *aodevs, - int rc); +static void devices_remove_callback(libxl__egc *egc, + libxl__multidev *multidev, int rc); void libxl__devices_destroy(libxl__egc *egc, libxl__devices_remove_state *drs) { @@ -545,12 +545,12 @@ void libxl__devices_destroy(libxl__egc * char **kinds = NULL, **devs = NULL; int i, j, rc = 0; libxl__device *dev; - libxl__ao_devices *aodevs = &drs->aodevs; + libxl__multidev *multidev = &drs->multidev; libxl__ao_device *aodev; libxl__device_kind kind; - libxl__multidev_begin(ao, aodevs); - aodevs->callback = devices_remove_callback; + libxl__multidev_begin(ao, multidev); + multidev->callback = devices_remove_callback; path = libxl__sprintf(gc, "/local/domain/%d/device", domid); kinds = libxl__xs_directory(gc, XBT_NULL, path, &num_kinds); @@ -587,7 +587,7 @@ void libxl__devices_destroy(libxl__egc * libxl__device_destroy(gc, dev); continue; } - aodev = libxl__multidev_prepare(aodevs); + aodev = libxl__multidev_prepare(multidev); aodev->action = DEVICE_DISCONNECT; aodev->dev = dev; aodev->force = drs->force; @@ -613,7 +613,7 @@ void libxl__devices_destroy(libxl__egc * } out: - libxl__multidev_prepared(egc, aodevs, rc); + libxl__multidev_prepared(egc, multidev, rc); } /* Callbacks for device related operations */ @@ -1003,10 +1003,10 @@ static void device_hotplug_clean(libxl__ assert(!libxl__ev_child_inuse(&aodev->child)); } -static void devices_remove_callback(libxl__egc *egc, libxl__ao_devices *aodevs, - int rc) +static void devices_remove_callback(libxl__egc *egc, + libxl__multidev *multidev, int rc) { - libxl__devices_remove_state *drs = CONTAINER_OF(aodevs, *drs, aodevs); + libxl__devices_remove_state *drs = CONTAINER_OF(multidev, *drs, multidev); STATE_AO_GC(drs->ao); drs->callback(egc, drs, rc); diff -r ee32ae163126 -r a1b583ffbcb0 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Fri Aug 03 09:54:11 2012 +0100 +++ b/tools/libxl/libxl_dm.c Fri Aug 03 09:54:11 2012 +0100 @@ -714,10 +714,10 @@ static void spawn_stubdom_pvqemu_cb(libx int rc); static void spawn_stub_launch_dm(libxl__egc *egc, - libxl__ao_devices *aodevs, int ret); + libxl__multidev *aodevs, int ret); static void stubdom_pvqemu_cb(libxl__egc *egc, - libxl__ao_devices *aodevs, + libxl__multidev *aodevs, int rc); static void spaw_stubdom_pvqemu_destroy_cb(libxl__egc *egc, @@ -856,10 +856,10 @@ retry_transaction: if (errno == EAGAIN) goto retry_transaction; - libxl__multidev_begin(ao, &sdss->aodevs); - sdss->aodevs.callback = spawn_stub_launch_dm; - libxl__add_disks(egc, ao, dm_domid, dm_config, &sdss->aodevs); - libxl__multidev_prepared(egc, &sdss->aodevs, 0); + libxl__multidev_begin(ao, &sdss->multidev); + sdss->multidev.callback = spawn_stub_launch_dm; + libxl__add_disks(egc, ao, dm_domid, dm_config, &sdss->multidev); + libxl__multidev_prepared(egc, &sdss->multidev, 0); free(args); return; @@ -872,9 +872,9 @@ out: } static void spawn_stub_launch_dm(libxl__egc *egc, - libxl__ao_devices *aodevs, int ret) + libxl__multidev *multidev, int ret) { - libxl__stub_dm_spawn_state *sdss = CONTAINER_OF(aodevs, *sdss, aodevs); + libxl__stub_dm_spawn_state *sdss = CONTAINER_OF(multidev, *sdss, multidev); STATE_AO_GC(sdss->dm.spawn.ao); libxl_ctx *ctx = libxl__gc_owner(gc); int i, num_console = STUBDOM_SPECIAL_CONSOLES; @@ -982,22 +982,22 @@ static void spawn_stubdom_pvqemu_cb(libx if (rc) goto out; if (d_config->num_nics > 0) { - libxl__multidev_begin(ao, &sdss->aodevs); - sdss->aodevs.callback = stubdom_pvqemu_cb; - libxl__add_nics(egc, ao, dm_domid, d_config, &sdss->aodevs); - libxl__multidev_prepared(egc, &sdss->aodevs, 0); + libxl__multidev_begin(ao, &sdss->multidev); + sdss->multidev.callback = stubdom_pvqemu_cb; + libxl__add_nics(egc, ao, dm_domid, d_config, &sdss->multidev); + libxl__multidev_prepared(egc, &sdss->multidev, 0); return; } out: - stubdom_pvqemu_cb(egc, &sdss->aodevs, rc); + stubdom_pvqemu_cb(egc, &sdss->multidev, rc); } static void stubdom_pvqemu_cb(libxl__egc *egc, - libxl__ao_devices *aodevs, + libxl__multidev *multidev, int rc) { - libxl__stub_dm_spawn_state *sdss = CONTAINER_OF(aodevs, *sdss, aodevs); + libxl__stub_dm_spawn_state *sdss = CONTAINER_OF(multidev, *sdss, multidev); STATE_AO_GC(sdss->dm.spawn.ao); uint32_t dm_domid = sdss->pvqemu.guest_domid; diff -r ee32ae163126 -r a1b583ffbcb0 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri Aug 03 09:54:11 2012 +0100 +++ b/tools/libxl/libxl_internal.h Fri Aug 03 09:54:11 2012 +0100 @@ -1797,7 +1797,7 @@ typedef enum { } libxl__device_action; typedef struct libxl__ao_device libxl__ao_device; -typedef struct libxl__ao_devices libxl__ao_devices; +typedef struct libxl__multidev libxl__multidev; typedef void libxl__device_callback(libxl__egc*, libxl__ao_device*); /* This functions sets the necessary libxl__ao_device struct values to use @@ -1827,7 +1827,7 @@ struct libxl__ao_device { int rc; /* private for multidev */ int active; - libxl__ao_devices *aodevs; /* reference to the containing multidev */ + libxl__multidev *multidev; /* reference to the containing multidev */ /* private for add/remove implementation */ libxl__ev_devstate backend_ds; /* Bodge for Qemu devices, also used for timeout of hotplug execution */ @@ -1853,12 +1853,12 @@ struct libxl__ao_device { */ /* Starts preparing to add/remove a bunch of devices. */ -_hidden void libxl__multidev_begin(libxl__ao *ao, libxl__ao_devices*); +_hidden void libxl__multidev_begin(libxl__ao *ao, libxl__multidev*); /* Prepares to add/remove one of many devices. Returns a libxl__ao_device * which has had libxl__prepare_ao_device called, and which has also * had ->callback set. The user should not mess with aodev->callback. */ -_hidden libxl__ao_device *libxl__multidev_prepare(libxl__ao_devices*); +_hidden libxl__ao_device *libxl__multidev_prepare(libxl__multidev*); /* Notifies the multidev machinery that we have now finished preparing * and initiating devices. multidev->callback may then be called as @@ -1866,10 +1866,10 @@ _hidden libxl__ao_device *libxl__multide * outstanding, perhaps reentrantly. If rc!=0 (error should have been * logged) multidev->callback will get a non-zero rc. * callback may be set by the user at any point before prepared. */ -_hidden void libxl__multidev_prepared(libxl__egc*, libxl__ao_devices*, int rc); - -typedef void libxl__devices_callback(libxl__egc*, libxl__ao_devices*, int rc); -struct libxl__ao_devices { +_hidden void libxl__multidev_prepared(libxl__egc*, libxl__multidev*, int rc); + +typedef void libxl__devices_callback(libxl__egc*, libxl__multidev*, int rc); +struct libxl__multidev { /* set by user: */ libxl__devices_callback *callback; /* for private use by libxl__...ao_devices... machinery: */ @@ -2342,7 +2342,7 @@ struct libxl__devices_remove_state { libxl__devices_remove_callback *callback; int force; /* libxl_device_TYPE_destroy rather than _remove */ /* private */ - libxl__ao_devices aodevs; + libxl__multidev multidev; int num_devices; }; @@ -2386,7 +2386,7 @@ _hidden void libxl__devices_destroy(libx libxl__devices_remove_state *drs); /* Helper function to add a bunch of disks. This should be used when - * the caller is inside an async op. "devices" will NOT be prepared by + * the caller is inside an async op. "multidev" will NOT be prepared by * this function, so the caller must make sure to call * libxl__multidev_begin before calling this function. * @@ -2395,11 +2395,11 @@ _hidden void libxl__devices_destroy(libx */ _hidden void libxl__add_disks(libxl__egc *egc, libxl__ao *ao, uint32_t domid, libxl_domain_config *d_config, - libxl__ao_devices *aodevs); + libxl__multidev *multidev); _hidden void libxl__add_nics(libxl__egc *egc, libxl__ao *ao, uint32_t domid, libxl_domain_config *d_config, - libxl__ao_devices *aodevs); + libxl__multidev *multidev); /*----- device model creation -----*/ @@ -2435,7 +2435,7 @@ typedef struct { libxl__domain_build_state dm_state; libxl__dm_spawn_state pvqemu; libxl__destroy_domid_state dis; - libxl__ao_devices aodevs; + libxl__multidev multidev; } libxl__stub_dm_spawn_state; _hidden void libxl__spawn_stub_dm(libxl__egc *egc, libxl__stub_dm_spawn_state*); @@ -2467,7 +2467,7 @@ struct libxl__domain_create_state { libxl__save_helper_state shs; /* necessary if the domain creation failed and we have to destroy it */ libxl__domain_destroy_state dds; - libxl__ao_devices aodevs; + libxl__multidev multidev; }; /*----- Domain suspend (save) functions -----*/ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 20:33:23 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 20:33: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 1SyqSv-0005V8-W7; Tue, 07 Aug 2012 20:33:21 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSu-0005Rk-F1 for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:20 +0000 Received: from [85.158.143.99:37320] by server-1.bemta-4.messagelabs.com id 26/CB-24392-09B71205; Tue, 07 Aug 2012 20:33:20 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-216.messagelabs.com!1344371596!20959391!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22643 invoked from network); 7 Aug 2012 20:33:17 -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; 7 Aug 2012 20:33:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSq-00041A-6Q for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SyqSq-0003J4-59 for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:16 +0000 Message-Id: Date: Tue, 07 Aug 2012 20:33:15 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: rename aodevs to multidev X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1343984051 -3600 # Node ID a1b583ffbcb0503ad3907253c41986bd65f56ac7 # Parent ee32ae1631266f0f6cce3d8c95ba15a68ec258a4 libxl: rename aodevs to multidev To be consistent with the new function naming, rename libxl__ao_devices to libxl__multidev and all variables aodevs to multidev. No functional change. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r ee32ae163126 -r a1b583ffbcb0 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Fri Aug 03 09:54:11 2012 +0100 +++ b/tools/libxl/libxl_create.c Fri Aug 03 09:54:11 2012 +0100 @@ -599,10 +599,10 @@ static void domcreate_bootloader_done(li libxl__bootloader_state *bl, int rc); -static void domcreate_launch_dm(libxl__egc *egc, libxl__ao_devices *aodevs, +static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *aodevs, int ret); -static void domcreate_attach_pci(libxl__egc *egc, libxl__ao_devices *aodevs, +static void domcreate_attach_pci(libxl__egc *egc, libxl__multidev *aodevs, int ret); static void domcreate_console_available(libxl__egc *egc, @@ -909,10 +909,10 @@ static void domcreate_rebuild_done(libxl store_libxl_entry(gc, domid, &d_config->b_info); - libxl__multidev_begin(ao, &dcs->aodevs); - dcs->aodevs.callback = domcreate_launch_dm; - libxl__add_disks(egc, ao, domid, d_config, &dcs->aodevs); - libxl__multidev_prepared(egc, &dcs->aodevs, 0); + libxl__multidev_begin(ao, &dcs->multidev); + dcs->multidev.callback = domcreate_launch_dm; + libxl__add_disks(egc, ao, domid, d_config, &dcs->multidev); + libxl__multidev_prepared(egc, &dcs->multidev, 0); return; @@ -921,10 +921,10 @@ static void domcreate_rebuild_done(libxl domcreate_complete(egc, dcs, ret); } -static void domcreate_launch_dm(libxl__egc *egc, libxl__ao_devices *aodevs, +static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev, int ret) { - libxl__domain_create_state *dcs = CONTAINER_OF(aodevs, *dcs, aodevs); + libxl__domain_create_state *dcs = CONTAINER_OF(multidev, *dcs, multidev); STATE_AO_GC(dcs->ao); int i; @@ -1039,14 +1039,14 @@ static void domcreate_devmodel_started(l /* Plug nic interfaces */ if (d_config->num_nics > 0) { /* Attach nics */ - libxl__multidev_begin(ao, &dcs->aodevs); - dcs->aodevs.callback = domcreate_attach_pci; - libxl__add_nics(egc, ao, domid, d_config, &dcs->aodevs); - libxl__multidev_prepared(egc, &dcs->aodevs, 0); + libxl__multidev_begin(ao, &dcs->multidev); + dcs->multidev.callback = domcreate_attach_pci; + libxl__add_nics(egc, ao, domid, d_config, &dcs->multidev); + libxl__multidev_prepared(egc, &dcs->multidev, 0); return; } - domcreate_attach_pci(egc, &dcs->aodevs, 0); + domcreate_attach_pci(egc, &dcs->multidev, 0); return; error_out: @@ -1054,10 +1054,10 @@ error_out: domcreate_complete(egc, dcs, ret); } -static void domcreate_attach_pci(libxl__egc *egc, libxl__ao_devices *aodevs, +static void domcreate_attach_pci(libxl__egc *egc, libxl__multidev *multidev, int ret) { - libxl__domain_create_state *dcs = CONTAINER_OF(aodevs, *dcs, aodevs); + libxl__domain_create_state *dcs = CONTAINER_OF(multidev, *dcs, multidev); STATE_AO_GC(dcs->ao); int i; libxl_ctx *ctx = CTX; diff -r ee32ae163126 -r a1b583ffbcb0 tools/libxl/libxl_device.c --- a/tools/libxl/libxl_device.c Fri Aug 03 09:54:11 2012 +0100 +++ b/tools/libxl/libxl_device.c Fri Aug 03 09:54:11 2012 +0100 @@ -403,13 +403,13 @@ void libxl__prepare_ao_device(libxl__ao /* multidev */ -void libxl__multidev_begin(libxl__ao *ao, libxl__ao_devices *aodevs) +void libxl__multidev_begin(libxl__ao *ao, libxl__multidev *multidev) { AO_GC; - aodevs->ao = ao; - aodevs->array = 0; - aodevs->used = aodevs->allocd = 0; + multidev->ao = ao; + multidev->array = 0; + multidev->used = multidev->allocd = 0; /* We allocate an aodev to represent the operation of preparing * all of the other operations. This operation is completed when @@ -422,25 +422,25 @@ void libxl__multidev_begin(libxl__ao *ao * (iii) we have a nice consistent way to deal with any * error that might occur while deciding what to initiate */ - aodevs->preparation = libxl__multidev_prepare(aodevs); + multidev->preparation = libxl__multidev_prepare(multidev); } static void multidev_one_callback(libxl__egc *egc, libxl__ao_device *aodev); -libxl__ao_device *libxl__multidev_prepare(libxl__ao_devices *aodevs) { - STATE_AO_GC(aodevs->ao); +libxl__ao_device *libxl__multidev_prepare(libxl__multidev *multidev) { + STATE_AO_GC(multidev->ao); libxl__ao_device *aodev; GCNEW(aodev); - aodev->aodevs = aodevs; + aodev->multidev = multidev; aodev->callback = multidev_one_callback; libxl__prepare_ao_device(ao, aodev); - if (aodevs->used >= aodevs->allocd) { - aodevs->allocd = aodevs->used * 2 + 5; - GCREALLOC_ARRAY(aodevs->array, aodevs->allocd); + if (multidev->used >= multidev->allocd) { + multidev->allocd = multidev->used * 2 + 5; + GCREALLOC_ARRAY(multidev->array, multidev->allocd); } - aodevs->array[aodevs->used++] = aodev; + multidev->array[multidev->used++] = aodev; return aodev; } @@ -448,28 +448,28 @@ libxl__ao_device *libxl__multidev_prepar static void multidev_one_callback(libxl__egc *egc, libxl__ao_device *aodev) { STATE_AO_GC(aodev->ao); - libxl__ao_devices *aodevs = aodev->aodevs; + libxl__multidev *multidev = aodev->multidev; int i, error = 0; aodev->active = 0; - for (i = 0; i < aodevs->used; i++) { - if (aodevs->array[i]->active) + for (i = 0; i < multidev->used; i++) { + if (multidev->array[i]->active) return; - if (aodevs->array[i]->rc) - error = aodevs->array[i]->rc; + if (multidev->array[i]->rc) + error = multidev->array[i]->rc; } - aodevs->callback(egc, aodevs, error); + multidev->callback(egc, multidev, error); return; } -void libxl__multidev_prepared(libxl__egc *egc, libxl__ao_devices *aodevs, - int rc) +void libxl__multidev_prepared(libxl__egc *egc, + libxl__multidev *multidev, int rc) { - aodevs->preparation->rc = rc; - multidev_one_callback(egc, aodevs->preparation); + multidev->preparation->rc = rc; + multidev_one_callback(egc, multidev->preparation); } /******************************************************************************/ @@ -486,12 +486,12 @@ void libxl__multidev_prepared(libxl__egc #define DEFINE_DEVICES_ADD(type) \ void libxl__add_##type##s(libxl__egc *egc, libxl__ao *ao, uint32_t domid, \ libxl_domain_config *d_config, \ - libxl__ao_devices *aodevs) \ + libxl__multidev *multidev) \ { \ AO_GC; \ int i; \ for (i = 0; i < d_config->num_##type##s; i++) { \ - libxl__ao_device *aodev = libxl__multidev_prepare(aodevs); \ + libxl__ao_device *aodev = libxl__multidev_prepare(multidev); \ libxl__device_##type##_add(egc, domid, &d_config->type##s[i], \ aodev); \ } \ @@ -532,8 +532,8 @@ out: /* Callback for device destruction */ -static void devices_remove_callback(libxl__egc *egc, libxl__ao_devices *aodevs, - int rc); +static void devices_remove_callback(libxl__egc *egc, + libxl__multidev *multidev, int rc); void libxl__devices_destroy(libxl__egc *egc, libxl__devices_remove_state *drs) { @@ -545,12 +545,12 @@ void libxl__devices_destroy(libxl__egc * char **kinds = NULL, **devs = NULL; int i, j, rc = 0; libxl__device *dev; - libxl__ao_devices *aodevs = &drs->aodevs; + libxl__multidev *multidev = &drs->multidev; libxl__ao_device *aodev; libxl__device_kind kind; - libxl__multidev_begin(ao, aodevs); - aodevs->callback = devices_remove_callback; + libxl__multidev_begin(ao, multidev); + multidev->callback = devices_remove_callback; path = libxl__sprintf(gc, "/local/domain/%d/device", domid); kinds = libxl__xs_directory(gc, XBT_NULL, path, &num_kinds); @@ -587,7 +587,7 @@ void libxl__devices_destroy(libxl__egc * libxl__device_destroy(gc, dev); continue; } - aodev = libxl__multidev_prepare(aodevs); + aodev = libxl__multidev_prepare(multidev); aodev->action = DEVICE_DISCONNECT; aodev->dev = dev; aodev->force = drs->force; @@ -613,7 +613,7 @@ void libxl__devices_destroy(libxl__egc * } out: - libxl__multidev_prepared(egc, aodevs, rc); + libxl__multidev_prepared(egc, multidev, rc); } /* Callbacks for device related operations */ @@ -1003,10 +1003,10 @@ static void device_hotplug_clean(libxl__ assert(!libxl__ev_child_inuse(&aodev->child)); } -static void devices_remove_callback(libxl__egc *egc, libxl__ao_devices *aodevs, - int rc) +static void devices_remove_callback(libxl__egc *egc, + libxl__multidev *multidev, int rc) { - libxl__devices_remove_state *drs = CONTAINER_OF(aodevs, *drs, aodevs); + libxl__devices_remove_state *drs = CONTAINER_OF(multidev, *drs, multidev); STATE_AO_GC(drs->ao); drs->callback(egc, drs, rc); diff -r ee32ae163126 -r a1b583ffbcb0 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Fri Aug 03 09:54:11 2012 +0100 +++ b/tools/libxl/libxl_dm.c Fri Aug 03 09:54:11 2012 +0100 @@ -714,10 +714,10 @@ static void spawn_stubdom_pvqemu_cb(libx int rc); static void spawn_stub_launch_dm(libxl__egc *egc, - libxl__ao_devices *aodevs, int ret); + libxl__multidev *aodevs, int ret); static void stubdom_pvqemu_cb(libxl__egc *egc, - libxl__ao_devices *aodevs, + libxl__multidev *aodevs, int rc); static void spaw_stubdom_pvqemu_destroy_cb(libxl__egc *egc, @@ -856,10 +856,10 @@ retry_transaction: if (errno == EAGAIN) goto retry_transaction; - libxl__multidev_begin(ao, &sdss->aodevs); - sdss->aodevs.callback = spawn_stub_launch_dm; - libxl__add_disks(egc, ao, dm_domid, dm_config, &sdss->aodevs); - libxl__multidev_prepared(egc, &sdss->aodevs, 0); + libxl__multidev_begin(ao, &sdss->multidev); + sdss->multidev.callback = spawn_stub_launch_dm; + libxl__add_disks(egc, ao, dm_domid, dm_config, &sdss->multidev); + libxl__multidev_prepared(egc, &sdss->multidev, 0); free(args); return; @@ -872,9 +872,9 @@ out: } static void spawn_stub_launch_dm(libxl__egc *egc, - libxl__ao_devices *aodevs, int ret) + libxl__multidev *multidev, int ret) { - libxl__stub_dm_spawn_state *sdss = CONTAINER_OF(aodevs, *sdss, aodevs); + libxl__stub_dm_spawn_state *sdss = CONTAINER_OF(multidev, *sdss, multidev); STATE_AO_GC(sdss->dm.spawn.ao); libxl_ctx *ctx = libxl__gc_owner(gc); int i, num_console = STUBDOM_SPECIAL_CONSOLES; @@ -982,22 +982,22 @@ static void spawn_stubdom_pvqemu_cb(libx if (rc) goto out; if (d_config->num_nics > 0) { - libxl__multidev_begin(ao, &sdss->aodevs); - sdss->aodevs.callback = stubdom_pvqemu_cb; - libxl__add_nics(egc, ao, dm_domid, d_config, &sdss->aodevs); - libxl__multidev_prepared(egc, &sdss->aodevs, 0); + libxl__multidev_begin(ao, &sdss->multidev); + sdss->multidev.callback = stubdom_pvqemu_cb; + libxl__add_nics(egc, ao, dm_domid, d_config, &sdss->multidev); + libxl__multidev_prepared(egc, &sdss->multidev, 0); return; } out: - stubdom_pvqemu_cb(egc, &sdss->aodevs, rc); + stubdom_pvqemu_cb(egc, &sdss->multidev, rc); } static void stubdom_pvqemu_cb(libxl__egc *egc, - libxl__ao_devices *aodevs, + libxl__multidev *multidev, int rc) { - libxl__stub_dm_spawn_state *sdss = CONTAINER_OF(aodevs, *sdss, aodevs); + libxl__stub_dm_spawn_state *sdss = CONTAINER_OF(multidev, *sdss, multidev); STATE_AO_GC(sdss->dm.spawn.ao); uint32_t dm_domid = sdss->pvqemu.guest_domid; diff -r ee32ae163126 -r a1b583ffbcb0 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri Aug 03 09:54:11 2012 +0100 +++ b/tools/libxl/libxl_internal.h Fri Aug 03 09:54:11 2012 +0100 @@ -1797,7 +1797,7 @@ typedef enum { } libxl__device_action; typedef struct libxl__ao_device libxl__ao_device; -typedef struct libxl__ao_devices libxl__ao_devices; +typedef struct libxl__multidev libxl__multidev; typedef void libxl__device_callback(libxl__egc*, libxl__ao_device*); /* This functions sets the necessary libxl__ao_device struct values to use @@ -1827,7 +1827,7 @@ struct libxl__ao_device { int rc; /* private for multidev */ int active; - libxl__ao_devices *aodevs; /* reference to the containing multidev */ + libxl__multidev *multidev; /* reference to the containing multidev */ /* private for add/remove implementation */ libxl__ev_devstate backend_ds; /* Bodge for Qemu devices, also used for timeout of hotplug execution */ @@ -1853,12 +1853,12 @@ struct libxl__ao_device { */ /* Starts preparing to add/remove a bunch of devices. */ -_hidden void libxl__multidev_begin(libxl__ao *ao, libxl__ao_devices*); +_hidden void libxl__multidev_begin(libxl__ao *ao, libxl__multidev*); /* Prepares to add/remove one of many devices. Returns a libxl__ao_device * which has had libxl__prepare_ao_device called, and which has also * had ->callback set. The user should not mess with aodev->callback. */ -_hidden libxl__ao_device *libxl__multidev_prepare(libxl__ao_devices*); +_hidden libxl__ao_device *libxl__multidev_prepare(libxl__multidev*); /* Notifies the multidev machinery that we have now finished preparing * and initiating devices. multidev->callback may then be called as @@ -1866,10 +1866,10 @@ _hidden libxl__ao_device *libxl__multide * outstanding, perhaps reentrantly. If rc!=0 (error should have been * logged) multidev->callback will get a non-zero rc. * callback may be set by the user at any point before prepared. */ -_hidden void libxl__multidev_prepared(libxl__egc*, libxl__ao_devices*, int rc); - -typedef void libxl__devices_callback(libxl__egc*, libxl__ao_devices*, int rc); -struct libxl__ao_devices { +_hidden void libxl__multidev_prepared(libxl__egc*, libxl__multidev*, int rc); + +typedef void libxl__devices_callback(libxl__egc*, libxl__multidev*, int rc); +struct libxl__multidev { /* set by user: */ libxl__devices_callback *callback; /* for private use by libxl__...ao_devices... machinery: */ @@ -2342,7 +2342,7 @@ struct libxl__devices_remove_state { libxl__devices_remove_callback *callback; int force; /* libxl_device_TYPE_destroy rather than _remove */ /* private */ - libxl__ao_devices aodevs; + libxl__multidev multidev; int num_devices; }; @@ -2386,7 +2386,7 @@ _hidden void libxl__devices_destroy(libx libxl__devices_remove_state *drs); /* Helper function to add a bunch of disks. This should be used when - * the caller is inside an async op. "devices" will NOT be prepared by + * the caller is inside an async op. "multidev" will NOT be prepared by * this function, so the caller must make sure to call * libxl__multidev_begin before calling this function. * @@ -2395,11 +2395,11 @@ _hidden void libxl__devices_destroy(libx */ _hidden void libxl__add_disks(libxl__egc *egc, libxl__ao *ao, uint32_t domid, libxl_domain_config *d_config, - libxl__ao_devices *aodevs); + libxl__multidev *multidev); _hidden void libxl__add_nics(libxl__egc *egc, libxl__ao *ao, uint32_t domid, libxl_domain_config *d_config, - libxl__ao_devices *aodevs); + libxl__multidev *multidev); /*----- device model creation -----*/ @@ -2435,7 +2435,7 @@ typedef struct { libxl__domain_build_state dm_state; libxl__dm_spawn_state pvqemu; libxl__destroy_domid_state dis; - libxl__ao_devices aodevs; + libxl__multidev multidev; } libxl__stub_dm_spawn_state; _hidden void libxl__spawn_stub_dm(libxl__egc *egc, libxl__stub_dm_spawn_state*); @@ -2467,7 +2467,7 @@ struct libxl__domain_create_state { libxl__save_helper_state shs; /* necessary if the domain creation failed and we have to destroy it */ libxl__domain_destroy_state dds; - libxl__ao_devices aodevs; + libxl__multidev multidev; }; /*----- Domain suspend (save) functions -----*/ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 20:33:25 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 20:33: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 1SyqSy-0005Xa-MC; Tue, 07 Aug 2012 20:33:24 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSw-0005VP-Tq for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:23 +0000 Received: from [85.158.143.35:5612] by server-3.bemta-4.messagelabs.com id CA/D5-01511-29B71205; Tue, 07 Aug 2012 20:33:22 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-21.messagelabs.com!1344371600!17303580!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12393 invoked from network); 7 Aug 2012 20:33:21 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2012 20:33:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSu-00041Y-DR for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SyqSu-0003L0-CJ for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:20 +0000 Message-Id: Date: Tue, 07 Aug 2012 20:33:19 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] Intel VT-d: Dump IOMMU supported page sizes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Santosh Jodh # Date 1343986684 -3600 # Node ID 9ad379939b78769a9368123989bb0736096fc6ab # Parent 612898732e66db3d3b992df1a1af1655af4d92c9 Intel VT-d: Dump IOMMU supported page sizes Signed-off-by: Santosh Jodh --- diff -r 612898732e66 -r 9ad379939b78 xen/drivers/passthrough/vtd/iommu.c --- a/xen/drivers/passthrough/vtd/iommu.c Fri Aug 03 09:54:17 2012 +0100 +++ b/xen/drivers/passthrough/vtd/iommu.c Fri Aug 03 10:38:04 2012 +0100 @@ -2137,6 +2137,15 @@ int __init intel_vtd_setup(void) { iommu = drhd->iommu; + printk("Intel VT-d supported page sizes: 4kB"); + if (cap_sps_2mb(iommu->cap)) + printk(", 2MB"); + + if (cap_sps_1gb(iommu->cap)) + printk(", 1GB"); + + printk(".\n"); + if ( iommu_snoop && !ecap_snp_ctl(iommu->ecap) ) iommu_snoop = 0; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 20:33:25 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 20:33: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 1SyqSy-0005Xa-MC; Tue, 07 Aug 2012 20:33:24 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSw-0005VP-Tq for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:23 +0000 Received: from [85.158.143.35:5612] by server-3.bemta-4.messagelabs.com id CA/D5-01511-29B71205; Tue, 07 Aug 2012 20:33:22 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-21.messagelabs.com!1344371600!17303580!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12393 invoked from network); 7 Aug 2012 20:33:21 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2012 20:33:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSu-00041Y-DR for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SyqSu-0003L0-CJ for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:20 +0000 Message-Id: Date: Tue, 07 Aug 2012 20:33:19 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] Intel VT-d: Dump IOMMU supported page sizes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Santosh Jodh # Date 1343986684 -3600 # Node ID 9ad379939b78769a9368123989bb0736096fc6ab # Parent 612898732e66db3d3b992df1a1af1655af4d92c9 Intel VT-d: Dump IOMMU supported page sizes Signed-off-by: Santosh Jodh --- diff -r 612898732e66 -r 9ad379939b78 xen/drivers/passthrough/vtd/iommu.c --- a/xen/drivers/passthrough/vtd/iommu.c Fri Aug 03 09:54:17 2012 +0100 +++ b/xen/drivers/passthrough/vtd/iommu.c Fri Aug 03 10:38:04 2012 +0100 @@ -2137,6 +2137,15 @@ int __init intel_vtd_setup(void) { iommu = drhd->iommu; + printk("Intel VT-d supported page sizes: 4kB"); + if (cap_sps_2mb(iommu->cap)) + printk(", 2MB"); + + if (cap_sps_1gb(iommu->cap)) + printk(", 1GB"); + + printk(".\n"); + if ( iommu_snoop && !ecap_snp_ctl(iommu->ecap) ) iommu_snoop = 0; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 20:33:25 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 20:33: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 1SyqSx-0005WE-5s; Tue, 07 Aug 2012 20:33:23 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSv-0005Sg-36 for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:21 +0000 Received: from [85.158.138.51:58642] by server-6.bemta-3.messagelabs.com id 43/F1-02321-09B71205; Tue, 07 Aug 2012 20:33:20 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-174.messagelabs.com!1344371599!30952324!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15259 invoked from network); 7 Aug 2012 20:33:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2012 20:33:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSs-00041P-QX for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SyqSs-0003KH-OY for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:18 +0000 Message-Id: Date: Tue, 07 Aug 2012 20:33:18 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: add a comment re the memory management API instability X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1343984055 -3600 # Node ID afff548d43d770a3e074a20e1e7154ba5df1c8c6 # Parent 32aa98840f2ba38081d007a919a40efefc62d20a libxl: add a comment re the memory management API instability Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r 32aa98840f2b -r afff548d43d7 tools/libxl/libxl.h --- a/tools/libxl/libxl.h Fri Aug 03 09:54:14 2012 +0100 +++ b/tools/libxl/libxl.h Fri Aug 03 09:54:15 2012 +0100 @@ -567,6 +567,17 @@ int libxl_domain_core_dump(libxl_ctx *ct int libxl_domain_setmaxmem(libxl_ctx *ctx, uint32_t domid, uint32_t target_memkb); int libxl_set_memory_target(libxl_ctx *ctx, uint32_t domid, int32_t target_memkb, int relative, int enforce); int libxl_get_memory_target(libxl_ctx *ctx, uint32_t domid, uint32_t *out_target); + + +/* + * WARNING + * This memory management API is unstable even in Xen 4.2. + * It has a numer of deficiencies and we intend to replace it. + * + * The semantics of these functions should not be relied on to be very + * coherent or stable. We will however endeavour to keep working + * existing programs which use them in roughly the same way as libxl. + */ /* 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, uint32_t *need_memkb); @@ -577,6 +588,7 @@ int libxl_wait_for_free_memory(libxl_ctx /* wait for the memory target of a domain to be reached */ int libxl_wait_for_memory_target(libxl_ctx *ctx, uint32_t domid, int wait_secs); + int libxl_vncviewer_exec(libxl_ctx *ctx, uint32_t domid, int autopass); int libxl_console_exec(libxl_ctx *ctx, uint32_t domid, int cons_num, libxl_console_type type); /* libxl_primary_console_exec finds the domid and console number _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 20:33:25 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 20:33: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 1SyqSx-0005WE-5s; Tue, 07 Aug 2012 20:33:23 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSv-0005Sg-36 for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:21 +0000 Received: from [85.158.138.51:58642] by server-6.bemta-3.messagelabs.com id 43/F1-02321-09B71205; Tue, 07 Aug 2012 20:33:20 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-174.messagelabs.com!1344371599!30952324!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15259 invoked from network); 7 Aug 2012 20:33:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2012 20:33:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSs-00041P-QX for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SyqSs-0003KH-OY for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:18 +0000 Message-Id: Date: Tue, 07 Aug 2012 20:33:18 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: add a comment re the memory management API instability X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1343984055 -3600 # Node ID afff548d43d770a3e074a20e1e7154ba5df1c8c6 # Parent 32aa98840f2ba38081d007a919a40efefc62d20a libxl: add a comment re the memory management API instability Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r 32aa98840f2b -r afff548d43d7 tools/libxl/libxl.h --- a/tools/libxl/libxl.h Fri Aug 03 09:54:14 2012 +0100 +++ b/tools/libxl/libxl.h Fri Aug 03 09:54:15 2012 +0100 @@ -567,6 +567,17 @@ int libxl_domain_core_dump(libxl_ctx *ct int libxl_domain_setmaxmem(libxl_ctx *ctx, uint32_t domid, uint32_t target_memkb); int libxl_set_memory_target(libxl_ctx *ctx, uint32_t domid, int32_t target_memkb, int relative, int enforce); int libxl_get_memory_target(libxl_ctx *ctx, uint32_t domid, uint32_t *out_target); + + +/* + * WARNING + * This memory management API is unstable even in Xen 4.2. + * It has a numer of deficiencies and we intend to replace it. + * + * The semantics of these functions should not be relied on to be very + * coherent or stable. We will however endeavour to keep working + * existing programs which use them in roughly the same way as libxl. + */ /* 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, uint32_t *need_memkb); @@ -577,6 +588,7 @@ int libxl_wait_for_free_memory(libxl_ctx /* wait for the memory target of a domain to be reached */ int libxl_wait_for_memory_target(libxl_ctx *ctx, uint32_t domid, int wait_secs); + int libxl_vncviewer_exec(libxl_ctx *ctx, uint32_t domid, int autopass); int libxl_console_exec(libxl_ctx *ctx, uint32_t domid, int cons_num, libxl_console_type type); /* libxl_primary_console_exec finds the domid and console number _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 20:33:25 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 20:33: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 1SyqSy-0005XJ-Gw; Tue, 07 Aug 2012 20:33:24 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSw-0005Uy-C2 for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:22 +0000 Received: from [85.158.138.51:32917] by server-10.bemta-3.messagelabs.com id F6/5C-07905-19B71205; Tue, 07 Aug 2012 20:33:21 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-174.messagelabs.com!1344371599!30789575!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17908 invoked from network); 7 Aug 2012 20:33:20 -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; 7 Aug 2012 20:33:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSt-00041S-Bb for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SyqSt-0003KW-AK for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:19 +0000 Message-Id: Date: Tue, 07 Aug 2012 20:33:18 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: const correctness for libxl__xs_path_cleanup X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1343984056 -3600 # Node ID 12f65475c13dff134a7f5540bf75c391e90ef491 # Parent afff548d43d770a3e074a20e1e7154ba5df1c8c6 libxl: const correctness for libxl__xs_path_cleanup Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r afff548d43d7 -r 12f65475c13d tools/libxl/libxl_device.c --- a/tools/libxl/libxl_device.c Fri Aug 03 09:54:15 2012 +0100 +++ b/tools/libxl/libxl_device.c Fri Aug 03 09:54:16 2012 +0100 @@ -507,7 +507,7 @@ DEFINE_DEVICES_ADD(nic) int libxl__device_destroy(libxl__gc *gc, libxl__device *dev) { char *be_path = libxl__device_backend_path(gc, dev); - char *fe_path = libxl__device_frontend_path(gc, dev); + const char *fe_path = libxl__device_frontend_path(gc, dev); xs_transaction_t t = 0; int rc; diff -r afff548d43d7 -r 12f65475c13d tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri Aug 03 09:54:15 2012 +0100 +++ b/tools/libxl/libxl_internal.h Fri Aug 03 09:54:16 2012 +0100 @@ -614,7 +614,7 @@ void libxl__xs_transaction_abort(libxl__ * It mimics xenstore-rm -t behaviour. */ _hidden int libxl__xs_path_cleanup(libxl__gc *gc, xs_transaction_t t, - char *user_path); + const char *user_path); /* * Event generation functions provided by the libxl event core to the diff -r afff548d43d7 -r 12f65475c13d tools/libxl/libxl_xshelp.c --- a/tools/libxl/libxl_xshelp.c Fri Aug 03 09:54:15 2012 +0100 +++ b/tools/libxl/libxl_xshelp.c Fri Aug 03 09:54:16 2012 +0100 @@ -233,7 +233,8 @@ void libxl__xs_transaction_abort(libxl__ *t = 0; } -int libxl__xs_path_cleanup(libxl__gc *gc, xs_transaction_t t, char *user_path) +int libxl__xs_path_cleanup(libxl__gc *gc, xs_transaction_t t, + const char *user_path) { unsigned int nb = 0; char *path, *last, *val; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 20:33:25 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 20:33: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 1SyqSv-0005Uz-Rh; Tue, 07 Aug 2012 20:33:21 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSt-0005Sg-W7 for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:20 +0000 Received: from [85.158.138.51:58570] by server-6.bemta-3.messagelabs.com id 6E/E1-02321-F8B71205; Tue, 07 Aug 2012 20:33:19 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-11.tower-174.messagelabs.com!1344371597!30884359!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8010 invoked from network); 7 Aug 2012 20:33:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2012 20:33:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSr-00041G-7o for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SyqSr-0003JY-6K for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:17 +0000 Message-Id: Date: Tue, 07 Aug 2012 20:33:16 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: remus: mark TODOs more clearly X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1343984053 -3600 # Node ID 646a1deabd189fca948385fc0c0c1d28a7c63664 # Parent f1e7c1142fe515171df742b3748828b758d5f88b libxl: remus: mark TODOs more clearly Change the TODOs in the remus code to "REMUS TODO" which will make them easier to grep for later. AIUI all of these are essential for use of remus in production. Also add a new TODO and a new assert, to check rc on entry to remus_checkpoint_dm_saved. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r f1e7c1142fe5 -r 646a1deabd18 tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Fri Aug 03 09:54:12 2012 +0100 +++ b/tools/libxl/libxl_dom.c Fri Aug 03 09:54:13 2012 +0100 @@ -1110,7 +1110,7 @@ int libxl__toolstack_save(uint32_t domid static int libxl__remus_domain_suspend_callback(void *data) { - /* TODO: Issue disk and network checkpoint reqs. */ + /* REMUS TODO: Issue disk and network checkpoint reqs. */ return libxl__domain_suspend_common_callback(data); } @@ -1124,7 +1124,7 @@ static int libxl__remus_domain_resume_ca if (libxl_domain_resume(CTX, dss->domid, /* Fast Suspend */1)) return 0; - /* TODO: Deal with disk. Start a new network output buffer */ + /* REMUS TODO: Deal with disk. Start a new network output buffer */ return 1; } @@ -1151,8 +1151,9 @@ static void libxl__remus_domain_checkpoi static void remus_checkpoint_dm_saved(libxl__egc *egc, libxl__domain_suspend_state *dss, int rc) { - /* TODO: Wait for disk and memory ack, release network buffer */ - /* TODO: make this asynchronous */ + /* REMUS TODO: Wait for disk and memory ack, release network buffer */ + /* REMUS TODO: make this asynchronous */ + assert(!rc); /* REMUS TODO handle this error properly */ usleep(dss->interval * 1000); libxl__xc_domain_saverestore_async_callback_done(egc, &dss->shs, 1); } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 20:33:25 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 20:33: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 1SyqSy-0005XJ-Gw; Tue, 07 Aug 2012 20:33:24 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSw-0005Uy-C2 for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:22 +0000 Received: from [85.158.138.51:32917] by server-10.bemta-3.messagelabs.com id F6/5C-07905-19B71205; Tue, 07 Aug 2012 20:33:21 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-174.messagelabs.com!1344371599!30789575!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17908 invoked from network); 7 Aug 2012 20:33:20 -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; 7 Aug 2012 20:33:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSt-00041S-Bb for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SyqSt-0003KW-AK for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:19 +0000 Message-Id: Date: Tue, 07 Aug 2012 20:33:18 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: const correctness for libxl__xs_path_cleanup X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1343984056 -3600 # Node ID 12f65475c13dff134a7f5540bf75c391e90ef491 # Parent afff548d43d770a3e074a20e1e7154ba5df1c8c6 libxl: const correctness for libxl__xs_path_cleanup Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r afff548d43d7 -r 12f65475c13d tools/libxl/libxl_device.c --- a/tools/libxl/libxl_device.c Fri Aug 03 09:54:15 2012 +0100 +++ b/tools/libxl/libxl_device.c Fri Aug 03 09:54:16 2012 +0100 @@ -507,7 +507,7 @@ DEFINE_DEVICES_ADD(nic) int libxl__device_destroy(libxl__gc *gc, libxl__device *dev) { char *be_path = libxl__device_backend_path(gc, dev); - char *fe_path = libxl__device_frontend_path(gc, dev); + const char *fe_path = libxl__device_frontend_path(gc, dev); xs_transaction_t t = 0; int rc; diff -r afff548d43d7 -r 12f65475c13d tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri Aug 03 09:54:15 2012 +0100 +++ b/tools/libxl/libxl_internal.h Fri Aug 03 09:54:16 2012 +0100 @@ -614,7 +614,7 @@ void libxl__xs_transaction_abort(libxl__ * It mimics xenstore-rm -t behaviour. */ _hidden int libxl__xs_path_cleanup(libxl__gc *gc, xs_transaction_t t, - char *user_path); + const char *user_path); /* * Event generation functions provided by the libxl event core to the diff -r afff548d43d7 -r 12f65475c13d tools/libxl/libxl_xshelp.c --- a/tools/libxl/libxl_xshelp.c Fri Aug 03 09:54:15 2012 +0100 +++ b/tools/libxl/libxl_xshelp.c Fri Aug 03 09:54:16 2012 +0100 @@ -233,7 +233,8 @@ void libxl__xs_transaction_abort(libxl__ *t = 0; } -int libxl__xs_path_cleanup(libxl__gc *gc, xs_transaction_t t, char *user_path) +int libxl__xs_path_cleanup(libxl__gc *gc, xs_transaction_t t, + const char *user_path) { unsigned int nb = 0; char *path, *last, *val; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 20:33:25 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 20:33: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 1SyqSv-0005Uz-Rh; Tue, 07 Aug 2012 20:33:21 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSt-0005Sg-W7 for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:20 +0000 Received: from [85.158.138.51:58570] by server-6.bemta-3.messagelabs.com id 6E/E1-02321-F8B71205; Tue, 07 Aug 2012 20:33:19 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-11.tower-174.messagelabs.com!1344371597!30884359!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8010 invoked from network); 7 Aug 2012 20:33:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2012 20:33:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSr-00041G-7o for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SyqSr-0003JY-6K for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:17 +0000 Message-Id: Date: Tue, 07 Aug 2012 20:33:16 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: remus: mark TODOs more clearly X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1343984053 -3600 # Node ID 646a1deabd189fca948385fc0c0c1d28a7c63664 # Parent f1e7c1142fe515171df742b3748828b758d5f88b libxl: remus: mark TODOs more clearly Change the TODOs in the remus code to "REMUS TODO" which will make them easier to grep for later. AIUI all of these are essential for use of remus in production. Also add a new TODO and a new assert, to check rc on entry to remus_checkpoint_dm_saved. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r f1e7c1142fe5 -r 646a1deabd18 tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Fri Aug 03 09:54:12 2012 +0100 +++ b/tools/libxl/libxl_dom.c Fri Aug 03 09:54:13 2012 +0100 @@ -1110,7 +1110,7 @@ int libxl__toolstack_save(uint32_t domid static int libxl__remus_domain_suspend_callback(void *data) { - /* TODO: Issue disk and network checkpoint reqs. */ + /* REMUS TODO: Issue disk and network checkpoint reqs. */ return libxl__domain_suspend_common_callback(data); } @@ -1124,7 +1124,7 @@ static int libxl__remus_domain_resume_ca if (libxl_domain_resume(CTX, dss->domid, /* Fast Suspend */1)) return 0; - /* TODO: Deal with disk. Start a new network output buffer */ + /* REMUS TODO: Deal with disk. Start a new network output buffer */ return 1; } @@ -1151,8 +1151,9 @@ static void libxl__remus_domain_checkpoi static void remus_checkpoint_dm_saved(libxl__egc *egc, libxl__domain_suspend_state *dss, int rc) { - /* TODO: Wait for disk and memory ack, release network buffer */ - /* TODO: make this asynchronous */ + /* REMUS TODO: Wait for disk and memory ack, release network buffer */ + /* REMUS TODO: make this asynchronous */ + assert(!rc); /* REMUS TODO handle this error properly */ usleep(dss->interval * 1000); libxl__xc_domain_saverestore_async_callback_done(egc, &dss->shs, 1); } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 20:33:25 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 20:33: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 1SyqSy-0005Xo-RF; Tue, 07 Aug 2012 20:33:24 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSx-0005Qw-OS for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:24 +0000 Received: from [85.158.143.35:34031] by server-2.bemta-4.messagelabs.com id A0/26-17938-19B71205; Tue, 07 Aug 2012 20:33:21 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-21.messagelabs.com!1344371594!17271160!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15814 invoked from network); 7 Aug 2012 20:33:15 -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; 7 Aug 2012 20:33:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSo-000411-HO for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SyqSo-0003IK-Fr for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:14 +0000 Message-Id: Date: Tue, 07 Aug 2012 20:33:13 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: fix device counting race in libxl__devices_destroy X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1343984049 -3600 # Node ID 7697fc6ff332b9d4be4b54a959352fe509573bfb # Parent ba32a6202e64a59d1ae9622e740d73faf54c77ba libxl: fix device counting race in libxl__devices_destroy Don't have a fixed number of devices in the aodevs array, and instead size it depending on the devices present in xenstore. Somewhat formalise the multiple device addition/removal machinery to make this clearer and easier to do. As a side-effect we fix a few "lost thread of control" bug which would occur if there were no devices of a particular kind. (Various if statements which checked for there being no devices have become redundant, but are retained to avoid making the patch bigger.) Specifically: * Users of libxl__ao_devices are no longer expected to know in advance how many device operations they are going to do. Instead they can initiate them one at a time, between bracketing calls to "begin" and "prepared". * The array of aodevs used for this is dynamically sized; to support this it's an array of pointers rather than of structs. * Users of libxl__ao_devices are presented with a more opaque interface. They are are no longer expected to, themselves, - look into the array of aodevs (this is now private) - know that the individual addition/removal completions are handled by libxl__ao_devices_callback (this callback function is now a private function for the multidev machinery) - ever deal with populating the contents of an aodevs * The doc comments relating to some of the members of libxl__ao_device are clarified. (And the member `aodevs' is moved to put it with the other members with the same status.) * The multidev machinery allocates an aodev to represent the operation of preparing all of the other operations. See the comment in libxl__multidev_begin. A wrinkle is that the functions are called "multidev" but the structs are called "libxl__ao_devices" and "aodevs". I have given these functions this name to distinguish them from "libxl__ao_device" and "aodev" and so forth by more than just the use of the plural "s" suffix. In the next patch we will rename the structs. Signed-off-by: Roger Pau Monne Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r ba32a6202e64 -r 7697fc6ff332 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Fri Aug 03 09:54:08 2012 +0100 +++ b/tools/libxl/libxl_create.c Fri Aug 03 09:54:09 2012 +0100 @@ -909,10 +909,10 @@ static void domcreate_rebuild_done(libxl store_libxl_entry(gc, domid, &d_config->b_info); - dcs->aodevs.size = d_config->num_disks; + libxl__multidev_begin(ao, &dcs->aodevs); dcs->aodevs.callback = domcreate_launch_dm; - libxl__prepare_ao_devices(ao, &dcs->aodevs); libxl__add_disks(egc, ao, domid, 0, d_config, &dcs->aodevs); + libxl__multidev_prepared(egc, &dcs->aodevs, 0); return; @@ -1039,10 +1039,10 @@ static void domcreate_devmodel_started(l /* Plug nic interfaces */ if (d_config->num_nics > 0) { /* Attach nics */ - dcs->aodevs.size = d_config->num_nics; + libxl__multidev_begin(ao, &dcs->aodevs); dcs->aodevs.callback = domcreate_attach_pci; - libxl__prepare_ao_devices(ao, &dcs->aodevs); libxl__add_nics(egc, ao, domid, 0, d_config, &dcs->aodevs); + libxl__multidev_prepared(egc, &dcs->aodevs, 0); return; } diff -r ba32a6202e64 -r 7697fc6ff332 tools/libxl/libxl_device.c --- a/tools/libxl/libxl_device.c Fri Aug 03 09:54:08 2012 +0100 +++ b/tools/libxl/libxl_device.c Fri Aug 03 09:54:09 2012 +0100 @@ -58,50 +58,6 @@ int libxl__parse_backend_path(libxl__gc return libxl__device_kind_from_string(strkind, &dev->backend_kind); } -static int libxl__num_devices(libxl__gc *gc, uint32_t domid) -{ - char *path; - unsigned int num_kinds, num_devs; - char **kinds = NULL, **devs = NULL; - int i, j, rc = 0; - libxl__device dev; - libxl__device_kind kind; - int numdevs = 0; - - path = GCSPRINTF("/local/domain/%d/device", domid); - kinds = libxl__xs_directory(gc, XBT_NULL, path, &num_kinds); - if (!kinds) { - if (errno != ENOENT) { - LOGE(ERROR, "unable to get xenstore device listing %s", path); - rc = ERROR_FAIL; - goto out; - } - num_kinds = 0; - } - for (i = 0; i < num_kinds; i++) { - if (libxl__device_kind_from_string(kinds[i], &kind)) - continue; - if (kind == LIBXL__DEVICE_KIND_CONSOLE) - continue; - - path = GCSPRINTF("/local/domain/%d/device/%s", domid, kinds[i]); - devs = libxl__xs_directory(gc, XBT_NULL, path, &num_devs); - if (!devs) - continue; - for (j = 0; j < num_devs; j++) { - path = GCSPRINTF("/local/domain/%d/device/%s/%s/backend", - domid, kinds[i], devs[j]); - path = libxl__xs_read(gc, XBT_NULL, path); - if (path && libxl__parse_backend_path(gc, path, &dev) == 0) { - numdevs++; - } - } - } -out: - if (rc) return rc; - return numdevs; -} - int libxl__nic_type(libxl__gc *gc, libxl__device *dev, libxl_nic_type *nictype) { char *snictype, *be_path; @@ -445,40 +401,81 @@ void libxl__prepare_ao_device(libxl__ao libxl__ev_child_init(&aodev->child); } -void libxl__prepare_ao_devices(libxl__ao *ao, libxl__ao_devices *aodevs) +/* multidev */ + +void libxl__multidev_begin(libxl__ao *ao, libxl__ao_devices *aodevs) { AO_GC; - GCNEW_ARRAY(aodevs->array, aodevs->size); - for (int i = 0; i < aodevs->size; i++) { - aodevs->array[i].aodevs = aodevs; - libxl__prepare_ao_device(ao, &aodevs->array[i]); - } + aodevs->ao = ao; + aodevs->array = 0; + aodevs->used = aodevs->allocd = 0; + + /* We allocate an aodev to represent the operation of preparing + * all of the other operations. This operation is completed when + * we have started all the others (ie, when the user calls + * _prepared). That arranges automatically that + * (i) we do not think we have finished even if one of the + * operations completes while we are still preparing + * (ii) if we are starting zero operations, we do still + * make the callback as soon as we know this fact + * (iii) we have a nice consistent way to deal with any + * error that might occur while deciding what to initiate + */ + aodevs->preparation = libxl__multidev_prepare(aodevs); } -void libxl__ao_devices_callback(libxl__egc *egc, libxl__ao_device *aodev) +static void multidev_one_callback(libxl__egc *egc, libxl__ao_device *aodev); + +libxl__ao_device *libxl__multidev_prepare(libxl__ao_devices *aodevs) { + STATE_AO_GC(aodevs->ao); + libxl__ao_device *aodev; + + GCNEW(aodev); + aodev->aodevs = aodevs; + aodev->callback = multidev_one_callback; + libxl__prepare_ao_device(ao, aodev); + + if (aodevs->used >= aodevs->allocd) { + aodevs->allocd = aodevs->used * 2 + 5; + GCREALLOC_ARRAY(aodevs->array, aodevs->allocd); + } + aodevs->array[aodevs->used++] = aodev; + + return aodev; +} + +static void multidev_one_callback(libxl__egc *egc, libxl__ao_device *aodev) { STATE_AO_GC(aodev->ao); libxl__ao_devices *aodevs = aodev->aodevs; int i, error = 0; aodev->active = 0; - for (i = 0; i < aodevs->size; i++) { - if (aodevs->array[i].active) + + for (i = 0; i < aodevs->used; i++) { + if (aodevs->array[i]->active) return; - if (aodevs->array[i].rc) - error = aodevs->array[i].rc; + if (aodevs->array[i]->rc) + error = aodevs->array[i]->rc; } aodevs->callback(egc, aodevs, error); return; } +void libxl__multidev_prepared(libxl__egc *egc, libxl__ao_devices *aodevs, + int rc) +{ + aodevs->preparation->rc = rc; + multidev_one_callback(egc, aodevs->preparation); +} + /******************************************************************************/ /* Macro for defining the functions that will add a bunch of disks when - * inside an async op. + * inside an async op with multidev. * This macro is added to prevent repetition of code. * * The following functions are defined: @@ -495,9 +492,9 @@ void libxl__ao_devices_callback(libxl__e int i; \ int end = start + d_config->num_##type##s; \ for (i = start; i < end; i++) { \ - aodevs->array[i].callback = libxl__ao_devices_callback; \ + libxl__ao_device *aodev = libxl__multidev_prepare(aodevs); \ libxl__device_##type##_add(egc, domid, &d_config->type##s[i-start],\ - &aodevs->array[i]); \ + aodev); \ } \ } @@ -547,20 +544,13 @@ void libxl__devices_destroy(libxl__egc * char *path; unsigned int num_kinds, num_dev_xsentries; char **kinds = NULL, **devs = NULL; - int i, j, numdev = 0, rc = 0; + int i, j, rc = 0; libxl__device *dev; libxl__ao_devices *aodevs = &drs->aodevs; libxl__ao_device *aodev; libxl__device_kind kind; - aodevs->size = libxl__num_devices(gc, drs->domid); - if (aodevs->size < 0) { - LOG(ERROR, "unable to get number of devices for domain %u", drs->domid); - rc = aodevs->size; - goto out; - } - - libxl__prepare_ao_devices(drs->ao, aodevs); + libxl__multidev_begin(ao, aodevs); aodevs->callback = devices_remove_callback; path = libxl__sprintf(gc, "/local/domain/%d/device", domid); @@ -598,13 +588,11 @@ void libxl__devices_destroy(libxl__egc * libxl__device_destroy(gc, dev); continue; } - aodev = &aodevs->array[numdev]; + aodev = libxl__multidev_prepare(aodevs); aodev->action = DEVICE_DISCONNECT; aodev->dev = dev; - aodev->callback = libxl__ao_devices_callback; aodev->force = drs->force; libxl__initiate_device_remove(egc, aodev); - numdev++; } } } @@ -626,8 +614,7 @@ void libxl__devices_destroy(libxl__egc * } out: - if (!numdev) drs->callback(egc, drs, rc); - return; + libxl__multidev_prepared(egc, aodevs, rc); } /* Callbacks for device related operations */ diff -r ba32a6202e64 -r 7697fc6ff332 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Fri Aug 03 09:54:08 2012 +0100 +++ b/tools/libxl/libxl_dm.c Fri Aug 03 09:54:09 2012 +0100 @@ -856,10 +856,10 @@ retry_transaction: if (errno == EAGAIN) goto retry_transaction; - sdss->aodevs.size = dm_config->num_disks; + libxl__multidev_begin(ao, &sdss->aodevs); sdss->aodevs.callback = spawn_stub_launch_dm; - libxl__prepare_ao_devices(ao, &sdss->aodevs); libxl__add_disks(egc, ao, dm_domid, 0, dm_config, &sdss->aodevs); + libxl__multidev_prepared(egc, &sdss->aodevs, 0); free(args); return; @@ -982,10 +982,10 @@ static void spawn_stubdom_pvqemu_cb(libx if (rc) goto out; if (d_config->num_nics > 0) { - sdss->aodevs.size = d_config->num_nics; + libxl__multidev_begin(ao, &sdss->aodevs); sdss->aodevs.callback = stubdom_pvqemu_cb; - libxl__prepare_ao_devices(ao, &sdss->aodevs); libxl__add_nics(egc, ao, dm_domid, 0, d_config, &sdss->aodevs); + libxl__multidev_prepared(egc, &sdss->aodevs, 0); return; } diff -r ba32a6202e64 -r 7697fc6ff332 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri Aug 03 09:54:08 2012 +0100 +++ b/tools/libxl/libxl_internal.h Fri Aug 03 09:54:09 2012 +0100 @@ -1816,20 +1816,6 @@ typedef void libxl__device_callback(libx */ _hidden void libxl__prepare_ao_device(libxl__ao *ao, libxl__ao_device *aodev); -/* Prepare a bunch of devices for addition/removal. Every ao_device in - * ao_devices is set to 'active', and the ao_device 'base' field is set to - * the one pointed by aodevs. - */ -_hidden void libxl__prepare_ao_devices(libxl__ao *ao, - libxl__ao_devices *aodevs); - -/* Generic callback to use when adding/removing several devices, this will - * check if the given aodev is the last one, and call the callback in the - * parent libxl__ao_devices struct, passing the appropriate error if found. - */ -_hidden void libxl__ao_devices_callback(libxl__egc *egc, - libxl__ao_device *aodev); - struct libxl__ao_device { /* filled in by user */ libxl__ao *ao; @@ -1837,32 +1823,60 @@ struct libxl__ao_device { libxl__device *dev; int force; libxl__device_callback *callback; - /* private for implementation */ + /* return value, zeroed by user on entry, is valid on callback */ + int rc; + /* private for multidev */ int active; - int rc; + libxl__ao_devices *aodevs; /* reference to the containing multidev */ + /* private for add/remove implementation */ libxl__ev_devstate backend_ds; /* Bodge for Qemu devices, also used for timeout of hotplug execution */ libxl__ev_time timeout; - /* Used internally to have a reference to the upper libxl__ao_devices - * struct when present */ - libxl__ao_devices *aodevs; /* device hotplug execution */ const char *what; int num_exec; libxl__ev_child child; }; -/* Helper struct to simply the plug/unplug of multiple devices at the same - * time. +/* + * Multiple devices "multidev" handling. * - * This structure holds several devices, and the callback is only called - * when all the devices inside of the array have finished. + * Firstly, you should + * libxl__multidev_begin + * multidev->callback = ... + * Then zero or more times + * libxl__multidev_prepare + * libal__initiate_device_{remove/addition}. + * Finally, once + * libxl__multidev_prepared + * which will result (perhaps reentrantly) in one call to callback(). */ + +/* Starts preparing to add/remove a bunch of devices. */ +_hidden void libxl__multidev_begin(libxl__ao *ao, libxl__ao_devices*); + +/* Prepares to add/remove one of many devices. Returns a libxl__ao_device + * which has had libxl__prepare_ao_device called, and which has also + * had ->callback set. The user should not mess with aodev->callback. */ +_hidden libxl__ao_device *libxl__multidev_prepare(libxl__ao_devices*); + +/* Notifies the multidev machinery that we have now finished preparing + * and initiating devices. multidev->callback may then be called as + * soon as there are no prepared but not completed operations + * outstanding, perhaps reentrantly. If rc!=0 (error should have been + * logged) multidev->callback will get a non-zero rc. + * callback may be set by the user at any point before prepared. */ +_hidden void libxl__multidev_prepared(libxl__egc*, libxl__ao_devices*, int rc); + typedef void libxl__devices_callback(libxl__egc*, libxl__ao_devices*, int rc); struct libxl__ao_devices { - libxl__ao_device *array; - int size; + /* set by user: */ libxl__devices_callback *callback; + /* for private use by libxl__...ao_devices... machinery: */ + libxl__ao *ao; + libxl__ao_device **array; + int used, allocd; + libxl__ao_device *preparation; }; /* @@ -2372,10 +2386,11 @@ _hidden void libxl__devices_destroy(libx libxl__devices_remove_state *drs); /* Helper function to add a bunch of disks. This should be used when - * the caller is inside an async op. "devices" will NOT be prepared by this - * function, so the caller must make sure to call _prepare before calling this - * function. The start parameter contains the position inside the aodevs array - * that should be used to store the state of this devices. + * the caller is inside an async op. "devices" will NOT be prepared by + * this function, so the caller must make sure to call + * libxl__multidev_begin before calling this function. The start + * parameter contains the position inside the aodevs array that should + * be used to store the state of this devices. * * The "callback" will be called for each device, and the user is responsible * for calling libxl__ao_device_check_last on the callback. _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 20:33:25 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 20:33: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 1SyqSy-0005Ww-8d; Tue, 07 Aug 2012 20:33:24 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSw-0005Rf-73 for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:22 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-27.messagelabs.com!1344371590!9577753!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11951 invoked from network); 7 Aug 2012 20:33:12 -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; 7 Aug 2012 20:33:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSi-00040U-MZ for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SyqSi-0003Fc-EC for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:08 +0000 Message-Id: Date: Tue, 07 Aug 2012 20:33:07 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xen: detect compiler version with '--version' rather than '-v' X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Tim Deegan # Date 1343905471 -3600 # Node ID 90bc5e0a67b5ba896bd9cf1f92b345793010adc3 # Parent 3d17148e465ce87ddd8f555a001280348d848419 xen: detect compiler version with '--version' rather than '-v' This allows us to get rid of the 'grep version', which doesn't work with localized compilers. Signed-off-by: Tim Deegan Acked-by: Keir Fraser Committed-by: Tim Deegan --- diff -r 3d17148e465c -r 90bc5e0a67b5 xen/Makefile --- a/xen/Makefile Thu Aug 02 11:49:37 2012 +0200 +++ b/xen/Makefile Thu Aug 02 12:04:31 2012 +0100 @@ -103,7 +103,7 @@ include/xen/compile.h: include/xen/compi -e 's/@@whoami@@/$(XEN_WHOAMI)/g' \ -e 's/@@domain@@/$(XEN_DOMAIN)/g' \ -e 's/@@hostname@@/$(shell hostname)/g' \ - -e 's!@@compiler@@!$(shell $(CC) $(CFLAGS) -v 2>&1 | grep version | tail -1)!g' \ + -e 's!@@compiler@@!$(shell $(CC) $(CFLAGS) --version 2>&1 | head -1)!g' \ -e 's/@@version@@/$(XEN_VERSION)/g' \ -e 's/@@subversion@@/$(XEN_SUBVERSION)/g' \ -e 's/@@extraversion@@/$(XEN_EXTRAVERSION)/g' \ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 20:33:25 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 20:33: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 1SyqSy-0005Ww-8d; Tue, 07 Aug 2012 20:33:24 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSw-0005Rf-73 for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:22 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-27.messagelabs.com!1344371590!9577753!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11951 invoked from network); 7 Aug 2012 20:33:12 -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; 7 Aug 2012 20:33:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSi-00040U-MZ for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SyqSi-0003Fc-EC for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:08 +0000 Message-Id: Date: Tue, 07 Aug 2012 20:33:07 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xen: detect compiler version with '--version' rather than '-v' X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Tim Deegan # Date 1343905471 -3600 # Node ID 90bc5e0a67b5ba896bd9cf1f92b345793010adc3 # Parent 3d17148e465ce87ddd8f555a001280348d848419 xen: detect compiler version with '--version' rather than '-v' This allows us to get rid of the 'grep version', which doesn't work with localized compilers. Signed-off-by: Tim Deegan Acked-by: Keir Fraser Committed-by: Tim Deegan --- diff -r 3d17148e465c -r 90bc5e0a67b5 xen/Makefile --- a/xen/Makefile Thu Aug 02 11:49:37 2012 +0200 +++ b/xen/Makefile Thu Aug 02 12:04:31 2012 +0100 @@ -103,7 +103,7 @@ include/xen/compile.h: include/xen/compi -e 's/@@whoami@@/$(XEN_WHOAMI)/g' \ -e 's/@@domain@@/$(XEN_DOMAIN)/g' \ -e 's/@@hostname@@/$(shell hostname)/g' \ - -e 's!@@compiler@@!$(shell $(CC) $(CFLAGS) -v 2>&1 | grep version | tail -1)!g' \ + -e 's!@@compiler@@!$(shell $(CC) $(CFLAGS) --version 2>&1 | head -1)!g' \ -e 's/@@version@@/$(XEN_VERSION)/g' \ -e 's/@@subversion@@/$(XEN_SUBVERSION)/g' \ -e 's/@@extraversion@@/$(XEN_EXTRAVERSION)/g' \ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 20:33:25 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 20:33: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 1SyqSy-0005Xo-RF; Tue, 07 Aug 2012 20:33:24 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSx-0005Qw-OS for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:24 +0000 Received: from [85.158.143.35:34031] by server-2.bemta-4.messagelabs.com id A0/26-17938-19B71205; Tue, 07 Aug 2012 20:33:21 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-21.messagelabs.com!1344371594!17271160!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15814 invoked from network); 7 Aug 2012 20:33:15 -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; 7 Aug 2012 20:33:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSo-000411-HO for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SyqSo-0003IK-Fr for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:14 +0000 Message-Id: Date: Tue, 07 Aug 2012 20:33:13 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: fix device counting race in libxl__devices_destroy X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1343984049 -3600 # Node ID 7697fc6ff332b9d4be4b54a959352fe509573bfb # Parent ba32a6202e64a59d1ae9622e740d73faf54c77ba libxl: fix device counting race in libxl__devices_destroy Don't have a fixed number of devices in the aodevs array, and instead size it depending on the devices present in xenstore. Somewhat formalise the multiple device addition/removal machinery to make this clearer and easier to do. As a side-effect we fix a few "lost thread of control" bug which would occur if there were no devices of a particular kind. (Various if statements which checked for there being no devices have become redundant, but are retained to avoid making the patch bigger.) Specifically: * Users of libxl__ao_devices are no longer expected to know in advance how many device operations they are going to do. Instead they can initiate them one at a time, between bracketing calls to "begin" and "prepared". * The array of aodevs used for this is dynamically sized; to support this it's an array of pointers rather than of structs. * Users of libxl__ao_devices are presented with a more opaque interface. They are are no longer expected to, themselves, - look into the array of aodevs (this is now private) - know that the individual addition/removal completions are handled by libxl__ao_devices_callback (this callback function is now a private function for the multidev machinery) - ever deal with populating the contents of an aodevs * The doc comments relating to some of the members of libxl__ao_device are clarified. (And the member `aodevs' is moved to put it with the other members with the same status.) * The multidev machinery allocates an aodev to represent the operation of preparing all of the other operations. See the comment in libxl__multidev_begin. A wrinkle is that the functions are called "multidev" but the structs are called "libxl__ao_devices" and "aodevs". I have given these functions this name to distinguish them from "libxl__ao_device" and "aodev" and so forth by more than just the use of the plural "s" suffix. In the next patch we will rename the structs. Signed-off-by: Roger Pau Monne Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r ba32a6202e64 -r 7697fc6ff332 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Fri Aug 03 09:54:08 2012 +0100 +++ b/tools/libxl/libxl_create.c Fri Aug 03 09:54:09 2012 +0100 @@ -909,10 +909,10 @@ static void domcreate_rebuild_done(libxl store_libxl_entry(gc, domid, &d_config->b_info); - dcs->aodevs.size = d_config->num_disks; + libxl__multidev_begin(ao, &dcs->aodevs); dcs->aodevs.callback = domcreate_launch_dm; - libxl__prepare_ao_devices(ao, &dcs->aodevs); libxl__add_disks(egc, ao, domid, 0, d_config, &dcs->aodevs); + libxl__multidev_prepared(egc, &dcs->aodevs, 0); return; @@ -1039,10 +1039,10 @@ static void domcreate_devmodel_started(l /* Plug nic interfaces */ if (d_config->num_nics > 0) { /* Attach nics */ - dcs->aodevs.size = d_config->num_nics; + libxl__multidev_begin(ao, &dcs->aodevs); dcs->aodevs.callback = domcreate_attach_pci; - libxl__prepare_ao_devices(ao, &dcs->aodevs); libxl__add_nics(egc, ao, domid, 0, d_config, &dcs->aodevs); + libxl__multidev_prepared(egc, &dcs->aodevs, 0); return; } diff -r ba32a6202e64 -r 7697fc6ff332 tools/libxl/libxl_device.c --- a/tools/libxl/libxl_device.c Fri Aug 03 09:54:08 2012 +0100 +++ b/tools/libxl/libxl_device.c Fri Aug 03 09:54:09 2012 +0100 @@ -58,50 +58,6 @@ int libxl__parse_backend_path(libxl__gc return libxl__device_kind_from_string(strkind, &dev->backend_kind); } -static int libxl__num_devices(libxl__gc *gc, uint32_t domid) -{ - char *path; - unsigned int num_kinds, num_devs; - char **kinds = NULL, **devs = NULL; - int i, j, rc = 0; - libxl__device dev; - libxl__device_kind kind; - int numdevs = 0; - - path = GCSPRINTF("/local/domain/%d/device", domid); - kinds = libxl__xs_directory(gc, XBT_NULL, path, &num_kinds); - if (!kinds) { - if (errno != ENOENT) { - LOGE(ERROR, "unable to get xenstore device listing %s", path); - rc = ERROR_FAIL; - goto out; - } - num_kinds = 0; - } - for (i = 0; i < num_kinds; i++) { - if (libxl__device_kind_from_string(kinds[i], &kind)) - continue; - if (kind == LIBXL__DEVICE_KIND_CONSOLE) - continue; - - path = GCSPRINTF("/local/domain/%d/device/%s", domid, kinds[i]); - devs = libxl__xs_directory(gc, XBT_NULL, path, &num_devs); - if (!devs) - continue; - for (j = 0; j < num_devs; j++) { - path = GCSPRINTF("/local/domain/%d/device/%s/%s/backend", - domid, kinds[i], devs[j]); - path = libxl__xs_read(gc, XBT_NULL, path); - if (path && libxl__parse_backend_path(gc, path, &dev) == 0) { - numdevs++; - } - } - } -out: - if (rc) return rc; - return numdevs; -} - int libxl__nic_type(libxl__gc *gc, libxl__device *dev, libxl_nic_type *nictype) { char *snictype, *be_path; @@ -445,40 +401,81 @@ void libxl__prepare_ao_device(libxl__ao libxl__ev_child_init(&aodev->child); } -void libxl__prepare_ao_devices(libxl__ao *ao, libxl__ao_devices *aodevs) +/* multidev */ + +void libxl__multidev_begin(libxl__ao *ao, libxl__ao_devices *aodevs) { AO_GC; - GCNEW_ARRAY(aodevs->array, aodevs->size); - for (int i = 0; i < aodevs->size; i++) { - aodevs->array[i].aodevs = aodevs; - libxl__prepare_ao_device(ao, &aodevs->array[i]); - } + aodevs->ao = ao; + aodevs->array = 0; + aodevs->used = aodevs->allocd = 0; + + /* We allocate an aodev to represent the operation of preparing + * all of the other operations. This operation is completed when + * we have started all the others (ie, when the user calls + * _prepared). That arranges automatically that + * (i) we do not think we have finished even if one of the + * operations completes while we are still preparing + * (ii) if we are starting zero operations, we do still + * make the callback as soon as we know this fact + * (iii) we have a nice consistent way to deal with any + * error that might occur while deciding what to initiate + */ + aodevs->preparation = libxl__multidev_prepare(aodevs); } -void libxl__ao_devices_callback(libxl__egc *egc, libxl__ao_device *aodev) +static void multidev_one_callback(libxl__egc *egc, libxl__ao_device *aodev); + +libxl__ao_device *libxl__multidev_prepare(libxl__ao_devices *aodevs) { + STATE_AO_GC(aodevs->ao); + libxl__ao_device *aodev; + + GCNEW(aodev); + aodev->aodevs = aodevs; + aodev->callback = multidev_one_callback; + libxl__prepare_ao_device(ao, aodev); + + if (aodevs->used >= aodevs->allocd) { + aodevs->allocd = aodevs->used * 2 + 5; + GCREALLOC_ARRAY(aodevs->array, aodevs->allocd); + } + aodevs->array[aodevs->used++] = aodev; + + return aodev; +} + +static void multidev_one_callback(libxl__egc *egc, libxl__ao_device *aodev) { STATE_AO_GC(aodev->ao); libxl__ao_devices *aodevs = aodev->aodevs; int i, error = 0; aodev->active = 0; - for (i = 0; i < aodevs->size; i++) { - if (aodevs->array[i].active) + + for (i = 0; i < aodevs->used; i++) { + if (aodevs->array[i]->active) return; - if (aodevs->array[i].rc) - error = aodevs->array[i].rc; + if (aodevs->array[i]->rc) + error = aodevs->array[i]->rc; } aodevs->callback(egc, aodevs, error); return; } +void libxl__multidev_prepared(libxl__egc *egc, libxl__ao_devices *aodevs, + int rc) +{ + aodevs->preparation->rc = rc; + multidev_one_callback(egc, aodevs->preparation); +} + /******************************************************************************/ /* Macro for defining the functions that will add a bunch of disks when - * inside an async op. + * inside an async op with multidev. * This macro is added to prevent repetition of code. * * The following functions are defined: @@ -495,9 +492,9 @@ void libxl__ao_devices_callback(libxl__e int i; \ int end = start + d_config->num_##type##s; \ for (i = start; i < end; i++) { \ - aodevs->array[i].callback = libxl__ao_devices_callback; \ + libxl__ao_device *aodev = libxl__multidev_prepare(aodevs); \ libxl__device_##type##_add(egc, domid, &d_config->type##s[i-start],\ - &aodevs->array[i]); \ + aodev); \ } \ } @@ -547,20 +544,13 @@ void libxl__devices_destroy(libxl__egc * char *path; unsigned int num_kinds, num_dev_xsentries; char **kinds = NULL, **devs = NULL; - int i, j, numdev = 0, rc = 0; + int i, j, rc = 0; libxl__device *dev; libxl__ao_devices *aodevs = &drs->aodevs; libxl__ao_device *aodev; libxl__device_kind kind; - aodevs->size = libxl__num_devices(gc, drs->domid); - if (aodevs->size < 0) { - LOG(ERROR, "unable to get number of devices for domain %u", drs->domid); - rc = aodevs->size; - goto out; - } - - libxl__prepare_ao_devices(drs->ao, aodevs); + libxl__multidev_begin(ao, aodevs); aodevs->callback = devices_remove_callback; path = libxl__sprintf(gc, "/local/domain/%d/device", domid); @@ -598,13 +588,11 @@ void libxl__devices_destroy(libxl__egc * libxl__device_destroy(gc, dev); continue; } - aodev = &aodevs->array[numdev]; + aodev = libxl__multidev_prepare(aodevs); aodev->action = DEVICE_DISCONNECT; aodev->dev = dev; - aodev->callback = libxl__ao_devices_callback; aodev->force = drs->force; libxl__initiate_device_remove(egc, aodev); - numdev++; } } } @@ -626,8 +614,7 @@ void libxl__devices_destroy(libxl__egc * } out: - if (!numdev) drs->callback(egc, drs, rc); - return; + libxl__multidev_prepared(egc, aodevs, rc); } /* Callbacks for device related operations */ diff -r ba32a6202e64 -r 7697fc6ff332 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Fri Aug 03 09:54:08 2012 +0100 +++ b/tools/libxl/libxl_dm.c Fri Aug 03 09:54:09 2012 +0100 @@ -856,10 +856,10 @@ retry_transaction: if (errno == EAGAIN) goto retry_transaction; - sdss->aodevs.size = dm_config->num_disks; + libxl__multidev_begin(ao, &sdss->aodevs); sdss->aodevs.callback = spawn_stub_launch_dm; - libxl__prepare_ao_devices(ao, &sdss->aodevs); libxl__add_disks(egc, ao, dm_domid, 0, dm_config, &sdss->aodevs); + libxl__multidev_prepared(egc, &sdss->aodevs, 0); free(args); return; @@ -982,10 +982,10 @@ static void spawn_stubdom_pvqemu_cb(libx if (rc) goto out; if (d_config->num_nics > 0) { - sdss->aodevs.size = d_config->num_nics; + libxl__multidev_begin(ao, &sdss->aodevs); sdss->aodevs.callback = stubdom_pvqemu_cb; - libxl__prepare_ao_devices(ao, &sdss->aodevs); libxl__add_nics(egc, ao, dm_domid, 0, d_config, &sdss->aodevs); + libxl__multidev_prepared(egc, &sdss->aodevs, 0); return; } diff -r ba32a6202e64 -r 7697fc6ff332 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri Aug 03 09:54:08 2012 +0100 +++ b/tools/libxl/libxl_internal.h Fri Aug 03 09:54:09 2012 +0100 @@ -1816,20 +1816,6 @@ typedef void libxl__device_callback(libx */ _hidden void libxl__prepare_ao_device(libxl__ao *ao, libxl__ao_device *aodev); -/* Prepare a bunch of devices for addition/removal. Every ao_device in - * ao_devices is set to 'active', and the ao_device 'base' field is set to - * the one pointed by aodevs. - */ -_hidden void libxl__prepare_ao_devices(libxl__ao *ao, - libxl__ao_devices *aodevs); - -/* Generic callback to use when adding/removing several devices, this will - * check if the given aodev is the last one, and call the callback in the - * parent libxl__ao_devices struct, passing the appropriate error if found. - */ -_hidden void libxl__ao_devices_callback(libxl__egc *egc, - libxl__ao_device *aodev); - struct libxl__ao_device { /* filled in by user */ libxl__ao *ao; @@ -1837,32 +1823,60 @@ struct libxl__ao_device { libxl__device *dev; int force; libxl__device_callback *callback; - /* private for implementation */ + /* return value, zeroed by user on entry, is valid on callback */ + int rc; + /* private for multidev */ int active; - int rc; + libxl__ao_devices *aodevs; /* reference to the containing multidev */ + /* private for add/remove implementation */ libxl__ev_devstate backend_ds; /* Bodge for Qemu devices, also used for timeout of hotplug execution */ libxl__ev_time timeout; - /* Used internally to have a reference to the upper libxl__ao_devices - * struct when present */ - libxl__ao_devices *aodevs; /* device hotplug execution */ const char *what; int num_exec; libxl__ev_child child; }; -/* Helper struct to simply the plug/unplug of multiple devices at the same - * time. +/* + * Multiple devices "multidev" handling. * - * This structure holds several devices, and the callback is only called - * when all the devices inside of the array have finished. + * Firstly, you should + * libxl__multidev_begin + * multidev->callback = ... + * Then zero or more times + * libxl__multidev_prepare + * libal__initiate_device_{remove/addition}. + * Finally, once + * libxl__multidev_prepared + * which will result (perhaps reentrantly) in one call to callback(). */ + +/* Starts preparing to add/remove a bunch of devices. */ +_hidden void libxl__multidev_begin(libxl__ao *ao, libxl__ao_devices*); + +/* Prepares to add/remove one of many devices. Returns a libxl__ao_device + * which has had libxl__prepare_ao_device called, and which has also + * had ->callback set. The user should not mess with aodev->callback. */ +_hidden libxl__ao_device *libxl__multidev_prepare(libxl__ao_devices*); + +/* Notifies the multidev machinery that we have now finished preparing + * and initiating devices. multidev->callback may then be called as + * soon as there are no prepared but not completed operations + * outstanding, perhaps reentrantly. If rc!=0 (error should have been + * logged) multidev->callback will get a non-zero rc. + * callback may be set by the user at any point before prepared. */ +_hidden void libxl__multidev_prepared(libxl__egc*, libxl__ao_devices*, int rc); + typedef void libxl__devices_callback(libxl__egc*, libxl__ao_devices*, int rc); struct libxl__ao_devices { - libxl__ao_device *array; - int size; + /* set by user: */ libxl__devices_callback *callback; + /* for private use by libxl__...ao_devices... machinery: */ + libxl__ao *ao; + libxl__ao_device **array; + int used, allocd; + libxl__ao_device *preparation; }; /* @@ -2372,10 +2386,11 @@ _hidden void libxl__devices_destroy(libx libxl__devices_remove_state *drs); /* Helper function to add a bunch of disks. This should be used when - * the caller is inside an async op. "devices" will NOT be prepared by this - * function, so the caller must make sure to call _prepare before calling this - * function. The start parameter contains the position inside the aodevs array - * that should be used to store the state of this devices. + * the caller is inside an async op. "devices" will NOT be prepared by + * this function, so the caller must make sure to call + * libxl__multidev_begin before calling this function. The start + * parameter contains the position inside the aodevs array that should + * be used to store the state of this devices. * * The "callback" will be called for each device, and the user is responsible * for calling libxl__ao_device_check_last on the callback. _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 20:33:25 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 20:33: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 1SyqSy-0005Xx-Tc; Tue, 07 Aug 2012 20:33:24 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSy-0005SU-5n for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:24 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-27.messagelabs.com!1344371596!12699043!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28852 invoked from network); 7 Aug 2012 20:33:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2012 20:33:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSq-00041D-Mu for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SyqSq-0003JJ-Li for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:16 +0000 Message-Id: Date: Tue, 07 Aug 2012 20:33:16 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: do not blunder on if bootloader fails (again) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1343984052 -3600 # Node ID f1e7c1142fe515171df742b3748828b758d5f88b # Parent a1b583ffbcb0503ad3907253c41986bd65f56ac7 libxl: do not blunder on if bootloader fails (again) Do not lose the rc value passed to bootloader_callback. Do not lose the rc value from the bl when the local disk detach succeeds. While we're here rationalise the use of bl->rc to make things clearer. Set it to zero at the start and always update it conditionally; copy it into bootloader_callback's argument each time. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r a1b583ffbcb0 -r f1e7c1142fe5 tools/libxl/libxl_bootloader.c --- a/tools/libxl/libxl_bootloader.c Fri Aug 03 09:54:11 2012 +0100 +++ b/tools/libxl/libxl_bootloader.c Fri Aug 03 09:54:12 2012 +0100 @@ -206,6 +206,7 @@ static int parse_bootloader_result(libxl void libxl__bootloader_init(libxl__bootloader_state *bl) { assert(bl->ao); + bl->rc = 0; bl->dls.diskpath = NULL; bl->openpty.ao = bl->ao; bl->dls.ao = bl->ao; @@ -255,6 +256,9 @@ static void bootloader_local_detached_cb static void bootloader_callback(libxl__egc *egc, libxl__bootloader_state *bl, int rc) { + if (!bl->rc) + bl->rc = rc; + bootloader_cleanup(egc, bl); bl->dls.callback = bootloader_local_detached_cb; @@ -270,9 +274,11 @@ static void bootloader_local_detached_cb if (rc) { LOG(ERROR, "unable to detach locally attached disk"); + if (!bl->rc) + bl->rc = rc; } - bl->callback(egc, bl, rc); + bl->callback(egc, bl, bl->rc); } /* might be called at any time, provided it's init'd */ @@ -289,7 +295,8 @@ static void bootloader_stop(libxl__egc * if (r) LOGE(WARN, "%sfailed to kill bootloader [%lu]", rc ? "after failure, " : "", (unsigned long)bl->child.pid); } - bl->rc = rc; + if (!bl->rc) + bl->rc = rc; } /*----- main flow of control -----*/ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 20:33:25 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 20:33: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 1SyqSy-0005Xx-Tc; Tue, 07 Aug 2012 20:33:24 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSy-0005SU-5n for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:24 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-27.messagelabs.com!1344371596!12699043!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28852 invoked from network); 7 Aug 2012 20:33:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2012 20:33:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSq-00041D-Mu for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SyqSq-0003JJ-Li for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:16 +0000 Message-Id: Date: Tue, 07 Aug 2012 20:33:16 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: do not blunder on if bootloader fails (again) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1343984052 -3600 # Node ID f1e7c1142fe515171df742b3748828b758d5f88b # Parent a1b583ffbcb0503ad3907253c41986bd65f56ac7 libxl: do not blunder on if bootloader fails (again) Do not lose the rc value passed to bootloader_callback. Do not lose the rc value from the bl when the local disk detach succeeds. While we're here rationalise the use of bl->rc to make things clearer. Set it to zero at the start and always update it conditionally; copy it into bootloader_callback's argument each time. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r a1b583ffbcb0 -r f1e7c1142fe5 tools/libxl/libxl_bootloader.c --- a/tools/libxl/libxl_bootloader.c Fri Aug 03 09:54:11 2012 +0100 +++ b/tools/libxl/libxl_bootloader.c Fri Aug 03 09:54:12 2012 +0100 @@ -206,6 +206,7 @@ static int parse_bootloader_result(libxl void libxl__bootloader_init(libxl__bootloader_state *bl) { assert(bl->ao); + bl->rc = 0; bl->dls.diskpath = NULL; bl->openpty.ao = bl->ao; bl->dls.ao = bl->ao; @@ -255,6 +256,9 @@ static void bootloader_local_detached_cb static void bootloader_callback(libxl__egc *egc, libxl__bootloader_state *bl, int rc) { + if (!bl->rc) + bl->rc = rc; + bootloader_cleanup(egc, bl); bl->dls.callback = bootloader_local_detached_cb; @@ -270,9 +274,11 @@ static void bootloader_local_detached_cb if (rc) { LOG(ERROR, "unable to detach locally attached disk"); + if (!bl->rc) + bl->rc = rc; } - bl->callback(egc, bl, rc); + bl->callback(egc, bl, bl->rc); } /* might be called at any time, provided it's init'd */ @@ -289,7 +295,8 @@ static void bootloader_stop(libxl__egc * if (r) LOGE(WARN, "%sfailed to kill bootloader [%lu]", rc ? "after failure, " : "", (unsigned long)bl->child.pid); } - bl->rc = rc; + if (!bl->rc) + bl->rc = rc; } /*----- main flow of control -----*/ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 20:33:25 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 20:33: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 1SyqSy-0005X1-BB; Tue, 07 Aug 2012 20:33:24 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSw-0005Rg-75 for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:22 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-27.messagelabs.com!1344371593!11288921!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7725 invoked from network); 7 Aug 2012 20:33:14 -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; 7 Aug 2012 20:33:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSm-00040p-De for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SyqSm-0003HL-CH for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:12 +0000 Message-Id: Date: Tue, 07 Aug 2012 20:33:11 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: only read script once in libxl__hotplug_* X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1343984046 -3600 # Node ID 428014e272914d21cb2fc63a651a556543242a7d # Parent a3cfa3666857ada79c3fad002a41e382568332b6 libxl: only read script once in libxl__hotplug_* instead of duplicating the error handling etc in get_hotplug_env just pass the script already read by the caller down. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r a3cfa3666857 -r 428014e27291 tools/libxl/libxl_linux.c --- a/tools/libxl/libxl_linux.c Fri Aug 03 09:54:05 2012 +0100 +++ b/tools/libxl/libxl_linux.c Fri Aug 03 09:54:06 2012 +0100 @@ -80,22 +80,14 @@ char *libxl__devid_to_localdev(libxl__gc /* Hotplug scripts helpers */ -static char **get_hotplug_env(libxl__gc *gc, libxl__device *dev) +static char **get_hotplug_env(libxl__gc *gc, + char *script, libxl__device *dev) { - char *be_path = libxl__device_backend_path(gc, dev); - char *script; const char *type = libxl__device_kind_to_string(dev->backend_kind); char **env; int nr = 0; libxl_nic_type nictype; - script = libxl__xs_read(gc, XBT_NULL, - GCSPRINTF("%s/%s", be_path, "script")); - if (!script) { - LOGEV(ERROR, errno, "unable to read script from %s", be_path); - return NULL; - } - const int arraysize = 13; GCNEW_ARRAY(env, arraysize); env[nr++] = "script"; @@ -170,7 +162,7 @@ static int libxl__hotplug_nic(libxl__gc goto out; } - *env = get_hotplug_env(gc, dev); + *env = get_hotplug_env(gc, script, dev); if (!env) { rc = ERROR_FAIL; goto out; @@ -212,7 +204,7 @@ static int libxl__hotplug_disk(libxl__gc goto error; } - *env = get_hotplug_env(gc, dev); + *env = get_hotplug_env(gc, script, dev); if (!*env) { rc = ERROR_FAIL; goto error; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 20:33:25 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 20:33: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 1SyqSy-0005XA-Dw; Tue, 07 Aug 2012 20:33:24 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSw-0005Re-89 for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:22 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-27.messagelabs.com!1344371592!6017190!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25385 invoked from network); 7 Aug 2012 20:33:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2012 20:33:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSk-00040g-SI for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SyqSk-0003Ga-R4 for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:10 +0000 Message-Id: Date: Tue, 07 Aug 2012 20:33:10 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: make libxl_device_pci_{add, remove, destroy} interfaces asynchronous X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1343984043 -3600 # Node ID 65ae31da1c536b2551c6465d796642ba42e594a2 # Parent 7fd5facb608427b7e5890ff10cee8ed0da6a7703 libxl: make libxl_device_pci_{add,remove,destroy} interfaces asynchronous This does not make the implementation fully asynchronous but just updates the API to support asynchrony in the future. Currently although these functions do not call hotplug scripts etc and therefore are not "slow" (per the comment about ao machinery in libxl_internal.h) they do interact with the device model and so are not quite "fast" either. We can live with this for now. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r 7fd5facb6084 -r 65ae31da1c53 tools/libxl/libxl.h --- a/tools/libxl/libxl.h Fri Aug 03 09:50:28 2012 +0200 +++ b/tools/libxl/libxl.h Fri Aug 03 09:54:03 2012 +0100 @@ -757,10 +757,21 @@ int libxl_device_vfb_destroy(libxl_ctx * LIBXL_EXTERNAL_CALLERS_ONLY; /* PCI Passthrough */ -int libxl_device_pci_add(libxl_ctx *ctx, uint32_t domid, libxl_device_pci *pcidev); -int libxl_device_pci_remove(libxl_ctx *ctx, uint32_t domid, libxl_device_pci *pcidev); -int libxl_device_pci_destroy(libxl_ctx *ctx, uint32_t domid, libxl_device_pci *pcidev); -libxl_device_pci *libxl_device_pci_list(libxl_ctx *ctx, uint32_t domid, int *num); +int libxl_device_pci_add(libxl_ctx *ctx, uint32_t domid, + libxl_device_pci *pcidev, + const libxl_asyncop_how *ao_how) + LIBXL_EXTERNAL_CALLERS_ONLY; +int libxl_device_pci_remove(libxl_ctx *ctx, uint32_t domid, + libxl_device_pci *pcidev, + const libxl_asyncop_how *ao_how) + LIBXL_EXTERNAL_CALLERS_ONLY; +int libxl_device_pci_destroy(libxl_ctx *ctx, uint32_t domid, + libxl_device_pci *pcidev, + const libxl_asyncop_how *ao_how) + LIBXL_EXTERNAL_CALLERS_ONLY; + +libxl_device_pci *libxl_device_pci_list(libxl_ctx *ctx, uint32_t domid, + int *num); /* * Functions related to making devices assignable -- that is, bound to diff -r 7fd5facb6084 -r 65ae31da1c53 tools/libxl/libxl_pci.c --- a/tools/libxl/libxl_pci.c Fri Aug 03 09:50:28 2012 +0200 +++ b/tools/libxl/libxl_pci.c Fri Aug 03 09:54:03 2012 +0100 @@ -1010,13 +1010,15 @@ int libxl__device_pci_setdefault(libxl__ return 0; } -int libxl_device_pci_add(libxl_ctx *ctx, uint32_t domid, libxl_device_pci *pcidev) +int libxl_device_pci_add(libxl_ctx *ctx, uint32_t domid, + libxl_device_pci *pcidev, + const libxl_asyncop_how *ao_how) { - GC_INIT(ctx); + AO_CREATE(ctx, domid, ao_how); int rc; rc = libxl__device_pci_add(gc, domid, pcidev, 0); - GC_FREE; - return rc; + libxl__ao_complete(egc, ao, rc); + return AO_INPROGRESS; } static int libxl_pcidev_assignable(libxl_ctx *ctx, libxl_device_pci *pcidev) @@ -1150,6 +1152,9 @@ static int qemu_pci_remove_xenstore(libx return 0; } +static int libxl__device_pci_remove_common(libxl__gc *gc, uint32_t domid, + libxl_device_pci *pcidev, int force); + static int do_pci_remove(libxl__gc *gc, uint32_t domid, libxl_device_pci *pcidev, int force) { @@ -1263,10 +1268,7 @@ out: stubdomid = libxl_get_stubdom_id(ctx, domid); if (stubdomid != 0) { libxl_device_pci pcidev_s = *pcidev; - if (force) - libxl_device_pci_destroy(ctx, stubdomid, &pcidev_s); - else - libxl_device_pci_remove(ctx, stubdomid, &pcidev_s); + libxl__device_pci_remove_common(gc, stubdomid, &pcidev_s, force); } libxl__device_pci_remove_xenstore(gc, domid, pcidev); @@ -1313,27 +1315,31 @@ out: return rc; } -int libxl_device_pci_remove(libxl_ctx *ctx, uint32_t domid, libxl_device_pci *pcidev) +int libxl_device_pci_remove(libxl_ctx *ctx, uint32_t domid, + libxl_device_pci *pcidev, + const libxl_asyncop_how *ao_how) + { - GC_INIT(ctx); + AO_CREATE(ctx, domid, ao_how); int rc; rc = libxl__device_pci_remove_common(gc, domid, pcidev, 0); - GC_FREE; - return rc; + libxl__ao_complete(egc, ao, rc); + return AO_INPROGRESS; } int libxl_device_pci_destroy(libxl_ctx *ctx, uint32_t domid, - libxl_device_pci *pcidev) + libxl_device_pci *pcidev, + const libxl_asyncop_how *ao_how) { - GC_INIT(ctx); + AO_CREATE(ctx, domid, ao_how); int rc; rc = libxl__device_pci_remove_common(gc, domid, pcidev, 1); - GC_FREE; - return rc; + libxl__ao_complete(egc, ao, rc); + return AO_INPROGRESS; } static void libxl__device_pci_from_xs_be(libxl__gc *gc, @@ -1415,7 +1421,7 @@ int libxl__device_pci_destroy_all(libxl_ * respond to SCI interrupt because the guest kernel has shut down the * devices by the time we even get here! */ - if (libxl_device_pci_destroy(ctx, domid, pcidevs + i) < 0) + if (libxl__device_pci_remove_common(gc, domid, pcidevs + i, 1) < 0) rc = ERROR_FAIL; } diff -r 7fd5facb6084 -r 65ae31da1c53 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Fri Aug 03 09:50:28 2012 +0200 +++ b/tools/libxl/xl_cmdimpl.c Fri Aug 03 09:54:03 2012 +0100 @@ -2389,9 +2389,9 @@ static void pcidetach(const char *dom, c exit(2); } if (force) - libxl_device_pci_destroy(ctx, domid, &pcidev); + libxl_device_pci_destroy(ctx, domid, &pcidev, 0); else - libxl_device_pci_remove(ctx, domid, &pcidev); + libxl_device_pci_remove(ctx, domid, &pcidev, 0); libxl_device_pci_dispose(&pcidev); xlu_cfg_destroy(config); @@ -2435,7 +2435,7 @@ static void pciattach(const char *dom, c fprintf(stderr, "pci-attach: malformed BDF specification \"%s\"\n", bdf); exit(2); } - libxl_device_pci_add(ctx, domid, &pcidev); + libxl_device_pci_add(ctx, domid, &pcidev, 0); libxl_device_pci_dispose(&pcidev); xlu_cfg_destroy(config); diff -r 7fd5facb6084 -r 65ae31da1c53 tools/ocaml/libs/xl/xenlight_stubs.c --- a/tools/ocaml/libs/xl/xenlight_stubs.c Fri Aug 03 09:50:28 2012 +0200 +++ b/tools/ocaml/libs/xl/xenlight_stubs.c Fri Aug 03 09:54:03 2012 +0100 @@ -423,7 +423,7 @@ value stub_xl_device_pci_add(value info, device_pci_val(&gc, &lg, &c_info, info); INIT_CTX(); - ret = libxl_device_pci_add(ctx, Int_val(domid), &c_info); + ret = libxl_device_pci_add(ctx, Int_val(domid), &c_info, 0); if (ret != 0) failwith_xl("pci_add", &lg); FREE_CTX(); @@ -441,7 +441,7 @@ value stub_xl_device_pci_remove(value in device_pci_val(&gc, &lg, &c_info, info); INIT_CTX(); - ret = libxl_device_pci_remove(ctx, Int_val(domid), &c_info); + ret = libxl_device_pci_remove(ctx, Int_val(domid), &c_info, 0); if (ret != 0) failwith_xl("pci_remove", &lg); FREE_CTX(); diff -r 7fd5facb6084 -r 65ae31da1c53 tools/python/xen/lowlevel/xl/xl.c --- a/tools/python/xen/lowlevel/xl/xl.c Fri Aug 03 09:50:28 2012 +0200 +++ b/tools/python/xen/lowlevel/xl/xl.c Fri Aug 03 09:54:03 2012 +0100 @@ -497,7 +497,7 @@ static PyObject *pyxl_pci_add(XlObject * return NULL; } pci = (Py_device_pci *)obj; - if ( libxl_device_pci_add(self->ctx, domid, &pci->obj) ) { + if ( libxl_device_pci_add(self->ctx, domid, &pci->obj, 0) ) { PyErr_SetString(xl_error_obj, "cannot add pci device"); return NULL; } @@ -519,12 +519,12 @@ static PyObject *pyxl_pci_del(XlObject * } pci = (Py_device_pci *)obj; if ( force ) { - if ( libxl_device_pci_destroy(self->ctx, domid, &pci->obj) ) { + if ( libxl_device_pci_destroy(self->ctx, domid, &pci->obj, 0) ) { PyErr_SetString(xl_error_obj, "cannot remove pci device"); return NULL; } } else { - if ( libxl_device_pci_remove(self->ctx, domid, &pci->obj) ) { + if ( libxl_device_pci_remove(self->ctx, domid, &pci->obj, 0) ) { PyErr_SetString(xl_error_obj, "cannot remove pci device"); return NULL; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 20:33:25 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 20:33: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 1SyqSy-0005X1-BB; Tue, 07 Aug 2012 20:33:24 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSw-0005Rg-75 for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:22 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-27.messagelabs.com!1344371593!11288921!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7725 invoked from network); 7 Aug 2012 20:33:14 -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; 7 Aug 2012 20:33:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSm-00040p-De for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SyqSm-0003HL-CH for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:12 +0000 Message-Id: Date: Tue, 07 Aug 2012 20:33:11 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: only read script once in libxl__hotplug_* X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1343984046 -3600 # Node ID 428014e272914d21cb2fc63a651a556543242a7d # Parent a3cfa3666857ada79c3fad002a41e382568332b6 libxl: only read script once in libxl__hotplug_* instead of duplicating the error handling etc in get_hotplug_env just pass the script already read by the caller down. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r a3cfa3666857 -r 428014e27291 tools/libxl/libxl_linux.c --- a/tools/libxl/libxl_linux.c Fri Aug 03 09:54:05 2012 +0100 +++ b/tools/libxl/libxl_linux.c Fri Aug 03 09:54:06 2012 +0100 @@ -80,22 +80,14 @@ char *libxl__devid_to_localdev(libxl__gc /* Hotplug scripts helpers */ -static char **get_hotplug_env(libxl__gc *gc, libxl__device *dev) +static char **get_hotplug_env(libxl__gc *gc, + char *script, libxl__device *dev) { - char *be_path = libxl__device_backend_path(gc, dev); - char *script; const char *type = libxl__device_kind_to_string(dev->backend_kind); char **env; int nr = 0; libxl_nic_type nictype; - script = libxl__xs_read(gc, XBT_NULL, - GCSPRINTF("%s/%s", be_path, "script")); - if (!script) { - LOGEV(ERROR, errno, "unable to read script from %s", be_path); - return NULL; - } - const int arraysize = 13; GCNEW_ARRAY(env, arraysize); env[nr++] = "script"; @@ -170,7 +162,7 @@ static int libxl__hotplug_nic(libxl__gc goto out; } - *env = get_hotplug_env(gc, dev); + *env = get_hotplug_env(gc, script, dev); if (!env) { rc = ERROR_FAIL; goto out; @@ -212,7 +204,7 @@ static int libxl__hotplug_disk(libxl__gc goto error; } - *env = get_hotplug_env(gc, dev); + *env = get_hotplug_env(gc, script, dev); if (!*env) { rc = ERROR_FAIL; goto error; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 20:33:25 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 20:33: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 1SyqSy-0005XA-Dw; Tue, 07 Aug 2012 20:33:24 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSw-0005Re-89 for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:22 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-27.messagelabs.com!1344371592!6017190!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25385 invoked from network); 7 Aug 2012 20:33:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2012 20:33:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSk-00040g-SI for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SyqSk-0003Ga-R4 for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:10 +0000 Message-Id: Date: Tue, 07 Aug 2012 20:33:10 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: make libxl_device_pci_{add, remove, destroy} interfaces asynchronous X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1343984043 -3600 # Node ID 65ae31da1c536b2551c6465d796642ba42e594a2 # Parent 7fd5facb608427b7e5890ff10cee8ed0da6a7703 libxl: make libxl_device_pci_{add,remove,destroy} interfaces asynchronous This does not make the implementation fully asynchronous but just updates the API to support asynchrony in the future. Currently although these functions do not call hotplug scripts etc and therefore are not "slow" (per the comment about ao machinery in libxl_internal.h) they do interact with the device model and so are not quite "fast" either. We can live with this for now. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r 7fd5facb6084 -r 65ae31da1c53 tools/libxl/libxl.h --- a/tools/libxl/libxl.h Fri Aug 03 09:50:28 2012 +0200 +++ b/tools/libxl/libxl.h Fri Aug 03 09:54:03 2012 +0100 @@ -757,10 +757,21 @@ int libxl_device_vfb_destroy(libxl_ctx * LIBXL_EXTERNAL_CALLERS_ONLY; /* PCI Passthrough */ -int libxl_device_pci_add(libxl_ctx *ctx, uint32_t domid, libxl_device_pci *pcidev); -int libxl_device_pci_remove(libxl_ctx *ctx, uint32_t domid, libxl_device_pci *pcidev); -int libxl_device_pci_destroy(libxl_ctx *ctx, uint32_t domid, libxl_device_pci *pcidev); -libxl_device_pci *libxl_device_pci_list(libxl_ctx *ctx, uint32_t domid, int *num); +int libxl_device_pci_add(libxl_ctx *ctx, uint32_t domid, + libxl_device_pci *pcidev, + const libxl_asyncop_how *ao_how) + LIBXL_EXTERNAL_CALLERS_ONLY; +int libxl_device_pci_remove(libxl_ctx *ctx, uint32_t domid, + libxl_device_pci *pcidev, + const libxl_asyncop_how *ao_how) + LIBXL_EXTERNAL_CALLERS_ONLY; +int libxl_device_pci_destroy(libxl_ctx *ctx, uint32_t domid, + libxl_device_pci *pcidev, + const libxl_asyncop_how *ao_how) + LIBXL_EXTERNAL_CALLERS_ONLY; + +libxl_device_pci *libxl_device_pci_list(libxl_ctx *ctx, uint32_t domid, + int *num); /* * Functions related to making devices assignable -- that is, bound to diff -r 7fd5facb6084 -r 65ae31da1c53 tools/libxl/libxl_pci.c --- a/tools/libxl/libxl_pci.c Fri Aug 03 09:50:28 2012 +0200 +++ b/tools/libxl/libxl_pci.c Fri Aug 03 09:54:03 2012 +0100 @@ -1010,13 +1010,15 @@ int libxl__device_pci_setdefault(libxl__ return 0; } -int libxl_device_pci_add(libxl_ctx *ctx, uint32_t domid, libxl_device_pci *pcidev) +int libxl_device_pci_add(libxl_ctx *ctx, uint32_t domid, + libxl_device_pci *pcidev, + const libxl_asyncop_how *ao_how) { - GC_INIT(ctx); + AO_CREATE(ctx, domid, ao_how); int rc; rc = libxl__device_pci_add(gc, domid, pcidev, 0); - GC_FREE; - return rc; + libxl__ao_complete(egc, ao, rc); + return AO_INPROGRESS; } static int libxl_pcidev_assignable(libxl_ctx *ctx, libxl_device_pci *pcidev) @@ -1150,6 +1152,9 @@ static int qemu_pci_remove_xenstore(libx return 0; } +static int libxl__device_pci_remove_common(libxl__gc *gc, uint32_t domid, + libxl_device_pci *pcidev, int force); + static int do_pci_remove(libxl__gc *gc, uint32_t domid, libxl_device_pci *pcidev, int force) { @@ -1263,10 +1268,7 @@ out: stubdomid = libxl_get_stubdom_id(ctx, domid); if (stubdomid != 0) { libxl_device_pci pcidev_s = *pcidev; - if (force) - libxl_device_pci_destroy(ctx, stubdomid, &pcidev_s); - else - libxl_device_pci_remove(ctx, stubdomid, &pcidev_s); + libxl__device_pci_remove_common(gc, stubdomid, &pcidev_s, force); } libxl__device_pci_remove_xenstore(gc, domid, pcidev); @@ -1313,27 +1315,31 @@ out: return rc; } -int libxl_device_pci_remove(libxl_ctx *ctx, uint32_t domid, libxl_device_pci *pcidev) +int libxl_device_pci_remove(libxl_ctx *ctx, uint32_t domid, + libxl_device_pci *pcidev, + const libxl_asyncop_how *ao_how) + { - GC_INIT(ctx); + AO_CREATE(ctx, domid, ao_how); int rc; rc = libxl__device_pci_remove_common(gc, domid, pcidev, 0); - GC_FREE; - return rc; + libxl__ao_complete(egc, ao, rc); + return AO_INPROGRESS; } int libxl_device_pci_destroy(libxl_ctx *ctx, uint32_t domid, - libxl_device_pci *pcidev) + libxl_device_pci *pcidev, + const libxl_asyncop_how *ao_how) { - GC_INIT(ctx); + AO_CREATE(ctx, domid, ao_how); int rc; rc = libxl__device_pci_remove_common(gc, domid, pcidev, 1); - GC_FREE; - return rc; + libxl__ao_complete(egc, ao, rc); + return AO_INPROGRESS; } static void libxl__device_pci_from_xs_be(libxl__gc *gc, @@ -1415,7 +1421,7 @@ int libxl__device_pci_destroy_all(libxl_ * respond to SCI interrupt because the guest kernel has shut down the * devices by the time we even get here! */ - if (libxl_device_pci_destroy(ctx, domid, pcidevs + i) < 0) + if (libxl__device_pci_remove_common(gc, domid, pcidevs + i, 1) < 0) rc = ERROR_FAIL; } diff -r 7fd5facb6084 -r 65ae31da1c53 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Fri Aug 03 09:50:28 2012 +0200 +++ b/tools/libxl/xl_cmdimpl.c Fri Aug 03 09:54:03 2012 +0100 @@ -2389,9 +2389,9 @@ static void pcidetach(const char *dom, c exit(2); } if (force) - libxl_device_pci_destroy(ctx, domid, &pcidev); + libxl_device_pci_destroy(ctx, domid, &pcidev, 0); else - libxl_device_pci_remove(ctx, domid, &pcidev); + libxl_device_pci_remove(ctx, domid, &pcidev, 0); libxl_device_pci_dispose(&pcidev); xlu_cfg_destroy(config); @@ -2435,7 +2435,7 @@ static void pciattach(const char *dom, c fprintf(stderr, "pci-attach: malformed BDF specification \"%s\"\n", bdf); exit(2); } - libxl_device_pci_add(ctx, domid, &pcidev); + libxl_device_pci_add(ctx, domid, &pcidev, 0); libxl_device_pci_dispose(&pcidev); xlu_cfg_destroy(config); diff -r 7fd5facb6084 -r 65ae31da1c53 tools/ocaml/libs/xl/xenlight_stubs.c --- a/tools/ocaml/libs/xl/xenlight_stubs.c Fri Aug 03 09:50:28 2012 +0200 +++ b/tools/ocaml/libs/xl/xenlight_stubs.c Fri Aug 03 09:54:03 2012 +0100 @@ -423,7 +423,7 @@ value stub_xl_device_pci_add(value info, device_pci_val(&gc, &lg, &c_info, info); INIT_CTX(); - ret = libxl_device_pci_add(ctx, Int_val(domid), &c_info); + ret = libxl_device_pci_add(ctx, Int_val(domid), &c_info, 0); if (ret != 0) failwith_xl("pci_add", &lg); FREE_CTX(); @@ -441,7 +441,7 @@ value stub_xl_device_pci_remove(value in device_pci_val(&gc, &lg, &c_info, info); INIT_CTX(); - ret = libxl_device_pci_remove(ctx, Int_val(domid), &c_info); + ret = libxl_device_pci_remove(ctx, Int_val(domid), &c_info, 0); if (ret != 0) failwith_xl("pci_remove", &lg); FREE_CTX(); diff -r 7fd5facb6084 -r 65ae31da1c53 tools/python/xen/lowlevel/xl/xl.c --- a/tools/python/xen/lowlevel/xl/xl.c Fri Aug 03 09:50:28 2012 +0200 +++ b/tools/python/xen/lowlevel/xl/xl.c Fri Aug 03 09:54:03 2012 +0100 @@ -497,7 +497,7 @@ static PyObject *pyxl_pci_add(XlObject * return NULL; } pci = (Py_device_pci *)obj; - if ( libxl_device_pci_add(self->ctx, domid, &pci->obj) ) { + if ( libxl_device_pci_add(self->ctx, domid, &pci->obj, 0) ) { PyErr_SetString(xl_error_obj, "cannot add pci device"); return NULL; } @@ -519,12 +519,12 @@ static PyObject *pyxl_pci_del(XlObject * } pci = (Py_device_pci *)obj; if ( force ) { - if ( libxl_device_pci_destroy(self->ctx, domid, &pci->obj) ) { + if ( libxl_device_pci_destroy(self->ctx, domid, &pci->obj, 0) ) { PyErr_SetString(xl_error_obj, "cannot remove pci device"); return NULL; } } else { - if ( libxl_device_pci_remove(self->ctx, domid, &pci->obj) ) { + if ( libxl_device_pci_remove(self->ctx, domid, &pci->obj, 0) ) { PyErr_SetString(xl_error_obj, "cannot remove pci device"); return NULL; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 20:33:25 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 20:33: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 1SyqSy-0005XR-Ju; Tue, 07 Aug 2012 20:33:24 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSw-0005VE-NF for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:23 +0000 Received: from [85.158.138.51:32927] by server-1.bemta-3.messagelabs.com id DF/79-29224-19B71205; Tue, 07 Aug 2012 20:33:21 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-174.messagelabs.com!1344371600!30952328!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15284 invoked from network); 7 Aug 2012 20:33:21 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2012 20:33:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSt-00041V-Sp for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SyqSt-0003Kl-Re for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:19 +0000 Message-Id: Date: Tue, 07 Aug 2012 20:33:19 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] nestedhvm: fix nested page fault build error on 32-bit X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1343984057 -3600 # Node ID 612898732e66db3d3b992df1a1af1655af4d92c9 # Parent 12f65475c13dff134a7f5540bf75c391e90ef491 nestedhvm: fix nested page fault build error on 32-bit cc1: warnings being treated as errors hvm.c: In function ?hvm_hap_nested_page_fault?: hvm.c:1282: error: passing argument 2 of ?nestedhvm_hap_nested_page_fault? from incompatible pointer type /local/scratch/ianc/devel/xen-unstable.hg/xen/include/asm/hvm/nestedhvm.h:55: note: expected ?paddr_t *? but argument is of type ?long unsigned int *? hvm_hap_nested_page_fault takes an unsigned long gpa and passes &gpa to nestedhvm_hap_nested_page_fault which takes a paddr_t *. Since both of the callers of hvm_hap_nested_page_fault (svm_do_nested_pgfault and ept_handle_violation) actually have the gpa which they pass to hvm_hap_nested_page_fault as a paddr_t I think it makes sense to change the argument to hvm_hap_nested_page_fault. The other user of gpa in hvm_hap_nested_page_fault is a call to p2m_mem_access_check, which currently also takes a paddr_t gpa but I think a paddr_t is appropriate there too. Jan points out that this is also an issue for >4GB guests on the 32 bit hypervisor. Signed-off-by: Ian Campbell Acked-by: Jan Beulich Acked-by: Tim Deegan Committed-by: Ian Campbell --- diff -r 12f65475c13d -r 612898732e66 xen/arch/x86/hvm/hvm.c --- a/xen/arch/x86/hvm/hvm.c Fri Aug 03 09:54:16 2012 +0100 +++ b/xen/arch/x86/hvm/hvm.c Fri Aug 03 09:54:17 2012 +0100 @@ -1242,7 +1242,7 @@ void hvm_inject_page_fault(int errcode, hvm_inject_trap(&trap); } -int hvm_hap_nested_page_fault(unsigned long gpa, +int hvm_hap_nested_page_fault(paddr_t gpa, bool_t gla_valid, unsigned long gla, bool_t access_r, diff -r 12f65475c13d -r 612898732e66 xen/arch/x86/mm/p2m.c --- a/xen/arch/x86/mm/p2m.c Fri Aug 03 09:54:16 2012 +0100 +++ b/xen/arch/x86/mm/p2m.c Fri Aug 03 09:54:17 2012 +0100 @@ -1233,7 +1233,7 @@ void p2m_mem_paging_resume(struct domain } } -bool_t p2m_mem_access_check(unsigned long gpa, bool_t gla_valid, unsigned long gla, +bool_t p2m_mem_access_check(paddr_t gpa, bool_t gla_valid, unsigned long gla, bool_t access_r, bool_t access_w, bool_t access_x, mem_event_request_t **req_ptr) { diff -r 12f65475c13d -r 612898732e66 xen/include/asm-x86/hvm/hvm.h --- a/xen/include/asm-x86/hvm/hvm.h Fri Aug 03 09:54:16 2012 +0100 +++ b/xen/include/asm-x86/hvm/hvm.h Fri Aug 03 09:54:17 2012 +0100 @@ -433,7 +433,7 @@ static inline void hvm_set_info_guest(st int hvm_debug_op(struct vcpu *v, int32_t op); -int hvm_hap_nested_page_fault(unsigned long gpa, +int hvm_hap_nested_page_fault(paddr_t gpa, bool_t gla_valid, unsigned long gla, bool_t access_r, bool_t access_w, diff -r 12f65475c13d -r 612898732e66 xen/include/asm-x86/p2m.h --- a/xen/include/asm-x86/p2m.h Fri Aug 03 09:54:16 2012 +0100 +++ b/xen/include/asm-x86/p2m.h Fri Aug 03 09:54:17 2012 +0100 @@ -589,7 +589,7 @@ static inline void p2m_mem_paging_popula * been promoted with no underlying vcpu pause. If the req_ptr has been populated, * then the caller must put the event in the ring (once having released get_gfn* * locks -- caller must also xfree the request. */ -bool_t p2m_mem_access_check(unsigned long gpa, bool_t gla_valid, unsigned long gla, +bool_t p2m_mem_access_check(paddr_t gpa, bool_t gla_valid, unsigned long gla, bool_t access_r, bool_t access_w, bool_t access_x, mem_event_request_t **req_ptr); /* Resumes the running of the VCPU, restarting the last instruction */ @@ -606,7 +606,7 @@ int p2m_get_mem_access(struct domain *d, hvmmem_access_t *access); #else -static inline bool_t p2m_mem_access_check(unsigned long gpa, bool_t gla_valid, +static inline bool_t p2m_mem_access_check(paddr_t gpa, bool_t gla_valid, unsigned long gla, bool_t access_r, bool_t access_w, bool_t access_x, mem_event_request_t **req_ptr) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 20:33:25 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 20:33: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 1SyqSy-0005XR-Ju; Tue, 07 Aug 2012 20:33:24 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSw-0005VE-NF for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:23 +0000 Received: from [85.158.138.51:32927] by server-1.bemta-3.messagelabs.com id DF/79-29224-19B71205; Tue, 07 Aug 2012 20:33:21 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-174.messagelabs.com!1344371600!30952328!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15284 invoked from network); 7 Aug 2012 20:33:21 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2012 20:33:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSt-00041V-Sp for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SyqSt-0003Kl-Re for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:19 +0000 Message-Id: Date: Tue, 07 Aug 2012 20:33:19 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] nestedhvm: fix nested page fault build error on 32-bit X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1343984057 -3600 # Node ID 612898732e66db3d3b992df1a1af1655af4d92c9 # Parent 12f65475c13dff134a7f5540bf75c391e90ef491 nestedhvm: fix nested page fault build error on 32-bit cc1: warnings being treated as errors hvm.c: In function ?hvm_hap_nested_page_fault?: hvm.c:1282: error: passing argument 2 of ?nestedhvm_hap_nested_page_fault? from incompatible pointer type /local/scratch/ianc/devel/xen-unstable.hg/xen/include/asm/hvm/nestedhvm.h:55: note: expected ?paddr_t *? but argument is of type ?long unsigned int *? hvm_hap_nested_page_fault takes an unsigned long gpa and passes &gpa to nestedhvm_hap_nested_page_fault which takes a paddr_t *. Since both of the callers of hvm_hap_nested_page_fault (svm_do_nested_pgfault and ept_handle_violation) actually have the gpa which they pass to hvm_hap_nested_page_fault as a paddr_t I think it makes sense to change the argument to hvm_hap_nested_page_fault. The other user of gpa in hvm_hap_nested_page_fault is a call to p2m_mem_access_check, which currently also takes a paddr_t gpa but I think a paddr_t is appropriate there too. Jan points out that this is also an issue for >4GB guests on the 32 bit hypervisor. Signed-off-by: Ian Campbell Acked-by: Jan Beulich Acked-by: Tim Deegan Committed-by: Ian Campbell --- diff -r 12f65475c13d -r 612898732e66 xen/arch/x86/hvm/hvm.c --- a/xen/arch/x86/hvm/hvm.c Fri Aug 03 09:54:16 2012 +0100 +++ b/xen/arch/x86/hvm/hvm.c Fri Aug 03 09:54:17 2012 +0100 @@ -1242,7 +1242,7 @@ void hvm_inject_page_fault(int errcode, hvm_inject_trap(&trap); } -int hvm_hap_nested_page_fault(unsigned long gpa, +int hvm_hap_nested_page_fault(paddr_t gpa, bool_t gla_valid, unsigned long gla, bool_t access_r, diff -r 12f65475c13d -r 612898732e66 xen/arch/x86/mm/p2m.c --- a/xen/arch/x86/mm/p2m.c Fri Aug 03 09:54:16 2012 +0100 +++ b/xen/arch/x86/mm/p2m.c Fri Aug 03 09:54:17 2012 +0100 @@ -1233,7 +1233,7 @@ void p2m_mem_paging_resume(struct domain } } -bool_t p2m_mem_access_check(unsigned long gpa, bool_t gla_valid, unsigned long gla, +bool_t p2m_mem_access_check(paddr_t gpa, bool_t gla_valid, unsigned long gla, bool_t access_r, bool_t access_w, bool_t access_x, mem_event_request_t **req_ptr) { diff -r 12f65475c13d -r 612898732e66 xen/include/asm-x86/hvm/hvm.h --- a/xen/include/asm-x86/hvm/hvm.h Fri Aug 03 09:54:16 2012 +0100 +++ b/xen/include/asm-x86/hvm/hvm.h Fri Aug 03 09:54:17 2012 +0100 @@ -433,7 +433,7 @@ static inline void hvm_set_info_guest(st int hvm_debug_op(struct vcpu *v, int32_t op); -int hvm_hap_nested_page_fault(unsigned long gpa, +int hvm_hap_nested_page_fault(paddr_t gpa, bool_t gla_valid, unsigned long gla, bool_t access_r, bool_t access_w, diff -r 12f65475c13d -r 612898732e66 xen/include/asm-x86/p2m.h --- a/xen/include/asm-x86/p2m.h Fri Aug 03 09:54:16 2012 +0100 +++ b/xen/include/asm-x86/p2m.h Fri Aug 03 09:54:17 2012 +0100 @@ -589,7 +589,7 @@ static inline void p2m_mem_paging_popula * been promoted with no underlying vcpu pause. If the req_ptr has been populated, * then the caller must put the event in the ring (once having released get_gfn* * locks -- caller must also xfree the request. */ -bool_t p2m_mem_access_check(unsigned long gpa, bool_t gla_valid, unsigned long gla, +bool_t p2m_mem_access_check(paddr_t gpa, bool_t gla_valid, unsigned long gla, bool_t access_r, bool_t access_w, bool_t access_x, mem_event_request_t **req_ptr); /* Resumes the running of the VCPU, restarting the last instruction */ @@ -606,7 +606,7 @@ int p2m_get_mem_access(struct domain *d, hvmmem_access_t *access); #else -static inline bool_t p2m_mem_access_check(unsigned long gpa, bool_t gla_valid, +static inline bool_t p2m_mem_access_check(paddr_t gpa, bool_t gla_valid, unsigned long gla, bool_t access_r, bool_t access_w, bool_t access_x, mem_event_request_t **req_ptr) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 20:33:26 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 20:33: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 1SyqT0-0005bK-9S; Tue, 07 Aug 2012 20:33:26 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSy-0005Sf-PQ for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:24 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-27.messagelabs.com!1344371596!4377392!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25133 invoked from network); 7 Aug 2012 20:33:17 -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; 7 Aug 2012 20:33:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSp-000417-Kc for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SyqSp-0003Io-JG for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:15 +0000 Message-Id: Date: Tue, 07 Aug 2012 20:33:15 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: abolish useless `start' parameter to libxl__add_* X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1343984051 -3600 # Node ID ee32ae1631266f0f6cce3d8c95ba15a68ec258a4 # Parent 8897bc3d8a3029d6a6e6cba9dfcdc08f94016bd7 libxl: abolish useless `start' parameter to libxl__add_* 0 is always passed for this parameter and the code doesn't, actually, use it, now. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r 8897bc3d8a30 -r ee32ae163126 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Fri Aug 03 09:54:10 2012 +0100 +++ b/tools/libxl/libxl_create.c Fri Aug 03 09:54:11 2012 +0100 @@ -911,7 +911,7 @@ static void domcreate_rebuild_done(libxl libxl__multidev_begin(ao, &dcs->aodevs); dcs->aodevs.callback = domcreate_launch_dm; - libxl__add_disks(egc, ao, domid, 0, d_config, &dcs->aodevs); + libxl__add_disks(egc, ao, domid, d_config, &dcs->aodevs); libxl__multidev_prepared(egc, &dcs->aodevs, 0); return; @@ -1041,7 +1041,7 @@ static void domcreate_devmodel_started(l /* Attach nics */ libxl__multidev_begin(ao, &dcs->aodevs); dcs->aodevs.callback = domcreate_attach_pci; - libxl__add_nics(egc, ao, domid, 0, d_config, &dcs->aodevs); + libxl__add_nics(egc, ao, domid, d_config, &dcs->aodevs); libxl__multidev_prepared(egc, &dcs->aodevs, 0); return; } diff -r 8897bc3d8a30 -r ee32ae163126 tools/libxl/libxl_device.c --- a/tools/libxl/libxl_device.c Fri Aug 03 09:54:10 2012 +0100 +++ b/tools/libxl/libxl_device.c Fri Aug 03 09:54:11 2012 +0100 @@ -485,15 +485,14 @@ void libxl__multidev_prepared(libxl__egc #define DEFINE_DEVICES_ADD(type) \ void libxl__add_##type##s(libxl__egc *egc, libxl__ao *ao, uint32_t domid, \ - int start, libxl_domain_config *d_config, \ + libxl_domain_config *d_config, \ libxl__ao_devices *aodevs) \ { \ AO_GC; \ int i; \ - int end = start + d_config->num_##type##s; \ - for (i = start; i < end; i++) { \ + for (i = 0; i < d_config->num_##type##s; i++) { \ libxl__ao_device *aodev = libxl__multidev_prepare(aodevs); \ - libxl__device_##type##_add(egc, domid, &d_config->type##s[i-start], \ + libxl__device_##type##_add(egc, domid, &d_config->type##s[i], \ aodev); \ } \ } diff -r 8897bc3d8a30 -r ee32ae163126 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Fri Aug 03 09:54:10 2012 +0100 +++ b/tools/libxl/libxl_dm.c Fri Aug 03 09:54:11 2012 +0100 @@ -858,7 +858,7 @@ retry_transaction: libxl__multidev_begin(ao, &sdss->aodevs); sdss->aodevs.callback = spawn_stub_launch_dm; - libxl__add_disks(egc, ao, dm_domid, 0, dm_config, &sdss->aodevs); + libxl__add_disks(egc, ao, dm_domid, dm_config, &sdss->aodevs); libxl__multidev_prepared(egc, &sdss->aodevs, 0); free(args); @@ -984,7 +984,7 @@ static void spawn_stubdom_pvqemu_cb(libx if (d_config->num_nics > 0) { libxl__multidev_begin(ao, &sdss->aodevs); sdss->aodevs.callback = stubdom_pvqemu_cb; - libxl__add_nics(egc, ao, dm_domid, 0, d_config, &sdss->aodevs); + libxl__add_nics(egc, ao, dm_domid, d_config, &sdss->aodevs); libxl__multidev_prepared(egc, &sdss->aodevs, 0); return; } diff -r 8897bc3d8a30 -r ee32ae163126 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri Aug 03 09:54:10 2012 +0100 +++ b/tools/libxl/libxl_internal.h Fri Aug 03 09:54:11 2012 +0100 @@ -2388,19 +2388,17 @@ _hidden void libxl__devices_destroy(libx /* Helper function to add a bunch of disks. This should be used when * the caller is inside an async op. "devices" will NOT be prepared by * this function, so the caller must make sure to call - * libxl__multidev_begin before calling this function. The start - * parameter contains the position inside the aodevs array that should - * be used to store the state of this devices. + * libxl__multidev_begin before calling this function. * * The "callback" will be called for each device, and the user is responsible * for calling libxl__ao_device_check_last on the callback. */ _hidden void libxl__add_disks(libxl__egc *egc, libxl__ao *ao, uint32_t domid, - int start, libxl_domain_config *d_config, + libxl_domain_config *d_config, libxl__ao_devices *aodevs); _hidden void libxl__add_nics(libxl__egc *egc, libxl__ao *ao, uint32_t domid, - int start, libxl_domain_config *d_config, + libxl_domain_config *d_config, libxl__ao_devices *aodevs); /*----- device model creation -----*/ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 20:33:26 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 20:33: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 1SyqT0-0005bK-9S; Tue, 07 Aug 2012 20:33:26 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSy-0005Sf-PQ for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:24 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-27.messagelabs.com!1344371596!4377392!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25133 invoked from network); 7 Aug 2012 20:33:17 -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; 7 Aug 2012 20:33:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSp-000417-Kc for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SyqSp-0003Io-JG for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:15 +0000 Message-Id: Date: Tue, 07 Aug 2012 20:33:15 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: abolish useless `start' parameter to libxl__add_* X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1343984051 -3600 # Node ID ee32ae1631266f0f6cce3d8c95ba15a68ec258a4 # Parent 8897bc3d8a3029d6a6e6cba9dfcdc08f94016bd7 libxl: abolish useless `start' parameter to libxl__add_* 0 is always passed for this parameter and the code doesn't, actually, use it, now. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r 8897bc3d8a30 -r ee32ae163126 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Fri Aug 03 09:54:10 2012 +0100 +++ b/tools/libxl/libxl_create.c Fri Aug 03 09:54:11 2012 +0100 @@ -911,7 +911,7 @@ static void domcreate_rebuild_done(libxl libxl__multidev_begin(ao, &dcs->aodevs); dcs->aodevs.callback = domcreate_launch_dm; - libxl__add_disks(egc, ao, domid, 0, d_config, &dcs->aodevs); + libxl__add_disks(egc, ao, domid, d_config, &dcs->aodevs); libxl__multidev_prepared(egc, &dcs->aodevs, 0); return; @@ -1041,7 +1041,7 @@ static void domcreate_devmodel_started(l /* Attach nics */ libxl__multidev_begin(ao, &dcs->aodevs); dcs->aodevs.callback = domcreate_attach_pci; - libxl__add_nics(egc, ao, domid, 0, d_config, &dcs->aodevs); + libxl__add_nics(egc, ao, domid, d_config, &dcs->aodevs); libxl__multidev_prepared(egc, &dcs->aodevs, 0); return; } diff -r 8897bc3d8a30 -r ee32ae163126 tools/libxl/libxl_device.c --- a/tools/libxl/libxl_device.c Fri Aug 03 09:54:10 2012 +0100 +++ b/tools/libxl/libxl_device.c Fri Aug 03 09:54:11 2012 +0100 @@ -485,15 +485,14 @@ void libxl__multidev_prepared(libxl__egc #define DEFINE_DEVICES_ADD(type) \ void libxl__add_##type##s(libxl__egc *egc, libxl__ao *ao, uint32_t domid, \ - int start, libxl_domain_config *d_config, \ + libxl_domain_config *d_config, \ libxl__ao_devices *aodevs) \ { \ AO_GC; \ int i; \ - int end = start + d_config->num_##type##s; \ - for (i = start; i < end; i++) { \ + for (i = 0; i < d_config->num_##type##s; i++) { \ libxl__ao_device *aodev = libxl__multidev_prepare(aodevs); \ - libxl__device_##type##_add(egc, domid, &d_config->type##s[i-start], \ + libxl__device_##type##_add(egc, domid, &d_config->type##s[i], \ aodev); \ } \ } diff -r 8897bc3d8a30 -r ee32ae163126 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Fri Aug 03 09:54:10 2012 +0100 +++ b/tools/libxl/libxl_dm.c Fri Aug 03 09:54:11 2012 +0100 @@ -858,7 +858,7 @@ retry_transaction: libxl__multidev_begin(ao, &sdss->aodevs); sdss->aodevs.callback = spawn_stub_launch_dm; - libxl__add_disks(egc, ao, dm_domid, 0, dm_config, &sdss->aodevs); + libxl__add_disks(egc, ao, dm_domid, dm_config, &sdss->aodevs); libxl__multidev_prepared(egc, &sdss->aodevs, 0); free(args); @@ -984,7 +984,7 @@ static void spawn_stubdom_pvqemu_cb(libx if (d_config->num_nics > 0) { libxl__multidev_begin(ao, &sdss->aodevs); sdss->aodevs.callback = stubdom_pvqemu_cb; - libxl__add_nics(egc, ao, dm_domid, 0, d_config, &sdss->aodevs); + libxl__add_nics(egc, ao, dm_domid, d_config, &sdss->aodevs); libxl__multidev_prepared(egc, &sdss->aodevs, 0); return; } diff -r 8897bc3d8a30 -r ee32ae163126 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri Aug 03 09:54:10 2012 +0100 +++ b/tools/libxl/libxl_internal.h Fri Aug 03 09:54:11 2012 +0100 @@ -2388,19 +2388,17 @@ _hidden void libxl__devices_destroy(libx /* Helper function to add a bunch of disks. This should be used when * the caller is inside an async op. "devices" will NOT be prepared by * this function, so the caller must make sure to call - * libxl__multidev_begin before calling this function. The start - * parameter contains the position inside the aodevs array that should - * be used to store the state of this devices. + * libxl__multidev_begin before calling this function. * * The "callback" will be called for each device, and the user is responsible * for calling libxl__ao_device_check_last on the callback. */ _hidden void libxl__add_disks(libxl__egc *egc, libxl__ao *ao, uint32_t domid, - int start, libxl_domain_config *d_config, + libxl_domain_config *d_config, libxl__ao_devices *aodevs); _hidden void libxl__add_nics(libxl__egc *egc, libxl__ao *ao, uint32_t domid, - int start, libxl_domain_config *d_config, + libxl_domain_config *d_config, libxl__ao_devices *aodevs); /*----- device model creation -----*/ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 20:33:26 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 20:33: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 1SyqT0-0005b0-2M; Tue, 07 Aug 2012 20:33:26 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSy-0005Wp-Ox for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:24 +0000 Received: from [85.158.138.51:58797] by server-4.bemta-3.messagelabs.com id FB/BB-06379-39B71205; Tue, 07 Aug 2012 20:33:23 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-174.messagelabs.com!1344371602!30905208!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24727 invoked from network); 7 Aug 2012 20:33:23 -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; 7 Aug 2012 20:33:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSw-00041h-0w for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SyqSv-0003Lj-Vq for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:21 +0000 Message-Id: Date: Tue, 07 Aug 2012 20:33:21 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] tools/hotplug/Linux/init.d/: load other xen kernel modules on xencommons start X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Fabio Fantoni # Date 1343992054 -3600 # Node ID a6edbc39fc84904f0be4d9ab60a4e50624d5f7cf # Parent a8d708fcb3474b7fc112de37b3064e9213d4de92 tools/hotplug/Linux/init.d/: load other xen kernel modules on xencommons start Signed-off-by: Fabio Fantoni Acked-by: Ian Jackson --- diff -r a8d708fcb347 -r a6edbc39fc84 tools/hotplug/Linux/init.d/xencommons --- a/tools/hotplug/Linux/init.d/xencommons Fri Aug 03 11:59:12 2012 +0100 +++ b/tools/hotplug/Linux/init.d/xencommons Fri Aug 03 12:07:34 2012 +0100 @@ -56,6 +56,9 @@ do_start () { modprobe xen-evtchn 2>/dev/null modprobe xen-gntdev 2>/dev/null + modprobe xen-gntalloc 2>/dev/null + modprobe xen-blkback 2>/dev/null + modprobe xen-netback 2>/dev/null modprobe evtchn 2>/dev/null modprobe gntdev 2>/dev/null modprobe xen-acpi-processor 2>/dev/null _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 20:33:26 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 20:33: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 1SyqT0-0005b0-2M; Tue, 07 Aug 2012 20:33:26 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSy-0005Wp-Ox for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:24 +0000 Received: from [85.158.138.51:58797] by server-4.bemta-3.messagelabs.com id FB/BB-06379-39B71205; Tue, 07 Aug 2012 20:33:23 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-174.messagelabs.com!1344371602!30905208!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24727 invoked from network); 7 Aug 2012 20:33:23 -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; 7 Aug 2012 20:33:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSw-00041h-0w for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SyqSv-0003Lj-Vq for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:21 +0000 Message-Id: Date: Tue, 07 Aug 2012 20:33:21 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] tools/hotplug/Linux/init.d/: load other xen kernel modules on xencommons start X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Fabio Fantoni # Date 1343992054 -3600 # Node ID a6edbc39fc84904f0be4d9ab60a4e50624d5f7cf # Parent a8d708fcb3474b7fc112de37b3064e9213d4de92 tools/hotplug/Linux/init.d/: load other xen kernel modules on xencommons start Signed-off-by: Fabio Fantoni Acked-by: Ian Jackson --- diff -r a8d708fcb347 -r a6edbc39fc84 tools/hotplug/Linux/init.d/xencommons --- a/tools/hotplug/Linux/init.d/xencommons Fri Aug 03 11:59:12 2012 +0100 +++ b/tools/hotplug/Linux/init.d/xencommons Fri Aug 03 12:07:34 2012 +0100 @@ -56,6 +56,9 @@ do_start () { modprobe xen-evtchn 2>/dev/null modprobe xen-gntdev 2>/dev/null + modprobe xen-gntalloc 2>/dev/null + modprobe xen-blkback 2>/dev/null + modprobe xen-netback 2>/dev/null modprobe evtchn 2>/dev/null modprobe gntdev 2>/dev/null modprobe xen-acpi-processor 2>/dev/null _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 20:33:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 20:33:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqT1-0005cw-JK; Tue, 07 Aug 2012 20:33:27 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqT0-0005Ti-BG for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:26 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-27.messagelabs.com!1344371598!4319581!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6455 invoked from network); 7 Aug 2012 20:33:19 -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; 7 Aug 2012 20:33:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSs-00041M-8i for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SyqSs-0003K2-7V for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:18 +0000 Message-Id: Date: Tue, 07 Aug 2012 20:33:17 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: idl: always initialise the KeyedEnum keyvar in the member init function X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1343984054 -3600 # Node ID 32aa98840f2ba38081d007a919a40efefc62d20a # Parent aa93fe2d5a60770c697a44fc9635918417b1f5b5 libxl: idl: always initialise the KeyedEnum keyvar in the member init function Previously we only initialised it if an explicit keyvar_init_val was given but not if the default was implicitly 0. In the generated code this only changes the unused libxl_event_init_type function: void libxl_event_init_type(libxl_event *p, libxl_event_type type) { + assert(!p->type); + p->type = type; switch (p->type) { case LIBXL_EVENT_TYPE_DOMAIN_SHUTDOWN: break; However I think it is wrong that this function is unused, this and libxl_event_init should be used by libxl__event_new. As it happens both are just memset to zero but for correctness we should use the init functions (in case the IDL changes). In the generator we also need to properly handle init_var == 0 which the current if statements incorrectly treat as False. This doesn't actually have any impact on the generated code. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r aa93fe2d5a60 -r 32aa98840f2b tools/libxl/gentypes.py --- a/tools/libxl/gentypes.py Fri Aug 03 09:54:14 2012 +0100 +++ b/tools/libxl/gentypes.py Fri Aug 03 09:54:14 2012 +0100 @@ -162,17 +162,20 @@ def libxl_C_type_member_init(ty, field): ku.keyvar.type.make_arg(ku.keyvar.name)) s += "{\n" - if ku.keyvar.init_val: + if ku.keyvar.init_val is not None: init_val = ku.keyvar.init_val - elif ku.keyvar.type.init_val: + elif ku.keyvar.type.init_val is not None: init_val = ku.keyvar.type.init_val else: init_val = None + (nparent,fexpr) = ty.member(ty.pass_arg("p"), ku.keyvar, isref=True) if init_val is not None: - (nparent,fexpr) = ty.member(ty.pass_arg("p"), ku.keyvar, isref=True) s += " assert(%s == %s);\n" % (fexpr, init_val) - s += " %s = %s;\n" % (fexpr, ku.keyvar.name) + else: + s += " assert(!%s);\n" % (fexpr) + s += " %s = %s;\n" % (fexpr, ku.keyvar.name) + (nparent,fexpr) = ty.member(ty.pass_arg("p"), field, isref=True) s += _libxl_C_type_init(ku, fexpr, parent=nparent, subinit=True) s += "}\n" diff -r aa93fe2d5a60 -r 32aa98840f2b tools/libxl/libxl_event.c --- a/tools/libxl/libxl_event.c Fri Aug 03 09:54:14 2012 +0100 +++ b/tools/libxl/libxl_event.c Fri Aug 03 09:54:14 2012 +0100 @@ -1163,7 +1163,10 @@ libxl_event *libxl__event_new(libxl__egc libxl_event *ev; ev = libxl__zalloc(NOGC,sizeof(*ev)); - ev->type = type; + + libxl_event_init(ev); + libxl_event_init_type(ev, type); + ev->domid = domid; return ev; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 20:33:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 20:33:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqT1-0005cw-JK; Tue, 07 Aug 2012 20:33:27 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqT0-0005Ti-BG for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:26 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-27.messagelabs.com!1344371598!4319581!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6455 invoked from network); 7 Aug 2012 20:33:19 -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; 7 Aug 2012 20:33:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSs-00041M-8i for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SyqSs-0003K2-7V for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:18 +0000 Message-Id: Date: Tue, 07 Aug 2012 20:33:17 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: idl: always initialise the KeyedEnum keyvar in the member init function X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1343984054 -3600 # Node ID 32aa98840f2ba38081d007a919a40efefc62d20a # Parent aa93fe2d5a60770c697a44fc9635918417b1f5b5 libxl: idl: always initialise the KeyedEnum keyvar in the member init function Previously we only initialised it if an explicit keyvar_init_val was given but not if the default was implicitly 0. In the generated code this only changes the unused libxl_event_init_type function: void libxl_event_init_type(libxl_event *p, libxl_event_type type) { + assert(!p->type); + p->type = type; switch (p->type) { case LIBXL_EVENT_TYPE_DOMAIN_SHUTDOWN: break; However I think it is wrong that this function is unused, this and libxl_event_init should be used by libxl__event_new. As it happens both are just memset to zero but for correctness we should use the init functions (in case the IDL changes). In the generator we also need to properly handle init_var == 0 which the current if statements incorrectly treat as False. This doesn't actually have any impact on the generated code. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r aa93fe2d5a60 -r 32aa98840f2b tools/libxl/gentypes.py --- a/tools/libxl/gentypes.py Fri Aug 03 09:54:14 2012 +0100 +++ b/tools/libxl/gentypes.py Fri Aug 03 09:54:14 2012 +0100 @@ -162,17 +162,20 @@ def libxl_C_type_member_init(ty, field): ku.keyvar.type.make_arg(ku.keyvar.name)) s += "{\n" - if ku.keyvar.init_val: + if ku.keyvar.init_val is not None: init_val = ku.keyvar.init_val - elif ku.keyvar.type.init_val: + elif ku.keyvar.type.init_val is not None: init_val = ku.keyvar.type.init_val else: init_val = None + (nparent,fexpr) = ty.member(ty.pass_arg("p"), ku.keyvar, isref=True) if init_val is not None: - (nparent,fexpr) = ty.member(ty.pass_arg("p"), ku.keyvar, isref=True) s += " assert(%s == %s);\n" % (fexpr, init_val) - s += " %s = %s;\n" % (fexpr, ku.keyvar.name) + else: + s += " assert(!%s);\n" % (fexpr) + s += " %s = %s;\n" % (fexpr, ku.keyvar.name) + (nparent,fexpr) = ty.member(ty.pass_arg("p"), field, isref=True) s += _libxl_C_type_init(ku, fexpr, parent=nparent, subinit=True) s += "}\n" diff -r aa93fe2d5a60 -r 32aa98840f2b tools/libxl/libxl_event.c --- a/tools/libxl/libxl_event.c Fri Aug 03 09:54:14 2012 +0100 +++ b/tools/libxl/libxl_event.c Fri Aug 03 09:54:14 2012 +0100 @@ -1163,7 +1163,10 @@ libxl_event *libxl__event_new(libxl__egc libxl_event *ev; ev = libxl__zalloc(NOGC,sizeof(*ev)); - ev->type = type; + + libxl_event_init(ev); + libxl_event_init_type(ev, type); + ev->domid = domid; return ev; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 20:33:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 20:33:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqT1-0005cf-DZ; Tue, 07 Aug 2012 20:33:27 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSz-0005VP-J4 for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:25 +0000 Received: from [85.158.143.35:34117] by server-3.bemta-4.messagelabs.com id F0/E5-01511-59B71205; Tue, 07 Aug 2012 20:33:25 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-21.messagelabs.com!1344371603!13940794!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4795 invoked from network); 7 Aug 2012 20:33:24 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2012 20:33:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSx-00041o-2F for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SyqSx-0003MD-12 for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:23 +0000 Message-Id: Date: Tue, 07 Aug 2012 20:33:22 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] x86: fix wait code asm() constraints X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Jan Beulich # Date 1344244723 -7200 # Node ID 6221bee07e5dc31d9ed9eb3c0c1c94a80c56c78d # Parent 6ccad16b50b6b402a98ddfeb9ac6fa7522119778 x86: fix wait code asm() constraints This fixes theoretical issues with those constraints - operands that get clobbered before consuming all input operands must be marked so according the the gcc documentation. Beyond that, the change is merely code improvement, not a bug fix. In __prepare_to_wait(), properly mark early clobbered registers. By doing so, we at once eliminate the need to save/restore rCX and rDI. In check_wakeup_from_wait(), make the current constraints match by removing the code that actuall alters registers. By adjusting the resume address in __prepare_to_wait(), we can simply re-use the copying operation there (rather than doing a second pointless copy in the opposite direction after branching to the resume point), which at once eliminates the need for re-loading rCX and rDI inside the asm(). Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- diff -r 6ccad16b50b6 -r 6221bee07e5d xen/common/wait.c --- a/xen/common/wait.c Fri Aug 03 12:25:29 2012 +0100 +++ b/xen/common/wait.c Mon Aug 06 11:18:43 2012 +0200 @@ -126,6 +126,7 @@ static void __prepare_to_wait(struct wai { char *cpu_info = (char *)get_cpu_info(); struct vcpu *curr = current; + unsigned long dummy; ASSERT(wqv->esp == 0); @@ -140,27 +141,27 @@ static void __prepare_to_wait(struct wai asm volatile ( #ifdef CONFIG_X86_64 - "push %%rax; push %%rbx; push %%rcx; push %%rdx; push %%rdi; " + "push %%rax; push %%rbx; push %%rdx; " "push %%rbp; push %%r8; push %%r9; push %%r10; push %%r11; " "push %%r12; push %%r13; push %%r14; push %%r15; call 1f; " - "1: mov 80(%%rsp),%%rdi; mov 96(%%rsp),%%rcx; mov %%rsp,%%rsi; " + "1: mov %%rsp,%%rsi; addq $2f-1b,(%%rsp); " "sub %%rsi,%%rcx; cmp %3,%%rcx; jbe 2f; " "xor %%esi,%%esi; jmp 3f; " "2: rep movsb; mov %%rsp,%%rsi; 3: pop %%rax; " "pop %%r15; pop %%r14; pop %%r13; pop %%r12; " "pop %%r11; pop %%r10; pop %%r9; pop %%r8; " - "pop %%rbp; pop %%rdi; pop %%rdx; pop %%rcx; pop %%rbx; pop %%rax" + "pop %%rbp; pop %%rdx; pop %%rbx; pop %%rax" #else - "push %%eax; push %%ebx; push %%ecx; push %%edx; push %%edi; " + "push %%eax; push %%ebx; push %%edx; " "push %%ebp; call 1f; " - "1: mov 8(%%esp),%%edi; mov 16(%%esp),%%ecx; mov %%esp,%%esi; " + "1: mov %%esp,%%esi; addl $2f-1b,(%%esp); " "sub %%esi,%%ecx; cmp %3,%%ecx; jbe 2f; " "xor %%esi,%%esi; jmp 3f; " "2: rep movsb; mov %%esp,%%esi; 3: pop %%eax; " - "pop %%ebp; pop %%edi; pop %%edx; pop %%ecx; pop %%ebx; pop %%eax" + "pop %%ebp; pop %%edx; pop %%ebx; pop %%eax" #endif - : "=S" (wqv->esp) - : "c" (cpu_info), "D" (wqv->stack), "i" (PAGE_SIZE) + : "=&S" (wqv->esp), "=&c" (dummy), "=&D" (dummy) + : "i" (PAGE_SIZE), "1" (cpu_info), "2" (wqv->stack) : "memory" ); if ( unlikely(wqv->esp == 0) ) @@ -200,7 +201,7 @@ void check_wakeup_from_wait(void) } asm volatile ( - "mov %1,%%"__OP"sp; rep movsb; jmp *(%%"__OP"sp)" + "mov %1,%%"__OP"sp; jmp *(%0)" : : "S" (wqv->stack), "D" (wqv->esp), "c" ((char *)get_cpu_info() - (char *)wqv->esp) : "memory" ); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 20:33:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 20:33:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqT1-0005co-H3; Tue, 07 Aug 2012 20:33:27 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqT0-0005VP-8q for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:26 +0000 Received: from [85.158.143.99:37534] by server-3.bemta-4.messagelabs.com id 32/E5-01511-69B71205; Tue, 07 Aug 2012 20:33:26 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-216.messagelabs.com!1344371602!30751332!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11843 invoked from network); 7 Aug 2012 20:33:23 -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; 7 Aug 2012 20:33:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSw-00041k-Hz for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SyqSw-0003Ly-Gj for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:22 +0000 Message-Id: Date: Tue, 07 Aug 2012 20:33:22 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: fix cleanup of tap devices in libxl__device_destroy X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1343993129 -3600 # Node ID 6ccad16b50b6b402a98ddfeb9ac6fa7522119778 # Parent a6edbc39fc84904f0be4d9ab60a4e50624d5f7cf libxl: fix cleanup of tap devices in libxl__device_destroy We pass be_path to tapdisk_destroy but we've already deleted it so it fails to read tapdisk-params. However it appears that we need to destroy the tap device after tearing down xenstore, to avoid the leak reported by Greg Wettstein in <201207312141.q6VLfJje012656@wind.enjellic.com>. So read the tapdisk-params in the cleanup transaction, before the remove, and pass that down to destroy_tapdisk instead. tapdisk-params may of course be NULL if the device isn't a tap device. There is no need to tear down the tap device from libxl__initiate_device_remove since this ultimately calls libxl__device_destroy. Propagate and log errors from libxl__device_destroy_tapdisk. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r a6edbc39fc84 -r 6ccad16b50b6 tools/libxl/libxl_blktap2.c --- a/tools/libxl/libxl_blktap2.c Fri Aug 03 12:07:34 2012 +0100 +++ b/tools/libxl/libxl_blktap2.c Fri Aug 03 12:25:29 2012 +0100 @@ -51,28 +51,37 @@ char *libxl__blktap_devpath(libxl__gc *g } -void libxl__device_destroy_tapdisk(libxl__gc *gc, char *be_path) +int libxl__device_destroy_tapdisk(libxl__gc *gc, const char *params) { - char *path, *params, *type, *disk; + char *type, *disk; int err; tap_list_t tap; - path = libxl__sprintf(gc, "%s/tapdisk-params", be_path); - if (!path) return; + type = libxl__strdup(gc, params); - params = libxl__xs_read(gc, XBT_NULL, path); - if (!params) return; - - type = params; - disk = strchr(params, ':'); - if (!disk) return; + disk = strchr(type, ':'); + if (!disk) { + LOG(ERROR, "Unable to parse params %s", params); + return ERROR_INVAL; + } *disk++ = '\0'; err = tap_ctl_find(type, disk, &tap); - if (err < 0) return; + if (err < 0) { + /* returns -errno */ + LOGEV(ERROR, -err, "Unable to find type %s disk %s", type, disk); + return ERROR_FAIL; + } - tap_ctl_destroy(tap.id, tap.minor); + err = tap_ctl_destroy(tap.id, tap.minor); + if (err < 0) { + LOGEV(ERROR, -err, "Failed to destroy tap device id %d minor %d", + tap.id, tap.minor); + return ERROR_FAIL; + } + + return 0; } /* diff -r a6edbc39fc84 -r 6ccad16b50b6 tools/libxl/libxl_device.c --- a/tools/libxl/libxl_device.c Fri Aug 03 12:07:34 2012 +0100 +++ b/tools/libxl/libxl_device.c Fri Aug 03 12:25:29 2012 +0100 @@ -522,8 +522,10 @@ DEFINE_DEVICES_ADD(nic) int libxl__device_destroy(libxl__gc *gc, libxl__device *dev) { - char *be_path = libxl__device_backend_path(gc, dev); + const char *be_path = libxl__device_backend_path(gc, dev); const char *fe_path = libxl__device_frontend_path(gc, dev); + const char *tapdisk_path = GCSPRINTF("%s/%s", be_path, "tapdisk-params"); + const char *tapdisk_params; xs_transaction_t t = 0; int rc; @@ -531,6 +533,10 @@ int libxl__device_destroy(libxl__gc *gc, rc = libxl__xs_transaction_start(gc, &t); if (rc) goto out; + /* May not exist if this is not a tap device */ + rc = libxl__xs_read_checked(gc, t, tapdisk_path, &tapdisk_params); + if (rc) goto out; + libxl__xs_path_cleanup(gc, t, fe_path); libxl__xs_path_cleanup(gc, t, be_path); @@ -539,7 +545,8 @@ int libxl__device_destroy(libxl__gc *gc, if (rc < 0) goto out; } - libxl__device_destroy_tapdisk(gc, be_path); + if (tapdisk_params) + rc = libxl__device_destroy_tapdisk(gc, tapdisk_params); out: libxl__xs_transaction_abort(gc, &t); @@ -790,8 +797,6 @@ void libxl__initiate_device_remove(libxl if (rc < 0) goto out; } - libxl__device_destroy_tapdisk(gc, be_path); - rc = libxl__ev_devstate_wait(gc, &aodev->backend_ds, device_backend_callback, state_path, XenbusStateClosed, diff -r a6edbc39fc84 -r 6ccad16b50b6 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri Aug 03 12:07:34 2012 +0100 +++ b/tools/libxl/libxl_internal.h Fri Aug 03 12:25:29 2012 +0100 @@ -1344,8 +1344,9 @@ _hidden char *libxl__blktap_devpath(libx /* libxl__device_destroy_tapdisk: * Destroys any tapdisk process associated with the backend represented * by be_path. + * Always logs on failure. */ -_hidden void libxl__device_destroy_tapdisk(libxl__gc *gc, char *be_path); +_hidden int libxl__device_destroy_tapdisk(libxl__gc *gc, const char *params); _hidden int libxl__device_from_disk(libxl__gc *gc, uint32_t domid, libxl_device_disk *disk, diff -r a6edbc39fc84 -r 6ccad16b50b6 tools/libxl/libxl_noblktap2.c --- a/tools/libxl/libxl_noblktap2.c Fri Aug 03 12:07:34 2012 +0100 +++ b/tools/libxl/libxl_noblktap2.c Fri Aug 03 12:25:29 2012 +0100 @@ -28,8 +28,9 @@ char *libxl__blktap_devpath(libxl__gc *g return NULL; } -void libxl__device_destroy_tapdisk(libxl__gc *gc, char *be_path) +int libxl__device_destroy_tapdisk(libxl__gc *gc, const char *params) { + return 0; } /* _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 20:33:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 20:33:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqT1-0005cf-DZ; Tue, 07 Aug 2012 20:33:27 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSz-0005VP-J4 for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:25 +0000 Received: from [85.158.143.35:34117] by server-3.bemta-4.messagelabs.com id F0/E5-01511-59B71205; Tue, 07 Aug 2012 20:33:25 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-21.messagelabs.com!1344371603!13940794!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4795 invoked from network); 7 Aug 2012 20:33:24 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2012 20:33:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSx-00041o-2F for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SyqSx-0003MD-12 for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:23 +0000 Message-Id: Date: Tue, 07 Aug 2012 20:33:22 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] x86: fix wait code asm() constraints X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Jan Beulich # Date 1344244723 -7200 # Node ID 6221bee07e5dc31d9ed9eb3c0c1c94a80c56c78d # Parent 6ccad16b50b6b402a98ddfeb9ac6fa7522119778 x86: fix wait code asm() constraints This fixes theoretical issues with those constraints - operands that get clobbered before consuming all input operands must be marked so according the the gcc documentation. Beyond that, the change is merely code improvement, not a bug fix. In __prepare_to_wait(), properly mark early clobbered registers. By doing so, we at once eliminate the need to save/restore rCX and rDI. In check_wakeup_from_wait(), make the current constraints match by removing the code that actuall alters registers. By adjusting the resume address in __prepare_to_wait(), we can simply re-use the copying operation there (rather than doing a second pointless copy in the opposite direction after branching to the resume point), which at once eliminates the need for re-loading rCX and rDI inside the asm(). Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- diff -r 6ccad16b50b6 -r 6221bee07e5d xen/common/wait.c --- a/xen/common/wait.c Fri Aug 03 12:25:29 2012 +0100 +++ b/xen/common/wait.c Mon Aug 06 11:18:43 2012 +0200 @@ -126,6 +126,7 @@ static void __prepare_to_wait(struct wai { char *cpu_info = (char *)get_cpu_info(); struct vcpu *curr = current; + unsigned long dummy; ASSERT(wqv->esp == 0); @@ -140,27 +141,27 @@ static void __prepare_to_wait(struct wai asm volatile ( #ifdef CONFIG_X86_64 - "push %%rax; push %%rbx; push %%rcx; push %%rdx; push %%rdi; " + "push %%rax; push %%rbx; push %%rdx; " "push %%rbp; push %%r8; push %%r9; push %%r10; push %%r11; " "push %%r12; push %%r13; push %%r14; push %%r15; call 1f; " - "1: mov 80(%%rsp),%%rdi; mov 96(%%rsp),%%rcx; mov %%rsp,%%rsi; " + "1: mov %%rsp,%%rsi; addq $2f-1b,(%%rsp); " "sub %%rsi,%%rcx; cmp %3,%%rcx; jbe 2f; " "xor %%esi,%%esi; jmp 3f; " "2: rep movsb; mov %%rsp,%%rsi; 3: pop %%rax; " "pop %%r15; pop %%r14; pop %%r13; pop %%r12; " "pop %%r11; pop %%r10; pop %%r9; pop %%r8; " - "pop %%rbp; pop %%rdi; pop %%rdx; pop %%rcx; pop %%rbx; pop %%rax" + "pop %%rbp; pop %%rdx; pop %%rbx; pop %%rax" #else - "push %%eax; push %%ebx; push %%ecx; push %%edx; push %%edi; " + "push %%eax; push %%ebx; push %%edx; " "push %%ebp; call 1f; " - "1: mov 8(%%esp),%%edi; mov 16(%%esp),%%ecx; mov %%esp,%%esi; " + "1: mov %%esp,%%esi; addl $2f-1b,(%%esp); " "sub %%esi,%%ecx; cmp %3,%%ecx; jbe 2f; " "xor %%esi,%%esi; jmp 3f; " "2: rep movsb; mov %%esp,%%esi; 3: pop %%eax; " - "pop %%ebp; pop %%edi; pop %%edx; pop %%ecx; pop %%ebx; pop %%eax" + "pop %%ebp; pop %%edx; pop %%ebx; pop %%eax" #endif - : "=S" (wqv->esp) - : "c" (cpu_info), "D" (wqv->stack), "i" (PAGE_SIZE) + : "=&S" (wqv->esp), "=&c" (dummy), "=&D" (dummy) + : "i" (PAGE_SIZE), "1" (cpu_info), "2" (wqv->stack) : "memory" ); if ( unlikely(wqv->esp == 0) ) @@ -200,7 +201,7 @@ void check_wakeup_from_wait(void) } asm volatile ( - "mov %1,%%"__OP"sp; rep movsb; jmp *(%%"__OP"sp)" + "mov %1,%%"__OP"sp; jmp *(%0)" : : "S" (wqv->stack), "D" (wqv->esp), "c" ((char *)get_cpu_info() - (char *)wqv->esp) : "memory" ); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 20:33:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 20:33:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqT1-0005co-H3; Tue, 07 Aug 2012 20:33:27 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqT0-0005VP-8q for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:26 +0000 Received: from [85.158.143.99:37534] by server-3.bemta-4.messagelabs.com id 32/E5-01511-69B71205; Tue, 07 Aug 2012 20:33:26 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-216.messagelabs.com!1344371602!30751332!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11843 invoked from network); 7 Aug 2012 20:33:23 -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; 7 Aug 2012 20:33:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSw-00041k-Hz for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SyqSw-0003Ly-Gj for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:22 +0000 Message-Id: Date: Tue, 07 Aug 2012 20:33:22 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: fix cleanup of tap devices in libxl__device_destroy X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1343993129 -3600 # Node ID 6ccad16b50b6b402a98ddfeb9ac6fa7522119778 # Parent a6edbc39fc84904f0be4d9ab60a4e50624d5f7cf libxl: fix cleanup of tap devices in libxl__device_destroy We pass be_path to tapdisk_destroy but we've already deleted it so it fails to read tapdisk-params. However it appears that we need to destroy the tap device after tearing down xenstore, to avoid the leak reported by Greg Wettstein in <201207312141.q6VLfJje012656@wind.enjellic.com>. So read the tapdisk-params in the cleanup transaction, before the remove, and pass that down to destroy_tapdisk instead. tapdisk-params may of course be NULL if the device isn't a tap device. There is no need to tear down the tap device from libxl__initiate_device_remove since this ultimately calls libxl__device_destroy. Propagate and log errors from libxl__device_destroy_tapdisk. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r a6edbc39fc84 -r 6ccad16b50b6 tools/libxl/libxl_blktap2.c --- a/tools/libxl/libxl_blktap2.c Fri Aug 03 12:07:34 2012 +0100 +++ b/tools/libxl/libxl_blktap2.c Fri Aug 03 12:25:29 2012 +0100 @@ -51,28 +51,37 @@ char *libxl__blktap_devpath(libxl__gc *g } -void libxl__device_destroy_tapdisk(libxl__gc *gc, char *be_path) +int libxl__device_destroy_tapdisk(libxl__gc *gc, const char *params) { - char *path, *params, *type, *disk; + char *type, *disk; int err; tap_list_t tap; - path = libxl__sprintf(gc, "%s/tapdisk-params", be_path); - if (!path) return; + type = libxl__strdup(gc, params); - params = libxl__xs_read(gc, XBT_NULL, path); - if (!params) return; - - type = params; - disk = strchr(params, ':'); - if (!disk) return; + disk = strchr(type, ':'); + if (!disk) { + LOG(ERROR, "Unable to parse params %s", params); + return ERROR_INVAL; + } *disk++ = '\0'; err = tap_ctl_find(type, disk, &tap); - if (err < 0) return; + if (err < 0) { + /* returns -errno */ + LOGEV(ERROR, -err, "Unable to find type %s disk %s", type, disk); + return ERROR_FAIL; + } - tap_ctl_destroy(tap.id, tap.minor); + err = tap_ctl_destroy(tap.id, tap.minor); + if (err < 0) { + LOGEV(ERROR, -err, "Failed to destroy tap device id %d minor %d", + tap.id, tap.minor); + return ERROR_FAIL; + } + + return 0; } /* diff -r a6edbc39fc84 -r 6ccad16b50b6 tools/libxl/libxl_device.c --- a/tools/libxl/libxl_device.c Fri Aug 03 12:07:34 2012 +0100 +++ b/tools/libxl/libxl_device.c Fri Aug 03 12:25:29 2012 +0100 @@ -522,8 +522,10 @@ DEFINE_DEVICES_ADD(nic) int libxl__device_destroy(libxl__gc *gc, libxl__device *dev) { - char *be_path = libxl__device_backend_path(gc, dev); + const char *be_path = libxl__device_backend_path(gc, dev); const char *fe_path = libxl__device_frontend_path(gc, dev); + const char *tapdisk_path = GCSPRINTF("%s/%s", be_path, "tapdisk-params"); + const char *tapdisk_params; xs_transaction_t t = 0; int rc; @@ -531,6 +533,10 @@ int libxl__device_destroy(libxl__gc *gc, rc = libxl__xs_transaction_start(gc, &t); if (rc) goto out; + /* May not exist if this is not a tap device */ + rc = libxl__xs_read_checked(gc, t, tapdisk_path, &tapdisk_params); + if (rc) goto out; + libxl__xs_path_cleanup(gc, t, fe_path); libxl__xs_path_cleanup(gc, t, be_path); @@ -539,7 +545,8 @@ int libxl__device_destroy(libxl__gc *gc, if (rc < 0) goto out; } - libxl__device_destroy_tapdisk(gc, be_path); + if (tapdisk_params) + rc = libxl__device_destroy_tapdisk(gc, tapdisk_params); out: libxl__xs_transaction_abort(gc, &t); @@ -790,8 +797,6 @@ void libxl__initiate_device_remove(libxl if (rc < 0) goto out; } - libxl__device_destroy_tapdisk(gc, be_path); - rc = libxl__ev_devstate_wait(gc, &aodev->backend_ds, device_backend_callback, state_path, XenbusStateClosed, diff -r a6edbc39fc84 -r 6ccad16b50b6 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri Aug 03 12:07:34 2012 +0100 +++ b/tools/libxl/libxl_internal.h Fri Aug 03 12:25:29 2012 +0100 @@ -1344,8 +1344,9 @@ _hidden char *libxl__blktap_devpath(libx /* libxl__device_destroy_tapdisk: * Destroys any tapdisk process associated with the backend represented * by be_path. + * Always logs on failure. */ -_hidden void libxl__device_destroy_tapdisk(libxl__gc *gc, char *be_path); +_hidden int libxl__device_destroy_tapdisk(libxl__gc *gc, const char *params); _hidden int libxl__device_from_disk(libxl__gc *gc, uint32_t domid, libxl_device_disk *disk, diff -r a6edbc39fc84 -r 6ccad16b50b6 tools/libxl/libxl_noblktap2.c --- a/tools/libxl/libxl_noblktap2.c Fri Aug 03 12:07:34 2012 +0100 +++ b/tools/libxl/libxl_noblktap2.c Fri Aug 03 12:25:29 2012 +0100 @@ -28,8 +28,9 @@ char *libxl__blktap_devpath(libxl__gc *g return NULL; } -void libxl__device_destroy_tapdisk(libxl__gc *gc, char *be_path) +int libxl__device_destroy_tapdisk(libxl__gc *gc, const char *params) { + return 0; } /* _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 20:33:29 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 20:33:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqT2-0005eh-Ls; Tue, 07 Aug 2012 20:33:28 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqT1-0005Qw-9V for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:27 +0000 Received: from [85.158.143.35:5703] by server-2.bemta-4.messagelabs.com id C9/26-17938-79B71205; Tue, 07 Aug 2012 20:33:27 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-21.messagelabs.com!1344371601!11349912!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19727 invoked from network); 7 Aug 2012 20:33:22 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2012 20:33:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSu-00041b-Tz for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SyqSu-0003LF-Sl for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:20 +0000 Message-Id: Date: Tue, 07 Aug 2012 20:33:20 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: correct some comments regarding event API and fds X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1343991430 -3600 # Node ID 4a1dde3b9dfe4572d222847cbe37a355d81b1986 # Parent 9ad379939b78769a9368123989bb0736096fc6ab libxl: correct some comments regarding event API and fds * libxl may indeed register more than one callback for the same fd, with some restrictions. The allowable range of responses to this by the application means that this should pose no problems for users. But the documentation comment should be fixed. * Document the relaxed synchronicity semantics of the fd_modify registration callback. * A couple of comments referred to old names for functions. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- diff -r 9ad379939b78 -r 4a1dde3b9dfe tools/libxl/libxl_event.h --- a/tools/libxl/libxl_event.h Fri Aug 03 10:38:04 2012 +0100 +++ b/tools/libxl/libxl_event.h Fri Aug 03 11:57:10 2012 +0100 @@ -320,13 +320,24 @@ typedef struct libxl_osevent_hooks { * *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 may want to register more than one callback for any one fd; + * in that case: (i) each such registration will have at least one bit + * set in revents which is unique to that registration; (ii) if an + * event occurs which is relevant for multiple registrations the + * application's event system may call libxl_osevent_occurred_fd + * for one, some, or all of those registrations. + * + * If fd_modify is used, it is permitted for the application's event + * system to still make calls to libxl_osevent_occurred_fd for the + * "old" set of requested events; these will be safely ignored by + * libxl. + * * 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. + * osevent_register_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 @@ -357,7 +368,7 @@ void libxl_osevent_register_hooks(libxl_ /* 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_*. + * from within libxl_event_occurred_call_*. */ void libxl_osevent_occurred_fd(libxl_ctx *ctx, void *for_libxl, _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 20:33:29 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 20:33:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqT2-0005eh-Ls; Tue, 07 Aug 2012 20:33:28 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqT1-0005Qw-9V for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:27 +0000 Received: from [85.158.143.35:5703] by server-2.bemta-4.messagelabs.com id C9/26-17938-79B71205; Tue, 07 Aug 2012 20:33:27 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-21.messagelabs.com!1344371601!11349912!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19727 invoked from network); 7 Aug 2012 20:33:22 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2012 20:33:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSu-00041b-Tz for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SyqSu-0003LF-Sl for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:20 +0000 Message-Id: Date: Tue, 07 Aug 2012 20:33:20 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: correct some comments regarding event API and fds X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1343991430 -3600 # Node ID 4a1dde3b9dfe4572d222847cbe37a355d81b1986 # Parent 9ad379939b78769a9368123989bb0736096fc6ab libxl: correct some comments regarding event API and fds * libxl may indeed register more than one callback for the same fd, with some restrictions. The allowable range of responses to this by the application means that this should pose no problems for users. But the documentation comment should be fixed. * Document the relaxed synchronicity semantics of the fd_modify registration callback. * A couple of comments referred to old names for functions. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- diff -r 9ad379939b78 -r 4a1dde3b9dfe tools/libxl/libxl_event.h --- a/tools/libxl/libxl_event.h Fri Aug 03 10:38:04 2012 +0100 +++ b/tools/libxl/libxl_event.h Fri Aug 03 11:57:10 2012 +0100 @@ -320,13 +320,24 @@ typedef struct libxl_osevent_hooks { * *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 may want to register more than one callback for any one fd; + * in that case: (i) each such registration will have at least one bit + * set in revents which is unique to that registration; (ii) if an + * event occurs which is relevant for multiple registrations the + * application's event system may call libxl_osevent_occurred_fd + * for one, some, or all of those registrations. + * + * If fd_modify is used, it is permitted for the application's event + * system to still make calls to libxl_osevent_occurred_fd for the + * "old" set of requested events; these will be safely ignored by + * libxl. + * * 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. + * osevent_register_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 @@ -357,7 +368,7 @@ void libxl_osevent_register_hooks(libxl_ /* 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_*. + * from within libxl_event_occurred_call_*. */ void libxl_osevent_occurred_fd(libxl_ctx *ctx, void *for_libxl, _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 20:33:30 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 20:33: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 1SyqT3-0005fr-OW; Tue, 07 Aug 2012 20:33:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqT1-0005Wp-Sv for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:28 +0000 Received: from [85.158.138.51:58947] by server-4.bemta-3.messagelabs.com id D6/CB-06379-79B71205; Tue, 07 Aug 2012 20:33:27 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-174.messagelabs.com!1344371605!26853189!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23424 invoked from network); 7 Aug 2012 20:33:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2012 20:33:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSz-00042H-AM for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SyqSz-0003NC-94 for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:25 +0000 Message-Id: Date: Tue, 07 Aug 2012 20:33:24 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] x86/MCE: remove mcg_ctl and other adjustment for future vMCE X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Liu, Jinsong # Date 1344320197 -7200 # Node ID a5f4efac996f030ba2f572b93ddbbcd1eff5ade7 # Parent 353bc0801b11ee28855cad50ffc7b8afe0efa556 x86/MCE: remove mcg_ctl and other adjustment for future vMCE This is a middle-work patch, preparing for the future new vMCE model. It removes mcg_ctl, disables MCG_CTL_P, and sets bank count to 2. Signed-off-by: Liu, Jinsong Committed-by: Jan Beulich --- diff -r 353bc0801b11 -r a5f4efac996f xen/arch/x86/cpu/mcheck/mce.c --- a/xen/arch/x86/cpu/mcheck/mce.c Mon Aug 06 12:28:03 2012 +0100 +++ b/xen/arch/x86/cpu/mcheck/mce.c Tue Aug 07 08:16:37 2012 +0200 @@ -843,8 +843,6 @@ void mcheck_init(struct cpuinfo_x86 *c, mctelem_init(sizeof(struct mc_info)); - vmce_init(c); - /* Turn on MCE now */ set_in_cr4(X86_CR4_MCE); diff -r 353bc0801b11 -r a5f4efac996f xen/arch/x86/cpu/mcheck/mce.h --- a/xen/arch/x86/cpu/mcheck/mce.h Mon Aug 06 12:28:03 2012 +0100 +++ b/xen/arch/x86/cpu/mcheck/mce.h Tue Aug 07 08:16:37 2012 +0200 @@ -170,8 +170,6 @@ int fill_vmsr_data(struct mcinfo_bank *m int inject_vmce(struct domain *d); int vmce_domain_inject(struct mcinfo_bank *bank, struct domain *d, struct mcinfo_global *global); -extern int vmce_init(struct cpuinfo_x86 *c); - static inline int mce_vendor_bank_msr(const struct vcpu *v, uint32_t msr) { if ( boot_cpu_data.x86_vendor == X86_VENDOR_INTEL && diff -r 353bc0801b11 -r a5f4efac996f xen/arch/x86/cpu/mcheck/vmce.c --- a/xen/arch/x86/cpu/mcheck/vmce.c Mon Aug 06 12:28:03 2012 +0100 +++ b/xen/arch/x86/cpu/mcheck/vmce.c Tue Aug 07 08:16:37 2012 +0200 @@ -19,13 +19,18 @@ #include "mce.h" #include "x86_mca.h" +/* + * Emulate 2 banks for guest + * Bank0: reserved for 'bank0 quirk' occur at some very old processors: + * 1). Intel cpu whose family-model value < 06-1A; + * 2). AMD K7 + * Bank1: used to transfer error info to guest + */ +#define GUEST_BANK_NUM 2 +#define GUEST_MCG_CAP (MCG_TES_P | MCG_SER_P | GUEST_BANK_NUM) + #define dom_vmce(x) ((x)->arch.vmca_msrs) -static uint64_t __read_mostly g_mcg_cap; - -/* Real value in physical CTL MSR */ -static uint64_t __read_mostly h_mcg_ctl; - int vmce_init_msr(struct domain *d) { dom_vmce(d) = xmalloc(struct domain_mca_msrs); @@ -33,7 +38,6 @@ int vmce_init_msr(struct domain *d) return -ENOMEM; dom_vmce(d)->mcg_status = 0x0; - dom_vmce(d)->mcg_ctl = ~(uint64_t)0x0; dom_vmce(d)->nr_injection = 0; INIT_LIST_HEAD(&dom_vmce(d)->impact_header); @@ -52,17 +56,17 @@ void vmce_destroy_msr(struct domain *d) void vmce_init_vcpu(struct vcpu *v) { - v->arch.mcg_cap = g_mcg_cap; + v->arch.mcg_cap = GUEST_MCG_CAP; } int vmce_restore_vcpu(struct vcpu *v, uint64_t caps) { - if ( caps & ~g_mcg_cap & ~MCG_CAP_COUNT & ~MCG_CTL_P ) + if ( caps & ~GUEST_MCG_CAP & ~MCG_CAP_COUNT & ~MCG_CTL_P ) { dprintk(XENLOG_G_ERR, "%s restore: unsupported MCA capabilities" " %#" PRIx64 " for d%d:v%u (supported: %#Lx)\n", is_hvm_vcpu(v) ? "HVM" : "PV", caps, v->domain->domain_id, - v->vcpu_id, g_mcg_cap & ~MCG_CAP_COUNT); + v->vcpu_id, GUEST_MCG_CAP & ~MCG_CAP_COUNT); return -EPERM; } @@ -175,11 +179,10 @@ int vmce_rdmsr(uint32_t msr, uint64_t *v *val); break; case MSR_IA32_MCG_CTL: - /* Always 0 if no CTL support */ + /* Stick all 1's when CTL support, and 0's when no CTL support */ if ( cur->arch.mcg_cap & MCG_CTL_P ) - *val = vmce->mcg_ctl & h_mcg_ctl; - mce_printk(MCE_VERBOSE, "MCE: rdmsr MCG_CTL 0x%"PRIx64"\n", - *val); + *val = ~0ULL; + mce_printk(MCE_VERBOSE, "MCE: rdmsr MCG_CTL 0x%"PRIx64"\n", *val); break; default: ret = mce_bank_msr(cur, msr) ? bank_mce_rdmsr(cur, msr, val) : 0; @@ -287,15 +290,11 @@ int vmce_wrmsr(u32 msr, u64 val) struct domain_mca_msrs *vmce = dom_vmce(cur->domain); int ret = 1; - if ( !g_mcg_cap ) - return 0; - spin_lock(&vmce->lock); switch ( msr ) { case MSR_IA32_MCG_CTL: - vmce->mcg_ctl = val; break; case MSR_IA32_MCG_STATUS: vmce->mcg_status = val; @@ -510,31 +509,6 @@ int vmce_domain_inject( } #endif -int vmce_init(struct cpuinfo_x86 *c) -{ - u64 value; - - rdmsrl(MSR_IA32_MCG_CAP, value); - /* For Guest vMCE usage */ - g_mcg_cap = value & (MCG_CAP_COUNT | MCG_CTL_P | MCG_TES_P | MCG_SER_P); - if (value & MCG_CTL_P) - rdmsrl(MSR_IA32_MCG_CTL, h_mcg_ctl); - - return 0; -} - -static int mca_ctl_conflict(struct mcinfo_bank *bank, struct domain *d) -{ - if ( !bank || !d ) - return 1; - - /* Will MCE happen in host if If host mcg_ctl is 0? */ - if ( ~d->arch.vmca_msrs->mcg_ctl & h_mcg_ctl ) - return 1; - - return 0; -} - static int is_hvm_vmce_ready(struct mcinfo_bank *bank, struct domain *d) { struct vcpu *v; @@ -588,14 +562,6 @@ static int is_hvm_vmce_ready(struct mcin if (no_vmce) return 0; - /* Guest has different MCE ctl value setting */ - if (mca_ctl_conflict(bank, d)) - { - dprintk(XENLOG_WARNING, - "No vmce, guest has different mca control setting\n"); - return 0; - } - return 1; } diff -r 353bc0801b11 -r a5f4efac996f xen/include/asm-x86/mce.h --- a/xen/include/asm-x86/mce.h Mon Aug 06 12:28:03 2012 +0100 +++ b/xen/include/asm-x86/mce.h Tue Aug 07 08:16:37 2012 +0200 @@ -16,7 +16,6 @@ struct bank_entry { struct domain_mca_msrs { /* Guest should not change below values after DOM boot up */ - uint64_t mcg_ctl; uint64_t mcg_status; uint16_t nr_injection; struct list_head impact_header; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 20:33:30 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 20:33: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 1SyqT3-0005fr-OW; Tue, 07 Aug 2012 20:33:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqT1-0005Wp-Sv for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:28 +0000 Received: from [85.158.138.51:58947] by server-4.bemta-3.messagelabs.com id D6/CB-06379-79B71205; Tue, 07 Aug 2012 20:33:27 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-174.messagelabs.com!1344371605!26853189!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23424 invoked from network); 7 Aug 2012 20:33:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2012 20:33:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSz-00042H-AM for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SyqSz-0003NC-94 for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:25 +0000 Message-Id: Date: Tue, 07 Aug 2012 20:33:24 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] x86/MCE: remove mcg_ctl and other adjustment for future vMCE X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Liu, Jinsong # Date 1344320197 -7200 # Node ID a5f4efac996f030ba2f572b93ddbbcd1eff5ade7 # Parent 353bc0801b11ee28855cad50ffc7b8afe0efa556 x86/MCE: remove mcg_ctl and other adjustment for future vMCE This is a middle-work patch, preparing for the future new vMCE model. It removes mcg_ctl, disables MCG_CTL_P, and sets bank count to 2. Signed-off-by: Liu, Jinsong Committed-by: Jan Beulich --- diff -r 353bc0801b11 -r a5f4efac996f xen/arch/x86/cpu/mcheck/mce.c --- a/xen/arch/x86/cpu/mcheck/mce.c Mon Aug 06 12:28:03 2012 +0100 +++ b/xen/arch/x86/cpu/mcheck/mce.c Tue Aug 07 08:16:37 2012 +0200 @@ -843,8 +843,6 @@ void mcheck_init(struct cpuinfo_x86 *c, mctelem_init(sizeof(struct mc_info)); - vmce_init(c); - /* Turn on MCE now */ set_in_cr4(X86_CR4_MCE); diff -r 353bc0801b11 -r a5f4efac996f xen/arch/x86/cpu/mcheck/mce.h --- a/xen/arch/x86/cpu/mcheck/mce.h Mon Aug 06 12:28:03 2012 +0100 +++ b/xen/arch/x86/cpu/mcheck/mce.h Tue Aug 07 08:16:37 2012 +0200 @@ -170,8 +170,6 @@ int fill_vmsr_data(struct mcinfo_bank *m int inject_vmce(struct domain *d); int vmce_domain_inject(struct mcinfo_bank *bank, struct domain *d, struct mcinfo_global *global); -extern int vmce_init(struct cpuinfo_x86 *c); - static inline int mce_vendor_bank_msr(const struct vcpu *v, uint32_t msr) { if ( boot_cpu_data.x86_vendor == X86_VENDOR_INTEL && diff -r 353bc0801b11 -r a5f4efac996f xen/arch/x86/cpu/mcheck/vmce.c --- a/xen/arch/x86/cpu/mcheck/vmce.c Mon Aug 06 12:28:03 2012 +0100 +++ b/xen/arch/x86/cpu/mcheck/vmce.c Tue Aug 07 08:16:37 2012 +0200 @@ -19,13 +19,18 @@ #include "mce.h" #include "x86_mca.h" +/* + * Emulate 2 banks for guest + * Bank0: reserved for 'bank0 quirk' occur at some very old processors: + * 1). Intel cpu whose family-model value < 06-1A; + * 2). AMD K7 + * Bank1: used to transfer error info to guest + */ +#define GUEST_BANK_NUM 2 +#define GUEST_MCG_CAP (MCG_TES_P | MCG_SER_P | GUEST_BANK_NUM) + #define dom_vmce(x) ((x)->arch.vmca_msrs) -static uint64_t __read_mostly g_mcg_cap; - -/* Real value in physical CTL MSR */ -static uint64_t __read_mostly h_mcg_ctl; - int vmce_init_msr(struct domain *d) { dom_vmce(d) = xmalloc(struct domain_mca_msrs); @@ -33,7 +38,6 @@ int vmce_init_msr(struct domain *d) return -ENOMEM; dom_vmce(d)->mcg_status = 0x0; - dom_vmce(d)->mcg_ctl = ~(uint64_t)0x0; dom_vmce(d)->nr_injection = 0; INIT_LIST_HEAD(&dom_vmce(d)->impact_header); @@ -52,17 +56,17 @@ void vmce_destroy_msr(struct domain *d) void vmce_init_vcpu(struct vcpu *v) { - v->arch.mcg_cap = g_mcg_cap; + v->arch.mcg_cap = GUEST_MCG_CAP; } int vmce_restore_vcpu(struct vcpu *v, uint64_t caps) { - if ( caps & ~g_mcg_cap & ~MCG_CAP_COUNT & ~MCG_CTL_P ) + if ( caps & ~GUEST_MCG_CAP & ~MCG_CAP_COUNT & ~MCG_CTL_P ) { dprintk(XENLOG_G_ERR, "%s restore: unsupported MCA capabilities" " %#" PRIx64 " for d%d:v%u (supported: %#Lx)\n", is_hvm_vcpu(v) ? "HVM" : "PV", caps, v->domain->domain_id, - v->vcpu_id, g_mcg_cap & ~MCG_CAP_COUNT); + v->vcpu_id, GUEST_MCG_CAP & ~MCG_CAP_COUNT); return -EPERM; } @@ -175,11 +179,10 @@ int vmce_rdmsr(uint32_t msr, uint64_t *v *val); break; case MSR_IA32_MCG_CTL: - /* Always 0 if no CTL support */ + /* Stick all 1's when CTL support, and 0's when no CTL support */ if ( cur->arch.mcg_cap & MCG_CTL_P ) - *val = vmce->mcg_ctl & h_mcg_ctl; - mce_printk(MCE_VERBOSE, "MCE: rdmsr MCG_CTL 0x%"PRIx64"\n", - *val); + *val = ~0ULL; + mce_printk(MCE_VERBOSE, "MCE: rdmsr MCG_CTL 0x%"PRIx64"\n", *val); break; default: ret = mce_bank_msr(cur, msr) ? bank_mce_rdmsr(cur, msr, val) : 0; @@ -287,15 +290,11 @@ int vmce_wrmsr(u32 msr, u64 val) struct domain_mca_msrs *vmce = dom_vmce(cur->domain); int ret = 1; - if ( !g_mcg_cap ) - return 0; - spin_lock(&vmce->lock); switch ( msr ) { case MSR_IA32_MCG_CTL: - vmce->mcg_ctl = val; break; case MSR_IA32_MCG_STATUS: vmce->mcg_status = val; @@ -510,31 +509,6 @@ int vmce_domain_inject( } #endif -int vmce_init(struct cpuinfo_x86 *c) -{ - u64 value; - - rdmsrl(MSR_IA32_MCG_CAP, value); - /* For Guest vMCE usage */ - g_mcg_cap = value & (MCG_CAP_COUNT | MCG_CTL_P | MCG_TES_P | MCG_SER_P); - if (value & MCG_CTL_P) - rdmsrl(MSR_IA32_MCG_CTL, h_mcg_ctl); - - return 0; -} - -static int mca_ctl_conflict(struct mcinfo_bank *bank, struct domain *d) -{ - if ( !bank || !d ) - return 1; - - /* Will MCE happen in host if If host mcg_ctl is 0? */ - if ( ~d->arch.vmca_msrs->mcg_ctl & h_mcg_ctl ) - return 1; - - return 0; -} - static int is_hvm_vmce_ready(struct mcinfo_bank *bank, struct domain *d) { struct vcpu *v; @@ -588,14 +562,6 @@ static int is_hvm_vmce_ready(struct mcin if (no_vmce) return 0; - /* Guest has different MCE ctl value setting */ - if (mca_ctl_conflict(bank, d)) - { - dprintk(XENLOG_WARNING, - "No vmce, guest has different mca control setting\n"); - return 0; - } - return 1; } diff -r 353bc0801b11 -r a5f4efac996f xen/include/asm-x86/mce.h --- a/xen/include/asm-x86/mce.h Mon Aug 06 12:28:03 2012 +0100 +++ b/xen/include/asm-x86/mce.h Tue Aug 07 08:16:37 2012 +0200 @@ -16,7 +16,6 @@ struct bank_entry { struct domain_mca_msrs { /* Guest should not change below values after DOM boot up */ - uint64_t mcg_ctl; uint64_t mcg_status; uint16_t nr_injection; struct list_head impact_header; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 07 20:33:31 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Aug 2012 20:33: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 1SyqT4-0005hj-Tf; Tue, 07 Aug 2012 20:33:30 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqT2-0005dx-GI for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:28 +0000 Received: from [85.158.143.99:37571] by server-1.bemta-4.messagelabs.com id E6/DB-24392-79B71205; Tue, 07 Aug 2012 20:33:27 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-216.messagelabs.com!1344371604!29818854!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8552 invoked from network); 7 Aug 2012 20:33:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2012 20:33:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SyqSy-000420-6g for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SyqSy-0003Mh-52 for xen-changelog@lists.xensource.com; Tue, 07 Aug 2012 20:33:24 +0000 Message-Id: Date: Tue, 07 Aug 2012 20:33:23 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] Merge backout of 25727:a8d708fcb347 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1344252306 -3600 # Node ID 60f2c7b74741776d1a25fe2618fb17b570996ce5 # Parent 6221bee07e5dc31d9ed9eb3c0c1c94a80c56c78d # Parent ce0079dc8c52d5335d78b24c4c6e0a36d4780061 Merge backout of 25727:a8d708fcb347 --- diff -r 6221bee07e5d -r 60f2c7b74741 docs/misc/xl-disk-configuration.txt --- a/docs/misc/xl-disk-configuration.txt Mon Aug 06 11:18:43 2012 +0200 +++ b/docs/misc/xl-disk-configuration.txt Mon Aug 06 12:25:06 2012 +0100 @@ -160,10 +160,7 @@ script=