From xen-changelog-bounces@lists.xen.org Tue Jul 03 09:22:13 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Jul 2012 09:22:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SlzJC-0007ff-Fm; Tue, 03 Jul 2012 09:22:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SlzJ9-0007fP-U8 for xen-changelog@lists.xensource.com; Tue, 03 Jul 2012 09:22:09 +0000 Received: from [85.158.138.51:13024] by server-8.bemta-3.messagelabs.com id C2/EA-06157-FB9B2FF4; Tue, 03 Jul 2012 09:22:07 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-174.messagelabs.com!1341307324!21844756!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9509 invoked from network); 3 Jul 2012 09:22:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 3 Jul 2012 09:22:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SlzJ6-0005E5-A8 for xen-changelog@lists.xensource.com; Tue, 03 Jul 2012 09:22:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SlzJ5-0001Zc-VA for xen-changelog@lists.xensource.com; Tue, 03 Jul 2012 09:22:03 +0000 Message-Id: Date: Tue, 03 Jul 2012 09: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: make xor block handling uniform X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341306467 -7200 # Node ID d5afea2ab44ff42e3a12e3952efa35a60ca2d1de # Parent 5e3c342a325edb5841b1df42ac33b61c49586f9c x86: make xor block handling uniform Irrespective of the elimination of raw CR0 reads and writes, any of the methods requiring access to the floating point/XMM state still perform worse than the integer register based ones (at least as long as the virtual CR0.TS is set upon entry). Thus un-define XOR_SELECT_TEMPLATE in both 32- and 64-bit. On 64-bit additionally make the integer register based routines available for selection in the first place, and remove the duplicate code in the Xen specific header in favor of a small adjustment to the native one (using read_cr0()/clts()/write_cr0() instead of open coded accesses in the inline assembly). Signed-off-by: Jan Beulich --- diff -r 5e3c342a325e -r d5afea2ab44f include/asm-i386/mach-xen/asm/xor.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/include/asm-i386/mach-xen/asm/xor.h Tue Jul 03 11:07:47 2012 +0200 @@ -0,0 +1,3 @@ +#include_next + +#undef XOR_SELECT_TEMPLATE diff -r 5e3c342a325e -r d5afea2ab44f include/asm-x86_64/mach-xen/asm/xor.h --- a/include/asm-x86_64/mach-xen/asm/xor.h Tue Jul 03 10:12:32 2012 +0200 +++ b/include/asm-x86_64/mach-xen/asm/xor.h Tue Jul 03 11:07:47 2012 +0200 @@ -1,328 +1,17 @@ -/* - * x86-64 changes / gcc fixes from Andi Kleen. - * Copyright 2002 Andi Kleen, SuSE Labs. - * - * This hasn't been optimized for the hammer yet, but there are likely - * no advantages to be gotten from x86-64 here anyways. - */ +#include_next -typedef struct { unsigned long a,b; } __attribute__((aligned(16))) xmm_store_t; +#undef XOR_SELECT_TEMPLATE -/* Doesn't use gcc to save the XMM registers, because there is no easy way to - tell it to do a clts before the register saving. */ -#define XMMS_SAVE do { \ - preempt_disable(); \ - if (!(current_thread_info()->status & TS_USEDFPU)) \ - clts(); \ - __asm__ __volatile__ ( \ - "movups %%xmm0,(%1) ;\n\t" \ - "movups %%xmm1,0x10(%1) ;\n\t" \ - "movups %%xmm2,0x20(%1) ;\n\t" \ - "movups %%xmm3,0x30(%1) ;\n\t" \ - : "=&r" (cr0) \ - : "r" (xmm_save) \ - : "memory"); \ -} while(0) - -#define XMMS_RESTORE do { \ - asm volatile ( \ - "sfence ;\n\t" \ - "movups (%1),%%xmm0 ;\n\t" \ - "movups 0x10(%1),%%xmm1 ;\n\t" \ - "movups 0x20(%1),%%xmm2 ;\n\t" \ - "movups 0x30(%1),%%xmm3 ;\n\t" \ - : \ - : "r" (cr0), "r" (xmm_save) \ - : "memory"); \ - if (!(current_thread_info()->status & TS_USEDFPU)) \ - stts(); \ - preempt_enable(); \ -} while(0) - -#define OFFS(x) "16*("#x")" -#define PF_OFFS(x) "256+16*("#x")" -#define PF0(x) " prefetchnta "PF_OFFS(x)"(%[p1]) ;\n" -#define LD(x,y) " movaps "OFFS(x)"(%[p1]), %%xmm"#y" ;\n" -#define ST(x,y) " movaps %%xmm"#y", "OFFS(x)"(%[p1]) ;\n" -#define PF1(x) " prefetchnta "PF_OFFS(x)"(%[p2]) ;\n" -#define PF2(x) " prefetchnta "PF_OFFS(x)"(%[p3]) ;\n" -#define PF3(x) " prefetchnta "PF_OFFS(x)"(%[p4]) ;\n" -#define PF4(x) " prefetchnta "PF_OFFS(x)"(%[p5]) ;\n" -#define PF5(x) " prefetchnta "PF_OFFS(x)"(%[p6]) ;\n" -#define XO1(x,y) " xorps "OFFS(x)"(%[p2]), %%xmm"#y" ;\n" -#define XO2(x,y) " xorps "OFFS(x)"(%[p3]), %%xmm"#y" ;\n" -#define XO3(x,y) " xorps "OFFS(x)"(%[p4]), %%xmm"#y" ;\n" -#define XO4(x,y) " xorps "OFFS(x)"(%[p5]), %%xmm"#y" ;\n" -#define XO5(x,y) " xorps "OFFS(x)"(%[p6]), %%xmm"#y" ;\n" - - -static void -xor_sse_2(unsigned long bytes, unsigned long *p1, unsigned long *p2) -{ - unsigned int lines = bytes >> 8; - unsigned long cr0; - xmm_store_t xmm_save[4]; - - XMMS_SAVE; - - asm volatile ( -#undef BLOCK -#define BLOCK(i) \ - LD(i,0) \ - LD(i+1,1) \ - PF1(i) \ - PF1(i+2) \ - LD(i+2,2) \ - LD(i+3,3) \ - PF0(i+4) \ - PF0(i+6) \ - XO1(i,0) \ - XO1(i+1,1) \ - XO1(i+2,2) \ - XO1(i+3,3) \ - ST(i,0) \ - ST(i+1,1) \ - ST(i+2,2) \ - ST(i+3,3) \ - - - PF0(0) - PF0(2) - - " .align 32 ;\n" - " 1: ;\n" - - BLOCK(0) - BLOCK(4) - BLOCK(8) - BLOCK(12) - - " addq %[inc], %[p1] ;\n" - " addq %[inc], %[p2] ;\n" - " decl %[cnt] ; jnz 1b" - : [p1] "+r" (p1), [p2] "+r" (p2), [cnt] "+r" (lines) - : [inc] "r" (256UL) - : "memory"); - - XMMS_RESTORE; -} - -static void -xor_sse_3(unsigned long bytes, unsigned long *p1, unsigned long *p2, - unsigned long *p3) -{ - unsigned int lines = bytes >> 8; - xmm_store_t xmm_save[4]; - unsigned long cr0; - - XMMS_SAVE; - - __asm__ __volatile__ ( -#undef BLOCK -#define BLOCK(i) \ - PF1(i) \ - PF1(i+2) \ - LD(i,0) \ - LD(i+1,1) \ - LD(i+2,2) \ - LD(i+3,3) \ - PF2(i) \ - PF2(i+2) \ - PF0(i+4) \ - PF0(i+6) \ - XO1(i,0) \ - XO1(i+1,1) \ - XO1(i+2,2) \ - XO1(i+3,3) \ - XO2(i,0) \ - XO2(i+1,1) \ - XO2(i+2,2) \ - XO2(i+3,3) \ - ST(i,0) \ - ST(i+1,1) \ - ST(i+2,2) \ - ST(i+3,3) \ - - - PF0(0) - PF0(2) - - " .align 32 ;\n" - " 1: ;\n" - - BLOCK(0) - BLOCK(4) - BLOCK(8) - BLOCK(12) - - " addq %[inc], %[p1] ;\n" - " addq %[inc], %[p2] ;\n" - " addq %[inc], %[p3] ;\n" - " decl %[cnt] ; jnz 1b" - : [cnt] "+r" (lines), - [p1] "+r" (p1), [p2] "+r" (p2), [p3] "+r" (p3) - : [inc] "r" (256UL) - : "memory"); - XMMS_RESTORE; -} - -static void -xor_sse_4(unsigned long bytes, unsigned long *p1, unsigned long *p2, - unsigned long *p3, unsigned long *p4) -{ - unsigned int lines = bytes >> 8; - xmm_store_t xmm_save[4]; - unsigned long cr0; - - XMMS_SAVE; - - __asm__ __volatile__ ( -#undef BLOCK -#define BLOCK(i) \ - PF1(i) \ - PF1(i+2) \ - LD(i,0) \ - LD(i+1,1) \ - LD(i+2,2) \ - LD(i+3,3) \ - PF2(i) \ - PF2(i+2) \ - XO1(i,0) \ - XO1(i+1,1) \ - XO1(i+2,2) \ - XO1(i+3,3) \ - PF3(i) \ - PF3(i+2) \ - PF0(i+4) \ - PF0(i+6) \ - XO2(i,0) \ - XO2(i+1,1) \ - XO2(i+2,2) \ - XO2(i+3,3) \ - XO3(i,0) \ - XO3(i+1,1) \ - XO3(i+2,2) \ - XO3(i+3,3) \ - ST(i,0) \ - ST(i+1,1) \ - ST(i+2,2) \ - ST(i+3,3) \ - - - PF0(0) - PF0(2) - - " .align 32 ;\n" - " 1: ;\n" - - BLOCK(0) - BLOCK(4) - BLOCK(8) - BLOCK(12) - - " addq %[inc], %[p1] ;\n" - " addq %[inc], %[p2] ;\n" - " addq %[inc], %[p3] ;\n" - " addq %[inc], %[p4] ;\n" - " decl %[cnt] ; jnz 1b" - : [cnt] "+c" (lines), - [p1] "+r" (p1), [p2] "+r" (p2), [p3] "+r" (p3), [p4] "+r" (p4) - : [inc] "r" (256UL) - : "memory" ); - - XMMS_RESTORE; -} - -static void -xor_sse_5(unsigned long bytes, unsigned long *p1, unsigned long *p2, - unsigned long *p3, unsigned long *p4, unsigned long *p5) -{ - unsigned int lines = bytes >> 8; - xmm_store_t xmm_save[4]; - unsigned long cr0; - - XMMS_SAVE; - - __asm__ __volatile__ ( -#undef BLOCK -#define BLOCK(i) \ - PF1(i) \ - PF1(i+2) \ - LD(i,0) \ - LD(i+1,1) \ - LD(i+2,2) \ - LD(i+3,3) \ - PF2(i) \ - PF2(i+2) \ - XO1(i,0) \ - XO1(i+1,1) \ - XO1(i+2,2) \ - XO1(i+3,3) \ - PF3(i) \ - PF3(i+2) \ - XO2(i,0) \ - XO2(i+1,1) \ - XO2(i+2,2) \ - XO2(i+3,3) \ - PF4(i) \ - PF4(i+2) \ - PF0(i+4) \ - PF0(i+6) \ - XO3(i,0) \ - XO3(i+1,1) \ - XO3(i+2,2) \ - XO3(i+3,3) \ - XO4(i,0) \ - XO4(i+1,1) \ - XO4(i+2,2) \ - XO4(i+3,3) \ - ST(i,0) \ - ST(i+1,1) \ - ST(i+2,2) \ - ST(i+3,3) \ - - - PF0(0) - PF0(2) - - " .align 32 ;\n" - " 1: ;\n" - - BLOCK(0) - BLOCK(4) - BLOCK(8) - BLOCK(12) - - " addq %[inc], %[p1] ;\n" - " addq %[inc], %[p2] ;\n" - " addq %[inc], %[p3] ;\n" - " addq %[inc], %[p4] ;\n" - " addq %[inc], %[p5] ;\n" - " decl %[cnt] ; jnz 1b" - : [cnt] "+c" (lines), - [p1] "+r" (p1), [p2] "+r" (p2), [p3] "+r" (p3), [p4] "+r" (p4), - [p5] "+r" (p5) - : [inc] "r" (256UL) - : "memory"); - - XMMS_RESTORE; -} - -static struct xor_block_template xor_block_sse = { - .name = "generic_sse", - .do_2 = xor_sse_2, - .do_3 = xor_sse_3, - .do_4 = xor_sse_4, - .do_5 = xor_sse_5, -}; +/* Also try the generic routines. */ +#undef XOR_TRY_TEMPLATES +#include #undef XOR_TRY_TEMPLATES -#define XOR_TRY_TEMPLATES \ - do { \ +#define XOR_TRY_TEMPLATES \ + do { \ + xor_speed(&xor_block_8regs); \ + xor_speed(&xor_block_8regs_p); \ + xor_speed(&xor_block_32regs); \ + xor_speed(&xor_block_32regs_p); \ xor_speed(&xor_block_sse); \ } while (0) - -/* We force the use of the SSE xor block because it can write around L2. - We may also be able to load into the L1 only depending on how the cpu - deals with a load to a line that is being prefetched. */ -#define XOR_SELECT_TEMPLATE(FASTEST) (&xor_block_sse) diff -r 5e3c342a325e -r d5afea2ab44f include/asm-x86_64/xor.h --- a/include/asm-x86_64/xor.h Tue Jul 03 10:12:32 2012 +0200 +++ b/include/asm-x86_64/xor.h Tue Jul 03 11:07:47 2012 +0200 @@ -39,14 +39,14 @@ typedef struct { unsigned long a,b; } __ tell it to do a clts before the register saving. */ #define XMMS_SAVE do { \ preempt_disable(); \ + cr0 = read_cr0(); \ + clts(); \ asm volatile ( \ - "movq %%cr0,%0 ;\n\t" \ - "clts ;\n\t" \ "movups %%xmm0,(%1) ;\n\t" \ "movups %%xmm1,0x10(%1) ;\n\t" \ "movups %%xmm2,0x20(%1) ;\n\t" \ "movups %%xmm3,0x30(%1) ;\n\t" \ - : "=&r" (cr0) \ + : "+r" (cr0) \ : "r" (xmm_save) \ : "memory"); \ } while(0) @@ -58,10 +58,10 @@ typedef struct { unsigned long a,b; } __ "movups 0x10(%1),%%xmm1 ;\n\t" \ "movups 0x20(%1),%%xmm2 ;\n\t" \ "movups 0x30(%1),%%xmm3 ;\n\t" \ - "movq %0,%%cr0 ;\n\t" \ : \ : "r" (cr0), "r" (xmm_save) \ : "memory"); \ + write_cr0(cr0); \ preempt_enable(); \ } while(0) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jul 03 09:22:14 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Jul 2012 09:22:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SlzJC-0007fa-DO; Tue, 03 Jul 2012 09: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 1SlzJA-0007fQ-Go for xen-changelog@lists.xensource.com; Tue, 03 Jul 2012 09:22:08 +0000 Received: from [85.158.139.83:64241] by server-10.bemta-5.messagelabs.com id 25/F8-02190-FB9B2FF4; Tue, 03 Jul 2012 09:22:07 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-182.messagelabs.com!1341307324!26428220!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 883 invoked from network); 3 Jul 2012 09:22:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 3 Jul 2012 09:22:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SlzJ6-0005E2-2f for xen-changelog@lists.xensource.com; Tue, 03 Jul 2012 09:22:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SlzJ5-0001ZN-Gw for xen-changelog@lists.xensource.com; Tue, 03 Jul 2012 09:22:03 +0000 Message-Id: Date: Tue, 03 Jul 2012 09: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: improve CR0 read/write handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341303152 -7200 # Node ID 5e3c342a325edb5841b1df42ac33b61c49586f9c # Parent 7b36058ce050a6f55f33849f0528410288e72b59 x86: improve CR0 read/write handling With the only bit in CR0 permitted to be changed by PV guests being TS, optimize the handling towards that: Keep a cached value in a per-CPU variable, and issue HYPERVISOR_fpu_taskswitch hypercalls for updates in all but the unusual case should something in the system still try to modify another bit (the attempt of which would then be logged by the hypervisor). This removes the need to have the hypervisor emulate MOV to/from CR0 instructions in all halfway frequently executed code paths. Signed-off-by: Jan Beulich --- diff -r 7b36058ce050 -r 5e3c342a325e arch/i386/kernel/cpu/common-xen.c --- a/arch/i386/kernel/cpu/common-xen.c Tue Jun 12 16:06:28 2012 +0200 +++ b/arch/i386/kernel/cpu/common-xen.c Tue Jul 03 10:12:32 2012 +0200 @@ -32,6 +32,11 @@ EXPORT_PER_CPU_SYMBOL(cpu_gdt_descr); #ifndef CONFIG_XEN DEFINE_PER_CPU(unsigned char, cpu_16bit_stack[CPU_16BIT_STACK_SIZE]); EXPORT_PER_CPU_SYMBOL(cpu_16bit_stack); +#else +DEFINE_PER_CPU(unsigned int, xen_x86_cr0); +DEFINE_PER_CPU(unsigned int, xen_x86_cr0_upd) = ~0; +EXPORT_PER_CPU_SYMBOL(xen_x86_cr0); +EXPORT_PER_CPU_SYMBOL(xen_x86_cr0_upd); #endif static int cachesize_override __cpuinitdata = -1; @@ -681,6 +686,8 @@ old_gdt: cpu_gdt_descr->size = GDT_SIZE - 1; cpu_gdt_descr->address = (unsigned long)gdt; #else + __get_cpu_var(xen_x86_cr0) = raw_read_cr0(); + xen_clear_cr0_upd(); if (cpu == 0 && cpu_gdt_descr->address == 0) { gdt = (struct desc_struct *)alloc_bootmem_pages(PAGE_SIZE); /* alloc_bootmem_pages panics on failure, so no check */ diff -r 7b36058ce050 -r 5e3c342a325e arch/i386/kernel/process-xen.c --- a/arch/i386/kernel/process-xen.c Tue Jun 12 16:06:28 2012 +0200 +++ b/arch/i386/kernel/process-xen.c Tue Jul 03 10:12:32 2012 +0200 @@ -639,8 +639,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) + __get_cpu_var(xen_x86_cr0_upd) = X86_CR0_TS; if (unlikely(HYPERVISOR_multicall_check(_mcl, mcl - _mcl, NULL))) BUG(); + if (_mcl->op == __HYPERVISOR_fpu_taskswitch) { + __get_cpu_var(xen_x86_cr0) |= X86_CR0_TS; + xen_clear_cr0_upd(); + } /* * Restore %fs and %gs if needed. diff -r 7b36058ce050 -r 5e3c342a325e arch/i386/kernel/traps-xen.c --- a/arch/i386/kernel/traps-xen.c Tue Jun 12 16:06:28 2012 +0200 +++ b/arch/i386/kernel/traps-xen.c Tue Jul 03 10:12:32 2012 +0200 @@ -1057,6 +1057,7 @@ asmlinkage void math_state_restore(struc struct task_struct *tsk = thread->task; /* NB. 'clts' is done for us by Xen during virtual trap. */ + __get_cpu_var(xen_x86_cr0) &= ~X86_CR0_TS; if (!tsk_used_math(tsk)) init_fpu(tsk); restore_fpu(tsk); diff -r 7b36058ce050 -r 5e3c342a325e arch/x86_64/kernel/process-xen.c --- a/arch/x86_64/kernel/process-xen.c Tue Jun 12 16:06:28 2012 +0200 +++ b/arch/x86_64/kernel/process-xen.c Tue Jul 03 10:12:32 2012 +0200 @@ -572,8 +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) + __get_cpu_var(xen_x86_cr0_upd) = X86_CR0_TS; if (unlikely(HYPERVISOR_multicall_check(_mcl, mcl - _mcl, NULL))) BUG(); + if (_mcl->op == __HYPERVISOR_fpu_taskswitch) { + __get_cpu_var(xen_x86_cr0) |= X86_CR0_TS; + xen_clear_cr0_upd(); + } /* * Switch DS and ES. diff -r 7b36058ce050 -r 5e3c342a325e arch/x86_64/kernel/setup64-xen.c --- a/arch/x86_64/kernel/setup64-xen.c Tue Jun 12 16:06:28 2012 +0200 +++ b/arch/x86_64/kernel/setup64-xen.c Tue Jul 03 10:12:32 2012 +0200 @@ -126,6 +126,11 @@ void __init setup_per_cpu_areas(void) } #ifdef CONFIG_XEN +DEFINE_PER_CPU(unsigned long, xen_x86_cr0); +DEFINE_PER_CPU(unsigned long, xen_x86_cr0_upd) = ~0; +EXPORT_PER_CPU_SYMBOL(xen_x86_cr0); +EXPORT_PER_CPU_SYMBOL(xen_x86_cr0_upd); + static void switch_pt(void) { xen_pt_switch(__pa_symbol(init_level4_pgt)); @@ -174,6 +179,8 @@ void pda_init(int cpu) if (HYPERVISOR_set_segment_base(SEGBASE_GS_KERNEL, (unsigned long)pda)) BUG(); + __get_cpu_var(xen_x86_cr0) = raw_read_cr0(); + xen_clear_cr0_upd(); #endif pda->cpunumber = cpu; pda->irqcount = -1; diff -r 7b36058ce050 -r 5e3c342a325e arch/x86_64/kernel/traps-xen.c --- a/arch/x86_64/kernel/traps-xen.c Tue Jun 12 16:06:28 2012 +0200 +++ b/arch/x86_64/kernel/traps-xen.c Tue Jul 03 10:12:32 2012 +0200 @@ -1075,8 +1075,9 @@ asmlinkage void __attribute__((weak)) mc asmlinkage void math_state_restore(void) { struct task_struct *me = current; - /* clts(); */ /* 'clts' is done for us by Xen during virtual trap. */ + /* NB. 'clts' is done for us by Xen during virtual trap. */ + __get_cpu_var(xen_x86_cr0) &= ~X86_CR0_TS; if (!used_math()) init_fpu(me); restore_fpu_checking(&me->thread.i387.fxsave); diff -r 7b36058ce050 -r 5e3c342a325e include/asm-i386/mach-xen/asm/system.h --- a/include/asm-i386/mach-xen/asm/system.h Tue Jun 12 16:06:28 2012 +0200 +++ b/include/asm-i386/mach-xen/asm/system.h Tue Jul 03 10:12:32 2012 +0200 @@ -2,8 +2,10 @@ #define __ASM_SYSTEM_H #include +#include #include #include +#include #include /* for LOCK_PREFIX */ #include #include @@ -90,15 +92,50 @@ __asm__ __volatile__ ("movw %%dx,%1\n\t" #define savesegment(seg, value) \ asm volatile("mov %%" #seg ",%0":"=rm" (value)) -#define read_cr0() ({ \ +DECLARE_PER_CPU(unsigned int, xen_x86_cr0); +DECLARE_PER_CPU(unsigned int, xen_x86_cr0_upd); + +#define xen_read_cr0_upd() ({ \ + unsigned int u__ = __get_cpu_var(xen_x86_cr0_upd); \ + rmb(); \ + u__; \ +}) +#define xen_clear_cr0_upd() do { \ + wmb(); \ + __get_cpu_var(xen_x86_cr0_upd) = 0; \ +} while (0) + +#define raw_read_cr0() ({ \ unsigned int __dummy; \ __asm__ __volatile__( \ "movl %%cr0,%0\n\t" \ :"=r" (__dummy)); \ __dummy; \ }) -#define write_cr0(x) \ +#define read_cr0() (likely(!xen_read_cr0_upd()) ? \ + __get_cpu_var(xen_x86_cr0) : raw_read_cr0()) +#define raw_write_cr0(x) \ __asm__ __volatile__("movl %0,%%cr0": :"r" (x)) +#define write_cr0(x) do { \ + unsigned int x__ = (x); \ + unsigned int upd = x__ ^ __get_cpu_var(xen_x86_cr0); \ + if (unlikely(cmpxchg(&__get_cpu_var(xen_x86_cr0_upd), 0, upd))) { \ + raw_write_cr0(x__); \ + break; \ + } \ + switch (upd) { \ + case 0: \ + continue; \ + case X86_CR0_TS: \ + HYPERVISOR_fpu_taskswitch(!!(x__ & X86_CR0_TS)); \ + break; \ + default: \ + raw_write_cr0(x__); \ + break; \ + } \ + __get_cpu_var(xen_x86_cr0) = x__; \ + xen_clear_cr0_upd(); \ +} while (0) #define read_cr2() (current_vcpu_info()->arch.cr2) #define write_cr2(x) \ @@ -142,8 +179,27 @@ __asm__ __volatile__ ("movw %%dx,%1\n\t" /* * Clear and set 'TS' bit respectively */ -#define clts() (HYPERVISOR_fpu_taskswitch(0)) -#define stts() (HYPERVISOR_fpu_taskswitch(1)) +#define X86_CR0_TS 8 +#define clts() ({ \ + if (unlikely(xen_read_cr0_upd())) \ + HYPERVISOR_fpu_taskswitch(0); \ + else if (__get_cpu_var(xen_x86_cr0) & X86_CR0_TS) { \ + __get_cpu_var(xen_x86_cr0_upd) = X86_CR0_TS; \ + HYPERVISOR_fpu_taskswitch(0); \ + __get_cpu_var(xen_x86_cr0) &= ~X86_CR0_TS; \ + xen_clear_cr0_upd(); \ + } \ +}) +#define stts() ({ \ + if (unlikely(xen_read_cr0_upd())) \ + HYPERVISOR_fpu_taskswitch(1); \ + else if (!(__get_cpu_var(xen_x86_cr0) & X86_CR0_TS)) { \ + __get_cpu_var(xen_x86_cr0_upd) = X86_CR0_TS; \ + HYPERVISOR_fpu_taskswitch(1); \ + __get_cpu_var(xen_x86_cr0) |= X86_CR0_TS; \ + xen_clear_cr0_upd(); \ + } \ +}) #endif /* __KERNEL__ */ diff -r 7b36058ce050 -r 5e3c342a325e include/asm-x86_64/mach-xen/asm/system.h --- a/include/asm-x86_64/mach-xen/asm/system.h Tue Jun 12 16:06:28 2012 +0200 +++ b/include/asm-x86_64/mach-xen/asm/system.h Tue Jul 03 10:12:32 2012 +0200 @@ -7,7 +7,7 @@ #include #include -#include +#include #ifdef __KERNEL__ @@ -71,19 +71,64 @@ extern void load_gs_index(unsigned); /* * Clear and set 'TS' bit respectively */ -#define clts() (HYPERVISOR_fpu_taskswitch(0)) +#define X86_CR0_TS 8 +#define clts() ({ \ + if (unlikely(xen_read_cr0_upd())) \ + HYPERVISOR_fpu_taskswitch(0); \ + else if (__get_cpu_var(xen_x86_cr0) & X86_CR0_TS) { \ + __get_cpu_var(xen_x86_cr0_upd) = X86_CR0_TS; \ + HYPERVISOR_fpu_taskswitch(0); \ + __get_cpu_var(xen_x86_cr0) &= ~X86_CR0_TS; \ + xen_clear_cr0_upd(); \ + } \ +}) -static inline unsigned long read_cr0(void) +DECLARE_PER_CPU(unsigned long, xen_x86_cr0); +DECLARE_PER_CPU(unsigned long, xen_x86_cr0_upd); + +#define xen_read_cr0_upd() ({ \ + unsigned long u__ = __get_cpu_var(xen_x86_cr0_upd); \ + rmb(); \ + u__; \ +}) +#define xen_clear_cr0_upd() do { \ + wmb(); \ + __get_cpu_var(xen_x86_cr0_upd) = 0; \ +} while (0) + +static inline unsigned long raw_read_cr0(void) { unsigned long cr0; asm volatile("movq %%cr0,%0" : "=r" (cr0)); return cr0; } +#define read_cr0() (likely(!xen_read_cr0_upd()) ? \ + __get_cpu_var(xen_x86_cr0) : raw_read_cr0()) -static inline void write_cr0(unsigned long val) +static inline void raw_write_cr0(unsigned long val) { asm volatile("movq %0,%%cr0" :: "r" (val)); } +#define write_cr0(x) do { \ + unsigned long x__ = (x); \ + unsigned long upd = x__ ^ __get_cpu_var(xen_x86_cr0); \ + if (unlikely(cmpxchg(&__get_cpu_var(xen_x86_cr0_upd), 0, upd))) { \ + raw_write_cr0(x__); \ + break; \ + } \ + switch (upd) { \ + case 0: \ + continue; \ + case X86_CR0_TS: \ + HYPERVISOR_fpu_taskswitch(!!(x__ & X86_CR0_TS)); \ + break; \ + default: \ + raw_write_cr0(x__); \ + break; \ + } \ + __get_cpu_var(xen_x86_cr0) = x__; \ + xen_clear_cr0_upd(); \ +} while (0) #define read_cr3() ({ \ unsigned long __dummy; \ @@ -103,7 +148,16 @@ static inline void write_cr4(unsigned lo asm volatile("movq %0,%%cr4" :: "r" (val)); } -#define stts() (HYPERVISOR_fpu_taskswitch(1)) +#define stts() ({ \ + if (unlikely(xen_read_cr0_upd())) \ + HYPERVISOR_fpu_taskswitch(1); \ + else if (!(__get_cpu_var(xen_x86_cr0) & X86_CR0_TS)) { \ + __get_cpu_var(xen_x86_cr0_upd) = X86_CR0_TS; \ + HYPERVISOR_fpu_taskswitch(1); \ + __get_cpu_var(xen_x86_cr0) |= X86_CR0_TS; \ + xen_clear_cr0_upd(); \ + } \ +}) #define wbinvd() \ __asm__ __volatile__ ("wbinvd": : :"memory"); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jul 03 09:22:13 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Jul 2012 09:22:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SlzJC-0007ff-Fm; Tue, 03 Jul 2012 09:22:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SlzJ9-0007fP-U8 for xen-changelog@lists.xensource.com; Tue, 03 Jul 2012 09:22:09 +0000 Received: from [85.158.138.51:13024] by server-8.bemta-3.messagelabs.com id C2/EA-06157-FB9B2FF4; Tue, 03 Jul 2012 09:22:07 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-174.messagelabs.com!1341307324!21844756!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9509 invoked from network); 3 Jul 2012 09:22:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 3 Jul 2012 09:22:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SlzJ6-0005E5-A8 for xen-changelog@lists.xensource.com; Tue, 03 Jul 2012 09:22:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SlzJ5-0001Zc-VA for xen-changelog@lists.xensource.com; Tue, 03 Jul 2012 09:22:03 +0000 Message-Id: Date: Tue, 03 Jul 2012 09: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: make xor block handling uniform X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341306467 -7200 # Node ID d5afea2ab44ff42e3a12e3952efa35a60ca2d1de # Parent 5e3c342a325edb5841b1df42ac33b61c49586f9c x86: make xor block handling uniform Irrespective of the elimination of raw CR0 reads and writes, any of the methods requiring access to the floating point/XMM state still perform worse than the integer register based ones (at least as long as the virtual CR0.TS is set upon entry). Thus un-define XOR_SELECT_TEMPLATE in both 32- and 64-bit. On 64-bit additionally make the integer register based routines available for selection in the first place, and remove the duplicate code in the Xen specific header in favor of a small adjustment to the native one (using read_cr0()/clts()/write_cr0() instead of open coded accesses in the inline assembly). Signed-off-by: Jan Beulich --- diff -r 5e3c342a325e -r d5afea2ab44f include/asm-i386/mach-xen/asm/xor.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/include/asm-i386/mach-xen/asm/xor.h Tue Jul 03 11:07:47 2012 +0200 @@ -0,0 +1,3 @@ +#include_next + +#undef XOR_SELECT_TEMPLATE diff -r 5e3c342a325e -r d5afea2ab44f include/asm-x86_64/mach-xen/asm/xor.h --- a/include/asm-x86_64/mach-xen/asm/xor.h Tue Jul 03 10:12:32 2012 +0200 +++ b/include/asm-x86_64/mach-xen/asm/xor.h Tue Jul 03 11:07:47 2012 +0200 @@ -1,328 +1,17 @@ -/* - * x86-64 changes / gcc fixes from Andi Kleen. - * Copyright 2002 Andi Kleen, SuSE Labs. - * - * This hasn't been optimized for the hammer yet, but there are likely - * no advantages to be gotten from x86-64 here anyways. - */ +#include_next -typedef struct { unsigned long a,b; } __attribute__((aligned(16))) xmm_store_t; +#undef XOR_SELECT_TEMPLATE -/* Doesn't use gcc to save the XMM registers, because there is no easy way to - tell it to do a clts before the register saving. */ -#define XMMS_SAVE do { \ - preempt_disable(); \ - if (!(current_thread_info()->status & TS_USEDFPU)) \ - clts(); \ - __asm__ __volatile__ ( \ - "movups %%xmm0,(%1) ;\n\t" \ - "movups %%xmm1,0x10(%1) ;\n\t" \ - "movups %%xmm2,0x20(%1) ;\n\t" \ - "movups %%xmm3,0x30(%1) ;\n\t" \ - : "=&r" (cr0) \ - : "r" (xmm_save) \ - : "memory"); \ -} while(0) - -#define XMMS_RESTORE do { \ - asm volatile ( \ - "sfence ;\n\t" \ - "movups (%1),%%xmm0 ;\n\t" \ - "movups 0x10(%1),%%xmm1 ;\n\t" \ - "movups 0x20(%1),%%xmm2 ;\n\t" \ - "movups 0x30(%1),%%xmm3 ;\n\t" \ - : \ - : "r" (cr0), "r" (xmm_save) \ - : "memory"); \ - if (!(current_thread_info()->status & TS_USEDFPU)) \ - stts(); \ - preempt_enable(); \ -} while(0) - -#define OFFS(x) "16*("#x")" -#define PF_OFFS(x) "256+16*("#x")" -#define PF0(x) " prefetchnta "PF_OFFS(x)"(%[p1]) ;\n" -#define LD(x,y) " movaps "OFFS(x)"(%[p1]), %%xmm"#y" ;\n" -#define ST(x,y) " movaps %%xmm"#y", "OFFS(x)"(%[p1]) ;\n" -#define PF1(x) " prefetchnta "PF_OFFS(x)"(%[p2]) ;\n" -#define PF2(x) " prefetchnta "PF_OFFS(x)"(%[p3]) ;\n" -#define PF3(x) " prefetchnta "PF_OFFS(x)"(%[p4]) ;\n" -#define PF4(x) " prefetchnta "PF_OFFS(x)"(%[p5]) ;\n" -#define PF5(x) " prefetchnta "PF_OFFS(x)"(%[p6]) ;\n" -#define XO1(x,y) " xorps "OFFS(x)"(%[p2]), %%xmm"#y" ;\n" -#define XO2(x,y) " xorps "OFFS(x)"(%[p3]), %%xmm"#y" ;\n" -#define XO3(x,y) " xorps "OFFS(x)"(%[p4]), %%xmm"#y" ;\n" -#define XO4(x,y) " xorps "OFFS(x)"(%[p5]), %%xmm"#y" ;\n" -#define XO5(x,y) " xorps "OFFS(x)"(%[p6]), %%xmm"#y" ;\n" - - -static void -xor_sse_2(unsigned long bytes, unsigned long *p1, unsigned long *p2) -{ - unsigned int lines = bytes >> 8; - unsigned long cr0; - xmm_store_t xmm_save[4]; - - XMMS_SAVE; - - asm volatile ( -#undef BLOCK -#define BLOCK(i) \ - LD(i,0) \ - LD(i+1,1) \ - PF1(i) \ - PF1(i+2) \ - LD(i+2,2) \ - LD(i+3,3) \ - PF0(i+4) \ - PF0(i+6) \ - XO1(i,0) \ - XO1(i+1,1) \ - XO1(i+2,2) \ - XO1(i+3,3) \ - ST(i,0) \ - ST(i+1,1) \ - ST(i+2,2) \ - ST(i+3,3) \ - - - PF0(0) - PF0(2) - - " .align 32 ;\n" - " 1: ;\n" - - BLOCK(0) - BLOCK(4) - BLOCK(8) - BLOCK(12) - - " addq %[inc], %[p1] ;\n" - " addq %[inc], %[p2] ;\n" - " decl %[cnt] ; jnz 1b" - : [p1] "+r" (p1), [p2] "+r" (p2), [cnt] "+r" (lines) - : [inc] "r" (256UL) - : "memory"); - - XMMS_RESTORE; -} - -static void -xor_sse_3(unsigned long bytes, unsigned long *p1, unsigned long *p2, - unsigned long *p3) -{ - unsigned int lines = bytes >> 8; - xmm_store_t xmm_save[4]; - unsigned long cr0; - - XMMS_SAVE; - - __asm__ __volatile__ ( -#undef BLOCK -#define BLOCK(i) \ - PF1(i) \ - PF1(i+2) \ - LD(i,0) \ - LD(i+1,1) \ - LD(i+2,2) \ - LD(i+3,3) \ - PF2(i) \ - PF2(i+2) \ - PF0(i+4) \ - PF0(i+6) \ - XO1(i,0) \ - XO1(i+1,1) \ - XO1(i+2,2) \ - XO1(i+3,3) \ - XO2(i,0) \ - XO2(i+1,1) \ - XO2(i+2,2) \ - XO2(i+3,3) \ - ST(i,0) \ - ST(i+1,1) \ - ST(i+2,2) \ - ST(i+3,3) \ - - - PF0(0) - PF0(2) - - " .align 32 ;\n" - " 1: ;\n" - - BLOCK(0) - BLOCK(4) - BLOCK(8) - BLOCK(12) - - " addq %[inc], %[p1] ;\n" - " addq %[inc], %[p2] ;\n" - " addq %[inc], %[p3] ;\n" - " decl %[cnt] ; jnz 1b" - : [cnt] "+r" (lines), - [p1] "+r" (p1), [p2] "+r" (p2), [p3] "+r" (p3) - : [inc] "r" (256UL) - : "memory"); - XMMS_RESTORE; -} - -static void -xor_sse_4(unsigned long bytes, unsigned long *p1, unsigned long *p2, - unsigned long *p3, unsigned long *p4) -{ - unsigned int lines = bytes >> 8; - xmm_store_t xmm_save[4]; - unsigned long cr0; - - XMMS_SAVE; - - __asm__ __volatile__ ( -#undef BLOCK -#define BLOCK(i) \ - PF1(i) \ - PF1(i+2) \ - LD(i,0) \ - LD(i+1,1) \ - LD(i+2,2) \ - LD(i+3,3) \ - PF2(i) \ - PF2(i+2) \ - XO1(i,0) \ - XO1(i+1,1) \ - XO1(i+2,2) \ - XO1(i+3,3) \ - PF3(i) \ - PF3(i+2) \ - PF0(i+4) \ - PF0(i+6) \ - XO2(i,0) \ - XO2(i+1,1) \ - XO2(i+2,2) \ - XO2(i+3,3) \ - XO3(i,0) \ - XO3(i+1,1) \ - XO3(i+2,2) \ - XO3(i+3,3) \ - ST(i,0) \ - ST(i+1,1) \ - ST(i+2,2) \ - ST(i+3,3) \ - - - PF0(0) - PF0(2) - - " .align 32 ;\n" - " 1: ;\n" - - BLOCK(0) - BLOCK(4) - BLOCK(8) - BLOCK(12) - - " addq %[inc], %[p1] ;\n" - " addq %[inc], %[p2] ;\n" - " addq %[inc], %[p3] ;\n" - " addq %[inc], %[p4] ;\n" - " decl %[cnt] ; jnz 1b" - : [cnt] "+c" (lines), - [p1] "+r" (p1), [p2] "+r" (p2), [p3] "+r" (p3), [p4] "+r" (p4) - : [inc] "r" (256UL) - : "memory" ); - - XMMS_RESTORE; -} - -static void -xor_sse_5(unsigned long bytes, unsigned long *p1, unsigned long *p2, - unsigned long *p3, unsigned long *p4, unsigned long *p5) -{ - unsigned int lines = bytes >> 8; - xmm_store_t xmm_save[4]; - unsigned long cr0; - - XMMS_SAVE; - - __asm__ __volatile__ ( -#undef BLOCK -#define BLOCK(i) \ - PF1(i) \ - PF1(i+2) \ - LD(i,0) \ - LD(i+1,1) \ - LD(i+2,2) \ - LD(i+3,3) \ - PF2(i) \ - PF2(i+2) \ - XO1(i,0) \ - XO1(i+1,1) \ - XO1(i+2,2) \ - XO1(i+3,3) \ - PF3(i) \ - PF3(i+2) \ - XO2(i,0) \ - XO2(i+1,1) \ - XO2(i+2,2) \ - XO2(i+3,3) \ - PF4(i) \ - PF4(i+2) \ - PF0(i+4) \ - PF0(i+6) \ - XO3(i,0) \ - XO3(i+1,1) \ - XO3(i+2,2) \ - XO3(i+3,3) \ - XO4(i,0) \ - XO4(i+1,1) \ - XO4(i+2,2) \ - XO4(i+3,3) \ - ST(i,0) \ - ST(i+1,1) \ - ST(i+2,2) \ - ST(i+3,3) \ - - - PF0(0) - PF0(2) - - " .align 32 ;\n" - " 1: ;\n" - - BLOCK(0) - BLOCK(4) - BLOCK(8) - BLOCK(12) - - " addq %[inc], %[p1] ;\n" - " addq %[inc], %[p2] ;\n" - " addq %[inc], %[p3] ;\n" - " addq %[inc], %[p4] ;\n" - " addq %[inc], %[p5] ;\n" - " decl %[cnt] ; jnz 1b" - : [cnt] "+c" (lines), - [p1] "+r" (p1), [p2] "+r" (p2), [p3] "+r" (p3), [p4] "+r" (p4), - [p5] "+r" (p5) - : [inc] "r" (256UL) - : "memory"); - - XMMS_RESTORE; -} - -static struct xor_block_template xor_block_sse = { - .name = "generic_sse", - .do_2 = xor_sse_2, - .do_3 = xor_sse_3, - .do_4 = xor_sse_4, - .do_5 = xor_sse_5, -}; +/* Also try the generic routines. */ +#undef XOR_TRY_TEMPLATES +#include #undef XOR_TRY_TEMPLATES -#define XOR_TRY_TEMPLATES \ - do { \ +#define XOR_TRY_TEMPLATES \ + do { \ + xor_speed(&xor_block_8regs); \ + xor_speed(&xor_block_8regs_p); \ + xor_speed(&xor_block_32regs); \ + xor_speed(&xor_block_32regs_p); \ xor_speed(&xor_block_sse); \ } while (0) - -/* We force the use of the SSE xor block because it can write around L2. - We may also be able to load into the L1 only depending on how the cpu - deals with a load to a line that is being prefetched. */ -#define XOR_SELECT_TEMPLATE(FASTEST) (&xor_block_sse) diff -r 5e3c342a325e -r d5afea2ab44f include/asm-x86_64/xor.h --- a/include/asm-x86_64/xor.h Tue Jul 03 10:12:32 2012 +0200 +++ b/include/asm-x86_64/xor.h Tue Jul 03 11:07:47 2012 +0200 @@ -39,14 +39,14 @@ typedef struct { unsigned long a,b; } __ tell it to do a clts before the register saving. */ #define XMMS_SAVE do { \ preempt_disable(); \ + cr0 = read_cr0(); \ + clts(); \ asm volatile ( \ - "movq %%cr0,%0 ;\n\t" \ - "clts ;\n\t" \ "movups %%xmm0,(%1) ;\n\t" \ "movups %%xmm1,0x10(%1) ;\n\t" \ "movups %%xmm2,0x20(%1) ;\n\t" \ "movups %%xmm3,0x30(%1) ;\n\t" \ - : "=&r" (cr0) \ + : "+r" (cr0) \ : "r" (xmm_save) \ : "memory"); \ } while(0) @@ -58,10 +58,10 @@ typedef struct { unsigned long a,b; } __ "movups 0x10(%1),%%xmm1 ;\n\t" \ "movups 0x20(%1),%%xmm2 ;\n\t" \ "movups 0x30(%1),%%xmm3 ;\n\t" \ - "movq %0,%%cr0 ;\n\t" \ : \ : "r" (cr0), "r" (xmm_save) \ : "memory"); \ + write_cr0(cr0); \ preempt_enable(); \ } while(0) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jul 03 09:22:14 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Jul 2012 09:22:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SlzJC-0007fa-DO; Tue, 03 Jul 2012 09: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 1SlzJA-0007fQ-Go for xen-changelog@lists.xensource.com; Tue, 03 Jul 2012 09:22:08 +0000 Received: from [85.158.139.83:64241] by server-10.bemta-5.messagelabs.com id 25/F8-02190-FB9B2FF4; Tue, 03 Jul 2012 09:22:07 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-182.messagelabs.com!1341307324!26428220!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 883 invoked from network); 3 Jul 2012 09:22:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 3 Jul 2012 09:22:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SlzJ6-0005E2-2f for xen-changelog@lists.xensource.com; Tue, 03 Jul 2012 09:22:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SlzJ5-0001ZN-Gw for xen-changelog@lists.xensource.com; Tue, 03 Jul 2012 09:22:03 +0000 Message-Id: Date: Tue, 03 Jul 2012 09: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: improve CR0 read/write handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341303152 -7200 # Node ID 5e3c342a325edb5841b1df42ac33b61c49586f9c # Parent 7b36058ce050a6f55f33849f0528410288e72b59 x86: improve CR0 read/write handling With the only bit in CR0 permitted to be changed by PV guests being TS, optimize the handling towards that: Keep a cached value in a per-CPU variable, and issue HYPERVISOR_fpu_taskswitch hypercalls for updates in all but the unusual case should something in the system still try to modify another bit (the attempt of which would then be logged by the hypervisor). This removes the need to have the hypervisor emulate MOV to/from CR0 instructions in all halfway frequently executed code paths. Signed-off-by: Jan Beulich --- diff -r 7b36058ce050 -r 5e3c342a325e arch/i386/kernel/cpu/common-xen.c --- a/arch/i386/kernel/cpu/common-xen.c Tue Jun 12 16:06:28 2012 +0200 +++ b/arch/i386/kernel/cpu/common-xen.c Tue Jul 03 10:12:32 2012 +0200 @@ -32,6 +32,11 @@ EXPORT_PER_CPU_SYMBOL(cpu_gdt_descr); #ifndef CONFIG_XEN DEFINE_PER_CPU(unsigned char, cpu_16bit_stack[CPU_16BIT_STACK_SIZE]); EXPORT_PER_CPU_SYMBOL(cpu_16bit_stack); +#else +DEFINE_PER_CPU(unsigned int, xen_x86_cr0); +DEFINE_PER_CPU(unsigned int, xen_x86_cr0_upd) = ~0; +EXPORT_PER_CPU_SYMBOL(xen_x86_cr0); +EXPORT_PER_CPU_SYMBOL(xen_x86_cr0_upd); #endif static int cachesize_override __cpuinitdata = -1; @@ -681,6 +686,8 @@ old_gdt: cpu_gdt_descr->size = GDT_SIZE - 1; cpu_gdt_descr->address = (unsigned long)gdt; #else + __get_cpu_var(xen_x86_cr0) = raw_read_cr0(); + xen_clear_cr0_upd(); if (cpu == 0 && cpu_gdt_descr->address == 0) { gdt = (struct desc_struct *)alloc_bootmem_pages(PAGE_SIZE); /* alloc_bootmem_pages panics on failure, so no check */ diff -r 7b36058ce050 -r 5e3c342a325e arch/i386/kernel/process-xen.c --- a/arch/i386/kernel/process-xen.c Tue Jun 12 16:06:28 2012 +0200 +++ b/arch/i386/kernel/process-xen.c Tue Jul 03 10:12:32 2012 +0200 @@ -639,8 +639,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) + __get_cpu_var(xen_x86_cr0_upd) = X86_CR0_TS; if (unlikely(HYPERVISOR_multicall_check(_mcl, mcl - _mcl, NULL))) BUG(); + if (_mcl->op == __HYPERVISOR_fpu_taskswitch) { + __get_cpu_var(xen_x86_cr0) |= X86_CR0_TS; + xen_clear_cr0_upd(); + } /* * Restore %fs and %gs if needed. diff -r 7b36058ce050 -r 5e3c342a325e arch/i386/kernel/traps-xen.c --- a/arch/i386/kernel/traps-xen.c Tue Jun 12 16:06:28 2012 +0200 +++ b/arch/i386/kernel/traps-xen.c Tue Jul 03 10:12:32 2012 +0200 @@ -1057,6 +1057,7 @@ asmlinkage void math_state_restore(struc struct task_struct *tsk = thread->task; /* NB. 'clts' is done for us by Xen during virtual trap. */ + __get_cpu_var(xen_x86_cr0) &= ~X86_CR0_TS; if (!tsk_used_math(tsk)) init_fpu(tsk); restore_fpu(tsk); diff -r 7b36058ce050 -r 5e3c342a325e arch/x86_64/kernel/process-xen.c --- a/arch/x86_64/kernel/process-xen.c Tue Jun 12 16:06:28 2012 +0200 +++ b/arch/x86_64/kernel/process-xen.c Tue Jul 03 10:12:32 2012 +0200 @@ -572,8 +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) + __get_cpu_var(xen_x86_cr0_upd) = X86_CR0_TS; if (unlikely(HYPERVISOR_multicall_check(_mcl, mcl - _mcl, NULL))) BUG(); + if (_mcl->op == __HYPERVISOR_fpu_taskswitch) { + __get_cpu_var(xen_x86_cr0) |= X86_CR0_TS; + xen_clear_cr0_upd(); + } /* * Switch DS and ES. diff -r 7b36058ce050 -r 5e3c342a325e arch/x86_64/kernel/setup64-xen.c --- a/arch/x86_64/kernel/setup64-xen.c Tue Jun 12 16:06:28 2012 +0200 +++ b/arch/x86_64/kernel/setup64-xen.c Tue Jul 03 10:12:32 2012 +0200 @@ -126,6 +126,11 @@ void __init setup_per_cpu_areas(void) } #ifdef CONFIG_XEN +DEFINE_PER_CPU(unsigned long, xen_x86_cr0); +DEFINE_PER_CPU(unsigned long, xen_x86_cr0_upd) = ~0; +EXPORT_PER_CPU_SYMBOL(xen_x86_cr0); +EXPORT_PER_CPU_SYMBOL(xen_x86_cr0_upd); + static void switch_pt(void) { xen_pt_switch(__pa_symbol(init_level4_pgt)); @@ -174,6 +179,8 @@ void pda_init(int cpu) if (HYPERVISOR_set_segment_base(SEGBASE_GS_KERNEL, (unsigned long)pda)) BUG(); + __get_cpu_var(xen_x86_cr0) = raw_read_cr0(); + xen_clear_cr0_upd(); #endif pda->cpunumber = cpu; pda->irqcount = -1; diff -r 7b36058ce050 -r 5e3c342a325e arch/x86_64/kernel/traps-xen.c --- a/arch/x86_64/kernel/traps-xen.c Tue Jun 12 16:06:28 2012 +0200 +++ b/arch/x86_64/kernel/traps-xen.c Tue Jul 03 10:12:32 2012 +0200 @@ -1075,8 +1075,9 @@ asmlinkage void __attribute__((weak)) mc asmlinkage void math_state_restore(void) { struct task_struct *me = current; - /* clts(); */ /* 'clts' is done for us by Xen during virtual trap. */ + /* NB. 'clts' is done for us by Xen during virtual trap. */ + __get_cpu_var(xen_x86_cr0) &= ~X86_CR0_TS; if (!used_math()) init_fpu(me); restore_fpu_checking(&me->thread.i387.fxsave); diff -r 7b36058ce050 -r 5e3c342a325e include/asm-i386/mach-xen/asm/system.h --- a/include/asm-i386/mach-xen/asm/system.h Tue Jun 12 16:06:28 2012 +0200 +++ b/include/asm-i386/mach-xen/asm/system.h Tue Jul 03 10:12:32 2012 +0200 @@ -2,8 +2,10 @@ #define __ASM_SYSTEM_H #include +#include #include #include +#include #include /* for LOCK_PREFIX */ #include #include @@ -90,15 +92,50 @@ __asm__ __volatile__ ("movw %%dx,%1\n\t" #define savesegment(seg, value) \ asm volatile("mov %%" #seg ",%0":"=rm" (value)) -#define read_cr0() ({ \ +DECLARE_PER_CPU(unsigned int, xen_x86_cr0); +DECLARE_PER_CPU(unsigned int, xen_x86_cr0_upd); + +#define xen_read_cr0_upd() ({ \ + unsigned int u__ = __get_cpu_var(xen_x86_cr0_upd); \ + rmb(); \ + u__; \ +}) +#define xen_clear_cr0_upd() do { \ + wmb(); \ + __get_cpu_var(xen_x86_cr0_upd) = 0; \ +} while (0) + +#define raw_read_cr0() ({ \ unsigned int __dummy; \ __asm__ __volatile__( \ "movl %%cr0,%0\n\t" \ :"=r" (__dummy)); \ __dummy; \ }) -#define write_cr0(x) \ +#define read_cr0() (likely(!xen_read_cr0_upd()) ? \ + __get_cpu_var(xen_x86_cr0) : raw_read_cr0()) +#define raw_write_cr0(x) \ __asm__ __volatile__("movl %0,%%cr0": :"r" (x)) +#define write_cr0(x) do { \ + unsigned int x__ = (x); \ + unsigned int upd = x__ ^ __get_cpu_var(xen_x86_cr0); \ + if (unlikely(cmpxchg(&__get_cpu_var(xen_x86_cr0_upd), 0, upd))) { \ + raw_write_cr0(x__); \ + break; \ + } \ + switch (upd) { \ + case 0: \ + continue; \ + case X86_CR0_TS: \ + HYPERVISOR_fpu_taskswitch(!!(x__ & X86_CR0_TS)); \ + break; \ + default: \ + raw_write_cr0(x__); \ + break; \ + } \ + __get_cpu_var(xen_x86_cr0) = x__; \ + xen_clear_cr0_upd(); \ +} while (0) #define read_cr2() (current_vcpu_info()->arch.cr2) #define write_cr2(x) \ @@ -142,8 +179,27 @@ __asm__ __volatile__ ("movw %%dx,%1\n\t" /* * Clear and set 'TS' bit respectively */ -#define clts() (HYPERVISOR_fpu_taskswitch(0)) -#define stts() (HYPERVISOR_fpu_taskswitch(1)) +#define X86_CR0_TS 8 +#define clts() ({ \ + if (unlikely(xen_read_cr0_upd())) \ + HYPERVISOR_fpu_taskswitch(0); \ + else if (__get_cpu_var(xen_x86_cr0) & X86_CR0_TS) { \ + __get_cpu_var(xen_x86_cr0_upd) = X86_CR0_TS; \ + HYPERVISOR_fpu_taskswitch(0); \ + __get_cpu_var(xen_x86_cr0) &= ~X86_CR0_TS; \ + xen_clear_cr0_upd(); \ + } \ +}) +#define stts() ({ \ + if (unlikely(xen_read_cr0_upd())) \ + HYPERVISOR_fpu_taskswitch(1); \ + else if (!(__get_cpu_var(xen_x86_cr0) & X86_CR0_TS)) { \ + __get_cpu_var(xen_x86_cr0_upd) = X86_CR0_TS; \ + HYPERVISOR_fpu_taskswitch(1); \ + __get_cpu_var(xen_x86_cr0) |= X86_CR0_TS; \ + xen_clear_cr0_upd(); \ + } \ +}) #endif /* __KERNEL__ */ diff -r 7b36058ce050 -r 5e3c342a325e include/asm-x86_64/mach-xen/asm/system.h --- a/include/asm-x86_64/mach-xen/asm/system.h Tue Jun 12 16:06:28 2012 +0200 +++ b/include/asm-x86_64/mach-xen/asm/system.h Tue Jul 03 10:12:32 2012 +0200 @@ -7,7 +7,7 @@ #include #include -#include +#include #ifdef __KERNEL__ @@ -71,19 +71,64 @@ extern void load_gs_index(unsigned); /* * Clear and set 'TS' bit respectively */ -#define clts() (HYPERVISOR_fpu_taskswitch(0)) +#define X86_CR0_TS 8 +#define clts() ({ \ + if (unlikely(xen_read_cr0_upd())) \ + HYPERVISOR_fpu_taskswitch(0); \ + else if (__get_cpu_var(xen_x86_cr0) & X86_CR0_TS) { \ + __get_cpu_var(xen_x86_cr0_upd) = X86_CR0_TS; \ + HYPERVISOR_fpu_taskswitch(0); \ + __get_cpu_var(xen_x86_cr0) &= ~X86_CR0_TS; \ + xen_clear_cr0_upd(); \ + } \ +}) -static inline unsigned long read_cr0(void) +DECLARE_PER_CPU(unsigned long, xen_x86_cr0); +DECLARE_PER_CPU(unsigned long, xen_x86_cr0_upd); + +#define xen_read_cr0_upd() ({ \ + unsigned long u__ = __get_cpu_var(xen_x86_cr0_upd); \ + rmb(); \ + u__; \ +}) +#define xen_clear_cr0_upd() do { \ + wmb(); \ + __get_cpu_var(xen_x86_cr0_upd) = 0; \ +} while (0) + +static inline unsigned long raw_read_cr0(void) { unsigned long cr0; asm volatile("movq %%cr0,%0" : "=r" (cr0)); return cr0; } +#define read_cr0() (likely(!xen_read_cr0_upd()) ? \ + __get_cpu_var(xen_x86_cr0) : raw_read_cr0()) -static inline void write_cr0(unsigned long val) +static inline void raw_write_cr0(unsigned long val) { asm volatile("movq %0,%%cr0" :: "r" (val)); } +#define write_cr0(x) do { \ + unsigned long x__ = (x); \ + unsigned long upd = x__ ^ __get_cpu_var(xen_x86_cr0); \ + if (unlikely(cmpxchg(&__get_cpu_var(xen_x86_cr0_upd), 0, upd))) { \ + raw_write_cr0(x__); \ + break; \ + } \ + switch (upd) { \ + case 0: \ + continue; \ + case X86_CR0_TS: \ + HYPERVISOR_fpu_taskswitch(!!(x__ & X86_CR0_TS)); \ + break; \ + default: \ + raw_write_cr0(x__); \ + break; \ + } \ + __get_cpu_var(xen_x86_cr0) = x__; \ + xen_clear_cr0_upd(); \ +} while (0) #define read_cr3() ({ \ unsigned long __dummy; \ @@ -103,7 +148,16 @@ static inline void write_cr4(unsigned lo asm volatile("movq %0,%%cr4" :: "r" (val)); } -#define stts() (HYPERVISOR_fpu_taskswitch(1)) +#define stts() ({ \ + if (unlikely(xen_read_cr0_upd())) \ + HYPERVISOR_fpu_taskswitch(1); \ + else if (!(__get_cpu_var(xen_x86_cr0) & X86_CR0_TS)) { \ + __get_cpu_var(xen_x86_cr0_upd) = X86_CR0_TS; \ + HYPERVISOR_fpu_taskswitch(1); \ + __get_cpu_var(xen_x86_cr0) |= X86_CR0_TS; \ + xen_clear_cr0_upd(); \ + } \ +}) #define wbinvd() \ __asm__ __volatile__ ("wbinvd": : :"memory"); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jul 03 22:00:30 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Jul 2012 22:00: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 1SmB90-0004Zf-0N; Tue, 03 Jul 2012 22:00:26 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmB8z-0004Za-7S for xen-changelog@lists.xensource.com; Tue, 03 Jul 2012 22:00:25 +0000 Received: from [85.158.138.51:24813] by server-2.bemta-3.messagelabs.com id 63/F5-10266-87B63FF4; Tue, 03 Jul 2012 22:00:24 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-174.messagelabs.com!1341352822!27978353!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18724 invoked from network); 3 Jul 2012 22:00:23 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 3 Jul 2012 22:00:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmB8w-00063n-3c for xen-changelog@lists.xensource.com; Tue, 03 Jul 2012 22:00:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmB8v-0003Lu-Ok for xen-changelog@lists.xensource.com; Tue, 03 Jul 2012 22:00:21 +0000 Message-Id: Date: Tue, 03 Jul 2012 22:00:21 +0000 From: Xen patchbot-4.0-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.0-testing] x86/nmi: Fix deadlock in unknown_nmi_error() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Andrew Cooper # Date 1341319864 -3600 # Node ID c9861d09dc81a218af8017bb4eccace1aa2c91b8 # Parent 99bb81618bb5123cceccdbd4ee845ac5fe6ca61d x86/nmi: Fix deadlock in unknown_nmi_error() Additionally, correct the text description to reflect what is being done, and make use of fatal_trap() in preference to kexec_crash() in case an unknown NMI occurs before a kdump kernel has been loaded. Signed-off-by: Andrew Cooper Committed-by: Keir Fraser xen-unstable changeset: 25478:6d1a30dc47e8 xen-unstable date: Mon Jun 11 15:12:50 2012 +0100 --- diff -r 99bb81618bb5 -r c9861d09dc81 xen/arch/x86/traps.c --- a/xen/arch/x86/traps.c Tue Jul 03 13:50:51 2012 +0100 +++ b/xen/arch/x86/traps.c Tue Jul 03 13:51:04 2012 +0100 @@ -3064,7 +3064,7 @@ static void io_check_error(struct cpu_us outb((inb(0x61) & 0x07) | 0x00, 0x61); /* enable IOCK */ } -static void unknown_nmi_error(unsigned char reason) +static void unknown_nmi_error(struct cpu_user_regs *regs, unsigned char reason) { switch ( opt_nmi[0] ) { @@ -3073,10 +3073,10 @@ static void unknown_nmi_error(unsigned c case 'i': /* 'ignore' */ break; default: /* 'fatal' */ + console_force_unlock(); printk("Uhhuh. NMI received for unknown reason %02x.\n", reason); - printk("Dazed and confused, but trying to continue\n"); printk("Do you have a strange power saving mode enabled?\n"); - kexec_crash(); + fatal_trap(TRAP_nmi, regs); } } @@ -3109,7 +3109,7 @@ void do_nmi(struct cpu_user_regs *regs) else if ( reason & 0x40 ) io_check_error(regs); else if ( !nmi_watchdog ) - unknown_nmi_error((unsigned char)(reason&0xff)); + unknown_nmi_error(regs, (unsigned char)(reason&0xff)); } } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jul 03 22:00:30 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Jul 2012 22:00: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 1SmB90-0004Zf-0N; Tue, 03 Jul 2012 22:00:26 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmB8z-0004Za-7S for xen-changelog@lists.xensource.com; Tue, 03 Jul 2012 22:00:25 +0000 Received: from [85.158.138.51:24813] by server-2.bemta-3.messagelabs.com id 63/F5-10266-87B63FF4; Tue, 03 Jul 2012 22:00:24 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-174.messagelabs.com!1341352822!27978353!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18724 invoked from network); 3 Jul 2012 22:00:23 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 3 Jul 2012 22:00:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmB8w-00063n-3c for xen-changelog@lists.xensource.com; Tue, 03 Jul 2012 22:00:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmB8v-0003Lu-Ok for xen-changelog@lists.xensource.com; Tue, 03 Jul 2012 22:00:21 +0000 Message-Id: Date: Tue, 03 Jul 2012 22:00:21 +0000 From: Xen patchbot-4.0-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.0-testing] x86/nmi: Fix deadlock in unknown_nmi_error() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Andrew Cooper # Date 1341319864 -3600 # Node ID c9861d09dc81a218af8017bb4eccace1aa2c91b8 # Parent 99bb81618bb5123cceccdbd4ee845ac5fe6ca61d x86/nmi: Fix deadlock in unknown_nmi_error() Additionally, correct the text description to reflect what is being done, and make use of fatal_trap() in preference to kexec_crash() in case an unknown NMI occurs before a kdump kernel has been loaded. Signed-off-by: Andrew Cooper Committed-by: Keir Fraser xen-unstable changeset: 25478:6d1a30dc47e8 xen-unstable date: Mon Jun 11 15:12:50 2012 +0100 --- diff -r 99bb81618bb5 -r c9861d09dc81 xen/arch/x86/traps.c --- a/xen/arch/x86/traps.c Tue Jul 03 13:50:51 2012 +0100 +++ b/xen/arch/x86/traps.c Tue Jul 03 13:51:04 2012 +0100 @@ -3064,7 +3064,7 @@ static void io_check_error(struct cpu_us outb((inb(0x61) & 0x07) | 0x00, 0x61); /* enable IOCK */ } -static void unknown_nmi_error(unsigned char reason) +static void unknown_nmi_error(struct cpu_user_regs *regs, unsigned char reason) { switch ( opt_nmi[0] ) { @@ -3073,10 +3073,10 @@ static void unknown_nmi_error(unsigned c case 'i': /* 'ignore' */ break; default: /* 'fatal' */ + console_force_unlock(); printk("Uhhuh. NMI received for unknown reason %02x.\n", reason); - printk("Dazed and confused, but trying to continue\n"); printk("Do you have a strange power saving mode enabled?\n"); - kexec_crash(); + fatal_trap(TRAP_nmi, regs); } } @@ -3109,7 +3109,7 @@ void do_nmi(struct cpu_user_regs *regs) else if ( reason & 0x40 ) io_check_error(regs); else if ( !nmi_watchdog ) - unknown_nmi_error((unsigned char)(reason&0xff)); + unknown_nmi_error(regs, (unsigned char)(reason&0xff)); } } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jul 03 22:00:34 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Jul 2012 22:00:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmB92-0004Zq-3d; Tue, 03 Jul 2012 22:00:28 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmB91-0004Zk-Ej for xen-changelog@lists.xensource.com; Tue, 03 Jul 2012 22:00:27 +0000 Received: from [193.109.254.147:38306] by server-4.bemta-14.messagelabs.com id C8/E9-02077-A7B63FF4; Tue, 03 Jul 2012 22:00:26 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-27.messagelabs.com!1341352821!3019521!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4414 invoked from network); 3 Jul 2012 22:00:22 -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; 3 Jul 2012 22:00:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmB8v-00063k-Df for xen-changelog@lists.xensource.com; Tue, 03 Jul 2012 22:00:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmB8r-0003LZ-Jc for xen-changelog@lists.xensource.com; Tue, 03 Jul 2012 22:00:21 +0000 Message-Id: Date: Tue, 03 Jul 2012 22:00:16 +0000 From: Xen patchbot-4.0-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.0-testing] x86_64: Fix off-by-one error setting up the Interrupt Stack Tables X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Andrew Cooper # Date 1341319851 -3600 # Node ID 99bb81618bb5123cceccdbd4ee845ac5fe6ca61d # Parent ffd1f786a7b502455abe03c47d76985143e38b8f x86_64: Fix off-by-one error setting up the Interrupt Stack Tables The Interrupt Stack Table entries in a 64bit TSS are a 1 based data structure as far as hardware is concerned. As a result, the code setting up stacks in subarch_percpu_traps_init() fills in the wrong IST entries. The result is that the MCE handler executes on the stack set up for NMIs; the NMI handler executes on a stack set up for Double Faults, and Double Faults are executed with a stack pointer set to 0. Once the #DF handler starts to execute, it will usually take a page fault looking up the address at 0xfffffffffffffff8, which will cause a triple fault. If a guest has mapped a page in that location, then it will have some state overwritten, but as the #DF handler always calls panic(), this is not a problem the guest will have time to care about. Signed-off-by: Andrew Cooper Committed-by: Keir Fraser xen-unstable changeset: 25271:54da0329e259 xen-unstable date: Thu May 10 11:04:32 2012 +0100 --- diff -r ffd1f786a7b5 -r 99bb81618bb5 xen/arch/x86/x86_64/traps.c --- a/xen/arch/x86/x86_64/traps.c Wed Jun 20 09:40:40 2012 +0100 +++ b/xen/arch/x86/x86_64/traps.c Tue Jul 03 13:50:51 2012 +0100 @@ -385,13 +385,13 @@ void __devinit subarch_percpu_traps_init BUILD_BUG_ON((IST_MAX + 2) * PAGE_SIZE + PRIMARY_STACK_SIZE > STACK_SIZE); /* Machine Check handler has its own per-CPU 4kB stack. */ - this_cpu(init_tss).ist[IST_MCE] = (unsigned long)&stack[IST_MCE * PAGE_SIZE]; + this_cpu(init_tss).ist[IST_MCE-1] = (unsigned long)&stack[IST_MCE * PAGE_SIZE]; /* Double-fault handler has its own per-CPU 4kB stack. */ - this_cpu(init_tss).ist[IST_DF] = (unsigned long)&stack[IST_DF * PAGE_SIZE]; + this_cpu(init_tss).ist[IST_DF-1] = (unsigned long)&stack[IST_DF * PAGE_SIZE]; /* NMI handler has its own per-CPU 4kB stack. */ - this_cpu(init_tss).ist[IST_NMI] = (unsigned long)&stack[IST_NMI * PAGE_SIZE]; + this_cpu(init_tss).ist[IST_NMI-1] = (unsigned long)&stack[IST_NMI * PAGE_SIZE]; /* Trampoline for SYSCALL entry from long mode. */ stack = &stack[IST_MAX * PAGE_SIZE]; /* Skip the IST stacks. */ diff -r ffd1f786a7b5 -r 99bb81618bb5 xen/include/asm-x86/processor.h --- a/xen/include/asm-x86/processor.h Wed Jun 20 09:40:40 2012 +0100 +++ b/xen/include/asm-x86/processor.h Tue Jul 03 13:50:51 2012 +0100 @@ -417,7 +417,9 @@ struct tss_struct { union { u64 rsp1, esp1; }; union { u64 rsp2, esp2; }; u64 reserved1; - u64 ist[7]; + u64 ist[7]; /* Interrupt Stack Table is 1-based so tss->ist[0] + * corresponds to an IST value of 1 in an Interrupt + * Descriptor */ u64 reserved2; u16 reserved3; #else _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jul 03 22:00:34 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Jul 2012 22:00:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmB92-0004Zq-3d; Tue, 03 Jul 2012 22:00:28 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmB91-0004Zk-Ej for xen-changelog@lists.xensource.com; Tue, 03 Jul 2012 22:00:27 +0000 Received: from [193.109.254.147:38306] by server-4.bemta-14.messagelabs.com id C8/E9-02077-A7B63FF4; Tue, 03 Jul 2012 22:00:26 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-27.messagelabs.com!1341352821!3019521!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4414 invoked from network); 3 Jul 2012 22:00:22 -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; 3 Jul 2012 22:00:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmB8v-00063k-Df for xen-changelog@lists.xensource.com; Tue, 03 Jul 2012 22:00:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmB8r-0003LZ-Jc for xen-changelog@lists.xensource.com; Tue, 03 Jul 2012 22:00:21 +0000 Message-Id: Date: Tue, 03 Jul 2012 22:00:16 +0000 From: Xen patchbot-4.0-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.0-testing] x86_64: Fix off-by-one error setting up the Interrupt Stack Tables X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Andrew Cooper # Date 1341319851 -3600 # Node ID 99bb81618bb5123cceccdbd4ee845ac5fe6ca61d # Parent ffd1f786a7b502455abe03c47d76985143e38b8f x86_64: Fix off-by-one error setting up the Interrupt Stack Tables The Interrupt Stack Table entries in a 64bit TSS are a 1 based data structure as far as hardware is concerned. As a result, the code setting up stacks in subarch_percpu_traps_init() fills in the wrong IST entries. The result is that the MCE handler executes on the stack set up for NMIs; the NMI handler executes on a stack set up for Double Faults, and Double Faults are executed with a stack pointer set to 0. Once the #DF handler starts to execute, it will usually take a page fault looking up the address at 0xfffffffffffffff8, which will cause a triple fault. If a guest has mapped a page in that location, then it will have some state overwritten, but as the #DF handler always calls panic(), this is not a problem the guest will have time to care about. Signed-off-by: Andrew Cooper Committed-by: Keir Fraser xen-unstable changeset: 25271:54da0329e259 xen-unstable date: Thu May 10 11:04:32 2012 +0100 --- diff -r ffd1f786a7b5 -r 99bb81618bb5 xen/arch/x86/x86_64/traps.c --- a/xen/arch/x86/x86_64/traps.c Wed Jun 20 09:40:40 2012 +0100 +++ b/xen/arch/x86/x86_64/traps.c Tue Jul 03 13:50:51 2012 +0100 @@ -385,13 +385,13 @@ void __devinit subarch_percpu_traps_init BUILD_BUG_ON((IST_MAX + 2) * PAGE_SIZE + PRIMARY_STACK_SIZE > STACK_SIZE); /* Machine Check handler has its own per-CPU 4kB stack. */ - this_cpu(init_tss).ist[IST_MCE] = (unsigned long)&stack[IST_MCE * PAGE_SIZE]; + this_cpu(init_tss).ist[IST_MCE-1] = (unsigned long)&stack[IST_MCE * PAGE_SIZE]; /* Double-fault handler has its own per-CPU 4kB stack. */ - this_cpu(init_tss).ist[IST_DF] = (unsigned long)&stack[IST_DF * PAGE_SIZE]; + this_cpu(init_tss).ist[IST_DF-1] = (unsigned long)&stack[IST_DF * PAGE_SIZE]; /* NMI handler has its own per-CPU 4kB stack. */ - this_cpu(init_tss).ist[IST_NMI] = (unsigned long)&stack[IST_NMI * PAGE_SIZE]; + this_cpu(init_tss).ist[IST_NMI-1] = (unsigned long)&stack[IST_NMI * PAGE_SIZE]; /* Trampoline for SYSCALL entry from long mode. */ stack = &stack[IST_MAX * PAGE_SIZE]; /* Skip the IST stacks. */ diff -r ffd1f786a7b5 -r 99bb81618bb5 xen/include/asm-x86/processor.h --- a/xen/include/asm-x86/processor.h Wed Jun 20 09:40:40 2012 +0100 +++ b/xen/include/asm-x86/processor.h Tue Jul 03 13:50:51 2012 +0100 @@ -417,7 +417,9 @@ struct tss_struct { union { u64 rsp1, esp1; }; union { u64 rsp2, esp2; }; u64 reserved1; - u64 ist[7]; + u64 ist[7]; /* Interrupt Stack Table is 1-based so tss->ist[0] + * corresponds to an IST value of 1 in an Interrupt + * Descriptor */ u64 reserved2; u16 reserved3; #else _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jul 03 22:00:35 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Jul 2012 22:00:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmB95-0004aK-6T; Tue, 03 Jul 2012 22:00:31 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmB94-0004a0-DI for xen-changelog@lists.xensource.com; Tue, 03 Jul 2012 22:00:30 +0000 Received: from [193.109.254.147:38522] by server-5.bemta-14.messagelabs.com id 04/3B-04343-D7B63FF4; Tue, 03 Jul 2012 22:00:29 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-27.messagelabs.com!1341352825!9745568!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24944 invoked from network); 3 Jul 2012 22:00:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 3 Jul 2012 22:00:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmB8y-00063q-UI for xen-changelog@lists.xensource.com; Tue, 03 Jul 2012 22:00:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmB8w-0003Mg-Df for xen-changelog@lists.xensource.com; Tue, 03 Jul 2012 22:00:23 +0000 Message-Id: Date: Tue, 03 Jul 2012 22:00:21 +0000 From: Xen patchbot-4.0-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.0-testing] xen: Fix off-by-one error when parsing command line arguments X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341319874 -3600 # Node ID 30c9bcaec782d200113dfaebb97d55a9e73cd869 # Parent c9861d09dc81a218af8017bb4eccace1aa2c91b8 xen: Fix off-by-one error when parsing command line arguments As Xen currently stands, it will attempt to interpret the first few bytes of the initcall section as a struct kernel_param. The reason that this not caused problems is because in the overflow case, param->name is actually a function pointer to the first initcall, and intepreting it as string is very unlikely to match an ASCII command line parameter name. Signed-off-by: Andrew Cooper Committed-by: Keir Fraser xen-unstable changeset: 25587:2cffb7bf6e57 xen-unstable date: Tue Jul 03 13:38:19 2012 +0100 --- diff -r c9861d09dc81 -r 30c9bcaec782 xen/common/kernel.c --- a/xen/common/kernel.c Tue Jul 03 13:51:04 2012 +0100 +++ b/xen/common/kernel.c Tue Jul 03 13:51:14 2012 +0100 @@ -68,7 +68,7 @@ void cmdline_parse(char *cmdline) if ( !bool_assert ) optkey += 3; - for ( param = &__setup_start; param <= &__setup_end; param++ ) + for ( param = &__setup_start; param < &__setup_end; param++ ) { if ( strcmp(param->name, optkey) ) continue; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jul 03 22:00:35 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Jul 2012 22:00:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmB95-0004aK-6T; Tue, 03 Jul 2012 22:00:31 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmB94-0004a0-DI for xen-changelog@lists.xensource.com; Tue, 03 Jul 2012 22:00:30 +0000 Received: from [193.109.254.147:38522] by server-5.bemta-14.messagelabs.com id 04/3B-04343-D7B63FF4; Tue, 03 Jul 2012 22:00:29 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-27.messagelabs.com!1341352825!9745568!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24944 invoked from network); 3 Jul 2012 22:00:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 3 Jul 2012 22:00:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmB8y-00063q-UI for xen-changelog@lists.xensource.com; Tue, 03 Jul 2012 22:00:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmB8w-0003Mg-Df for xen-changelog@lists.xensource.com; Tue, 03 Jul 2012 22:00:23 +0000 Message-Id: Date: Tue, 03 Jul 2012 22:00:21 +0000 From: Xen patchbot-4.0-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.0-testing] xen: Fix off-by-one error when parsing command line arguments X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341319874 -3600 # Node ID 30c9bcaec782d200113dfaebb97d55a9e73cd869 # Parent c9861d09dc81a218af8017bb4eccace1aa2c91b8 xen: Fix off-by-one error when parsing command line arguments As Xen currently stands, it will attempt to interpret the first few bytes of the initcall section as a struct kernel_param. The reason that this not caused problems is because in the overflow case, param->name is actually a function pointer to the first initcall, and intepreting it as string is very unlikely to match an ASCII command line parameter name. Signed-off-by: Andrew Cooper Committed-by: Keir Fraser xen-unstable changeset: 25587:2cffb7bf6e57 xen-unstable date: Tue Jul 03 13:38:19 2012 +0100 --- diff -r c9861d09dc81 -r 30c9bcaec782 xen/common/kernel.c --- a/xen/common/kernel.c Tue Jul 03 13:51:04 2012 +0100 +++ b/xen/common/kernel.c Tue Jul 03 13:51:14 2012 +0100 @@ -68,7 +68,7 @@ void cmdline_parse(char *cmdline) if ( !bool_assert ) optkey += 3; - for ( param = &__setup_start; param <= &__setup_end; param++ ) + for ( param = &__setup_start; param < &__setup_end; param++ ) { if ( strcmp(param->name, optkey) ) continue; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 00:33:16 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 00:33: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 1SmDWp-0006NJ-Oe; Wed, 04 Jul 2012 00:33:11 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmDWo-0006NC-TI for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 00:33:11 +0000 Received: from [85.158.143.99:50783] by server-1.bemta-4.messagelabs.com id 0E/4C-24392-64F83FF4; Wed, 04 Jul 2012 00:33:10 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-216.messagelabs.com!1341361988!25101669!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10762 invoked from network); 4 Jul 2012 00:33:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 00:33:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmDWm-00084n-5A for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 00:33:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmDWl-0006uY-PD for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 00:33:07 +0000 Message-Id: Date: Wed, 04 Jul 2012 00:33:07 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] tools/ocaml: Fix 2 bit-twiddling bugs and an off-by-one X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Zheng Li # Date 1341319687 -3600 # Node ID 32ab8989df674433a1c26d0b4cdda9eab4a6fc07 # Parent ec75bfd8599cad22339420d6436fb74584f9c767 tools/ocaml: Fix 2 bit-twiddling bugs and an off-by-one The bit bugs are in ocaml vcpu affinity calls, and the off-by-one error is in the ocaml console ring code Signed-off-by: Zheng Li Acked-by: Ian Campbell Committed-by: Ian Jackson Acked-by: Jon Ludlam xen-unstable changeset: 23940:187d59e32a58 xen-unstable date: Mon Oct 10 16:41:16 2011 +0100 --- diff -r ec75bfd8599c -r 32ab8989df67 tools/ocaml/libs/xc/xc_stubs.c --- a/tools/ocaml/libs/xc/xc_stubs.c Wed Jun 20 09:37:29 2012 +0100 +++ b/tools/ocaml/libs/xc/xc_stubs.c Tue Jul 03 13:48:07 2012 +0100 @@ -430,7 +430,7 @@ CAMLprim value stub_xc_vcpu_setaffinity( for (i=0; i Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 00:33: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 1SmDWp-0006NJ-Oe; Wed, 04 Jul 2012 00:33:11 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmDWo-0006NC-TI for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 00:33:11 +0000 Received: from [85.158.143.99:50783] by server-1.bemta-4.messagelabs.com id 0E/4C-24392-64F83FF4; Wed, 04 Jul 2012 00:33:10 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-216.messagelabs.com!1341361988!25101669!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10762 invoked from network); 4 Jul 2012 00:33:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 00:33:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmDWm-00084n-5A for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 00:33:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmDWl-0006uY-PD for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 00:33:07 +0000 Message-Id: Date: Wed, 04 Jul 2012 00:33:07 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] tools/ocaml: Fix 2 bit-twiddling bugs and an off-by-one X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Zheng Li # Date 1341319687 -3600 # Node ID 32ab8989df674433a1c26d0b4cdda9eab4a6fc07 # Parent ec75bfd8599cad22339420d6436fb74584f9c767 tools/ocaml: Fix 2 bit-twiddling bugs and an off-by-one The bit bugs are in ocaml vcpu affinity calls, and the off-by-one error is in the ocaml console ring code Signed-off-by: Zheng Li Acked-by: Ian Campbell Committed-by: Ian Jackson Acked-by: Jon Ludlam xen-unstable changeset: 23940:187d59e32a58 xen-unstable date: Mon Oct 10 16:41:16 2011 +0100 --- diff -r ec75bfd8599c -r 32ab8989df67 tools/ocaml/libs/xc/xc_stubs.c --- a/tools/ocaml/libs/xc/xc_stubs.c Wed Jun 20 09:37:29 2012 +0100 +++ b/tools/ocaml/libs/xc/xc_stubs.c Tue Jul 03 13:48:07 2012 +0100 @@ -430,7 +430,7 @@ CAMLprim value stub_xc_vcpu_setaffinity( for (i=0; i Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 00:33: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 1SmDWq-0006NV-Rf; Wed, 04 Jul 2012 00:33:12 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmDWq-0006NI-4A for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 00:33:12 +0000 Received: from [193.109.254.147:32006] by server-6.bemta-14.messagelabs.com id C0/40-08993-74F83FF4; Wed, 04 Jul 2012 00:33:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-27.messagelabs.com!1341361989!9856027!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31332 invoked from network); 4 Jul 2012 00:33:10 -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; 4 Jul 2012 00:33:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmDWn-00084w-Bs for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 00:33:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmDWn-0006vH-Aw for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 00:33:09 +0000 Message-Id: Date: Wed, 04 Jul 2012 00:33:08 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] xen: Fix off-by-one error when parsing command line arguments X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341319801 -3600 # Node ID 3fed2c0a282acbca71d72e89c1d067f4f8c951e9 # Parent ce1b489f05436edd1285939c0c65157e5ef9fd96 xen: Fix off-by-one error when parsing command line arguments As Xen currently stands, it will attempt to interpret the first few bytes of the initcall section as a struct kernel_param. The reason that this not caused problems is because in the overflow case, param->name is actually a function pointer to the first initcall, and intepreting it as string is very unlikely to match an ASCII command line parameter name. Signed-off-by: Andrew Cooper Committed-by: Keir Fraser xen-unstable changeset: 25587:2cffb7bf6e57 xen-unstable date: Tue Jul 03 13:38:19 2012 +0100 --- diff -r ce1b489f0543 -r 3fed2c0a282a xen/common/kernel.c --- a/xen/common/kernel.c Tue Jul 03 13:49:32 2012 +0100 +++ b/xen/common/kernel.c Tue Jul 03 13:50:01 2012 +0100 @@ -92,7 +92,7 @@ void __init cmdline_parse(char *cmdline) if ( !bool_assert ) optkey += 3; - for ( param = &__setup_start; param <= &__setup_end; param++ ) + for ( param = &__setup_start; param < &__setup_end; param++ ) { if ( strcmp(param->name, optkey) ) continue; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 00:33:16 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 00:33: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 1SmDWq-0006NV-Rf; Wed, 04 Jul 2012 00:33:12 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmDWq-0006NI-4A for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 00:33:12 +0000 Received: from [193.109.254.147:32006] by server-6.bemta-14.messagelabs.com id C0/40-08993-74F83FF4; Wed, 04 Jul 2012 00:33:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-27.messagelabs.com!1341361989!9856027!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31332 invoked from network); 4 Jul 2012 00:33:10 -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; 4 Jul 2012 00:33:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmDWn-00084w-Bs for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 00:33:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmDWn-0006vH-Aw for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 00:33:09 +0000 Message-Id: Date: Wed, 04 Jul 2012 00:33:08 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] xen: Fix off-by-one error when parsing command line arguments X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341319801 -3600 # Node ID 3fed2c0a282acbca71d72e89c1d067f4f8c951e9 # Parent ce1b489f05436edd1285939c0c65157e5ef9fd96 xen: Fix off-by-one error when parsing command line arguments As Xen currently stands, it will attempt to interpret the first few bytes of the initcall section as a struct kernel_param. The reason that this not caused problems is because in the overflow case, param->name is actually a function pointer to the first initcall, and intepreting it as string is very unlikely to match an ASCII command line parameter name. Signed-off-by: Andrew Cooper Committed-by: Keir Fraser xen-unstable changeset: 25587:2cffb7bf6e57 xen-unstable date: Tue Jul 03 13:38:19 2012 +0100 --- diff -r ce1b489f0543 -r 3fed2c0a282a xen/common/kernel.c --- a/xen/common/kernel.c Tue Jul 03 13:49:32 2012 +0100 +++ b/xen/common/kernel.c Tue Jul 03 13:50:01 2012 +0100 @@ -92,7 +92,7 @@ void __init cmdline_parse(char *cmdline) if ( !bool_assert ) optkey += 3; - for ( param = &__setup_start; param <= &__setup_end; param++ ) + for ( param = &__setup_start; param < &__setup_end; param++ ) { if ( strcmp(param->name, optkey) ) continue; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 00:34:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 00:34: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 1SmDXs-0006Rb-0o; Wed, 04 Jul 2012 00:34:16 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmDXr-0006RU-1T for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 00:34:15 +0000 Received: from [85.158.143.35:56299] by server-2.bemta-4.messagelabs.com id 8F/F3-17938-68F83FF4; Wed, 04 Jul 2012 00:34:14 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-21.messagelabs.com!1341362052!15425629!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17552 invoked from network); 4 Jul 2012 00:34:13 -0000 Received: from unknown (HELO mail.xen.org) (50.57.168.107) by server-7.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 00:34:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmDWm-00084q-JG for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 00:33:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmDWm-0006un-Ab for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 00:33:08 +0000 Message-Id: Date: Wed, 04 Jul 2012 00:33:07 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] x86_64: Fix off-by-one error setting up the Interrupt Stack Tables X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Andrew Cooper # Date 1341319738 -3600 # Node ID 0b947d466e3ee99da43f5541da3d3de9f675b49a # Parent 32ab8989df674433a1c26d0b4cdda9eab4a6fc07 x86_64: Fix off-by-one error setting up the Interrupt Stack Tables The Interrupt Stack Table entries in a 64bit TSS are a 1 based data structure as far as hardware is concerned. As a result, the code setting up stacks in subarch_percpu_traps_init() fills in the wrong IST entries. The result is that the MCE handler executes on the stack set up for NMIs; the NMI handler executes on a stack set up for Double Faults, and Double Faults are executed with a stack pointer set to 0. Once the #DF handler starts to execute, it will usually take a page fault looking up the address at 0xfffffffffffffff8, which will cause a triple fault. If a guest has mapped a page in that location, then it will have some state overwritten, but as the #DF handler always calls panic(), this is not a problem the guest will have time to care about. Signed-off-by: Andrew Cooper Committed-by: Keir Fraser xen-unstable changeset: 25271:54da0329e259 xen-unstable date: Thu May 10 11:04:32 2012 +0100 --- diff -r 32ab8989df67 -r 0b947d466e3e xen/arch/x86/x86_64/traps.c --- a/xen/arch/x86/x86_64/traps.c Tue Jul 03 13:48:07 2012 +0100 +++ b/xen/arch/x86/x86_64/traps.c Tue Jul 03 13:48:58 2012 +0100 @@ -385,13 +385,13 @@ void __devinit subarch_percpu_traps_init BUILD_BUG_ON((IST_MAX + 2) * PAGE_SIZE + PRIMARY_STACK_SIZE > STACK_SIZE); /* Machine Check handler has its own per-CPU 4kB stack. */ - this_cpu(init_tss).ist[IST_MCE] = (unsigned long)&stack[IST_MCE * PAGE_SIZE]; + this_cpu(init_tss).ist[IST_MCE-1] = (unsigned long)&stack[IST_MCE * PAGE_SIZE]; /* Double-fault handler has its own per-CPU 4kB stack. */ - this_cpu(init_tss).ist[IST_DF] = (unsigned long)&stack[IST_DF * PAGE_SIZE]; + this_cpu(init_tss).ist[IST_DF-1] = (unsigned long)&stack[IST_DF * PAGE_SIZE]; /* NMI handler has its own per-CPU 4kB stack. */ - this_cpu(init_tss).ist[IST_NMI] = (unsigned long)&stack[IST_NMI * PAGE_SIZE]; + this_cpu(init_tss).ist[IST_NMI-1] = (unsigned long)&stack[IST_NMI * PAGE_SIZE]; /* Trampoline for SYSCALL entry from long mode. */ stack = &stack[IST_MAX * PAGE_SIZE]; /* Skip the IST stacks. */ diff -r 32ab8989df67 -r 0b947d466e3e xen/include/asm-x86/processor.h --- a/xen/include/asm-x86/processor.h Tue Jul 03 13:48:07 2012 +0100 +++ b/xen/include/asm-x86/processor.h Tue Jul 03 13:48:58 2012 +0100 @@ -427,7 +427,9 @@ struct tss_struct { union { u64 rsp1, esp1; }; union { u64 rsp2, esp2; }; u64 reserved1; - u64 ist[7]; + u64 ist[7]; /* Interrupt Stack Table is 1-based so tss->ist[0] + * corresponds to an IST value of 1 in an Interrupt + * Descriptor */ u64 reserved2; u16 reserved3; #else _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 00:34:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 00:34: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 1SmDXs-0006Rb-0o; Wed, 04 Jul 2012 00:34:16 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmDXr-0006RU-1T for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 00:34:15 +0000 Received: from [85.158.143.35:56299] by server-2.bemta-4.messagelabs.com id 8F/F3-17938-68F83FF4; Wed, 04 Jul 2012 00:34:14 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-21.messagelabs.com!1341362052!15425629!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17552 invoked from network); 4 Jul 2012 00:34:13 -0000 Received: from unknown (HELO mail.xen.org) (50.57.168.107) by server-7.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 00:34:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmDWm-00084q-JG for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 00:33:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmDWm-0006un-Ab for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 00:33:08 +0000 Message-Id: Date: Wed, 04 Jul 2012 00:33:07 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] x86_64: Fix off-by-one error setting up the Interrupt Stack Tables X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Andrew Cooper # Date 1341319738 -3600 # Node ID 0b947d466e3ee99da43f5541da3d3de9f675b49a # Parent 32ab8989df674433a1c26d0b4cdda9eab4a6fc07 x86_64: Fix off-by-one error setting up the Interrupt Stack Tables The Interrupt Stack Table entries in a 64bit TSS are a 1 based data structure as far as hardware is concerned. As a result, the code setting up stacks in subarch_percpu_traps_init() fills in the wrong IST entries. The result is that the MCE handler executes on the stack set up for NMIs; the NMI handler executes on a stack set up for Double Faults, and Double Faults are executed with a stack pointer set to 0. Once the #DF handler starts to execute, it will usually take a page fault looking up the address at 0xfffffffffffffff8, which will cause a triple fault. If a guest has mapped a page in that location, then it will have some state overwritten, but as the #DF handler always calls panic(), this is not a problem the guest will have time to care about. Signed-off-by: Andrew Cooper Committed-by: Keir Fraser xen-unstable changeset: 25271:54da0329e259 xen-unstable date: Thu May 10 11:04:32 2012 +0100 --- diff -r 32ab8989df67 -r 0b947d466e3e xen/arch/x86/x86_64/traps.c --- a/xen/arch/x86/x86_64/traps.c Tue Jul 03 13:48:07 2012 +0100 +++ b/xen/arch/x86/x86_64/traps.c Tue Jul 03 13:48:58 2012 +0100 @@ -385,13 +385,13 @@ void __devinit subarch_percpu_traps_init BUILD_BUG_ON((IST_MAX + 2) * PAGE_SIZE + PRIMARY_STACK_SIZE > STACK_SIZE); /* Machine Check handler has its own per-CPU 4kB stack. */ - this_cpu(init_tss).ist[IST_MCE] = (unsigned long)&stack[IST_MCE * PAGE_SIZE]; + this_cpu(init_tss).ist[IST_MCE-1] = (unsigned long)&stack[IST_MCE * PAGE_SIZE]; /* Double-fault handler has its own per-CPU 4kB stack. */ - this_cpu(init_tss).ist[IST_DF] = (unsigned long)&stack[IST_DF * PAGE_SIZE]; + this_cpu(init_tss).ist[IST_DF-1] = (unsigned long)&stack[IST_DF * PAGE_SIZE]; /* NMI handler has its own per-CPU 4kB stack. */ - this_cpu(init_tss).ist[IST_NMI] = (unsigned long)&stack[IST_NMI * PAGE_SIZE]; + this_cpu(init_tss).ist[IST_NMI-1] = (unsigned long)&stack[IST_NMI * PAGE_SIZE]; /* Trampoline for SYSCALL entry from long mode. */ stack = &stack[IST_MAX * PAGE_SIZE]; /* Skip the IST stacks. */ diff -r 32ab8989df67 -r 0b947d466e3e xen/include/asm-x86/processor.h --- a/xen/include/asm-x86/processor.h Tue Jul 03 13:48:07 2012 +0100 +++ b/xen/include/asm-x86/processor.h Tue Jul 03 13:48:58 2012 +0100 @@ -427,7 +427,9 @@ struct tss_struct { union { u64 rsp1, esp1; }; union { u64 rsp2, esp2; }; u64 reserved1; - u64 ist[7]; + u64 ist[7]; /* Interrupt Stack Table is 1-based so tss->ist[0] + * corresponds to an IST value of 1 in an Interrupt + * Descriptor */ u64 reserved2; u16 reserved3; #else _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 00:34:23 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 00:34: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 1SmDXw-0006SC-3e; Wed, 04 Jul 2012 00:34:20 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmDXv-0006Rr-9E for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 00:34:19 +0000 Received: from [85.158.143.35:56501] by server-3.bemta-4.messagelabs.com id D0/84-05808-A8F83FF4; Wed, 04 Jul 2012 00:34:18 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-21.messagelabs.com!1341362052!17026859!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7552 invoked from network); 4 Jul 2012 00:34:15 -0000 Received: from unknown (HELO mail.xen.org) (50.57.168.107) by server-14.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 00:34:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmDWn-00084t-2S for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 00:33:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmDWm-0006v2-Rb for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 00:33:08 +0000 Message-Id: Date: Wed, 04 Jul 2012 00:33:08 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] x86/nmi: Fix deadlock in unknown_nmi_error() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Andrew Cooper # Date 1341319772 -3600 # Node ID ce1b489f05436edd1285939c0c65157e5ef9fd96 # Parent 0b947d466e3ee99da43f5541da3d3de9f675b49a x86/nmi: Fix deadlock in unknown_nmi_error() Additionally, correct the text description to reflect what is being done, and make use of fatal_trap() in preference to kexec_crash() in case an unknown NMI occurs before a kdump kernel has been loaded. Signed-off-by: Andrew Cooper Committed-by: Keir Fraser xen-unstable changeset: 25478:6d1a30dc47e8 xen-unstable date: Mon Jun 11 15:12:50 2012 +0100 --- diff -r 0b947d466e3e -r ce1b489f0543 xen/arch/x86/traps.c --- a/xen/arch/x86/traps.c Tue Jul 03 13:48:58 2012 +0100 +++ b/xen/arch/x86/traps.c Tue Jul 03 13:49:32 2012 +0100 @@ -3225,7 +3225,7 @@ static void io_check_error(struct cpu_us outb((inb(0x61) & 0x07) | 0x00, 0x61); /* enable IOCK */ } -static void unknown_nmi_error(unsigned char reason) +static void unknown_nmi_error(struct cpu_user_regs *regs, unsigned char reason) { switch ( opt_nmi[0] ) { @@ -3234,10 +3234,10 @@ static void unknown_nmi_error(unsigned c case 'i': /* 'ignore' */ break; default: /* 'fatal' */ + console_force_unlock(); printk("Uhhuh. NMI received for unknown reason %02x.\n", reason); - printk("Dazed and confused, but trying to continue\n"); printk("Do you have a strange power saving mode enabled?\n"); - kexec_crash(); + fatal_trap(TRAP_nmi, regs); } } @@ -3270,7 +3270,7 @@ void do_nmi(struct cpu_user_regs *regs) else if ( reason & 0x40 ) io_check_error(regs); else if ( !nmi_watchdog ) - unknown_nmi_error((unsigned char)(reason&0xff)); + unknown_nmi_error(regs, (unsigned char)(reason&0xff)); } } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 00:34:23 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 00:34: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 1SmDXw-0006SC-3e; Wed, 04 Jul 2012 00:34:20 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmDXv-0006Rr-9E for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 00:34:19 +0000 Received: from [85.158.143.35:56501] by server-3.bemta-4.messagelabs.com id D0/84-05808-A8F83FF4; Wed, 04 Jul 2012 00:34:18 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-21.messagelabs.com!1341362052!17026859!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7552 invoked from network); 4 Jul 2012 00:34:15 -0000 Received: from unknown (HELO mail.xen.org) (50.57.168.107) by server-14.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 00:34:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmDWn-00084t-2S for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 00:33:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmDWm-0006v2-Rb for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 00:33:08 +0000 Message-Id: Date: Wed, 04 Jul 2012 00:33:08 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] x86/nmi: Fix deadlock in unknown_nmi_error() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Andrew Cooper # Date 1341319772 -3600 # Node ID ce1b489f05436edd1285939c0c65157e5ef9fd96 # Parent 0b947d466e3ee99da43f5541da3d3de9f675b49a x86/nmi: Fix deadlock in unknown_nmi_error() Additionally, correct the text description to reflect what is being done, and make use of fatal_trap() in preference to kexec_crash() in case an unknown NMI occurs before a kdump kernel has been loaded. Signed-off-by: Andrew Cooper Committed-by: Keir Fraser xen-unstable changeset: 25478:6d1a30dc47e8 xen-unstable date: Mon Jun 11 15:12:50 2012 +0100 --- diff -r 0b947d466e3e -r ce1b489f0543 xen/arch/x86/traps.c --- a/xen/arch/x86/traps.c Tue Jul 03 13:48:58 2012 +0100 +++ b/xen/arch/x86/traps.c Tue Jul 03 13:49:32 2012 +0100 @@ -3225,7 +3225,7 @@ static void io_check_error(struct cpu_us outb((inb(0x61) & 0x07) | 0x00, 0x61); /* enable IOCK */ } -static void unknown_nmi_error(unsigned char reason) +static void unknown_nmi_error(struct cpu_user_regs *regs, unsigned char reason) { switch ( opt_nmi[0] ) { @@ -3234,10 +3234,10 @@ static void unknown_nmi_error(unsigned c case 'i': /* 'ignore' */ break; default: /* 'fatal' */ + console_force_unlock(); printk("Uhhuh. NMI received for unknown reason %02x.\n", reason); - printk("Dazed and confused, but trying to continue\n"); printk("Do you have a strange power saving mode enabled?\n"); - kexec_crash(); + fatal_trap(TRAP_nmi, regs); } } @@ -3270,7 +3270,7 @@ void do_nmi(struct cpu_user_regs *regs) else if ( reason & 0x40 ) io_check_error(regs); else if ( !nmi_watchdog ) - unknown_nmi_error((unsigned char)(reason&0xff)); + unknown_nmi_error(regs, (unsigned char)(reason&0xff)); } } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:17 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvo-0004am-IM; Wed, 04 Jul 2012 04:11:12 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvn-0004ad-5Q for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:11 +0000 Received: from [85.158.139.83:55595] by server-4.bemta-5.messagelabs.com id E2/51-27831-E52C3FF4; Wed, 04 Jul 2012 04:11:10 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-182.messagelabs.com!1341375068!26890353!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13647 invoked from network); 4 Jul 2012 04:11:09 -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; 4 Jul 2012 04:11:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvk-0002gq-JK for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGvk-0003mO-3M for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:08 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:07 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] x86/hvm: increase struct hvm_vcpu_io's mmio_large_read[] X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340883368 -7200 # Node ID fdc1f16d382c8d75ab96be00a9133f39b4384bcf # Parent 4f92bdf3370c4fe5ed0f00cdeaf8156e4818ecb5 x86/hvm: increase struct hvm_vcpu_io's mmio_large_read[] Since the emulator now supports a few 256-bit memory operations, this array needs to follow (and the comments should, too). To limit growth, re-order the mmio_large_write_* fields so that the two mmio_large_*_bytes fields end up adjacent to each other. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- diff -r 4f92bdf3370c -r fdc1f16d382c xen/include/asm-x86/hvm/vcpu.h --- a/xen/include/asm-x86/hvm/vcpu.h Wed Jun 27 09:36:43 2012 +0200 +++ b/xen/include/asm-x86/hvm/vcpu.h Thu Jun 28 13:36:08 2012 +0200 @@ -59,13 +59,13 @@ struct hvm_vcpu_io { unsigned long mmio_gva; unsigned long mmio_gpfn; - /* We may read up to m128 as a number of device-model transactions. */ + /* We may read up to m256 as a number of device-model transactions. */ paddr_t mmio_large_read_pa; - uint8_t mmio_large_read[16]; + uint8_t mmio_large_read[32]; unsigned int mmio_large_read_bytes; - /* We may write up to m128 as a number of device-model transactions. */ + /* We may write up to m256 as a number of device-model transactions. */ + unsigned int mmio_large_write_bytes; paddr_t mmio_large_write_pa; - unsigned int mmio_large_write_bytes; }; #define VMCX_EADDR (~0ULL) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:17 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvo-0004am-IM; Wed, 04 Jul 2012 04:11:12 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvn-0004ad-5Q for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:11 +0000 Received: from [85.158.139.83:55595] by server-4.bemta-5.messagelabs.com id E2/51-27831-E52C3FF4; Wed, 04 Jul 2012 04:11:10 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-182.messagelabs.com!1341375068!26890353!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13647 invoked from network); 4 Jul 2012 04:11:09 -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; 4 Jul 2012 04:11:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvk-0002gq-JK for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGvk-0003mO-3M for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:08 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:07 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] x86/hvm: increase struct hvm_vcpu_io's mmio_large_read[] X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340883368 -7200 # Node ID fdc1f16d382c8d75ab96be00a9133f39b4384bcf # Parent 4f92bdf3370c4fe5ed0f00cdeaf8156e4818ecb5 x86/hvm: increase struct hvm_vcpu_io's mmio_large_read[] Since the emulator now supports a few 256-bit memory operations, this array needs to follow (and the comments should, too). To limit growth, re-order the mmio_large_write_* fields so that the two mmio_large_*_bytes fields end up adjacent to each other. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- diff -r 4f92bdf3370c -r fdc1f16d382c xen/include/asm-x86/hvm/vcpu.h --- a/xen/include/asm-x86/hvm/vcpu.h Wed Jun 27 09:36:43 2012 +0200 +++ b/xen/include/asm-x86/hvm/vcpu.h Thu Jun 28 13:36:08 2012 +0200 @@ -59,13 +59,13 @@ struct hvm_vcpu_io { unsigned long mmio_gva; unsigned long mmio_gpfn; - /* We may read up to m128 as a number of device-model transactions. */ + /* We may read up to m256 as a number of device-model transactions. */ paddr_t mmio_large_read_pa; - uint8_t mmio_large_read[16]; + uint8_t mmio_large_read[32]; unsigned int mmio_large_read_bytes; - /* We may write up to m128 as a number of device-model transactions. */ + /* We may write up to m256 as a number of device-model transactions. */ + unsigned int mmio_large_write_bytes; paddr_t mmio_large_write_pa; - unsigned int mmio_large_write_bytes; }; #define VMCX_EADDR (~0ULL) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvr-0004bl-30; Wed, 04 Jul 2012 04:11:15 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvq-0004b1-4A for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:14 +0000 Received: from [85.158.143.35:28200] by server-2.bemta-4.messagelabs.com id 73/B5-17938-162C3FF4; Wed, 04 Jul 2012 04:11:13 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-21.messagelabs.com!1341375071!17043126!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24988 invoked from network); 4 Jul 2012 04:11:12 -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; 4 Jul 2012 04:11:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvn-0002h5-23 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGvm-0003nc-Tu for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:10 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:10 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: do not ignore the per-device msitranslate and power_mgmt opts X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Stefano Stabellini # Date 1340894759 -3600 # Node ID 1b125c4c0f8681d5e55fd7139ff576bdcbc2f111 # Parent f347d62595011cd6b8baece7bc2a0e4d1d875b14 libxl: do not ignore the per-device msitranslate and power_mgmt opts Do not ignore the per-device msitranslate and power_mgmt options: they need to be appended to the bdf. Signed-off-by: Stefano Stabellini Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r f347d6259501 -r 1b125c4c0f86 tools/libxl/libxl_pci.c --- a/tools/libxl/libxl_pci.c Thu Jun 28 15:44:02 2012 +0100 +++ b/tools/libxl/libxl_pci.c Thu Jun 28 15:45:59 2012 +0100 @@ -21,6 +21,7 @@ #define PCI_BDF "%04x:%02x:%02x.%01x" #define PCI_BDF_SHORT "%02x:%02x.%01x" #define PCI_BDF_VDEVFN "%04x:%02x:%02x.%01x@%02x" +#define PCI_OPTIONS "msitranslate=%d,power_mgmt=%d" #define PCI_BDF_XSPATH "%04x-%02x-%02x-%01x" static unsigned int pcidev_encode_bdf(libxl_device_pci *pcidev) @@ -814,12 +815,14 @@ static int qemu_pci_add_xenstore(libxl__ path = libxl__sprintf(gc, "/local/domain/0/device-model/%d/parameter", domid); if (pcidev->vdevfn) { - libxl__xs_write(gc, XBT_NULL, path, PCI_BDF_VDEVFN, + libxl__xs_write(gc, XBT_NULL, path, PCI_BDF_VDEVFN","PCI_OPTIONS, pcidev->domain, pcidev->bus, pcidev->dev, - pcidev->func, pcidev->vdevfn); + pcidev->func, pcidev->vdevfn, pcidev->msitranslate, + pcidev->power_mgmt); } else { - libxl__xs_write(gc, XBT_NULL, path, PCI_BDF, pcidev->domain, - pcidev->bus, pcidev->dev, pcidev->func); + libxl__xs_write(gc, XBT_NULL, path, PCI_BDF","PCI_OPTIONS, + pcidev->domain, pcidev->bus, pcidev->dev, + pcidev->func, pcidev->msitranslate, pcidev->power_mgmt); } libxl__qemu_traditional_cmd(gc, domid, "pci-ins"); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvr-0004bl-30; Wed, 04 Jul 2012 04:11:15 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvq-0004b1-4A for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:14 +0000 Received: from [85.158.143.35:28200] by server-2.bemta-4.messagelabs.com id 73/B5-17938-162C3FF4; Wed, 04 Jul 2012 04:11:13 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-21.messagelabs.com!1341375071!17043126!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24988 invoked from network); 4 Jul 2012 04:11:12 -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; 4 Jul 2012 04:11:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvn-0002h5-23 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGvm-0003nc-Tu for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:10 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:10 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: do not ignore the per-device msitranslate and power_mgmt opts X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Stefano Stabellini # Date 1340894759 -3600 # Node ID 1b125c4c0f8681d5e55fd7139ff576bdcbc2f111 # Parent f347d62595011cd6b8baece7bc2a0e4d1d875b14 libxl: do not ignore the per-device msitranslate and power_mgmt opts Do not ignore the per-device msitranslate and power_mgmt options: they need to be appended to the bdf. Signed-off-by: Stefano Stabellini Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r f347d6259501 -r 1b125c4c0f86 tools/libxl/libxl_pci.c --- a/tools/libxl/libxl_pci.c Thu Jun 28 15:44:02 2012 +0100 +++ b/tools/libxl/libxl_pci.c Thu Jun 28 15:45:59 2012 +0100 @@ -21,6 +21,7 @@ #define PCI_BDF "%04x:%02x:%02x.%01x" #define PCI_BDF_SHORT "%02x:%02x.%01x" #define PCI_BDF_VDEVFN "%04x:%02x:%02x.%01x@%02x" +#define PCI_OPTIONS "msitranslate=%d,power_mgmt=%d" #define PCI_BDF_XSPATH "%04x-%02x-%02x-%01x" static unsigned int pcidev_encode_bdf(libxl_device_pci *pcidev) @@ -814,12 +815,14 @@ static int qemu_pci_add_xenstore(libxl__ path = libxl__sprintf(gc, "/local/domain/0/device-model/%d/parameter", domid); if (pcidev->vdevfn) { - libxl__xs_write(gc, XBT_NULL, path, PCI_BDF_VDEVFN, + libxl__xs_write(gc, XBT_NULL, path, PCI_BDF_VDEVFN","PCI_OPTIONS, pcidev->domain, pcidev->bus, pcidev->dev, - pcidev->func, pcidev->vdevfn); + pcidev->func, pcidev->vdevfn, pcidev->msitranslate, + pcidev->power_mgmt); } else { - libxl__xs_write(gc, XBT_NULL, path, PCI_BDF, pcidev->domain, - pcidev->bus, pcidev->dev, pcidev->func); + libxl__xs_write(gc, XBT_NULL, path, PCI_BDF","PCI_OPTIONS, + pcidev->domain, pcidev->bus, pcidev->dev, + pcidev->func, pcidev->msitranslate, pcidev->power_mgmt); } libxl__qemu_traditional_cmd(gc, domid, "pci-ins"); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvr-0004bu-5U; Wed, 04 Jul 2012 04:11:15 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvq-0004b0-7t for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:14 +0000 Received: from [85.158.138.51:39276] by server-2.bemta-3.messagelabs.com id 03/CD-10266-162C3FF4; Wed, 04 Jul 2012 04:11:13 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-174.messagelabs.com!1341375071!21999568!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4464 invoked from network); 4 Jul 2012 04:11:12 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvn-0002h8-G2 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGvn-0003nr-Ev for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:11 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:10 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: disable msitranslate by default X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Stefano Stabellini # Date 1340894854 -3600 # Node ID 84272cca638aeedbfba2337582121ff6a5e105b9 # Parent 1b125c4c0f8681d5e55fd7139ff576bdcbc2f111 libxl: disable msitranslate by default msitranslate is known to cause problems with some device drivers, because it sets the real device in MSI mode while making the guest think is actually in legacy interrupts mode. Some drivers are able to spot this inconsistency and break (Nvidia drivers for example). Disable msitranslate by default. Signed-off-by: Stefano Stabellini Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 1b125c4c0f86 -r 84272cca638a tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Thu Jun 28 15:45:59 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Thu Jun 28 15:47:34 2012 +0100 @@ -562,7 +562,7 @@ static void parse_config_data(const char XLU_Config *config; XLU_ConfigList *cpus, *vbds, *nics, *pcis, *cvfbs, *cpuids; int pci_power_mgmt = 0; - int pci_msitranslate = 1; + int pci_msitranslate = 0; int pci_permissive = 0; int e; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvr-0004bu-5U; Wed, 04 Jul 2012 04:11:15 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvq-0004b0-7t for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:14 +0000 Received: from [85.158.138.51:39276] by server-2.bemta-3.messagelabs.com id 03/CD-10266-162C3FF4; Wed, 04 Jul 2012 04:11:13 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-174.messagelabs.com!1341375071!21999568!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4464 invoked from network); 4 Jul 2012 04:11:12 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvn-0002h8-G2 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGvn-0003nr-Ev for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:11 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:10 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: disable msitranslate by default X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Stefano Stabellini # Date 1340894854 -3600 # Node ID 84272cca638aeedbfba2337582121ff6a5e105b9 # Parent 1b125c4c0f8681d5e55fd7139ff576bdcbc2f111 libxl: disable msitranslate by default msitranslate is known to cause problems with some device drivers, because it sets the real device in MSI mode while making the guest think is actually in legacy interrupts mode. Some drivers are able to spot this inconsistency and break (Nvidia drivers for example). Disable msitranslate by default. Signed-off-by: Stefano Stabellini Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 1b125c4c0f86 -r 84272cca638a tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Thu Jun 28 15:45:59 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Thu Jun 28 15:47:34 2012 +0100 @@ -562,7 +562,7 @@ static void parse_config_data(const char XLU_Config *config; XLU_ConfigList *cpus, *vbds, *nics, *pcis, *cvfbs, *cpuids; int pci_power_mgmt = 0; - int pci_msitranslate = 1; + int pci_msitranslate = 0; int pci_permissive = 0; int e; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvs-0004cQ-FA; Wed, 04 Jul 2012 04: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 1SmGvr-0004al-9D for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:15 +0000 Received: from [85.158.143.35:28279] by server-3.bemta-4.messagelabs.com id 89/C6-05808-362C3FF4; Wed, 04 Jul 2012 04:11:15 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-21.messagelabs.com!1341375073!8068047!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14564 invoked from network); 4 Jul 2012 04:11:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvp-0002hH-57 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGvp-0003od-0x for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:13 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:12 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] docs: Use lists.xen.org not lists.xensource.com X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340896319 -3600 # Node ID ae7d717abb7c28357c37b3a1b1a3b685acf445de # Parent 39b056330de08c3d79cd000c340a7de39c0940d6 docs: Use lists.xen.org not lists.xensource.com [ Also s/greatful/grateful/, twice -iwj ] Signed-off-by: Ian Campbell Acked-by: Keir Fraser Acked-by: Ian Jackson Signed-off-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 39b056330de0 -r ae7d717abb7c docs/man/xl.cfg.pod.5 --- a/docs/man/xl.cfg.pod.5 Thu Jun 28 15:59:24 2012 +0100 +++ b/docs/man/xl.cfg.pod.5 Thu Jun 28 16:11:59 2012 +0100 @@ -1082,7 +1082,7 @@ XXX). However all options are included fully documented. Patches to improve incomplete items (or any other item) would be -greatfully received on the xen-devel@lists.xensource.com mailing +gratefully received on the xen-devel@lists.xen.org mailing list. Please see L for information on how to submit a patch to Xen. diff -r 39b056330de0 -r ae7d717abb7c docs/man/xl.pod.1 --- a/docs/man/xl.pod.1 Thu Jun 28 15:59:24 2012 +0100 +++ b/docs/man/xl.pod.1 Thu Jun 28 16:11:59 2012 +0100 @@ -1255,5 +1255,5 @@ L for information on how to submit a patch to Xen. _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvs-0004cQ-FA; Wed, 04 Jul 2012 04: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 1SmGvr-0004al-9D for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:15 +0000 Received: from [85.158.143.35:28279] by server-3.bemta-4.messagelabs.com id 89/C6-05808-362C3FF4; Wed, 04 Jul 2012 04:11:15 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-21.messagelabs.com!1341375073!8068047!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14564 invoked from network); 4 Jul 2012 04:11:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvp-0002hH-57 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGvp-0003od-0x for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:13 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:12 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] docs: Use lists.xen.org not lists.xensource.com X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340896319 -3600 # Node ID ae7d717abb7c28357c37b3a1b1a3b685acf445de # Parent 39b056330de08c3d79cd000c340a7de39c0940d6 docs: Use lists.xen.org not lists.xensource.com [ Also s/greatful/grateful/, twice -iwj ] Signed-off-by: Ian Campbell Acked-by: Keir Fraser Acked-by: Ian Jackson Signed-off-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 39b056330de0 -r ae7d717abb7c docs/man/xl.cfg.pod.5 --- a/docs/man/xl.cfg.pod.5 Thu Jun 28 15:59:24 2012 +0100 +++ b/docs/man/xl.cfg.pod.5 Thu Jun 28 16:11:59 2012 +0100 @@ -1082,7 +1082,7 @@ XXX). However all options are included fully documented. Patches to improve incomplete items (or any other item) would be -greatfully received on the xen-devel@lists.xensource.com mailing +gratefully received on the xen-devel@lists.xen.org mailing list. Please see L for information on how to submit a patch to Xen. diff -r 39b056330de0 -r ae7d717abb7c docs/man/xl.pod.1 --- a/docs/man/xl.pod.1 Thu Jun 28 15:59:24 2012 +0100 +++ b/docs/man/xl.pod.1 Thu Jun 28 16:11:59 2012 +0100 @@ -1255,5 +1255,5 @@ L for information on how to submit a patch to Xen. _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvs-0004cD-9Y; Wed, 04 Jul 2012 04: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 1SmGvq-0004b1-KK for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:14 +0000 Received: from [85.158.143.35:28202] by server-2.bemta-4.messagelabs.com id B3/B5-17938-162C3FF4; Wed, 04 Jul 2012 04:11:13 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-21.messagelabs.com!1341375069!17043121!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24917 invoked from network); 4 Jul 2012 04:11:10 -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; 4 Jul 2012 04:11:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvl-0002gt-68 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGvk-0003md-P1 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:08 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] x86/mm: Clean up unshare path for foreign mappings X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Andres Lagar-Cavilla # Date 1340883909 -3600 # Node ID 2d9f3b0109011a84c1e9a8b3d1d65ab6521bbd40 # Parent fdc1f16d382c8d75ab96be00a9133f39b4384bcf x86/mm: Clean up unshare path for foreign mappings In its current shape, if Xen unshares a foreign gfn successfully while building a foreign writable map, it is left with a reference to the old shared page in the "target" var. Instead, push unsharing request down on the initial get_page_from_gfn call, which will DTRT. This allows for greatly simplifying the unshare related condition handling, removing ugly comments and s86_64 ifdef-ery. Signed-off-by: Andres Lagar-Cavilla Acked-by: Tim Deegan Committed-by: Tim Deegan --- diff -r fdc1f16d382c -r 2d9f3b010901 xen/arch/x86/mm.c --- a/xen/arch/x86/mm.c Thu Jun 28 13:36:08 2012 +0200 +++ b/xen/arch/x86/mm.c Thu Jun 28 12:45:09 2012 +0100 @@ -3564,10 +3564,12 @@ int do_mmu_update( l1_pgentry_t l1e = l1e_from_intpte(req.val); p2m_type_t l1e_p2mt = p2m_ram_rw; struct page_info *target = NULL; + p2m_query_t q = (l1e_get_flags(l1e) & _PAGE_RW) ? + P2M_UNSHARE : P2M_ALLOC; if ( paging_mode_translate(pg_owner) ) target = get_page_from_gfn(pg_owner, l1e_get_pfn(l1e), - &l1e_p2mt, P2M_ALLOC); + &l1e_p2mt, q); if ( p2m_is_paged(l1e_p2mt) ) { @@ -3582,29 +3584,15 @@ int do_mmu_update( rc = -ENOENT; break; } -#ifdef __x86_64__ - /* XXX: Ugly: pull all the checks into a separate function. - * Don't want to do it now, not to interfere with mem_paging - * patches */ - else if ( p2m_ram_shared == l1e_p2mt ) + /* If we tried to unshare and failed */ + else if ( (q & P2M_UNSHARE) && p2m_is_shared(l1e_p2mt) ) { - /* Unshare the page for RW foreign mappings */ - if ( l1e_get_flags(l1e) & _PAGE_RW ) - { - unsigned long gfn = l1e_get_pfn(l1e); - rc = mem_sharing_unshare_page(pg_owner, gfn, 0); - if ( rc ) - { - if ( target ) - put_page(target); - /* Notify helper, don't care about errors, will not - * sleep on wq, since we're a foreign domain. */ - (void)mem_sharing_notify_enomem(pg_owner, gfn, 0); - break; - } - } - } -#endif + /* We could not have obtained a page ref. */ + ASSERT(target == NULL); + /* And mem_sharing_notify has already been called. */ + rc = -ENOMEM; + break; + } rc = mod_l1_entry(va, l1e, mfn, cmd == MMU_PT_UPDATE_PRESERVE_AD, v, _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvt-0004dO-Q2; Wed, 04 Jul 2012 04:11:17 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvt-0004b1-7f for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:17 +0000 Received: from [85.158.143.35:28318] by server-2.bemta-4.messagelabs.com id DA/B5-17938-462C3FF4; Wed, 04 Jul 2012 04:11:16 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-21.messagelabs.com!1341375074!14809996!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22945 invoked from network); 4 Jul 2012 04:11:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvq-0002hQ-MB for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGvq-0003pM-I7 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:14 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:14 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xen, pod: Only sweep in an emergency, and only for 4k pages X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User George Dunlap # Date 1340893085 -3600 # Node ID 3ea92ea1490fbe4a174f0d4d8fc3c6acfecd1b97 # Parent 437b7cc52db7fb2d0c4adacc9bf9bad2979cf110 xen,pod: Only sweep in an emergency, and only for 4k pages Testing has shown that doing sweeps for superpages slows down boot significantly, but does not result in a significantly higher number of superpages after boot. Early sweeping for 4k pages causes superpages to be broken up unnecessarily. Only sweep if we're really out of memory. v2: - Move unrelated code-motion hunk to another patch v3: - Remove now-unused reclaim_super from pod struct Signed-off-by: George Dunlap Acked-by: Tim Deegan Committed-by: Tim Deegan --- diff -r 437b7cc52db7 -r 3ea92ea1490f xen/arch/x86/mm/p2m-pod.c --- a/xen/arch/x86/mm/p2m-pod.c Thu Jun 28 15:18:03 2012 +0100 +++ b/xen/arch/x86/mm/p2m-pod.c Thu Jun 28 15:18:05 2012 +0100 @@ -897,34 +897,6 @@ p2m_pod_zero_check(struct p2m_domain *p2 } #define POD_SWEEP_LIMIT 1024 -static void -p2m_pod_emergency_sweep_super(struct p2m_domain *p2m) -{ - unsigned long i, start, limit; - - if ( p2m->pod.reclaim_super == 0 ) - { - p2m->pod.reclaim_super = (p2m->pod.max_guest>>PAGE_ORDER_2M)<pod.reclaim_super -= SUPERPAGE_PAGES; - } - - start = p2m->pod.reclaim_super; - limit = (start > POD_SWEEP_LIMIT) ? (start - POD_SWEEP_LIMIT) : 0; - - for ( i=p2m->pod.reclaim_super ; i > 0 ; i -= SUPERPAGE_PAGES ) - { - p2m_pod_zero_check_superpage(p2m, i); - /* Stop if we're past our limit and we have found *something*. - * - * NB that this is a zero-sum game; we're increasing our cache size - * by increasing our 'debt'. Since we hold the p2m lock, - * (entry_count - count) must remain the same. */ - if ( !page_list_empty(&p2m->pod.super) && i < limit ) - break; - } - - p2m->pod.reclaim_super = i ? i - SUPERPAGE_PAGES : 0; -} /* When populating a new superpage, look at recently populated superpages * hoping that they've been zeroed. This will snap up zeroed pages as soon as @@ -1039,27 +1011,12 @@ p2m_pod_demand_populate(struct p2m_domai return 0; } - /* Once we've ballooned down enough that we can fill the remaining - * PoD entries from the cache, don't sweep even if the particular - * list we want to use is empty: that can lead to thrashing zero pages - * through the cache for no good reason. */ - if ( p2m->pod.entry_count > p2m->pod.count ) - { + /* Only sweep if we're actually out of memory. Doing anything else + * causes unnecessary time and fragmentation of superpages in the p2m. */ + if ( p2m->pod.count == 0 ) + p2m_pod_emergency_sweep(p2m); - /* If we're low, start a sweep */ - if ( order == PAGE_ORDER_2M && page_list_empty(&p2m->pod.super) ) - /* Note that sweeps scan other ranges in the p2m. In an scenario - * in which p2m locks are fine-grained, this may result in deadlock. - * Using trylock on the gfn's as we sweep would avoid it. */ - p2m_pod_emergency_sweep_super(p2m); - - if ( page_list_empty(&p2m->pod.single) && - ( ( order == PAGE_ORDER_4K ) - || (order == PAGE_ORDER_2M && page_list_empty(&p2m->pod.super) ) ) ) - /* Same comment regarding deadlock applies */ - p2m_pod_emergency_sweep(p2m); - } - + /* If the sweep failed, give up. */ if ( p2m->pod.count == 0 ) goto out_of_memory; diff -r 437b7cc52db7 -r 3ea92ea1490f xen/include/asm-x86/p2m.h --- a/xen/include/asm-x86/p2m.h Thu Jun 28 15:18:03 2012 +0100 +++ b/xen/include/asm-x86/p2m.h Thu Jun 28 15:18:05 2012 +0100 @@ -284,7 +284,6 @@ struct p2m_domain { single; /* Non-super lists */ int count, /* # of pages in cache lists */ entry_count; /* # of pages in p2m marked pod */ - unsigned reclaim_super; /* Last gpfn of a scan */ unsigned reclaim_single; /* Last gpfn of a scan */ unsigned max_guest; /* gpfn of max guest demand-populate */ #define POD_HISTORY_MAX 128 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvr-0004bg-0e; Wed, 04 Jul 2012 04:11:15 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvp-0004al-SC for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:14 +0000 Received: from [85.158.143.35:28207] by server-3.bemta-4.messagelabs.com id 17/C6-05808-162C3FF4; Wed, 04 Jul 2012 04:11:13 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-21.messagelabs.com!1341375070!17043125!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24961 invoked from network); 4 Jul 2012 04:11:11 -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; 4 Jul 2012 04:11:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvm-0002h2-Hb for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGvm-0003nN-D8 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:10 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:09 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: document the memory ownership of some functions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340894642 -3600 # Node ID f347d62595011cd6b8baece7bc2a0e4d1d875b14 # Parent efd12cc7dd99fa855d98025d97d5cbcbf1445e73 libxl: document the memory ownership of some functions Specifying they allocate dynamic memory that needs to be explicitly freed. Signed-off-by: Dario Faggioli Acked-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r efd12cc7dd99 -r f347d6259501 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Thu Jun 28 16:04:12 2012 +0200 +++ b/tools/libxl/libxl.c Thu Jun 28 15:44:02 2012 +0100 @@ -508,7 +508,7 @@ static void xcinfo2xlinfo(const xc_domai xlinfo->cpupool = xcinfo->cpupool; } -libxl_dominfo * libxl_list_domain(libxl_ctx *ctx, int *nb_domain) +libxl_dominfo * libxl_list_domain(libxl_ctx *ctx, int *nb_domain_out) { libxl_dominfo *ptr; int i, ret; @@ -531,7 +531,7 @@ libxl_dominfo * libxl_list_domain(libxl_ for (i = 0; i < ret; i++) { xcinfo2xlinfo(&info[i], &ptr[i]); } - *nb_domain = ret; + *nb_domain_out = ret; return ptr; } @@ -589,7 +589,7 @@ int libxl_cpupool_info(libxl_ctx *ctx, return rc; } -libxl_cpupoolinfo * libxl_list_cpupool(libxl_ctx *ctx, int *nb_pool) +libxl_cpupoolinfo * libxl_list_cpupool(libxl_ctx *ctx, int *nb_pool_out) { GC_INIT(ctx); libxl_cpupoolinfo info, *ptr, *tmp; @@ -613,14 +613,15 @@ libxl_cpupoolinfo * libxl_list_cpupool(l poolid = info.poolid + 1; } - *nb_pool = i; + *nb_pool_out = i; out: GC_FREE; return ptr; } -/* this API call only list VM running on this host. a VM can be an aggregate of multiple domains. */ -libxl_vminfo * libxl_list_vm(libxl_ctx *ctx, int *nb_vm) +/* this API call only list VM running on this host. A VM can + * be an aggregate of multiple domains. */ +libxl_vminfo * libxl_list_vm(libxl_ctx *ctx, int *nb_vm_out) { libxl_vminfo *ptr; int index, i, ret; @@ -644,7 +645,7 @@ libxl_vminfo * libxl_list_vm(libxl_ctx * index++; } - *nb_vm = index; + *nb_vm_out = index; return ptr; } @@ -3161,7 +3162,7 @@ int libxl_get_physinfo(libxl_ctx *ctx, l return 0; } -libxl_cputopology *libxl_get_cpu_topology(libxl_ctx *ctx, int *nr) +libxl_cputopology *libxl_get_cpu_topology(libxl_ctx *ctx, int *nb_cpu_out) { xc_topologyinfo_t tinfo; DECLARE_HYPERCALL_BUFFER(xc_cpu_to_core_t, coremap); @@ -3219,7 +3220,7 @@ fail: xc_hypercall_buffer_free(ctx->xch, nodemap); if (ret) - *nr = max_cpus; + *nb_cpu_out = max_cpus; return ret; } @@ -3270,7 +3271,7 @@ const libxl_version_info* libxl_get_vers } libxl_vcpuinfo *libxl_list_vcpu(libxl_ctx *ctx, uint32_t domid, - int *nb_vcpu, int *nrcpus) + int *nb_vcpu, int *nr_vcpus_out) { libxl_vcpuinfo *ptr, *ret; xc_domaininfo_t domaininfo; @@ -3280,7 +3281,7 @@ libxl_vcpuinfo *libxl_list_vcpu(libxl_ct LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "getting infolist"); return NULL; } - *nrcpus = libxl_get_max_cpus(ctx); + *nr_vcpus_out = libxl_get_max_cpus(ctx); ret = ptr = calloc(domaininfo.max_vcpu_id + 1, sizeof (libxl_vcpuinfo)); if (!ptr) { return NULL; diff -r efd12cc7dd99 -r f347d6259501 tools/libxl/libxl.h --- a/tools/libxl/libxl.h Thu Jun 28 16:04:12 2012 +0200 +++ b/tools/libxl/libxl.h Thu Jun 28 15:44:02 2012 +0100 @@ -585,12 +585,28 @@ int libxl_primary_console_get_tty(libxl_ /* May be called with info_r == NULL to check for domain's existance */ int libxl_domain_info(libxl_ctx*, libxl_dominfo *info_r, uint32_t domid); -libxl_dominfo * libxl_list_domain(libxl_ctx*, int *nb_domain); -void libxl_dominfo_list_free(libxl_dominfo *list, int nr); -libxl_cpupoolinfo * libxl_list_cpupool(libxl_ctx*, int *nb_pool); -void libxl_cpupoolinfo_list_free(libxl_cpupoolinfo *list, int nr); -libxl_vminfo * libxl_list_vm(libxl_ctx *ctx, int *nb_vm); -void libxl_vminfo_list_free(libxl_vminfo *list, int nr); + +/* These functions each return (on success) an array of elements, + * and the length via the int* out parameter. These arrays and + * their contents come from malloc, and must be freed with the + * corresponding libxl_THING_list_free function. + */ +libxl_dominfo * libxl_list_domain(libxl_ctx*, int *nb_domain_out); +void libxl_dominfo_list_free(libxl_dominfo *list, int nb_domain); + +libxl_cpupoolinfo * libxl_list_cpupool(libxl_ctx*, int *nb_pool_out); +void libxl_cpupoolinfo_list_free(libxl_cpupoolinfo *list, int nb_pool); + +libxl_vminfo * libxl_list_vm(libxl_ctx *ctx, int *nb_vm_out); +void libxl_vminfo_list_free(libxl_vminfo *list, int nb_vm); + +#define LIBXL_CPUTOPOLOGY_INVALID_ENTRY (~(uint32_t)0) +libxl_cputopology *libxl_get_cpu_topology(libxl_ctx *ctx, int *nb_cpu_out); +void libxl_cputopology_list_free(libxl_cputopology *, int nb_cpu); + +libxl_vcpuinfo *libxl_list_vcpu(libxl_ctx *ctx, uint32_t domid, + int *nb_vcpu, int *nr_vcpus_out); +void libxl_vcpuinfo_list_free(libxl_vcpuinfo *, int nr_vcpus); /* * Devices @@ -766,12 +782,6 @@ int libxl_userdata_retrieve(libxl_ctx *c */ int libxl_get_physinfo(libxl_ctx *ctx, libxl_physinfo *physinfo); -#define LIBXL_CPUTOPOLOGY_INVALID_ENTRY (~(uint32_t)0) -libxl_cputopology *libxl_get_cpu_topology(libxl_ctx *ctx, int *nr); -void libxl_cputopology_list_free(libxl_cputopology *, int nr); -libxl_vcpuinfo *libxl_list_vcpu(libxl_ctx *ctx, uint32_t domid, - int *nb_vcpu, int *nrcpus); -void libxl_vcpuinfo_list_free(libxl_vcpuinfo *, int nr); int libxl_set_vcpuaffinity(libxl_ctx *ctx, uint32_t domid, uint32_t vcpuid, libxl_cpumap *cpumap); int libxl_set_vcpuaffinity_all(libxl_ctx *ctx, uint32_t domid, _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvt-0004dO-Q2; Wed, 04 Jul 2012 04:11:17 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvt-0004b1-7f for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:17 +0000 Received: from [85.158.143.35:28318] by server-2.bemta-4.messagelabs.com id DA/B5-17938-462C3FF4; Wed, 04 Jul 2012 04:11:16 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-21.messagelabs.com!1341375074!14809996!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22945 invoked from network); 4 Jul 2012 04:11:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvq-0002hQ-MB for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGvq-0003pM-I7 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:14 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:14 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xen, pod: Only sweep in an emergency, and only for 4k pages X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User George Dunlap # Date 1340893085 -3600 # Node ID 3ea92ea1490fbe4a174f0d4d8fc3c6acfecd1b97 # Parent 437b7cc52db7fb2d0c4adacc9bf9bad2979cf110 xen,pod: Only sweep in an emergency, and only for 4k pages Testing has shown that doing sweeps for superpages slows down boot significantly, but does not result in a significantly higher number of superpages after boot. Early sweeping for 4k pages causes superpages to be broken up unnecessarily. Only sweep if we're really out of memory. v2: - Move unrelated code-motion hunk to another patch v3: - Remove now-unused reclaim_super from pod struct Signed-off-by: George Dunlap Acked-by: Tim Deegan Committed-by: Tim Deegan --- diff -r 437b7cc52db7 -r 3ea92ea1490f xen/arch/x86/mm/p2m-pod.c --- a/xen/arch/x86/mm/p2m-pod.c Thu Jun 28 15:18:03 2012 +0100 +++ b/xen/arch/x86/mm/p2m-pod.c Thu Jun 28 15:18:05 2012 +0100 @@ -897,34 +897,6 @@ p2m_pod_zero_check(struct p2m_domain *p2 } #define POD_SWEEP_LIMIT 1024 -static void -p2m_pod_emergency_sweep_super(struct p2m_domain *p2m) -{ - unsigned long i, start, limit; - - if ( p2m->pod.reclaim_super == 0 ) - { - p2m->pod.reclaim_super = (p2m->pod.max_guest>>PAGE_ORDER_2M)<pod.reclaim_super -= SUPERPAGE_PAGES; - } - - start = p2m->pod.reclaim_super; - limit = (start > POD_SWEEP_LIMIT) ? (start - POD_SWEEP_LIMIT) : 0; - - for ( i=p2m->pod.reclaim_super ; i > 0 ; i -= SUPERPAGE_PAGES ) - { - p2m_pod_zero_check_superpage(p2m, i); - /* Stop if we're past our limit and we have found *something*. - * - * NB that this is a zero-sum game; we're increasing our cache size - * by increasing our 'debt'. Since we hold the p2m lock, - * (entry_count - count) must remain the same. */ - if ( !page_list_empty(&p2m->pod.super) && i < limit ) - break; - } - - p2m->pod.reclaim_super = i ? i - SUPERPAGE_PAGES : 0; -} /* When populating a new superpage, look at recently populated superpages * hoping that they've been zeroed. This will snap up zeroed pages as soon as @@ -1039,27 +1011,12 @@ p2m_pod_demand_populate(struct p2m_domai return 0; } - /* Once we've ballooned down enough that we can fill the remaining - * PoD entries from the cache, don't sweep even if the particular - * list we want to use is empty: that can lead to thrashing zero pages - * through the cache for no good reason. */ - if ( p2m->pod.entry_count > p2m->pod.count ) - { + /* Only sweep if we're actually out of memory. Doing anything else + * causes unnecessary time and fragmentation of superpages in the p2m. */ + if ( p2m->pod.count == 0 ) + p2m_pod_emergency_sweep(p2m); - /* If we're low, start a sweep */ - if ( order == PAGE_ORDER_2M && page_list_empty(&p2m->pod.super) ) - /* Note that sweeps scan other ranges in the p2m. In an scenario - * in which p2m locks are fine-grained, this may result in deadlock. - * Using trylock on the gfn's as we sweep would avoid it. */ - p2m_pod_emergency_sweep_super(p2m); - - if ( page_list_empty(&p2m->pod.single) && - ( ( order == PAGE_ORDER_4K ) - || (order == PAGE_ORDER_2M && page_list_empty(&p2m->pod.super) ) ) ) - /* Same comment regarding deadlock applies */ - p2m_pod_emergency_sweep(p2m); - } - + /* If the sweep failed, give up. */ if ( p2m->pod.count == 0 ) goto out_of_memory; diff -r 437b7cc52db7 -r 3ea92ea1490f xen/include/asm-x86/p2m.h --- a/xen/include/asm-x86/p2m.h Thu Jun 28 15:18:03 2012 +0100 +++ b/xen/include/asm-x86/p2m.h Thu Jun 28 15:18:05 2012 +0100 @@ -284,7 +284,6 @@ struct p2m_domain { single; /* Non-super lists */ int count, /* # of pages in cache lists */ entry_count; /* # of pages in p2m marked pod */ - unsigned reclaim_super; /* Last gpfn of a scan */ unsigned reclaim_single; /* Last gpfn of a scan */ unsigned max_guest; /* gpfn of max guest demand-populate */ #define POD_HISTORY_MAX 128 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvs-0004cD-9Y; Wed, 04 Jul 2012 04: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 1SmGvq-0004b1-KK for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:14 +0000 Received: from [85.158.143.35:28202] by server-2.bemta-4.messagelabs.com id B3/B5-17938-162C3FF4; Wed, 04 Jul 2012 04:11:13 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-21.messagelabs.com!1341375069!17043121!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24917 invoked from network); 4 Jul 2012 04:11:10 -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; 4 Jul 2012 04:11:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvl-0002gt-68 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGvk-0003md-P1 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:08 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] x86/mm: Clean up unshare path for foreign mappings X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Andres Lagar-Cavilla # Date 1340883909 -3600 # Node ID 2d9f3b0109011a84c1e9a8b3d1d65ab6521bbd40 # Parent fdc1f16d382c8d75ab96be00a9133f39b4384bcf x86/mm: Clean up unshare path for foreign mappings In its current shape, if Xen unshares a foreign gfn successfully while building a foreign writable map, it is left with a reference to the old shared page in the "target" var. Instead, push unsharing request down on the initial get_page_from_gfn call, which will DTRT. This allows for greatly simplifying the unshare related condition handling, removing ugly comments and s86_64 ifdef-ery. Signed-off-by: Andres Lagar-Cavilla Acked-by: Tim Deegan Committed-by: Tim Deegan --- diff -r fdc1f16d382c -r 2d9f3b010901 xen/arch/x86/mm.c --- a/xen/arch/x86/mm.c Thu Jun 28 13:36:08 2012 +0200 +++ b/xen/arch/x86/mm.c Thu Jun 28 12:45:09 2012 +0100 @@ -3564,10 +3564,12 @@ int do_mmu_update( l1_pgentry_t l1e = l1e_from_intpte(req.val); p2m_type_t l1e_p2mt = p2m_ram_rw; struct page_info *target = NULL; + p2m_query_t q = (l1e_get_flags(l1e) & _PAGE_RW) ? + P2M_UNSHARE : P2M_ALLOC; if ( paging_mode_translate(pg_owner) ) target = get_page_from_gfn(pg_owner, l1e_get_pfn(l1e), - &l1e_p2mt, P2M_ALLOC); + &l1e_p2mt, q); if ( p2m_is_paged(l1e_p2mt) ) { @@ -3582,29 +3584,15 @@ int do_mmu_update( rc = -ENOENT; break; } -#ifdef __x86_64__ - /* XXX: Ugly: pull all the checks into a separate function. - * Don't want to do it now, not to interfere with mem_paging - * patches */ - else if ( p2m_ram_shared == l1e_p2mt ) + /* If we tried to unshare and failed */ + else if ( (q & P2M_UNSHARE) && p2m_is_shared(l1e_p2mt) ) { - /* Unshare the page for RW foreign mappings */ - if ( l1e_get_flags(l1e) & _PAGE_RW ) - { - unsigned long gfn = l1e_get_pfn(l1e); - rc = mem_sharing_unshare_page(pg_owner, gfn, 0); - if ( rc ) - { - if ( target ) - put_page(target); - /* Notify helper, don't care about errors, will not - * sleep on wq, since we're a foreign domain. */ - (void)mem_sharing_notify_enomem(pg_owner, gfn, 0); - break; - } - } - } -#endif + /* We could not have obtained a page ref. */ + ASSERT(target == NULL); + /* And mem_sharing_notify has already been called. */ + rc = -ENOMEM; + break; + } rc = mod_l1_entry(va, l1e, mfn, cmd == MMU_PT_UPDATE_PRESERVE_AD, v, _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04: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 1SmGvp-0004b7-NA; Wed, 04 Jul 2012 04:11:13 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvo-0004aj-Ek for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:12 +0000 Received: from [85.158.138.51:39199] by server-12.bemta-3.messagelabs.com id 7A/2D-30206-F52C3FF4; Wed, 04 Jul 2012 04:11:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-174.messagelabs.com!1341375069!30798650!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12620 invoked from network); 4 Jul 2012 04:11:10 -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; 4 Jul 2012 04:11:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvl-0002gw-Em for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGvl-0003mt-AJ for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:09 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xen,pod: Cosmetic code motion X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User George Dunlap # Date 1340815810 -3600 # Node ID 52f1b8a4f9a4cb454b6fea1220cc6a09cf401a42 # Parent 2d9f3b0109011a84c1e9a8b3d1d65ab6521bbd40 xen,pod: Cosmetic code motion No point in doing the assignment if we're just going to crash anyway. Signed-off-by: George Dunlap --- diff -r 2d9f3b010901 -r 52f1b8a4f9a4 xen/arch/x86/mm/p2m-pod.c --- a/xen/arch/x86/mm/p2m-pod.c Thu Jun 28 12:45:09 2012 +0100 +++ b/xen/arch/x86/mm/p2m-pod.c Wed Jun 27 17:50:10 2012 +0100 @@ -1022,13 +1022,13 @@ p2m_pod_demand_populate(struct p2m_domai p2m_pod_emergency_sweep(p2m); } + if ( p2m->pod.count == 0 ) + goto out_of_memory; + /* Keep track of the highest gfn demand-populated by a guest fault */ if ( gfn > p2m->pod.max_guest ) p2m->pod.max_guest = gfn; - if ( p2m->pod.count == 0 ) - goto out_of_memory; - /* Get a page f/ the cache. A NULL return value indicates that the * 2-meg range should be marked singleton PoD, and retried */ if ( (p = p2m_pod_cache_get(p2m, order)) == NULL ) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvr-0004bg-0e; Wed, 04 Jul 2012 04:11:15 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvp-0004al-SC for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:14 +0000 Received: from [85.158.143.35:28207] by server-3.bemta-4.messagelabs.com id 17/C6-05808-162C3FF4; Wed, 04 Jul 2012 04:11:13 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-21.messagelabs.com!1341375070!17043125!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24961 invoked from network); 4 Jul 2012 04:11:11 -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; 4 Jul 2012 04:11:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvm-0002h2-Hb for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGvm-0003nN-D8 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:10 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:09 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: document the memory ownership of some functions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340894642 -3600 # Node ID f347d62595011cd6b8baece7bc2a0e4d1d875b14 # Parent efd12cc7dd99fa855d98025d97d5cbcbf1445e73 libxl: document the memory ownership of some functions Specifying they allocate dynamic memory that needs to be explicitly freed. Signed-off-by: Dario Faggioli Acked-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r efd12cc7dd99 -r f347d6259501 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Thu Jun 28 16:04:12 2012 +0200 +++ b/tools/libxl/libxl.c Thu Jun 28 15:44:02 2012 +0100 @@ -508,7 +508,7 @@ static void xcinfo2xlinfo(const xc_domai xlinfo->cpupool = xcinfo->cpupool; } -libxl_dominfo * libxl_list_domain(libxl_ctx *ctx, int *nb_domain) +libxl_dominfo * libxl_list_domain(libxl_ctx *ctx, int *nb_domain_out) { libxl_dominfo *ptr; int i, ret; @@ -531,7 +531,7 @@ libxl_dominfo * libxl_list_domain(libxl_ for (i = 0; i < ret; i++) { xcinfo2xlinfo(&info[i], &ptr[i]); } - *nb_domain = ret; + *nb_domain_out = ret; return ptr; } @@ -589,7 +589,7 @@ int libxl_cpupool_info(libxl_ctx *ctx, return rc; } -libxl_cpupoolinfo * libxl_list_cpupool(libxl_ctx *ctx, int *nb_pool) +libxl_cpupoolinfo * libxl_list_cpupool(libxl_ctx *ctx, int *nb_pool_out) { GC_INIT(ctx); libxl_cpupoolinfo info, *ptr, *tmp; @@ -613,14 +613,15 @@ libxl_cpupoolinfo * libxl_list_cpupool(l poolid = info.poolid + 1; } - *nb_pool = i; + *nb_pool_out = i; out: GC_FREE; return ptr; } -/* this API call only list VM running on this host. a VM can be an aggregate of multiple domains. */ -libxl_vminfo * libxl_list_vm(libxl_ctx *ctx, int *nb_vm) +/* this API call only list VM running on this host. A VM can + * be an aggregate of multiple domains. */ +libxl_vminfo * libxl_list_vm(libxl_ctx *ctx, int *nb_vm_out) { libxl_vminfo *ptr; int index, i, ret; @@ -644,7 +645,7 @@ libxl_vminfo * libxl_list_vm(libxl_ctx * index++; } - *nb_vm = index; + *nb_vm_out = index; return ptr; } @@ -3161,7 +3162,7 @@ int libxl_get_physinfo(libxl_ctx *ctx, l return 0; } -libxl_cputopology *libxl_get_cpu_topology(libxl_ctx *ctx, int *nr) +libxl_cputopology *libxl_get_cpu_topology(libxl_ctx *ctx, int *nb_cpu_out) { xc_topologyinfo_t tinfo; DECLARE_HYPERCALL_BUFFER(xc_cpu_to_core_t, coremap); @@ -3219,7 +3220,7 @@ fail: xc_hypercall_buffer_free(ctx->xch, nodemap); if (ret) - *nr = max_cpus; + *nb_cpu_out = max_cpus; return ret; } @@ -3270,7 +3271,7 @@ const libxl_version_info* libxl_get_vers } libxl_vcpuinfo *libxl_list_vcpu(libxl_ctx *ctx, uint32_t domid, - int *nb_vcpu, int *nrcpus) + int *nb_vcpu, int *nr_vcpus_out) { libxl_vcpuinfo *ptr, *ret; xc_domaininfo_t domaininfo; @@ -3280,7 +3281,7 @@ libxl_vcpuinfo *libxl_list_vcpu(libxl_ct LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "getting infolist"); return NULL; } - *nrcpus = libxl_get_max_cpus(ctx); + *nr_vcpus_out = libxl_get_max_cpus(ctx); ret = ptr = calloc(domaininfo.max_vcpu_id + 1, sizeof (libxl_vcpuinfo)); if (!ptr) { return NULL; diff -r efd12cc7dd99 -r f347d6259501 tools/libxl/libxl.h --- a/tools/libxl/libxl.h Thu Jun 28 16:04:12 2012 +0200 +++ b/tools/libxl/libxl.h Thu Jun 28 15:44:02 2012 +0100 @@ -585,12 +585,28 @@ int libxl_primary_console_get_tty(libxl_ /* May be called with info_r == NULL to check for domain's existance */ int libxl_domain_info(libxl_ctx*, libxl_dominfo *info_r, uint32_t domid); -libxl_dominfo * libxl_list_domain(libxl_ctx*, int *nb_domain); -void libxl_dominfo_list_free(libxl_dominfo *list, int nr); -libxl_cpupoolinfo * libxl_list_cpupool(libxl_ctx*, int *nb_pool); -void libxl_cpupoolinfo_list_free(libxl_cpupoolinfo *list, int nr); -libxl_vminfo * libxl_list_vm(libxl_ctx *ctx, int *nb_vm); -void libxl_vminfo_list_free(libxl_vminfo *list, int nr); + +/* These functions each return (on success) an array of elements, + * and the length via the int* out parameter. These arrays and + * their contents come from malloc, and must be freed with the + * corresponding libxl_THING_list_free function. + */ +libxl_dominfo * libxl_list_domain(libxl_ctx*, int *nb_domain_out); +void libxl_dominfo_list_free(libxl_dominfo *list, int nb_domain); + +libxl_cpupoolinfo * libxl_list_cpupool(libxl_ctx*, int *nb_pool_out); +void libxl_cpupoolinfo_list_free(libxl_cpupoolinfo *list, int nb_pool); + +libxl_vminfo * libxl_list_vm(libxl_ctx *ctx, int *nb_vm_out); +void libxl_vminfo_list_free(libxl_vminfo *list, int nb_vm); + +#define LIBXL_CPUTOPOLOGY_INVALID_ENTRY (~(uint32_t)0) +libxl_cputopology *libxl_get_cpu_topology(libxl_ctx *ctx, int *nb_cpu_out); +void libxl_cputopology_list_free(libxl_cputopology *, int nb_cpu); + +libxl_vcpuinfo *libxl_list_vcpu(libxl_ctx *ctx, uint32_t domid, + int *nb_vcpu, int *nr_vcpus_out); +void libxl_vcpuinfo_list_free(libxl_vcpuinfo *, int nr_vcpus); /* * Devices @@ -766,12 +782,6 @@ int libxl_userdata_retrieve(libxl_ctx *c */ int libxl_get_physinfo(libxl_ctx *ctx, libxl_physinfo *physinfo); -#define LIBXL_CPUTOPOLOGY_INVALID_ENTRY (~(uint32_t)0) -libxl_cputopology *libxl_get_cpu_topology(libxl_ctx *ctx, int *nr); -void libxl_cputopology_list_free(libxl_cputopology *, int nr); -libxl_vcpuinfo *libxl_list_vcpu(libxl_ctx *ctx, uint32_t domid, - int *nb_vcpu, int *nrcpus); -void libxl_vcpuinfo_list_free(libxl_vcpuinfo *, int nr); int libxl_set_vcpuaffinity(libxl_ctx *ctx, uint32_t domid, uint32_t vcpuid, libxl_cpumap *cpumap); int libxl_set_vcpuaffinity_all(libxl_ctx *ctx, uint32_t domid, _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04: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 1SmGvp-0004bC-RK; Wed, 04 Jul 2012 04: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 1SmGvo-0004al-RW for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:13 +0000 Received: from [85.158.143.99:53555] by server-3.bemta-4.messagelabs.com id 34/C6-05808-062C3FF4; Wed, 04 Jul 2012 04:11:12 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-216.messagelabs.com!1341375070!25165747!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 977 invoked from network); 4 Jul 2012 04:11:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvm-0002gz-AW for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGvl-0003n8-RI for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:09 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:09 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: fix build after c/s 25477:e12e0b038219 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340892252 -7200 # Node ID efd12cc7dd99fa855d98025d97d5cbcbf1445e73 # Parent 52f1b8a4f9a4cb454b6fea1220cc6a09cf401a42 arm: fix build after c/s 25477:e12e0b038219 Only x86 currently has a struct vcpu field arch.gdbsx_vcpu_event. But as the whole function domain_pause_for_debugger() is pointless to be compiled when there's no arch support, simply introduce another HAS_* macro, enabled only on x86. Signed-off-by: Jan Beulich Acked-by: Ian Campbell Acked-by: Keir Fraser --- diff -r 52f1b8a4f9a4 -r efd12cc7dd99 xen/Rules.mk --- a/xen/Rules.mk Wed Jun 27 17:50:10 2012 +0100 +++ b/xen/Rules.mk Thu Jun 28 16:04:12 2012 +0200 @@ -51,6 +51,7 @@ CFLAGS-$(perfc) += -DPERF_COUNTE CFLAGS-$(perfc_arrays) += -DPERF_ARRAYS CFLAGS-$(lock_profile) += -DLOCK_PROFILE CFLAGS-$(HAS_ACPI) += -DHAS_ACPI +CFLAGS-$(HAS_GDBSX) += -DHAS_GDBSX CFLAGS-$(HAS_PASSTHROUGH) += -DHAS_PASSTHROUGH CFLAGS-$(frame_pointer) += -fno-omit-frame-pointer -DCONFIG_FRAME_POINTER diff -r 52f1b8a4f9a4 -r efd12cc7dd99 xen/arch/x86/Rules.mk --- a/xen/arch/x86/Rules.mk Wed Jun 27 17:50:10 2012 +0100 +++ b/xen/arch/x86/Rules.mk Thu Jun 28 16:04:12 2012 +0200 @@ -8,6 +8,7 @@ HAS_PCI := y HAS_PASSTHROUGH := y HAS_NS16550 := y HAS_KEXEC := y +HAS_GDBSX := y xenoprof := y # diff -r 52f1b8a4f9a4 -r efd12cc7dd99 xen/common/domain.c --- a/xen/common/domain.c Wed Jun 27 17:50:10 2012 +0100 +++ b/xen/common/domain.c Thu Jun 28 16:04:12 2012 +0200 @@ -612,6 +612,7 @@ void vcpu_end_shutdown_deferral(struct v vcpu_check_shutdown(v); } +#ifdef HAS_GDBSX void domain_pause_for_debugger(void) { struct domain *d = current->domain; @@ -628,6 +629,7 @@ void domain_pause_for_debugger(void) if (current->arch.gdbsx_vcpu_event == 0) send_global_virq(VIRQ_DEBUGGER); } +#endif /* Complete domain destroy after RCU readers are not holding old references. */ static void complete_domain_destroy(struct rcu_head *head) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04: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 1SmGvp-0004b7-NA; Wed, 04 Jul 2012 04:11:13 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvo-0004aj-Ek for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:12 +0000 Received: from [85.158.138.51:39199] by server-12.bemta-3.messagelabs.com id 7A/2D-30206-F52C3FF4; Wed, 04 Jul 2012 04:11:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-174.messagelabs.com!1341375069!30798650!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12620 invoked from network); 4 Jul 2012 04:11:10 -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; 4 Jul 2012 04:11:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvl-0002gw-Em for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGvl-0003mt-AJ for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:09 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xen,pod: Cosmetic code motion X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User George Dunlap # Date 1340815810 -3600 # Node ID 52f1b8a4f9a4cb454b6fea1220cc6a09cf401a42 # Parent 2d9f3b0109011a84c1e9a8b3d1d65ab6521bbd40 xen,pod: Cosmetic code motion No point in doing the assignment if we're just going to crash anyway. Signed-off-by: George Dunlap --- diff -r 2d9f3b010901 -r 52f1b8a4f9a4 xen/arch/x86/mm/p2m-pod.c --- a/xen/arch/x86/mm/p2m-pod.c Thu Jun 28 12:45:09 2012 +0100 +++ b/xen/arch/x86/mm/p2m-pod.c Wed Jun 27 17:50:10 2012 +0100 @@ -1022,13 +1022,13 @@ p2m_pod_demand_populate(struct p2m_domai p2m_pod_emergency_sweep(p2m); } + if ( p2m->pod.count == 0 ) + goto out_of_memory; + /* Keep track of the highest gfn demand-populated by a guest fault */ if ( gfn > p2m->pod.max_guest ) p2m->pod.max_guest = gfn; - if ( p2m->pod.count == 0 ) - goto out_of_memory; - /* Get a page f/ the cache. A NULL return value indicates that the * 2-meg range should be marked singleton PoD, and retried */ if ( (p = p2m_pod_cache_get(p2m, order)) == NULL ) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04: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 1SmGvs-0004cJ-CW; Wed, 04 Jul 2012 04:11:16 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvr-0004bY-0K for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:15 +0000 Received: from [85.158.139.83:46173] by server-3.bemta-5.messagelabs.com id B3/71-03367-262C3FF4; Wed, 04 Jul 2012 04:11:14 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-182.messagelabs.com!1341375072!19596533!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14151 invoked from network); 4 Jul 2012 04:11:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvo-0002hB-6k for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGvn-0003o6-Vt for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:11 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:11 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] QEMU_TAG update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1340894993 -3600 # Node ID e541c488a4eef80947a5f5b49696fc57ad4e3497 # Parent 84272cca638aeedbfba2337582121ff6a5e105b9 QEMU_TAG update --- diff -r 84272cca638a -r e541c488a4ee Config.mk --- a/Config.mk Thu Jun 28 15:47:34 2012 +0100 +++ b/Config.mk Thu Jun 28 15:49:53 2012 +0100 @@ -213,9 +213,9 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= 50c553be472c9f4b05a0526c0aae98709ca9ffff -# Thu Jun 7 19:44:01 2012 +0100 -# qemu-xen-trad: fix sys-queue.h usage on BSD systems +QEMU_TAG ?= ce6d9b1b2f9c6a5ca2500e03d0ef8b453bc4bf53 +# Thu Jun 28 15:44:50 2012 +0100 +# qemu-traditional: disable msitranslate by default # Short answer -- do not enable this unless you know what you are # doing and are prepared for some pain. _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04: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 1SmGvp-0004bC-RK; Wed, 04 Jul 2012 04: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 1SmGvo-0004al-RW for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:13 +0000 Received: from [85.158.143.99:53555] by server-3.bemta-4.messagelabs.com id 34/C6-05808-062C3FF4; Wed, 04 Jul 2012 04:11:12 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-216.messagelabs.com!1341375070!25165747!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 977 invoked from network); 4 Jul 2012 04:11:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvm-0002gz-AW for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGvl-0003n8-RI for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:09 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:09 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: fix build after c/s 25477:e12e0b038219 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340892252 -7200 # Node ID efd12cc7dd99fa855d98025d97d5cbcbf1445e73 # Parent 52f1b8a4f9a4cb454b6fea1220cc6a09cf401a42 arm: fix build after c/s 25477:e12e0b038219 Only x86 currently has a struct vcpu field arch.gdbsx_vcpu_event. But as the whole function domain_pause_for_debugger() is pointless to be compiled when there's no arch support, simply introduce another HAS_* macro, enabled only on x86. Signed-off-by: Jan Beulich Acked-by: Ian Campbell Acked-by: Keir Fraser --- diff -r 52f1b8a4f9a4 -r efd12cc7dd99 xen/Rules.mk --- a/xen/Rules.mk Wed Jun 27 17:50:10 2012 +0100 +++ b/xen/Rules.mk Thu Jun 28 16:04:12 2012 +0200 @@ -51,6 +51,7 @@ CFLAGS-$(perfc) += -DPERF_COUNTE CFLAGS-$(perfc_arrays) += -DPERF_ARRAYS CFLAGS-$(lock_profile) += -DLOCK_PROFILE CFLAGS-$(HAS_ACPI) += -DHAS_ACPI +CFLAGS-$(HAS_GDBSX) += -DHAS_GDBSX CFLAGS-$(HAS_PASSTHROUGH) += -DHAS_PASSTHROUGH CFLAGS-$(frame_pointer) += -fno-omit-frame-pointer -DCONFIG_FRAME_POINTER diff -r 52f1b8a4f9a4 -r efd12cc7dd99 xen/arch/x86/Rules.mk --- a/xen/arch/x86/Rules.mk Wed Jun 27 17:50:10 2012 +0100 +++ b/xen/arch/x86/Rules.mk Thu Jun 28 16:04:12 2012 +0200 @@ -8,6 +8,7 @@ HAS_PCI := y HAS_PASSTHROUGH := y HAS_NS16550 := y HAS_KEXEC := y +HAS_GDBSX := y xenoprof := y # diff -r 52f1b8a4f9a4 -r efd12cc7dd99 xen/common/domain.c --- a/xen/common/domain.c Wed Jun 27 17:50:10 2012 +0100 +++ b/xen/common/domain.c Thu Jun 28 16:04:12 2012 +0200 @@ -612,6 +612,7 @@ void vcpu_end_shutdown_deferral(struct v vcpu_check_shutdown(v); } +#ifdef HAS_GDBSX void domain_pause_for_debugger(void) { struct domain *d = current->domain; @@ -628,6 +629,7 @@ void domain_pause_for_debugger(void) if (current->arch.gdbsx_vcpu_event == 0) send_global_virq(VIRQ_DEBUGGER); } +#endif /* Complete domain destroy after RCU readers are not holding old references. */ static void complete_domain_destroy(struct rcu_head *head) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04: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 1SmGvs-0004cJ-CW; Wed, 04 Jul 2012 04:11:16 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvr-0004bY-0K for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:15 +0000 Received: from [85.158.139.83:46173] by server-3.bemta-5.messagelabs.com id B3/71-03367-262C3FF4; Wed, 04 Jul 2012 04:11:14 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-182.messagelabs.com!1341375072!19596533!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14151 invoked from network); 4 Jul 2012 04:11:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvo-0002hB-6k for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGvn-0003o6-Vt for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:11 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:11 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] QEMU_TAG update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1340894993 -3600 # Node ID e541c488a4eef80947a5f5b49696fc57ad4e3497 # Parent 84272cca638aeedbfba2337582121ff6a5e105b9 QEMU_TAG update --- diff -r 84272cca638a -r e541c488a4ee Config.mk --- a/Config.mk Thu Jun 28 15:47:34 2012 +0100 +++ b/Config.mk Thu Jun 28 15:49:53 2012 +0100 @@ -213,9 +213,9 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= 50c553be472c9f4b05a0526c0aae98709ca9ffff -# Thu Jun 7 19:44:01 2012 +0100 -# qemu-xen-trad: fix sys-queue.h usage on BSD systems +QEMU_TAG ?= ce6d9b1b2f9c6a5ca2500e03d0ef8b453bc4bf53 +# Thu Jun 28 15:44:50 2012 +0100 +# qemu-traditional: disable msitranslate by default # Short answer -- do not enable this unless you know what you are # doing and are prepared for some pain. _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04: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 1SmGvs-0004cW-Hm; Wed, 04 Jul 2012 04:11:16 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvr-0004bb-BZ for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:15 +0000 Received: from [85.158.139.83:55787] by server-1.bemta-5.messagelabs.com id 3C/00-19721-262C3FF4; Wed, 04 Jul 2012 04:11:14 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-182.messagelabs.com!1341375072!25704329!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21589 invoked from network); 4 Jul 2012 04:11:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvo-0002hE-Kp for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGvo-0003oO-GL for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:12 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:12 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] hgignore/gitignore: add xen/arch/x86/boot/reloc.bin, .lnk X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340895564 -3600 # Node ID 39b056330de08c3d79cd000c340a7de39c0940d6 # Parent e541c488a4eef80947a5f5b49696fc57ad4e3497 hgignore/gitignore: add xen/arch/x86/boot/reloc.bin, .lnk 25479:61dfb3da56b0 added a .PRECIOUS which causes these files to be left over more often. They should have been ignored already, though. Signed-off-by: Ian Jackson Committed-by: Ian Jackson --- diff -r e541c488a4ee -r 39b056330de0 .gitignore --- a/.gitignore Thu Jun 28 15:49:53 2012 +0100 +++ b/.gitignore Thu Jun 28 15:59:24 2012 +0100 @@ -296,6 +296,8 @@ xen/arch/x86/asm-offsets.s xen/arch/x86/boot/mkelf32 xen/arch/x86/xen.lds xen/arch/x86/boot/reloc.S +xen/arch/x86/boot/reloc.bin +xen/arch/x86/boot/reloc.lnk xen/arch/x86/efi.lds xen/arch/x86/efi/disabled xen/arch/x86/efi/mkreloc diff -r e541c488a4ee -r 39b056330de0 .hgignore --- a/.hgignore Thu Jun 28 15:49:53 2012 +0100 +++ b/.hgignore Thu Jun 28 15:59:24 2012 +0100 @@ -322,7 +322,9 @@ ^xen/arch/x86/asm-offsets\.s$ ^xen/arch/x86/boot/mkelf32$ ^xen/arch/x86/xen\.lds$ -^xen/arch/x86/boot/reloc.S$ +^xen/arch/x86/boot/reloc\.S$ +^xen/arch/x86/boot/reloc\.bin$ +^xen/arch/x86/boot/reloc\.lnk$ ^xen/arch/x86/efi\.lds$ ^xen/arch/x86/efi/disabled$ ^xen/arch/x86/efi/mkreloc$ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04: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 1SmGvt-0004dJ-Mb; Wed, 04 Jul 2012 04:11:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvs-0004c7-9M for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:16 +0000 Received: from [85.158.138.51:36621] by server-7.bemta-3.messagelabs.com id E5/29-10113-362C3FF4; Wed, 04 Jul 2012 04:11:15 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-174.messagelabs.com!1341375073!29788466!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14961 invoked from network); 4 Jul 2012 04:11:14 -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; 4 Jul 2012 04:11:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvp-0002hK-IR for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGvp-0003os-HO for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:13 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:13 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xen, pod: Try to reclaim superpages when ballooning down X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User George Dunlap # Date 1340893080 -3600 # Node ID 0ff7269bbcedc22db1f48661dd52355081c19eaf # Parent ae7d717abb7c28357c37b3a1b1a3b685acf445de xen,pod: Try to reclaim superpages when ballooning down Windows balloon drivers can typically only get 4k pages from the kernel, and so hand them back at that level. Try to regain superpages by checking the superpage frame that the 4k page is in to see if we can reclaim the whole thing for the PoD cache. This also modifies p2m_pod_zero_check_superpage() to return SUPERPAGE_PAGES on success. v2: - Rewritten to simply to the check as in demand-fault case, without needing to know that the p2m entry is a superpage. - Also, took out the re-writing of the reclaim loop, leaving it optimized for 4k pages (by far the most common case), and simplifying the patch. v3: - Add SoB Signed-off-by: George Dunlap Acked-by: Tim Deegan Committed-by: Tim Deegan --- diff -r ae7d717abb7c -r 0ff7269bbced xen/arch/x86/mm/p2m-pod.c --- a/xen/arch/x86/mm/p2m-pod.c Thu Jun 28 16:11:59 2012 +0100 +++ b/xen/arch/x86/mm/p2m-pod.c Thu Jun 28 15:18:00 2012 +0100 @@ -488,6 +488,10 @@ p2m_pod_offline_or_broken_replace(struct return; } +static int +p2m_pod_zero_check_superpage(struct p2m_domain *p2m, unsigned long gfn); + + /* This function is needed for two reasons: * + To properly handle clearing of PoD entries * + To "steal back" memory being freed for the PoD cache, rather than @@ -505,8 +509,8 @@ p2m_pod_decrease_reservation(struct doma int i; struct p2m_domain *p2m = p2m_get_hostp2m(d); - int steal_for_cache = 0; - int pod = 0, nonpod = 0, ram = 0; + int steal_for_cache; + int pod, nonpod, ram; gfn_lock(p2m, gpfn, order); pod_lock(p2m); @@ -516,13 +520,15 @@ p2m_pod_decrease_reservation(struct doma if ( p2m->pod.entry_count == 0 ) goto out_unlock; + if ( unlikely(d->is_dying) ) + goto out_unlock; + +recount: + pod = nonpod = ram = 0; + /* Figure out if we need to steal some freed memory for our cache */ steal_for_cache = ( p2m->pod.entry_count > p2m->pod.count ); - if ( unlikely(d->is_dying) ) - goto out_unlock; - - /* See what's in here. */ /* FIXME: Add contiguous; query for PSE entries? */ for ( i=0; i<(1<pod.entry_count += SUPERPAGE_PAGES; + ret = SUPERPAGE_PAGES; + out_reset: if ( reset ) set_p2m_entry(p2m, gfn, mfn0, 9, type0, p2m->default_access); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04: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 1SmGvs-0004cW-Hm; Wed, 04 Jul 2012 04:11:16 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvr-0004bb-BZ for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:15 +0000 Received: from [85.158.139.83:55787] by server-1.bemta-5.messagelabs.com id 3C/00-19721-262C3FF4; Wed, 04 Jul 2012 04:11:14 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-182.messagelabs.com!1341375072!25704329!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21589 invoked from network); 4 Jul 2012 04:11:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvo-0002hE-Kp for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGvo-0003oO-GL for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:12 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:12 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] hgignore/gitignore: add xen/arch/x86/boot/reloc.bin, .lnk X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340895564 -3600 # Node ID 39b056330de08c3d79cd000c340a7de39c0940d6 # Parent e541c488a4eef80947a5f5b49696fc57ad4e3497 hgignore/gitignore: add xen/arch/x86/boot/reloc.bin, .lnk 25479:61dfb3da56b0 added a .PRECIOUS which causes these files to be left over more often. They should have been ignored already, though. Signed-off-by: Ian Jackson Committed-by: Ian Jackson --- diff -r e541c488a4ee -r 39b056330de0 .gitignore --- a/.gitignore Thu Jun 28 15:49:53 2012 +0100 +++ b/.gitignore Thu Jun 28 15:59:24 2012 +0100 @@ -296,6 +296,8 @@ xen/arch/x86/asm-offsets.s xen/arch/x86/boot/mkelf32 xen/arch/x86/xen.lds xen/arch/x86/boot/reloc.S +xen/arch/x86/boot/reloc.bin +xen/arch/x86/boot/reloc.lnk xen/arch/x86/efi.lds xen/arch/x86/efi/disabled xen/arch/x86/efi/mkreloc diff -r e541c488a4ee -r 39b056330de0 .hgignore --- a/.hgignore Thu Jun 28 15:49:53 2012 +0100 +++ b/.hgignore Thu Jun 28 15:59:24 2012 +0100 @@ -322,7 +322,9 @@ ^xen/arch/x86/asm-offsets\.s$ ^xen/arch/x86/boot/mkelf32$ ^xen/arch/x86/xen\.lds$ -^xen/arch/x86/boot/reloc.S$ +^xen/arch/x86/boot/reloc\.S$ +^xen/arch/x86/boot/reloc\.bin$ +^xen/arch/x86/boot/reloc\.lnk$ ^xen/arch/x86/efi\.lds$ ^xen/arch/x86/efi/disabled$ ^xen/arch/x86/efi/mkreloc$ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04: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 1SmGvt-0004dJ-Mb; Wed, 04 Jul 2012 04:11:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvs-0004c7-9M for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:16 +0000 Received: from [85.158.138.51:36621] by server-7.bemta-3.messagelabs.com id E5/29-10113-362C3FF4; Wed, 04 Jul 2012 04:11:15 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-174.messagelabs.com!1341375073!29788466!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14961 invoked from network); 4 Jul 2012 04:11:14 -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; 4 Jul 2012 04:11:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvp-0002hK-IR for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGvp-0003os-HO for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:13 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:13 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xen, pod: Try to reclaim superpages when ballooning down X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User George Dunlap # Date 1340893080 -3600 # Node ID 0ff7269bbcedc22db1f48661dd52355081c19eaf # Parent ae7d717abb7c28357c37b3a1b1a3b685acf445de xen,pod: Try to reclaim superpages when ballooning down Windows balloon drivers can typically only get 4k pages from the kernel, and so hand them back at that level. Try to regain superpages by checking the superpage frame that the 4k page is in to see if we can reclaim the whole thing for the PoD cache. This also modifies p2m_pod_zero_check_superpage() to return SUPERPAGE_PAGES on success. v2: - Rewritten to simply to the check as in demand-fault case, without needing to know that the p2m entry is a superpage. - Also, took out the re-writing of the reclaim loop, leaving it optimized for 4k pages (by far the most common case), and simplifying the patch. v3: - Add SoB Signed-off-by: George Dunlap Acked-by: Tim Deegan Committed-by: Tim Deegan --- diff -r ae7d717abb7c -r 0ff7269bbced xen/arch/x86/mm/p2m-pod.c --- a/xen/arch/x86/mm/p2m-pod.c Thu Jun 28 16:11:59 2012 +0100 +++ b/xen/arch/x86/mm/p2m-pod.c Thu Jun 28 15:18:00 2012 +0100 @@ -488,6 +488,10 @@ p2m_pod_offline_or_broken_replace(struct return; } +static int +p2m_pod_zero_check_superpage(struct p2m_domain *p2m, unsigned long gfn); + + /* This function is needed for two reasons: * + To properly handle clearing of PoD entries * + To "steal back" memory being freed for the PoD cache, rather than @@ -505,8 +509,8 @@ p2m_pod_decrease_reservation(struct doma int i; struct p2m_domain *p2m = p2m_get_hostp2m(d); - int steal_for_cache = 0; - int pod = 0, nonpod = 0, ram = 0; + int steal_for_cache; + int pod, nonpod, ram; gfn_lock(p2m, gpfn, order); pod_lock(p2m); @@ -516,13 +520,15 @@ p2m_pod_decrease_reservation(struct doma if ( p2m->pod.entry_count == 0 ) goto out_unlock; + if ( unlikely(d->is_dying) ) + goto out_unlock; + +recount: + pod = nonpod = ram = 0; + /* Figure out if we need to steal some freed memory for our cache */ steal_for_cache = ( p2m->pod.entry_count > p2m->pod.count ); - if ( unlikely(d->is_dying) ) - goto out_unlock; - - /* See what's in here. */ /* FIXME: Add contiguous; query for PSE entries? */ for ( i=0; i<(1<pod.entry_count += SUPERPAGE_PAGES; + ret = SUPERPAGE_PAGES; + out_reset: if ( reset ) set_p2m_entry(p2m, gfn, mfn0, 9, type0, p2m->default_access); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvv-0004gO-HJ; Wed, 04 Jul 2012 04:11:19 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvu-0004dH-55 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:18 +0000 Received: from [85.158.138.51:39404] by server-8.bemta-3.messagelabs.com id 94/BB-06157-562C3FF4; Wed, 04 Jul 2012 04:11:17 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-174.messagelabs.com!1341375075!22749730!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26367 invoked from network); 4 Jul 2012 04:11:16 -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; 4 Jul 2012 04:11:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvr-0002hT-4V for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGvr-0003pb-3R for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:15 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:14 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: allow to allocate cpumap with specific size X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340902033 -3600 # Node ID 0671657e0f3ad4f04dfa370ac64c5b38443e16fe # Parent 3ea92ea1490fbe4a174f0d4d8fc3c6acfecd1b97 libxl: allow to allocate cpumap with specific size Currently, libxl_cpumap_alloc()allocate the cpumap with size of number of physical cpus. In some place, we may want to allocate specific size of cpumap. This patch allow to pass a argument to specific the size that you want to allocate. If pass 0, it means the size is equal to number of physical cpus. Signed-off-by: Yang Zhang Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 3ea92ea1490f -r 0671657e0f3a tools/libxl/libxl.c --- a/tools/libxl/libxl.c Thu Jun 28 15:18:05 2012 +0100 +++ b/tools/libxl/libxl.c Thu Jun 28 17:47:13 2012 +0100 @@ -570,7 +570,7 @@ static int cpupool_info(libxl__gc *gc, info->poolid = xcinfo->cpupool_id; info->sched = xcinfo->sched_id; info->n_dom = xcinfo->n_dom; - if (libxl_cpumap_alloc(CTX, &info->cpumap)) + if (libxl_cpumap_alloc(CTX, &info->cpumap, 0)) goto out; memcpy(info->cpumap.map, xcinfo->cpumap, info->cpumap.size); @@ -3288,7 +3288,7 @@ libxl_vcpuinfo *libxl_list_vcpu(libxl_ct } for (*nb_vcpu = 0; *nb_vcpu <= domaininfo.max_vcpu_id; ++*nb_vcpu, ++ptr) { - if (libxl_cpumap_alloc(ctx, &ptr->cpumap)) { + if (libxl_cpumap_alloc(ctx, &ptr->cpumap, 0)) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "allocating cpumap"); return NULL; } @@ -4041,8 +4041,8 @@ int libxl_cpupool_destroy(libxl_ctx *ctx if ((info->cpupool_id != poolid) || (info->n_dom)) goto out; - rc = ERROR_NOMEM; - if (libxl_cpumap_alloc(ctx, &cpumap)) + rc = libxl_cpumap_alloc(ctx, &cpumap, 0); + if (rc) goto out; memcpy(cpumap.map, info->cpumap, cpumap.size); diff -r 3ea92ea1490f -r 0671657e0f3a tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Thu Jun 28 15:18:05 2012 +0100 +++ b/tools/libxl/libxl_create.c Thu Jun 28 17:47:13 2012 +0100 @@ -205,8 +205,8 @@ int libxl__domain_build_info_setdefault( b_info->cur_vcpus = 1; if (!b_info->cpumap.size) { - if (libxl_cpumap_alloc(CTX, &b_info->cpumap)) - return ERROR_NOMEM; + if (libxl_cpumap_alloc(CTX, &b_info->cpumap, 0)) + return ERROR_FAIL; libxl_cpumap_set_any(&b_info->cpumap); } diff -r 3ea92ea1490f -r 0671657e0f3a tools/libxl/libxl_utils.c --- a/tools/libxl/libxl_utils.c Thu Jun 28 15:18:05 2012 +0100 +++ b/tools/libxl/libxl_utils.c Thu Jun 28 17:47:13 2012 +0100 @@ -489,19 +489,19 @@ int libxl_mac_to_device_nic(libxl_ctx *c return rc; } -int libxl_cpumap_alloc(libxl_ctx *ctx, libxl_cpumap *cpumap) +int libxl_cpumap_alloc(libxl_ctx *ctx, libxl_cpumap *cpumap, int max_cpus) { - int max_cpus; int sz; - max_cpus = libxl_get_max_cpus(ctx); + if (max_cpus < 0) + return ERROR_INVAL; + if (max_cpus == 0) + max_cpus = libxl_get_max_cpus(ctx); if (max_cpus == 0) return ERROR_FAIL; sz = (max_cpus + 7) / 8; - cpumap->map = calloc(sz, sizeof(*cpumap->map)); - if (!cpumap->map) - return ERROR_NOMEM; + cpumap->map = libxl__calloc(NULL, sizeof(*cpumap->map), sz); cpumap->size = sz; return 0; } diff -r 3ea92ea1490f -r 0671657e0f3a tools/libxl/libxl_utils.h --- a/tools/libxl/libxl_utils.h Thu Jun 28 15:18:05 2012 +0100 +++ b/tools/libxl/libxl_utils.h Thu Jun 28 17:47:13 2012 +0100 @@ -63,7 +63,7 @@ int libxl_devid_to_device_nic(libxl_ctx int libxl_vdev_to_device_disk(libxl_ctx *ctx, uint32_t domid, const char *vdev, libxl_device_disk *disk); -int libxl_cpumap_alloc(libxl_ctx *ctx, libxl_cpumap *cpumap); +int libxl_cpumap_alloc(libxl_ctx *ctx, libxl_cpumap *cpumap, int max_cpus); int libxl_cpumap_test(libxl_cpumap *cpumap, int cpu); void libxl_cpumap_set(libxl_cpumap *cpumap, int cpu); void libxl_cpumap_reset(libxl_cpumap *cpumap, int cpu); diff -r 3ea92ea1490f -r 0671657e0f3a tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Thu Jun 28 15:18:05 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Thu Jun 28 17:47:13 2012 +0100 @@ -503,7 +503,7 @@ static int vcpupin_parse(char *cpu, libx return 0; } - if (libxl_cpumap_alloc(ctx, &exclude_cpumap)) { + if (libxl_cpumap_alloc(ctx, &exclude_cpumap, 0)) { fprintf(stderr, "Error: Failed to allocate cpumap.\n"); return ENOMEM; } @@ -656,7 +656,7 @@ static void parse_config_data(const char if (!xlu_cfg_get_list (config, "cpus", &cpus, 0, 1)) { int i, n_cpus = 0; - if (libxl_cpumap_alloc(ctx, &b_info->cpumap)) { + if (libxl_cpumap_alloc(ctx, &b_info->cpumap, 0)) { fprintf(stderr, "Unable to allocate cpumap\n"); exit(1); } @@ -692,7 +692,7 @@ static void parse_config_data(const char else if (!xlu_cfg_get_string (config, "cpus", &buf, 0)) { char *buf2 = strdup(buf); - if (libxl_cpumap_alloc(ctx, &b_info->cpumap)) { + if (libxl_cpumap_alloc(ctx, &b_info->cpumap, 0)) { fprintf(stderr, "Unable to allocate cpumap\n"); exit(1); } @@ -1779,7 +1779,9 @@ start: if (vcpu_to_pcpu) { libxl_cpumap vcpu_cpumap; - libxl_cpumap_alloc(ctx, &vcpu_cpumap); + ret = libxl_cpumap_alloc(ctx, &vcpu_cpumap, 0); + if (ret) + goto error_out; for (i = 0; i < d_config.b_info.max_vcpus; i++) { if (vcpu_to_pcpu[i] != -1) { @@ -4051,7 +4053,7 @@ static void vcpupin(const char *d, const find_domain(d); - if (libxl_cpumap_alloc(ctx, &cpumap)) { + if (libxl_cpumap_alloc(ctx, &cpumap, 0)) { goto vcpupin_out; } @@ -4108,7 +4110,7 @@ static void vcpuset(const char *d, const find_domain(d); - if (libxl_cpumap_alloc(ctx, &cpumap)) { + if (libxl_cpumap_alloc(ctx, &cpumap, 0)) { fprintf(stderr, "libxl_cpumap_alloc failed\n"); return; } @@ -5921,7 +5923,7 @@ int main_cpupoolcreate(int argc, char ** fprintf(stderr, "libxl_get_freecpus failed\n"); goto out_cfg; } - if (libxl_cpumap_alloc(ctx, &cpumap)) { + if (libxl_cpumap_alloc(ctx, &cpumap, 0)) { fprintf(stderr, "Failed to allocate cpumap\n"); goto out_cfg; } @@ -6289,7 +6291,7 @@ int main_cpupoolnumasplit(int argc, char return -ERROR_FAIL; } - if (libxl_cpumap_alloc(ctx, &cpumap)) { + if (libxl_cpumap_alloc(ctx, &cpumap, 0)) { fprintf(stderr, "Failed to allocate cpumap\n"); libxl_cputopology_list_free(topology, n_cpus); return -ERROR_FAIL; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvv-0004gO-HJ; Wed, 04 Jul 2012 04:11:19 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvu-0004dH-55 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:18 +0000 Received: from [85.158.138.51:39404] by server-8.bemta-3.messagelabs.com id 94/BB-06157-562C3FF4; Wed, 04 Jul 2012 04:11:17 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-174.messagelabs.com!1341375075!22749730!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26367 invoked from network); 4 Jul 2012 04:11:16 -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; 4 Jul 2012 04:11:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvr-0002hT-4V for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGvr-0003pb-3R for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:15 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:14 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: allow to allocate cpumap with specific size X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340902033 -3600 # Node ID 0671657e0f3ad4f04dfa370ac64c5b38443e16fe # Parent 3ea92ea1490fbe4a174f0d4d8fc3c6acfecd1b97 libxl: allow to allocate cpumap with specific size Currently, libxl_cpumap_alloc()allocate the cpumap with size of number of physical cpus. In some place, we may want to allocate specific size of cpumap. This patch allow to pass a argument to specific the size that you want to allocate. If pass 0, it means the size is equal to number of physical cpus. Signed-off-by: Yang Zhang Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 3ea92ea1490f -r 0671657e0f3a tools/libxl/libxl.c --- a/tools/libxl/libxl.c Thu Jun 28 15:18:05 2012 +0100 +++ b/tools/libxl/libxl.c Thu Jun 28 17:47:13 2012 +0100 @@ -570,7 +570,7 @@ static int cpupool_info(libxl__gc *gc, info->poolid = xcinfo->cpupool_id; info->sched = xcinfo->sched_id; info->n_dom = xcinfo->n_dom; - if (libxl_cpumap_alloc(CTX, &info->cpumap)) + if (libxl_cpumap_alloc(CTX, &info->cpumap, 0)) goto out; memcpy(info->cpumap.map, xcinfo->cpumap, info->cpumap.size); @@ -3288,7 +3288,7 @@ libxl_vcpuinfo *libxl_list_vcpu(libxl_ct } for (*nb_vcpu = 0; *nb_vcpu <= domaininfo.max_vcpu_id; ++*nb_vcpu, ++ptr) { - if (libxl_cpumap_alloc(ctx, &ptr->cpumap)) { + if (libxl_cpumap_alloc(ctx, &ptr->cpumap, 0)) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "allocating cpumap"); return NULL; } @@ -4041,8 +4041,8 @@ int libxl_cpupool_destroy(libxl_ctx *ctx if ((info->cpupool_id != poolid) || (info->n_dom)) goto out; - rc = ERROR_NOMEM; - if (libxl_cpumap_alloc(ctx, &cpumap)) + rc = libxl_cpumap_alloc(ctx, &cpumap, 0); + if (rc) goto out; memcpy(cpumap.map, info->cpumap, cpumap.size); diff -r 3ea92ea1490f -r 0671657e0f3a tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Thu Jun 28 15:18:05 2012 +0100 +++ b/tools/libxl/libxl_create.c Thu Jun 28 17:47:13 2012 +0100 @@ -205,8 +205,8 @@ int libxl__domain_build_info_setdefault( b_info->cur_vcpus = 1; if (!b_info->cpumap.size) { - if (libxl_cpumap_alloc(CTX, &b_info->cpumap)) - return ERROR_NOMEM; + if (libxl_cpumap_alloc(CTX, &b_info->cpumap, 0)) + return ERROR_FAIL; libxl_cpumap_set_any(&b_info->cpumap); } diff -r 3ea92ea1490f -r 0671657e0f3a tools/libxl/libxl_utils.c --- a/tools/libxl/libxl_utils.c Thu Jun 28 15:18:05 2012 +0100 +++ b/tools/libxl/libxl_utils.c Thu Jun 28 17:47:13 2012 +0100 @@ -489,19 +489,19 @@ int libxl_mac_to_device_nic(libxl_ctx *c return rc; } -int libxl_cpumap_alloc(libxl_ctx *ctx, libxl_cpumap *cpumap) +int libxl_cpumap_alloc(libxl_ctx *ctx, libxl_cpumap *cpumap, int max_cpus) { - int max_cpus; int sz; - max_cpus = libxl_get_max_cpus(ctx); + if (max_cpus < 0) + return ERROR_INVAL; + if (max_cpus == 0) + max_cpus = libxl_get_max_cpus(ctx); if (max_cpus == 0) return ERROR_FAIL; sz = (max_cpus + 7) / 8; - cpumap->map = calloc(sz, sizeof(*cpumap->map)); - if (!cpumap->map) - return ERROR_NOMEM; + cpumap->map = libxl__calloc(NULL, sizeof(*cpumap->map), sz); cpumap->size = sz; return 0; } diff -r 3ea92ea1490f -r 0671657e0f3a tools/libxl/libxl_utils.h --- a/tools/libxl/libxl_utils.h Thu Jun 28 15:18:05 2012 +0100 +++ b/tools/libxl/libxl_utils.h Thu Jun 28 17:47:13 2012 +0100 @@ -63,7 +63,7 @@ int libxl_devid_to_device_nic(libxl_ctx int libxl_vdev_to_device_disk(libxl_ctx *ctx, uint32_t domid, const char *vdev, libxl_device_disk *disk); -int libxl_cpumap_alloc(libxl_ctx *ctx, libxl_cpumap *cpumap); +int libxl_cpumap_alloc(libxl_ctx *ctx, libxl_cpumap *cpumap, int max_cpus); int libxl_cpumap_test(libxl_cpumap *cpumap, int cpu); void libxl_cpumap_set(libxl_cpumap *cpumap, int cpu); void libxl_cpumap_reset(libxl_cpumap *cpumap, int cpu); diff -r 3ea92ea1490f -r 0671657e0f3a tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Thu Jun 28 15:18:05 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Thu Jun 28 17:47:13 2012 +0100 @@ -503,7 +503,7 @@ static int vcpupin_parse(char *cpu, libx return 0; } - if (libxl_cpumap_alloc(ctx, &exclude_cpumap)) { + if (libxl_cpumap_alloc(ctx, &exclude_cpumap, 0)) { fprintf(stderr, "Error: Failed to allocate cpumap.\n"); return ENOMEM; } @@ -656,7 +656,7 @@ static void parse_config_data(const char if (!xlu_cfg_get_list (config, "cpus", &cpus, 0, 1)) { int i, n_cpus = 0; - if (libxl_cpumap_alloc(ctx, &b_info->cpumap)) { + if (libxl_cpumap_alloc(ctx, &b_info->cpumap, 0)) { fprintf(stderr, "Unable to allocate cpumap\n"); exit(1); } @@ -692,7 +692,7 @@ static void parse_config_data(const char else if (!xlu_cfg_get_string (config, "cpus", &buf, 0)) { char *buf2 = strdup(buf); - if (libxl_cpumap_alloc(ctx, &b_info->cpumap)) { + if (libxl_cpumap_alloc(ctx, &b_info->cpumap, 0)) { fprintf(stderr, "Unable to allocate cpumap\n"); exit(1); } @@ -1779,7 +1779,9 @@ start: if (vcpu_to_pcpu) { libxl_cpumap vcpu_cpumap; - libxl_cpumap_alloc(ctx, &vcpu_cpumap); + ret = libxl_cpumap_alloc(ctx, &vcpu_cpumap, 0); + if (ret) + goto error_out; for (i = 0; i < d_config.b_info.max_vcpus; i++) { if (vcpu_to_pcpu[i] != -1) { @@ -4051,7 +4053,7 @@ static void vcpupin(const char *d, const find_domain(d); - if (libxl_cpumap_alloc(ctx, &cpumap)) { + if (libxl_cpumap_alloc(ctx, &cpumap, 0)) { goto vcpupin_out; } @@ -4108,7 +4110,7 @@ static void vcpuset(const char *d, const find_domain(d); - if (libxl_cpumap_alloc(ctx, &cpumap)) { + if (libxl_cpumap_alloc(ctx, &cpumap, 0)) { fprintf(stderr, "libxl_cpumap_alloc failed\n"); return; } @@ -5921,7 +5923,7 @@ int main_cpupoolcreate(int argc, char ** fprintf(stderr, "libxl_get_freecpus failed\n"); goto out_cfg; } - if (libxl_cpumap_alloc(ctx, &cpumap)) { + if (libxl_cpumap_alloc(ctx, &cpumap, 0)) { fprintf(stderr, "Failed to allocate cpumap\n"); goto out_cfg; } @@ -6289,7 +6291,7 @@ int main_cpupoolnumasplit(int argc, char return -ERROR_FAIL; } - if (libxl_cpumap_alloc(ctx, &cpumap)) { + if (libxl_cpumap_alloc(ctx, &cpumap, 0)) { fprintf(stderr, "Failed to allocate cpumap\n"); libxl_cputopology_list_free(topology, n_cpus); return -ERROR_FAIL; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvv-0004fK-4d; Wed, 04 Jul 2012 04:11:19 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvt-0004cu-Jx for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:17 +0000 Received: from [85.158.143.35:38261] by server-1.bemta-4.messagelabs.com id 16/BE-24392-462C3FF4; Wed, 04 Jul 2012 04:11:16 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-21.messagelabs.com!1341375074!14809995!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22918 invoked from network); 4 Jul 2012 04:11:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvq-0002hN-2m for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGvq-0003p7-1m for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:14 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:13 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xen, pod: Zero-check recently populated pages (checklast) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User George Dunlap # Date 1340893083 -3600 # Node ID 437b7cc52db7fb2d0c4adacc9bf9bad2979cf110 # Parent 0ff7269bbcedc22db1f48661dd52355081c19eaf xen,pod: Zero-check recently populated pages (checklast) When demand-populating pages due to guest accesses, check recently populated pages to see if we can reclaim them for the cache. This should keep the PoD cache filled when the start-of-day scrubber is going through. The number 128 was chosen by experiment. Windows does its page scrubbing in parallel; while a small nubmer like 4 works well for single VMs, it breaks down as multiple vcpus are scrubbing different pages in parallel. Increasing to 128 works well for higher numbers of vcpus. v2: - Wrapped some long lines - unsigned int for index, unsigned long for array v3: - Use PAGE_ORDER_2M instead of 9 - Removed inappropriate use of p2m_pod_zero_check_superpage() return value Signed-off-by: George Dunlap Acked-by: Tim Deegan Committed-by: Tim Deegan --- diff -r 0ff7269bbced -r 437b7cc52db7 xen/arch/x86/mm/p2m-pod.c --- a/xen/arch/x86/mm/p2m-pod.c Thu Jun 28 15:18:00 2012 +0100 +++ b/xen/arch/x86/mm/p2m-pod.c Thu Jun 28 15:18:03 2012 +0100 @@ -926,6 +926,27 @@ p2m_pod_emergency_sweep_super(struct p2m p2m->pod.reclaim_super = i ? i - SUPERPAGE_PAGES : 0; } +/* When populating a new superpage, look at recently populated superpages + * hoping that they've been zeroed. This will snap up zeroed pages as soon as + * the guest OS is done with them. */ +static void +p2m_pod_check_last_super(struct p2m_domain *p2m, unsigned long gfn_aligned) +{ + unsigned long check_gfn; + + ASSERT(p2m->pod.last_populated_index < POD_HISTORY_MAX); + + check_gfn = p2m->pod.last_populated[p2m->pod.last_populated_index]; + + p2m->pod.last_populated[p2m->pod.last_populated_index] = gfn_aligned; + + p2m->pod.last_populated_index = + ( p2m->pod.last_populated_index + 1 ) % POD_HISTORY_MAX; + + p2m_pod_zero_check_superpage(p2m, check_gfn); +} + + #define POD_SWEEP_STRIDE 16 static void p2m_pod_emergency_sweep(struct p2m_domain *p2m) @@ -1083,6 +1104,12 @@ p2m_pod_demand_populate(struct p2m_domai __trace_var(TRC_MEM_POD_POPULATE, 0, sizeof(t), &t); } + /* Check the last guest demand-populate */ + if ( p2m->pod.entry_count > p2m->pod.count + && (order == PAGE_ORDER_2M) + && (q & P2M_ALLOC) ) + p2m_pod_check_last_super(p2m, gfn_aligned); + pod_unlock(p2m); return 0; out_of_memory: diff -r 0ff7269bbced -r 437b7cc52db7 xen/include/asm-x86/p2m.h --- a/xen/include/asm-x86/p2m.h Thu Jun 28 15:18:00 2012 +0100 +++ b/xen/include/asm-x86/p2m.h Thu Jun 28 15:18:03 2012 +0100 @@ -287,6 +287,10 @@ struct p2m_domain { unsigned reclaim_super; /* Last gpfn of a scan */ unsigned reclaim_single; /* Last gpfn of a scan */ unsigned max_guest; /* gpfn of max guest demand-populate */ +#define POD_HISTORY_MAX 128 + /* gpfn of last guest superpage demand-populated */ + unsigned long last_populated[POD_HISTORY_MAX]; + unsigned int last_populated_index; mm_lock_t lock; /* Locking of private pod structs, * * not relying on the p2m lock. */ } pod; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvv-0004fK-4d; Wed, 04 Jul 2012 04:11:19 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvt-0004cu-Jx for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:17 +0000 Received: from [85.158.143.35:38261] by server-1.bemta-4.messagelabs.com id 16/BE-24392-462C3FF4; Wed, 04 Jul 2012 04:11:16 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-21.messagelabs.com!1341375074!14809995!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22918 invoked from network); 4 Jul 2012 04:11:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvq-0002hN-2m for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGvq-0003p7-1m for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:14 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:13 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xen, pod: Zero-check recently populated pages (checklast) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User George Dunlap # Date 1340893083 -3600 # Node ID 437b7cc52db7fb2d0c4adacc9bf9bad2979cf110 # Parent 0ff7269bbcedc22db1f48661dd52355081c19eaf xen,pod: Zero-check recently populated pages (checklast) When demand-populating pages due to guest accesses, check recently populated pages to see if we can reclaim them for the cache. This should keep the PoD cache filled when the start-of-day scrubber is going through. The number 128 was chosen by experiment. Windows does its page scrubbing in parallel; while a small nubmer like 4 works well for single VMs, it breaks down as multiple vcpus are scrubbing different pages in parallel. Increasing to 128 works well for higher numbers of vcpus. v2: - Wrapped some long lines - unsigned int for index, unsigned long for array v3: - Use PAGE_ORDER_2M instead of 9 - Removed inappropriate use of p2m_pod_zero_check_superpage() return value Signed-off-by: George Dunlap Acked-by: Tim Deegan Committed-by: Tim Deegan --- diff -r 0ff7269bbced -r 437b7cc52db7 xen/arch/x86/mm/p2m-pod.c --- a/xen/arch/x86/mm/p2m-pod.c Thu Jun 28 15:18:00 2012 +0100 +++ b/xen/arch/x86/mm/p2m-pod.c Thu Jun 28 15:18:03 2012 +0100 @@ -926,6 +926,27 @@ p2m_pod_emergency_sweep_super(struct p2m p2m->pod.reclaim_super = i ? i - SUPERPAGE_PAGES : 0; } +/* When populating a new superpage, look at recently populated superpages + * hoping that they've been zeroed. This will snap up zeroed pages as soon as + * the guest OS is done with them. */ +static void +p2m_pod_check_last_super(struct p2m_domain *p2m, unsigned long gfn_aligned) +{ + unsigned long check_gfn; + + ASSERT(p2m->pod.last_populated_index < POD_HISTORY_MAX); + + check_gfn = p2m->pod.last_populated[p2m->pod.last_populated_index]; + + p2m->pod.last_populated[p2m->pod.last_populated_index] = gfn_aligned; + + p2m->pod.last_populated_index = + ( p2m->pod.last_populated_index + 1 ) % POD_HISTORY_MAX; + + p2m_pod_zero_check_superpage(p2m, check_gfn); +} + + #define POD_SWEEP_STRIDE 16 static void p2m_pod_emergency_sweep(struct p2m_domain *p2m) @@ -1083,6 +1104,12 @@ p2m_pod_demand_populate(struct p2m_domai __trace_var(TRC_MEM_POD_POPULATE, 0, sizeof(t), &t); } + /* Check the last guest demand-populate */ + if ( p2m->pod.entry_count > p2m->pod.count + && (order == PAGE_ORDER_2M) + && (q & P2M_ALLOC) ) + p2m_pod_check_last_super(p2m, gfn_aligned); + pod_unlock(p2m); return 0; out_of_memory: diff -r 0ff7269bbced -r 437b7cc52db7 xen/include/asm-x86/p2m.h --- a/xen/include/asm-x86/p2m.h Thu Jun 28 15:18:00 2012 +0100 +++ b/xen/include/asm-x86/p2m.h Thu Jun 28 15:18:03 2012 +0100 @@ -287,6 +287,10 @@ struct p2m_domain { unsigned reclaim_super; /* Last gpfn of a scan */ unsigned reclaim_single; /* Last gpfn of a scan */ unsigned max_guest; /* gpfn of max guest demand-populate */ +#define POD_HISTORY_MAX 128 + /* gpfn of last guest superpage demand-populated */ + unsigned long last_populated[POD_HISTORY_MAX]; + unsigned int last_populated_index; mm_lock_t lock; /* Locking of private pod structs, * * not relying on the p2m lock. */ } pod; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:21 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11: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 1SmGvx-0004iR-1Z; Wed, 04 Jul 2012 04:11:21 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvu-0004dc-Mc for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:19 +0000 Received: from [85.158.138.51:39448] by server-5.bemta-3.messagelabs.com id BE/EA-01572-562C3FF4; Wed, 04 Jul 2012 04:11:17 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-174.messagelabs.com!1341375075!28004876!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28570 invoked from network); 4 Jul 2012 04:11:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvr-0002hW-PF for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGvr-0003pq-L4 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:15 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:15 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: allow setting more than 31 vcpus X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340902316 -3600 # Node ID 51d2daabd428dd1ab74beeb4a572f542653b1492 # Parent 0671657e0f3ad4f04dfa370ac64c5b38443e16fe libxl: allow setting more than 31 vcpus In current implementation, it uses integer to record current avail cpus and this only allows user to specify 31 vcpus. In following patch, it uses cpumap instead integer which make more sense than before. Also there is no limit to the max vcpus. Signed-off-by: Yang Zhang Acked-by: Ian Jackson Signed-off-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 0671657e0f3a -r 51d2daabd428 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Thu Jun 28 17:47:13 2012 +0100 +++ b/tools/libxl/libxl_create.c Thu Jun 28 17:51:56 2012 +0100 @@ -22,6 +22,7 @@ #include #include +#include void libxl_domain_config_init(libxl_domain_config *d_config) { @@ -201,8 +202,12 @@ int libxl__domain_build_info_setdefault( if (!b_info->max_vcpus) b_info->max_vcpus = 1; - if (!b_info->cur_vcpus) - b_info->cur_vcpus = 1; + if (!b_info->avail_vcpus.size) { + if (libxl_cpumap_alloc(CTX, &b_info->avail_vcpus, 1)) + return ERROR_FAIL; + libxl_cpumap_set(&b_info->avail_vcpus, 0); + } else if (b_info->avail_vcpus.size > HVM_MAX_VCPUS) + return ERROR_FAIL; if (!b_info->cpumap.size) { if (libxl_cpumap_alloc(CTX, &b_info->cpumap, 0)) diff -r 0671657e0f3a -r 51d2daabd428 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Thu Jun 28 17:47:13 2012 +0100 +++ b/tools/libxl/libxl_dm.c Thu Jun 28 17:51:56 2012 +0100 @@ -160,6 +160,8 @@ static char ** libxl__build_device_model } if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) { int ioemu_vifs = 0; + int nr_set_cpus = 0; + char *s; if (b_info->u.hvm.serial) { flexarray_vappend(dm_args, "-serial", b_info->u.hvm.serial, NULL); @@ -200,11 +202,13 @@ static char ** libxl__build_device_model libxl__sprintf(gc, "%d", b_info->max_vcpus), NULL); } - if (b_info->cur_vcpus) { - flexarray_vappend(dm_args, "-vcpu_avail", - libxl__sprintf(gc, "0x%x", b_info->cur_vcpus), - NULL); - } + + nr_set_cpus = libxl_cpumap_count_set(&b_info->avail_vcpus); + s = libxl_cpumap_to_hex_string(&b_info->avail_vcpus); + flexarray_vappend(dm_args, "-vcpu_avail", + libxl__sprintf(gc, "%s", s), NULL); + free(s); + for (i = 0; i < num_vifs; i++) { if (vifs[i].nictype == LIBXL_NIC_TYPE_IOEMU) { char *smac = libxl__sprintf(gc, @@ -443,11 +447,14 @@ static char ** libxl__build_device_model } if (b_info->max_vcpus > 1) { flexarray_append(dm_args, "-smp"); - if (b_info->cur_vcpus) + if (b_info->avail_vcpus.size) { + int nr_set_cpus = 0; + nr_set_cpus = libxl_cpumap_count_set(&b_info->avail_vcpus); + flexarray_append(dm_args, libxl__sprintf(gc, "%d,maxcpus=%d", b_info->max_vcpus, - b_info->cur_vcpus)); - else + nr_set_cpus)); + } else flexarray_append(dm_args, libxl__sprintf(gc, "%d", b_info->max_vcpus)); } diff -r 0671657e0f3a -r 51d2daabd428 tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Thu Jun 28 17:47:13 2012 +0100 +++ b/tools/libxl/libxl_dom.c Thu Jun 28 17:51:56 2012 +0100 @@ -199,8 +199,8 @@ int libxl__build_post(libxl__gc *gc, uin ents[11] = libxl__sprintf(gc, "%lu", state->store_mfn); for (i = 0; i < info->max_vcpus; i++) { ents[12+(i*2)] = libxl__sprintf(gc, "cpu/%d/availability", i); - ents[12+(i*2)+1] = (i && info->cur_vcpus && !(info->cur_vcpus & (1 << i))) - ? "offline" : "online"; + ents[12+(i*2)+1] = libxl_cpumap_test(&info->avail_vcpus, i) + ? "online" : "offline"; } hvm_ents = NULL; @@ -354,7 +354,7 @@ static int hvm_build_set_params(xc_inter va_hvm = (struct hvm_info_table *)(va_map + HVM_INFO_OFFSET); va_hvm->apic_mode = libxl_defbool_val(info->u.hvm.apic); va_hvm->nr_vcpus = info->max_vcpus; - memcpy(va_hvm->vcpu_online, &info->cur_vcpus, sizeof(info->cur_vcpus)); + memcpy(va_hvm->vcpu_online, info->avail_vcpus.map, info->avail_vcpus.size); for (i = 0, sum = 0; i < va_hvm->length; i++) sum += ((uint8_t *) va_hvm)[i]; va_hvm->checksum -= sum; diff -r 0671657e0f3a -r 51d2daabd428 tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Thu Jun 28 17:47:13 2012 +0100 +++ b/tools/libxl/libxl_types.idl Thu Jun 28 17:51:56 2012 +0100 @@ -237,7 +237,7 @@ libxl_domain_sched_params = Struct("doma libxl_domain_build_info = Struct("domain_build_info",[ ("max_vcpus", integer), - ("cur_vcpus", integer), + ("avail_vcpus", libxl_cpumap), ("cpumap", libxl_cpumap), ("tsc_mode", libxl_tsc_mode), ("max_memkb", MemKB), diff -r 0671657e0f3a -r 51d2daabd428 tools/libxl/libxl_utils.c --- a/tools/libxl/libxl_utils.c Thu Jun 28 17:47:13 2012 +0100 +++ b/tools/libxl/libxl_utils.c Thu Jun 28 17:51:56 2012 +0100 @@ -511,7 +511,7 @@ void libxl_cpumap_dispose(libxl_cpumap * free(map->map); } -int libxl_cpumap_test(libxl_cpumap *cpumap, int cpu) +int libxl_cpumap_test(const libxl_cpumap *cpumap, int cpu) { if (cpu >= cpumap->size * 8) return 0; @@ -532,6 +532,31 @@ void libxl_cpumap_reset(libxl_cpumap *cp cpumap->map[cpu / 8] &= ~(1 << (cpu & 7)); } +int libxl_cpumap_count_set(const libxl_cpumap *cpumap) +{ + int i, nr_set_cpus = 0; + libxl_for_each_set_cpu(i, *cpumap) + nr_set_cpus++; + + return nr_set_cpus; +} + +/* NB. caller is responsible for freeing the memory */ +char *libxl_cpumap_to_hex_string(const libxl_cpumap *cpumap) +{ + int i = cpumap->size; + char *p = libxl__zalloc(NULL, cpumap->size * 2 + 3); + char *q = p; + strncpy(p, "0x", 2); + p += 2; + while(--i >= 0) { + sprintf(p, "%02x", cpumap->map[i]); + p += 2; + } + *p = '\0'; + return q; +} + int libxl_get_max_cpus(libxl_ctx *ctx) { return xc_get_max_cpus(ctx->xch); diff -r 0671657e0f3a -r 51d2daabd428 tools/libxl/libxl_utils.h --- a/tools/libxl/libxl_utils.h Thu Jun 28 17:47:13 2012 +0100 +++ b/tools/libxl/libxl_utils.h Thu Jun 28 17:51:56 2012 +0100 @@ -64,9 +64,11 @@ int libxl_vdev_to_device_disk(libxl_ctx libxl_device_disk *disk); int libxl_cpumap_alloc(libxl_ctx *ctx, libxl_cpumap *cpumap, int max_cpus); -int libxl_cpumap_test(libxl_cpumap *cpumap, int cpu); +int libxl_cpumap_test(const libxl_cpumap *cpumap, int cpu); void libxl_cpumap_set(libxl_cpumap *cpumap, int cpu); void libxl_cpumap_reset(libxl_cpumap *cpumap, int cpu); +int libxl_cpumap_count_set(const libxl_cpumap *cpumap); +char *libxl_cpumap_to_hex_string(const libxl_cpumap *cpumap); static inline void libxl_cpumap_set_any(libxl_cpumap *cpumap) { memset(cpumap->map, -1, cpumap->size); diff -r 0671657e0f3a -r 51d2daabd428 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Thu Jun 28 17:47:13 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Thu Jun 28 17:51:56 2012 +0100 @@ -647,7 +647,14 @@ static void parse_config_data(const char if (!xlu_cfg_get_long (config, "vcpus", &l, 0)) { b_info->max_vcpus = l; - b_info->cur_vcpus = (1 << l) - 1; + + if (libxl_cpumap_alloc(ctx, &b_info->avail_vcpus, l)) { + fprintf(stderr, "Unable to allocate cpumap\n"); + exit(1); + } + libxl_cpumap_set_none(&b_info->avail_vcpus); + while (l-- > 0) + libxl_cpumap_set((&b_info->avail_vcpus), l); } if (!xlu_cfg_get_long (config, "maxvcpus", &l, 0)) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:21 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11: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 1SmGvx-0004iR-1Z; Wed, 04 Jul 2012 04:11:21 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvu-0004dc-Mc for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:19 +0000 Received: from [85.158.138.51:39448] by server-5.bemta-3.messagelabs.com id BE/EA-01572-562C3FF4; Wed, 04 Jul 2012 04:11:17 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-174.messagelabs.com!1341375075!28004876!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28570 invoked from network); 4 Jul 2012 04:11:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvr-0002hW-PF for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGvr-0003pq-L4 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:15 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:15 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: allow setting more than 31 vcpus X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340902316 -3600 # Node ID 51d2daabd428dd1ab74beeb4a572f542653b1492 # Parent 0671657e0f3ad4f04dfa370ac64c5b38443e16fe libxl: allow setting more than 31 vcpus In current implementation, it uses integer to record current avail cpus and this only allows user to specify 31 vcpus. In following patch, it uses cpumap instead integer which make more sense than before. Also there is no limit to the max vcpus. Signed-off-by: Yang Zhang Acked-by: Ian Jackson Signed-off-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 0671657e0f3a -r 51d2daabd428 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Thu Jun 28 17:47:13 2012 +0100 +++ b/tools/libxl/libxl_create.c Thu Jun 28 17:51:56 2012 +0100 @@ -22,6 +22,7 @@ #include #include +#include void libxl_domain_config_init(libxl_domain_config *d_config) { @@ -201,8 +202,12 @@ int libxl__domain_build_info_setdefault( if (!b_info->max_vcpus) b_info->max_vcpus = 1; - if (!b_info->cur_vcpus) - b_info->cur_vcpus = 1; + if (!b_info->avail_vcpus.size) { + if (libxl_cpumap_alloc(CTX, &b_info->avail_vcpus, 1)) + return ERROR_FAIL; + libxl_cpumap_set(&b_info->avail_vcpus, 0); + } else if (b_info->avail_vcpus.size > HVM_MAX_VCPUS) + return ERROR_FAIL; if (!b_info->cpumap.size) { if (libxl_cpumap_alloc(CTX, &b_info->cpumap, 0)) diff -r 0671657e0f3a -r 51d2daabd428 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Thu Jun 28 17:47:13 2012 +0100 +++ b/tools/libxl/libxl_dm.c Thu Jun 28 17:51:56 2012 +0100 @@ -160,6 +160,8 @@ static char ** libxl__build_device_model } if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) { int ioemu_vifs = 0; + int nr_set_cpus = 0; + char *s; if (b_info->u.hvm.serial) { flexarray_vappend(dm_args, "-serial", b_info->u.hvm.serial, NULL); @@ -200,11 +202,13 @@ static char ** libxl__build_device_model libxl__sprintf(gc, "%d", b_info->max_vcpus), NULL); } - if (b_info->cur_vcpus) { - flexarray_vappend(dm_args, "-vcpu_avail", - libxl__sprintf(gc, "0x%x", b_info->cur_vcpus), - NULL); - } + + nr_set_cpus = libxl_cpumap_count_set(&b_info->avail_vcpus); + s = libxl_cpumap_to_hex_string(&b_info->avail_vcpus); + flexarray_vappend(dm_args, "-vcpu_avail", + libxl__sprintf(gc, "%s", s), NULL); + free(s); + for (i = 0; i < num_vifs; i++) { if (vifs[i].nictype == LIBXL_NIC_TYPE_IOEMU) { char *smac = libxl__sprintf(gc, @@ -443,11 +447,14 @@ static char ** libxl__build_device_model } if (b_info->max_vcpus > 1) { flexarray_append(dm_args, "-smp"); - if (b_info->cur_vcpus) + if (b_info->avail_vcpus.size) { + int nr_set_cpus = 0; + nr_set_cpus = libxl_cpumap_count_set(&b_info->avail_vcpus); + flexarray_append(dm_args, libxl__sprintf(gc, "%d,maxcpus=%d", b_info->max_vcpus, - b_info->cur_vcpus)); - else + nr_set_cpus)); + } else flexarray_append(dm_args, libxl__sprintf(gc, "%d", b_info->max_vcpus)); } diff -r 0671657e0f3a -r 51d2daabd428 tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Thu Jun 28 17:47:13 2012 +0100 +++ b/tools/libxl/libxl_dom.c Thu Jun 28 17:51:56 2012 +0100 @@ -199,8 +199,8 @@ int libxl__build_post(libxl__gc *gc, uin ents[11] = libxl__sprintf(gc, "%lu", state->store_mfn); for (i = 0; i < info->max_vcpus; i++) { ents[12+(i*2)] = libxl__sprintf(gc, "cpu/%d/availability", i); - ents[12+(i*2)+1] = (i && info->cur_vcpus && !(info->cur_vcpus & (1 << i))) - ? "offline" : "online"; + ents[12+(i*2)+1] = libxl_cpumap_test(&info->avail_vcpus, i) + ? "online" : "offline"; } hvm_ents = NULL; @@ -354,7 +354,7 @@ static int hvm_build_set_params(xc_inter va_hvm = (struct hvm_info_table *)(va_map + HVM_INFO_OFFSET); va_hvm->apic_mode = libxl_defbool_val(info->u.hvm.apic); va_hvm->nr_vcpus = info->max_vcpus; - memcpy(va_hvm->vcpu_online, &info->cur_vcpus, sizeof(info->cur_vcpus)); + memcpy(va_hvm->vcpu_online, info->avail_vcpus.map, info->avail_vcpus.size); for (i = 0, sum = 0; i < va_hvm->length; i++) sum += ((uint8_t *) va_hvm)[i]; va_hvm->checksum -= sum; diff -r 0671657e0f3a -r 51d2daabd428 tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Thu Jun 28 17:47:13 2012 +0100 +++ b/tools/libxl/libxl_types.idl Thu Jun 28 17:51:56 2012 +0100 @@ -237,7 +237,7 @@ libxl_domain_sched_params = Struct("doma libxl_domain_build_info = Struct("domain_build_info",[ ("max_vcpus", integer), - ("cur_vcpus", integer), + ("avail_vcpus", libxl_cpumap), ("cpumap", libxl_cpumap), ("tsc_mode", libxl_tsc_mode), ("max_memkb", MemKB), diff -r 0671657e0f3a -r 51d2daabd428 tools/libxl/libxl_utils.c --- a/tools/libxl/libxl_utils.c Thu Jun 28 17:47:13 2012 +0100 +++ b/tools/libxl/libxl_utils.c Thu Jun 28 17:51:56 2012 +0100 @@ -511,7 +511,7 @@ void libxl_cpumap_dispose(libxl_cpumap * free(map->map); } -int libxl_cpumap_test(libxl_cpumap *cpumap, int cpu) +int libxl_cpumap_test(const libxl_cpumap *cpumap, int cpu) { if (cpu >= cpumap->size * 8) return 0; @@ -532,6 +532,31 @@ void libxl_cpumap_reset(libxl_cpumap *cp cpumap->map[cpu / 8] &= ~(1 << (cpu & 7)); } +int libxl_cpumap_count_set(const libxl_cpumap *cpumap) +{ + int i, nr_set_cpus = 0; + libxl_for_each_set_cpu(i, *cpumap) + nr_set_cpus++; + + return nr_set_cpus; +} + +/* NB. caller is responsible for freeing the memory */ +char *libxl_cpumap_to_hex_string(const libxl_cpumap *cpumap) +{ + int i = cpumap->size; + char *p = libxl__zalloc(NULL, cpumap->size * 2 + 3); + char *q = p; + strncpy(p, "0x", 2); + p += 2; + while(--i >= 0) { + sprintf(p, "%02x", cpumap->map[i]); + p += 2; + } + *p = '\0'; + return q; +} + int libxl_get_max_cpus(libxl_ctx *ctx) { return xc_get_max_cpus(ctx->xch); diff -r 0671657e0f3a -r 51d2daabd428 tools/libxl/libxl_utils.h --- a/tools/libxl/libxl_utils.h Thu Jun 28 17:47:13 2012 +0100 +++ b/tools/libxl/libxl_utils.h Thu Jun 28 17:51:56 2012 +0100 @@ -64,9 +64,11 @@ int libxl_vdev_to_device_disk(libxl_ctx libxl_device_disk *disk); int libxl_cpumap_alloc(libxl_ctx *ctx, libxl_cpumap *cpumap, int max_cpus); -int libxl_cpumap_test(libxl_cpumap *cpumap, int cpu); +int libxl_cpumap_test(const libxl_cpumap *cpumap, int cpu); void libxl_cpumap_set(libxl_cpumap *cpumap, int cpu); void libxl_cpumap_reset(libxl_cpumap *cpumap, int cpu); +int libxl_cpumap_count_set(const libxl_cpumap *cpumap); +char *libxl_cpumap_to_hex_string(const libxl_cpumap *cpumap); static inline void libxl_cpumap_set_any(libxl_cpumap *cpumap) { memset(cpumap->map, -1, cpumap->size); diff -r 0671657e0f3a -r 51d2daabd428 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Thu Jun 28 17:47:13 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Thu Jun 28 17:51:56 2012 +0100 @@ -647,7 +647,14 @@ static void parse_config_data(const char if (!xlu_cfg_get_long (config, "vcpus", &l, 0)) { b_info->max_vcpus = l; - b_info->cur_vcpus = (1 << l) - 1; + + if (libxl_cpumap_alloc(ctx, &b_info->avail_vcpus, l)) { + fprintf(stderr, "Unable to allocate cpumap\n"); + exit(1); + } + libxl_cpumap_set_none(&b_info->avail_vcpus); + while (l-- > 0) + libxl_cpumap_set((&b_info->avail_vcpus), l); } if (!xlu_cfg_get_long (config, "maxvcpus", &l, 0)) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:22 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11: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 1SmGvw-0004i4-TB; Wed, 04 Jul 2012 04:11:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvv-0004dj-47 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:19 +0000 Received: from [85.158.138.51:39468] by server-6.bemta-3.messagelabs.com id 3F/29-11602-662C3FF4; Wed, 04 Jul 2012 04:11:18 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-174.messagelabs.com!1341375076!30872558!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25964 invoked from network); 4 Jul 2012 04:11:17 -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; 4 Jul 2012 04:11:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvs-0002hZ-6X for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGvs-0003q5-5O for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:16 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:15 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxc: xc_domain_restore, make toolstack_restore const-correct X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1340905399 -3600 # Node ID b366b34bc159560e4bd8c12eeb3717b5dcb5fe9a # Parent 51d2daabd428dd1ab74beeb4a572f542653b1492 libxc: xc_domain_restore, make toolstack_restore const-correct Update the one provider of this callback, in libxl. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- diff -r 51d2daabd428 -r b366b34bc159 tools/libxc/xenguest.h --- a/tools/libxc/xenguest.h Thu Jun 28 17:51:56 2012 +0100 +++ b/tools/libxc/xenguest.h Thu Jun 28 18:43:19 2012 +0100 @@ -92,7 +92,7 @@ int xc_domain_save(xc_interface *xch, in /* callbacks provided by xc_domain_restore */ struct restore_callbacks { /* callback to restore toolstack specific data */ - int (*toolstack_restore)(uint32_t domid, uint8_t *buf, + int (*toolstack_restore)(uint32_t domid, const uint8_t *buf, uint32_t size, void* data); /* to be provided as the last argument to each callback function */ diff -r 51d2daabd428 -r b366b34bc159 tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Thu Jun 28 17:51:56 2012 +0100 +++ b/tools/libxl/libxl_dom.c Thu Jun 28 18:43:19 2012 +0100 @@ -469,13 +469,13 @@ static inline char *restore_helper(libxl domid, phys_offset, node); } -static int libxl__toolstack_restore(uint32_t domid, uint8_t *buf, +static int libxl__toolstack_restore(uint32_t domid, const uint8_t *buf, uint32_t size, void *data) { libxl__gc *gc = (libxl__gc *) data; libxl_ctx *ctx = gc->owner; int i, ret; - uint8_t *ptr = buf; + const uint8_t *ptr = buf; uint32_t count = 0, version = 0; struct libxl__physmap_info* pi; char *xs_path; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:22 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11: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 1SmGvw-0004i4-TB; Wed, 04 Jul 2012 04:11:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvv-0004dj-47 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:19 +0000 Received: from [85.158.138.51:39468] by server-6.bemta-3.messagelabs.com id 3F/29-11602-662C3FF4; Wed, 04 Jul 2012 04:11:18 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-174.messagelabs.com!1341375076!30872558!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25964 invoked from network); 4 Jul 2012 04:11:17 -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; 4 Jul 2012 04:11:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvs-0002hZ-6X for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGvs-0003q5-5O for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:16 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:15 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxc: xc_domain_restore, make toolstack_restore const-correct X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1340905399 -3600 # Node ID b366b34bc159560e4bd8c12eeb3717b5dcb5fe9a # Parent 51d2daabd428dd1ab74beeb4a572f542653b1492 libxc: xc_domain_restore, make toolstack_restore const-correct Update the one provider of this callback, in libxl. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- diff -r 51d2daabd428 -r b366b34bc159 tools/libxc/xenguest.h --- a/tools/libxc/xenguest.h Thu Jun 28 17:51:56 2012 +0100 +++ b/tools/libxc/xenguest.h Thu Jun 28 18:43:19 2012 +0100 @@ -92,7 +92,7 @@ int xc_domain_save(xc_interface *xch, in /* callbacks provided by xc_domain_restore */ struct restore_callbacks { /* callback to restore toolstack specific data */ - int (*toolstack_restore)(uint32_t domid, uint8_t *buf, + int (*toolstack_restore)(uint32_t domid, const uint8_t *buf, uint32_t size, void* data); /* to be provided as the last argument to each callback function */ diff -r 51d2daabd428 -r b366b34bc159 tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Thu Jun 28 17:51:56 2012 +0100 +++ b/tools/libxl/libxl_dom.c Thu Jun 28 18:43:19 2012 +0100 @@ -469,13 +469,13 @@ static inline char *restore_helper(libxl domid, phys_offset, node); } -static int libxl__toolstack_restore(uint32_t domid, uint8_t *buf, +static int libxl__toolstack_restore(uint32_t domid, const uint8_t *buf, uint32_t size, void *data) { libxl__gc *gc = (libxl__gc *) data; libxl_ctx *ctx = gc->owner; int i, ret; - uint8_t *ptr = buf; + const uint8_t *ptr = buf; uint32_t count = 0, version = 0; struct libxl__physmap_info* pi; char *xs_path; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:24 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvz-0004kE-4n; Wed, 04 Jul 2012 04:11:23 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvx-0004hd-61 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:21 +0000 Received: from [85.158.139.83:46481] by server-2.bemta-5.messagelabs.com id D2/6C-04598-862C3FF4; Wed, 04 Jul 2012 04:11:20 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-182.messagelabs.com!1341375077!23496364!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1258 invoked from network); 4 Jul 2012 04:11:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvt-0002hf-7N for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGvt-0003qZ-6L for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:17 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:16 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: domain save: rename variables etc. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340905400 -3600 # Node ID 54e1337048dce53f4b3f014c51d248e6abf615de # Parent a31a5064552a8762a0dec25307dd4dd46992abeb libxl: domain save: rename variables etc. Preparatory work for making domain suspend asynchronous: * Rename `struct suspendinfo' to `libxl__domain_suspend_state' and move it to libxl_internal.h. * Rename variables `si' to `dss'. * Change the stack-allocated state and callbacks from struct suspendinfo si; struct save_callbacks callbacks; struct restore_callbacks callbacks; to libxl__domain_suspend_state dss[1]; struct save_callbacks callbacks[1]; struct restore_callbacks callbacks[1]; so that it may be referred to as a pointer variable everywhere. * Rename the variable `flags' (in libxl__domain_suspend_state) to `xcflags', to help distinguish it from the other `flags' which is passed in from the calling application in libxl_domain_suspend_info. Abolish the local variable in libxl__domain_suspend_common, as it can use the one in the dss. * Move the prototypes of suspend-related functions in libxl_internal.h to after the definition of the state struct. * Replace several ctx variables with gc variables and consequently references to ctx with CTX. Change references to `dss->gc' in the functional code to simply `gc'. * Use LOG* rather than LIBXL__LOG* in a number of places. * In libxl__domain_save_device_model use `rc' instead of `ret'. * Introduce and use `gc' and `domid' in libxl__domain_suspend_common_callback. * Wrap some long lines. * Add an extra pair of parens for clarity in a flag test. * Remove two pointless casts from void* to a struct*. No functional change whatsoever. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- diff -r a31a5064552a -r 54e1337048dc tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Thu Jun 28 18:43:19 2012 +0100 +++ b/tools/libxl/libxl_dom.c Thu Jun 28 18:43:20 2012 +0100 @@ -472,7 +472,7 @@ static inline char *restore_helper(libxl static int libxl__toolstack_restore(uint32_t domid, const uint8_t *buf, uint32_t size, void *data) { - libxl__gc *gc = (libxl__gc *) data; + libxl__gc *gc = data; libxl_ctx *ctx = gc->owner; int i, ret; const uint8_t *ptr = buf; @@ -533,7 +533,7 @@ int libxl__domain_restore_common(libxl__ /* read signature */ int rc; int hvm, pae, superpages; - struct restore_callbacks callbacks; + struct restore_callbacks callbacks[1]; int no_incr_generationid; switch (info->type) { case LIBXL_DOMAIN_TYPE_HVM: @@ -541,8 +541,8 @@ int libxl__domain_restore_common(libxl__ superpages = 1; pae = libxl_defbool_val(info->u.hvm.pae); no_incr_generationid = !libxl_defbool_val(info->u.hvm.incr_generationid); - callbacks.toolstack_restore = libxl__toolstack_restore; - callbacks.data = gc; + callbacks->toolstack_restore = libxl__toolstack_restore; + callbacks->data = gc; break; case LIBXL_DOMAIN_TYPE_PV: hvm = 0; @@ -558,7 +558,7 @@ int libxl__domain_restore_common(libxl__ state->store_domid, state->console_port, &state->console_mfn, state->console_domid, hvm, pae, superpages, no_incr_generationid, - &state->vm_generationid_addr, &callbacks); + &state->vm_generationid_addr, callbacks); if ( rc ) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "restoring domain"); return ERROR_FAIL; @@ -566,33 +566,23 @@ int libxl__domain_restore_common(libxl__ return 0; } -struct suspendinfo { - libxl__gc *gc; - xc_evtchn *xce; /* event channel handle */ - int suspend_eventchn; - int domid; - int hvm; - unsigned int flags; - int guest_responded; - int save_fd; /* Migration stream fd (for Remus) */ - int interval; /* checkpoint interval (for Remus) */ -}; - -static int libxl__domain_suspend_common_switch_qemu_logdirty(int domid, unsigned int enable, void *data) +static int libxl__domain_suspend_common_switch_qemu_logdirty + (int domid, unsigned int enable, void *data) { - struct suspendinfo *si = data; - libxl_ctx *ctx = libxl__gc_owner(si->gc); + libxl__domain_suspend_state *dss = data; + libxl__gc *gc = dss->gc; char *path; bool rc; - path = libxl__sprintf(si->gc, "/local/domain/0/device-model/%u/logdirty/cmd", domid); + path = libxl__sprintf(gc, + "/local/domain/0/device-model/%u/logdirty/cmd", domid); if (!path) return 1; if (enable) - rc = xs_write(ctx->xsh, XBT_NULL, path, "enable", strlen("enable")); + rc = xs_write(CTX->xsh, XBT_NULL, path, "enable", strlen("enable")); else - rc = xs_write(ctx->xsh, XBT_NULL, path, "disable", strlen("disable")); + rc = xs_write(CTX->xsh, XBT_NULL, path, "disable", strlen("disable")); return rc ? 0 : 1; } @@ -647,53 +637,56 @@ int libxl__domain_resume_device_model(li static int libxl__domain_suspend_common_callback(void *data) { - struct suspendinfo *si = data; + libxl__domain_suspend_state *dss = data; + libxl__gc *gc = dss->gc; unsigned long hvm_s_state = 0, hvm_pvdrv = 0; int ret; char *state = "suspend"; int watchdog; - libxl_ctx *ctx = libxl__gc_owner(si->gc); xs_transaction_t t; - if (si->hvm) { - xc_get_hvm_param(ctx->xch, si->domid, HVM_PARAM_CALLBACK_IRQ, &hvm_pvdrv); - xc_get_hvm_param(ctx->xch, si->domid, HVM_PARAM_ACPI_S_STATE, &hvm_s_state); + /* Convenience aliases */ + const uint32_t domid = dss->domid; + + if (dss->hvm) { + xc_get_hvm_param(CTX->xch, domid, HVM_PARAM_CALLBACK_IRQ, &hvm_pvdrv); + xc_get_hvm_param(CTX->xch, domid, HVM_PARAM_ACPI_S_STATE, &hvm_s_state); } - if ((hvm_s_state == 0) && (si->suspend_eventchn >= 0)) { - LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "issuing %s suspend request via event channel", - si->hvm ? "PVHVM" : "PV"); - ret = xc_evtchn_notify(si->xce, si->suspend_eventchn); + if ((hvm_s_state == 0) && (dss->suspend_eventchn >= 0)) { + LOG(DEBUG, "issuing %s suspend request via event channel", + dss->hvm ? "PVHVM" : "PV"); + ret = xc_evtchn_notify(dss->xce, dss->suspend_eventchn); if (ret < 0) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "xc_evtchn_notify failed ret=%d", ret); + LOG(ERROR, "xc_evtchn_notify failed ret=%d", ret); return 0; } - ret = xc_await_suspend(ctx->xch, si->xce, si->suspend_eventchn); + ret = xc_await_suspend(CTX->xch, dss->xce, dss->suspend_eventchn); if (ret < 0) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "xc_await_suspend failed ret=%d", ret); + LOG(ERROR, "xc_await_suspend failed ret=%d", ret); return 0; } - si->guest_responded = 1; + dss->guest_responded = 1; goto guest_suspended; } - if (si->hvm && (!hvm_pvdrv || hvm_s_state)) { - LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "Calling xc_domain_shutdown on HVM domain"); - xc_domain_shutdown(ctx->xch, si->domid, SHUTDOWN_suspend); + if (dss->hvm && (!hvm_pvdrv || hvm_s_state)) { + LOG(DEBUG, "Calling xc_domain_shutdown on HVM domain"); + xc_domain_shutdown(CTX->xch, domid, SHUTDOWN_suspend); /* The guest does not (need to) respond to this sort of request. */ - si->guest_responded = 1; + dss->guest_responded = 1; } else { - LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "issuing %s suspend request via XenBus control node", - si->hvm ? "PVHVM" : "PV"); + LOG(DEBUG, "issuing %s suspend request via XenBus control node", + dss->hvm ? "PVHVM" : "PV"); - libxl__domain_pvcontrol_write(si->gc, XBT_NULL, si->domid, "suspend"); + libxl__domain_pvcontrol_write(gc, XBT_NULL, domid, "suspend"); - LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "wait for the guest to acknowledge suspend request"); + LOG(DEBUG, "wait for the guest to acknowledge suspend request"); watchdog = 60; while (!strcmp(state, "suspend") && watchdog > 0) { usleep(100000); - state = libxl__domain_pvcontrol_read(si->gc, XBT_NULL, si->domid); + state = libxl__domain_pvcontrol_read(gc, XBT_NULL, domid); if (!state) state = ""; watchdog--; @@ -709,17 +702,17 @@ static int libxl__domain_suspend_common_ * at the last minute. */ if (!strcmp(state, "suspend")) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "guest didn't acknowledge suspend, cancelling request"); + LOG(ERROR, "guest didn't acknowledge suspend, cancelling request"); retry_transaction: - t = xs_transaction_start(ctx->xsh); + t = xs_transaction_start(CTX->xsh); - state = libxl__domain_pvcontrol_read(si->gc, t, si->domid); + state = libxl__domain_pvcontrol_read(gc, t, domid); if (!state) state = ""; if (!strcmp(state, "suspend")) - libxl__domain_pvcontrol_write(si->gc, t, si->domid, ""); + libxl__domain_pvcontrol_write(gc, t, domid, ""); - if (!xs_transaction_end(ctx->xsh, t, 0)) + if (!xs_transaction_end(CTX->xsh, t, 0)) if (errno == EAGAIN) goto retry_transaction; @@ -731,27 +724,29 @@ static int libxl__domain_suspend_common_ * case we lost the race while cancelling and should continue. */ if (!strcmp(state, "suspend")) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "guest didn't acknowledge suspend, request cancelled"); + LOG(ERROR, "guest didn't acknowledge suspend, request cancelled"); return 0; } - LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "guest acknowledged suspend request"); - si->guest_responded = 1; + LOG(DEBUG, "guest acknowledged suspend request"); + dss->guest_responded = 1; } - LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "wait for the guest to suspend"); + LOG(DEBUG, "wait for the guest to suspend"); watchdog = 60; while (watchdog > 0) { xc_domaininfo_t info; usleep(100000); - ret = xc_domain_getinfolist(ctx->xch, si->domid, 1, &info); - if (ret == 1 && info.domain == si->domid && info.flags & XEN_DOMINF_shutdown) { + ret = xc_domain_getinfolist(CTX->xch, domid, 1, &info); + if (ret == 1 && info.domain == domid && + (info.flags & XEN_DOMINF_shutdown)) { int shutdown_reason; - shutdown_reason = (info.flags >> XEN_DOMINF_shutdownshift) & XEN_DOMINF_shutdownmask; + shutdown_reason = (info.flags >> XEN_DOMINF_shutdownshift) + & XEN_DOMINF_shutdownmask; if (shutdown_reason == SHUTDOWN_suspend) { - LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "guest has suspended"); + LOG(DEBUG, "guest has suspended"); goto guest_suspended; } } @@ -759,15 +754,14 @@ static int libxl__domain_suspend_common_ watchdog--; } - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "guest did not suspend"); + LOG(ERROR, "guest did not suspend"); return 0; guest_suspended: - if (si->hvm) { - ret = libxl__domain_suspend_device_model(si->gc, si->domid); + if (dss->hvm) { + ret = libxl__domain_suspend_device_model(dss->gc, dss->domid); if (ret) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, - "libxl__domain_suspend_device_model failed ret=%d", ret); + LOG(ERROR, "libxl__domain_suspend_device_model failed ret=%d", ret); return 0; } } @@ -785,9 +779,8 @@ static inline char *save_helper(libxl__g static int libxl__toolstack_save(uint32_t domid, uint8_t **buf, uint32_t *len, void *data) { - struct suspendinfo *si = (struct suspendinfo *) data; - libxl__gc *gc = (libxl__gc *) si->gc; - libxl_ctx *ctx = gc->owner; + libxl__domain_suspend_state *dss = data; + libxl__gc *gc = dss->gc; int i = 0; char *start_addr = NULL, *size = NULL, *phys_offset = NULL, *name = NULL; unsigned int num = 0; @@ -816,21 +809,21 @@ static int libxl__toolstack_save(uint32_ char *xs_path; phys_offset = entries[i]; if (phys_offset == NULL) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "phys_offset %d is NULL", i); + LOG(ERROR, "phys_offset %d is NULL", i); return -1; } xs_path = save_helper(gc, domid, phys_offset, "start_addr"); start_addr = libxl__xs_read(gc, 0, xs_path); if (start_addr == NULL) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "%s is NULL", xs_path); + LOG(ERROR, "%s is NULL", xs_path); return -1; } xs_path = save_helper(gc, domid, phys_offset, "size"); size = libxl__xs_read(gc, 0, xs_path); if (size == NULL) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "%s is NULL", xs_path); + LOG(ERROR, "%s is NULL", xs_path); return -1; } @@ -866,11 +859,11 @@ static int libxl__remus_domain_suspend_c static int libxl__remus_domain_resume_callback(void *data) { - struct suspendinfo *si = data; - libxl_ctx *ctx = libxl__gc_owner(si->gc); + libxl__domain_suspend_state *dss = data; + libxl__gc *gc = dss->gc; /* Resumes the domain and the device model */ - if (libxl_domain_resume(ctx, si->domid, /* Fast Suspend */1)) + if (libxl_domain_resume(CTX, dss->domid, /* Fast Suspend */1)) return 0; /* TODO: Deal with disk. Start a new network output buffer */ @@ -879,15 +872,15 @@ static int libxl__remus_domain_resume_ca static int libxl__remus_domain_checkpoint_callback(void *data) { - struct suspendinfo *si = data; + libxl__domain_suspend_state *dss = data; /* This would go into tailbuf. */ - if (si->hvm && - libxl__domain_save_device_model(si->gc, si->domid, si->save_fd)) + if (dss->hvm && + libxl__domain_save_device_model(dss->gc, dss->domid, dss->save_fd)) return 0; /* TODO: Wait for disk and memory ack, release network buffer */ - usleep(si->interval * 1000); + usleep(dss->interval * 1000); return 1; } @@ -896,12 +889,10 @@ int libxl__domain_suspend_common(libxl__ int live, int debug, const libxl_domain_remus_info *r_info) { - libxl_ctx *ctx = libxl__gc_owner(gc); - int flags; int port; - struct save_callbacks callbacks; - struct suspendinfo si; - int hvm, rc = ERROR_FAIL; + struct save_callbacks callbacks[1]; + libxl__domain_suspend_state dss[1]; + int rc = ERROR_FAIL; unsigned long vm_generationid_addr; switch (type) { @@ -914,82 +905,81 @@ int libxl__domain_suspend_common(libxl__ addr = libxl__xs_read(gc, XBT_NULL, path); vm_generationid_addr = (addr) ? strtoul(addr, NULL, 0) : 0; - hvm = 1; + dss->hvm = 1; break; } case LIBXL_DOMAIN_TYPE_PV: vm_generationid_addr = 0; - hvm = 0; + dss->hvm = 0; break; default: return ERROR_INVAL; } - memset(&si, 0, sizeof(si)); - flags = (live) ? XCFLAGS_LIVE : 0 + dss->xcflags = (live) ? XCFLAGS_LIVE : 0 | (debug) ? XCFLAGS_DEBUG : 0 - | (hvm) ? XCFLAGS_HVM : 0; + | (dss->hvm) ? XCFLAGS_HVM : 0; + + dss->domid = domid; + dss->gc = gc; + dss->suspend_eventchn = -1; + dss->guest_responded = 0; if (r_info != NULL) { - si.interval = r_info->interval; + dss->interval = r_info->interval; if (r_info->compression) - flags |= XCFLAGS_CHECKPOINT_COMPRESS; - si.save_fd = fd; + dss->xcflags |= XCFLAGS_CHECKPOINT_COMPRESS; + dss->save_fd = fd; } else - si.save_fd = -1; + dss->save_fd = -1; - si.domid = domid; - si.flags = flags; - si.hvm = hvm; - si.gc = gc; - si.suspend_eventchn = -1; - si.guest_responded = 0; - - si.xce = xc_evtchn_open(NULL, 0); - if (si.xce == NULL) + dss->xce = xc_evtchn_open(NULL, 0); + if (dss->xce == NULL) goto out; else { - port = xs_suspend_evtchn_port(si.domid); + port = xs_suspend_evtchn_port(dss->domid); if (port >= 0) { - si.suspend_eventchn = xc_suspend_evtchn_init(ctx->xch, si.xce, si.domid, port); + dss->suspend_eventchn = + xc_suspend_evtchn_init(CTX->xch, dss->xce, dss->domid, port); - if (si.suspend_eventchn < 0) - LIBXL__LOG(ctx, LIBXL__LOG_WARNING, "Suspend event channel initialization failed"); + if (dss->suspend_eventchn < 0) + LOG(WARN, "Suspend event channel initialization failed"); } } - memset(&callbacks, 0, sizeof(callbacks)); + memset(callbacks, 0, sizeof(*callbacks)); if (r_info != NULL) { - callbacks.suspend = libxl__remus_domain_suspend_callback; - callbacks.postcopy = libxl__remus_domain_resume_callback; - callbacks.checkpoint = libxl__remus_domain_checkpoint_callback; + callbacks->suspend = libxl__remus_domain_suspend_callback; + callbacks->postcopy = libxl__remus_domain_resume_callback; + callbacks->checkpoint = libxl__remus_domain_checkpoint_callback; } else - callbacks.suspend = libxl__domain_suspend_common_callback; + callbacks->suspend = libxl__domain_suspend_common_callback; - callbacks.switch_qemu_logdirty = libxl__domain_suspend_common_switch_qemu_logdirty; - callbacks.toolstack_save = libxl__toolstack_save; - callbacks.data = &si; + callbacks->switch_qemu_logdirty = libxl__domain_suspend_common_switch_qemu_logdirty; + callbacks->toolstack_save = libxl__toolstack_save; + callbacks->data = dss; - rc = xc_domain_save(ctx->xch, fd, domid, 0, 0, flags, &callbacks, - hvm, vm_generationid_addr); + rc = xc_domain_save(CTX->xch, fd, domid, 0, 0, dss->xcflags, callbacks, + dss->hvm, vm_generationid_addr); if ( rc ) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "saving domain: %s", - si.guest_responded ? + LOGE(ERROR, "saving domain: %s", + dss->guest_responded ? "domain responded to suspend request" : "domain did not respond to suspend request"); - if ( !si.guest_responded ) + if ( !dss->guest_responded ) rc = ERROR_GUEST_TIMEDOUT; else rc = ERROR_FAIL; } - if (si.suspend_eventchn > 0) - xc_suspend_evtchn_release(ctx->xch, si.xce, domid, si.suspend_eventchn); - if (si.xce != NULL) - xc_evtchn_close(si.xce); + if (dss->suspend_eventchn > 0) + xc_suspend_evtchn_release(CTX->xch, dss->xce, domid, + dss->suspend_eventchn); + if (dss->xce != NULL) + xc_evtchn_close(dss->xce); out: return rc; @@ -997,8 +987,7 @@ out: int libxl__domain_save_device_model(libxl__gc *gc, uint32_t domid, int fd) { - libxl_ctx *ctx = libxl__gc_owner(gc); - int ret, fd2 = -1, c; + int rc, fd2 = -1, c; char buf[1024]; const char *filename = libxl__device_model_savefile(gc, domid); struct stat st; @@ -1006,46 +995,46 @@ int libxl__domain_save_device_model(libx if (stat(filename, &st) < 0) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "Unable to stat qemu save file\n"); - ret = ERROR_FAIL; + LOG(ERROR, "Unable to stat qemu save file\n"); + rc = ERROR_FAIL; goto out; } qemu_state_len = st.st_size; - LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "Qemu state is %d bytes\n", qemu_state_len); + LOG(DEBUG, "Qemu state is %d bytes\n", qemu_state_len); - ret = libxl_write_exactly(ctx, fd, QEMU_SIGNATURE, strlen(QEMU_SIGNATURE), + rc = libxl_write_exactly(CTX, fd, QEMU_SIGNATURE, strlen(QEMU_SIGNATURE), "saved-state file", "qemu signature"); - if (ret) + if (rc) goto out; - ret = libxl_write_exactly(ctx, fd, &qemu_state_len, sizeof(qemu_state_len), + rc = libxl_write_exactly(CTX, fd, &qemu_state_len, sizeof(qemu_state_len), "saved-state file", "saved-state length"); - if (ret) + if (rc) goto out; fd2 = open(filename, O_RDONLY); if (fd2 < 0) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Unable to open qemu save file\n"); + LOGE(ERROR, "Unable to open qemu save file\n"); goto out; } while ((c = read(fd2, buf, sizeof(buf))) != 0) { if (c < 0) { if (errno == EINTR) continue; - ret = errno; + rc = errno; goto out; } - ret = libxl_write_exactly( - ctx, fd, buf, c, "saved-state file", "qemu state"); - if (ret) + rc = libxl_write_exactly( + CTX, fd, buf, c, "saved-state file", "qemu state"); + if (rc) goto out; } - ret = 0; + rc = 0; out: if (fd2 >= 0) close(fd2); unlink(filename); - return ret; + return rc; } char *libxl__uuid2string(libxl__gc *gc, const libxl_uuid uuid) diff -r a31a5064552a -r 54e1337048dc tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Thu Jun 28 18:43:19 2012 +0100 +++ b/tools/libxl/libxl_internal.h Thu Jun 28 18:43:20 2012 +0100 @@ -786,10 +786,6 @@ _hidden int libxl__domain_restore_common libxl_domain_build_info *info, libxl__domain_build_state *state, int fd); -_hidden int libxl__domain_suspend_common(libxl__gc *gc, uint32_t domid, int fd, - libxl_domain_type type, - int live, int debug, - const libxl_domain_remus_info *r_info); _hidden const char *libxl__device_model_savefile(libxl__gc *gc, uint32_t domid); _hidden int libxl__domain_suspend_device_model(libxl__gc *gc, uint32_t domid); _hidden int libxl__domain_resume_device_model(libxl__gc *gc, uint32_t domid); @@ -1778,6 +1774,23 @@ _hidden void libxl__datacopier_kill(libx _hidden int libxl__datacopier_start(libxl__datacopier_state *dc); +/*----- Domain suspend (save) state structure -----*/ + +typedef struct libxl__domain_suspend_state libxl__domain_suspend_state; + +struct libxl__domain_suspend_state { + libxl__gc *gc; + xc_evtchn *xce; /* event channel handle */ + int suspend_eventchn; + int domid; + int hvm; + unsigned int xcflags; + int guest_responded; + int save_fd; /* Migration stream fd (for Remus) */ + int interval; /* checkpoint interval (for Remus) */ +}; + + /*----- openpty -----*/ /* @@ -1888,6 +1901,15 @@ struct libxl__domain_create_state { * for the non-stubdom device model. */ }; +/*----- Domain suspend (save) functions -----*/ + +_hidden int libxl__domain_suspend_common(libxl__gc *gc, uint32_t domid, int fd, + libxl_domain_type type, + int live, int debug, + const libxl_domain_remus_info *r_info); + + + /* * Convenience macros. */ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:24 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvz-0004kE-4n; Wed, 04 Jul 2012 04:11:23 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvx-0004hd-61 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:21 +0000 Received: from [85.158.139.83:46481] by server-2.bemta-5.messagelabs.com id D2/6C-04598-862C3FF4; Wed, 04 Jul 2012 04:11:20 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-182.messagelabs.com!1341375077!23496364!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1258 invoked from network); 4 Jul 2012 04:11:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvt-0002hf-7N for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGvt-0003qZ-6L for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:17 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:16 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: domain save: rename variables etc. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340905400 -3600 # Node ID 54e1337048dce53f4b3f014c51d248e6abf615de # Parent a31a5064552a8762a0dec25307dd4dd46992abeb libxl: domain save: rename variables etc. Preparatory work for making domain suspend asynchronous: * Rename `struct suspendinfo' to `libxl__domain_suspend_state' and move it to libxl_internal.h. * Rename variables `si' to `dss'. * Change the stack-allocated state and callbacks from struct suspendinfo si; struct save_callbacks callbacks; struct restore_callbacks callbacks; to libxl__domain_suspend_state dss[1]; struct save_callbacks callbacks[1]; struct restore_callbacks callbacks[1]; so that it may be referred to as a pointer variable everywhere. * Rename the variable `flags' (in libxl__domain_suspend_state) to `xcflags', to help distinguish it from the other `flags' which is passed in from the calling application in libxl_domain_suspend_info. Abolish the local variable in libxl__domain_suspend_common, as it can use the one in the dss. * Move the prototypes of suspend-related functions in libxl_internal.h to after the definition of the state struct. * Replace several ctx variables with gc variables and consequently references to ctx with CTX. Change references to `dss->gc' in the functional code to simply `gc'. * Use LOG* rather than LIBXL__LOG* in a number of places. * In libxl__domain_save_device_model use `rc' instead of `ret'. * Introduce and use `gc' and `domid' in libxl__domain_suspend_common_callback. * Wrap some long lines. * Add an extra pair of parens for clarity in a flag test. * Remove two pointless casts from void* to a struct*. No functional change whatsoever. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- diff -r a31a5064552a -r 54e1337048dc tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Thu Jun 28 18:43:19 2012 +0100 +++ b/tools/libxl/libxl_dom.c Thu Jun 28 18:43:20 2012 +0100 @@ -472,7 +472,7 @@ static inline char *restore_helper(libxl static int libxl__toolstack_restore(uint32_t domid, const uint8_t *buf, uint32_t size, void *data) { - libxl__gc *gc = (libxl__gc *) data; + libxl__gc *gc = data; libxl_ctx *ctx = gc->owner; int i, ret; const uint8_t *ptr = buf; @@ -533,7 +533,7 @@ int libxl__domain_restore_common(libxl__ /* read signature */ int rc; int hvm, pae, superpages; - struct restore_callbacks callbacks; + struct restore_callbacks callbacks[1]; int no_incr_generationid; switch (info->type) { case LIBXL_DOMAIN_TYPE_HVM: @@ -541,8 +541,8 @@ int libxl__domain_restore_common(libxl__ superpages = 1; pae = libxl_defbool_val(info->u.hvm.pae); no_incr_generationid = !libxl_defbool_val(info->u.hvm.incr_generationid); - callbacks.toolstack_restore = libxl__toolstack_restore; - callbacks.data = gc; + callbacks->toolstack_restore = libxl__toolstack_restore; + callbacks->data = gc; break; case LIBXL_DOMAIN_TYPE_PV: hvm = 0; @@ -558,7 +558,7 @@ int libxl__domain_restore_common(libxl__ state->store_domid, state->console_port, &state->console_mfn, state->console_domid, hvm, pae, superpages, no_incr_generationid, - &state->vm_generationid_addr, &callbacks); + &state->vm_generationid_addr, callbacks); if ( rc ) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "restoring domain"); return ERROR_FAIL; @@ -566,33 +566,23 @@ int libxl__domain_restore_common(libxl__ return 0; } -struct suspendinfo { - libxl__gc *gc; - xc_evtchn *xce; /* event channel handle */ - int suspend_eventchn; - int domid; - int hvm; - unsigned int flags; - int guest_responded; - int save_fd; /* Migration stream fd (for Remus) */ - int interval; /* checkpoint interval (for Remus) */ -}; - -static int libxl__domain_suspend_common_switch_qemu_logdirty(int domid, unsigned int enable, void *data) +static int libxl__domain_suspend_common_switch_qemu_logdirty + (int domid, unsigned int enable, void *data) { - struct suspendinfo *si = data; - libxl_ctx *ctx = libxl__gc_owner(si->gc); + libxl__domain_suspend_state *dss = data; + libxl__gc *gc = dss->gc; char *path; bool rc; - path = libxl__sprintf(si->gc, "/local/domain/0/device-model/%u/logdirty/cmd", domid); + path = libxl__sprintf(gc, + "/local/domain/0/device-model/%u/logdirty/cmd", domid); if (!path) return 1; if (enable) - rc = xs_write(ctx->xsh, XBT_NULL, path, "enable", strlen("enable")); + rc = xs_write(CTX->xsh, XBT_NULL, path, "enable", strlen("enable")); else - rc = xs_write(ctx->xsh, XBT_NULL, path, "disable", strlen("disable")); + rc = xs_write(CTX->xsh, XBT_NULL, path, "disable", strlen("disable")); return rc ? 0 : 1; } @@ -647,53 +637,56 @@ int libxl__domain_resume_device_model(li static int libxl__domain_suspend_common_callback(void *data) { - struct suspendinfo *si = data; + libxl__domain_suspend_state *dss = data; + libxl__gc *gc = dss->gc; unsigned long hvm_s_state = 0, hvm_pvdrv = 0; int ret; char *state = "suspend"; int watchdog; - libxl_ctx *ctx = libxl__gc_owner(si->gc); xs_transaction_t t; - if (si->hvm) { - xc_get_hvm_param(ctx->xch, si->domid, HVM_PARAM_CALLBACK_IRQ, &hvm_pvdrv); - xc_get_hvm_param(ctx->xch, si->domid, HVM_PARAM_ACPI_S_STATE, &hvm_s_state); + /* Convenience aliases */ + const uint32_t domid = dss->domid; + + if (dss->hvm) { + xc_get_hvm_param(CTX->xch, domid, HVM_PARAM_CALLBACK_IRQ, &hvm_pvdrv); + xc_get_hvm_param(CTX->xch, domid, HVM_PARAM_ACPI_S_STATE, &hvm_s_state); } - if ((hvm_s_state == 0) && (si->suspend_eventchn >= 0)) { - LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "issuing %s suspend request via event channel", - si->hvm ? "PVHVM" : "PV"); - ret = xc_evtchn_notify(si->xce, si->suspend_eventchn); + if ((hvm_s_state == 0) && (dss->suspend_eventchn >= 0)) { + LOG(DEBUG, "issuing %s suspend request via event channel", + dss->hvm ? "PVHVM" : "PV"); + ret = xc_evtchn_notify(dss->xce, dss->suspend_eventchn); if (ret < 0) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "xc_evtchn_notify failed ret=%d", ret); + LOG(ERROR, "xc_evtchn_notify failed ret=%d", ret); return 0; } - ret = xc_await_suspend(ctx->xch, si->xce, si->suspend_eventchn); + ret = xc_await_suspend(CTX->xch, dss->xce, dss->suspend_eventchn); if (ret < 0) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "xc_await_suspend failed ret=%d", ret); + LOG(ERROR, "xc_await_suspend failed ret=%d", ret); return 0; } - si->guest_responded = 1; + dss->guest_responded = 1; goto guest_suspended; } - if (si->hvm && (!hvm_pvdrv || hvm_s_state)) { - LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "Calling xc_domain_shutdown on HVM domain"); - xc_domain_shutdown(ctx->xch, si->domid, SHUTDOWN_suspend); + if (dss->hvm && (!hvm_pvdrv || hvm_s_state)) { + LOG(DEBUG, "Calling xc_domain_shutdown on HVM domain"); + xc_domain_shutdown(CTX->xch, domid, SHUTDOWN_suspend); /* The guest does not (need to) respond to this sort of request. */ - si->guest_responded = 1; + dss->guest_responded = 1; } else { - LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "issuing %s suspend request via XenBus control node", - si->hvm ? "PVHVM" : "PV"); + LOG(DEBUG, "issuing %s suspend request via XenBus control node", + dss->hvm ? "PVHVM" : "PV"); - libxl__domain_pvcontrol_write(si->gc, XBT_NULL, si->domid, "suspend"); + libxl__domain_pvcontrol_write(gc, XBT_NULL, domid, "suspend"); - LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "wait for the guest to acknowledge suspend request"); + LOG(DEBUG, "wait for the guest to acknowledge suspend request"); watchdog = 60; while (!strcmp(state, "suspend") && watchdog > 0) { usleep(100000); - state = libxl__domain_pvcontrol_read(si->gc, XBT_NULL, si->domid); + state = libxl__domain_pvcontrol_read(gc, XBT_NULL, domid); if (!state) state = ""; watchdog--; @@ -709,17 +702,17 @@ static int libxl__domain_suspend_common_ * at the last minute. */ if (!strcmp(state, "suspend")) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "guest didn't acknowledge suspend, cancelling request"); + LOG(ERROR, "guest didn't acknowledge suspend, cancelling request"); retry_transaction: - t = xs_transaction_start(ctx->xsh); + t = xs_transaction_start(CTX->xsh); - state = libxl__domain_pvcontrol_read(si->gc, t, si->domid); + state = libxl__domain_pvcontrol_read(gc, t, domid); if (!state) state = ""; if (!strcmp(state, "suspend")) - libxl__domain_pvcontrol_write(si->gc, t, si->domid, ""); + libxl__domain_pvcontrol_write(gc, t, domid, ""); - if (!xs_transaction_end(ctx->xsh, t, 0)) + if (!xs_transaction_end(CTX->xsh, t, 0)) if (errno == EAGAIN) goto retry_transaction; @@ -731,27 +724,29 @@ static int libxl__domain_suspend_common_ * case we lost the race while cancelling and should continue. */ if (!strcmp(state, "suspend")) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "guest didn't acknowledge suspend, request cancelled"); + LOG(ERROR, "guest didn't acknowledge suspend, request cancelled"); return 0; } - LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "guest acknowledged suspend request"); - si->guest_responded = 1; + LOG(DEBUG, "guest acknowledged suspend request"); + dss->guest_responded = 1; } - LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "wait for the guest to suspend"); + LOG(DEBUG, "wait for the guest to suspend"); watchdog = 60; while (watchdog > 0) { xc_domaininfo_t info; usleep(100000); - ret = xc_domain_getinfolist(ctx->xch, si->domid, 1, &info); - if (ret == 1 && info.domain == si->domid && info.flags & XEN_DOMINF_shutdown) { + ret = xc_domain_getinfolist(CTX->xch, domid, 1, &info); + if (ret == 1 && info.domain == domid && + (info.flags & XEN_DOMINF_shutdown)) { int shutdown_reason; - shutdown_reason = (info.flags >> XEN_DOMINF_shutdownshift) & XEN_DOMINF_shutdownmask; + shutdown_reason = (info.flags >> XEN_DOMINF_shutdownshift) + & XEN_DOMINF_shutdownmask; if (shutdown_reason == SHUTDOWN_suspend) { - LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "guest has suspended"); + LOG(DEBUG, "guest has suspended"); goto guest_suspended; } } @@ -759,15 +754,14 @@ static int libxl__domain_suspend_common_ watchdog--; } - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "guest did not suspend"); + LOG(ERROR, "guest did not suspend"); return 0; guest_suspended: - if (si->hvm) { - ret = libxl__domain_suspend_device_model(si->gc, si->domid); + if (dss->hvm) { + ret = libxl__domain_suspend_device_model(dss->gc, dss->domid); if (ret) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, - "libxl__domain_suspend_device_model failed ret=%d", ret); + LOG(ERROR, "libxl__domain_suspend_device_model failed ret=%d", ret); return 0; } } @@ -785,9 +779,8 @@ static inline char *save_helper(libxl__g static int libxl__toolstack_save(uint32_t domid, uint8_t **buf, uint32_t *len, void *data) { - struct suspendinfo *si = (struct suspendinfo *) data; - libxl__gc *gc = (libxl__gc *) si->gc; - libxl_ctx *ctx = gc->owner; + libxl__domain_suspend_state *dss = data; + libxl__gc *gc = dss->gc; int i = 0; char *start_addr = NULL, *size = NULL, *phys_offset = NULL, *name = NULL; unsigned int num = 0; @@ -816,21 +809,21 @@ static int libxl__toolstack_save(uint32_ char *xs_path; phys_offset = entries[i]; if (phys_offset == NULL) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "phys_offset %d is NULL", i); + LOG(ERROR, "phys_offset %d is NULL", i); return -1; } xs_path = save_helper(gc, domid, phys_offset, "start_addr"); start_addr = libxl__xs_read(gc, 0, xs_path); if (start_addr == NULL) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "%s is NULL", xs_path); + LOG(ERROR, "%s is NULL", xs_path); return -1; } xs_path = save_helper(gc, domid, phys_offset, "size"); size = libxl__xs_read(gc, 0, xs_path); if (size == NULL) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "%s is NULL", xs_path); + LOG(ERROR, "%s is NULL", xs_path); return -1; } @@ -866,11 +859,11 @@ static int libxl__remus_domain_suspend_c static int libxl__remus_domain_resume_callback(void *data) { - struct suspendinfo *si = data; - libxl_ctx *ctx = libxl__gc_owner(si->gc); + libxl__domain_suspend_state *dss = data; + libxl__gc *gc = dss->gc; /* Resumes the domain and the device model */ - if (libxl_domain_resume(ctx, si->domid, /* Fast Suspend */1)) + if (libxl_domain_resume(CTX, dss->domid, /* Fast Suspend */1)) return 0; /* TODO: Deal with disk. Start a new network output buffer */ @@ -879,15 +872,15 @@ static int libxl__remus_domain_resume_ca static int libxl__remus_domain_checkpoint_callback(void *data) { - struct suspendinfo *si = data; + libxl__domain_suspend_state *dss = data; /* This would go into tailbuf. */ - if (si->hvm && - libxl__domain_save_device_model(si->gc, si->domid, si->save_fd)) + if (dss->hvm && + libxl__domain_save_device_model(dss->gc, dss->domid, dss->save_fd)) return 0; /* TODO: Wait for disk and memory ack, release network buffer */ - usleep(si->interval * 1000); + usleep(dss->interval * 1000); return 1; } @@ -896,12 +889,10 @@ int libxl__domain_suspend_common(libxl__ int live, int debug, const libxl_domain_remus_info *r_info) { - libxl_ctx *ctx = libxl__gc_owner(gc); - int flags; int port; - struct save_callbacks callbacks; - struct suspendinfo si; - int hvm, rc = ERROR_FAIL; + struct save_callbacks callbacks[1]; + libxl__domain_suspend_state dss[1]; + int rc = ERROR_FAIL; unsigned long vm_generationid_addr; switch (type) { @@ -914,82 +905,81 @@ int libxl__domain_suspend_common(libxl__ addr = libxl__xs_read(gc, XBT_NULL, path); vm_generationid_addr = (addr) ? strtoul(addr, NULL, 0) : 0; - hvm = 1; + dss->hvm = 1; break; } case LIBXL_DOMAIN_TYPE_PV: vm_generationid_addr = 0; - hvm = 0; + dss->hvm = 0; break; default: return ERROR_INVAL; } - memset(&si, 0, sizeof(si)); - flags = (live) ? XCFLAGS_LIVE : 0 + dss->xcflags = (live) ? XCFLAGS_LIVE : 0 | (debug) ? XCFLAGS_DEBUG : 0 - | (hvm) ? XCFLAGS_HVM : 0; + | (dss->hvm) ? XCFLAGS_HVM : 0; + + dss->domid = domid; + dss->gc = gc; + dss->suspend_eventchn = -1; + dss->guest_responded = 0; if (r_info != NULL) { - si.interval = r_info->interval; + dss->interval = r_info->interval; if (r_info->compression) - flags |= XCFLAGS_CHECKPOINT_COMPRESS; - si.save_fd = fd; + dss->xcflags |= XCFLAGS_CHECKPOINT_COMPRESS; + dss->save_fd = fd; } else - si.save_fd = -1; + dss->save_fd = -1; - si.domid = domid; - si.flags = flags; - si.hvm = hvm; - si.gc = gc; - si.suspend_eventchn = -1; - si.guest_responded = 0; - - si.xce = xc_evtchn_open(NULL, 0); - if (si.xce == NULL) + dss->xce = xc_evtchn_open(NULL, 0); + if (dss->xce == NULL) goto out; else { - port = xs_suspend_evtchn_port(si.domid); + port = xs_suspend_evtchn_port(dss->domid); if (port >= 0) { - si.suspend_eventchn = xc_suspend_evtchn_init(ctx->xch, si.xce, si.domid, port); + dss->suspend_eventchn = + xc_suspend_evtchn_init(CTX->xch, dss->xce, dss->domid, port); - if (si.suspend_eventchn < 0) - LIBXL__LOG(ctx, LIBXL__LOG_WARNING, "Suspend event channel initialization failed"); + if (dss->suspend_eventchn < 0) + LOG(WARN, "Suspend event channel initialization failed"); } } - memset(&callbacks, 0, sizeof(callbacks)); + memset(callbacks, 0, sizeof(*callbacks)); if (r_info != NULL) { - callbacks.suspend = libxl__remus_domain_suspend_callback; - callbacks.postcopy = libxl__remus_domain_resume_callback; - callbacks.checkpoint = libxl__remus_domain_checkpoint_callback; + callbacks->suspend = libxl__remus_domain_suspend_callback; + callbacks->postcopy = libxl__remus_domain_resume_callback; + callbacks->checkpoint = libxl__remus_domain_checkpoint_callback; } else - callbacks.suspend = libxl__domain_suspend_common_callback; + callbacks->suspend = libxl__domain_suspend_common_callback; - callbacks.switch_qemu_logdirty = libxl__domain_suspend_common_switch_qemu_logdirty; - callbacks.toolstack_save = libxl__toolstack_save; - callbacks.data = &si; + callbacks->switch_qemu_logdirty = libxl__domain_suspend_common_switch_qemu_logdirty; + callbacks->toolstack_save = libxl__toolstack_save; + callbacks->data = dss; - rc = xc_domain_save(ctx->xch, fd, domid, 0, 0, flags, &callbacks, - hvm, vm_generationid_addr); + rc = xc_domain_save(CTX->xch, fd, domid, 0, 0, dss->xcflags, callbacks, + dss->hvm, vm_generationid_addr); if ( rc ) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "saving domain: %s", - si.guest_responded ? + LOGE(ERROR, "saving domain: %s", + dss->guest_responded ? "domain responded to suspend request" : "domain did not respond to suspend request"); - if ( !si.guest_responded ) + if ( !dss->guest_responded ) rc = ERROR_GUEST_TIMEDOUT; else rc = ERROR_FAIL; } - if (si.suspend_eventchn > 0) - xc_suspend_evtchn_release(ctx->xch, si.xce, domid, si.suspend_eventchn); - if (si.xce != NULL) - xc_evtchn_close(si.xce); + if (dss->suspend_eventchn > 0) + xc_suspend_evtchn_release(CTX->xch, dss->xce, domid, + dss->suspend_eventchn); + if (dss->xce != NULL) + xc_evtchn_close(dss->xce); out: return rc; @@ -997,8 +987,7 @@ out: int libxl__domain_save_device_model(libxl__gc *gc, uint32_t domid, int fd) { - libxl_ctx *ctx = libxl__gc_owner(gc); - int ret, fd2 = -1, c; + int rc, fd2 = -1, c; char buf[1024]; const char *filename = libxl__device_model_savefile(gc, domid); struct stat st; @@ -1006,46 +995,46 @@ int libxl__domain_save_device_model(libx if (stat(filename, &st) < 0) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "Unable to stat qemu save file\n"); - ret = ERROR_FAIL; + LOG(ERROR, "Unable to stat qemu save file\n"); + rc = ERROR_FAIL; goto out; } qemu_state_len = st.st_size; - LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "Qemu state is %d bytes\n", qemu_state_len); + LOG(DEBUG, "Qemu state is %d bytes\n", qemu_state_len); - ret = libxl_write_exactly(ctx, fd, QEMU_SIGNATURE, strlen(QEMU_SIGNATURE), + rc = libxl_write_exactly(CTX, fd, QEMU_SIGNATURE, strlen(QEMU_SIGNATURE), "saved-state file", "qemu signature"); - if (ret) + if (rc) goto out; - ret = libxl_write_exactly(ctx, fd, &qemu_state_len, sizeof(qemu_state_len), + rc = libxl_write_exactly(CTX, fd, &qemu_state_len, sizeof(qemu_state_len), "saved-state file", "saved-state length"); - if (ret) + if (rc) goto out; fd2 = open(filename, O_RDONLY); if (fd2 < 0) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Unable to open qemu save file\n"); + LOGE(ERROR, "Unable to open qemu save file\n"); goto out; } while ((c = read(fd2, buf, sizeof(buf))) != 0) { if (c < 0) { if (errno == EINTR) continue; - ret = errno; + rc = errno; goto out; } - ret = libxl_write_exactly( - ctx, fd, buf, c, "saved-state file", "qemu state"); - if (ret) + rc = libxl_write_exactly( + CTX, fd, buf, c, "saved-state file", "qemu state"); + if (rc) goto out; } - ret = 0; + rc = 0; out: if (fd2 >= 0) close(fd2); unlink(filename); - return ret; + return rc; } char *libxl__uuid2string(libxl__gc *gc, const libxl_uuid uuid) diff -r a31a5064552a -r 54e1337048dc tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Thu Jun 28 18:43:19 2012 +0100 +++ b/tools/libxl/libxl_internal.h Thu Jun 28 18:43:20 2012 +0100 @@ -786,10 +786,6 @@ _hidden int libxl__domain_restore_common libxl_domain_build_info *info, libxl__domain_build_state *state, int fd); -_hidden int libxl__domain_suspend_common(libxl__gc *gc, uint32_t domid, int fd, - libxl_domain_type type, - int live, int debug, - const libxl_domain_remus_info *r_info); _hidden const char *libxl__device_model_savefile(libxl__gc *gc, uint32_t domid); _hidden int libxl__domain_suspend_device_model(libxl__gc *gc, uint32_t domid); _hidden int libxl__domain_resume_device_model(libxl__gc *gc, uint32_t domid); @@ -1778,6 +1774,23 @@ _hidden void libxl__datacopier_kill(libx _hidden int libxl__datacopier_start(libxl__datacopier_state *dc); +/*----- Domain suspend (save) state structure -----*/ + +typedef struct libxl__domain_suspend_state libxl__domain_suspend_state; + +struct libxl__domain_suspend_state { + libxl__gc *gc; + xc_evtchn *xce; /* event channel handle */ + int suspend_eventchn; + int domid; + int hvm; + unsigned int xcflags; + int guest_responded; + int save_fd; /* Migration stream fd (for Remus) */ + int interval; /* checkpoint interval (for Remus) */ +}; + + /*----- openpty -----*/ /* @@ -1888,6 +1901,15 @@ struct libxl__domain_create_state { * for the non-stubdom device model. */ }; +/*----- Domain suspend (save) functions -----*/ + +_hidden int libxl__domain_suspend_common(libxl__gc *gc, uint32_t domid, int fd, + libxl_domain_type type, + int live, int debug, + const libxl_domain_remus_info *r_info); + + + /* * Convenience macros. */ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:24 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvz-0004kL-9F; Wed, 04 Jul 2012 04:11:23 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvx-0004iq-SK for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:22 +0000 Received: from [85.158.143.35:28486] by server-3.bemta-4.messagelabs.com id D1/D6-05808-962C3FF4; Wed, 04 Jul 2012 04:11:21 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-21.messagelabs.com!1341375079!5501020!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23385 invoked from network); 4 Jul 2012 04:11:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvv-0002hr-CI for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGvv-0003rX-BK for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:19 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:18 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: rename libxl_dom:save_helper to physmap_path X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340905402 -3600 # Node ID d1fe6b6aa97a36c4b52bf78af34a0256ed0d321b # Parent 0f1a974bfb38ba55555a4a86a1ccd568aa7be56b libxl: rename libxl_dom:save_helper to physmap_path "save_helper" isn't very descriptive. Also it is now confusing because it reads like it might refer to the libxl-save-helper executable which runs xc_domain_save and xc_domain_restore. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 0f1a974bfb38 -r d1fe6b6aa97a tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Thu Jun 28 18:43:21 2012 +0100 +++ b/tools/libxl/libxl_dom.c Thu Jun 28 18:43:22 2012 +0100 @@ -736,7 +736,7 @@ int libxl__domain_suspend_common_callbac return 1; } -static inline char *save_helper(libxl__gc *gc, uint32_t domid, +static inline char *physmap_path(libxl__gc *gc, uint32_t domid, char *phys_offset, char *node) { return libxl__sprintf(gc, @@ -781,21 +781,21 @@ int libxl__toolstack_save(uint32_t domid return -1; } - xs_path = save_helper(gc, domid, phys_offset, "start_addr"); + xs_path = physmap_path(gc, domid, phys_offset, "start_addr"); start_addr = libxl__xs_read(gc, 0, xs_path); if (start_addr == NULL) { LOG(ERROR, "%s is NULL", xs_path); return -1; } - xs_path = save_helper(gc, domid, phys_offset, "size"); + xs_path = physmap_path(gc, domid, phys_offset, "size"); size = libxl__xs_read(gc, 0, xs_path); if (size == NULL) { LOG(ERROR, "%s is NULL", xs_path); return -1; } - xs_path = save_helper(gc, domid, phys_offset, "name"); + xs_path = physmap_path(gc, domid, phys_offset, "name"); name = libxl__xs_read(gc, 0, xs_path); if (name == NULL) namelen = 0; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:24 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvz-0004kL-9F; Wed, 04 Jul 2012 04:11:23 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvx-0004iq-SK for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:22 +0000 Received: from [85.158.143.35:28486] by server-3.bemta-4.messagelabs.com id D1/D6-05808-962C3FF4; Wed, 04 Jul 2012 04:11:21 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-21.messagelabs.com!1341375079!5501020!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23385 invoked from network); 4 Jul 2012 04:11:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvv-0002hr-CI for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGvv-0003rX-BK for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:19 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:18 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: rename libxl_dom:save_helper to physmap_path X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340905402 -3600 # Node ID d1fe6b6aa97a36c4b52bf78af34a0256ed0d321b # Parent 0f1a974bfb38ba55555a4a86a1ccd568aa7be56b libxl: rename libxl_dom:save_helper to physmap_path "save_helper" isn't very descriptive. Also it is now confusing because it reads like it might refer to the libxl-save-helper executable which runs xc_domain_save and xc_domain_restore. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 0f1a974bfb38 -r d1fe6b6aa97a tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Thu Jun 28 18:43:21 2012 +0100 +++ b/tools/libxl/libxl_dom.c Thu Jun 28 18:43:22 2012 +0100 @@ -736,7 +736,7 @@ int libxl__domain_suspend_common_callbac return 1; } -static inline char *save_helper(libxl__gc *gc, uint32_t domid, +static inline char *physmap_path(libxl__gc *gc, uint32_t domid, char *phys_offset, char *node) { return libxl__sprintf(gc, @@ -781,21 +781,21 @@ int libxl__toolstack_save(uint32_t domid return -1; } - xs_path = save_helper(gc, domid, phys_offset, "start_addr"); + xs_path = physmap_path(gc, domid, phys_offset, "start_addr"); start_addr = libxl__xs_read(gc, 0, xs_path); if (start_addr == NULL) { LOG(ERROR, "%s is NULL", xs_path); return -1; } - xs_path = save_helper(gc, domid, phys_offset, "size"); + xs_path = physmap_path(gc, domid, phys_offset, "size"); size = libxl__xs_read(gc, 0, xs_path); if (size == NULL) { LOG(ERROR, "%s is NULL", xs_path); return -1; } - xs_path = save_helper(gc, domid, phys_offset, "name"); + xs_path = physmap_path(gc, domid, phys_offset, "name"); name = libxl__xs_read(gc, 0, xs_path); if (name == NULL) namelen = 0; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:24 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw0-0004lD-8S; Wed, 04 Jul 2012 04:11:24 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvx-0004b1-RN for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:22 +0000 Received: from [85.158.143.35:38402] by server-2.bemta-4.messagelabs.com id F0/C5-17938-962C3FF4; Wed, 04 Jul 2012 04:11:21 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-21.messagelabs.com!1341375077!13125693!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25837 invoked from network); 4 Jul 2012 04:11:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvt-0002hi-OX for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGvt-0003qo-NX for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:17 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:17 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: domain restore: reshuffle, preparing for ao X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340905400 -3600 # Node ID 0377ed8c274ee3a036dc3cdc7c6e4c29dee98181 # Parent 54e1337048dce53f4b3f014c51d248e6abf615de libxl: domain restore: reshuffle, preparing for ao We are going to arrange that libxl, instead of calling xc_domain_restore, calls a stub function which forks and execs a helper program, so that restore can be asynchronous rather than blocking the whole toolstack. This stub function will be called libxl__xc_domain_restore. However, its prospective call site is unsuitable for a function which needs to make a callback, and is buried in two nested single-call-site functions which are logically part of the domain creation procedure. So we first abolish those single-call-site functions, integrate their contents into domain creation in their proper temporal order, and break out libxl__xc_domain_restore ready for its reimplementation. No functional change - just the following reorganisation: * Abolish libxl__domain_restore_common, as it had only one caller. Move its contents into (what was) domain_restore. * There is a new stage function domcreate_rebuild_done containing what used to be the bulk of domcreate_bootloader_done, since domcreate_bootloader_done now simply starts the restore (or does the rebuild) and arranges to call the next stage. * Move the contents of domain_restore into its correct place in the domain creation sequence. We put it inside domcreate_bootloader_done, which now either calls libxl__xc_domain_restore which will call the new function domcreate_rebuild_done, or calls domcreate_rebuild_done directly. * Various general-purpose local variables (`i' etc.) and convenience alias variables need to be shuffled about accordingly. * Consequently libxl__toolstack_restore needs to gain external linkage as it is now in a different file to its user. * Move the xc_domain_save callbacks struct from the stack into libxl__domain_create_state. In general the moved code remains almost identical. Two returns in what used to be libxl__domain_restore_common have been changed to set the return value and "goto out", and the call sites for the abolished and new functions have been adjusted. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- diff -r 54e1337048dc -r 0377ed8c274e tools/libxl/Makefile --- a/tools/libxl/Makefile Thu Jun 28 18:43:20 2012 +0100 +++ b/tools/libxl/Makefile Thu Jun 28 18:43:20 2012 +0100 @@ -67,6 +67,7 @@ LIBXL_OBJS = flexarray.o libxl.o libxl_c libxl_dom.o libxl_exec.o libxl_xshelp.o libxl_device.o \ libxl_internal.o libxl_utils.o libxl_uuid.o \ libxl_json.o libxl_aoutils.o \ + libxl_save_callout.o \ libxl_qmp.o libxl_event.o libxl_fork.o $(LIBXL_OBJS-y) LIBXL_OBJS += _libxl_types.o libxl_flask.o _libxl_types_internal.o diff -r 54e1337048dc -r 0377ed8c274e tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Thu Jun 28 18:43:20 2012 +0100 +++ b/tools/libxl/libxl_create.c Thu Jun 28 18:43:20 2012 +0100 @@ -377,89 +377,6 @@ out: return ret; } -static int domain_restore(libxl__gc *gc, libxl_domain_build_info *info, - uint32_t domid, int fd, - libxl__domain_build_state *state) -{ - libxl_ctx *ctx = libxl__gc_owner(gc); - char **vments = NULL, **localents = NULL; - struct timeval start_time; - int i, ret, esave, flags; - - ret = libxl__build_pre(gc, domid, info, state); - if (ret) - goto out; - - ret = libxl__domain_restore_common(gc, domid, info, state, fd); - if (ret) - goto out; - - gettimeofday(&start_time, NULL); - - switch (info->type) { - case LIBXL_DOMAIN_TYPE_HVM: - vments = libxl__calloc(gc, 7, sizeof(char *)); - vments[0] = "rtc/timeoffset"; - vments[1] = (info->u.hvm.timeoffset) ? info->u.hvm.timeoffset : ""; - vments[2] = "image/ostype"; - vments[3] = "hvm"; - vments[4] = "start_time"; - vments[5] = libxl__sprintf(gc, "%lu.%02d", start_time.tv_sec,(int)start_time.tv_usec/10000); - break; - case LIBXL_DOMAIN_TYPE_PV: - vments = libxl__calloc(gc, 11, sizeof(char *)); - i = 0; - vments[i++] = "image/ostype"; - vments[i++] = "linux"; - vments[i++] = "image/kernel"; - vments[i++] = (char *) state->pv_kernel.path; - vments[i++] = "start_time"; - vments[i++] = libxl__sprintf(gc, "%lu.%02d", start_time.tv_sec,(int)start_time.tv_usec/10000); - if (state->pv_ramdisk.path) { - vments[i++] = "image/ramdisk"; - vments[i++] = (char *) state->pv_ramdisk.path; - } - if (state->pv_cmdline) { - vments[i++] = "image/cmdline"; - vments[i++] = (char *) state->pv_cmdline; - } - break; - default: - ret = ERROR_INVAL; - goto out; - } - ret = libxl__build_post(gc, domid, info, state, vments, localents); - if (ret) - goto out; - - if (info->type == LIBXL_DOMAIN_TYPE_HVM) { - ret = asprintf(&state->saved_state, - XC_DEVICE_MODEL_RESTORE_FILE".%d", domid); - ret = (ret < 0) ? ERROR_FAIL : 0; - } - -out: - if (info->type == LIBXL_DOMAIN_TYPE_PV) { - libxl__file_reference_unmap(&state->pv_kernel); - libxl__file_reference_unmap(&state->pv_ramdisk); - } - - esave = errno; - - flags = fcntl(fd, F_GETFL); - if (flags == -1) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "unable to get flags on restore fd"); - } else { - flags &= ~O_NONBLOCK; - if (fcntl(fd, F_SETFL, flags) == -1) - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "unable to put restore fd" - " back to blocking mode"); - } - - errno = esave; - return ret; -} - int libxl__domain_make(libxl__gc *gc, libxl_domain_create_info *info, uint32_t *domid) { @@ -640,10 +557,13 @@ static void domcreate_bootloader_console static void domcreate_bootloader_done(libxl__egc *egc, libxl__bootloader_state *bl, int rc); - static void domcreate_console_available(libxl__egc *egc, libxl__domain_create_state *dcs); +static void domcreate_rebuild_done(libxl__egc *egc, + libxl__domain_create_state *dcs, + int ret); + /* Our own function to clean up and call the user's callback. * The final call in the sequence. */ static void domcreate_complete(libxl__egc *egc, @@ -737,20 +657,20 @@ static void domcreate_console_available( static void domcreate_bootloader_done(libxl__egc *egc, libxl__bootloader_state *bl, - int ret) + int rc) { libxl__domain_create_state *dcs = CONTAINER_OF(bl, *dcs, bl); STATE_AO_GC(bl->ao); - int i; /* convenience aliases */ const uint32_t domid = dcs->guest_domid; libxl_domain_config *const d_config = dcs->guest_config; + libxl_domain_build_info *const info = &d_config->b_info; const int restore_fd = dcs->restore_fd; libxl__domain_build_state *const state = &dcs->build_state; - libxl_ctx *const ctx = CTX; + struct restore_callbacks *const callbacks = &dcs->callbacks; - if (ret) goto error_out; + if (rc) domcreate_rebuild_done(egc, dcs, rc); /* consume bootloader outputs. state->pv_{kernel,ramdisk} have * been initialised by the bootloader already. @@ -766,12 +686,153 @@ static void domcreate_bootloader_done(li dcs->dmss.dm.callback = domcreate_devmodel_started; dcs->dmss.callback = domcreate_devmodel_started; - if ( restore_fd >= 0 ) { - ret = domain_restore(gc, &d_config->b_info, domid, restore_fd, state); + if ( restore_fd < 0 ) { + rc = libxl__domain_build(gc, &d_config->b_info, domid, state); + domcreate_rebuild_done(egc, dcs, rc); + return; + } + + /* Restore */ + + rc = libxl__build_pre(gc, domid, info, state); + if (rc) + goto out; + + /* read signature */ + int hvm, pae, superpages; + int no_incr_generationid; + switch (info->type) { + case LIBXL_DOMAIN_TYPE_HVM: + hvm = 1; + superpages = 1; + pae = libxl_defbool_val(info->u.hvm.pae); + no_incr_generationid = !libxl_defbool_val(info->u.hvm.incr_generationid); + callbacks->toolstack_restore = libxl__toolstack_restore; + callbacks->data = gc; + break; + case LIBXL_DOMAIN_TYPE_PV: + hvm = 0; + superpages = 0; + pae = 1; + no_incr_generationid = 0; + break; + default: + rc = ERROR_INVAL; + goto out; + } + libxl__xc_domain_restore(egc, dcs, + hvm, pae, superpages, no_incr_generationid); + return; + + out: + libxl__xc_domain_restore_done(egc, dcs, rc, 0, 0); +} + +void libxl__xc_domain_restore_done(libxl__egc *egc, + libxl__domain_create_state *dcs, + int ret, int retval, int errnoval) +{ + STATE_AO_GC(dcs->ao); + libxl_ctx *ctx = libxl__gc_owner(gc); + char **vments = NULL, **localents = NULL; + struct timeval start_time; + int i, esave, flags; + + /* convenience aliases */ + const uint32_t domid = dcs->guest_domid; + libxl_domain_config *const d_config = dcs->guest_config; + libxl_domain_build_info *const info = &d_config->b_info; + libxl__domain_build_state *const state = &dcs->build_state; + const int fd = dcs->restore_fd; + + if (ret) + goto out; + + if (retval) { + LOGEV(ERROR, errnoval, "restoring domain"); + ret = ERROR_FAIL; + goto out; + } + + gettimeofday(&start_time, NULL); + + switch (info->type) { + case LIBXL_DOMAIN_TYPE_HVM: + vments = libxl__calloc(gc, 7, sizeof(char *)); + vments[0] = "rtc/timeoffset"; + vments[1] = (info->u.hvm.timeoffset) ? info->u.hvm.timeoffset : ""; + vments[2] = "image/ostype"; + vments[3] = "hvm"; + vments[4] = "start_time"; + vments[5] = libxl__sprintf(gc, "%lu.%02d", start_time.tv_sec,(int)start_time.tv_usec/10000); + break; + case LIBXL_DOMAIN_TYPE_PV: + vments = libxl__calloc(gc, 11, sizeof(char *)); + i = 0; + vments[i++] = "image/ostype"; + vments[i++] = "linux"; + vments[i++] = "image/kernel"; + vments[i++] = (char *) state->pv_kernel.path; + vments[i++] = "start_time"; + vments[i++] = libxl__sprintf(gc, "%lu.%02d", start_time.tv_sec,(int)start_time.tv_usec/10000); + if (state->pv_ramdisk.path) { + vments[i++] = "image/ramdisk"; + vments[i++] = (char *) state->pv_ramdisk.path; + } + if (state->pv_cmdline) { + vments[i++] = "image/cmdline"; + vments[i++] = (char *) state->pv_cmdline; + } + break; + default: + ret = ERROR_INVAL; + goto out; + } + ret = libxl__build_post(gc, domid, info, state, vments, localents); + if (ret) + goto out; + + if (info->type == LIBXL_DOMAIN_TYPE_HVM) { + ret = asprintf(&state->saved_state, + XC_DEVICE_MODEL_RESTORE_FILE".%d", domid); + ret = (ret < 0) ? ERROR_FAIL : 0; + } + +out: + if (info->type == LIBXL_DOMAIN_TYPE_PV) { + libxl__file_reference_unmap(&state->pv_kernel); + libxl__file_reference_unmap(&state->pv_ramdisk); + } + + esave = errno; + + flags = fcntl(fd, F_GETFL); + if (flags == -1) { + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "unable to get flags on restore fd"); } else { - ret = libxl__domain_build(gc, &d_config->b_info, domid, state); + flags &= ~O_NONBLOCK; + if (fcntl(fd, F_SETFL, flags) == -1) + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "unable to put restore fd" + " back to blocking mode"); } + errno = esave; + domcreate_rebuild_done(egc, dcs, ret); +} + +static void domcreate_rebuild_done(libxl__egc *egc, + libxl__domain_create_state *dcs, + int ret) +{ + STATE_AO_GC(dcs->ao); + int i; + + /* convenience aliases */ + const uint32_t domid = dcs->guest_domid; + libxl_domain_config *const d_config = dcs->guest_config; + libxl__domain_build_state *const state = &dcs->build_state; + libxl_ctx *const ctx = CTX; + if (ret) { LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "cannot (re-)build domain: %d", ret); ret = ERROR_FAIL; diff -r 54e1337048dc -r 0377ed8c274e tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Thu Jun 28 18:43:20 2012 +0100 +++ b/tools/libxl/libxl_dom.c Thu Jun 28 18:43:20 2012 +0100 @@ -19,7 +19,6 @@ #include #include -#include #include @@ -469,7 +468,7 @@ static inline char *restore_helper(libxl domid, phys_offset, node); } -static int libxl__toolstack_restore(uint32_t domid, const uint8_t *buf, +int libxl__toolstack_restore(uint32_t domid, const uint8_t *buf, uint32_t size, void *data) { libxl__gc *gc = data; @@ -524,48 +523,6 @@ static int libxl__toolstack_restore(uint return 0; } -int libxl__domain_restore_common(libxl__gc *gc, uint32_t domid, - libxl_domain_build_info *info, - libxl__domain_build_state *state, - int fd) -{ - libxl_ctx *ctx = libxl__gc_owner(gc); - /* read signature */ - int rc; - int hvm, pae, superpages; - struct restore_callbacks callbacks[1]; - int no_incr_generationid; - switch (info->type) { - case LIBXL_DOMAIN_TYPE_HVM: - hvm = 1; - superpages = 1; - pae = libxl_defbool_val(info->u.hvm.pae); - no_incr_generationid = !libxl_defbool_val(info->u.hvm.incr_generationid); - callbacks->toolstack_restore = libxl__toolstack_restore; - callbacks->data = gc; - break; - case LIBXL_DOMAIN_TYPE_PV: - hvm = 0; - superpages = 0; - pae = 1; - no_incr_generationid = 0; - break; - default: - return ERROR_INVAL; - } - rc = xc_domain_restore(ctx->xch, fd, domid, - state->store_port, &state->store_mfn, - state->store_domid, state->console_port, - &state->console_mfn, state->console_domid, - hvm, pae, superpages, no_incr_generationid, - &state->vm_generationid_addr, callbacks); - if ( rc ) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "restoring domain"); - return ERROR_FAIL; - } - return 0; -} - static int libxl__domain_suspend_common_switch_qemu_logdirty (int domid, unsigned int enable, void *data) { diff -r 54e1337048dc -r 0377ed8c274e tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Thu Jun 28 18:43:20 2012 +0100 +++ b/tools/libxl/libxl_internal.h Thu Jun 28 18:43:20 2012 +0100 @@ -46,6 +46,7 @@ #include #include +#include #include "xentoollog.h" @@ -782,10 +783,8 @@ _hidden int libxl__domain_rename(libxl__ const char *old_name, const char *new_name, xs_transaction_t trans); -_hidden int libxl__domain_restore_common(libxl__gc *gc, uint32_t domid, - libxl_domain_build_info *info, - libxl__domain_build_state *state, - int fd); +_hidden int libxl__toolstack_restore(uint32_t domid, const uint8_t *buf, + uint32_t size, void *data); _hidden const char *libxl__device_model_savefile(libxl__gc *gc, uint32_t domid); _hidden int libxl__domain_suspend_device_model(libxl__gc *gc, uint32_t domid); _hidden int libxl__domain_resume_device_model(libxl__gc *gc, uint32_t domid); @@ -1899,6 +1898,7 @@ struct libxl__domain_create_state { libxl__stub_dm_spawn_state dmss; /* If we're not doing stubdom, we use only dmss.dm, * for the non-stubdom device model. */ + struct restore_callbacks callbacks; }; /*----- Domain suspend (save) functions -----*/ @@ -1908,6 +1908,17 @@ _hidden int libxl__domain_suspend_common int live, int debug, const libxl_domain_remus_info *r_info); +/* calls libxl__xc_domain_restore_done when done */ +_hidden void libxl__xc_domain_restore(libxl__egc *egc, + libxl__domain_create_state *dcs, + int hvm, int pae, int superpages, + int no_incr_generationid); +/* If rc==0 then retval is the return value from xc_domain_save + * and errnoval is the errno value it provided. + * If rc!=0, retval and errnoval are undefined. */ +_hidden void libxl__xc_domain_restore_done(libxl__egc *egc, + libxl__domain_create_state *dcs, + int rc, int retval, int errnoval); /* diff -r 54e1337048dc -r 0377ed8c274e tools/libxl/libxl_save_callout.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/libxl/libxl_save_callout.c Thu Jun 28 18:43:20 2012 +0100 @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2012 Citrix Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; version 2.1 only. with the special + * exception on linking described in file LICENSE. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + */ + +#include "libxl_osdeps.h" + +#include "libxl_internal.h" + +void libxl__xc_domain_restore(libxl__egc *egc, libxl__domain_create_state *dcs, + int hvm, int pae, int superpages, + int no_incr_generationid) +{ + STATE_AO_GC(dcs->ao); + + /* Convenience aliases */ + const uint32_t domid = dcs->guest_domid; + const int restore_fd = dcs->restore_fd; + libxl__domain_build_state *const state = &dcs->build_state; + + int r = xc_domain_restore(CTX->xch, restore_fd, domid, + state->store_port, &state->store_mfn, + state->store_domid, state->console_port, + &state->console_mfn, state->console_domid, + hvm, pae, superpages, no_incr_generationid, + &state->vm_generationid_addr, &dcs->callbacks); + libxl__xc_domain_restore_done(egc, dcs, 0, r, errno); +} _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:24 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw0-0004ls-KU; Wed, 04 Jul 2012 04:11:24 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvy-0004jO-Kr for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:22 +0000 Received: from [85.158.139.83:56130] by server-3.bemta-5.messagelabs.com id BB/81-03367-962C3FF4; Wed, 04 Jul 2012 04:11:21 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-11.tower-182.messagelabs.com!1341375080!23629965!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27141 invoked from network); 4 Jul 2012 04:11:21 -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; 4 Jul 2012 04:11:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvv-0002hv-T9 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGvv-0003rm-SB for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:19 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:19 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: provide libxl__xs_*_checked and libxl__xs_transaction_* X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340905402 -3600 # Node ID 7ccecbe23489598547391983cfc8e0349904c2d8 # Parent d1fe6b6aa97a36c4b52bf78af34a0256ed0d321b libxl: provide libxl__xs_*_checked and libxl__xs_transaction_* These useful utility functions make dealing with xenstore a little less painful. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- diff -r d1fe6b6aa97a -r 7ccecbe23489 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Thu Jun 28 18:43:22 2012 +0100 +++ b/tools/libxl/libxl_internal.h Thu Jun 28 18:43:22 2012 +0100 @@ -498,6 +498,44 @@ _hidden bool libxl__xs_mkdir(libxl__gc * _hidden char *libxl__xs_libxl_path(libxl__gc *gc, uint32_t domid); + +/*----- "checked" xenstore access functions -----*/ +/* Each of these functions will check that it succeeded; if it + * fails it logs and returns ERROR_FAIL. + */ + +/* On success, *result_out came from the gc. + * On error, *result_out is undefined. + * ENOENT counts as success but sets *result_out=0 + */ +int libxl__xs_read_checked(libxl__gc *gc, xs_transaction_t t, + const char *path, const char **result_out); + +/* Does not include a trailing null. + * May usefully be combined with GCSPRINTF if the format string + * behaviour of libxl__xs_write is desirable. */ +int libxl__xs_write_checked(libxl__gc *gc, xs_transaction_t t, + const char *path, const char *string); + +/* ENOENT is not an error (even if the parent directories don't exist) */ +int libxl__xs_rm_checked(libxl__gc *gc, xs_transaction_t t, const char *path); + +/* Transaction functions, best used together. + * The caller should initialise *t to 0 (XBT_NULL) before calling start. + * Each function leaves *t!=0 iff the transaction needs cleaning up. + * + * libxl__xs_transaction_commit returns: + * <0 failure - a libxl error code + * +1 commit conflict; transaction has been destroyed and caller + * must go round again (call _start again and retry) + * 0 committed successfully + */ +int libxl__xs_transaction_start(libxl__gc *gc, xs_transaction_t *t); +int libxl__xs_transaction_commit(libxl__gc *gc, xs_transaction_t *t); +void libxl__xs_transaction_abort(libxl__gc *gc, xs_transaction_t *t); + + + /* * This is a recursive delete, from top to bottom. What this function does * is remove empty folders that contained the deleted entry. diff -r d1fe6b6aa97a -r 7ccecbe23489 tools/libxl/libxl_xshelp.c --- a/tools/libxl/libxl_xshelp.c Thu Jun 28 18:43:22 2012 +0100 +++ b/tools/libxl/libxl_xshelp.c Thu Jun 28 18:43:22 2012 +0100 @@ -135,6 +135,82 @@ char *libxl__xs_libxl_path(libxl__gc *gc return s; } +int libxl__xs_read_checked(libxl__gc *gc, xs_transaction_t t, + const char *path, const char **result_out) +{ + char *result = libxl__xs_read(gc, t, path); + if (!result) { + if (errno != ENOENT) { + LOGE(ERROR, "xenstore read failed: `%s'", path); + return ERROR_FAIL; + } + } + *result_out = result; + return 0; +} + +int libxl__xs_write_checked(libxl__gc *gc, xs_transaction_t t, + const char *path, const char *string) +{ + size_t length = strlen(string); + if (!xs_write(CTX->xsh, t, path, string, length)) { + LOGE(ERROR, "xenstore write failed: `%s' = `%s'", path, string); + return ERROR_FAIL; + } + return 0; +} + +int libxl__xs_rm_checked(libxl__gc *gc, xs_transaction_t t, const char *path) +{ + if (!xs_rm(CTX->xsh, t, path)) { + if (errno == ENOENT) + return 0; + + LOGE(ERROR, "xenstore rm failed: `%s'", path); + return ERROR_FAIL; + } + return 0; +} + +int libxl__xs_transaction_start(libxl__gc *gc, xs_transaction_t *t) +{ + assert(!*t); + *t = xs_transaction_start(CTX->xsh); + if (!*t) { + LOGE(ERROR, "could not create xenstore transaction"); + return ERROR_FAIL; + } + return 0; +} + +int libxl__xs_transaction_commit(libxl__gc *gc, xs_transaction_t *t) +{ + assert(*t); + + if (!xs_transaction_end(CTX->xsh, *t, 0)) { + if (errno == EAGAIN) + return +1; + + *t = 0; + LOGE(ERROR, "could not commit xenstore transaction"); + return ERROR_FAIL; + } + + *t = 0; + return 0; +} + +void libxl__xs_transaction_abort(libxl__gc *gc, xs_transaction_t *t) +{ + if (!*t) + return; + + if (!xs_transaction_end(CTX->xsh, *t, 1)) + LOGE(ERROR, "could not abort xenstore transaction"); + + *t = 0; +} + int libxl__xs_path_cleanup(libxl__gc *gc, xs_transaction_t t, char *user_path) { unsigned int nb = 0; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:24 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw0-0004lD-8S; Wed, 04 Jul 2012 04:11:24 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvx-0004b1-RN for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:22 +0000 Received: from [85.158.143.35:38402] by server-2.bemta-4.messagelabs.com id F0/C5-17938-962C3FF4; Wed, 04 Jul 2012 04:11:21 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-21.messagelabs.com!1341375077!13125693!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25837 invoked from network); 4 Jul 2012 04:11:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvt-0002hi-OX for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGvt-0003qo-NX for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:17 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:17 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: domain restore: reshuffle, preparing for ao X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340905400 -3600 # Node ID 0377ed8c274ee3a036dc3cdc7c6e4c29dee98181 # Parent 54e1337048dce53f4b3f014c51d248e6abf615de libxl: domain restore: reshuffle, preparing for ao We are going to arrange that libxl, instead of calling xc_domain_restore, calls a stub function which forks and execs a helper program, so that restore can be asynchronous rather than blocking the whole toolstack. This stub function will be called libxl__xc_domain_restore. However, its prospective call site is unsuitable for a function which needs to make a callback, and is buried in two nested single-call-site functions which are logically part of the domain creation procedure. So we first abolish those single-call-site functions, integrate their contents into domain creation in their proper temporal order, and break out libxl__xc_domain_restore ready for its reimplementation. No functional change - just the following reorganisation: * Abolish libxl__domain_restore_common, as it had only one caller. Move its contents into (what was) domain_restore. * There is a new stage function domcreate_rebuild_done containing what used to be the bulk of domcreate_bootloader_done, since domcreate_bootloader_done now simply starts the restore (or does the rebuild) and arranges to call the next stage. * Move the contents of domain_restore into its correct place in the domain creation sequence. We put it inside domcreate_bootloader_done, which now either calls libxl__xc_domain_restore which will call the new function domcreate_rebuild_done, or calls domcreate_rebuild_done directly. * Various general-purpose local variables (`i' etc.) and convenience alias variables need to be shuffled about accordingly. * Consequently libxl__toolstack_restore needs to gain external linkage as it is now in a different file to its user. * Move the xc_domain_save callbacks struct from the stack into libxl__domain_create_state. In general the moved code remains almost identical. Two returns in what used to be libxl__domain_restore_common have been changed to set the return value and "goto out", and the call sites for the abolished and new functions have been adjusted. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- diff -r 54e1337048dc -r 0377ed8c274e tools/libxl/Makefile --- a/tools/libxl/Makefile Thu Jun 28 18:43:20 2012 +0100 +++ b/tools/libxl/Makefile Thu Jun 28 18:43:20 2012 +0100 @@ -67,6 +67,7 @@ LIBXL_OBJS = flexarray.o libxl.o libxl_c libxl_dom.o libxl_exec.o libxl_xshelp.o libxl_device.o \ libxl_internal.o libxl_utils.o libxl_uuid.o \ libxl_json.o libxl_aoutils.o \ + libxl_save_callout.o \ libxl_qmp.o libxl_event.o libxl_fork.o $(LIBXL_OBJS-y) LIBXL_OBJS += _libxl_types.o libxl_flask.o _libxl_types_internal.o diff -r 54e1337048dc -r 0377ed8c274e tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Thu Jun 28 18:43:20 2012 +0100 +++ b/tools/libxl/libxl_create.c Thu Jun 28 18:43:20 2012 +0100 @@ -377,89 +377,6 @@ out: return ret; } -static int domain_restore(libxl__gc *gc, libxl_domain_build_info *info, - uint32_t domid, int fd, - libxl__domain_build_state *state) -{ - libxl_ctx *ctx = libxl__gc_owner(gc); - char **vments = NULL, **localents = NULL; - struct timeval start_time; - int i, ret, esave, flags; - - ret = libxl__build_pre(gc, domid, info, state); - if (ret) - goto out; - - ret = libxl__domain_restore_common(gc, domid, info, state, fd); - if (ret) - goto out; - - gettimeofday(&start_time, NULL); - - switch (info->type) { - case LIBXL_DOMAIN_TYPE_HVM: - vments = libxl__calloc(gc, 7, sizeof(char *)); - vments[0] = "rtc/timeoffset"; - vments[1] = (info->u.hvm.timeoffset) ? info->u.hvm.timeoffset : ""; - vments[2] = "image/ostype"; - vments[3] = "hvm"; - vments[4] = "start_time"; - vments[5] = libxl__sprintf(gc, "%lu.%02d", start_time.tv_sec,(int)start_time.tv_usec/10000); - break; - case LIBXL_DOMAIN_TYPE_PV: - vments = libxl__calloc(gc, 11, sizeof(char *)); - i = 0; - vments[i++] = "image/ostype"; - vments[i++] = "linux"; - vments[i++] = "image/kernel"; - vments[i++] = (char *) state->pv_kernel.path; - vments[i++] = "start_time"; - vments[i++] = libxl__sprintf(gc, "%lu.%02d", start_time.tv_sec,(int)start_time.tv_usec/10000); - if (state->pv_ramdisk.path) { - vments[i++] = "image/ramdisk"; - vments[i++] = (char *) state->pv_ramdisk.path; - } - if (state->pv_cmdline) { - vments[i++] = "image/cmdline"; - vments[i++] = (char *) state->pv_cmdline; - } - break; - default: - ret = ERROR_INVAL; - goto out; - } - ret = libxl__build_post(gc, domid, info, state, vments, localents); - if (ret) - goto out; - - if (info->type == LIBXL_DOMAIN_TYPE_HVM) { - ret = asprintf(&state->saved_state, - XC_DEVICE_MODEL_RESTORE_FILE".%d", domid); - ret = (ret < 0) ? ERROR_FAIL : 0; - } - -out: - if (info->type == LIBXL_DOMAIN_TYPE_PV) { - libxl__file_reference_unmap(&state->pv_kernel); - libxl__file_reference_unmap(&state->pv_ramdisk); - } - - esave = errno; - - flags = fcntl(fd, F_GETFL); - if (flags == -1) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "unable to get flags on restore fd"); - } else { - flags &= ~O_NONBLOCK; - if (fcntl(fd, F_SETFL, flags) == -1) - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "unable to put restore fd" - " back to blocking mode"); - } - - errno = esave; - return ret; -} - int libxl__domain_make(libxl__gc *gc, libxl_domain_create_info *info, uint32_t *domid) { @@ -640,10 +557,13 @@ static void domcreate_bootloader_console static void domcreate_bootloader_done(libxl__egc *egc, libxl__bootloader_state *bl, int rc); - static void domcreate_console_available(libxl__egc *egc, libxl__domain_create_state *dcs); +static void domcreate_rebuild_done(libxl__egc *egc, + libxl__domain_create_state *dcs, + int ret); + /* Our own function to clean up and call the user's callback. * The final call in the sequence. */ static void domcreate_complete(libxl__egc *egc, @@ -737,20 +657,20 @@ static void domcreate_console_available( static void domcreate_bootloader_done(libxl__egc *egc, libxl__bootloader_state *bl, - int ret) + int rc) { libxl__domain_create_state *dcs = CONTAINER_OF(bl, *dcs, bl); STATE_AO_GC(bl->ao); - int i; /* convenience aliases */ const uint32_t domid = dcs->guest_domid; libxl_domain_config *const d_config = dcs->guest_config; + libxl_domain_build_info *const info = &d_config->b_info; const int restore_fd = dcs->restore_fd; libxl__domain_build_state *const state = &dcs->build_state; - libxl_ctx *const ctx = CTX; + struct restore_callbacks *const callbacks = &dcs->callbacks; - if (ret) goto error_out; + if (rc) domcreate_rebuild_done(egc, dcs, rc); /* consume bootloader outputs. state->pv_{kernel,ramdisk} have * been initialised by the bootloader already. @@ -766,12 +686,153 @@ static void domcreate_bootloader_done(li dcs->dmss.dm.callback = domcreate_devmodel_started; dcs->dmss.callback = domcreate_devmodel_started; - if ( restore_fd >= 0 ) { - ret = domain_restore(gc, &d_config->b_info, domid, restore_fd, state); + if ( restore_fd < 0 ) { + rc = libxl__domain_build(gc, &d_config->b_info, domid, state); + domcreate_rebuild_done(egc, dcs, rc); + return; + } + + /* Restore */ + + rc = libxl__build_pre(gc, domid, info, state); + if (rc) + goto out; + + /* read signature */ + int hvm, pae, superpages; + int no_incr_generationid; + switch (info->type) { + case LIBXL_DOMAIN_TYPE_HVM: + hvm = 1; + superpages = 1; + pae = libxl_defbool_val(info->u.hvm.pae); + no_incr_generationid = !libxl_defbool_val(info->u.hvm.incr_generationid); + callbacks->toolstack_restore = libxl__toolstack_restore; + callbacks->data = gc; + break; + case LIBXL_DOMAIN_TYPE_PV: + hvm = 0; + superpages = 0; + pae = 1; + no_incr_generationid = 0; + break; + default: + rc = ERROR_INVAL; + goto out; + } + libxl__xc_domain_restore(egc, dcs, + hvm, pae, superpages, no_incr_generationid); + return; + + out: + libxl__xc_domain_restore_done(egc, dcs, rc, 0, 0); +} + +void libxl__xc_domain_restore_done(libxl__egc *egc, + libxl__domain_create_state *dcs, + int ret, int retval, int errnoval) +{ + STATE_AO_GC(dcs->ao); + libxl_ctx *ctx = libxl__gc_owner(gc); + char **vments = NULL, **localents = NULL; + struct timeval start_time; + int i, esave, flags; + + /* convenience aliases */ + const uint32_t domid = dcs->guest_domid; + libxl_domain_config *const d_config = dcs->guest_config; + libxl_domain_build_info *const info = &d_config->b_info; + libxl__domain_build_state *const state = &dcs->build_state; + const int fd = dcs->restore_fd; + + if (ret) + goto out; + + if (retval) { + LOGEV(ERROR, errnoval, "restoring domain"); + ret = ERROR_FAIL; + goto out; + } + + gettimeofday(&start_time, NULL); + + switch (info->type) { + case LIBXL_DOMAIN_TYPE_HVM: + vments = libxl__calloc(gc, 7, sizeof(char *)); + vments[0] = "rtc/timeoffset"; + vments[1] = (info->u.hvm.timeoffset) ? info->u.hvm.timeoffset : ""; + vments[2] = "image/ostype"; + vments[3] = "hvm"; + vments[4] = "start_time"; + vments[5] = libxl__sprintf(gc, "%lu.%02d", start_time.tv_sec,(int)start_time.tv_usec/10000); + break; + case LIBXL_DOMAIN_TYPE_PV: + vments = libxl__calloc(gc, 11, sizeof(char *)); + i = 0; + vments[i++] = "image/ostype"; + vments[i++] = "linux"; + vments[i++] = "image/kernel"; + vments[i++] = (char *) state->pv_kernel.path; + vments[i++] = "start_time"; + vments[i++] = libxl__sprintf(gc, "%lu.%02d", start_time.tv_sec,(int)start_time.tv_usec/10000); + if (state->pv_ramdisk.path) { + vments[i++] = "image/ramdisk"; + vments[i++] = (char *) state->pv_ramdisk.path; + } + if (state->pv_cmdline) { + vments[i++] = "image/cmdline"; + vments[i++] = (char *) state->pv_cmdline; + } + break; + default: + ret = ERROR_INVAL; + goto out; + } + ret = libxl__build_post(gc, domid, info, state, vments, localents); + if (ret) + goto out; + + if (info->type == LIBXL_DOMAIN_TYPE_HVM) { + ret = asprintf(&state->saved_state, + XC_DEVICE_MODEL_RESTORE_FILE".%d", domid); + ret = (ret < 0) ? ERROR_FAIL : 0; + } + +out: + if (info->type == LIBXL_DOMAIN_TYPE_PV) { + libxl__file_reference_unmap(&state->pv_kernel); + libxl__file_reference_unmap(&state->pv_ramdisk); + } + + esave = errno; + + flags = fcntl(fd, F_GETFL); + if (flags == -1) { + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "unable to get flags on restore fd"); } else { - ret = libxl__domain_build(gc, &d_config->b_info, domid, state); + flags &= ~O_NONBLOCK; + if (fcntl(fd, F_SETFL, flags) == -1) + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "unable to put restore fd" + " back to blocking mode"); } + errno = esave; + domcreate_rebuild_done(egc, dcs, ret); +} + +static void domcreate_rebuild_done(libxl__egc *egc, + libxl__domain_create_state *dcs, + int ret) +{ + STATE_AO_GC(dcs->ao); + int i; + + /* convenience aliases */ + const uint32_t domid = dcs->guest_domid; + libxl_domain_config *const d_config = dcs->guest_config; + libxl__domain_build_state *const state = &dcs->build_state; + libxl_ctx *const ctx = CTX; + if (ret) { LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "cannot (re-)build domain: %d", ret); ret = ERROR_FAIL; diff -r 54e1337048dc -r 0377ed8c274e tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Thu Jun 28 18:43:20 2012 +0100 +++ b/tools/libxl/libxl_dom.c Thu Jun 28 18:43:20 2012 +0100 @@ -19,7 +19,6 @@ #include #include -#include #include @@ -469,7 +468,7 @@ static inline char *restore_helper(libxl domid, phys_offset, node); } -static int libxl__toolstack_restore(uint32_t domid, const uint8_t *buf, +int libxl__toolstack_restore(uint32_t domid, const uint8_t *buf, uint32_t size, void *data) { libxl__gc *gc = data; @@ -524,48 +523,6 @@ static int libxl__toolstack_restore(uint return 0; } -int libxl__domain_restore_common(libxl__gc *gc, uint32_t domid, - libxl_domain_build_info *info, - libxl__domain_build_state *state, - int fd) -{ - libxl_ctx *ctx = libxl__gc_owner(gc); - /* read signature */ - int rc; - int hvm, pae, superpages; - struct restore_callbacks callbacks[1]; - int no_incr_generationid; - switch (info->type) { - case LIBXL_DOMAIN_TYPE_HVM: - hvm = 1; - superpages = 1; - pae = libxl_defbool_val(info->u.hvm.pae); - no_incr_generationid = !libxl_defbool_val(info->u.hvm.incr_generationid); - callbacks->toolstack_restore = libxl__toolstack_restore; - callbacks->data = gc; - break; - case LIBXL_DOMAIN_TYPE_PV: - hvm = 0; - superpages = 0; - pae = 1; - no_incr_generationid = 0; - break; - default: - return ERROR_INVAL; - } - rc = xc_domain_restore(ctx->xch, fd, domid, - state->store_port, &state->store_mfn, - state->store_domid, state->console_port, - &state->console_mfn, state->console_domid, - hvm, pae, superpages, no_incr_generationid, - &state->vm_generationid_addr, callbacks); - if ( rc ) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "restoring domain"); - return ERROR_FAIL; - } - return 0; -} - static int libxl__domain_suspend_common_switch_qemu_logdirty (int domid, unsigned int enable, void *data) { diff -r 54e1337048dc -r 0377ed8c274e tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Thu Jun 28 18:43:20 2012 +0100 +++ b/tools/libxl/libxl_internal.h Thu Jun 28 18:43:20 2012 +0100 @@ -46,6 +46,7 @@ #include #include +#include #include "xentoollog.h" @@ -782,10 +783,8 @@ _hidden int libxl__domain_rename(libxl__ const char *old_name, const char *new_name, xs_transaction_t trans); -_hidden int libxl__domain_restore_common(libxl__gc *gc, uint32_t domid, - libxl_domain_build_info *info, - libxl__domain_build_state *state, - int fd); +_hidden int libxl__toolstack_restore(uint32_t domid, const uint8_t *buf, + uint32_t size, void *data); _hidden const char *libxl__device_model_savefile(libxl__gc *gc, uint32_t domid); _hidden int libxl__domain_suspend_device_model(libxl__gc *gc, uint32_t domid); _hidden int libxl__domain_resume_device_model(libxl__gc *gc, uint32_t domid); @@ -1899,6 +1898,7 @@ struct libxl__domain_create_state { libxl__stub_dm_spawn_state dmss; /* If we're not doing stubdom, we use only dmss.dm, * for the non-stubdom device model. */ + struct restore_callbacks callbacks; }; /*----- Domain suspend (save) functions -----*/ @@ -1908,6 +1908,17 @@ _hidden int libxl__domain_suspend_common int live, int debug, const libxl_domain_remus_info *r_info); +/* calls libxl__xc_domain_restore_done when done */ +_hidden void libxl__xc_domain_restore(libxl__egc *egc, + libxl__domain_create_state *dcs, + int hvm, int pae, int superpages, + int no_incr_generationid); +/* If rc==0 then retval is the return value from xc_domain_save + * and errnoval is the errno value it provided. + * If rc!=0, retval and errnoval are undefined. */ +_hidden void libxl__xc_domain_restore_done(libxl__egc *egc, + libxl__domain_create_state *dcs, + int rc, int retval, int errnoval); /* diff -r 54e1337048dc -r 0377ed8c274e tools/libxl/libxl_save_callout.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/libxl/libxl_save_callout.c Thu Jun 28 18:43:20 2012 +0100 @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2012 Citrix Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; version 2.1 only. with the special + * exception on linking described in file LICENSE. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + */ + +#include "libxl_osdeps.h" + +#include "libxl_internal.h" + +void libxl__xc_domain_restore(libxl__egc *egc, libxl__domain_create_state *dcs, + int hvm, int pae, int superpages, + int no_incr_generationid) +{ + STATE_AO_GC(dcs->ao); + + /* Convenience aliases */ + const uint32_t domid = dcs->guest_domid; + const int restore_fd = dcs->restore_fd; + libxl__domain_build_state *const state = &dcs->build_state; + + int r = xc_domain_restore(CTX->xch, restore_fd, domid, + state->store_port, &state->store_mfn, + state->store_domid, state->console_port, + &state->console_mfn, state->console_domid, + hvm, pae, superpages, no_incr_generationid, + &state->vm_generationid_addr, &dcs->callbacks); + libxl__xc_domain_restore_done(egc, dcs, 0, r, errno); +} _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:24 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw0-0004ls-KU; Wed, 04 Jul 2012 04:11:24 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvy-0004jO-Kr for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:22 +0000 Received: from [85.158.139.83:56130] by server-3.bemta-5.messagelabs.com id BB/81-03367-962C3FF4; Wed, 04 Jul 2012 04:11:21 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-11.tower-182.messagelabs.com!1341375080!23629965!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27141 invoked from network); 4 Jul 2012 04:11:21 -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; 4 Jul 2012 04:11:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvv-0002hv-T9 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGvv-0003rm-SB for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:19 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:19 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: provide libxl__xs_*_checked and libxl__xs_transaction_* X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340905402 -3600 # Node ID 7ccecbe23489598547391983cfc8e0349904c2d8 # Parent d1fe6b6aa97a36c4b52bf78af34a0256ed0d321b libxl: provide libxl__xs_*_checked and libxl__xs_transaction_* These useful utility functions make dealing with xenstore a little less painful. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- diff -r d1fe6b6aa97a -r 7ccecbe23489 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Thu Jun 28 18:43:22 2012 +0100 +++ b/tools/libxl/libxl_internal.h Thu Jun 28 18:43:22 2012 +0100 @@ -498,6 +498,44 @@ _hidden bool libxl__xs_mkdir(libxl__gc * _hidden char *libxl__xs_libxl_path(libxl__gc *gc, uint32_t domid); + +/*----- "checked" xenstore access functions -----*/ +/* Each of these functions will check that it succeeded; if it + * fails it logs and returns ERROR_FAIL. + */ + +/* On success, *result_out came from the gc. + * On error, *result_out is undefined. + * ENOENT counts as success but sets *result_out=0 + */ +int libxl__xs_read_checked(libxl__gc *gc, xs_transaction_t t, + const char *path, const char **result_out); + +/* Does not include a trailing null. + * May usefully be combined with GCSPRINTF if the format string + * behaviour of libxl__xs_write is desirable. */ +int libxl__xs_write_checked(libxl__gc *gc, xs_transaction_t t, + const char *path, const char *string); + +/* ENOENT is not an error (even if the parent directories don't exist) */ +int libxl__xs_rm_checked(libxl__gc *gc, xs_transaction_t t, const char *path); + +/* Transaction functions, best used together. + * The caller should initialise *t to 0 (XBT_NULL) before calling start. + * Each function leaves *t!=0 iff the transaction needs cleaning up. + * + * libxl__xs_transaction_commit returns: + * <0 failure - a libxl error code + * +1 commit conflict; transaction has been destroyed and caller + * must go round again (call _start again and retry) + * 0 committed successfully + */ +int libxl__xs_transaction_start(libxl__gc *gc, xs_transaction_t *t); +int libxl__xs_transaction_commit(libxl__gc *gc, xs_transaction_t *t); +void libxl__xs_transaction_abort(libxl__gc *gc, xs_transaction_t *t); + + + /* * This is a recursive delete, from top to bottom. What this function does * is remove empty folders that contained the deleted entry. diff -r d1fe6b6aa97a -r 7ccecbe23489 tools/libxl/libxl_xshelp.c --- a/tools/libxl/libxl_xshelp.c Thu Jun 28 18:43:22 2012 +0100 +++ b/tools/libxl/libxl_xshelp.c Thu Jun 28 18:43:22 2012 +0100 @@ -135,6 +135,82 @@ char *libxl__xs_libxl_path(libxl__gc *gc return s; } +int libxl__xs_read_checked(libxl__gc *gc, xs_transaction_t t, + const char *path, const char **result_out) +{ + char *result = libxl__xs_read(gc, t, path); + if (!result) { + if (errno != ENOENT) { + LOGE(ERROR, "xenstore read failed: `%s'", path); + return ERROR_FAIL; + } + } + *result_out = result; + return 0; +} + +int libxl__xs_write_checked(libxl__gc *gc, xs_transaction_t t, + const char *path, const char *string) +{ + size_t length = strlen(string); + if (!xs_write(CTX->xsh, t, path, string, length)) { + LOGE(ERROR, "xenstore write failed: `%s' = `%s'", path, string); + return ERROR_FAIL; + } + return 0; +} + +int libxl__xs_rm_checked(libxl__gc *gc, xs_transaction_t t, const char *path) +{ + if (!xs_rm(CTX->xsh, t, path)) { + if (errno == ENOENT) + return 0; + + LOGE(ERROR, "xenstore rm failed: `%s'", path); + return ERROR_FAIL; + } + return 0; +} + +int libxl__xs_transaction_start(libxl__gc *gc, xs_transaction_t *t) +{ + assert(!*t); + *t = xs_transaction_start(CTX->xsh); + if (!*t) { + LOGE(ERROR, "could not create xenstore transaction"); + return ERROR_FAIL; + } + return 0; +} + +int libxl__xs_transaction_commit(libxl__gc *gc, xs_transaction_t *t) +{ + assert(*t); + + if (!xs_transaction_end(CTX->xsh, *t, 0)) { + if (errno == EAGAIN) + return +1; + + *t = 0; + LOGE(ERROR, "could not commit xenstore transaction"); + return ERROR_FAIL; + } + + *t = 0; + return 0; +} + +void libxl__xs_transaction_abort(libxl__gc *gc, xs_transaction_t *t) +{ + if (!*t) + return; + + if (!xs_transaction_end(CTX->xsh, *t, 1)) + LOGE(ERROR, "could not abort xenstore transaction"); + + *t = 0; +} + int libxl__xs_path_cleanup(libxl__gc *gc, xs_transaction_t t, char *user_path) { unsigned int nb = 0; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:25 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04: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 1SmGw0-0004m0-NE; Wed, 04 Jul 2012 04:11:24 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvy-0004b1-VA for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:23 +0000 Received: from [85.158.143.35:38463] by server-2.bemta-4.messagelabs.com id 94/C5-17938-A62C3FF4; Wed, 04 Jul 2012 04:11:22 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-21.messagelabs.com!1341375081!14211766!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12560 invoked from network); 4 Jul 2012 04:11:22 -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; 4 Jul 2012 04:11:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvw-0002i4-UI for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGvw-0003sG-TJ for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:20 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:20 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: datacopier: provide "prefix data" facility X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340905403 -3600 # Node ID 59127c03d75c7d7e6556ec545c957660770bddfa # Parent 1883e5c71a87797fbb841a3ee59f166b7a6af09d libxl: datacopier: provide "prefix data" facility This will be used to write the qemu data banner to the save/migration stream. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- diff -r 1883e5c71a87 -r 59127c03d75c tools/libxl/libxl_aoutils.c --- a/tools/libxl/libxl_aoutils.c Thu Jun 28 18:43:23 2012 +0100 +++ b/tools/libxl/libxl_aoutils.c Thu Jun 28 18:43:23 2012 +0100 @@ -74,6 +74,28 @@ static void datacopier_check_state(libxl } } +void libxl__datacopier_prefixdata(libxl__egc *egc, libxl__datacopier_state *dc, + const void *data, size_t len) +{ + libxl__datacopier_buf *buf; + /* + * It is safe for this to be called immediately after _start, as + * is documented in the public comment. _start's caller must have + * the ctx locked, so other threads don't get to mess with the + * contents, and the fd events cannot happen reentrantly. So we + * are guaranteed to beat the first data from the read fd. + */ + + assert(len < dc->maxsz - dc->used); + + buf = libxl__zalloc(0, sizeof(*buf) - sizeof(buf->buf) + len); + buf->used = len; + memcpy(buf->buf, data, len); + + dc->used += len; + LIBXL_TAILQ_INSERT_TAIL(&dc->bufs, buf, entry); +} + 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); diff -r 1883e5c71a87 -r 59127c03d75c tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Thu Jun 28 18:43:23 2012 +0100 +++ b/tools/libxl/libxl_internal.h Thu Jun 28 18:43:23 2012 +0100 @@ -1811,6 +1811,12 @@ _hidden void libxl__datacopier_init(libx _hidden void libxl__datacopier_kill(libxl__datacopier_state *dc); _hidden int libxl__datacopier_start(libxl__datacopier_state *dc); +/* Inserts literal data into the output stream. The data is copied. + * May safely be used only immediately after libxl__datacopier_start + * (before the ctx is unlocked). But may be called multiple times. + * NB exceeding maxsz will fail an assertion! */ +_hidden void libxl__datacopier_prefixdata(libxl__egc*, libxl__datacopier_state*, + const void *data, size_t len); /*----- Save/restore helper (used by creation and suspend) -----*/ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:25 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04: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 1SmGw0-0004m0-NE; Wed, 04 Jul 2012 04:11:24 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvy-0004b1-VA for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:23 +0000 Received: from [85.158.143.35:38463] by server-2.bemta-4.messagelabs.com id 94/C5-17938-A62C3FF4; Wed, 04 Jul 2012 04:11:22 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-21.messagelabs.com!1341375081!14211766!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12560 invoked from network); 4 Jul 2012 04:11:22 -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; 4 Jul 2012 04:11:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvw-0002i4-UI for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGvw-0003sG-TJ for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:20 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:20 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: datacopier: provide "prefix data" facility X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340905403 -3600 # Node ID 59127c03d75c7d7e6556ec545c957660770bddfa # Parent 1883e5c71a87797fbb841a3ee59f166b7a6af09d libxl: datacopier: provide "prefix data" facility This will be used to write the qemu data banner to the save/migration stream. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- diff -r 1883e5c71a87 -r 59127c03d75c tools/libxl/libxl_aoutils.c --- a/tools/libxl/libxl_aoutils.c Thu Jun 28 18:43:23 2012 +0100 +++ b/tools/libxl/libxl_aoutils.c Thu Jun 28 18:43:23 2012 +0100 @@ -74,6 +74,28 @@ static void datacopier_check_state(libxl } } +void libxl__datacopier_prefixdata(libxl__egc *egc, libxl__datacopier_state *dc, + const void *data, size_t len) +{ + libxl__datacopier_buf *buf; + /* + * It is safe for this to be called immediately after _start, as + * is documented in the public comment. _start's caller must have + * the ctx locked, so other threads don't get to mess with the + * contents, and the fd events cannot happen reentrantly. So we + * are guaranteed to beat the first data from the read fd. + */ + + assert(len < dc->maxsz - dc->used); + + buf = libxl__zalloc(0, sizeof(*buf) - sizeof(buf->buf) + len); + buf->used = len; + memcpy(buf->buf, data, len); + + dc->used += len; + LIBXL_TAILQ_INSERT_TAIL(&dc->bufs, buf, entry); +} + 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); diff -r 1883e5c71a87 -r 59127c03d75c tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Thu Jun 28 18:43:23 2012 +0100 +++ b/tools/libxl/libxl_internal.h Thu Jun 28 18:43:23 2012 +0100 @@ -1811,6 +1811,12 @@ _hidden void libxl__datacopier_init(libx _hidden void libxl__datacopier_kill(libxl__datacopier_state *dc); _hidden int libxl__datacopier_start(libxl__datacopier_state *dc); +/* Inserts literal data into the output stream. The data is copied. + * May safely be used only immediately after libxl__datacopier_start + * (before the ctx is unlocked). But may be called multiple times. + * NB exceeding maxsz will fail an assertion! */ +_hidden void libxl__datacopier_prefixdata(libxl__egc*, libxl__datacopier_state*, + const void *data, size_t len); /*----- Save/restore helper (used by creation and suspend) -----*/ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11: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 1SmGw2-0004ou-Ug; Wed, 04 Jul 2012 04:11:26 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvz-0004di-Vn for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:24 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-27.messagelabs.com!1341375076!9877765!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 366 invoked from network); 4 Jul 2012 04:11:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvs-0002hc-NX for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGvs-0003qK-M2 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:16 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:16 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxc: Do not segfault if (e.g.) switch_qemu_logdirty fails X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1340905399 -3600 # Node ID a31a5064552a8762a0dec25307dd4dd46992abeb # Parent b366b34bc159560e4bd8c12eeb3717b5dcb5fe9a libxc: Do not segfault if (e.g.) switch_qemu_logdirty fails In xc_domain_save the local variable `ob' is initialised to NULL. There are then various startup actions. Some of these `goto out' on failure; for example the call to callbacks->switch_qemu_logdirty on l.978. However, out is used both by success and error paths. So it attempts (l.2043) to flush the current output buffer. If ob has not yet been assigned a non-NULL value, this segfaults. So make the call to outbuf_flush conditional on ob. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r b366b34bc159 -r a31a5064552a tools/libxc/xc_domain_save.c --- a/tools/libxc/xc_domain_save.c Thu Jun 28 18:43:19 2012 +0100 +++ b/tools/libxc/xc_domain_save.c Thu Jun 28 18:43:19 2012 +0100 @@ -2040,7 +2040,7 @@ int xc_domain_save(xc_interface *xch, in } /* Flush last write and discard cache for file. */ - if ( outbuf_flush(xch, ob, io_fd) < 0 ) { + if ( ob && outbuf_flush(xch, ob, io_fd) < 0 ) { PERROR("Error when flushing output buffer"); rc = 1; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11: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 1SmGw2-0004ou-Ug; Wed, 04 Jul 2012 04:11:26 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvz-0004di-Vn for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:24 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-27.messagelabs.com!1341375076!9877765!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 366 invoked from network); 4 Jul 2012 04:11:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvs-0002hc-NX for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGvs-0003qK-M2 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:16 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:16 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxc: Do not segfault if (e.g.) switch_qemu_logdirty fails X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1340905399 -3600 # Node ID a31a5064552a8762a0dec25307dd4dd46992abeb # Parent b366b34bc159560e4bd8c12eeb3717b5dcb5fe9a libxc: Do not segfault if (e.g.) switch_qemu_logdirty fails In xc_domain_save the local variable `ob' is initialised to NULL. There are then various startup actions. Some of these `goto out' on failure; for example the call to callbacks->switch_qemu_logdirty on l.978. However, out is used both by success and error paths. So it attempts (l.2043) to flush the current output buffer. If ob has not yet been assigned a non-NULL value, this segfaults. So make the call to outbuf_flush conditional on ob. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r b366b34bc159 -r a31a5064552a tools/libxc/xc_domain_save.c --- a/tools/libxc/xc_domain_save.c Thu Jun 28 18:43:19 2012 +0100 +++ b/tools/libxc/xc_domain_save.c Thu Jun 28 18:43:19 2012 +0100 @@ -2040,7 +2040,7 @@ int xc_domain_save(xc_interface *xch, in } /* Flush last write and discard cache for file. */ - if ( outbuf_flush(xch, ob, io_fd) < 0 ) { + if ( ob && outbuf_flush(xch, ob, io_fd) < 0 ) { PERROR("Error when flushing output buffer"); rc = 1; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11: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 1SmGw3-0004p5-1Y; Wed, 04 Jul 2012 04:11:27 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvz-0004kD-LT for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:24 +0000 Received: from [85.158.139.83:46573] by server-12.bemta-5.messagelabs.com id 6E/7B-25233-A62C3FF4; Wed, 04 Jul 2012 04:11:22 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-182.messagelabs.com!1341375079!25704337!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21685 invoked from network); 4 Jul 2012 04:11:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvu-0002ho-Rz for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGvu-0003rI-Qm for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:18 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:18 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: domain save/restore: run in a separate process X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340905401 -3600 # Node ID 0f1a974bfb38ba55555a4a86a1ccd568aa7be56b # Parent 13c51d101a9dcebb99a710f7dd43767309a172d2 libxl: domain save/restore: run in a separate process libxenctrl expects to be able to simply run the save or restore operation synchronously. This won't work well in a process which is trying to handle multiple domains. The options are: - Block such a whole process (eg, the whole of libvirt) while migration completes (or until it fails). - Create a thread to run xc_domain_save and xc_domain_restore on. This is quite unpalatable. Multithreaded programming is error prone enough without generating threads in libraries, particularly if the thread does some very complex operation. - Fork and run the operation in the child without execing. This is no good because we would need to negotiate with the caller about fds we would inherit (and we might be a very large process). - Fork and exec a helper. Of these options the latter is the most palatable. Consequently: * A new helper program libxl-save-helper (which does both save and restore). It will be installed in /usr/lib/xen/bin. It does not link against libxl, only libxc, and its error handling does not need to be very advanced. It does contain a plumbing through of the logging interface into the callback stream. * A small ad-hoc protocol between the helper and libxl which allows log messages and the libxc callbacks to be passed up and down. Protocol doc comment is in libxl_save_helper.c. * To avoid a lot of tedium the marshalling boilerplate (stubs for the helper and the callback decoder for libxl) is generated with a small perl script. * Implement new functionality to spawn the helper, monitor its output, provide responses, and check on its exit status. * The functions libxl__xc_domain_restore_done and libxl__xc_domain_save_done now turn out to want be called in the same place. So make their state argument a void* so that the two functions are type compatible. The domain save path still writes the qemu savefile synchronously. This will need to be fixed in a subsequent patch. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- diff -r 13c51d101a9d -r 0f1a974bfb38 .gitignore --- a/.gitignore Thu Jun 28 18:43:21 2012 +0100 +++ b/.gitignore Thu Jun 28 18:43:21 2012 +0100 @@ -355,6 +355,7 @@ tools/libxl/_*.[ch] tools/libxl/testidl tools/libxl/testidl.c tools/libxl/*.pyc +tools/libxl/libxl-save-helper tools/blktap2/control/tap-ctl tools/firmware/etherboot/eb-roms.h tools/firmware/etherboot/gpxe-git-snapshot.tar.gz diff -r 13c51d101a9d -r 0f1a974bfb38 .hgignore --- a/.hgignore Thu Jun 28 18:43:21 2012 +0100 +++ b/.hgignore Thu Jun 28 18:43:21 2012 +0100 @@ -180,9 +180,11 @@ ^tools/libxl/_.*\.c$ ^tools/libxl/libxlu_cfg_y\.output$ ^tools/libxl/xl$ +^tools/libxl/libxl-save-helper$ ^tools/libxl/testidl$ ^tools/libxl/testidl\.c$ ^tools/libxl/tmp\..*$ +^tools/libxl/.*\.new$ ^tools/libvchan/vchan-node[12]$ ^tools/libaio/src/.*\.ol$ ^tools/libaio/src/.*\.os$ diff -r 13c51d101a9d -r 0f1a974bfb38 tools/libxl/Makefile --- a/tools/libxl/Makefile Thu Jun 28 18:43:21 2012 +0100 +++ b/tools/libxl/Makefile Thu Jun 28 18:43:21 2012 +0100 @@ -67,25 +67,30 @@ LIBXL_OBJS = flexarray.o libxl.o libxl_c libxl_dom.o libxl_exec.o libxl_xshelp.o libxl_device.o \ libxl_internal.o libxl_utils.o libxl_uuid.o \ libxl_json.o libxl_aoutils.o \ - libxl_save_callout.o \ + libxl_save_callout.o _libxl_save_msgs_callout.o \ libxl_qmp.o libxl_event.o libxl_fork.o $(LIBXL_OBJS-y) LIBXL_OBJS += _libxl_types.o libxl_flask.o _libxl_types_internal.o $(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 +AUTOINCS= libxlu_cfg_y.h libxlu_cfg_l.h _libxl_list.h _paths.h \ + _libxl_save_msgs_callout.h _libxl_save_msgs_helper.h 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 \ libxlu_disk_l.o libxlu_disk.o libxlu_vif.o libxlu_pci.o $(LIBXLU_OBJS): CFLAGS += $(CFLAGS_libxenctrl) # For xentoollog.h -CLIENTS = xl testidl +CLIENTS = xl testidl libxl-save-helper XL_OBJS = xl.o xl_cmdimpl.o xl_cmdtable.o xl_sxp.o $(XL_OBJS): CFLAGS += $(CFLAGS_libxenctrl) # For xentoollog.h $(XL_OBJS): CFLAGS += $(CFLAGS_libxenlight) $(XL_OBJS): CFLAGS += -include $(XEN_ROOT)/tools/config.h # libxl_json.h needs it. +SAVE_HELPER_OBJS = libxl_save_helper.o _libxl_save_msgs_helper.o +$(SAVE_HELPER_OBJS): CFLAGS += $(CFLAGS_libxenctrl) + testidl.o: CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenlight) testidl.c: libxl_types.idl gentest.py libxl.h $(AUTOINCS) $(PYTHON) gentest.py libxl_types.idl testidl.c.new @@ -117,6 +122,12 @@ _libxl_list.h: $(XEN_INCLUDE)/xen-extern perl $^ --prefix=libxl >$@.new $(call move-if-changed,$@.new,$@) +_libxl_save_msgs_helper.c _libxl_save_msgs_callout.c \ +_libxl_save_msgs_helper.h _libxl_save_msgs_callout.h: \ + libxl_save_msgs_gen.pl + $(PERL) -w $< $@ >$@.new + $(call move-if-changed,$@.new,$@) + libxl.h: _libxl_types.h libxl_json.h: _libxl_types_json.h libxl_internal.h: _libxl_types_internal.h _paths.h @@ -159,6 +170,9 @@ libxlutil.a: $(LIBXLU_OBJS) xl: $(XL_OBJS) libxlutil.so libxenlight.so $(CC) $(LDFLAGS) -o $@ $(XL_OBJS) libxlutil.so $(LDLIBS_libxenlight) $(LDLIBS_libxenctrl) -lyajl $(APPEND_LDFLAGS) +libxl-save-helper: $(SAVE_HELPER_OBJS) libxenlight.so + $(CC) $(LDFLAGS) -o $@ $(SAVE_HELPER_OBJS) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(APPEND_LDFLAGS) + testidl: testidl.o libxlutil.so libxenlight.so $(CC) $(LDFLAGS) -o $@ testidl.o libxlutil.so $(LDLIBS_libxenlight) $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS) @@ -169,7 +183,9 @@ install: all $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR) $(INSTALL_DIR) $(DESTDIR)$(BASH_COMPLETION_DIR) $(INSTALL_DIR) $(DESTDIR)$(XEN_RUN_DIR) + $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR) $(INSTALL_PROG) xl $(DESTDIR)$(SBINDIR) + $(INSTALL_PROG) libxl-save-helper $(DESTDIR)$(PRIVATE_BINDIR) $(INSTALL_PROG) libxenlight.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) ln -sf libxenlight.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenlight.so.$(MAJOR) ln -sf libxenlight.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenlight.so diff -r 13c51d101a9d -r 0f1a974bfb38 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Thu Jun 28 18:43:21 2012 +0100 +++ b/tools/libxl/libxl_create.c Thu Jun 28 18:43:21 2012 +0100 @@ -668,7 +668,8 @@ static void domcreate_bootloader_done(li libxl_domain_build_info *const info = &d_config->b_info; const int restore_fd = dcs->restore_fd; libxl__domain_build_state *const state = &dcs->build_state; - struct restore_callbacks *const callbacks = &dcs->callbacks; + libxl__srm_restore_autogen_callbacks *const callbacks = + &dcs->shs.callbacks.restore.a; if (rc) domcreate_rebuild_done(egc, dcs, rc); @@ -708,7 +709,6 @@ static void domcreate_bootloader_done(li pae = libxl_defbool_val(info->u.hvm.pae); no_incr_generationid = !libxl_defbool_val(info->u.hvm.incr_generationid); callbacks->toolstack_restore = libxl__toolstack_restore; - callbacks->data = gc; break; case LIBXL_DOMAIN_TYPE_PV: hvm = 0; @@ -728,10 +728,24 @@ static void domcreate_bootloader_done(li libxl__xc_domain_restore_done(egc, dcs, rc, 0, 0); } -void libxl__xc_domain_restore_done(libxl__egc *egc, - libxl__domain_create_state *dcs, +void libxl__srm_callout_callback_restore_results(unsigned long store_mfn, + unsigned long console_mfn, unsigned long genidad, void *user) +{ + libxl__save_helper_state *shs = user; + libxl__domain_create_state *dcs = CONTAINER_OF(shs, *dcs, shs); + STATE_AO_GC(dcs->ao); + libxl__domain_build_state *const state = &dcs->build_state; + + state->store_mfn = store_mfn; + state->console_mfn = console_mfn; + state->vm_generationid_addr = genidad; + shs->need_results = 0; +} + +void libxl__xc_domain_restore_done(libxl__egc *egc, void *dcs_void, int ret, int retval, int errnoval) { + libxl__domain_create_state *dcs = dcs_void; STATE_AO_GC(dcs->ao); libxl_ctx *ctx = libxl__gc_owner(gc); char **vments = NULL, **localents = NULL; diff -r 13c51d101a9d -r 0f1a974bfb38 tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Thu Jun 28 18:43:21 2012 +0100 +++ b/tools/libxl/libxl_dom.c Thu Jun 28 18:43:21 2012 +0100 @@ -467,16 +467,20 @@ static inline char *restore_helper(libxl } int libxl__toolstack_restore(uint32_t domid, const uint8_t *buf, - uint32_t size, void *data) + uint32_t size, void *user) { - libxl__gc *gc = data; - libxl_ctx *ctx = gc->owner; + libxl__save_helper_state *shs = user; + libxl__domain_create_state *dcs = CONTAINER_OF(shs, *dcs, shs); + STATE_AO_GC(dcs->ao); + libxl_ctx *ctx = CTX; int i, ret; const uint8_t *ptr = buf; uint32_t count = 0, version = 0; struct libxl__physmap_info* pi; char *xs_path; + LOG(DEBUG,"domain=%"PRIu32" toolstack data size=%"PRIu32, domid, size); + if (size < sizeof(version) + sizeof(count)) { LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "wrong size"); return -1; @@ -529,9 +533,10 @@ static void domain_suspend_done(libxl__e /*----- callbacks, called by xc_domain_save -----*/ int libxl__domain_suspend_common_switch_qemu_logdirty - (int domid, unsigned int enable, void *data) + (int domid, unsigned enable, void *user) { - libxl__domain_suspend_state *dss = data; + libxl__save_helper_state *shs = user; + libxl__domain_suspend_state *dss = CONTAINER_OF(shs, *dss, shs); STATE_AO_GC(dss->ao); char *path; bool rc; @@ -597,9 +602,10 @@ int libxl__domain_resume_device_model(li return 0; } -int libxl__domain_suspend_common_callback(void *data) +int libxl__domain_suspend_common_callback(void *user) { - libxl__domain_suspend_state *dss = data; + libxl__save_helper_state *shs = user; + libxl__domain_suspend_state *dss = CONTAINER_OF(shs, *dss, shs); STATE_AO_GC(dss->ao); unsigned long hvm_s_state = 0, hvm_pvdrv = 0; int ret; @@ -739,9 +745,9 @@ static inline char *save_helper(libxl__g } int libxl__toolstack_save(uint32_t domid, uint8_t **buf, - uint32_t *len, void *data) + uint32_t *len, void *dss_void) { - libxl__domain_suspend_state *dss = data; + libxl__domain_suspend_state *dss = dss_void; STATE_AO_GC(dss->ao); int i = 0; char *start_addr = NULL, *size = NULL, *phys_offset = NULL, *name = NULL; @@ -810,6 +816,8 @@ int libxl__toolstack_save(uint32_t domid ptr += sizeof(struct libxl__physmap_info) + namelen; } + LOG(DEBUG,"domain=%"PRIu32" toolstack data size=%"PRIu32, domid, *len); + return 0; } @@ -823,7 +831,8 @@ static int libxl__remus_domain_suspend_c static int libxl__remus_domain_resume_callback(void *data) { - libxl__domain_suspend_state *dss = data; + libxl__save_helper_state *shs = data; + libxl__domain_suspend_state *dss = CONTAINER_OF(shs, *dss, shs); STATE_AO_GC(dss->ao); /* Resumes the domain and the device model */ @@ -836,7 +845,8 @@ static int libxl__remus_domain_resume_ca static int libxl__remus_domain_checkpoint_callback(void *data) { - libxl__domain_suspend_state *dss = data; + libxl__save_helper_state *shs = data; + libxl__domain_suspend_state *dss = CONTAINER_OF(shs, *dss, shs); STATE_AO_GC(dss->ao); /* This would go into tailbuf. */ @@ -864,7 +874,8 @@ void libxl__domain_suspend(libxl__egc *e const int live = dss->live; const int debug = dss->debug; const libxl_domain_remus_info *const r_info = dss->remus; - struct save_callbacks *const callbacks = &dss->callbacks; + libxl__srm_save_autogen_callbacks *const callbacks = + &dss->shs.callbacks.save.a; switch (type) { case LIBXL_DOMAIN_TYPE_HVM: { @@ -925,8 +936,7 @@ void libxl__domain_suspend(libxl__egc *e callbacks->suspend = libxl__domain_suspend_common_callback; callbacks->switch_qemu_logdirty = libxl__domain_suspend_common_switch_qemu_logdirty; - callbacks->toolstack_save = libxl__toolstack_save; - callbacks->data = dss; + dss->shs.callbacks.save.toolstack_save = libxl__toolstack_save; libxl__xc_domain_save(egc, dss, vm_generationid_addr); return; @@ -935,10 +945,10 @@ void libxl__domain_suspend(libxl__egc *e domain_suspend_done(egc, dss, rc); } -void libxl__xc_domain_save_done(libxl__egc *egc, - libxl__domain_suspend_state *dss, +void libxl__xc_domain_save_done(libxl__egc *egc, void *dss_void, int rc, int retval, int errnoval) { + libxl__domain_suspend_state *dss = dss_void; STATE_AO_GC(dss->ao); /* Convenience aliases */ diff -r 13c51d101a9d -r 0f1a974bfb38 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Thu Jun 28 18:43:21 2012 +0100 +++ b/tools/libxl/libxl_internal.h Thu Jun 28 18:43:21 2012 +0100 @@ -54,6 +54,7 @@ #include "libxl.h" #include "_paths.h" +#include "_libxl_save_msgs_callout.h" #if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1) #define _hidden __attribute__((visibility("hidden"))) @@ -1773,6 +1774,51 @@ _hidden void libxl__datacopier_kill(libx _hidden int libxl__datacopier_start(libxl__datacopier_state *dc); +/*----- Save/restore helper (used by creation and suspend) -----*/ + +typedef struct libxl__srm_save_callbacks { + libxl__srm_save_autogen_callbacks a; + int (*toolstack_save)(uint32_t domid, uint8_t **buf, + uint32_t *len, void *data); +} libxl__srm_save_callbacks; + +typedef struct libxl__srm_restore_callbacks { + libxl__srm_restore_autogen_callbacks a; +} libxl__srm_restore_callbacks; + +/* a pointer to this struct is also passed as "user" to the + * save callout helper callback functions */ +typedef struct libxl__save_helper_state { + /* public, caller of run_helper initialises */ + libxl__ao *ao; + uint32_t domid; + union { + libxl__srm_save_callbacks save; + libxl__srm_restore_callbacks restore; + } callbacks; + int (*recv_callback)(const unsigned char *msg, uint32_t len, void *user); + void (*completion_callback)(libxl__egc *egc, void *caller_state, + int rc, int retval, int errnoval); + void *caller_state; + int need_results; /* set to 0 or 1 by caller of run_helper; + * if set to 1 then the ultimate caller's + * results function must set it to 0 */ + /* private */ + int rc; + int completed; /* retval/errnoval valid iff completed */ + int retval, errnoval; /* from xc_domain_save / xc_domain_restore */ + libxl__carefd *pipes[2]; /* 0 = helper's stdin, 1 = helper's stdout */ + libxl__ev_fd readable; + libxl__ev_child child; + const char *stdin_what, *stdout_what; + FILE *toolstack_data_file; + + libxl__egc *egc; /* valid only for duration of each event callback; + * is here in this struct for the benefit of the + * marshalling and xc callback functions */ +} libxl__save_helper_state; + + /*----- Domain suspend (save) state structure -----*/ typedef struct libxl__domain_suspend_state libxl__domain_suspend_state; @@ -1798,7 +1844,7 @@ struct libxl__domain_suspend_state { int xcflags; int guest_responded; int interval; /* checkpoint interval (for Remus) */ - struct save_callbacks callbacks; + libxl__save_helper_state shs; }; @@ -1910,7 +1956,7 @@ struct libxl__domain_create_state { libxl__stub_dm_spawn_state dmss; /* If we're not doing stubdom, we use only dmss.dm, * for the non-stubdom device model. */ - struct restore_callbacks callbacks; + libxl__save_helper_state shs; }; /*----- Domain suspend (save) functions -----*/ @@ -1926,8 +1972,7 @@ _hidden void libxl__xc_domain_save(libxl /* If rc==0 then retval is the return value from xc_domain_save * and errnoval is the errno value it provided. * If rc!=0, retval and errnoval are undefined. */ -_hidden void libxl__xc_domain_save_done(libxl__egc*, - libxl__domain_suspend_state*, +_hidden void libxl__xc_domain_save_done(libxl__egc*, void *dss_void, int rc, int retval, int errnoval); _hidden int libxl__domain_suspend_common_callback(void *data); @@ -1945,8 +1990,7 @@ _hidden void libxl__xc_domain_restore(li /* If rc==0 then retval is the return value from xc_domain_save * and errnoval is the errno value it provided. * If rc!=0, retval and errnoval are undefined. */ -_hidden void libxl__xc_domain_restore_done(libxl__egc *egc, - libxl__domain_create_state *dcs, +_hidden void libxl__xc_domain_restore_done(libxl__egc *egc, void *dcs_void, int rc, int retval, int errnoval); diff -r 13c51d101a9d -r 0f1a974bfb38 tools/libxl/libxl_save_callout.c --- a/tools/libxl/libxl_save_callout.c Thu Jun 28 18:43:21 2012 +0100 +++ b/tools/libxl/libxl_save_callout.c Thu Jun 28 18:43:21 2012 +0100 @@ -16,6 +16,30 @@ #include "libxl_internal.h" +/* stream_fd is as from the caller (eventually, the application). + * It may be 0, 1 or 2, in which case we need to dup it elsewhere. + * The actual fd value is not included in the supplied argnums; rather + * it will be automatically supplied by run_helper as the 2nd argument. + * + * preserve_fds are fds that the caller is intending to pass to the + * helper so which need cloexec clearing. They may not be 0, 1 or 2. + * An entry may be -1 in which case it will be ignored. + */ +static void run_helper(libxl__egc *egc, libxl__save_helper_state *shs, + const char *mode_arg, + int stream_fd, + const int *preserve_fds, int num_preserve_fds, + const unsigned long *argnums, int num_argnums); + +static void helper_failed(libxl__egc*, libxl__save_helper_state *shs, int rc); +static void helper_stdout_readable(libxl__egc *egc, libxl__ev_fd *ev, + int fd, short events, short revents); +static void helper_exited(libxl__egc *egc, libxl__ev_child *ch, + pid_t pid, int status); +static void helper_done(libxl__egc *egc, libxl__save_helper_state *shs); + +/*----- entrypoints -----*/ + void libxl__xc_domain_restore(libxl__egc *egc, libxl__domain_create_state *dcs, int hvm, int pae, int superpages, int no_incr_generationid) @@ -27,22 +51,337 @@ void libxl__xc_domain_restore(libxl__egc const int restore_fd = dcs->restore_fd; libxl__domain_build_state *const state = &dcs->build_state; - int r = xc_domain_restore(CTX->xch, restore_fd, domid, - state->store_port, &state->store_mfn, - state->store_domid, state->console_port, - &state->console_mfn, state->console_domid, - hvm, pae, superpages, no_incr_generationid, - &state->vm_generationid_addr, &dcs->callbacks); - libxl__xc_domain_restore_done(egc, dcs, 0, r, errno); + unsigned cbflags = libxl__srm_callout_enumcallbacks_restore + (&dcs->shs.callbacks.restore.a); + + const unsigned long argnums[] = { + domid, + state->store_port, + state->store_domid, state->console_port, + state->console_domid, + hvm, pae, superpages, no_incr_generationid, + cbflags, + }; + + dcs->shs.ao = ao; + dcs->shs.domid = domid; + dcs->shs.recv_callback = libxl__srm_callout_received_restore; + dcs->shs.completion_callback = libxl__xc_domain_restore_done; + dcs->shs.caller_state = dcs; + dcs->shs.need_results = 1; + dcs->shs.toolstack_data_file = 0; + + run_helper(egc, &dcs->shs, "--restore-domain", restore_fd, 0,0, + argnums, ARRAY_SIZE(argnums)); } void libxl__xc_domain_save(libxl__egc *egc, libxl__domain_suspend_state *dss, unsigned long vm_generationid_addr) { STATE_AO_GC(dss->ao); - int r; + int r, rc, toolstack_data_fd = -1; + uint32_t toolstack_data_len = 0; - r = xc_domain_save(CTX->xch, dss->fd, dss->domid, 0, 0, dss->xcflags, - &dss->callbacks, dss->hvm, vm_generationid_addr); - libxl__xc_domain_save_done(egc, dss, 0, r, errno); + /* Resources we need to free */ + uint8_t *toolstack_data_buf = 0; + + unsigned cbflags = libxl__srm_callout_enumcallbacks_save + (&dss->shs.callbacks.save.a); + + if (dss->shs.callbacks.save.toolstack_save) { + r = dss->shs.callbacks.save.toolstack_save + (dss->domid, &toolstack_data_buf, &toolstack_data_len, dss); + if (r) { rc = ERROR_FAIL; goto out; } + + dss->shs.toolstack_data_file = tmpfile(); + if (!dss->shs.toolstack_data_file) { + LOGE(ERROR, "cannot create toolstack data tmpfile"); + rc = ERROR_FAIL; + goto out; + } + toolstack_data_fd = fileno(dss->shs.toolstack_data_file); + + r = libxl_write_exactly(CTX, toolstack_data_fd, + toolstack_data_buf, toolstack_data_len, + "toolstack data tmpfile", 0); + if (r) { rc = ERROR_FAIL; goto out; } + } + + const unsigned long argnums[] = { + dss->domid, 0, 0, dss->xcflags, dss->hvm, vm_generationid_addr, + toolstack_data_fd, toolstack_data_len, + cbflags, + }; + + dss->shs.ao = ao; + dss->shs.domid = dss->domid; + dss->shs.recv_callback = libxl__srm_callout_received_save; + dss->shs.completion_callback = libxl__xc_domain_save_done; + dss->shs.caller_state = dss; + dss->shs.need_results = 0; + + free(toolstack_data_buf); + + run_helper(egc, &dss->shs, "--save-domain", dss->fd, + &toolstack_data_fd, 1, + argnums, ARRAY_SIZE(argnums)); + return; + + out: + free(toolstack_data_buf); + if (dss->shs.toolstack_data_file) fclose(dss->shs.toolstack_data_file); + + libxl__xc_domain_save_done(egc, dss, rc, 0, 0); } + + +/*----- helper execution -----*/ + +static void run_helper(libxl__egc *egc, libxl__save_helper_state *shs, + const char *mode_arg, int stream_fd, + const int *preserve_fds, int num_preserve_fds, + const unsigned long *argnums, int num_argnums) +{ + STATE_AO_GC(shs->ao); + const char *args[4 + num_argnums]; + const char **arg = args; + int i, rc; + + /* Resources we must free */ + libxl__carefd *childs_pipes[2] = { 0,0 }; + + /* Convenience aliases */ + const uint32_t domid = shs->domid; + + shs->rc = 0; + shs->completed = 0; + shs->pipes[0] = shs->pipes[1] = 0; + libxl__ev_fd_init(&shs->readable); + libxl__ev_child_init(&shs->child); + + shs->stdin_what = GCSPRINTF("domain %"PRIu32" save/restore helper" + " stdin pipe", domid); + shs->stdout_what = GCSPRINTF("domain %"PRIu32" save/restore helper" + " stdout pipe", domid); + + *arg++ = getenv("LIBXL_SAVE_HELPER") ?: LIBEXEC "/" "libxl-save-helper"; + *arg++ = mode_arg; + const char **stream_fd_arg = arg++; + for (i=0; ipipes[childfd] = libxl__carefd_record(CTX, fds[our_end]); + } + libxl__carefd_unlock(); + + pid_t pid = libxl__ev_child_fork(gc, &shs->child, helper_exited); + if (!pid) { + if (stream_fd <= 2) { + stream_fd = dup(stream_fd); + if (stream_fd < 0) { + LOGE(ERROR,"dup migration stream fd"); + exit(-1); + } + } + libxl_fd_set_cloexec(CTX, stream_fd, 0); + *stream_fd_arg = GCSPRINTF("%d", stream_fd); + + for (i=0; i= 0) { + assert(preserve_fds[i] > 2); + libxl_fd_set_cloexec(CTX, preserve_fds[i], 0); + } + + libxl__exec(gc, + libxl__carefd_fd(childs_pipes[0]), + libxl__carefd_fd(childs_pipes[1]), + -1, + args[0], (char**)args, 0); + } + + libxl__carefd_close(childs_pipes[0]); + libxl__carefd_close(childs_pipes[1]); + + rc = libxl__ev_fd_register(gc, &shs->readable, helper_stdout_readable, + libxl__carefd_fd(shs->pipes[1]), POLLIN|POLLPRI); + if (rc) goto out; + return; + + out: + libxl__carefd_close(childs_pipes[0]); + libxl__carefd_close(childs_pipes[1]); + helper_failed(egc, shs, rc);; +} + +static void helper_failed(libxl__egc *egc, libxl__save_helper_state *shs, + int rc) +{ + STATE_AO_GC(shs->ao); + + if (!shs->rc) + shs->rc = rc; + + libxl__ev_fd_deregister(gc, &shs->readable); + + if (!libxl__ev_child_inuse(&shs->child)) { + helper_done(egc, shs); + return; + } + + int r = kill(shs->child.pid, SIGKILL); + if (r) LOGE(WARN, "failed to kill save/restore helper [%lu]", + (unsigned long)shs->child.pid); +} + +static void helper_stdout_readable(libxl__egc *egc, libxl__ev_fd *ev, + int fd, short events, short revents) +{ + libxl__save_helper_state *shs = CONTAINER_OF(ev, *shs, readable); + STATE_AO_GC(shs->ao); + int rc, errnoval; + + if (revents & (POLLERR|POLLPRI)) { + LOG(ERROR, "%s signaled POLLERR|POLLPRI (%#x)", + shs->stdout_what, revents); + rc = ERROR_FAIL; + out: + /* this is here because otherwise we bypass the decl of msg[] */ + helper_failed(egc, shs, rc); + return; + } + + uint16_t msglen; + errnoval = libxl_read_exactly(CTX, fd, &msglen, sizeof(msglen), + shs->stdout_what, "ipc msg header"); + if (errnoval) { rc = ERROR_FAIL; goto out; } + + unsigned char msg[msglen]; + errnoval = libxl_read_exactly(CTX, fd, msg, msglen, + shs->stdout_what, "ipc msg body"); + if (errnoval) { rc = ERROR_FAIL; goto out; } + + shs->egc = egc; + shs->recv_callback(msg, msglen, shs); + shs->egc = 0; + return; +} + +static void helper_exited(libxl__egc *egc, libxl__ev_child *ch, + pid_t pid, int status) +{ + libxl__save_helper_state *shs = CONTAINER_OF(ch, *shs, child); + STATE_AO_GC(shs->ao); + + /* Convenience aliases */ + const uint32_t domid = shs->domid; + + const char *what = + GCSPRINTF("domain %"PRIu32" save/restore helper", domid); + + if (status) { + libxl_report_child_exitstatus(CTX, XTL_ERROR, what, pid, status); + shs->rc = ERROR_FAIL; + } + + if (shs->need_results) { + if (!shs->rc) + LOG(ERROR,"%s exited without providing results",what); + shs->rc = ERROR_FAIL; + } + + if (!shs->completed) { + if (!shs->rc) + LOG(ERROR,"%s exited without signaling completion",what); + shs->rc = ERROR_FAIL; + } + + helper_done(egc, shs); + return; +} + +static void helper_done(libxl__egc *egc, libxl__save_helper_state *shs) +{ + STATE_AO_GC(shs->ao); + + libxl__ev_fd_deregister(gc, &shs->readable); + libxl__carefd_close(shs->pipes[0]); shs->pipes[0] = 0; + libxl__carefd_close(shs->pipes[1]); shs->pipes[1] = 0; + assert(!libxl__ev_child_inuse(&shs->child)); + if (shs->toolstack_data_file) fclose(shs->toolstack_data_file); + + shs->egc = egc; + shs->completion_callback(egc, shs->caller_state, + shs->rc, shs->retval, shs->errnoval); + shs->egc = 0; +} + +/*----- generic helpers for the autogenerated code -----*/ + +const libxl__srm_save_autogen_callbacks* +libxl__srm_callout_get_callbacks_save(void *user) +{ + libxl__save_helper_state *shs = user; + return &shs->callbacks.save.a; +} + +const libxl__srm_restore_autogen_callbacks* +libxl__srm_callout_get_callbacks_restore(void *user) +{ + libxl__save_helper_state *shs = user; + return &shs->callbacks.restore.a; +} + +void libxl__srm_callout_sendreply(int r, void *user) +{ + libxl__save_helper_state *shs = user; + libxl__egc *egc = shs->egc; + STATE_AO_GC(shs->ao); + int errnoval; + + errnoval = libxl_write_exactly(CTX, libxl__carefd_fd(shs->pipes[0]), + &r, sizeof(r), shs->stdin_what, + "callback return value"); + if (errnoval) + helper_failed(egc, shs, ERROR_FAIL); +} + +void libxl__srm_callout_callback_log(uint32_t level, uint32_t errnoval, + const char *context, const char *formatted, void *user) +{ + libxl__save_helper_state *shs = user; + STATE_AO_GC(shs->ao); + xtl_log(CTX->lg, level, errnoval, context, "%s", formatted); +} + +void libxl__srm_callout_callback_progress(const char *context, + const char *doing_what, unsigned long done, + unsigned long total, void *user) +{ + libxl__save_helper_state *shs = user; + STATE_AO_GC(shs->ao); + xtl_progress(CTX->lg, context, doing_what, done, total); +} + +int libxl__srm_callout_callback_complete(int retval, int errnoval, + void *user) +{ + libxl__save_helper_state *shs = user; + STATE_AO_GC(shs->ao); + + shs->completed = 1; + shs->retval = retval; + shs->errnoval = errnoval; + libxl__ev_fd_deregister(gc, &shs->readable); + return 0; +} diff -r 13c51d101a9d -r 0f1a974bfb38 tools/libxl/libxl_save_helper.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/libxl/libxl_save_helper.c Thu Jun 28 18:43:21 2012 +0100 @@ -0,0 +1,283 @@ +/* + * Copyright (C) 2012 Citrix Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; version 2.1 only. with the special + * exception on linking described in file LICENSE. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + */ + +/* + * The libxl-save-helper utility speaks a protocol to its caller for + * the callbacks. The protocol is as follows. + * + * The helper talks on stdin and stdout, in binary in machine + * endianness. The helper speaks first, and only when it has a + * callback to make. It writes a 16-bit number being the message + * length, and then the message body. + * + * Each message starts with a 16-bit number indicating which of the + * messages it is, and then some arguments in a binary marshalled form. + * If the callback does not need a reply (it returns void), the helper + * just continues. Otherwise the helper waits for its caller to send a + * single int which is to be the return value from the callback. + * + * Where feasible the stubs and callbacks have prototypes identical to + * those required by xc_domain_save and xc_domain_restore, so that the + * autogenerated functions can be used/provided directly. + * + * The actual messages are in the array @msgs in libxl_save_msgs_gen.pl + */ + +#include "libxl_osdeps.h" + +#include +#include +#include +#include + +#include "libxl.h" + +#include "xenctrl.h" +#include "xenguest.h" +#include "_libxl_save_msgs_helper.h" + +/*----- globals -----*/ + +static const char *program = "libxl-save-helper"; +static xentoollog_logger *logger; +static xc_interface *xch; + +/*----- error handling -----*/ + +static void fail(int errnoval, const char *fmt, ...) + __attribute__((noreturn,format(printf,2,3))); +static void fail(int errnoval, const char *fmt, ...) +{ + va_list al; + va_start(al,fmt); + xtl_logv(logger,XTL_ERROR,errnoval,program,fmt,al); + exit(-1); +} + +static int read_exactly(int fd, void *buf, size_t len) +/* returns 0 if we get eof, even if we got it midway through; 1 if ok */ +{ + while (len) { + ssize_t r = read(fd, buf, len); + if (r<=0) return r; + assert(r <= len); + len -= r; + buf = (char*)buf + r; + } + return 1; +} + +static void *xmalloc(size_t sz) +{ + if (!sz) return 0; + void *r = malloc(sz); + if (!r) { perror("memory allocation failed"); exit(-1); } + return r; +} + +/*----- logger -----*/ + +typedef struct { + xentoollog_logger vtable; +} xentoollog_logger_tellparent; + +static void tellparent_vmessage(xentoollog_logger *logger_in, + xentoollog_level level, + int errnoval, + const char *context, + const char *format, + va_list al) +{ + char *formatted; + int r = vasprintf(&formatted, format, al); + if (r < 0) { perror("memory allocation failed during logging"); exit(-1); } + helper_stub_log(level, errnoval, context, formatted, 0); + free(formatted); +} + +static void tellparent_progress(struct xentoollog_logger *logger_in, + const char *context, + const char *doing_what, int percent, + unsigned long done, unsigned long total) +{ + helper_stub_progress(context, doing_what, done, total, 0); +} + +static void tellparent_destroy(struct xentoollog_logger *logger_in) +{ + abort(); +} + +static xentoollog_logger_tellparent *createlogger_tellparent(void) +{ + xentoollog_logger_tellparent newlogger; + return XTL_NEW_LOGGER(tellparent, newlogger); +} + +/*----- helper functions called by autogenerated stubs -----*/ + +unsigned char * helper_allocbuf(int len, void *user) +{ + return xmalloc(len); +} + +static void transmit(const unsigned char *msg, int len, void *user) +{ + while (len) { + int r = write(1, msg, len); + if (r<0) { perror("write"); exit(-1); } + assert(r >= 0); + assert(r <= len); + len -= r; + msg += r; + } +} + +void helper_transmitmsg(unsigned char *msg_freed, int len_in, void *user) +{ + assert(len_in < 64*1024); + uint16_t len = len_in; + transmit((const void*)&len, sizeof(len), user); + transmit(msg_freed, len, user); + free(msg_freed); +} + +int helper_getreply(void *user) +{ + int v; + int r = read_exactly(0, &v, sizeof(v)); + if (r<=0) exit(-2); + return v; +} + +/*----- other callbacks -----*/ + +static int toolstack_save_fd; +static uint32_t toolstack_save_len; + +static int toolstack_save_cb(uint32_t domid, uint8_t **buf, + uint32_t *len, void *data) +{ + assert(toolstack_save_fd > 0); + + int r = lseek(toolstack_save_fd, 0, SEEK_SET); + if (r) fail(errno,"rewind toolstack data tmpfile"); + + *buf = xmalloc(toolstack_save_len); + r = read_exactly(toolstack_save_fd, *buf, toolstack_save_len); + if (r<0) fail(errno,"read toolstack data"); + if (r==0) fail(0,"read toolstack data eof"); + + *len = toolstack_save_len; + return 0; +} + +static void startup(const char *op) { + logger = (xentoollog_logger*)createlogger_tellparent(); + if (!logger) { + fprintf(stderr, "%s: cannot initialise logger\n", program); + exit(-1); + } + + xtl_log(logger,XTL_DEBUG,0,program,"starting %s",op); + + xch = xc_interface_open(logger,logger,0); + if (!xch) fail(errno,"xc_interface_open failed"); +} + +static void complete(int retval) { + int errnoval = retval ? errno : 0; /* suppress irrelevant errnos */ + xtl_log(logger,XTL_DEBUG,errnoval,program,"complete r=%d",retval); + helper_stub_complete(retval,errnoval,0); + exit(0); +} + +static struct save_callbacks helper_save_callbacks; +static struct restore_callbacks helper_restore_callbacks; + +int main(int argc, char **argv) +{ + int r; + +#define NEXTARG (++argv, assert(*argv), *argv) + + const char *mode = *++argv; + assert(mode); + + if (!strcmp(mode,"--save-domain")) { + + int io_fd = atoi(NEXTARG); + uint32_t dom = strtoul(NEXTARG,0,10); + uint32_t max_iters = strtoul(NEXTARG,0,10); + uint32_t max_factor = strtoul(NEXTARG,0,10); + uint32_t flags = strtoul(NEXTARG,0,10); + int hvm = atoi(NEXTARG); + unsigned long genidad = strtoul(NEXTARG,0,10); + toolstack_save_fd = atoi(NEXTARG); + toolstack_save_len = strtoul(NEXTARG,0,10); + unsigned cbflags = strtoul(NEXTARG,0,10); + assert(!*++argv); + + if (toolstack_save_fd >= 0) + helper_save_callbacks.toolstack_save = toolstack_save_cb; + + helper_setcallbacks_save(&helper_save_callbacks, cbflags); + + startup("save"); + r = xc_domain_save(xch, io_fd, dom, max_iters, max_factor, flags, + &helper_save_callbacks, hvm, genidad); + complete(r); + + } else if (!strcmp(mode,"--restore-domain")) { + + int io_fd = atoi(NEXTARG); + uint32_t dom = strtoul(NEXTARG,0,10); + unsigned store_evtchn = strtoul(NEXTARG,0,10); + domid_t store_domid = strtoul(NEXTARG,0,10); + unsigned console_evtchn = strtoul(NEXTARG,0,10); + domid_t console_domid = strtoul(NEXTARG,0,10); + unsigned int hvm = strtoul(NEXTARG,0,10); + unsigned int pae = strtoul(NEXTARG,0,10); + int superpages = strtoul(NEXTARG,0,10); + int no_incr_genidad = strtoul(NEXTARG,0,10); + unsigned cbflags = strtoul(NEXTARG,0,10); + assert(!*++argv); + + helper_setcallbacks_restore(&helper_restore_callbacks, cbflags); + + unsigned long store_mfn = 0; + unsigned long console_mfn = 0; + unsigned long genidad = 0; + + startup("restore"); + r = xc_domain_restore(xch, io_fd, dom, store_evtchn, &store_mfn, + store_domid, console_evtchn, &console_mfn, + console_domid, hvm, pae, superpages, + no_incr_genidad, &genidad, + &helper_restore_callbacks); + helper_stub_restore_results(store_mfn,console_mfn,genidad,0); + complete(r); + + } else { + assert(!"unexpected mode argument"); + } +} + +/* + * Local variables: + * mode: C + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff -r 13c51d101a9d -r 0f1a974bfb38 tools/libxl/libxl_save_msgs_gen.pl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/libxl/libxl_save_msgs_gen.pl Thu Jun 28 18:43:21 2012 +0100 @@ -0,0 +1,397 @@ +#!/usr/bin/perl -w + +use warnings; +use strict; +use POSIX; + +our $debug = 0; # produce copious debugging output at run-time? + +our @msgs = ( + # flags: + # s - applicable to save + # r - applicable to restore + # c - function pointer in callbacks struct rather than fixed function + # x - function pointer is in struct {save,restore}_callbacks + # and its null-ness needs to be passed through to the helper's xc + # W - needs a return value; callback is synchronous + [ 1, 'sr', "log", [qw(uint32_t level + uint32_t errnoval + STRING context + STRING formatted)] ], + [ 2, 'sr', "progress", [qw(STRING context + STRING doing_what), + 'unsigned long', 'done', + 'unsigned long', 'total'] ], + [ 3, 'scxW', "suspend", [] ], + [ 4, 'scxW', "postcopy", [] ], + [ 5, 'scxW', "checkpoint", [] ], + [ 6, 'scxW', "switch_qemu_logdirty", [qw(int domid + unsigned enable)] ], + # toolstack_save done entirely `by hand' + [ 7, 'rcxW', "toolstack_restore", [qw(uint32_t domid + BLOCK tsdata)] ], + [ 8, 'r', "restore_results", ['unsigned long', 'store_mfn', + 'unsigned long', 'console_mfn', + 'unsigned long', 'genidad'] ], + [ 9, 'srW', "complete", [qw(int retval + int errnoval)] ], +); + +#---------------------------------------- + +our %cbs; +our %func; +our %func_ah; +our @outfuncs; +our %out_decls; +our %out_body; +our %msgnum_used; + +die unless @ARGV==1; +die if $ARGV[0] =~ m/^-/; + +our ($intendedout) = @ARGV; + +$intendedout =~ m/([a-z]+)\.([ch])$/ or die; +my ($want_ah, $ch) = ($1, $2); + +my $declprefix = ''; + +foreach my $ah (qw(callout helper)) { + $out_body{$ah} .= + < +#include +#include +#include +END_BOTH + +#include "libxl_internal.h" + +END_CALLOUT + +#include "_libxl_save_msgs_${ah}.h" +#include +#include + +END_HELPER +} + +die $want_ah unless defined $out_body{$want_ah}; + +sub f_decl ($$$$) { + my ($name, $ah, $c_rtype, $c_decl) = @_; + $out_decls{$name} = "${declprefix}$c_rtype $name$c_decl;\n"; + $func{$name} = "$c_rtype $name$c_decl\n{\n" . ($func{$name} || ''); + $func_ah{$name} = $ah; +} + +sub f_more ($$) { + my ($name, $addbody) = @_; + $func{$name} ||= ''; + $func{$name} .= $addbody; + push @outfuncs, $name; +} + +our $libxl = "libxl__srm"; +our $callback = "${libxl}_callout_callback"; +our $receiveds = "${libxl}_callout_received"; +our $sendreply = "${libxl}_callout_sendreply"; +our $getcallbacks = "${libxl}_callout_get_callbacks"; +our $enumcallbacks = "${libxl}_callout_enumcallbacks"; +sub cbtype ($) { "${libxl}_".$_[0]."_autogen_callbacks"; }; + +f_decl($sendreply, 'callout', 'void', "(int r, void *user)"); + +our $helper = "helper"; +our $encode = "${helper}_stub"; +our $allocbuf = "${helper}_allocbuf"; +our $transmit = "${helper}_transmitmsg"; +our $getreply = "${helper}_getreply"; +our $setcallbacks = "${helper}_setcallbacks"; + +f_decl($allocbuf, 'helper', 'unsigned char *', '(int len, void *user)'); +f_decl($transmit, 'helper', 'void', + '(unsigned char *msg_freed, int len, void *user)'); +f_decl($getreply, 'helper', 'int', '(void *user)'); + +sub typeid ($) { my ($t) = @_; $t =~ s/\W/_/; return $t; }; + +$out_body{'callout'} .= <($sr); + f_more("${fnamebase}_${sr}", $contents); + } + }; + + $f_more_sr->(" case $msgnum: { /* $name */\n"); + if ($flags =~ m/W/) { + $f_more_sr->(" int r;\n"); + } + + my $c_rtype_helper = $flags =~ m/W/ ? 'int' : 'void'; + my $c_rtype_callout = $flags =~ m/W/ ? 'int' : 'void'; + my $c_decl = '('; + my $c_callback_args = ''; + + f_more("${encode}_$name", + <(" const char *$arg;\n"); + } elsif ($argtype eq 'BLOCK') { + $c_decl .= "const uint8_t *$arg, uint32_t ${arg}_size, "; + $c_args .= ", ${arg}_size"; + $c_get_args .= ",&${arg}_size"; + $f_more_sr->(" const uint8_t *$arg;\n". + " uint32_t ${arg}_size;\n"); + } else { + $c_decl .= "$argtype $arg, "; + $f_more_sr->(" $argtype $arg;\n"); + } + $c_callback_args .= "$c_args, "; + $c_recv.= + " if (!${typeid}_get(&msg,endmsg,$c_get_args)) return 0;\n"; + f_more("${encode}_$name", " ${typeid}_put(buf, &len, $c_args);\n"); + } + $f_more_sr->($c_recv); + $c_decl .= "void *user)"; + $c_callback_args .= "user"; + + $f_more_sr->(" if (msg != endmsg) return 0;\n"); + + my $c_callback; + if ($flags !~ m/c/) { + $c_callback = "${callback}_$name"; + } else { + $f_more_sr->(sub { + my ($sr) = @_; + $cbs{$sr} .= " $c_rtype_callout (*${name})$c_decl;\n"; + return + " const ".cbtype($sr)." *const cbs =\n". + " ${getcallbacks}_${sr}(user);\n"; + }); + $c_callback = "cbs->${name}"; + } + my $c_make_callback = "$c_callback($c_callback_args)"; + if ($flags !~ m/W/) { + $f_more_sr->(" $c_make_callback;\n"); + } else { + $f_more_sr->(" r = $c_make_callback;\n". + " $sendreply(r, user);\n"); + f_decl($sendreply, 'callout', 'void', '(int r, void *user)'); + } + if ($flags =~ m/x/) { + my $c_v = "(1u<<$msgnum)"; + my $c_cb = "cbs->$name"; + $f_more_sr->(" if ($c_cb) cbflags |= $c_v;\n", $enumcallbacks); + $f_more_sr->(" $c_cb = (cbflags & $c_v) ? ${encode}_${name} : 0;\n", + $setcallbacks); + } + $f_more_sr->(" return 1;\n }\n\n"); + f_decl("${callback}_$name", 'callout', $c_rtype_callout, $c_decl); + f_decl("${encode}_$name", 'helper', $c_rtype_helper, $c_decl); + f_more("${encode}_$name", +" if (buf) break; + buf = ${helper}_allocbuf(len, user); + assert(buf); + allocd = len; + len = 0; + } + assert(len == allocd); + ${transmit}(buf, len, user); +"); + if ($flags =~ m/W/) { + f_more("${encode}_$name", + (< Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11: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 1SmGw3-0004pP-98; Wed, 04 Jul 2012 04:11:27 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw0-0004kN-Gm for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:24 +0000 Received: from [85.158.138.51:37019] by server-8.bemta-3.messagelabs.com id C6/CB-06157-B62C3FF4; Wed, 04 Jul 2012 04:11:23 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-174.messagelabs.com!1341375081!29729063!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14407 invoked from network); 4 Jul 2012 04:11:22 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvx-0002iA-Ei for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGvx-0003sV-Df for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:21 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:20 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: prepare for asynchronous writing of qemu save 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 Jackson # Date 1340905404 -3600 # Node ID 68c4625cfb415beb8d78138e8d121cc7e719ed77 # Parent 59127c03d75c7d7e6556ec545c957660770bddfa libxl: prepare for asynchronous writing of qemu save file * Combine the various calls to libxl__device_model_savefile into one at the start of libxl__domain_suspend, storing the result in the dss. Consequently a few functions take a dss instead of some or all of their other arguments. * Make libxl__domain_save_device_model's API into an asynchronous style which takes a callback. The function is, however, still synchronous; it will be made actually async in the next patch. * Consequently make libxl__remus_domain_checkpoint_callback into an asynchronous callback. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 59127c03d75c -r 68c4625cfb41 tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Thu Jun 28 18:43:23 2012 +0100 +++ b/tools/libxl/libxl_dom.c Thu Jun 28 18:43:24 2012 +0100 @@ -705,11 +705,13 @@ static void switch_logdirty_done(libxl__ /*----- callbacks, called by xc_domain_save -----*/ -int libxl__domain_suspend_device_model(libxl__gc *gc, uint32_t domid) +int libxl__domain_suspend_device_model(libxl__gc *gc, + libxl__domain_suspend_state *dss) { libxl_ctx *ctx = libxl__gc_owner(gc); int ret = 0; - const char *filename = libxl__device_model_savefile(gc, domid); + uint32_t const domid = dss->domid; + const char *const filename = dss->dm_savefile; switch (libxl__device_model_version_running(gc, domid)) { case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: { @@ -878,7 +880,7 @@ int libxl__domain_suspend_common_callbac guest_suspended: if (dss->hvm) { - ret = libxl__domain_suspend_device_model(gc, dss->domid); + ret = libxl__domain_suspend_device_model(gc, dss); if (ret) { LOG(ERROR, "libxl__domain_suspend_device_model failed ret=%d", ret); return 0; @@ -994,20 +996,33 @@ static int libxl__remus_domain_resume_ca return 1; } -static int libxl__remus_domain_checkpoint_callback(void *data) +/*----- remus asynchronous checkpoint callback -----*/ + +static void remus_checkpoint_dm_saved(libxl__egc *egc, + libxl__domain_suspend_state *dss, int rc); + +static void libxl__remus_domain_checkpoint_callback(void *data) { libxl__save_helper_state *shs = data; libxl__domain_suspend_state *dss = CONTAINER_OF(shs, *dss, shs); + libxl__egc *egc = dss->shs.egc; STATE_AO_GC(dss->ao); /* This would go into tailbuf. */ - if (dss->hvm && - libxl__domain_save_device_model(gc, dss->domid, dss->fd)) - return 0; + if (dss->hvm) { + libxl__domain_save_device_model(egc, dss, remus_checkpoint_dm_saved); + } else { + remus_checkpoint_dm_saved(egc, dss, 0); + } +} +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 */ usleep(dss->interval * 1000); - return 1; + libxl__xc_domain_saverestore_async_callback_done(egc, &dss->shs, 1); } /*----- main code for suspending, in order of execution -----*/ @@ -1057,6 +1072,7 @@ void libxl__domain_suspend(libxl__egc *e dss->suspend_eventchn = -1; dss->guest_responded = 0; + dss->dm_savefile = libxl__device_model_savefile(gc, domid); if (r_info != NULL) { dss->interval = r_info->interval; @@ -1106,7 +1122,6 @@ void libxl__xc_domain_save_done(libxl__e /* Convenience aliases */ const libxl_domain_type type = dss->type; - const uint32_t domid = dss->domid; if (rc) goto out; @@ -1124,11 +1139,11 @@ void libxl__xc_domain_save_done(libxl__e } if (type == LIBXL_DOMAIN_TYPE_HVM) { - rc = libxl__domain_suspend_device_model(gc, domid); + rc = libxl__domain_suspend_device_model(gc, dss); if (rc) goto out; - rc = libxl__domain_save_device_model(gc, domid, dss->fd); - if (rc) goto out; + libxl__domain_save_device_model(egc, dss, domain_suspend_done); + return; } rc = 0; @@ -1137,14 +1152,22 @@ out: domain_suspend_done(egc, dss, rc); } -int libxl__domain_save_device_model(libxl__gc *gc, uint32_t domid, int fd) +void libxl__domain_save_device_model(libxl__egc *egc, + libxl__domain_suspend_state *dss, + libxl__save_device_model_cb *callback) { + STATE_AO_GC(dss->ao); int rc, fd2 = -1, c; char buf[1024]; - const char *filename = libxl__device_model_savefile(gc, domid); struct stat st; uint32_t qemu_state_len; + dss->save_dm_callback = callback; + + /* Convenience aliases */ + const char *const filename = dss->dm_savefile; + const int fd = dss->fd; + if (stat(filename, &st) < 0) { LOG(ERROR, "Unable to stat qemu save file\n"); @@ -1186,7 +1209,8 @@ int libxl__domain_save_device_model(libx out: if (fd2 >= 0) close(fd2); unlink(filename); - return rc; + + dss->save_dm_callback(egc, dss, rc); } static void domain_suspend_done(libxl__egc *egc, diff -r 59127c03d75c -r 68c4625cfb41 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Thu Jun 28 18:43:23 2012 +0100 +++ b/tools/libxl/libxl_internal.h Thu Jun 28 18:43:24 2012 +0100 @@ -824,10 +824,8 @@ _hidden int libxl__domain_rename(libxl__ _hidden int libxl__toolstack_restore(uint32_t domid, const uint8_t *buf, uint32_t size, void *data); -_hidden const char *libxl__device_model_savefile(libxl__gc *gc, uint32_t domid); -_hidden int libxl__domain_suspend_device_model(libxl__gc *gc, uint32_t domid); _hidden int libxl__domain_resume_device_model(libxl__gc *gc, uint32_t domid); -_hidden int libxl__domain_save_device_model(libxl__gc *gc, uint32_t domid, int fd); + _hidden void libxl__userdata_destroyall(libxl__gc *gc, uint32_t domid); _hidden int libxl__domain_pvcontrol_available(libxl__gc *gc, uint32_t domid); @@ -1869,6 +1867,8 @@ typedef struct libxl__domain_suspend_sta typedef void libxl__domain_suspend_cb(libxl__egc*, libxl__domain_suspend_state*, int rc); +typedef void libxl__save_device_model_cb(libxl__egc*, + libxl__domain_suspend_state*, int rc); typedef struct libxl__logdirty_switch { const char *cmd; @@ -1895,9 +1895,12 @@ struct libxl__domain_suspend_state { int hvm; int xcflags; int guest_responded; + const char *dm_savefile; int interval; /* checkpoint interval (for Remus) */ libxl__save_helper_state shs; libxl__logdirty_switch logdirty; + /* private for libxl__domain_save_device_model */ + libxl__save_device_model_cb *save_dm_callback; }; @@ -2053,6 +2056,15 @@ _hidden void libxl__xc_domain_restore(li _hidden void libxl__xc_domain_restore_done(libxl__egc *egc, void *dcs_void, int rc, int retval, int errnoval); +/* Each time the dm needs to be saved, we must call suspend and then save */ +_hidden int libxl__domain_suspend_device_model(libxl__gc *gc, + libxl__domain_suspend_state *dss); +_hidden void libxl__domain_save_device_model(libxl__egc *egc, + libxl__domain_suspend_state *dss, + libxl__save_device_model_cb *callback); + +_hidden const char *libxl__device_model_savefile(libxl__gc *gc, uint32_t domid); + /* * Convenience macros. diff -r 59127c03d75c -r 68c4625cfb41 tools/libxl/libxl_save_msgs_gen.pl --- a/tools/libxl/libxl_save_msgs_gen.pl Thu Jun 28 18:43:23 2012 +0100 +++ b/tools/libxl/libxl_save_msgs_gen.pl Thu Jun 28 18:43:24 2012 +0100 @@ -25,7 +25,7 @@ our @msgs = ( 'unsigned long', 'total'] ], [ 3, 'scxW', "suspend", [] ], [ 4, 'scxW', "postcopy", [] ], - [ 5, 'scxW', "checkpoint", [] ], + [ 5, 'scxA', "checkpoint", [] ], [ 6, 'scxA', "switch_qemu_logdirty", [qw(int domid unsigned enable)] ], # toolstack_save done entirely `by hand' _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11: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 1SmGw3-0004pB-4i; Wed, 04 Jul 2012 04:11:27 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvz-0004k6-Go for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:24 +0000 Received: from [85.158.139.83:56159] by server-5.bemta-5.messagelabs.com id E7/4B-02722-A62C3FF4; Wed, 04 Jul 2012 04:11:22 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-182.messagelabs.com!1341375080!19596546!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14359 invoked from network); 4 Jul 2012 04:11:21 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvw-0002hy-Dq for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGvw-0003s1-Cr for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:20 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:19 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: wait for qemu to acknowledge logdirty command X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1340905403 -3600 # Node ID 1883e5c71a87797fbb841a3ee59f166b7a6af09d # Parent 7ccecbe23489598547391983cfc8e0349904c2d8 libxl: wait for qemu to acknowledge logdirty command The current migration code in libxl instructs qemu to start or stop logdirty, but it does not wait for an acknowledgement from qemu before continuing. This might lead to memory corruption (!) Fix this by waiting for qemu to acknowledge the command. Unfortunately the necessary ao arrangements for waiting for this command are unique because qemu has a special protocol for this particular operation. Also, this change means that the switch_qemu_logdirty callback implementation in libxl can no longer synchronously produce its return value, as it now needs to wait for xenstore. So we tell the marshalling code generator that it is a message which does not need a reply. This turns the callback function called by the marshaller into one which returns void; the callback function arranges to later explicitly sends the reply to the helper, when the xs watch triggers and the appropriate value is read from xenstore. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- diff -r 7ccecbe23489 -r 1883e5c71a87 tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Thu Jun 28 18:43:22 2012 +0100 +++ b/tools/libxl/libxl_dom.c Thu Jun 28 18:43:23 2012 +0100 @@ -530,30 +530,181 @@ int libxl__toolstack_restore(uint32_t do static void domain_suspend_done(libxl__egc *egc, libxl__domain_suspend_state *dss, int rc); -/*----- callbacks, called by xc_domain_save -----*/ +/*----- complicated callback, called by xc_domain_save -----*/ -int libxl__domain_suspend_common_switch_qemu_logdirty +/* + * We implement the other end of protocol for controlling qemu-dm's + * logdirty. There is no documentation for this protocol, but our + * counterparty's implementation is in + * qemu-xen-traditional.git:xenstore.c in the function + * xenstore_process_logdirty_event + */ + +static void switch_logdirty_timeout(libxl__egc *egc, libxl__ev_time *ev, + const struct timeval *requested_abs); +static void switch_logdirty_xswatch(libxl__egc *egc, libxl__ev_xswatch*, + const char *watch_path, const char *event_path); +static void switch_logdirty_done(libxl__egc *egc, + libxl__domain_suspend_state *dss, int ok); + +static void logdirty_init(libxl__logdirty_switch *lds) +{ + lds->cmd_path = 0; + libxl__ev_xswatch_init(&lds->watch); + libxl__ev_time_init(&lds->timeout); +} + +void libxl__domain_suspend_common_switch_qemu_logdirty (int domid, unsigned enable, void *user) { libxl__save_helper_state *shs = user; + libxl__egc *egc = shs->egc; libxl__domain_suspend_state *dss = CONTAINER_OF(shs, *dss, shs); + libxl__logdirty_switch *lds = &dss->logdirty; STATE_AO_GC(dss->ao); - char *path; - bool rc; + int rc; + xs_transaction_t t = 0; + const char *got; - path = libxl__sprintf(gc, + if (!lds->cmd_path) { + lds->cmd_path = GCSPRINTF( "/local/domain/0/device-model/%u/logdirty/cmd", domid); - if (!path) - return 1; + lds->ret_path = GCSPRINTF( + "/local/domain/0/device-model/%u/logdirty/ret", domid); + } + lds->cmd = enable ? "enable" : "disable"; - if (enable) - rc = xs_write(CTX->xsh, XBT_NULL, path, "enable", strlen("enable")); - else - rc = xs_write(CTX->xsh, XBT_NULL, path, "disable", strlen("disable")); + rc = libxl__ev_xswatch_register(gc, &lds->watch, + switch_logdirty_xswatch, lds->ret_path); + if (rc) goto out; - return rc ? 0 : 1; + rc = libxl__ev_time_register_rel(gc, &lds->timeout, + switch_logdirty_timeout, 10*1000); + if (rc) goto out; + + for (;;) { + rc = libxl__xs_transaction_start(gc, &t); + if (rc) goto out; + + rc = libxl__xs_read_checked(gc, t, lds->cmd_path, &got); + if (rc) goto out; + + if (got) { + const char *got_ret; + rc = libxl__xs_read_checked(gc, t, lds->ret_path, &got_ret); + if (rc) goto out; + + if (strcmp(got, got_ret)) { + LOG(ERROR,"controlling logdirty: qemu was already sent" + " command `%s' (xenstore path `%s') but result is `%s'", + got, lds->cmd_path, got_ret ? got_ret : ""); + rc = ERROR_FAIL; + goto out; + } + rc = libxl__xs_rm_checked(gc, t, lds->cmd_path); + if (rc) goto out; + } + + rc = libxl__xs_rm_checked(gc, t, lds->ret_path); + if (rc) goto out; + + rc = libxl__xs_write_checked(gc, t, lds->cmd_path, lds->cmd); + if (rc) goto out; + + rc = libxl__xs_transaction_commit(gc, &t); + if (!rc) break; + if (rc<0) goto out; + } + + /* OK, wait for some callback */ + return; + + out: + LOG(ERROR,"logdirty switch failed (rc=%d), aborting suspend",rc); + switch_logdirty_done(egc,dss,-1); } +static void switch_logdirty_timeout(libxl__egc *egc, libxl__ev_time *ev, + const struct timeval *requested_abs) +{ + libxl__domain_suspend_state *dss = CONTAINER_OF(ev, *dss, logdirty.timeout); + STATE_AO_GC(dss->ao); + LOG(ERROR,"logdirty switch: wait for device model timed out"); + switch_logdirty_done(egc,dss,-1); +} + +static void switch_logdirty_xswatch(libxl__egc *egc, libxl__ev_xswatch *watch, + const char *watch_path, const char *event_path) +{ + libxl__domain_suspend_state *dss = + CONTAINER_OF(watch, *dss, logdirty.watch); + libxl__logdirty_switch *lds = &dss->logdirty; + STATE_AO_GC(dss->ao); + const char *got; + xs_transaction_t t = 0; + int rc; + + for (;;) { + rc = libxl__xs_transaction_start(gc, &t); + if (rc) goto out; + + rc = libxl__xs_read_checked(gc, t, lds->ret_path, &got); + if (rc) goto out; + + if (!got) { + rc = +1; + goto out; + } + + if (strcmp(got, lds->cmd)) { + LOG(ERROR,"logdirty switch: sent command `%s' but got reply `%s'" + " (xenstore paths `%s' / `%s')", lds->cmd, got, + lds->cmd_path, lds->ret_path); + rc = ERROR_FAIL; + goto out; + } + + rc = libxl__xs_rm_checked(gc, t, lds->cmd_path); + if (rc) goto out; + + rc = libxl__xs_rm_checked(gc, t, lds->ret_path); + if (rc) goto out; + + rc = libxl__xs_transaction_commit(gc, &t); + if (!rc) break; + if (rc<0) goto out; + } + + out: + /* rc < 0: error + * rc == 0: ok, we are done + * rc == +1: need to keep waiting + */ + libxl__xs_transaction_abort(gc, &t); + + if (!rc) { + switch_logdirty_done(egc,dss,0); + } else if (rc < 0) { + LOG(ERROR,"logdirty switch: failed (rc=%d)",rc); + switch_logdirty_done(egc,dss,-1); + } +} + +static void switch_logdirty_done(libxl__egc *egc, + libxl__domain_suspend_state *dss, + int broke) +{ + STATE_AO_GC(dss->ao); + libxl__logdirty_switch *lds = &dss->logdirty; + + libxl__ev_xswatch_deregister(gc, &lds->watch); + libxl__ev_time_deregister(gc, &lds->timeout); + + libxl__xc_domain_saverestore_async_callback_done(egc, &dss->shs, broke); +} + +/*----- callbacks, called by xc_domain_save -----*/ + int libxl__domain_suspend_device_model(libxl__gc *gc, uint32_t domid) { libxl_ctx *ctx = libxl__gc_owner(gc); @@ -877,6 +1028,8 @@ void libxl__domain_suspend(libxl__egc *e libxl__srm_save_autogen_callbacks *const callbacks = &dss->shs.callbacks.save.a; + logdirty_init(&dss->logdirty); + switch (type) { case LIBXL_DOMAIN_TYPE_HVM: { char *path; diff -r 7ccecbe23489 -r 1883e5c71a87 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Thu Jun 28 18:43:22 2012 +0100 +++ b/tools/libxl/libxl_internal.h Thu Jun 28 18:43:23 2012 +0100 @@ -1864,6 +1864,14 @@ typedef struct libxl__domain_suspend_sta typedef void libxl__domain_suspend_cb(libxl__egc*, libxl__domain_suspend_state*, int rc); +typedef struct libxl__logdirty_switch { + const char *cmd; + const char *cmd_path; + const char *ret_path; + libxl__ev_xswatch watch; + libxl__ev_time timeout; +} libxl__logdirty_switch; + struct libxl__domain_suspend_state { /* set by caller of libxl__domain_suspend */ libxl__ao *ao; @@ -1883,6 +1891,7 @@ struct libxl__domain_suspend_state { int guest_responded; int interval; /* checkpoint interval (for Remus) */ libxl__save_helper_state shs; + libxl__logdirty_switch logdirty; }; @@ -2013,8 +2022,15 @@ _hidden void libxl__xc_domain_save(libxl _hidden void libxl__xc_domain_save_done(libxl__egc*, void *dss_void, int rc, int retval, int errnoval); +/* Used by asynchronous callbacks: ie ones which xc regards as + * returning a value, but which we want to handle asynchronously. + * Such functions' actual callback function return void in libxl + * When they are ready to indicate completion, they call this. */ +void libxl__xc_domain_saverestore_async_callback_done(libxl__egc *egc, + libxl__save_helper_state *shs, int return_value); + _hidden int libxl__domain_suspend_common_callback(void *data); -_hidden int libxl__domain_suspend_common_switch_qemu_logdirty +_hidden void libxl__domain_suspend_common_switch_qemu_logdirty (int domid, unsigned int enable, void *data); _hidden int libxl__toolstack_save(uint32_t domid, uint8_t **buf, uint32_t *len, void *data); diff -r 7ccecbe23489 -r 1883e5c71a87 tools/libxl/libxl_save_callout.c --- a/tools/libxl/libxl_save_callout.c Thu Jun 28 18:43:22 2012 +0100 +++ b/tools/libxl/libxl_save_callout.c Thu Jun 28 18:43:23 2012 +0100 @@ -135,6 +135,14 @@ void libxl__xc_domain_save(libxl__egc *e } +void libxl__xc_domain_saverestore_async_callback_done(libxl__egc *egc, + libxl__save_helper_state *shs, int return_value) +{ + shs->egc = egc; + libxl__srm_callout_sendreply(return_value, shs); + shs->egc = 0; +} + /*----- helper execution -----*/ static void run_helper(libxl__egc *egc, libxl__save_helper_state *shs, diff -r 7ccecbe23489 -r 1883e5c71a87 tools/libxl/libxl_save_msgs_gen.pl --- a/tools/libxl/libxl_save_msgs_gen.pl Thu Jun 28 18:43:22 2012 +0100 +++ b/tools/libxl/libxl_save_msgs_gen.pl Thu Jun 28 18:43:23 2012 +0100 @@ -14,6 +14,7 @@ our @msgs = ( # x - function pointer is in struct {save,restore}_callbacks # and its null-ness needs to be passed through to the helper's xc # W - needs a return value; callback is synchronous + # A - needs a return value; callback is asynchronous [ 1, 'sr', "log", [qw(uint32_t level uint32_t errnoval STRING context @@ -25,7 +26,7 @@ our @msgs = ( [ 3, 'scxW', "suspend", [] ], [ 4, 'scxW', "postcopy", [] ], [ 5, 'scxW', "checkpoint", [] ], - [ 6, 'scxW', "switch_qemu_logdirty", [qw(int domid + [ 6, 'scxA', "switch_qemu_logdirty", [qw(int domid unsigned enable)] ], # toolstack_save done entirely `by hand' [ 7, 'rcxW', "toolstack_restore", [qw(uint32_t domid @@ -262,7 +263,7 @@ foreach my $msginfo (@msgs) { $f_more_sr->(" int r;\n"); } - my $c_rtype_helper = $flags =~ m/W/ ? 'int' : 'void'; + my $c_rtype_helper = $flags =~ m/[WA]/ ? 'int' : 'void'; my $c_rtype_callout = $flags =~ m/W/ ? 'int' : 'void'; my $c_decl = '('; my $c_callback_args = ''; @@ -351,7 +352,7 @@ END_ALWAYS assert(len == allocd); ${transmit}(buf, len, user); "); - if ($flags =~ m/W/) { + if ($flags =~ m/[WA]/) { f_more("${encode}_$name", (< Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11: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 1SmGw3-0004pB-4i; Wed, 04 Jul 2012 04:11:27 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvz-0004k6-Go for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:24 +0000 Received: from [85.158.139.83:56159] by server-5.bemta-5.messagelabs.com id E7/4B-02722-A62C3FF4; Wed, 04 Jul 2012 04:11:22 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-182.messagelabs.com!1341375080!19596546!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14359 invoked from network); 4 Jul 2012 04:11:21 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvw-0002hy-Dq for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGvw-0003s1-Cr for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:20 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:19 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: wait for qemu to acknowledge logdirty command X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1340905403 -3600 # Node ID 1883e5c71a87797fbb841a3ee59f166b7a6af09d # Parent 7ccecbe23489598547391983cfc8e0349904c2d8 libxl: wait for qemu to acknowledge logdirty command The current migration code in libxl instructs qemu to start or stop logdirty, but it does not wait for an acknowledgement from qemu before continuing. This might lead to memory corruption (!) Fix this by waiting for qemu to acknowledge the command. Unfortunately the necessary ao arrangements for waiting for this command are unique because qemu has a special protocol for this particular operation. Also, this change means that the switch_qemu_logdirty callback implementation in libxl can no longer synchronously produce its return value, as it now needs to wait for xenstore. So we tell the marshalling code generator that it is a message which does not need a reply. This turns the callback function called by the marshaller into one which returns void; the callback function arranges to later explicitly sends the reply to the helper, when the xs watch triggers and the appropriate value is read from xenstore. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- diff -r 7ccecbe23489 -r 1883e5c71a87 tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Thu Jun 28 18:43:22 2012 +0100 +++ b/tools/libxl/libxl_dom.c Thu Jun 28 18:43:23 2012 +0100 @@ -530,30 +530,181 @@ int libxl__toolstack_restore(uint32_t do static void domain_suspend_done(libxl__egc *egc, libxl__domain_suspend_state *dss, int rc); -/*----- callbacks, called by xc_domain_save -----*/ +/*----- complicated callback, called by xc_domain_save -----*/ -int libxl__domain_suspend_common_switch_qemu_logdirty +/* + * We implement the other end of protocol for controlling qemu-dm's + * logdirty. There is no documentation for this protocol, but our + * counterparty's implementation is in + * qemu-xen-traditional.git:xenstore.c in the function + * xenstore_process_logdirty_event + */ + +static void switch_logdirty_timeout(libxl__egc *egc, libxl__ev_time *ev, + const struct timeval *requested_abs); +static void switch_logdirty_xswatch(libxl__egc *egc, libxl__ev_xswatch*, + const char *watch_path, const char *event_path); +static void switch_logdirty_done(libxl__egc *egc, + libxl__domain_suspend_state *dss, int ok); + +static void logdirty_init(libxl__logdirty_switch *lds) +{ + lds->cmd_path = 0; + libxl__ev_xswatch_init(&lds->watch); + libxl__ev_time_init(&lds->timeout); +} + +void libxl__domain_suspend_common_switch_qemu_logdirty (int domid, unsigned enable, void *user) { libxl__save_helper_state *shs = user; + libxl__egc *egc = shs->egc; libxl__domain_suspend_state *dss = CONTAINER_OF(shs, *dss, shs); + libxl__logdirty_switch *lds = &dss->logdirty; STATE_AO_GC(dss->ao); - char *path; - bool rc; + int rc; + xs_transaction_t t = 0; + const char *got; - path = libxl__sprintf(gc, + if (!lds->cmd_path) { + lds->cmd_path = GCSPRINTF( "/local/domain/0/device-model/%u/logdirty/cmd", domid); - if (!path) - return 1; + lds->ret_path = GCSPRINTF( + "/local/domain/0/device-model/%u/logdirty/ret", domid); + } + lds->cmd = enable ? "enable" : "disable"; - if (enable) - rc = xs_write(CTX->xsh, XBT_NULL, path, "enable", strlen("enable")); - else - rc = xs_write(CTX->xsh, XBT_NULL, path, "disable", strlen("disable")); + rc = libxl__ev_xswatch_register(gc, &lds->watch, + switch_logdirty_xswatch, lds->ret_path); + if (rc) goto out; - return rc ? 0 : 1; + rc = libxl__ev_time_register_rel(gc, &lds->timeout, + switch_logdirty_timeout, 10*1000); + if (rc) goto out; + + for (;;) { + rc = libxl__xs_transaction_start(gc, &t); + if (rc) goto out; + + rc = libxl__xs_read_checked(gc, t, lds->cmd_path, &got); + if (rc) goto out; + + if (got) { + const char *got_ret; + rc = libxl__xs_read_checked(gc, t, lds->ret_path, &got_ret); + if (rc) goto out; + + if (strcmp(got, got_ret)) { + LOG(ERROR,"controlling logdirty: qemu was already sent" + " command `%s' (xenstore path `%s') but result is `%s'", + got, lds->cmd_path, got_ret ? got_ret : ""); + rc = ERROR_FAIL; + goto out; + } + rc = libxl__xs_rm_checked(gc, t, lds->cmd_path); + if (rc) goto out; + } + + rc = libxl__xs_rm_checked(gc, t, lds->ret_path); + if (rc) goto out; + + rc = libxl__xs_write_checked(gc, t, lds->cmd_path, lds->cmd); + if (rc) goto out; + + rc = libxl__xs_transaction_commit(gc, &t); + if (!rc) break; + if (rc<0) goto out; + } + + /* OK, wait for some callback */ + return; + + out: + LOG(ERROR,"logdirty switch failed (rc=%d), aborting suspend",rc); + switch_logdirty_done(egc,dss,-1); } +static void switch_logdirty_timeout(libxl__egc *egc, libxl__ev_time *ev, + const struct timeval *requested_abs) +{ + libxl__domain_suspend_state *dss = CONTAINER_OF(ev, *dss, logdirty.timeout); + STATE_AO_GC(dss->ao); + LOG(ERROR,"logdirty switch: wait for device model timed out"); + switch_logdirty_done(egc,dss,-1); +} + +static void switch_logdirty_xswatch(libxl__egc *egc, libxl__ev_xswatch *watch, + const char *watch_path, const char *event_path) +{ + libxl__domain_suspend_state *dss = + CONTAINER_OF(watch, *dss, logdirty.watch); + libxl__logdirty_switch *lds = &dss->logdirty; + STATE_AO_GC(dss->ao); + const char *got; + xs_transaction_t t = 0; + int rc; + + for (;;) { + rc = libxl__xs_transaction_start(gc, &t); + if (rc) goto out; + + rc = libxl__xs_read_checked(gc, t, lds->ret_path, &got); + if (rc) goto out; + + if (!got) { + rc = +1; + goto out; + } + + if (strcmp(got, lds->cmd)) { + LOG(ERROR,"logdirty switch: sent command `%s' but got reply `%s'" + " (xenstore paths `%s' / `%s')", lds->cmd, got, + lds->cmd_path, lds->ret_path); + rc = ERROR_FAIL; + goto out; + } + + rc = libxl__xs_rm_checked(gc, t, lds->cmd_path); + if (rc) goto out; + + rc = libxl__xs_rm_checked(gc, t, lds->ret_path); + if (rc) goto out; + + rc = libxl__xs_transaction_commit(gc, &t); + if (!rc) break; + if (rc<0) goto out; + } + + out: + /* rc < 0: error + * rc == 0: ok, we are done + * rc == +1: need to keep waiting + */ + libxl__xs_transaction_abort(gc, &t); + + if (!rc) { + switch_logdirty_done(egc,dss,0); + } else if (rc < 0) { + LOG(ERROR,"logdirty switch: failed (rc=%d)",rc); + switch_logdirty_done(egc,dss,-1); + } +} + +static void switch_logdirty_done(libxl__egc *egc, + libxl__domain_suspend_state *dss, + int broke) +{ + STATE_AO_GC(dss->ao); + libxl__logdirty_switch *lds = &dss->logdirty; + + libxl__ev_xswatch_deregister(gc, &lds->watch); + libxl__ev_time_deregister(gc, &lds->timeout); + + libxl__xc_domain_saverestore_async_callback_done(egc, &dss->shs, broke); +} + +/*----- callbacks, called by xc_domain_save -----*/ + int libxl__domain_suspend_device_model(libxl__gc *gc, uint32_t domid) { libxl_ctx *ctx = libxl__gc_owner(gc); @@ -877,6 +1028,8 @@ void libxl__domain_suspend(libxl__egc *e libxl__srm_save_autogen_callbacks *const callbacks = &dss->shs.callbacks.save.a; + logdirty_init(&dss->logdirty); + switch (type) { case LIBXL_DOMAIN_TYPE_HVM: { char *path; diff -r 7ccecbe23489 -r 1883e5c71a87 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Thu Jun 28 18:43:22 2012 +0100 +++ b/tools/libxl/libxl_internal.h Thu Jun 28 18:43:23 2012 +0100 @@ -1864,6 +1864,14 @@ typedef struct libxl__domain_suspend_sta typedef void libxl__domain_suspend_cb(libxl__egc*, libxl__domain_suspend_state*, int rc); +typedef struct libxl__logdirty_switch { + const char *cmd; + const char *cmd_path; + const char *ret_path; + libxl__ev_xswatch watch; + libxl__ev_time timeout; +} libxl__logdirty_switch; + struct libxl__domain_suspend_state { /* set by caller of libxl__domain_suspend */ libxl__ao *ao; @@ -1883,6 +1891,7 @@ struct libxl__domain_suspend_state { int guest_responded; int interval; /* checkpoint interval (for Remus) */ libxl__save_helper_state shs; + libxl__logdirty_switch logdirty; }; @@ -2013,8 +2022,15 @@ _hidden void libxl__xc_domain_save(libxl _hidden void libxl__xc_domain_save_done(libxl__egc*, void *dss_void, int rc, int retval, int errnoval); +/* Used by asynchronous callbacks: ie ones which xc regards as + * returning a value, but which we want to handle asynchronously. + * Such functions' actual callback function return void in libxl + * When they are ready to indicate completion, they call this. */ +void libxl__xc_domain_saverestore_async_callback_done(libxl__egc *egc, + libxl__save_helper_state *shs, int return_value); + _hidden int libxl__domain_suspend_common_callback(void *data); -_hidden int libxl__domain_suspend_common_switch_qemu_logdirty +_hidden void libxl__domain_suspend_common_switch_qemu_logdirty (int domid, unsigned int enable, void *data); _hidden int libxl__toolstack_save(uint32_t domid, uint8_t **buf, uint32_t *len, void *data); diff -r 7ccecbe23489 -r 1883e5c71a87 tools/libxl/libxl_save_callout.c --- a/tools/libxl/libxl_save_callout.c Thu Jun 28 18:43:22 2012 +0100 +++ b/tools/libxl/libxl_save_callout.c Thu Jun 28 18:43:23 2012 +0100 @@ -135,6 +135,14 @@ void libxl__xc_domain_save(libxl__egc *e } +void libxl__xc_domain_saverestore_async_callback_done(libxl__egc *egc, + libxl__save_helper_state *shs, int return_value) +{ + shs->egc = egc; + libxl__srm_callout_sendreply(return_value, shs); + shs->egc = 0; +} + /*----- helper execution -----*/ static void run_helper(libxl__egc *egc, libxl__save_helper_state *shs, diff -r 7ccecbe23489 -r 1883e5c71a87 tools/libxl/libxl_save_msgs_gen.pl --- a/tools/libxl/libxl_save_msgs_gen.pl Thu Jun 28 18:43:22 2012 +0100 +++ b/tools/libxl/libxl_save_msgs_gen.pl Thu Jun 28 18:43:23 2012 +0100 @@ -14,6 +14,7 @@ our @msgs = ( # x - function pointer is in struct {save,restore}_callbacks # and its null-ness needs to be passed through to the helper's xc # W - needs a return value; callback is synchronous + # A - needs a return value; callback is asynchronous [ 1, 'sr', "log", [qw(uint32_t level uint32_t errnoval STRING context @@ -25,7 +26,7 @@ our @msgs = ( [ 3, 'scxW', "suspend", [] ], [ 4, 'scxW', "postcopy", [] ], [ 5, 'scxW', "checkpoint", [] ], - [ 6, 'scxW', "switch_qemu_logdirty", [qw(int domid + [ 6, 'scxA', "switch_qemu_logdirty", [qw(int domid unsigned enable)] ], # toolstack_save done entirely `by hand' [ 7, 'rcxW', "toolstack_restore", [qw(uint32_t domid @@ -262,7 +263,7 @@ foreach my $msginfo (@msgs) { $f_more_sr->(" int r;\n"); } - my $c_rtype_helper = $flags =~ m/W/ ? 'int' : 'void'; + my $c_rtype_helper = $flags =~ m/[WA]/ ? 'int' : 'void'; my $c_rtype_callout = $flags =~ m/W/ ? 'int' : 'void'; my $c_decl = '('; my $c_callback_args = ''; @@ -351,7 +352,7 @@ END_ALWAYS assert(len == allocd); ${transmit}(buf, len, user); "); - if ($flags =~ m/W/) { + if ($flags =~ m/[WA]/) { f_more("${encode}_$name", (< Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11: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 1SmGw3-0004pP-98; Wed, 04 Jul 2012 04:11:27 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw0-0004kN-Gm for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:24 +0000 Received: from [85.158.138.51:37019] by server-8.bemta-3.messagelabs.com id C6/CB-06157-B62C3FF4; Wed, 04 Jul 2012 04:11:23 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-174.messagelabs.com!1341375081!29729063!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14407 invoked from network); 4 Jul 2012 04:11:22 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvx-0002iA-Ei for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGvx-0003sV-Df for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:21 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:20 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: prepare for asynchronous writing of qemu save 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 Jackson # Date 1340905404 -3600 # Node ID 68c4625cfb415beb8d78138e8d121cc7e719ed77 # Parent 59127c03d75c7d7e6556ec545c957660770bddfa libxl: prepare for asynchronous writing of qemu save file * Combine the various calls to libxl__device_model_savefile into one at the start of libxl__domain_suspend, storing the result in the dss. Consequently a few functions take a dss instead of some or all of their other arguments. * Make libxl__domain_save_device_model's API into an asynchronous style which takes a callback. The function is, however, still synchronous; it will be made actually async in the next patch. * Consequently make libxl__remus_domain_checkpoint_callback into an asynchronous callback. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 59127c03d75c -r 68c4625cfb41 tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Thu Jun 28 18:43:23 2012 +0100 +++ b/tools/libxl/libxl_dom.c Thu Jun 28 18:43:24 2012 +0100 @@ -705,11 +705,13 @@ static void switch_logdirty_done(libxl__ /*----- callbacks, called by xc_domain_save -----*/ -int libxl__domain_suspend_device_model(libxl__gc *gc, uint32_t domid) +int libxl__domain_suspend_device_model(libxl__gc *gc, + libxl__domain_suspend_state *dss) { libxl_ctx *ctx = libxl__gc_owner(gc); int ret = 0; - const char *filename = libxl__device_model_savefile(gc, domid); + uint32_t const domid = dss->domid; + const char *const filename = dss->dm_savefile; switch (libxl__device_model_version_running(gc, domid)) { case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: { @@ -878,7 +880,7 @@ int libxl__domain_suspend_common_callbac guest_suspended: if (dss->hvm) { - ret = libxl__domain_suspend_device_model(gc, dss->domid); + ret = libxl__domain_suspend_device_model(gc, dss); if (ret) { LOG(ERROR, "libxl__domain_suspend_device_model failed ret=%d", ret); return 0; @@ -994,20 +996,33 @@ static int libxl__remus_domain_resume_ca return 1; } -static int libxl__remus_domain_checkpoint_callback(void *data) +/*----- remus asynchronous checkpoint callback -----*/ + +static void remus_checkpoint_dm_saved(libxl__egc *egc, + libxl__domain_suspend_state *dss, int rc); + +static void libxl__remus_domain_checkpoint_callback(void *data) { libxl__save_helper_state *shs = data; libxl__domain_suspend_state *dss = CONTAINER_OF(shs, *dss, shs); + libxl__egc *egc = dss->shs.egc; STATE_AO_GC(dss->ao); /* This would go into tailbuf. */ - if (dss->hvm && - libxl__domain_save_device_model(gc, dss->domid, dss->fd)) - return 0; + if (dss->hvm) { + libxl__domain_save_device_model(egc, dss, remus_checkpoint_dm_saved); + } else { + remus_checkpoint_dm_saved(egc, dss, 0); + } +} +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 */ usleep(dss->interval * 1000); - return 1; + libxl__xc_domain_saverestore_async_callback_done(egc, &dss->shs, 1); } /*----- main code for suspending, in order of execution -----*/ @@ -1057,6 +1072,7 @@ void libxl__domain_suspend(libxl__egc *e dss->suspend_eventchn = -1; dss->guest_responded = 0; + dss->dm_savefile = libxl__device_model_savefile(gc, domid); if (r_info != NULL) { dss->interval = r_info->interval; @@ -1106,7 +1122,6 @@ void libxl__xc_domain_save_done(libxl__e /* Convenience aliases */ const libxl_domain_type type = dss->type; - const uint32_t domid = dss->domid; if (rc) goto out; @@ -1124,11 +1139,11 @@ void libxl__xc_domain_save_done(libxl__e } if (type == LIBXL_DOMAIN_TYPE_HVM) { - rc = libxl__domain_suspend_device_model(gc, domid); + rc = libxl__domain_suspend_device_model(gc, dss); if (rc) goto out; - rc = libxl__domain_save_device_model(gc, domid, dss->fd); - if (rc) goto out; + libxl__domain_save_device_model(egc, dss, domain_suspend_done); + return; } rc = 0; @@ -1137,14 +1152,22 @@ out: domain_suspend_done(egc, dss, rc); } -int libxl__domain_save_device_model(libxl__gc *gc, uint32_t domid, int fd) +void libxl__domain_save_device_model(libxl__egc *egc, + libxl__domain_suspend_state *dss, + libxl__save_device_model_cb *callback) { + STATE_AO_GC(dss->ao); int rc, fd2 = -1, c; char buf[1024]; - const char *filename = libxl__device_model_savefile(gc, domid); struct stat st; uint32_t qemu_state_len; + dss->save_dm_callback = callback; + + /* Convenience aliases */ + const char *const filename = dss->dm_savefile; + const int fd = dss->fd; + if (stat(filename, &st) < 0) { LOG(ERROR, "Unable to stat qemu save file\n"); @@ -1186,7 +1209,8 @@ int libxl__domain_save_device_model(libx out: if (fd2 >= 0) close(fd2); unlink(filename); - return rc; + + dss->save_dm_callback(egc, dss, rc); } static void domain_suspend_done(libxl__egc *egc, diff -r 59127c03d75c -r 68c4625cfb41 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Thu Jun 28 18:43:23 2012 +0100 +++ b/tools/libxl/libxl_internal.h Thu Jun 28 18:43:24 2012 +0100 @@ -824,10 +824,8 @@ _hidden int libxl__domain_rename(libxl__ _hidden int libxl__toolstack_restore(uint32_t domid, const uint8_t *buf, uint32_t size, void *data); -_hidden const char *libxl__device_model_savefile(libxl__gc *gc, uint32_t domid); -_hidden int libxl__domain_suspend_device_model(libxl__gc *gc, uint32_t domid); _hidden int libxl__domain_resume_device_model(libxl__gc *gc, uint32_t domid); -_hidden int libxl__domain_save_device_model(libxl__gc *gc, uint32_t domid, int fd); + _hidden void libxl__userdata_destroyall(libxl__gc *gc, uint32_t domid); _hidden int libxl__domain_pvcontrol_available(libxl__gc *gc, uint32_t domid); @@ -1869,6 +1867,8 @@ typedef struct libxl__domain_suspend_sta typedef void libxl__domain_suspend_cb(libxl__egc*, libxl__domain_suspend_state*, int rc); +typedef void libxl__save_device_model_cb(libxl__egc*, + libxl__domain_suspend_state*, int rc); typedef struct libxl__logdirty_switch { const char *cmd; @@ -1895,9 +1895,12 @@ struct libxl__domain_suspend_state { int hvm; int xcflags; int guest_responded; + const char *dm_savefile; int interval; /* checkpoint interval (for Remus) */ libxl__save_helper_state shs; libxl__logdirty_switch logdirty; + /* private for libxl__domain_save_device_model */ + libxl__save_device_model_cb *save_dm_callback; }; @@ -2053,6 +2056,15 @@ _hidden void libxl__xc_domain_restore(li _hidden void libxl__xc_domain_restore_done(libxl__egc *egc, void *dcs_void, int rc, int retval, int errnoval); +/* Each time the dm needs to be saved, we must call suspend and then save */ +_hidden int libxl__domain_suspend_device_model(libxl__gc *gc, + libxl__domain_suspend_state *dss); +_hidden void libxl__domain_save_device_model(libxl__egc *egc, + libxl__domain_suspend_state *dss, + libxl__save_device_model_cb *callback); + +_hidden const char *libxl__device_model_savefile(libxl__gc *gc, uint32_t domid); + /* * Convenience macros. diff -r 59127c03d75c -r 68c4625cfb41 tools/libxl/libxl_save_msgs_gen.pl --- a/tools/libxl/libxl_save_msgs_gen.pl Thu Jun 28 18:43:23 2012 +0100 +++ b/tools/libxl/libxl_save_msgs_gen.pl Thu Jun 28 18:43:24 2012 +0100 @@ -25,7 +25,7 @@ our @msgs = ( 'unsigned long', 'total'] ], [ 3, 'scxW', "suspend", [] ], [ 4, 'scxW', "postcopy", [] ], - [ 5, 'scxW', "checkpoint", [] ], + [ 5, 'scxA', "checkpoint", [] ], [ 6, 'scxA', "switch_qemu_logdirty", [qw(int domid unsigned enable)] ], # toolstack_save done entirely `by hand' _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11: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 1SmGw3-0004p5-1Y; Wed, 04 Jul 2012 04:11:27 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvz-0004kD-LT for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:24 +0000 Received: from [85.158.139.83:46573] by server-12.bemta-5.messagelabs.com id 6E/7B-25233-A62C3FF4; Wed, 04 Jul 2012 04:11:22 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-182.messagelabs.com!1341375079!25704337!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21685 invoked from network); 4 Jul 2012 04:11:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvu-0002ho-Rz for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGvu-0003rI-Qm for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:18 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:18 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: domain save/restore: run in a separate process X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340905401 -3600 # Node ID 0f1a974bfb38ba55555a4a86a1ccd568aa7be56b # Parent 13c51d101a9dcebb99a710f7dd43767309a172d2 libxl: domain save/restore: run in a separate process libxenctrl expects to be able to simply run the save or restore operation synchronously. This won't work well in a process which is trying to handle multiple domains. The options are: - Block such a whole process (eg, the whole of libvirt) while migration completes (or until it fails). - Create a thread to run xc_domain_save and xc_domain_restore on. This is quite unpalatable. Multithreaded programming is error prone enough without generating threads in libraries, particularly if the thread does some very complex operation. - Fork and run the operation in the child without execing. This is no good because we would need to negotiate with the caller about fds we would inherit (and we might be a very large process). - Fork and exec a helper. Of these options the latter is the most palatable. Consequently: * A new helper program libxl-save-helper (which does both save and restore). It will be installed in /usr/lib/xen/bin. It does not link against libxl, only libxc, and its error handling does not need to be very advanced. It does contain a plumbing through of the logging interface into the callback stream. * A small ad-hoc protocol between the helper and libxl which allows log messages and the libxc callbacks to be passed up and down. Protocol doc comment is in libxl_save_helper.c. * To avoid a lot of tedium the marshalling boilerplate (stubs for the helper and the callback decoder for libxl) is generated with a small perl script. * Implement new functionality to spawn the helper, monitor its output, provide responses, and check on its exit status. * The functions libxl__xc_domain_restore_done and libxl__xc_domain_save_done now turn out to want be called in the same place. So make their state argument a void* so that the two functions are type compatible. The domain save path still writes the qemu savefile synchronously. This will need to be fixed in a subsequent patch. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- diff -r 13c51d101a9d -r 0f1a974bfb38 .gitignore --- a/.gitignore Thu Jun 28 18:43:21 2012 +0100 +++ b/.gitignore Thu Jun 28 18:43:21 2012 +0100 @@ -355,6 +355,7 @@ tools/libxl/_*.[ch] tools/libxl/testidl tools/libxl/testidl.c tools/libxl/*.pyc +tools/libxl/libxl-save-helper tools/blktap2/control/tap-ctl tools/firmware/etherboot/eb-roms.h tools/firmware/etherboot/gpxe-git-snapshot.tar.gz diff -r 13c51d101a9d -r 0f1a974bfb38 .hgignore --- a/.hgignore Thu Jun 28 18:43:21 2012 +0100 +++ b/.hgignore Thu Jun 28 18:43:21 2012 +0100 @@ -180,9 +180,11 @@ ^tools/libxl/_.*\.c$ ^tools/libxl/libxlu_cfg_y\.output$ ^tools/libxl/xl$ +^tools/libxl/libxl-save-helper$ ^tools/libxl/testidl$ ^tools/libxl/testidl\.c$ ^tools/libxl/tmp\..*$ +^tools/libxl/.*\.new$ ^tools/libvchan/vchan-node[12]$ ^tools/libaio/src/.*\.ol$ ^tools/libaio/src/.*\.os$ diff -r 13c51d101a9d -r 0f1a974bfb38 tools/libxl/Makefile --- a/tools/libxl/Makefile Thu Jun 28 18:43:21 2012 +0100 +++ b/tools/libxl/Makefile Thu Jun 28 18:43:21 2012 +0100 @@ -67,25 +67,30 @@ LIBXL_OBJS = flexarray.o libxl.o libxl_c libxl_dom.o libxl_exec.o libxl_xshelp.o libxl_device.o \ libxl_internal.o libxl_utils.o libxl_uuid.o \ libxl_json.o libxl_aoutils.o \ - libxl_save_callout.o \ + libxl_save_callout.o _libxl_save_msgs_callout.o \ libxl_qmp.o libxl_event.o libxl_fork.o $(LIBXL_OBJS-y) LIBXL_OBJS += _libxl_types.o libxl_flask.o _libxl_types_internal.o $(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 +AUTOINCS= libxlu_cfg_y.h libxlu_cfg_l.h _libxl_list.h _paths.h \ + _libxl_save_msgs_callout.h _libxl_save_msgs_helper.h 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 \ libxlu_disk_l.o libxlu_disk.o libxlu_vif.o libxlu_pci.o $(LIBXLU_OBJS): CFLAGS += $(CFLAGS_libxenctrl) # For xentoollog.h -CLIENTS = xl testidl +CLIENTS = xl testidl libxl-save-helper XL_OBJS = xl.o xl_cmdimpl.o xl_cmdtable.o xl_sxp.o $(XL_OBJS): CFLAGS += $(CFLAGS_libxenctrl) # For xentoollog.h $(XL_OBJS): CFLAGS += $(CFLAGS_libxenlight) $(XL_OBJS): CFLAGS += -include $(XEN_ROOT)/tools/config.h # libxl_json.h needs it. +SAVE_HELPER_OBJS = libxl_save_helper.o _libxl_save_msgs_helper.o +$(SAVE_HELPER_OBJS): CFLAGS += $(CFLAGS_libxenctrl) + testidl.o: CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenlight) testidl.c: libxl_types.idl gentest.py libxl.h $(AUTOINCS) $(PYTHON) gentest.py libxl_types.idl testidl.c.new @@ -117,6 +122,12 @@ _libxl_list.h: $(XEN_INCLUDE)/xen-extern perl $^ --prefix=libxl >$@.new $(call move-if-changed,$@.new,$@) +_libxl_save_msgs_helper.c _libxl_save_msgs_callout.c \ +_libxl_save_msgs_helper.h _libxl_save_msgs_callout.h: \ + libxl_save_msgs_gen.pl + $(PERL) -w $< $@ >$@.new + $(call move-if-changed,$@.new,$@) + libxl.h: _libxl_types.h libxl_json.h: _libxl_types_json.h libxl_internal.h: _libxl_types_internal.h _paths.h @@ -159,6 +170,9 @@ libxlutil.a: $(LIBXLU_OBJS) xl: $(XL_OBJS) libxlutil.so libxenlight.so $(CC) $(LDFLAGS) -o $@ $(XL_OBJS) libxlutil.so $(LDLIBS_libxenlight) $(LDLIBS_libxenctrl) -lyajl $(APPEND_LDFLAGS) +libxl-save-helper: $(SAVE_HELPER_OBJS) libxenlight.so + $(CC) $(LDFLAGS) -o $@ $(SAVE_HELPER_OBJS) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(APPEND_LDFLAGS) + testidl: testidl.o libxlutil.so libxenlight.so $(CC) $(LDFLAGS) -o $@ testidl.o libxlutil.so $(LDLIBS_libxenlight) $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS) @@ -169,7 +183,9 @@ install: all $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR) $(INSTALL_DIR) $(DESTDIR)$(BASH_COMPLETION_DIR) $(INSTALL_DIR) $(DESTDIR)$(XEN_RUN_DIR) + $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR) $(INSTALL_PROG) xl $(DESTDIR)$(SBINDIR) + $(INSTALL_PROG) libxl-save-helper $(DESTDIR)$(PRIVATE_BINDIR) $(INSTALL_PROG) libxenlight.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) ln -sf libxenlight.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenlight.so.$(MAJOR) ln -sf libxenlight.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenlight.so diff -r 13c51d101a9d -r 0f1a974bfb38 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Thu Jun 28 18:43:21 2012 +0100 +++ b/tools/libxl/libxl_create.c Thu Jun 28 18:43:21 2012 +0100 @@ -668,7 +668,8 @@ static void domcreate_bootloader_done(li libxl_domain_build_info *const info = &d_config->b_info; const int restore_fd = dcs->restore_fd; libxl__domain_build_state *const state = &dcs->build_state; - struct restore_callbacks *const callbacks = &dcs->callbacks; + libxl__srm_restore_autogen_callbacks *const callbacks = + &dcs->shs.callbacks.restore.a; if (rc) domcreate_rebuild_done(egc, dcs, rc); @@ -708,7 +709,6 @@ static void domcreate_bootloader_done(li pae = libxl_defbool_val(info->u.hvm.pae); no_incr_generationid = !libxl_defbool_val(info->u.hvm.incr_generationid); callbacks->toolstack_restore = libxl__toolstack_restore; - callbacks->data = gc; break; case LIBXL_DOMAIN_TYPE_PV: hvm = 0; @@ -728,10 +728,24 @@ static void domcreate_bootloader_done(li libxl__xc_domain_restore_done(egc, dcs, rc, 0, 0); } -void libxl__xc_domain_restore_done(libxl__egc *egc, - libxl__domain_create_state *dcs, +void libxl__srm_callout_callback_restore_results(unsigned long store_mfn, + unsigned long console_mfn, unsigned long genidad, void *user) +{ + libxl__save_helper_state *shs = user; + libxl__domain_create_state *dcs = CONTAINER_OF(shs, *dcs, shs); + STATE_AO_GC(dcs->ao); + libxl__domain_build_state *const state = &dcs->build_state; + + state->store_mfn = store_mfn; + state->console_mfn = console_mfn; + state->vm_generationid_addr = genidad; + shs->need_results = 0; +} + +void libxl__xc_domain_restore_done(libxl__egc *egc, void *dcs_void, int ret, int retval, int errnoval) { + libxl__domain_create_state *dcs = dcs_void; STATE_AO_GC(dcs->ao); libxl_ctx *ctx = libxl__gc_owner(gc); char **vments = NULL, **localents = NULL; diff -r 13c51d101a9d -r 0f1a974bfb38 tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Thu Jun 28 18:43:21 2012 +0100 +++ b/tools/libxl/libxl_dom.c Thu Jun 28 18:43:21 2012 +0100 @@ -467,16 +467,20 @@ static inline char *restore_helper(libxl } int libxl__toolstack_restore(uint32_t domid, const uint8_t *buf, - uint32_t size, void *data) + uint32_t size, void *user) { - libxl__gc *gc = data; - libxl_ctx *ctx = gc->owner; + libxl__save_helper_state *shs = user; + libxl__domain_create_state *dcs = CONTAINER_OF(shs, *dcs, shs); + STATE_AO_GC(dcs->ao); + libxl_ctx *ctx = CTX; int i, ret; const uint8_t *ptr = buf; uint32_t count = 0, version = 0; struct libxl__physmap_info* pi; char *xs_path; + LOG(DEBUG,"domain=%"PRIu32" toolstack data size=%"PRIu32, domid, size); + if (size < sizeof(version) + sizeof(count)) { LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "wrong size"); return -1; @@ -529,9 +533,10 @@ static void domain_suspend_done(libxl__e /*----- callbacks, called by xc_domain_save -----*/ int libxl__domain_suspend_common_switch_qemu_logdirty - (int domid, unsigned int enable, void *data) + (int domid, unsigned enable, void *user) { - libxl__domain_suspend_state *dss = data; + libxl__save_helper_state *shs = user; + libxl__domain_suspend_state *dss = CONTAINER_OF(shs, *dss, shs); STATE_AO_GC(dss->ao); char *path; bool rc; @@ -597,9 +602,10 @@ int libxl__domain_resume_device_model(li return 0; } -int libxl__domain_suspend_common_callback(void *data) +int libxl__domain_suspend_common_callback(void *user) { - libxl__domain_suspend_state *dss = data; + libxl__save_helper_state *shs = user; + libxl__domain_suspend_state *dss = CONTAINER_OF(shs, *dss, shs); STATE_AO_GC(dss->ao); unsigned long hvm_s_state = 0, hvm_pvdrv = 0; int ret; @@ -739,9 +745,9 @@ static inline char *save_helper(libxl__g } int libxl__toolstack_save(uint32_t domid, uint8_t **buf, - uint32_t *len, void *data) + uint32_t *len, void *dss_void) { - libxl__domain_suspend_state *dss = data; + libxl__domain_suspend_state *dss = dss_void; STATE_AO_GC(dss->ao); int i = 0; char *start_addr = NULL, *size = NULL, *phys_offset = NULL, *name = NULL; @@ -810,6 +816,8 @@ int libxl__toolstack_save(uint32_t domid ptr += sizeof(struct libxl__physmap_info) + namelen; } + LOG(DEBUG,"domain=%"PRIu32" toolstack data size=%"PRIu32, domid, *len); + return 0; } @@ -823,7 +831,8 @@ static int libxl__remus_domain_suspend_c static int libxl__remus_domain_resume_callback(void *data) { - libxl__domain_suspend_state *dss = data; + libxl__save_helper_state *shs = data; + libxl__domain_suspend_state *dss = CONTAINER_OF(shs, *dss, shs); STATE_AO_GC(dss->ao); /* Resumes the domain and the device model */ @@ -836,7 +845,8 @@ static int libxl__remus_domain_resume_ca static int libxl__remus_domain_checkpoint_callback(void *data) { - libxl__domain_suspend_state *dss = data; + libxl__save_helper_state *shs = data; + libxl__domain_suspend_state *dss = CONTAINER_OF(shs, *dss, shs); STATE_AO_GC(dss->ao); /* This would go into tailbuf. */ @@ -864,7 +874,8 @@ void libxl__domain_suspend(libxl__egc *e const int live = dss->live; const int debug = dss->debug; const libxl_domain_remus_info *const r_info = dss->remus; - struct save_callbacks *const callbacks = &dss->callbacks; + libxl__srm_save_autogen_callbacks *const callbacks = + &dss->shs.callbacks.save.a; switch (type) { case LIBXL_DOMAIN_TYPE_HVM: { @@ -925,8 +936,7 @@ void libxl__domain_suspend(libxl__egc *e callbacks->suspend = libxl__domain_suspend_common_callback; callbacks->switch_qemu_logdirty = libxl__domain_suspend_common_switch_qemu_logdirty; - callbacks->toolstack_save = libxl__toolstack_save; - callbacks->data = dss; + dss->shs.callbacks.save.toolstack_save = libxl__toolstack_save; libxl__xc_domain_save(egc, dss, vm_generationid_addr); return; @@ -935,10 +945,10 @@ void libxl__domain_suspend(libxl__egc *e domain_suspend_done(egc, dss, rc); } -void libxl__xc_domain_save_done(libxl__egc *egc, - libxl__domain_suspend_state *dss, +void libxl__xc_domain_save_done(libxl__egc *egc, void *dss_void, int rc, int retval, int errnoval) { + libxl__domain_suspend_state *dss = dss_void; STATE_AO_GC(dss->ao); /* Convenience aliases */ diff -r 13c51d101a9d -r 0f1a974bfb38 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Thu Jun 28 18:43:21 2012 +0100 +++ b/tools/libxl/libxl_internal.h Thu Jun 28 18:43:21 2012 +0100 @@ -54,6 +54,7 @@ #include "libxl.h" #include "_paths.h" +#include "_libxl_save_msgs_callout.h" #if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1) #define _hidden __attribute__((visibility("hidden"))) @@ -1773,6 +1774,51 @@ _hidden void libxl__datacopier_kill(libx _hidden int libxl__datacopier_start(libxl__datacopier_state *dc); +/*----- Save/restore helper (used by creation and suspend) -----*/ + +typedef struct libxl__srm_save_callbacks { + libxl__srm_save_autogen_callbacks a; + int (*toolstack_save)(uint32_t domid, uint8_t **buf, + uint32_t *len, void *data); +} libxl__srm_save_callbacks; + +typedef struct libxl__srm_restore_callbacks { + libxl__srm_restore_autogen_callbacks a; +} libxl__srm_restore_callbacks; + +/* a pointer to this struct is also passed as "user" to the + * save callout helper callback functions */ +typedef struct libxl__save_helper_state { + /* public, caller of run_helper initialises */ + libxl__ao *ao; + uint32_t domid; + union { + libxl__srm_save_callbacks save; + libxl__srm_restore_callbacks restore; + } callbacks; + int (*recv_callback)(const unsigned char *msg, uint32_t len, void *user); + void (*completion_callback)(libxl__egc *egc, void *caller_state, + int rc, int retval, int errnoval); + void *caller_state; + int need_results; /* set to 0 or 1 by caller of run_helper; + * if set to 1 then the ultimate caller's + * results function must set it to 0 */ + /* private */ + int rc; + int completed; /* retval/errnoval valid iff completed */ + int retval, errnoval; /* from xc_domain_save / xc_domain_restore */ + libxl__carefd *pipes[2]; /* 0 = helper's stdin, 1 = helper's stdout */ + libxl__ev_fd readable; + libxl__ev_child child; + const char *stdin_what, *stdout_what; + FILE *toolstack_data_file; + + libxl__egc *egc; /* valid only for duration of each event callback; + * is here in this struct for the benefit of the + * marshalling and xc callback functions */ +} libxl__save_helper_state; + + /*----- Domain suspend (save) state structure -----*/ typedef struct libxl__domain_suspend_state libxl__domain_suspend_state; @@ -1798,7 +1844,7 @@ struct libxl__domain_suspend_state { int xcflags; int guest_responded; int interval; /* checkpoint interval (for Remus) */ - struct save_callbacks callbacks; + libxl__save_helper_state shs; }; @@ -1910,7 +1956,7 @@ struct libxl__domain_create_state { libxl__stub_dm_spawn_state dmss; /* If we're not doing stubdom, we use only dmss.dm, * for the non-stubdom device model. */ - struct restore_callbacks callbacks; + libxl__save_helper_state shs; }; /*----- Domain suspend (save) functions -----*/ @@ -1926,8 +1972,7 @@ _hidden void libxl__xc_domain_save(libxl /* If rc==0 then retval is the return value from xc_domain_save * and errnoval is the errno value it provided. * If rc!=0, retval and errnoval are undefined. */ -_hidden void libxl__xc_domain_save_done(libxl__egc*, - libxl__domain_suspend_state*, +_hidden void libxl__xc_domain_save_done(libxl__egc*, void *dss_void, int rc, int retval, int errnoval); _hidden int libxl__domain_suspend_common_callback(void *data); @@ -1945,8 +1990,7 @@ _hidden void libxl__xc_domain_restore(li /* If rc==0 then retval is the return value from xc_domain_save * and errnoval is the errno value it provided. * If rc!=0, retval and errnoval are undefined. */ -_hidden void libxl__xc_domain_restore_done(libxl__egc *egc, - libxl__domain_create_state *dcs, +_hidden void libxl__xc_domain_restore_done(libxl__egc *egc, void *dcs_void, int rc, int retval, int errnoval); diff -r 13c51d101a9d -r 0f1a974bfb38 tools/libxl/libxl_save_callout.c --- a/tools/libxl/libxl_save_callout.c Thu Jun 28 18:43:21 2012 +0100 +++ b/tools/libxl/libxl_save_callout.c Thu Jun 28 18:43:21 2012 +0100 @@ -16,6 +16,30 @@ #include "libxl_internal.h" +/* stream_fd is as from the caller (eventually, the application). + * It may be 0, 1 or 2, in which case we need to dup it elsewhere. + * The actual fd value is not included in the supplied argnums; rather + * it will be automatically supplied by run_helper as the 2nd argument. + * + * preserve_fds are fds that the caller is intending to pass to the + * helper so which need cloexec clearing. They may not be 0, 1 or 2. + * An entry may be -1 in which case it will be ignored. + */ +static void run_helper(libxl__egc *egc, libxl__save_helper_state *shs, + const char *mode_arg, + int stream_fd, + const int *preserve_fds, int num_preserve_fds, + const unsigned long *argnums, int num_argnums); + +static void helper_failed(libxl__egc*, libxl__save_helper_state *shs, int rc); +static void helper_stdout_readable(libxl__egc *egc, libxl__ev_fd *ev, + int fd, short events, short revents); +static void helper_exited(libxl__egc *egc, libxl__ev_child *ch, + pid_t pid, int status); +static void helper_done(libxl__egc *egc, libxl__save_helper_state *shs); + +/*----- entrypoints -----*/ + void libxl__xc_domain_restore(libxl__egc *egc, libxl__domain_create_state *dcs, int hvm, int pae, int superpages, int no_incr_generationid) @@ -27,22 +51,337 @@ void libxl__xc_domain_restore(libxl__egc const int restore_fd = dcs->restore_fd; libxl__domain_build_state *const state = &dcs->build_state; - int r = xc_domain_restore(CTX->xch, restore_fd, domid, - state->store_port, &state->store_mfn, - state->store_domid, state->console_port, - &state->console_mfn, state->console_domid, - hvm, pae, superpages, no_incr_generationid, - &state->vm_generationid_addr, &dcs->callbacks); - libxl__xc_domain_restore_done(egc, dcs, 0, r, errno); + unsigned cbflags = libxl__srm_callout_enumcallbacks_restore + (&dcs->shs.callbacks.restore.a); + + const unsigned long argnums[] = { + domid, + state->store_port, + state->store_domid, state->console_port, + state->console_domid, + hvm, pae, superpages, no_incr_generationid, + cbflags, + }; + + dcs->shs.ao = ao; + dcs->shs.domid = domid; + dcs->shs.recv_callback = libxl__srm_callout_received_restore; + dcs->shs.completion_callback = libxl__xc_domain_restore_done; + dcs->shs.caller_state = dcs; + dcs->shs.need_results = 1; + dcs->shs.toolstack_data_file = 0; + + run_helper(egc, &dcs->shs, "--restore-domain", restore_fd, 0,0, + argnums, ARRAY_SIZE(argnums)); } void libxl__xc_domain_save(libxl__egc *egc, libxl__domain_suspend_state *dss, unsigned long vm_generationid_addr) { STATE_AO_GC(dss->ao); - int r; + int r, rc, toolstack_data_fd = -1; + uint32_t toolstack_data_len = 0; - r = xc_domain_save(CTX->xch, dss->fd, dss->domid, 0, 0, dss->xcflags, - &dss->callbacks, dss->hvm, vm_generationid_addr); - libxl__xc_domain_save_done(egc, dss, 0, r, errno); + /* Resources we need to free */ + uint8_t *toolstack_data_buf = 0; + + unsigned cbflags = libxl__srm_callout_enumcallbacks_save + (&dss->shs.callbacks.save.a); + + if (dss->shs.callbacks.save.toolstack_save) { + r = dss->shs.callbacks.save.toolstack_save + (dss->domid, &toolstack_data_buf, &toolstack_data_len, dss); + if (r) { rc = ERROR_FAIL; goto out; } + + dss->shs.toolstack_data_file = tmpfile(); + if (!dss->shs.toolstack_data_file) { + LOGE(ERROR, "cannot create toolstack data tmpfile"); + rc = ERROR_FAIL; + goto out; + } + toolstack_data_fd = fileno(dss->shs.toolstack_data_file); + + r = libxl_write_exactly(CTX, toolstack_data_fd, + toolstack_data_buf, toolstack_data_len, + "toolstack data tmpfile", 0); + if (r) { rc = ERROR_FAIL; goto out; } + } + + const unsigned long argnums[] = { + dss->domid, 0, 0, dss->xcflags, dss->hvm, vm_generationid_addr, + toolstack_data_fd, toolstack_data_len, + cbflags, + }; + + dss->shs.ao = ao; + dss->shs.domid = dss->domid; + dss->shs.recv_callback = libxl__srm_callout_received_save; + dss->shs.completion_callback = libxl__xc_domain_save_done; + dss->shs.caller_state = dss; + dss->shs.need_results = 0; + + free(toolstack_data_buf); + + run_helper(egc, &dss->shs, "--save-domain", dss->fd, + &toolstack_data_fd, 1, + argnums, ARRAY_SIZE(argnums)); + return; + + out: + free(toolstack_data_buf); + if (dss->shs.toolstack_data_file) fclose(dss->shs.toolstack_data_file); + + libxl__xc_domain_save_done(egc, dss, rc, 0, 0); } + + +/*----- helper execution -----*/ + +static void run_helper(libxl__egc *egc, libxl__save_helper_state *shs, + const char *mode_arg, int stream_fd, + const int *preserve_fds, int num_preserve_fds, + const unsigned long *argnums, int num_argnums) +{ + STATE_AO_GC(shs->ao); + const char *args[4 + num_argnums]; + const char **arg = args; + int i, rc; + + /* Resources we must free */ + libxl__carefd *childs_pipes[2] = { 0,0 }; + + /* Convenience aliases */ + const uint32_t domid = shs->domid; + + shs->rc = 0; + shs->completed = 0; + shs->pipes[0] = shs->pipes[1] = 0; + libxl__ev_fd_init(&shs->readable); + libxl__ev_child_init(&shs->child); + + shs->stdin_what = GCSPRINTF("domain %"PRIu32" save/restore helper" + " stdin pipe", domid); + shs->stdout_what = GCSPRINTF("domain %"PRIu32" save/restore helper" + " stdout pipe", domid); + + *arg++ = getenv("LIBXL_SAVE_HELPER") ?: LIBEXEC "/" "libxl-save-helper"; + *arg++ = mode_arg; + const char **stream_fd_arg = arg++; + for (i=0; ipipes[childfd] = libxl__carefd_record(CTX, fds[our_end]); + } + libxl__carefd_unlock(); + + pid_t pid = libxl__ev_child_fork(gc, &shs->child, helper_exited); + if (!pid) { + if (stream_fd <= 2) { + stream_fd = dup(stream_fd); + if (stream_fd < 0) { + LOGE(ERROR,"dup migration stream fd"); + exit(-1); + } + } + libxl_fd_set_cloexec(CTX, stream_fd, 0); + *stream_fd_arg = GCSPRINTF("%d", stream_fd); + + for (i=0; i= 0) { + assert(preserve_fds[i] > 2); + libxl_fd_set_cloexec(CTX, preserve_fds[i], 0); + } + + libxl__exec(gc, + libxl__carefd_fd(childs_pipes[0]), + libxl__carefd_fd(childs_pipes[1]), + -1, + args[0], (char**)args, 0); + } + + libxl__carefd_close(childs_pipes[0]); + libxl__carefd_close(childs_pipes[1]); + + rc = libxl__ev_fd_register(gc, &shs->readable, helper_stdout_readable, + libxl__carefd_fd(shs->pipes[1]), POLLIN|POLLPRI); + if (rc) goto out; + return; + + out: + libxl__carefd_close(childs_pipes[0]); + libxl__carefd_close(childs_pipes[1]); + helper_failed(egc, shs, rc);; +} + +static void helper_failed(libxl__egc *egc, libxl__save_helper_state *shs, + int rc) +{ + STATE_AO_GC(shs->ao); + + if (!shs->rc) + shs->rc = rc; + + libxl__ev_fd_deregister(gc, &shs->readable); + + if (!libxl__ev_child_inuse(&shs->child)) { + helper_done(egc, shs); + return; + } + + int r = kill(shs->child.pid, SIGKILL); + if (r) LOGE(WARN, "failed to kill save/restore helper [%lu]", + (unsigned long)shs->child.pid); +} + +static void helper_stdout_readable(libxl__egc *egc, libxl__ev_fd *ev, + int fd, short events, short revents) +{ + libxl__save_helper_state *shs = CONTAINER_OF(ev, *shs, readable); + STATE_AO_GC(shs->ao); + int rc, errnoval; + + if (revents & (POLLERR|POLLPRI)) { + LOG(ERROR, "%s signaled POLLERR|POLLPRI (%#x)", + shs->stdout_what, revents); + rc = ERROR_FAIL; + out: + /* this is here because otherwise we bypass the decl of msg[] */ + helper_failed(egc, shs, rc); + return; + } + + uint16_t msglen; + errnoval = libxl_read_exactly(CTX, fd, &msglen, sizeof(msglen), + shs->stdout_what, "ipc msg header"); + if (errnoval) { rc = ERROR_FAIL; goto out; } + + unsigned char msg[msglen]; + errnoval = libxl_read_exactly(CTX, fd, msg, msglen, + shs->stdout_what, "ipc msg body"); + if (errnoval) { rc = ERROR_FAIL; goto out; } + + shs->egc = egc; + shs->recv_callback(msg, msglen, shs); + shs->egc = 0; + return; +} + +static void helper_exited(libxl__egc *egc, libxl__ev_child *ch, + pid_t pid, int status) +{ + libxl__save_helper_state *shs = CONTAINER_OF(ch, *shs, child); + STATE_AO_GC(shs->ao); + + /* Convenience aliases */ + const uint32_t domid = shs->domid; + + const char *what = + GCSPRINTF("domain %"PRIu32" save/restore helper", domid); + + if (status) { + libxl_report_child_exitstatus(CTX, XTL_ERROR, what, pid, status); + shs->rc = ERROR_FAIL; + } + + if (shs->need_results) { + if (!shs->rc) + LOG(ERROR,"%s exited without providing results",what); + shs->rc = ERROR_FAIL; + } + + if (!shs->completed) { + if (!shs->rc) + LOG(ERROR,"%s exited without signaling completion",what); + shs->rc = ERROR_FAIL; + } + + helper_done(egc, shs); + return; +} + +static void helper_done(libxl__egc *egc, libxl__save_helper_state *shs) +{ + STATE_AO_GC(shs->ao); + + libxl__ev_fd_deregister(gc, &shs->readable); + libxl__carefd_close(shs->pipes[0]); shs->pipes[0] = 0; + libxl__carefd_close(shs->pipes[1]); shs->pipes[1] = 0; + assert(!libxl__ev_child_inuse(&shs->child)); + if (shs->toolstack_data_file) fclose(shs->toolstack_data_file); + + shs->egc = egc; + shs->completion_callback(egc, shs->caller_state, + shs->rc, shs->retval, shs->errnoval); + shs->egc = 0; +} + +/*----- generic helpers for the autogenerated code -----*/ + +const libxl__srm_save_autogen_callbacks* +libxl__srm_callout_get_callbacks_save(void *user) +{ + libxl__save_helper_state *shs = user; + return &shs->callbacks.save.a; +} + +const libxl__srm_restore_autogen_callbacks* +libxl__srm_callout_get_callbacks_restore(void *user) +{ + libxl__save_helper_state *shs = user; + return &shs->callbacks.restore.a; +} + +void libxl__srm_callout_sendreply(int r, void *user) +{ + libxl__save_helper_state *shs = user; + libxl__egc *egc = shs->egc; + STATE_AO_GC(shs->ao); + int errnoval; + + errnoval = libxl_write_exactly(CTX, libxl__carefd_fd(shs->pipes[0]), + &r, sizeof(r), shs->stdin_what, + "callback return value"); + if (errnoval) + helper_failed(egc, shs, ERROR_FAIL); +} + +void libxl__srm_callout_callback_log(uint32_t level, uint32_t errnoval, + const char *context, const char *formatted, void *user) +{ + libxl__save_helper_state *shs = user; + STATE_AO_GC(shs->ao); + xtl_log(CTX->lg, level, errnoval, context, "%s", formatted); +} + +void libxl__srm_callout_callback_progress(const char *context, + const char *doing_what, unsigned long done, + unsigned long total, void *user) +{ + libxl__save_helper_state *shs = user; + STATE_AO_GC(shs->ao); + xtl_progress(CTX->lg, context, doing_what, done, total); +} + +int libxl__srm_callout_callback_complete(int retval, int errnoval, + void *user) +{ + libxl__save_helper_state *shs = user; + STATE_AO_GC(shs->ao); + + shs->completed = 1; + shs->retval = retval; + shs->errnoval = errnoval; + libxl__ev_fd_deregister(gc, &shs->readable); + return 0; +} diff -r 13c51d101a9d -r 0f1a974bfb38 tools/libxl/libxl_save_helper.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/libxl/libxl_save_helper.c Thu Jun 28 18:43:21 2012 +0100 @@ -0,0 +1,283 @@ +/* + * Copyright (C) 2012 Citrix Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; version 2.1 only. with the special + * exception on linking described in file LICENSE. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + */ + +/* + * The libxl-save-helper utility speaks a protocol to its caller for + * the callbacks. The protocol is as follows. + * + * The helper talks on stdin and stdout, in binary in machine + * endianness. The helper speaks first, and only when it has a + * callback to make. It writes a 16-bit number being the message + * length, and then the message body. + * + * Each message starts with a 16-bit number indicating which of the + * messages it is, and then some arguments in a binary marshalled form. + * If the callback does not need a reply (it returns void), the helper + * just continues. Otherwise the helper waits for its caller to send a + * single int which is to be the return value from the callback. + * + * Where feasible the stubs and callbacks have prototypes identical to + * those required by xc_domain_save and xc_domain_restore, so that the + * autogenerated functions can be used/provided directly. + * + * The actual messages are in the array @msgs in libxl_save_msgs_gen.pl + */ + +#include "libxl_osdeps.h" + +#include +#include +#include +#include + +#include "libxl.h" + +#include "xenctrl.h" +#include "xenguest.h" +#include "_libxl_save_msgs_helper.h" + +/*----- globals -----*/ + +static const char *program = "libxl-save-helper"; +static xentoollog_logger *logger; +static xc_interface *xch; + +/*----- error handling -----*/ + +static void fail(int errnoval, const char *fmt, ...) + __attribute__((noreturn,format(printf,2,3))); +static void fail(int errnoval, const char *fmt, ...) +{ + va_list al; + va_start(al,fmt); + xtl_logv(logger,XTL_ERROR,errnoval,program,fmt,al); + exit(-1); +} + +static int read_exactly(int fd, void *buf, size_t len) +/* returns 0 if we get eof, even if we got it midway through; 1 if ok */ +{ + while (len) { + ssize_t r = read(fd, buf, len); + if (r<=0) return r; + assert(r <= len); + len -= r; + buf = (char*)buf + r; + } + return 1; +} + +static void *xmalloc(size_t sz) +{ + if (!sz) return 0; + void *r = malloc(sz); + if (!r) { perror("memory allocation failed"); exit(-1); } + return r; +} + +/*----- logger -----*/ + +typedef struct { + xentoollog_logger vtable; +} xentoollog_logger_tellparent; + +static void tellparent_vmessage(xentoollog_logger *logger_in, + xentoollog_level level, + int errnoval, + const char *context, + const char *format, + va_list al) +{ + char *formatted; + int r = vasprintf(&formatted, format, al); + if (r < 0) { perror("memory allocation failed during logging"); exit(-1); } + helper_stub_log(level, errnoval, context, formatted, 0); + free(formatted); +} + +static void tellparent_progress(struct xentoollog_logger *logger_in, + const char *context, + const char *doing_what, int percent, + unsigned long done, unsigned long total) +{ + helper_stub_progress(context, doing_what, done, total, 0); +} + +static void tellparent_destroy(struct xentoollog_logger *logger_in) +{ + abort(); +} + +static xentoollog_logger_tellparent *createlogger_tellparent(void) +{ + xentoollog_logger_tellparent newlogger; + return XTL_NEW_LOGGER(tellparent, newlogger); +} + +/*----- helper functions called by autogenerated stubs -----*/ + +unsigned char * helper_allocbuf(int len, void *user) +{ + return xmalloc(len); +} + +static void transmit(const unsigned char *msg, int len, void *user) +{ + while (len) { + int r = write(1, msg, len); + if (r<0) { perror("write"); exit(-1); } + assert(r >= 0); + assert(r <= len); + len -= r; + msg += r; + } +} + +void helper_transmitmsg(unsigned char *msg_freed, int len_in, void *user) +{ + assert(len_in < 64*1024); + uint16_t len = len_in; + transmit((const void*)&len, sizeof(len), user); + transmit(msg_freed, len, user); + free(msg_freed); +} + +int helper_getreply(void *user) +{ + int v; + int r = read_exactly(0, &v, sizeof(v)); + if (r<=0) exit(-2); + return v; +} + +/*----- other callbacks -----*/ + +static int toolstack_save_fd; +static uint32_t toolstack_save_len; + +static int toolstack_save_cb(uint32_t domid, uint8_t **buf, + uint32_t *len, void *data) +{ + assert(toolstack_save_fd > 0); + + int r = lseek(toolstack_save_fd, 0, SEEK_SET); + if (r) fail(errno,"rewind toolstack data tmpfile"); + + *buf = xmalloc(toolstack_save_len); + r = read_exactly(toolstack_save_fd, *buf, toolstack_save_len); + if (r<0) fail(errno,"read toolstack data"); + if (r==0) fail(0,"read toolstack data eof"); + + *len = toolstack_save_len; + return 0; +} + +static void startup(const char *op) { + logger = (xentoollog_logger*)createlogger_tellparent(); + if (!logger) { + fprintf(stderr, "%s: cannot initialise logger\n", program); + exit(-1); + } + + xtl_log(logger,XTL_DEBUG,0,program,"starting %s",op); + + xch = xc_interface_open(logger,logger,0); + if (!xch) fail(errno,"xc_interface_open failed"); +} + +static void complete(int retval) { + int errnoval = retval ? errno : 0; /* suppress irrelevant errnos */ + xtl_log(logger,XTL_DEBUG,errnoval,program,"complete r=%d",retval); + helper_stub_complete(retval,errnoval,0); + exit(0); +} + +static struct save_callbacks helper_save_callbacks; +static struct restore_callbacks helper_restore_callbacks; + +int main(int argc, char **argv) +{ + int r; + +#define NEXTARG (++argv, assert(*argv), *argv) + + const char *mode = *++argv; + assert(mode); + + if (!strcmp(mode,"--save-domain")) { + + int io_fd = atoi(NEXTARG); + uint32_t dom = strtoul(NEXTARG,0,10); + uint32_t max_iters = strtoul(NEXTARG,0,10); + uint32_t max_factor = strtoul(NEXTARG,0,10); + uint32_t flags = strtoul(NEXTARG,0,10); + int hvm = atoi(NEXTARG); + unsigned long genidad = strtoul(NEXTARG,0,10); + toolstack_save_fd = atoi(NEXTARG); + toolstack_save_len = strtoul(NEXTARG,0,10); + unsigned cbflags = strtoul(NEXTARG,0,10); + assert(!*++argv); + + if (toolstack_save_fd >= 0) + helper_save_callbacks.toolstack_save = toolstack_save_cb; + + helper_setcallbacks_save(&helper_save_callbacks, cbflags); + + startup("save"); + r = xc_domain_save(xch, io_fd, dom, max_iters, max_factor, flags, + &helper_save_callbacks, hvm, genidad); + complete(r); + + } else if (!strcmp(mode,"--restore-domain")) { + + int io_fd = atoi(NEXTARG); + uint32_t dom = strtoul(NEXTARG,0,10); + unsigned store_evtchn = strtoul(NEXTARG,0,10); + domid_t store_domid = strtoul(NEXTARG,0,10); + unsigned console_evtchn = strtoul(NEXTARG,0,10); + domid_t console_domid = strtoul(NEXTARG,0,10); + unsigned int hvm = strtoul(NEXTARG,0,10); + unsigned int pae = strtoul(NEXTARG,0,10); + int superpages = strtoul(NEXTARG,0,10); + int no_incr_genidad = strtoul(NEXTARG,0,10); + unsigned cbflags = strtoul(NEXTARG,0,10); + assert(!*++argv); + + helper_setcallbacks_restore(&helper_restore_callbacks, cbflags); + + unsigned long store_mfn = 0; + unsigned long console_mfn = 0; + unsigned long genidad = 0; + + startup("restore"); + r = xc_domain_restore(xch, io_fd, dom, store_evtchn, &store_mfn, + store_domid, console_evtchn, &console_mfn, + console_domid, hvm, pae, superpages, + no_incr_genidad, &genidad, + &helper_restore_callbacks); + helper_stub_restore_results(store_mfn,console_mfn,genidad,0); + complete(r); + + } else { + assert(!"unexpected mode argument"); + } +} + +/* + * Local variables: + * mode: C + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff -r 13c51d101a9d -r 0f1a974bfb38 tools/libxl/libxl_save_msgs_gen.pl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/libxl/libxl_save_msgs_gen.pl Thu Jun 28 18:43:21 2012 +0100 @@ -0,0 +1,397 @@ +#!/usr/bin/perl -w + +use warnings; +use strict; +use POSIX; + +our $debug = 0; # produce copious debugging output at run-time? + +our @msgs = ( + # flags: + # s - applicable to save + # r - applicable to restore + # c - function pointer in callbacks struct rather than fixed function + # x - function pointer is in struct {save,restore}_callbacks + # and its null-ness needs to be passed through to the helper's xc + # W - needs a return value; callback is synchronous + [ 1, 'sr', "log", [qw(uint32_t level + uint32_t errnoval + STRING context + STRING formatted)] ], + [ 2, 'sr', "progress", [qw(STRING context + STRING doing_what), + 'unsigned long', 'done', + 'unsigned long', 'total'] ], + [ 3, 'scxW', "suspend", [] ], + [ 4, 'scxW', "postcopy", [] ], + [ 5, 'scxW', "checkpoint", [] ], + [ 6, 'scxW', "switch_qemu_logdirty", [qw(int domid + unsigned enable)] ], + # toolstack_save done entirely `by hand' + [ 7, 'rcxW', "toolstack_restore", [qw(uint32_t domid + BLOCK tsdata)] ], + [ 8, 'r', "restore_results", ['unsigned long', 'store_mfn', + 'unsigned long', 'console_mfn', + 'unsigned long', 'genidad'] ], + [ 9, 'srW', "complete", [qw(int retval + int errnoval)] ], +); + +#---------------------------------------- + +our %cbs; +our %func; +our %func_ah; +our @outfuncs; +our %out_decls; +our %out_body; +our %msgnum_used; + +die unless @ARGV==1; +die if $ARGV[0] =~ m/^-/; + +our ($intendedout) = @ARGV; + +$intendedout =~ m/([a-z]+)\.([ch])$/ or die; +my ($want_ah, $ch) = ($1, $2); + +my $declprefix = ''; + +foreach my $ah (qw(callout helper)) { + $out_body{$ah} .= + < +#include +#include +#include +END_BOTH + +#include "libxl_internal.h" + +END_CALLOUT + +#include "_libxl_save_msgs_${ah}.h" +#include +#include + +END_HELPER +} + +die $want_ah unless defined $out_body{$want_ah}; + +sub f_decl ($$$$) { + my ($name, $ah, $c_rtype, $c_decl) = @_; + $out_decls{$name} = "${declprefix}$c_rtype $name$c_decl;\n"; + $func{$name} = "$c_rtype $name$c_decl\n{\n" . ($func{$name} || ''); + $func_ah{$name} = $ah; +} + +sub f_more ($$) { + my ($name, $addbody) = @_; + $func{$name} ||= ''; + $func{$name} .= $addbody; + push @outfuncs, $name; +} + +our $libxl = "libxl__srm"; +our $callback = "${libxl}_callout_callback"; +our $receiveds = "${libxl}_callout_received"; +our $sendreply = "${libxl}_callout_sendreply"; +our $getcallbacks = "${libxl}_callout_get_callbacks"; +our $enumcallbacks = "${libxl}_callout_enumcallbacks"; +sub cbtype ($) { "${libxl}_".$_[0]."_autogen_callbacks"; }; + +f_decl($sendreply, 'callout', 'void', "(int r, void *user)"); + +our $helper = "helper"; +our $encode = "${helper}_stub"; +our $allocbuf = "${helper}_allocbuf"; +our $transmit = "${helper}_transmitmsg"; +our $getreply = "${helper}_getreply"; +our $setcallbacks = "${helper}_setcallbacks"; + +f_decl($allocbuf, 'helper', 'unsigned char *', '(int len, void *user)'); +f_decl($transmit, 'helper', 'void', + '(unsigned char *msg_freed, int len, void *user)'); +f_decl($getreply, 'helper', 'int', '(void *user)'); + +sub typeid ($) { my ($t) = @_; $t =~ s/\W/_/; return $t; }; + +$out_body{'callout'} .= <($sr); + f_more("${fnamebase}_${sr}", $contents); + } + }; + + $f_more_sr->(" case $msgnum: { /* $name */\n"); + if ($flags =~ m/W/) { + $f_more_sr->(" int r;\n"); + } + + my $c_rtype_helper = $flags =~ m/W/ ? 'int' : 'void'; + my $c_rtype_callout = $flags =~ m/W/ ? 'int' : 'void'; + my $c_decl = '('; + my $c_callback_args = ''; + + f_more("${encode}_$name", + <(" const char *$arg;\n"); + } elsif ($argtype eq 'BLOCK') { + $c_decl .= "const uint8_t *$arg, uint32_t ${arg}_size, "; + $c_args .= ", ${arg}_size"; + $c_get_args .= ",&${arg}_size"; + $f_more_sr->(" const uint8_t *$arg;\n". + " uint32_t ${arg}_size;\n"); + } else { + $c_decl .= "$argtype $arg, "; + $f_more_sr->(" $argtype $arg;\n"); + } + $c_callback_args .= "$c_args, "; + $c_recv.= + " if (!${typeid}_get(&msg,endmsg,$c_get_args)) return 0;\n"; + f_more("${encode}_$name", " ${typeid}_put(buf, &len, $c_args);\n"); + } + $f_more_sr->($c_recv); + $c_decl .= "void *user)"; + $c_callback_args .= "user"; + + $f_more_sr->(" if (msg != endmsg) return 0;\n"); + + my $c_callback; + if ($flags !~ m/c/) { + $c_callback = "${callback}_$name"; + } else { + $f_more_sr->(sub { + my ($sr) = @_; + $cbs{$sr} .= " $c_rtype_callout (*${name})$c_decl;\n"; + return + " const ".cbtype($sr)." *const cbs =\n". + " ${getcallbacks}_${sr}(user);\n"; + }); + $c_callback = "cbs->${name}"; + } + my $c_make_callback = "$c_callback($c_callback_args)"; + if ($flags !~ m/W/) { + $f_more_sr->(" $c_make_callback;\n"); + } else { + $f_more_sr->(" r = $c_make_callback;\n". + " $sendreply(r, user);\n"); + f_decl($sendreply, 'callout', 'void', '(int r, void *user)'); + } + if ($flags =~ m/x/) { + my $c_v = "(1u<<$msgnum)"; + my $c_cb = "cbs->$name"; + $f_more_sr->(" if ($c_cb) cbflags |= $c_v;\n", $enumcallbacks); + $f_more_sr->(" $c_cb = (cbflags & $c_v) ? ${encode}_${name} : 0;\n", + $setcallbacks); + } + $f_more_sr->(" return 1;\n }\n\n"); + f_decl("${callback}_$name", 'callout', $c_rtype_callout, $c_decl); + f_decl("${encode}_$name", 'helper', $c_rtype_helper, $c_decl); + f_more("${encode}_$name", +" if (buf) break; + buf = ${helper}_allocbuf(len, user); + assert(buf); + allocd = len; + len = 0; + } + assert(len == allocd); + ${transmit}(buf, len, user); +"); + if ($flags =~ m/W/) { + f_more("${encode}_$name", + (< Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11: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 1SmGw3-0004pq-EL; Wed, 04 Jul 2012 04:11:27 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw0-0004kD-Nh for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:24 +0000 Received: from [85.158.139.83:56203] by server-12.bemta-5.messagelabs.com id 51/8B-25233-B62C3FF4; Wed, 04 Jul 2012 04:11:23 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-182.messagelabs.com!1341375082!26578459!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30944 invoked from network); 4 Jul 2012 04:11:23 -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; 4 Jul 2012 04:11:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvx-0002iH-V7 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGvx-0003sk-U9 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:21 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:21 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: Make libxl__domain_save_device_model 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 Jackson # Date 1340905404 -3600 # Node ID c7f89692edba0c0097243064d4ecda31bfed2fdd # Parent 68c4625cfb415beb8d78138e8d121cc7e719ed77 libxl: Make libxl__domain_save_device_model asynchronous Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- diff -r 68c4625cfb41 -r c7f89692edba tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Thu Jun 28 18:43:24 2012 +0100 +++ b/tools/libxl/libxl_dom.c Thu Jun 28 18:43:24 2012 +0100 @@ -1152,15 +1152,17 @@ out: domain_suspend_done(egc, dss, rc); } +static void save_device_model_datacopier_done(libxl__egc *egc, + libxl__datacopier_state *dc, int onwrite, int errnoval); + void libxl__domain_save_device_model(libxl__egc *egc, libxl__domain_suspend_state *dss, libxl__save_device_model_cb *callback) { STATE_AO_GC(dss->ao); - int rc, fd2 = -1, c; - char buf[1024]; struct stat st; uint32_t qemu_state_len; + int rc; dss->save_dm_callback = callback; @@ -1168,49 +1170,77 @@ void libxl__domain_save_device_model(lib const char *const filename = dss->dm_savefile; const int fd = dss->fd; - if (stat(filename, &st) < 0) + libxl__datacopier_state *dc = &dss->save_dm_datacopier; + memset(dc, 0, sizeof(*dc)); + dc->readwhat = GCSPRINTF("qemu save file %s", filename); + dc->ao = ao; + dc->readfd = -1; + dc->writefd = fd; + dc->maxsz = INT_MAX; + dc->copywhat = GCSPRINTF("qemu save file for domain %"PRIu32, dss->domid); + dc->writewhat = "save/migration stream"; + dc->callback = save_device_model_datacopier_done; + + dc->readfd = open(filename, O_RDONLY); + if (dc->readfd < 0) { + LOGE(ERROR, "unable to open %s", dc->readwhat); + goto out; + } + + if (fstat(dc->readfd, &st)) { - LOG(ERROR, "Unable to stat qemu save file\n"); - rc = ERROR_FAIL; + LOGE(ERROR, "unable to fstat %s", dc->readwhat); + goto out; + } + + if (!S_ISREG(st.st_mode)) { + LOG(ERROR, "%s is not a plain file!", dc->readwhat); goto out; } qemu_state_len = st.st_size; - LOG(DEBUG, "Qemu state is %d bytes\n", qemu_state_len); + LOG(DEBUG, "%s is %d bytes", dc->readwhat, qemu_state_len); - rc = libxl_write_exactly(CTX, fd, QEMU_SIGNATURE, strlen(QEMU_SIGNATURE), - "saved-state file", "qemu signature"); - if (rc) - goto out; + rc = libxl__datacopier_start(dc); + if (rc) goto out; - rc = libxl_write_exactly(CTX, fd, &qemu_state_len, sizeof(qemu_state_len), - "saved-state file", "saved-state length"); - if (rc) - goto out; + libxl__datacopier_prefixdata(egc, dc, + QEMU_SIGNATURE, strlen(QEMU_SIGNATURE)); - fd2 = open(filename, O_RDONLY); - if (fd2 < 0) { - LOGE(ERROR, "Unable to open qemu save file\n"); - goto out; + libxl__datacopier_prefixdata(egc, dc, + &qemu_state_len, sizeof(qemu_state_len)); + return; + + out: + save_device_model_datacopier_done(egc, dc, -1, 0); +} + +static void save_device_model_datacopier_done(libxl__egc *egc, + libxl__datacopier_state *dc, int onwrite, int errnoval) +{ + libxl__domain_suspend_state *dss = + CONTAINER_OF(dc, *dss, save_dm_datacopier); + STATE_AO_GC(dss->ao); + + /* Convenience aliases */ + const char *const filename = dss->dm_savefile; + int our_rc = 0; + int rc; + + libxl__datacopier_kill(dc); + + if (onwrite || errnoval) + our_rc = ERROR_FAIL; + + if (dc->readfd >= 0) { + close(dc->readfd); + dc->readfd = -1; } - while ((c = read(fd2, buf, sizeof(buf))) != 0) { - if (c < 0) { - if (errno == EINTR) - continue; - rc = errno; - goto out; - } - rc = libxl_write_exactly( - CTX, fd, buf, c, "saved-state file", "qemu state"); - if (rc) - goto out; - } - rc = 0; -out: - if (fd2 >= 0) close(fd2); - unlink(filename); - dss->save_dm_callback(egc, dss, rc); + rc = libxl__remove_file(gc, filename); + if (!our_rc) our_rc = rc; + + dss->save_dm_callback(egc, dss, our_rc); } static void domain_suspend_done(libxl__egc *egc, diff -r 68c4625cfb41 -r c7f89692edba tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Thu Jun 28 18:43:24 2012 +0100 +++ b/tools/libxl/libxl_internal.h Thu Jun 28 18:43:24 2012 +0100 @@ -1901,6 +1901,7 @@ struct libxl__domain_suspend_state { libxl__logdirty_switch logdirty; /* private for libxl__domain_save_device_model */ libxl__save_device_model_cb *save_dm_callback; + libxl__datacopier_state save_dm_datacopier; }; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11: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 1SmGw3-0004pq-EL; Wed, 04 Jul 2012 04:11:27 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw0-0004kD-Nh for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:24 +0000 Received: from [85.158.139.83:56203] by server-12.bemta-5.messagelabs.com id 51/8B-25233-B62C3FF4; Wed, 04 Jul 2012 04:11:23 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-182.messagelabs.com!1341375082!26578459!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30944 invoked from network); 4 Jul 2012 04:11:23 -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; 4 Jul 2012 04:11:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvx-0002iH-V7 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGvx-0003sk-U9 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:21 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:21 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: Make libxl__domain_save_device_model 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 Jackson # Date 1340905404 -3600 # Node ID c7f89692edba0c0097243064d4ecda31bfed2fdd # Parent 68c4625cfb415beb8d78138e8d121cc7e719ed77 libxl: Make libxl__domain_save_device_model asynchronous Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- diff -r 68c4625cfb41 -r c7f89692edba tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Thu Jun 28 18:43:24 2012 +0100 +++ b/tools/libxl/libxl_dom.c Thu Jun 28 18:43:24 2012 +0100 @@ -1152,15 +1152,17 @@ out: domain_suspend_done(egc, dss, rc); } +static void save_device_model_datacopier_done(libxl__egc *egc, + libxl__datacopier_state *dc, int onwrite, int errnoval); + void libxl__domain_save_device_model(libxl__egc *egc, libxl__domain_suspend_state *dss, libxl__save_device_model_cb *callback) { STATE_AO_GC(dss->ao); - int rc, fd2 = -1, c; - char buf[1024]; struct stat st; uint32_t qemu_state_len; + int rc; dss->save_dm_callback = callback; @@ -1168,49 +1170,77 @@ void libxl__domain_save_device_model(lib const char *const filename = dss->dm_savefile; const int fd = dss->fd; - if (stat(filename, &st) < 0) + libxl__datacopier_state *dc = &dss->save_dm_datacopier; + memset(dc, 0, sizeof(*dc)); + dc->readwhat = GCSPRINTF("qemu save file %s", filename); + dc->ao = ao; + dc->readfd = -1; + dc->writefd = fd; + dc->maxsz = INT_MAX; + dc->copywhat = GCSPRINTF("qemu save file for domain %"PRIu32, dss->domid); + dc->writewhat = "save/migration stream"; + dc->callback = save_device_model_datacopier_done; + + dc->readfd = open(filename, O_RDONLY); + if (dc->readfd < 0) { + LOGE(ERROR, "unable to open %s", dc->readwhat); + goto out; + } + + if (fstat(dc->readfd, &st)) { - LOG(ERROR, "Unable to stat qemu save file\n"); - rc = ERROR_FAIL; + LOGE(ERROR, "unable to fstat %s", dc->readwhat); + goto out; + } + + if (!S_ISREG(st.st_mode)) { + LOG(ERROR, "%s is not a plain file!", dc->readwhat); goto out; } qemu_state_len = st.st_size; - LOG(DEBUG, "Qemu state is %d bytes\n", qemu_state_len); + LOG(DEBUG, "%s is %d bytes", dc->readwhat, qemu_state_len); - rc = libxl_write_exactly(CTX, fd, QEMU_SIGNATURE, strlen(QEMU_SIGNATURE), - "saved-state file", "qemu signature"); - if (rc) - goto out; + rc = libxl__datacopier_start(dc); + if (rc) goto out; - rc = libxl_write_exactly(CTX, fd, &qemu_state_len, sizeof(qemu_state_len), - "saved-state file", "saved-state length"); - if (rc) - goto out; + libxl__datacopier_prefixdata(egc, dc, + QEMU_SIGNATURE, strlen(QEMU_SIGNATURE)); - fd2 = open(filename, O_RDONLY); - if (fd2 < 0) { - LOGE(ERROR, "Unable to open qemu save file\n"); - goto out; + libxl__datacopier_prefixdata(egc, dc, + &qemu_state_len, sizeof(qemu_state_len)); + return; + + out: + save_device_model_datacopier_done(egc, dc, -1, 0); +} + +static void save_device_model_datacopier_done(libxl__egc *egc, + libxl__datacopier_state *dc, int onwrite, int errnoval) +{ + libxl__domain_suspend_state *dss = + CONTAINER_OF(dc, *dss, save_dm_datacopier); + STATE_AO_GC(dss->ao); + + /* Convenience aliases */ + const char *const filename = dss->dm_savefile; + int our_rc = 0; + int rc; + + libxl__datacopier_kill(dc); + + if (onwrite || errnoval) + our_rc = ERROR_FAIL; + + if (dc->readfd >= 0) { + close(dc->readfd); + dc->readfd = -1; } - while ((c = read(fd2, buf, sizeof(buf))) != 0) { - if (c < 0) { - if (errno == EINTR) - continue; - rc = errno; - goto out; - } - rc = libxl_write_exactly( - CTX, fd, buf, c, "saved-state file", "qemu state"); - if (rc) - goto out; - } - rc = 0; -out: - if (fd2 >= 0) close(fd2); - unlink(filename); - dss->save_dm_callback(egc, dss, rc); + rc = libxl__remove_file(gc, filename); + if (!our_rc) our_rc = rc; + + dss->save_dm_callback(egc, dss, our_rc); } static void domain_suspend_done(libxl__egc *egc, diff -r 68c4625cfb41 -r c7f89692edba tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Thu Jun 28 18:43:24 2012 +0100 +++ b/tools/libxl/libxl_internal.h Thu Jun 28 18:43:24 2012 +0100 @@ -1901,6 +1901,7 @@ struct libxl__domain_suspend_state { libxl__logdirty_switch logdirty; /* private for libxl__domain_save_device_model */ libxl__save_device_model_cb *save_dm_callback; + libxl__datacopier_state save_dm_datacopier; }; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:28 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw3-0004qf-Pw; Wed, 04 Jul 2012 04:11:27 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw1-0004la-4W for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:25 +0000 Received: from [85.158.138.51:37056] by server-3.bemta-3.messagelabs.com id 98/81-26490-C62C3FF4; Wed, 04 Jul 2012 04:11:24 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-174.messagelabs.com!1341375082!29729065!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14449 invoked from network); 4 Jul 2012 04:11:23 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvy-0002iP-Fs for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGvy-0003sz-Et for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:22 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:21 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: Add a gc to libxl_get_cpu_topology X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340905405 -3600 # Node ID 5ad69631f8279b9ce58540dd7e9b316b8607a5a9 # Parent c7f89692edba0c0097243064d4ecda31bfed2fdd libxl: Add a gc to libxl_get_cpu_topology In the next-but-one patch we are going to change the definition of NOGC to require a local variable libxl__gc *gc. libxl_get_cpu_topology doesn't have one but does use NOGC. Fix this by: - introducing an `out' label - replacing the only call to `return' with a suitable assignment to ret and a `goto out'. - adding uses of GC_INIT and GC_FREE. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r c7f89692edba -r 5ad69631f827 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Thu Jun 28 18:43:24 2012 +0100 +++ b/tools/libxl/libxl.c Thu Jun 28 18:43:25 2012 +0100 @@ -3202,6 +3202,7 @@ int libxl_get_physinfo(libxl_ctx *ctx, l libxl_cputopology *libxl_get_cpu_topology(libxl_ctx *ctx, int *nb_cpu_out) { + GC_INIT(ctx); xc_topologyinfo_t tinfo; DECLARE_HYPERCALL_BUFFER(xc_cpu_to_core_t, coremap); DECLARE_HYPERCALL_BUFFER(xc_cpu_to_socket_t, socketmap); @@ -3214,7 +3215,8 @@ libxl_cputopology *libxl_get_cpu_topolog if (max_cpus == 0) { LIBXL__LOG(ctx, XTL_ERROR, "Unable to determine number of CPUS"); - return NULL; + ret = NULL; + goto out; } coremap = xc_hypercall_buffer_alloc @@ -3259,6 +3261,8 @@ fail: if (ret) *nb_cpu_out = max_cpus; + out: + GC_FREE; return ret; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:28 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw4-0004rK-1C; Wed, 04 Jul 2012 04:11:28 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw1-0004kN-9g for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:25 +0000 Received: from [85.158.138.51:37091] by server-8.bemta-3.messagelabs.com id 99/CB-06157-C62C3FF4; Wed, 04 Jul 2012 04:11:24 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-174.messagelabs.com!1341375083!30957371!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28218 invoked from network); 4 Jul 2012 04:11:24 -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; 4 Jul 2012 04:11:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvz-0002iZ-0V for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGvy-0003tE-Vj for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:22 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:22 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: Add a gc to libxl_cpumap_alloc, ..._to_hex_string X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340905405 -3600 # Node ID a383ea62e716cca326ed597f21e8da4a05fc5e99 # Parent 5ad69631f8279b9ce58540dd7e9b316b8607a5a9 libxl: Add a gc to libxl_cpumap_alloc, ..._to_hex_string In the next patch we are going to change the definition of NOGC to require a local variable libxl__gc *gc. And this means that passing 0 to libxl__calloc is going to be wrong. libxl_cpumap_alloc doesn't have a gc but passes 0 to libxl_calloc Fix this by: - introducing an `out' label and an rc variable - replacing the returns with rc = ERROR_BLAH; goto out; - adding uses of GC_INIT and GC_FREE. - changing NULL to NOGC in the call to libxl__calloc Likewise fix libxl_cpumap_to_hex_string by: - adding a libxl_ctx* parameter and updating the one call site - adding uses of GC_INIT and GC_FREE. - changing NULL to NOGC in the call to libxl__zalloc Signed-off-by: Ian Jackson Acked-by: Dario Faggioli Acked-by: Roger Pau Monne Committed-by: Ian Jackson --- diff -r 5ad69631f827 -r a383ea62e716 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Thu Jun 28 18:43:25 2012 +0100 +++ b/tools/libxl/libxl_dm.c Thu Jun 28 18:43:25 2012 +0100 @@ -204,7 +204,7 @@ static char ** libxl__build_device_model } nr_set_cpus = libxl_cpumap_count_set(&b_info->avail_vcpus); - s = libxl_cpumap_to_hex_string(&b_info->avail_vcpus); + s = libxl_cpumap_to_hex_string(CTX, &b_info->avail_vcpus); flexarray_vappend(dm_args, "-vcpu_avail", libxl__sprintf(gc, "%s", s), NULL); free(s); diff -r 5ad69631f827 -r a383ea62e716 tools/libxl/libxl_utils.c --- a/tools/libxl/libxl_utils.c Thu Jun 28 18:43:25 2012 +0100 +++ b/tools/libxl/libxl_utils.c Thu Jun 28 18:43:25 2012 +0100 @@ -491,19 +491,29 @@ int libxl_mac_to_device_nic(libxl_ctx *c int libxl_cpumap_alloc(libxl_ctx *ctx, libxl_cpumap *cpumap, int max_cpus) { + GC_INIT(ctx); int sz; + int rc; - if (max_cpus < 0) - return ERROR_INVAL; + if (max_cpus < 0) { + rc = ERROR_INVAL; + goto out; + } if (max_cpus == 0) max_cpus = libxl_get_max_cpus(ctx); - if (max_cpus == 0) - return ERROR_FAIL; + if (max_cpus == 0) { + rc = ERROR_FAIL; + goto out; + } sz = (max_cpus + 7) / 8; - cpumap->map = libxl__calloc(NULL, sizeof(*cpumap->map), sz); + cpumap->map = libxl__calloc(NOGC, sizeof(*cpumap->map), sz); cpumap->size = sz; - return 0; + + rc = 0; + out: + GC_FREE; + return rc; } void libxl_cpumap_dispose(libxl_cpumap *map) @@ -542,10 +552,11 @@ int libxl_cpumap_count_set(const libxl_c } /* NB. caller is responsible for freeing the memory */ -char *libxl_cpumap_to_hex_string(const libxl_cpumap *cpumap) +char *libxl_cpumap_to_hex_string(libxl_ctx *ctx, const libxl_cpumap *cpumap) { + GC_INIT(ctx); int i = cpumap->size; - char *p = libxl__zalloc(NULL, cpumap->size * 2 + 3); + char *p = libxl__zalloc(NOGC, cpumap->size * 2 + 3); char *q = p; strncpy(p, "0x", 2); p += 2; @@ -554,6 +565,7 @@ char *libxl_cpumap_to_hex_string(const l p += 2; } *p = '\0'; + GC_FREE; return q; } diff -r 5ad69631f827 -r a383ea62e716 tools/libxl/libxl_utils.h --- a/tools/libxl/libxl_utils.h Thu Jun 28 18:43:25 2012 +0100 +++ b/tools/libxl/libxl_utils.h Thu Jun 28 18:43:25 2012 +0100 @@ -68,7 +68,7 @@ int libxl_cpumap_test(const libxl_cpumap void libxl_cpumap_set(libxl_cpumap *cpumap, int cpu); void libxl_cpumap_reset(libxl_cpumap *cpumap, int cpu); int libxl_cpumap_count_set(const libxl_cpumap *cpumap); -char *libxl_cpumap_to_hex_string(const libxl_cpumap *cpumap); +char *libxl_cpumap_to_hex_string(libxl_ctx *ctx, const libxl_cpumap *cpumap); static inline void libxl_cpumap_set_any(libxl_cpumap *cpumap) { memset(cpumap->map, -1, cpumap->size); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:28 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw3-0004qf-Pw; Wed, 04 Jul 2012 04:11:27 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw1-0004la-4W for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:25 +0000 Received: from [85.158.138.51:37056] by server-3.bemta-3.messagelabs.com id 98/81-26490-C62C3FF4; Wed, 04 Jul 2012 04:11:24 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-174.messagelabs.com!1341375082!29729065!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14449 invoked from network); 4 Jul 2012 04:11:23 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvy-0002iP-Fs for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGvy-0003sz-Et for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:22 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:21 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: Add a gc to libxl_get_cpu_topology X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340905405 -3600 # Node ID 5ad69631f8279b9ce58540dd7e9b316b8607a5a9 # Parent c7f89692edba0c0097243064d4ecda31bfed2fdd libxl: Add a gc to libxl_get_cpu_topology In the next-but-one patch we are going to change the definition of NOGC to require a local variable libxl__gc *gc. libxl_get_cpu_topology doesn't have one but does use NOGC. Fix this by: - introducing an `out' label - replacing the only call to `return' with a suitable assignment to ret and a `goto out'. - adding uses of GC_INIT and GC_FREE. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r c7f89692edba -r 5ad69631f827 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Thu Jun 28 18:43:24 2012 +0100 +++ b/tools/libxl/libxl.c Thu Jun 28 18:43:25 2012 +0100 @@ -3202,6 +3202,7 @@ int libxl_get_physinfo(libxl_ctx *ctx, l libxl_cputopology *libxl_get_cpu_topology(libxl_ctx *ctx, int *nb_cpu_out) { + GC_INIT(ctx); xc_topologyinfo_t tinfo; DECLARE_HYPERCALL_BUFFER(xc_cpu_to_core_t, coremap); DECLARE_HYPERCALL_BUFFER(xc_cpu_to_socket_t, socketmap); @@ -3214,7 +3215,8 @@ libxl_cputopology *libxl_get_cpu_topolog if (max_cpus == 0) { LIBXL__LOG(ctx, XTL_ERROR, "Unable to determine number of CPUS"); - return NULL; + ret = NULL; + goto out; } coremap = xc_hypercall_buffer_alloc @@ -3259,6 +3261,8 @@ fail: if (ret) *nb_cpu_out = max_cpus; + out: + GC_FREE; return ret; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:28 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw4-0004rK-1C; Wed, 04 Jul 2012 04:11:28 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw1-0004kN-9g for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:25 +0000 Received: from [85.158.138.51:37091] by server-8.bemta-3.messagelabs.com id 99/CB-06157-C62C3FF4; Wed, 04 Jul 2012 04:11:24 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-174.messagelabs.com!1341375083!30957371!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28218 invoked from network); 4 Jul 2012 04:11:24 -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; 4 Jul 2012 04:11:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvz-0002iZ-0V for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGvy-0003tE-Vj for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:22 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:22 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: Add a gc to libxl_cpumap_alloc, ..._to_hex_string X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340905405 -3600 # Node ID a383ea62e716cca326ed597f21e8da4a05fc5e99 # Parent 5ad69631f8279b9ce58540dd7e9b316b8607a5a9 libxl: Add a gc to libxl_cpumap_alloc, ..._to_hex_string In the next patch we are going to change the definition of NOGC to require a local variable libxl__gc *gc. And this means that passing 0 to libxl__calloc is going to be wrong. libxl_cpumap_alloc doesn't have a gc but passes 0 to libxl_calloc Fix this by: - introducing an `out' label and an rc variable - replacing the returns with rc = ERROR_BLAH; goto out; - adding uses of GC_INIT and GC_FREE. - changing NULL to NOGC in the call to libxl__calloc Likewise fix libxl_cpumap_to_hex_string by: - adding a libxl_ctx* parameter and updating the one call site - adding uses of GC_INIT and GC_FREE. - changing NULL to NOGC in the call to libxl__zalloc Signed-off-by: Ian Jackson Acked-by: Dario Faggioli Acked-by: Roger Pau Monne Committed-by: Ian Jackson --- diff -r 5ad69631f827 -r a383ea62e716 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Thu Jun 28 18:43:25 2012 +0100 +++ b/tools/libxl/libxl_dm.c Thu Jun 28 18:43:25 2012 +0100 @@ -204,7 +204,7 @@ static char ** libxl__build_device_model } nr_set_cpus = libxl_cpumap_count_set(&b_info->avail_vcpus); - s = libxl_cpumap_to_hex_string(&b_info->avail_vcpus); + s = libxl_cpumap_to_hex_string(CTX, &b_info->avail_vcpus); flexarray_vappend(dm_args, "-vcpu_avail", libxl__sprintf(gc, "%s", s), NULL); free(s); diff -r 5ad69631f827 -r a383ea62e716 tools/libxl/libxl_utils.c --- a/tools/libxl/libxl_utils.c Thu Jun 28 18:43:25 2012 +0100 +++ b/tools/libxl/libxl_utils.c Thu Jun 28 18:43:25 2012 +0100 @@ -491,19 +491,29 @@ int libxl_mac_to_device_nic(libxl_ctx *c int libxl_cpumap_alloc(libxl_ctx *ctx, libxl_cpumap *cpumap, int max_cpus) { + GC_INIT(ctx); int sz; + int rc; - if (max_cpus < 0) - return ERROR_INVAL; + if (max_cpus < 0) { + rc = ERROR_INVAL; + goto out; + } if (max_cpus == 0) max_cpus = libxl_get_max_cpus(ctx); - if (max_cpus == 0) - return ERROR_FAIL; + if (max_cpus == 0) { + rc = ERROR_FAIL; + goto out; + } sz = (max_cpus + 7) / 8; - cpumap->map = libxl__calloc(NULL, sizeof(*cpumap->map), sz); + cpumap->map = libxl__calloc(NOGC, sizeof(*cpumap->map), sz); cpumap->size = sz; - return 0; + + rc = 0; + out: + GC_FREE; + return rc; } void libxl_cpumap_dispose(libxl_cpumap *map) @@ -542,10 +552,11 @@ int libxl_cpumap_count_set(const libxl_c } /* NB. caller is responsible for freeing the memory */ -char *libxl_cpumap_to_hex_string(const libxl_cpumap *cpumap) +char *libxl_cpumap_to_hex_string(libxl_ctx *ctx, const libxl_cpumap *cpumap) { + GC_INIT(ctx); int i = cpumap->size; - char *p = libxl__zalloc(NULL, cpumap->size * 2 + 3); + char *p = libxl__zalloc(NOGC, cpumap->size * 2 + 3); char *q = p; strncpy(p, "0x", 2); p += 2; @@ -554,6 +565,7 @@ char *libxl_cpumap_to_hex_string(const l p += 2; } *p = '\0'; + GC_FREE; return q; } diff -r 5ad69631f827 -r a383ea62e716 tools/libxl/libxl_utils.h --- a/tools/libxl/libxl_utils.h Thu Jun 28 18:43:25 2012 +0100 +++ b/tools/libxl/libxl_utils.h Thu Jun 28 18:43:25 2012 +0100 @@ -68,7 +68,7 @@ int libxl_cpumap_test(const libxl_cpumap void libxl_cpumap_set(libxl_cpumap *cpumap, int cpu); void libxl_cpumap_reset(libxl_cpumap *cpumap, int cpu); int libxl_cpumap_count_set(const libxl_cpumap *cpumap); -char *libxl_cpumap_to_hex_string(const libxl_cpumap *cpumap); +char *libxl_cpumap_to_hex_string(libxl_ctx *ctx, const libxl_cpumap *cpumap); static inline void libxl_cpumap_set_any(libxl_cpumap *cpumap) { memset(cpumap->map, -1, cpumap->size); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:28 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw4-0004tH-NK; Wed, 04 Jul 2012 04:11:28 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw2-0004b1-9u for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:26 +0000 Received: from [85.158.143.35:38540] by server-2.bemta-4.messagelabs.com id 6A/C5-17938-D62C3FF4; Wed, 04 Jul 2012 04:11:25 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-21.messagelabs.com!1341375083!14211771!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12602 invoked from network); 4 Jul 2012 04:11:24 -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; 4 Jul 2012 04:11:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvz-0002ih-IQ for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGvz-0003tT-H9 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:23 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:23 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: Do not pass NULL as gc_opt; introduce NOGC X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340905405 -3600 # Node ID a2ee8da8211936e64a55dcaf41e45aa9988da7fc # Parent a383ea62e716cca326ed597f21e8da4a05fc5e99 libxl: Do not pass NULL as gc_opt; introduce NOGC In 25182:6c3345d7e9d9 the practice of passing NULL to gc-using memory allocation functions was introduced. However, the arrangements there were not correct as committed, because the error handling and logging depends on getting a ctx from the gc - so an allocation error would in fact result in libxl dereferencing NULL. Instead, provide a special dummy gc in the ctx, called `nogc_gc'. It is marked out specially by having alloc_maxsize==-1, which is otherwise invalid. Functions which need to actually look into the gc use the new test function gc_is_real (whose purpose is mainly clarity of the code) to check whether the gc is the dummy one, and do nothing if it is. And we provide a helper macro NOGC which uses the in-scope real gc to find the ctx and hence the dummy gc (and which replaces the previous #define NOGC NULL). Change all callers which pass 0 or NULL to an allocation function to use NOGC or &ctx->nogc_gc, as applicable in the context. We add a comment near the definition of LIBXL_INIT_GC pointing out that it isn't any more the only place a libxl__gc struct is initialised, for the benefit of anyone changing the contents of gc's in the future. Also, actually document that libxl__ptr_add is legal with ptr==NULL, and change a couple of calls not to check for NULL argument. Reported-by: Bamvor Jian Zhang Signed-off-by: Ian Jackson Cc: Bamvor Jian Zhang Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r a383ea62e716 -r a2ee8da82119 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Thu Jun 28 18:43:25 2012 +0100 +++ b/tools/libxl/libxl.c Thu Jun 28 18:43:25 2012 +0100 @@ -41,6 +41,9 @@ int libxl_ctx_alloc(libxl_ctx **pctx, in /* First initialise pointers etc. (cannot fail) */ + ctx->nogc_gc.alloc_maxsize = -1; + ctx->nogc_gc.owner = ctx; + LIBXL_TAILQ_INIT(&ctx->occurred); ctx->osevent_hooks = 0; diff -r a383ea62e716 -r a2ee8da82119 tools/libxl/libxl_aoutils.c --- a/tools/libxl/libxl_aoutils.c Thu Jun 28 18:43:25 2012 +0100 +++ b/tools/libxl/libxl_aoutils.c Thu Jun 28 18:43:25 2012 +0100 @@ -77,6 +77,7 @@ static void datacopier_check_state(libxl void libxl__datacopier_prefixdata(libxl__egc *egc, libxl__datacopier_state *dc, const void *data, size_t len) { + EGC_GC; libxl__datacopier_buf *buf; /* * It is safe for this to be called immediately after _start, as @@ -88,7 +89,7 @@ void libxl__datacopier_prefixdata(libxl_ assert(len < dc->maxsz - dc->used); - buf = libxl__zalloc(0, sizeof(*buf) - sizeof(buf->buf) + len); + buf = libxl__zalloc(NOGC, sizeof(*buf) - sizeof(buf->buf) + len); buf->used = len; memcpy(buf->buf, data, len); diff -r a383ea62e716 -r a2ee8da82119 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Thu Jun 28 18:43:25 2012 +0100 +++ b/tools/libxl/libxl_create.c Thu Jun 28 18:43:25 2012 +0100 @@ -165,7 +165,7 @@ int libxl__domain_build_info_setdefault( } if (b_info->blkdev_start == NULL) - b_info->blkdev_start = libxl__strdup(0, "xvda"); + b_info->blkdev_start = libxl__strdup(NOGC, "xvda"); if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) { if (!b_info->u.hvm.bios) diff -r a383ea62e716 -r a2ee8da82119 tools/libxl/libxl_event.c --- a/tools/libxl/libxl_event.c Thu Jun 28 18:43:25 2012 +0100 +++ b/tools/libxl/libxl_event.c Thu Jun 28 18:43:25 2012 +0100 @@ -772,7 +772,7 @@ static int beforepoll_internal(libxl__gc if (poller->fd_rindices_allocd < maxfd) { assert(ARRAY_SIZE_OK(poller->fd_rindices, maxfd)); poller->fd_rindices = - libxl__realloc(0, poller->fd_rindices, + libxl__realloc(NOGC, poller->fd_rindices, maxfd * sizeof(*poller->fd_rindices)); memset(poller->fd_rindices + poller->fd_rindices_allocd, 0, @@ -1099,9 +1099,10 @@ void libxl_event_free(libxl_ctx *ctx, li libxl_event *libxl__event_new(libxl__egc *egc, libxl_event_type type, uint32_t domid) { + EGC_GC; libxl_event *ev; - ev = libxl__zalloc(0,sizeof(*ev)); + ev = libxl__zalloc(NOGC,sizeof(*ev)); ev->type = type; ev->domid = domid; diff -r a383ea62e716 -r a2ee8da82119 tools/libxl/libxl_exec.c --- a/tools/libxl/libxl_exec.c Thu Jun 28 18:43:25 2012 +0100 +++ b/tools/libxl/libxl_exec.c Thu Jun 28 18:43:25 2012 +0100 @@ -280,7 +280,7 @@ int libxl__spawn_spawn(libxl__egc *egc, int status, rc; libxl__spawn_init(ss); - ss->ssd = libxl__zalloc(0, sizeof(*ss->ssd)); + ss->ssd = libxl__zalloc(NOGC, sizeof(*ss->ssd)); libxl__ev_child_init(&ss->ssd->mid); rc = libxl__ev_time_register_rel(gc, &ss->timeout, diff -r a383ea62e716 -r a2ee8da82119 tools/libxl/libxl_fork.c --- a/tools/libxl/libxl_fork.c Thu Jun 28 18:43:25 2012 +0100 +++ b/tools/libxl/libxl_fork.c Thu Jun 28 18:43:25 2012 +0100 @@ -92,7 +92,7 @@ libxl__carefd *libxl__carefd_record(libx libxl__carefd *cf = 0; libxl_fd_set_cloexec(ctx, fd, 1); - cf = libxl__zalloc(NULL, sizeof(*cf)); + cf = libxl__zalloc(&ctx->nogc_gc, sizeof(*cf)); cf->fd = fd; LIBXL_LIST_INSERT_HEAD(&carefds, cf, entry); return cf; diff -r a383ea62e716 -r a2ee8da82119 tools/libxl/libxl_internal.c --- a/tools/libxl/libxl_internal.c Thu Jun 28 18:43:25 2012 +0100 +++ b/tools/libxl/libxl_internal.c Thu Jun 28 18:43:25 2012 +0100 @@ -30,11 +30,16 @@ void libxl__alloc_failed(libxl_ctx *ctx, #undef L } +static int gc_is_real(const libxl__gc *gc) +{ + return gc->alloc_maxsize >= 0; +} + void libxl__ptr_add(libxl__gc *gc, void *ptr) { int i; - if (!gc) + if (!gc_is_real(gc)) return; if (!ptr) @@ -66,6 +71,8 @@ void libxl__free_all(libxl__gc *gc) void *ptr; int i; + assert(gc_is_real(gc)); + for (i = 0; i < gc->alloc_maxsize; i++) { ptr = gc->alloc_ptrs[i]; gc->alloc_ptrs[i] = NULL; @@ -104,7 +111,7 @@ void *libxl__realloc(libxl__gc *gc, void if (ptr == NULL) { libxl__ptr_add(gc, new_ptr); - } else if (new_ptr != ptr && gc != NULL) { + } else if (new_ptr != ptr && gc_is_real(gc)) { for (i = 0; i < gc->alloc_maxsize; i++) { if (gc->alloc_ptrs[i] == ptr) { gc->alloc_ptrs[i] = new_ptr; diff -r a383ea62e716 -r a2ee8da82119 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Thu Jun 28 18:43:25 2012 +0100 +++ b/tools/libxl/libxl_internal.h Thu Jun 28 18:43:25 2012 +0100 @@ -277,10 +277,18 @@ struct libxl__poller { int wakeup_pipe[2]; /* 0 means no fd allocated */ }; +struct libxl__gc { + /* mini-GC */ + int alloc_maxsize; /* -1 means this is the dummy non-gc gc */ + void **alloc_ptrs; + libxl_ctx *owner; +}; + struct libxl__ctx { xentoollog_logger *lg; xc_interface *xch; struct xs_handle *xsh; + libxl__gc nogc_gc; const libxl_event_hooks *event_hooks; void *event_hooks_user; @@ -356,13 +364,6 @@ typedef struct { #define PRINTF_ATTRIBUTE(x, y) __attribute__((format(printf, x, y))) -struct libxl__gc { - /* mini-GC */ - int alloc_maxsize; - void **alloc_ptrs; - libxl_ctx *owner; -}; - struct libxl__egc { /* For event-generating functions only. * The egc and its gc may be accessed only on the creating thread. */ @@ -420,6 +421,7 @@ struct libxl__ao { (gc).alloc_ptrs = 0; \ (gc).owner = (ctx); \ } while(0) + /* NB, also, a gc struct ctx->nogc_gc is initialised in libxl_ctx_alloc */ static inline libxl_ctx *libxl__gc_owner(libxl__gc *gc) { @@ -438,13 +440,20 @@ static inline libxl_ctx *libxl__gc_owner * All pointers returned by these functions are registered for garbage * collection on exit from the outermost libxl callframe. * - * However, where the argument is stated to be "gc_opt", NULL may be - * passed instead, in which case no garbage collection will occur; the - * pointer must later be freed with free(). This is for memory - * allocations of types (b) and (c). + * However, where the argument is stated to be "gc_opt", &ctx->nogc_gc + * may be passed instead, in which case no garbage collection will + * occur; the pointer must later be freed with free(). (Passing NULL + * for gc_opt is not permitted.) This is for memory allocations of + * types (b) and (c). The convenience macro NOGC should be used where + * possible. + * + * NOGC (and ctx->nogc_gc) may ONLY be used with functions which + * explicitly declare that it's OK. Use with nonconsenting functions + * may result in leaks of those functions' internal allocations on the + * psuedo-gc. */ -/* register @ptr in @gc for free on exit from outermost libxl callframe. */ -_hidden void libxl__ptr_add(libxl__gc *gc_opt, void *ptr); +/* register ptr in gc for free on exit from outermost libxl callframe. */ +_hidden void libxl__ptr_add(libxl__gc *gc_opt, void *ptr /* may be NULL */); /* if this is the outermost libxl callframe then free all pointers in @gc */ _hidden void libxl__free_all(libxl__gc *gc); /* allocate and zero @bytes. (similar to a gc'd malloc(3)+memzero()) */ @@ -2110,7 +2119,7 @@ _hidden const char *libxl__device_model_ #define GC_INIT(ctx) libxl__gc gc[1]; LIBXL_INIT_GC(gc[0],ctx) #define GC_FREE libxl__free_all(gc) #define CTX libxl__gc_owner(gc) -#define NOGC NULL +#define NOGC (&CTX->nogc_gc) /* pass only to consenting functions */ /* Allocation macros all of which use the gc. */ diff -r a383ea62e716 -r a2ee8da82119 tools/libxl/libxl_utils.c --- a/tools/libxl/libxl_utils.c Thu Jun 28 18:43:25 2012 +0100 +++ b/tools/libxl/libxl_utils.c Thu Jun 28 18:43:25 2012 +0100 @@ -58,8 +58,7 @@ char *libxl_domid_to_name(libxl_ctx *ctx char *libxl__domid_to_name(libxl__gc *gc, uint32_t domid) { char *s = libxl_domid_to_name(libxl__gc_owner(gc), domid); - if ( s ) - libxl__ptr_add(gc, s); + libxl__ptr_add(gc, s); return s; } @@ -107,8 +106,7 @@ char *libxl_cpupoolid_to_name(libxl_ctx char *libxl__cpupoolid_to_name(libxl__gc *gc, uint32_t poolid) { char *s = libxl_cpupoolid_to_name(libxl__gc_owner(gc), poolid); - if ( s ) - libxl__ptr_add(gc, s); + libxl__ptr_add(gc, s); return s; } diff -r a383ea62e716 -r a2ee8da82119 tools/libxl/libxl_xshelp.c --- a/tools/libxl/libxl_xshelp.c Thu Jun 28 18:43:25 2012 +0100 +++ b/tools/libxl/libxl_xshelp.c Thu Jun 28 18:43:25 2012 +0100 @@ -86,11 +86,8 @@ char * libxl__xs_read(libxl__gc *gc, xs_ char *ptr; ptr = xs_read(ctx->xsh, t, path, NULL); - if (ptr != NULL) { - libxl__ptr_add(gc, ptr); - return ptr; - } - return 0; + libxl__ptr_add(gc, ptr); + return ptr; } char *libxl__xs_get_dompath(libxl__gc *gc, uint32_t domid) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:28 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw4-0004tH-NK; Wed, 04 Jul 2012 04:11:28 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw2-0004b1-9u for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:26 +0000 Received: from [85.158.143.35:38540] by server-2.bemta-4.messagelabs.com id 6A/C5-17938-D62C3FF4; Wed, 04 Jul 2012 04:11:25 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-21.messagelabs.com!1341375083!14211771!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12602 invoked from network); 4 Jul 2012 04:11:24 -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; 4 Jul 2012 04:11:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvz-0002ih-IQ for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGvz-0003tT-H9 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:23 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:23 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: Do not pass NULL as gc_opt; introduce NOGC X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340905405 -3600 # Node ID a2ee8da8211936e64a55dcaf41e45aa9988da7fc # Parent a383ea62e716cca326ed597f21e8da4a05fc5e99 libxl: Do not pass NULL as gc_opt; introduce NOGC In 25182:6c3345d7e9d9 the practice of passing NULL to gc-using memory allocation functions was introduced. However, the arrangements there were not correct as committed, because the error handling and logging depends on getting a ctx from the gc - so an allocation error would in fact result in libxl dereferencing NULL. Instead, provide a special dummy gc in the ctx, called `nogc_gc'. It is marked out specially by having alloc_maxsize==-1, which is otherwise invalid. Functions which need to actually look into the gc use the new test function gc_is_real (whose purpose is mainly clarity of the code) to check whether the gc is the dummy one, and do nothing if it is. And we provide a helper macro NOGC which uses the in-scope real gc to find the ctx and hence the dummy gc (and which replaces the previous #define NOGC NULL). Change all callers which pass 0 or NULL to an allocation function to use NOGC or &ctx->nogc_gc, as applicable in the context. We add a comment near the definition of LIBXL_INIT_GC pointing out that it isn't any more the only place a libxl__gc struct is initialised, for the benefit of anyone changing the contents of gc's in the future. Also, actually document that libxl__ptr_add is legal with ptr==NULL, and change a couple of calls not to check for NULL argument. Reported-by: Bamvor Jian Zhang Signed-off-by: Ian Jackson Cc: Bamvor Jian Zhang Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r a383ea62e716 -r a2ee8da82119 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Thu Jun 28 18:43:25 2012 +0100 +++ b/tools/libxl/libxl.c Thu Jun 28 18:43:25 2012 +0100 @@ -41,6 +41,9 @@ int libxl_ctx_alloc(libxl_ctx **pctx, in /* First initialise pointers etc. (cannot fail) */ + ctx->nogc_gc.alloc_maxsize = -1; + ctx->nogc_gc.owner = ctx; + LIBXL_TAILQ_INIT(&ctx->occurred); ctx->osevent_hooks = 0; diff -r a383ea62e716 -r a2ee8da82119 tools/libxl/libxl_aoutils.c --- a/tools/libxl/libxl_aoutils.c Thu Jun 28 18:43:25 2012 +0100 +++ b/tools/libxl/libxl_aoutils.c Thu Jun 28 18:43:25 2012 +0100 @@ -77,6 +77,7 @@ static void datacopier_check_state(libxl void libxl__datacopier_prefixdata(libxl__egc *egc, libxl__datacopier_state *dc, const void *data, size_t len) { + EGC_GC; libxl__datacopier_buf *buf; /* * It is safe for this to be called immediately after _start, as @@ -88,7 +89,7 @@ void libxl__datacopier_prefixdata(libxl_ assert(len < dc->maxsz - dc->used); - buf = libxl__zalloc(0, sizeof(*buf) - sizeof(buf->buf) + len); + buf = libxl__zalloc(NOGC, sizeof(*buf) - sizeof(buf->buf) + len); buf->used = len; memcpy(buf->buf, data, len); diff -r a383ea62e716 -r a2ee8da82119 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Thu Jun 28 18:43:25 2012 +0100 +++ b/tools/libxl/libxl_create.c Thu Jun 28 18:43:25 2012 +0100 @@ -165,7 +165,7 @@ int libxl__domain_build_info_setdefault( } if (b_info->blkdev_start == NULL) - b_info->blkdev_start = libxl__strdup(0, "xvda"); + b_info->blkdev_start = libxl__strdup(NOGC, "xvda"); if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) { if (!b_info->u.hvm.bios) diff -r a383ea62e716 -r a2ee8da82119 tools/libxl/libxl_event.c --- a/tools/libxl/libxl_event.c Thu Jun 28 18:43:25 2012 +0100 +++ b/tools/libxl/libxl_event.c Thu Jun 28 18:43:25 2012 +0100 @@ -772,7 +772,7 @@ static int beforepoll_internal(libxl__gc if (poller->fd_rindices_allocd < maxfd) { assert(ARRAY_SIZE_OK(poller->fd_rindices, maxfd)); poller->fd_rindices = - libxl__realloc(0, poller->fd_rindices, + libxl__realloc(NOGC, poller->fd_rindices, maxfd * sizeof(*poller->fd_rindices)); memset(poller->fd_rindices + poller->fd_rindices_allocd, 0, @@ -1099,9 +1099,10 @@ void libxl_event_free(libxl_ctx *ctx, li libxl_event *libxl__event_new(libxl__egc *egc, libxl_event_type type, uint32_t domid) { + EGC_GC; libxl_event *ev; - ev = libxl__zalloc(0,sizeof(*ev)); + ev = libxl__zalloc(NOGC,sizeof(*ev)); ev->type = type; ev->domid = domid; diff -r a383ea62e716 -r a2ee8da82119 tools/libxl/libxl_exec.c --- a/tools/libxl/libxl_exec.c Thu Jun 28 18:43:25 2012 +0100 +++ b/tools/libxl/libxl_exec.c Thu Jun 28 18:43:25 2012 +0100 @@ -280,7 +280,7 @@ int libxl__spawn_spawn(libxl__egc *egc, int status, rc; libxl__spawn_init(ss); - ss->ssd = libxl__zalloc(0, sizeof(*ss->ssd)); + ss->ssd = libxl__zalloc(NOGC, sizeof(*ss->ssd)); libxl__ev_child_init(&ss->ssd->mid); rc = libxl__ev_time_register_rel(gc, &ss->timeout, diff -r a383ea62e716 -r a2ee8da82119 tools/libxl/libxl_fork.c --- a/tools/libxl/libxl_fork.c Thu Jun 28 18:43:25 2012 +0100 +++ b/tools/libxl/libxl_fork.c Thu Jun 28 18:43:25 2012 +0100 @@ -92,7 +92,7 @@ libxl__carefd *libxl__carefd_record(libx libxl__carefd *cf = 0; libxl_fd_set_cloexec(ctx, fd, 1); - cf = libxl__zalloc(NULL, sizeof(*cf)); + cf = libxl__zalloc(&ctx->nogc_gc, sizeof(*cf)); cf->fd = fd; LIBXL_LIST_INSERT_HEAD(&carefds, cf, entry); return cf; diff -r a383ea62e716 -r a2ee8da82119 tools/libxl/libxl_internal.c --- a/tools/libxl/libxl_internal.c Thu Jun 28 18:43:25 2012 +0100 +++ b/tools/libxl/libxl_internal.c Thu Jun 28 18:43:25 2012 +0100 @@ -30,11 +30,16 @@ void libxl__alloc_failed(libxl_ctx *ctx, #undef L } +static int gc_is_real(const libxl__gc *gc) +{ + return gc->alloc_maxsize >= 0; +} + void libxl__ptr_add(libxl__gc *gc, void *ptr) { int i; - if (!gc) + if (!gc_is_real(gc)) return; if (!ptr) @@ -66,6 +71,8 @@ void libxl__free_all(libxl__gc *gc) void *ptr; int i; + assert(gc_is_real(gc)); + for (i = 0; i < gc->alloc_maxsize; i++) { ptr = gc->alloc_ptrs[i]; gc->alloc_ptrs[i] = NULL; @@ -104,7 +111,7 @@ void *libxl__realloc(libxl__gc *gc, void if (ptr == NULL) { libxl__ptr_add(gc, new_ptr); - } else if (new_ptr != ptr && gc != NULL) { + } else if (new_ptr != ptr && gc_is_real(gc)) { for (i = 0; i < gc->alloc_maxsize; i++) { if (gc->alloc_ptrs[i] == ptr) { gc->alloc_ptrs[i] = new_ptr; diff -r a383ea62e716 -r a2ee8da82119 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Thu Jun 28 18:43:25 2012 +0100 +++ b/tools/libxl/libxl_internal.h Thu Jun 28 18:43:25 2012 +0100 @@ -277,10 +277,18 @@ struct libxl__poller { int wakeup_pipe[2]; /* 0 means no fd allocated */ }; +struct libxl__gc { + /* mini-GC */ + int alloc_maxsize; /* -1 means this is the dummy non-gc gc */ + void **alloc_ptrs; + libxl_ctx *owner; +}; + struct libxl__ctx { xentoollog_logger *lg; xc_interface *xch; struct xs_handle *xsh; + libxl__gc nogc_gc; const libxl_event_hooks *event_hooks; void *event_hooks_user; @@ -356,13 +364,6 @@ typedef struct { #define PRINTF_ATTRIBUTE(x, y) __attribute__((format(printf, x, y))) -struct libxl__gc { - /* mini-GC */ - int alloc_maxsize; - void **alloc_ptrs; - libxl_ctx *owner; -}; - struct libxl__egc { /* For event-generating functions only. * The egc and its gc may be accessed only on the creating thread. */ @@ -420,6 +421,7 @@ struct libxl__ao { (gc).alloc_ptrs = 0; \ (gc).owner = (ctx); \ } while(0) + /* NB, also, a gc struct ctx->nogc_gc is initialised in libxl_ctx_alloc */ static inline libxl_ctx *libxl__gc_owner(libxl__gc *gc) { @@ -438,13 +440,20 @@ static inline libxl_ctx *libxl__gc_owner * All pointers returned by these functions are registered for garbage * collection on exit from the outermost libxl callframe. * - * However, where the argument is stated to be "gc_opt", NULL may be - * passed instead, in which case no garbage collection will occur; the - * pointer must later be freed with free(). This is for memory - * allocations of types (b) and (c). + * However, where the argument is stated to be "gc_opt", &ctx->nogc_gc + * may be passed instead, in which case no garbage collection will + * occur; the pointer must later be freed with free(). (Passing NULL + * for gc_opt is not permitted.) This is for memory allocations of + * types (b) and (c). The convenience macro NOGC should be used where + * possible. + * + * NOGC (and ctx->nogc_gc) may ONLY be used with functions which + * explicitly declare that it's OK. Use with nonconsenting functions + * may result in leaks of those functions' internal allocations on the + * psuedo-gc. */ -/* register @ptr in @gc for free on exit from outermost libxl callframe. */ -_hidden void libxl__ptr_add(libxl__gc *gc_opt, void *ptr); +/* register ptr in gc for free on exit from outermost libxl callframe. */ +_hidden void libxl__ptr_add(libxl__gc *gc_opt, void *ptr /* may be NULL */); /* if this is the outermost libxl callframe then free all pointers in @gc */ _hidden void libxl__free_all(libxl__gc *gc); /* allocate and zero @bytes. (similar to a gc'd malloc(3)+memzero()) */ @@ -2110,7 +2119,7 @@ _hidden const char *libxl__device_model_ #define GC_INIT(ctx) libxl__gc gc[1]; LIBXL_INIT_GC(gc[0],ctx) #define GC_FREE libxl__free_all(gc) #define CTX libxl__gc_owner(gc) -#define NOGC NULL +#define NOGC (&CTX->nogc_gc) /* pass only to consenting functions */ /* Allocation macros all of which use the gc. */ diff -r a383ea62e716 -r a2ee8da82119 tools/libxl/libxl_utils.c --- a/tools/libxl/libxl_utils.c Thu Jun 28 18:43:25 2012 +0100 +++ b/tools/libxl/libxl_utils.c Thu Jun 28 18:43:25 2012 +0100 @@ -58,8 +58,7 @@ char *libxl_domid_to_name(libxl_ctx *ctx char *libxl__domid_to_name(libxl__gc *gc, uint32_t domid) { char *s = libxl_domid_to_name(libxl__gc_owner(gc), domid); - if ( s ) - libxl__ptr_add(gc, s); + libxl__ptr_add(gc, s); return s; } @@ -107,8 +106,7 @@ char *libxl_cpupoolid_to_name(libxl_ctx char *libxl__cpupoolid_to_name(libxl__gc *gc, uint32_t poolid) { char *s = libxl_cpupoolid_to_name(libxl__gc_owner(gc), poolid); - if ( s ) - libxl__ptr_add(gc, s); + libxl__ptr_add(gc, s); return s; } diff -r a383ea62e716 -r a2ee8da82119 tools/libxl/libxl_xshelp.c --- a/tools/libxl/libxl_xshelp.c Thu Jun 28 18:43:25 2012 +0100 +++ b/tools/libxl/libxl_xshelp.c Thu Jun 28 18:43:25 2012 +0100 @@ -86,11 +86,8 @@ char * libxl__xs_read(libxl__gc *gc, xs_ char *ptr; ptr = xs_read(ctx->xsh, t, path, NULL); - if (ptr != NULL) { - libxl__ptr_add(gc, ptr); - return ptr; - } - return 0; + libxl__ptr_add(gc, ptr); + return ptr; } char *libxl__xs_get_dompath(libxl__gc *gc, uint32_t domid) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:29 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11: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 1SmGw5-0004tr-08; Wed, 04 Jul 2012 04:11:29 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw2-0004ii-M4 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:27 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-27.messagelabs.com!1341375078!6485103!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15504 invoked from network); 4 Jul 2012 04:11:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvu-0002hl-Aq for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGvu-0003r3-9n for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:18 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:17 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: domain save: API changes for asynchrony X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340905401 -3600 # Node ID 13c51d101a9dcebb99a710f7dd43767309a172d2 # Parent 0377ed8c274ee3a036dc3cdc7c6e4c29dee98181 libxl: domain save: API changes for asynchrony Change the internal and external APIs for domain save (suspend) to be capable of asynchronous operation. The implementation remains synchronous. The interfaces surrounding device model saving are still synchronous. Public API changes: * libxl_domain_save takes an ao_how. * libxl_domain_remus_start takes an ao_how. If the libxl_domain_remus_info is NULL, we abort rather than returning an error. * The `suspend_callback' function passed to libxl_domain_save is never called by the existing implementation in libxl. Abolish it. * libxl_domain_save takes its flags parameter as an argument. Thus libxl_domain_suspend_info is abolished. * XL_SUSPEND_* flags renamed to LIBXL_SAVE_*. * Callers in xl updated. Internal code restructuring: * libxl__domain_suspend_state member types and names rationalised. * libxl__domain_suspend renamed from libxl__domain_suspend_common. (_common here actually meant "internal function"). * libxl__domain_suspend takes a libxl__domain_suspend_state, which where the parameters to the operation are filled in by the caller. * xc_domain_save is now called via libxl__xc_domain_save which can itself become asynchronous. * Consequently, libxl__domain_suspend is split into two functions at the callback boundary; the second half is libxl__xc_domain_save_done. * libxl__domain_save_device_model is now called by the actual implementation rather than by the public wrapper. It is already in its proper place in the domain save execution sequence. So officially make it part of that execution sequence, renaming it to domain_save_device_model. * Effectively, rewrite the public wrapper functions libxl_domain_suspend and libxl_domain_remus_start. * Remove a needless #include * libxl__domain_suspend aborts on unexpected domain types rather than mysteriously returning EINVAL. * struct save_callbacks moved from the stack to the dss. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- diff -r 0377ed8c274e -r 13c51d101a9d tools/libxl/libxl.c --- a/tools/libxl/libxl.c Thu Jun 28 18:43:20 2012 +0100 +++ b/tools/libxl/libxl.c Thu Jun 28 18:43:21 2012 +0100 @@ -649,32 +649,51 @@ libxl_vminfo * libxl_list_vm(libxl_ctx * return ptr; } +static void remus_failover_cb(libxl__egc *egc, + libxl__domain_suspend_state *dss, int rc); + /* TODO: Explicit Checkpoint acknowledgements via recv_fd. */ int libxl_domain_remus_start(libxl_ctx *ctx, libxl_domain_remus_info *info, - uint32_t domid, int send_fd, int recv_fd) + uint32_t domid, int send_fd, int recv_fd, + const libxl_asyncop_how *ao_how) { - GC_INIT(ctx); + AO_CREATE(ctx, domid, ao_how); + libxl__domain_suspend_state *dss; + int rc; + libxl_domain_type type = libxl__domain_type(gc, domid); - int rc = 0; - if (type == LIBXL_DOMAIN_TYPE_INVALID) { rc = ERROR_FAIL; - goto remus_fail; + goto out; } - if (info == NULL) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, - "No remus_info structure supplied for domain %d", domid); - rc = ERROR_INVAL; - goto remus_fail; - } + GCNEW(dss); + dss->ao = ao; + dss->callback = remus_failover_cb; + dss->domid = domid; + dss->fd = send_fd; + /* TODO do something with recv_fd */ + dss->type = type; + dss->live = 1; + dss->debug = 0; + dss->remus = info; + + assert(info); /* TBD: Remus setup - i.e. attach qdisc, enable disk buffering, etc */ /* Point of no return */ - rc = libxl__domain_suspend_common(gc, domid, send_fd, type, /* live */ 1, - /* debug */ 0, info); - + libxl__domain_suspend(egc, dss); + return AO_INPROGRESS; + + out: + return AO_ABORT(rc); +} + +static void remus_failover_cb(libxl__egc *egc, + libxl__domain_suspend_state *dss, int rc) +{ + STATE_AO_GC(dss->ao); /* * With Remus, if we reach this point, it means either * backup died or some network error occurred preventing us @@ -684,27 +703,46 @@ int libxl_domain_remus_start(libxl_ctx * /* TBD: Remus cleanup - i.e. detach qdisc, release other * resources. */ - remus_fail: - GC_FREE; - return rc; + libxl__ao_complete(egc, ao, rc); } -int libxl_domain_suspend(libxl_ctx *ctx, libxl_domain_suspend_info *info, - uint32_t domid, int fd) +static void domain_suspend_cb(libxl__egc *egc, + libxl__domain_suspend_state *dss, int rc) { - GC_INIT(ctx); + STATE_AO_GC(dss->ao); + libxl__ao_complete(egc,ao,rc); + +} + +int libxl_domain_suspend(libxl_ctx *ctx, uint32_t domid, int fd, int flags, + const libxl_asyncop_how *ao_how) +{ + AO_CREATE(ctx, domid, ao_how); + int rc; + libxl_domain_type type = libxl__domain_type(gc, domid); - int live = info != NULL && info->flags & XL_SUSPEND_LIVE; - int debug = info != NULL && info->flags & XL_SUSPEND_DEBUG; - int rc = 0; - - rc = libxl__domain_suspend_common(gc, domid, fd, type, live, debug, - /* No Remus */ NULL); - - if (!rc && type == LIBXL_DOMAIN_TYPE_HVM) - rc = libxl__domain_save_device_model(gc, domid, fd); - GC_FREE; - return rc; + if (type == LIBXL_DOMAIN_TYPE_INVALID) { + rc = ERROR_FAIL; + goto out_err; + } + + libxl__domain_suspend_state *dss; + GCNEW(dss); + + dss->ao = ao; + dss->callback = domain_suspend_cb; + + dss->domid = domid; + dss->fd = fd; + dss->type = type; + dss->live = flags & LIBXL_SUSPEND_LIVE; + dss->debug = flags & LIBXL_SUSPEND_DEBUG; + + libxl__domain_suspend(egc, dss); + return AO_INPROGRESS; + + out_err: + return AO_ABORT(rc); } int libxl_domain_pause(libxl_ctx *ctx, uint32_t domid) diff -r 0377ed8c274e -r 13c51d101a9d tools/libxl/libxl.h --- a/tools/libxl/libxl.h Thu Jun 28 18:43:20 2012 +0100 +++ b/tools/libxl/libxl.h Thu Jun 28 18:43:21 2012 +0100 @@ -347,13 +347,6 @@ typedef struct libxl__ctx libxl_ctx; const libxl_version_info* libxl_get_version_info(libxl_ctx *ctx); -typedef struct { -#define XL_SUSPEND_DEBUG 1 -#define XL_SUSPEND_LIVE 2 - int flags; - int (*suspend_callback)(void *, int); -} libxl_domain_suspend_info; - enum { ERROR_NONSPECIFIC = -1, ERROR_VERSION = -2, @@ -514,16 +507,23 @@ int libxl_domain_create_restore(libxl_ct void libxl_domain_config_init(libxl_domain_config *d_config); void libxl_domain_config_dispose(libxl_domain_config *d_config); -int libxl_domain_remus_start(libxl_ctx *ctx, libxl_domain_remus_info *info, - uint32_t domid, int send_fd, int recv_fd); -int libxl_domain_suspend(libxl_ctx *ctx, libxl_domain_suspend_info *info, - uint32_t domid, int fd); + +int libxl_domain_suspend(libxl_ctx *ctx, uint32_t domid, int fd, + int flags, /* LIBXL_SUSPEND_* */ + const libxl_asyncop_how *ao_how); +#define LIBXL_SUSPEND_DEBUG 1 +#define LIBXL_SUSPEND_LIVE 2 /* @param suspend_cancel [from xenctrl.h:xc_domain_resume( @param fast )] * If this parameter is true, use co-operative resume. The guest * must support this. */ int libxl_domain_resume(libxl_ctx *ctx, uint32_t domid, int suspend_cancel); + +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); + 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); diff -r 0377ed8c274e -r 13c51d101a9d tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Thu Jun 28 18:43:20 2012 +0100 +++ b/tools/libxl/libxl_dom.c Thu Jun 28 18:43:21 2012 +0100 @@ -17,13 +17,11 @@ #include -#include +#include "libxl_internal.h" + #include - #include -#include "libxl_internal.h" - libxl_domain_type libxl__domain_type(libxl__gc *gc, uint32_t domid) { libxl_ctx *ctx = libxl__gc_owner(gc); @@ -523,11 +521,18 @@ int libxl__toolstack_restore(uint32_t do return 0; } -static int libxl__domain_suspend_common_switch_qemu_logdirty +/*==================== Domain suspend (save) ====================*/ + +static void domain_suspend_done(libxl__egc *egc, + libxl__domain_suspend_state *dss, int rc); + +/*----- callbacks, called by xc_domain_save -----*/ + +int libxl__domain_suspend_common_switch_qemu_logdirty (int domid, unsigned int enable, void *data) { libxl__domain_suspend_state *dss = data; - libxl__gc *gc = dss->gc; + STATE_AO_GC(dss->ao); char *path; bool rc; @@ -592,10 +597,10 @@ int libxl__domain_resume_device_model(li return 0; } -static int libxl__domain_suspend_common_callback(void *data) +int libxl__domain_suspend_common_callback(void *data) { libxl__domain_suspend_state *dss = data; - libxl__gc *gc = dss->gc; + STATE_AO_GC(dss->ao); unsigned long hvm_s_state = 0, hvm_pvdrv = 0; int ret; char *state = "suspend"; @@ -716,7 +721,7 @@ static int libxl__domain_suspend_common_ guest_suspended: if (dss->hvm) { - ret = libxl__domain_suspend_device_model(dss->gc, dss->domid); + ret = libxl__domain_suspend_device_model(gc, dss->domid); if (ret) { LOG(ERROR, "libxl__domain_suspend_device_model failed ret=%d", ret); return 0; @@ -733,11 +738,11 @@ static inline char *save_helper(libxl__g domid, phys_offset, node); } -static int libxl__toolstack_save(uint32_t domid, uint8_t **buf, +int libxl__toolstack_save(uint32_t domid, uint8_t **buf, uint32_t *len, void *data) { libxl__domain_suspend_state *dss = data; - libxl__gc *gc = dss->gc; + STATE_AO_GC(dss->ao); int i = 0; char *start_addr = NULL, *size = NULL, *phys_offset = NULL, *name = NULL; unsigned int num = 0; @@ -808,6 +813,8 @@ static int libxl__toolstack_save(uint32_ return 0; } +/*----- remus callbacks -----*/ + static int libxl__remus_domain_suspend_callback(void *data) { /* TODO: Issue disk and network checkpoint reqs. */ @@ -817,7 +824,7 @@ static int libxl__remus_domain_suspend_c static int libxl__remus_domain_resume_callback(void *data) { libxl__domain_suspend_state *dss = data; - libxl__gc *gc = dss->gc; + STATE_AO_GC(dss->ao); /* Resumes the domain and the device model */ if (libxl_domain_resume(CTX, dss->domid, /* Fast Suspend */1)) @@ -830,10 +837,11 @@ static int libxl__remus_domain_resume_ca static int libxl__remus_domain_checkpoint_callback(void *data) { libxl__domain_suspend_state *dss = data; + STATE_AO_GC(dss->ao); /* This would go into tailbuf. */ if (dss->hvm && - libxl__domain_save_device_model(dss->gc, dss->domid, dss->save_fd)) + libxl__domain_save_device_model(gc, dss->domid, dss->fd)) return 0; /* TODO: Wait for disk and memory ack, release network buffer */ @@ -841,17 +849,23 @@ static int libxl__remus_domain_checkpoin return 1; } -int libxl__domain_suspend_common(libxl__gc *gc, uint32_t domid, int fd, - libxl_domain_type type, - int live, int debug, - const libxl_domain_remus_info *r_info) +/*----- main code for suspending, in order of execution -----*/ + +void libxl__domain_suspend(libxl__egc *egc, libxl__domain_suspend_state *dss) { + STATE_AO_GC(dss->ao); int port; - struct save_callbacks callbacks[1]; - libxl__domain_suspend_state dss[1]; int rc = ERROR_FAIL; unsigned long vm_generationid_addr; + /* Convenience aliases */ + const uint32_t domid = dss->domid; + const libxl_domain_type type = dss->type; + const int live = dss->live; + const int debug = dss->debug; + const libxl_domain_remus_info *const r_info = dss->remus; + struct save_callbacks *const callbacks = &dss->callbacks; + switch (type) { case LIBXL_DOMAIN_TYPE_HVM: { char *path; @@ -870,15 +884,13 @@ int libxl__domain_suspend_common(libxl__ dss->hvm = 0; break; default: - return ERROR_INVAL; + abort(); } dss->xcflags = (live) ? XCFLAGS_LIVE : 0 | (debug) ? XCFLAGS_DEBUG : 0 | (dss->hvm) ? XCFLAGS_HVM : 0; - dss->domid = domid; - dss->gc = gc; dss->suspend_eventchn = -1; dss->guest_responded = 0; @@ -886,10 +898,7 @@ int libxl__domain_suspend_common(libxl__ dss->interval = r_info->interval; if (r_info->compression) dss->xcflags |= XCFLAGS_CHECKPOINT_COMPRESS; - dss->save_fd = fd; } - else - dss->save_fd = -1; dss->xce = xc_evtchn_open(NULL, 0); if (dss->xce == NULL) @@ -919,10 +928,28 @@ int libxl__domain_suspend_common(libxl__ callbacks->toolstack_save = libxl__toolstack_save; callbacks->data = dss; - rc = xc_domain_save(CTX->xch, fd, domid, 0, 0, dss->xcflags, callbacks, - dss->hvm, vm_generationid_addr); - if ( rc ) { - LOGE(ERROR, "saving domain: %s", + libxl__xc_domain_save(egc, dss, vm_generationid_addr); + return; + + out: + domain_suspend_done(egc, dss, rc); +} + +void libxl__xc_domain_save_done(libxl__egc *egc, + libxl__domain_suspend_state *dss, + int rc, int retval, int errnoval) +{ + STATE_AO_GC(dss->ao); + + /* Convenience aliases */ + const libxl_domain_type type = dss->type; + const uint32_t domid = dss->domid; + + if (rc) + goto out; + + if (retval) { + LOGEV(ERROR, errnoval, "saving domain: %s", dss->guest_responded ? "domain responded to suspend request" : "domain did not respond to suspend request"); @@ -930,16 +957,21 @@ int libxl__domain_suspend_common(libxl__ rc = ERROR_GUEST_TIMEDOUT; else rc = ERROR_FAIL; + goto out; } - if (dss->suspend_eventchn > 0) - xc_suspend_evtchn_release(CTX->xch, dss->xce, domid, - dss->suspend_eventchn); - if (dss->xce != NULL) - xc_evtchn_close(dss->xce); + if (type == LIBXL_DOMAIN_TYPE_HVM) { + rc = libxl__domain_suspend_device_model(gc, domid); + if (rc) goto out; + + rc = libxl__domain_save_device_model(gc, domid, dss->fd); + if (rc) goto out; + } + + rc = 0; out: - return rc; + domain_suspend_done(egc, dss, rc); } int libxl__domain_save_device_model(libxl__gc *gc, uint32_t domid, int fd) @@ -994,6 +1026,25 @@ out: return rc; } +static void domain_suspend_done(libxl__egc *egc, + libxl__domain_suspend_state *dss, int rc) +{ + STATE_AO_GC(dss->ao); + + /* Convenience aliases */ + const uint32_t domid = dss->domid; + + if (dss->suspend_eventchn > 0) + xc_suspend_evtchn_release(CTX->xch, dss->xce, domid, + dss->suspend_eventchn); + if (dss->xce != NULL) + xc_evtchn_close(dss->xce); + + dss->callback(egc, dss, rc); +} + +/*==================== Miscellaneous ====================*/ + char *libxl__uuid2string(libxl__gc *gc, const libxl_uuid uuid) { char *s = libxl__sprintf(gc, LIBXL_UUID_FMT, LIBXL_UUID_BYTES(uuid)); diff -r 0377ed8c274e -r 13c51d101a9d tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Thu Jun 28 18:43:20 2012 +0100 +++ b/tools/libxl/libxl_internal.h Thu Jun 28 18:43:21 2012 +0100 @@ -1777,16 +1777,28 @@ _hidden int libxl__datacopier_start(libx typedef struct libxl__domain_suspend_state libxl__domain_suspend_state; +typedef void libxl__domain_suspend_cb(libxl__egc*, + libxl__domain_suspend_state*, int rc); + struct libxl__domain_suspend_state { - libxl__gc *gc; + /* set by caller of libxl__domain_suspend */ + libxl__ao *ao; + libxl__domain_suspend_cb *callback; + + uint32_t domid; + int fd; + libxl_domain_type type; + int live; + int debug; + const libxl_domain_remus_info *remus; + /* private */ xc_evtchn *xce; /* event channel handle */ int suspend_eventchn; - int domid; int hvm; - unsigned int xcflags; + int xcflags; int guest_responded; - int save_fd; /* Migration stream fd (for Remus) */ int interval; /* checkpoint interval (for Remus) */ + struct save_callbacks callbacks; }; @@ -1903,10 +1915,27 @@ struct libxl__domain_create_state { /*----- Domain suspend (save) functions -----*/ -_hidden int libxl__domain_suspend_common(libxl__gc *gc, uint32_t domid, int fd, - libxl_domain_type type, - int live, int debug, - const libxl_domain_remus_info *r_info); +/* calls dss->callback when done */ +_hidden void libxl__domain_suspend(libxl__egc *egc, + libxl__domain_suspend_state *dss); + + +/* calls libxl__xc_domain_suspend_done when done */ +_hidden void libxl__xc_domain_save(libxl__egc*, libxl__domain_suspend_state*, + unsigned long vm_generationid_addr); +/* If rc==0 then retval is the return value from xc_domain_save + * and errnoval is the errno value it provided. + * If rc!=0, retval and errnoval are undefined. */ +_hidden void libxl__xc_domain_save_done(libxl__egc*, + libxl__domain_suspend_state*, + int rc, int retval, int errnoval); + +_hidden int libxl__domain_suspend_common_callback(void *data); +_hidden int libxl__domain_suspend_common_switch_qemu_logdirty + (int domid, unsigned int enable, void *data); +_hidden int libxl__toolstack_save(uint32_t domid, uint8_t **buf, + uint32_t *len, void *data); + /* calls libxl__xc_domain_restore_done when done */ _hidden void libxl__xc_domain_restore(libxl__egc *egc, diff -r 0377ed8c274e -r 13c51d101a9d tools/libxl/libxl_save_callout.c --- a/tools/libxl/libxl_save_callout.c Thu Jun 28 18:43:20 2012 +0100 +++ b/tools/libxl/libxl_save_callout.c Thu Jun 28 18:43:21 2012 +0100 @@ -35,3 +35,14 @@ void libxl__xc_domain_restore(libxl__egc &state->vm_generationid_addr, &dcs->callbacks); libxl__xc_domain_restore_done(egc, dcs, 0, r, errno); } + +void libxl__xc_domain_save(libxl__egc *egc, libxl__domain_suspend_state *dss, + unsigned long vm_generationid_addr) +{ + STATE_AO_GC(dss->ao); + int r; + + r = xc_domain_save(CTX->xch, dss->fd, dss->domid, 0, 0, dss->xcflags, + &dss->callbacks, dss->hvm, vm_generationid_addr); + libxl__xc_domain_save_done(egc, dss, 0, r, errno); +} diff -r 0377ed8c274e -r 13c51d101a9d tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Thu Jun 28 18:43:20 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Thu Jun 28 18:43:21 2012 +0100 @@ -2826,7 +2826,7 @@ static int save_domain(const char *p, co save_domain_core_writeconfig(fd, filename, config_data, config_len); - CHK_ERRNO(libxl_domain_suspend(ctx, NULL, domid, fd)); + CHK_ERRNO(libxl_domain_suspend(ctx, domid, fd, 0, NULL)); close(fd); if (checkpoint) @@ -2988,7 +2988,6 @@ static void migrate_domain(const char *d pid_t child = -1; int rc; int send_fd = -1, recv_fd = -1; - libxl_domain_suspend_info suspinfo; char *away_domname; char rc_buf; uint8_t *config_data; @@ -3010,9 +3009,7 @@ static void migrate_domain(const char *d xtl_stdiostream_adjust_flags(logger, XTL_STDIOSTREAM_HIDE_PROGRESS, 0); - memset(&suspinfo, 0, sizeof(suspinfo)); - suspinfo.flags |= XL_SUSPEND_LIVE; - rc = libxl_domain_suspend(ctx, &suspinfo, domid, send_fd); + rc = libxl_domain_suspend(ctx, domid, send_fd, LIBXL_SUSPEND_LIVE, NULL); if (rc) { fprintf(stderr, "migration sender: libxl_domain_suspend failed" " (rc=%d)\n", rc); @@ -6584,7 +6581,7 @@ int main_remus(int argc, char **argv) } /* Point of no return */ - rc = libxl_domain_remus_start(ctx, &r_info, domid, send_fd, recv_fd); + rc = libxl_domain_remus_start(ctx, &r_info, domid, send_fd, recv_fd, 0); /* If we are here, it means backup has failed/domain suspend failed. * Try to resume the domain and exit gracefully. _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:29 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11: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 1SmGw5-0004tr-08; Wed, 04 Jul 2012 04:11:29 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw2-0004ii-M4 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:27 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-27.messagelabs.com!1341375078!6485103!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15504 invoked from network); 4 Jul 2012 04:11:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGvu-0002hl-Aq for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGvu-0003r3-9n for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:18 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:17 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: domain save: API changes for asynchrony X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340905401 -3600 # Node ID 13c51d101a9dcebb99a710f7dd43767309a172d2 # Parent 0377ed8c274ee3a036dc3cdc7c6e4c29dee98181 libxl: domain save: API changes for asynchrony Change the internal and external APIs for domain save (suspend) to be capable of asynchronous operation. The implementation remains synchronous. The interfaces surrounding device model saving are still synchronous. Public API changes: * libxl_domain_save takes an ao_how. * libxl_domain_remus_start takes an ao_how. If the libxl_domain_remus_info is NULL, we abort rather than returning an error. * The `suspend_callback' function passed to libxl_domain_save is never called by the existing implementation in libxl. Abolish it. * libxl_domain_save takes its flags parameter as an argument. Thus libxl_domain_suspend_info is abolished. * XL_SUSPEND_* flags renamed to LIBXL_SAVE_*. * Callers in xl updated. Internal code restructuring: * libxl__domain_suspend_state member types and names rationalised. * libxl__domain_suspend renamed from libxl__domain_suspend_common. (_common here actually meant "internal function"). * libxl__domain_suspend takes a libxl__domain_suspend_state, which where the parameters to the operation are filled in by the caller. * xc_domain_save is now called via libxl__xc_domain_save which can itself become asynchronous. * Consequently, libxl__domain_suspend is split into two functions at the callback boundary; the second half is libxl__xc_domain_save_done. * libxl__domain_save_device_model is now called by the actual implementation rather than by the public wrapper. It is already in its proper place in the domain save execution sequence. So officially make it part of that execution sequence, renaming it to domain_save_device_model. * Effectively, rewrite the public wrapper functions libxl_domain_suspend and libxl_domain_remus_start. * Remove a needless #include * libxl__domain_suspend aborts on unexpected domain types rather than mysteriously returning EINVAL. * struct save_callbacks moved from the stack to the dss. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- diff -r 0377ed8c274e -r 13c51d101a9d tools/libxl/libxl.c --- a/tools/libxl/libxl.c Thu Jun 28 18:43:20 2012 +0100 +++ b/tools/libxl/libxl.c Thu Jun 28 18:43:21 2012 +0100 @@ -649,32 +649,51 @@ libxl_vminfo * libxl_list_vm(libxl_ctx * return ptr; } +static void remus_failover_cb(libxl__egc *egc, + libxl__domain_suspend_state *dss, int rc); + /* TODO: Explicit Checkpoint acknowledgements via recv_fd. */ int libxl_domain_remus_start(libxl_ctx *ctx, libxl_domain_remus_info *info, - uint32_t domid, int send_fd, int recv_fd) + uint32_t domid, int send_fd, int recv_fd, + const libxl_asyncop_how *ao_how) { - GC_INIT(ctx); + AO_CREATE(ctx, domid, ao_how); + libxl__domain_suspend_state *dss; + int rc; + libxl_domain_type type = libxl__domain_type(gc, domid); - int rc = 0; - if (type == LIBXL_DOMAIN_TYPE_INVALID) { rc = ERROR_FAIL; - goto remus_fail; + goto out; } - if (info == NULL) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, - "No remus_info structure supplied for domain %d", domid); - rc = ERROR_INVAL; - goto remus_fail; - } + GCNEW(dss); + dss->ao = ao; + dss->callback = remus_failover_cb; + dss->domid = domid; + dss->fd = send_fd; + /* TODO do something with recv_fd */ + dss->type = type; + dss->live = 1; + dss->debug = 0; + dss->remus = info; + + assert(info); /* TBD: Remus setup - i.e. attach qdisc, enable disk buffering, etc */ /* Point of no return */ - rc = libxl__domain_suspend_common(gc, domid, send_fd, type, /* live */ 1, - /* debug */ 0, info); - + libxl__domain_suspend(egc, dss); + return AO_INPROGRESS; + + out: + return AO_ABORT(rc); +} + +static void remus_failover_cb(libxl__egc *egc, + libxl__domain_suspend_state *dss, int rc) +{ + STATE_AO_GC(dss->ao); /* * With Remus, if we reach this point, it means either * backup died or some network error occurred preventing us @@ -684,27 +703,46 @@ int libxl_domain_remus_start(libxl_ctx * /* TBD: Remus cleanup - i.e. detach qdisc, release other * resources. */ - remus_fail: - GC_FREE; - return rc; + libxl__ao_complete(egc, ao, rc); } -int libxl_domain_suspend(libxl_ctx *ctx, libxl_domain_suspend_info *info, - uint32_t domid, int fd) +static void domain_suspend_cb(libxl__egc *egc, + libxl__domain_suspend_state *dss, int rc) { - GC_INIT(ctx); + STATE_AO_GC(dss->ao); + libxl__ao_complete(egc,ao,rc); + +} + +int libxl_domain_suspend(libxl_ctx *ctx, uint32_t domid, int fd, int flags, + const libxl_asyncop_how *ao_how) +{ + AO_CREATE(ctx, domid, ao_how); + int rc; + libxl_domain_type type = libxl__domain_type(gc, domid); - int live = info != NULL && info->flags & XL_SUSPEND_LIVE; - int debug = info != NULL && info->flags & XL_SUSPEND_DEBUG; - int rc = 0; - - rc = libxl__domain_suspend_common(gc, domid, fd, type, live, debug, - /* No Remus */ NULL); - - if (!rc && type == LIBXL_DOMAIN_TYPE_HVM) - rc = libxl__domain_save_device_model(gc, domid, fd); - GC_FREE; - return rc; + if (type == LIBXL_DOMAIN_TYPE_INVALID) { + rc = ERROR_FAIL; + goto out_err; + } + + libxl__domain_suspend_state *dss; + GCNEW(dss); + + dss->ao = ao; + dss->callback = domain_suspend_cb; + + dss->domid = domid; + dss->fd = fd; + dss->type = type; + dss->live = flags & LIBXL_SUSPEND_LIVE; + dss->debug = flags & LIBXL_SUSPEND_DEBUG; + + libxl__domain_suspend(egc, dss); + return AO_INPROGRESS; + + out_err: + return AO_ABORT(rc); } int libxl_domain_pause(libxl_ctx *ctx, uint32_t domid) diff -r 0377ed8c274e -r 13c51d101a9d tools/libxl/libxl.h --- a/tools/libxl/libxl.h Thu Jun 28 18:43:20 2012 +0100 +++ b/tools/libxl/libxl.h Thu Jun 28 18:43:21 2012 +0100 @@ -347,13 +347,6 @@ typedef struct libxl__ctx libxl_ctx; const libxl_version_info* libxl_get_version_info(libxl_ctx *ctx); -typedef struct { -#define XL_SUSPEND_DEBUG 1 -#define XL_SUSPEND_LIVE 2 - int flags; - int (*suspend_callback)(void *, int); -} libxl_domain_suspend_info; - enum { ERROR_NONSPECIFIC = -1, ERROR_VERSION = -2, @@ -514,16 +507,23 @@ int libxl_domain_create_restore(libxl_ct void libxl_domain_config_init(libxl_domain_config *d_config); void libxl_domain_config_dispose(libxl_domain_config *d_config); -int libxl_domain_remus_start(libxl_ctx *ctx, libxl_domain_remus_info *info, - uint32_t domid, int send_fd, int recv_fd); -int libxl_domain_suspend(libxl_ctx *ctx, libxl_domain_suspend_info *info, - uint32_t domid, int fd); + +int libxl_domain_suspend(libxl_ctx *ctx, uint32_t domid, int fd, + int flags, /* LIBXL_SUSPEND_* */ + const libxl_asyncop_how *ao_how); +#define LIBXL_SUSPEND_DEBUG 1 +#define LIBXL_SUSPEND_LIVE 2 /* @param suspend_cancel [from xenctrl.h:xc_domain_resume( @param fast )] * If this parameter is true, use co-operative resume. The guest * must support this. */ int libxl_domain_resume(libxl_ctx *ctx, uint32_t domid, int suspend_cancel); + +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); + 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); diff -r 0377ed8c274e -r 13c51d101a9d tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Thu Jun 28 18:43:20 2012 +0100 +++ b/tools/libxl/libxl_dom.c Thu Jun 28 18:43:21 2012 +0100 @@ -17,13 +17,11 @@ #include -#include +#include "libxl_internal.h" + #include - #include -#include "libxl_internal.h" - libxl_domain_type libxl__domain_type(libxl__gc *gc, uint32_t domid) { libxl_ctx *ctx = libxl__gc_owner(gc); @@ -523,11 +521,18 @@ int libxl__toolstack_restore(uint32_t do return 0; } -static int libxl__domain_suspend_common_switch_qemu_logdirty +/*==================== Domain suspend (save) ====================*/ + +static void domain_suspend_done(libxl__egc *egc, + libxl__domain_suspend_state *dss, int rc); + +/*----- callbacks, called by xc_domain_save -----*/ + +int libxl__domain_suspend_common_switch_qemu_logdirty (int domid, unsigned int enable, void *data) { libxl__domain_suspend_state *dss = data; - libxl__gc *gc = dss->gc; + STATE_AO_GC(dss->ao); char *path; bool rc; @@ -592,10 +597,10 @@ int libxl__domain_resume_device_model(li return 0; } -static int libxl__domain_suspend_common_callback(void *data) +int libxl__domain_suspend_common_callback(void *data) { libxl__domain_suspend_state *dss = data; - libxl__gc *gc = dss->gc; + STATE_AO_GC(dss->ao); unsigned long hvm_s_state = 0, hvm_pvdrv = 0; int ret; char *state = "suspend"; @@ -716,7 +721,7 @@ static int libxl__domain_suspend_common_ guest_suspended: if (dss->hvm) { - ret = libxl__domain_suspend_device_model(dss->gc, dss->domid); + ret = libxl__domain_suspend_device_model(gc, dss->domid); if (ret) { LOG(ERROR, "libxl__domain_suspend_device_model failed ret=%d", ret); return 0; @@ -733,11 +738,11 @@ static inline char *save_helper(libxl__g domid, phys_offset, node); } -static int libxl__toolstack_save(uint32_t domid, uint8_t **buf, +int libxl__toolstack_save(uint32_t domid, uint8_t **buf, uint32_t *len, void *data) { libxl__domain_suspend_state *dss = data; - libxl__gc *gc = dss->gc; + STATE_AO_GC(dss->ao); int i = 0; char *start_addr = NULL, *size = NULL, *phys_offset = NULL, *name = NULL; unsigned int num = 0; @@ -808,6 +813,8 @@ static int libxl__toolstack_save(uint32_ return 0; } +/*----- remus callbacks -----*/ + static int libxl__remus_domain_suspend_callback(void *data) { /* TODO: Issue disk and network checkpoint reqs. */ @@ -817,7 +824,7 @@ static int libxl__remus_domain_suspend_c static int libxl__remus_domain_resume_callback(void *data) { libxl__domain_suspend_state *dss = data; - libxl__gc *gc = dss->gc; + STATE_AO_GC(dss->ao); /* Resumes the domain and the device model */ if (libxl_domain_resume(CTX, dss->domid, /* Fast Suspend */1)) @@ -830,10 +837,11 @@ static int libxl__remus_domain_resume_ca static int libxl__remus_domain_checkpoint_callback(void *data) { libxl__domain_suspend_state *dss = data; + STATE_AO_GC(dss->ao); /* This would go into tailbuf. */ if (dss->hvm && - libxl__domain_save_device_model(dss->gc, dss->domid, dss->save_fd)) + libxl__domain_save_device_model(gc, dss->domid, dss->fd)) return 0; /* TODO: Wait for disk and memory ack, release network buffer */ @@ -841,17 +849,23 @@ static int libxl__remus_domain_checkpoin return 1; } -int libxl__domain_suspend_common(libxl__gc *gc, uint32_t domid, int fd, - libxl_domain_type type, - int live, int debug, - const libxl_domain_remus_info *r_info) +/*----- main code for suspending, in order of execution -----*/ + +void libxl__domain_suspend(libxl__egc *egc, libxl__domain_suspend_state *dss) { + STATE_AO_GC(dss->ao); int port; - struct save_callbacks callbacks[1]; - libxl__domain_suspend_state dss[1]; int rc = ERROR_FAIL; unsigned long vm_generationid_addr; + /* Convenience aliases */ + const uint32_t domid = dss->domid; + const libxl_domain_type type = dss->type; + const int live = dss->live; + const int debug = dss->debug; + const libxl_domain_remus_info *const r_info = dss->remus; + struct save_callbacks *const callbacks = &dss->callbacks; + switch (type) { case LIBXL_DOMAIN_TYPE_HVM: { char *path; @@ -870,15 +884,13 @@ int libxl__domain_suspend_common(libxl__ dss->hvm = 0; break; default: - return ERROR_INVAL; + abort(); } dss->xcflags = (live) ? XCFLAGS_LIVE : 0 | (debug) ? XCFLAGS_DEBUG : 0 | (dss->hvm) ? XCFLAGS_HVM : 0; - dss->domid = domid; - dss->gc = gc; dss->suspend_eventchn = -1; dss->guest_responded = 0; @@ -886,10 +898,7 @@ int libxl__domain_suspend_common(libxl__ dss->interval = r_info->interval; if (r_info->compression) dss->xcflags |= XCFLAGS_CHECKPOINT_COMPRESS; - dss->save_fd = fd; } - else - dss->save_fd = -1; dss->xce = xc_evtchn_open(NULL, 0); if (dss->xce == NULL) @@ -919,10 +928,28 @@ int libxl__domain_suspend_common(libxl__ callbacks->toolstack_save = libxl__toolstack_save; callbacks->data = dss; - rc = xc_domain_save(CTX->xch, fd, domid, 0, 0, dss->xcflags, callbacks, - dss->hvm, vm_generationid_addr); - if ( rc ) { - LOGE(ERROR, "saving domain: %s", + libxl__xc_domain_save(egc, dss, vm_generationid_addr); + return; + + out: + domain_suspend_done(egc, dss, rc); +} + +void libxl__xc_domain_save_done(libxl__egc *egc, + libxl__domain_suspend_state *dss, + int rc, int retval, int errnoval) +{ + STATE_AO_GC(dss->ao); + + /* Convenience aliases */ + const libxl_domain_type type = dss->type; + const uint32_t domid = dss->domid; + + if (rc) + goto out; + + if (retval) { + LOGEV(ERROR, errnoval, "saving domain: %s", dss->guest_responded ? "domain responded to suspend request" : "domain did not respond to suspend request"); @@ -930,16 +957,21 @@ int libxl__domain_suspend_common(libxl__ rc = ERROR_GUEST_TIMEDOUT; else rc = ERROR_FAIL; + goto out; } - if (dss->suspend_eventchn > 0) - xc_suspend_evtchn_release(CTX->xch, dss->xce, domid, - dss->suspend_eventchn); - if (dss->xce != NULL) - xc_evtchn_close(dss->xce); + if (type == LIBXL_DOMAIN_TYPE_HVM) { + rc = libxl__domain_suspend_device_model(gc, domid); + if (rc) goto out; + + rc = libxl__domain_save_device_model(gc, domid, dss->fd); + if (rc) goto out; + } + + rc = 0; out: - return rc; + domain_suspend_done(egc, dss, rc); } int libxl__domain_save_device_model(libxl__gc *gc, uint32_t domid, int fd) @@ -994,6 +1026,25 @@ out: return rc; } +static void domain_suspend_done(libxl__egc *egc, + libxl__domain_suspend_state *dss, int rc) +{ + STATE_AO_GC(dss->ao); + + /* Convenience aliases */ + const uint32_t domid = dss->domid; + + if (dss->suspend_eventchn > 0) + xc_suspend_evtchn_release(CTX->xch, dss->xce, domid, + dss->suspend_eventchn); + if (dss->xce != NULL) + xc_evtchn_close(dss->xce); + + dss->callback(egc, dss, rc); +} + +/*==================== Miscellaneous ====================*/ + char *libxl__uuid2string(libxl__gc *gc, const libxl_uuid uuid) { char *s = libxl__sprintf(gc, LIBXL_UUID_FMT, LIBXL_UUID_BYTES(uuid)); diff -r 0377ed8c274e -r 13c51d101a9d tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Thu Jun 28 18:43:20 2012 +0100 +++ b/tools/libxl/libxl_internal.h Thu Jun 28 18:43:21 2012 +0100 @@ -1777,16 +1777,28 @@ _hidden int libxl__datacopier_start(libx typedef struct libxl__domain_suspend_state libxl__domain_suspend_state; +typedef void libxl__domain_suspend_cb(libxl__egc*, + libxl__domain_suspend_state*, int rc); + struct libxl__domain_suspend_state { - libxl__gc *gc; + /* set by caller of libxl__domain_suspend */ + libxl__ao *ao; + libxl__domain_suspend_cb *callback; + + uint32_t domid; + int fd; + libxl_domain_type type; + int live; + int debug; + const libxl_domain_remus_info *remus; + /* private */ xc_evtchn *xce; /* event channel handle */ int suspend_eventchn; - int domid; int hvm; - unsigned int xcflags; + int xcflags; int guest_responded; - int save_fd; /* Migration stream fd (for Remus) */ int interval; /* checkpoint interval (for Remus) */ + struct save_callbacks callbacks; }; @@ -1903,10 +1915,27 @@ struct libxl__domain_create_state { /*----- Domain suspend (save) functions -----*/ -_hidden int libxl__domain_suspend_common(libxl__gc *gc, uint32_t domid, int fd, - libxl_domain_type type, - int live, int debug, - const libxl_domain_remus_info *r_info); +/* calls dss->callback when done */ +_hidden void libxl__domain_suspend(libxl__egc *egc, + libxl__domain_suspend_state *dss); + + +/* calls libxl__xc_domain_suspend_done when done */ +_hidden void libxl__xc_domain_save(libxl__egc*, libxl__domain_suspend_state*, + unsigned long vm_generationid_addr); +/* If rc==0 then retval is the return value from xc_domain_save + * and errnoval is the errno value it provided. + * If rc!=0, retval and errnoval are undefined. */ +_hidden void libxl__xc_domain_save_done(libxl__egc*, + libxl__domain_suspend_state*, + int rc, int retval, int errnoval); + +_hidden int libxl__domain_suspend_common_callback(void *data); +_hidden int libxl__domain_suspend_common_switch_qemu_logdirty + (int domid, unsigned int enable, void *data); +_hidden int libxl__toolstack_save(uint32_t domid, uint8_t **buf, + uint32_t *len, void *data); + /* calls libxl__xc_domain_restore_done when done */ _hidden void libxl__xc_domain_restore(libxl__egc *egc, diff -r 0377ed8c274e -r 13c51d101a9d tools/libxl/libxl_save_callout.c --- a/tools/libxl/libxl_save_callout.c Thu Jun 28 18:43:20 2012 +0100 +++ b/tools/libxl/libxl_save_callout.c Thu Jun 28 18:43:21 2012 +0100 @@ -35,3 +35,14 @@ void libxl__xc_domain_restore(libxl__egc &state->vm_generationid_addr, &dcs->callbacks); libxl__xc_domain_restore_done(egc, dcs, 0, r, errno); } + +void libxl__xc_domain_save(libxl__egc *egc, libxl__domain_suspend_state *dss, + unsigned long vm_generationid_addr) +{ + STATE_AO_GC(dss->ao); + int r; + + r = xc_domain_save(CTX->xch, dss->fd, dss->domid, 0, 0, dss->xcflags, + &dss->callbacks, dss->hvm, vm_generationid_addr); + libxl__xc_domain_save_done(egc, dss, 0, r, errno); +} diff -r 0377ed8c274e -r 13c51d101a9d tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Thu Jun 28 18:43:20 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Thu Jun 28 18:43:21 2012 +0100 @@ -2826,7 +2826,7 @@ static int save_domain(const char *p, co save_domain_core_writeconfig(fd, filename, config_data, config_len); - CHK_ERRNO(libxl_domain_suspend(ctx, NULL, domid, fd)); + CHK_ERRNO(libxl_domain_suspend(ctx, domid, fd, 0, NULL)); close(fd); if (checkpoint) @@ -2988,7 +2988,6 @@ static void migrate_domain(const char *d pid_t child = -1; int rc; int send_fd = -1, recv_fd = -1; - libxl_domain_suspend_info suspinfo; char *away_domname; char rc_buf; uint8_t *config_data; @@ -3010,9 +3009,7 @@ static void migrate_domain(const char *d xtl_stdiostream_adjust_flags(logger, XTL_STDIOSTREAM_HIDE_PROGRESS, 0); - memset(&suspinfo, 0, sizeof(suspinfo)); - suspinfo.flags |= XL_SUSPEND_LIVE; - rc = libxl_domain_suspend(ctx, &suspinfo, domid, send_fd); + rc = libxl_domain_suspend(ctx, domid, send_fd, LIBXL_SUSPEND_LIVE, NULL); if (rc) { fprintf(stderr, "migration sender: libxl_domain_suspend failed" " (rc=%d)\n", rc); @@ -6584,7 +6581,7 @@ int main_remus(int argc, char **argv) } /* Point of no return */ - rc = libxl_domain_remus_start(ctx, &r_info, domid, send_fd, recv_fd); + rc = libxl_domain_remus_start(ctx, &r_info, domid, send_fd, recv_fd, 0); /* If we are here, it means backup has failed/domain suspend failed. * Try to resume the domain and exit gracefully. _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:29 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11: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 1SmGw5-0004uM-7w; Wed, 04 Jul 2012 04:11:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw3-0004og-3B for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:27 +0000 Received: from [85.158.138.51:43787] by server-1.bemta-3.messagelabs.com id A9/1B-14648-E62C3FF4; Wed, 04 Jul 2012 04:11:26 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-174.messagelabs.com!1341375084!30978790!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13694 invoked from network); 4 Jul 2012 04:11:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw0-0002io-9D for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGw0-0003tj-2F for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:24 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:23 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: Get compiler to warn about gc_opt==NULL X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340905406 -3600 # Node ID 10866409df3a88a9b22ceae0b3fae339558e171c # Parent a2ee8da8211936e64a55dcaf41e45aa9988da7fc libxl: Get compiler to warn about gc_opt==NULL Since it used to be legal to pass gc_opt==NULL, and there are various patches floating about and under development which do so, add a compiler annotation which makes the build fail when that is done. This turns a runtime crash into a build failure, and should ensure that we don't accidentally commit a broken combination of patches. This is something of an annoying approach because it adds a macro invocation to the RHS of every declaration of a function taking a gc_opt. So it should be reverted after Xen 4.2rc1. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r a2ee8da82119 -r 10866409df3a tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Thu Jun 28 18:43:25 2012 +0100 +++ b/tools/libxl/libxl_internal.h Thu Jun 28 18:43:26 2012 +0100 @@ -453,28 +453,33 @@ static inline libxl_ctx *libxl__gc_owner * psuedo-gc. */ /* register ptr in gc for free on exit from outermost libxl callframe. */ -_hidden void libxl__ptr_add(libxl__gc *gc_opt, void *ptr /* may be NULL */); + +#define NN1 __attribute__((nonnull(1))) + /* It used to be legal to pass NULL for gc_opt. Get the compiler to + * warn about this if any slip through. */ + +_hidden void libxl__ptr_add(libxl__gc *gc_opt, void *ptr /* may be NULL */) NN1; /* if this is the outermost libxl callframe then free all pointers in @gc */ _hidden void libxl__free_all(libxl__gc *gc); /* allocate and zero @bytes. (similar to a gc'd malloc(3)+memzero()) */ -_hidden void *libxl__zalloc(libxl__gc *gc_opt, int bytes); +_hidden void *libxl__zalloc(libxl__gc *gc_opt, int bytes) NN1; /* allocate and zero memory for an array of @nmemb members of @size each. * (similar to a gc'd calloc(3)). */ -_hidden void *libxl__calloc(libxl__gc *gc_opt, size_t nmemb, size_t size); +_hidden void *libxl__calloc(libxl__gc *gc_opt, size_t nmemb, size_t size) NN1; /* change the size of the memory block pointed to by @ptr to @new_size bytes. * unlike other allocation functions here any additional space between the * oldsize and @new_size is not initialised (similar to a gc'd realloc(3)). */ -_hidden void *libxl__realloc(libxl__gc *gc_opt, void *ptr, size_t new_size); +_hidden void *libxl__realloc(libxl__gc *gc_opt, void *ptr, size_t new_size) NN1; /* print @fmt into an allocated string large enoughto contain the result. * (similar to gc'd asprintf(3)). */ -_hidden char *libxl__sprintf(libxl__gc *gc_opt, const char *fmt, ...) PRINTF_ATTRIBUTE(2, 3); +_hidden char *libxl__sprintf(libxl__gc *gc_opt, const char *fmt, ...) PRINTF_ATTRIBUTE(2, 3) NN1; /* duplicate the string @c (similar to a gc'd strdup(3)). */ -_hidden char *libxl__strdup(libxl__gc *gc_opt, const char *c); +_hidden char *libxl__strdup(libxl__gc *gc_opt, const char *c) NN1; /* duplicate at most @n bytes of string @c (similar to a gc'd strndup(3)). */ -_hidden char *libxl__strndup(libxl__gc *gc_opt, const char *c, size_t n); +_hidden char *libxl__strndup(libxl__gc *gc_opt, const char *c, size_t n) NN1; /* strip the last path component from @s and return as a newly allocated * string. (similar to a gc'd dirname(3)). */ -_hidden char *libxl__dirname(libxl__gc *gc_opt, const char *s); +_hidden char *libxl__dirname(libxl__gc *gc_opt, const char *s) NN1; /* Each of these logs errors and returns a libxl error code. * They do not mind if path is already removed. _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:29 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11: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 1SmGw5-0004uM-7w; Wed, 04 Jul 2012 04:11:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw3-0004og-3B for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:27 +0000 Received: from [85.158.138.51:43787] by server-1.bemta-3.messagelabs.com id A9/1B-14648-E62C3FF4; Wed, 04 Jul 2012 04:11:26 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-174.messagelabs.com!1341375084!30978790!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13694 invoked from network); 4 Jul 2012 04:11:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw0-0002io-9D for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGw0-0003tj-2F for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:24 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:23 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: Get compiler to warn about gc_opt==NULL X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340905406 -3600 # Node ID 10866409df3a88a9b22ceae0b3fae339558e171c # Parent a2ee8da8211936e64a55dcaf41e45aa9988da7fc libxl: Get compiler to warn about gc_opt==NULL Since it used to be legal to pass gc_opt==NULL, and there are various patches floating about and under development which do so, add a compiler annotation which makes the build fail when that is done. This turns a runtime crash into a build failure, and should ensure that we don't accidentally commit a broken combination of patches. This is something of an annoying approach because it adds a macro invocation to the RHS of every declaration of a function taking a gc_opt. So it should be reverted after Xen 4.2rc1. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r a2ee8da82119 -r 10866409df3a tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Thu Jun 28 18:43:25 2012 +0100 +++ b/tools/libxl/libxl_internal.h Thu Jun 28 18:43:26 2012 +0100 @@ -453,28 +453,33 @@ static inline libxl_ctx *libxl__gc_owner * psuedo-gc. */ /* register ptr in gc for free on exit from outermost libxl callframe. */ -_hidden void libxl__ptr_add(libxl__gc *gc_opt, void *ptr /* may be NULL */); + +#define NN1 __attribute__((nonnull(1))) + /* It used to be legal to pass NULL for gc_opt. Get the compiler to + * warn about this if any slip through. */ + +_hidden void libxl__ptr_add(libxl__gc *gc_opt, void *ptr /* may be NULL */) NN1; /* if this is the outermost libxl callframe then free all pointers in @gc */ _hidden void libxl__free_all(libxl__gc *gc); /* allocate and zero @bytes. (similar to a gc'd malloc(3)+memzero()) */ -_hidden void *libxl__zalloc(libxl__gc *gc_opt, int bytes); +_hidden void *libxl__zalloc(libxl__gc *gc_opt, int bytes) NN1; /* allocate and zero memory for an array of @nmemb members of @size each. * (similar to a gc'd calloc(3)). */ -_hidden void *libxl__calloc(libxl__gc *gc_opt, size_t nmemb, size_t size); +_hidden void *libxl__calloc(libxl__gc *gc_opt, size_t nmemb, size_t size) NN1; /* change the size of the memory block pointed to by @ptr to @new_size bytes. * unlike other allocation functions here any additional space between the * oldsize and @new_size is not initialised (similar to a gc'd realloc(3)). */ -_hidden void *libxl__realloc(libxl__gc *gc_opt, void *ptr, size_t new_size); +_hidden void *libxl__realloc(libxl__gc *gc_opt, void *ptr, size_t new_size) NN1; /* print @fmt into an allocated string large enoughto contain the result. * (similar to gc'd asprintf(3)). */ -_hidden char *libxl__sprintf(libxl__gc *gc_opt, const char *fmt, ...) PRINTF_ATTRIBUTE(2, 3); +_hidden char *libxl__sprintf(libxl__gc *gc_opt, const char *fmt, ...) PRINTF_ATTRIBUTE(2, 3) NN1; /* duplicate the string @c (similar to a gc'd strdup(3)). */ -_hidden char *libxl__strdup(libxl__gc *gc_opt, const char *c); +_hidden char *libxl__strdup(libxl__gc *gc_opt, const char *c) NN1; /* duplicate at most @n bytes of string @c (similar to a gc'd strndup(3)). */ -_hidden char *libxl__strndup(libxl__gc *gc_opt, const char *c, size_t n); +_hidden char *libxl__strndup(libxl__gc *gc_opt, const char *c, size_t n) NN1; /* strip the last path component from @s and return as a newly allocated * string. (similar to a gc'd dirname(3)). */ -_hidden char *libxl__dirname(libxl__gc *gc_opt, const char *s); +_hidden char *libxl__dirname(libxl__gc *gc_opt, const char *s) NN1; /* Each of these logs errors and returns a libxl error code. * They do not mind if path is already removed. _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:30 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11: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 1SmGw6-0004xL-Kb; Wed, 04 Jul 2012 04:11:30 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw4-0004s5-NS for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:28 +0000 Received: from [85.158.139.83:46765] by server-11.bemta-5.messagelabs.com id 64/95-20400-F62C3FF4; Wed, 04 Jul 2012 04:11:27 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-182.messagelabs.com!1341375086!30318041!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1650 invoked from network); 4 Jul 2012 04:11:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw2-0002j4-5a for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGw2-0003ui-4e for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:26 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:25 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: do not leak an event struct on ignored ao progress X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340905408 -3600 # Node ID 01a09e818f960c5adac6183ecc7ebfabc42fbfb8 # Parent 52be3b1ae4f096cf76ddced7276cd5ef36ecbbdc libxl: do not leak an event struct on ignored ao progress On entry to libxl__ao_progress_report, the caller has allocated an event. If the progress report is to be ignored, we need to free it. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 52be3b1ae4f0 -r 01a09e818f96 tools/libxl/libxl_event.c --- a/tools/libxl/libxl_event.c Thu Jun 28 18:43:27 2012 +0100 +++ b/tools/libxl/libxl_event.c Thu Jun 28 18:43:28 2012 +0100 @@ -1602,6 +1602,7 @@ void libxl__ao_progress_report(libxl__eg ev->for_user = how->for_event; if (how->callback == dummy_asyncprogress_callback_ignore) { LOG(DEBUG,"ao %p: progress report: ignored",ao); + libxl_event_free(CTX,ev); /* ignore */ } else if (how->callback) { libxl__aop_occurred *aop = libxl__zalloc(&egc->gc, sizeof(*aop)); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:30 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11: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 1SmGw6-0004xL-Kb; Wed, 04 Jul 2012 04:11:30 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw4-0004s5-NS for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:28 +0000 Received: from [85.158.139.83:46765] by server-11.bemta-5.messagelabs.com id 64/95-20400-F62C3FF4; Wed, 04 Jul 2012 04:11:27 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-182.messagelabs.com!1341375086!30318041!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1650 invoked from network); 4 Jul 2012 04:11:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw2-0002j4-5a for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGw2-0003ui-4e for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:26 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:25 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: do not leak an event struct on ignored ao progress X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340905408 -3600 # Node ID 01a09e818f960c5adac6183ecc7ebfabc42fbfb8 # Parent 52be3b1ae4f096cf76ddced7276cd5ef36ecbbdc libxl: do not leak an event struct on ignored ao progress On entry to libxl__ao_progress_report, the caller has allocated an event. If the progress report is to be ignored, we need to free it. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 52be3b1ae4f0 -r 01a09e818f96 tools/libxl/libxl_event.c --- a/tools/libxl/libxl_event.c Thu Jun 28 18:43:27 2012 +0100 +++ b/tools/libxl/libxl_event.c Thu Jun 28 18:43:28 2012 +0100 @@ -1602,6 +1602,7 @@ void libxl__ao_progress_report(libxl__eg ev->for_user = how->for_event; if (how->callback == dummy_asyncprogress_callback_ignore) { LOG(DEBUG,"ao %p: progress report: ignored",ao); + libxl_event_free(CTX,ev); /* ignore */ } else if (how->callback) { libxl__aop_occurred *aop = libxl__zalloc(&egc->gc, sizeof(*aop)); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:31 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11: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 1SmGw7-0004zT-Op; Wed, 04 Jul 2012 04:11:31 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw5-0004uB-Kf for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:29 +0000 Received: from [85.158.138.51:37262] by server-10.bemta-3.messagelabs.com id FF/64-01753-072C3FF4; Wed, 04 Jul 2012 04:11:28 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-174.messagelabs.com!1341375086!30957378!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28303 invoked from network); 4 Jul 2012 04:11:27 -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; 4 Jul 2012 04:11:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw2-0002j9-NX for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGw2-0003ux-MZ for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:26 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:26 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: further fixups re LIBXL_DOMAIN_TYPE X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340905408 -3600 # Node ID 0455d8317631b74c436fd2fadc6dc1c0cc86cb86 # Parent 01a09e818f960c5adac6183ecc7ebfabc42fbfb8 libxl: further fixups re LIBXL_DOMAIN_TYPE * Abolish the macro LIBXL__DOMAIN_IS_TYPE which had incorrect error handling. At every call site, replace it with an open-coded call to libxl_domain_type and check against LIBXL_DOMAIN_TYPE_INVALID. * This involves adding an `out:' to libxl_domain_unpause. * In libxl_domain_destroy and do_pci_add, do not `default: abort();' if the domain type cannot be found. Instead switch on LIBXL_DOMAIN_TYPE_INVALID specifically and do some actual error handling. * In libxl__primary_console_find, remove a spurious default clause from the domain type switch. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- diff -r 01a09e818f96 -r 0455d8317631 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Thu Jun 28 18:43:28 2012 +0100 +++ b/tools/libxl/libxl.c Thu Jun 28 18:43:28 2012 +0100 @@ -390,7 +390,13 @@ int libxl_domain_resume(libxl_ctx *ctx, goto out; } - if (LIBXL__DOMAIN_IS_TYPE(gc, domid, HVM)) { + libxl_domain_type type = libxl__domain_type(gc, domid); + if (type == LIBXL_DOMAIN_TYPE_INVALID) { + rc = ERROR_FAIL; + goto out; + } + + if (type == LIBXL_DOMAIN_TYPE_HVM) { rc = libxl__domain_resume_device_model(gc, domid); if (rc) { LIBXL__LOG(ctx, LIBXL__LOG_ERROR, @@ -789,7 +795,13 @@ int libxl_domain_unpause(libxl_ctx *ctx, char *state; int ret, rc = 0; - if (LIBXL__DOMAIN_IS_TYPE(gc, domid, HVM)) { + libxl_domain_type type = libxl__domain_type(gc, domid); + if (type == LIBXL_DOMAIN_TYPE_INVALID) { + rc = ERROR_FAIL; + goto out; + } + + if (type == LIBXL_DOMAIN_TYPE_HVM) { path = libxl__sprintf(gc, "/local/domain/0/device-model/%d/state", domid); state = libxl__xs_read(gc, XBT_NULL, path); if (state != NULL && !strcmp(state, "paused")) { @@ -803,6 +815,7 @@ int libxl_domain_unpause(libxl_ctx *ctx, LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "unpausing domain %d", domid); rc = ERROR_FAIL; } + out: GC_FREE; return rc; } @@ -814,7 +827,11 @@ int libxl__domain_pvcontrol_available(li unsigned long pvdriver = 0; int ret; - if (LIBXL__DOMAIN_IS_TYPE(gc, domid, PV)) + libxl_domain_type domtype = libxl__domain_type(gc, domid); + if (domtype == LIBXL_DOMAIN_TYPE_INVALID) + return ERROR_FAIL; + + if (domtype == LIBXL_DOMAIN_TYPE_PV) return 1; ret = xc_get_hvm_param(ctx->xch, domid, HVM_PARAM_CALLBACK_IRQ, &pvdriver); @@ -1214,6 +1231,9 @@ int libxl_domain_destroy(libxl_ctx *ctx, pid = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, "/local/domain/%d/image/device-model-pid", domid)); dm_present = (pid != NULL); break; + case LIBXL_DOMAIN_TYPE_INVALID: + rc = ERROR_FAIL; + goto out; default: abort(); } @@ -1363,8 +1383,6 @@ static int libxl__primary_console_find(l case LIBXL_DOMAIN_TYPE_INVALID: rc = ERROR_INVAL; goto out; - default: - abort(); } } diff -r 01a09e818f96 -r 0455d8317631 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Thu Jun 28 18:43:28 2012 +0100 +++ b/tools/libxl/libxl_internal.h Thu Jun 28 18:43:28 2012 +0100 @@ -797,8 +797,7 @@ _hidden int libxl__domain_cpupool(libxl_ _hidden libxl_scheduler libxl__domain_scheduler(libxl__gc *gc, uint32_t domid); _hidden int libxl__sched_set_params(libxl__gc *gc, uint32_t domid, libxl_domain_sched_params *scparams); -#define LIBXL__DOMAIN_IS_TYPE(gc, domid, type) \ - libxl__domain_type((gc), (domid)) == LIBXL_DOMAIN_TYPE_##type + typedef struct { uint32_t store_port; uint32_t store_domid; @@ -841,7 +840,9 @@ _hidden int libxl__domain_resume_device_ _hidden void libxl__userdata_destroyall(libxl__gc *gc, uint32_t domid); +/* returns 0 or 1, or a libxl error code */ _hidden int libxl__domain_pvcontrol_available(libxl__gc *gc, uint32_t domid); + _hidden char * libxl__domain_pvcontrol_read(libxl__gc *gc, xs_transaction_t t, uint32_t domid); _hidden int libxl__domain_pvcontrol_write(libxl__gc *gc, xs_transaction_t t, diff -r 01a09e818f96 -r 0455d8317631 tools/libxl/libxl_pci.c --- a/tools/libxl/libxl_pci.c Thu Jun 28 18:43:28 2012 +0100 +++ b/tools/libxl/libxl_pci.c Thu Jun 28 18:43:28 2012 +0100 @@ -129,7 +129,11 @@ static int libxl__device_pci_add_xenstor if (!num_devs) return libxl__create_pci_backend(gc, domid, pcidev, 1); - if (!starting && LIBXL__DOMAIN_IS_TYPE(gc, domid, PV)) { + libxl_domain_type domtype = libxl__domain_type(gc, domid); + if (domtype == LIBXL_DOMAIN_TYPE_INVALID) + return ERROR_FAIL; + + if (!starting && domtype == LIBXL_DOMAIN_TYPE_PV) { if (libxl__wait_for_backend(gc, be_path, "4") < 0) return ERROR_FAIL; } @@ -172,7 +176,11 @@ static int libxl__device_pci_remove_xens return ERROR_INVAL; num = atoi(num_devs); - if (LIBXL__DOMAIN_IS_TYPE(gc, domid, PV)) { + libxl_domain_type domtype = libxl__domain_type(gc, domid); + if (domtype == LIBXL_DOMAIN_TYPE_INVALID) + return ERROR_FAIL; + + if (domtype == LIBXL_DOMAIN_TYPE_PV) { if (libxl__wait_for_backend(gc, be_path, "4") < 0) { LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "pci backend at %s is not ready", be_path); return ERROR_FAIL; @@ -200,7 +208,7 @@ retry_transaction: if (errno == EAGAIN) goto retry_transaction; - if (LIBXL__DOMAIN_IS_TYPE(gc, domid, PV)) { + if (domtype == LIBXL_DOMAIN_TYPE_PV) { if (libxl__wait_for_backend(gc, be_path, "4") < 0) { LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "pci backend at %s is not ready", be_path); return ERROR_FAIL; @@ -942,8 +950,8 @@ static int do_pci_add(libxl__gc *gc, uin } break; } - default: - abort(); + case LIBXL_DOMAIN_TYPE_INVALID: + return ERROR_FAIL; } out: if (!libxl_is_stubdom(ctx, domid, NULL)) { _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:31 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11: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 1SmGw7-0004zT-Op; Wed, 04 Jul 2012 04:11:31 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw5-0004uB-Kf for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:29 +0000 Received: from [85.158.138.51:37262] by server-10.bemta-3.messagelabs.com id FF/64-01753-072C3FF4; Wed, 04 Jul 2012 04:11:28 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-174.messagelabs.com!1341375086!30957378!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28303 invoked from network); 4 Jul 2012 04:11:27 -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; 4 Jul 2012 04:11:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw2-0002j9-NX for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGw2-0003ux-MZ for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:26 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:26 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: further fixups re LIBXL_DOMAIN_TYPE X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340905408 -3600 # Node ID 0455d8317631b74c436fd2fadc6dc1c0cc86cb86 # Parent 01a09e818f960c5adac6183ecc7ebfabc42fbfb8 libxl: further fixups re LIBXL_DOMAIN_TYPE * Abolish the macro LIBXL__DOMAIN_IS_TYPE which had incorrect error handling. At every call site, replace it with an open-coded call to libxl_domain_type and check against LIBXL_DOMAIN_TYPE_INVALID. * This involves adding an `out:' to libxl_domain_unpause. * In libxl_domain_destroy and do_pci_add, do not `default: abort();' if the domain type cannot be found. Instead switch on LIBXL_DOMAIN_TYPE_INVALID specifically and do some actual error handling. * In libxl__primary_console_find, remove a spurious default clause from the domain type switch. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- diff -r 01a09e818f96 -r 0455d8317631 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Thu Jun 28 18:43:28 2012 +0100 +++ b/tools/libxl/libxl.c Thu Jun 28 18:43:28 2012 +0100 @@ -390,7 +390,13 @@ int libxl_domain_resume(libxl_ctx *ctx, goto out; } - if (LIBXL__DOMAIN_IS_TYPE(gc, domid, HVM)) { + libxl_domain_type type = libxl__domain_type(gc, domid); + if (type == LIBXL_DOMAIN_TYPE_INVALID) { + rc = ERROR_FAIL; + goto out; + } + + if (type == LIBXL_DOMAIN_TYPE_HVM) { rc = libxl__domain_resume_device_model(gc, domid); if (rc) { LIBXL__LOG(ctx, LIBXL__LOG_ERROR, @@ -789,7 +795,13 @@ int libxl_domain_unpause(libxl_ctx *ctx, char *state; int ret, rc = 0; - if (LIBXL__DOMAIN_IS_TYPE(gc, domid, HVM)) { + libxl_domain_type type = libxl__domain_type(gc, domid); + if (type == LIBXL_DOMAIN_TYPE_INVALID) { + rc = ERROR_FAIL; + goto out; + } + + if (type == LIBXL_DOMAIN_TYPE_HVM) { path = libxl__sprintf(gc, "/local/domain/0/device-model/%d/state", domid); state = libxl__xs_read(gc, XBT_NULL, path); if (state != NULL && !strcmp(state, "paused")) { @@ -803,6 +815,7 @@ int libxl_domain_unpause(libxl_ctx *ctx, LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "unpausing domain %d", domid); rc = ERROR_FAIL; } + out: GC_FREE; return rc; } @@ -814,7 +827,11 @@ int libxl__domain_pvcontrol_available(li unsigned long pvdriver = 0; int ret; - if (LIBXL__DOMAIN_IS_TYPE(gc, domid, PV)) + libxl_domain_type domtype = libxl__domain_type(gc, domid); + if (domtype == LIBXL_DOMAIN_TYPE_INVALID) + return ERROR_FAIL; + + if (domtype == LIBXL_DOMAIN_TYPE_PV) return 1; ret = xc_get_hvm_param(ctx->xch, domid, HVM_PARAM_CALLBACK_IRQ, &pvdriver); @@ -1214,6 +1231,9 @@ int libxl_domain_destroy(libxl_ctx *ctx, pid = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, "/local/domain/%d/image/device-model-pid", domid)); dm_present = (pid != NULL); break; + case LIBXL_DOMAIN_TYPE_INVALID: + rc = ERROR_FAIL; + goto out; default: abort(); } @@ -1363,8 +1383,6 @@ static int libxl__primary_console_find(l case LIBXL_DOMAIN_TYPE_INVALID: rc = ERROR_INVAL; goto out; - default: - abort(); } } diff -r 01a09e818f96 -r 0455d8317631 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Thu Jun 28 18:43:28 2012 +0100 +++ b/tools/libxl/libxl_internal.h Thu Jun 28 18:43:28 2012 +0100 @@ -797,8 +797,7 @@ _hidden int libxl__domain_cpupool(libxl_ _hidden libxl_scheduler libxl__domain_scheduler(libxl__gc *gc, uint32_t domid); _hidden int libxl__sched_set_params(libxl__gc *gc, uint32_t domid, libxl_domain_sched_params *scparams); -#define LIBXL__DOMAIN_IS_TYPE(gc, domid, type) \ - libxl__domain_type((gc), (domid)) == LIBXL_DOMAIN_TYPE_##type + typedef struct { uint32_t store_port; uint32_t store_domid; @@ -841,7 +840,9 @@ _hidden int libxl__domain_resume_device_ _hidden void libxl__userdata_destroyall(libxl__gc *gc, uint32_t domid); +/* returns 0 or 1, or a libxl error code */ _hidden int libxl__domain_pvcontrol_available(libxl__gc *gc, uint32_t domid); + _hidden char * libxl__domain_pvcontrol_read(libxl__gc *gc, xs_transaction_t t, uint32_t domid); _hidden int libxl__domain_pvcontrol_write(libxl__gc *gc, xs_transaction_t t, diff -r 01a09e818f96 -r 0455d8317631 tools/libxl/libxl_pci.c --- a/tools/libxl/libxl_pci.c Thu Jun 28 18:43:28 2012 +0100 +++ b/tools/libxl/libxl_pci.c Thu Jun 28 18:43:28 2012 +0100 @@ -129,7 +129,11 @@ static int libxl__device_pci_add_xenstor if (!num_devs) return libxl__create_pci_backend(gc, domid, pcidev, 1); - if (!starting && LIBXL__DOMAIN_IS_TYPE(gc, domid, PV)) { + libxl_domain_type domtype = libxl__domain_type(gc, domid); + if (domtype == LIBXL_DOMAIN_TYPE_INVALID) + return ERROR_FAIL; + + if (!starting && domtype == LIBXL_DOMAIN_TYPE_PV) { if (libxl__wait_for_backend(gc, be_path, "4") < 0) return ERROR_FAIL; } @@ -172,7 +176,11 @@ static int libxl__device_pci_remove_xens return ERROR_INVAL; num = atoi(num_devs); - if (LIBXL__DOMAIN_IS_TYPE(gc, domid, PV)) { + libxl_domain_type domtype = libxl__domain_type(gc, domid); + if (domtype == LIBXL_DOMAIN_TYPE_INVALID) + return ERROR_FAIL; + + if (domtype == LIBXL_DOMAIN_TYPE_PV) { if (libxl__wait_for_backend(gc, be_path, "4") < 0) { LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "pci backend at %s is not ready", be_path); return ERROR_FAIL; @@ -200,7 +208,7 @@ retry_transaction: if (errno == EAGAIN) goto retry_transaction; - if (LIBXL__DOMAIN_IS_TYPE(gc, domid, PV)) { + if (domtype == LIBXL_DOMAIN_TYPE_PV) { if (libxl__wait_for_backend(gc, be_path, "4") < 0) { LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "pci backend at %s is not ready", be_path); return ERROR_FAIL; @@ -942,8 +950,8 @@ static int do_pci_add(libxl__gc *gc, uin } break; } - default: - abort(); + case LIBXL_DOMAIN_TYPE_INVALID: + return ERROR_FAIL; } out: if (!libxl_is_stubdom(ctx, domid, NULL)) { _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:32 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw7-0004zi-VP; Wed, 04 Jul 2012 04:11:31 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw6-0004vi-BZ for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:30 +0000 Received: from [85.158.138.51:43957] by server-2.bemta-3.messagelabs.com id 98/ED-10266-172C3FF4; Wed, 04 Jul 2012 04:11:29 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-174.messagelabs.com!1341375087!30978800!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13833 invoked from network); 4 Jul 2012 04:11:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw3-0002jR-OE for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGw3-0003vR-NH for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:27 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:27 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: make libxl-save-helper depend on the autogenerated code targets X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340965450 -3600 # Node ID a2abb62aedbe3fb0a6ad25dd20a9c4b21427f002 # Parent cf6ca262ef6a2320b6ed8a90b2797a71fc8827c3 libxl: make libxl-save-helper depend on the autogenerated code targets Fixes this build failure: In file included from libxl_save_helper.c:44: libxl.h:346:26: error: _libxl_types.h: No such file or directory Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r cf6ca262ef6a -r a2abb62aedbe tools/libxl/Makefile --- a/tools/libxl/Makefile Fri Jun 29 11:19:02 2012 +0100 +++ b/tools/libxl/Makefile Fri Jun 29 11:24:10 2012 +0100 @@ -100,7 +100,7 @@ testidl.c: libxl_types.idl gentest.py li all: $(CLIENTS) libxenlight.so libxenlight.a libxlutil.so libxlutil.a \ $(AUTOSRCS) $(AUTOINCS) -$(LIBXL_OBJS) $(LIBXLU_OBJS) $(XL_OBJS): $(AUTOINCS) +$(LIBXL_OBJS) $(LIBXLU_OBJS) $(XL_OBJS) $(SAVE_HELPER_OBJS): $(AUTOINCS) %.c %.h:: %.y @rm -f $*.[ch] @@ -134,7 +134,7 @@ libxl_internal.h: _libxl_types_internal. libxl_internal_json.h: _libxl_types_internal_json.h xl.h: _paths.h -$(LIBXL_OBJS) $(LIBXLU_OBJS) $(XL_OBJS): libxl.h +$(LIBXL_OBJS) $(LIBXLU_OBJS) $(XL_OBJS) $(SAVE_HELPER_OBJS): libxl.h $(LIBXL_OBJS): libxl_internal.h _libxl_type%.h _libxl_type%_json.h _libxl_type%.c: libxl_type%.idl gentypes.py idl.py _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:32 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw7-0004zi-VP; Wed, 04 Jul 2012 04:11:31 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw6-0004vi-BZ for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:30 +0000 Received: from [85.158.138.51:43957] by server-2.bemta-3.messagelabs.com id 98/ED-10266-172C3FF4; Wed, 04 Jul 2012 04:11:29 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-174.messagelabs.com!1341375087!30978800!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13833 invoked from network); 4 Jul 2012 04:11:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw3-0002jR-OE for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGw3-0003vR-NH for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:27 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:27 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: make libxl-save-helper depend on the autogenerated code targets X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340965450 -3600 # Node ID a2abb62aedbe3fb0a6ad25dd20a9c4b21427f002 # Parent cf6ca262ef6a2320b6ed8a90b2797a71fc8827c3 libxl: make libxl-save-helper depend on the autogenerated code targets Fixes this build failure: In file included from libxl_save_helper.c:44: libxl.h:346:26: error: _libxl_types.h: No such file or directory Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r cf6ca262ef6a -r a2abb62aedbe tools/libxl/Makefile --- a/tools/libxl/Makefile Fri Jun 29 11:19:02 2012 +0100 +++ b/tools/libxl/Makefile Fri Jun 29 11:24:10 2012 +0100 @@ -100,7 +100,7 @@ testidl.c: libxl_types.idl gentest.py li all: $(CLIENTS) libxenlight.so libxenlight.a libxlutil.so libxlutil.a \ $(AUTOSRCS) $(AUTOINCS) -$(LIBXL_OBJS) $(LIBXLU_OBJS) $(XL_OBJS): $(AUTOINCS) +$(LIBXL_OBJS) $(LIBXLU_OBJS) $(XL_OBJS) $(SAVE_HELPER_OBJS): $(AUTOINCS) %.c %.h:: %.y @rm -f $*.[ch] @@ -134,7 +134,7 @@ libxl_internal.h: _libxl_types_internal. libxl_internal_json.h: _libxl_types_internal_json.h xl.h: _paths.h -$(LIBXL_OBJS) $(LIBXLU_OBJS) $(XL_OBJS): libxl.h +$(LIBXL_OBJS) $(LIBXLU_OBJS) $(XL_OBJS) $(SAVE_HELPER_OBJS): libxl.h $(LIBXL_OBJS): libxl_internal.h _libxl_type%.h _libxl_type%_json.h _libxl_type%.c: libxl_type%.idl gentypes.py idl.py _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:32 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw8-000509-2u; Wed, 04 Jul 2012 04:11:32 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw7-0004x5-0v for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:31 +0000 Received: from [85.158.139.83:46876] by server-3.bemta-5.messagelabs.com id 66/A1-03367-272C3FF4; Wed, 04 Jul 2012 04:11:30 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-182.messagelabs.com!1341375088!27798096!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11426 invoked from network); 4 Jul 2012 04:11:29 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw4-0002jW-8l for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGw4-0003vg-7l for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:28 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:27 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] autoconf: correctly parse *_INCLUDES and *_LIB env vars X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340980317 -3600 # Node ID f7576f2fe8f9614ce926bf7fb8d1695c009eec1e # Parent a2abb62aedbe3fb0a6ad25dd20a9c4b21427f002 autoconf: correctly parse *_INCLUDES and *_LIB env vars Parse those options correctly, since the "+=" operator is not valid. Also added CPPFLAGS, so headers checks don't give strange results. Please rerun configure after applying. Signed-off-by: Roger Pau Monne Cc: Christoph Egger Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r a2abb62aedbe -r f7576f2fe8f9 tools/configure --- a/tools/configure Fri Jun 29 11:24:10 2012 +0100 +++ b/tools/configure Fri Jun 29 15:31:57 2012 +0100 @@ -2594,23 +2594,23 @@ debug=$ax_cv_debug -for cflag in $PREPEND_INCLUDES +for cppflag in $PREPEND_INCLUDES do - PREPEND_CFLAGS+=" -I$cflag" + PREPEND_CPPFLAGS="$PREPEND_CPPFLAGS -I$cppflag" done for ldflag in $PREPEND_LIB do - PREPEND_LDFLAGS+=" -L$ldflag" + PREPEND_LDFLAGS="$PREPEND_LDFLAGS -L$ldflag" done -for cflag in $APPEND_INCLUDES +for cppflag in $APPEND_INCLUDES do - APPEND_CFLAGS+=" -I$cflag" + APPEND_CPPFLAGS="$APPEND_CPPFLAGS -I$cppflag" done for ldflag in $APPEND_LIB do - APPEND_LDFLAGS+=" -L$ldflag" + APPEND_LDFLAGS="$APPEND_LDFLAGS -L$ldflag" done -CFLAGS="$PREPEND_CFLAGS $CFLAGS $APPEND_CFLAGS" +CPPFLAGS="$PREPEND_CPPFLAGS $CPPFLAGS $APPEND_CPPFLAGS" LDFLAGS="$PREPEND_LDFLAGS $LDFLAGS $APPEND_LDFLAGS" diff -r a2abb62aedbe -r f7576f2fe8f9 tools/m4/set_cflags_ldflags.m4 --- a/tools/m4/set_cflags_ldflags.m4 Fri Jun 29 11:24:10 2012 +0100 +++ b/tools/m4/set_cflags_ldflags.m4 Fri Jun 29 15:31:57 2012 +0100 @@ -1,20 +1,20 @@ AC_DEFUN([AX_SET_FLAGS], -[for cflag in $PREPEND_INCLUDES +[for cppflag in $PREPEND_INCLUDES do - PREPEND_CFLAGS+=" -I$cflag" + PREPEND_CPPFLAGS="$PREPEND_CPPFLAGS -I$cppflag" done for ldflag in $PREPEND_LIB do - PREPEND_LDFLAGS+=" -L$ldflag" + PREPEND_LDFLAGS="$PREPEND_LDFLAGS -L$ldflag" done -for cflag in $APPEND_INCLUDES +for cppflag in $APPEND_INCLUDES do - APPEND_CFLAGS+=" -I$cflag" + APPEND_CPPFLAGS="$APPEND_CPPFLAGS -I$cppflag" done for ldflag in $APPEND_LIB do - APPEND_LDFLAGS+=" -L$ldflag" + APPEND_LDFLAGS="$APPEND_LDFLAGS -L$ldflag" done -CFLAGS="$PREPEND_CFLAGS $CFLAGS $APPEND_CFLAGS" +CPPFLAGS="$PREPEND_CPPFLAGS $CPPFLAGS $APPEND_CPPFLAGS" LDFLAGS="$PREPEND_LDFLAGS $LDFLAGS $APPEND_LDFLAGS"]) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:32 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw8-000509-2u; Wed, 04 Jul 2012 04:11:32 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw7-0004x5-0v for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:31 +0000 Received: from [85.158.139.83:46876] by server-3.bemta-5.messagelabs.com id 66/A1-03367-272C3FF4; Wed, 04 Jul 2012 04:11:30 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-182.messagelabs.com!1341375088!27798096!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11426 invoked from network); 4 Jul 2012 04:11:29 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw4-0002jW-8l for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGw4-0003vg-7l for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:28 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:27 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] autoconf: correctly parse *_INCLUDES and *_LIB env vars X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340980317 -3600 # Node ID f7576f2fe8f9614ce926bf7fb8d1695c009eec1e # Parent a2abb62aedbe3fb0a6ad25dd20a9c4b21427f002 autoconf: correctly parse *_INCLUDES and *_LIB env vars Parse those options correctly, since the "+=" operator is not valid. Also added CPPFLAGS, so headers checks don't give strange results. Please rerun configure after applying. Signed-off-by: Roger Pau Monne Cc: Christoph Egger Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r a2abb62aedbe -r f7576f2fe8f9 tools/configure --- a/tools/configure Fri Jun 29 11:24:10 2012 +0100 +++ b/tools/configure Fri Jun 29 15:31:57 2012 +0100 @@ -2594,23 +2594,23 @@ debug=$ax_cv_debug -for cflag in $PREPEND_INCLUDES +for cppflag in $PREPEND_INCLUDES do - PREPEND_CFLAGS+=" -I$cflag" + PREPEND_CPPFLAGS="$PREPEND_CPPFLAGS -I$cppflag" done for ldflag in $PREPEND_LIB do - PREPEND_LDFLAGS+=" -L$ldflag" + PREPEND_LDFLAGS="$PREPEND_LDFLAGS -L$ldflag" done -for cflag in $APPEND_INCLUDES +for cppflag in $APPEND_INCLUDES do - APPEND_CFLAGS+=" -I$cflag" + APPEND_CPPFLAGS="$APPEND_CPPFLAGS -I$cppflag" done for ldflag in $APPEND_LIB do - APPEND_LDFLAGS+=" -L$ldflag" + APPEND_LDFLAGS="$APPEND_LDFLAGS -L$ldflag" done -CFLAGS="$PREPEND_CFLAGS $CFLAGS $APPEND_CFLAGS" +CPPFLAGS="$PREPEND_CPPFLAGS $CPPFLAGS $APPEND_CPPFLAGS" LDFLAGS="$PREPEND_LDFLAGS $LDFLAGS $APPEND_LDFLAGS" diff -r a2abb62aedbe -r f7576f2fe8f9 tools/m4/set_cflags_ldflags.m4 --- a/tools/m4/set_cflags_ldflags.m4 Fri Jun 29 11:24:10 2012 +0100 +++ b/tools/m4/set_cflags_ldflags.m4 Fri Jun 29 15:31:57 2012 +0100 @@ -1,20 +1,20 @@ AC_DEFUN([AX_SET_FLAGS], -[for cflag in $PREPEND_INCLUDES +[for cppflag in $PREPEND_INCLUDES do - PREPEND_CFLAGS+=" -I$cflag" + PREPEND_CPPFLAGS="$PREPEND_CPPFLAGS -I$cppflag" done for ldflag in $PREPEND_LIB do - PREPEND_LDFLAGS+=" -L$ldflag" + PREPEND_LDFLAGS="$PREPEND_LDFLAGS -L$ldflag" done -for cflag in $APPEND_INCLUDES +for cppflag in $APPEND_INCLUDES do - APPEND_CFLAGS+=" -I$cflag" + APPEND_CPPFLAGS="$APPEND_CPPFLAGS -I$cppflag" done for ldflag in $APPEND_LIB do - APPEND_LDFLAGS+=" -L$ldflag" + APPEND_LDFLAGS="$APPEND_LDFLAGS -L$ldflag" done -CFLAGS="$PREPEND_CFLAGS $CFLAGS $APPEND_CFLAGS" +CPPFLAGS="$PREPEND_CPPFLAGS $CPPFLAGS $APPEND_CPPFLAGS" LDFLAGS="$PREPEND_LDFLAGS $LDFLAGS $APPEND_LDFLAGS"]) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:34 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwA-000542-9I; Wed, 04 Jul 2012 04:11:34 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw8-0004p3-E6 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:32 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-27.messagelabs.com!1341375085!6485111!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15886 invoked from network); 4 Jul 2012 04:11:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw1-0002iy-5R for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGw1-0003uE-4M for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:25 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:24 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: do not leak dms->saved_state X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340905407 -3600 # Node ID 470770c73af9adc33f7a3bcbf5b2c997ab1bfd51 # Parent 82e77edfa002b272f6b21d954267de091dd77531 libxl: do not leak dms->saved_state This was allocated using asprintf but never freed. Use GCSPRINTF. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 82e77edfa002 -r 470770c73af9 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Thu Jun 28 18:43:26 2012 +0100 +++ b/tools/libxl/libxl_create.c Thu Jun 28 18:43:27 2012 +0100 @@ -807,9 +807,8 @@ void libxl__xc_domain_restore_done(libxl goto out; if (info->type == LIBXL_DOMAIN_TYPE_HVM) { - ret = asprintf(&state->saved_state, + state->saved_state = GCSPRINTF( XC_DEVICE_MODEL_RESTORE_FILE".%d", domid); - ret = (ret < 0) ? ERROR_FAIL : 0; } out: _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:34 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwA-000542-9I; Wed, 04 Jul 2012 04:11:34 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw8-0004p3-E6 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:32 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-27.messagelabs.com!1341375085!6485111!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15886 invoked from network); 4 Jul 2012 04:11:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw1-0002iy-5R for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGw1-0003uE-4M for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:25 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:24 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: do not leak dms->saved_state X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340905407 -3600 # Node ID 470770c73af9adc33f7a3bcbf5b2c997ab1bfd51 # Parent 82e77edfa002b272f6b21d954267de091dd77531 libxl: do not leak dms->saved_state This was allocated using asprintf but never freed. Use GCSPRINTF. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 82e77edfa002 -r 470770c73af9 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Thu Jun 28 18:43:26 2012 +0100 +++ b/tools/libxl/libxl_create.c Thu Jun 28 18:43:27 2012 +0100 @@ -807,9 +807,8 @@ void libxl__xc_domain_restore_done(libxl goto out; if (info->type == LIBXL_DOMAIN_TYPE_HVM) { - ret = asprintf(&state->saved_state, + state->saved_state = GCSPRINTF( XC_DEVICE_MODEL_RESTORE_FILE".%d", domid); - ret = (ret < 0) ? ERROR_FAIL : 0; } out: _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:34 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwA-00054k-F8; Wed, 04 Jul 2012 04:11:34 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw8-0004q1-U1 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:33 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-27.messagelabs.com!1341375084!9968992!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15675 invoked from network); 4 Jul 2012 04:11:25 -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; 4 Jul 2012 04:11:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw0-0002it-Ki for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGw0-0003tz-Jd for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:24 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:24 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xl: Handle return value from libxl_domain_suspend correctly X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340905406 -3600 # Node ID 82e77edfa002b272f6b21d954267de091dd77531 # Parent 10866409df3a88a9b22ceae0b3fae339558e171c xl: Handle return value from libxl_domain_suspend correctly libxl_domain_suspend returns a libxl error code. So it must be wrapped with MUST and not CHK_ERRNO. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 10866409df3a -r 82e77edfa002 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Thu Jun 28 18:43:26 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Thu Jun 28 18:43:26 2012 +0100 @@ -2826,7 +2826,7 @@ static int save_domain(const char *p, co save_domain_core_writeconfig(fd, filename, config_data, config_len); - CHK_ERRNO(libxl_domain_suspend(ctx, domid, fd, 0, NULL)); + MUST(libxl_domain_suspend(ctx, domid, fd, 0, NULL)); close(fd); if (checkpoint) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:34 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwA-00054k-F8; Wed, 04 Jul 2012 04:11:34 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw8-0004q1-U1 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:33 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-27.messagelabs.com!1341375084!9968992!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15675 invoked from network); 4 Jul 2012 04:11:25 -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; 4 Jul 2012 04:11:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw0-0002it-Ki for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGw0-0003tz-Jd for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:24 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:24 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xl: Handle return value from libxl_domain_suspend correctly X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340905406 -3600 # Node ID 82e77edfa002b272f6b21d954267de091dd77531 # Parent 10866409df3a88a9b22ceae0b3fae339558e171c xl: Handle return value from libxl_domain_suspend correctly libxl_domain_suspend returns a libxl error code. So it must be wrapped with MUST and not CHK_ERRNO. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 10866409df3a -r 82e77edfa002 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Thu Jun 28 18:43:26 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Thu Jun 28 18:43:26 2012 +0100 @@ -2826,7 +2826,7 @@ static int save_domain(const char *p, co save_domain_core_writeconfig(fd, filename, config_data, config_len); - CHK_ERRNO(libxl_domain_suspend(ctx, domid, fd, 0, NULL)); + MUST(libxl_domain_suspend(ctx, domid, fd, 0, NULL)); close(fd); if (checkpoint) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:35 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwA-00055V-Oc; Wed, 04 Jul 2012 04:11:34 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw9-00051U-4z for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:33 +0000 Received: from [85.158.143.35:28864] by server-3.bemta-4.messagelabs.com id 96/E6-05808-472C3FF4; Wed, 04 Jul 2012 04:11:32 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-21.messagelabs.com!1341375090!16353628!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2035 invoked from network); 4 Jul 2012 04:11:31 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw5-0002jk-Ri for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGw5-0003wP-Qo for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:29 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:29 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: initialise cpupoolinfo in libxl__domain_scheduler X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340956631 -3600 # Node ID a82c0e0d4aa46ec3f70a46ce6d7c215e374a2d08 # Parent 675b3d693971d3db3cb676e032291c3f9321b46e libxl: initialise cpupoolinfo in libxl__domain_scheduler If libxl_cpupool_info fails then we would call libxl_cpupoolinfo_dispose on an uninitialised struct, and possibly free an invalid pointer. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 675b3d693971 -r a82c0e0d4aa4 tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Fri Jun 29 15:42:27 2012 +0100 +++ b/tools/libxl/libxl_dom.c Fri Jun 29 08:57:11 2012 +0100 @@ -81,6 +81,7 @@ libxl_scheduler libxl__domain_scheduler( if (cpupool < 0) return sched; + libxl_cpupoolinfo_init(&poolinfo); rc = libxl_cpupool_info(CTX, &poolinfo, cpupool); if (rc < 0) goto out; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:35 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwA-00055V-Oc; Wed, 04 Jul 2012 04:11:34 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw9-00051U-4z for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:33 +0000 Received: from [85.158.143.35:28864] by server-3.bemta-4.messagelabs.com id 96/E6-05808-472C3FF4; Wed, 04 Jul 2012 04:11:32 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-21.messagelabs.com!1341375090!16353628!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2035 invoked from network); 4 Jul 2012 04:11:31 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw5-0002jk-Ri for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGw5-0003wP-Qo for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:29 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:29 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: initialise cpupoolinfo in libxl__domain_scheduler X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340956631 -3600 # Node ID a82c0e0d4aa46ec3f70a46ce6d7c215e374a2d08 # Parent 675b3d693971d3db3cb676e032291c3f9321b46e libxl: initialise cpupoolinfo in libxl__domain_scheduler If libxl_cpupool_info fails then we would call libxl_cpupoolinfo_dispose on an uninitialised struct, and possibly free an invalid pointer. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 675b3d693971 -r a82c0e0d4aa4 tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Fri Jun 29 15:42:27 2012 +0100 +++ b/tools/libxl/libxl_dom.c Fri Jun 29 08:57:11 2012 +0100 @@ -81,6 +81,7 @@ libxl_scheduler libxl__domain_scheduler( if (cpupool < 0) return sched; + libxl_cpupoolinfo_init(&poolinfo); rc = libxl_cpupool_info(CTX, &poolinfo, cpupool); if (rc < 0) goto out; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:35 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwB-00056H-08; Wed, 04 Jul 2012 04:11:35 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw9-00051j-DK for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:33 +0000 Received: from [85.158.139.83:46999] by server-5.bemta-5.messagelabs.com id 23/6B-02722-472C3FF4; Wed, 04 Jul 2012 04:11:32 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-182.messagelabs.com!1341375090!19596565!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14568 invoked from network); 4 Jul 2012 04:11:31 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw6-0002jr-Bn for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGw6-0003we-Ap for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:30 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:29 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: correct type of cpupool variable. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340956631 -3600 # Node ID 19d48015b5aa38ca913962a4cc7367bb79ed7244 # Parent a82c0e0d4aa46ec3f70a46ce6d7c215e374a2d08 libxl: correct type of cpupool variable. libxl__domain_cpupool returns int and can return ERROR_* so we need to use a signed type. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r a82c0e0d4aa4 -r 19d48015b5aa tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Fri Jun 29 08:57:11 2012 +0100 +++ b/tools/libxl/libxl_dom.c Fri Jun 29 08:57:11 2012 +0100 @@ -73,7 +73,7 @@ int libxl__domain_cpupool(libxl__gc *gc, libxl_scheduler libxl__domain_scheduler(libxl__gc *gc, uint32_t domid) { - uint32_t cpupool = libxl__domain_cpupool(gc, domid); + int cpupool = libxl__domain_cpupool(gc, domid); libxl_cpupoolinfo poolinfo; libxl_scheduler sched = LIBXL_SCHEDULER_UNKNOWN; int rc; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:35 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwB-000571-Af; Wed, 04 Jul 2012 04:11:35 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw9-00051j-RE for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:34 +0000 Received: from [85.158.139.83:56565] by server-5.bemta-5.messagelabs.com id 24/6B-02722-472C3FF4; Wed, 04 Jul 2012 04:11:32 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-182.messagelabs.com!1341375091!30757974!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30661 invoked from network); 4 Jul 2012 04:11:32 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw6-0002k2-Ti for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGw6-0003wu-S1 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:30 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:30 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: log on failure in cpupool_info and libxl__domain_cpupool X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340956699 -3600 # Node ID d70030d6a87c7237afa78435b3a9b2a11628a63b # Parent 19d48015b5aa38ca913962a4cc7367bb79ed7244 libxl: log on failure in cpupool_info and libxl__domain_cpupool Also in cpupool_info propagate the failure value from libxl_cpumap_alloc. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 19d48015b5aa -r d70030d6a87c tools/libxl/libxl.c --- a/tools/libxl/libxl.c Fri Jun 29 08:57:11 2012 +0100 +++ b/tools/libxl/libxl.c Fri Jun 29 08:58:19 2012 +0100 @@ -571,16 +571,27 @@ static int cpupool_info(libxl__gc *gc, xcinfo = xc_cpupool_getinfo(CTX->xch, poolid); if (xcinfo == NULL) + { + LOGE(ERROR, "failed to get info for cpupool%d\n", poolid); return ERROR_FAIL; + } if (exact && xcinfo->cpupool_id != poolid) + { + LOG(ERROR, "got info for cpupool%d, wanted cpupool%d\n", + xcinfo->cpupool_id, poolid); goto out; + } info->poolid = xcinfo->cpupool_id; info->sched = xcinfo->sched_id; info->n_dom = xcinfo->n_dom; - if (libxl_cpumap_alloc(CTX, &info->cpumap, 0)) + rc = libxl_cpumap_alloc(CTX, &info->cpumap, 0); + if (rc) + { + LOG(ERROR, "unable to allocate cpumap %d\n", rc); goto out; + } memcpy(info->cpumap.map, xcinfo->cpumap, info->cpumap.size); rc = 0; diff -r 19d48015b5aa -r d70030d6a87c tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Fri Jun 29 08:57:11 2012 +0100 +++ b/tools/libxl/libxl_dom.c Fri Jun 29 08:58:19 2012 +0100 @@ -64,10 +64,15 @@ int libxl__domain_cpupool(libxl__gc *gc, ret = xc_domain_getinfolist(CTX->xch, domid, 1, &info); if (ret != 1) + { + LOGE(ERROR, "getinfolist failed %d\n", ret); return ERROR_FAIL; + } if (info.domain != domid) + { + LOGE(ERROR, "got info for dom%d, wanted dom%d\n", info.domain, domid); return ERROR_FAIL; - + } return info.cpupool; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:35 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwB-00056H-08; Wed, 04 Jul 2012 04:11:35 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw9-00051j-DK for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:33 +0000 Received: from [85.158.139.83:46999] by server-5.bemta-5.messagelabs.com id 23/6B-02722-472C3FF4; Wed, 04 Jul 2012 04:11:32 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-182.messagelabs.com!1341375090!19596565!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14568 invoked from network); 4 Jul 2012 04:11:31 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw6-0002jr-Bn for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGw6-0003we-Ap for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:30 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:29 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: correct type of cpupool variable. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340956631 -3600 # Node ID 19d48015b5aa38ca913962a4cc7367bb79ed7244 # Parent a82c0e0d4aa46ec3f70a46ce6d7c215e374a2d08 libxl: correct type of cpupool variable. libxl__domain_cpupool returns int and can return ERROR_* so we need to use a signed type. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r a82c0e0d4aa4 -r 19d48015b5aa tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Fri Jun 29 08:57:11 2012 +0100 +++ b/tools/libxl/libxl_dom.c Fri Jun 29 08:57:11 2012 +0100 @@ -73,7 +73,7 @@ int libxl__domain_cpupool(libxl__gc *gc, libxl_scheduler libxl__domain_scheduler(libxl__gc *gc, uint32_t domid) { - uint32_t cpupool = libxl__domain_cpupool(gc, domid); + int cpupool = libxl__domain_cpupool(gc, domid); libxl_cpupoolinfo poolinfo; libxl_scheduler sched = LIBXL_SCHEDULER_UNKNOWN; int rc; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:35 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwB-000571-Af; Wed, 04 Jul 2012 04:11:35 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw9-00051j-RE for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:34 +0000 Received: from [85.158.139.83:56565] by server-5.bemta-5.messagelabs.com id 24/6B-02722-472C3FF4; Wed, 04 Jul 2012 04:11:32 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-182.messagelabs.com!1341375091!30757974!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30661 invoked from network); 4 Jul 2012 04:11:32 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw6-0002k2-Ti for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGw6-0003wu-S1 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:30 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:30 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: log on failure in cpupool_info and libxl__domain_cpupool X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340956699 -3600 # Node ID d70030d6a87c7237afa78435b3a9b2a11628a63b # Parent 19d48015b5aa38ca913962a4cc7367bb79ed7244 libxl: log on failure in cpupool_info and libxl__domain_cpupool Also in cpupool_info propagate the failure value from libxl_cpumap_alloc. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 19d48015b5aa -r d70030d6a87c tools/libxl/libxl.c --- a/tools/libxl/libxl.c Fri Jun 29 08:57:11 2012 +0100 +++ b/tools/libxl/libxl.c Fri Jun 29 08:58:19 2012 +0100 @@ -571,16 +571,27 @@ static int cpupool_info(libxl__gc *gc, xcinfo = xc_cpupool_getinfo(CTX->xch, poolid); if (xcinfo == NULL) + { + LOGE(ERROR, "failed to get info for cpupool%d\n", poolid); return ERROR_FAIL; + } if (exact && xcinfo->cpupool_id != poolid) + { + LOG(ERROR, "got info for cpupool%d, wanted cpupool%d\n", + xcinfo->cpupool_id, poolid); goto out; + } info->poolid = xcinfo->cpupool_id; info->sched = xcinfo->sched_id; info->n_dom = xcinfo->n_dom; - if (libxl_cpumap_alloc(CTX, &info->cpumap, 0)) + rc = libxl_cpumap_alloc(CTX, &info->cpumap, 0); + if (rc) + { + LOG(ERROR, "unable to allocate cpumap %d\n", rc); goto out; + } memcpy(info->cpumap.map, xcinfo->cpumap, info->cpumap.size); rc = 0; diff -r 19d48015b5aa -r d70030d6a87c tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Fri Jun 29 08:57:11 2012 +0100 +++ b/tools/libxl/libxl_dom.c Fri Jun 29 08:58:19 2012 +0100 @@ -64,10 +64,15 @@ int libxl__domain_cpupool(libxl__gc *gc, ret = xc_domain_getinfolist(CTX->xch, domid, 1, &info); if (ret != 1) + { + LOGE(ERROR, "getinfolist failed %d\n", ret); return ERROR_FAIL; + } if (info.domain != domid) + { + LOGE(ERROR, "got info for dom%d, wanted dom%d\n", info.domain, domid); return ERROR_FAIL; - + } return info.cpupool; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:36 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11: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 1SmGwC-00058M-BM; Wed, 04 Jul 2012 04:11:36 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwA-00053V-IU for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:34 +0000 Received: from [85.158.138.51:37531] by server-11.bemta-3.messagelabs.com id 21/5F-02904-572C3FF4; Wed, 04 Jul 2012 04:11:33 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-174.messagelabs.com!1341375092!30872583!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26258 invoked from network); 4 Jul 2012 04:11:33 -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; 4 Jul 2012 04:11:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw7-0002kD-Uo for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGw7-0003xO-Tt for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:31 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:31 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] MAINTAINTERS: update xen-devel email address X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340981279 -3600 # Node ID 4b30d1863cd25325d0f26fd671cf999c6bd758cf # Parent dbf54d93ac40f6aa0ce2efbb37f512b884d23637 MAINTAINTERS: update xen-devel email address Signed-off-by: Andrew Cooper Acked-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r dbf54d93ac40 -r 4b30d1863cd2 MAINTAINERS --- a/MAINTAINERS Fri Jun 29 08:58:22 2012 +0100 +++ b/MAINTAINERS Fri Jun 29 15:47:59 2012 +0100 @@ -102,7 +102,7 @@ M: Ian Campbell M: Tim Deegan S: Supported -L: xen-devel@lists.xensource.com +L: xen-devel@lists.xen.org F: xen/arch/arm/ F: xen/include/asm-arm/ @@ -246,7 +246,7 @@ X86 ARCHITECTURE M: Keir Fraser M: Jan Beulich S: Supported -L: xen-devel@lists.xensource.com +L: xen-devel@lists.xen.org F: xen/arch/x86/ F: xen/include/asm-x86/ @@ -263,7 +263,7 @@ F: xen/common/trace.c THE REST M: Keir Fraser -L: xen-devel@lists.xensource.com +L: xen-devel@lists.xen.org S: Supported F: * F: */ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:36 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11: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 1SmGwC-00058M-BM; Wed, 04 Jul 2012 04:11:36 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwA-00053V-IU for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:34 +0000 Received: from [85.158.138.51:37531] by server-11.bemta-3.messagelabs.com id 21/5F-02904-572C3FF4; Wed, 04 Jul 2012 04:11:33 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-174.messagelabs.com!1341375092!30872583!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26258 invoked from network); 4 Jul 2012 04:11:33 -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; 4 Jul 2012 04:11:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw7-0002kD-Uo for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGw7-0003xO-Tt for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:31 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:31 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] MAINTAINTERS: update xen-devel email address X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340981279 -3600 # Node ID 4b30d1863cd25325d0f26fd671cf999c6bd758cf # Parent dbf54d93ac40f6aa0ce2efbb37f512b884d23637 MAINTAINTERS: update xen-devel email address Signed-off-by: Andrew Cooper Acked-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r dbf54d93ac40 -r 4b30d1863cd2 MAINTAINERS --- a/MAINTAINERS Fri Jun 29 08:58:22 2012 +0100 +++ b/MAINTAINERS Fri Jun 29 15:47:59 2012 +0100 @@ -102,7 +102,7 @@ M: Ian Campbell M: Tim Deegan S: Supported -L: xen-devel@lists.xensource.com +L: xen-devel@lists.xen.org F: xen/arch/arm/ F: xen/include/asm-arm/ @@ -246,7 +246,7 @@ X86 ARCHITECTURE M: Keir Fraser M: Jan Beulich S: Supported -L: xen-devel@lists.xensource.com +L: xen-devel@lists.xen.org F: xen/arch/x86/ F: xen/include/asm-x86/ @@ -263,7 +263,7 @@ F: xen/common/trace.c THE REST M: Keir Fraser -L: xen-devel@lists.xensource.com +L: xen-devel@lists.xen.org S: Supported F: * F: */ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:37 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwC-00059j-Oi; Wed, 04 Jul 2012 04:11:36 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwA-0004uB-O5 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:34 +0000 Received: from [85.158.138.51:44144] by server-10.bemta-3.messagelabs.com id DE/74-01753-672C3FF4; Wed, 04 Jul 2012 04:11:34 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-174.messagelabs.com!1341375092!22749753!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26956 invoked from network); 4 Jul 2012 04:11:33 -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; 4 Jul 2012 04:11:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw8-0002kJ-Ek for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGw8-0003xd-Do for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:32 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:31 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] QEMU_TAG update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1340985839 -3600 # Node ID fb5ef18e57343a81130c8ef6442f7bb947762122 # Parent 4b30d1863cd25325d0f26fd671cf999c6bd758cf QEMU_TAG update --- diff -r 4b30d1863cd2 -r fb5ef18e5734 Config.mk --- a/Config.mk Fri Jun 29 15:47:59 2012 +0100 +++ b/Config.mk Fri Jun 29 17:03:59 2012 +0100 @@ -213,9 +213,9 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= ce6d9b1b2f9c6a5ca2500e03d0ef8b453bc4bf53 -# Thu Jun 28 15:44:50 2012 +0100 -# qemu-traditional: disable msitranslate by default +QEMU_TAG ?= 94a7bdc2e7797df2dab1c26216349f66e0f3490a +# Fri Jun 29 16:58:05 2012 +0100 +# xendisk: set maximum number of grants to be used # Short answer -- do not enable this unless you know what you are # doing and are prepared for some pain. _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:37 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwC-00059j-Oi; Wed, 04 Jul 2012 04:11:36 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwA-0004uB-O5 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:34 +0000 Received: from [85.158.138.51:44144] by server-10.bemta-3.messagelabs.com id DE/74-01753-672C3FF4; Wed, 04 Jul 2012 04:11:34 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-174.messagelabs.com!1341375092!22749753!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26956 invoked from network); 4 Jul 2012 04:11:33 -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; 4 Jul 2012 04:11:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw8-0002kJ-Ek for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGw8-0003xd-Do for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:32 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:31 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] QEMU_TAG update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1340985839 -3600 # Node ID fb5ef18e57343a81130c8ef6442f7bb947762122 # Parent 4b30d1863cd25325d0f26fd671cf999c6bd758cf QEMU_TAG update --- diff -r 4b30d1863cd2 -r fb5ef18e5734 Config.mk --- a/Config.mk Fri Jun 29 15:47:59 2012 +0100 +++ b/Config.mk Fri Jun 29 17:03:59 2012 +0100 @@ -213,9 +213,9 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= ce6d9b1b2f9c6a5ca2500e03d0ef8b453bc4bf53 -# Thu Jun 28 15:44:50 2012 +0100 -# qemu-traditional: disable msitranslate by default +QEMU_TAG ?= 94a7bdc2e7797df2dab1c26216349f66e0f3490a +# Fri Jun 29 16:58:05 2012 +0100 +# xendisk: set maximum number of grants to be used # Short answer -- do not enable this unless you know what you are # doing and are prepared for some pain. _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:37 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwD-0005Am-19; Wed, 04 Jul 2012 04:11:37 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwA-0004uS-JO for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:34 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-27.messagelabs.com!1341375087!4257784!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5859 invoked from network); 4 Jul 2012 04:11:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw3-0002jK-7j for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGw3-0003vC-6g for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:27 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:26 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: libxl__xs_transaction_commit should always clear the transaction. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340965142 -3600 # Node ID cf6ca262ef6a2320b6ed8a90b2797a71fc8827c3 # Parent 0455d8317631b74c436fd2fadc6dc1c0cc86cb86 libxl: libxl__xs_transaction_commit should always clear the transaction. This includes the EAGAIN case. Users are of the form: xs_transaction_t t = 0; for (;;) { rc = libxl__xs_transaction_start(gc, &t); rc = stuff if (rc) goto out; ...more... rc = libxl__xs_transaction_commit(gc, &t); if (!rc) break; if (rc<0) goto out; } ... out: So in EAGAIN (commit -> +1) we will go round the loop again and call start which leads to: xl: libxl_xshelp.c:174: libxl__xs_transaction_start: Assertion `!*t' failed. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 0455d8317631 -r cf6ca262ef6a tools/libxl/libxl_xshelp.c --- a/tools/libxl/libxl_xshelp.c Thu Jun 28 18:43:28 2012 +0100 +++ b/tools/libxl/libxl_xshelp.c Fri Jun 29 11:19:02 2012 +0100 @@ -185,10 +185,10 @@ int libxl__xs_transaction_commit(libxl__ assert(*t); if (!xs_transaction_end(CTX->xsh, *t, 0)) { + *t = 0; if (errno == EAGAIN) return +1; - *t = 0; LOGE(ERROR, "could not commit xenstore transaction"); return ERROR_FAIL; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:37 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwD-0005Am-19; Wed, 04 Jul 2012 04:11:37 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwA-0004uS-JO for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:34 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-27.messagelabs.com!1341375087!4257784!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5859 invoked from network); 4 Jul 2012 04:11:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw3-0002jK-7j for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGw3-0003vC-6g for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:27 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:26 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: libxl__xs_transaction_commit should always clear the transaction. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340965142 -3600 # Node ID cf6ca262ef6a2320b6ed8a90b2797a71fc8827c3 # Parent 0455d8317631b74c436fd2fadc6dc1c0cc86cb86 libxl: libxl__xs_transaction_commit should always clear the transaction. This includes the EAGAIN case. Users are of the form: xs_transaction_t t = 0; for (;;) { rc = libxl__xs_transaction_start(gc, &t); rc = stuff if (rc) goto out; ...more... rc = libxl__xs_transaction_commit(gc, &t); if (!rc) break; if (rc<0) goto out; } ... out: So in EAGAIN (commit -> +1) we will go round the loop again and call start which leads to: xl: libxl_xshelp.c:174: libxl__xs_transaction_start: Assertion `!*t' failed. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 0455d8317631 -r cf6ca262ef6a tools/libxl/libxl_xshelp.c --- a/tools/libxl/libxl_xshelp.c Thu Jun 28 18:43:28 2012 +0100 +++ b/tools/libxl/libxl_xshelp.c Fri Jun 29 11:19:02 2012 +0100 @@ -185,10 +185,10 @@ int libxl__xs_transaction_commit(libxl__ assert(*t); if (!xs_transaction_end(CTX->xsh, *t, 0)) { + *t = 0; if (errno == EAGAIN) return +1; - *t = 0; LOGE(ERROR, "could not commit xenstore transaction"); return ERROR_FAIL; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:38 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwE-0005Dz-Dz; Wed, 04 Jul 2012 04:11:38 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwB-0004vt-6r for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:35 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-11.tower-27.messagelabs.com!1341375085!3111094!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8249 invoked from network); 4 Jul 2012 04:11:27 -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; 4 Jul 2012 04:11:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw1-0002j1-M2 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGw1-0003uT-Kw for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:25 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:25 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: do not leak spawned middle children X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340905407 -3600 # Node ID 52be3b1ae4f096cf76ddced7276cd5ef36ecbbdc # Parent 470770c73af9adc33f7a3bcbf5b2c997ab1bfd51 libxl: do not leak spawned middle children libxl__spawn_spawn would, when libxl__spawn_detach was called, make the spawn become idle immediately. However it still has a child process which needs to be waited for: the `detachable' spawned child. This is wrong because the ultimate in-libxl caller may return to the application, with a child process still forked but not reaped libxl contrary to the documented behaviour of libxl. Instead, replace libxl__spawn_detach with libxl__spawn_initiate_detach which is asynchronous. The detachable spawned children are abolished; instead, we defer calling back to the in-libxl user until the middle child has been reaped. Also, remove erroneous comment suggesting that `death' callback parameter to libxl__ev_child_fork may be NULL. It may not, and there are no callers which pass NULL. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- diff -r 470770c73af9 -r 52be3b1ae4f0 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Thu Jun 28 18:43:27 2012 +0100 +++ b/tools/libxl/libxl_dm.c Thu Jun 28 18:43:27 2012 +0100 @@ -915,6 +915,8 @@ static void device_model_confirm(libxl__ const char *xsdata); static void device_model_startup_failed(libxl__egc *egc, libxl__spawn_state *spawn); +static void device_model_detached(libxl__egc *egc, + libxl__spawn_state *spawn); /* our "next step" function, called from those callbacks and elsewhere */ static void device_model_spawn_outcome(libxl__egc *egc, @@ -1022,6 +1024,7 @@ retry_transaction: spawn->midproc_cb = libxl__spawn_record_pid; spawn->confirm_cb = device_model_confirm; spawn->failure_cb = device_model_startup_failed; + spawn->detached_cb = device_model_detached; rc = libxl__spawn_spawn(egc, spawn); if (rc < 0) @@ -1055,9 +1058,7 @@ static void device_model_confirm(libxl__ if (strcmp(xsdata, "running")) return; - libxl__spawn_detach(gc, spawn); - - device_model_spawn_outcome(egc, dmss, 0); + libxl__spawn_initiate_detach(gc, spawn); } static void device_model_startup_failed(libxl__egc *egc, @@ -1067,6 +1068,13 @@ static void device_model_startup_failed( device_model_spawn_outcome(egc, dmss, ERROR_FAIL); } +static void device_model_detached(libxl__egc *egc, + libxl__spawn_state *spawn) +{ + libxl__dm_spawn_state *dmss = CONTAINER_OF(spawn, *dmss, spawn); + device_model_spawn_outcome(egc, dmss, 0); +} + static void device_model_spawn_outcome(libxl__egc *egc, libxl__dm_spawn_state *dmss, int rc) diff -r 470770c73af9 -r 52be3b1ae4f0 tools/libxl/libxl_exec.c --- a/tools/libxl/libxl_exec.c Thu Jun 28 18:43:27 2012 +0100 +++ b/tools/libxl/libxl_exec.c Thu Jun 28 18:43:27 2012 +0100 @@ -238,15 +238,22 @@ err: /* * Full set of possible states of a libxl__spawn_state and its _detachable: * - * ss-> ss-> ss-> | ssd-> ssd-> - * timeout xswatch ssd | mid ss - * - Undefined undef undef no | - - - * - Idle Idle Idle no | - - - * - Active Active Active yes | Active yes - * - Partial Active/Idle Active/Idle maybe | Active/Idle yes (if exists) - * - Detached - - - | Active no + * detaching failed mid timeout xswatch + * - Undefined undef undef - undef undef + * - Idle any any Idle Idle Idle + * - Attached OK 0 0 Active Active Active + * - Attached Failed 0 1 Active Idle Idle + * - Detaching 1 maybe Active Idle Idle + * - Partial any any Idle Active/Idle Active/Idle * - * When in state Detached, the middle process has been sent a SIGKILL. + * When in states Detaching or Attached Failed, the middle process has + * been sent a SIGKILL. + * + * The difference between Attached OK and Attached Failed is not + * directly visible to callers - callers see these two the same, + * although of course Attached OK will hopefully eventually result in + * a call to detached_cb, whereas Attached Failed will end up + * in a call to failure_cb. */ /* Event callbacks. */ @@ -257,19 +264,18 @@ static void spawn_timeout(libxl__egc *eg static void spawn_middle_death(libxl__egc *egc, libxl__ev_child *childw, pid_t pid, int status); -/* Precondition: Partial. Results: Detached. */ +/* Precondition: Partial. Results: Idle. */ static void spawn_cleanup(libxl__gc *gc, libxl__spawn_state *ss); -/* Precondition: Partial; caller has logged failure reason. - * Results: Caller notified of failure; - * after return, ss may be completely invalid as caller may reuse it */ -static void spawn_failed(libxl__egc *egc, libxl__spawn_state *ss); +/* Precondition: Attached or Detaching; caller has logged failure reason. + * Results: Detaching, or Attached Failed */ +static void spawn_fail(libxl__egc *egc, libxl__spawn_state *ss); void libxl__spawn_init(libxl__spawn_state *ss) { + libxl__ev_child_init(&ss->mid); libxl__ev_time_init(&ss->timeout); libxl__ev_xswatch_init(&ss->xswatch); - ss->ssd = 0; } int libxl__spawn_spawn(libxl__egc *egc, libxl__spawn_state *ss) @@ -280,8 +286,7 @@ int libxl__spawn_spawn(libxl__egc *egc, int status, rc; libxl__spawn_init(ss); - ss->ssd = libxl__zalloc(NOGC, sizeof(*ss->ssd)); - libxl__ev_child_init(&ss->ssd->mid); + ss->failed = ss->detaching = 0; rc = libxl__ev_time_register_rel(gc, &ss->timeout, spawn_timeout, ss->timeout_ms); @@ -291,7 +296,7 @@ int libxl__spawn_spawn(libxl__egc *egc, spawn_watch_event, ss->xspath); if (rc) goto out_err; - pid_t middle = libxl__ev_child_fork(gc, &ss->ssd->mid, spawn_middle_death); + pid_t middle = libxl__ev_child_fork(gc, &ss->mid, spawn_middle_death); if (middle ==-1) { rc = ERROR_FAIL; goto out_err; } if (middle) { @@ -344,54 +349,64 @@ int libxl__spawn_spawn(libxl__egc *egc, static void spawn_cleanup(libxl__gc *gc, libxl__spawn_state *ss) { + assert(!libxl__ev_child_inuse(&ss->mid)); + libxl__ev_time_deregister(gc, &ss->timeout); + libxl__ev_xswatch_deregister(gc, &ss->xswatch); +} + +static void spawn_detach(libxl__gc *gc, libxl__spawn_state *ss) +/* Precondition: Attached or Detaching, but caller must have just set + * at least one of detaching or failed. + * Results: Detaching or Attached Failed */ +{ int r; + assert(libxl__ev_child_inuse(&ss->mid)); libxl__ev_time_deregister(gc, &ss->timeout); libxl__ev_xswatch_deregister(gc, &ss->xswatch); - libxl__spawn_state_detachable *ssd = ss->ssd; - if (ssd) { - if (libxl__ev_child_inuse(&ssd->mid)) { - pid_t child = ssd->mid.pid; - r = kill(child, SIGKILL); - if (r && errno != ESRCH) - LOGE(WARN, "%s: failed to kill intermediate child (pid=%lu)", - ss->what, (unsigned long)child); - } - - /* disconnect the ss and ssd from each other */ - ssd->ss = 0; - ss->ssd = 0; - } + pid_t child = ss->mid.pid; + r = kill(child, SIGKILL); + if (r && errno != ESRCH) + LOGE(WARN, "%s: failed to kill intermediate child (pid=%lu)", + ss->what, (unsigned long)child); } -static void spawn_failed(libxl__egc *egc, libxl__spawn_state *ss) +void libxl__spawn_initiate_detach(libxl__gc *gc, libxl__spawn_state *ss) +{ + ss->detaching = 1; + spawn_detach(gc, ss); +} + +static void spawn_fail(libxl__egc *egc, libxl__spawn_state *ss) +/* Caller must have logged. Must be last thing in calling function, + * as it may make the callback. Precondition: Attached or Detaching. */ { EGC_GC; - spawn_cleanup(gc, ss); - ss->failure_cb(egc, ss); /* must be last; callback may do anything to ss */ + ss->failed = 1; + spawn_detach(gc, ss); } static void spawn_timeout(libxl__egc *egc, libxl__ev_time *ev, const struct timeval *requested_abs) { - /* Before event, was Active; is now Partial. */ + /* Before event, was Attached. */ EGC_GC; libxl__spawn_state *ss = CONTAINER_OF(ev, *ss, timeout); LOG(ERROR, "%s: startup timed out", ss->what); - spawn_failed(egc, ss); /* must be last */ + spawn_fail(egc, ss); /* must be last */ } static void spawn_watch_event(libxl__egc *egc, libxl__ev_xswatch *xsw, const char *watch_path, const char *event_path) { - /* On entry, is Active. */ + /* On entry, is Attached. */ EGC_GC; libxl__spawn_state *ss = CONTAINER_OF(xsw, *ss, xswatch); char *p = libxl__xs_read(gc, 0, ss->xspath); if (!p && errno != ENOENT) { LOG(ERROR, "%s: xenstore read of %s failed", ss->what, ss->xspath); - spawn_failed(egc, ss); /* must be last */ + spawn_fail(egc, ss); /* must be last */ return; } ss->confirm_cb(egc, ss, p); /* must be last */ @@ -399,20 +414,22 @@ static void spawn_watch_event(libxl__egc static void spawn_middle_death(libxl__egc *egc, libxl__ev_child *childw, pid_t pid, int status) - /* Before event, was Active or Detached; - * is now Active or Detached except that ssd->mid is Idle */ + /* On entry, is Attached or Detaching */ { EGC_GC; - libxl__spawn_state_detachable *ssd = CONTAINER_OF(childw, *ssd, mid); - libxl__spawn_state *ss = ssd->ss; + libxl__spawn_state *ss = CONTAINER_OF(childw, *ss, mid); - if (!WIFEXITED(status)) { + if ((ss->failed || ss->detaching) && + ((WIFEXITED(status) && WEXITSTATUS(status)==0) || + (WIFSIGNALED(status) && WTERMSIG(status)==SIGKILL))) { + /* as expected */ + } else if (!WIFEXITED(status)) { + int loglevel = ss->detaching ? XTL_WARN : XTL_ERROR; const char *what = - GCSPRINTF("%s intermediate process (startup monitor)", - ss ? ss->what : "(detached)"); - int loglevel = ss ? XTL_ERROR : XTL_WARN; + GCSPRINTF("%s intermediate process (startup monitor)", ss->what); libxl_report_child_exitstatus(CTX, loglevel, what, pid, status); - } else if (ss) { /* otherwise it was supposed to be a daemon by now */ + ss->failed = 1; + } else { if (!status) LOG(ERROR, "%s [%ld]: unexpectedly exited with exit status 0," " when we were waiting for it to confirm startup", @@ -430,15 +447,22 @@ static void spawn_middle_death(libxl__eg LOG(ERROR, "%s [%ld]: died during startup due to unknown fatal" " signal number %d", ss->what, (unsigned long)pid, sig); } - ss->ssd = 0; /* detatch the ssd to make the ss be in state Partial */ - spawn_failed(egc, ss); /* must be last use of ss */ + ss->failed = 1; } - free(ssd); -} -void libxl__spawn_detach(libxl__gc *gc, libxl__spawn_state *ss) -{ spawn_cleanup(gc, ss); + + if (ss->failed && !ss->detaching) { + ss->failure_cb(egc, ss); /* must be last */ + return; + } + + if (ss->failed && ss->detaching) + LOG(WARN,"%s underlying machinery seemed to fail," + " but its function seems to have been successful", ss->what); + + assert(ss->detaching); + ss->detached_cb(egc, ss); } /* diff -r 470770c73af9 -r 52be3b1ae4f0 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Thu Jun 28 18:43:27 2012 +0100 +++ b/tools/libxl/libxl_internal.h Thu Jun 28 18:43:27 2012 +0100 @@ -690,8 +690,7 @@ static inline int libxl__ev_xswatch_isre * the libxl event machinery. * * The parent may signal the child but it must not reap it. That will - * be done by the event machinery. death may be NULL in which case - * the child is still reaped but its death is ignored. + * be done by the event machinery. * * It is not possible to "deregister" the child death event source. * It will generate exactly one event callback; until then the childw @@ -998,8 +997,8 @@ _hidden int libxl__device_pci_destroy_al * * Higher-level double-fork and separate detach eg as for device models * - * Each libxl__spawn_state is in one of the conventional states - * Undefined, Idle, Active + * Each libxl__spawn_state is in one of these states + * Undefined, Idle, Attached, Detaching */ typedef struct libxl__obsolete_spawn_starting libxl__spawn_starting; @@ -1040,15 +1039,15 @@ _hidden void libxl__spawn_init(libxl__sp * intermediate or final child; an error message will have been * logged. * - * confirm_cb and failure_cb will not be called reentrantly from - * within libxl__spawn_spawn. + * confirm_cb, failure_cb and detached_cb will not be called + * reentrantly from within libxl__spawn_spawn. * * what: string describing the spawned process, used for logging * * Logs errors. A copy of "what" is taken. * Return values: * < 0 error, *spawn is now Idle and need not be detached - * +1 caller is the parent, *spawn is Active and must eventually be detached + * +1 caller is the parent, *spawn is Attached and must be detached * 0 caller is now the inner child, should probably call libxl__exec * * The spawn state must be Undefined or Idle on entry. @@ -1056,12 +1055,15 @@ _hidden void libxl__spawn_init(libxl__sp _hidden int libxl__spawn_spawn(libxl__egc *egc, libxl__spawn_state *spawn); /* - * libxl__spawn_detach - Detaches the daemonic child. + * libxl__spawn_request_detach - Detaches the daemonic child. * * Works by killing the intermediate process from spawn_spawn. * After this function returns, failures of either child are no * longer reported via failure_cb. * + * This is not synchronous: there will be a further callback when + * the detach is complete. + * * If called before the inner child has been created, this may prevent * it from running at all. Thus this should be called only when the * inner child has notified that it is ready. Normally it will be @@ -1069,10 +1071,10 @@ _hidden int libxl__spawn_spawn(libxl__eg * * Logs errors. * - * The spawn state must be Active or Idle on entry and will be Idle + * The spawn state must be Attached entry and will be Detaching * on return. */ -_hidden void libxl__spawn_detach(libxl__gc *gc, libxl__spawn_state*); +_hidden void libxl__spawn_initiate_detach(libxl__gc *gc, libxl__spawn_state*); /* * If successful, this should return 0. @@ -1109,15 +1111,11 @@ typedef void libxl__spawn_failure_cb(lib typedef void libxl__spawn_confirm_cb(libxl__egc*, libxl__spawn_state*, const char *xsdata); -typedef struct { - /* Private to the spawn implementation. - */ - /* This separate struct, from malloc, allows us to "detach" - * the child and reap it later, when our user has gone - * away and freed its libxl__spawn_state */ - struct libxl__spawn_state *ss; - libxl__ev_child mid; -} libxl__spawn_state_detachable; +/* + * Called when the detach (requested by libxl__spawn_initiate_detach) has + * completed. On entry to the callback the spawn state is Idle. + */ +typedef void libxl__spawn_detached_cb(libxl__egc*, libxl__spawn_state*); struct libxl__spawn_state { /* must be filled in by user and remain valid */ @@ -1129,15 +1127,18 @@ struct libxl__spawn_state { libxl__spawn_midproc_cb *midproc_cb; libxl__spawn_failure_cb *failure_cb; libxl__spawn_confirm_cb *confirm_cb; + libxl__spawn_detached_cb *detached_cb; /* remaining fields are private to libxl_spawn_... */ + int detaching; /* we are in Detaching */ + int failed; /* might be true whenever we are not Idle */ + libxl__ev_child mid; /* always in use whenever we are not Idle */ libxl__ev_time timeout; libxl__ev_xswatch xswatch; - libxl__spawn_state_detachable *ssd; }; static inline int libxl__spawn_inuse(libxl__spawn_state *ss) - { return !!ss->ssd; } + { return libxl__ev_child_inuse(&ss->mid); } /* * libxl_spawner_record_pid - Record given pid in xenstore _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:38 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwE-0005Dz-Dz; Wed, 04 Jul 2012 04:11:38 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwB-0004vt-6r for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:35 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-11.tower-27.messagelabs.com!1341375085!3111094!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8249 invoked from network); 4 Jul 2012 04:11:27 -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; 4 Jul 2012 04:11:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw1-0002j1-M2 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGw1-0003uT-Kw for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:25 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:25 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: do not leak spawned middle children X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340905407 -3600 # Node ID 52be3b1ae4f096cf76ddced7276cd5ef36ecbbdc # Parent 470770c73af9adc33f7a3bcbf5b2c997ab1bfd51 libxl: do not leak spawned middle children libxl__spawn_spawn would, when libxl__spawn_detach was called, make the spawn become idle immediately. However it still has a child process which needs to be waited for: the `detachable' spawned child. This is wrong because the ultimate in-libxl caller may return to the application, with a child process still forked but not reaped libxl contrary to the documented behaviour of libxl. Instead, replace libxl__spawn_detach with libxl__spawn_initiate_detach which is asynchronous. The detachable spawned children are abolished; instead, we defer calling back to the in-libxl user until the middle child has been reaped. Also, remove erroneous comment suggesting that `death' callback parameter to libxl__ev_child_fork may be NULL. It may not, and there are no callers which pass NULL. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- diff -r 470770c73af9 -r 52be3b1ae4f0 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Thu Jun 28 18:43:27 2012 +0100 +++ b/tools/libxl/libxl_dm.c Thu Jun 28 18:43:27 2012 +0100 @@ -915,6 +915,8 @@ static void device_model_confirm(libxl__ const char *xsdata); static void device_model_startup_failed(libxl__egc *egc, libxl__spawn_state *spawn); +static void device_model_detached(libxl__egc *egc, + libxl__spawn_state *spawn); /* our "next step" function, called from those callbacks and elsewhere */ static void device_model_spawn_outcome(libxl__egc *egc, @@ -1022,6 +1024,7 @@ retry_transaction: spawn->midproc_cb = libxl__spawn_record_pid; spawn->confirm_cb = device_model_confirm; spawn->failure_cb = device_model_startup_failed; + spawn->detached_cb = device_model_detached; rc = libxl__spawn_spawn(egc, spawn); if (rc < 0) @@ -1055,9 +1058,7 @@ static void device_model_confirm(libxl__ if (strcmp(xsdata, "running")) return; - libxl__spawn_detach(gc, spawn); - - device_model_spawn_outcome(egc, dmss, 0); + libxl__spawn_initiate_detach(gc, spawn); } static void device_model_startup_failed(libxl__egc *egc, @@ -1067,6 +1068,13 @@ static void device_model_startup_failed( device_model_spawn_outcome(egc, dmss, ERROR_FAIL); } +static void device_model_detached(libxl__egc *egc, + libxl__spawn_state *spawn) +{ + libxl__dm_spawn_state *dmss = CONTAINER_OF(spawn, *dmss, spawn); + device_model_spawn_outcome(egc, dmss, 0); +} + static void device_model_spawn_outcome(libxl__egc *egc, libxl__dm_spawn_state *dmss, int rc) diff -r 470770c73af9 -r 52be3b1ae4f0 tools/libxl/libxl_exec.c --- a/tools/libxl/libxl_exec.c Thu Jun 28 18:43:27 2012 +0100 +++ b/tools/libxl/libxl_exec.c Thu Jun 28 18:43:27 2012 +0100 @@ -238,15 +238,22 @@ err: /* * Full set of possible states of a libxl__spawn_state and its _detachable: * - * ss-> ss-> ss-> | ssd-> ssd-> - * timeout xswatch ssd | mid ss - * - Undefined undef undef no | - - - * - Idle Idle Idle no | - - - * - Active Active Active yes | Active yes - * - Partial Active/Idle Active/Idle maybe | Active/Idle yes (if exists) - * - Detached - - - | Active no + * detaching failed mid timeout xswatch + * - Undefined undef undef - undef undef + * - Idle any any Idle Idle Idle + * - Attached OK 0 0 Active Active Active + * - Attached Failed 0 1 Active Idle Idle + * - Detaching 1 maybe Active Idle Idle + * - Partial any any Idle Active/Idle Active/Idle * - * When in state Detached, the middle process has been sent a SIGKILL. + * When in states Detaching or Attached Failed, the middle process has + * been sent a SIGKILL. + * + * The difference between Attached OK and Attached Failed is not + * directly visible to callers - callers see these two the same, + * although of course Attached OK will hopefully eventually result in + * a call to detached_cb, whereas Attached Failed will end up + * in a call to failure_cb. */ /* Event callbacks. */ @@ -257,19 +264,18 @@ static void spawn_timeout(libxl__egc *eg static void spawn_middle_death(libxl__egc *egc, libxl__ev_child *childw, pid_t pid, int status); -/* Precondition: Partial. Results: Detached. */ +/* Precondition: Partial. Results: Idle. */ static void spawn_cleanup(libxl__gc *gc, libxl__spawn_state *ss); -/* Precondition: Partial; caller has logged failure reason. - * Results: Caller notified of failure; - * after return, ss may be completely invalid as caller may reuse it */ -static void spawn_failed(libxl__egc *egc, libxl__spawn_state *ss); +/* Precondition: Attached or Detaching; caller has logged failure reason. + * Results: Detaching, or Attached Failed */ +static void spawn_fail(libxl__egc *egc, libxl__spawn_state *ss); void libxl__spawn_init(libxl__spawn_state *ss) { + libxl__ev_child_init(&ss->mid); libxl__ev_time_init(&ss->timeout); libxl__ev_xswatch_init(&ss->xswatch); - ss->ssd = 0; } int libxl__spawn_spawn(libxl__egc *egc, libxl__spawn_state *ss) @@ -280,8 +286,7 @@ int libxl__spawn_spawn(libxl__egc *egc, int status, rc; libxl__spawn_init(ss); - ss->ssd = libxl__zalloc(NOGC, sizeof(*ss->ssd)); - libxl__ev_child_init(&ss->ssd->mid); + ss->failed = ss->detaching = 0; rc = libxl__ev_time_register_rel(gc, &ss->timeout, spawn_timeout, ss->timeout_ms); @@ -291,7 +296,7 @@ int libxl__spawn_spawn(libxl__egc *egc, spawn_watch_event, ss->xspath); if (rc) goto out_err; - pid_t middle = libxl__ev_child_fork(gc, &ss->ssd->mid, spawn_middle_death); + pid_t middle = libxl__ev_child_fork(gc, &ss->mid, spawn_middle_death); if (middle ==-1) { rc = ERROR_FAIL; goto out_err; } if (middle) { @@ -344,54 +349,64 @@ int libxl__spawn_spawn(libxl__egc *egc, static void spawn_cleanup(libxl__gc *gc, libxl__spawn_state *ss) { + assert(!libxl__ev_child_inuse(&ss->mid)); + libxl__ev_time_deregister(gc, &ss->timeout); + libxl__ev_xswatch_deregister(gc, &ss->xswatch); +} + +static void spawn_detach(libxl__gc *gc, libxl__spawn_state *ss) +/* Precondition: Attached or Detaching, but caller must have just set + * at least one of detaching or failed. + * Results: Detaching or Attached Failed */ +{ int r; + assert(libxl__ev_child_inuse(&ss->mid)); libxl__ev_time_deregister(gc, &ss->timeout); libxl__ev_xswatch_deregister(gc, &ss->xswatch); - libxl__spawn_state_detachable *ssd = ss->ssd; - if (ssd) { - if (libxl__ev_child_inuse(&ssd->mid)) { - pid_t child = ssd->mid.pid; - r = kill(child, SIGKILL); - if (r && errno != ESRCH) - LOGE(WARN, "%s: failed to kill intermediate child (pid=%lu)", - ss->what, (unsigned long)child); - } - - /* disconnect the ss and ssd from each other */ - ssd->ss = 0; - ss->ssd = 0; - } + pid_t child = ss->mid.pid; + r = kill(child, SIGKILL); + if (r && errno != ESRCH) + LOGE(WARN, "%s: failed to kill intermediate child (pid=%lu)", + ss->what, (unsigned long)child); } -static void spawn_failed(libxl__egc *egc, libxl__spawn_state *ss) +void libxl__spawn_initiate_detach(libxl__gc *gc, libxl__spawn_state *ss) +{ + ss->detaching = 1; + spawn_detach(gc, ss); +} + +static void spawn_fail(libxl__egc *egc, libxl__spawn_state *ss) +/* Caller must have logged. Must be last thing in calling function, + * as it may make the callback. Precondition: Attached or Detaching. */ { EGC_GC; - spawn_cleanup(gc, ss); - ss->failure_cb(egc, ss); /* must be last; callback may do anything to ss */ + ss->failed = 1; + spawn_detach(gc, ss); } static void spawn_timeout(libxl__egc *egc, libxl__ev_time *ev, const struct timeval *requested_abs) { - /* Before event, was Active; is now Partial. */ + /* Before event, was Attached. */ EGC_GC; libxl__spawn_state *ss = CONTAINER_OF(ev, *ss, timeout); LOG(ERROR, "%s: startup timed out", ss->what); - spawn_failed(egc, ss); /* must be last */ + spawn_fail(egc, ss); /* must be last */ } static void spawn_watch_event(libxl__egc *egc, libxl__ev_xswatch *xsw, const char *watch_path, const char *event_path) { - /* On entry, is Active. */ + /* On entry, is Attached. */ EGC_GC; libxl__spawn_state *ss = CONTAINER_OF(xsw, *ss, xswatch); char *p = libxl__xs_read(gc, 0, ss->xspath); if (!p && errno != ENOENT) { LOG(ERROR, "%s: xenstore read of %s failed", ss->what, ss->xspath); - spawn_failed(egc, ss); /* must be last */ + spawn_fail(egc, ss); /* must be last */ return; } ss->confirm_cb(egc, ss, p); /* must be last */ @@ -399,20 +414,22 @@ static void spawn_watch_event(libxl__egc static void spawn_middle_death(libxl__egc *egc, libxl__ev_child *childw, pid_t pid, int status) - /* Before event, was Active or Detached; - * is now Active or Detached except that ssd->mid is Idle */ + /* On entry, is Attached or Detaching */ { EGC_GC; - libxl__spawn_state_detachable *ssd = CONTAINER_OF(childw, *ssd, mid); - libxl__spawn_state *ss = ssd->ss; + libxl__spawn_state *ss = CONTAINER_OF(childw, *ss, mid); - if (!WIFEXITED(status)) { + if ((ss->failed || ss->detaching) && + ((WIFEXITED(status) && WEXITSTATUS(status)==0) || + (WIFSIGNALED(status) && WTERMSIG(status)==SIGKILL))) { + /* as expected */ + } else if (!WIFEXITED(status)) { + int loglevel = ss->detaching ? XTL_WARN : XTL_ERROR; const char *what = - GCSPRINTF("%s intermediate process (startup monitor)", - ss ? ss->what : "(detached)"); - int loglevel = ss ? XTL_ERROR : XTL_WARN; + GCSPRINTF("%s intermediate process (startup monitor)", ss->what); libxl_report_child_exitstatus(CTX, loglevel, what, pid, status); - } else if (ss) { /* otherwise it was supposed to be a daemon by now */ + ss->failed = 1; + } else { if (!status) LOG(ERROR, "%s [%ld]: unexpectedly exited with exit status 0," " when we were waiting for it to confirm startup", @@ -430,15 +447,22 @@ static void spawn_middle_death(libxl__eg LOG(ERROR, "%s [%ld]: died during startup due to unknown fatal" " signal number %d", ss->what, (unsigned long)pid, sig); } - ss->ssd = 0; /* detatch the ssd to make the ss be in state Partial */ - spawn_failed(egc, ss); /* must be last use of ss */ + ss->failed = 1; } - free(ssd); -} -void libxl__spawn_detach(libxl__gc *gc, libxl__spawn_state *ss) -{ spawn_cleanup(gc, ss); + + if (ss->failed && !ss->detaching) { + ss->failure_cb(egc, ss); /* must be last */ + return; + } + + if (ss->failed && ss->detaching) + LOG(WARN,"%s underlying machinery seemed to fail," + " but its function seems to have been successful", ss->what); + + assert(ss->detaching); + ss->detached_cb(egc, ss); } /* diff -r 470770c73af9 -r 52be3b1ae4f0 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Thu Jun 28 18:43:27 2012 +0100 +++ b/tools/libxl/libxl_internal.h Thu Jun 28 18:43:27 2012 +0100 @@ -690,8 +690,7 @@ static inline int libxl__ev_xswatch_isre * the libxl event machinery. * * The parent may signal the child but it must not reap it. That will - * be done by the event machinery. death may be NULL in which case - * the child is still reaped but its death is ignored. + * be done by the event machinery. * * It is not possible to "deregister" the child death event source. * It will generate exactly one event callback; until then the childw @@ -998,8 +997,8 @@ _hidden int libxl__device_pci_destroy_al * * Higher-level double-fork and separate detach eg as for device models * - * Each libxl__spawn_state is in one of the conventional states - * Undefined, Idle, Active + * Each libxl__spawn_state is in one of these states + * Undefined, Idle, Attached, Detaching */ typedef struct libxl__obsolete_spawn_starting libxl__spawn_starting; @@ -1040,15 +1039,15 @@ _hidden void libxl__spawn_init(libxl__sp * intermediate or final child; an error message will have been * logged. * - * confirm_cb and failure_cb will not be called reentrantly from - * within libxl__spawn_spawn. + * confirm_cb, failure_cb and detached_cb will not be called + * reentrantly from within libxl__spawn_spawn. * * what: string describing the spawned process, used for logging * * Logs errors. A copy of "what" is taken. * Return values: * < 0 error, *spawn is now Idle and need not be detached - * +1 caller is the parent, *spawn is Active and must eventually be detached + * +1 caller is the parent, *spawn is Attached and must be detached * 0 caller is now the inner child, should probably call libxl__exec * * The spawn state must be Undefined or Idle on entry. @@ -1056,12 +1055,15 @@ _hidden void libxl__spawn_init(libxl__sp _hidden int libxl__spawn_spawn(libxl__egc *egc, libxl__spawn_state *spawn); /* - * libxl__spawn_detach - Detaches the daemonic child. + * libxl__spawn_request_detach - Detaches the daemonic child. * * Works by killing the intermediate process from spawn_spawn. * After this function returns, failures of either child are no * longer reported via failure_cb. * + * This is not synchronous: there will be a further callback when + * the detach is complete. + * * If called before the inner child has been created, this may prevent * it from running at all. Thus this should be called only when the * inner child has notified that it is ready. Normally it will be @@ -1069,10 +1071,10 @@ _hidden int libxl__spawn_spawn(libxl__eg * * Logs errors. * - * The spawn state must be Active or Idle on entry and will be Idle + * The spawn state must be Attached entry and will be Detaching * on return. */ -_hidden void libxl__spawn_detach(libxl__gc *gc, libxl__spawn_state*); +_hidden void libxl__spawn_initiate_detach(libxl__gc *gc, libxl__spawn_state*); /* * If successful, this should return 0. @@ -1109,15 +1111,11 @@ typedef void libxl__spawn_failure_cb(lib typedef void libxl__spawn_confirm_cb(libxl__egc*, libxl__spawn_state*, const char *xsdata); -typedef struct { - /* Private to the spawn implementation. - */ - /* This separate struct, from malloc, allows us to "detach" - * the child and reap it later, when our user has gone - * away and freed its libxl__spawn_state */ - struct libxl__spawn_state *ss; - libxl__ev_child mid; -} libxl__spawn_state_detachable; +/* + * Called when the detach (requested by libxl__spawn_initiate_detach) has + * completed. On entry to the callback the spawn state is Idle. + */ +typedef void libxl__spawn_detached_cb(libxl__egc*, libxl__spawn_state*); struct libxl__spawn_state { /* must be filled in by user and remain valid */ @@ -1129,15 +1127,18 @@ struct libxl__spawn_state { libxl__spawn_midproc_cb *midproc_cb; libxl__spawn_failure_cb *failure_cb; libxl__spawn_confirm_cb *confirm_cb; + libxl__spawn_detached_cb *detached_cb; /* remaining fields are private to libxl_spawn_... */ + int detaching; /* we are in Detaching */ + int failed; /* might be true whenever we are not Idle */ + libxl__ev_child mid; /* always in use whenever we are not Idle */ libxl__ev_time timeout; libxl__ev_xswatch xswatch; - libxl__spawn_state_detachable *ssd; }; static inline int libxl__spawn_inuse(libxl__spawn_state *ss) - { return !!ss->ssd; } + { return libxl__ev_child_inuse(&ss->mid); } /* * libxl_spawner_record_pid - Record given pid in xenstore _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:39 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwE-0005En-OY; Wed, 04 Jul 2012 04:11:38 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwB-00051U-I9 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:35 +0000 Received: from [85.158.143.35:38838] by server-3.bemta-4.messagelabs.com id 0A/E6-05808-772C3FF4; Wed, 04 Jul 2012 04:11:35 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-21.messagelabs.com!1341375093!4319322!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19647 invoked from network); 4 Jul 2012 04:11:34 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw9-0002kX-JI for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGw9-0003yB-Ft for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:33 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:33 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xl: Clarify 'xend is running' error message X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User George Dunlap # Date 1340987810 -3600 # Node ID 165eb54e57c0b14c211fda12fb53c80490aae32c # Parent 08930e14bc97a6da52ac6115d5755f07ef684c9e xl: Clarify 'xend is running' error message * Give reason for check (unpredictable results) * Give a better recommendation (shut down xend) * Make it clear that -f is overriding a safety check. Signed-off-by: George Dunlap Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 08930e14bc97 -r 165eb54e57c0 tools/libxl/xl.c --- a/tools/libxl/xl.c Fri Jun 29 17:32:20 2012 +0100 +++ b/tools/libxl/xl.c Fri Jun 29 17:36:50 2012 +0100 @@ -251,9 +251,9 @@ int main(int argc, char **argv) for (int i = 0; i < sizeof(locks)/sizeof(locks[0]); i++) { if (!access(locks[i], F_OK) && !force_execution) { fprintf(stderr, -"xend is running, which prevents xl from working correctly.\n" -"If you still want to force the execution of xl please use the -f\n" -"option.\n" +"xend is running, which may cause unpredictable results when using\n" +"this xl command. Please shut down xend before continuing.\n\n" +"(This check can be overridden with the -f option.)\n" ); ret = 1; goto xit; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:39 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwE-0005En-OY; Wed, 04 Jul 2012 04:11:38 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwB-00051U-I9 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:35 +0000 Received: from [85.158.143.35:38838] by server-3.bemta-4.messagelabs.com id 0A/E6-05808-772C3FF4; Wed, 04 Jul 2012 04:11:35 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-21.messagelabs.com!1341375093!4319322!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19647 invoked from network); 4 Jul 2012 04:11:34 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw9-0002kX-JI for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGw9-0003yB-Ft for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:33 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:33 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xl: Clarify 'xend is running' error message X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User George Dunlap # Date 1340987810 -3600 # Node ID 165eb54e57c0b14c211fda12fb53c80490aae32c # Parent 08930e14bc97a6da52ac6115d5755f07ef684c9e xl: Clarify 'xend is running' error message * Give reason for check (unpredictable results) * Give a better recommendation (shut down xend) * Make it clear that -f is overriding a safety check. Signed-off-by: George Dunlap Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 08930e14bc97 -r 165eb54e57c0 tools/libxl/xl.c --- a/tools/libxl/xl.c Fri Jun 29 17:32:20 2012 +0100 +++ b/tools/libxl/xl.c Fri Jun 29 17:36:50 2012 +0100 @@ -251,9 +251,9 @@ int main(int argc, char **argv) for (int i = 0; i < sizeof(locks)/sizeof(locks[0]); i++) { if (!access(locks[i], F_OK) && !force_execution) { fprintf(stderr, -"xend is running, which prevents xl from working correctly.\n" -"If you still want to force the execution of xl please use the -f\n" -"option.\n" +"xend is running, which may cause unpredictable results when using\n" +"this xl command. Please shut down xend before continuing.\n\n" +"(This check can be overridden with the -f option.)\n" ); ret = 1; goto xit; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:39 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwF-0005Fo-0l; Wed, 04 Jul 2012 04:11:39 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwB-00056z-Ox for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:36 +0000 Received: from [85.158.139.83:47080] by server-7.bemta-5.messagelabs.com id 49/5A-28276-772C3FF4; Wed, 04 Jul 2012 04:11:35 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-11.tower-182.messagelabs.com!1341375093!23629985!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.3 required=7.0 tests=MAILTO_TO_SPAM_ADDR X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27389 invoked from network); 4 Jul 2012 04:11:34 -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; 4 Jul 2012 04:11:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw9-0002kO-0H for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGw8-0003xv-VZ for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:32 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:32 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: refactor stdvga opinon support. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Zhou Peng # Date 1340987540 -3600 # Node ID 08930e14bc97a6da52ac6115d5755f07ef684c9e # Parent fb5ef18e57343a81130c8ef6442f7bb947762122 libxl: refactor stdvga opinon support. Be ready to add and describe new vga interface Signed-off-by: Zhou Peng Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r fb5ef18e5734 -r 08930e14bc97 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Fri Jun 29 17:03:59 2012 +0100 +++ b/tools/libxl/libxl_create.c Fri Jun 29 17:32:20 2012 +0100 @@ -253,7 +253,8 @@ int libxl__domain_build_info_setdefault( if (!b_info->u.hvm.boot) return ERROR_NOMEM; } - libxl_defbool_setdefault(&b_info->u.hvm.stdvga, false); + if (!b_info->u.hvm.vga.kind) + b_info->u.hvm.vga.kind = LIBXL_VGA_INTERFACE_TYPE_CIRRUS; libxl_defbool_setdefault(&b_info->u.hvm.vnc.enable, true); if (libxl_defbool_val(b_info->u.hvm.vnc.enable)) { libxl_defbool_setdefault(&b_info->u.hvm.vnc.findunused, true); diff -r fb5ef18e5734 -r 08930e14bc97 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Fri Jun 29 17:03:59 2012 +0100 +++ b/tools/libxl/libxl_dm.c Fri Jun 29 17:32:20 2012 +0100 @@ -177,8 +177,13 @@ static char ** libxl__build_device_model libxl__sizekb_to_mb(b_info->video_memkb)), NULL); } - if (libxl_defbool_val(b_info->u.hvm.stdvga)) { + + switch (b_info->u.hvm.vga.kind) { + case LIBXL_VGA_INTERFACE_TYPE_STD: flexarray_append(dm_args, "-std-vga"); + break; + case LIBXL_VGA_INTERFACE_TYPE_CIRRUS: + break; } if (b_info->u.hvm.boot) { @@ -424,8 +429,13 @@ static char ** libxl__build_device_model flexarray_append(dm_args, spiceoptions); } - if (libxl_defbool_val(b_info->u.hvm.stdvga)) { - flexarray_vappend(dm_args, "-vga", "std", NULL); + switch (b_info->u.hvm.vga.kind) { + case LIBXL_VGA_INTERFACE_TYPE_STD: + flexarray_vappend(dm_args, "-vga", "std", NULL); + break; + case LIBXL_VGA_INTERFACE_TYPE_CIRRUS: + flexarray_vappend(dm_args, "-vga", "cirrus", NULL); + break; } if (b_info->u.hvm.boot) { diff -r fb5ef18e5734 -r 08930e14bc97 tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Fri Jun 29 17:03:59 2012 +0100 +++ b/tools/libxl/libxl_types.idl Fri Jun 29 17:32:20 2012 +0100 @@ -126,9 +126,19 @@ libxl_shutdown_reason = Enumeration("shu (4, "watchdog"), ]) +libxl_vga_interface_type = Enumeration("vga_interface_type", [ + (1, "CIRRUS"), + (2, "STD"), + ], init_val = 0) + # # Complex libxl types # + +libxl_vga_interface_info = Struct("vga_interface_info", [ + ("kind", libxl_vga_interface_type), + ]) + libxl_vnc_info = Struct("vnc_info", [ ("enable", libxl_defbool), # "address:port" that should be listened on @@ -282,7 +292,7 @@ libxl_domain_build_info = Struct("domain ("nested_hvm", libxl_defbool), ("incr_generationid",libxl_defbool), ("nographic", libxl_defbool), - ("stdvga", libxl_defbool), + ("vga", libxl_vga_interface_info), ("vnc", libxl_vnc_info), # keyboard layout, default is en-us keyboard ("keymap", string), diff -r fb5ef18e5734 -r 08930e14bc97 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Fri Jun 29 17:03:59 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Fri Jun 29 17:32:20 2012 +0100 @@ -1264,7 +1264,10 @@ skip_vfb: #undef parse_extra_args if (c_info->type == LIBXL_DOMAIN_TYPE_HVM) { - xlu_cfg_get_defbool(config, "stdvga", &b_info->u.hvm.stdvga, 0); + if (!xlu_cfg_get_long(config, "stdvga", &l, 0)) + b_info->u.hvm.vga.kind = l ? LIBXL_VGA_INTERFACE_TYPE_STD : + LIBXL_VGA_INTERFACE_TYPE_CIRRUS; + xlu_cfg_get_defbool(config, "vnc", &b_info->u.hvm.vnc.enable, 0); xlu_cfg_replace_string (config, "vnclisten", &b_info->u.hvm.vnc.listen, 0); diff -r fb5ef18e5734 -r 08930e14bc97 tools/libxl/xl_sxp.c --- a/tools/libxl/xl_sxp.c Fri Jun 29 17:03:59 2012 +0100 +++ b/tools/libxl/xl_sxp.c Fri Jun 29 17:32:20 2012 +0100 @@ -110,8 +110,9 @@ void printf_info_sexp(int domid, libxl_d libxl_defbool_to_string(b_info->u.hvm.nested_hvm)); printf("\t\t\t(no_incr_generationid %s)\n", libxl_defbool_to_string(b_info->u.hvm.incr_generationid)); - printf("\t\t\t(stdvga %s)\n", - libxl_defbool_to_string(b_info->u.hvm.stdvga)); + printf("\t\t\t(stdvga %s)\n", b_info->u.hvm.vga.kind == + LIBXL_VGA_INTERFACE_TYPE_STD ? + "True" : "False"); printf("\t\t\t(vnc %s)\n", libxl_defbool_to_string(b_info->u.hvm.vnc.enable)); printf("\t\t\t(vnclisten %s)\n", b_info->u.hvm.vnc.listen); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:39 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwF-0005Fo-0l; Wed, 04 Jul 2012 04:11:39 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwB-00056z-Ox for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:36 +0000 Received: from [85.158.139.83:47080] by server-7.bemta-5.messagelabs.com id 49/5A-28276-772C3FF4; Wed, 04 Jul 2012 04:11:35 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-11.tower-182.messagelabs.com!1341375093!23629985!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.3 required=7.0 tests=MAILTO_TO_SPAM_ADDR X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27389 invoked from network); 4 Jul 2012 04:11:34 -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; 4 Jul 2012 04:11:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw9-0002kO-0H for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGw8-0003xv-VZ for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:32 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:32 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: refactor stdvga opinon support. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Zhou Peng # Date 1340987540 -3600 # Node ID 08930e14bc97a6da52ac6115d5755f07ef684c9e # Parent fb5ef18e57343a81130c8ef6442f7bb947762122 libxl: refactor stdvga opinon support. Be ready to add and describe new vga interface Signed-off-by: Zhou Peng Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r fb5ef18e5734 -r 08930e14bc97 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Fri Jun 29 17:03:59 2012 +0100 +++ b/tools/libxl/libxl_create.c Fri Jun 29 17:32:20 2012 +0100 @@ -253,7 +253,8 @@ int libxl__domain_build_info_setdefault( if (!b_info->u.hvm.boot) return ERROR_NOMEM; } - libxl_defbool_setdefault(&b_info->u.hvm.stdvga, false); + if (!b_info->u.hvm.vga.kind) + b_info->u.hvm.vga.kind = LIBXL_VGA_INTERFACE_TYPE_CIRRUS; libxl_defbool_setdefault(&b_info->u.hvm.vnc.enable, true); if (libxl_defbool_val(b_info->u.hvm.vnc.enable)) { libxl_defbool_setdefault(&b_info->u.hvm.vnc.findunused, true); diff -r fb5ef18e5734 -r 08930e14bc97 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Fri Jun 29 17:03:59 2012 +0100 +++ b/tools/libxl/libxl_dm.c Fri Jun 29 17:32:20 2012 +0100 @@ -177,8 +177,13 @@ static char ** libxl__build_device_model libxl__sizekb_to_mb(b_info->video_memkb)), NULL); } - if (libxl_defbool_val(b_info->u.hvm.stdvga)) { + + switch (b_info->u.hvm.vga.kind) { + case LIBXL_VGA_INTERFACE_TYPE_STD: flexarray_append(dm_args, "-std-vga"); + break; + case LIBXL_VGA_INTERFACE_TYPE_CIRRUS: + break; } if (b_info->u.hvm.boot) { @@ -424,8 +429,13 @@ static char ** libxl__build_device_model flexarray_append(dm_args, spiceoptions); } - if (libxl_defbool_val(b_info->u.hvm.stdvga)) { - flexarray_vappend(dm_args, "-vga", "std", NULL); + switch (b_info->u.hvm.vga.kind) { + case LIBXL_VGA_INTERFACE_TYPE_STD: + flexarray_vappend(dm_args, "-vga", "std", NULL); + break; + case LIBXL_VGA_INTERFACE_TYPE_CIRRUS: + flexarray_vappend(dm_args, "-vga", "cirrus", NULL); + break; } if (b_info->u.hvm.boot) { diff -r fb5ef18e5734 -r 08930e14bc97 tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Fri Jun 29 17:03:59 2012 +0100 +++ b/tools/libxl/libxl_types.idl Fri Jun 29 17:32:20 2012 +0100 @@ -126,9 +126,19 @@ libxl_shutdown_reason = Enumeration("shu (4, "watchdog"), ]) +libxl_vga_interface_type = Enumeration("vga_interface_type", [ + (1, "CIRRUS"), + (2, "STD"), + ], init_val = 0) + # # Complex libxl types # + +libxl_vga_interface_info = Struct("vga_interface_info", [ + ("kind", libxl_vga_interface_type), + ]) + libxl_vnc_info = Struct("vnc_info", [ ("enable", libxl_defbool), # "address:port" that should be listened on @@ -282,7 +292,7 @@ libxl_domain_build_info = Struct("domain ("nested_hvm", libxl_defbool), ("incr_generationid",libxl_defbool), ("nographic", libxl_defbool), - ("stdvga", libxl_defbool), + ("vga", libxl_vga_interface_info), ("vnc", libxl_vnc_info), # keyboard layout, default is en-us keyboard ("keymap", string), diff -r fb5ef18e5734 -r 08930e14bc97 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Fri Jun 29 17:03:59 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Fri Jun 29 17:32:20 2012 +0100 @@ -1264,7 +1264,10 @@ skip_vfb: #undef parse_extra_args if (c_info->type == LIBXL_DOMAIN_TYPE_HVM) { - xlu_cfg_get_defbool(config, "stdvga", &b_info->u.hvm.stdvga, 0); + if (!xlu_cfg_get_long(config, "stdvga", &l, 0)) + b_info->u.hvm.vga.kind = l ? LIBXL_VGA_INTERFACE_TYPE_STD : + LIBXL_VGA_INTERFACE_TYPE_CIRRUS; + xlu_cfg_get_defbool(config, "vnc", &b_info->u.hvm.vnc.enable, 0); xlu_cfg_replace_string (config, "vnclisten", &b_info->u.hvm.vnc.listen, 0); diff -r fb5ef18e5734 -r 08930e14bc97 tools/libxl/xl_sxp.c --- a/tools/libxl/xl_sxp.c Fri Jun 29 17:03:59 2012 +0100 +++ b/tools/libxl/xl_sxp.c Fri Jun 29 17:32:20 2012 +0100 @@ -110,8 +110,9 @@ void printf_info_sexp(int domid, libxl_d libxl_defbool_to_string(b_info->u.hvm.nested_hvm)); printf("\t\t\t(no_incr_generationid %s)\n", libxl_defbool_to_string(b_info->u.hvm.incr_generationid)); - printf("\t\t\t(stdvga %s)\n", - libxl_defbool_to_string(b_info->u.hvm.stdvga)); + printf("\t\t\t(stdvga %s)\n", b_info->u.hvm.vga.kind == + LIBXL_VGA_INTERFACE_TYPE_STD ? + "True" : "False"); printf("\t\t\t(vnc %s)\n", libxl_defbool_to_string(b_info->u.hvm.vnc.enable)); printf("\t\t\t(vnclisten %s)\n", b_info->u.hvm.vnc.listen); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:39 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwF-0005Gk-Br; Wed, 04 Jul 2012 04:11:39 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwD-0004zS-48 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:37 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-27.messagelabs.com!1341375089!4257787!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5923 invoked from network); 4 Jul 2012 04:11:30 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw5-0002jf-Bm for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGw5-0003wA-An for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:29 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:28 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xl: rename "list-vm" command to "vm-list" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Matt Wilson # Date 1340980947 -3600 # Node ID 675b3d693971d3db3cb676e032291c3f9321b46e # Parent 2bc19ad5039e146252a7225d62952932e68fee5a xl: rename "list-vm" command to "vm-list" All of the other "list" verbs are of the form "$noun-list". For example: "pci-list", "vcpu-list", "network-list", "block-list", etc. Additionally, many people have well trained muscle memory from years of typing "xm li". "xl li" was ambiguous due to "xl list-vm", thus resulting in "command not implemented". Finally, this command was missing from the xl man page. Signed-off-by: Matt Wilson Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 2bc19ad5039e -r 675b3d693971 docs/man/xl.pod.1 --- a/docs/man/xl.pod.1 Thu Jun 28 16:57:26 2012 +0100 +++ b/docs/man/xl.pod.1 Fri Jun 29 15:42:27 2012 +0100 @@ -617,6 +617,19 @@ different run state is appropriate. Pin this, by ensuring certain VCPUs can only run on certain physical CPUs. +=item B + +Prints information about guests. This list excludes information about +service or auxiliary domains such as dom0 and stubdoms. + +B + +An example format for the list is as follows: + +UUID ID name +59e1cf6c-6ab9-4879-90e7-adc8d1c63bf5 2 win +50bc8f75-81d0-4d53-b2e6-95cb44e2682e 3 linux + =item B [I] I Attach to domain's VNC server, forking a vncviewer process. diff -r 2bc19ad5039e -r 675b3d693971 tools/libxl/xl.h --- a/tools/libxl/xl.h Thu Jun 28 16:57:26 2012 +0100 +++ b/tools/libxl/xl.h Fri Jun 29 15:42:27 2012 +0100 @@ -54,7 +54,7 @@ int main_destroy(int argc, char **argv); int main_shutdown(int argc, char **argv); int main_reboot(int argc, char **argv); int main_list(int argc, char **argv); -int main_list_vm(int argc, char **argv); +int main_vm_list(int argc, char **argv); int main_create(int argc, char **argv); int main_config_update(int argc, char **argv); int main_button_press(int argc, char **argv); diff -r 2bc19ad5039e -r 675b3d693971 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Thu Jun 28 16:57:26 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Fri Jun 29 15:42:27 2012 +0100 @@ -3629,11 +3629,11 @@ int main_list(int argc, char **argv) return 0; } -int main_list_vm(int argc, char **argv) +int main_vm_list(int argc, char **argv) { int opt; - if ((opt = def_getopt(argc, argv, "", "list-vm", 0)) != -1) + if ((opt = def_getopt(argc, argv, "", "vm-list", 0)) != -1) return opt; list_vm(); diff -r 2bc19ad5039e -r 675b3d693971 tools/libxl/xl_cmdtable.c --- a/tools/libxl/xl_cmdtable.c Thu Jun 28 16:57:26 2012 +0100 +++ b/tools/libxl/xl_cmdtable.c Fri Jun 29 15:42:27 2012 +0100 @@ -214,9 +214,9 @@ struct cmd_spec cmd_table[] = { "Set the number of active VCPUs allowed for the domain", " ", }, - { "list-vm", - &main_list_vm, 0, 0, - "List the VMs,without DOM0", + { "vm-list", + &main_vm_list, 0, 0, + "List guest domains, excluding dom0, stubdoms, etc.", "", }, { "info", _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:39 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwF-0005Gk-Br; Wed, 04 Jul 2012 04:11:39 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwD-0004zS-48 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:37 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-27.messagelabs.com!1341375089!4257787!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5923 invoked from network); 4 Jul 2012 04:11:30 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw5-0002jf-Bm for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGw5-0003wA-An for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:29 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:28 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xl: rename "list-vm" command to "vm-list" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Matt Wilson # Date 1340980947 -3600 # Node ID 675b3d693971d3db3cb676e032291c3f9321b46e # Parent 2bc19ad5039e146252a7225d62952932e68fee5a xl: rename "list-vm" command to "vm-list" All of the other "list" verbs are of the form "$noun-list". For example: "pci-list", "vcpu-list", "network-list", "block-list", etc. Additionally, many people have well trained muscle memory from years of typing "xm li". "xl li" was ambiguous due to "xl list-vm", thus resulting in "command not implemented". Finally, this command was missing from the xl man page. Signed-off-by: Matt Wilson Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 2bc19ad5039e -r 675b3d693971 docs/man/xl.pod.1 --- a/docs/man/xl.pod.1 Thu Jun 28 16:57:26 2012 +0100 +++ b/docs/man/xl.pod.1 Fri Jun 29 15:42:27 2012 +0100 @@ -617,6 +617,19 @@ different run state is appropriate. Pin this, by ensuring certain VCPUs can only run on certain physical CPUs. +=item B + +Prints information about guests. This list excludes information about +service or auxiliary domains such as dom0 and stubdoms. + +B + +An example format for the list is as follows: + +UUID ID name +59e1cf6c-6ab9-4879-90e7-adc8d1c63bf5 2 win +50bc8f75-81d0-4d53-b2e6-95cb44e2682e 3 linux + =item B [I] I Attach to domain's VNC server, forking a vncviewer process. diff -r 2bc19ad5039e -r 675b3d693971 tools/libxl/xl.h --- a/tools/libxl/xl.h Thu Jun 28 16:57:26 2012 +0100 +++ b/tools/libxl/xl.h Fri Jun 29 15:42:27 2012 +0100 @@ -54,7 +54,7 @@ int main_destroy(int argc, char **argv); int main_shutdown(int argc, char **argv); int main_reboot(int argc, char **argv); int main_list(int argc, char **argv); -int main_list_vm(int argc, char **argv); +int main_vm_list(int argc, char **argv); int main_create(int argc, char **argv); int main_config_update(int argc, char **argv); int main_button_press(int argc, char **argv); diff -r 2bc19ad5039e -r 675b3d693971 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Thu Jun 28 16:57:26 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Fri Jun 29 15:42:27 2012 +0100 @@ -3629,11 +3629,11 @@ int main_list(int argc, char **argv) return 0; } -int main_list_vm(int argc, char **argv) +int main_vm_list(int argc, char **argv) { int opt; - if ((opt = def_getopt(argc, argv, "", "list-vm", 0)) != -1) + if ((opt = def_getopt(argc, argv, "", "vm-list", 0)) != -1) return opt; list_vm(); diff -r 2bc19ad5039e -r 675b3d693971 tools/libxl/xl_cmdtable.c --- a/tools/libxl/xl_cmdtable.c Thu Jun 28 16:57:26 2012 +0100 +++ b/tools/libxl/xl_cmdtable.c Fri Jun 29 15:42:27 2012 +0100 @@ -214,9 +214,9 @@ struct cmd_spec cmd_table[] = { "Set the number of active VCPUs allowed for the domain", " ", }, - { "list-vm", - &main_list_vm, 0, 0, - "List the VMs,without DOM0", + { "vm-list", + &main_vm_list, 0, 0, + "List guest domains, excluding dom0, stubdoms, etc.", "", }, { "info", _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:41 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwG-0005Kb-Vn; Wed, 04 Jul 2012 04:11:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwE-0005Ch-9N for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:38 +0000 Received: from [85.158.139.83:47181] by server-12.bemta-5.messagelabs.com id 0E/AB-25233-972C3FF4; Wed, 04 Jul 2012 04:11:37 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-182.messagelabs.com!1341375095!25704359!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22235 invoked from network); 4 Jul 2012 04:11:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwB-0002ko-JR for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGwB-0003zC-IN for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:35 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:35 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: allow p2m to be created with specific MATTR. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341309140 -3600 # Node ID a37ff29c027bf5de013eaf8033629cb69ed5836c # Parent 52942b34a1705723669cad5e9abd7f8883077ac4 arm: allow p2m to be created with specific MATTR. Rename p2m_create_entry to p2m_create_table since it can now only be used to insert non-leaf entries into the page table. Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini Committed-by: Ian Campbell --- diff -r 52942b34a170 -r a37ff29c027b xen/arch/arm/p2m.c --- a/xen/arch/arm/p2m.c Tue Jul 03 09:48:28 2012 +0200 +++ b/xen/arch/arm/p2m.c Tue Jul 03 10:52:20 2012 +0100 @@ -91,7 +91,8 @@ int p2m_pod_decrease_reservation(struct return -ENOSYS; } -static int p2m_create_entry(struct domain *d, +/* Allocate a new page table page and hook it in via the given entry */ +static int p2m_create_table(struct domain *d, lpae_t *entry) { struct p2m_domain *p2m = &d->arch.p2m; @@ -111,7 +112,7 @@ static int p2m_create_entry(struct domai clear_page(p); unmap_domain_page(p); - pte = mfn_to_p2m_entry(page_to_mfn(page)); + pte = mfn_to_p2m_entry(page_to_mfn(page), MATTR_MEM); write_pte(entry, pte); @@ -122,7 +123,8 @@ static int create_p2m_entries(struct dom int alloc, paddr_t start_gpaddr, paddr_t end_gpaddr, - paddr_t maddr) + paddr_t maddr, + int mattr) { int rc; struct p2m_domain *p2m = &d->arch.p2m; @@ -142,7 +144,7 @@ static int create_p2m_entries(struct dom { if ( !first[first_table_offset(addr)].p2m.valid ) { - rc = p2m_create_entry(d, &first[first_table_offset(addr)]); + rc = p2m_create_table(d, &first[first_table_offset(addr)]); if ( rc < 0 ) { printk("p2m_populate_ram: L1 failed\n"); goto out; @@ -161,7 +163,7 @@ static int create_p2m_entries(struct dom if ( !second[second_table_offset(addr)].p2m.valid ) { - rc = p2m_create_entry(d, &second[second_table_offset(addr)]); + rc = p2m_create_table(d, &second[second_table_offset(addr)]); if ( rc < 0 ) { printk("p2m_populate_ram: L2 failed\n"); goto out; @@ -200,11 +202,11 @@ static int create_p2m_entries(struct dom goto out; } - pte = mfn_to_p2m_entry(page_to_mfn(page)); + pte = mfn_to_p2m_entry(page_to_mfn(page), mattr); write_pte(&third[third_table_offset(addr)], pte); } else { - lpae_t pte = mfn_to_p2m_entry(maddr >> PAGE_SHIFT); + lpae_t pte = mfn_to_p2m_entry(maddr >> PAGE_SHIFT, mattr); write_pte(&third[third_table_offset(addr)], pte); maddr += PAGE_SIZE; } @@ -226,7 +228,7 @@ int p2m_populate_ram(struct domain *d, paddr_t start, paddr_t end) { - return create_p2m_entries(d, 1, start, end, 0); + return create_p2m_entries(d, 1, start, end, 0, MATTR_MEM); } int map_mmio_regions(struct domain *d, @@ -234,7 +236,7 @@ int map_mmio_regions(struct domain *d, paddr_t end_gaddr, paddr_t maddr) { - return create_p2m_entries(d, 0, start_gaddr, end_gaddr, maddr); + return create_p2m_entries(d, 0, start_gaddr, end_gaddr, maddr, MATTR_DEV); } int guest_physmap_add_page(struct domain *d, @@ -244,7 +246,7 @@ int guest_physmap_add_page(struct domain { return create_p2m_entries(d, 0, gpfn << PAGE_SHIFT, (gpfn + (1< Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwG-0005Kb-Vn; Wed, 04 Jul 2012 04:11:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwE-0005Ch-9N for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:38 +0000 Received: from [85.158.139.83:47181] by server-12.bemta-5.messagelabs.com id 0E/AB-25233-972C3FF4; Wed, 04 Jul 2012 04:11:37 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-182.messagelabs.com!1341375095!25704359!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22235 invoked from network); 4 Jul 2012 04:11:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwB-0002ko-JR for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGwB-0003zC-IN for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:35 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:35 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: allow p2m to be created with specific MATTR. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341309140 -3600 # Node ID a37ff29c027bf5de013eaf8033629cb69ed5836c # Parent 52942b34a1705723669cad5e9abd7f8883077ac4 arm: allow p2m to be created with specific MATTR. Rename p2m_create_entry to p2m_create_table since it can now only be used to insert non-leaf entries into the page table. Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini Committed-by: Ian Campbell --- diff -r 52942b34a170 -r a37ff29c027b xen/arch/arm/p2m.c --- a/xen/arch/arm/p2m.c Tue Jul 03 09:48:28 2012 +0200 +++ b/xen/arch/arm/p2m.c Tue Jul 03 10:52:20 2012 +0100 @@ -91,7 +91,8 @@ int p2m_pod_decrease_reservation(struct return -ENOSYS; } -static int p2m_create_entry(struct domain *d, +/* Allocate a new page table page and hook it in via the given entry */ +static int p2m_create_table(struct domain *d, lpae_t *entry) { struct p2m_domain *p2m = &d->arch.p2m; @@ -111,7 +112,7 @@ static int p2m_create_entry(struct domai clear_page(p); unmap_domain_page(p); - pte = mfn_to_p2m_entry(page_to_mfn(page)); + pte = mfn_to_p2m_entry(page_to_mfn(page), MATTR_MEM); write_pte(entry, pte); @@ -122,7 +123,8 @@ static int create_p2m_entries(struct dom int alloc, paddr_t start_gpaddr, paddr_t end_gpaddr, - paddr_t maddr) + paddr_t maddr, + int mattr) { int rc; struct p2m_domain *p2m = &d->arch.p2m; @@ -142,7 +144,7 @@ static int create_p2m_entries(struct dom { if ( !first[first_table_offset(addr)].p2m.valid ) { - rc = p2m_create_entry(d, &first[first_table_offset(addr)]); + rc = p2m_create_table(d, &first[first_table_offset(addr)]); if ( rc < 0 ) { printk("p2m_populate_ram: L1 failed\n"); goto out; @@ -161,7 +163,7 @@ static int create_p2m_entries(struct dom if ( !second[second_table_offset(addr)].p2m.valid ) { - rc = p2m_create_entry(d, &second[second_table_offset(addr)]); + rc = p2m_create_table(d, &second[second_table_offset(addr)]); if ( rc < 0 ) { printk("p2m_populate_ram: L2 failed\n"); goto out; @@ -200,11 +202,11 @@ static int create_p2m_entries(struct dom goto out; } - pte = mfn_to_p2m_entry(page_to_mfn(page)); + pte = mfn_to_p2m_entry(page_to_mfn(page), mattr); write_pte(&third[third_table_offset(addr)], pte); } else { - lpae_t pte = mfn_to_p2m_entry(maddr >> PAGE_SHIFT); + lpae_t pte = mfn_to_p2m_entry(maddr >> PAGE_SHIFT, mattr); write_pte(&third[third_table_offset(addr)], pte); maddr += PAGE_SIZE; } @@ -226,7 +228,7 @@ int p2m_populate_ram(struct domain *d, paddr_t start, paddr_t end) { - return create_p2m_entries(d, 1, start, end, 0); + return create_p2m_entries(d, 1, start, end, 0, MATTR_MEM); } int map_mmio_regions(struct domain *d, @@ -234,7 +236,7 @@ int map_mmio_regions(struct domain *d, paddr_t end_gaddr, paddr_t maddr) { - return create_p2m_entries(d, 0, start_gaddr, end_gaddr, maddr); + return create_p2m_entries(d, 0, start_gaddr, end_gaddr, maddr, MATTR_DEV); } int guest_physmap_add_page(struct domain *d, @@ -244,7 +246,7 @@ int guest_physmap_add_page(struct domain { return create_p2m_entries(d, 0, gpfn << PAGE_SHIFT, (gpfn + (1< Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwH-0005ML-V7; Wed, 04 Jul 2012 04:11:42 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwE-0004uB-RX for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:39 +0000 Received: from [85.158.138.51:39725] by server-10.bemta-3.messagelabs.com id 29/84-01753-A72C3FF4; Wed, 04 Jul 2012 04:11:38 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-174.messagelabs.com!1341375096!30957395!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28589 invoked from network); 4 Jul 2012 04:11:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwC-0002ku-Kn for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGwC-0003zi-Jk for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:36 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:36 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: implement vcpu_show_execution_state X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341309142 -3600 # Node ID 51ad440f9efd92e640cccceed8c7f1c2da9684a9 # Parent f4e7fd47613cf914ea8896c8f11ec3dc6223f6ed arm: implement vcpu_show_execution_state Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini Committed-by: Ian Campbell --- diff -r f4e7fd47613c -r 51ad440f9efd xen/arch/arm/dummy.S --- a/xen/arch/arm/dummy.S Tue Jul 03 10:52:21 2012 +0100 +++ b/xen/arch/arm/dummy.S Tue Jul 03 10:52:22 2012 +0100 @@ -21,7 +21,6 @@ DUMMY(pirq_set_affinity); DUMMY(arch_get_info_guest); DUMMY(arch_vcpu_reset); NOP(update_vcpu_system_time); -DUMMY(vcpu_show_execution_state); /* Page Reference & Type Maintenance */ DUMMY(get_page); diff -r f4e7fd47613c -r 51ad440f9efd xen/arch/arm/traps.c --- a/xen/arch/arm/traps.c Tue Jul 03 10:52:21 2012 +0100 +++ b/xen/arch/arm/traps.c Tue Jul 03 10:52:22 2012 +0100 @@ -170,7 +170,13 @@ void panic_PAR(uint64_t par, const char panic("Error during %s-to-physical address translation\n", when); } -void show_registers(struct cpu_user_regs *regs) +struct reg_ctxt { + uint32_t sctlr; + uint32_t ttbr0, ttbr1, ttbcr; +}; +static void _show_registers(struct cpu_user_regs *regs, + struct reg_ctxt *ctxt, + int guest_mode) { static const char *mode_strings[] = { [PSR_MODE_USR] = "USR", @@ -187,7 +193,7 @@ void show_registers(struct cpu_user_regs print_xen_info(); printk("CPU: %d\n", smp_processor_id()); printk("PC: %08"PRIx32, regs->pc); - if ( !guest_mode(regs) ) + if ( !guest_mode ) print_symbol(" %s", regs->pc); printk("\n"); printk("CPSR: %08"PRIx32" MODE:%s\n", regs->cpsr, @@ -199,7 +205,7 @@ void show_registers(struct cpu_user_regs printk(" R8: %08"PRIx32" R9: %08"PRIx32" R10:%08"PRIx32" R11:%08"PRIx32" R12:%08"PRIx32"\n", regs->r8, regs->r9, regs->r10, regs->r11, regs->r12); - if ( guest_mode(regs) ) + if ( guest_mode ) { printk("USR: SP: %08"PRIx32" LR: %08"PRIx32" CPSR:%08"PRIx32"\n", regs->sp_usr, regs->lr_usr, regs->cpsr); @@ -217,8 +223,8 @@ void show_registers(struct cpu_user_regs regs->r8_fiq, regs->r9_fiq, regs->r10_fiq, regs->r11_fiq, regs->r11_fiq); printk("\n"); printk("TTBR0 %08"PRIx32" TTBR1 %08"PRIx32" TTBCR %08"PRIx32"\n", - READ_CP32(TTBR0), READ_CP32(TTBR1), READ_CP32(TTBCR)); - printk("SCTLR %08"PRIx32"\n", READ_CP32(SCTLR)); + ctxt->ttbr0, ctxt->ttbr1, ctxt->ttbcr); + printk("SCTLR %08"PRIx32"\n", ctxt->sctlr); printk("VTTBR %010"PRIx64"\n", READ_CP64(VTTBR)); printk("\n"); } @@ -241,6 +247,26 @@ void show_registers(struct cpu_user_regs printk("\n"); } +void show_registers(struct cpu_user_regs *regs) +{ + struct reg_ctxt ctxt; + ctxt.sctlr = READ_CP32(SCTLR); + ctxt.ttbcr = READ_CP32(TTBCR); + ctxt.ttbr0 = READ_CP32(TTBR0); + ctxt.ttbr1 = READ_CP32(TTBR1); + _show_registers(regs, &ctxt, guest_mode(regs)); +} + +void vcpu_show_registers(const struct vcpu *v) +{ + struct reg_ctxt ctxt; + ctxt.sctlr = v->arch.sctlr; + ctxt.ttbcr = v->arch.ttbcr; + ctxt.ttbr0 = v->arch.ttbr0; + ctxt.ttbr1 = v->arch.ttbr1; + _show_registers(&v->arch.cpu_info->guest_cpu_user_regs, &ctxt, 1); +} + static void show_guest_stack(struct cpu_user_regs *regs) { printk("GUEST STACK GOES HERE\n"); @@ -334,6 +360,26 @@ void show_execution_state(struct cpu_use show_stack(regs); } +void vcpu_show_execution_state(struct vcpu *v) +{ + printk("*** Dumping Dom%d vcpu#%d state: ***\n", + v->domain->domain_id, v->vcpu_id); + + if ( v == current ) + { + show_execution_state(guest_cpu_user_regs()); + return; + } + + vcpu_pause(v); /* acceptably dangerous */ + + vcpu_show_registers(v); + if ( !usr_mode(&v->arch.cpu_info->guest_cpu_user_regs) ) + show_guest_stack(&v->arch.cpu_info->guest_cpu_user_regs); + + vcpu_unpause(v); +} + static void do_unexpected_trap(const char *msg, struct cpu_user_regs *regs) { printk("Unexpected Trap: %s\n", msg); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:42 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwH-0005ML-V7; Wed, 04 Jul 2012 04:11:42 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwE-0004uB-RX for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:39 +0000 Received: from [85.158.138.51:39725] by server-10.bemta-3.messagelabs.com id 29/84-01753-A72C3FF4; Wed, 04 Jul 2012 04:11:38 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-174.messagelabs.com!1341375096!30957395!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28589 invoked from network); 4 Jul 2012 04:11:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwC-0002ku-Kn for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGwC-0003zi-Jk for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:36 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:36 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: implement vcpu_show_execution_state X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341309142 -3600 # Node ID 51ad440f9efd92e640cccceed8c7f1c2da9684a9 # Parent f4e7fd47613cf914ea8896c8f11ec3dc6223f6ed arm: implement vcpu_show_execution_state Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini Committed-by: Ian Campbell --- diff -r f4e7fd47613c -r 51ad440f9efd xen/arch/arm/dummy.S --- a/xen/arch/arm/dummy.S Tue Jul 03 10:52:21 2012 +0100 +++ b/xen/arch/arm/dummy.S Tue Jul 03 10:52:22 2012 +0100 @@ -21,7 +21,6 @@ DUMMY(pirq_set_affinity); DUMMY(arch_get_info_guest); DUMMY(arch_vcpu_reset); NOP(update_vcpu_system_time); -DUMMY(vcpu_show_execution_state); /* Page Reference & Type Maintenance */ DUMMY(get_page); diff -r f4e7fd47613c -r 51ad440f9efd xen/arch/arm/traps.c --- a/xen/arch/arm/traps.c Tue Jul 03 10:52:21 2012 +0100 +++ b/xen/arch/arm/traps.c Tue Jul 03 10:52:22 2012 +0100 @@ -170,7 +170,13 @@ void panic_PAR(uint64_t par, const char panic("Error during %s-to-physical address translation\n", when); } -void show_registers(struct cpu_user_regs *regs) +struct reg_ctxt { + uint32_t sctlr; + uint32_t ttbr0, ttbr1, ttbcr; +}; +static void _show_registers(struct cpu_user_regs *regs, + struct reg_ctxt *ctxt, + int guest_mode) { static const char *mode_strings[] = { [PSR_MODE_USR] = "USR", @@ -187,7 +193,7 @@ void show_registers(struct cpu_user_regs print_xen_info(); printk("CPU: %d\n", smp_processor_id()); printk("PC: %08"PRIx32, regs->pc); - if ( !guest_mode(regs) ) + if ( !guest_mode ) print_symbol(" %s", regs->pc); printk("\n"); printk("CPSR: %08"PRIx32" MODE:%s\n", regs->cpsr, @@ -199,7 +205,7 @@ void show_registers(struct cpu_user_regs printk(" R8: %08"PRIx32" R9: %08"PRIx32" R10:%08"PRIx32" R11:%08"PRIx32" R12:%08"PRIx32"\n", regs->r8, regs->r9, regs->r10, regs->r11, regs->r12); - if ( guest_mode(regs) ) + if ( guest_mode ) { printk("USR: SP: %08"PRIx32" LR: %08"PRIx32" CPSR:%08"PRIx32"\n", regs->sp_usr, regs->lr_usr, regs->cpsr); @@ -217,8 +223,8 @@ void show_registers(struct cpu_user_regs regs->r8_fiq, regs->r9_fiq, regs->r10_fiq, regs->r11_fiq, regs->r11_fiq); printk("\n"); printk("TTBR0 %08"PRIx32" TTBR1 %08"PRIx32" TTBCR %08"PRIx32"\n", - READ_CP32(TTBR0), READ_CP32(TTBR1), READ_CP32(TTBCR)); - printk("SCTLR %08"PRIx32"\n", READ_CP32(SCTLR)); + ctxt->ttbr0, ctxt->ttbr1, ctxt->ttbcr); + printk("SCTLR %08"PRIx32"\n", ctxt->sctlr); printk("VTTBR %010"PRIx64"\n", READ_CP64(VTTBR)); printk("\n"); } @@ -241,6 +247,26 @@ void show_registers(struct cpu_user_regs printk("\n"); } +void show_registers(struct cpu_user_regs *regs) +{ + struct reg_ctxt ctxt; + ctxt.sctlr = READ_CP32(SCTLR); + ctxt.ttbcr = READ_CP32(TTBCR); + ctxt.ttbr0 = READ_CP32(TTBR0); + ctxt.ttbr1 = READ_CP32(TTBR1); + _show_registers(regs, &ctxt, guest_mode(regs)); +} + +void vcpu_show_registers(const struct vcpu *v) +{ + struct reg_ctxt ctxt; + ctxt.sctlr = v->arch.sctlr; + ctxt.ttbcr = v->arch.ttbcr; + ctxt.ttbr0 = v->arch.ttbr0; + ctxt.ttbr1 = v->arch.ttbr1; + _show_registers(&v->arch.cpu_info->guest_cpu_user_regs, &ctxt, 1); +} + static void show_guest_stack(struct cpu_user_regs *regs) { printk("GUEST STACK GOES HERE\n"); @@ -334,6 +360,26 @@ void show_execution_state(struct cpu_use show_stack(regs); } +void vcpu_show_execution_state(struct vcpu *v) +{ + printk("*** Dumping Dom%d vcpu#%d state: ***\n", + v->domain->domain_id, v->vcpu_id); + + if ( v == current ) + { + show_execution_state(guest_cpu_user_regs()); + return; + } + + vcpu_pause(v); /* acceptably dangerous */ + + vcpu_show_registers(v); + if ( !usr_mode(&v->arch.cpu_info->guest_cpu_user_regs) ) + show_guest_stack(&v->arch.cpu_info->guest_cpu_user_regs); + + vcpu_unpause(v); +} + static void do_unexpected_trap(const char *msg, struct cpu_user_regs *regs) { printk("Unexpected Trap: %s\n", msg); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:42 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwI-0005NM-EZ; Wed, 04 Jul 2012 04:11:42 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwE-000528-Cv for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:38 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-27.messagelabs.com!1341375089!9872570!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19898 invoked from network); 4 Jul 2012 04:11:30 -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; 4 Jul 2012 04:11:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw4-0002jZ-Qj for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGw4-0003vv-Pj for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:28 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:28 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] docs: various typos X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340899046 -3600 # Node ID 2bc19ad5039e146252a7225d62952932e68fee5a # Parent f7576f2fe8f9614ce926bf7fb8d1695c009eec1e docs: various typos Signed-off-by: Tim Deegan Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r f7576f2fe8f9 -r 2bc19ad5039e docs/man/xl.cfg.pod.5 --- a/docs/man/xl.cfg.pod.5 Fri Jun 29 15:31:57 2012 +0100 +++ b/docs/man/xl.cfg.pod.5 Thu Jun 28 16:57:26 2012 +0100 @@ -202,7 +202,7 @@ configuration =item B -rename the domain which terminated, and thenimmediately create a new +rename the domain which terminated, and then immediately create a new domain with the same configuration as the original =item B @@ -357,7 +357,7 @@ guest B and B are C<0000:00>. =item B -Posible Bs are: +Possible Bs are: =over 4 @@ -387,7 +387,7 @@ enable this option only for trusted VMs =item B (PV only) Changes the default value of 'permissive' for all PCI -devices for this VM. This can still be overriden on a per-device +devices for this VM. This can still be overridden on a per-device basis. This option should be enabled with caution: it gives the guest much more control over the device, which may have security or stability implications. It is recommended to enable this option only @@ -436,7 +436,7 @@ specific what meaning this has). =item B Selects whether to expose the host e820 (memory map) to the guest via -the virtual e820. When this option is false the guest psuedo-physical +the virtual e820. When this option is false the guest pseudo-physical address space consists of a single contiguous RAM region. When this option is specified the virtual e820 instead reflects the host e820 and contains the same PCI holes. The total amount of RAM represented @@ -446,10 +446,10 @@ it is layed out. Exposing the host e820 to the guest gives the guest kernel the opportunity to set aside the required part of its pseudo-physical address space in order to provide address space to map passedthrough -PCI devices. It is guest Operaring System dependant whether this +PCI devices. It is guest Operating System dependant whether this option is required, specifically it is required when using a mainline Linux ("pvops") kernel. This option defaults to true if any PCI -passthrough devices are configued and false otherwise. If you do not +passthrough devices are configured and false otherwise. If you do not configure any passthrough devices at domain creation time but expect to hotplug devices later then you should set this option. Conversely if your particular guest kernel does not require this behaviour then @@ -580,7 +580,7 @@ has no effect on a guest with multiple v always include these tables. This option is enabled by default and you should usually omit it but it may be necessary to disable these firmware tables when using certain older guest Operating -Systems. These tables have been superceded by newer constructs within +Systems. These tables have been superseded by newer constructs within the ACPI tables. (X86 only) =item B @@ -763,7 +763,7 @@ Simple DirectMedia Layer). The default i =item B Enable OpenGL acceleration of the SDL display. Only effects machines -using B and only if the +using B and only if the device-model was compiled with OpenGL support. Disabled by default. =item B @@ -903,7 +903,7 @@ device-model will become the default in =back It is recommended to accept the default value for new guests. If -you have existing guests then, depeending on the nature of the guest +you have existing guests then, depending on the nature of the guest Operating System, you may wish to force them to use the device model which they were installed with. @@ -926,19 +926,19 @@ Assign an XSM security label to the devi =item B -Pass additional arbitrary options on the devide-model command +Pass additional arbitrary options on the device-model command line. Each element in the list is passed as an option to the device-model. =item B -Pass additional arbitrary options on the devide-model command line for +Pass additional arbitrary options on the device-model command line for a PV device model only. Each element in the list is passed as an option to the device-model. =item B -Pass additional arbitrary options on the devide-model command line for +Pass additional arbitrary options on the device-model command line for an HVM device model only. Each element in the list is passed as an option to the device-model. diff -r f7576f2fe8f9 -r 2bc19ad5039e docs/man/xl.pod.1 --- a/docs/man/xl.pod.1 Fri Jun 29 15:31:57 2012 +0100 +++ b/docs/man/xl.pod.1 Thu Jun 28 16:57:26 2012 +0100 @@ -50,7 +50,7 @@ setup the bridge. =item B If you specify the amount of memory dom0 has, passing B to -Xen, it is highly reccomended to disable B. Edit +Xen, it is highly recommended to disable B. Edit B and set it to 0. =item run xl as B @@ -808,7 +808,7 @@ the ratelimit (see below). Ratelimit attempts to limit the number of schedules per second. It sets a minimum amount of time (in microseconds) a VM must run before -we will allow a higher-prioirty VM to pre-empt it. The default value +we will allow a higher-priority VM to pre-empt it. The default value is 1000 microseconds (1ms). Valid range is 100 to 500000 (500ms). The ratelimit length must be lower than the timeslice length. @@ -1233,7 +1233,7 @@ We need better documentation for: =item B -Trascendent Memory. +Transcendent Memory. =back diff -r f7576f2fe8f9 -r 2bc19ad5039e docs/man/xm.pod.1 --- a/docs/man/xm.pod.1 Fri Jun 29 15:31:57 2012 +0100 +++ b/docs/man/xm.pod.1 Thu Jun 28 16:57:26 2012 +0100 @@ -117,7 +117,7 @@ on the command line are replaced by the =item B<-F=FILE>, B<--config=FILE> -Use the given SXP formated configuration script. +Use the given SXP formatted configuration script. SXP is the underlying configuration format used by Xen. SXP configuration scripts can be hand-written or generated from Python configuration scripts, using the -n @@ -430,7 +430,7 @@ on the command line are replaced by the =item B<-F=FILE>, B<--config=FILE> -Use the given SXP formated configuration script. +Use the given SXP formatted configuration script. SXP is the underlying configuration format used by Xen. SXP configuration scripts can be hand-written or generated from Python configuration scripts, using the -n diff -r f7576f2fe8f9 -r 2bc19ad5039e docs/man/xmdomain.cfg.pod.5 --- a/docs/man/xmdomain.cfg.pod.5 Fri Jun 29 15:31:57 2012 +0100 +++ b/docs/man/xmdomain.cfg.pod.5 Thu Jun 28 16:57:26 2012 +0100 @@ -53,7 +53,7 @@ xen kernel. The amount of RAM, in megabytes, to allocate to the domain when it starts. Allocating insufficient memory for a domain may produce extremely bizarre behavior. If there isn't enough free memory left on -the machine to fulfill this request, the domain will fail to start. +the machine to fulfil this request, the domain will fail to start. Xen does not support overcommit of memory, so the total memory of all guests (+ 64 MB needed for Xen) must be less than or equal to the diff -r f7576f2fe8f9 -r 2bc19ad5039e docs/misc/distro_mapping.txt --- a/docs/misc/distro_mapping.txt Fri Jun 29 15:31:57 2012 +0100 +++ b/docs/misc/distro_mapping.txt Thu Jun 28 16:57:26 2012 +0100 @@ -22,6 +22,6 @@ one must grep for the above elements and For example if a new distro uses /etc/bork as its config dir, it's not sufficient to set CONFIG_LEAF_DIR=bork; one must also add tests for the -existance of the bork dir in every context where config files are read. +existence of the bork dir in every context where config files are read. diff -r f7576f2fe8f9 -r 2bc19ad5039e docs/misc/kexec_and_kdump.txt --- a/docs/misc/kexec_and_kdump.txt Fri Jun 29 15:31:57 2012 +0100 +++ b/docs/misc/kexec_and_kdump.txt Thu Jun 28 16:57:26 2012 +0100 @@ -3,8 +3,8 @@ Kexec and Kdump for Xen ======================= -This is a breif guide to using Kexec and Kdump in conjunction with Xen. -This functionaly works at the level of the hypervisor and dom0 kernel. +This is a brief guide to using Kexec and Kdump in conjunction with Xen. +This functionally works at the level of the hypervisor and dom0 kernel. And will thus affect all guests running on a machine. At this stage it does not work in conjunction with domU kernels. @@ -33,7 +33,7 @@ Linux -> Xen | first kernel | se ---------------+--------------------+-------------------- Linux -> Linux | first kernel | second kernel -If you are kexecing to Xen then you will also need to preapare the second +If you are kexecing to Xen then you will also need to prepare the second hypervisor and dom0 kernel that will run after kexec. These may be the same as the first hypervisor and dom0 kernel that are used before kexec if you are kexecing from Xen to Xen. @@ -176,7 +176,7 @@ running kernel. On x86 systems the crash kernel may be either - A uncompressed vmlinux image if the kernel is not relocatable - A compressed bzImage or vmlinuz image if the kernel is relocatable -- Relocatability is crontroled by the CONFIG_RELOCATABLE kernel +- Relocatability is controlled by the CONFIG_RELOCATABLE kernel compile configuration parameter. This option may not be available depending on the kernel version On ia64 diff -r f7576f2fe8f9 -r 2bc19ad5039e docs/misc/tscmode.txt --- a/docs/misc/tscmode.txt Fri Jun 29 15:31:57 2012 +0100 +++ b/docs/misc/tscmode.txt Thu Jun 28 16:57:26 2012 +0100 @@ -121,7 +121,7 @@ may not remain) synchronized as "TSC-uns As a result of TSC's sordid history, two classes of applications use TSC: old applications designed for single processors, and the most recent -enteprise applications which require high-frequency high-precision +enterprise applications which require high-frequency high-precision timestamping. We will refer to apps that might break if running on a TSC-unsafe @@ -151,13 +151,13 @@ instructions to trap. This trap can be then transparently "emulate" the results of the rdtsc instruction and return control to the code following the rdtsc instruction. -To provide a "safe" TSC, i.e. to ensure both TSC monontonicity and a +To provide a "safe" TSC, i.e. to ensure both TSC monotonicity and a fixed rate, Xen provides rdtsc emulation whenever necessary or when explicitly specified by a per-VM configuration option. TSC emulation is relatively slow -- roughly 15-20 times slower than the rdtsc instruction when executed natively. However, except when an OS or application uses the rdtsc instruction at a high frequency (e.g. more than about 10,000 times -per second per processor), this performance degradation is not noticable +per second per processor), this performance degradation is not noticeable (i.e. <0.3%). And, TSC emulation is nearly always faster than OS-provided alternatives (e.g. Linux's gettimeofday). For environments where it is certain that all apps are TSC-resilient (e.g. @@ -196,7 +196,7 @@ all apps running in this virtual machine apps must either be TSC-resilient or pvrdtscp-modified. Second, highest performance is only obtained on TSC-safe machines that support the rdtscp instruction; when running on older machines, -rdtscp is emulated and thus slower. For more information on PVRTSCP, +rdtscp is emulated and thus slower. For more information on PVRDTSCP, see below. Finally, tsc_mode==1 always enables TSC emulation, regardless of @@ -243,7 +243,7 @@ saved, restore this domain will fail. There is another cpuid-related complication: The x86 cpuid instruction is non-privileged. HVM domains are configured to always trap this instruction to Xen, where Xen can "filter" the result. In a PV OS, all cpuid instructions -have been replaced by a parvirtualized equivalent of the cpuid instruction +have been replaced by a paravirtualized equivalent of the cpuid instruction ("pvcpuid") and also trap to Xen. But apps in a PV guest that use a cpuid instruction execute it directly, without a trap to Xen. As a result, an app may directly examine the physical TSC Invariant cpuid bit and make diff -r f7576f2fe8f9 -r 2bc19ad5039e docs/misc/vtpm.txt --- a/docs/misc/vtpm.txt Fri Jun 29 15:31:57 2012 +0100 +++ b/docs/misc/vtpm.txt Thu Jun 28 16:57:26 2012 +0100 @@ -78,7 +78,7 @@ ramdisk = "/xen/initrd_domU/U1_ramdisk.i memory = 32 name = "TPMUserDomain0" vtpm = ['instance=1,backend=0'] -root = "/dev/ram0 cosole=tty ro" +root = "/dev/ram0 console=tty ro" vif = ['backend=0'] In the above configuration file the line 'vtpm = ...' provides diff -r f7576f2fe8f9 -r 2bc19ad5039e docs/misc/xen-command-line.markdown --- a/docs/misc/xen-command-line.markdown Fri Jun 29 15:31:57 2012 +0100 +++ b/docs/misc/xen-command-line.markdown Thu Jun 28 16:57:26 2012 +0100 @@ -89,7 +89,7 @@ common, and only has an effect if your s The `acpi=noirq` option causes Xen to not parse the ACPI MADT table looking for IO-APIC entries. This is also not common, and any system -which requries this option to function should be blacklisted. +which requires this option to function should be blacklisted. Additionally, this will not prevent Xen from finding IO-APIC entries from the MP tables. diff -r f7576f2fe8f9 -r 2bc19ad5039e docs/misc/xenstore.txt --- a/docs/misc/xenstore.txt Fri Jun 29 15:31:57 2012 +0100 +++ b/docs/misc/xenstore.txt Thu Jun 28 16:57:26 2012 +0100 @@ -202,7 +202,7 @@ WATCH ||? readable, some notifications may have been lost). WATCH_EVENT || - Unsolicited `reply' generated for matching modfication events + Unsolicited `reply' generated for matching modification events as described above. req_id and tx_id are both 0. is the event's path, ie the actual path that was diff -r f7576f2fe8f9 -r 2bc19ad5039e docs/misc/xl-disk-configuration.txt --- a/docs/misc/xl-disk-configuration.txt Fri Jun 29 15:31:57 2012 +0100 +++ b/docs/misc/xl-disk-configuration.txt Thu Jun 28 16:57:26 2012 +0100 @@ -72,7 +72,7 @@ Special syntax: syntax in the configuration file, it consumes the whole rest of the . Therefore in that case it must come last. This is permissible even if an empty value for the target was already - specifed as a positional parameter. This is the only way to + specified as a positional parameter. This is the only way to specify a target string containing metacharacters such as commas and (in some cases) colons, which would otherwise be misinterpreted. diff -r f7576f2fe8f9 -r 2bc19ad5039e docs/misc/xl-network-configuration.markdown --- a/docs/misc/xl-network-configuration.markdown Fri Jun 29 15:31:57 2012 +0100 +++ b/docs/misc/xl-network-configuration.markdown Thu Jun 28 16:57:26 2012 +0100 @@ -89,7 +89,7 @@ are: * `rtl8139` (default) -- Realtek RTL8139 * `e1000` -- Intel E1000 - * in principal any device supported by your device model + * in principle any device supported by your device model ### vifname diff -r f7576f2fe8f9 -r 2bc19ad5039e docs/misc/xsm-flask.txt --- a/docs/misc/xsm-flask.txt Fri Jun 29 15:31:57 2012 +0100 +++ b/docs/misc/xsm-flask.txt Thu Jun 28 16:57:26 2012 +0100 @@ -226,7 +226,7 @@ 1) xen command line parameters To boot the platform into enforcing mode, which means that the policy is loaded and enforced, append 'flask_enforcing=1' on the grub line. - This parameter may also be changed through the flask hyercall. + This parameter may also be changed through the flask hypercall. b) flask_enabled _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:42 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwI-0005NM-EZ; Wed, 04 Jul 2012 04:11:42 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwE-000528-Cv for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:38 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-27.messagelabs.com!1341375089!9872570!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19898 invoked from network); 4 Jul 2012 04:11:30 -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; 4 Jul 2012 04:11:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw4-0002jZ-Qj for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGw4-0003vv-Pj for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:28 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:28 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] docs: various typos X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340899046 -3600 # Node ID 2bc19ad5039e146252a7225d62952932e68fee5a # Parent f7576f2fe8f9614ce926bf7fb8d1695c009eec1e docs: various typos Signed-off-by: Tim Deegan Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r f7576f2fe8f9 -r 2bc19ad5039e docs/man/xl.cfg.pod.5 --- a/docs/man/xl.cfg.pod.5 Fri Jun 29 15:31:57 2012 +0100 +++ b/docs/man/xl.cfg.pod.5 Thu Jun 28 16:57:26 2012 +0100 @@ -202,7 +202,7 @@ configuration =item B -rename the domain which terminated, and thenimmediately create a new +rename the domain which terminated, and then immediately create a new domain with the same configuration as the original =item B @@ -357,7 +357,7 @@ guest B and B are C<0000:00>. =item B -Posible Bs are: +Possible Bs are: =over 4 @@ -387,7 +387,7 @@ enable this option only for trusted VMs =item B (PV only) Changes the default value of 'permissive' for all PCI -devices for this VM. This can still be overriden on a per-device +devices for this VM. This can still be overridden on a per-device basis. This option should be enabled with caution: it gives the guest much more control over the device, which may have security or stability implications. It is recommended to enable this option only @@ -436,7 +436,7 @@ specific what meaning this has). =item B Selects whether to expose the host e820 (memory map) to the guest via -the virtual e820. When this option is false the guest psuedo-physical +the virtual e820. When this option is false the guest pseudo-physical address space consists of a single contiguous RAM region. When this option is specified the virtual e820 instead reflects the host e820 and contains the same PCI holes. The total amount of RAM represented @@ -446,10 +446,10 @@ it is layed out. Exposing the host e820 to the guest gives the guest kernel the opportunity to set aside the required part of its pseudo-physical address space in order to provide address space to map passedthrough -PCI devices. It is guest Operaring System dependant whether this +PCI devices. It is guest Operating System dependant whether this option is required, specifically it is required when using a mainline Linux ("pvops") kernel. This option defaults to true if any PCI -passthrough devices are configued and false otherwise. If you do not +passthrough devices are configured and false otherwise. If you do not configure any passthrough devices at domain creation time but expect to hotplug devices later then you should set this option. Conversely if your particular guest kernel does not require this behaviour then @@ -580,7 +580,7 @@ has no effect on a guest with multiple v always include these tables. This option is enabled by default and you should usually omit it but it may be necessary to disable these firmware tables when using certain older guest Operating -Systems. These tables have been superceded by newer constructs within +Systems. These tables have been superseded by newer constructs within the ACPI tables. (X86 only) =item B @@ -763,7 +763,7 @@ Simple DirectMedia Layer). The default i =item B Enable OpenGL acceleration of the SDL display. Only effects machines -using B and only if the +using B and only if the device-model was compiled with OpenGL support. Disabled by default. =item B @@ -903,7 +903,7 @@ device-model will become the default in =back It is recommended to accept the default value for new guests. If -you have existing guests then, depeending on the nature of the guest +you have existing guests then, depending on the nature of the guest Operating System, you may wish to force them to use the device model which they were installed with. @@ -926,19 +926,19 @@ Assign an XSM security label to the devi =item B -Pass additional arbitrary options on the devide-model command +Pass additional arbitrary options on the device-model command line. Each element in the list is passed as an option to the device-model. =item B -Pass additional arbitrary options on the devide-model command line for +Pass additional arbitrary options on the device-model command line for a PV device model only. Each element in the list is passed as an option to the device-model. =item B -Pass additional arbitrary options on the devide-model command line for +Pass additional arbitrary options on the device-model command line for an HVM device model only. Each element in the list is passed as an option to the device-model. diff -r f7576f2fe8f9 -r 2bc19ad5039e docs/man/xl.pod.1 --- a/docs/man/xl.pod.1 Fri Jun 29 15:31:57 2012 +0100 +++ b/docs/man/xl.pod.1 Thu Jun 28 16:57:26 2012 +0100 @@ -50,7 +50,7 @@ setup the bridge. =item B If you specify the amount of memory dom0 has, passing B to -Xen, it is highly reccomended to disable B. Edit +Xen, it is highly recommended to disable B. Edit B and set it to 0. =item run xl as B @@ -808,7 +808,7 @@ the ratelimit (see below). Ratelimit attempts to limit the number of schedules per second. It sets a minimum amount of time (in microseconds) a VM must run before -we will allow a higher-prioirty VM to pre-empt it. The default value +we will allow a higher-priority VM to pre-empt it. The default value is 1000 microseconds (1ms). Valid range is 100 to 500000 (500ms). The ratelimit length must be lower than the timeslice length. @@ -1233,7 +1233,7 @@ We need better documentation for: =item B -Trascendent Memory. +Transcendent Memory. =back diff -r f7576f2fe8f9 -r 2bc19ad5039e docs/man/xm.pod.1 --- a/docs/man/xm.pod.1 Fri Jun 29 15:31:57 2012 +0100 +++ b/docs/man/xm.pod.1 Thu Jun 28 16:57:26 2012 +0100 @@ -117,7 +117,7 @@ on the command line are replaced by the =item B<-F=FILE>, B<--config=FILE> -Use the given SXP formated configuration script. +Use the given SXP formatted configuration script. SXP is the underlying configuration format used by Xen. SXP configuration scripts can be hand-written or generated from Python configuration scripts, using the -n @@ -430,7 +430,7 @@ on the command line are replaced by the =item B<-F=FILE>, B<--config=FILE> -Use the given SXP formated configuration script. +Use the given SXP formatted configuration script. SXP is the underlying configuration format used by Xen. SXP configuration scripts can be hand-written or generated from Python configuration scripts, using the -n diff -r f7576f2fe8f9 -r 2bc19ad5039e docs/man/xmdomain.cfg.pod.5 --- a/docs/man/xmdomain.cfg.pod.5 Fri Jun 29 15:31:57 2012 +0100 +++ b/docs/man/xmdomain.cfg.pod.5 Thu Jun 28 16:57:26 2012 +0100 @@ -53,7 +53,7 @@ xen kernel. The amount of RAM, in megabytes, to allocate to the domain when it starts. Allocating insufficient memory for a domain may produce extremely bizarre behavior. If there isn't enough free memory left on -the machine to fulfill this request, the domain will fail to start. +the machine to fulfil this request, the domain will fail to start. Xen does not support overcommit of memory, so the total memory of all guests (+ 64 MB needed for Xen) must be less than or equal to the diff -r f7576f2fe8f9 -r 2bc19ad5039e docs/misc/distro_mapping.txt --- a/docs/misc/distro_mapping.txt Fri Jun 29 15:31:57 2012 +0100 +++ b/docs/misc/distro_mapping.txt Thu Jun 28 16:57:26 2012 +0100 @@ -22,6 +22,6 @@ one must grep for the above elements and For example if a new distro uses /etc/bork as its config dir, it's not sufficient to set CONFIG_LEAF_DIR=bork; one must also add tests for the -existance of the bork dir in every context where config files are read. +existence of the bork dir in every context where config files are read. diff -r f7576f2fe8f9 -r 2bc19ad5039e docs/misc/kexec_and_kdump.txt --- a/docs/misc/kexec_and_kdump.txt Fri Jun 29 15:31:57 2012 +0100 +++ b/docs/misc/kexec_and_kdump.txt Thu Jun 28 16:57:26 2012 +0100 @@ -3,8 +3,8 @@ Kexec and Kdump for Xen ======================= -This is a breif guide to using Kexec and Kdump in conjunction with Xen. -This functionaly works at the level of the hypervisor and dom0 kernel. +This is a brief guide to using Kexec and Kdump in conjunction with Xen. +This functionally works at the level of the hypervisor and dom0 kernel. And will thus affect all guests running on a machine. At this stage it does not work in conjunction with domU kernels. @@ -33,7 +33,7 @@ Linux -> Xen | first kernel | se ---------------+--------------------+-------------------- Linux -> Linux | first kernel | second kernel -If you are kexecing to Xen then you will also need to preapare the second +If you are kexecing to Xen then you will also need to prepare the second hypervisor and dom0 kernel that will run after kexec. These may be the same as the first hypervisor and dom0 kernel that are used before kexec if you are kexecing from Xen to Xen. @@ -176,7 +176,7 @@ running kernel. On x86 systems the crash kernel may be either - A uncompressed vmlinux image if the kernel is not relocatable - A compressed bzImage or vmlinuz image if the kernel is relocatable -- Relocatability is crontroled by the CONFIG_RELOCATABLE kernel +- Relocatability is controlled by the CONFIG_RELOCATABLE kernel compile configuration parameter. This option may not be available depending on the kernel version On ia64 diff -r f7576f2fe8f9 -r 2bc19ad5039e docs/misc/tscmode.txt --- a/docs/misc/tscmode.txt Fri Jun 29 15:31:57 2012 +0100 +++ b/docs/misc/tscmode.txt Thu Jun 28 16:57:26 2012 +0100 @@ -121,7 +121,7 @@ may not remain) synchronized as "TSC-uns As a result of TSC's sordid history, two classes of applications use TSC: old applications designed for single processors, and the most recent -enteprise applications which require high-frequency high-precision +enterprise applications which require high-frequency high-precision timestamping. We will refer to apps that might break if running on a TSC-unsafe @@ -151,13 +151,13 @@ instructions to trap. This trap can be then transparently "emulate" the results of the rdtsc instruction and return control to the code following the rdtsc instruction. -To provide a "safe" TSC, i.e. to ensure both TSC monontonicity and a +To provide a "safe" TSC, i.e. to ensure both TSC monotonicity and a fixed rate, Xen provides rdtsc emulation whenever necessary or when explicitly specified by a per-VM configuration option. TSC emulation is relatively slow -- roughly 15-20 times slower than the rdtsc instruction when executed natively. However, except when an OS or application uses the rdtsc instruction at a high frequency (e.g. more than about 10,000 times -per second per processor), this performance degradation is not noticable +per second per processor), this performance degradation is not noticeable (i.e. <0.3%). And, TSC emulation is nearly always faster than OS-provided alternatives (e.g. Linux's gettimeofday). For environments where it is certain that all apps are TSC-resilient (e.g. @@ -196,7 +196,7 @@ all apps running in this virtual machine apps must either be TSC-resilient or pvrdtscp-modified. Second, highest performance is only obtained on TSC-safe machines that support the rdtscp instruction; when running on older machines, -rdtscp is emulated and thus slower. For more information on PVRTSCP, +rdtscp is emulated and thus slower. For more information on PVRDTSCP, see below. Finally, tsc_mode==1 always enables TSC emulation, regardless of @@ -243,7 +243,7 @@ saved, restore this domain will fail. There is another cpuid-related complication: The x86 cpuid instruction is non-privileged. HVM domains are configured to always trap this instruction to Xen, where Xen can "filter" the result. In a PV OS, all cpuid instructions -have been replaced by a parvirtualized equivalent of the cpuid instruction +have been replaced by a paravirtualized equivalent of the cpuid instruction ("pvcpuid") and also trap to Xen. But apps in a PV guest that use a cpuid instruction execute it directly, without a trap to Xen. As a result, an app may directly examine the physical TSC Invariant cpuid bit and make diff -r f7576f2fe8f9 -r 2bc19ad5039e docs/misc/vtpm.txt --- a/docs/misc/vtpm.txt Fri Jun 29 15:31:57 2012 +0100 +++ b/docs/misc/vtpm.txt Thu Jun 28 16:57:26 2012 +0100 @@ -78,7 +78,7 @@ ramdisk = "/xen/initrd_domU/U1_ramdisk.i memory = 32 name = "TPMUserDomain0" vtpm = ['instance=1,backend=0'] -root = "/dev/ram0 cosole=tty ro" +root = "/dev/ram0 console=tty ro" vif = ['backend=0'] In the above configuration file the line 'vtpm = ...' provides diff -r f7576f2fe8f9 -r 2bc19ad5039e docs/misc/xen-command-line.markdown --- a/docs/misc/xen-command-line.markdown Fri Jun 29 15:31:57 2012 +0100 +++ b/docs/misc/xen-command-line.markdown Thu Jun 28 16:57:26 2012 +0100 @@ -89,7 +89,7 @@ common, and only has an effect if your s The `acpi=noirq` option causes Xen to not parse the ACPI MADT table looking for IO-APIC entries. This is also not common, and any system -which requries this option to function should be blacklisted. +which requires this option to function should be blacklisted. Additionally, this will not prevent Xen from finding IO-APIC entries from the MP tables. diff -r f7576f2fe8f9 -r 2bc19ad5039e docs/misc/xenstore.txt --- a/docs/misc/xenstore.txt Fri Jun 29 15:31:57 2012 +0100 +++ b/docs/misc/xenstore.txt Thu Jun 28 16:57:26 2012 +0100 @@ -202,7 +202,7 @@ WATCH ||? readable, some notifications may have been lost). WATCH_EVENT || - Unsolicited `reply' generated for matching modfication events + Unsolicited `reply' generated for matching modification events as described above. req_id and tx_id are both 0. is the event's path, ie the actual path that was diff -r f7576f2fe8f9 -r 2bc19ad5039e docs/misc/xl-disk-configuration.txt --- a/docs/misc/xl-disk-configuration.txt Fri Jun 29 15:31:57 2012 +0100 +++ b/docs/misc/xl-disk-configuration.txt Thu Jun 28 16:57:26 2012 +0100 @@ -72,7 +72,7 @@ Special syntax: syntax in the configuration file, it consumes the whole rest of the . Therefore in that case it must come last. This is permissible even if an empty value for the target was already - specifed as a positional parameter. This is the only way to + specified as a positional parameter. This is the only way to specify a target string containing metacharacters such as commas and (in some cases) colons, which would otherwise be misinterpreted. diff -r f7576f2fe8f9 -r 2bc19ad5039e docs/misc/xl-network-configuration.markdown --- a/docs/misc/xl-network-configuration.markdown Fri Jun 29 15:31:57 2012 +0100 +++ b/docs/misc/xl-network-configuration.markdown Thu Jun 28 16:57:26 2012 +0100 @@ -89,7 +89,7 @@ are: * `rtl8139` (default) -- Realtek RTL8139 * `e1000` -- Intel E1000 - * in principal any device supported by your device model + * in principle any device supported by your device model ### vifname diff -r f7576f2fe8f9 -r 2bc19ad5039e docs/misc/xsm-flask.txt --- a/docs/misc/xsm-flask.txt Fri Jun 29 15:31:57 2012 +0100 +++ b/docs/misc/xsm-flask.txt Thu Jun 28 16:57:26 2012 +0100 @@ -226,7 +226,7 @@ 1) xen command line parameters To boot the platform into enforcing mode, which means that the policy is loaded and enforced, append 'flask_enforcing=1' on the grub line. - This parameter may also be changed through the flask hyercall. + This parameter may also be changed through the flask hypercall. b) flask_enabled _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:43 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwI-0005Ox-SY; Wed, 04 Jul 2012 04:11:42 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwF-00054m-ST for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:40 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-27.messagelabs.com!1341375091!9941941!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30932 invoked from network); 4 Jul 2012 04:11:32 -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; 4 Jul 2012 04:11:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw7-0002k8-EL for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGw7-0003x9-DL for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:31 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:30 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xl: initialise domid to an explicitly invalid value X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340956702 -3600 # Node ID dbf54d93ac40f6aa0ce2efbb37f512b884d23637 # Parent d70030d6a87c7237afa78435b3a9b2a11628a63b xl: initialise domid to an explicitly invalid value also ensure it is invalid whenever we destroy the domain. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r d70030d6a87c -r dbf54d93ac40 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Fri Jun 29 08:58:19 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Fri Jun 29 08:58:22 2012 +0100 @@ -68,7 +68,8 @@ libxl_ctx *ctx; xlchild children[child_max]; /* when we operate on a domain, it is this one: */ -static uint32_t domid; +#define INVALID_DOMID ~0 +static uint32_t domid = INVALID_DOMID; static const char *common_domname; static int fd_lock = -1; @@ -1396,6 +1397,7 @@ static int handle_domain_death(uint32_t case LIBXL_ACTION_ON_SHUTDOWN_DESTROY: LOG("Domain %d needs to be cleaned up: destroying the domain", domid); libxl_domain_destroy(ctx, domid); + domid = INVALID_DOMID; break; case LIBXL_ACTION_ON_SHUTDOWN_COREDUMP_DESTROY: @@ -1458,6 +1460,12 @@ static int preserve_domain(uint32_t domi LOG("Preserving domain %d %s with suffix%s", domid, d_config->c_info.name, stime); rc = libxl_domain_preserve(ctx, domid, &d_config->c_info, stime, new_uuid); + /* + * Although domid still exists it is no longer the one we are concerned + * with. + */ + domid = INVALID_DOMID; + return rc == 0 ? 1 : 0; } @@ -1745,7 +1753,7 @@ static int create_domain(struct domain_c goto out; start: - domid = -1; + assert(domid == INVALID_DOMID); rc = acquire_lock(); if (rc < 0) @@ -1994,8 +2002,10 @@ start: error_out: release_lock(); - if (libxl_domid_valid_guest(domid)) + if (libxl_domid_valid_guest(domid)) { libxl_domain_destroy(ctx, domid); + domid = INVALID_DOMID; + } out: if (logfile != 2) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:43 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwI-0005Ox-SY; Wed, 04 Jul 2012 04:11:42 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwF-00054m-ST for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:40 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-27.messagelabs.com!1341375091!9941941!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30932 invoked from network); 4 Jul 2012 04:11:32 -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; 4 Jul 2012 04:11:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGw7-0002k8-EL for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGw7-0003x9-DL for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:31 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:30 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xl: initialise domid to an explicitly invalid value X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1340956702 -3600 # Node ID dbf54d93ac40f6aa0ce2efbb37f512b884d23637 # Parent d70030d6a87c7237afa78435b3a9b2a11628a63b xl: initialise domid to an explicitly invalid value also ensure it is invalid whenever we destroy the domain. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r d70030d6a87c -r dbf54d93ac40 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Fri Jun 29 08:58:19 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Fri Jun 29 08:58:22 2012 +0100 @@ -68,7 +68,8 @@ libxl_ctx *ctx; xlchild children[child_max]; /* when we operate on a domain, it is this one: */ -static uint32_t domid; +#define INVALID_DOMID ~0 +static uint32_t domid = INVALID_DOMID; static const char *common_domname; static int fd_lock = -1; @@ -1396,6 +1397,7 @@ static int handle_domain_death(uint32_t case LIBXL_ACTION_ON_SHUTDOWN_DESTROY: LOG("Domain %d needs to be cleaned up: destroying the domain", domid); libxl_domain_destroy(ctx, domid); + domid = INVALID_DOMID; break; case LIBXL_ACTION_ON_SHUTDOWN_COREDUMP_DESTROY: @@ -1458,6 +1460,12 @@ static int preserve_domain(uint32_t domi LOG("Preserving domain %d %s with suffix%s", domid, d_config->c_info.name, stime); rc = libxl_domain_preserve(ctx, domid, &d_config->c_info, stime, new_uuid); + /* + * Although domid still exists it is no longer the one we are concerned + * with. + */ + domid = INVALID_DOMID; + return rc == 0 ? 1 : 0; } @@ -1745,7 +1753,7 @@ static int create_domain(struct domain_c goto out; start: - domid = -1; + assert(domid == INVALID_DOMID); rc = acquire_lock(); if (rc < 0) @@ -1994,8 +2002,10 @@ start: error_out: release_lock(); - if (libxl_domid_valid_guest(domid)) + if (libxl_domid_valid_guest(domid)) { libxl_domain_destroy(ctx, domid); + domid = INVALID_DOMID; + } out: if (logfile != 2) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:44 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwJ-0005QM-Sd; Wed, 04 Jul 2012 04:11:43 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwF-0005Gb-UA for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:40 +0000 Received: from [85.158.139.83:47245] by server-1.bemta-5.messagelabs.com id 17/50-19721-B72C3FF4; Wed, 04 Jul 2012 04:11:39 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-182.messagelabs.com!1341375097!19596574!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14909 invoked from network); 4 Jul 2012 04:11:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwD-0002kz-50 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGwD-0003zy-43 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:37 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:36 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: use correct attributes for mappings in copy_from_paddr() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341309143 -3600 # Node ID 6a89e6f4eadcf763a904a298e82c281f90aba896 # Parent 51ad440f9efd92e640cccceed8c7f1c2da9684a9 arm: use correct attributes for mappings in copy_from_paddr() The DTB is in RAM (hence bufferable), kernel is in flash and therefor requires a device type mapping (hence dev shared). Signed-off-by: Ian Campbell Acked-by: David Vrabel Committed-by: Ian Campbell --- diff -r 51ad440f9efd -r 6a89e6f4eadc xen/arch/arm/kernel.c --- a/xen/arch/arm/kernel.c Tue Jul 03 10:52:22 2012 +0100 +++ b/xen/arch/arm/kernel.c Tue Jul 03 10:52:23 2012 +0100 @@ -39,7 +39,7 @@ struct minimal_dtb_header { * @paddr: source physical address * @len: length to copy */ -void copy_from_paddr(void *dst, paddr_t paddr, unsigned long len) +void copy_from_paddr(void *dst, paddr_t paddr, unsigned long len, int attrindx) { void *src = (void *)FIXMAP_ADDR(FIXMAP_MISC); @@ -51,7 +51,7 @@ void copy_from_paddr(void *dst, paddr_t s = paddr & (PAGE_SIZE-1); l = min(PAGE_SIZE - s, len); - set_fixmap(FIXMAP_MISC, p, DEV_SHARED); + set_fixmap(FIXMAP_MISC, p, attrindx); memcpy(dst, src + s, l); paddr += l; @@ -111,7 +111,7 @@ static int kernel_try_zimage_prepare(str /* * Check for an appended DTB. */ - copy_from_paddr(&dtb_hdr, KERNEL_FLASH_ADDRESS + end - start, sizeof(dtb_hdr)); + copy_from_paddr(&dtb_hdr, KERNEL_FLASH_ADDRESS + end - start, sizeof(dtb_hdr), DEV_SHARED); if (be32_to_cpu(dtb_hdr.magic) == DTB_MAGIC) { end += be32_to_cpu(dtb_hdr.total_size); } @@ -151,7 +151,7 @@ static int kernel_try_elf_prepare(struct if ( info->kernel_img == NULL ) panic("Cannot allocate temporary buffer for kernel.\n"); - copy_from_paddr(info->kernel_img, KERNEL_FLASH_ADDRESS, KERNEL_FLASH_SIZE); + copy_from_paddr(info->kernel_img, KERNEL_FLASH_ADDRESS, KERNEL_FLASH_SIZE, DEV_SHARED); if ( (rc = elf_init(&info->elf.elf, info->kernel_img, KERNEL_FLASH_SIZE )) != 0 ) return rc; diff -r 51ad440f9efd -r 6a89e6f4eadc xen/arch/arm/setup.c --- a/xen/arch/arm/setup.c Tue Jul 03 10:52:22 2012 +0100 +++ b/xen/arch/arm/setup.c Tue Jul 03 10:52:23 2012 +0100 @@ -122,7 +122,7 @@ static void __init setup_mm(unsigned lon * TODO: handle other payloads too. */ device_tree_flattened = mfn_to_virt(alloc_boot_pages(dtb_pages, 1)); - copy_from_paddr(device_tree_flattened, dtb_paddr, dtb_size); + copy_from_paddr(device_tree_flattened, dtb_paddr, dtb_size, BUFFERABLE); /* Add non-xenheap memory */ init_boot_pages(pfn_to_paddr(xenheap_mfn_start + xenheap_pages), diff -r 51ad440f9efd -r 6a89e6f4eadc xen/include/asm-arm/setup.h --- a/xen/include/asm-arm/setup.h Tue Jul 03 10:52:22 2012 +0100 +++ b/xen/include/asm-arm/setup.h Tue Jul 03 10:52:23 2012 +0100 @@ -3,7 +3,7 @@ #include -void copy_from_paddr(void *dst, paddr_t paddr, unsigned long len); +void copy_from_paddr(void *dst, paddr_t paddr, unsigned long len, int attrindx); void arch_get_xen_caps(xen_capabilities_info_t *info); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:44 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwJ-0005QM-Sd; Wed, 04 Jul 2012 04:11:43 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwF-0005Gb-UA for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:40 +0000 Received: from [85.158.139.83:47245] by server-1.bemta-5.messagelabs.com id 17/50-19721-B72C3FF4; Wed, 04 Jul 2012 04:11:39 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-182.messagelabs.com!1341375097!19596574!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14909 invoked from network); 4 Jul 2012 04:11:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwD-0002kz-50 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGwD-0003zy-43 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:37 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:36 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: use correct attributes for mappings in copy_from_paddr() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341309143 -3600 # Node ID 6a89e6f4eadcf763a904a298e82c281f90aba896 # Parent 51ad440f9efd92e640cccceed8c7f1c2da9684a9 arm: use correct attributes for mappings in copy_from_paddr() The DTB is in RAM (hence bufferable), kernel is in flash and therefor requires a device type mapping (hence dev shared). Signed-off-by: Ian Campbell Acked-by: David Vrabel Committed-by: Ian Campbell --- diff -r 51ad440f9efd -r 6a89e6f4eadc xen/arch/arm/kernel.c --- a/xen/arch/arm/kernel.c Tue Jul 03 10:52:22 2012 +0100 +++ b/xen/arch/arm/kernel.c Tue Jul 03 10:52:23 2012 +0100 @@ -39,7 +39,7 @@ struct minimal_dtb_header { * @paddr: source physical address * @len: length to copy */ -void copy_from_paddr(void *dst, paddr_t paddr, unsigned long len) +void copy_from_paddr(void *dst, paddr_t paddr, unsigned long len, int attrindx) { void *src = (void *)FIXMAP_ADDR(FIXMAP_MISC); @@ -51,7 +51,7 @@ void copy_from_paddr(void *dst, paddr_t s = paddr & (PAGE_SIZE-1); l = min(PAGE_SIZE - s, len); - set_fixmap(FIXMAP_MISC, p, DEV_SHARED); + set_fixmap(FIXMAP_MISC, p, attrindx); memcpy(dst, src + s, l); paddr += l; @@ -111,7 +111,7 @@ static int kernel_try_zimage_prepare(str /* * Check for an appended DTB. */ - copy_from_paddr(&dtb_hdr, KERNEL_FLASH_ADDRESS + end - start, sizeof(dtb_hdr)); + copy_from_paddr(&dtb_hdr, KERNEL_FLASH_ADDRESS + end - start, sizeof(dtb_hdr), DEV_SHARED); if (be32_to_cpu(dtb_hdr.magic) == DTB_MAGIC) { end += be32_to_cpu(dtb_hdr.total_size); } @@ -151,7 +151,7 @@ static int kernel_try_elf_prepare(struct if ( info->kernel_img == NULL ) panic("Cannot allocate temporary buffer for kernel.\n"); - copy_from_paddr(info->kernel_img, KERNEL_FLASH_ADDRESS, KERNEL_FLASH_SIZE); + copy_from_paddr(info->kernel_img, KERNEL_FLASH_ADDRESS, KERNEL_FLASH_SIZE, DEV_SHARED); if ( (rc = elf_init(&info->elf.elf, info->kernel_img, KERNEL_FLASH_SIZE )) != 0 ) return rc; diff -r 51ad440f9efd -r 6a89e6f4eadc xen/arch/arm/setup.c --- a/xen/arch/arm/setup.c Tue Jul 03 10:52:22 2012 +0100 +++ b/xen/arch/arm/setup.c Tue Jul 03 10:52:23 2012 +0100 @@ -122,7 +122,7 @@ static void __init setup_mm(unsigned lon * TODO: handle other payloads too. */ device_tree_flattened = mfn_to_virt(alloc_boot_pages(dtb_pages, 1)); - copy_from_paddr(device_tree_flattened, dtb_paddr, dtb_size); + copy_from_paddr(device_tree_flattened, dtb_paddr, dtb_size, BUFFERABLE); /* Add non-xenheap memory */ init_boot_pages(pfn_to_paddr(xenheap_mfn_start + xenheap_pages), diff -r 51ad440f9efd -r 6a89e6f4eadc xen/include/asm-arm/setup.h --- a/xen/include/asm-arm/setup.h Tue Jul 03 10:52:22 2012 +0100 +++ b/xen/include/asm-arm/setup.h Tue Jul 03 10:52:23 2012 +0100 @@ -3,7 +3,7 @@ #include -void copy_from_paddr(void *dst, paddr_t paddr, unsigned long len); +void copy_from_paddr(void *dst, paddr_t paddr, unsigned long len, int attrindx); void arch_get_xen_caps(xen_capabilities_info_t *info); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:44 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwK-0005Rc-AJ; Wed, 04 Jul 2012 04:11:44 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwH-00058b-Nr for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:42 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-27.messagelabs.com!1341375094!9902995!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21128 invoked from network); 4 Jul 2012 04:11:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwA-0002kb-12 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGw9-0003yQ-WF for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:34 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:33 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] QEMU_TAG update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1340989027 -3600 # Node ID 7ef0b3122c0ed1c7f531cf62ecc59d720c8061ae # Parent 165eb54e57c0b14c211fda12fb53c80490aae32c QEMU_TAG update --- diff -r 165eb54e57c0 -r 7ef0b3122c0e Config.mk --- a/Config.mk Fri Jun 29 17:36:50 2012 +0100 +++ b/Config.mk Fri Jun 29 17:57:07 2012 +0100 @@ -213,9 +213,9 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= 94a7bdc2e7797df2dab1c26216349f66e0f3490a -# Fri Jun 29 16:58:05 2012 +0100 -# xendisk: set maximum number of grants to be used +QEMU_TAG ?= fa2e8e3bc869c04d4a4d9b8f70c1cab7e53778d6 +# Fri Jun 29 17:06:25 2012 +0100 +# passthrough: fix off-by-one in PCI config space register index check # Short answer -- do not enable this unless you know what you are # doing and are prepared for some pain. _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:44 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwK-0005Rc-AJ; Wed, 04 Jul 2012 04:11:44 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwH-00058b-Nr for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:42 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-27.messagelabs.com!1341375094!9902995!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21128 invoked from network); 4 Jul 2012 04:11:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwA-0002kb-12 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGw9-0003yQ-WF for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:34 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:33 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] QEMU_TAG update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1340989027 -3600 # Node ID 7ef0b3122c0ed1c7f531cf62ecc59d720c8061ae # Parent 165eb54e57c0b14c211fda12fb53c80490aae32c QEMU_TAG update --- diff -r 165eb54e57c0 -r 7ef0b3122c0e Config.mk --- a/Config.mk Fri Jun 29 17:36:50 2012 +0100 +++ b/Config.mk Fri Jun 29 17:57:07 2012 +0100 @@ -213,9 +213,9 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= 94a7bdc2e7797df2dab1c26216349f66e0f3490a -# Fri Jun 29 16:58:05 2012 +0100 -# xendisk: set maximum number of grants to be used +QEMU_TAG ?= fa2e8e3bc869c04d4a4d9b8f70c1cab7e53778d6 +# Fri Jun 29 17:06:25 2012 +0100 +# passthrough: fix off-by-one in PCI config space register index check # Short answer -- do not enable this unless you know what you are # doing and are prepared for some pain. _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:45 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwL-0005Tq-Bd; Wed, 04 Jul 2012 04:11:45 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwH-0005L3-Kj for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:41 +0000 Received: from [85.158.143.35:39024] by server-3.bemta-4.messagelabs.com id 03/F6-05808-C72C3FF4; Wed, 04 Jul 2012 04:11:40 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-21.messagelabs.com!1341375099!19456188!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27744 invoked from network); 4 Jul 2012 04:11:40 -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; 4 Jul 2012 04:11:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwF-0002lH-Am for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGwF-00040w-5K for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:39 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:38 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: enable data-cache at the same time as enabling the MMU, not before X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341309146 -3600 # Node ID a9d004e63315936a7e3dec2afc6f48361d24573e # Parent d3dd28a6cdd066959869d7f77fb4bc7284c101ab arm: enable data-cache at the same time as enabling the MMU, not before With enough warnings enabled the model seemed to be complaining that pages cached before paging was enabled had been mapped with to inconsistent sets of attributes. I'm not convinced that isn't a model issue, nor am I convinced this has really fixed anything, but it seems sensible enough. Signed-off-by: Ian Campbell Acked-by: Tim Deegan Committed-by: Ian Campbell --- diff -r d3dd28a6cdd0 -r a9d004e63315 xen/arch/arm/head.S --- a/xen/arch/arm/head.S Tue Jul 03 10:52:25 2012 +0100 +++ b/xen/arch/arm/head.S Tue Jul 03 10:52:26 2012 +0100 @@ -148,10 +148,11 @@ hyp: * Exceptions in LE ARM, * Low-latency IRQs disabled, * Write-implies-XN disabled (for now), - * I-cache and d-cache enabled, + * D-cache disabled (for now), + * I-cache enabled, * Alignment checking enabled, * MMU translation disabled (for now). */ - ldr r0, =(HSCTLR_BASE|SCTLR_A|SCTLR_C) + ldr r0, =(HSCTLR_BASE|SCTLR_A) mcr CP32(r0, HSCTLR) /* Write Xen's PT's paddr into the HTTBR */ @@ -210,7 +211,7 @@ pt_ready: ldr r1, =paging /* Explicit vaddr, not RIP-relative */ mrc CP32(r0, HSCTLR) - orr r0, r0, #0x1 /* Add in the MMU enable bit */ + orr r0, r0, #(SCTLR_M|SCTLR_C) /* Enable MMU and D-cache */ dsb /* Flush PTE writes and finish reads */ mcr CP32(r0, HSCTLR) /* now paging is enabled */ isb /* Now, flush the icache */ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:45 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwL-0005Tq-Bd; Wed, 04 Jul 2012 04:11:45 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwH-0005L3-Kj for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:41 +0000 Received: from [85.158.143.35:39024] by server-3.bemta-4.messagelabs.com id 03/F6-05808-C72C3FF4; Wed, 04 Jul 2012 04:11:40 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-21.messagelabs.com!1341375099!19456188!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27744 invoked from network); 4 Jul 2012 04:11:40 -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; 4 Jul 2012 04:11:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwF-0002lH-Am for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGwF-00040w-5K for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:39 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:38 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: enable data-cache at the same time as enabling the MMU, not before X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341309146 -3600 # Node ID a9d004e63315936a7e3dec2afc6f48361d24573e # Parent d3dd28a6cdd066959869d7f77fb4bc7284c101ab arm: enable data-cache at the same time as enabling the MMU, not before With enough warnings enabled the model seemed to be complaining that pages cached before paging was enabled had been mapped with to inconsistent sets of attributes. I'm not convinced that isn't a model issue, nor am I convinced this has really fixed anything, but it seems sensible enough. Signed-off-by: Ian Campbell Acked-by: Tim Deegan Committed-by: Ian Campbell --- diff -r d3dd28a6cdd0 -r a9d004e63315 xen/arch/arm/head.S --- a/xen/arch/arm/head.S Tue Jul 03 10:52:25 2012 +0100 +++ b/xen/arch/arm/head.S Tue Jul 03 10:52:26 2012 +0100 @@ -148,10 +148,11 @@ hyp: * Exceptions in LE ARM, * Low-latency IRQs disabled, * Write-implies-XN disabled (for now), - * I-cache and d-cache enabled, + * D-cache disabled (for now), + * I-cache enabled, * Alignment checking enabled, * MMU translation disabled (for now). */ - ldr r0, =(HSCTLR_BASE|SCTLR_A|SCTLR_C) + ldr r0, =(HSCTLR_BASE|SCTLR_A) mcr CP32(r0, HSCTLR) /* Write Xen's PT's paddr into the HTTBR */ @@ -210,7 +211,7 @@ pt_ready: ldr r1, =paging /* Explicit vaddr, not RIP-relative */ mrc CP32(r0, HSCTLR) - orr r0, r0, #0x1 /* Add in the MMU enable bit */ + orr r0, r0, #(SCTLR_M|SCTLR_C) /* Enable MMU and D-cache */ dsb /* Flush PTE writes and finish reads */ mcr CP32(r0, HSCTLR) /* now paging is enabled */ isb /* Now, flush the icache */ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:46 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwM-0005W1-6G; Wed, 04 Jul 2012 04:11:46 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwH-00059S-TS for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:42 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-27.messagelabs.com!1341375094!9774546!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16081 invoked from network); 4 Jul 2012 04:11:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwA-0002kg-Hn for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGwA-0003yf-Ga for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:34 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:34 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xl: ensure handle_domain & preserve_domain update the global domid not a shadow X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341225645 -3600 # Node ID d4e4ef1d390fd2d2b0f589c6b30787dde50e5f2c # Parent 7ef0b3122c0ed1c7f531cf62ecc59d720c8061ae xl: ensure handle_domain & preserve_domain update the global domid not a shadow xl keeps the current domid in a global variable, however it also has various functions (including the two above) which take a domid parameter which shadows this. This fixes the issue introduced by 25563:dbf54d93ac40 "xl: initialise domid to an explicitly invalid value" but does not tackle the wider problem. Signed-off-by: Ian Campbell Acked-by: Roger Pau Monne Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r 7ef0b3122c0e -r d4e4ef1d390f tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Fri Jun 29 17:57:07 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Mon Jul 02 11:40:45 2012 +0100 @@ -1328,8 +1328,9 @@ static void reload_domain_config(uint32_ } /* Returns 1 if domain should be restarted, - * 2 if domain should be renamed then restarted, or 0 */ -static int handle_domain_death(uint32_t domid, + * 2 if domain should be renamed then restarted, or 0 + * Can update r_domid if domain is destroyed etc */ +static int handle_domain_death(uint32_t *r_domid, libxl_event *event, uint8_t **config_data, int *config_len, libxl_domain_config *d_config) @@ -1372,7 +1373,7 @@ static int handle_domain_death(uint32_t LOG("failed to construct core dump path"); } else { LOG("dumping core to %s", corefile); - rc=libxl_domain_core_dump(ctx, domid, corefile, NULL); + rc=libxl_domain_core_dump(ctx, *r_domid, corefile, NULL); if (rc) LOG("core dump failed (rc=%d).", rc); } /* No point crying over spilled milk, continue on failure. */ @@ -1388,19 +1389,20 @@ static int handle_domain_death(uint32_t break; case LIBXL_ACTION_ON_SHUTDOWN_RESTART_RENAME: - reload_domain_config(domid, config_data, config_len); + reload_domain_config(*r_domid, config_data, config_len); restart = 2; break; case LIBXL_ACTION_ON_SHUTDOWN_RESTART: - reload_domain_config(domid, config_data, config_len); + reload_domain_config(*r_domid, config_data, config_len); restart = 1; /* fall-through */ case LIBXL_ACTION_ON_SHUTDOWN_DESTROY: - LOG("Domain %d needs to be cleaned up: destroying the domain", domid); - libxl_domain_destroy(ctx, domid); - domid = INVALID_DOMID; + LOG("Domain %d needs to be cleaned up: destroying the domain", + *r_domid); + libxl_domain_destroy(ctx, *r_domid); + *r_domid = INVALID_DOMID; break; case LIBXL_ACTION_ON_SHUTDOWN_COREDUMP_DESTROY: @@ -1430,7 +1432,8 @@ static void replace_string(char **str, c } -static int preserve_domain(uint32_t domid, libxl_event *event, +/* Preserve a copy of a domain under a new name. Updates *r_domid */ +static int preserve_domain(uint32_t *r_domid, libxl_event *event, libxl_domain_config *d_config) { time_t now; @@ -1460,14 +1463,16 @@ static int preserve_domain(uint32_t domi libxl_uuid_generate(&new_uuid); - LOG("Preserving domain %d %s with suffix%s", domid, d_config->c_info.name, stime); - rc = libxl_domain_preserve(ctx, domid, &d_config->c_info, stime, new_uuid); + LOG("Preserving domain %d %s with suffix%s", + *r_domid, d_config->c_info.name, stime); + rc = libxl_domain_preserve(ctx, *r_domid, &d_config->c_info, + stime, new_uuid); /* - * Although domid still exists it is no longer the one we are concerned - * with. + * Although the domain still exists it is no longer the one we are + * concerned with. */ - domid = INVALID_DOMID; + *r_domid = INVALID_DOMID; return rc == 0 ? 1 : 0; } @@ -1921,11 +1926,11 @@ start: LOG("Domain %d has shut down, reason code %d 0x%x", domid, event->u.domain_shutdown.shutdown_reason, event->u.domain_shutdown.shutdown_reason); - switch (handle_domain_death(domid, event, + switch (handle_domain_death(&domid, event, (uint8_t **)&config_data, &config_len, &d_config)) { case 2: - if (!preserve_domain(domid, event, &d_config)) { + if (!preserve_domain(&domid, event, &d_config)) { /* If we fail then exit leaving the old domain in place. */ ret = -1; goto out; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:46 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwM-0005W1-6G; Wed, 04 Jul 2012 04:11:46 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwH-00059S-TS for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:42 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-27.messagelabs.com!1341375094!9774546!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16081 invoked from network); 4 Jul 2012 04:11:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwA-0002kg-Hn for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGwA-0003yf-Ga for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:34 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:34 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xl: ensure handle_domain & preserve_domain update the global domid not a shadow X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341225645 -3600 # Node ID d4e4ef1d390fd2d2b0f589c6b30787dde50e5f2c # Parent 7ef0b3122c0ed1c7f531cf62ecc59d720c8061ae xl: ensure handle_domain & preserve_domain update the global domid not a shadow xl keeps the current domid in a global variable, however it also has various functions (including the two above) which take a domid parameter which shadows this. This fixes the issue introduced by 25563:dbf54d93ac40 "xl: initialise domid to an explicitly invalid value" but does not tackle the wider problem. Signed-off-by: Ian Campbell Acked-by: Roger Pau Monne Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r 7ef0b3122c0e -r d4e4ef1d390f tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Fri Jun 29 17:57:07 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Mon Jul 02 11:40:45 2012 +0100 @@ -1328,8 +1328,9 @@ static void reload_domain_config(uint32_ } /* Returns 1 if domain should be restarted, - * 2 if domain should be renamed then restarted, or 0 */ -static int handle_domain_death(uint32_t domid, + * 2 if domain should be renamed then restarted, or 0 + * Can update r_domid if domain is destroyed etc */ +static int handle_domain_death(uint32_t *r_domid, libxl_event *event, uint8_t **config_data, int *config_len, libxl_domain_config *d_config) @@ -1372,7 +1373,7 @@ static int handle_domain_death(uint32_t LOG("failed to construct core dump path"); } else { LOG("dumping core to %s", corefile); - rc=libxl_domain_core_dump(ctx, domid, corefile, NULL); + rc=libxl_domain_core_dump(ctx, *r_domid, corefile, NULL); if (rc) LOG("core dump failed (rc=%d).", rc); } /* No point crying over spilled milk, continue on failure. */ @@ -1388,19 +1389,20 @@ static int handle_domain_death(uint32_t break; case LIBXL_ACTION_ON_SHUTDOWN_RESTART_RENAME: - reload_domain_config(domid, config_data, config_len); + reload_domain_config(*r_domid, config_data, config_len); restart = 2; break; case LIBXL_ACTION_ON_SHUTDOWN_RESTART: - reload_domain_config(domid, config_data, config_len); + reload_domain_config(*r_domid, config_data, config_len); restart = 1; /* fall-through */ case LIBXL_ACTION_ON_SHUTDOWN_DESTROY: - LOG("Domain %d needs to be cleaned up: destroying the domain", domid); - libxl_domain_destroy(ctx, domid); - domid = INVALID_DOMID; + LOG("Domain %d needs to be cleaned up: destroying the domain", + *r_domid); + libxl_domain_destroy(ctx, *r_domid); + *r_domid = INVALID_DOMID; break; case LIBXL_ACTION_ON_SHUTDOWN_COREDUMP_DESTROY: @@ -1430,7 +1432,8 @@ static void replace_string(char **str, c } -static int preserve_domain(uint32_t domid, libxl_event *event, +/* Preserve a copy of a domain under a new name. Updates *r_domid */ +static int preserve_domain(uint32_t *r_domid, libxl_event *event, libxl_domain_config *d_config) { time_t now; @@ -1460,14 +1463,16 @@ static int preserve_domain(uint32_t domi libxl_uuid_generate(&new_uuid); - LOG("Preserving domain %d %s with suffix%s", domid, d_config->c_info.name, stime); - rc = libxl_domain_preserve(ctx, domid, &d_config->c_info, stime, new_uuid); + LOG("Preserving domain %d %s with suffix%s", + *r_domid, d_config->c_info.name, stime); + rc = libxl_domain_preserve(ctx, *r_domid, &d_config->c_info, + stime, new_uuid); /* - * Although domid still exists it is no longer the one we are concerned - * with. + * Although the domain still exists it is no longer the one we are + * concerned with. */ - domid = INVALID_DOMID; + *r_domid = INVALID_DOMID; return rc == 0 ? 1 : 0; } @@ -1921,11 +1926,11 @@ start: LOG("Domain %d has shut down, reason code %d 0x%x", domid, event->u.domain_shutdown.shutdown_reason, event->u.domain_shutdown.shutdown_reason); - switch (handle_domain_death(domid, event, + switch (handle_domain_death(&domid, event, (uint8_t **)&config_data, &config_len, &d_config)) { case 2: - if (!preserve_domain(domid, event, &d_config)) { + if (!preserve_domain(&domid, event, &d_config)) { /* If we fail then exit leaving the old domain in place. */ ret = -1; goto out; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:46 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwM-0005WV-BP; Wed, 04 Jul 2012 04:11:46 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwI-0005M1-7i for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:42 +0000 Received: from [85.158.138.51:39844] by server-2.bemta-3.messagelabs.com id 25/0E-10266-D72C3FF4; Wed, 04 Jul 2012 04:11:41 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-174.messagelabs.com!1341375100!30872599!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26433 invoked from network); 4 Jul 2012 04:11:40 -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; 4 Jul 2012 04:11:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwF-0002lR-RL for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGwF-00041C-QD for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:39 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:39 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: Upgrade guest barriers to Outer-Shareable. Enable Protected Table Walk. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341309147 -3600 # Node ID 94984e45e189479c2bc7abb703044d2a5c9bf965 # Parent a9d004e63315936a7e3dec2afc6f48361d24573e arm: Upgrade guest barriers to Outer-Shareable. Enable Protected Table Walk. Upgrading barriers is conservative and may not be necessary. Protected Table Walk traps stage 1 page tables which refer to device memory (per stage 2) using a non-device mapping. This generally indicates a guest error but trapping it as a fault for now helps us know if something odd is going on. Signed-off-by: Ian Campbell Acked-by: Tim Deegan Committed-by: Ian Campbell --- diff -r a9d004e63315 -r 94984e45e189 xen/arch/arm/domain_build.c --- a/xen/arch/arm/domain_build.c Tue Jul 03 10:52:26 2012 +0100 +++ b/xen/arch/arm/domain_build.c Tue Jul 03 10:52:27 2012 +0100 @@ -333,7 +333,7 @@ int construct_dom0(struct domain *d) WRITE_CP32(SCTLR_BASE, SCTLR); - WRITE_CP32(HCR_AMO|HCR_IMO|HCR_VM, HCR); + WRITE_CP32(HCR_PTW|HCR_BSU_OUTER|HCR_AMO|HCR_IMO|HCR_VM, HCR); isb(); local_abort_enable(); diff -r a9d004e63315 -r 94984e45e189 xen/include/asm-arm/processor.h --- a/xen/include/asm-arm/processor.h Tue Jul 03 10:52:26 2012 +0100 +++ b/xen/include/asm-arm/processor.h Tue Jul 03 10:52:27 2012 +0100 @@ -76,6 +76,10 @@ #define HCR_TWI (1<<13) #define HCR_DC (1<<12) #define HCR_BSU_MASK (3<<10) +#define HCR_BSU_NONE (0<<10) +#define HCR_BSU_INNER (1<<10) +#define HCR_BSU_OUTER (2<<10) +#define HCR_BSU_FULL (3<<10) #define HCR_FB (1<<9) #define HCR_VA (1<<8) #define HCR_VI (1<<7) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:46 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwM-0005Ww-GF; Wed, 04 Jul 2012 04:11:46 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwI-0005L3-Ca for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:42 +0000 Received: from [85.158.143.35:29152] by server-3.bemta-4.messagelabs.com id 74/F6-05808-E72C3FF4; Wed, 04 Jul 2012 04:11:42 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-21.messagelabs.com!1341375098!16353642!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2560 invoked from network); 4 Jul 2012 04:11:39 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwE-0002l7-5x for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGwE-00040S-4t for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:38 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:37 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: make vgic lock safe for use in interrupt context. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1341309145 -3600 # Node ID 47a289c3b8f50b2b11d3e4b767395a8acfd027bc # Parent 2903a2dc7749005357834a163c7bce05f75d6c1e arm: make vgic lock safe for use in interrupt context. In particular vgic_vcpu_inject_irq can be called in both interrupt and regular context. Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini Committed-by: Ian Campbell --- diff -r 2903a2dc7749 -r 47a289c3b8f5 xen/arch/arm/gic.c --- a/xen/arch/arm/gic.c Tue Jul 03 10:52:24 2012 +0100 +++ b/xen/arch/arm/gic.c Tue Jul 03 10:52:25 2012 +0100 @@ -604,14 +604,14 @@ static void maintenance_interrupt(int ir } spin_unlock(&gic.lock); - spin_lock(¤t->arch.vgic.lock); + spin_lock_irq(¤t->arch.vgic.lock); p = irq_to_pending(current, virq); if ( p->desc != NULL ) { p->desc->status &= ~IRQ_INPROGRESS; GICC[GICC_DIR] = virq; } list_del_init(&p->inflight); - spin_unlock(¤t->arch.vgic.lock); + spin_unlock_irq(¤t->arch.vgic.lock); i++; } diff -r 2903a2dc7749 -r 47a289c3b8f5 xen/arch/arm/vgic.c --- a/xen/arch/arm/vgic.c Tue Jul 03 10:52:24 2012 +0100 +++ b/xen/arch/arm/vgic.c Tue Jul 03 10:52:25 2012 +0100 @@ -114,8 +114,8 @@ int vcpu_vgic_init(struct vcpu *v) return 0; } -#define vgic_lock(v) spin_lock(&(v)->domain->arch.vgic.lock) -#define vgic_unlock(v) spin_unlock(&(v)->domain->arch.vgic.lock) +#define vgic_lock(v) spin_lock_irq(&(v)->domain->arch.vgic.lock) +#define vgic_unlock(v) spin_unlock_irq(&(v)->domain->arch.vgic.lock) #define vgic_lock_rank(v, r) spin_lock(&(r)->lock) #define vgic_unlock_rank(v, r) spin_unlock(&(r)->lock) @@ -550,6 +550,7 @@ void vgic_vcpu_inject_irq(struct vcpu *v uint8_t priority; struct vgic_irq_rank *rank = vgic_irq_rank(v, 8, idx); struct pending_irq *iter, *n = irq_to_pending(v, irq); + unsigned long flags; /* irq still pending */ if (!list_empty(&n->inflight)) @@ -566,18 +567,18 @@ void vgic_vcpu_inject_irq(struct vcpu *v gic_set_guest_irq(irq, GICH_LR_PENDING, priority); - spin_lock(&v->arch.vgic.lock); + spin_lock_irqsave(&v->arch.vgic.lock, flags); list_for_each_entry ( iter, &v->arch.vgic.inflight_irqs, inflight ) { if ( iter->priority > priority ) { list_add_tail(&n->inflight, &iter->inflight); - spin_unlock(&v->arch.vgic.lock); + spin_unlock_irqrestore(&v->arch.vgic.lock, flags); return; } } list_add_tail(&n->inflight, &v->arch.vgic.inflight_irqs); - spin_unlock(&v->arch.vgic.lock); + spin_unlock_irqrestore(&v->arch.vgic.lock, flags); /* we have a new higher priority irq, inject it into the guest */ } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:46 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwM-0005WV-BP; Wed, 04 Jul 2012 04:11:46 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwI-0005M1-7i for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:42 +0000 Received: from [85.158.138.51:39844] by server-2.bemta-3.messagelabs.com id 25/0E-10266-D72C3FF4; Wed, 04 Jul 2012 04:11:41 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-174.messagelabs.com!1341375100!30872599!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26433 invoked from network); 4 Jul 2012 04:11:40 -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; 4 Jul 2012 04:11:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwF-0002lR-RL for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGwF-00041C-QD for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:39 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:39 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: Upgrade guest barriers to Outer-Shareable. Enable Protected Table Walk. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341309147 -3600 # Node ID 94984e45e189479c2bc7abb703044d2a5c9bf965 # Parent a9d004e63315936a7e3dec2afc6f48361d24573e arm: Upgrade guest barriers to Outer-Shareable. Enable Protected Table Walk. Upgrading barriers is conservative and may not be necessary. Protected Table Walk traps stage 1 page tables which refer to device memory (per stage 2) using a non-device mapping. This generally indicates a guest error but trapping it as a fault for now helps us know if something odd is going on. Signed-off-by: Ian Campbell Acked-by: Tim Deegan Committed-by: Ian Campbell --- diff -r a9d004e63315 -r 94984e45e189 xen/arch/arm/domain_build.c --- a/xen/arch/arm/domain_build.c Tue Jul 03 10:52:26 2012 +0100 +++ b/xen/arch/arm/domain_build.c Tue Jul 03 10:52:27 2012 +0100 @@ -333,7 +333,7 @@ int construct_dom0(struct domain *d) WRITE_CP32(SCTLR_BASE, SCTLR); - WRITE_CP32(HCR_AMO|HCR_IMO|HCR_VM, HCR); + WRITE_CP32(HCR_PTW|HCR_BSU_OUTER|HCR_AMO|HCR_IMO|HCR_VM, HCR); isb(); local_abort_enable(); diff -r a9d004e63315 -r 94984e45e189 xen/include/asm-arm/processor.h --- a/xen/include/asm-arm/processor.h Tue Jul 03 10:52:26 2012 +0100 +++ b/xen/include/asm-arm/processor.h Tue Jul 03 10:52:27 2012 +0100 @@ -76,6 +76,10 @@ #define HCR_TWI (1<<13) #define HCR_DC (1<<12) #define HCR_BSU_MASK (3<<10) +#define HCR_BSU_NONE (0<<10) +#define HCR_BSU_INNER (1<<10) +#define HCR_BSU_OUTER (2<<10) +#define HCR_BSU_FULL (3<<10) #define HCR_FB (1<<9) #define HCR_VA (1<<8) #define HCR_VI (1<<7) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:46 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwM-0005Ww-GF; Wed, 04 Jul 2012 04:11:46 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwI-0005L3-Ca for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:42 +0000 Received: from [85.158.143.35:29152] by server-3.bemta-4.messagelabs.com id 74/F6-05808-E72C3FF4; Wed, 04 Jul 2012 04:11:42 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-21.messagelabs.com!1341375098!16353642!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2560 invoked from network); 4 Jul 2012 04:11:39 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwE-0002l7-5x for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGwE-00040S-4t for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:38 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:37 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: make vgic lock safe for use in interrupt context. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1341309145 -3600 # Node ID 47a289c3b8f50b2b11d3e4b767395a8acfd027bc # Parent 2903a2dc7749005357834a163c7bce05f75d6c1e arm: make vgic lock safe for use in interrupt context. In particular vgic_vcpu_inject_irq can be called in both interrupt and regular context. Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini Committed-by: Ian Campbell --- diff -r 2903a2dc7749 -r 47a289c3b8f5 xen/arch/arm/gic.c --- a/xen/arch/arm/gic.c Tue Jul 03 10:52:24 2012 +0100 +++ b/xen/arch/arm/gic.c Tue Jul 03 10:52:25 2012 +0100 @@ -604,14 +604,14 @@ static void maintenance_interrupt(int ir } spin_unlock(&gic.lock); - spin_lock(¤t->arch.vgic.lock); + spin_lock_irq(¤t->arch.vgic.lock); p = irq_to_pending(current, virq); if ( p->desc != NULL ) { p->desc->status &= ~IRQ_INPROGRESS; GICC[GICC_DIR] = virq; } list_del_init(&p->inflight); - spin_unlock(¤t->arch.vgic.lock); + spin_unlock_irq(¤t->arch.vgic.lock); i++; } diff -r 2903a2dc7749 -r 47a289c3b8f5 xen/arch/arm/vgic.c --- a/xen/arch/arm/vgic.c Tue Jul 03 10:52:24 2012 +0100 +++ b/xen/arch/arm/vgic.c Tue Jul 03 10:52:25 2012 +0100 @@ -114,8 +114,8 @@ int vcpu_vgic_init(struct vcpu *v) return 0; } -#define vgic_lock(v) spin_lock(&(v)->domain->arch.vgic.lock) -#define vgic_unlock(v) spin_unlock(&(v)->domain->arch.vgic.lock) +#define vgic_lock(v) spin_lock_irq(&(v)->domain->arch.vgic.lock) +#define vgic_unlock(v) spin_unlock_irq(&(v)->domain->arch.vgic.lock) #define vgic_lock_rank(v, r) spin_lock(&(r)->lock) #define vgic_unlock_rank(v, r) spin_unlock(&(r)->lock) @@ -550,6 +550,7 @@ void vgic_vcpu_inject_irq(struct vcpu *v uint8_t priority; struct vgic_irq_rank *rank = vgic_irq_rank(v, 8, idx); struct pending_irq *iter, *n = irq_to_pending(v, irq); + unsigned long flags; /* irq still pending */ if (!list_empty(&n->inflight)) @@ -566,18 +567,18 @@ void vgic_vcpu_inject_irq(struct vcpu *v gic_set_guest_irq(irq, GICH_LR_PENDING, priority); - spin_lock(&v->arch.vgic.lock); + spin_lock_irqsave(&v->arch.vgic.lock, flags); list_for_each_entry ( iter, &v->arch.vgic.inflight_irqs, inflight ) { if ( iter->priority > priority ) { list_add_tail(&n->inflight, &iter->inflight); - spin_unlock(&v->arch.vgic.lock); + spin_unlock_irqrestore(&v->arch.vgic.lock, flags); return; } } list_add_tail(&n->inflight, &v->arch.vgic.inflight_irqs); - spin_unlock(&v->arch.vgic.lock); + spin_unlock_irqrestore(&v->arch.vgic.lock, flags); /* we have a new higher priority irq, inject it into the guest */ } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:48 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwO-0005Zv-5Q; Wed, 04 Jul 2012 04:11:48 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwI-0005L3-Tx for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:43 +0000 Received: from [85.158.143.35:29162] by server-3.bemta-4.messagelabs.com id 15/F6-05808-E72C3FF4; Wed, 04 Jul 2012 04:11:42 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-21.messagelabs.com!1341375101!17033570!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1053 invoked from network); 4 Jul 2012 04:11:41 -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; 4 Jul 2012 04:11:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwG-0002ld-SF for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGwG-00041h-RF for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:40 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:40 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: context switch virtual timer registers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341309149 -3600 # Node ID 1b7c5fbfbcdf146c9bc99b2ef768aea79dda28cf # Parent 126681c08a6274e07861c455cf7d59d107b78296 arm: context switch virtual timer registers Signed-off-by: Ian Campbell Acked-by: Tim Deegan Committed-by: Ian Campbell --- diff -r 126681c08a62 -r 1b7c5fbfbcdf xen/arch/arm/domain.c --- a/xen/arch/arm/domain.c Tue Jul 03 10:52:28 2012 +0100 +++ b/xen/arch/arm/domain.c Tue Jul 03 10:52:29 2012 +0100 @@ -49,6 +49,11 @@ static void ctxt_switch_from(struct vcpu p->arch.tpidruro = READ_CP32(TPIDRURO); p->arch.tpidrprw = READ_CP32(TPIDRPRW); + /* Arch timer */ + p->arch.cntvoff = READ_CP64(CNTVOFF); + p->arch.cntv_cval = READ_CP64(CNTV_CVAL); + p->arch.cntv_ctl = READ_CP32(CNTV_CTL); + /* XXX only save these if ThumbEE e.g. ID_PFR0.THUMB_EE_SUPPORT */ p->arch.teecr = READ_CP32(TEECR); p->arch.teehbr = READ_CP32(TEEHBR); @@ -128,6 +133,11 @@ static void ctxt_switch_to(struct vcpu * WRITE_CP32(n->arch.mair1, MAIR1); isb(); + /* Arch timer */ + WRITE_CP64(n->arch.cntvoff, CNTVOFF); + WRITE_CP64(n->arch.cntv_cval, CNTV_CVAL); + WRITE_CP32(n->arch.cntv_ctl, CNTV_CTL); + /* Control Registers */ WRITE_CP32(n->arch.actlr, ACTLR); WRITE_CP32(n->arch.sctlr, SCTLR); diff -r 126681c08a62 -r 1b7c5fbfbcdf xen/include/asm-arm/cpregs.h --- a/xen/include/asm-arm/cpregs.h Tue Jul 03 10:52:28 2012 +0100 +++ b/xen/include/asm-arm/cpregs.h Tue Jul 03 10:52:29 2012 +0100 @@ -238,10 +238,13 @@ #define CNTP_CTL p15,0,c14,c2,1 /* Physical Timer control register */ #define CNTVCT p15,1,c14 /* Time counter value + offset */ #define CNTP_CVAL p15,2,c14 /* Physical Timer comparator */ +#define CNTV_CVAL p15,3,c14 /* Virt. Timer comparator */ #define CNTVOFF p15,4,c14 /* Time counter offset */ #define CNTHCTL p15,4,c14,c1,0 /* Time counter hyp. control */ #define CNTHP_TVAL p15,4,c14,c2,0 /* Hyp. Timer value */ #define CNTHP_CTL p15,4,c14,c2,1 /* Hyp. Timer control register */ +#define CNTV_TVAL p15,0,c14,c3,0 /* Virt. Timer value */ +#define CNTV_CTL p15,0,c14,c3,1 /* Virt. TImer control register */ #define CNTHP_CVAL p15,6,c14 /* Hyp. Timer comparator */ /* CP15 CR15: Implementation Defined Registers */ diff -r 126681c08a62 -r 1b7c5fbfbcdf xen/include/asm-arm/domain.h --- a/xen/include/asm-arm/domain.h Tue Jul 03 10:52:28 2012 +0100 +++ b/xen/include/asm-arm/domain.h Tue Jul 03 10:52:29 2012 +0100 @@ -111,6 +111,11 @@ struct arch_vcpu uint32_t teecr, teehbr; uint32_t joscr, jmcr; + /* Arch timers */ + uint64_t cntvoff; + uint64_t cntv_cval; + uint32_t cntv_ctl; + /* CP 15 */ uint32_t csselr; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:48 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwO-0005Zv-5Q; Wed, 04 Jul 2012 04:11:48 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwI-0005L3-Tx for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:43 +0000 Received: from [85.158.143.35:29162] by server-3.bemta-4.messagelabs.com id 15/F6-05808-E72C3FF4; Wed, 04 Jul 2012 04:11:42 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-21.messagelabs.com!1341375101!17033570!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1053 invoked from network); 4 Jul 2012 04:11:41 -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; 4 Jul 2012 04:11:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwG-0002ld-SF for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGwG-00041h-RF for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:40 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:40 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: context switch virtual timer registers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341309149 -3600 # Node ID 1b7c5fbfbcdf146c9bc99b2ef768aea79dda28cf # Parent 126681c08a6274e07861c455cf7d59d107b78296 arm: context switch virtual timer registers Signed-off-by: Ian Campbell Acked-by: Tim Deegan Committed-by: Ian Campbell --- diff -r 126681c08a62 -r 1b7c5fbfbcdf xen/arch/arm/domain.c --- a/xen/arch/arm/domain.c Tue Jul 03 10:52:28 2012 +0100 +++ b/xen/arch/arm/domain.c Tue Jul 03 10:52:29 2012 +0100 @@ -49,6 +49,11 @@ static void ctxt_switch_from(struct vcpu p->arch.tpidruro = READ_CP32(TPIDRURO); p->arch.tpidrprw = READ_CP32(TPIDRPRW); + /* Arch timer */ + p->arch.cntvoff = READ_CP64(CNTVOFF); + p->arch.cntv_cval = READ_CP64(CNTV_CVAL); + p->arch.cntv_ctl = READ_CP32(CNTV_CTL); + /* XXX only save these if ThumbEE e.g. ID_PFR0.THUMB_EE_SUPPORT */ p->arch.teecr = READ_CP32(TEECR); p->arch.teehbr = READ_CP32(TEEHBR); @@ -128,6 +133,11 @@ static void ctxt_switch_to(struct vcpu * WRITE_CP32(n->arch.mair1, MAIR1); isb(); + /* Arch timer */ + WRITE_CP64(n->arch.cntvoff, CNTVOFF); + WRITE_CP64(n->arch.cntv_cval, CNTV_CVAL); + WRITE_CP32(n->arch.cntv_ctl, CNTV_CTL); + /* Control Registers */ WRITE_CP32(n->arch.actlr, ACTLR); WRITE_CP32(n->arch.sctlr, SCTLR); diff -r 126681c08a62 -r 1b7c5fbfbcdf xen/include/asm-arm/cpregs.h --- a/xen/include/asm-arm/cpregs.h Tue Jul 03 10:52:28 2012 +0100 +++ b/xen/include/asm-arm/cpregs.h Tue Jul 03 10:52:29 2012 +0100 @@ -238,10 +238,13 @@ #define CNTP_CTL p15,0,c14,c2,1 /* Physical Timer control register */ #define CNTVCT p15,1,c14 /* Time counter value + offset */ #define CNTP_CVAL p15,2,c14 /* Physical Timer comparator */ +#define CNTV_CVAL p15,3,c14 /* Virt. Timer comparator */ #define CNTVOFF p15,4,c14 /* Time counter offset */ #define CNTHCTL p15,4,c14,c1,0 /* Time counter hyp. control */ #define CNTHP_TVAL p15,4,c14,c2,0 /* Hyp. Timer value */ #define CNTHP_CTL p15,4,c14,c2,1 /* Hyp. Timer control register */ +#define CNTV_TVAL p15,0,c14,c3,0 /* Virt. Timer value */ +#define CNTV_CTL p15,0,c14,c3,1 /* Virt. TImer control register */ #define CNTHP_CVAL p15,6,c14 /* Hyp. Timer comparator */ /* CP15 CR15: Implementation Defined Registers */ diff -r 126681c08a62 -r 1b7c5fbfbcdf xen/include/asm-arm/domain.h --- a/xen/include/asm-arm/domain.h Tue Jul 03 10:52:28 2012 +0100 +++ b/xen/include/asm-arm/domain.h Tue Jul 03 10:52:29 2012 +0100 @@ -111,6 +111,11 @@ struct arch_vcpu uint32_t teecr, teehbr; uint32_t joscr, jmcr; + /* Arch timers */ + uint64_t cntvoff; + uint64_t cntv_cval; + uint32_t cntv_ctl; + /* CP 15 */ uint32_t csselr; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:48 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwO-0005aw-Hd; Wed, 04 Jul 2012 04:11:48 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwI-0005NV-Qh for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:43 +0000 Received: from [85.158.143.35:39039] by server-1.bemta-4.messagelabs.com id AF/DE-24392-E72C3FF4; Wed, 04 Jul 2012 04:11:42 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-21.messagelabs.com!1341375100!19456189!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27761 invoked from network); 4 Jul 2012 04:11:41 -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; 4 Jul 2012 04:11:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwG-0002lY-BX for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGwG-00041R-AV for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:40 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:39 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: gic.lock can be taken in interrupt context, so lock appropriately. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341309148 -3600 # Node ID 126681c08a6274e07861c455cf7d59d107b78296 # Parent 94984e45e189479c2bc7abb703044d2a5c9bf965 arm: gic.lock can be taken in interrupt context, so lock appropriately. In particular it is taken by gic_set_guest_irq which is called by vgic_vcpu_inject_irq Signed-off-by: Ian Campbell Acked-by: Tim Deegan Committed-by: Ian Campbell --- diff -r 94984e45e189 -r 126681c08a62 xen/arch/arm/gic.c --- a/xen/arch/arm/gic.c Tue Jul 03 10:52:27 2012 +0100 +++ b/xen/arch/arm/gic.c Tue Jul 03 10:52:28 2012 +0100 @@ -329,19 +329,19 @@ 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(&gic.lock); + spin_lock_irq(&gic.lock); gic_cpu_init(); gic_hyp_init(); - spin_unlock(&gic.lock); + spin_unlock_irq(&gic.lock); } /* Shut down the per-CPU GIC interface */ void gic_disable_cpu(void) { - spin_lock(&gic.lock); + spin_lock_irq(&gic.lock); gic_cpu_disable(); gic_hyp_disable(); - spin_unlock(&gic.lock); + spin_unlock_irq(&gic.lock); } void gic_route_irqs(void) @@ -439,7 +439,7 @@ void gic_set_guest_irq(unsigned int virt events_maintenance(current); - spin_lock(&gic.lock); + spin_lock_irq(&gic.lock); if ( list_empty(&gic.lr_pending) ) { @@ -465,7 +465,7 @@ void gic_set_guest_irq(unsigned int virt list_add_tail(&n->lr_queue, &gic.lr_pending); out: - spin_unlock(&gic.lock); + spin_unlock_irq(&gic.lock); return; } @@ -557,7 +557,7 @@ static void events_maintenance(struct vc (unsigned long *)&vcpu_info(v, evtchn_upcall_pending)); if (!already_pending && gic.event_mask != 0) { - spin_lock(&gic.lock); + spin_lock_irq(&gic.lock); while ((i = find_next_bit((const long unsigned int *) &gic.event_mask, sizeof(uint64_t), i)) < sizeof(uint64_t)) { @@ -567,7 +567,7 @@ static void events_maintenance(struct vc i++; } - spin_unlock(&gic.lock); + spin_unlock_irq(&gic.lock); } } @@ -583,7 +583,7 @@ static void maintenance_interrupt(int ir sizeof(eisr), i)) < sizeof(eisr)) { struct pending_irq *p; - spin_lock(&gic.lock); + spin_lock_irq(&gic.lock); lr = GICH[GICH_LR + i]; virq = lr & GICH_LR_VIRTUAL_MASK; GICH[GICH_LR + i] = 0; @@ -599,7 +599,7 @@ static void maintenance_interrupt(int ir } else { gic_inject_irq_stop(); } - spin_unlock(&gic.lock); + spin_unlock_irq(&gic.lock); spin_lock_irq(¤t->arch.vgic.lock); p = irq_to_pending(current, virq); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:48 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwO-0005aw-Hd; Wed, 04 Jul 2012 04:11:48 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwI-0005NV-Qh for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:43 +0000 Received: from [85.158.143.35:39039] by server-1.bemta-4.messagelabs.com id AF/DE-24392-E72C3FF4; Wed, 04 Jul 2012 04:11:42 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-21.messagelabs.com!1341375100!19456189!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27761 invoked from network); 4 Jul 2012 04:11:41 -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; 4 Jul 2012 04:11:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwG-0002lY-BX for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGwG-00041R-AV for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:40 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:39 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: gic.lock can be taken in interrupt context, so lock appropriately. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341309148 -3600 # Node ID 126681c08a6274e07861c455cf7d59d107b78296 # Parent 94984e45e189479c2bc7abb703044d2a5c9bf965 arm: gic.lock can be taken in interrupt context, so lock appropriately. In particular it is taken by gic_set_guest_irq which is called by vgic_vcpu_inject_irq Signed-off-by: Ian Campbell Acked-by: Tim Deegan Committed-by: Ian Campbell --- diff -r 94984e45e189 -r 126681c08a62 xen/arch/arm/gic.c --- a/xen/arch/arm/gic.c Tue Jul 03 10:52:27 2012 +0100 +++ b/xen/arch/arm/gic.c Tue Jul 03 10:52:28 2012 +0100 @@ -329,19 +329,19 @@ 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(&gic.lock); + spin_lock_irq(&gic.lock); gic_cpu_init(); gic_hyp_init(); - spin_unlock(&gic.lock); + spin_unlock_irq(&gic.lock); } /* Shut down the per-CPU GIC interface */ void gic_disable_cpu(void) { - spin_lock(&gic.lock); + spin_lock_irq(&gic.lock); gic_cpu_disable(); gic_hyp_disable(); - spin_unlock(&gic.lock); + spin_unlock_irq(&gic.lock); } void gic_route_irqs(void) @@ -439,7 +439,7 @@ void gic_set_guest_irq(unsigned int virt events_maintenance(current); - spin_lock(&gic.lock); + spin_lock_irq(&gic.lock); if ( list_empty(&gic.lr_pending) ) { @@ -465,7 +465,7 @@ void gic_set_guest_irq(unsigned int virt list_add_tail(&n->lr_queue, &gic.lr_pending); out: - spin_unlock(&gic.lock); + spin_unlock_irq(&gic.lock); return; } @@ -557,7 +557,7 @@ static void events_maintenance(struct vc (unsigned long *)&vcpu_info(v, evtchn_upcall_pending)); if (!already_pending && gic.event_mask != 0) { - spin_lock(&gic.lock); + spin_lock_irq(&gic.lock); while ((i = find_next_bit((const long unsigned int *) &gic.event_mask, sizeof(uint64_t), i)) < sizeof(uint64_t)) { @@ -567,7 +567,7 @@ static void events_maintenance(struct vc i++; } - spin_unlock(&gic.lock); + spin_unlock_irq(&gic.lock); } } @@ -583,7 +583,7 @@ static void maintenance_interrupt(int ir sizeof(eisr), i)) < sizeof(eisr)) { struct pending_irq *p; - spin_lock(&gic.lock); + spin_lock_irq(&gic.lock); lr = GICH[GICH_LR + i]; virq = lr & GICH_LR_VIRTUAL_MASK; GICH[GICH_LR + i] = 0; @@ -599,7 +599,7 @@ static void maintenance_interrupt(int ir } else { gic_inject_irq_stop(); } - spin_unlock(&gic.lock); + spin_unlock_irq(&gic.lock); spin_lock_irq(¤t->arch.vgic.lock); p = irq_to_pending(current, virq); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:49 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwP-0005bt-1X; Wed, 04 Jul 2012 04:11:49 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwJ-0005Dk-J6 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:43 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-27.messagelabs.com!1341375095!2235251!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24286 invoked from network); 4 Jul 2012 04:11:36 -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; 4 Jul 2012 04:11:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwB-0002kl-2W for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGwB-0003yw-1V for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:35 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:34 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] x86/hvm: fix BUFIOREQ evtchn init for a stubdom X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Anthony PERARD # Date 1341301708 -7200 # Node ID 52942b34a1705723669cad5e9abd7f8883077ac4 # Parent d4e4ef1d390fd2d2b0f589c6b30787dde50e5f2c x86/hvm: fix BUFIOREQ evtchn init for a stubdom This is a missing part from the previous patch that add the BUFIOREQ_EVTCHN parameter. This patch changes the ownership of the buifioreq event channel to the stubdom (when HVM_PARAM_DM_DOMAIN is set within the stubdom). This patch introduces an helper to replace a xen port. This fix the initialization of QEMU inside the stubdomain. Signed-off-by: Anthony PERARD Add error handling to first invocation of hvm_replace_event_channel(). Adjust type of hvm_replace_event_channel()'s second parameter. Signed-off-by: Jan Beulich Committed-by: Jan Beulich --- diff -r d4e4ef1d390f -r 52942b34a170 xen/arch/x86/hvm/hvm.c --- a/xen/arch/x86/hvm/hvm.c Mon Jul 02 11:40:45 2012 +0100 +++ b/xen/arch/x86/hvm/hvm.c Tue Jul 03 09:48:28 2012 +0200 @@ -3664,6 +3664,21 @@ static int hvmop_flush_tlb_all(void) return 0; } +static int hvm_replace_event_channel(struct vcpu *v, domid_t remote_domid, + int *p_port) +{ + int old_port, new_port; + + new_port = alloc_unbound_xen_event_channel(v, remote_domid, NULL); + if ( new_port < 0 ) + return new_port; + + /* xchg() ensures that only we call free_xen_event_channel(). */ + old_port = xchg(p_port, new_port); + free_xen_event_channel(v, old_port); + return 0; +} + long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE(void) arg) { @@ -3774,20 +3789,23 @@ long do_hvm_op(unsigned long op, XEN_GUE rc = 0; domain_pause(d); /* safe to change per-vcpu xen_port */ + if ( d->vcpu[0] ) + rc = hvm_replace_event_channel(d->vcpu[0], a.value, + (int *)&d->vcpu[0]->domain->arch.hvm_domain.params + [HVM_PARAM_BUFIOREQ_EVTCHN]); + if ( rc ) + { + domain_unpause(d); + break; + } iorp = &d->arch.hvm_domain.ioreq; for_each_vcpu ( d, v ) { - int old_port, new_port; - new_port = alloc_unbound_xen_event_channel( - v, a.value, NULL); - if ( new_port < 0 ) - { - rc = new_port; + rc = hvm_replace_event_channel(v, a.value, + &v->arch.hvm_vcpu.xen_port); + if ( rc ) break; - } - /* xchg() ensures that only we free_xen_event_channel() */ - old_port = xchg(&v->arch.hvm_vcpu.xen_port, new_port); - free_xen_event_channel(v, old_port); + spin_lock(&iorp->lock); if ( iorp->va != NULL ) get_ioreq(v)->vp_eport = v->arch.hvm_vcpu.xen_port; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:49 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwP-0005bt-1X; Wed, 04 Jul 2012 04:11:49 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwJ-0005Dk-J6 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:43 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-27.messagelabs.com!1341375095!2235251!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24286 invoked from network); 4 Jul 2012 04:11:36 -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; 4 Jul 2012 04:11:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwB-0002kl-2W for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGwB-0003yw-1V for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:35 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:34 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] x86/hvm: fix BUFIOREQ evtchn init for a stubdom X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Anthony PERARD # Date 1341301708 -7200 # Node ID 52942b34a1705723669cad5e9abd7f8883077ac4 # Parent d4e4ef1d390fd2d2b0f589c6b30787dde50e5f2c x86/hvm: fix BUFIOREQ evtchn init for a stubdom This is a missing part from the previous patch that add the BUFIOREQ_EVTCHN parameter. This patch changes the ownership of the buifioreq event channel to the stubdom (when HVM_PARAM_DM_DOMAIN is set within the stubdom). This patch introduces an helper to replace a xen port. This fix the initialization of QEMU inside the stubdomain. Signed-off-by: Anthony PERARD Add error handling to first invocation of hvm_replace_event_channel(). Adjust type of hvm_replace_event_channel()'s second parameter. Signed-off-by: Jan Beulich Committed-by: Jan Beulich --- diff -r d4e4ef1d390f -r 52942b34a170 xen/arch/x86/hvm/hvm.c --- a/xen/arch/x86/hvm/hvm.c Mon Jul 02 11:40:45 2012 +0100 +++ b/xen/arch/x86/hvm/hvm.c Tue Jul 03 09:48:28 2012 +0200 @@ -3664,6 +3664,21 @@ static int hvmop_flush_tlb_all(void) return 0; } +static int hvm_replace_event_channel(struct vcpu *v, domid_t remote_domid, + int *p_port) +{ + int old_port, new_port; + + new_port = alloc_unbound_xen_event_channel(v, remote_domid, NULL); + if ( new_port < 0 ) + return new_port; + + /* xchg() ensures that only we call free_xen_event_channel(). */ + old_port = xchg(p_port, new_port); + free_xen_event_channel(v, old_port); + return 0; +} + long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE(void) arg) { @@ -3774,20 +3789,23 @@ long do_hvm_op(unsigned long op, XEN_GUE rc = 0; domain_pause(d); /* safe to change per-vcpu xen_port */ + if ( d->vcpu[0] ) + rc = hvm_replace_event_channel(d->vcpu[0], a.value, + (int *)&d->vcpu[0]->domain->arch.hvm_domain.params + [HVM_PARAM_BUFIOREQ_EVTCHN]); + if ( rc ) + { + domain_unpause(d); + break; + } iorp = &d->arch.hvm_domain.ioreq; for_each_vcpu ( d, v ) { - int old_port, new_port; - new_port = alloc_unbound_xen_event_channel( - v, a.value, NULL); - if ( new_port < 0 ) - { - rc = new_port; + rc = hvm_replace_event_channel(v, a.value, + &v->arch.hvm_vcpu.xen_port); + if ( rc ) break; - } - /* xchg() ensures that only we free_xen_event_channel() */ - old_port = xchg(&v->arch.hvm_vcpu.xen_port, new_port); - free_xen_event_channel(v, old_port); + spin_lock(&iorp->lock); if ( iorp->va != NULL ) get_ioreq(v)->vp_eport = v->arch.hvm_vcpu.xen_port; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:49 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwP-0005cj-8V; Wed, 04 Jul 2012 04:11:49 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwK-0005QC-1P for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:44 +0000 Received: from [85.158.139.83:47392] by server-6.bemta-5.messagelabs.com id 41/D2-11348-F72C3FF4; Wed, 04 Jul 2012 04:11:43 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-182.messagelabs.com!1341375101!23496388!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1540 invoked from network); 4 Jul 2012 04:11:42 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwH-0002lh-C9 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGwH-00041w-BB for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:41 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:40 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: the hyp timer seems to work in newer model versions, default to using it. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341309149 -3600 # Node ID 9faae502bb9e8a2e2eddc8368f79b1a5fc01e110 # Parent 1b7c5fbfbcdf146c9bc99b2ef768aea79dda28cf arm: the hyp timer seems to work in newer model versions, default to using it. Signed-off-by: Ian Campbell Acked-by: Tim Deegan Committed-by: Ian Campbell --- diff -r 1b7c5fbfbcdf -r 9faae502bb9e xen/arch/arm/time.c --- a/xen/arch/arm/time.c Tue Jul 03 10:52:29 2012 +0100 +++ b/xen/arch/arm/time.c Tue Jul 03 10:52:29 2012 +0100 @@ -27,8 +27,12 @@ #include #include -/* Unfortunately the hypervisor timer interrupt appears to be buggy */ -#define USE_HYP_TIMER 0 +/* + * Unfortunately the hypervisor timer interrupt appears to be buggy in + * some versions of the model. Disable this to use the physical timer + * instead. + */ +#define USE_HYP_TIMER 1 /* For fine-grained timekeeping, we use the ARM "Generic Timer", a * register-mapped time source in the SoC. */ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:49 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwP-0005cj-8V; Wed, 04 Jul 2012 04:11:49 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwK-0005QC-1P for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:44 +0000 Received: from [85.158.139.83:47392] by server-6.bemta-5.messagelabs.com id 41/D2-11348-F72C3FF4; Wed, 04 Jul 2012 04:11:43 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-182.messagelabs.com!1341375101!23496388!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1540 invoked from network); 4 Jul 2012 04:11:42 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwH-0002lh-C9 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGwH-00041w-BB for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:41 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:40 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: the hyp timer seems to work in newer model versions, default to using it. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341309149 -3600 # Node ID 9faae502bb9e8a2e2eddc8368f79b1a5fc01e110 # Parent 1b7c5fbfbcdf146c9bc99b2ef768aea79dda28cf arm: the hyp timer seems to work in newer model versions, default to using it. Signed-off-by: Ian Campbell Acked-by: Tim Deegan Committed-by: Ian Campbell --- diff -r 1b7c5fbfbcdf -r 9faae502bb9e xen/arch/arm/time.c --- a/xen/arch/arm/time.c Tue Jul 03 10:52:29 2012 +0100 +++ b/xen/arch/arm/time.c Tue Jul 03 10:52:29 2012 +0100 @@ -27,8 +27,12 @@ #include #include -/* Unfortunately the hypervisor timer interrupt appears to be buggy */ -#define USE_HYP_TIMER 0 +/* + * Unfortunately the hypervisor timer interrupt appears to be buggy in + * some versions of the model. Disable this to use the physical timer + * instead. + */ +#define USE_HYP_TIMER 1 /* For fine-grained timekeeping, we use the ARM "Generic Timer", a * register-mapped time source in the SoC. */ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:51 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwQ-0005eL-Ib; Wed, 04 Jul 2012 04:11:50 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwK-0005NV-Qn for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:44 +0000 Received: from [85.158.143.35:39097] by server-1.bemta-4.messagelabs.com id 93/EE-24392-082C3FF4; Wed, 04 Jul 2012 04:11:44 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-21.messagelabs.com!1341375103!14211801!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13007 invoked from network); 4 Jul 2012 04:11:44 -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; 4 Jul 2012 04:11:44 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwI-0002m2-U4 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGwI-00042f-Sz for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:42 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:42 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: fix typo s/approprately/appropriately/g X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341309152 -3600 # Node ID 46b201f42bf850e7d9a4cbef8fad59798898fabc # Parent 481d7293aa533a6ee6544e8727499a6dca6bb741 arm: fix typo s/approprately/appropriately/g Signed-off-by: Ian Campbell Acked-by: Tim Deegan Committed-by: Ian Campbell --- diff -r 481d7293aa53 -r 46b201f42bf8 xen/include/asm-arm/page.h --- a/xen/include/asm-arm/page.h Tue Jul 03 10:52:31 2012 +0100 +++ b/xen/include/asm-arm/page.h Tue Jul 03 10:52:32 2012 +0100 @@ -102,7 +102,7 @@ typedef struct { unsigned long af:1; /* Access Flag */ unsigned long ng:1; /* Not-Global */ - /* The base address must be approprately aligned for Block entries */ + /* The base address must be appropriately aligned for Block entries */ unsigned long base:28; /* Base address of block or next table */ unsigned long sbz:12; /* Must be zero */ @@ -137,7 +137,7 @@ typedef struct { unsigned long af:1; /* Access Flag */ unsigned long sbz4:1; - /* The base address must be approprately aligned for Block entries */ + /* The base address must be appropriately aligned for Block entries */ unsigned long base:28; /* Base address of block or next table */ unsigned long sbz3:12; @@ -162,7 +162,7 @@ typedef struct { unsigned long pad2:10; - /* The base address must be approprately aligned for Block entries */ + /* The base address must be appropriately aligned for Block entries */ unsigned long base:28; /* Base address of block or next table */ unsigned long pad1:24; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:51 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwQ-0005eL-Ib; Wed, 04 Jul 2012 04:11:50 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwK-0005NV-Qn for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:44 +0000 Received: from [85.158.143.35:39097] by server-1.bemta-4.messagelabs.com id 93/EE-24392-082C3FF4; Wed, 04 Jul 2012 04:11:44 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-21.messagelabs.com!1341375103!14211801!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13007 invoked from network); 4 Jul 2012 04:11:44 -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; 4 Jul 2012 04:11:44 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwI-0002m2-U4 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGwI-00042f-Sz for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:42 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:42 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: fix typo s/approprately/appropriately/g X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341309152 -3600 # Node ID 46b201f42bf850e7d9a4cbef8fad59798898fabc # Parent 481d7293aa533a6ee6544e8727499a6dca6bb741 arm: fix typo s/approprately/appropriately/g Signed-off-by: Ian Campbell Acked-by: Tim Deegan Committed-by: Ian Campbell --- diff -r 481d7293aa53 -r 46b201f42bf8 xen/include/asm-arm/page.h --- a/xen/include/asm-arm/page.h Tue Jul 03 10:52:31 2012 +0100 +++ b/xen/include/asm-arm/page.h Tue Jul 03 10:52:32 2012 +0100 @@ -102,7 +102,7 @@ typedef struct { unsigned long af:1; /* Access Flag */ unsigned long ng:1; /* Not-Global */ - /* The base address must be approprately aligned for Block entries */ + /* The base address must be appropriately aligned for Block entries */ unsigned long base:28; /* Base address of block or next table */ unsigned long sbz:12; /* Must be zero */ @@ -137,7 +137,7 @@ typedef struct { unsigned long af:1; /* Access Flag */ unsigned long sbz4:1; - /* The base address must be approprately aligned for Block entries */ + /* The base address must be appropriately aligned for Block entries */ unsigned long base:28; /* Base address of block or next table */ unsigned long sbz3:12; @@ -162,7 +162,7 @@ typedef struct { unsigned long pad2:10; - /* The base address must be approprately aligned for Block entries */ + /* The base address must be appropriately aligned for Block entries */ unsigned long base:28; /* Base address of block or next table */ unsigned long pad1:24; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:52 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwR-0005gu-UO; Wed, 04 Jul 2012 04:11:51 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwK-0005HQ-Un for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:45 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-27.messagelabs.com!1341375097!9774550!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16126 invoked from network); 4 Jul 2012 04:11:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwD-0002l4-Lc for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGwD-00040D-Kd for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:37 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:37 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: split pending SPIs (global) out from pending PPIs and SGIs (per 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 1341309144 -3600 # Node ID 2903a2dc7749005357834a163c7bce05f75d6c1e # Parent 6a89e6f4eadcf763a904a298e82c281f90aba896 arm: split pending SPIs (global) out from pending PPIs and SGIs (per CPU) This tracks SPIs in struct arch_domain and PPIs+SGIs in struct arch_vcpu which seems more logical. Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini Committed-by: Ian Campbell --- diff -r 6a89e6f4eadc -r 2903a2dc7749 xen/arch/arm/vgic.c --- a/xen/arch/arm/vgic.c Tue Jul 03 10:52:23 2012 +0100 +++ b/xen/arch/arm/vgic.c Tue Jul 03 10:52:24 2012 +0100 @@ -82,9 +82,8 @@ int domain_vgic_init(struct domain *d) d->arch.vgic.shared_irqs = xmalloc_array(struct vgic_irq_rank, DOMAIN_NR_RANKS(d)); d->arch.vgic.pending_irqs = - xmalloc_array(struct pending_irq, - d->arch.vgic.nr_lines + (32 * d->max_vcpus)); - for (i=0; iarch.vgic.nr_lines + (32 * d->max_vcpus); i++) + xzalloc_array(struct pending_irq, d->arch.vgic.nr_lines); + for (i=0; iarch.vgic.nr_lines; i++) INIT_LIST_HEAD(&d->arch.vgic.pending_irqs[i].inflight); for (i=0; iarch.vgic.shared_irqs[i].lock); @@ -98,6 +97,10 @@ int vcpu_vgic_init(struct vcpu *v) spin_lock_init(&v->arch.vgic.private_irqs.lock); + memset(&v->arch.vgic.pending_irqs, 0, sizeof(v->arch.vgic.pending_irqs)); + for (i = 0; i < 32; i++) + INIT_LIST_HEAD(&v->arch.vgic.pending_irqs[i].inflight); + /* For SGI and PPI the target is always this CPU */ for ( i = 0 ; i < 8 ; i++ ) v->arch.vgic.private_irqs.itargets[i] = @@ -535,8 +538,7 @@ struct pending_irq *irq_to_pending(struc /* Pending irqs allocation strategy: the first vgic.nr_lines irqs * are used for SPIs; the rests are used for per cpu irqs */ if ( irq < 32 ) - n = &v->domain->arch.vgic.pending_irqs[irq + (v->vcpu_id * 32) - + v->domain->arch.vgic.nr_lines]; + n = &v->arch.vgic.pending_irqs[irq]; else n = &v->domain->arch.vgic.pending_irqs[irq - 32]; return n; diff -r 6a89e6f4eadc -r 2903a2dc7749 xen/include/asm-arm/domain.h --- a/xen/include/asm-arm/domain.h Tue Jul 03 10:52:23 2012 +0100 +++ b/xen/include/asm-arm/domain.h Tue Jul 03 10:52:24 2012 +0100 @@ -46,6 +46,10 @@ struct arch_domain int ctlr; int nr_lines; struct vgic_irq_rank *shared_irqs; + /* + * SPIs are domain global, SGIs and PPIs are per-VCPU and stored in + * struct arch_vcpu. + */ struct pending_irq *pending_irqs; } vgic; @@ -114,7 +118,13 @@ struct arch_vcpu uint32_t gic_lr[64]; struct { + /* + * SGIs and PPIs are per-VCPU, SPIs are domain global and in + * struct arch_domain. + */ + struct pending_irq pending_irqs[32]; struct vgic_irq_rank private_irqs; + /* This list is ordered by IRQ priority and it is used to keep * track of the IRQs that the VGIC injected into the guest. * Depending on the availability of LR registers, the IRQs might _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:52 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwR-0005gu-UO; Wed, 04 Jul 2012 04:11:51 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwK-0005HQ-Un for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:45 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-27.messagelabs.com!1341375097!9774550!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16126 invoked from network); 4 Jul 2012 04:11:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwD-0002l4-Lc for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGwD-00040D-Kd for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:37 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:37 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: split pending SPIs (global) out from pending PPIs and SGIs (per 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 1341309144 -3600 # Node ID 2903a2dc7749005357834a163c7bce05f75d6c1e # Parent 6a89e6f4eadcf763a904a298e82c281f90aba896 arm: split pending SPIs (global) out from pending PPIs and SGIs (per CPU) This tracks SPIs in struct arch_domain and PPIs+SGIs in struct arch_vcpu which seems more logical. Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini Committed-by: Ian Campbell --- diff -r 6a89e6f4eadc -r 2903a2dc7749 xen/arch/arm/vgic.c --- a/xen/arch/arm/vgic.c Tue Jul 03 10:52:23 2012 +0100 +++ b/xen/arch/arm/vgic.c Tue Jul 03 10:52:24 2012 +0100 @@ -82,9 +82,8 @@ int domain_vgic_init(struct domain *d) d->arch.vgic.shared_irqs = xmalloc_array(struct vgic_irq_rank, DOMAIN_NR_RANKS(d)); d->arch.vgic.pending_irqs = - xmalloc_array(struct pending_irq, - d->arch.vgic.nr_lines + (32 * d->max_vcpus)); - for (i=0; iarch.vgic.nr_lines + (32 * d->max_vcpus); i++) + xzalloc_array(struct pending_irq, d->arch.vgic.nr_lines); + for (i=0; iarch.vgic.nr_lines; i++) INIT_LIST_HEAD(&d->arch.vgic.pending_irqs[i].inflight); for (i=0; iarch.vgic.shared_irqs[i].lock); @@ -98,6 +97,10 @@ int vcpu_vgic_init(struct vcpu *v) spin_lock_init(&v->arch.vgic.private_irqs.lock); + memset(&v->arch.vgic.pending_irqs, 0, sizeof(v->arch.vgic.pending_irqs)); + for (i = 0; i < 32; i++) + INIT_LIST_HEAD(&v->arch.vgic.pending_irqs[i].inflight); + /* For SGI and PPI the target is always this CPU */ for ( i = 0 ; i < 8 ; i++ ) v->arch.vgic.private_irqs.itargets[i] = @@ -535,8 +538,7 @@ struct pending_irq *irq_to_pending(struc /* Pending irqs allocation strategy: the first vgic.nr_lines irqs * are used for SPIs; the rests are used for per cpu irqs */ if ( irq < 32 ) - n = &v->domain->arch.vgic.pending_irqs[irq + (v->vcpu_id * 32) - + v->domain->arch.vgic.nr_lines]; + n = &v->arch.vgic.pending_irqs[irq]; else n = &v->domain->arch.vgic.pending_irqs[irq - 32]; return n; diff -r 6a89e6f4eadc -r 2903a2dc7749 xen/include/asm-arm/domain.h --- a/xen/include/asm-arm/domain.h Tue Jul 03 10:52:23 2012 +0100 +++ b/xen/include/asm-arm/domain.h Tue Jul 03 10:52:24 2012 +0100 @@ -46,6 +46,10 @@ struct arch_domain int ctlr; int nr_lines; struct vgic_irq_rank *shared_irqs; + /* + * SPIs are domain global, SGIs and PPIs are per-VCPU and stored in + * struct arch_vcpu. + */ struct pending_irq *pending_irqs; } vgic; @@ -114,7 +118,13 @@ struct arch_vcpu uint32_t gic_lr[64]; struct { + /* + * SGIs and PPIs are per-VCPU, SPIs are domain global and in + * struct arch_domain. + */ + struct pending_irq pending_irqs[32]; struct vgic_irq_rank private_irqs; + /* This list is ordered by IRQ priority and it is used to keep * track of the IRQs that the VGIC injected into the guest. * Depending on the availability of LR registers, the IRQs might _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:53 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwT-0005jN-Bj; Wed, 04 Jul 2012 04:11:53 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwK-0005HM-UB for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:45 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-27.messagelabs.com!1341375096!9902997!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21178 invoked from network); 4 Jul 2012 04:11:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwC-0002kr-41 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGwC-0003zS-2z for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:36 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:35 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: implement vpl011 (UART) emulator. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341309141 -3600 # Node ID f4e7fd47613cf914ea8896c8f11ec3dc6223f6ed # Parent a37ff29c027bf5de013eaf8033629cb69ed5836c arm: implement vpl011 (UART) emulator. This is not interended to provide a full emulation, but rather just enough to satisfy the use made by Linux' boot time decompressor code (which is too early for DT etc) Signed-off-by: Ian Campbell Acked-by: Tim Deegan Committed-by: Ian Campbell --- diff -r a37ff29c027b -r f4e7fd47613c xen/arch/arm/Makefile --- a/xen/arch/arm/Makefile Tue Jul 03 10:52:20 2012 +0100 +++ b/xen/arch/arm/Makefile Tue Jul 03 10:52:21 2012 +0100 @@ -25,6 +25,7 @@ obj-y += shutdown.o obj-y += traps.o obj-y += vgic.o obj-y += vtimer.o +obj-y += vpl011.o #obj-bin-y += ....o diff -r a37ff29c027b -r f4e7fd47613c xen/arch/arm/domain.c --- a/xen/arch/arm/domain.c Tue Jul 03 10:52:20 2012 +0100 +++ b/xen/arch/arm/domain.c Tue Jul 03 10:52:21 2012 +0100 @@ -13,6 +13,7 @@ #include "gic.h" #include "vtimer.h" +#include "vpl011.h" DEFINE_PER_CPU(struct vcpu *, curr_vcpu); @@ -327,6 +328,10 @@ int arch_domain_create(struct domain *d, if ( (rc = domain_vgic_init(d)) != 0 ) goto fail; + /* Domain 0 gets a real UART not an emulated one */ + if ( d->domain_id && (rc = domain_uart0_init(d)) != 0 ) + goto fail; + rc = 0; fail: return rc; diff -r a37ff29c027b -r f4e7fd47613c xen/arch/arm/io.c --- a/xen/arch/arm/io.c Tue Jul 03 10:52:20 2012 +0100 +++ b/xen/arch/arm/io.c Tue Jul 03 10:52:21 2012 +0100 @@ -25,6 +25,7 @@ static const struct mmio_handler *const mmio_handlers[] = { &vgic_distr_mmio_handler, + &uart0_mmio_handler, }; #define MMIO_HANDLER_NR ARRAY_SIZE(mmio_handlers) diff -r a37ff29c027b -r f4e7fd47613c xen/arch/arm/io.h --- a/xen/arch/arm/io.h Tue Jul 03 10:52:20 2012 +0100 +++ b/xen/arch/arm/io.h Tue Jul 03 10:52:21 2012 +0100 @@ -40,6 +40,7 @@ struct mmio_handler { }; extern const struct mmio_handler vgic_distr_mmio_handler; +extern const struct mmio_handler uart0_mmio_handler; extern int handle_mmio(mmio_info_t *info); diff -r a37ff29c027b -r f4e7fd47613c xen/arch/arm/vpl011.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/xen/arch/arm/vpl011.c Tue Jul 03 10:52:21 2012 +0100 @@ -0,0 +1,145 @@ +/* + * xen/arch/arm/vpl011.c + * + * ARM PL011 UART Emulator (DEBUG) + * + * Ian Campbell + * Copyright (c) 2012 Citrix Systems. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +/* + * This is not intended to be a full emulation of a PL011 + * device. Rather it is intended to provide a sufficient veneer of one + * that early code (such as Linux's boot time decompressor) which + * hardcodes output directly to such a device are able to make progress. + * + * This device is not intended to be enumerable or exposed to the OS + * (e.g. via Device Tree). + */ + +#include +#include +#include +#include +#include + +#include "io.h" + +#define UART0_START 0x1c090000 +#define UART0_END (UART0_START+65536) + +#define UARTDR 0x000 +#define UARTFR 0x018 + +int domain_uart0_init(struct domain *d) +{ + ASSERT( d->domain_id ); + + spin_lock_init(&d->arch.uart0.lock); + d->arch.uart0.idx = 0; + + d->arch.uart0.buf = xzalloc_array(char, VPL011_BUF_SIZE); + if ( !d->arch.uart0.buf ) + return -ENOMEM; + + return 0; + +} + +static void uart0_print_char(char c) +{ + struct vpl011 *uart = ¤t->domain->arch.uart0; + + /* Accept only printable characters, newline, and horizontal tab. */ + if ( !isprint(c) && (c != '\n') && (c != '\t') ) + return ; + + spin_lock(&uart->lock); + uart->buf[uart->idx++] = c; + if ( (uart->idx == (VPL011_BUF_SIZE - 2)) || (c == '\n') ) + { + if ( c != '\n' ) + uart->buf[uart->idx++] = '\n'; + uart->buf[uart->idx] = '\0'; + printk(XENLOG_G_DEBUG "DOM%u: %s", + current->domain->domain_id, uart->buf); + uart->idx = 0; + } + spin_unlock(&uart->lock); +} + +static int uart0_mmio_check(struct vcpu *v, paddr_t addr) +{ + return addr >= UART0_START && addr < UART0_END; +} + +static int uart0_mmio_read(struct vcpu *v, mmio_info_t *info) +{ + struct hsr_dabt dabt = info->dabt; + struct cpu_user_regs *regs = guest_cpu_user_regs(); + uint32_t *r = ®s->r0 + dabt.reg; + int offset = (int)(info->gpa - UART0_START); + + switch ( offset ) + { + case UARTDR: + *r = 0; + return 1; + case UARTFR: + *r = 0x87; /* All holding registers empty, ready to send etc */ + return 1; + default: + printk("VPL011: unhandled read r%d offset %#08x\n", + dabt.reg, offset); + domain_crash_synchronous(); + } +} + +static int uart0_mmio_write(struct vcpu *v, mmio_info_t *info) +{ + struct hsr_dabt dabt = info->dabt; + struct cpu_user_regs *regs = guest_cpu_user_regs(); + uint32_t *r = ®s->r0 + dabt.reg; + int offset = (int)(info->gpa - UART0_START); + + switch ( offset ) + { + case UARTDR: + /* ignore any status bits */ + uart0_print_char((int)((*r) & 0xFF)); + return 1; + case UARTFR: + /* Silently ignore */ + return 1; + default: + printk("VPL011: unhandled write r%d=%"PRIx32" offset %#08x\n", + dabt.reg, *r, offset); + domain_crash_synchronous(); + } +} + +const struct mmio_handler uart0_mmio_handler = { + .check_handler = uart0_mmio_check, + .read_handler = uart0_mmio_read, + .write_handler = uart0_mmio_write, +}; + +/* + * Local variables: + * mode: C + * c-set-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ + diff -r a37ff29c027b -r f4e7fd47613c xen/arch/arm/vpl011.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/xen/arch/arm/vpl011.h Tue Jul 03 10:52:21 2012 +0100 @@ -0,0 +1,34 @@ +/* + * xen/arch/arm/vpl011.h + * + * ARM PL011 Emulation Support + * + * Ian Campbell + * Copyright (c) 2012 Citrix Systems. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef __ARCH_ARM_VPL011_H__ +#define __ARCH_ARM_VPL011_H__ + +extern int domain_uart0_init(struct domain *d); + +#endif + +/* + * Local variables: + * mode: C + * c-set-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff -r a37ff29c027b -r f4e7fd47613c xen/include/asm-arm/domain.h --- a/xen/include/asm-arm/domain.h Tue Jul 03 10:52:20 2012 +0100 +++ b/xen/include/asm-arm/domain.h Tue Jul 03 10:52:21 2012 +0100 @@ -48,6 +48,14 @@ struct arch_domain struct vgic_irq_rank *shared_irqs; struct pending_irq *pending_irqs; } vgic; + + struct vpl011 { +#define VPL011_BUF_SIZE 128 + char *buf; + int idx; + spinlock_t lock; + } uart0; + } __cacheline_aligned; struct arch_vcpu _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:53 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwT-0005jN-Bj; Wed, 04 Jul 2012 04:11:53 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwK-0005HM-UB for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:45 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-27.messagelabs.com!1341375096!9902997!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21178 invoked from network); 4 Jul 2012 04:11:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwC-0002kr-41 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGwC-0003zS-2z for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:36 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:35 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: implement vpl011 (UART) emulator. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341309141 -3600 # Node ID f4e7fd47613cf914ea8896c8f11ec3dc6223f6ed # Parent a37ff29c027bf5de013eaf8033629cb69ed5836c arm: implement vpl011 (UART) emulator. This is not interended to provide a full emulation, but rather just enough to satisfy the use made by Linux' boot time decompressor code (which is too early for DT etc) Signed-off-by: Ian Campbell Acked-by: Tim Deegan Committed-by: Ian Campbell --- diff -r a37ff29c027b -r f4e7fd47613c xen/arch/arm/Makefile --- a/xen/arch/arm/Makefile Tue Jul 03 10:52:20 2012 +0100 +++ b/xen/arch/arm/Makefile Tue Jul 03 10:52:21 2012 +0100 @@ -25,6 +25,7 @@ obj-y += shutdown.o obj-y += traps.o obj-y += vgic.o obj-y += vtimer.o +obj-y += vpl011.o #obj-bin-y += ....o diff -r a37ff29c027b -r f4e7fd47613c xen/arch/arm/domain.c --- a/xen/arch/arm/domain.c Tue Jul 03 10:52:20 2012 +0100 +++ b/xen/arch/arm/domain.c Tue Jul 03 10:52:21 2012 +0100 @@ -13,6 +13,7 @@ #include "gic.h" #include "vtimer.h" +#include "vpl011.h" DEFINE_PER_CPU(struct vcpu *, curr_vcpu); @@ -327,6 +328,10 @@ int arch_domain_create(struct domain *d, if ( (rc = domain_vgic_init(d)) != 0 ) goto fail; + /* Domain 0 gets a real UART not an emulated one */ + if ( d->domain_id && (rc = domain_uart0_init(d)) != 0 ) + goto fail; + rc = 0; fail: return rc; diff -r a37ff29c027b -r f4e7fd47613c xen/arch/arm/io.c --- a/xen/arch/arm/io.c Tue Jul 03 10:52:20 2012 +0100 +++ b/xen/arch/arm/io.c Tue Jul 03 10:52:21 2012 +0100 @@ -25,6 +25,7 @@ static const struct mmio_handler *const mmio_handlers[] = { &vgic_distr_mmio_handler, + &uart0_mmio_handler, }; #define MMIO_HANDLER_NR ARRAY_SIZE(mmio_handlers) diff -r a37ff29c027b -r f4e7fd47613c xen/arch/arm/io.h --- a/xen/arch/arm/io.h Tue Jul 03 10:52:20 2012 +0100 +++ b/xen/arch/arm/io.h Tue Jul 03 10:52:21 2012 +0100 @@ -40,6 +40,7 @@ struct mmio_handler { }; extern const struct mmio_handler vgic_distr_mmio_handler; +extern const struct mmio_handler uart0_mmio_handler; extern int handle_mmio(mmio_info_t *info); diff -r a37ff29c027b -r f4e7fd47613c xen/arch/arm/vpl011.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/xen/arch/arm/vpl011.c Tue Jul 03 10:52:21 2012 +0100 @@ -0,0 +1,145 @@ +/* + * xen/arch/arm/vpl011.c + * + * ARM PL011 UART Emulator (DEBUG) + * + * Ian Campbell + * Copyright (c) 2012 Citrix Systems. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +/* + * This is not intended to be a full emulation of a PL011 + * device. Rather it is intended to provide a sufficient veneer of one + * that early code (such as Linux's boot time decompressor) which + * hardcodes output directly to such a device are able to make progress. + * + * This device is not intended to be enumerable or exposed to the OS + * (e.g. via Device Tree). + */ + +#include +#include +#include +#include +#include + +#include "io.h" + +#define UART0_START 0x1c090000 +#define UART0_END (UART0_START+65536) + +#define UARTDR 0x000 +#define UARTFR 0x018 + +int domain_uart0_init(struct domain *d) +{ + ASSERT( d->domain_id ); + + spin_lock_init(&d->arch.uart0.lock); + d->arch.uart0.idx = 0; + + d->arch.uart0.buf = xzalloc_array(char, VPL011_BUF_SIZE); + if ( !d->arch.uart0.buf ) + return -ENOMEM; + + return 0; + +} + +static void uart0_print_char(char c) +{ + struct vpl011 *uart = ¤t->domain->arch.uart0; + + /* Accept only printable characters, newline, and horizontal tab. */ + if ( !isprint(c) && (c != '\n') && (c != '\t') ) + return ; + + spin_lock(&uart->lock); + uart->buf[uart->idx++] = c; + if ( (uart->idx == (VPL011_BUF_SIZE - 2)) || (c == '\n') ) + { + if ( c != '\n' ) + uart->buf[uart->idx++] = '\n'; + uart->buf[uart->idx] = '\0'; + printk(XENLOG_G_DEBUG "DOM%u: %s", + current->domain->domain_id, uart->buf); + uart->idx = 0; + } + spin_unlock(&uart->lock); +} + +static int uart0_mmio_check(struct vcpu *v, paddr_t addr) +{ + return addr >= UART0_START && addr < UART0_END; +} + +static int uart0_mmio_read(struct vcpu *v, mmio_info_t *info) +{ + struct hsr_dabt dabt = info->dabt; + struct cpu_user_regs *regs = guest_cpu_user_regs(); + uint32_t *r = ®s->r0 + dabt.reg; + int offset = (int)(info->gpa - UART0_START); + + switch ( offset ) + { + case UARTDR: + *r = 0; + return 1; + case UARTFR: + *r = 0x87; /* All holding registers empty, ready to send etc */ + return 1; + default: + printk("VPL011: unhandled read r%d offset %#08x\n", + dabt.reg, offset); + domain_crash_synchronous(); + } +} + +static int uart0_mmio_write(struct vcpu *v, mmio_info_t *info) +{ + struct hsr_dabt dabt = info->dabt; + struct cpu_user_regs *regs = guest_cpu_user_regs(); + uint32_t *r = ®s->r0 + dabt.reg; + int offset = (int)(info->gpa - UART0_START); + + switch ( offset ) + { + case UARTDR: + /* ignore any status bits */ + uart0_print_char((int)((*r) & 0xFF)); + return 1; + case UARTFR: + /* Silently ignore */ + return 1; + default: + printk("VPL011: unhandled write r%d=%"PRIx32" offset %#08x\n", + dabt.reg, *r, offset); + domain_crash_synchronous(); + } +} + +const struct mmio_handler uart0_mmio_handler = { + .check_handler = uart0_mmio_check, + .read_handler = uart0_mmio_read, + .write_handler = uart0_mmio_write, +}; + +/* + * Local variables: + * mode: C + * c-set-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ + diff -r a37ff29c027b -r f4e7fd47613c xen/arch/arm/vpl011.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/xen/arch/arm/vpl011.h Tue Jul 03 10:52:21 2012 +0100 @@ -0,0 +1,34 @@ +/* + * xen/arch/arm/vpl011.h + * + * ARM PL011 Emulation Support + * + * Ian Campbell + * Copyright (c) 2012 Citrix Systems. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef __ARCH_ARM_VPL011_H__ +#define __ARCH_ARM_VPL011_H__ + +extern int domain_uart0_init(struct domain *d); + +#endif + +/* + * Local variables: + * mode: C + * c-set-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff -r a37ff29c027b -r f4e7fd47613c xen/include/asm-arm/domain.h --- a/xen/include/asm-arm/domain.h Tue Jul 03 10:52:20 2012 +0100 +++ b/xen/include/asm-arm/domain.h Tue Jul 03 10:52:21 2012 +0100 @@ -48,6 +48,14 @@ struct arch_domain struct vgic_irq_rank *shared_irqs; struct pending_irq *pending_irqs; } vgic; + + struct vpl011 { +#define VPL011_BUF_SIZE 128 + char *buf; + int idx; + spinlock_t lock; + } uart0; + } __cacheline_aligned; struct arch_vcpu _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:54 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwU-0005lo-14; Wed, 04 Jul 2012 04:11:54 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwM-0005Vn-Jt for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:46 +0000 Received: from [85.158.139.83:57023] by server-9.bemta-5.messagelabs.com id 9C/70-01069-182C3FF4; Wed, 04 Jul 2012 04:11:45 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-182.messagelabs.com!1341375104!28140621!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6867 invoked from network); 4 Jul 2012 04:11:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwJ-0002mD-V0 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:43 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGwJ-000439-Tn for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:43 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:43 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xen: Fix off-by-one error when parsing command line arguments X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341319099 -3600 # Node ID 2cffb7bf6e5738af59d52446155d49aaeadac540 # Parent 1b3198c8f140918574ccfe6baba92ef214d69c1a xen: Fix off-by-one error when parsing command line arguments As Xen currently stands, it will attempt to interpret the first few bytes of the initcall section as a struct kernel_param. The reason that this not caused problems is because in the overflow case, param->name is actually a function pointer to the first initcall, and intepreting it as string is very unlikely to match an ASCII command line parameter name. Signed-off-by: Andrew Cooper Committed-by: Keir Fraser --- diff -r 1b3198c8f140 -r 2cffb7bf6e57 xen/common/kernel.c --- a/xen/common/kernel.c Tue Jul 03 10:52:33 2012 +0100 +++ b/xen/common/kernel.c Tue Jul 03 13:38:19 2012 +0100 @@ -90,7 +90,7 @@ void __init cmdline_parse(const char *cm if ( !bool_assert ) optkey += 3; - for ( param = &__setup_start; param <= &__setup_end; param++ ) + for ( param = &__setup_start; param < &__setup_end; param++ ) { if ( strcmp(param->name, optkey) ) continue; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:54 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwU-0005lo-14; Wed, 04 Jul 2012 04:11:54 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwM-0005Vn-Jt for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:46 +0000 Received: from [85.158.139.83:57023] by server-9.bemta-5.messagelabs.com id 9C/70-01069-182C3FF4; Wed, 04 Jul 2012 04:11:45 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-182.messagelabs.com!1341375104!28140621!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6867 invoked from network); 4 Jul 2012 04:11:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwJ-0002mD-V0 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:43 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGwJ-000439-Tn for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:43 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:43 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xen: Fix off-by-one error when parsing command line arguments X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341319099 -3600 # Node ID 2cffb7bf6e5738af59d52446155d49aaeadac540 # Parent 1b3198c8f140918574ccfe6baba92ef214d69c1a xen: Fix off-by-one error when parsing command line arguments As Xen currently stands, it will attempt to interpret the first few bytes of the initcall section as a struct kernel_param. The reason that this not caused problems is because in the overflow case, param->name is actually a function pointer to the first initcall, and intepreting it as string is very unlikely to match an ASCII command line parameter name. Signed-off-by: Andrew Cooper Committed-by: Keir Fraser --- diff -r 1b3198c8f140 -r 2cffb7bf6e57 xen/common/kernel.c --- a/xen/common/kernel.c Tue Jul 03 10:52:33 2012 +0100 +++ b/xen/common/kernel.c Tue Jul 03 13:38:19 2012 +0100 @@ -90,7 +90,7 @@ void __init cmdline_parse(const char *cm if ( !bool_assert ) optkey += 3; - for ( param = &__setup_start; param <= &__setup_end; param++ ) + for ( param = &__setup_start; param < &__setup_end; param++ ) { if ( strcmp(param->name, optkey) ) continue; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:55 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04: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 1SmGwU-0005mx-V8; Wed, 04 Jul 2012 04:11:54 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwM-0005L6-RE for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:47 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-27.messagelabs.com!1341375098!9941949!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31119 invoked from network); 4 Jul 2012 04:11:39 -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; 4 Jul 2012 04:11:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwE-0002lB-MP for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGwE-00040h-LJ for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:38 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:38 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: map GICV in all domains, not just dom0. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341309145 -3600 # Node ID d3dd28a6cdd066959869d7f77fb4bc7284c101ab # Parent 47a289c3b8f50b2b11d3e4b767395a8acfd027bc arm: map GICV in all domains, not just dom0. This requires that we allocate all p2m pages from domheap without a particular dom because max pages is not setup yet so there is no allocation available to us. At some point we should create a separate p2m allocation (similar to x86's shadow allocation) and use that. Also we seem to have been calling p2m_alloc_table twice for dom0. Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini Committed-by: Ian Campbell --- diff -r 47a289c3b8f5 -r d3dd28a6cdd0 xen/arch/arm/domain.c --- a/xen/arch/arm/domain.c Tue Jul 03 10:52:25 2012 +0100 +++ b/xen/arch/arm/domain.c Tue Jul 03 10:52:25 2012 +0100 @@ -323,17 +323,21 @@ int arch_domain_create(struct domain *d, if ( (rc = p2m_alloc_table(d)) != 0 ) goto fail; + + if ( (rc = gicv_setup(d)) != 0 ) + goto fail; + + if ( (rc = domain_vgic_init(d)) != 0 ) + goto fail; } - if ( (rc = domain_vgic_init(d)) != 0 ) - goto fail; - /* Domain 0 gets a real UART not an emulated one */ if ( d->domain_id && (rc = domain_uart0_init(d)) != 0 ) goto fail; rc = 0; fail: + /*XXX unwind allocations etc */ return rc; } diff -r 47a289c3b8f5 -r d3dd28a6cdd0 xen/arch/arm/domain_build.c --- a/xen/arch/arm/domain_build.c Tue Jul 03 10:52:25 2012 +0100 +++ b/xen/arch/arm/domain_build.c Tue Jul 03 10:52:25 2012 +0100 @@ -270,9 +270,6 @@ int construct_dom0(struct domain *d) d->max_pages = ~0U; - if ( (rc = p2m_alloc_table(d)) != 0 ) - return rc; - rc = prepare_dtb(d, &kinfo); if ( rc < 0 ) return rc; @@ -288,8 +285,6 @@ int construct_dom0(struct domain *d) printk("Map VGIC MMIO regions 1:1 in the P2M %#llx->%#llx\n", 0x2C008000ULL, 0x2DFFFFFFULL); map_mmio_regions(d, 0x2C008000, 0x2DFFFFFF, 0x2C008000); - gicv_setup(d); - printk("Routing peripheral interrupts to guest\n"); /* TODO Get from device tree */ gic_route_irq_to_guest(d, 34, "timer0"); diff -r 47a289c3b8f5 -r d3dd28a6cdd0 xen/arch/arm/gic.c --- a/xen/arch/arm/gic.c Tue Jul 03 10:52:25 2012 +0100 +++ b/xen/arch/arm/gic.c Tue Jul 03 10:52:25 2012 +0100 @@ -541,14 +541,11 @@ void gic_interrupt(struct cpu_user_regs do_IRQ(regs, irq, is_fiq); } -void gicv_setup(struct domain *d) +int gicv_setup(struct domain *d) { /* map the gic virtual cpu interface in the gic cpu interface region of * the guest */ - printk("mapping GICC at %#"PRIx32" to %#"PRIx32"\n", - GIC_BASE_ADDRESS + GIC_CR_OFFSET, - GIC_BASE_ADDRESS + GIC_VR_OFFSET); - map_mmio_regions(d, GIC_BASE_ADDRESS + GIC_CR_OFFSET, + return map_mmio_regions(d, GIC_BASE_ADDRESS + GIC_CR_OFFSET, GIC_BASE_ADDRESS + GIC_CR_OFFSET + (2 * PAGE_SIZE) - 1, GIC_BASE_ADDRESS + GIC_VR_OFFSET); } diff -r 47a289c3b8f5 -r d3dd28a6cdd0 xen/arch/arm/gic.h --- a/xen/arch/arm/gic.h Tue Jul 03 10:52:25 2012 +0100 +++ b/xen/arch/arm/gic.h Tue Jul 03 10:52:25 2012 +0100 @@ -148,7 +148,7 @@ extern void gic_init_secondary_cpu(void) /* Take down a CPU's per-CPU GIC interface */ extern void gic_disable_cpu(void); /* setup the gic virtual interface for a guest */ -extern void gicv_setup(struct domain *d); +extern int gicv_setup(struct domain *d); /* Context switch */ extern void gic_save_state(struct vcpu *v); diff -r 47a289c3b8f5 -r d3dd28a6cdd0 xen/arch/arm/p2m.c --- a/xen/arch/arm/p2m.c Tue Jul 03 10:52:25 2012 +0100 +++ b/xen/arch/arm/p2m.c Tue Jul 03 10:52:25 2012 +0100 @@ -4,6 +4,7 @@ #include #include #include +#include "gic.h" void dump_p2m_lookup(struct domain *d, paddr_t addr) { @@ -102,7 +103,7 @@ static int p2m_create_table(struct domai BUG_ON(entry->p2m.valid); - page = alloc_domheap_page(d, 0); + page = alloc_domheap_page(NULL, 0); if ( page == NULL ) return -ENOMEM; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:55 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04: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 1SmGwU-0005mx-V8; Wed, 04 Jul 2012 04:11:54 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwM-0005L6-RE for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:47 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-27.messagelabs.com!1341375098!9941949!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31119 invoked from network); 4 Jul 2012 04:11:39 -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; 4 Jul 2012 04:11:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwE-0002lB-MP for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGwE-00040h-LJ for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:38 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:38 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: map GICV in all domains, not just dom0. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341309145 -3600 # Node ID d3dd28a6cdd066959869d7f77fb4bc7284c101ab # Parent 47a289c3b8f50b2b11d3e4b767395a8acfd027bc arm: map GICV in all domains, not just dom0. This requires that we allocate all p2m pages from domheap without a particular dom because max pages is not setup yet so there is no allocation available to us. At some point we should create a separate p2m allocation (similar to x86's shadow allocation) and use that. Also we seem to have been calling p2m_alloc_table twice for dom0. Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini Committed-by: Ian Campbell --- diff -r 47a289c3b8f5 -r d3dd28a6cdd0 xen/arch/arm/domain.c --- a/xen/arch/arm/domain.c Tue Jul 03 10:52:25 2012 +0100 +++ b/xen/arch/arm/domain.c Tue Jul 03 10:52:25 2012 +0100 @@ -323,17 +323,21 @@ int arch_domain_create(struct domain *d, if ( (rc = p2m_alloc_table(d)) != 0 ) goto fail; + + if ( (rc = gicv_setup(d)) != 0 ) + goto fail; + + if ( (rc = domain_vgic_init(d)) != 0 ) + goto fail; } - if ( (rc = domain_vgic_init(d)) != 0 ) - goto fail; - /* Domain 0 gets a real UART not an emulated one */ if ( d->domain_id && (rc = domain_uart0_init(d)) != 0 ) goto fail; rc = 0; fail: + /*XXX unwind allocations etc */ return rc; } diff -r 47a289c3b8f5 -r d3dd28a6cdd0 xen/arch/arm/domain_build.c --- a/xen/arch/arm/domain_build.c Tue Jul 03 10:52:25 2012 +0100 +++ b/xen/arch/arm/domain_build.c Tue Jul 03 10:52:25 2012 +0100 @@ -270,9 +270,6 @@ int construct_dom0(struct domain *d) d->max_pages = ~0U; - if ( (rc = p2m_alloc_table(d)) != 0 ) - return rc; - rc = prepare_dtb(d, &kinfo); if ( rc < 0 ) return rc; @@ -288,8 +285,6 @@ int construct_dom0(struct domain *d) printk("Map VGIC MMIO regions 1:1 in the P2M %#llx->%#llx\n", 0x2C008000ULL, 0x2DFFFFFFULL); map_mmio_regions(d, 0x2C008000, 0x2DFFFFFF, 0x2C008000); - gicv_setup(d); - printk("Routing peripheral interrupts to guest\n"); /* TODO Get from device tree */ gic_route_irq_to_guest(d, 34, "timer0"); diff -r 47a289c3b8f5 -r d3dd28a6cdd0 xen/arch/arm/gic.c --- a/xen/arch/arm/gic.c Tue Jul 03 10:52:25 2012 +0100 +++ b/xen/arch/arm/gic.c Tue Jul 03 10:52:25 2012 +0100 @@ -541,14 +541,11 @@ void gic_interrupt(struct cpu_user_regs do_IRQ(regs, irq, is_fiq); } -void gicv_setup(struct domain *d) +int gicv_setup(struct domain *d) { /* map the gic virtual cpu interface in the gic cpu interface region of * the guest */ - printk("mapping GICC at %#"PRIx32" to %#"PRIx32"\n", - GIC_BASE_ADDRESS + GIC_CR_OFFSET, - GIC_BASE_ADDRESS + GIC_VR_OFFSET); - map_mmio_regions(d, GIC_BASE_ADDRESS + GIC_CR_OFFSET, + return map_mmio_regions(d, GIC_BASE_ADDRESS + GIC_CR_OFFSET, GIC_BASE_ADDRESS + GIC_CR_OFFSET + (2 * PAGE_SIZE) - 1, GIC_BASE_ADDRESS + GIC_VR_OFFSET); } diff -r 47a289c3b8f5 -r d3dd28a6cdd0 xen/arch/arm/gic.h --- a/xen/arch/arm/gic.h Tue Jul 03 10:52:25 2012 +0100 +++ b/xen/arch/arm/gic.h Tue Jul 03 10:52:25 2012 +0100 @@ -148,7 +148,7 @@ extern void gic_init_secondary_cpu(void) /* Take down a CPU's per-CPU GIC interface */ extern void gic_disable_cpu(void); /* setup the gic virtual interface for a guest */ -extern void gicv_setup(struct domain *d); +extern int gicv_setup(struct domain *d); /* Context switch */ extern void gic_save_state(struct vcpu *v); diff -r 47a289c3b8f5 -r d3dd28a6cdd0 xen/arch/arm/p2m.c --- a/xen/arch/arm/p2m.c Tue Jul 03 10:52:25 2012 +0100 +++ b/xen/arch/arm/p2m.c Tue Jul 03 10:52:25 2012 +0100 @@ -4,6 +4,7 @@ #include #include #include +#include "gic.h" void dump_p2m_lookup(struct domain *d, paddr_t addr) { @@ -102,7 +103,7 @@ static int p2m_create_table(struct domai BUG_ON(entry->p2m.valid); - page = alloc_domheap_page(d, 0); + page = alloc_domheap_page(NULL, 0); if ( page == NULL ) return -ENOMEM; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:55 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04: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 1SmGwV-0005pF-LC; Wed, 04 Jul 2012 04:11:55 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwP-0005Qm-96 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:49 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-27.messagelabs.com!1341375102!9774557!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16201 invoked from network); 4 Jul 2012 04:11:43 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwH-0002lm-Sc for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGwH-00042B-Ra for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:41 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:41 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: unwind allocations etc on arch_domain_create_failure X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341309150 -3600 # Node ID 5d432081deddfe40f501ce4a1420fa126252c56e # Parent 9faae502bb9e8a2e2eddc8368f79b1a5fc01e110 arm: unwind allocations etc on arch_domain_create_failure This involves adding the necessary teardown/free functions for some modules. Don't initialise full arch domain state for the idle domain, it's not needed. Signed-off-by: Ian Campbell Acked-by: Tim Deegan Committed-by: Ian Campbell --- diff -r 9faae502bb9e -r 5d432081dedd xen/arch/arm/domain.c --- a/xen/arch/arm/domain.c Tue Jul 03 10:52:29 2012 +0100 +++ b/xen/arch/arm/domain.c Tue Jul 03 10:52:30 2012 +0100 @@ -317,37 +317,45 @@ int arch_domain_create(struct domain *d, { int rc; + /* Idle domains do not need this setup */ + if ( is_idle_domain(d) ) + return 0; + rc = -ENOMEM; if ( (rc = p2m_init(d)) != 0 ) goto fail; - if ( !is_idle_domain(d) ) - { - rc = -ENOMEM; - if ( (d->shared_info = alloc_xenheap_pages(0, 0)) == NULL ) - goto fail; + if ( (d->shared_info = alloc_xenheap_pages(0, 0)) == NULL ) + goto fail; - clear_page(d->shared_info); - share_xen_page_with_guest( - virt_to_page(d->shared_info), d, XENSHARE_writable); + clear_page(d->shared_info); + share_xen_page_with_guest( + virt_to_page(d->shared_info), d, XENSHARE_writable); - if ( (rc = p2m_alloc_table(d)) != 0 ) - goto fail; + if ( (rc = p2m_alloc_table(d)) != 0 ) + goto fail; - if ( (rc = gicv_setup(d)) != 0 ) - goto fail; + if ( (rc = gicv_setup(d)) != 0 ) + goto fail; - if ( (rc = domain_vgic_init(d)) != 0 ) - goto fail; - } + if ( (rc = domain_vgic_init(d)) != 0 ) + goto fail; /* Domain 0 gets a real UART not an emulated one */ if ( d->domain_id && (rc = domain_uart0_init(d)) != 0 ) goto fail; - rc = 0; + return 0; + fail: - /*XXX unwind allocations etc */ + d->is_dying = DOMDYING_dead; + free_xenheap_page(d->shared_info); + + p2m_teardown(d); + + domain_vgic_free(d); + domain_uart0_free(d); + return rc; } diff -r 9faae502bb9e -r 5d432081dedd xen/arch/arm/gic.h --- a/xen/arch/arm/gic.h Tue Jul 03 10:52:29 2012 +0100 +++ b/xen/arch/arm/gic.h Tue Jul 03 10:52:30 2012 +0100 @@ -125,7 +125,10 @@ #define VGIC_IRQ_EVTCHN_CALLBACK 31 extern int domain_vgic_init(struct domain *d); +extern void domain_vgic_free(struct domain *d); + extern int vcpu_vgic_init(struct vcpu *v); + extern void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq,int virtual); extern struct pending_irq *irq_to_pending(struct vcpu *v, unsigned int irq); diff -r 9faae502bb9e -r 5d432081dedd xen/arch/arm/p2m.c --- a/xen/arch/arm/p2m.c Tue Jul 03 10:52:29 2012 +0100 +++ b/xen/arch/arm/p2m.c Tue Jul 03 10:52:30 2012 +0100 @@ -288,6 +288,21 @@ int p2m_alloc_table(struct domain *d) return 0; } +void p2m_teardown(struct domain *d) +{ + struct p2m_domain *p2m = &d->arch.p2m; + struct page_info *pg; + + spin_lock(&p2m->lock); + + while ( (pg = page_list_remove_head(&p2m->pages)) ) + free_domheap_page(pg); + + p2m->first_level = NULL; + + spin_unlock(&p2m->lock); +} + int p2m_init(struct domain *d) { struct p2m_domain *p2m = &d->arch.p2m; diff -r 9faae502bb9e -r 5d432081dedd xen/arch/arm/vgic.c --- a/xen/arch/arm/vgic.c Tue Jul 03 10:52:29 2012 +0100 +++ b/xen/arch/arm/vgic.c Tue Jul 03 10:52:30 2012 +0100 @@ -90,6 +90,12 @@ int domain_vgic_init(struct domain *d) return 0; } +void domain_vgic_free(struct domain *d) +{ + xfree(d->arch.vgic.shared_irqs); + xfree(d->arch.vgic.pending_irqs); +} + int vcpu_vgic_init(struct vcpu *v) { int i; diff -r 9faae502bb9e -r 5d432081dedd xen/arch/arm/vpl011.c --- a/xen/arch/arm/vpl011.c Tue Jul 03 10:52:29 2012 +0100 +++ b/xen/arch/arm/vpl011.c Tue Jul 03 10:52:30 2012 +0100 @@ -56,6 +56,11 @@ int domain_uart0_init(struct domain *d) } +void domain_uart0_free(struct domain *d) +{ + xfree(d->arch.uart0.buf); +} + static void uart0_print_char(char c) { struct vpl011 *uart = ¤t->domain->arch.uart0; diff -r 9faae502bb9e -r 5d432081dedd xen/arch/arm/vpl011.h --- a/xen/arch/arm/vpl011.h Tue Jul 03 10:52:29 2012 +0100 +++ b/xen/arch/arm/vpl011.h Tue Jul 03 10:52:30 2012 +0100 @@ -21,6 +21,7 @@ #define __ARCH_ARM_VPL011_H__ extern int domain_uart0_init(struct domain *d); +extern void domain_uart0_free(struct domain *d); #endif diff -r 9faae502bb9e -r 5d432081dedd xen/include/asm-arm/p2m.h --- a/xen/include/asm-arm/p2m.h Tue Jul 03 10:52:29 2012 +0100 +++ b/xen/include/asm-arm/p2m.h Tue Jul 03 10:52:30 2012 +0100 @@ -23,6 +23,9 @@ struct p2m_domain { /* Init the datastructures for later use by the p2m code */ int p2m_init(struct domain *d); +/* Return all the p2m resources to Xen. */ +void p2m_teardown(struct domain *d); + /* Allocate a new p2m table for a domain. * * Returns 0 for success or -errno. _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:55 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04: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 1SmGwV-0005pF-LC; Wed, 04 Jul 2012 04:11:55 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwP-0005Qm-96 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:49 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-27.messagelabs.com!1341375102!9774557!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16201 invoked from network); 4 Jul 2012 04:11:43 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2012 04:11:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwH-0002lm-Sc for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGwH-00042B-Ra for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:41 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:41 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: unwind allocations etc on arch_domain_create_failure X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341309150 -3600 # Node ID 5d432081deddfe40f501ce4a1420fa126252c56e # Parent 9faae502bb9e8a2e2eddc8368f79b1a5fc01e110 arm: unwind allocations etc on arch_domain_create_failure This involves adding the necessary teardown/free functions for some modules. Don't initialise full arch domain state for the idle domain, it's not needed. Signed-off-by: Ian Campbell Acked-by: Tim Deegan Committed-by: Ian Campbell --- diff -r 9faae502bb9e -r 5d432081dedd xen/arch/arm/domain.c --- a/xen/arch/arm/domain.c Tue Jul 03 10:52:29 2012 +0100 +++ b/xen/arch/arm/domain.c Tue Jul 03 10:52:30 2012 +0100 @@ -317,37 +317,45 @@ int arch_domain_create(struct domain *d, { int rc; + /* Idle domains do not need this setup */ + if ( is_idle_domain(d) ) + return 0; + rc = -ENOMEM; if ( (rc = p2m_init(d)) != 0 ) goto fail; - if ( !is_idle_domain(d) ) - { - rc = -ENOMEM; - if ( (d->shared_info = alloc_xenheap_pages(0, 0)) == NULL ) - goto fail; + if ( (d->shared_info = alloc_xenheap_pages(0, 0)) == NULL ) + goto fail; - clear_page(d->shared_info); - share_xen_page_with_guest( - virt_to_page(d->shared_info), d, XENSHARE_writable); + clear_page(d->shared_info); + share_xen_page_with_guest( + virt_to_page(d->shared_info), d, XENSHARE_writable); - if ( (rc = p2m_alloc_table(d)) != 0 ) - goto fail; + if ( (rc = p2m_alloc_table(d)) != 0 ) + goto fail; - if ( (rc = gicv_setup(d)) != 0 ) - goto fail; + if ( (rc = gicv_setup(d)) != 0 ) + goto fail; - if ( (rc = domain_vgic_init(d)) != 0 ) - goto fail; - } + if ( (rc = domain_vgic_init(d)) != 0 ) + goto fail; /* Domain 0 gets a real UART not an emulated one */ if ( d->domain_id && (rc = domain_uart0_init(d)) != 0 ) goto fail; - rc = 0; + return 0; + fail: - /*XXX unwind allocations etc */ + d->is_dying = DOMDYING_dead; + free_xenheap_page(d->shared_info); + + p2m_teardown(d); + + domain_vgic_free(d); + domain_uart0_free(d); + return rc; } diff -r 9faae502bb9e -r 5d432081dedd xen/arch/arm/gic.h --- a/xen/arch/arm/gic.h Tue Jul 03 10:52:29 2012 +0100 +++ b/xen/arch/arm/gic.h Tue Jul 03 10:52:30 2012 +0100 @@ -125,7 +125,10 @@ #define VGIC_IRQ_EVTCHN_CALLBACK 31 extern int domain_vgic_init(struct domain *d); +extern void domain_vgic_free(struct domain *d); + extern int vcpu_vgic_init(struct vcpu *v); + extern void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq,int virtual); extern struct pending_irq *irq_to_pending(struct vcpu *v, unsigned int irq); diff -r 9faae502bb9e -r 5d432081dedd xen/arch/arm/p2m.c --- a/xen/arch/arm/p2m.c Tue Jul 03 10:52:29 2012 +0100 +++ b/xen/arch/arm/p2m.c Tue Jul 03 10:52:30 2012 +0100 @@ -288,6 +288,21 @@ int p2m_alloc_table(struct domain *d) return 0; } +void p2m_teardown(struct domain *d) +{ + struct p2m_domain *p2m = &d->arch.p2m; + struct page_info *pg; + + spin_lock(&p2m->lock); + + while ( (pg = page_list_remove_head(&p2m->pages)) ) + free_domheap_page(pg); + + p2m->first_level = NULL; + + spin_unlock(&p2m->lock); +} + int p2m_init(struct domain *d) { struct p2m_domain *p2m = &d->arch.p2m; diff -r 9faae502bb9e -r 5d432081dedd xen/arch/arm/vgic.c --- a/xen/arch/arm/vgic.c Tue Jul 03 10:52:29 2012 +0100 +++ b/xen/arch/arm/vgic.c Tue Jul 03 10:52:30 2012 +0100 @@ -90,6 +90,12 @@ int domain_vgic_init(struct domain *d) return 0; } +void domain_vgic_free(struct domain *d) +{ + xfree(d->arch.vgic.shared_irqs); + xfree(d->arch.vgic.pending_irqs); +} + int vcpu_vgic_init(struct vcpu *v) { int i; diff -r 9faae502bb9e -r 5d432081dedd xen/arch/arm/vpl011.c --- a/xen/arch/arm/vpl011.c Tue Jul 03 10:52:29 2012 +0100 +++ b/xen/arch/arm/vpl011.c Tue Jul 03 10:52:30 2012 +0100 @@ -56,6 +56,11 @@ int domain_uart0_init(struct domain *d) } +void domain_uart0_free(struct domain *d) +{ + xfree(d->arch.uart0.buf); +} + static void uart0_print_char(char c) { struct vpl011 *uart = ¤t->domain->arch.uart0; diff -r 9faae502bb9e -r 5d432081dedd xen/arch/arm/vpl011.h --- a/xen/arch/arm/vpl011.h Tue Jul 03 10:52:29 2012 +0100 +++ b/xen/arch/arm/vpl011.h Tue Jul 03 10:52:30 2012 +0100 @@ -21,6 +21,7 @@ #define __ARCH_ARM_VPL011_H__ extern int domain_uart0_init(struct domain *d); +extern void domain_uart0_free(struct domain *d); #endif diff -r 9faae502bb9e -r 5d432081dedd xen/include/asm-arm/p2m.h --- a/xen/include/asm-arm/p2m.h Tue Jul 03 10:52:29 2012 +0100 +++ b/xen/include/asm-arm/p2m.h Tue Jul 03 10:52:30 2012 +0100 @@ -23,6 +23,9 @@ struct p2m_domain { /* Init the datastructures for later use by the p2m code */ int p2m_init(struct domain *d); +/* Return all the p2m resources to Xen. */ +void p2m_teardown(struct domain *d); + /* Allocate a new p2m table for a domain. * * Returns 0 for success or -errno. _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:56 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwV-0005q3-VO; Wed, 04 Jul 2012 04:11:56 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwP-0005S2-V3 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:50 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-27.messagelabs.com!1341375102!9914348!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14858 invoked from network); 4 Jul 2012 04:11:43 -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; 4 Jul 2012 04:11:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwI-0002lt-DC for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGwI-00042Q-Bk for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:42 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:41 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: move PSR flag definitions into interface, for tools use. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1341309151 -3600 # Node ID 481d7293aa533a6ee6544e8727499a6dca6bb741 # Parent 5d432081deddfe40f501ce4a1420fa126252c56e arm: move PSR flag definitions into interface, for tools use. Signed-off-by: Ian Campbell Acked-by: Tim Deegan Committed-by: Ian Campbell --- diff -r 5d432081dedd -r 481d7293aa53 xen/arch/arm/entry.S --- a/xen/arch/arm/entry.S Tue Jul 03 10:52:30 2012 +0100 +++ b/xen/arch/arm/entry.S Tue Jul 03 10:52:31 2012 +0100 @@ -1,5 +1,6 @@ #include #include +#include #define SAVE_ONE_BANKED(reg) mrs r11, reg; str r11, [sp, #UREGS_##reg] #define RESTORE_ONE_BANKED(reg) ldr r11, [sp, #UREGS_##reg]; msr reg, r11 diff -r 5d432081dedd -r 481d7293aa53 xen/include/asm-arm/page.h --- a/xen/include/asm-arm/page.h Tue Jul 03 10:52:30 2012 +0100 +++ b/xen/include/asm-arm/page.h Tue Jul 03 10:52:31 2012 +0100 @@ -2,6 +2,8 @@ #define __ARM_PAGE_H__ #include +#include +#include #define PADDR_BITS 40 #define PADDR_MASK ((1ULL << PADDR_BITS)-1) diff -r 5d432081dedd -r 481d7293aa53 xen/include/asm-arm/processor.h --- a/xen/include/asm-arm/processor.h Tue Jul 03 10:52:30 2012 +0100 +++ b/xen/include/asm-arm/processor.h Tue Jul 03 10:52:31 2012 +0100 @@ -3,27 +3,6 @@ #include -/* PSR bits (CPSR, SPSR)*/ - -/* 0-4: Mode */ -#define PSR_MODE_MASK 0x1f -#define PSR_MODE_USR 0x10 -#define PSR_MODE_FIQ 0x11 -#define PSR_MODE_IRQ 0x12 -#define PSR_MODE_SVC 0x13 -#define PSR_MODE_MON 0x16 -#define PSR_MODE_ABT 0x17 -#define PSR_MODE_HYP 0x1a -#define PSR_MODE_UND 0x1b -#define PSR_MODE_SYS 0x1f - -#define PSR_THUMB (1<<5) /* Thumb Mode enable */ -#define PSR_FIQ_MASK (1<<6) /* Fast Interrupt mask */ -#define PSR_IRQ_MASK (1<<7) /* Interrupt mask */ -#define PSR_ABT_MASK (1<<8) /* Asynchronous Abort mask */ -#define PSR_BIG_ENDIAN (1<<9) /* Big Endian Mode */ -#define PSR_JAZELLE (1<<24) /* Jazelle Mode */ - /* TTBCR Translation Table Base Control Register */ #define TTBCR_EAE 0x80000000 #define TTBCR_N_MASK 0x07 diff -r 5d432081dedd -r 481d7293aa53 xen/include/asm-arm/system.h --- a/xen/include/asm-arm/system.h Tue Jul 03 10:52:30 2012 +0100 +++ b/xen/include/asm-arm/system.h Tue Jul 03 10:52:31 2012 +0100 @@ -3,7 +3,7 @@ #define __ASM_SYSTEM_H #include -#include +#include #define nop() \ asm volatile ( "nop" ) diff -r 5d432081dedd -r 481d7293aa53 xen/include/public/arch-arm.h --- a/xen/include/public/arch-arm.h Tue Jul 03 10:52:30 2012 +0100 +++ b/xen/include/public/arch-arm.h Tue Jul 03 10:52:31 2012 +0100 @@ -138,7 +138,28 @@ struct arch_shared_info { }; typedef struct arch_shared_info arch_shared_info_t; typedef uint64_t xen_callback_t; -#endif +#endif /* ifndef __ASSEMBLY __ */ + +/* PSR bits (CPSR, SPSR)*/ + +/* 0-4: Mode */ +#define PSR_MODE_MASK 0x1f +#define PSR_MODE_USR 0x10 +#define PSR_MODE_FIQ 0x11 +#define PSR_MODE_IRQ 0x12 +#define PSR_MODE_SVC 0x13 +#define PSR_MODE_MON 0x16 +#define PSR_MODE_ABT 0x17 +#define PSR_MODE_HYP 0x1a +#define PSR_MODE_UND 0x1b +#define PSR_MODE_SYS 0x1f + +#define PSR_THUMB (1<<5) /* Thumb Mode enable */ +#define PSR_FIQ_MASK (1<<6) /* Fast Interrupt mask */ +#define PSR_IRQ_MASK (1<<7) /* Interrupt mask */ +#define PSR_ABT_MASK (1<<8) /* Asynchronous Abort mask */ +#define PSR_BIG_ENDIAN (1<<9) /* Big Endian Mode */ +#define PSR_JAZELLE (1<<24) /* Jazelle Mode */ #endif /* __XEN_PUBLIC_ARCH_ARM_H__ */ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:56 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwV-0005q3-VO; Wed, 04 Jul 2012 04:11:56 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwP-0005S2-V3 for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:50 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-27.messagelabs.com!1341375102!9914348!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14858 invoked from network); 4 Jul 2012 04:11:43 -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; 4 Jul 2012 04:11:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwI-0002lt-DC for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGwI-00042Q-Bk for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:42 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:41 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: move PSR flag definitions into interface, for tools use. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1341309151 -3600 # Node ID 481d7293aa533a6ee6544e8727499a6dca6bb741 # Parent 5d432081deddfe40f501ce4a1420fa126252c56e arm: move PSR flag definitions into interface, for tools use. Signed-off-by: Ian Campbell Acked-by: Tim Deegan Committed-by: Ian Campbell --- diff -r 5d432081dedd -r 481d7293aa53 xen/arch/arm/entry.S --- a/xen/arch/arm/entry.S Tue Jul 03 10:52:30 2012 +0100 +++ b/xen/arch/arm/entry.S Tue Jul 03 10:52:31 2012 +0100 @@ -1,5 +1,6 @@ #include #include +#include #define SAVE_ONE_BANKED(reg) mrs r11, reg; str r11, [sp, #UREGS_##reg] #define RESTORE_ONE_BANKED(reg) ldr r11, [sp, #UREGS_##reg]; msr reg, r11 diff -r 5d432081dedd -r 481d7293aa53 xen/include/asm-arm/page.h --- a/xen/include/asm-arm/page.h Tue Jul 03 10:52:30 2012 +0100 +++ b/xen/include/asm-arm/page.h Tue Jul 03 10:52:31 2012 +0100 @@ -2,6 +2,8 @@ #define __ARM_PAGE_H__ #include +#include +#include #define PADDR_BITS 40 #define PADDR_MASK ((1ULL << PADDR_BITS)-1) diff -r 5d432081dedd -r 481d7293aa53 xen/include/asm-arm/processor.h --- a/xen/include/asm-arm/processor.h Tue Jul 03 10:52:30 2012 +0100 +++ b/xen/include/asm-arm/processor.h Tue Jul 03 10:52:31 2012 +0100 @@ -3,27 +3,6 @@ #include -/* PSR bits (CPSR, SPSR)*/ - -/* 0-4: Mode */ -#define PSR_MODE_MASK 0x1f -#define PSR_MODE_USR 0x10 -#define PSR_MODE_FIQ 0x11 -#define PSR_MODE_IRQ 0x12 -#define PSR_MODE_SVC 0x13 -#define PSR_MODE_MON 0x16 -#define PSR_MODE_ABT 0x17 -#define PSR_MODE_HYP 0x1a -#define PSR_MODE_UND 0x1b -#define PSR_MODE_SYS 0x1f - -#define PSR_THUMB (1<<5) /* Thumb Mode enable */ -#define PSR_FIQ_MASK (1<<6) /* Fast Interrupt mask */ -#define PSR_IRQ_MASK (1<<7) /* Interrupt mask */ -#define PSR_ABT_MASK (1<<8) /* Asynchronous Abort mask */ -#define PSR_BIG_ENDIAN (1<<9) /* Big Endian Mode */ -#define PSR_JAZELLE (1<<24) /* Jazelle Mode */ - /* TTBCR Translation Table Base Control Register */ #define TTBCR_EAE 0x80000000 #define TTBCR_N_MASK 0x07 diff -r 5d432081dedd -r 481d7293aa53 xen/include/asm-arm/system.h --- a/xen/include/asm-arm/system.h Tue Jul 03 10:52:30 2012 +0100 +++ b/xen/include/asm-arm/system.h Tue Jul 03 10:52:31 2012 +0100 @@ -3,7 +3,7 @@ #define __ASM_SYSTEM_H #include -#include +#include #define nop() \ asm volatile ( "nop" ) diff -r 5d432081dedd -r 481d7293aa53 xen/include/public/arch-arm.h --- a/xen/include/public/arch-arm.h Tue Jul 03 10:52:30 2012 +0100 +++ b/xen/include/public/arch-arm.h Tue Jul 03 10:52:31 2012 +0100 @@ -138,7 +138,28 @@ struct arch_shared_info { }; typedef struct arch_shared_info arch_shared_info_t; typedef uint64_t xen_callback_t; -#endif +#endif /* ifndef __ASSEMBLY __ */ + +/* PSR bits (CPSR, SPSR)*/ + +/* 0-4: Mode */ +#define PSR_MODE_MASK 0x1f +#define PSR_MODE_USR 0x10 +#define PSR_MODE_FIQ 0x11 +#define PSR_MODE_IRQ 0x12 +#define PSR_MODE_SVC 0x13 +#define PSR_MODE_MON 0x16 +#define PSR_MODE_ABT 0x17 +#define PSR_MODE_HYP 0x1a +#define PSR_MODE_UND 0x1b +#define PSR_MODE_SYS 0x1f + +#define PSR_THUMB (1<<5) /* Thumb Mode enable */ +#define PSR_FIQ_MASK (1<<6) /* Fast Interrupt mask */ +#define PSR_IRQ_MASK (1<<7) /* Interrupt mask */ +#define PSR_ABT_MASK (1<<8) /* Asynchronous Abort mask */ +#define PSR_BIG_ENDIAN (1<<9) /* Big Endian Mode */ +#define PSR_JAZELLE (1<<24) /* Jazelle Mode */ #endif /* __XEN_PUBLIC_ARCH_ARM_H__ */ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:56 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwW-0005rQ-Gi; Wed, 04 Jul 2012 04:11:56 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwR-0005W0-Gy for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:51 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-27.messagelabs.com!1341375103!9872586!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20175 invoked from network); 4 Jul 2012 04:11:44 -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; 4 Jul 2012 04:11:44 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwJ-0002m9-Ea for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:43 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGwJ-00042u-DM for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:43 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:42 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xen: add assertion in default_vcpu0_location to protect against broken masks X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341309153 -3600 # Node ID 1b3198c8f140918574ccfe6baba92ef214d69c1a # Parent 46b201f42bf850e7d9a4cbef8fad59798898fabc xen: add assertion in default_vcpu0_location to protect against broken masks When setting up the cpu sibling/etc masks on ARM I accidentally and incorrectly omitted a CPU from it's own sibling mask which caused this function to return an invalid cpu number which caused errors later when we tried to access per_cpu data for that invalid cpu. Add an assert to catch this in the future. Signed-off-by: Ian Campbell Acked-by: Jan Beulich Acked-by: Keir Fraser Committed-by: Ian Campbell --- diff -r 46b201f42bf8 -r 1b3198c8f140 xen/common/domctl.c --- a/xen/common/domctl.c Tue Jul 03 10:52:32 2012 +0100 +++ b/xen/common/domctl.c Tue Jul 03 10:52:33 2012 +0100 @@ -192,6 +192,7 @@ static unsigned int default_vcpu0_locati cpu = cpumask_first(&cpu_exclude_map); if ( cpumask_weight(&cpu_exclude_map) > 1 ) cpu = cpumask_next(cpu, &cpu_exclude_map); + ASSERT(cpu < nr_cpu_ids); for_each_cpu(i, online) { if ( cpumask_test_cpu(i, &cpu_exclude_map) ) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:56 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwW-0005rQ-Gi; Wed, 04 Jul 2012 04:11:56 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwR-0005W0-Gy for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:51 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-27.messagelabs.com!1341375103!9872586!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20175 invoked from network); 4 Jul 2012 04:11:44 -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; 4 Jul 2012 04:11:44 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwJ-0002m9-Ea for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:43 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGwJ-00042u-DM for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:43 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:42 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xen: add assertion in default_vcpu0_location to protect against broken masks X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341309153 -3600 # Node ID 1b3198c8f140918574ccfe6baba92ef214d69c1a # Parent 46b201f42bf850e7d9a4cbef8fad59798898fabc xen: add assertion in default_vcpu0_location to protect against broken masks When setting up the cpu sibling/etc masks on ARM I accidentally and incorrectly omitted a CPU from it's own sibling mask which caused this function to return an invalid cpu number which caused errors later when we tried to access per_cpu data for that invalid cpu. Add an assert to catch this in the future. Signed-off-by: Ian Campbell Acked-by: Jan Beulich Acked-by: Keir Fraser Committed-by: Ian Campbell --- diff -r 46b201f42bf8 -r 1b3198c8f140 xen/common/domctl.c --- a/xen/common/domctl.c Tue Jul 03 10:52:32 2012 +0100 +++ b/xen/common/domctl.c Tue Jul 03 10:52:33 2012 +0100 @@ -192,6 +192,7 @@ static unsigned int default_vcpu0_locati cpu = cpumask_first(&cpu_exclude_map); if ( cpumask_weight(&cpu_exclude_map) > 1 ) cpu = cpumask_next(cpu, &cpu_exclude_map); + ASSERT(cpu < nr_cpu_ids); for_each_cpu(i, online) { if ( cpumask_test_cpu(i, &cpu_exclude_map) ) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:57 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwX-0005sp-Gc; Wed, 04 Jul 2012 04:11:57 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwR-0005WE-KK for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:51 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-27.messagelabs.com!1341375104!9914351!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14902 invoked from network); 4 Jul 2012 04:11:45 -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; 4 Jul 2012 04:11:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwK-0002mG-Ev for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGwK-00043O-Dy for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:44 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:43 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xen: event channel remapping for emulated MSIs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Stefano Stabellini # Date 1341319141 -3600 # Node ID 42f76d536b116d2ebad1b6705ae51ecd171d2581 # Parent 2cffb7bf6e5738af59d52446155d49aaeadac540 xen: event channel remapping for emulated MSIs Linux PV on HVM guests remap all the MSIs onto event channels, including MSIs corresponding to QEMU's emulated devices. This patch makes sure that we handle correctly the case of emulated MSI that have been remapped, sending a pirq to the guest instead. Signed-off-by: Stefano Stabellini Tested-by: Deep Debroy Committed-by: Keir Fraser --- diff -r 2cffb7bf6e57 -r 42f76d536b11 xen/arch/x86/hvm/irq.c --- a/xen/arch/x86/hvm/irq.c Tue Jul 03 13:38:19 2012 +0100 +++ b/xen/arch/x86/hvm/irq.c Tue Jul 03 13:39:01 2012 +0100 @@ -281,6 +281,31 @@ void hvm_inject_msi(struct domain *d, ui >> MSI_DATA_TRIGGER_SHIFT; uint8_t vector = data & MSI_DATA_VECTOR_MASK; + if ( !vector ) + { + int pirq = ((addr >> 32) & 0xffffff00) | ((addr >> 12) & 0xff); + if ( pirq > 0 ) + { + struct pirq *info = pirq_info(d, pirq); + + /* if it is the first time, allocate the pirq */ + if (info->arch.hvm.emuirq == IRQ_UNBOUND) + { + spin_lock(&d->event_lock); + map_domain_emuirq_pirq(d, pirq, IRQ_MSI_EMU); + spin_unlock(&d->event_lock); + } else if (info->arch.hvm.emuirq != IRQ_MSI_EMU) + { + printk("%s: pirq %d does not correspond to an emulated MSI\n", __func__, pirq); + return; + } + send_guest_pirq(d, info); + return; + } else { + printk("%s: error getting pirq from MSI: pirq = %d\n", __func__, pirq); + } + } + vmsi_deliver(d, vector, dest, dest_mode, delivery_mode, trig_mode); } diff -r 2cffb7bf6e57 -r 42f76d536b11 xen/include/asm-x86/irq.h --- a/xen/include/asm-x86/irq.h Tue Jul 03 13:38:19 2012 +0100 +++ b/xen/include/asm-x86/irq.h Tue Jul 03 13:39:01 2012 +0100 @@ -188,6 +188,7 @@ void cleanup_domain_irq_mapping(struct d }) #define IRQ_UNBOUND -1 #define IRQ_PT -2 +#define IRQ_MSI_EMU -3 bool_t cpu_has_pending_apic_eoi(void); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 04 04:11:57 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jul 2012 04:11:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwX-0005sp-Gc; Wed, 04 Jul 2012 04:11:57 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwR-0005WE-KK for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:51 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-27.messagelabs.com!1341375104!9914351!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14902 invoked from network); 4 Jul 2012 04:11:45 -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; 4 Jul 2012 04:11:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmGwK-0002mG-Ev for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmGwK-00043O-Dy for xen-changelog@lists.xensource.com; Wed, 04 Jul 2012 04:11:44 +0000 Message-Id: Date: Wed, 04 Jul 2012 04:11:43 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xen: event channel remapping for emulated MSIs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Stefano Stabellini # Date 1341319141 -3600 # Node ID 42f76d536b116d2ebad1b6705ae51ecd171d2581 # Parent 2cffb7bf6e5738af59d52446155d49aaeadac540 xen: event channel remapping for emulated MSIs Linux PV on HVM guests remap all the MSIs onto event channels, including MSIs corresponding to QEMU's emulated devices. This patch makes sure that we handle correctly the case of emulated MSI that have been remapped, sending a pirq to the guest instead. Signed-off-by: Stefano Stabellini Tested-by: Deep Debroy Committed-by: Keir Fraser --- diff -r 2cffb7bf6e57 -r 42f76d536b11 xen/arch/x86/hvm/irq.c --- a/xen/arch/x86/hvm/irq.c Tue Jul 03 13:38:19 2012 +0100 +++ b/xen/arch/x86/hvm/irq.c Tue Jul 03 13:39:01 2012 +0100 @@ -281,6 +281,31 @@ void hvm_inject_msi(struct domain *d, ui >> MSI_DATA_TRIGGER_SHIFT; uint8_t vector = data & MSI_DATA_VECTOR_MASK; + if ( !vector ) + { + int pirq = ((addr >> 32) & 0xffffff00) | ((addr >> 12) & 0xff); + if ( pirq > 0 ) + { + struct pirq *info = pirq_info(d, pirq); + + /* if it is the first time, allocate the pirq */ + if (info->arch.hvm.emuirq == IRQ_UNBOUND) + { + spin_lock(&d->event_lock); + map_domain_emuirq_pirq(d, pirq, IRQ_MSI_EMU); + spin_unlock(&d->event_lock); + } else if (info->arch.hvm.emuirq != IRQ_MSI_EMU) + { + printk("%s: pirq %d does not correspond to an emulated MSI\n", __func__, pirq); + return; + } + send_guest_pirq(d, info); + return; + } else { + printk("%s: error getting pirq from MSI: pirq = %d\n", __func__, pirq); + } + } + vmsi_deliver(d, vector, dest, dest_mode, delivery_mode, trig_mode); } diff -r 2cffb7bf6e57 -r 42f76d536b11 xen/include/asm-x86/irq.h --- a/xen/include/asm-x86/irq.h Tue Jul 03 13:38:19 2012 +0100 +++ b/xen/include/asm-x86/irq.h Tue Jul 03 13:39:01 2012 +0100 @@ -188,6 +188,7 @@ void cleanup_domain_irq_mapping(struct d }) #define IRQ_UNBOUND -1 #define IRQ_PT -2 +#define IRQ_MSI_EMU -3 bool_t cpu_has_pending_apic_eoi(void); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 05 22:22:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 05 Jul 2012 22: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 1SmuRD-0001Al-Mj; Thu, 05 Jul 2012 22:22:15 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmuRC-0001AI-J0 for xen-changelog@lists.xensource.com; Thu, 05 Jul 2012 22:22:14 +0000 Received: from [85.158.138.51:6088] by server-12.bemta-3.messagelabs.com id 19/0C-30206-59316FF4; Thu, 05 Jul 2012 22:22:13 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-174.messagelabs.com!1341526931!27452684!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 7640 invoked from network); 5 Jul 2012 22:22:12 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 5 Jul 2012 22:22:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmuR8-0000ti-N9 for xen-changelog@lists.xensource.com; Thu, 05 Jul 2012 22:22:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmuR8-00077Q-Lu for xen-changelog@lists.xensource.com; Thu, 05 Jul 2012 22:22:10 +0000 Message-Id: Date: Thu, 05 Jul 2012 22:22:10 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] tools: honour --libdir when it is passed to ./configure X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Matt Wilson # Date 1341482428 -3600 # Node ID ad08cd8e7097ec6da6526cf8ac26f0fa72cd1e01 # Parent 7c0351dc41a5123241af27f4cb910b915647193c tools: honour --libdir when it is passed to ./configure Currently shared libraries are automatically installed into /usr/lib or /usr/lib64, depending on the supplied --prefix value and $(XEN_TARGET_ARCH). Some systems, like recent Debian and Ubuntu releases, do not use /usr/lib64, but instead /usr/lib/x86_64-linux-gnu. With this change, packagers can supply the desired location for shared libraries on the ./configure command line. Packagers need to note that the default behaviour on 64-bit Linux systems will be to install shared libraries in /usr/lib, not /usr/lib64, unless a --libdir value is provided to ./configure. Additionally, the libfsimage plugins are now loaded explicitly from $LIBDIR/fs, removing platform-based decision trees in code. Signed-off-by: Matt Wilson Acked-by: Ian Jackson Acked-by: Ian Campbell [ ijc -- resolve rejects in configure by rerunning autogen.sh. Dropped changes to remove m4/default_lib.m4 and update m4/pkg.m4 since they cause LIBDIR=/lib instead of /usr/lib. Reran ./autogen.sh after that too ] Committed-by: Ian Campbell --- diff -r 7c0351dc41a5 -r ad08cd8e7097 Config.mk --- a/Config.mk Wed Jul 04 15:46:17 2012 +0100 +++ b/Config.mk Thu Jul 05 11:00:28 2012 +0100 @@ -67,7 +67,7 @@ endef ifneq ($(EXTRA_PREFIX),) EXTRA_INCLUDES += $(EXTRA_PREFIX)/include -EXTRA_LIB += $(EXTRA_PREFIX)/$(LIBLEAFDIR) +EXTRA_LIB += $(EXTRA_PREFIX)/lib endif PYTHON ?= python diff -r 7c0351dc41a5 -r ad08cd8e7097 config/NetBSD.mk --- a/config/NetBSD.mk Wed Jul 04 15:46:17 2012 +0100 +++ b/config/NetBSD.mk Thu Jul 05 11:00:28 2012 +0100 @@ -1,7 +1,6 @@ include $(XEN_ROOT)/config/StdGNU.mk # Override settings for this OS -LIBLEAFDIR_x86_64 = lib LIBEXEC = $(PREFIX)/libexec PRIVATE_BINDIR = $(BINDIR) diff -r 7c0351dc41a5 -r ad08cd8e7097 config/StdGNU.mk --- a/config/StdGNU.mk Wed Jul 04 15:46:17 2012 +0100 +++ b/config/StdGNU.mk Thu Jul 05 11:00:28 2012 +0100 @@ -32,19 +32,13 @@ INSTALL_PROG = $(INSTALL) -m0755 -p PREFIX ?= /usr BINDIR = $(PREFIX)/bin INCLUDEDIR = $(PREFIX)/include -LIBLEAFDIR = lib -LIBLEAFDIR_x86_32 = lib -LIBLEAFDIR_x86_64 ?= lib64 -LIBDIR = $(PREFIX)/$(LIBLEAFDIR) -LIBDIR_x86_32 = $(PREFIX)/$(LIBLEAFDIR_x86_32) -LIBDIR_x86_64 = $(PREFIX)/$(LIBLEAFDIR_x86_64) -LIBEXEC = $(LIBDIR_x86_32)/xen/bin +LIBEXEC = $(PREFIX)/lib/xen/bin SHAREDIR = $(PREFIX)/share MANDIR = $(SHAREDIR)/man MAN1DIR = $(MANDIR)/man1 MAN8DIR = $(MANDIR)/man8 SBINDIR = $(PREFIX)/sbin -XENFIRMWAREDIR = $(LIBDIR_x86_32)/xen/boot +XENFIRMWAREDIR = $(PREFIX)/lib/xen/boot PRIVATE_PREFIX = $(LIBDIR)/xen PRIVATE_BINDIR = $(PRIVATE_PREFIX)/bin diff -r 7c0351dc41a5 -r ad08cd8e7097 config/SunOS.mk --- a/config/SunOS.mk Wed Jul 04 15:46:17 2012 +0100 +++ b/config/SunOS.mk Thu Jul 05 11:00:28 2012 +0100 @@ -22,10 +22,6 @@ INSTALL_PROG = $(INSTALL) -m0755 -p PREFIX ?= /usr BINDIR = $(PREFIX)/bin INCLUDEDIR = $(PREFIX)/include -LIBLEAFDIR = lib -LIBLEAFDIR_x86_64 = lib/amd64 -LIBDIR = $(PREFIX)/$(LIBLEAFDIR) -LIBDIR_x86_64 = $(PREFIX)/$(LIBLEAFDIR_x86_64) MANDIR = $(PREFIX)/share/man MAN1DIR = $(MANDIR)/man1 MAN8DIR = $(MANDIR)/man8 diff -r 7c0351dc41a5 -r ad08cd8e7097 config/Tools.mk.in --- a/config/Tools.mk.in Wed Jul 04 15:46:17 2012 +0100 +++ b/config/Tools.mk.in Thu Jul 05 11:00:28 2012 +0100 @@ -1,6 +1,7 @@ # Prefix and install folder PREFIX := @prefix@ -LIBLEAFDIR_x86_64 := @LIB_PATH@ +exec_prefix := @exec_prefix@ +LIBDIR := @libdir@ # A debug build of tools? debug := @debug@ diff -r 7c0351dc41a5 -r ad08cd8e7097 config/x86_64.mk --- a/config/x86_64.mk Wed Jul 04 15:46:17 2012 +0100 +++ b/config/x86_64.mk Thu Jul 05 11:00:28 2012 +0100 @@ -10,9 +10,6 @@ CONFIG_IOEMU := y CFLAGS += -m64 -LIBLEAFDIR = $(LIBLEAFDIR_x86_64) -LIBDIR = $(LIBDIR_x86_64) - SunOS_LIBDIR = $(SunOS_LIBDIR_x86_64) # Use only if calling $(LD) directly. diff -r 7c0351dc41a5 -r ad08cd8e7097 tools/libfsimage/Rules.mk --- a/tools/libfsimage/Rules.mk Wed Jul 04 15:46:17 2012 +0100 +++ b/tools/libfsimage/Rules.mk Thu Jul 05 11:00:28 2012 +0100 @@ -1,17 +1,12 @@ include $(XEN_ROOT)/tools/Rules.mk -CFLAGS += -Wno-unknown-pragmas -I$(XEN_ROOT)/tools/libfsimage/common/ +CFLAGS += -Wno-unknown-pragmas -I$(XEN_ROOT)/tools/libfsimage/common/ -DFSIMAGE_FSDIR=\"$(FSDIR)\" CFLAGS += -Werror -D_GNU_SOURCE LDFLAGS += -L../common/ PIC_OBJS := $(patsubst %.c,%.opic,$(LIB_SRCS-y)) -FSDIR-$(CONFIG_Linux) = $(LIBDIR)/fs/$(FS) -FSDIR-$(CONFIG_SunOS)-x86_64 = $(PREFIX)/lib/fs/$(FS)/64 -FSDIR-$(CONFIG_SunOS)-x86_32 = $(PREFIX)/lib/fs/$(FS)/ -FSDIR-$(CONFIG_SunOS) = $(FSDIR-$(CONFIG_SunOS)-$(XEN_TARGET_ARCH)) -FSDIR-$(CONFIG_NetBSD) = $(LIBDIR)/fs/$(FS) -FSDIR = $(FSDIR-y) +FSDIR = $(LIBDIR)/fs FSLIB = fsimage.so @@ -20,8 +15,8 @@ fs-all: $(FSLIB) .PHONY: fs-install fs-install: fs-all - $(INSTALL_DIR) $(DESTDIR)$(FSDIR) - $(INSTALL_PROG) $(FSLIB) $(DESTDIR)$(FSDIR) + $(INSTALL_DIR) $(DESTDIR)$(FSDIR)/$(FS) + $(INSTALL_PROG) $(FSLIB) $(DESTDIR)$(FSDIR)/$(FS) $(FSLIB): $(PIC_OBJS) $(CC) $(LDFLAGS) $(SHLIB_LDFLAGS) -o $@ $^ -lfsimage $(FS_LIBDEPS) $(APPEND_LDFLAGS) diff -r 7c0351dc41a5 -r ad08cd8e7097 tools/libfsimage/common/Makefile --- a/tools/libfsimage/common/Makefile Wed Jul 04 15:46:17 2012 +0100 +++ b/tools/libfsimage/common/Makefile Thu Jul 05 11:00:28 2012 +0100 @@ -1,5 +1,5 @@ XEN_ROOT = $(CURDIR)/../../.. -include $(XEN_ROOT)/tools/Rules.mk +include $(XEN_ROOT)/tools/libfsimage/Rules.mk MAJOR = 1.0 MINOR = 0 diff -r 7c0351dc41a5 -r ad08cd8e7097 tools/libfsimage/common/fsimage_plugin.c --- a/tools/libfsimage/common/fsimage_plugin.c Wed Jul 04 15:46:17 2012 +0100 +++ b/tools/libfsimage/common/fsimage_plugin.c Thu Jul 05 11:00:28 2012 +0100 @@ -122,7 +122,6 @@ fail: static int load_plugins(void) { const char *fsdir = getenv("FSIMAGE_FSDIR"); - const char *isadir = ""; struct dirent *dp = NULL; struct dirent *dpp; DIR *dir = NULL; @@ -131,26 +130,8 @@ static int load_plugins(void) int err; int ret = -1; -#if defined(FSIMAGE_FSDIR) if (fsdir == NULL) fsdir = FSIMAGE_FSDIR; -#elif defined(__sun__) - if (fsdir == NULL) - fsdir = "/usr/lib/fs"; - - if (sizeof(void *) == 8) - isadir = "64/"; -#elif defined(__ia64__) - if (fsdir == NULL) - fsdir = "/usr/lib/fs"; -#else - if (fsdir == NULL) { - if (sizeof(void *) == 8) - fsdir = "/usr/lib64/fs"; - else - fsdir = "/usr/lib/fs"; - } -#endif if ((name_max = pathconf(fsdir, _PC_NAME_MAX)) == -1) goto fail; @@ -172,8 +153,8 @@ static int load_plugins(void) if (strcmp(dpp->d_name, "..") == 0) continue; - (void) snprintf(tmp, name_max, "%s/%s/%sfsimage.so", fsdir, - dpp->d_name, isadir); + (void) snprintf(tmp, name_max, "%s/%s/fsimage.so", fsdir, + dpp->d_name); if (init_plugin(tmp) != 0) goto fail; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 05 22:22:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 05 Jul 2012 22: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 1SmuRD-0001Al-Mj; Thu, 05 Jul 2012 22:22:15 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmuRC-0001AI-J0 for xen-changelog@lists.xensource.com; Thu, 05 Jul 2012 22:22:14 +0000 Received: from [85.158.138.51:6088] by server-12.bemta-3.messagelabs.com id 19/0C-30206-59316FF4; Thu, 05 Jul 2012 22:22:13 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-174.messagelabs.com!1341526931!27452684!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 7640 invoked from network); 5 Jul 2012 22:22:12 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 5 Jul 2012 22:22:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmuR8-0000ti-N9 for xen-changelog@lists.xensource.com; Thu, 05 Jul 2012 22:22:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmuR8-00077Q-Lu for xen-changelog@lists.xensource.com; Thu, 05 Jul 2012 22:22:10 +0000 Message-Id: Date: Thu, 05 Jul 2012 22:22:10 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] tools: honour --libdir when it is passed to ./configure X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Matt Wilson # Date 1341482428 -3600 # Node ID ad08cd8e7097ec6da6526cf8ac26f0fa72cd1e01 # Parent 7c0351dc41a5123241af27f4cb910b915647193c tools: honour --libdir when it is passed to ./configure Currently shared libraries are automatically installed into /usr/lib or /usr/lib64, depending on the supplied --prefix value and $(XEN_TARGET_ARCH). Some systems, like recent Debian and Ubuntu releases, do not use /usr/lib64, but instead /usr/lib/x86_64-linux-gnu. With this change, packagers can supply the desired location for shared libraries on the ./configure command line. Packagers need to note that the default behaviour on 64-bit Linux systems will be to install shared libraries in /usr/lib, not /usr/lib64, unless a --libdir value is provided to ./configure. Additionally, the libfsimage plugins are now loaded explicitly from $LIBDIR/fs, removing platform-based decision trees in code. Signed-off-by: Matt Wilson Acked-by: Ian Jackson Acked-by: Ian Campbell [ ijc -- resolve rejects in configure by rerunning autogen.sh. Dropped changes to remove m4/default_lib.m4 and update m4/pkg.m4 since they cause LIBDIR=/lib instead of /usr/lib. Reran ./autogen.sh after that too ] Committed-by: Ian Campbell --- diff -r 7c0351dc41a5 -r ad08cd8e7097 Config.mk --- a/Config.mk Wed Jul 04 15:46:17 2012 +0100 +++ b/Config.mk Thu Jul 05 11:00:28 2012 +0100 @@ -67,7 +67,7 @@ endef ifneq ($(EXTRA_PREFIX),) EXTRA_INCLUDES += $(EXTRA_PREFIX)/include -EXTRA_LIB += $(EXTRA_PREFIX)/$(LIBLEAFDIR) +EXTRA_LIB += $(EXTRA_PREFIX)/lib endif PYTHON ?= python diff -r 7c0351dc41a5 -r ad08cd8e7097 config/NetBSD.mk --- a/config/NetBSD.mk Wed Jul 04 15:46:17 2012 +0100 +++ b/config/NetBSD.mk Thu Jul 05 11:00:28 2012 +0100 @@ -1,7 +1,6 @@ include $(XEN_ROOT)/config/StdGNU.mk # Override settings for this OS -LIBLEAFDIR_x86_64 = lib LIBEXEC = $(PREFIX)/libexec PRIVATE_BINDIR = $(BINDIR) diff -r 7c0351dc41a5 -r ad08cd8e7097 config/StdGNU.mk --- a/config/StdGNU.mk Wed Jul 04 15:46:17 2012 +0100 +++ b/config/StdGNU.mk Thu Jul 05 11:00:28 2012 +0100 @@ -32,19 +32,13 @@ INSTALL_PROG = $(INSTALL) -m0755 -p PREFIX ?= /usr BINDIR = $(PREFIX)/bin INCLUDEDIR = $(PREFIX)/include -LIBLEAFDIR = lib -LIBLEAFDIR_x86_32 = lib -LIBLEAFDIR_x86_64 ?= lib64 -LIBDIR = $(PREFIX)/$(LIBLEAFDIR) -LIBDIR_x86_32 = $(PREFIX)/$(LIBLEAFDIR_x86_32) -LIBDIR_x86_64 = $(PREFIX)/$(LIBLEAFDIR_x86_64) -LIBEXEC = $(LIBDIR_x86_32)/xen/bin +LIBEXEC = $(PREFIX)/lib/xen/bin SHAREDIR = $(PREFIX)/share MANDIR = $(SHAREDIR)/man MAN1DIR = $(MANDIR)/man1 MAN8DIR = $(MANDIR)/man8 SBINDIR = $(PREFIX)/sbin -XENFIRMWAREDIR = $(LIBDIR_x86_32)/xen/boot +XENFIRMWAREDIR = $(PREFIX)/lib/xen/boot PRIVATE_PREFIX = $(LIBDIR)/xen PRIVATE_BINDIR = $(PRIVATE_PREFIX)/bin diff -r 7c0351dc41a5 -r ad08cd8e7097 config/SunOS.mk --- a/config/SunOS.mk Wed Jul 04 15:46:17 2012 +0100 +++ b/config/SunOS.mk Thu Jul 05 11:00:28 2012 +0100 @@ -22,10 +22,6 @@ INSTALL_PROG = $(INSTALL) -m0755 -p PREFIX ?= /usr BINDIR = $(PREFIX)/bin INCLUDEDIR = $(PREFIX)/include -LIBLEAFDIR = lib -LIBLEAFDIR_x86_64 = lib/amd64 -LIBDIR = $(PREFIX)/$(LIBLEAFDIR) -LIBDIR_x86_64 = $(PREFIX)/$(LIBLEAFDIR_x86_64) MANDIR = $(PREFIX)/share/man MAN1DIR = $(MANDIR)/man1 MAN8DIR = $(MANDIR)/man8 diff -r 7c0351dc41a5 -r ad08cd8e7097 config/Tools.mk.in --- a/config/Tools.mk.in Wed Jul 04 15:46:17 2012 +0100 +++ b/config/Tools.mk.in Thu Jul 05 11:00:28 2012 +0100 @@ -1,6 +1,7 @@ # Prefix and install folder PREFIX := @prefix@ -LIBLEAFDIR_x86_64 := @LIB_PATH@ +exec_prefix := @exec_prefix@ +LIBDIR := @libdir@ # A debug build of tools? debug := @debug@ diff -r 7c0351dc41a5 -r ad08cd8e7097 config/x86_64.mk --- a/config/x86_64.mk Wed Jul 04 15:46:17 2012 +0100 +++ b/config/x86_64.mk Thu Jul 05 11:00:28 2012 +0100 @@ -10,9 +10,6 @@ CONFIG_IOEMU := y CFLAGS += -m64 -LIBLEAFDIR = $(LIBLEAFDIR_x86_64) -LIBDIR = $(LIBDIR_x86_64) - SunOS_LIBDIR = $(SunOS_LIBDIR_x86_64) # Use only if calling $(LD) directly. diff -r 7c0351dc41a5 -r ad08cd8e7097 tools/libfsimage/Rules.mk --- a/tools/libfsimage/Rules.mk Wed Jul 04 15:46:17 2012 +0100 +++ b/tools/libfsimage/Rules.mk Thu Jul 05 11:00:28 2012 +0100 @@ -1,17 +1,12 @@ include $(XEN_ROOT)/tools/Rules.mk -CFLAGS += -Wno-unknown-pragmas -I$(XEN_ROOT)/tools/libfsimage/common/ +CFLAGS += -Wno-unknown-pragmas -I$(XEN_ROOT)/tools/libfsimage/common/ -DFSIMAGE_FSDIR=\"$(FSDIR)\" CFLAGS += -Werror -D_GNU_SOURCE LDFLAGS += -L../common/ PIC_OBJS := $(patsubst %.c,%.opic,$(LIB_SRCS-y)) -FSDIR-$(CONFIG_Linux) = $(LIBDIR)/fs/$(FS) -FSDIR-$(CONFIG_SunOS)-x86_64 = $(PREFIX)/lib/fs/$(FS)/64 -FSDIR-$(CONFIG_SunOS)-x86_32 = $(PREFIX)/lib/fs/$(FS)/ -FSDIR-$(CONFIG_SunOS) = $(FSDIR-$(CONFIG_SunOS)-$(XEN_TARGET_ARCH)) -FSDIR-$(CONFIG_NetBSD) = $(LIBDIR)/fs/$(FS) -FSDIR = $(FSDIR-y) +FSDIR = $(LIBDIR)/fs FSLIB = fsimage.so @@ -20,8 +15,8 @@ fs-all: $(FSLIB) .PHONY: fs-install fs-install: fs-all - $(INSTALL_DIR) $(DESTDIR)$(FSDIR) - $(INSTALL_PROG) $(FSLIB) $(DESTDIR)$(FSDIR) + $(INSTALL_DIR) $(DESTDIR)$(FSDIR)/$(FS) + $(INSTALL_PROG) $(FSLIB) $(DESTDIR)$(FSDIR)/$(FS) $(FSLIB): $(PIC_OBJS) $(CC) $(LDFLAGS) $(SHLIB_LDFLAGS) -o $@ $^ -lfsimage $(FS_LIBDEPS) $(APPEND_LDFLAGS) diff -r 7c0351dc41a5 -r ad08cd8e7097 tools/libfsimage/common/Makefile --- a/tools/libfsimage/common/Makefile Wed Jul 04 15:46:17 2012 +0100 +++ b/tools/libfsimage/common/Makefile Thu Jul 05 11:00:28 2012 +0100 @@ -1,5 +1,5 @@ XEN_ROOT = $(CURDIR)/../../.. -include $(XEN_ROOT)/tools/Rules.mk +include $(XEN_ROOT)/tools/libfsimage/Rules.mk MAJOR = 1.0 MINOR = 0 diff -r 7c0351dc41a5 -r ad08cd8e7097 tools/libfsimage/common/fsimage_plugin.c --- a/tools/libfsimage/common/fsimage_plugin.c Wed Jul 04 15:46:17 2012 +0100 +++ b/tools/libfsimage/common/fsimage_plugin.c Thu Jul 05 11:00:28 2012 +0100 @@ -122,7 +122,6 @@ fail: static int load_plugins(void) { const char *fsdir = getenv("FSIMAGE_FSDIR"); - const char *isadir = ""; struct dirent *dp = NULL; struct dirent *dpp; DIR *dir = NULL; @@ -131,26 +130,8 @@ static int load_plugins(void) int err; int ret = -1; -#if defined(FSIMAGE_FSDIR) if (fsdir == NULL) fsdir = FSIMAGE_FSDIR; -#elif defined(__sun__) - if (fsdir == NULL) - fsdir = "/usr/lib/fs"; - - if (sizeof(void *) == 8) - isadir = "64/"; -#elif defined(__ia64__) - if (fsdir == NULL) - fsdir = "/usr/lib/fs"; -#else - if (fsdir == NULL) { - if (sizeof(void *) == 8) - fsdir = "/usr/lib64/fs"; - else - fsdir = "/usr/lib/fs"; - } -#endif if ((name_max = pathconf(fsdir, _PC_NAME_MAX)) == -1) goto fail; @@ -172,8 +153,8 @@ static int load_plugins(void) if (strcmp(dpp->d_name, "..") == 0) continue; - (void) snprintf(tmp, name_max, "%s/%s/%sfsimage.so", fsdir, - dpp->d_name, isadir); + (void) snprintf(tmp, name_max, "%s/%s/fsimage.so", fsdir, + dpp->d_name); if (init_plugin(tmp) != 0) goto fail; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 05 22:22:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 05 Jul 2012 22: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 1SmuRB-0001A8-Ao; Thu, 05 Jul 2012 22:22:13 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmuRA-00019t-06 for xen-changelog@lists.xensource.com; Thu, 05 Jul 2012 22:22:12 +0000 Received: from [85.158.143.35:13677] by server-1.bemta-4.messagelabs.com id 17/8A-24392-39316FF4; Thu, 05 Jul 2012 22:22:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-21.messagelabs.com!1341526929!5356271!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 24211 invoked from network); 5 Jul 2012 22:22:10 -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; 5 Jul 2012 22:22:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmuR6-0000tT-EJ for xen-changelog@lists.xensource.com; Thu, 05 Jul 2012 22:22:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmuR5-00076B-Uj for xen-changelog@lists.xensource.com; Thu, 05 Jul 2012 22:22:08 +0000 Message-Id: Date: Thu, 05 Jul 2012 22:22:07 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] pygrub: cope better with big files in the guest. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User M A Young # Date 1341413174 -3600 # Node ID 60f09d1ab1fe5dee87db1bf55c7479a5d71e85a5 # Parent 42f76d536b116d2ebad1b6705ae51ecd171d2581 pygrub: cope better with big files in the guest. Only read the first megabyte of a configuration file (grub etc.) and read the kernel and ramdisk files from the guest in one megabyte pieces so pygrub doesn't use a lot of memory if the files are large. With --not-really option check that the chosen kernel and ramdisk files exist. If there are problems writing the copy of the kernel or ramdisk, delete the copied files and exit in case they have filled the filesystem. Signed-off-by: Michael Young Acked-by: Matt Wilson Acked-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r 42f76d536b11 -r 60f09d1ab1fe tools/pygrub/src/pygrub --- a/tools/pygrub/src/pygrub Tue Jul 03 13:39:01 2012 +0100 +++ b/tools/pygrub/src/pygrub Wed Jul 04 15:46:14 2012 +0100 @@ -28,6 +28,7 @@ import grub.LiloConf import grub.ExtLinuxConf PYGRUB_VER = 0.6 +FS_READ_MAX = 1024 * 1024 def enable_cursor(ison): if ison: @@ -448,7 +449,8 @@ class Grub: if self.__dict__.get('cf', None) is None: raise RuntimeError, "couldn't find bootloader config file in the image provided." f = fs.open_file(self.cf.filename) - buf = f.read() + # limit read size to avoid pathological cases + buf = f.read(FS_READ_MAX) del f self.cf.parse(buf) @@ -697,6 +699,37 @@ if __name__ == "__main__": def usage(): print >> sys.stderr, "Usage: %s [-q|--quiet] [-i|--interactive] [-n|--not-really] [--output=] [--kernel=] [--ramdisk=] [--args=] [--entry=] [--output-directory=] [--output-format=sxp|simple|simple0] " %(sys.argv[0],) + def copy_from_image(fs, file_to_read, file_type, output_directory, + not_really): + if not_really: + if fs.file_exists(file_to_read): + return "<%s:%s>" % (file_type, file_to_read) + else: + sys.exit("The requested %s file does not exist" % file_type) + try: + datafile = fs.open_file(file_to_read) + except Exception, e: + print >>sys.stderr, e + sys.exit("Error opening %s in guest" % file_to_read) + (tfd, ret) = tempfile.mkstemp(prefix="boot_"+file_type+".", + dir=output_directory) + dataoff = 0 + while True: + data = datafile.read(FS_READ_MAX, dataoff) + if len(data) == 0: + os.close(tfd) + del datafile + return ret + try: + os.write(tfd, data) + except Exception, e: + print >>sys.stderr, e + os.close(tfd) + os.unlink(ret) + del datafile + sys.exit("Error writing temporary copy of "+file_type) + dataoff += len(data) + try: opts, args = getopt.gnu_getopt(sys.argv[1:], 'qinh::', ["quiet", "interactive", "not-really", "help", @@ -821,24 +854,18 @@ if __name__ == "__main__": if not fs: raise RuntimeError, "Unable to find partition containing kernel" - if not_really: - bootcfg["kernel"] = "" % chosencfg["kernel"] - else: - data = fs.open_file(chosencfg["kernel"]).read() - (tfd, bootcfg["kernel"]) = tempfile.mkstemp(prefix="boot_kernel.", - dir=output_directory) - os.write(tfd, data) - os.close(tfd) + bootcfg["kernel"] = copy_from_image(fs, chosencfg["kernel"], "kernel", + output_directory, not_really) if chosencfg["ramdisk"]: - if not_really: - bootcfg["ramdisk"] = "" % chosencfg["ramdisk"] - else: - data = fs.open_file(chosencfg["ramdisk"],).read() - (tfd, bootcfg["ramdisk"]) = tempfile.mkstemp( - prefix="boot_ramdisk.", dir=output_directory) - os.write(tfd, data) - os.close(tfd) + try: + bootcfg["ramdisk"] = copy_from_image(fs, chosencfg["ramdisk"], + "ramdisk", output_directory, + not_really) + except: + if not not_really: + os.unlink(bootcfg["kernel"]) + raise else: initrd = None _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 05 22:22:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 05 Jul 2012 22: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 1SmuRD-0001Ag-JY; Thu, 05 Jul 2012 22:22:15 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmuRB-00019z-QA for xen-changelog@lists.xensource.com; Thu, 05 Jul 2012 22:22:14 +0000 Received: from [85.158.143.35:13732] by server-3.bemta-4.messagelabs.com id 68/4C-05808-59316FF4; Thu, 05 Jul 2012 22:22:13 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-21.messagelabs.com!1341526931!13265037!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 25769 invoked from network); 5 Jul 2012 22:22:12 -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; 5 Jul 2012 22:22:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmuR9-0000tl-Ak for xen-changelog@lists.xensource.com; Thu, 05 Jul 2012 22:22:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmuR9-00077f-6V for xen-changelog@lists.xensource.com; Thu, 05 Jul 2012 22:22:11 +0000 Message-Id: Date: Thu, 05 Jul 2012 22:22:10 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] hotplug/Linux: do not leak lockfiles X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341488425 -3600 # Node ID 497e2fe4945594cd2846f0302bef5e5dafa1c2c6 # Parent ad08cd8e7097ec6da6526cf8ac26f0fa72cd1e01 hotplug/Linux: do not leak lockfiles 25590:bb250383a4f5 introduced a new locking scheme. Unfortunately it leaves behind files in /var/run/xen-hotplug. These are spotted as regressions by the autotester. Fix this. This involves changing the locking protocol to allow lockfiles to be deleted (as removing lockfiles is unsafe with a naive flock-based algorithm). Signed-off-by: Ian Jackson Committed-by: Ian Jackson --- diff -r ad08cd8e7097 -r 497e2fe49455 tools/hotplug/Linux/locking.sh --- a/tools/hotplug/Linux/locking.sh Thu Jul 05 11:00:28 2012 +0100 +++ b/tools/hotplug/Linux/locking.sh Thu Jul 05 12:40:25 2012 +0100 @@ -30,6 +30,7 @@ _setlockfd() done _lockdict[$i]="$1" let _lockfd=200+i + _lockfile="$LOCK_BASEDIR/$1" } @@ -37,13 +38,92 @@ claim_lock() { mkdir -p "$LOCK_BASEDIR" _setlockfd $1 - eval "exec $_lockfd>>$LOCK_BASEDIR/$1" - flock -x $_lockfd + # The locking strategy is identical to that from with-lock-ex(1) + # from chiark-utils, except using flock. It has the benefit of + # it being possible to safely remove the lockfile when done. + # See below for a correctness proof. + local rightfile + while true; do + eval "exec $_lockfd>>$_lockfile" + flock -x $_lockfd || return $? + # We can't just stat /dev/stdin or /proc/self/fd/$_lockfd or + # use bash's test -ef because those all go through what is + # actually a synthetic symlink in /proc and we aren't + # guaranteed that our stat(2) won't lose the race with an + # rm(1) between reading the synthetic link and traversing the + # file system to find the inum. Perl is very fast so use that. + rightfile=$( perl -e ' + open STDIN, "<&'$_lockfd'" or die $!; + my $fd_inum = (stat STDIN)[1]; die $! unless defined $fd_inum; + my $file_inum = (stat $ARGV[0])[1]; + print "y\n" if $fd_inum eq $file_inum; + ' "$_lockfile" ) + if [ x$rightfile = xy ]; then break; fi + done } release_lock() { _setlockfd $1 - flock -u $_lockfd + rm "$_lockfile" } + +# Protocol and correctness proof: +# +# * The lock is owned not by a process but by an open-file (informally +# an fd). Any process with an fd onto this open-file is a +# lockholder and may perform the various operations; such a process +# should only do so when its co-lockholder processes expect. Ie, we +# will treat all processes holding fds onto the open-file as acting +# in concert and not distinguish between them. +# +# * You are a lockholder if +# - You have an fd onto an open-file which +# currently holds an exclusive flock lock on its inum +# - and that inum is currently linked at the lockfile path +# +# * The rules are: +# - No-one but a lockholder may unlink the lockfile path +# (or otherwise cause it to stop referring to a file it +# refers to). +# - Anyone may open the lockfile with O_CREAT +# +# * The protocol for locking is: +# - Open the file (O_CREAT) +# - flock it +# - fstat the fd you have open +# - stat the lockfile path +# - if both are equal you have the lock, otherwise try again. +# +# * Informal proof of exclusivity: +# - No two open-files can hold an fcntl lock onto the same file +# at the same time +# - No two files can have the same name at the same time +# +# * Informal proof of correctness of locking protocol: +# - After you call flock successfully no-one other than you +# (someone with the same open-file) can stop you having +# that flock lock. +# - Obviously the inum you get from the fstat is fixed +# - At the point where you call stat there are two +# possibilities: +# (i) the lockfile path referred to some other inum +# in which case you have failed +# (ii) the lockfile path referred to the same file +# in which case at that point you were the +# lockholder (by definition). +# +# * Informal proof that no-one else can steal the lock: +# - After you call flock successfully no-one other than you +# can stop you having that flock lock +# - No-one other than the lockholder is permitted to stop +# the path referring to a particular inum. So if you +# hold the lock then only you are allowed to stop the +# path referring to the file whose flock you hold; so +# it will continue to refer to that file. +# That's both the conditions for being the lockholder. +# +# Thus once you hold the lock at any instant, you will +# continue to do so until you voluntarily stop doing so +# (eg by unlinking the lockfile or closing the fd). _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 05 22:22:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 05 Jul 2012 22: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 1SmuRB-0001A8-Ao; Thu, 05 Jul 2012 22:22:13 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmuRA-00019t-06 for xen-changelog@lists.xensource.com; Thu, 05 Jul 2012 22:22:12 +0000 Received: from [85.158.143.35:13677] by server-1.bemta-4.messagelabs.com id 17/8A-24392-39316FF4; Thu, 05 Jul 2012 22:22:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-21.messagelabs.com!1341526929!5356271!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 24211 invoked from network); 5 Jul 2012 22:22:10 -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; 5 Jul 2012 22:22:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmuR6-0000tT-EJ for xen-changelog@lists.xensource.com; Thu, 05 Jul 2012 22:22:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmuR5-00076B-Uj for xen-changelog@lists.xensource.com; Thu, 05 Jul 2012 22:22:08 +0000 Message-Id: Date: Thu, 05 Jul 2012 22:22:07 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] pygrub: cope better with big files in the guest. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User M A Young # Date 1341413174 -3600 # Node ID 60f09d1ab1fe5dee87db1bf55c7479a5d71e85a5 # Parent 42f76d536b116d2ebad1b6705ae51ecd171d2581 pygrub: cope better with big files in the guest. Only read the first megabyte of a configuration file (grub etc.) and read the kernel and ramdisk files from the guest in one megabyte pieces so pygrub doesn't use a lot of memory if the files are large. With --not-really option check that the chosen kernel and ramdisk files exist. If there are problems writing the copy of the kernel or ramdisk, delete the copied files and exit in case they have filled the filesystem. Signed-off-by: Michael Young Acked-by: Matt Wilson Acked-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r 42f76d536b11 -r 60f09d1ab1fe tools/pygrub/src/pygrub --- a/tools/pygrub/src/pygrub Tue Jul 03 13:39:01 2012 +0100 +++ b/tools/pygrub/src/pygrub Wed Jul 04 15:46:14 2012 +0100 @@ -28,6 +28,7 @@ import grub.LiloConf import grub.ExtLinuxConf PYGRUB_VER = 0.6 +FS_READ_MAX = 1024 * 1024 def enable_cursor(ison): if ison: @@ -448,7 +449,8 @@ class Grub: if self.__dict__.get('cf', None) is None: raise RuntimeError, "couldn't find bootloader config file in the image provided." f = fs.open_file(self.cf.filename) - buf = f.read() + # limit read size to avoid pathological cases + buf = f.read(FS_READ_MAX) del f self.cf.parse(buf) @@ -697,6 +699,37 @@ if __name__ == "__main__": def usage(): print >> sys.stderr, "Usage: %s [-q|--quiet] [-i|--interactive] [-n|--not-really] [--output=] [--kernel=] [--ramdisk=] [--args=] [--entry=] [--output-directory=] [--output-format=sxp|simple|simple0] " %(sys.argv[0],) + def copy_from_image(fs, file_to_read, file_type, output_directory, + not_really): + if not_really: + if fs.file_exists(file_to_read): + return "<%s:%s>" % (file_type, file_to_read) + else: + sys.exit("The requested %s file does not exist" % file_type) + try: + datafile = fs.open_file(file_to_read) + except Exception, e: + print >>sys.stderr, e + sys.exit("Error opening %s in guest" % file_to_read) + (tfd, ret) = tempfile.mkstemp(prefix="boot_"+file_type+".", + dir=output_directory) + dataoff = 0 + while True: + data = datafile.read(FS_READ_MAX, dataoff) + if len(data) == 0: + os.close(tfd) + del datafile + return ret + try: + os.write(tfd, data) + except Exception, e: + print >>sys.stderr, e + os.close(tfd) + os.unlink(ret) + del datafile + sys.exit("Error writing temporary copy of "+file_type) + dataoff += len(data) + try: opts, args = getopt.gnu_getopt(sys.argv[1:], 'qinh::', ["quiet", "interactive", "not-really", "help", @@ -821,24 +854,18 @@ if __name__ == "__main__": if not fs: raise RuntimeError, "Unable to find partition containing kernel" - if not_really: - bootcfg["kernel"] = "" % chosencfg["kernel"] - else: - data = fs.open_file(chosencfg["kernel"]).read() - (tfd, bootcfg["kernel"]) = tempfile.mkstemp(prefix="boot_kernel.", - dir=output_directory) - os.write(tfd, data) - os.close(tfd) + bootcfg["kernel"] = copy_from_image(fs, chosencfg["kernel"], "kernel", + output_directory, not_really) if chosencfg["ramdisk"]: - if not_really: - bootcfg["ramdisk"] = "" % chosencfg["ramdisk"] - else: - data = fs.open_file(chosencfg["ramdisk"],).read() - (tfd, bootcfg["ramdisk"]) = tempfile.mkstemp( - prefix="boot_ramdisk.", dir=output_directory) - os.write(tfd, data) - os.close(tfd) + try: + bootcfg["ramdisk"] = copy_from_image(fs, chosencfg["ramdisk"], + "ramdisk", output_directory, + not_really) + except: + if not not_really: + os.unlink(bootcfg["kernel"]) + raise else: initrd = None _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 05 22:22:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 05 Jul 2012 22: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 1SmuRD-0001Ag-JY; Thu, 05 Jul 2012 22:22:15 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmuRB-00019z-QA for xen-changelog@lists.xensource.com; Thu, 05 Jul 2012 22:22:14 +0000 Received: from [85.158.143.35:13732] by server-3.bemta-4.messagelabs.com id 68/4C-05808-59316FF4; Thu, 05 Jul 2012 22:22:13 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-21.messagelabs.com!1341526931!13265037!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 25769 invoked from network); 5 Jul 2012 22:22:12 -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; 5 Jul 2012 22:22:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmuR9-0000tl-Ak for xen-changelog@lists.xensource.com; Thu, 05 Jul 2012 22:22:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmuR9-00077f-6V for xen-changelog@lists.xensource.com; Thu, 05 Jul 2012 22:22:11 +0000 Message-Id: Date: Thu, 05 Jul 2012 22:22:10 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] hotplug/Linux: do not leak lockfiles X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341488425 -3600 # Node ID 497e2fe4945594cd2846f0302bef5e5dafa1c2c6 # Parent ad08cd8e7097ec6da6526cf8ac26f0fa72cd1e01 hotplug/Linux: do not leak lockfiles 25590:bb250383a4f5 introduced a new locking scheme. Unfortunately it leaves behind files in /var/run/xen-hotplug. These are spotted as regressions by the autotester. Fix this. This involves changing the locking protocol to allow lockfiles to be deleted (as removing lockfiles is unsafe with a naive flock-based algorithm). Signed-off-by: Ian Jackson Committed-by: Ian Jackson --- diff -r ad08cd8e7097 -r 497e2fe49455 tools/hotplug/Linux/locking.sh --- a/tools/hotplug/Linux/locking.sh Thu Jul 05 11:00:28 2012 +0100 +++ b/tools/hotplug/Linux/locking.sh Thu Jul 05 12:40:25 2012 +0100 @@ -30,6 +30,7 @@ _setlockfd() done _lockdict[$i]="$1" let _lockfd=200+i + _lockfile="$LOCK_BASEDIR/$1" } @@ -37,13 +38,92 @@ claim_lock() { mkdir -p "$LOCK_BASEDIR" _setlockfd $1 - eval "exec $_lockfd>>$LOCK_BASEDIR/$1" - flock -x $_lockfd + # The locking strategy is identical to that from with-lock-ex(1) + # from chiark-utils, except using flock. It has the benefit of + # it being possible to safely remove the lockfile when done. + # See below for a correctness proof. + local rightfile + while true; do + eval "exec $_lockfd>>$_lockfile" + flock -x $_lockfd || return $? + # We can't just stat /dev/stdin or /proc/self/fd/$_lockfd or + # use bash's test -ef because those all go through what is + # actually a synthetic symlink in /proc and we aren't + # guaranteed that our stat(2) won't lose the race with an + # rm(1) between reading the synthetic link and traversing the + # file system to find the inum. Perl is very fast so use that. + rightfile=$( perl -e ' + open STDIN, "<&'$_lockfd'" or die $!; + my $fd_inum = (stat STDIN)[1]; die $! unless defined $fd_inum; + my $file_inum = (stat $ARGV[0])[1]; + print "y\n" if $fd_inum eq $file_inum; + ' "$_lockfile" ) + if [ x$rightfile = xy ]; then break; fi + done } release_lock() { _setlockfd $1 - flock -u $_lockfd + rm "$_lockfile" } + +# Protocol and correctness proof: +# +# * The lock is owned not by a process but by an open-file (informally +# an fd). Any process with an fd onto this open-file is a +# lockholder and may perform the various operations; such a process +# should only do so when its co-lockholder processes expect. Ie, we +# will treat all processes holding fds onto the open-file as acting +# in concert and not distinguish between them. +# +# * You are a lockholder if +# - You have an fd onto an open-file which +# currently holds an exclusive flock lock on its inum +# - and that inum is currently linked at the lockfile path +# +# * The rules are: +# - No-one but a lockholder may unlink the lockfile path +# (or otherwise cause it to stop referring to a file it +# refers to). +# - Anyone may open the lockfile with O_CREAT +# +# * The protocol for locking is: +# - Open the file (O_CREAT) +# - flock it +# - fstat the fd you have open +# - stat the lockfile path +# - if both are equal you have the lock, otherwise try again. +# +# * Informal proof of exclusivity: +# - No two open-files can hold an fcntl lock onto the same file +# at the same time +# - No two files can have the same name at the same time +# +# * Informal proof of correctness of locking protocol: +# - After you call flock successfully no-one other than you +# (someone with the same open-file) can stop you having +# that flock lock. +# - Obviously the inum you get from the fstat is fixed +# - At the point where you call stat there are two +# possibilities: +# (i) the lockfile path referred to some other inum +# in which case you have failed +# (ii) the lockfile path referred to the same file +# in which case at that point you were the +# lockholder (by definition). +# +# * Informal proof that no-one else can steal the lock: +# - After you call flock successfully no-one other than you +# can stop you having that flock lock +# - No-one other than the lockholder is permitted to stop +# the path referring to a particular inum. So if you +# hold the lock then only you are allowed to stop the +# path referring to the file whose flock you hold; so +# it will continue to refer to that file. +# That's both the conditions for being the lockholder. +# +# Thus once you hold the lock at any instant, you will +# continue to do so until you voluntarily stop doing so +# (eg by unlinking the lockfile or closing the fd). _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 05 22:22:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 05 Jul 2012 22: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 1SmuRC-0001AN-E1; Thu, 05 Jul 2012 22:22:14 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmuRA-00019t-P3 for xen-changelog@lists.xensource.com; Thu, 05 Jul 2012 22:22:12 +0000 Received: from [85.158.143.99:50778] by server-1.bemta-4.messagelabs.com id C8/8A-24392-49316FF4; Thu, 05 Jul 2012 22:22:12 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-216.messagelabs.com!1341526930!22185078!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 24546 invoked from network); 5 Jul 2012 22:22:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 5 Jul 2012 22:22:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmuR7-0000tZ-5E for xen-changelog@lists.xensource.com; Thu, 05 Jul 2012 22:22:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmuR7-00076f-3O for xen-changelog@lists.xensource.com; Thu, 05 Jul 2012 22:22:09 +0000 Message-Id: Date: Thu, 05 Jul 2012 22:22:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xl: Allow use of /dev/null with xl create to enable command-line definition X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User W. Michael Petullo # Date 1341413175 -3600 # Node ID 328f466f9ee6b8748c8af50090bb7ed12bf83ca5 # Parent bb250383a4f57c4cd8a0b16bae8cacc686c16825 xl: Allow use of /dev/null with xl create to enable command-line definition xm allows specifying /dev/null as the domain configuration argument to its create option; add same functionality to xl. xl treats the configuration argument /dev/null as a special case. This allows specifying an entire domain configuration on the command line. Signed-off-by: W. Michael Petullo Acked-by: Ian Campbell [ ijc -- ported to xen-unstable from 4.1 ] Committed-by: Ian Campbell --- diff -r bb250383a4f5 -r 328f466f9ee6 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Wed Jul 04 15:46:14 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Wed Jul 04 15:46:15 2012 +0100 @@ -1697,10 +1697,15 @@ static int create_domain(struct domain_c if (config_file) { free(config_data); config_data = 0; - ret = libxl_read_file_contents(ctx, config_file, - &config_data, &config_len); - if (ret) { fprintf(stderr, "Failed to read config file: %s: %s\n", - config_file, strerror(errno)); return ERROR_FAIL; } + /* /dev/null represents special case (read config. from command line) */ + if (!strcmp(config_file, "/dev/null")) { + config_len = 0; + } else { + ret = libxl_read_file_contents(ctx, config_file, + &config_data, &config_len); + if (ret) { fprintf(stderr, "Failed to read config file: %s: %s\n", + config_file, strerror(errno)); return ERROR_FAIL; } + } if (!restoring && extra_config && strlen(extra_config)) { if (config_len > INT_MAX - (strlen(extra_config) + 2 + 1)) { fprintf(stderr, "Failed to attach extra configration\n"); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 05 22:22:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 05 Jul 2012 22: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 1SmuRF-0001BB-Rg; Thu, 05 Jul 2012 22:22:17 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmuRE-0001At-IB for xen-changelog@lists.xensource.com; Thu, 05 Jul 2012 22:22:16 +0000 Received: from [193.109.254.147:49118] by server-2.bemta-14.messagelabs.com id 25/95-01735-79316FF4; Thu, 05 Jul 2012 22:22:15 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-27.messagelabs.com!1341526930!10332706!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31450 invoked from network); 5 Jul 2012 22:22: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; 5 Jul 2012 22:22:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmuR8-0000tf-Ak for xen-changelog@lists.xensource.com; Thu, 05 Jul 2012 22:22:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmuR8-000779-5h for xen-changelog@lists.xensource.com; Thu, 05 Jul 2012 22:22:10 +0000 Message-Id: Date: Thu, 05 Jul 2012 22:22:09 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] tools/m4: add AC_LANG_SOURCE to fix autoconf warnings X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341413177 -3600 # Node ID 7c0351dc41a5123241af27f4cb910b915647193c # Parent 197138cc94363f046f79ca89fc1d831a56004e4e tools/m4: add AC_LANG_SOURCE to fix autoconf warnings I see these warnings with autoconf 2.68, add AC_LANG_SOURCE as suggested by upstream documentation. ... # bash autogen.sh configure.ac:141: warning: AC_LANG_CONFTEST: no AC_LANG_SOURCE call detected in body ../../lib/autoconf/lang.m4:194: AC_LANG_CONFTEST is expanded from... ../../lib/autoconf/general.m4:2662: _AC_LINK_IFELSE is expanded from... ../../lib/autoconf/general.m4:2679: AC_LINK_IFELSE is expanded from... ../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from... ../../lib/autoconf/general.m4:2032: AC_CACHE_VAL is expanded from... ../../lib/autoconf/general.m4:2053: AC_CACHE_CHECK is expanded from... m4/pthread.m4:21: AX_CHECK_PTHREAD is expanded from... configure.ac:141: the top level configure.ac:142: warning: AC_LANG_CONFTEST: no AC_LANG_SOURCE call detected in body ../../lib/autoconf/lang.m4:194: AC_LANG_CONFTEST is expanded from... ../../lib/autoconf/general.m4:2662: _AC_LINK_IFELSE is expanded from... ../../lib/autoconf/general.m4:2679: AC_LINK_IFELSE is expanded from... ../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from... ../../lib/autoconf/general.m4:2032: AC_CACHE_VAL is expanded from... ../../lib/autoconf/general.m4:2053: AC_CACHE_CHECK is expanded from... m4/ptyfuncs.m4:1: AX_CHECK_PTYFUNCS is expanded from... configure.ac:142: the top level configure.ac:141: warning: AC_LANG_CONFTEST: no AC_LANG_SOURCE call detected in body ../../lib/autoconf/lang.m4:194: AC_LANG_CONFTEST is expanded from... ../../lib/autoconf/general.m4:2662: _AC_LINK_IFELSE is expanded from... ../../lib/autoconf/general.m4:2679: AC_LINK_IFELSE is expanded from... ../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from... ../../lib/autoconf/general.m4:2032: AC_CACHE_VAL is expanded from... ../../lib/autoconf/general.m4:2053: AC_CACHE_CHECK is expanded from... m4/pthread.m4:21: AX_CHECK_PTHREAD is expanded from... configure.ac:141: the top level configure.ac:142: warning: AC_LANG_CONFTEST: no AC_LANG_SOURCE call detected in body ../../lib/autoconf/lang.m4:194: AC_LANG_CONFTEST is expanded from... ../../lib/autoconf/general.m4:2662: _AC_LINK_IFELSE is expanded from... ../../lib/autoconf/general.m4:2679: AC_LINK_IFELSE is expanded from... ../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from... ../../lib/autoconf/general.m4:2032: AC_CACHE_VAL is expanded from... ../../lib/autoconf/general.m4:2053: AC_CACHE_CHECK is expanded from... m4/ptyfuncs.m4:1: AX_CHECK_PTYFUNCS is expanded from... configure.ac:142: the top level Please rerun autoconf after applying this. Signed-off-by: Olaf Hering Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r 197138cc9436 -r 7c0351dc41a5 tools/m4/pthread.m4 --- a/tools/m4/pthread.m4 Wed Jul 04 15:46:16 2012 +0100 +++ b/tools/m4/pthread.m4 Wed Jul 04 15:46:17 2012 +0100 @@ -24,13 +24,13 @@ AC_DEFUN([AX_CHECK_PTHREAD],[ AX_PTHREAD_CV2VARS AX_PTHREAD_VARS([AX_SAVEVAR_SAVE]) AX_PTHREAD_VARS([AX_PTHREAD_VAR_APPLY]) - AC_LINK_IFELSE([ + AC_LINK_IFELSE([AC_LANG_SOURCE([ #include int main(void) { pthread_atfork(0,0,0); pthread_create(0,0,0,0); } -],[],[ax_cv_pthread_flags=failed]) +])],[],[ax_cv_pthread_flags=failed]) AX_PTHREAD_VARS([AX_SAVEVAR_RESTORE]) ]) if test "x$ax_cv_pthread_flags" = xfailed; then diff -r 197138cc9436 -r 7c0351dc41a5 tools/m4/ptyfuncs.m4 --- a/tools/m4/ptyfuncs.m4 Wed Jul 04 15:46:16 2012 +0100 +++ b/tools/m4/ptyfuncs.m4 Wed Jul 04 15:46:17 2012 +0100 @@ -9,7 +9,7 @@ AC_DEFUN([AX_CHECK_PTYFUNCS], [ fi AX_SAVEVAR_SAVE(LIBS) LIBS="$LIBS $ax_cv_ptyfuncs_libs" - AC_LINK_IFELSE([ + AC_LINK_IFELSE([AC_LANG_SOURCE([ #ifdef INCLUDE_LIBUTIL_H #include INCLUDE_LIBUTIL_H #endif @@ -17,7 +17,7 @@ int main(void) { openpty(0,0,0,0,0); login_tty(0); } -],[ +])],[ break ],[]) AX_SAVEVAR_RESTORE(LIBS) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 05 22:22:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 05 Jul 2012 22: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 1SmuRF-0001BB-Rg; Thu, 05 Jul 2012 22:22:17 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmuRE-0001At-IB for xen-changelog@lists.xensource.com; Thu, 05 Jul 2012 22:22:16 +0000 Received: from [193.109.254.147:49118] by server-2.bemta-14.messagelabs.com id 25/95-01735-79316FF4; Thu, 05 Jul 2012 22:22:15 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-27.messagelabs.com!1341526930!10332706!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31450 invoked from network); 5 Jul 2012 22:22: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; 5 Jul 2012 22:22:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmuR8-0000tf-Ak for xen-changelog@lists.xensource.com; Thu, 05 Jul 2012 22:22:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmuR8-000779-5h for xen-changelog@lists.xensource.com; Thu, 05 Jul 2012 22:22:10 +0000 Message-Id: Date: Thu, 05 Jul 2012 22:22:09 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] tools/m4: add AC_LANG_SOURCE to fix autoconf warnings X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341413177 -3600 # Node ID 7c0351dc41a5123241af27f4cb910b915647193c # Parent 197138cc94363f046f79ca89fc1d831a56004e4e tools/m4: add AC_LANG_SOURCE to fix autoconf warnings I see these warnings with autoconf 2.68, add AC_LANG_SOURCE as suggested by upstream documentation. ... # bash autogen.sh configure.ac:141: warning: AC_LANG_CONFTEST: no AC_LANG_SOURCE call detected in body ../../lib/autoconf/lang.m4:194: AC_LANG_CONFTEST is expanded from... ../../lib/autoconf/general.m4:2662: _AC_LINK_IFELSE is expanded from... ../../lib/autoconf/general.m4:2679: AC_LINK_IFELSE is expanded from... ../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from... ../../lib/autoconf/general.m4:2032: AC_CACHE_VAL is expanded from... ../../lib/autoconf/general.m4:2053: AC_CACHE_CHECK is expanded from... m4/pthread.m4:21: AX_CHECK_PTHREAD is expanded from... configure.ac:141: the top level configure.ac:142: warning: AC_LANG_CONFTEST: no AC_LANG_SOURCE call detected in body ../../lib/autoconf/lang.m4:194: AC_LANG_CONFTEST is expanded from... ../../lib/autoconf/general.m4:2662: _AC_LINK_IFELSE is expanded from... ../../lib/autoconf/general.m4:2679: AC_LINK_IFELSE is expanded from... ../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from... ../../lib/autoconf/general.m4:2032: AC_CACHE_VAL is expanded from... ../../lib/autoconf/general.m4:2053: AC_CACHE_CHECK is expanded from... m4/ptyfuncs.m4:1: AX_CHECK_PTYFUNCS is expanded from... configure.ac:142: the top level configure.ac:141: warning: AC_LANG_CONFTEST: no AC_LANG_SOURCE call detected in body ../../lib/autoconf/lang.m4:194: AC_LANG_CONFTEST is expanded from... ../../lib/autoconf/general.m4:2662: _AC_LINK_IFELSE is expanded from... ../../lib/autoconf/general.m4:2679: AC_LINK_IFELSE is expanded from... ../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from... ../../lib/autoconf/general.m4:2032: AC_CACHE_VAL is expanded from... ../../lib/autoconf/general.m4:2053: AC_CACHE_CHECK is expanded from... m4/pthread.m4:21: AX_CHECK_PTHREAD is expanded from... configure.ac:141: the top level configure.ac:142: warning: AC_LANG_CONFTEST: no AC_LANG_SOURCE call detected in body ../../lib/autoconf/lang.m4:194: AC_LANG_CONFTEST is expanded from... ../../lib/autoconf/general.m4:2662: _AC_LINK_IFELSE is expanded from... ../../lib/autoconf/general.m4:2679: AC_LINK_IFELSE is expanded from... ../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from... ../../lib/autoconf/general.m4:2032: AC_CACHE_VAL is expanded from... ../../lib/autoconf/general.m4:2053: AC_CACHE_CHECK is expanded from... m4/ptyfuncs.m4:1: AX_CHECK_PTYFUNCS is expanded from... configure.ac:142: the top level Please rerun autoconf after applying this. Signed-off-by: Olaf Hering Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r 197138cc9436 -r 7c0351dc41a5 tools/m4/pthread.m4 --- a/tools/m4/pthread.m4 Wed Jul 04 15:46:16 2012 +0100 +++ b/tools/m4/pthread.m4 Wed Jul 04 15:46:17 2012 +0100 @@ -24,13 +24,13 @@ AC_DEFUN([AX_CHECK_PTHREAD],[ AX_PTHREAD_CV2VARS AX_PTHREAD_VARS([AX_SAVEVAR_SAVE]) AX_PTHREAD_VARS([AX_PTHREAD_VAR_APPLY]) - AC_LINK_IFELSE([ + AC_LINK_IFELSE([AC_LANG_SOURCE([ #include int main(void) { pthread_atfork(0,0,0); pthread_create(0,0,0,0); } -],[],[ax_cv_pthread_flags=failed]) +])],[],[ax_cv_pthread_flags=failed]) AX_PTHREAD_VARS([AX_SAVEVAR_RESTORE]) ]) if test "x$ax_cv_pthread_flags" = xfailed; then diff -r 197138cc9436 -r 7c0351dc41a5 tools/m4/ptyfuncs.m4 --- a/tools/m4/ptyfuncs.m4 Wed Jul 04 15:46:16 2012 +0100 +++ b/tools/m4/ptyfuncs.m4 Wed Jul 04 15:46:17 2012 +0100 @@ -9,7 +9,7 @@ AC_DEFUN([AX_CHECK_PTYFUNCS], [ fi AX_SAVEVAR_SAVE(LIBS) LIBS="$LIBS $ax_cv_ptyfuncs_libs" - AC_LINK_IFELSE([ + AC_LINK_IFELSE([AC_LANG_SOURCE([ #ifdef INCLUDE_LIBUTIL_H #include INCLUDE_LIBUTIL_H #endif @@ -17,7 +17,7 @@ int main(void) { openpty(0,0,0,0,0); login_tty(0); } -],[ +])],[ break ],[]) AX_SAVEVAR_RESTORE(LIBS) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 05 22:22:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 05 Jul 2012 22: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 1SmuRC-0001AN-E1; Thu, 05 Jul 2012 22:22:14 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmuRA-00019t-P3 for xen-changelog@lists.xensource.com; Thu, 05 Jul 2012 22:22:12 +0000 Received: from [85.158.143.99:50778] by server-1.bemta-4.messagelabs.com id C8/8A-24392-49316FF4; Thu, 05 Jul 2012 22:22:12 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-216.messagelabs.com!1341526930!22185078!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 24546 invoked from network); 5 Jul 2012 22:22:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 5 Jul 2012 22:22:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmuR7-0000tZ-5E for xen-changelog@lists.xensource.com; Thu, 05 Jul 2012 22:22:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmuR7-00076f-3O for xen-changelog@lists.xensource.com; Thu, 05 Jul 2012 22:22:09 +0000 Message-Id: Date: Thu, 05 Jul 2012 22:22:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xl: Allow use of /dev/null with xl create to enable command-line definition X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User W. Michael Petullo # Date 1341413175 -3600 # Node ID 328f466f9ee6b8748c8af50090bb7ed12bf83ca5 # Parent bb250383a4f57c4cd8a0b16bae8cacc686c16825 xl: Allow use of /dev/null with xl create to enable command-line definition xm allows specifying /dev/null as the domain configuration argument to its create option; add same functionality to xl. xl treats the configuration argument /dev/null as a special case. This allows specifying an entire domain configuration on the command line. Signed-off-by: W. Michael Petullo Acked-by: Ian Campbell [ ijc -- ported to xen-unstable from 4.1 ] Committed-by: Ian Campbell --- diff -r bb250383a4f5 -r 328f466f9ee6 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Wed Jul 04 15:46:14 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Wed Jul 04 15:46:15 2012 +0100 @@ -1697,10 +1697,15 @@ static int create_domain(struct domain_c if (config_file) { free(config_data); config_data = 0; - ret = libxl_read_file_contents(ctx, config_file, - &config_data, &config_len); - if (ret) { fprintf(stderr, "Failed to read config file: %s: %s\n", - config_file, strerror(errno)); return ERROR_FAIL; } + /* /dev/null represents special case (read config. from command line) */ + if (!strcmp(config_file, "/dev/null")) { + config_len = 0; + } else { + ret = libxl_read_file_contents(ctx, config_file, + &config_data, &config_len); + if (ret) { fprintf(stderr, "Failed to read config file: %s: %s\n", + config_file, strerror(errno)); return ERROR_FAIL; } + } if (!restoring && extra_config && strlen(extra_config)) { if (config_len > INT_MAX - (strlen(extra_config) + 2 + 1)) { fprintf(stderr, "Failed to attach extra configration\n"); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 05 22:22:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 05 Jul 2012 22:22: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 1SmuRD-0001Ab-Gq; Thu, 05 Jul 2012 22:22:15 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmuRB-00019z-9j for xen-changelog@lists.xensource.com; Thu, 05 Jul 2012 22:22:13 +0000 Received: from [85.158.143.99:45888] by server-3.bemta-4.messagelabs.com id B6/4C-05808-49316FF4; Thu, 05 Jul 2012 22:22:12 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-216.messagelabs.com!1341526930!26878369!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 14927 invoked from network); 5 Jul 2012 22:22:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 5 Jul 2012 22:22:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmuR7-0000tc-TA for xen-changelog@lists.xensource.com; Thu, 05 Jul 2012 22:22:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmuR7-00076u-L5 for xen-changelog@lists.xensource.com; Thu, 05 Jul 2012 22:22:09 +0000 Message-Id: Date: Thu, 05 Jul 2012 22:22:09 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] tools/configure.ac: add version check for glib2 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0379687245079353782==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============0379687245079353782== Content-Type: text/plain # HG changeset patch # User Olaf Hering # Date 1341413176 -3600 # Node ID 197138cc94363f046f79ca89fc1d831a56004e4e # Parent 328f466f9ee6b8748c8af50090bb7ed12bf83ca5 tools/configure.ac: add version check for glib2 xen-unstable fails to build in a SLES10SP4 environment since a long time because the included version of glib is slightly older than the required glib version. According to the glib docs version 2.12 includes base64 support, but SLES10 is shipped with glib 2.8.6: qemu-timer-common.o: In function `init_get_clock': /usr/src/packages/BUILD/xen-4.2.25432/non-dbg/tools/qemu-xen-dir/qemu-timer-common.c:57: undefined reference to `clock_gettime' qga/guest-agent-commands.o: In function `qmp_guest_file_write': qga/guest-agent-commands.c:249: undefined reference to `g_base64_decode' qga/guest-agent-commands.o: In function `qmp_guest_file_read': qga/guest-agent-commands.c:224: undefined reference to `g_base64_encode' collect2: ld returned 1 exit status make[3]: *** [qemu-ga] Error 1 Add a version check to toplevel configure to require at least glib 2.12. This makes sure configure can detect the condition early instead of failing later in the middle of tools build when qemu-upstream errors out. Please rerun autoconf after applying this. Signed-off-by: Olaf Hering Acked-by: Roger Pau Monné Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r 328f466f9ee6 -r 197138cc9436 tools/configure --- a/tools/configure Wed Jul 04 15:46:15 2012 +0100 +++ b/tools/configure Wed Jul 04 15:46:16 2012 +0100 @@ -5961,12 +5961,12 @@ if test -n "$glib_CFLAGS"; then pkg_cv_glib_CFLAGS="$glib_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.12\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.12") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_glib_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0" 2>/dev/null` + pkg_cv_glib_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.12" 2>/dev/null` else pkg_failed=yes fi @@ -5977,12 +5977,12 @@ if test -n "$glib_LIBS"; then pkg_cv_glib_LIBS="$glib_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.12\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.12") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_glib_LIBS=`$PKG_CONFIG --libs "glib-2.0" 2>/dev/null` + pkg_cv_glib_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.12" 2>/dev/null` else pkg_failed=yes fi @@ -6002,14 +6002,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - glib_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0" 2>&1` + glib_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.12" 2>&1` else - glib_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0" 2>&1` + glib_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.12" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$glib_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (glib-2.0) were not met: + as_fn_error $? "Package requirements (glib-2.0 >= 2.12) were not met: $glib_PKG_ERRORS diff -r 328f466f9ee6 -r 197138cc9436 tools/configure.ac --- a/tools/configure.ac Wed Jul 04 15:46:15 2012 +0100 +++ b/tools/configure.ac Wed Jul 04 15:46:16 2012 +0100 @@ -115,7 +115,7 @@ AX_PATH_PROG_OR_FAIL([BCC], [bcc]) AX_PATH_PROG_OR_FAIL([IASL], [iasl]) AX_CHECK_UUID AX_CHECK_CURSES -PKG_CHECK_MODULES(glib, glib-2.0) +PKG_CHECK_MODULES(glib, [glib-2.0 >= 2.12]) # Check library path AX_DEFAULT_LIB --===============0379687245079353782== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog --===============0379687245079353782==-- From xen-changelog-bounces@lists.xen.org Thu Jul 05 22:22:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 05 Jul 2012 22:22: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 1SmuRD-0001Ab-Gq; Thu, 05 Jul 2012 22:22:15 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmuRB-00019z-9j for xen-changelog@lists.xensource.com; Thu, 05 Jul 2012 22:22:13 +0000 Received: from [85.158.143.99:45888] by server-3.bemta-4.messagelabs.com id B6/4C-05808-49316FF4; Thu, 05 Jul 2012 22:22:12 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-216.messagelabs.com!1341526930!26878369!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 14927 invoked from network); 5 Jul 2012 22:22:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 5 Jul 2012 22:22:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmuR7-0000tc-TA for xen-changelog@lists.xensource.com; Thu, 05 Jul 2012 22:22:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmuR7-00076u-L5 for xen-changelog@lists.xensource.com; Thu, 05 Jul 2012 22:22:09 +0000 Message-Id: Date: Thu, 05 Jul 2012 22:22:09 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] tools/configure.ac: add version check for glib2 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0379687245079353782==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============0379687245079353782== Content-Type: text/plain # HG changeset patch # User Olaf Hering # Date 1341413176 -3600 # Node ID 197138cc94363f046f79ca89fc1d831a56004e4e # Parent 328f466f9ee6b8748c8af50090bb7ed12bf83ca5 tools/configure.ac: add version check for glib2 xen-unstable fails to build in a SLES10SP4 environment since a long time because the included version of glib is slightly older than the required glib version. According to the glib docs version 2.12 includes base64 support, but SLES10 is shipped with glib 2.8.6: qemu-timer-common.o: In function `init_get_clock': /usr/src/packages/BUILD/xen-4.2.25432/non-dbg/tools/qemu-xen-dir/qemu-timer-common.c:57: undefined reference to `clock_gettime' qga/guest-agent-commands.o: In function `qmp_guest_file_write': qga/guest-agent-commands.c:249: undefined reference to `g_base64_decode' qga/guest-agent-commands.o: In function `qmp_guest_file_read': qga/guest-agent-commands.c:224: undefined reference to `g_base64_encode' collect2: ld returned 1 exit status make[3]: *** [qemu-ga] Error 1 Add a version check to toplevel configure to require at least glib 2.12. This makes sure configure can detect the condition early instead of failing later in the middle of tools build when qemu-upstream errors out. Please rerun autoconf after applying this. Signed-off-by: Olaf Hering Acked-by: Roger Pau Monné Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r 328f466f9ee6 -r 197138cc9436 tools/configure --- a/tools/configure Wed Jul 04 15:46:15 2012 +0100 +++ b/tools/configure Wed Jul 04 15:46:16 2012 +0100 @@ -5961,12 +5961,12 @@ if test -n "$glib_CFLAGS"; then pkg_cv_glib_CFLAGS="$glib_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.12\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.12") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_glib_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0" 2>/dev/null` + pkg_cv_glib_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.12" 2>/dev/null` else pkg_failed=yes fi @@ -5977,12 +5977,12 @@ if test -n "$glib_LIBS"; then pkg_cv_glib_LIBS="$glib_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.12\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.12") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_glib_LIBS=`$PKG_CONFIG --libs "glib-2.0" 2>/dev/null` + pkg_cv_glib_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.12" 2>/dev/null` else pkg_failed=yes fi @@ -6002,14 +6002,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - glib_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0" 2>&1` + glib_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.12" 2>&1` else - glib_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0" 2>&1` + glib_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.12" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$glib_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (glib-2.0) were not met: + as_fn_error $? "Package requirements (glib-2.0 >= 2.12) were not met: $glib_PKG_ERRORS diff -r 328f466f9ee6 -r 197138cc9436 tools/configure.ac --- a/tools/configure.ac Wed Jul 04 15:46:15 2012 +0100 +++ b/tools/configure.ac Wed Jul 04 15:46:16 2012 +0100 @@ -115,7 +115,7 @@ AX_PATH_PROG_OR_FAIL([BCC], [bcc]) AX_PATH_PROG_OR_FAIL([IASL], [iasl]) AX_CHECK_UUID AX_CHECK_CURSES -PKG_CHECK_MODULES(glib, glib-2.0) +PKG_CHECK_MODULES(glib, [glib-2.0 >= 2.12]) # Check library path AX_DEFAULT_LIB --===============0379687245079353782== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog --===============0379687245079353782==-- From xen-changelog-bounces@lists.xen.org Thu Jul 05 22:22:24 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 05 Jul 2012 22:22:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmuRJ-0001DU-WB; Thu, 05 Jul 2012 22:22:22 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmuRI-0001AZ-FZ for xen-changelog@lists.xensource.com; Thu, 05 Jul 2012 22:22:20 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-27.messagelabs.com!1341526929!10273744!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17635 invoked from network); 5 Jul 2012 22:22:10 -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; 5 Jul 2012 22:22:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmuR6-0000tV-PA for xen-changelog@lists.xensource.com; Thu, 05 Jul 2012 22:22:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmuR6-00076Q-I3 for xen-changelog@lists.xensource.com; Thu, 05 Jul 2012 22:22:08 +0000 Message-Id: Date: Thu, 05 Jul 2012 22:22:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] hotplug/Linux: use flock based locking X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Zhigang Wang # Date 1341413174 -3600 # Node ID bb250383a4f57c4cd8a0b16bae8cacc686c16825 # Parent 60f09d1ab1fe5dee87db1bf55c7479a5d71e85a5 hotplug/Linux: use flock based locking In the normal case of a single domain booting with one disk, the disk hotplug script will fire once. In this case taking out the lock will never cause a sleep because there's no other concurrent invocations. If a domain has 4 disks configured, then the hotplug script will fire 4 times, all 4 invocations at pretty much the same time. If there is even a little load on the system, the locking function in the shell script will sleep for a few seconds - as many as 5 seconds, or potentially even time out & fail completely. If say 4 or even more domains each with 4 disks start up at once, that's 16 invocations of the hotplug script running at once. There will be a lot of sleep's done & because of the very coarse 1 second granularity the delay can add up significantly. The change to using flock() removes the arbitrary 1 second sleep, so the very instant once hotplug script finishes, another can start & there is no repeated attempts & failures to lock which would add more delay. In addition the current locking implementation would allow two processes get the lock simultaneously if one decided the other had timed out. Signed-off-by: Daniel P. Berrange Signed-off-by: Zhigang Wang Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r 60f09d1ab1fe -r bb250383a4f5 tools/hotplug/Linux/locking.sh --- a/tools/hotplug/Linux/locking.sh Wed Jul 04 15:46:14 2012 +0100 +++ b/tools/hotplug/Linux/locking.sh Wed Jul 04 15:46:14 2012 +0100 @@ -1,5 +1,6 @@ # # Copyright (c) 2005 XenSource Ltd. +# Copyright (c) 2007 Red Hat # # This library is free software; you can redistribute it and/or # modify it under the terms of version 2.1 of the GNU Lesser General Public @@ -19,92 +20,30 @@ # Serialisation # -LOCK_SLEEPTIME=1 -LOCK_SPINNING_RETRIES=5 -LOCK_RETRIES=100 LOCK_BASEDIR=/var/run/xen-hotplug +_setlockfd() +{ + local i + for ((i = 0; i < ${#_lockdict}; i++)) + do [ -z "${_lockdict[$i]}" -o "${_lockdict[$i]}" = "$1" ] && break + done + _lockdict[$i]="$1" + let _lockfd=200+i +} + claim_lock() { - local lockdir="$LOCK_BASEDIR/$1" - mkdir -p "$LOCK_BASEDIR" - _claim_lock "$lockdir" + mkdir -p "$LOCK_BASEDIR" + _setlockfd $1 + eval "exec $_lockfd>>$LOCK_BASEDIR/$1" + flock -x $_lockfd } release_lock() { - _release_lock "$LOCK_BASEDIR/$1" + _setlockfd $1 + flock -u $_lockfd } - - -# This function will be redefined in xen-hotplug-common.sh. -sigerr() { - exit 1 -} - - -_claim_lock() -{ - local lockdir="$1" - local owner=$(_lock_owner "$lockdir") - local retries=0 - - while [ $retries -lt $LOCK_RETRIES ] - do - mkdir "$lockdir" 2>/dev/null && trap "_release_lock $lockdir; sigerr" ERR && - _update_lock_info "$lockdir" && return - - local new_owner=$(_lock_owner "$lockdir") - if [ "$new_owner" != "$owner" ] - then - owner="$new_owner" - retries=0 - else - local pid=$(echo $owner | cut -d : -f 1) - if [ -n "$pid" -a "$pid" != "unknown" -a ! -f "/proc/$pid/status" ] - then - _release_lock $lockdir - fi - fi - - if [ $retries -gt $LOCK_SPINNING_RETRIES ] - then - sleep $LOCK_SLEEPTIME - else - sleep 0 - fi - retries=$(($retries + 1)) - done - _steal_lock "$lockdir" -} - - -_release_lock() -{ - trap sigerr ERR - rm -rf "$1" 2>/dev/null || true -} - - -_steal_lock() -{ - local lockdir="$1" - local owner=$(cat "$lockdir/owner" 2>/dev/null || echo "unknown") - log err "Forced to steal lock on $lockdir from $owner!" - _release_lock "$lockdir" - _claim_lock "$lockdir" -} - - -_lock_owner() -{ - cat "$1/owner" 2>/dev/null || echo "unknown" -} - - -_update_lock_info() -{ - echo "$$: $0" >"$1/owner" -} _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 05 22:22:24 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 05 Jul 2012 22:22:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmuRJ-0001DU-WB; Thu, 05 Jul 2012 22:22:22 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmuRI-0001AZ-FZ for xen-changelog@lists.xensource.com; Thu, 05 Jul 2012 22:22:20 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-27.messagelabs.com!1341526929!10273744!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17635 invoked from network); 5 Jul 2012 22:22:10 -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; 5 Jul 2012 22:22:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SmuR6-0000tV-PA for xen-changelog@lists.xensource.com; Thu, 05 Jul 2012 22:22:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SmuR6-00076Q-I3 for xen-changelog@lists.xensource.com; Thu, 05 Jul 2012 22:22:08 +0000 Message-Id: Date: Thu, 05 Jul 2012 22:22:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] hotplug/Linux: use flock based locking X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Zhigang Wang # Date 1341413174 -3600 # Node ID bb250383a4f57c4cd8a0b16bae8cacc686c16825 # Parent 60f09d1ab1fe5dee87db1bf55c7479a5d71e85a5 hotplug/Linux: use flock based locking In the normal case of a single domain booting with one disk, the disk hotplug script will fire once. In this case taking out the lock will never cause a sleep because there's no other concurrent invocations. If a domain has 4 disks configured, then the hotplug script will fire 4 times, all 4 invocations at pretty much the same time. If there is even a little load on the system, the locking function in the shell script will sleep for a few seconds - as many as 5 seconds, or potentially even time out & fail completely. If say 4 or even more domains each with 4 disks start up at once, that's 16 invocations of the hotplug script running at once. There will be a lot of sleep's done & because of the very coarse 1 second granularity the delay can add up significantly. The change to using flock() removes the arbitrary 1 second sleep, so the very instant once hotplug script finishes, another can start & there is no repeated attempts & failures to lock which would add more delay. In addition the current locking implementation would allow two processes get the lock simultaneously if one decided the other had timed out. Signed-off-by: Daniel P. Berrange Signed-off-by: Zhigang Wang Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r 60f09d1ab1fe -r bb250383a4f5 tools/hotplug/Linux/locking.sh --- a/tools/hotplug/Linux/locking.sh Wed Jul 04 15:46:14 2012 +0100 +++ b/tools/hotplug/Linux/locking.sh Wed Jul 04 15:46:14 2012 +0100 @@ -1,5 +1,6 @@ # # Copyright (c) 2005 XenSource Ltd. +# Copyright (c) 2007 Red Hat # # This library is free software; you can redistribute it and/or # modify it under the terms of version 2.1 of the GNU Lesser General Public @@ -19,92 +20,30 @@ # Serialisation # -LOCK_SLEEPTIME=1 -LOCK_SPINNING_RETRIES=5 -LOCK_RETRIES=100 LOCK_BASEDIR=/var/run/xen-hotplug +_setlockfd() +{ + local i + for ((i = 0; i < ${#_lockdict}; i++)) + do [ -z "${_lockdict[$i]}" -o "${_lockdict[$i]}" = "$1" ] && break + done + _lockdict[$i]="$1" + let _lockfd=200+i +} + claim_lock() { - local lockdir="$LOCK_BASEDIR/$1" - mkdir -p "$LOCK_BASEDIR" - _claim_lock "$lockdir" + mkdir -p "$LOCK_BASEDIR" + _setlockfd $1 + eval "exec $_lockfd>>$LOCK_BASEDIR/$1" + flock -x $_lockfd } release_lock() { - _release_lock "$LOCK_BASEDIR/$1" + _setlockfd $1 + flock -u $_lockfd } - - -# This function will be redefined in xen-hotplug-common.sh. -sigerr() { - exit 1 -} - - -_claim_lock() -{ - local lockdir="$1" - local owner=$(_lock_owner "$lockdir") - local retries=0 - - while [ $retries -lt $LOCK_RETRIES ] - do - mkdir "$lockdir" 2>/dev/null && trap "_release_lock $lockdir; sigerr" ERR && - _update_lock_info "$lockdir" && return - - local new_owner=$(_lock_owner "$lockdir") - if [ "$new_owner" != "$owner" ] - then - owner="$new_owner" - retries=0 - else - local pid=$(echo $owner | cut -d : -f 1) - if [ -n "$pid" -a "$pid" != "unknown" -a ! -f "/proc/$pid/status" ] - then - _release_lock $lockdir - fi - fi - - if [ $retries -gt $LOCK_SPINNING_RETRIES ] - then - sleep $LOCK_SLEEPTIME - else - sleep 0 - fi - retries=$(($retries + 1)) - done - _steal_lock "$lockdir" -} - - -_release_lock() -{ - trap sigerr ERR - rm -rf "$1" 2>/dev/null || true -} - - -_steal_lock() -{ - local lockdir="$1" - local owner=$(cat "$lockdir/owner" 2>/dev/null || echo "unknown") - log err "Forced to steal lock on $lockdir from $owner!" - _release_lock "$lockdir" - _claim_lock "$lockdir" -} - - -_lock_owner() -{ - cat "$1/owner" 2>/dev/null || echo "unknown" -} - - -_update_lock_info() -{ - echo "$$: $0" >"$1/owner" -} _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jul 06 20:44:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Jul 2012 20:44: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 1SnFNu-00029k-Kw; Fri, 06 Jul 2012 20:44:14 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SnFNt-00029M-VX for xen-changelog@lists.xensource.com; Fri, 06 Jul 2012 20:44:14 +0000 Received: from [85.158.138.51:49620] by server-7.bemta-3.messagelabs.com id 86/67-10113-D1E47FF4; Fri, 06 Jul 2012 20:44:13 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-174.messagelabs.com!1341607451!27562496!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 31932 invoked from network); 6 Jul 2012 20:44:12 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 6 Jul 2012 20:44:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SnFNq-00012X-Lp for xen-changelog@lists.xensource.com; Fri, 06 Jul 2012 20:44:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SnFNq-0006dU-EI for xen-changelog@lists.xensource.com; Fri, 06 Jul 2012 20:44:10 +0000 Message-Id: Date: Fri, 06 Jul 2012 20:44:09 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: introduce some node map helpers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341577064 -3600 # Node ID 03a60d7e56fdd9c0ba2d05234b972aa63019680f # Parent 61742ab1a675618c963e0f4d10950bf87cc5a57a libxl: introduce some node map helpers To allow for allocating a node specific libxl_bitmap (as it is for cpu number and maps). Helper unctions to convert a node map it its coresponding cpu map and vice versa are also implemented. Signed-off-by: Dario Faggioli Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r 61742ab1a675 -r 03a60d7e56fd tools/libxl/libxl_utils.c --- a/tools/libxl/libxl_utils.c Fri Jul 06 13:17:43 2012 +0100 +++ b/tools/libxl/libxl_utils.c Fri Jul 06 13:17:44 2012 +0100 @@ -588,6 +588,50 @@ char *libxl_bitmap_to_hex_string(libxl_c return q; } +int libxl_nodemap_to_cpumap(libxl_ctx *ctx, + const libxl_bitmap *nodemap, + libxl_bitmap *cpumap) +{ + libxl_cputopology *tinfo = NULL; + int nr_cpus, i, rc = 0; + + tinfo = libxl_get_cpu_topology(ctx, &nr_cpus); + if (tinfo == NULL) { + rc = ERROR_FAIL; + goto out; + } + + libxl_bitmap_set_none(cpumap); + for (i = 0; i < nr_cpus; i++) { + if (libxl_bitmap_test(nodemap, tinfo[i].node)) + libxl_bitmap_set(cpumap, i); + } + out: + libxl_cputopology_list_free(tinfo, nr_cpus); + return rc; +} + +int libxl_cpumap_to_nodemap(libxl_ctx *ctx, + const libxl_bitmap *cpumap, + libxl_bitmap *nodemap) +{ + libxl_cputopology *tinfo = NULL; + int nr_cpus, i, rc = 0; + + tinfo = libxl_get_cpu_topology(ctx, &nr_cpus); + if (tinfo == NULL) { + rc = ERROR_FAIL; + goto out; + } + + libxl_bitmap_set_none(nodemap); + libxl_for_each_set_bit(i, *cpumap) + libxl_bitmap_set(nodemap, tinfo[i].node); + out: + libxl_cputopology_list_free(tinfo, nr_cpus); + return rc; +} + int libxl_get_max_cpus(libxl_ctx *ctx) { return xc_get_max_cpus(ctx->xch); diff -r 61742ab1a675 -r 03a60d7e56fd tools/libxl/libxl_utils.h --- a/tools/libxl/libxl_utils.h Fri Jul 06 13:17:43 2012 +0100 +++ b/tools/libxl/libxl_utils.h Fri Jul 06 13:17:44 2012 +0100 @@ -104,6 +104,29 @@ static inline int libxl_cpu_bitmap_alloc return libxl_bitmap_alloc(ctx, cpumap, max_cpus); } +static inline int libxl_node_bitmap_alloc(libxl_ctx *ctx, + libxl_bitmap *nodemap, + int max_nodes) +{ + if (max_nodes < 0) + return ERROR_INVAL; + if (max_nodes == 0) + max_nodes = libxl_get_max_nodes(ctx); + if (max_nodes == 0) + return ERROR_FAIL; + + return libxl_bitmap_alloc(ctx, nodemap, max_nodes); +} + +/* Populate cpumap with the cpus spanned by the nodes in nodemap */ +int libxl_nodemap_to_cpumap(libxl_ctx *ctx, + const libxl_bitmap *nodemap, + libxl_bitmap *cpumap); +/* Populate nodemap with the nodes of the cpus in cpumap */ +int libxl_cpumap_to_nodemap(libxl_ctx *ctx, + const libxl_bitmap *cpuemap, + libxl_bitmap *nodemap); + static inline uint32_t libxl__sizekb_to_mb(uint32_t s) { return (s + 1023) / 1024; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jul 06 20:44:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Jul 2012 20:44: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 1SnFNu-00029k-Kw; Fri, 06 Jul 2012 20:44:14 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SnFNt-00029M-VX for xen-changelog@lists.xensource.com; Fri, 06 Jul 2012 20:44:14 +0000 Received: from [85.158.138.51:49620] by server-7.bemta-3.messagelabs.com id 86/67-10113-D1E47FF4; Fri, 06 Jul 2012 20:44:13 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-174.messagelabs.com!1341607451!27562496!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 31932 invoked from network); 6 Jul 2012 20:44:12 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 6 Jul 2012 20:44:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SnFNq-00012X-Lp for xen-changelog@lists.xensource.com; Fri, 06 Jul 2012 20:44:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SnFNq-0006dU-EI for xen-changelog@lists.xensource.com; Fri, 06 Jul 2012 20:44:10 +0000 Message-Id: Date: Fri, 06 Jul 2012 20:44:09 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: introduce some node map helpers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341577064 -3600 # Node ID 03a60d7e56fdd9c0ba2d05234b972aa63019680f # Parent 61742ab1a675618c963e0f4d10950bf87cc5a57a libxl: introduce some node map helpers To allow for allocating a node specific libxl_bitmap (as it is for cpu number and maps). Helper unctions to convert a node map it its coresponding cpu map and vice versa are also implemented. Signed-off-by: Dario Faggioli Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r 61742ab1a675 -r 03a60d7e56fd tools/libxl/libxl_utils.c --- a/tools/libxl/libxl_utils.c Fri Jul 06 13:17:43 2012 +0100 +++ b/tools/libxl/libxl_utils.c Fri Jul 06 13:17:44 2012 +0100 @@ -588,6 +588,50 @@ char *libxl_bitmap_to_hex_string(libxl_c return q; } +int libxl_nodemap_to_cpumap(libxl_ctx *ctx, + const libxl_bitmap *nodemap, + libxl_bitmap *cpumap) +{ + libxl_cputopology *tinfo = NULL; + int nr_cpus, i, rc = 0; + + tinfo = libxl_get_cpu_topology(ctx, &nr_cpus); + if (tinfo == NULL) { + rc = ERROR_FAIL; + goto out; + } + + libxl_bitmap_set_none(cpumap); + for (i = 0; i < nr_cpus; i++) { + if (libxl_bitmap_test(nodemap, tinfo[i].node)) + libxl_bitmap_set(cpumap, i); + } + out: + libxl_cputopology_list_free(tinfo, nr_cpus); + return rc; +} + +int libxl_cpumap_to_nodemap(libxl_ctx *ctx, + const libxl_bitmap *cpumap, + libxl_bitmap *nodemap) +{ + libxl_cputopology *tinfo = NULL; + int nr_cpus, i, rc = 0; + + tinfo = libxl_get_cpu_topology(ctx, &nr_cpus); + if (tinfo == NULL) { + rc = ERROR_FAIL; + goto out; + } + + libxl_bitmap_set_none(nodemap); + libxl_for_each_set_bit(i, *cpumap) + libxl_bitmap_set(nodemap, tinfo[i].node); + out: + libxl_cputopology_list_free(tinfo, nr_cpus); + return rc; +} + int libxl_get_max_cpus(libxl_ctx *ctx) { return xc_get_max_cpus(ctx->xch); diff -r 61742ab1a675 -r 03a60d7e56fd tools/libxl/libxl_utils.h --- a/tools/libxl/libxl_utils.h Fri Jul 06 13:17:43 2012 +0100 +++ b/tools/libxl/libxl_utils.h Fri Jul 06 13:17:44 2012 +0100 @@ -104,6 +104,29 @@ static inline int libxl_cpu_bitmap_alloc return libxl_bitmap_alloc(ctx, cpumap, max_cpus); } +static inline int libxl_node_bitmap_alloc(libxl_ctx *ctx, + libxl_bitmap *nodemap, + int max_nodes) +{ + if (max_nodes < 0) + return ERROR_INVAL; + if (max_nodes == 0) + max_nodes = libxl_get_max_nodes(ctx); + if (max_nodes == 0) + return ERROR_FAIL; + + return libxl_bitmap_alloc(ctx, nodemap, max_nodes); +} + +/* Populate cpumap with the cpus spanned by the nodes in nodemap */ +int libxl_nodemap_to_cpumap(libxl_ctx *ctx, + const libxl_bitmap *nodemap, + libxl_bitmap *cpumap); +/* Populate nodemap with the nodes of the cpus in cpumap */ +int libxl_cpumap_to_nodemap(libxl_ctx *ctx, + const libxl_bitmap *cpuemap, + libxl_bitmap *nodemap); + static inline uint32_t libxl__sizekb_to_mb(uint32_t s) { return (s + 1023) / 1024; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jul 06 20:44:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Jul 2012 20:44: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 1SnFNu-00029V-D8; Fri, 06 Jul 2012 20:44:14 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SnFNs-00028x-1t for xen-changelog@lists.xensource.com; Fri, 06 Jul 2012 20:44:12 +0000 Received: from [85.158.143.35:26114] by server-2.bemta-4.messagelabs.com id A0/AF-17938-B1E47FF4; Fri, 06 Jul 2012 20:44:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-21.messagelabs.com!1341607448!4928216!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 4455 invoked from network); 6 Jul 2012 20:44:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 6 Jul 2012 20:44:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SnFNo-00012L-Hd for xen-changelog@lists.xensource.com; Fri, 06 Jul 2012 20:44:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SnFNo-0006cV-9e for xen-changelog@lists.xensource.com; Fri, 06 Jul 2012 20:44:08 +0000 Message-Id: Date: Fri, 06 Jul 2012 20:44:07 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl, libxc: introduce libxl_get_numainfo() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341577061 -3600 # Node ID e0f04c3978f75192a436736d45c7a11405606ebb # Parent e9aa6da372bd76774d0d63ad17c43df34673ce30 libxl,libxc: introduce libxl_get_numainfo() Make some NUMA node information available to the toolstack. Achieve this by means of xc_numainfo(), which exposes memory size and amount of free memory of each node, as well as the relative distances of each node to all the others. For properly exposing distances we need the IDL to support arrays. Signed-off-by: Dario Faggioli Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r e9aa6da372bd -r e0f04c3978f7 tools/libxc/xc_misc.c --- a/tools/libxc/xc_misc.c Fri Jul 06 13:17:40 2012 +0100 +++ b/tools/libxc/xc_misc.c Fri Jul 06 13:17:41 2012 +0100 @@ -35,6 +35,20 @@ int xc_get_max_cpus(xc_interface *xch) return max_cpus; } +int xc_get_max_nodes(xc_interface *xch) +{ + static int max_nodes = 0; + xc_physinfo_t physinfo; + + if ( max_nodes ) + return max_nodes; + + if ( !xc_physinfo(xch, &physinfo) ) + max_nodes = physinfo.max_node_id + 1; + + return max_nodes; +} + int xc_get_cpumap_size(xc_interface *xch) { return (xc_get_max_cpus(xch) + 7) / 8; diff -r e9aa6da372bd -r e0f04c3978f7 tools/libxc/xenctrl.h --- a/tools/libxc/xenctrl.h Fri Jul 06 13:17:40 2012 +0100 +++ b/tools/libxc/xenctrl.h Fri Jul 06 13:17:41 2012 +0100 @@ -329,6 +329,12 @@ int xc_get_cpumap_size(xc_interface *xch /* allocate a cpumap */ xc_cpumap_t xc_cpumap_alloc(xc_interface *xch); + /* + * NODEMAP handling + */ +/* return maximum number of NUMA nodes the hypervisor supports */ +int xc_get_max_nodes(xc_interface *xch); + /* * DOMAIN DEBUGGING FUNCTIONS */ diff -r e9aa6da372bd -r e0f04c3978f7 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Fri Jul 06 13:17:40 2012 +0100 +++ b/tools/libxl/libxl.c Fri Jul 06 13:17:41 2012 +0100 @@ -3298,6 +3298,75 @@ fail: return ret; } +libxl_numainfo *libxl_get_numainfo(libxl_ctx *ctx, int *nr) +{ + GC_INIT(ctx); + xc_numainfo_t ninfo; + DECLARE_HYPERCALL_BUFFER(xc_node_to_memsize_t, memsize); + DECLARE_HYPERCALL_BUFFER(xc_node_to_memfree_t, memfree); + DECLARE_HYPERCALL_BUFFER(uint32_t, node_dists); + libxl_numainfo *ret = NULL; + int i, j, max_nodes; + + max_nodes = libxl_get_max_nodes(ctx); + if (max_nodes == 0) + { + LIBXL__LOG(ctx, XTL_ERROR, "Unable to determine number of NODES"); + ret = NULL; + goto out; + } + + memsize = xc_hypercall_buffer_alloc + (ctx->xch, memsize, sizeof(*memsize) * max_nodes); + memfree = xc_hypercall_buffer_alloc + (ctx->xch, memfree, sizeof(*memfree) * max_nodes); + node_dists = xc_hypercall_buffer_alloc + (ctx->xch, node_dists, sizeof(*node_dists) * max_nodes * max_nodes); + if ((memsize == NULL) || (memfree == NULL) || (node_dists == NULL)) { + LIBXL__LOG_ERRNOVAL(ctx, XTL_ERROR, ENOMEM, + "Unable to allocate hypercall arguments"); + goto fail; + } + + set_xen_guest_handle(ninfo.node_to_memsize, memsize); + set_xen_guest_handle(ninfo.node_to_memfree, memfree); + set_xen_guest_handle(ninfo.node_to_node_distance, node_dists); + ninfo.max_node_index = max_nodes - 1; + if (xc_numainfo(ctx->xch, &ninfo) != 0) { + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "getting numainfo"); + goto fail; + } + + if (ninfo.max_node_index < max_nodes - 1) + max_nodes = ninfo.max_node_index + 1; + + *nr = max_nodes; + + ret = libxl__zalloc(NOGC, sizeof(libxl_numainfo) * max_nodes); + for (i = 0; i < max_nodes; i++) + ret[i].dists = libxl__calloc(NOGC, max_nodes, sizeof(*node_dists)); + + for (i = 0; i < max_nodes; i++) { +#define V(mem, i) (mem[i] == INVALID_NUMAINFO_ID) ? \ + LIBXL_NUMAINFO_INVALID_ENTRY : mem[i] + ret[i].size = V(memsize, i); + ret[i].free = V(memfree, i); + ret[i].num_dists = max_nodes; + for (j = 0; j < ret[i].num_dists; j++) + ret[i].dists[j] = V(node_dists, i * max_nodes + j); +#undef V + } + + fail: + xc_hypercall_buffer_free(ctx->xch, memsize); + xc_hypercall_buffer_free(ctx->xch, memfree); + xc_hypercall_buffer_free(ctx->xch, node_dists); + + out: + GC_FREE; + return ret; +} + const libxl_version_info* libxl_get_version_info(libxl_ctx *ctx) { union { diff -r e9aa6da372bd -r e0f04c3978f7 tools/libxl/libxl.h --- a/tools/libxl/libxl.h Fri Jul 06 13:17:40 2012 +0100 +++ b/tools/libxl/libxl.h Fri Jul 06 13:17:41 2012 +0100 @@ -532,6 +532,9 @@ int libxl_domain_preserve(libxl_ctx *ctx /* get max. number of cpus supported by hypervisor */ int libxl_get_max_cpus(libxl_ctx *ctx); +/* get max. number of NUMA nodes supported by hypervisor */ +int libxl_get_max_nodes(libxl_ctx *ctx); + int libxl_domain_rename(libxl_ctx *ctx, uint32_t domid, const char *old_name, const char *new_name); @@ -604,6 +607,10 @@ void libxl_vminfo_list_free(libxl_vminfo libxl_cputopology *libxl_get_cpu_topology(libxl_ctx *ctx, int *nb_cpu_out); void libxl_cputopology_list_free(libxl_cputopology *, int nb_cpu); +#define LIBXL_NUMAINFO_INVALID_ENTRY (~(uint32_t)0) +libxl_numainfo *libxl_get_numainfo(libxl_ctx *ctx, int *nr); +void libxl_numainfo_list_free(libxl_numainfo *, int nr); + libxl_vcpuinfo *libxl_list_vcpu(libxl_ctx *ctx, uint32_t domid, int *nb_vcpu, int *nr_vcpus_out); void libxl_vcpuinfo_list_free(libxl_vcpuinfo *, int nr_vcpus); diff -r e9aa6da372bd -r e0f04c3978f7 tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Fri Jul 06 13:17:40 2012 +0100 +++ b/tools/libxl/libxl_types.idl Fri Jul 06 13:17:41 2012 +0100 @@ -433,6 +433,15 @@ libxl_physinfo = Struct("physinfo", [ ("cap_hvm_directio", bool), ], dir=DIR_OUT) +# NUMA node characteristics: size and free are how much memory it has, and how +# much of it is free, respectively. dists is an array of distances from this +# node to each other node. +libxl_numainfo = Struct("numainfo", [ + ("size", uint64), + ("free", uint64), + ("dists", Array(uint32, "num_dists")), + ], dir=DIR_OUT) + libxl_cputopology = Struct("cputopology", [ ("core", uint32), ("socket", uint32), diff -r e9aa6da372bd -r e0f04c3978f7 tools/libxl/libxl_utils.c --- a/tools/libxl/libxl_utils.c Fri Jul 06 13:17:40 2012 +0100 +++ b/tools/libxl/libxl_utils.c Fri Jul 06 13:17:41 2012 +0100 @@ -572,6 +572,11 @@ int libxl_get_max_cpus(libxl_ctx *ctx) return xc_get_max_cpus(ctx->xch); } +int libxl_get_max_nodes(libxl_ctx *ctx) +{ + return xc_get_max_nodes(ctx->xch); +} + int libxl__enum_from_string(const libxl_enum_string_table *t, const char *s, int *e) { @@ -594,6 +599,14 @@ void libxl_cputopology_list_free(libxl_c free(list); } +void libxl_numainfo_list_free(libxl_numainfo *list, int nr) +{ + int i; + for (i = 0; i < nr; i++) + libxl_numainfo_dispose(&list[i]); + free(list); +} + void libxl_vcpuinfo_list_free(libxl_vcpuinfo *list, int nr) { int i; diff -r e9aa6da372bd -r e0f04c3978f7 xen/include/public/sysctl.h --- a/xen/include/public/sysctl.h Fri Jul 06 13:17:40 2012 +0100 +++ b/xen/include/public/sysctl.h Fri Jul 06 13:17:41 2012 +0100 @@ -484,6 +484,7 @@ typedef struct xen_sysctl_topologyinfo x DEFINE_XEN_GUEST_HANDLE(xen_sysctl_topologyinfo_t); /* XEN_SYSCTL_numainfo */ +#define INVALID_NUMAINFO_ID (~0U) struct xen_sysctl_numainfo { /* * IN: maximum addressable entry in the caller-provided arrays. _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jul 06 20:44:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Jul 2012 20:44: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 1SnFNu-00029V-D8; Fri, 06 Jul 2012 20:44:14 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SnFNs-00028x-1t for xen-changelog@lists.xensource.com; Fri, 06 Jul 2012 20:44:12 +0000 Received: from [85.158.143.35:26114] by server-2.bemta-4.messagelabs.com id A0/AF-17938-B1E47FF4; Fri, 06 Jul 2012 20:44:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-21.messagelabs.com!1341607448!4928216!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 4455 invoked from network); 6 Jul 2012 20:44:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 6 Jul 2012 20:44:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SnFNo-00012L-Hd for xen-changelog@lists.xensource.com; Fri, 06 Jul 2012 20:44:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SnFNo-0006cV-9e for xen-changelog@lists.xensource.com; Fri, 06 Jul 2012 20:44:08 +0000 Message-Id: Date: Fri, 06 Jul 2012 20:44:07 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl, libxc: introduce libxl_get_numainfo() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341577061 -3600 # Node ID e0f04c3978f75192a436736d45c7a11405606ebb # Parent e9aa6da372bd76774d0d63ad17c43df34673ce30 libxl,libxc: introduce libxl_get_numainfo() Make some NUMA node information available to the toolstack. Achieve this by means of xc_numainfo(), which exposes memory size and amount of free memory of each node, as well as the relative distances of each node to all the others. For properly exposing distances we need the IDL to support arrays. Signed-off-by: Dario Faggioli Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r e9aa6da372bd -r e0f04c3978f7 tools/libxc/xc_misc.c --- a/tools/libxc/xc_misc.c Fri Jul 06 13:17:40 2012 +0100 +++ b/tools/libxc/xc_misc.c Fri Jul 06 13:17:41 2012 +0100 @@ -35,6 +35,20 @@ int xc_get_max_cpus(xc_interface *xch) return max_cpus; } +int xc_get_max_nodes(xc_interface *xch) +{ + static int max_nodes = 0; + xc_physinfo_t physinfo; + + if ( max_nodes ) + return max_nodes; + + if ( !xc_physinfo(xch, &physinfo) ) + max_nodes = physinfo.max_node_id + 1; + + return max_nodes; +} + int xc_get_cpumap_size(xc_interface *xch) { return (xc_get_max_cpus(xch) + 7) / 8; diff -r e9aa6da372bd -r e0f04c3978f7 tools/libxc/xenctrl.h --- a/tools/libxc/xenctrl.h Fri Jul 06 13:17:40 2012 +0100 +++ b/tools/libxc/xenctrl.h Fri Jul 06 13:17:41 2012 +0100 @@ -329,6 +329,12 @@ int xc_get_cpumap_size(xc_interface *xch /* allocate a cpumap */ xc_cpumap_t xc_cpumap_alloc(xc_interface *xch); + /* + * NODEMAP handling + */ +/* return maximum number of NUMA nodes the hypervisor supports */ +int xc_get_max_nodes(xc_interface *xch); + /* * DOMAIN DEBUGGING FUNCTIONS */ diff -r e9aa6da372bd -r e0f04c3978f7 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Fri Jul 06 13:17:40 2012 +0100 +++ b/tools/libxl/libxl.c Fri Jul 06 13:17:41 2012 +0100 @@ -3298,6 +3298,75 @@ fail: return ret; } +libxl_numainfo *libxl_get_numainfo(libxl_ctx *ctx, int *nr) +{ + GC_INIT(ctx); + xc_numainfo_t ninfo; + DECLARE_HYPERCALL_BUFFER(xc_node_to_memsize_t, memsize); + DECLARE_HYPERCALL_BUFFER(xc_node_to_memfree_t, memfree); + DECLARE_HYPERCALL_BUFFER(uint32_t, node_dists); + libxl_numainfo *ret = NULL; + int i, j, max_nodes; + + max_nodes = libxl_get_max_nodes(ctx); + if (max_nodes == 0) + { + LIBXL__LOG(ctx, XTL_ERROR, "Unable to determine number of NODES"); + ret = NULL; + goto out; + } + + memsize = xc_hypercall_buffer_alloc + (ctx->xch, memsize, sizeof(*memsize) * max_nodes); + memfree = xc_hypercall_buffer_alloc + (ctx->xch, memfree, sizeof(*memfree) * max_nodes); + node_dists = xc_hypercall_buffer_alloc + (ctx->xch, node_dists, sizeof(*node_dists) * max_nodes * max_nodes); + if ((memsize == NULL) || (memfree == NULL) || (node_dists == NULL)) { + LIBXL__LOG_ERRNOVAL(ctx, XTL_ERROR, ENOMEM, + "Unable to allocate hypercall arguments"); + goto fail; + } + + set_xen_guest_handle(ninfo.node_to_memsize, memsize); + set_xen_guest_handle(ninfo.node_to_memfree, memfree); + set_xen_guest_handle(ninfo.node_to_node_distance, node_dists); + ninfo.max_node_index = max_nodes - 1; + if (xc_numainfo(ctx->xch, &ninfo) != 0) { + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "getting numainfo"); + goto fail; + } + + if (ninfo.max_node_index < max_nodes - 1) + max_nodes = ninfo.max_node_index + 1; + + *nr = max_nodes; + + ret = libxl__zalloc(NOGC, sizeof(libxl_numainfo) * max_nodes); + for (i = 0; i < max_nodes; i++) + ret[i].dists = libxl__calloc(NOGC, max_nodes, sizeof(*node_dists)); + + for (i = 0; i < max_nodes; i++) { +#define V(mem, i) (mem[i] == INVALID_NUMAINFO_ID) ? \ + LIBXL_NUMAINFO_INVALID_ENTRY : mem[i] + ret[i].size = V(memsize, i); + ret[i].free = V(memfree, i); + ret[i].num_dists = max_nodes; + for (j = 0; j < ret[i].num_dists; j++) + ret[i].dists[j] = V(node_dists, i * max_nodes + j); +#undef V + } + + fail: + xc_hypercall_buffer_free(ctx->xch, memsize); + xc_hypercall_buffer_free(ctx->xch, memfree); + xc_hypercall_buffer_free(ctx->xch, node_dists); + + out: + GC_FREE; + return ret; +} + const libxl_version_info* libxl_get_version_info(libxl_ctx *ctx) { union { diff -r e9aa6da372bd -r e0f04c3978f7 tools/libxl/libxl.h --- a/tools/libxl/libxl.h Fri Jul 06 13:17:40 2012 +0100 +++ b/tools/libxl/libxl.h Fri Jul 06 13:17:41 2012 +0100 @@ -532,6 +532,9 @@ int libxl_domain_preserve(libxl_ctx *ctx /* get max. number of cpus supported by hypervisor */ int libxl_get_max_cpus(libxl_ctx *ctx); +/* get max. number of NUMA nodes supported by hypervisor */ +int libxl_get_max_nodes(libxl_ctx *ctx); + int libxl_domain_rename(libxl_ctx *ctx, uint32_t domid, const char *old_name, const char *new_name); @@ -604,6 +607,10 @@ void libxl_vminfo_list_free(libxl_vminfo libxl_cputopology *libxl_get_cpu_topology(libxl_ctx *ctx, int *nb_cpu_out); void libxl_cputopology_list_free(libxl_cputopology *, int nb_cpu); +#define LIBXL_NUMAINFO_INVALID_ENTRY (~(uint32_t)0) +libxl_numainfo *libxl_get_numainfo(libxl_ctx *ctx, int *nr); +void libxl_numainfo_list_free(libxl_numainfo *, int nr); + libxl_vcpuinfo *libxl_list_vcpu(libxl_ctx *ctx, uint32_t domid, int *nb_vcpu, int *nr_vcpus_out); void libxl_vcpuinfo_list_free(libxl_vcpuinfo *, int nr_vcpus); diff -r e9aa6da372bd -r e0f04c3978f7 tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Fri Jul 06 13:17:40 2012 +0100 +++ b/tools/libxl/libxl_types.idl Fri Jul 06 13:17:41 2012 +0100 @@ -433,6 +433,15 @@ libxl_physinfo = Struct("physinfo", [ ("cap_hvm_directio", bool), ], dir=DIR_OUT) +# NUMA node characteristics: size and free are how much memory it has, and how +# much of it is free, respectively. dists is an array of distances from this +# node to each other node. +libxl_numainfo = Struct("numainfo", [ + ("size", uint64), + ("free", uint64), + ("dists", Array(uint32, "num_dists")), + ], dir=DIR_OUT) + libxl_cputopology = Struct("cputopology", [ ("core", uint32), ("socket", uint32), diff -r e9aa6da372bd -r e0f04c3978f7 tools/libxl/libxl_utils.c --- a/tools/libxl/libxl_utils.c Fri Jul 06 13:17:40 2012 +0100 +++ b/tools/libxl/libxl_utils.c Fri Jul 06 13:17:41 2012 +0100 @@ -572,6 +572,11 @@ int libxl_get_max_cpus(libxl_ctx *ctx) return xc_get_max_cpus(ctx->xch); } +int libxl_get_max_nodes(libxl_ctx *ctx) +{ + return xc_get_max_nodes(ctx->xch); +} + int libxl__enum_from_string(const libxl_enum_string_table *t, const char *s, int *e) { @@ -594,6 +599,14 @@ void libxl_cputopology_list_free(libxl_c free(list); } +void libxl_numainfo_list_free(libxl_numainfo *list, int nr) +{ + int i; + for (i = 0; i < nr; i++) + libxl_numainfo_dispose(&list[i]); + free(list); +} + void libxl_vcpuinfo_list_free(libxl_vcpuinfo *list, int nr) { int i; diff -r e9aa6da372bd -r e0f04c3978f7 xen/include/public/sysctl.h --- a/xen/include/public/sysctl.h Fri Jul 06 13:17:40 2012 +0100 +++ b/xen/include/public/sysctl.h Fri Jul 06 13:17:41 2012 +0100 @@ -484,6 +484,7 @@ typedef struct xen_sysctl_topologyinfo x DEFINE_XEN_GUEST_HANDLE(xen_sysctl_topologyinfo_t); /* XEN_SYSCTL_numainfo */ +#define INVALID_NUMAINFO_ID (~0U) struct xen_sysctl_numainfo { /* * IN: maximum addressable entry in the caller-provided arrays. _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jul 06 20:44:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Jul 2012 20:44: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 1SnFNv-0002AD-QU; Fri, 06 Jul 2012 20:44:15 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SnFNu-00029N-CQ for xen-changelog@lists.xensource.com; Fri, 06 Jul 2012 20:44:14 +0000 Received: from [85.158.138.51:51616] by server-4.bemta-3.messagelabs.com id 5D/DF-17105-D1E47FF4; Fri, 06 Jul 2012 20:44:13 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-174.messagelabs.com!1341607449!27681433!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 32048 invoked from network); 6 Jul 2012 20:44:10 -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; 6 Jul 2012 20:44:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SnFNp-00012R-EL for xen-changelog@lists.xensource.com; Fri, 06 Jul 2012 20:44:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SnFNp-0006cz-D7 for xen-changelog@lists.xensource.com; Fri, 06 Jul 2012 20:44:09 +0000 Message-Id: Date: Fri, 06 Jul 2012 20:44:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: rename libxl_cpumap to libxl_bitmap X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341577062 -3600 # Node ID 86c5dcbd03e6da6408666820d3b17a282a82c057 # Parent fd2b80a82cb0b2029eeacb224b8d49439a4a89ec libxl: rename libxl_cpumap to libxl_bitmap And leave to the caller the burden of knowing and remembering what kind of bitmap each instance of libxl_bitmap is. This is basically just some s/libxl_cpumap/libxl_bitmap/ (and some other related interface name substitution, e.g., libxl_for_each_cpu) in a bunch of files, with no real functional change involved. A specific allocation helper is introduced, besides libxl_bitmap_alloc(). It is called libxl_cpu_bitmap_alloc() and is meant at substituting the old libxl_cpumap_alloc(). It is just something easier to use in cases where one wants to allocate a libxl_bitmap that is going to serve as a cpu map. This is because we want to be able to deal with both cpu and NUMA node maps, but we don't want to duplicate all the various helpers and wrappers. While at it, add the usual initialization function, common to all libxl data structures. Signed-off-by: Dario Faggioli Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r fd2b80a82cb0 -r 86c5dcbd03e6 tools/libxl/gentest.py --- a/tools/libxl/gentest.py Fri Jul 06 13:17:42 2012 +0100 +++ b/tools/libxl/gentest.py Fri Jul 06 13:17:42 2012 +0100 @@ -20,7 +20,7 @@ def randomize_case(s): def randomize_enum(e): return random.choice([v.name for v in e.values]) -handcoded = ["libxl_cpumap", "libxl_key_value_list", +handcoded = ["libxl_bitmap", "libxl_key_value_list", "libxl_cpuid_policy_list", "libxl_string_list"] def gen_rand_init(ty, v, indent = " ", parent = None): @@ -117,16 +117,16 @@ static void rand_bytes(uint8_t *p, size_ p[i] = rand() % 256; } -static void libxl_cpumap_rand_init(libxl_cpumap *cpumap) +static void libxl_bitmap_rand_init(libxl_bitmap *bitmap) { int i; - cpumap->size = rand() % 16; - cpumap->map = calloc(cpumap->size, sizeof(*cpumap->map)); - libxl_for_each_cpu(i, *cpumap) { + bitmap->size = rand() % 16; + bitmap->map = calloc(bitmap->size, sizeof(*bitmap->map)); + libxl_for_each_bit(i, *bitmap) { if (rand() % 2) - libxl_cpumap_set(cpumap, i); + libxl_bitmap_set(bitmap, i); else - libxl_cpumap_reset(cpumap, i); + libxl_bitmap_reset(bitmap, i); } } diff -r fd2b80a82cb0 -r 86c5dcbd03e6 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Fri Jul 06 13:17:42 2012 +0100 +++ b/tools/libxl/libxl.c Fri Jul 06 13:17:42 2012 +0100 @@ -586,7 +586,7 @@ static int cpupool_info(libxl__gc *gc, info->poolid = xcinfo->cpupool_id; info->sched = xcinfo->sched_id; info->n_dom = xcinfo->n_dom; - rc = libxl_cpumap_alloc(CTX, &info->cpumap, 0); + rc = libxl_cpu_bitmap_alloc(CTX, &info->cpumap, 0); if (rc) { LOG(ERROR, "unable to allocate cpumap %d\n", rc); @@ -3431,7 +3431,7 @@ libxl_vcpuinfo *libxl_list_vcpu(libxl_ct } for (*nb_vcpu = 0; *nb_vcpu <= domaininfo.max_vcpu_id; ++*nb_vcpu, ++ptr) { - if (libxl_cpumap_alloc(ctx, &ptr->cpumap, 0)) { + if (libxl_cpu_bitmap_alloc(ctx, &ptr->cpumap, 0)) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "allocating cpumap"); return NULL; } @@ -3454,7 +3454,7 @@ libxl_vcpuinfo *libxl_list_vcpu(libxl_ct } int libxl_set_vcpuaffinity(libxl_ctx *ctx, uint32_t domid, uint32_t vcpuid, - libxl_cpumap *cpumap) + libxl_bitmap *cpumap) { if (xc_vcpu_setaffinity(ctx->xch, domid, vcpuid, cpumap->map)) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "setting vcpu affinity"); @@ -3464,7 +3464,7 @@ int libxl_set_vcpuaffinity(libxl_ctx *ct } int libxl_set_vcpuaffinity_all(libxl_ctx *ctx, uint32_t domid, - unsigned int max_vcpus, libxl_cpumap *cpumap) + unsigned int max_vcpus, libxl_bitmap *cpumap) { int i, rc = 0; @@ -3478,7 +3478,7 @@ int libxl_set_vcpuaffinity_all(libxl_ctx return rc; } -int libxl_set_vcpuonline(libxl_ctx *ctx, uint32_t domid, libxl_cpumap *cpumap) +int libxl_set_vcpuonline(libxl_ctx *ctx, uint32_t domid, libxl_bitmap *cpumap) { GC_INIT(ctx); libxl_dominfo info; @@ -3498,7 +3498,7 @@ retry_transaction: for (i = 0; i <= info.vcpu_max_id; i++) libxl__xs_write(gc, t, libxl__sprintf(gc, "%s/cpu/%u/availability", dompath, i), - "%s", libxl_cpumap_test(cpumap, i) ? "online" : "offline"); + "%s", libxl_bitmap_test(cpumap, i) ? "online" : "offline"); if (!xs_transaction_end(ctx->xsh, t, 0)) { if (errno == EAGAIN) goto retry_transaction; @@ -4094,7 +4094,7 @@ int libxl_tmem_freeable(libxl_ctx *ctx) return rc; } -int libxl_get_freecpus(libxl_ctx *ctx, libxl_cpumap *cpumap) +int libxl_get_freecpus(libxl_ctx *ctx, libxl_bitmap *cpumap) { int ncpus; @@ -4113,7 +4113,7 @@ int libxl_get_freecpus(libxl_ctx *ctx, l int libxl_cpupool_create(libxl_ctx *ctx, const char *name, libxl_scheduler sched, - libxl_cpumap cpumap, libxl_uuid *uuid, + libxl_bitmap cpumap, libxl_uuid *uuid, uint32_t *poolid) { GC_INIT(ctx); @@ -4136,8 +4136,8 @@ int libxl_cpupool_create(libxl_ctx *ctx, return ERROR_FAIL; } - libxl_for_each_cpu(i, cpumap) - if (libxl_cpumap_test(&cpumap, i)) { + libxl_for_each_bit(i, cpumap) + if (libxl_bitmap_test(&cpumap, i)) { rc = xc_cpupool_addcpu(ctx->xch, *poolid, i); if (rc) { LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, rc, @@ -4172,7 +4172,7 @@ int libxl_cpupool_destroy(libxl_ctx *ctx int rc, i; xc_cpupoolinfo_t *info; xs_transaction_t t; - libxl_cpumap cpumap; + libxl_bitmap cpumap; info = xc_cpupool_getinfo(ctx->xch, poolid); if (info == NULL) { @@ -4184,13 +4184,13 @@ int libxl_cpupool_destroy(libxl_ctx *ctx if ((info->cpupool_id != poolid) || (info->n_dom)) goto out; - rc = libxl_cpumap_alloc(ctx, &cpumap, 0); + rc = libxl_cpu_bitmap_alloc(ctx, &cpumap, 0); if (rc) goto out; memcpy(cpumap.map, info->cpumap, cpumap.size); - libxl_for_each_cpu(i, cpumap) - if (libxl_cpumap_test(&cpumap, i)) { + libxl_for_each_bit(i, cpumap) + if (libxl_bitmap_test(&cpumap, i)) { rc = xc_cpupool_removecpu(ctx->xch, poolid, i); if (rc) { LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, rc, @@ -4219,7 +4219,7 @@ int libxl_cpupool_destroy(libxl_ctx *ctx rc = 0; out1: - libxl_cpumap_dispose(&cpumap); + libxl_bitmap_dispose(&cpumap); out: xc_cpupool_infofree(ctx->xch, info); GC_FREE; @@ -4287,7 +4287,7 @@ int libxl_cpupool_cpuadd_node(libxl_ctx { int rc = 0; int cpu, nr; - libxl_cpumap freemap; + libxl_bitmap freemap; libxl_cputopology *topology; if (libxl_get_freecpus(ctx, &freemap)) { @@ -4302,7 +4302,7 @@ int libxl_cpupool_cpuadd_node(libxl_ctx *cpus = 0; for (cpu = 0; cpu < nr; cpu++) { - if (libxl_cpumap_test(&freemap, cpu) && (topology[cpu].node == node) && + if (libxl_bitmap_test(&freemap, cpu) && (topology[cpu].node == node) && !libxl_cpupool_cpuadd(ctx, poolid, cpu)) { (*cpus)++; } @@ -4311,7 +4311,7 @@ int libxl_cpupool_cpuadd_node(libxl_ctx free(topology); out: - libxl_cpumap_dispose(&freemap); + libxl_bitmap_dispose(&freemap); return rc; } @@ -4353,7 +4353,7 @@ int libxl_cpupool_cpuremove_node(libxl_c if (poolinfo[p].poolid == poolid) { for (cpu = 0; cpu < nr_cpus; cpu++) { if ((topology[cpu].node == node) && - libxl_cpumap_test(&poolinfo[p].cpumap, cpu) && + libxl_bitmap_test(&poolinfo[p].cpumap, cpu) && !libxl_cpupool_cpuremove(ctx, poolid, cpu)) { (*cpus)++; } diff -r fd2b80a82cb0 -r 86c5dcbd03e6 tools/libxl/libxl.h --- a/tools/libxl/libxl.h Fri Jul 06 13:17:42 2012 +0100 +++ b/tools/libxl/libxl.h Fri Jul 06 13:17:42 2012 +0100 @@ -285,8 +285,9 @@ typedef uint64_t libxl_ev_user; typedef struct { uint32_t size; /* number of bytes in map */ uint8_t *map; -} libxl_cpumap; -void libxl_cpumap_dispose(libxl_cpumap *map); +} libxl_bitmap; +void libxl_bitmap_init(libxl_bitmap *map); +void libxl_bitmap_dispose(libxl_bitmap *map); /* libxl_cpuid_policy_list is a dynamic array storing CPUID policies * for multiple leafs. It is terminated with an entry holding @@ -790,10 +791,10 @@ int libxl_userdata_retrieve(libxl_ctx *c int libxl_get_physinfo(libxl_ctx *ctx, libxl_physinfo *physinfo); int libxl_set_vcpuaffinity(libxl_ctx *ctx, uint32_t domid, uint32_t vcpuid, - libxl_cpumap *cpumap); + libxl_bitmap *cpumap); int libxl_set_vcpuaffinity_all(libxl_ctx *ctx, uint32_t domid, - unsigned int max_vcpus, libxl_cpumap *cpumap); -int libxl_set_vcpuonline(libxl_ctx *ctx, uint32_t domid, libxl_cpumap *cpumap); + unsigned int max_vcpus, libxl_bitmap *cpumap); +int libxl_set_vcpuonline(libxl_ctx *ctx, uint32_t domid, libxl_bitmap *cpumap); libxl_scheduler libxl_get_scheduler(libxl_ctx *ctx); @@ -843,10 +844,10 @@ int libxl_tmem_shared_auth(libxl_ctx *ct int auth); int libxl_tmem_freeable(libxl_ctx *ctx); -int libxl_get_freecpus(libxl_ctx *ctx, libxl_cpumap *cpumap); +int libxl_get_freecpus(libxl_ctx *ctx, libxl_bitmap *cpumap); int libxl_cpupool_create(libxl_ctx *ctx, const char *name, libxl_scheduler sched, - libxl_cpumap cpumap, libxl_uuid *uuid, + libxl_bitmap cpumap, libxl_uuid *uuid, uint32_t *poolid); int libxl_cpupool_destroy(libxl_ctx *ctx, uint32_t poolid); int libxl_cpupool_rename(libxl_ctx *ctx, const char *name, uint32_t poolid); diff -r fd2b80a82cb0 -r 86c5dcbd03e6 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Fri Jul 06 13:17:42 2012 +0100 +++ b/tools/libxl/libxl_create.c Fri Jul 06 13:17:42 2012 +0100 @@ -203,16 +203,16 @@ int libxl__domain_build_info_setdefault( if (!b_info->max_vcpus) b_info->max_vcpus = 1; if (!b_info->avail_vcpus.size) { - if (libxl_cpumap_alloc(CTX, &b_info->avail_vcpus, 1)) + if (libxl_cpu_bitmap_alloc(CTX, &b_info->avail_vcpus, 1)) return ERROR_FAIL; - libxl_cpumap_set(&b_info->avail_vcpus, 0); + libxl_bitmap_set(&b_info->avail_vcpus, 0); } else if (b_info->avail_vcpus.size > HVM_MAX_VCPUS) return ERROR_FAIL; if (!b_info->cpumap.size) { - if (libxl_cpumap_alloc(CTX, &b_info->cpumap, 0)) + if (libxl_cpu_bitmap_alloc(CTX, &b_info->cpumap, 0)) return ERROR_FAIL; - libxl_cpumap_set_any(&b_info->cpumap); + libxl_bitmap_set_any(&b_info->cpumap); } if (b_info->max_memkb == LIBXL_MEMKB_DEFAULT) diff -r fd2b80a82cb0 -r 86c5dcbd03e6 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Fri Jul 06 13:17:42 2012 +0100 +++ b/tools/libxl/libxl_dm.c Fri Jul 06 13:17:42 2012 +0100 @@ -208,8 +208,8 @@ static char ** libxl__build_device_model NULL); } - nr_set_cpus = libxl_cpumap_count_set(&b_info->avail_vcpus); - s = libxl_cpumap_to_hex_string(CTX, &b_info->avail_vcpus); + nr_set_cpus = libxl_bitmap_count_set(&b_info->avail_vcpus); + s = libxl_bitmap_to_hex_string(CTX, &b_info->avail_vcpus); flexarray_vappend(dm_args, "-vcpu_avail", libxl__sprintf(gc, "%s", s), NULL); free(s); @@ -459,7 +459,7 @@ static char ** libxl__build_device_model flexarray_append(dm_args, "-smp"); if (b_info->avail_vcpus.size) { int nr_set_cpus = 0; - nr_set_cpus = libxl_cpumap_count_set(&b_info->avail_vcpus); + nr_set_cpus = libxl_bitmap_count_set(&b_info->avail_vcpus); flexarray_append(dm_args, libxl__sprintf(gc, "%d,maxcpus=%d", b_info->max_vcpus, diff -r fd2b80a82cb0 -r 86c5dcbd03e6 tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Fri Jul 06 13:17:42 2012 +0100 +++ b/tools/libxl/libxl_dom.c Fri Jul 06 13:17:42 2012 +0100 @@ -202,7 +202,7 @@ int libxl__build_post(libxl__gc *gc, uin ents[11] = libxl__sprintf(gc, "%lu", state->store_mfn); for (i = 0; i < info->max_vcpus; i++) { ents[12+(i*2)] = libxl__sprintf(gc, "cpu/%d/availability", i); - ents[12+(i*2)+1] = libxl_cpumap_test(&info->avail_vcpus, i) + ents[12+(i*2)+1] = libxl_bitmap_test(&info->avail_vcpus, i) ? "online" : "offline"; } diff -r fd2b80a82cb0 -r 86c5dcbd03e6 tools/libxl/libxl_json.c --- a/tools/libxl/libxl_json.c Fri Jul 06 13:17:42 2012 +0100 +++ b/tools/libxl/libxl_json.c Fri Jul 06 13:17:42 2012 +0100 @@ -99,8 +99,8 @@ yajl_gen_status libxl_uuid_gen_json(yajl return yajl_gen_string(hand, (const unsigned char *)buf, LIBXL_UUID_FMTLEN); } -yajl_gen_status libxl_cpumap_gen_json(yajl_gen hand, - libxl_cpumap *cpumap) +yajl_gen_status libxl_bitmap_gen_json(yajl_gen hand, + libxl_bitmap *bitmap) { yajl_gen_status s; int i; @@ -108,8 +108,8 @@ yajl_gen_status libxl_cpumap_gen_json(ya s = yajl_gen_array_open(hand); if (s != yajl_gen_status_ok) goto out; - libxl_for_each_cpu(i, *cpumap) { - if (libxl_cpumap_test(cpumap, i)) { + libxl_for_each_bit(i, *bitmap) { + if (libxl_bitmap_test(bitmap, i)) { s = yajl_gen_integer(hand, i); if (s != yajl_gen_status_ok) goto out; } diff -r fd2b80a82cb0 -r 86c5dcbd03e6 tools/libxl/libxl_json.h --- a/tools/libxl/libxl_json.h Fri Jul 06 13:17:42 2012 +0100 +++ b/tools/libxl/libxl_json.h Fri Jul 06 13:17:42 2012 +0100 @@ -26,7 +26,7 @@ yajl_gen_status libxl_defbool_gen_json(y yajl_gen_status libxl_domid_gen_json(yajl_gen hand, libxl_domid *p); yajl_gen_status libxl_uuid_gen_json(yajl_gen hand, libxl_uuid *p); yajl_gen_status libxl_mac_gen_json(yajl_gen hand, libxl_mac *p); -yajl_gen_status libxl_cpumap_gen_json(yajl_gen hand, libxl_cpumap *p); +yajl_gen_status libxl_bitmap_gen_json(yajl_gen hand, libxl_bitmap *p); yajl_gen_status libxl_cpuid_policy_list_gen_json(yajl_gen hand, libxl_cpuid_policy_list *p); yajl_gen_status libxl_string_list_gen_json(yajl_gen hand, libxl_string_list *p); diff -r fd2b80a82cb0 -r 86c5dcbd03e6 tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Fri Jul 06 13:17:42 2012 +0100 +++ b/tools/libxl/libxl_types.idl Fri Jul 06 13:17:42 2012 +0100 @@ -10,7 +10,7 @@ libxl_defbool = Builtin("defbool", passb libxl_domid = Builtin("domid", json_fn = "yajl_gen_integer", autogenerate_json = False) libxl_uuid = Builtin("uuid", passby=PASS_BY_REFERENCE) libxl_mac = Builtin("mac", passby=PASS_BY_REFERENCE) -libxl_cpumap = Builtin("cpumap", dispose_fn="libxl_cpumap_dispose", passby=PASS_BY_REFERENCE) +libxl_bitmap = Builtin("bitmap", dispose_fn="libxl_bitmap_dispose", passby=PASS_BY_REFERENCE) libxl_cpuid_policy_list = Builtin("cpuid_policy_list", dispose_fn="libxl_cpuid_dispose", passby=PASS_BY_REFERENCE) libxl_string_list = Builtin("string_list", dispose_fn="libxl_string_list_dispose", passby=PASS_BY_REFERENCE) @@ -198,7 +198,7 @@ libxl_cpupoolinfo = Struct("cpupoolinfo" ("poolid", uint32), ("sched", libxl_scheduler), ("n_dom", uint32), - ("cpumap", libxl_cpumap) + ("cpumap", libxl_bitmap) ], dir=DIR_OUT) libxl_vminfo = Struct("vminfo", [ @@ -247,8 +247,8 @@ libxl_domain_sched_params = Struct("doma libxl_domain_build_info = Struct("domain_build_info",[ ("max_vcpus", integer), - ("avail_vcpus", libxl_cpumap), - ("cpumap", libxl_cpumap), + ("avail_vcpus", libxl_bitmap), + ("cpumap", libxl_bitmap), ("tsc_mode", libxl_tsc_mode), ("max_memkb", MemKB), ("target_memkb", MemKB), @@ -409,7 +409,7 @@ libxl_vcpuinfo = Struct("vcpuinfo", [ ("blocked", bool), ("running", bool), ("vcpu_time", uint64), # total vcpu time ran (ns) - ("cpumap", libxl_cpumap), # current cpu's affinities + ("cpumap", libxl_bitmap), # current cpu's affinities ], dir=DIR_OUT) libxl_physinfo = Struct("physinfo", [ diff -r fd2b80a82cb0 -r 86c5dcbd03e6 tools/libxl/libxl_utils.c --- a/tools/libxl/libxl_utils.c Fri Jul 06 13:17:42 2012 +0100 +++ b/tools/libxl/libxl_utils.c Fri Jul 06 13:17:42 2012 +0100 @@ -487,79 +487,70 @@ int libxl_mac_to_device_nic(libxl_ctx *c return rc; } -int libxl_cpumap_alloc(libxl_ctx *ctx, libxl_cpumap *cpumap, int max_cpus) +int libxl_bitmap_alloc(libxl_ctx *ctx, libxl_bitmap *bitmap, int n_bits) { GC_INIT(ctx); int sz; - int rc; - if (max_cpus < 0) { - rc = ERROR_INVAL; - goto out; - } - if (max_cpus == 0) - max_cpus = libxl_get_max_cpus(ctx); - if (max_cpus == 0) { - rc = ERROR_FAIL; - goto out; - } + sz = (n_bits + 7) / 8; + bitmap->map = libxl__calloc(NOGC, sizeof(*bitmap->map), sz); + bitmap->size = sz; - sz = (max_cpus + 7) / 8; - cpumap->map = libxl__calloc(NOGC, sizeof(*cpumap->map), sz); - cpumap->size = sz; - - rc = 0; - out: GC_FREE; - return rc; + return 0; } -void libxl_cpumap_dispose(libxl_cpumap *map) +void libxl_bitmap_init(libxl_bitmap *map) +{ + memset(map, '\0', sizeof(*map)); +} + +void libxl_bitmap_dispose(libxl_bitmap *map) { free(map->map); } -int libxl_cpumap_test(const libxl_cpumap *cpumap, int cpu) +int libxl_bitmap_test(const libxl_bitmap *bitmap, int bit) { - if (cpu >= cpumap->size * 8) + if (bit >= bitmap->size * 8) return 0; - return (cpumap->map[cpu / 8] & (1 << (cpu & 7))) ? 1 : 0; + return (bitmap->map[bit / 8] & (1 << (bit & 7))) ? 1 : 0; } -void libxl_cpumap_set(libxl_cpumap *cpumap, int cpu) +void libxl_bitmap_set(libxl_bitmap *bitmap, int bit) { - if (cpu >= cpumap->size * 8) + if (bit >= bitmap->size * 8) return; - cpumap->map[cpu / 8] |= 1 << (cpu & 7); + bitmap->map[bit / 8] |= 1 << (bit & 7); } -void libxl_cpumap_reset(libxl_cpumap *cpumap, int cpu) +void libxl_bitmap_reset(libxl_bitmap *bitmap, int bit) { - if (cpu >= cpumap->size * 8) + if (bit >= bitmap->size * 8) return; - cpumap->map[cpu / 8] &= ~(1 << (cpu & 7)); + bitmap->map[bit / 8] &= ~(1 << (bit & 7)); } -int libxl_cpumap_count_set(const libxl_cpumap *cpumap) +int libxl_bitmap_count_set(const libxl_bitmap *bitmap) { - int i, nr_set_cpus = 0; - libxl_for_each_set_cpu(i, *cpumap) - nr_set_cpus++; + int i, nr_set_bits = 0; + libxl_for_each_set_bit(i, *bitmap) + nr_set_bits++; - return nr_set_cpus; + return nr_set_bits; } /* NB. caller is responsible for freeing the memory */ -char *libxl_cpumap_to_hex_string(libxl_ctx *ctx, const libxl_cpumap *cpumap) +char *libxl_bitmap_to_hex_string(libxl_ctx *ctx, const libxl_bitmap *bitmap) { GC_INIT(ctx); - int i = cpumap->size; - char *p = libxl__zalloc(NOGC, cpumap->size * 2 + 3); + int i = bitmap->size; + char *p = libxl__zalloc(NOGC, bitmap->size * 2 + 3); char *q = p; strncpy(p, "0x", 2); p += 2; while(--i >= 0) { - sprintf(p, "%02x", cpumap->map[i]); + sprintf(p, "%02x", bitmap->map[i]); p += 2; } *p = '\0'; diff -r fd2b80a82cb0 -r 86c5dcbd03e6 tools/libxl/libxl_utils.h --- a/tools/libxl/libxl_utils.h Fri Jul 06 13:17:42 2012 +0100 +++ b/tools/libxl/libxl_utils.h Fri Jul 06 13:17:42 2012 +0100 @@ -63,29 +63,44 @@ int libxl_devid_to_device_nic(libxl_ctx int libxl_vdev_to_device_disk(libxl_ctx *ctx, uint32_t domid, const char *vdev, libxl_device_disk *disk); -int libxl_cpumap_alloc(libxl_ctx *ctx, libxl_cpumap *cpumap, int max_cpus); -int libxl_cpumap_test(const libxl_cpumap *cpumap, int cpu); -void libxl_cpumap_set(libxl_cpumap *cpumap, int cpu); -void libxl_cpumap_reset(libxl_cpumap *cpumap, int cpu); -int libxl_cpumap_count_set(const libxl_cpumap *cpumap); -char *libxl_cpumap_to_hex_string(libxl_ctx *ctx, const libxl_cpumap *cpumap); -static inline void libxl_cpumap_set_any(libxl_cpumap *cpumap) +int libxl_bitmap_alloc(libxl_ctx *ctx, libxl_bitmap *bitmap, int n_bits); + /* Allocated bimap is from malloc, libxl_bitmap_dispose() to be + * called by the application when done. */ +int libxl_bitmap_test(const libxl_bitmap *bitmap, int bit); +void libxl_bitmap_set(libxl_bitmap *bitmap, int bit); +void libxl_bitmap_reset(libxl_bitmap *bitmap, int bit); +int libxl_bitmap_count_set(const libxl_bitmap *cpumap); +char *libxl_bitmap_to_hex_string(libxl_ctx *ctx, const libxl_bitmap *cpumap); +static inline void libxl_bitmap_set_any(libxl_bitmap *bitmap) { - memset(cpumap->map, -1, cpumap->size); + memset(bitmap->map, -1, bitmap->size); } -static inline void libxl_cpumap_set_none(libxl_cpumap *cpumap) +static inline void libxl_bitmap_set_none(libxl_bitmap *bitmap) { - memset(cpumap->map, 0, cpumap->size); + memset(bitmap->map, 0, bitmap->size); } -static inline int libxl_cpumap_cpu_valid(libxl_cpumap *cpumap, int cpu) +static inline int libxl_bitmap_cpu_valid(libxl_bitmap *bitmap, int bit) { - return cpu >= 0 && cpu < (cpumap->size * 8); + return bit >= 0 && bit < (bitmap->size * 8); } -#define libxl_for_each_cpu(var, map) for (var = 0; var < (map).size * 8; var++) -#define libxl_for_each_set_cpu(v, m) for (v = 0; v < (m).size * 8; v++) \ - if (libxl_cpumap_test(&(m), v)) +#define libxl_for_each_bit(var, map) for (var = 0; var < (map).size * 8; var++) +#define libxl_for_each_set_bit(v, m) for (v = 0; v < (m).size * 8; v++) \ + if (libxl_bitmap_test(&(m), v)) -static inline uint32_t libxl__sizekb_to_mb(uint32_t s) { +static inline int libxl_cpu_bitmap_alloc(libxl_ctx *ctx, libxl_bitmap *cpumap, + int max_cpus) +{ + if (max_cpus < 0) + return ERROR_INVAL; + if (max_cpus == 0) + max_cpus = libxl_get_max_cpus(ctx); + if (max_cpus == 0) + return ERROR_FAIL; + + return libxl_bitmap_alloc(ctx, cpumap, max_cpus); +} + + static inline uint32_t libxl__sizekb_to_mb(uint32_t s) { return (s + 1023) / 1024; } diff -r fd2b80a82cb0 -r 86c5dcbd03e6 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Fri Jul 06 13:17:42 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Fri Jul 06 13:17:42 2012 +0100 @@ -492,19 +492,19 @@ static void split_string_into_string_lis free(s); } -static int vcpupin_parse(char *cpu, libxl_cpumap *cpumap) -{ - libxl_cpumap exclude_cpumap; +static int vcpupin_parse(char *cpu, libxl_bitmap *cpumap) +{ + libxl_bitmap exclude_cpumap; uint32_t cpuida, cpuidb; char *endptr, *toka, *tokb, *saveptr = NULL; int i, rc = 0, rmcpu; if (!strcmp(cpu, "all")) { - libxl_cpumap_set_any(cpumap); + libxl_bitmap_set_any(cpumap); return 0; } - if (libxl_cpumap_alloc(ctx, &exclude_cpumap, 0)) { + if (libxl_cpu_bitmap_alloc(ctx, &exclude_cpumap, 0)) { fprintf(stderr, "Error: Failed to allocate cpumap.\n"); return ENOMEM; } @@ -534,19 +534,19 @@ static int vcpupin_parse(char *cpu, libx } } while (cpuida <= cpuidb) { - rmcpu == 0 ? libxl_cpumap_set(cpumap, cpuida) : - libxl_cpumap_set(&exclude_cpumap, cpuida); + rmcpu == 0 ? libxl_bitmap_set(cpumap, cpuida) : + libxl_bitmap_set(&exclude_cpumap, cpuida); cpuida++; } } /* Clear all the cpus from the removal list */ - libxl_for_each_set_cpu(i, exclude_cpumap) { - libxl_cpumap_reset(cpumap, i); + libxl_for_each_set_bit(i, exclude_cpumap) { + libxl_bitmap_reset(cpumap, i); } vcpp_out: - libxl_cpumap_dispose(&exclude_cpumap); + libxl_bitmap_dispose(&exclude_cpumap); return rc; } @@ -649,13 +649,13 @@ static void parse_config_data(const char if (!xlu_cfg_get_long (config, "vcpus", &l, 0)) { b_info->max_vcpus = l; - if (libxl_cpumap_alloc(ctx, &b_info->avail_vcpus, l)) { + if (libxl_cpu_bitmap_alloc(ctx, &b_info->avail_vcpus, l)) { fprintf(stderr, "Unable to allocate cpumap\n"); exit(1); } - libxl_cpumap_set_none(&b_info->avail_vcpus); + libxl_bitmap_set_none(&b_info->avail_vcpus); while (l-- > 0) - libxl_cpumap_set((&b_info->avail_vcpus), l); + libxl_bitmap_set((&b_info->avail_vcpus), l); } if (!xlu_cfg_get_long (config, "maxvcpus", &l, 0)) @@ -664,7 +664,7 @@ static void parse_config_data(const char if (!xlu_cfg_get_list (config, "cpus", &cpus, 0, 1)) { int i, n_cpus = 0; - if (libxl_cpumap_alloc(ctx, &b_info->cpumap, 0)) { + if (libxl_cpu_bitmap_alloc(ctx, &b_info->cpumap, 0)) { fprintf(stderr, "Unable to allocate cpumap\n"); exit(1); } @@ -684,14 +684,14 @@ static void parse_config_data(const char * the cpumap derived from the list ensures memory is being * allocated on the proper nodes anyway. */ - libxl_cpumap_set_none(&b_info->cpumap); + libxl_bitmap_set_none(&b_info->cpumap); while ((buf = xlu_cfg_get_listitem(cpus, n_cpus)) != NULL) { i = atoi(buf); - if (!libxl_cpumap_cpu_valid(&b_info->cpumap, i)) { + if (!libxl_bitmap_cpu_valid(&b_info->cpumap, i)) { fprintf(stderr, "cpu %d illegal\n", i); exit(1); } - libxl_cpumap_set(&b_info->cpumap, i); + libxl_bitmap_set(&b_info->cpumap, i); if (n_cpus < b_info->max_vcpus) vcpu_to_pcpu[n_cpus] = i; n_cpus++; @@ -700,12 +700,12 @@ static void parse_config_data(const char else if (!xlu_cfg_get_string (config, "cpus", &buf, 0)) { char *buf2 = strdup(buf); - if (libxl_cpumap_alloc(ctx, &b_info->cpumap, 0)) { + if (libxl_cpu_bitmap_alloc(ctx, &b_info->cpumap, 0)) { fprintf(stderr, "Unable to allocate cpumap\n"); exit(1); } - libxl_cpumap_set_none(&b_info->cpumap); + libxl_bitmap_set_none(&b_info->cpumap); if (vcpupin_parse(buf2, &b_info->cpumap)) exit(1); free(buf2); @@ -1805,28 +1805,28 @@ start: /* If single vcpu to pcpu mapping was requested, honour it */ if (vcpu_to_pcpu) { - libxl_cpumap vcpu_cpumap; - - ret = libxl_cpumap_alloc(ctx, &vcpu_cpumap, 0); + libxl_bitmap vcpu_cpumap; + + ret = libxl_cpu_bitmap_alloc(ctx, &vcpu_cpumap, 0); if (ret) goto error_out; for (i = 0; i < d_config.b_info.max_vcpus; i++) { if (vcpu_to_pcpu[i] != -1) { - libxl_cpumap_set_none(&vcpu_cpumap); - libxl_cpumap_set(&vcpu_cpumap, vcpu_to_pcpu[i]); + libxl_bitmap_set_none(&vcpu_cpumap); + libxl_bitmap_set(&vcpu_cpumap, vcpu_to_pcpu[i]); } else { - libxl_cpumap_set_any(&vcpu_cpumap); + libxl_bitmap_set_any(&vcpu_cpumap); } if (libxl_set_vcpuaffinity(ctx, domid, i, &vcpu_cpumap)) { fprintf(stderr, "setting affinity failed on vcpu `%d'.\n", i); - libxl_cpumap_dispose(&vcpu_cpumap); + libxl_bitmap_dispose(&vcpu_cpumap); free(vcpu_to_pcpu); ret = ERROR_FAIL; goto error_out; } } - libxl_cpumap_dispose(&vcpu_cpumap); + libxl_bitmap_dispose(&vcpu_cpumap); free(vcpu_to_pcpu); vcpu_to_pcpu = NULL; } @@ -4063,7 +4063,7 @@ int main_vcpulist(int argc, char **argv) static void vcpupin(const char *d, const char *vcpu, char *cpu) { libxl_vcpuinfo *vcpuinfo; - libxl_cpumap cpumap; + libxl_bitmap cpumap; uint32_t vcpuid; char *endptr; @@ -4080,7 +4080,7 @@ static void vcpupin(const char *d, const find_domain(d); - if (libxl_cpumap_alloc(ctx, &cpumap, 0)) { + if (libxl_cpu_bitmap_alloc(ctx, &cpumap, 0)) { goto vcpupin_out; } @@ -4107,7 +4107,7 @@ static void vcpupin(const char *d, const libxl_vcpuinfo_list_free(vcpuinfo, nb_vcpu); } vcpupin_out1: - libxl_cpumap_dispose(&cpumap); + libxl_bitmap_dispose(&cpumap); vcpupin_out: ; } @@ -4127,7 +4127,7 @@ static void vcpuset(const char *d, const { char *endptr; unsigned int max_vcpus, i; - libxl_cpumap cpumap; + libxl_bitmap cpumap; max_vcpus = strtoul(nr_vcpus, &endptr, 10); if (nr_vcpus == endptr) { @@ -4137,17 +4137,17 @@ static void vcpuset(const char *d, const find_domain(d); - if (libxl_cpumap_alloc(ctx, &cpumap, 0)) { - fprintf(stderr, "libxl_cpumap_alloc failed\n"); + if (libxl_cpu_bitmap_alloc(ctx, &cpumap, 0)) { + fprintf(stderr, "libxl_cpu_bitmap_alloc failed\n"); return; } for (i = 0; i < max_vcpus; i++) - libxl_cpumap_set(&cpumap, i); + libxl_bitmap_set(&cpumap, i); if (libxl_set_vcpuonline(ctx, domid, &cpumap) < 0) fprintf(stderr, "libxl_set_vcpuonline failed domid=%d max_vcpus=%d\n", domid, max_vcpus); - libxl_cpumap_dispose(&cpumap); + libxl_bitmap_dispose(&cpumap); } int main_vcpuset(int argc, char **argv) @@ -4211,7 +4211,7 @@ static void output_physinfo(void) libxl_physinfo info; const libxl_version_info *vinfo; unsigned int i; - libxl_cpumap cpumap; + libxl_bitmap cpumap; int n = 0; if (libxl_get_physinfo(ctx, &info) != 0) { @@ -4243,8 +4243,8 @@ static void output_physinfo(void) printf("sharing_used_memory : %"PRIu64"\n", info.sharing_used_frames / i); } if (!libxl_get_freecpus(ctx, &cpumap)) { - libxl_for_each_cpu(i, cpumap) - if (libxl_cpumap_test(&cpumap, i)) + libxl_for_each_bit(i, cpumap) + if (libxl_bitmap_test(&cpumap, i)) n++; printf("free_cpus : %d\n", n); free(cpumap.map); @@ -5866,8 +5866,8 @@ int main_cpupoolcreate(int argc, char ** XLU_ConfigList *cpus; XLU_ConfigList *nodes; int n_cpus, n_nodes, i, n; - libxl_cpumap freemap; - libxl_cpumap cpumap; + libxl_bitmap freemap; + libxl_bitmap cpumap; libxl_uuid uuid; libxl_cputopology *topology; int rc = -ERROR_FAIL; @@ -5980,7 +5980,7 @@ int main_cpupoolcreate(int argc, char ** fprintf(stderr, "libxl_get_freecpus failed\n"); goto out_cfg; } - if (libxl_cpumap_alloc(ctx, &cpumap, 0)) { + if (libxl_cpu_bitmap_alloc(ctx, &cpumap, 0)) { fprintf(stderr, "Failed to allocate cpumap\n"); goto out_cfg; } @@ -5997,8 +5997,8 @@ int main_cpupoolcreate(int argc, char ** n = atoi(buf); for (i = 0; i < nr; i++) { if ((topology[i].node == n) && - libxl_cpumap_test(&freemap, i)) { - libxl_cpumap_set(&cpumap, i); + libxl_bitmap_test(&freemap, i)) { + libxl_bitmap_set(&cpumap, i); n_cpus++; } } @@ -6016,11 +6016,11 @@ int main_cpupoolcreate(int argc, char ** while ((buf = xlu_cfg_get_listitem(cpus, n_cpus)) != NULL) { i = atoi(buf); if ((i < 0) || (i >= freemap.size * 8) || - !libxl_cpumap_test(&freemap, i)) { + !libxl_bitmap_test(&freemap, i)) { fprintf(stderr, "cpu %d illegal or not free\n", i); goto out_cfg; } - libxl_cpumap_set(&cpumap, i); + libxl_bitmap_set(&cpumap, i); n_cpus++; } } else @@ -6118,8 +6118,8 @@ int main_cpupoollist(int argc, char **ar printf("%-19s", name); free(name); n = 0; - libxl_for_each_cpu(c, poolinfo[p].cpumap) - if (libxl_cpumap_test(&poolinfo[p].cpumap, c)) { + libxl_for_each_bit(c, poolinfo[p].cpumap) + if (libxl_bitmap_test(&poolinfo[p].cpumap, c)) { if (n && opt_cpus) printf(","); if (opt_cpus) printf("%d", c); n++; @@ -6318,7 +6318,7 @@ int main_cpupoolnumasplit(int argc, char int n_cpus; char name[16]; libxl_uuid uuid; - libxl_cpumap cpumap; + libxl_bitmap cpumap; libxl_cpupoolinfo *poolinfo; libxl_cputopology *topology; libxl_dominfo info; @@ -6348,7 +6348,7 @@ int main_cpupoolnumasplit(int argc, char return -ERROR_FAIL; } - if (libxl_cpumap_alloc(ctx, &cpumap, 0)) { + if (libxl_cpu_bitmap_alloc(ctx, &cpumap, 0)) { fprintf(stderr, "Failed to allocate cpumap\n"); libxl_cputopology_list_free(topology, n_cpus); return -ERROR_FAIL; @@ -6374,7 +6374,7 @@ int main_cpupoolnumasplit(int argc, char for (c = 0; c < n_cpus; c++) { if (topology[c].node == node) { topology[c].node = LIBXL_CPUTOPOLOGY_INVALID_ENTRY; - libxl_cpumap_set(&cpumap, n); + libxl_bitmap_set(&cpumap, n); n++; } } @@ -6396,7 +6396,7 @@ int main_cpupoolnumasplit(int argc, char fprintf(stderr, "failed to offline vcpus\n"); goto out; } - libxl_cpumap_set_none(&cpumap); + libxl_bitmap_set_none(&cpumap); for (c = 0; c < n_cpus; c++) { if (topology[c].node == LIBXL_CPUTOPOLOGY_INVALID_ENTRY) { @@ -6434,7 +6434,7 @@ int main_cpupoolnumasplit(int argc, char out: libxl_cputopology_list_free(topology, n_cpus); - libxl_cpumap_dispose(&cpumap); + libxl_bitmap_dispose(&cpumap); return ret; } diff -r fd2b80a82cb0 -r 86c5dcbd03e6 tools/python/xen/lowlevel/xl/xl.c --- a/tools/python/xen/lowlevel/xl/xl.c Fri Jul 06 13:17:42 2012 +0100 +++ b/tools/python/xen/lowlevel/xl/xl.c Fri Jul 06 13:17:42 2012 +0100 @@ -231,14 +231,14 @@ int attrib__libxl_cpuid_policy_list_set( return -1; } -int attrib__libxl_cpumap_set(PyObject *v, libxl_cpumap *pptr) +int attrib__libxl_bitmap_set(PyObject *v, libxl_bitmap *pptr) { int i; long cpu; for (i = 0; i < PyList_Size(v); i++) { cpu = PyInt_AsLong(PyList_GetItem(v, i)); - libxl_cpumap_set(pptr, cpu); + libxl_bitmap_set(pptr, cpu); } return 0; } @@ -293,14 +293,14 @@ PyObject *attrib__libxl_cpuid_policy_lis return NULL; } -PyObject *attrib__libxl_cpumap_get(libxl_cpumap *pptr) +PyObject *attrib__libxl_bitmap_get(libxl_bitmap *pptr) { PyObject *cpulist = NULL; int i; cpulist = PyList_New(0); - libxl_for_each_cpu(i, *pptr) { - if ( libxl_cpumap_test(pptr, i) ) { + libxl_for_each_bit(i, *pptr) { + if ( libxl_bitmap_test(pptr, i) ) { PyObject* pyint = PyInt_FromLong(i); PyList_Append(cpulist, pyint); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jul 06 20:44:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Jul 2012 20:44: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 1SnFNv-0002AD-QU; Fri, 06 Jul 2012 20:44:15 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SnFNu-00029N-CQ for xen-changelog@lists.xensource.com; Fri, 06 Jul 2012 20:44:14 +0000 Received: from [85.158.138.51:51616] by server-4.bemta-3.messagelabs.com id 5D/DF-17105-D1E47FF4; Fri, 06 Jul 2012 20:44:13 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-174.messagelabs.com!1341607449!27681433!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 32048 invoked from network); 6 Jul 2012 20:44:10 -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; 6 Jul 2012 20:44:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SnFNp-00012R-EL for xen-changelog@lists.xensource.com; Fri, 06 Jul 2012 20:44:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SnFNp-0006cz-D7 for xen-changelog@lists.xensource.com; Fri, 06 Jul 2012 20:44:09 +0000 Message-Id: Date: Fri, 06 Jul 2012 20:44:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: rename libxl_cpumap to libxl_bitmap X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341577062 -3600 # Node ID 86c5dcbd03e6da6408666820d3b17a282a82c057 # Parent fd2b80a82cb0b2029eeacb224b8d49439a4a89ec libxl: rename libxl_cpumap to libxl_bitmap And leave to the caller the burden of knowing and remembering what kind of bitmap each instance of libxl_bitmap is. This is basically just some s/libxl_cpumap/libxl_bitmap/ (and some other related interface name substitution, e.g., libxl_for_each_cpu) in a bunch of files, with no real functional change involved. A specific allocation helper is introduced, besides libxl_bitmap_alloc(). It is called libxl_cpu_bitmap_alloc() and is meant at substituting the old libxl_cpumap_alloc(). It is just something easier to use in cases where one wants to allocate a libxl_bitmap that is going to serve as a cpu map. This is because we want to be able to deal with both cpu and NUMA node maps, but we don't want to duplicate all the various helpers and wrappers. While at it, add the usual initialization function, common to all libxl data structures. Signed-off-by: Dario Faggioli Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r fd2b80a82cb0 -r 86c5dcbd03e6 tools/libxl/gentest.py --- a/tools/libxl/gentest.py Fri Jul 06 13:17:42 2012 +0100 +++ b/tools/libxl/gentest.py Fri Jul 06 13:17:42 2012 +0100 @@ -20,7 +20,7 @@ def randomize_case(s): def randomize_enum(e): return random.choice([v.name for v in e.values]) -handcoded = ["libxl_cpumap", "libxl_key_value_list", +handcoded = ["libxl_bitmap", "libxl_key_value_list", "libxl_cpuid_policy_list", "libxl_string_list"] def gen_rand_init(ty, v, indent = " ", parent = None): @@ -117,16 +117,16 @@ static void rand_bytes(uint8_t *p, size_ p[i] = rand() % 256; } -static void libxl_cpumap_rand_init(libxl_cpumap *cpumap) +static void libxl_bitmap_rand_init(libxl_bitmap *bitmap) { int i; - cpumap->size = rand() % 16; - cpumap->map = calloc(cpumap->size, sizeof(*cpumap->map)); - libxl_for_each_cpu(i, *cpumap) { + bitmap->size = rand() % 16; + bitmap->map = calloc(bitmap->size, sizeof(*bitmap->map)); + libxl_for_each_bit(i, *bitmap) { if (rand() % 2) - libxl_cpumap_set(cpumap, i); + libxl_bitmap_set(bitmap, i); else - libxl_cpumap_reset(cpumap, i); + libxl_bitmap_reset(bitmap, i); } } diff -r fd2b80a82cb0 -r 86c5dcbd03e6 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Fri Jul 06 13:17:42 2012 +0100 +++ b/tools/libxl/libxl.c Fri Jul 06 13:17:42 2012 +0100 @@ -586,7 +586,7 @@ static int cpupool_info(libxl__gc *gc, info->poolid = xcinfo->cpupool_id; info->sched = xcinfo->sched_id; info->n_dom = xcinfo->n_dom; - rc = libxl_cpumap_alloc(CTX, &info->cpumap, 0); + rc = libxl_cpu_bitmap_alloc(CTX, &info->cpumap, 0); if (rc) { LOG(ERROR, "unable to allocate cpumap %d\n", rc); @@ -3431,7 +3431,7 @@ libxl_vcpuinfo *libxl_list_vcpu(libxl_ct } for (*nb_vcpu = 0; *nb_vcpu <= domaininfo.max_vcpu_id; ++*nb_vcpu, ++ptr) { - if (libxl_cpumap_alloc(ctx, &ptr->cpumap, 0)) { + if (libxl_cpu_bitmap_alloc(ctx, &ptr->cpumap, 0)) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "allocating cpumap"); return NULL; } @@ -3454,7 +3454,7 @@ libxl_vcpuinfo *libxl_list_vcpu(libxl_ct } int libxl_set_vcpuaffinity(libxl_ctx *ctx, uint32_t domid, uint32_t vcpuid, - libxl_cpumap *cpumap) + libxl_bitmap *cpumap) { if (xc_vcpu_setaffinity(ctx->xch, domid, vcpuid, cpumap->map)) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "setting vcpu affinity"); @@ -3464,7 +3464,7 @@ int libxl_set_vcpuaffinity(libxl_ctx *ct } int libxl_set_vcpuaffinity_all(libxl_ctx *ctx, uint32_t domid, - unsigned int max_vcpus, libxl_cpumap *cpumap) + unsigned int max_vcpus, libxl_bitmap *cpumap) { int i, rc = 0; @@ -3478,7 +3478,7 @@ int libxl_set_vcpuaffinity_all(libxl_ctx return rc; } -int libxl_set_vcpuonline(libxl_ctx *ctx, uint32_t domid, libxl_cpumap *cpumap) +int libxl_set_vcpuonline(libxl_ctx *ctx, uint32_t domid, libxl_bitmap *cpumap) { GC_INIT(ctx); libxl_dominfo info; @@ -3498,7 +3498,7 @@ retry_transaction: for (i = 0; i <= info.vcpu_max_id; i++) libxl__xs_write(gc, t, libxl__sprintf(gc, "%s/cpu/%u/availability", dompath, i), - "%s", libxl_cpumap_test(cpumap, i) ? "online" : "offline"); + "%s", libxl_bitmap_test(cpumap, i) ? "online" : "offline"); if (!xs_transaction_end(ctx->xsh, t, 0)) { if (errno == EAGAIN) goto retry_transaction; @@ -4094,7 +4094,7 @@ int libxl_tmem_freeable(libxl_ctx *ctx) return rc; } -int libxl_get_freecpus(libxl_ctx *ctx, libxl_cpumap *cpumap) +int libxl_get_freecpus(libxl_ctx *ctx, libxl_bitmap *cpumap) { int ncpus; @@ -4113,7 +4113,7 @@ int libxl_get_freecpus(libxl_ctx *ctx, l int libxl_cpupool_create(libxl_ctx *ctx, const char *name, libxl_scheduler sched, - libxl_cpumap cpumap, libxl_uuid *uuid, + libxl_bitmap cpumap, libxl_uuid *uuid, uint32_t *poolid) { GC_INIT(ctx); @@ -4136,8 +4136,8 @@ int libxl_cpupool_create(libxl_ctx *ctx, return ERROR_FAIL; } - libxl_for_each_cpu(i, cpumap) - if (libxl_cpumap_test(&cpumap, i)) { + libxl_for_each_bit(i, cpumap) + if (libxl_bitmap_test(&cpumap, i)) { rc = xc_cpupool_addcpu(ctx->xch, *poolid, i); if (rc) { LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, rc, @@ -4172,7 +4172,7 @@ int libxl_cpupool_destroy(libxl_ctx *ctx int rc, i; xc_cpupoolinfo_t *info; xs_transaction_t t; - libxl_cpumap cpumap; + libxl_bitmap cpumap; info = xc_cpupool_getinfo(ctx->xch, poolid); if (info == NULL) { @@ -4184,13 +4184,13 @@ int libxl_cpupool_destroy(libxl_ctx *ctx if ((info->cpupool_id != poolid) || (info->n_dom)) goto out; - rc = libxl_cpumap_alloc(ctx, &cpumap, 0); + rc = libxl_cpu_bitmap_alloc(ctx, &cpumap, 0); if (rc) goto out; memcpy(cpumap.map, info->cpumap, cpumap.size); - libxl_for_each_cpu(i, cpumap) - if (libxl_cpumap_test(&cpumap, i)) { + libxl_for_each_bit(i, cpumap) + if (libxl_bitmap_test(&cpumap, i)) { rc = xc_cpupool_removecpu(ctx->xch, poolid, i); if (rc) { LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, rc, @@ -4219,7 +4219,7 @@ int libxl_cpupool_destroy(libxl_ctx *ctx rc = 0; out1: - libxl_cpumap_dispose(&cpumap); + libxl_bitmap_dispose(&cpumap); out: xc_cpupool_infofree(ctx->xch, info); GC_FREE; @@ -4287,7 +4287,7 @@ int libxl_cpupool_cpuadd_node(libxl_ctx { int rc = 0; int cpu, nr; - libxl_cpumap freemap; + libxl_bitmap freemap; libxl_cputopology *topology; if (libxl_get_freecpus(ctx, &freemap)) { @@ -4302,7 +4302,7 @@ int libxl_cpupool_cpuadd_node(libxl_ctx *cpus = 0; for (cpu = 0; cpu < nr; cpu++) { - if (libxl_cpumap_test(&freemap, cpu) && (topology[cpu].node == node) && + if (libxl_bitmap_test(&freemap, cpu) && (topology[cpu].node == node) && !libxl_cpupool_cpuadd(ctx, poolid, cpu)) { (*cpus)++; } @@ -4311,7 +4311,7 @@ int libxl_cpupool_cpuadd_node(libxl_ctx free(topology); out: - libxl_cpumap_dispose(&freemap); + libxl_bitmap_dispose(&freemap); return rc; } @@ -4353,7 +4353,7 @@ int libxl_cpupool_cpuremove_node(libxl_c if (poolinfo[p].poolid == poolid) { for (cpu = 0; cpu < nr_cpus; cpu++) { if ((topology[cpu].node == node) && - libxl_cpumap_test(&poolinfo[p].cpumap, cpu) && + libxl_bitmap_test(&poolinfo[p].cpumap, cpu) && !libxl_cpupool_cpuremove(ctx, poolid, cpu)) { (*cpus)++; } diff -r fd2b80a82cb0 -r 86c5dcbd03e6 tools/libxl/libxl.h --- a/tools/libxl/libxl.h Fri Jul 06 13:17:42 2012 +0100 +++ b/tools/libxl/libxl.h Fri Jul 06 13:17:42 2012 +0100 @@ -285,8 +285,9 @@ typedef uint64_t libxl_ev_user; typedef struct { uint32_t size; /* number of bytes in map */ uint8_t *map; -} libxl_cpumap; -void libxl_cpumap_dispose(libxl_cpumap *map); +} libxl_bitmap; +void libxl_bitmap_init(libxl_bitmap *map); +void libxl_bitmap_dispose(libxl_bitmap *map); /* libxl_cpuid_policy_list is a dynamic array storing CPUID policies * for multiple leafs. It is terminated with an entry holding @@ -790,10 +791,10 @@ int libxl_userdata_retrieve(libxl_ctx *c int libxl_get_physinfo(libxl_ctx *ctx, libxl_physinfo *physinfo); int libxl_set_vcpuaffinity(libxl_ctx *ctx, uint32_t domid, uint32_t vcpuid, - libxl_cpumap *cpumap); + libxl_bitmap *cpumap); int libxl_set_vcpuaffinity_all(libxl_ctx *ctx, uint32_t domid, - unsigned int max_vcpus, libxl_cpumap *cpumap); -int libxl_set_vcpuonline(libxl_ctx *ctx, uint32_t domid, libxl_cpumap *cpumap); + unsigned int max_vcpus, libxl_bitmap *cpumap); +int libxl_set_vcpuonline(libxl_ctx *ctx, uint32_t domid, libxl_bitmap *cpumap); libxl_scheduler libxl_get_scheduler(libxl_ctx *ctx); @@ -843,10 +844,10 @@ int libxl_tmem_shared_auth(libxl_ctx *ct int auth); int libxl_tmem_freeable(libxl_ctx *ctx); -int libxl_get_freecpus(libxl_ctx *ctx, libxl_cpumap *cpumap); +int libxl_get_freecpus(libxl_ctx *ctx, libxl_bitmap *cpumap); int libxl_cpupool_create(libxl_ctx *ctx, const char *name, libxl_scheduler sched, - libxl_cpumap cpumap, libxl_uuid *uuid, + libxl_bitmap cpumap, libxl_uuid *uuid, uint32_t *poolid); int libxl_cpupool_destroy(libxl_ctx *ctx, uint32_t poolid); int libxl_cpupool_rename(libxl_ctx *ctx, const char *name, uint32_t poolid); diff -r fd2b80a82cb0 -r 86c5dcbd03e6 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Fri Jul 06 13:17:42 2012 +0100 +++ b/tools/libxl/libxl_create.c Fri Jul 06 13:17:42 2012 +0100 @@ -203,16 +203,16 @@ int libxl__domain_build_info_setdefault( if (!b_info->max_vcpus) b_info->max_vcpus = 1; if (!b_info->avail_vcpus.size) { - if (libxl_cpumap_alloc(CTX, &b_info->avail_vcpus, 1)) + if (libxl_cpu_bitmap_alloc(CTX, &b_info->avail_vcpus, 1)) return ERROR_FAIL; - libxl_cpumap_set(&b_info->avail_vcpus, 0); + libxl_bitmap_set(&b_info->avail_vcpus, 0); } else if (b_info->avail_vcpus.size > HVM_MAX_VCPUS) return ERROR_FAIL; if (!b_info->cpumap.size) { - if (libxl_cpumap_alloc(CTX, &b_info->cpumap, 0)) + if (libxl_cpu_bitmap_alloc(CTX, &b_info->cpumap, 0)) return ERROR_FAIL; - libxl_cpumap_set_any(&b_info->cpumap); + libxl_bitmap_set_any(&b_info->cpumap); } if (b_info->max_memkb == LIBXL_MEMKB_DEFAULT) diff -r fd2b80a82cb0 -r 86c5dcbd03e6 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Fri Jul 06 13:17:42 2012 +0100 +++ b/tools/libxl/libxl_dm.c Fri Jul 06 13:17:42 2012 +0100 @@ -208,8 +208,8 @@ static char ** libxl__build_device_model NULL); } - nr_set_cpus = libxl_cpumap_count_set(&b_info->avail_vcpus); - s = libxl_cpumap_to_hex_string(CTX, &b_info->avail_vcpus); + nr_set_cpus = libxl_bitmap_count_set(&b_info->avail_vcpus); + s = libxl_bitmap_to_hex_string(CTX, &b_info->avail_vcpus); flexarray_vappend(dm_args, "-vcpu_avail", libxl__sprintf(gc, "%s", s), NULL); free(s); @@ -459,7 +459,7 @@ static char ** libxl__build_device_model flexarray_append(dm_args, "-smp"); if (b_info->avail_vcpus.size) { int nr_set_cpus = 0; - nr_set_cpus = libxl_cpumap_count_set(&b_info->avail_vcpus); + nr_set_cpus = libxl_bitmap_count_set(&b_info->avail_vcpus); flexarray_append(dm_args, libxl__sprintf(gc, "%d,maxcpus=%d", b_info->max_vcpus, diff -r fd2b80a82cb0 -r 86c5dcbd03e6 tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Fri Jul 06 13:17:42 2012 +0100 +++ b/tools/libxl/libxl_dom.c Fri Jul 06 13:17:42 2012 +0100 @@ -202,7 +202,7 @@ int libxl__build_post(libxl__gc *gc, uin ents[11] = libxl__sprintf(gc, "%lu", state->store_mfn); for (i = 0; i < info->max_vcpus; i++) { ents[12+(i*2)] = libxl__sprintf(gc, "cpu/%d/availability", i); - ents[12+(i*2)+1] = libxl_cpumap_test(&info->avail_vcpus, i) + ents[12+(i*2)+1] = libxl_bitmap_test(&info->avail_vcpus, i) ? "online" : "offline"; } diff -r fd2b80a82cb0 -r 86c5dcbd03e6 tools/libxl/libxl_json.c --- a/tools/libxl/libxl_json.c Fri Jul 06 13:17:42 2012 +0100 +++ b/tools/libxl/libxl_json.c Fri Jul 06 13:17:42 2012 +0100 @@ -99,8 +99,8 @@ yajl_gen_status libxl_uuid_gen_json(yajl return yajl_gen_string(hand, (const unsigned char *)buf, LIBXL_UUID_FMTLEN); } -yajl_gen_status libxl_cpumap_gen_json(yajl_gen hand, - libxl_cpumap *cpumap) +yajl_gen_status libxl_bitmap_gen_json(yajl_gen hand, + libxl_bitmap *bitmap) { yajl_gen_status s; int i; @@ -108,8 +108,8 @@ yajl_gen_status libxl_cpumap_gen_json(ya s = yajl_gen_array_open(hand); if (s != yajl_gen_status_ok) goto out; - libxl_for_each_cpu(i, *cpumap) { - if (libxl_cpumap_test(cpumap, i)) { + libxl_for_each_bit(i, *bitmap) { + if (libxl_bitmap_test(bitmap, i)) { s = yajl_gen_integer(hand, i); if (s != yajl_gen_status_ok) goto out; } diff -r fd2b80a82cb0 -r 86c5dcbd03e6 tools/libxl/libxl_json.h --- a/tools/libxl/libxl_json.h Fri Jul 06 13:17:42 2012 +0100 +++ b/tools/libxl/libxl_json.h Fri Jul 06 13:17:42 2012 +0100 @@ -26,7 +26,7 @@ yajl_gen_status libxl_defbool_gen_json(y yajl_gen_status libxl_domid_gen_json(yajl_gen hand, libxl_domid *p); yajl_gen_status libxl_uuid_gen_json(yajl_gen hand, libxl_uuid *p); yajl_gen_status libxl_mac_gen_json(yajl_gen hand, libxl_mac *p); -yajl_gen_status libxl_cpumap_gen_json(yajl_gen hand, libxl_cpumap *p); +yajl_gen_status libxl_bitmap_gen_json(yajl_gen hand, libxl_bitmap *p); yajl_gen_status libxl_cpuid_policy_list_gen_json(yajl_gen hand, libxl_cpuid_policy_list *p); yajl_gen_status libxl_string_list_gen_json(yajl_gen hand, libxl_string_list *p); diff -r fd2b80a82cb0 -r 86c5dcbd03e6 tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Fri Jul 06 13:17:42 2012 +0100 +++ b/tools/libxl/libxl_types.idl Fri Jul 06 13:17:42 2012 +0100 @@ -10,7 +10,7 @@ libxl_defbool = Builtin("defbool", passb libxl_domid = Builtin("domid", json_fn = "yajl_gen_integer", autogenerate_json = False) libxl_uuid = Builtin("uuid", passby=PASS_BY_REFERENCE) libxl_mac = Builtin("mac", passby=PASS_BY_REFERENCE) -libxl_cpumap = Builtin("cpumap", dispose_fn="libxl_cpumap_dispose", passby=PASS_BY_REFERENCE) +libxl_bitmap = Builtin("bitmap", dispose_fn="libxl_bitmap_dispose", passby=PASS_BY_REFERENCE) libxl_cpuid_policy_list = Builtin("cpuid_policy_list", dispose_fn="libxl_cpuid_dispose", passby=PASS_BY_REFERENCE) libxl_string_list = Builtin("string_list", dispose_fn="libxl_string_list_dispose", passby=PASS_BY_REFERENCE) @@ -198,7 +198,7 @@ libxl_cpupoolinfo = Struct("cpupoolinfo" ("poolid", uint32), ("sched", libxl_scheduler), ("n_dom", uint32), - ("cpumap", libxl_cpumap) + ("cpumap", libxl_bitmap) ], dir=DIR_OUT) libxl_vminfo = Struct("vminfo", [ @@ -247,8 +247,8 @@ libxl_domain_sched_params = Struct("doma libxl_domain_build_info = Struct("domain_build_info",[ ("max_vcpus", integer), - ("avail_vcpus", libxl_cpumap), - ("cpumap", libxl_cpumap), + ("avail_vcpus", libxl_bitmap), + ("cpumap", libxl_bitmap), ("tsc_mode", libxl_tsc_mode), ("max_memkb", MemKB), ("target_memkb", MemKB), @@ -409,7 +409,7 @@ libxl_vcpuinfo = Struct("vcpuinfo", [ ("blocked", bool), ("running", bool), ("vcpu_time", uint64), # total vcpu time ran (ns) - ("cpumap", libxl_cpumap), # current cpu's affinities + ("cpumap", libxl_bitmap), # current cpu's affinities ], dir=DIR_OUT) libxl_physinfo = Struct("physinfo", [ diff -r fd2b80a82cb0 -r 86c5dcbd03e6 tools/libxl/libxl_utils.c --- a/tools/libxl/libxl_utils.c Fri Jul 06 13:17:42 2012 +0100 +++ b/tools/libxl/libxl_utils.c Fri Jul 06 13:17:42 2012 +0100 @@ -487,79 +487,70 @@ int libxl_mac_to_device_nic(libxl_ctx *c return rc; } -int libxl_cpumap_alloc(libxl_ctx *ctx, libxl_cpumap *cpumap, int max_cpus) +int libxl_bitmap_alloc(libxl_ctx *ctx, libxl_bitmap *bitmap, int n_bits) { GC_INIT(ctx); int sz; - int rc; - if (max_cpus < 0) { - rc = ERROR_INVAL; - goto out; - } - if (max_cpus == 0) - max_cpus = libxl_get_max_cpus(ctx); - if (max_cpus == 0) { - rc = ERROR_FAIL; - goto out; - } + sz = (n_bits + 7) / 8; + bitmap->map = libxl__calloc(NOGC, sizeof(*bitmap->map), sz); + bitmap->size = sz; - sz = (max_cpus + 7) / 8; - cpumap->map = libxl__calloc(NOGC, sizeof(*cpumap->map), sz); - cpumap->size = sz; - - rc = 0; - out: GC_FREE; - return rc; + return 0; } -void libxl_cpumap_dispose(libxl_cpumap *map) +void libxl_bitmap_init(libxl_bitmap *map) +{ + memset(map, '\0', sizeof(*map)); +} + +void libxl_bitmap_dispose(libxl_bitmap *map) { free(map->map); } -int libxl_cpumap_test(const libxl_cpumap *cpumap, int cpu) +int libxl_bitmap_test(const libxl_bitmap *bitmap, int bit) { - if (cpu >= cpumap->size * 8) + if (bit >= bitmap->size * 8) return 0; - return (cpumap->map[cpu / 8] & (1 << (cpu & 7))) ? 1 : 0; + return (bitmap->map[bit / 8] & (1 << (bit & 7))) ? 1 : 0; } -void libxl_cpumap_set(libxl_cpumap *cpumap, int cpu) +void libxl_bitmap_set(libxl_bitmap *bitmap, int bit) { - if (cpu >= cpumap->size * 8) + if (bit >= bitmap->size * 8) return; - cpumap->map[cpu / 8] |= 1 << (cpu & 7); + bitmap->map[bit / 8] |= 1 << (bit & 7); } -void libxl_cpumap_reset(libxl_cpumap *cpumap, int cpu) +void libxl_bitmap_reset(libxl_bitmap *bitmap, int bit) { - if (cpu >= cpumap->size * 8) + if (bit >= bitmap->size * 8) return; - cpumap->map[cpu / 8] &= ~(1 << (cpu & 7)); + bitmap->map[bit / 8] &= ~(1 << (bit & 7)); } -int libxl_cpumap_count_set(const libxl_cpumap *cpumap) +int libxl_bitmap_count_set(const libxl_bitmap *bitmap) { - int i, nr_set_cpus = 0; - libxl_for_each_set_cpu(i, *cpumap) - nr_set_cpus++; + int i, nr_set_bits = 0; + libxl_for_each_set_bit(i, *bitmap) + nr_set_bits++; - return nr_set_cpus; + return nr_set_bits; } /* NB. caller is responsible for freeing the memory */ -char *libxl_cpumap_to_hex_string(libxl_ctx *ctx, const libxl_cpumap *cpumap) +char *libxl_bitmap_to_hex_string(libxl_ctx *ctx, const libxl_bitmap *bitmap) { GC_INIT(ctx); - int i = cpumap->size; - char *p = libxl__zalloc(NOGC, cpumap->size * 2 + 3); + int i = bitmap->size; + char *p = libxl__zalloc(NOGC, bitmap->size * 2 + 3); char *q = p; strncpy(p, "0x", 2); p += 2; while(--i >= 0) { - sprintf(p, "%02x", cpumap->map[i]); + sprintf(p, "%02x", bitmap->map[i]); p += 2; } *p = '\0'; diff -r fd2b80a82cb0 -r 86c5dcbd03e6 tools/libxl/libxl_utils.h --- a/tools/libxl/libxl_utils.h Fri Jul 06 13:17:42 2012 +0100 +++ b/tools/libxl/libxl_utils.h Fri Jul 06 13:17:42 2012 +0100 @@ -63,29 +63,44 @@ int libxl_devid_to_device_nic(libxl_ctx int libxl_vdev_to_device_disk(libxl_ctx *ctx, uint32_t domid, const char *vdev, libxl_device_disk *disk); -int libxl_cpumap_alloc(libxl_ctx *ctx, libxl_cpumap *cpumap, int max_cpus); -int libxl_cpumap_test(const libxl_cpumap *cpumap, int cpu); -void libxl_cpumap_set(libxl_cpumap *cpumap, int cpu); -void libxl_cpumap_reset(libxl_cpumap *cpumap, int cpu); -int libxl_cpumap_count_set(const libxl_cpumap *cpumap); -char *libxl_cpumap_to_hex_string(libxl_ctx *ctx, const libxl_cpumap *cpumap); -static inline void libxl_cpumap_set_any(libxl_cpumap *cpumap) +int libxl_bitmap_alloc(libxl_ctx *ctx, libxl_bitmap *bitmap, int n_bits); + /* Allocated bimap is from malloc, libxl_bitmap_dispose() to be + * called by the application when done. */ +int libxl_bitmap_test(const libxl_bitmap *bitmap, int bit); +void libxl_bitmap_set(libxl_bitmap *bitmap, int bit); +void libxl_bitmap_reset(libxl_bitmap *bitmap, int bit); +int libxl_bitmap_count_set(const libxl_bitmap *cpumap); +char *libxl_bitmap_to_hex_string(libxl_ctx *ctx, const libxl_bitmap *cpumap); +static inline void libxl_bitmap_set_any(libxl_bitmap *bitmap) { - memset(cpumap->map, -1, cpumap->size); + memset(bitmap->map, -1, bitmap->size); } -static inline void libxl_cpumap_set_none(libxl_cpumap *cpumap) +static inline void libxl_bitmap_set_none(libxl_bitmap *bitmap) { - memset(cpumap->map, 0, cpumap->size); + memset(bitmap->map, 0, bitmap->size); } -static inline int libxl_cpumap_cpu_valid(libxl_cpumap *cpumap, int cpu) +static inline int libxl_bitmap_cpu_valid(libxl_bitmap *bitmap, int bit) { - return cpu >= 0 && cpu < (cpumap->size * 8); + return bit >= 0 && bit < (bitmap->size * 8); } -#define libxl_for_each_cpu(var, map) for (var = 0; var < (map).size * 8; var++) -#define libxl_for_each_set_cpu(v, m) for (v = 0; v < (m).size * 8; v++) \ - if (libxl_cpumap_test(&(m), v)) +#define libxl_for_each_bit(var, map) for (var = 0; var < (map).size * 8; var++) +#define libxl_for_each_set_bit(v, m) for (v = 0; v < (m).size * 8; v++) \ + if (libxl_bitmap_test(&(m), v)) -static inline uint32_t libxl__sizekb_to_mb(uint32_t s) { +static inline int libxl_cpu_bitmap_alloc(libxl_ctx *ctx, libxl_bitmap *cpumap, + int max_cpus) +{ + if (max_cpus < 0) + return ERROR_INVAL; + if (max_cpus == 0) + max_cpus = libxl_get_max_cpus(ctx); + if (max_cpus == 0) + return ERROR_FAIL; + + return libxl_bitmap_alloc(ctx, cpumap, max_cpus); +} + + static inline uint32_t libxl__sizekb_to_mb(uint32_t s) { return (s + 1023) / 1024; } diff -r fd2b80a82cb0 -r 86c5dcbd03e6 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Fri Jul 06 13:17:42 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Fri Jul 06 13:17:42 2012 +0100 @@ -492,19 +492,19 @@ static void split_string_into_string_lis free(s); } -static int vcpupin_parse(char *cpu, libxl_cpumap *cpumap) -{ - libxl_cpumap exclude_cpumap; +static int vcpupin_parse(char *cpu, libxl_bitmap *cpumap) +{ + libxl_bitmap exclude_cpumap; uint32_t cpuida, cpuidb; char *endptr, *toka, *tokb, *saveptr = NULL; int i, rc = 0, rmcpu; if (!strcmp(cpu, "all")) { - libxl_cpumap_set_any(cpumap); + libxl_bitmap_set_any(cpumap); return 0; } - if (libxl_cpumap_alloc(ctx, &exclude_cpumap, 0)) { + if (libxl_cpu_bitmap_alloc(ctx, &exclude_cpumap, 0)) { fprintf(stderr, "Error: Failed to allocate cpumap.\n"); return ENOMEM; } @@ -534,19 +534,19 @@ static int vcpupin_parse(char *cpu, libx } } while (cpuida <= cpuidb) { - rmcpu == 0 ? libxl_cpumap_set(cpumap, cpuida) : - libxl_cpumap_set(&exclude_cpumap, cpuida); + rmcpu == 0 ? libxl_bitmap_set(cpumap, cpuida) : + libxl_bitmap_set(&exclude_cpumap, cpuida); cpuida++; } } /* Clear all the cpus from the removal list */ - libxl_for_each_set_cpu(i, exclude_cpumap) { - libxl_cpumap_reset(cpumap, i); + libxl_for_each_set_bit(i, exclude_cpumap) { + libxl_bitmap_reset(cpumap, i); } vcpp_out: - libxl_cpumap_dispose(&exclude_cpumap); + libxl_bitmap_dispose(&exclude_cpumap); return rc; } @@ -649,13 +649,13 @@ static void parse_config_data(const char if (!xlu_cfg_get_long (config, "vcpus", &l, 0)) { b_info->max_vcpus = l; - if (libxl_cpumap_alloc(ctx, &b_info->avail_vcpus, l)) { + if (libxl_cpu_bitmap_alloc(ctx, &b_info->avail_vcpus, l)) { fprintf(stderr, "Unable to allocate cpumap\n"); exit(1); } - libxl_cpumap_set_none(&b_info->avail_vcpus); + libxl_bitmap_set_none(&b_info->avail_vcpus); while (l-- > 0) - libxl_cpumap_set((&b_info->avail_vcpus), l); + libxl_bitmap_set((&b_info->avail_vcpus), l); } if (!xlu_cfg_get_long (config, "maxvcpus", &l, 0)) @@ -664,7 +664,7 @@ static void parse_config_data(const char if (!xlu_cfg_get_list (config, "cpus", &cpus, 0, 1)) { int i, n_cpus = 0; - if (libxl_cpumap_alloc(ctx, &b_info->cpumap, 0)) { + if (libxl_cpu_bitmap_alloc(ctx, &b_info->cpumap, 0)) { fprintf(stderr, "Unable to allocate cpumap\n"); exit(1); } @@ -684,14 +684,14 @@ static void parse_config_data(const char * the cpumap derived from the list ensures memory is being * allocated on the proper nodes anyway. */ - libxl_cpumap_set_none(&b_info->cpumap); + libxl_bitmap_set_none(&b_info->cpumap); while ((buf = xlu_cfg_get_listitem(cpus, n_cpus)) != NULL) { i = atoi(buf); - if (!libxl_cpumap_cpu_valid(&b_info->cpumap, i)) { + if (!libxl_bitmap_cpu_valid(&b_info->cpumap, i)) { fprintf(stderr, "cpu %d illegal\n", i); exit(1); } - libxl_cpumap_set(&b_info->cpumap, i); + libxl_bitmap_set(&b_info->cpumap, i); if (n_cpus < b_info->max_vcpus) vcpu_to_pcpu[n_cpus] = i; n_cpus++; @@ -700,12 +700,12 @@ static void parse_config_data(const char else if (!xlu_cfg_get_string (config, "cpus", &buf, 0)) { char *buf2 = strdup(buf); - if (libxl_cpumap_alloc(ctx, &b_info->cpumap, 0)) { + if (libxl_cpu_bitmap_alloc(ctx, &b_info->cpumap, 0)) { fprintf(stderr, "Unable to allocate cpumap\n"); exit(1); } - libxl_cpumap_set_none(&b_info->cpumap); + libxl_bitmap_set_none(&b_info->cpumap); if (vcpupin_parse(buf2, &b_info->cpumap)) exit(1); free(buf2); @@ -1805,28 +1805,28 @@ start: /* If single vcpu to pcpu mapping was requested, honour it */ if (vcpu_to_pcpu) { - libxl_cpumap vcpu_cpumap; - - ret = libxl_cpumap_alloc(ctx, &vcpu_cpumap, 0); + libxl_bitmap vcpu_cpumap; + + ret = libxl_cpu_bitmap_alloc(ctx, &vcpu_cpumap, 0); if (ret) goto error_out; for (i = 0; i < d_config.b_info.max_vcpus; i++) { if (vcpu_to_pcpu[i] != -1) { - libxl_cpumap_set_none(&vcpu_cpumap); - libxl_cpumap_set(&vcpu_cpumap, vcpu_to_pcpu[i]); + libxl_bitmap_set_none(&vcpu_cpumap); + libxl_bitmap_set(&vcpu_cpumap, vcpu_to_pcpu[i]); } else { - libxl_cpumap_set_any(&vcpu_cpumap); + libxl_bitmap_set_any(&vcpu_cpumap); } if (libxl_set_vcpuaffinity(ctx, domid, i, &vcpu_cpumap)) { fprintf(stderr, "setting affinity failed on vcpu `%d'.\n", i); - libxl_cpumap_dispose(&vcpu_cpumap); + libxl_bitmap_dispose(&vcpu_cpumap); free(vcpu_to_pcpu); ret = ERROR_FAIL; goto error_out; } } - libxl_cpumap_dispose(&vcpu_cpumap); + libxl_bitmap_dispose(&vcpu_cpumap); free(vcpu_to_pcpu); vcpu_to_pcpu = NULL; } @@ -4063,7 +4063,7 @@ int main_vcpulist(int argc, char **argv) static void vcpupin(const char *d, const char *vcpu, char *cpu) { libxl_vcpuinfo *vcpuinfo; - libxl_cpumap cpumap; + libxl_bitmap cpumap; uint32_t vcpuid; char *endptr; @@ -4080,7 +4080,7 @@ static void vcpupin(const char *d, const find_domain(d); - if (libxl_cpumap_alloc(ctx, &cpumap, 0)) { + if (libxl_cpu_bitmap_alloc(ctx, &cpumap, 0)) { goto vcpupin_out; } @@ -4107,7 +4107,7 @@ static void vcpupin(const char *d, const libxl_vcpuinfo_list_free(vcpuinfo, nb_vcpu); } vcpupin_out1: - libxl_cpumap_dispose(&cpumap); + libxl_bitmap_dispose(&cpumap); vcpupin_out: ; } @@ -4127,7 +4127,7 @@ static void vcpuset(const char *d, const { char *endptr; unsigned int max_vcpus, i; - libxl_cpumap cpumap; + libxl_bitmap cpumap; max_vcpus = strtoul(nr_vcpus, &endptr, 10); if (nr_vcpus == endptr) { @@ -4137,17 +4137,17 @@ static void vcpuset(const char *d, const find_domain(d); - if (libxl_cpumap_alloc(ctx, &cpumap, 0)) { - fprintf(stderr, "libxl_cpumap_alloc failed\n"); + if (libxl_cpu_bitmap_alloc(ctx, &cpumap, 0)) { + fprintf(stderr, "libxl_cpu_bitmap_alloc failed\n"); return; } for (i = 0; i < max_vcpus; i++) - libxl_cpumap_set(&cpumap, i); + libxl_bitmap_set(&cpumap, i); if (libxl_set_vcpuonline(ctx, domid, &cpumap) < 0) fprintf(stderr, "libxl_set_vcpuonline failed domid=%d max_vcpus=%d\n", domid, max_vcpus); - libxl_cpumap_dispose(&cpumap); + libxl_bitmap_dispose(&cpumap); } int main_vcpuset(int argc, char **argv) @@ -4211,7 +4211,7 @@ static void output_physinfo(void) libxl_physinfo info; const libxl_version_info *vinfo; unsigned int i; - libxl_cpumap cpumap; + libxl_bitmap cpumap; int n = 0; if (libxl_get_physinfo(ctx, &info) != 0) { @@ -4243,8 +4243,8 @@ static void output_physinfo(void) printf("sharing_used_memory : %"PRIu64"\n", info.sharing_used_frames / i); } if (!libxl_get_freecpus(ctx, &cpumap)) { - libxl_for_each_cpu(i, cpumap) - if (libxl_cpumap_test(&cpumap, i)) + libxl_for_each_bit(i, cpumap) + if (libxl_bitmap_test(&cpumap, i)) n++; printf("free_cpus : %d\n", n); free(cpumap.map); @@ -5866,8 +5866,8 @@ int main_cpupoolcreate(int argc, char ** XLU_ConfigList *cpus; XLU_ConfigList *nodes; int n_cpus, n_nodes, i, n; - libxl_cpumap freemap; - libxl_cpumap cpumap; + libxl_bitmap freemap; + libxl_bitmap cpumap; libxl_uuid uuid; libxl_cputopology *topology; int rc = -ERROR_FAIL; @@ -5980,7 +5980,7 @@ int main_cpupoolcreate(int argc, char ** fprintf(stderr, "libxl_get_freecpus failed\n"); goto out_cfg; } - if (libxl_cpumap_alloc(ctx, &cpumap, 0)) { + if (libxl_cpu_bitmap_alloc(ctx, &cpumap, 0)) { fprintf(stderr, "Failed to allocate cpumap\n"); goto out_cfg; } @@ -5997,8 +5997,8 @@ int main_cpupoolcreate(int argc, char ** n = atoi(buf); for (i = 0; i < nr; i++) { if ((topology[i].node == n) && - libxl_cpumap_test(&freemap, i)) { - libxl_cpumap_set(&cpumap, i); + libxl_bitmap_test(&freemap, i)) { + libxl_bitmap_set(&cpumap, i); n_cpus++; } } @@ -6016,11 +6016,11 @@ int main_cpupoolcreate(int argc, char ** while ((buf = xlu_cfg_get_listitem(cpus, n_cpus)) != NULL) { i = atoi(buf); if ((i < 0) || (i >= freemap.size * 8) || - !libxl_cpumap_test(&freemap, i)) { + !libxl_bitmap_test(&freemap, i)) { fprintf(stderr, "cpu %d illegal or not free\n", i); goto out_cfg; } - libxl_cpumap_set(&cpumap, i); + libxl_bitmap_set(&cpumap, i); n_cpus++; } } else @@ -6118,8 +6118,8 @@ int main_cpupoollist(int argc, char **ar printf("%-19s", name); free(name); n = 0; - libxl_for_each_cpu(c, poolinfo[p].cpumap) - if (libxl_cpumap_test(&poolinfo[p].cpumap, c)) { + libxl_for_each_bit(c, poolinfo[p].cpumap) + if (libxl_bitmap_test(&poolinfo[p].cpumap, c)) { if (n && opt_cpus) printf(","); if (opt_cpus) printf("%d", c); n++; @@ -6318,7 +6318,7 @@ int main_cpupoolnumasplit(int argc, char int n_cpus; char name[16]; libxl_uuid uuid; - libxl_cpumap cpumap; + libxl_bitmap cpumap; libxl_cpupoolinfo *poolinfo; libxl_cputopology *topology; libxl_dominfo info; @@ -6348,7 +6348,7 @@ int main_cpupoolnumasplit(int argc, char return -ERROR_FAIL; } - if (libxl_cpumap_alloc(ctx, &cpumap, 0)) { + if (libxl_cpu_bitmap_alloc(ctx, &cpumap, 0)) { fprintf(stderr, "Failed to allocate cpumap\n"); libxl_cputopology_list_free(topology, n_cpus); return -ERROR_FAIL; @@ -6374,7 +6374,7 @@ int main_cpupoolnumasplit(int argc, char for (c = 0; c < n_cpus; c++) { if (topology[c].node == node) { topology[c].node = LIBXL_CPUTOPOLOGY_INVALID_ENTRY; - libxl_cpumap_set(&cpumap, n); + libxl_bitmap_set(&cpumap, n); n++; } } @@ -6396,7 +6396,7 @@ int main_cpupoolnumasplit(int argc, char fprintf(stderr, "failed to offline vcpus\n"); goto out; } - libxl_cpumap_set_none(&cpumap); + libxl_bitmap_set_none(&cpumap); for (c = 0; c < n_cpus; c++) { if (topology[c].node == LIBXL_CPUTOPOLOGY_INVALID_ENTRY) { @@ -6434,7 +6434,7 @@ int main_cpupoolnumasplit(int argc, char out: libxl_cputopology_list_free(topology, n_cpus); - libxl_cpumap_dispose(&cpumap); + libxl_bitmap_dispose(&cpumap); return ret; } diff -r fd2b80a82cb0 -r 86c5dcbd03e6 tools/python/xen/lowlevel/xl/xl.c --- a/tools/python/xen/lowlevel/xl/xl.c Fri Jul 06 13:17:42 2012 +0100 +++ b/tools/python/xen/lowlevel/xl/xl.c Fri Jul 06 13:17:42 2012 +0100 @@ -231,14 +231,14 @@ int attrib__libxl_cpuid_policy_list_set( return -1; } -int attrib__libxl_cpumap_set(PyObject *v, libxl_cpumap *pptr) +int attrib__libxl_bitmap_set(PyObject *v, libxl_bitmap *pptr) { int i; long cpu; for (i = 0; i < PyList_Size(v); i++) { cpu = PyInt_AsLong(PyList_GetItem(v, i)); - libxl_cpumap_set(pptr, cpu); + libxl_bitmap_set(pptr, cpu); } return 0; } @@ -293,14 +293,14 @@ PyObject *attrib__libxl_cpuid_policy_lis return NULL; } -PyObject *attrib__libxl_cpumap_get(libxl_cpumap *pptr) +PyObject *attrib__libxl_bitmap_get(libxl_bitmap *pptr) { PyObject *cpulist = NULL; int i; cpulist = PyList_New(0); - libxl_for_each_cpu(i, *pptr) { - if ( libxl_cpumap_test(pptr, i) ) { + libxl_for_each_bit(i, *pptr) { + if ( libxl_bitmap_test(pptr, i) ) { PyObject* pyint = PyInt_FromLong(i); PyList_Append(cpulist, pyint); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jul 06 20:44:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Jul 2012 20:44: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 1SnFNu-00029f-IB; Fri, 06 Jul 2012 20:44:14 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SnFNs-00028v-T1 for xen-changelog@lists.xensource.com; Fri, 06 Jul 2012 20:44:13 +0000 Received: from [85.158.143.35:26102] by server-1.bemta-4.messagelabs.com id 1E/99-24392-B1E47FF4; Fri, 06 Jul 2012 20:44:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-21.messagelabs.com!1341607448!14150650!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 24447 invoked from network); 6 Jul 2012 20:44:09 -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; 6 Jul 2012 20:44:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SnFNn-00012I-VO for xen-changelog@lists.xensource.com; Fri, 06 Jul 2012 20:44:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SnFNn-0006cG-JZ for xen-changelog@lists.xensource.com; Fri, 06 Jul 2012 20:44:07 +0000 Message-Id: Date: Fri, 06 Jul 2012 20:44:07 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: add a new Array type to the IDL X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341577060 -3600 # Node ID e9aa6da372bd76774d0d63ad17c43df34673ce30 # Parent 497e2fe4945594cd2846f0302bef5e5dafa1c2c6 libxl: add a new Array type to the IDL And make all the required infrastructure updates to enable this. Since there are currently no uses of this type there is no change to the generated code. Signed-off-by: Ian Campbell Tested-by: Dario Faggioli Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r 497e2fe49455 -r e9aa6da372bd tools/libxl/gentest.py --- a/tools/libxl/gentest.py Thu Jul 05 12:40:25 2012 +0100 +++ b/tools/libxl/gentest.py Fri Jul 06 13:17:40 2012 +0100 @@ -27,6 +27,18 @@ def gen_rand_init(ty, v, indent = " " s = "" if isinstance(ty, idl.Enumeration): s += "%s = %s;\n" % (ty.pass_arg(v, parent is None), randomize_enum(ty)) + elif isinstance(ty, idl.Array): + if parent is None: + raise Exception("Array type must have a parent") + s += "%s = rand()%%8;\n" % (parent + ty.lenvar.name) + s += "%s = calloc(%s, sizeof(*%s));\n" % \ + (v, parent + ty.lenvar.name, v) + s += "{\n" + s += " int i;\n" + s += " for (i=0; i<%s; i++)\n" % (parent + ty.lenvar.name) + s += gen_rand_init(ty.elem_type, v+"[i]", + indent + " ", parent) + s += "}\n" elif isinstance(ty, idl.KeyedUnion): if parent is None: raise Exception("KeyedUnion type must have a parent") diff -r 497e2fe49455 -r e9aa6da372bd tools/libxl/gentypes.py --- a/tools/libxl/gentypes.py Thu Jul 05 12:40:25 2012 +0100 +++ b/tools/libxl/gentypes.py Fri Jul 06 13:17:40 2012 +0100 @@ -11,8 +11,12 @@ def libxl_C_instance_of(ty, instancename return libxl_C_type_define(ty) else: return libxl_C_type_define(ty) + " " + instancename - else: - return ty.typename + " " + instancename + + s = "" + if isinstance(ty, idl.Array): + s += libxl_C_instance_of(ty.lenvar.type, ty.lenvar.name) + ";\n" + + return s + ty.typename + " " + instancename def libxl_C_type_define(ty, indent = ""): s = "" @@ -66,6 +70,21 @@ def libxl_C_type_dispose(ty, v, indent = s += libxl_C_type_dispose(f.type, fexpr, indent + " ", nparent) s += " break;\n" s += "}\n" + elif isinstance(ty, idl.Array): + if parent is None: + raise Exception("Array type must have a parent") + if ty.elem_type.dispose_fn is not None: + s += "{\n" + s += " int i;\n" + s += " for (i=0; i<%s; i++)\n" % (parent + ty.lenvar.name) + s += libxl_C_type_dispose(ty.elem_type, v+"[i]", + indent + " ", parent) + if ty.dispose_fn is not None: + if ty.elem_type.dispose_fn is not None: + s += " " + s += "%s(%s);\n" % (ty.dispose_fn, ty.pass_arg(v, parent is None)) + if ty.elem_type.dispose_fn is not None: + s += "}\n" elif isinstance(ty, idl.Struct) and (parent is None or ty.dispose_fn is None): for f in [f for f in ty.fields if not f.const]: (nparent,fexpr) = ty.member(v, f, parent is None) @@ -164,7 +183,24 @@ def libxl_C_type_gen_json(ty, v, indent s = "" if parent is None: s += "yajl_gen_status s;\n" - if isinstance(ty, idl.Enumeration): + + if isinstance(ty, idl.Array): + if parent is None: + raise Exception("Array type must have a parent") + s += "{\n" + s += " int i;\n" + s += " s = yajl_gen_array_open(hand);\n" + s += " if (s != yajl_gen_status_ok)\n" + s += " goto out;\n" + s += " for (i=0; i<%s; i++) {\n" % (parent + ty.lenvar.name) + s += libxl_C_type_gen_json(ty.elem_type, v+"[i]", + indent + " ", parent) + s += " }\n" + s += " s = yajl_gen_array_close(hand);\n" + s += " if (s != yajl_gen_status_ok)\n" + s += " goto out;\n" + s += "}\n" + elif isinstance(ty, idl.Enumeration): s += "s = libxl__yajl_gen_enum(hand, %s_to_string(%s));\n" % (ty.typename, ty.pass_arg(v, parent is None)) s += "if (s != yajl_gen_status_ok)\n" s += " goto out;\n" diff -r 497e2fe49455 -r e9aa6da372bd tools/libxl/idl.py --- a/tools/libxl/idl.py Thu Jul 05 12:40:25 2012 +0100 +++ b/tools/libxl/idl.py Fri Jul 06 13:17:40 2012 +0100 @@ -266,6 +266,17 @@ string = Builtin("char *", namespace = N json_fn = "libxl__string_gen_json", autogenerate_json = False) +class Array(Type): + """An array of the same type""" + def __init__(self, elem_type, lenvar_name, **kwargs): + kwargs.setdefault('dispose_fn', 'free') + Type.__init__(self, namespace=elem_type.namespace, typename=elem_type.rawname + " *", **kwargs) + + lv_kwargs = dict([(x.lstrip('lenvar_'),y) for (x,y) in kwargs.items() if x.startswith('lenvar_')]) + + self.lenvar = Field(integer, lenvar_name, **lv_kwargs) + self.elem_type = elem_type + class OrderedDict(dict): """A dictionary which remembers insertion order. diff -r 497e2fe49455 -r e9aa6da372bd tools/libxl/idl.txt --- a/tools/libxl/idl.txt Thu Jul 05 12:40:25 2012 +0100 +++ b/tools/libxl/idl.txt Fri Jul 06 13:17:40 2012 +0100 @@ -145,11 +145,24 @@ idl.KeyedUnion A subclass of idl.Aggregate which represents the C union type where the currently valid member of the union can be determined based - upon another member in the containing type. + upon another member in the containing type. An idl.KeyedUnion must + always be a member of a containing idl.Aggregate type. - The KeyedUnion.keyvar contains an idl.type the member of the - containing type which determines the valid member of the union. The - must be an instance of the Enumeration type. + The KeyedUnion.keyvar contains an idl.Field, this is the member of + the containing type which determines the valid member of the + union. The idl.Field.type of the keyvar must be an Enumeration type. + +idl.Array + + A class representing an array of similar elements. An idl.Array must + always be an idl.Field of a containing idl.Aggregate. + + idl.Array.elem_type contains an idl.Type which is the type of each + element of the array. + + idl.Array.len_var contains an idl.Field which is added to the parent + idl.Aggregate and will contain the length of the array. The field + MUST be named num_ARRAYNAME. Standard Types -------------- diff -r 497e2fe49455 -r e9aa6da372bd tools/ocaml/libs/xl/genwrap.py --- a/tools/ocaml/libs/xl/genwrap.py Thu Jul 05 12:40:25 2012 +0100 +++ b/tools/ocaml/libs/xl/genwrap.py Fri Jul 06 13:17:40 2012 +0100 @@ -55,7 +55,8 @@ def ocaml_type_of(ty): return "int%d" % ty.width else: return "int" - + elif isinstance(ty,idl.Array): + return "%s array" % ocaml_type_of(ty.elem_type) elif isinstance(ty,idl.Builtin): if not builtins.has_key(ty.typename): raise NotImplementedError("Unknown Builtin %s (%s)" % (ty.typename, type(ty))) @@ -138,6 +139,8 @@ def c_val(ty, c, o, indent="", parent = if not fn: raise NotImplementedError("No c_val fn for Builtin %s (%s)" % (ty.typename, type(ty))) s += "%s;" % (fn % { "o": o, "c": c }) + elif isinstance (ty,idl.Array): + raise("Cannot handle Array type\n") elif isinstance(ty,idl.Enumeration) and (parent is None): n = 0 s += "switch(Int_val(%s)) {\n" % o @@ -195,6 +198,16 @@ def ocaml_Val(ty, o, c, indent="", paren if not fn: raise NotImplementedError("No ocaml Val fn for Builtin %s (%s)" % (ty.typename, type(ty))) s += "%s = %s;" % (o, fn % { "c": c }) + elif isinstance(ty, idl.Array): + s += "{\n" + s += "\t int i;\n" + s += "\t value array_elem;\n" + s += "\t %s = caml_alloc(%s,0);\n" % (o, parent + ty.lenvar.name) + s += "\t for(i=0; i<%s; i++) {\n" % (parent + ty.lenvar.name) + s += "\t %s\n" % ocaml_Val(ty.elem_type, "array_elem", c + "[i]", "") + s += "\t Store_field(%s, i, array_elem);\n" % o + s += "\t }\n" + s += "\t}" elif isinstance(ty,idl.Enumeration) and (parent is None): n = 0 s += "switch(%s) {\n" % c diff -r 497e2fe49455 -r e9aa6da372bd tools/python/genwrap.py --- a/tools/python/genwrap.py Thu Jul 05 12:40:25 2012 +0100 +++ b/tools/python/genwrap.py Fri Jul 06 13:17:40 2012 +0100 @@ -4,7 +4,7 @@ import sys,os import idl -(TYPE_DEFBOOL, TYPE_BOOL, TYPE_INT, TYPE_UINT, TYPE_STRING, TYPE_AGGREGATE) = range(6) +(TYPE_DEFBOOL, TYPE_BOOL, TYPE_INT, TYPE_UINT, TYPE_STRING, TYPE_ARRAY, TYPE_AGGREGATE) = range(7) def py_type(ty): if ty == idl.bool: @@ -18,6 +18,8 @@ def py_type(ty): return TYPE_INT else: return TYPE_UINT + if isinstance(ty, idl.Array): + return TYPE_ARRAY if isinstance(ty, idl.Aggregate): return TYPE_AGGREGATE if ty == idl.string: @@ -74,7 +76,7 @@ def py_attrib_get(ty, f): l.append(' return genwrap__ull_get(self->obj.%s);'%f.name) elif t == TYPE_STRING: l.append(' return genwrap__string_get(&self->obj.%s);'%f.name) - elif t == TYPE_AGGREGATE: + elif t == TYPE_AGGREGATE or t == TYPE_ARRAY: l.append(' PyErr_SetString(PyExc_NotImplementedError, "Getting %s");'%ty.typename) l.append(' return NULL;') else: @@ -105,7 +107,7 @@ def py_attrib_set(ty, f): l.append(' return ret;') elif t == TYPE_STRING: l.append(' return genwrap__string_set(v, &self->obj.%s);'%f.name) - elif t == TYPE_AGGREGATE: + elif t == TYPE_AGGREGATE or t == TYPE_ARRAY: l.append(' PyErr_SetString(PyExc_NotImplementedError, "Setting %s");'%ty.typename) l.append(' return -1;') else: _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jul 06 20:44:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Jul 2012 20:44: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 1SnFNu-00029f-IB; Fri, 06 Jul 2012 20:44:14 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SnFNs-00028v-T1 for xen-changelog@lists.xensource.com; Fri, 06 Jul 2012 20:44:13 +0000 Received: from [85.158.143.35:26102] by server-1.bemta-4.messagelabs.com id 1E/99-24392-B1E47FF4; Fri, 06 Jul 2012 20:44:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-21.messagelabs.com!1341607448!14150650!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 24447 invoked from network); 6 Jul 2012 20:44:09 -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; 6 Jul 2012 20:44:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SnFNn-00012I-VO for xen-changelog@lists.xensource.com; Fri, 06 Jul 2012 20:44:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SnFNn-0006cG-JZ for xen-changelog@lists.xensource.com; Fri, 06 Jul 2012 20:44:07 +0000 Message-Id: Date: Fri, 06 Jul 2012 20:44:07 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: add a new Array type to the IDL X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341577060 -3600 # Node ID e9aa6da372bd76774d0d63ad17c43df34673ce30 # Parent 497e2fe4945594cd2846f0302bef5e5dafa1c2c6 libxl: add a new Array type to the IDL And make all the required infrastructure updates to enable this. Since there are currently no uses of this type there is no change to the generated code. Signed-off-by: Ian Campbell Tested-by: Dario Faggioli Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r 497e2fe49455 -r e9aa6da372bd tools/libxl/gentest.py --- a/tools/libxl/gentest.py Thu Jul 05 12:40:25 2012 +0100 +++ b/tools/libxl/gentest.py Fri Jul 06 13:17:40 2012 +0100 @@ -27,6 +27,18 @@ def gen_rand_init(ty, v, indent = " " s = "" if isinstance(ty, idl.Enumeration): s += "%s = %s;\n" % (ty.pass_arg(v, parent is None), randomize_enum(ty)) + elif isinstance(ty, idl.Array): + if parent is None: + raise Exception("Array type must have a parent") + s += "%s = rand()%%8;\n" % (parent + ty.lenvar.name) + s += "%s = calloc(%s, sizeof(*%s));\n" % \ + (v, parent + ty.lenvar.name, v) + s += "{\n" + s += " int i;\n" + s += " for (i=0; i<%s; i++)\n" % (parent + ty.lenvar.name) + s += gen_rand_init(ty.elem_type, v+"[i]", + indent + " ", parent) + s += "}\n" elif isinstance(ty, idl.KeyedUnion): if parent is None: raise Exception("KeyedUnion type must have a parent") diff -r 497e2fe49455 -r e9aa6da372bd tools/libxl/gentypes.py --- a/tools/libxl/gentypes.py Thu Jul 05 12:40:25 2012 +0100 +++ b/tools/libxl/gentypes.py Fri Jul 06 13:17:40 2012 +0100 @@ -11,8 +11,12 @@ def libxl_C_instance_of(ty, instancename return libxl_C_type_define(ty) else: return libxl_C_type_define(ty) + " " + instancename - else: - return ty.typename + " " + instancename + + s = "" + if isinstance(ty, idl.Array): + s += libxl_C_instance_of(ty.lenvar.type, ty.lenvar.name) + ";\n" + + return s + ty.typename + " " + instancename def libxl_C_type_define(ty, indent = ""): s = "" @@ -66,6 +70,21 @@ def libxl_C_type_dispose(ty, v, indent = s += libxl_C_type_dispose(f.type, fexpr, indent + " ", nparent) s += " break;\n" s += "}\n" + elif isinstance(ty, idl.Array): + if parent is None: + raise Exception("Array type must have a parent") + if ty.elem_type.dispose_fn is not None: + s += "{\n" + s += " int i;\n" + s += " for (i=0; i<%s; i++)\n" % (parent + ty.lenvar.name) + s += libxl_C_type_dispose(ty.elem_type, v+"[i]", + indent + " ", parent) + if ty.dispose_fn is not None: + if ty.elem_type.dispose_fn is not None: + s += " " + s += "%s(%s);\n" % (ty.dispose_fn, ty.pass_arg(v, parent is None)) + if ty.elem_type.dispose_fn is not None: + s += "}\n" elif isinstance(ty, idl.Struct) and (parent is None or ty.dispose_fn is None): for f in [f for f in ty.fields if not f.const]: (nparent,fexpr) = ty.member(v, f, parent is None) @@ -164,7 +183,24 @@ def libxl_C_type_gen_json(ty, v, indent s = "" if parent is None: s += "yajl_gen_status s;\n" - if isinstance(ty, idl.Enumeration): + + if isinstance(ty, idl.Array): + if parent is None: + raise Exception("Array type must have a parent") + s += "{\n" + s += " int i;\n" + s += " s = yajl_gen_array_open(hand);\n" + s += " if (s != yajl_gen_status_ok)\n" + s += " goto out;\n" + s += " for (i=0; i<%s; i++) {\n" % (parent + ty.lenvar.name) + s += libxl_C_type_gen_json(ty.elem_type, v+"[i]", + indent + " ", parent) + s += " }\n" + s += " s = yajl_gen_array_close(hand);\n" + s += " if (s != yajl_gen_status_ok)\n" + s += " goto out;\n" + s += "}\n" + elif isinstance(ty, idl.Enumeration): s += "s = libxl__yajl_gen_enum(hand, %s_to_string(%s));\n" % (ty.typename, ty.pass_arg(v, parent is None)) s += "if (s != yajl_gen_status_ok)\n" s += " goto out;\n" diff -r 497e2fe49455 -r e9aa6da372bd tools/libxl/idl.py --- a/tools/libxl/idl.py Thu Jul 05 12:40:25 2012 +0100 +++ b/tools/libxl/idl.py Fri Jul 06 13:17:40 2012 +0100 @@ -266,6 +266,17 @@ string = Builtin("char *", namespace = N json_fn = "libxl__string_gen_json", autogenerate_json = False) +class Array(Type): + """An array of the same type""" + def __init__(self, elem_type, lenvar_name, **kwargs): + kwargs.setdefault('dispose_fn', 'free') + Type.__init__(self, namespace=elem_type.namespace, typename=elem_type.rawname + " *", **kwargs) + + lv_kwargs = dict([(x.lstrip('lenvar_'),y) for (x,y) in kwargs.items() if x.startswith('lenvar_')]) + + self.lenvar = Field(integer, lenvar_name, **lv_kwargs) + self.elem_type = elem_type + class OrderedDict(dict): """A dictionary which remembers insertion order. diff -r 497e2fe49455 -r e9aa6da372bd tools/libxl/idl.txt --- a/tools/libxl/idl.txt Thu Jul 05 12:40:25 2012 +0100 +++ b/tools/libxl/idl.txt Fri Jul 06 13:17:40 2012 +0100 @@ -145,11 +145,24 @@ idl.KeyedUnion A subclass of idl.Aggregate which represents the C union type where the currently valid member of the union can be determined based - upon another member in the containing type. + upon another member in the containing type. An idl.KeyedUnion must + always be a member of a containing idl.Aggregate type. - The KeyedUnion.keyvar contains an idl.type the member of the - containing type which determines the valid member of the union. The - must be an instance of the Enumeration type. + The KeyedUnion.keyvar contains an idl.Field, this is the member of + the containing type which determines the valid member of the + union. The idl.Field.type of the keyvar must be an Enumeration type. + +idl.Array + + A class representing an array of similar elements. An idl.Array must + always be an idl.Field of a containing idl.Aggregate. + + idl.Array.elem_type contains an idl.Type which is the type of each + element of the array. + + idl.Array.len_var contains an idl.Field which is added to the parent + idl.Aggregate and will contain the length of the array. The field + MUST be named num_ARRAYNAME. Standard Types -------------- diff -r 497e2fe49455 -r e9aa6da372bd tools/ocaml/libs/xl/genwrap.py --- a/tools/ocaml/libs/xl/genwrap.py Thu Jul 05 12:40:25 2012 +0100 +++ b/tools/ocaml/libs/xl/genwrap.py Fri Jul 06 13:17:40 2012 +0100 @@ -55,7 +55,8 @@ def ocaml_type_of(ty): return "int%d" % ty.width else: return "int" - + elif isinstance(ty,idl.Array): + return "%s array" % ocaml_type_of(ty.elem_type) elif isinstance(ty,idl.Builtin): if not builtins.has_key(ty.typename): raise NotImplementedError("Unknown Builtin %s (%s)" % (ty.typename, type(ty))) @@ -138,6 +139,8 @@ def c_val(ty, c, o, indent="", parent = if not fn: raise NotImplementedError("No c_val fn for Builtin %s (%s)" % (ty.typename, type(ty))) s += "%s;" % (fn % { "o": o, "c": c }) + elif isinstance (ty,idl.Array): + raise("Cannot handle Array type\n") elif isinstance(ty,idl.Enumeration) and (parent is None): n = 0 s += "switch(Int_val(%s)) {\n" % o @@ -195,6 +198,16 @@ def ocaml_Val(ty, o, c, indent="", paren if not fn: raise NotImplementedError("No ocaml Val fn for Builtin %s (%s)" % (ty.typename, type(ty))) s += "%s = %s;" % (o, fn % { "c": c }) + elif isinstance(ty, idl.Array): + s += "{\n" + s += "\t int i;\n" + s += "\t value array_elem;\n" + s += "\t %s = caml_alloc(%s,0);\n" % (o, parent + ty.lenvar.name) + s += "\t for(i=0; i<%s; i++) {\n" % (parent + ty.lenvar.name) + s += "\t %s\n" % ocaml_Val(ty.elem_type, "array_elem", c + "[i]", "") + s += "\t Store_field(%s, i, array_elem);\n" % o + s += "\t }\n" + s += "\t}" elif isinstance(ty,idl.Enumeration) and (parent is None): n = 0 s += "switch(%s) {\n" % c diff -r 497e2fe49455 -r e9aa6da372bd tools/python/genwrap.py --- a/tools/python/genwrap.py Thu Jul 05 12:40:25 2012 +0100 +++ b/tools/python/genwrap.py Fri Jul 06 13:17:40 2012 +0100 @@ -4,7 +4,7 @@ import sys,os import idl -(TYPE_DEFBOOL, TYPE_BOOL, TYPE_INT, TYPE_UINT, TYPE_STRING, TYPE_AGGREGATE) = range(6) +(TYPE_DEFBOOL, TYPE_BOOL, TYPE_INT, TYPE_UINT, TYPE_STRING, TYPE_ARRAY, TYPE_AGGREGATE) = range(7) def py_type(ty): if ty == idl.bool: @@ -18,6 +18,8 @@ def py_type(ty): return TYPE_INT else: return TYPE_UINT + if isinstance(ty, idl.Array): + return TYPE_ARRAY if isinstance(ty, idl.Aggregate): return TYPE_AGGREGATE if ty == idl.string: @@ -74,7 +76,7 @@ def py_attrib_get(ty, f): l.append(' return genwrap__ull_get(self->obj.%s);'%f.name) elif t == TYPE_STRING: l.append(' return genwrap__string_get(&self->obj.%s);'%f.name) - elif t == TYPE_AGGREGATE: + elif t == TYPE_AGGREGATE or t == TYPE_ARRAY: l.append(' PyErr_SetString(PyExc_NotImplementedError, "Getting %s");'%ty.typename) l.append(' return NULL;') else: @@ -105,7 +107,7 @@ def py_attrib_set(ty, f): l.append(' return ret;') elif t == TYPE_STRING: l.append(' return genwrap__string_set(v, &self->obj.%s);'%f.name) - elif t == TYPE_AGGREGATE: + elif t == TYPE_AGGREGATE or t == TYPE_ARRAY: l.append(' PyErr_SetString(PyExc_NotImplementedError, "Setting %s");'%ty.typename) l.append(' return -1;') else: _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jul 06 20:44:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Jul 2012 20:44: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 1SnFNu-00029a-Fj; Fri, 06 Jul 2012 20:44:14 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SnFNs-000293-MB for xen-changelog@lists.xensource.com; Fri, 06 Jul 2012 20:44:12 +0000 Received: from [85.158.138.51:20775] by server-3.bemta-3.messagelabs.com id 12/F0-26490-B1E47FF4; Fri, 06 Jul 2012 20:44:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-174.messagelabs.com!1341607449!27681432!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 32040 invoked from network); 6 Jul 2012 20:44:10 -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; 6 Jul 2012 20:44:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SnFNp-00012O-7v for xen-changelog@lists.xensource.com; Fri, 06 Jul 2012 20:44:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SnFNo-0006ck-Qh for xen-changelog@lists.xensource.com; Fri, 06 Jul 2012 20:44:08 +0000 Message-Id: Date: Fri, 06 Jul 2012 20:44:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xl: add more NUMA information to `xl info -n' X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341577062 -3600 # Node ID fd2b80a82cb0b2029eeacb224b8d49439a4a89ec # Parent e0f04c3978f75192a436736d45c7a11405606ebb xl: add more NUMA information to `xl info -n' So that the user knows how much memory there is on each node and how far they are from each others. Signed-off-by: Dario Faggioli Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r e0f04c3978f7 -r fd2b80a82cb0 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Fri Jul 06 13:17:41 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Fri Jul 06 13:17:42 2012 +0100 @@ -4254,6 +4254,36 @@ static void output_physinfo(void) return; } +static void output_numainfo(void) +{ + libxl_numainfo *info; + int i, j, nr; + + info = libxl_get_numainfo(ctx, &nr); + if (info == NULL) { + fprintf(stderr, "libxl_get_numainfo failed.\n"); + return; + } + + printf("numa_info :\n"); + printf("node: memsize memfree distances\n"); + + for (i = 0; i < nr; i++) { + if (info[i].size != LIBXL_NUMAINFO_INVALID_ENTRY) { + printf("%4d: %6"PRIu64" %6"PRIu64" %d", i, + info[i].size >> 20, info[i].free >> 20, + info[i].dists[0]); + for (j = 1; j < info[i].num_dists; j++) + printf(",%d", info[i].dists[j]); + printf("\n"); + } + } + + libxl_numainfo_list_free(info, nr); + + return; +} + static void output_topologyinfo(void) { libxl_cputopology *info; @@ -4276,8 +4306,6 @@ static void output_topologyinfo(void) libxl_cputopology_list_free(info, nr); - printf("numa_info : none\n"); - return; } @@ -4287,8 +4315,10 @@ static void info(int numa) output_physinfo(); - if (numa) + if (numa) { output_topologyinfo(); + output_numainfo(); + } output_xeninfo(); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jul 06 20:44:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Jul 2012 20:44: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 1SnFNu-00029a-Fj; Fri, 06 Jul 2012 20:44:14 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SnFNs-000293-MB for xen-changelog@lists.xensource.com; Fri, 06 Jul 2012 20:44:12 +0000 Received: from [85.158.138.51:20775] by server-3.bemta-3.messagelabs.com id 12/F0-26490-B1E47FF4; Fri, 06 Jul 2012 20:44:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-174.messagelabs.com!1341607449!27681432!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 32040 invoked from network); 6 Jul 2012 20:44:10 -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; 6 Jul 2012 20:44:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SnFNp-00012O-7v for xen-changelog@lists.xensource.com; Fri, 06 Jul 2012 20:44:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SnFNo-0006ck-Qh for xen-changelog@lists.xensource.com; Fri, 06 Jul 2012 20:44:08 +0000 Message-Id: Date: Fri, 06 Jul 2012 20:44:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xl: add more NUMA information to `xl info -n' X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341577062 -3600 # Node ID fd2b80a82cb0b2029eeacb224b8d49439a4a89ec # Parent e0f04c3978f75192a436736d45c7a11405606ebb xl: add more NUMA information to `xl info -n' So that the user knows how much memory there is on each node and how far they are from each others. Signed-off-by: Dario Faggioli Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r e0f04c3978f7 -r fd2b80a82cb0 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Fri Jul 06 13:17:41 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Fri Jul 06 13:17:42 2012 +0100 @@ -4254,6 +4254,36 @@ static void output_physinfo(void) return; } +static void output_numainfo(void) +{ + libxl_numainfo *info; + int i, j, nr; + + info = libxl_get_numainfo(ctx, &nr); + if (info == NULL) { + fprintf(stderr, "libxl_get_numainfo failed.\n"); + return; + } + + printf("numa_info :\n"); + printf("node: memsize memfree distances\n"); + + for (i = 0; i < nr; i++) { + if (info[i].size != LIBXL_NUMAINFO_INVALID_ENTRY) { + printf("%4d: %6"PRIu64" %6"PRIu64" %d", i, + info[i].size >> 20, info[i].free >> 20, + info[i].dists[0]); + for (j = 1; j < info[i].num_dists; j++) + printf(",%d", info[i].dists[j]); + printf("\n"); + } + } + + libxl_numainfo_list_free(info, nr); + + return; +} + static void output_topologyinfo(void) { libxl_cputopology *info; @@ -4276,8 +4306,6 @@ static void output_topologyinfo(void) libxl_cputopology_list_free(info, nr); - printf("numa_info : none\n"); - return; } @@ -4287,8 +4315,10 @@ static void info(int numa) output_physinfo(); - if (numa) + if (numa) { output_topologyinfo(); + output_numainfo(); + } output_xeninfo(); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jul 06 20:44:23 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Jul 2012 20:44: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 1SnFNv-0002AJ-Tw; Fri, 06 Jul 2012 20:44:15 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SnFNt-00029C-I1 for xen-changelog@lists.xensource.com; Fri, 06 Jul 2012 20:44:15 +0000 Received: from [85.158.139.83:61236] by server-4.bemta-5.messagelabs.com id 17/1B-27831-C1E47FF4; Fri, 06 Jul 2012 20:44:12 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-182.messagelabs.com!1341607450!23248620!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 28454 invoked from network); 6 Jul 2012 20:44:11 -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; 6 Jul 2012 20:44:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SnFNq-00012U-2I for xen-changelog@lists.xensource.com; Fri, 06 Jul 2012 20:44:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SnFNp-0006dE-UD for xen-changelog@lists.xensource.com; Fri, 06 Jul 2012 20:44:09 +0000 Message-Id: Date: Fri, 06 Jul 2012 20:44:09 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: expand the libxl_bitmap API a 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 Dario Faggioli # Date 1341577063 -3600 # Node ID 61742ab1a675618c963e0f4d10950bf87cc5a57a # Parent 86c5dcbd03e6da6408666820d3b17a282a82c057 libxl: expand the libxl_bitmap API a bit By adding copying and *_is_full/*_is_empty facilities. Signed-off-by: Dario Faggioli Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r 86c5dcbd03e6 -r 61742ab1a675 tools/libxl/libxl_utils.c --- a/tools/libxl/libxl_utils.c Fri Jul 06 13:17:42 2012 +0100 +++ b/tools/libxl/libxl_utils.c Fri Jul 06 13:17:43 2012 +0100 @@ -510,6 +510,36 @@ void libxl_bitmap_dispose(libxl_bitmap * free(map->map); } +void libxl_bitmap_copy(libxl_ctx *ctx, libxl_bitmap *dptr, + const libxl_bitmap *sptr) +{ + int sz; + + assert(dptr->size == sptr->size); + sz = dptr->size = sptr->size; + memcpy(dptr->map, sptr->map, sz * sizeof(*dptr->map)); +} + +int libxl_bitmap_is_full(const libxl_bitmap *bitmap) +{ + int i; + + for (i = 0; i < bitmap->size; i++) + if (bitmap->map[i] != (uint8_t)-1) + return 0; + return 1; +} + +int libxl_bitmap_is_empty(const libxl_bitmap *bitmap) +{ + int i; + + for (i = 0; i < bitmap->size; i++) + if (bitmap->map[i]) + return 0; + return 1; +} + int libxl_bitmap_test(const libxl_bitmap *bitmap, int bit) { if (bit >= bitmap->size * 8) diff -r 86c5dcbd03e6 -r 61742ab1a675 tools/libxl/libxl_utils.h --- a/tools/libxl/libxl_utils.h Fri Jul 06 13:17:42 2012 +0100 +++ b/tools/libxl/libxl_utils.h Fri Jul 06 13:17:43 2012 +0100 @@ -66,6 +66,10 @@ int libxl_vdev_to_device_disk(libxl_ctx int libxl_bitmap_alloc(libxl_ctx *ctx, libxl_bitmap *bitmap, int n_bits); /* Allocated bimap is from malloc, libxl_bitmap_dispose() to be * called by the application when done. */ +void libxl_bitmap_copy(libxl_ctx *ctx, libxl_bitmap *dptr, + const libxl_bitmap *sptr); +int libxl_bitmap_is_full(const libxl_bitmap *bitmap); +int libxl_bitmap_is_empty(const libxl_bitmap *bitmap); int libxl_bitmap_test(const libxl_bitmap *bitmap, int bit); void libxl_bitmap_set(libxl_bitmap *bitmap, int bit); void libxl_bitmap_reset(libxl_bitmap *bitmap, int bit); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jul 06 20:44:23 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Jul 2012 20:44: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 1SnFNv-0002AJ-Tw; Fri, 06 Jul 2012 20:44:15 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SnFNt-00029C-I1 for xen-changelog@lists.xensource.com; Fri, 06 Jul 2012 20:44:15 +0000 Received: from [85.158.139.83:61236] by server-4.bemta-5.messagelabs.com id 17/1B-27831-C1E47FF4; Fri, 06 Jul 2012 20:44:12 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-182.messagelabs.com!1341607450!23248620!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 28454 invoked from network); 6 Jul 2012 20:44:11 -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; 6 Jul 2012 20:44:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SnFNq-00012U-2I for xen-changelog@lists.xensource.com; Fri, 06 Jul 2012 20:44:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SnFNp-0006dE-UD for xen-changelog@lists.xensource.com; Fri, 06 Jul 2012 20:44:09 +0000 Message-Id: Date: Fri, 06 Jul 2012 20:44:09 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: expand the libxl_bitmap API a 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 Dario Faggioli # Date 1341577063 -3600 # Node ID 61742ab1a675618c963e0f4d10950bf87cc5a57a # Parent 86c5dcbd03e6da6408666820d3b17a282a82c057 libxl: expand the libxl_bitmap API a bit By adding copying and *_is_full/*_is_empty facilities. Signed-off-by: Dario Faggioli Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r 86c5dcbd03e6 -r 61742ab1a675 tools/libxl/libxl_utils.c --- a/tools/libxl/libxl_utils.c Fri Jul 06 13:17:42 2012 +0100 +++ b/tools/libxl/libxl_utils.c Fri Jul 06 13:17:43 2012 +0100 @@ -510,6 +510,36 @@ void libxl_bitmap_dispose(libxl_bitmap * free(map->map); } +void libxl_bitmap_copy(libxl_ctx *ctx, libxl_bitmap *dptr, + const libxl_bitmap *sptr) +{ + int sz; + + assert(dptr->size == sptr->size); + sz = dptr->size = sptr->size; + memcpy(dptr->map, sptr->map, sz * sizeof(*dptr->map)); +} + +int libxl_bitmap_is_full(const libxl_bitmap *bitmap) +{ + int i; + + for (i = 0; i < bitmap->size; i++) + if (bitmap->map[i] != (uint8_t)-1) + return 0; + return 1; +} + +int libxl_bitmap_is_empty(const libxl_bitmap *bitmap) +{ + int i; + + for (i = 0; i < bitmap->size; i++) + if (bitmap->map[i]) + return 0; + return 1; +} + int libxl_bitmap_test(const libxl_bitmap *bitmap, int bit) { if (bit >= bitmap->size * 8) diff -r 86c5dcbd03e6 -r 61742ab1a675 tools/libxl/libxl_utils.h --- a/tools/libxl/libxl_utils.h Fri Jul 06 13:17:42 2012 +0100 +++ b/tools/libxl/libxl_utils.h Fri Jul 06 13:17:43 2012 +0100 @@ -66,6 +66,10 @@ int libxl_vdev_to_device_disk(libxl_ctx int libxl_bitmap_alloc(libxl_ctx *ctx, libxl_bitmap *bitmap, int n_bits); /* Allocated bimap is from malloc, libxl_bitmap_dispose() to be * called by the application when done. */ +void libxl_bitmap_copy(libxl_ctx *ctx, libxl_bitmap *dptr, + const libxl_bitmap *sptr); +int libxl_bitmap_is_full(const libxl_bitmap *bitmap); +int libxl_bitmap_is_empty(const libxl_bitmap *bitmap); int libxl_bitmap_test(const libxl_bitmap *bitmap, int bit); void libxl_bitmap_set(libxl_bitmap *bitmap, int bit); void libxl_bitmap_reset(libxl_bitmap *bitmap, int bit); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jul 06 20:44:23 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Jul 2012 20:44: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 1SnFO1-0002Cc-3I; Fri, 06 Jul 2012 20:44:21 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SnFNz-00029Q-Kj for xen-changelog@lists.xensource.com; Fri, 06 Jul 2012 20:44:19 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-27.messagelabs.com!1341607451!1767069!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 30893 invoked from network); 6 Jul 2012 20:44:12 -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; 6 Jul 2012 20:44:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SnFNr-00012a-0g for xen-changelog@lists.xensource.com; Fri, 06 Jul 2012 20:44:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SnFNq-0006dj-Vu for xen-changelog@lists.xensource.com; Fri, 06 Jul 2012 20:44:10 +0000 Message-Id: Date: Fri, 06 Jul 2012 20:44:10 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: explicitly check for libmath in autoconf X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341577065 -3600 # Node ID 7b0dc7f3ddfe65e65b0878661a6967f781023c7d # Parent 03a60d7e56fdd9c0ba2d05234b972aa63019680f libxl: explicitly check for libmath in autoconf As well as explicitly add -lm to libxl's Makefile. This is because next patch uses floating point arithmetic, and it is better to state it clearly that we need libmath (just in case we find a libc that wants that to be explicitly enforced). Notice that autoconf should be rerun after applying this change. Signed-off-by: Dario Faggioli Acked-by: Roger Pau Monne Acked-by: Ian Campbell [ ijc -- s/libmath/libm/ in error message ] Committed-by: Ian Campbell --- diff -r 03a60d7e56fd -r 7b0dc7f3ddfe tools/config.h.in --- a/tools/config.h.in Fri Jul 06 13:17:44 2012 +0100 +++ b/tools/config.h.in Fri Jul 06 13:17:45 2012 +0100 @@ -6,6 +6,9 @@ /* Define to 1 if you have the `crypto' library (-lcrypto). */ #undef HAVE_LIBCRYPTO +/* Define to 1 if you have the `m' library (-lm). */ +#undef HAVE_LIBM + /* Define to 1 if you have the `yajl' library (-lyajl). */ #undef HAVE_LIBYAJL diff -r 03a60d7e56fd -r 7b0dc7f3ddfe tools/configure --- a/tools/configure Fri Jul 06 13:17:44 2012 +0100 +++ b/tools/configure Fri Jul 06 13:17:45 2012 +0100 @@ -6253,6 +6253,53 @@ else fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for isnan in -lm" >&5 +$as_echo_n "checking for isnan in -lm... " >&6; } +if test "${ac_cv_lib_m_isnan+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lm $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char isnan (); +int +main () +{ +return isnan (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_m_isnan=yes +else + ac_cv_lib_m_isnan=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_isnan" >&5 +$as_echo "$ac_cv_lib_m_isnan" >&6; } +if test "x$ac_cv_lib_m_isnan" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBM 1 +_ACEOF + + LIBS="-lm $LIBS" + +else + as_fn_error $? "Could not find libm" "$LINENO" 5 +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MD5 in -lcrypto" >&5 $as_echo_n "checking for MD5 in -lcrypto... " >&6; } if test "${ac_cv_lib_crypto_MD5+set}" = set; then : diff -r 03a60d7e56fd -r 7b0dc7f3ddfe tools/configure.ac --- a/tools/configure.ac Fri Jul 06 13:17:44 2012 +0100 +++ b/tools/configure.ac Fri Jul 06 13:17:45 2012 +0100 @@ -133,6 +133,7 @@ AC_CHECK_LIB([lzo2], [lzo1x_decompress], AC_SUBST(zlib) AC_CHECK_LIB([aio], [io_setup], [system_aio="y"], [system_aio="n"]) AC_SUBST(system_aio) +AC_CHECK_LIB([m], [isnan], [], [AC_MSG_ERROR([Could not find libm])]) AC_CHECK_LIB([crypto], [MD5], [], [AC_MSG_ERROR([Could not find libcrypto])]) AC_CHECK_LIB([ext2fs], [ext2fs_open2], [libext2fs="y"], [libext2fs="n"]) AC_SUBST(libext2fs) diff -r 03a60d7e56fd -r 7b0dc7f3ddfe tools/libxl/Makefile --- a/tools/libxl/Makefile Fri Jul 06 13:17:44 2012 +0100 +++ b/tools/libxl/Makefile Fri Jul 06 13:17:45 2012 +0100 @@ -61,7 +61,7 @@ ifeq ($(BISON),) scanners, please install it an rerun configure) endif -LIBXL_LIBS += -lyajl +LIBXL_LIBS += -lyajl -lm LIBXL_OBJS = flexarray.o libxl.o libxl_create.o libxl_dm.o libxl_pci.o \ libxl_dom.o libxl_exec.o libxl_xshelp.o libxl_device.o \ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jul 06 20:44:23 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Jul 2012 20:44: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 1SnFO1-0002Cc-3I; Fri, 06 Jul 2012 20:44:21 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SnFNz-00029Q-Kj for xen-changelog@lists.xensource.com; Fri, 06 Jul 2012 20:44:19 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-27.messagelabs.com!1341607451!1767069!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 30893 invoked from network); 6 Jul 2012 20:44:12 -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; 6 Jul 2012 20:44:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SnFNr-00012a-0g for xen-changelog@lists.xensource.com; Fri, 06 Jul 2012 20:44:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SnFNq-0006dj-Vu for xen-changelog@lists.xensource.com; Fri, 06 Jul 2012 20:44:10 +0000 Message-Id: Date: Fri, 06 Jul 2012 20:44:10 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: explicitly check for libmath in autoconf X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341577065 -3600 # Node ID 7b0dc7f3ddfe65e65b0878661a6967f781023c7d # Parent 03a60d7e56fdd9c0ba2d05234b972aa63019680f libxl: explicitly check for libmath in autoconf As well as explicitly add -lm to libxl's Makefile. This is because next patch uses floating point arithmetic, and it is better to state it clearly that we need libmath (just in case we find a libc that wants that to be explicitly enforced). Notice that autoconf should be rerun after applying this change. Signed-off-by: Dario Faggioli Acked-by: Roger Pau Monne Acked-by: Ian Campbell [ ijc -- s/libmath/libm/ in error message ] Committed-by: Ian Campbell --- diff -r 03a60d7e56fd -r 7b0dc7f3ddfe tools/config.h.in --- a/tools/config.h.in Fri Jul 06 13:17:44 2012 +0100 +++ b/tools/config.h.in Fri Jul 06 13:17:45 2012 +0100 @@ -6,6 +6,9 @@ /* Define to 1 if you have the `crypto' library (-lcrypto). */ #undef HAVE_LIBCRYPTO +/* Define to 1 if you have the `m' library (-lm). */ +#undef HAVE_LIBM + /* Define to 1 if you have the `yajl' library (-lyajl). */ #undef HAVE_LIBYAJL diff -r 03a60d7e56fd -r 7b0dc7f3ddfe tools/configure --- a/tools/configure Fri Jul 06 13:17:44 2012 +0100 +++ b/tools/configure Fri Jul 06 13:17:45 2012 +0100 @@ -6253,6 +6253,53 @@ else fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for isnan in -lm" >&5 +$as_echo_n "checking for isnan in -lm... " >&6; } +if test "${ac_cv_lib_m_isnan+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lm $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char isnan (); +int +main () +{ +return isnan (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_m_isnan=yes +else + ac_cv_lib_m_isnan=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_isnan" >&5 +$as_echo "$ac_cv_lib_m_isnan" >&6; } +if test "x$ac_cv_lib_m_isnan" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBM 1 +_ACEOF + + LIBS="-lm $LIBS" + +else + as_fn_error $? "Could not find libm" "$LINENO" 5 +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MD5 in -lcrypto" >&5 $as_echo_n "checking for MD5 in -lcrypto... " >&6; } if test "${ac_cv_lib_crypto_MD5+set}" = set; then : diff -r 03a60d7e56fd -r 7b0dc7f3ddfe tools/configure.ac --- a/tools/configure.ac Fri Jul 06 13:17:44 2012 +0100 +++ b/tools/configure.ac Fri Jul 06 13:17:45 2012 +0100 @@ -133,6 +133,7 @@ AC_CHECK_LIB([lzo2], [lzo1x_decompress], AC_SUBST(zlib) AC_CHECK_LIB([aio], [io_setup], [system_aio="y"], [system_aio="n"]) AC_SUBST(system_aio) +AC_CHECK_LIB([m], [isnan], [], [AC_MSG_ERROR([Could not find libm])]) AC_CHECK_LIB([crypto], [MD5], [], [AC_MSG_ERROR([Could not find libcrypto])]) AC_CHECK_LIB([ext2fs], [ext2fs_open2], [libext2fs="y"], [libext2fs="n"]) AC_SUBST(libext2fs) diff -r 03a60d7e56fd -r 7b0dc7f3ddfe tools/libxl/Makefile --- a/tools/libxl/Makefile Fri Jul 06 13:17:44 2012 +0100 +++ b/tools/libxl/Makefile Fri Jul 06 13:17:45 2012 +0100 @@ -61,7 +61,7 @@ ifeq ($(BISON),) scanners, please install it an rerun configure) endif -LIBXL_LIBS += -lyajl +LIBXL_LIBS += -lyajl -lm LIBXL_OBJS = flexarray.o libxl.o libxl_create.o libxl_dm.o libxl_pci.o \ libxl_dom.o libxl_exec.o libxl_xshelp.o libxl_device.o \ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 09 15:33:16 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Jul 2012 15:33: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 1SoFxZ-0000wl-2e; Mon, 09 Jul 2012 15:33:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SoFxX-0000wW-Gl for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 15:33:11 +0000 Received: from [85.158.139.83:63157] by server-9.bemta-5.messagelabs.com id 0A/10-01069-6B9FAFF4; Mon, 09 Jul 2012 15:33:10 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-182.messagelabs.com!1341847989!23888126!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 22923 invoked from network); 9 Jul 2012 15:33: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; 9 Jul 2012 15:33:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SoFxU-0007aj-Vz for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 15:33:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SoFxU-0002si-OZ for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 15:33:08 +0000 Message-Id: Date: Mon, 09 Jul 2012 15:33:08 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] tools/pygrub: fix solaris kernel sniff X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Zhigang Wang # Date 1341825555 -3600 # Node ID e8a3797e34d1b6b13cd5547e43afe08ef7d95cb1 # Parent 3fed2c0a282acbca71d72e89c1d067f4f8c951e9 tools/pygrub: fix solaris kernel sniff Solaris 11 build 163+ removes '/platform/i86xpv/kernel/unix' and only the 64-bit PV kernel file '/platform/i86xpv/kernel/amd64/unix' exists. This patch fixes the detection. Signed-off-by: Zhigang Wang Signed-off-by: Kurt Hackel Signed-off-by: Frank Che Committed-by: Ian Jackson xen-unstable changeset: 23686:7c39a2c0d870 xen-unstable date: Thu Jul 14 18:09:58 2011 +0100 --- diff -r 3fed2c0a282a -r e8a3797e34d1 tools/pygrub/src/pygrub --- a/tools/pygrub/src/pygrub Tue Jul 03 13:50:01 2012 +0100 +++ b/tools/pygrub/src/pygrub Mon Jul 09 10:19:15 2012 +0100 @@ -604,7 +604,8 @@ def supports64bitPVguest(): # If nothing has been specified, look for a Solaris domU. If found, perform the # necessary tweaks. def sniff_solaris(fs, cfg): - if not fs.file_exists("/platform/i86xpv/kernel/unix"): + if not fs.file_exists("/platform/i86xpv/kernel/unix") and \ + not fs.file_exists("/platform/i86xpv/kernel/amd64/unix"): return cfg if not cfg["kernel"]: @@ -612,9 +613,11 @@ def sniff_solaris(fs, cfg): fs.file_exists("/platform/i86xpv/kernel/amd64/unix"): cfg["kernel"] = "/platform/i86xpv/kernel/amd64/unix" cfg["ramdisk"] = "/platform/i86pc/amd64/boot_archive" - else: + elif fs.file_exists("/platform/i86xpv/kernel/unix"): cfg["kernel"] = "/platform/i86xpv/kernel/unix" cfg["ramdisk"] = "/platform/i86pc/boot_archive" + else: + return cfg # Unpleasant. Typically we'll have 'root=foo -k' or 'root=foo /kernel -k', # and we need to maintain Xen properties (root= and ip=) and the kernel _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 09 15:33:16 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Jul 2012 15:33: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 1SoFxZ-0000wl-2e; Mon, 09 Jul 2012 15:33:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SoFxX-0000wW-Gl for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 15:33:11 +0000 Received: from [85.158.139.83:63157] by server-9.bemta-5.messagelabs.com id 0A/10-01069-6B9FAFF4; Mon, 09 Jul 2012 15:33:10 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-182.messagelabs.com!1341847989!23888126!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 22923 invoked from network); 9 Jul 2012 15:33: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; 9 Jul 2012 15:33:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SoFxU-0007aj-Vz for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 15:33:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SoFxU-0002si-OZ for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 15:33:08 +0000 Message-Id: Date: Mon, 09 Jul 2012 15:33:08 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] tools/pygrub: fix solaris kernel sniff X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Zhigang Wang # Date 1341825555 -3600 # Node ID e8a3797e34d1b6b13cd5547e43afe08ef7d95cb1 # Parent 3fed2c0a282acbca71d72e89c1d067f4f8c951e9 tools/pygrub: fix solaris kernel sniff Solaris 11 build 163+ removes '/platform/i86xpv/kernel/unix' and only the 64-bit PV kernel file '/platform/i86xpv/kernel/amd64/unix' exists. This patch fixes the detection. Signed-off-by: Zhigang Wang Signed-off-by: Kurt Hackel Signed-off-by: Frank Che Committed-by: Ian Jackson xen-unstable changeset: 23686:7c39a2c0d870 xen-unstable date: Thu Jul 14 18:09:58 2011 +0100 --- diff -r 3fed2c0a282a -r e8a3797e34d1 tools/pygrub/src/pygrub --- a/tools/pygrub/src/pygrub Tue Jul 03 13:50:01 2012 +0100 +++ b/tools/pygrub/src/pygrub Mon Jul 09 10:19:15 2012 +0100 @@ -604,7 +604,8 @@ def supports64bitPVguest(): # If nothing has been specified, look for a Solaris domU. If found, perform the # necessary tweaks. def sniff_solaris(fs, cfg): - if not fs.file_exists("/platform/i86xpv/kernel/unix"): + if not fs.file_exists("/platform/i86xpv/kernel/unix") and \ + not fs.file_exists("/platform/i86xpv/kernel/amd64/unix"): return cfg if not cfg["kernel"]: @@ -612,9 +613,11 @@ def sniff_solaris(fs, cfg): fs.file_exists("/platform/i86xpv/kernel/amd64/unix"): cfg["kernel"] = "/platform/i86xpv/kernel/amd64/unix" cfg["ramdisk"] = "/platform/i86pc/amd64/boot_archive" - else: + elif fs.file_exists("/platform/i86xpv/kernel/unix"): cfg["kernel"] = "/platform/i86xpv/kernel/unix" cfg["ramdisk"] = "/platform/i86pc/boot_archive" + else: + return cfg # Unpleasant. Typically we'll have 'root=foo -k' or 'root=foo /kernel -k', # and we need to maintain Xen properties (root= and ip=) and the kernel _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 09 15:33:17 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Jul 2012 15:33:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SoFxa-0000x2-5O; Mon, 09 Jul 2012 15:33:14 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SoFxY-0000wb-DE for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 15:33:12 +0000 Received: from [85.158.139.83:13713] by server-4.bemta-5.messagelabs.com id FB/9E-27831-7B9FAFF4; Mon, 09 Jul 2012 15:33:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-182.messagelabs.com!1341847989!23888128!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 22972 invoked from network); 9 Jul 2012 15:33: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; 9 Jul 2012 15:33:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SoFxV-0007am-Ik for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 15:33:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SoFxV-0002sx-Ae for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 15:33:09 +0000 Message-Id: Date: Mon, 09 Jul 2012 15:33:08 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] x86: update Intel CPUID masking code to latest spec X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341825702 -3600 # Node ID b394b1f87ebcdc88aa0478a93870862bb50df040 # Parent e8a3797e34d1b6b13cd5547e43afe08ef7d95cb1 x86: update Intel CPUID masking code to latest spec ..., which adds masking of the xsave feature leaf. Also add back (and fix to actually make it do what it was supposed to do from the beginning) the printing of what specific masking couldn't be done in case the user requested something the hardware doesn't support. Signed-off-by: Jan Beulich xen-unstable changeset: 23726:fd97ca086df6 xen-unstable date: Tue Jul 19 14:14:51 2011 +0100 x86: add change missing in c/s 23726:fd97ca086df6 The early "do we need to do anything" check needs adjustment, too. Thanks to Haitao Shan for pointing this out. Signed-off-by: Jan Beulich xen-unstable changeset: 23731:48f72b389b04 xen-unstable date: Thu Jul 21 14:34:51 2011 +0100 --- diff -r e8a3797e34d1 -r b394b1f87ebc xen/arch/x86/cpu/common.c --- a/xen/arch/x86/cpu/common.c Mon Jul 09 10:19:15 2012 +0100 +++ b/xen/arch/x86/cpu/common.c Mon Jul 09 10:21:42 2012 +0100 @@ -27,10 +27,15 @@ boolean_param("noserialnumber", disable_ static bool_t __cpuinitdata use_xsave; boolean_param("xsave", use_xsave); + unsigned int __devinitdata opt_cpuid_mask_ecx = ~0u; integer_param("cpuid_mask_ecx", opt_cpuid_mask_ecx); unsigned int __devinitdata opt_cpuid_mask_edx = ~0u; integer_param("cpuid_mask_edx", opt_cpuid_mask_edx); + +unsigned int __devinitdata opt_cpuid_mask_xsave_eax = ~0u; +integer_param("cpuid_mask_xsave_eax", opt_cpuid_mask_xsave_eax); + unsigned int __devinitdata opt_cpuid_mask_ext_ecx = ~0u; integer_param("cpuid_mask_ext_ecx", opt_cpuid_mask_ext_ecx); unsigned int __devinitdata opt_cpuid_mask_ext_edx = ~0u; diff -r e8a3797e34d1 -r b394b1f87ebc xen/arch/x86/cpu/cpu.h --- a/xen/arch/x86/cpu/cpu.h Mon Jul 09 10:19:15 2012 +0100 +++ b/xen/arch/x86/cpu/cpu.h Mon Jul 09 10:21:42 2012 +0100 @@ -22,6 +22,7 @@ struct cpu_dev { extern struct cpu_dev * cpu_devs [X86_VENDOR_NUM]; extern unsigned int opt_cpuid_mask_ecx, opt_cpuid_mask_edx; +extern unsigned int opt_cpuid_mask_xsave_eax; extern unsigned int opt_cpuid_mask_ext_ecx, opt_cpuid_mask_ext_edx; extern int get_model_name(struct cpuinfo_x86 *c); diff -r e8a3797e34d1 -r b394b1f87ebc xen/arch/x86/cpu/intel.c --- a/xen/arch/x86/cpu/intel.c Mon Jul 09 10:19:15 2012 +0100 +++ b/xen/arch/x86/cpu/intel.c Mon Jul 09 10:21:42 2012 +0100 @@ -59,10 +59,12 @@ void set_cpuid_faulting(bool_t enable) */ static void __devinit set_cpuidmask(const struct cpuinfo_x86 *c) { + u32 eax, edx; const char *extra = ""; if (!~(opt_cpuid_mask_ecx & opt_cpuid_mask_edx & - opt_cpuid_mask_ext_ecx & opt_cpuid_mask_ext_edx)) + opt_cpuid_mask_ext_ecx & opt_cpuid_mask_ext_edx & + opt_cpuid_mask_xsave_eax)) return; /* Only family 6 supports this feature */ @@ -75,7 +77,11 @@ static void __devinit set_cpuidmask(cons wrmsr(MSR_INTEL_CPUID_FEATURE_MASK, opt_cpuid_mask_ecx, opt_cpuid_mask_edx); - if (!~(opt_cpuid_mask_ext_ecx & opt_cpuid_mask_ext_edx)) + if (~(opt_cpuid_mask_ext_ecx & opt_cpuid_mask_ext_edx)) + extra = "extended "; + else if (~opt_cpuid_mask_xsave_eax) + extra = "xsave "; + else return; extra = "extended "; break; @@ -97,11 +103,25 @@ static void __devinit set_cpuidmask(cons wrmsr(MSR_INTEL_CPUID80000001_FEATURE_MASK, opt_cpuid_mask_ext_ecx, opt_cpuid_mask_ext_edx); + if (!~opt_cpuid_mask_xsave_eax) + return; + extra = "xsave "; + break; + case 0x2a: + wrmsr(MSR_INTEL_CPUID1_FEATURE_MASK_V2, + opt_cpuid_mask_ecx, + opt_cpuid_mask_edx); + rdmsr(MSR_INTEL_CPUIDD_01_FEATURE_MASK, eax, edx); + wrmsr(MSR_INTEL_CPUIDD_01_FEATURE_MASK, + opt_cpuid_mask_xsave_eax, edx); + wrmsr(MSR_INTEL_CPUID80000001_FEATURE_MASK_V2, + opt_cpuid_mask_ext_ecx, + opt_cpuid_mask_ext_edx); return; } - printk(XENLOG_ERR "Cannot set CPU feature mask on CPU#%d\n", - smp_processor_id()); + printk(XENLOG_ERR "Cannot set CPU %sfeature mask on CPU#%d\n", + extra, smp_processor_id()); } void __devinit early_intel_workaround(struct cpuinfo_x86 *c) diff -r e8a3797e34d1 -r b394b1f87ebc xen/include/asm-x86/msr-index.h --- a/xen/include/asm-x86/msr-index.h Mon Jul 09 10:19:15 2012 +0100 +++ b/xen/include/asm-x86/msr-index.h Mon Jul 09 10:21:42 2012 +0100 @@ -495,6 +495,10 @@ #define MSR_INTEL_CPUID1_FEATURE_MASK 0x00000130 #define MSR_INTEL_CPUID80000001_FEATURE_MASK 0x00000131 +#define MSR_INTEL_CPUID1_FEATURE_MASK_V2 0x00000132 +#define MSR_INTEL_CPUID80000001_FEATURE_MASK_V2 0x00000133 +#define MSR_INTEL_CPUIDD_01_FEATURE_MASK 0x00000134 + /* Intel cpuid faulting MSRs */ #define MSR_INTEL_PLATFORM_INFO 0x000000ce #define MSR_INTEL_MISC_FEATURES_ENABLES 0x00000140 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 09 15:33:17 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Jul 2012 15:33:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SoFxa-0000x2-5O; Mon, 09 Jul 2012 15:33:14 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SoFxY-0000wb-DE for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 15:33:12 +0000 Received: from [85.158.139.83:13713] by server-4.bemta-5.messagelabs.com id FB/9E-27831-7B9FAFF4; Mon, 09 Jul 2012 15:33:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-182.messagelabs.com!1341847989!23888128!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 22972 invoked from network); 9 Jul 2012 15:33: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; 9 Jul 2012 15:33:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SoFxV-0007am-Ik for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 15:33:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SoFxV-0002sx-Ae for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 15:33:09 +0000 Message-Id: Date: Mon, 09 Jul 2012 15:33:08 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] x86: update Intel CPUID masking code to latest spec X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341825702 -3600 # Node ID b394b1f87ebcdc88aa0478a93870862bb50df040 # Parent e8a3797e34d1b6b13cd5547e43afe08ef7d95cb1 x86: update Intel CPUID masking code to latest spec ..., which adds masking of the xsave feature leaf. Also add back (and fix to actually make it do what it was supposed to do from the beginning) the printing of what specific masking couldn't be done in case the user requested something the hardware doesn't support. Signed-off-by: Jan Beulich xen-unstable changeset: 23726:fd97ca086df6 xen-unstable date: Tue Jul 19 14:14:51 2011 +0100 x86: add change missing in c/s 23726:fd97ca086df6 The early "do we need to do anything" check needs adjustment, too. Thanks to Haitao Shan for pointing this out. Signed-off-by: Jan Beulich xen-unstable changeset: 23731:48f72b389b04 xen-unstable date: Thu Jul 21 14:34:51 2011 +0100 --- diff -r e8a3797e34d1 -r b394b1f87ebc xen/arch/x86/cpu/common.c --- a/xen/arch/x86/cpu/common.c Mon Jul 09 10:19:15 2012 +0100 +++ b/xen/arch/x86/cpu/common.c Mon Jul 09 10:21:42 2012 +0100 @@ -27,10 +27,15 @@ boolean_param("noserialnumber", disable_ static bool_t __cpuinitdata use_xsave; boolean_param("xsave", use_xsave); + unsigned int __devinitdata opt_cpuid_mask_ecx = ~0u; integer_param("cpuid_mask_ecx", opt_cpuid_mask_ecx); unsigned int __devinitdata opt_cpuid_mask_edx = ~0u; integer_param("cpuid_mask_edx", opt_cpuid_mask_edx); + +unsigned int __devinitdata opt_cpuid_mask_xsave_eax = ~0u; +integer_param("cpuid_mask_xsave_eax", opt_cpuid_mask_xsave_eax); + unsigned int __devinitdata opt_cpuid_mask_ext_ecx = ~0u; integer_param("cpuid_mask_ext_ecx", opt_cpuid_mask_ext_ecx); unsigned int __devinitdata opt_cpuid_mask_ext_edx = ~0u; diff -r e8a3797e34d1 -r b394b1f87ebc xen/arch/x86/cpu/cpu.h --- a/xen/arch/x86/cpu/cpu.h Mon Jul 09 10:19:15 2012 +0100 +++ b/xen/arch/x86/cpu/cpu.h Mon Jul 09 10:21:42 2012 +0100 @@ -22,6 +22,7 @@ struct cpu_dev { extern struct cpu_dev * cpu_devs [X86_VENDOR_NUM]; extern unsigned int opt_cpuid_mask_ecx, opt_cpuid_mask_edx; +extern unsigned int opt_cpuid_mask_xsave_eax; extern unsigned int opt_cpuid_mask_ext_ecx, opt_cpuid_mask_ext_edx; extern int get_model_name(struct cpuinfo_x86 *c); diff -r e8a3797e34d1 -r b394b1f87ebc xen/arch/x86/cpu/intel.c --- a/xen/arch/x86/cpu/intel.c Mon Jul 09 10:19:15 2012 +0100 +++ b/xen/arch/x86/cpu/intel.c Mon Jul 09 10:21:42 2012 +0100 @@ -59,10 +59,12 @@ void set_cpuid_faulting(bool_t enable) */ static void __devinit set_cpuidmask(const struct cpuinfo_x86 *c) { + u32 eax, edx; const char *extra = ""; if (!~(opt_cpuid_mask_ecx & opt_cpuid_mask_edx & - opt_cpuid_mask_ext_ecx & opt_cpuid_mask_ext_edx)) + opt_cpuid_mask_ext_ecx & opt_cpuid_mask_ext_edx & + opt_cpuid_mask_xsave_eax)) return; /* Only family 6 supports this feature */ @@ -75,7 +77,11 @@ static void __devinit set_cpuidmask(cons wrmsr(MSR_INTEL_CPUID_FEATURE_MASK, opt_cpuid_mask_ecx, opt_cpuid_mask_edx); - if (!~(opt_cpuid_mask_ext_ecx & opt_cpuid_mask_ext_edx)) + if (~(opt_cpuid_mask_ext_ecx & opt_cpuid_mask_ext_edx)) + extra = "extended "; + else if (~opt_cpuid_mask_xsave_eax) + extra = "xsave "; + else return; extra = "extended "; break; @@ -97,11 +103,25 @@ static void __devinit set_cpuidmask(cons wrmsr(MSR_INTEL_CPUID80000001_FEATURE_MASK, opt_cpuid_mask_ext_ecx, opt_cpuid_mask_ext_edx); + if (!~opt_cpuid_mask_xsave_eax) + return; + extra = "xsave "; + break; + case 0x2a: + wrmsr(MSR_INTEL_CPUID1_FEATURE_MASK_V2, + opt_cpuid_mask_ecx, + opt_cpuid_mask_edx); + rdmsr(MSR_INTEL_CPUIDD_01_FEATURE_MASK, eax, edx); + wrmsr(MSR_INTEL_CPUIDD_01_FEATURE_MASK, + opt_cpuid_mask_xsave_eax, edx); + wrmsr(MSR_INTEL_CPUID80000001_FEATURE_MASK_V2, + opt_cpuid_mask_ext_ecx, + opt_cpuid_mask_ext_edx); return; } - printk(XENLOG_ERR "Cannot set CPU feature mask on CPU#%d\n", - smp_processor_id()); + printk(XENLOG_ERR "Cannot set CPU %sfeature mask on CPU#%d\n", + extra, smp_processor_id()); } void __devinit early_intel_workaround(struct cpuinfo_x86 *c) diff -r e8a3797e34d1 -r b394b1f87ebc xen/include/asm-x86/msr-index.h --- a/xen/include/asm-x86/msr-index.h Mon Jul 09 10:19:15 2012 +0100 +++ b/xen/include/asm-x86/msr-index.h Mon Jul 09 10:21:42 2012 +0100 @@ -495,6 +495,10 @@ #define MSR_INTEL_CPUID1_FEATURE_MASK 0x00000130 #define MSR_INTEL_CPUID80000001_FEATURE_MASK 0x00000131 +#define MSR_INTEL_CPUID1_FEATURE_MASK_V2 0x00000132 +#define MSR_INTEL_CPUID80000001_FEATURE_MASK_V2 0x00000133 +#define MSR_INTEL_CPUIDD_01_FEATURE_MASK 0x00000134 + /* Intel cpuid faulting MSRs */ #define MSR_INTEL_PLATFORM_INFO 0x000000ce #define MSR_INTEL_MISC_FEATURES_ENABLES 0x00000140 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 09 15:33:17 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Jul 2012 15:33:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SoFxa-0000x7-8N; Mon, 09 Jul 2012 15:33:14 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SoFxZ-0000wc-2C for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 15:33:13 +0000 Received: from [85.158.139.83:63289] by server-5.bemta-5.messagelabs.com id 21/80-02722-8B9FAFF4; Mon, 09 Jul 2012 15:33:12 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-182.messagelabs.com!1341847990!16575918!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 10254 invoked from network); 9 Jul 2012 15:33:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 9 Jul 2012 15:33:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SoFxW-0007as-Bu for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 15:33:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SoFxW-0002tS-AS for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 15:33:10 +0000 Message-Id: Date: Mon, 09 Jul 2012 15:33:09 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] xen, vtd: Fix device check for devices behind PCIe-to-PCI bridges X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User George Dunlap # Date 1341825778 -3600 # Node ID 10d5cc3094d6890167b8dbdf961259f9e578cd93 # Parent 9fe2a77b740d3d591e994d687bac31484506920b xen, vtd: Fix device check for devices behind PCIe-to-PCI bridges On some systems, requests devices behind a PCIe-to-PCI bridge all appear to the IOMMU as though they come from from slot 0, function 0 on that device; so the mapping code much punch a hole for X:0.0 in the IOMMU for such devices. When punching the hole, if that device has already been mapped once, we simply need to check ownership to make sure it's legal. To do so, domain_context_mapping_one() will look up the device for the mapping with pci_get_pdev() and look for the owner. However, if there is no device in X:0.0, this look up will fail. Rather than returning -ENODEV in this situation (causing a failure in mapping the device), try to get the domain ownership from the iommu context mapping itself. Signed-off-by: George Dunlap xen-unstable changeset: 23813:5535d7ce2673 xen-unstable date: Mon Sep 05 15:00:46 2011 +0100 --- diff -r 9fe2a77b740d -r 10d5cc3094d6 xen/drivers/passthrough/vtd/iommu.c --- a/xen/drivers/passthrough/vtd/iommu.c Mon Jul 09 10:22:24 2012 +0100 +++ b/xen/drivers/passthrough/vtd/iommu.c Mon Jul 09 10:22:58 2012 +0100 @@ -118,6 +118,27 @@ static int context_set_domain_id(struct return 0; } +static int context_get_domain_id(struct context_entry *context, + struct iommu *iommu) +{ + unsigned long dom_index, nr_dom; + int domid = -1; + + if (iommu && context) + { + nr_dom = cap_ndoms(iommu->cap); + + dom_index = context_domain_id(*context); + + if ( dom_index < nr_dom && iommu->domid_map) + domid = iommu->domid_map[dom_index]; + else + dprintk(XENLOG_DEBUG VTDPREFIX, "%s: dom_index %lu exceeds nr_dom %lu or iommu has no domid_map\n", + __func__, dom_index, nr_dom); + } + return domid; +} + static struct intel_iommu *__init alloc_intel_iommu(void) { struct intel_iommu *intel; @@ -1278,7 +1299,6 @@ int domain_context_mapping_one( struct hvm_iommu *hd = domain_hvm_iommu(domain); struct context_entry *context, *context_entries; u64 maddr, pgd_maddr; - struct pci_dev *pdev = NULL; int agaw; ASSERT(spin_is_locked(&pcidevs_lock)); @@ -1290,12 +1310,45 @@ int domain_context_mapping_one( if ( context_present(*context) ) { int res = 0; + struct pci_dev *pdev = NULL; + /* First try to get domain ownership from device structure. If that's + * not available, try to read it from the context itself. */ pdev = pci_get_pdev(bus, devfn); - if (!pdev) - res = -ENODEV; - else if (pdev->domain != domain) - res = -EINVAL; + if ( pdev ) + { + if ( pdev->domain != domain ) + { + dprintk(XENLOG_INFO VTDPREFIX, "d%d: bdf = %x:%x.%x owned by d%d!", + domain->domain_id, + bus, PCI_SLOT(devfn), PCI_FUNC(devfn), + (pdev->domain) + ? pdev->domain->domain_id : -1); + res = -EINVAL; + } + } + else + { + int cdomain; + cdomain = context_get_domain_id(context, iommu); + + if ( cdomain < 0 ) + { + dprintk(VTDPREFIX, "d%d: bdf = %x:%x.%x mapped, but can't find owner!\n", + domain->domain_id, + bus, PCI_SLOT(devfn), PCI_FUNC(devfn)); + res = -EINVAL; + } + else if ( cdomain != domain->domain_id ) + { + dprintk(XENLOG_INFO VTDPREFIX, "d%d: bdf = %x:%x.%x already mapped to d%d!", + domain->domain_id, + bus, PCI_SLOT(devfn), PCI_FUNC(devfn), + cdomain); + res = -EINVAL; + } + } + unmap_vtd_domain_page(context_entries); spin_unlock(&iommu->lock); return res; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 09 15:33:17 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Jul 2012 15:33:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SoFxa-0000x7-8N; Mon, 09 Jul 2012 15:33:14 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SoFxZ-0000wc-2C for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 15:33:13 +0000 Received: from [85.158.139.83:63289] by server-5.bemta-5.messagelabs.com id 21/80-02722-8B9FAFF4; Mon, 09 Jul 2012 15:33:12 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-182.messagelabs.com!1341847990!16575918!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 10254 invoked from network); 9 Jul 2012 15:33:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 9 Jul 2012 15:33:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SoFxW-0007as-Bu for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 15:33:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SoFxW-0002tS-AS for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 15:33:10 +0000 Message-Id: Date: Mon, 09 Jul 2012 15:33:09 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] xen, vtd: Fix device check for devices behind PCIe-to-PCI bridges X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User George Dunlap # Date 1341825778 -3600 # Node ID 10d5cc3094d6890167b8dbdf961259f9e578cd93 # Parent 9fe2a77b740d3d591e994d687bac31484506920b xen, vtd: Fix device check for devices behind PCIe-to-PCI bridges On some systems, requests devices behind a PCIe-to-PCI bridge all appear to the IOMMU as though they come from from slot 0, function 0 on that device; so the mapping code much punch a hole for X:0.0 in the IOMMU for such devices. When punching the hole, if that device has already been mapped once, we simply need to check ownership to make sure it's legal. To do so, domain_context_mapping_one() will look up the device for the mapping with pci_get_pdev() and look for the owner. However, if there is no device in X:0.0, this look up will fail. Rather than returning -ENODEV in this situation (causing a failure in mapping the device), try to get the domain ownership from the iommu context mapping itself. Signed-off-by: George Dunlap xen-unstable changeset: 23813:5535d7ce2673 xen-unstable date: Mon Sep 05 15:00:46 2011 +0100 --- diff -r 9fe2a77b740d -r 10d5cc3094d6 xen/drivers/passthrough/vtd/iommu.c --- a/xen/drivers/passthrough/vtd/iommu.c Mon Jul 09 10:22:24 2012 +0100 +++ b/xen/drivers/passthrough/vtd/iommu.c Mon Jul 09 10:22:58 2012 +0100 @@ -118,6 +118,27 @@ static int context_set_domain_id(struct return 0; } +static int context_get_domain_id(struct context_entry *context, + struct iommu *iommu) +{ + unsigned long dom_index, nr_dom; + int domid = -1; + + if (iommu && context) + { + nr_dom = cap_ndoms(iommu->cap); + + dom_index = context_domain_id(*context); + + if ( dom_index < nr_dom && iommu->domid_map) + domid = iommu->domid_map[dom_index]; + else + dprintk(XENLOG_DEBUG VTDPREFIX, "%s: dom_index %lu exceeds nr_dom %lu or iommu has no domid_map\n", + __func__, dom_index, nr_dom); + } + return domid; +} + static struct intel_iommu *__init alloc_intel_iommu(void) { struct intel_iommu *intel; @@ -1278,7 +1299,6 @@ int domain_context_mapping_one( struct hvm_iommu *hd = domain_hvm_iommu(domain); struct context_entry *context, *context_entries; u64 maddr, pgd_maddr; - struct pci_dev *pdev = NULL; int agaw; ASSERT(spin_is_locked(&pcidevs_lock)); @@ -1290,12 +1310,45 @@ int domain_context_mapping_one( if ( context_present(*context) ) { int res = 0; + struct pci_dev *pdev = NULL; + /* First try to get domain ownership from device structure. If that's + * not available, try to read it from the context itself. */ pdev = pci_get_pdev(bus, devfn); - if (!pdev) - res = -ENODEV; - else if (pdev->domain != domain) - res = -EINVAL; + if ( pdev ) + { + if ( pdev->domain != domain ) + { + dprintk(XENLOG_INFO VTDPREFIX, "d%d: bdf = %x:%x.%x owned by d%d!", + domain->domain_id, + bus, PCI_SLOT(devfn), PCI_FUNC(devfn), + (pdev->domain) + ? pdev->domain->domain_id : -1); + res = -EINVAL; + } + } + else + { + int cdomain; + cdomain = context_get_domain_id(context, iommu); + + if ( cdomain < 0 ) + { + dprintk(VTDPREFIX, "d%d: bdf = %x:%x.%x mapped, but can't find owner!\n", + domain->domain_id, + bus, PCI_SLOT(devfn), PCI_FUNC(devfn)); + res = -EINVAL; + } + else if ( cdomain != domain->domain_id ) + { + dprintk(XENLOG_INFO VTDPREFIX, "d%d: bdf = %x:%x.%x already mapped to d%d!", + domain->domain_id, + bus, PCI_SLOT(devfn), PCI_FUNC(devfn), + cdomain); + res = -EINVAL; + } + } + unmap_vtd_domain_page(context_entries); spin_unlock(&iommu->lock); return res; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 09 15:33:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Jul 2012 15: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 1SoFxc-0000xf-Fy; Mon, 09 Jul 2012 15: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 1SoFxa-0000xB-Q1 for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 15:33:15 +0000 Received: from [85.158.143.35:31962] by server-1.bemta-4.messagelabs.com id 84/E3-24392-AB9FAFF4; Mon, 09 Jul 2012 15:33:14 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-21.messagelabs.com!1341847992!4133664!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 2852 invoked from network); 9 Jul 2012 15:33:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 9 Jul 2012 15:33:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SoFxX-0007b1-Qj for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 15:33:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SoFxX-0002uj-PR for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 15:33:11 +0000 Message-Id: Date: Mon, 09 Jul 2012 15:33:11 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] xen: Fix schedule()'s grabbing of the schedule lock X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User George Dunlap # Date 1341825884 -3600 # Node ID c1f43d07dc1ed4203afe4f0a207da04213c53e3e # Parent 01366a3245870bed6666f98d498528697d082701 xen: Fix schedule()'s grabbing of the schedule lock Because the location of the lock can change between the time you read it and the time you grab it, the per-cpu schedule locks need to check after lock acquisition that the lock location hasn't changed, and release and re-try if so. This change was effected throughout the source code, but one very important place was apparently missed: in schedule() itself. Signed-off-by: George Dunlap Committed-by: Keir Fraser xen-unstable changeset: 25162:478bec603d3d xen-unstable date: Tue Apr 10 10:41:30 2012 +0100 --- diff -r 01366a324587 -r c1f43d07dc1e xen/common/schedule.c --- a/xen/common/schedule.c Mon Jul 09 10:23:57 2012 +0100 +++ b/xen/common/schedule.c Mon Jul 09 10:24:44 2012 +0100 @@ -1122,6 +1122,7 @@ static void schedule(void) bool_t tasklet_work_scheduled = 0; struct schedule_data *sd; struct task_slice next_slice; + int cpu = smp_processor_id(); ASSERT(!in_atomic()); @@ -1146,7 +1147,7 @@ static void schedule(void) BUG(); } - spin_lock_irq(sd->schedule_lock); + pcpu_schedule_lock_irq(cpu); stop_timer(&sd->s_timer); @@ -1163,7 +1164,7 @@ static void schedule(void) if ( unlikely(prev == next) ) { - spin_unlock_irq(sd->schedule_lock); + pcpu_schedule_unlock_irq(cpu); trace_continue_running(next); return continue_running(prev); } @@ -1201,7 +1202,7 @@ static void schedule(void) ASSERT(!next->is_running); next->is_running = 1; - spin_unlock_irq(sd->schedule_lock); + pcpu_schedule_unlock_irq(cpu); perfc_incr(sched_ctx); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 09 15:33:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Jul 2012 15: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 1SoFxc-0000xf-Fy; Mon, 09 Jul 2012 15: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 1SoFxa-0000xB-Q1 for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 15:33:15 +0000 Received: from [85.158.143.35:31962] by server-1.bemta-4.messagelabs.com id 84/E3-24392-AB9FAFF4; Mon, 09 Jul 2012 15:33:14 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-21.messagelabs.com!1341847992!4133664!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 2852 invoked from network); 9 Jul 2012 15:33:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 9 Jul 2012 15:33:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SoFxX-0007b1-Qj for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 15:33:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SoFxX-0002uj-PR for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 15:33:11 +0000 Message-Id: Date: Mon, 09 Jul 2012 15:33:11 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] xen: Fix schedule()'s grabbing of the schedule lock X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User George Dunlap # Date 1341825884 -3600 # Node ID c1f43d07dc1ed4203afe4f0a207da04213c53e3e # Parent 01366a3245870bed6666f98d498528697d082701 xen: Fix schedule()'s grabbing of the schedule lock Because the location of the lock can change between the time you read it and the time you grab it, the per-cpu schedule locks need to check after lock acquisition that the lock location hasn't changed, and release and re-try if so. This change was effected throughout the source code, but one very important place was apparently missed: in schedule() itself. Signed-off-by: George Dunlap Committed-by: Keir Fraser xen-unstable changeset: 25162:478bec603d3d xen-unstable date: Tue Apr 10 10:41:30 2012 +0100 --- diff -r 01366a324587 -r c1f43d07dc1e xen/common/schedule.c --- a/xen/common/schedule.c Mon Jul 09 10:23:57 2012 +0100 +++ b/xen/common/schedule.c Mon Jul 09 10:24:44 2012 +0100 @@ -1122,6 +1122,7 @@ static void schedule(void) bool_t tasklet_work_scheduled = 0; struct schedule_data *sd; struct task_slice next_slice; + int cpu = smp_processor_id(); ASSERT(!in_atomic()); @@ -1146,7 +1147,7 @@ static void schedule(void) BUG(); } - spin_lock_irq(sd->schedule_lock); + pcpu_schedule_lock_irq(cpu); stop_timer(&sd->s_timer); @@ -1163,7 +1164,7 @@ static void schedule(void) if ( unlikely(prev == next) ) { - spin_unlock_irq(sd->schedule_lock); + pcpu_schedule_unlock_irq(cpu); trace_continue_running(next); return continue_running(prev); } @@ -1201,7 +1202,7 @@ static void schedule(void) ASSERT(!next->is_running); next->is_running = 1; - spin_unlock_irq(sd->schedule_lock); + pcpu_schedule_unlock_irq(cpu); perfc_incr(sched_ctx); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 09 15:33:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Jul 2012 15: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 1SoFxb-0000xO-Av; Mon, 09 Jul 2012 15:33:15 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SoFxZ-0000wq-O5 for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 15:33:13 +0000 Received: from [85.158.139.83:63322] by server-12.bemta-5.messagelabs.com id D7/80-25233-8B9FAFF4; Mon, 09 Jul 2012 15:33:12 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-182.messagelabs.com!1341847991!27877547!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 17926 invoked from network); 9 Jul 2012 15:33:12 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 9 Jul 2012 15:33:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SoFxW-0007av-R5 for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 15:33:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SoFxW-0002th-Pd for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 15:33:10 +0000 Message-Id: Date: Mon, 09 Jul 2012 15:33:10 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] x86/cpuidle: add Westmere-EX support to hw residencies reading logic X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Jan Beulich # Date 1341825810 -3600 # Node ID 3b50ea3909a87473b6c19849099f156be53599c5 # Parent 10d5cc3094d6890167b8dbdf961259f9e578cd93 x86/cpuidle: add Westmere-EX support to hw residencies reading logic This is in accordance with http://software.intel.com/en-us/articles/intel-processor-identification-with-cpuid-model-and-family-numbers/ Signed-off-by: Jan Beulich Acked-by: Haitao Shan xen-unstable changeset: 24261:64088ba60263 xen-unstable date: Wed Nov 30 10:23:41 2011 +0100 --- diff -r 10d5cc3094d6 -r 3b50ea3909a8 xen/arch/x86/acpi/cpu_idle.c --- a/xen/arch/x86/acpi/cpu_idle.c Mon Jul 09 10:22:58 2012 +0100 +++ b/xen/arch/x86/acpi/cpu_idle.c Mon Jul 09 10:23:30 2012 +0100 @@ -111,6 +111,7 @@ static void do_get_hw_residencies(void * /* Westmere */ case 0x25: case 0x2C: + case 0x2F: GET_PC3_RES(hw_res->pc3); GET_PC6_RES(hw_res->pc6); GET_PC7_RES(hw_res->pc7); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 09 15:33:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Jul 2012 15: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 1SoFxb-0000xO-Av; Mon, 09 Jul 2012 15:33:15 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SoFxZ-0000wq-O5 for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 15:33:13 +0000 Received: from [85.158.139.83:63322] by server-12.bemta-5.messagelabs.com id D7/80-25233-8B9FAFF4; Mon, 09 Jul 2012 15:33:12 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-182.messagelabs.com!1341847991!27877547!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 17926 invoked from network); 9 Jul 2012 15:33:12 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 9 Jul 2012 15:33:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SoFxW-0007av-R5 for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 15:33:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SoFxW-0002th-Pd for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 15:33:10 +0000 Message-Id: Date: Mon, 09 Jul 2012 15:33:10 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] x86/cpuidle: add Westmere-EX support to hw residencies reading logic X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Jan Beulich # Date 1341825810 -3600 # Node ID 3b50ea3909a87473b6c19849099f156be53599c5 # Parent 10d5cc3094d6890167b8dbdf961259f9e578cd93 x86/cpuidle: add Westmere-EX support to hw residencies reading logic This is in accordance with http://software.intel.com/en-us/articles/intel-processor-identification-with-cpuid-model-and-family-numbers/ Signed-off-by: Jan Beulich Acked-by: Haitao Shan xen-unstable changeset: 24261:64088ba60263 xen-unstable date: Wed Nov 30 10:23:41 2011 +0100 --- diff -r 10d5cc3094d6 -r 3b50ea3909a8 xen/arch/x86/acpi/cpu_idle.c --- a/xen/arch/x86/acpi/cpu_idle.c Mon Jul 09 10:22:58 2012 +0100 +++ b/xen/arch/x86/acpi/cpu_idle.c Mon Jul 09 10:23:30 2012 +0100 @@ -111,6 +111,7 @@ static void do_get_hw_residencies(void * /* Westmere */ case 0x25: case 0x2C: + case 0x2F: GET_PC3_RES(hw_res->pc3); GET_PC6_RES(hw_res->pc6); GET_PC7_RES(hw_res->pc7); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 09 15:33:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Jul 2012 15: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 1SoFxc-0000xa-Df; Mon, 09 Jul 2012 15:33:16 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SoFxa-0000wW-N5 for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 15:33:14 +0000 Received: from [85.158.139.83:63403] by server-9.bemta-5.messagelabs.com id 83/40-01069-AB9FAFF4; Mon, 09 Jul 2012 15:33:14 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-182.messagelabs.com!1341847992!27834448!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 15592 invoked from network); 9 Jul 2012 15:33:13 -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; 9 Jul 2012 15:33:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SoFxY-0007b4-D3 for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 15:33:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SoFxY-0002uy-8S for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 15:33:12 +0000 Message-Id: Date: Mon, 09 Jul 2012 15:33:11 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] SVM: fix performance decrease with asid assignment X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Christoph Egger # Date 1341826130 -3600 # Node ID 1d437f7fb15d1582ed4be5df461fe7d49fba693b # Parent c1f43d07dc1ed4203afe4f0a207da04213c53e3e SVM: fix performance decrease with asid assignment Do not clear asid cleanbit unconditionally. This shaves off 100 cycles from the VMRUN instruction. Signed-off-by: Christoph Egger Committed-by: Jan Beulich xen-unstable changeset: 25482:34c725807d21 xen-unstable date: Wed Jun 13 11:51:26 2012 +0200 --- diff -r c1f43d07dc1e -r 1d437f7fb15d xen/arch/x86/hvm/svm/asid.c --- a/xen/arch/x86/hvm/svm/asid.c Mon Jul 09 10:24:44 2012 +0100 +++ b/xen/arch/x86/hvm/svm/asid.c Mon Jul 09 10:28:50 2012 +0100 @@ -52,7 +52,8 @@ void svm_asid_handle_vmrun(void) return; } - vmcb_set_guest_asid(vmcb, curr->arch.hvm_vcpu.asid); + if (vmcb_get_guest_asid(vmcb) != curr->arch.hvm_vcpu.asid) + vmcb_set_guest_asid(vmcb, curr->arch.hvm_vcpu.asid); vmcb->tlb_control = need_flush; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 09 15:33:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Jul 2012 15: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 1SoFxc-0000xa-Df; Mon, 09 Jul 2012 15:33:16 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SoFxa-0000wW-N5 for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 15:33:14 +0000 Received: from [85.158.139.83:63403] by server-9.bemta-5.messagelabs.com id 83/40-01069-AB9FAFF4; Mon, 09 Jul 2012 15:33:14 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-182.messagelabs.com!1341847992!27834448!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 15592 invoked from network); 9 Jul 2012 15:33:13 -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; 9 Jul 2012 15:33:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SoFxY-0007b4-D3 for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 15:33:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SoFxY-0002uy-8S for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 15:33:12 +0000 Message-Id: Date: Mon, 09 Jul 2012 15:33:11 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] SVM: fix performance decrease with asid assignment X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Christoph Egger # Date 1341826130 -3600 # Node ID 1d437f7fb15d1582ed4be5df461fe7d49fba693b # Parent c1f43d07dc1ed4203afe4f0a207da04213c53e3e SVM: fix performance decrease with asid assignment Do not clear asid cleanbit unconditionally. This shaves off 100 cycles from the VMRUN instruction. Signed-off-by: Christoph Egger Committed-by: Jan Beulich xen-unstable changeset: 25482:34c725807d21 xen-unstable date: Wed Jun 13 11:51:26 2012 +0200 --- diff -r c1f43d07dc1e -r 1d437f7fb15d xen/arch/x86/hvm/svm/asid.c --- a/xen/arch/x86/hvm/svm/asid.c Mon Jul 09 10:24:44 2012 +0100 +++ b/xen/arch/x86/hvm/svm/asid.c Mon Jul 09 10:28:50 2012 +0100 @@ -52,7 +52,8 @@ void svm_asid_handle_vmrun(void) return; } - vmcb_set_guest_asid(vmcb, curr->arch.hvm_vcpu.asid); + if (vmcb_get_guest_asid(vmcb) != curr->arch.hvm_vcpu.asid) + vmcb_set_guest_asid(vmcb, curr->arch.hvm_vcpu.asid); vmcb->tlb_control = need_flush; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 09 15:33:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Jul 2012 15: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 1SoFxf-0000zq-Oe; Mon, 09 Jul 2012 15:33:19 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SoFxe-0000wk-AN for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 15:33:18 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-27.messagelabs.com!1341847990!8893805!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 8776 invoked from network); 9 Jul 2012 15:33:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 9 Jul 2012 15:33:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SoFxW-0007ap-2X for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 15:33:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SoFxV-0002tC-Qi for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 15:33:09 +0000 Message-Id: Date: Mon, 09 Jul 2012 15:33:09 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] pm: don't truncate processors' ACPI IDs to 8 bits X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341825744 -3600 # Node ID 9fe2a77b740d3d591e994d687bac31484506920b # Parent b394b1f87ebcdc88aa0478a93870862bb50df040 pm: don't truncate processors' ACPI IDs to 8 bits This is just another adjustment to allow systems with very many CPUs (or unusual ACPI IDs) to be properly power-managed. Signed-off-by: Jan Beulich xen-unstable changeset: 23781:0849b0e59e24 xen-unstable date: Mon Aug 22 10:10:39 2011 +0100 --- diff -r b394b1f87ebc -r 9fe2a77b740d xen/arch/ia64/linux-xen/acpi.c --- a/xen/arch/ia64/linux-xen/acpi.c Mon Jul 09 10:21:42 2012 +0100 +++ b/xen/arch/ia64/linux-xen/acpi.c Mon Jul 09 10:22:24 2012 +0100 @@ -223,11 +223,14 @@ static u16 ia64_acpiid_to_sapicid[ MAX_L {[0 ... MAX_LOCAL_SAPIC - 1] = 0xffff }; /* acpi id to cpu id */ -int get_cpu_id(u8 acpi_id) +int get_cpu_id(u32 acpi_id) { int i; u16 apic_id; + if ( acpi_id >= MAX_LOCAL_SAPIC ) + return -EINVAL; + apic_id = ia64_acpiid_to_sapicid[acpi_id]; if ( apic_id == 0xffff ) return -EINVAL; diff -r b394b1f87ebc -r 9fe2a77b740d xen/arch/x86/acpi/cpu_idle.c --- a/xen/arch/x86/acpi/cpu_idle.c Mon Jul 09 10:21:42 2012 +0100 +++ b/xen/arch/x86/acpi/cpu_idle.c Mon Jul 09 10:22:24 2012 +0100 @@ -902,11 +902,14 @@ static void set_cx( acpi_power->safe_state = cx; } -int get_cpu_id(u8 acpi_id) +int get_cpu_id(u32 acpi_id) { int i; u32 apic_id; + if ( acpi_id >= MAX_MADT_ENTRIES ) + return -1; + apic_id = x86_acpiid_to_apicid[acpi_id]; if ( apic_id == BAD_APICID ) return -1; @@ -983,7 +986,7 @@ long set_cx_pminfo(uint32_t cpu, struct print_cx_pminfo(cpu, power); /* map from acpi_id to cpu_id */ - cpu_id = get_cpu_id((u8)cpu); + cpu_id = get_cpu_id(cpu); if ( cpu_id == -1 ) { printk(XENLOG_ERR "no cpu_id for acpi_id %d\n", cpu); diff -r b394b1f87ebc -r 9fe2a77b740d xen/include/acpi/cpufreq/processor_perf.h --- a/xen/include/acpi/cpufreq/processor_perf.h Mon Jul 09 10:21:42 2012 +0100 +++ b/xen/include/acpi/cpufreq/processor_perf.h Mon Jul 09 10:22:24 2012 +0100 @@ -6,7 +6,7 @@ #define XEN_PX_INIT 0x80000000 -int get_cpu_id(u8); +int get_cpu_id(u32); int powernow_cpufreq_init(void); unsigned int powernow_register_driver(void); unsigned int get_measured_perf(unsigned int cpu, unsigned int flag); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 09 15:33:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Jul 2012 15: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 1SoFxf-0000zq-Oe; Mon, 09 Jul 2012 15:33:19 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SoFxe-0000wk-AN for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 15:33:18 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-27.messagelabs.com!1341847990!8893805!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 8776 invoked from network); 9 Jul 2012 15:33:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 9 Jul 2012 15:33:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SoFxW-0007ap-2X for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 15:33:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SoFxV-0002tC-Qi for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 15:33:09 +0000 Message-Id: Date: Mon, 09 Jul 2012 15:33:09 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] pm: don't truncate processors' ACPI IDs to 8 bits X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341825744 -3600 # Node ID 9fe2a77b740d3d591e994d687bac31484506920b # Parent b394b1f87ebcdc88aa0478a93870862bb50df040 pm: don't truncate processors' ACPI IDs to 8 bits This is just another adjustment to allow systems with very many CPUs (or unusual ACPI IDs) to be properly power-managed. Signed-off-by: Jan Beulich xen-unstable changeset: 23781:0849b0e59e24 xen-unstable date: Mon Aug 22 10:10:39 2011 +0100 --- diff -r b394b1f87ebc -r 9fe2a77b740d xen/arch/ia64/linux-xen/acpi.c --- a/xen/arch/ia64/linux-xen/acpi.c Mon Jul 09 10:21:42 2012 +0100 +++ b/xen/arch/ia64/linux-xen/acpi.c Mon Jul 09 10:22:24 2012 +0100 @@ -223,11 +223,14 @@ static u16 ia64_acpiid_to_sapicid[ MAX_L {[0 ... MAX_LOCAL_SAPIC - 1] = 0xffff }; /* acpi id to cpu id */ -int get_cpu_id(u8 acpi_id) +int get_cpu_id(u32 acpi_id) { int i; u16 apic_id; + if ( acpi_id >= MAX_LOCAL_SAPIC ) + return -EINVAL; + apic_id = ia64_acpiid_to_sapicid[acpi_id]; if ( apic_id == 0xffff ) return -EINVAL; diff -r b394b1f87ebc -r 9fe2a77b740d xen/arch/x86/acpi/cpu_idle.c --- a/xen/arch/x86/acpi/cpu_idle.c Mon Jul 09 10:21:42 2012 +0100 +++ b/xen/arch/x86/acpi/cpu_idle.c Mon Jul 09 10:22:24 2012 +0100 @@ -902,11 +902,14 @@ static void set_cx( acpi_power->safe_state = cx; } -int get_cpu_id(u8 acpi_id) +int get_cpu_id(u32 acpi_id) { int i; u32 apic_id; + if ( acpi_id >= MAX_MADT_ENTRIES ) + return -1; + apic_id = x86_acpiid_to_apicid[acpi_id]; if ( apic_id == BAD_APICID ) return -1; @@ -983,7 +986,7 @@ long set_cx_pminfo(uint32_t cpu, struct print_cx_pminfo(cpu, power); /* map from acpi_id to cpu_id */ - cpu_id = get_cpu_id((u8)cpu); + cpu_id = get_cpu_id(cpu); if ( cpu_id == -1 ) { printk(XENLOG_ERR "no cpu_id for acpi_id %d\n", cpu); diff -r b394b1f87ebc -r 9fe2a77b740d xen/include/acpi/cpufreq/processor_perf.h --- a/xen/include/acpi/cpufreq/processor_perf.h Mon Jul 09 10:21:42 2012 +0100 +++ b/xen/include/acpi/cpufreq/processor_perf.h Mon Jul 09 10:22:24 2012 +0100 @@ -6,7 +6,7 @@ #define XEN_PX_INIT 0x80000000 -int get_cpu_id(u8); +int get_cpu_id(u32); int powernow_cpufreq_init(void); unsigned int powernow_register_driver(void); unsigned int get_measured_perf(unsigned int cpu, unsigned int flag); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 09 15:33:21 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Jul 2012 15: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 1SoFxf-0000zf-Ib; Mon, 09 Jul 2012 15:33:19 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SoFxd-0000y6-F6 for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 15:33:17 +0000 Received: from [85.158.143.35:48539] by server-3.bemta-4.messagelabs.com id 67/03-05808-CB9FAFF4; Mon, 09 Jul 2012 15:33:16 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-21.messagelabs.com!1341847993!15042882!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 3592 invoked from network); 9 Jul 2012 15:33:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 9 Jul 2012 15:33:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SoFxY-0007b7-Qp for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 15:33:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SoFxY-0002vD-PJ for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 15:33:12 +0000 Message-Id: Date: Mon, 09 Jul 2012 15:33:12 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] x86/mm: fix mod_l1_entry() return value when encountering r/o MMIO page X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341826216 -3600 # Node ID ff523faf2be10a86b4f1452533db2271e0d88ff3 # Parent 1d437f7fb15d1582ed4be5df461fe7d49fba693b x86/mm: fix mod_l1_entry() return value when encountering r/o MMIO page While putting together the workaround announced in http://lists.xen.org/archives/html/xen-devel/2012-06/msg00709.html, I found that mod_l1_entry(), upon encountering a set bit in mmio_ro_ranges, would return 1 instead of 0 (the removal of the write permission is supposed to be entirely transparent to the caller, even more so to the calling guest). Signed-off-by: Jan Beulich Acked-by: Keir Fraser xen-unstable changeset: 25487:baa85434d0ec xen-unstable date: Thu Jun 21 11:30:59 2012 +0200 --- diff -r 1d437f7fb15d -r ff523faf2be1 xen/arch/x86/mm.c --- a/xen/arch/x86/mm.c Mon Jul 09 10:28:50 2012 +0100 +++ b/xen/arch/x86/mm.c Mon Jul 09 10:30:16 2012 +0100 @@ -1801,6 +1801,7 @@ static int mod_l1_entry(l1_pgentry_t *pl return 0; case -1: l1e_remove_flags(nl1e, _PAGE_RW); + rc = 0; break; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 09 15:33:21 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Jul 2012 15: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 1SoFxf-0000zf-Ib; Mon, 09 Jul 2012 15:33:19 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SoFxd-0000y6-F6 for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 15:33:17 +0000 Received: from [85.158.143.35:48539] by server-3.bemta-4.messagelabs.com id 67/03-05808-CB9FAFF4; Mon, 09 Jul 2012 15:33:16 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-21.messagelabs.com!1341847993!15042882!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 3592 invoked from network); 9 Jul 2012 15:33:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 9 Jul 2012 15:33:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SoFxY-0007b7-Qp for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 15:33:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SoFxY-0002vD-PJ for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 15:33:12 +0000 Message-Id: Date: Mon, 09 Jul 2012 15:33:12 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] x86/mm: fix mod_l1_entry() return value when encountering r/o MMIO page X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341826216 -3600 # Node ID ff523faf2be10a86b4f1452533db2271e0d88ff3 # Parent 1d437f7fb15d1582ed4be5df461fe7d49fba693b x86/mm: fix mod_l1_entry() return value when encountering r/o MMIO page While putting together the workaround announced in http://lists.xen.org/archives/html/xen-devel/2012-06/msg00709.html, I found that mod_l1_entry(), upon encountering a set bit in mmio_ro_ranges, would return 1 instead of 0 (the removal of the write permission is supposed to be entirely transparent to the caller, even more so to the calling guest). Signed-off-by: Jan Beulich Acked-by: Keir Fraser xen-unstable changeset: 25487:baa85434d0ec xen-unstable date: Thu Jun 21 11:30:59 2012 +0200 --- diff -r 1d437f7fb15d -r ff523faf2be1 xen/arch/x86/mm.c --- a/xen/arch/x86/mm.c Mon Jul 09 10:28:50 2012 +0100 +++ b/xen/arch/x86/mm.c Mon Jul 09 10:30:16 2012 +0100 @@ -1801,6 +1801,7 @@ static int mod_l1_entry(l1_pgentry_t *pl return 0; case -1: l1e_remove_flags(nl1e, _PAGE_RW); + rc = 0; break; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 09 15:33:21 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Jul 2012 15: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 1SoFxf-0000zw-R3; Mon, 09 Jul 2012 15:33:19 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SoFxf-0000wv-Aj for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 15:33:19 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-27.messagelabs.com!1341847991!6478630!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 4588 invoked from network); 9 Jul 2012 15:33:12 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 9 Jul 2012 15:33:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SoFxX-0007ay-Ae for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 15:33:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SoFxX-0002uI-9J for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 15:33:11 +0000 Message-Id: Date: Mon, 09 Jul 2012 15:33:10 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] x86/cpuidle: deny access to the I/O port used for EM_SYSIO X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341825837 -3600 # Node ID 01366a3245870bed6666f98d498528697d082701 # Parent 3b50ea3909a87473b6c19849099f156be53599c5 x86/cpuidle: deny access to the I/O port used for EM_SYSIO Nothing, not even Dom0, should fiddle with this. Signed-off-by: Jan Beulich Acked-by: Keir Fraser xen-unstable changeset: 24970:33980e36597b xen-unstable date: Tue Mar 06 16:41:41 2012 +0100 --- diff -r 3b50ea3909a8 -r 01366a324587 xen/arch/x86/acpi/cpu_idle.c --- a/xen/arch/x86/acpi/cpu_idle.c Mon Jul 09 10:23:30 2012 +0100 +++ b/xen/arch/x86/acpi/cpu_idle.c Mon Jul 09 10:23:57 2012 +0100 @@ -44,6 +44,7 @@ #include #include #include +#include #include #include #include @@ -888,6 +889,9 @@ static void set_cx( cx->entry_method = ACPI_CSTATE_EM_HALT; break; case ACPI_ADR_SPACE_SYSTEM_IO: + if ( ioports_deny_access(dom0, cx->address, cx->address) ) + printk(XENLOG_WARNING "Could not deny access to port %04x\n", + cx->address); cx->entry_method = ACPI_CSTATE_EM_SYSIO; break; default: _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 09 15:33:21 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Jul 2012 15: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 1SoFxf-0000zw-R3; Mon, 09 Jul 2012 15:33:19 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SoFxf-0000wv-Aj for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 15:33:19 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-27.messagelabs.com!1341847991!6478630!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 4588 invoked from network); 9 Jul 2012 15:33:12 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 9 Jul 2012 15:33:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SoFxX-0007ay-Ae for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 15:33:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SoFxX-0002uI-9J for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 15:33:11 +0000 Message-Id: Date: Mon, 09 Jul 2012 15:33:10 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] x86/cpuidle: deny access to the I/O port used for EM_SYSIO X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341825837 -3600 # Node ID 01366a3245870bed6666f98d498528697d082701 # Parent 3b50ea3909a87473b6c19849099f156be53599c5 x86/cpuidle: deny access to the I/O port used for EM_SYSIO Nothing, not even Dom0, should fiddle with this. Signed-off-by: Jan Beulich Acked-by: Keir Fraser xen-unstable changeset: 24970:33980e36597b xen-unstable date: Tue Mar 06 16:41:41 2012 +0100 --- diff -r 3b50ea3909a8 -r 01366a324587 xen/arch/x86/acpi/cpu_idle.c --- a/xen/arch/x86/acpi/cpu_idle.c Mon Jul 09 10:23:30 2012 +0100 +++ b/xen/arch/x86/acpi/cpu_idle.c Mon Jul 09 10:23:57 2012 +0100 @@ -44,6 +44,7 @@ #include #include #include +#include #include #include #include @@ -888,6 +889,9 @@ static void set_cx( cx->entry_method = ACPI_CSTATE_EM_HALT; break; case ACPI_ADR_SPACE_SYSTEM_IO: + if ( ioports_deny_access(dom0, cx->address, cx->address) ) + printk(XENLOG_WARNING "Could not deny access to port %04x\n", + cx->address); cx->entry_method = ACPI_CSTATE_EM_SYSIO; break; default: _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 09 15:33:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Jul 2012 15: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 1SoFxm-00012f-Tn; Mon, 09 Jul 2012 15:33:26 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SoFxl-00010U-Vc for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 15:33:26 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-11.tower-27.messagelabs.com!1341847993!2093393!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 11058 invoked from network); 9 Jul 2012 15:33:14 -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; 9 Jul 2012 15:33:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SoFxZ-0007bA-Aj for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 15:33:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SoFxZ-0002vS-9H for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 15:33:13 +0000 Message-Id: Date: Mon, 09 Jul 2012 15:33:12 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] x86/PCI: fix guest_io_read() when pci_cfg_ok() denies access X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341826244 -3600 # Node ID 3ce155e77f39d0c3cc787c1cc3d6bab1ef45a1dc # Parent ff523faf2be10a86b4f1452533db2271e0d88ff3 x86/PCI: fix guest_io_read() when pci_cfg_ok() denies access For a multi-byte aligned read, this so far resulted in 0x00ff to be put in the guest's register rather than 0xffff or 0xffffffff, which in turn could confuse bus scanning functions (which, when reading vendor and/or device IDs, expect to get back all zeroes or all ones). As the value gets masked to the read width when merging back into the full result, setting the initial value to all ones should not harm any or the other cases. Signed-off-by: Jan Beulich Acked-by: Keir Fraser xen-unstable changeset: 25489:cc46bd403bc4 xen-unstable date: Fri Jun 22 10:04:30 2012 +0200 --- diff -r ff523faf2be1 -r 3ce155e77f39 xen/arch/x86/traps.c --- a/xen/arch/x86/traps.c Mon Jul 09 10:30:16 2012 +0100 +++ b/xen/arch/x86/traps.c Mon Jul 09 10:30:44 2012 +0100 @@ -1678,7 +1678,7 @@ static uint32_t guest_io_read( while ( bytes != 0 ) { unsigned int size = 1; - uint32_t sub_data = 0xff; + uint32_t sub_data = ~0; if ( (port == 0x42) || (port == 0x43) || (port == 0x61) ) { _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 09 15:33:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Jul 2012 15: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 1SoFxm-00012f-Tn; Mon, 09 Jul 2012 15:33:26 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SoFxl-00010U-Vc for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 15:33:26 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-11.tower-27.messagelabs.com!1341847993!2093393!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 11058 invoked from network); 9 Jul 2012 15:33:14 -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; 9 Jul 2012 15:33:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SoFxZ-0007bA-Aj for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 15:33:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SoFxZ-0002vS-9H for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 15:33:13 +0000 Message-Id: Date: Mon, 09 Jul 2012 15:33:12 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] x86/PCI: fix guest_io_read() when pci_cfg_ok() denies access X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1341826244 -3600 # Node ID 3ce155e77f39d0c3cc787c1cc3d6bab1ef45a1dc # Parent ff523faf2be10a86b4f1452533db2271e0d88ff3 x86/PCI: fix guest_io_read() when pci_cfg_ok() denies access For a multi-byte aligned read, this so far resulted in 0x00ff to be put in the guest's register rather than 0xffff or 0xffffffff, which in turn could confuse bus scanning functions (which, when reading vendor and/or device IDs, expect to get back all zeroes or all ones). As the value gets masked to the read width when merging back into the full result, setting the initial value to all ones should not harm any or the other cases. Signed-off-by: Jan Beulich Acked-by: Keir Fraser xen-unstable changeset: 25489:cc46bd403bc4 xen-unstable date: Fri Jun 22 10:04:30 2012 +0200 --- diff -r ff523faf2be1 -r 3ce155e77f39 xen/arch/x86/traps.c --- a/xen/arch/x86/traps.c Mon Jul 09 10:30:16 2012 +0100 +++ b/xen/arch/x86/traps.c Mon Jul 09 10:30:44 2012 +0100 @@ -1678,7 +1678,7 @@ static uint32_t guest_io_read( while ( bytes != 0 ) { unsigned int size = 1; - uint32_t sub_data = 0xff; + uint32_t sub_data = ~0; if ( (port == 0x42) || (port == 0x43) || (port == 0x61) ) { _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 09 19:00:29 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Jul 2012 19:00: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 1SoJC4-0003Ai-3P; Mon, 09 Jul 2012 19:00:24 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SoJC2-0003AJ-8K for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 19:00:22 +0000 Received: from [85.158.143.35:14913] by server-3.bemta-4.messagelabs.com id 5C/BC-05808-54A2BFF4; Mon, 09 Jul 2012 19:00:21 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-21.messagelabs.com!1341860418!5878965!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 7568 invoked from network); 9 Jul 2012 19:00:19 -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; 9 Jul 2012 19:00:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SoJBy-0001qL-GJ for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 19:00:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SoJBs-00089g-07 for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 19:00:16 +0000 Message-Id: Date: Mon, 09 Jul 2012 19:00:10 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] nestedsvm: fix DRn handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Christoph Egger # Date 1341824943 -3600 # Node ID f7b33a9f3b97b01da8e1a5740421c21577b7cee3 # Parent 7b0dc7f3ddfe65e65b0878661a6967f781023c7d nestedsvm: fix DRn handling Always use l1 vmcb to handle DRn access. This avoids to interfere with l1 hypervisor's DRn handling when it doesn't intercept DRn. Fixes Hyper-V hang. Signed-off-by: Christoph Egger Committed-by: Keir Fraser --- diff -r 7b0dc7f3ddfe -r f7b33a9f3b97 xen/arch/x86/hvm/svm/svm.c --- a/xen/arch/x86/hvm/svm/svm.c Fri Jul 06 13:17:45 2012 +0100 +++ b/xen/arch/x86/hvm/svm/svm.c Mon Jul 09 10:09:03 2012 +0100 @@ -174,10 +174,8 @@ static void svm_save_dr(struct vcpu *v) v->arch.debugreg[7] = vmcb_get_dr7(vmcb); } -static void __restore_debug_registers(struct vcpu *v) +static void __restore_debug_registers(struct vmcb_struct *vmcb, struct vcpu *v) { - struct vmcb_struct *vmcb = v->arch.hvm_svm.vmcb; - if ( v->arch.hvm_vcpu.flag_dr_dirty ) return; @@ -200,8 +198,9 @@ static void __restore_debug_registers(st */ static void svm_restore_dr(struct vcpu *v) { + struct vmcb_struct *vmcb = v->arch.hvm_svm.vmcb; if ( unlikely(v->arch.debugreg[7] & DR7_ACTIVE_MASK) ) - __restore_debug_registers(v); + __restore_debug_registers(vmcb, v); } static int svm_vmcb_save(struct vcpu *v, struct hvm_hw_cpu *c) @@ -1078,7 +1077,7 @@ static void svm_inject_trap(struct hvm_t case TRAP_debug: if ( guest_cpu_user_regs()->eflags & X86_EFLAGS_TF ) { - __restore_debug_registers(curr); + __restore_debug_registers(vmcb, curr); vmcb_set_dr6(vmcb, vmcb_get_dr6(vmcb) | 0x4000); } if ( cpu_has_monitor_trap_flag ) @@ -1455,8 +1454,10 @@ static void svm_vmexit_do_cr_access( static void svm_dr_access(struct vcpu *v, struct cpu_user_regs *regs) { + struct vmcb_struct *vmcb = vcpu_nestedhvm(v).nv_n1vmcx; + HVMTRACE_0D(DR_WRITE); - __restore_debug_registers(v); + __restore_debug_registers(vmcb, v); } static int svm_msr_read_intercept(unsigned int msr, uint64_t *msr_content) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 09 19:00:29 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Jul 2012 19:00: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 1SoJC4-0003Ai-3P; Mon, 09 Jul 2012 19:00:24 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SoJC2-0003AJ-8K for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 19:00:22 +0000 Received: from [85.158.143.35:14913] by server-3.bemta-4.messagelabs.com id 5C/BC-05808-54A2BFF4; Mon, 09 Jul 2012 19:00:21 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-21.messagelabs.com!1341860418!5878965!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 7568 invoked from network); 9 Jul 2012 19:00:19 -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; 9 Jul 2012 19:00:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SoJBy-0001qL-GJ for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 19:00:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SoJBs-00089g-07 for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 19:00:16 +0000 Message-Id: Date: Mon, 09 Jul 2012 19:00:10 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] nestedsvm: fix DRn handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Christoph Egger # Date 1341824943 -3600 # Node ID f7b33a9f3b97b01da8e1a5740421c21577b7cee3 # Parent 7b0dc7f3ddfe65e65b0878661a6967f781023c7d nestedsvm: fix DRn handling Always use l1 vmcb to handle DRn access. This avoids to interfere with l1 hypervisor's DRn handling when it doesn't intercept DRn. Fixes Hyper-V hang. Signed-off-by: Christoph Egger Committed-by: Keir Fraser --- diff -r 7b0dc7f3ddfe -r f7b33a9f3b97 xen/arch/x86/hvm/svm/svm.c --- a/xen/arch/x86/hvm/svm/svm.c Fri Jul 06 13:17:45 2012 +0100 +++ b/xen/arch/x86/hvm/svm/svm.c Mon Jul 09 10:09:03 2012 +0100 @@ -174,10 +174,8 @@ static void svm_save_dr(struct vcpu *v) v->arch.debugreg[7] = vmcb_get_dr7(vmcb); } -static void __restore_debug_registers(struct vcpu *v) +static void __restore_debug_registers(struct vmcb_struct *vmcb, struct vcpu *v) { - struct vmcb_struct *vmcb = v->arch.hvm_svm.vmcb; - if ( v->arch.hvm_vcpu.flag_dr_dirty ) return; @@ -200,8 +198,9 @@ static void __restore_debug_registers(st */ static void svm_restore_dr(struct vcpu *v) { + struct vmcb_struct *vmcb = v->arch.hvm_svm.vmcb; if ( unlikely(v->arch.debugreg[7] & DR7_ACTIVE_MASK) ) - __restore_debug_registers(v); + __restore_debug_registers(vmcb, v); } static int svm_vmcb_save(struct vcpu *v, struct hvm_hw_cpu *c) @@ -1078,7 +1077,7 @@ static void svm_inject_trap(struct hvm_t case TRAP_debug: if ( guest_cpu_user_regs()->eflags & X86_EFLAGS_TF ) { - __restore_debug_registers(curr); + __restore_debug_registers(vmcb, curr); vmcb_set_dr6(vmcb, vmcb_get_dr6(vmcb) | 0x4000); } if ( cpu_has_monitor_trap_flag ) @@ -1455,8 +1454,10 @@ static void svm_vmexit_do_cr_access( static void svm_dr_access(struct vcpu *v, struct cpu_user_regs *regs) { + struct vmcb_struct *vmcb = vcpu_nestedhvm(v).nv_n1vmcx; + HVMTRACE_0D(DR_WRITE); - __restore_debug_registers(v); + __restore_debug_registers(vmcb, v); } static int svm_msr_read_intercept(unsigned int msr, uint64_t *msr_content) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 09 19:00:29 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Jul 2012 19:00: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 1SoJC2-0003AX-UZ; Mon, 09 Jul 2012 19:00:22 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SoJC1-0003AI-RA for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 19:00:21 +0000 Received: from [85.158.143.99:35629] by server-2.bemta-4.messagelabs.com id 55/CC-17938-44A2BFF4; Mon, 09 Jul 2012 19:00:20 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-216.messagelabs.com!1341860419!27366003!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 13766 invoked from network); 9 Jul 2012 19:00:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 9 Jul 2012 19:00:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SoJBz-0001qO-0J for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 19:00:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SoJBy-0008AD-HV for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 19:00:18 +0000 Message-Id: Date: Mon, 09 Jul 2012 19:00:18 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xsm/flask: fix memory AVC formatting X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Daniel De Graaf # Date 1341824984 -3600 # Node ID 7d3401621bb5af42a48cac94ca5b8434e4e547cc # Parent f7b33a9f3b97b01da8e1a5740421c21577b7cee3 xsm/flask: fix memory AVC formatting A space was missing in the format string. Signed-off-by: Daniel De Graaf Committed-by: Keir Fraser --- diff -r f7b33a9f3b97 -r 7d3401621bb5 xen/xsm/flask/avc.c --- a/xen/xsm/flask/avc.c Mon Jul 09 10:09:03 2012 +0100 +++ b/xen/xsm/flask/avc.c Mon Jul 09 10:09:44 2012 +0100 @@ -640,7 +640,7 @@ void avc_audit(u32 ssid, u32 tsid, u16 t avc_printk(&buf, "range=0x%lx-0x%lx ", a->range.start, a->range.end); break; case AVC_AUDIT_DATA_MEMORY: - avc_printk(&buf, "pte=0x%lx mfn=0x%lx", a->memory.pte, a->memory.mfn); + avc_printk(&buf, "pte=0x%lx mfn=0x%lx ", a->memory.pte, a->memory.mfn); break; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 09 19:00:29 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Jul 2012 19:00: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 1SoJC2-0003AX-UZ; Mon, 09 Jul 2012 19:00:22 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SoJC1-0003AI-RA for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 19:00:21 +0000 Received: from [85.158.143.99:35629] by server-2.bemta-4.messagelabs.com id 55/CC-17938-44A2BFF4; Mon, 09 Jul 2012 19:00:20 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-216.messagelabs.com!1341860419!27366003!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 13766 invoked from network); 9 Jul 2012 19:00:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 9 Jul 2012 19:00:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SoJBz-0001qO-0J for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 19:00:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SoJBy-0008AD-HV for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 19:00:18 +0000 Message-Id: Date: Mon, 09 Jul 2012 19:00:18 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xsm/flask: fix memory AVC formatting X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Daniel De Graaf # Date 1341824984 -3600 # Node ID 7d3401621bb5af42a48cac94ca5b8434e4e547cc # Parent f7b33a9f3b97b01da8e1a5740421c21577b7cee3 xsm/flask: fix memory AVC formatting A space was missing in the format string. Signed-off-by: Daniel De Graaf Committed-by: Keir Fraser --- diff -r f7b33a9f3b97 -r 7d3401621bb5 xen/xsm/flask/avc.c --- a/xen/xsm/flask/avc.c Mon Jul 09 10:09:03 2012 +0100 +++ b/xen/xsm/flask/avc.c Mon Jul 09 10:09:44 2012 +0100 @@ -640,7 +640,7 @@ void avc_audit(u32 ssid, u32 tsid, u16 t avc_printk(&buf, "range=0x%lx-0x%lx ", a->range.start, a->range.end); break; case AVC_AUDIT_DATA_MEMORY: - avc_printk(&buf, "pte=0x%lx mfn=0x%lx", a->memory.pte, a->memory.mfn); + avc_printk(&buf, "pte=0x%lx mfn=0x%lx ", a->memory.pte, a->memory.mfn); break; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 09 19:00:30 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Jul 2012 19:00: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 1SoJC4-0003Ad-16; Mon, 09 Jul 2012 19:00:24 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SoJC2-0003AI-7t for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 19:00:22 +0000 Received: from [85.158.143.99:26572] by server-2.bemta-4.messagelabs.com id 56/CC-17938-54A2BFF4; Mon, 09 Jul 2012 19:00:21 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-216.messagelabs.com!1341860419!27025637!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 25550 invoked from network); 9 Jul 2012 19:00:20 -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; 9 Jul 2012 19:00:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SoJBz-0001qR-7Y for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 19:00:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SoJBz-0008AU-3C for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 19:00:19 +0000 Message-Id: Date: Mon, 09 Jul 2012 19:00:18 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xsm/flask: avoid struct page lookup in mmu_normal_update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Daniel De Graaf # Date 1341825027 -3600 # Node ID 9950f2dc2ee6dfd172258a5a4ee29809b0ff8263 # Parent 7d3401621bb5af42a48cac94ca5b8434e4e547cc xsm/flask: avoid struct page lookup in mmu_normal_update Since the mmu_normal_update hook is called even when mapping MFNs without an associated struct page, attempting to use the struct page to map between GFN and MFN will cause crashes. Use get_gfn_query instead. Signed-off-by: Daniel De Graaf Committed-by: Keir Fraser --- diff -r 7d3401621bb5 -r 9950f2dc2ee6 xen/xsm/flask/hooks.c --- a/xen/xsm/flask/hooks.c Mon Jul 09 10:09:44 2012 +0100 +++ b/xen/xsm/flask/hooks.c Mon Jul 09 10:10:27 2012 +0100 @@ -1314,11 +1314,11 @@ static int flask_mmu_normal_update(struc { int rc = 0; u32 map_perms = MMU__MAP_READ; - unsigned long fmfn; + unsigned long fgfn, fmfn; struct domain_security_struct *dsec; u32 fsid; struct avc_audit_data ad; - struct page_info *page = NULL; + p2m_type_t p2mt; if (d != t) rc = domain_has_perm(d, t, SECCLASS_MMU, MMU__REMOTE_REMAP); @@ -1334,9 +1334,9 @@ static int flask_mmu_normal_update(struc map_perms |= MMU__MAP_WRITE; AVC_AUDIT_DATA_INIT(&ad, MEMORY); - page = get_page_from_gfn(f, l1e_get_pfn(l1e_from_intpte(fpte)), - NULL, P2M_ALLOC); - fmfn = page ? page_to_mfn(page) : INVALID_MFN; + fgfn = l1e_get_pfn(l1e_from_intpte(fpte)); + fmfn = mfn_x(get_gfn_query(f, fgfn, &p2mt)); + ad.sdom = d; ad.tdom = f; ad.memory.pte = fpte; @@ -1344,8 +1344,7 @@ static int flask_mmu_normal_update(struc rc = get_mfn_sid(fmfn, &fsid); - if ( page ) - put_page(page); + put_gfn(f, fgfn); if ( rc ) return rc; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 09 19:00:30 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Jul 2012 19:00: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 1SoJC4-0003Ad-16; Mon, 09 Jul 2012 19:00:24 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SoJC2-0003AI-7t for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 19:00:22 +0000 Received: from [85.158.143.99:26572] by server-2.bemta-4.messagelabs.com id 56/CC-17938-54A2BFF4; Mon, 09 Jul 2012 19:00:21 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-216.messagelabs.com!1341860419!27025637!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 25550 invoked from network); 9 Jul 2012 19:00:20 -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; 9 Jul 2012 19:00:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SoJBz-0001qR-7Y for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 19:00:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SoJBz-0008AU-3C for xen-changelog@lists.xensource.com; Mon, 09 Jul 2012 19:00:19 +0000 Message-Id: Date: Mon, 09 Jul 2012 19:00:18 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xsm/flask: avoid struct page lookup in mmu_normal_update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Daniel De Graaf # Date 1341825027 -3600 # Node ID 9950f2dc2ee6dfd172258a5a4ee29809b0ff8263 # Parent 7d3401621bb5af42a48cac94ca5b8434e4e547cc xsm/flask: avoid struct page lookup in mmu_normal_update Since the mmu_normal_update hook is called even when mapping MFNs without an associated struct page, attempting to use the struct page to map between GFN and MFN will cause crashes. Use get_gfn_query instead. Signed-off-by: Daniel De Graaf Committed-by: Keir Fraser --- diff -r 7d3401621bb5 -r 9950f2dc2ee6 xen/xsm/flask/hooks.c --- a/xen/xsm/flask/hooks.c Mon Jul 09 10:09:44 2012 +0100 +++ b/xen/xsm/flask/hooks.c Mon Jul 09 10:10:27 2012 +0100 @@ -1314,11 +1314,11 @@ static int flask_mmu_normal_update(struc { int rc = 0; u32 map_perms = MMU__MAP_READ; - unsigned long fmfn; + unsigned long fgfn, fmfn; struct domain_security_struct *dsec; u32 fsid; struct avc_audit_data ad; - struct page_info *page = NULL; + p2m_type_t p2mt; if (d != t) rc = domain_has_perm(d, t, SECCLASS_MMU, MMU__REMOTE_REMAP); @@ -1334,9 +1334,9 @@ static int flask_mmu_normal_update(struc map_perms |= MMU__MAP_WRITE; AVC_AUDIT_DATA_INIT(&ad, MEMORY); - page = get_page_from_gfn(f, l1e_get_pfn(l1e_from_intpte(fpte)), - NULL, P2M_ALLOC); - fmfn = page ? page_to_mfn(page) : INVALID_MFN; + fgfn = l1e_get_pfn(l1e_from_intpte(fpte)); + fmfn = mfn_x(get_gfn_query(f, fgfn, &p2mt)); + ad.sdom = d; ad.tdom = f; ad.memory.pte = fpte; @@ -1344,8 +1344,7 @@ static int flask_mmu_normal_update(struc rc = get_mfn_sid(fmfn, &fsid); - if ( page ) - put_page(page); + put_gfn(f, fgfn); if ( rc ) return rc; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jul 17 22:22:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 17 Jul 2012 22: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 1SrG9m-0001B3-5l; Tue, 17 Jul 2012 22: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 1SrG9k-0001Ae-94 for xen-changelog@lists.xensource.com; Tue, 17 Jul 2012 22:22:12 +0000 Received: from [85.158.138.51:18340] by server-1.bemta-3.messagelabs.com id 96/3F-31934-395E5005; Tue, 17 Jul 2012 22:22:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-174.messagelabs.com!1342563729!19457908!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 352 invoked from network); 17 Jul 2012 22:22:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 17 Jul 2012 22:22:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SrG9h-0003qD-8g for xen-changelog@lists.xensource.com; Tue, 17 Jul 2012 22:22:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SrG9g-0007no-Qg for xen-changelog@lists.xensource.com; Tue, 17 Jul 2012 22:22:08 +0000 Message-Id: Date: Tue, 17 Jul 2012 22:22:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm/vtimer: do not let the guest interact with the physical timer X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Stefano Stabellini # Date 1342542124 -3600 # Node ID d53381ebdb3287d002e1179f6774516e70399490 # Parent 9950f2dc2ee6dfd172258a5a4ee29809b0ff8263 arm/vtimer: do not let the guest interact with the physical timer The guest can read the physical counter but it shouldn't be able to cause interrupts of the physical timer to go to the hypervisor. Trap physical timer reads/writes in vtimer.c instead. Signed-off-by: Stefano Stabellini Acked-by: Tim Deegan Committed-by: Ian Campbell --- diff -r 9950f2dc2ee6 -r d53381ebdb32 xen/arch/arm/time.c --- a/xen/arch/arm/time.c Mon Jul 09 10:10:27 2012 +0100 +++ b/xen/arch/arm/time.c Tue Jul 17 17:22:04 2012 +0100 @@ -160,8 +160,8 @@ void __cpuinit init_timer_interrupt(void WRITE_CP64(0, CNTVOFF); /* No VM-specific offset */ WRITE_CP32(0, CNTKCTL); /* No user-mode access */ #if USE_HYP_TIMER - /* Let the VMs read the physical counter and timer so they can tell time */ - WRITE_CP32(CNTHCTL_PA|CNTHCTL_TA, CNTHCTL); + /* Do not let the VMs program the physical timer, only read the physical counter */ + WRITE_CP32(CNTHCTL_PA, CNTHCTL); #else /* Cannot let VMs access physical counter if we are using it */ WRITE_CP32(0, CNTHCTL); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jul 17 22:22:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 17 Jul 2012 22: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 1SrG9m-0001B3-5l; Tue, 17 Jul 2012 22: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 1SrG9k-0001Ae-94 for xen-changelog@lists.xensource.com; Tue, 17 Jul 2012 22:22:12 +0000 Received: from [85.158.138.51:18340] by server-1.bemta-3.messagelabs.com id 96/3F-31934-395E5005; Tue, 17 Jul 2012 22:22:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-174.messagelabs.com!1342563729!19457908!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 352 invoked from network); 17 Jul 2012 22:22:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 17 Jul 2012 22:22:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SrG9h-0003qD-8g for xen-changelog@lists.xensource.com; Tue, 17 Jul 2012 22:22:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SrG9g-0007no-Qg for xen-changelog@lists.xensource.com; Tue, 17 Jul 2012 22:22:08 +0000 Message-Id: Date: Tue, 17 Jul 2012 22:22:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm/vtimer: do not let the guest interact with the physical timer X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Stefano Stabellini # Date 1342542124 -3600 # Node ID d53381ebdb3287d002e1179f6774516e70399490 # Parent 9950f2dc2ee6dfd172258a5a4ee29809b0ff8263 arm/vtimer: do not let the guest interact with the physical timer The guest can read the physical counter but it shouldn't be able to cause interrupts of the physical timer to go to the hypervisor. Trap physical timer reads/writes in vtimer.c instead. Signed-off-by: Stefano Stabellini Acked-by: Tim Deegan Committed-by: Ian Campbell --- diff -r 9950f2dc2ee6 -r d53381ebdb32 xen/arch/arm/time.c --- a/xen/arch/arm/time.c Mon Jul 09 10:10:27 2012 +0100 +++ b/xen/arch/arm/time.c Tue Jul 17 17:22:04 2012 +0100 @@ -160,8 +160,8 @@ void __cpuinit init_timer_interrupt(void WRITE_CP64(0, CNTVOFF); /* No VM-specific offset */ WRITE_CP32(0, CNTKCTL); /* No user-mode access */ #if USE_HYP_TIMER - /* Let the VMs read the physical counter and timer so they can tell time */ - WRITE_CP32(CNTHCTL_PA|CNTHCTL_TA, CNTHCTL); + /* Do not let the VMs program the physical timer, only read the physical counter */ + WRITE_CP32(CNTHCTL_PA, CNTHCTL); #else /* Cannot let VMs access physical counter if we are using it */ WRITE_CP32(0, CNTHCTL); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jul 17 22:22:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 17 Jul 2012 22: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 1SrG9n-0001BV-H4; Tue, 17 Jul 2012 22:22:15 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SrG9l-0001Am-Bf for xen-changelog@lists.xensource.com; Tue, 17 Jul 2012 22:22:13 +0000 Received: from [85.158.143.99:15711] by server-3.bemta-4.messagelabs.com id AE/EA-01511-495E5005; Tue, 17 Jul 2012 22:22:12 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-216.messagelabs.com!1342563731!22153055!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 32504 invoked from network); 17 Jul 2012 22:22:12 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 17 Jul 2012 22:22:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SrG9j-0003qP-03 for xen-changelog@lists.xensource.com; Tue, 17 Jul 2012 22:22:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SrG9i-0007on-Uy for xen-changelog@lists.xensource.com; Tue, 17 Jul 2012 22:22:10 +0000 Message-Id: Date: Tue, 17 Jul 2012 22:22:10 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm/vgic: initialize pending_irqs.lr_queue X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Stefano Stabellini # Date 1342542127 -3600 # Node ID 4d1ca7cd04efd635c5dbf2c419849c4fdc549ada # Parent 10de6fc19fb928b3f5e4f2aef6dcb4dacde5d323 arm/vgic: initialize pending_irqs.lr_queue Properly initialize all the pending_irqs.lr_queue like we do for inflight. Check whether we already have the irq in lr_queue before adding it. Signed-off-by: Stefano Stabellini Acked-by: Tim Deegan Committed-by: Ian Campbell --- diff -r 10de6fc19fb9 -r 4d1ca7cd04ef xen/arch/arm/gic.c --- a/xen/arch/arm/gic.c Tue Jul 17 17:22:06 2012 +0100 +++ b/xen/arch/arm/gic.c Tue Jul 17 17:22:07 2012 +0100 @@ -456,6 +456,9 @@ void gic_set_guest_irq(struct vcpu *v, u } n = irq_to_pending(v, virtual_irq); + if ( !list_empty(&n->lr_queue) ) + goto out; + list_for_each_entry ( iter, &v->arch.vgic.lr_pending, lr_queue ) { if ( iter->priority > priority ) diff -r 10de6fc19fb9 -r 4d1ca7cd04ef xen/arch/arm/vgic.c --- a/xen/arch/arm/vgic.c Tue Jul 17 17:22:06 2012 +0100 +++ b/xen/arch/arm/vgic.c Tue Jul 17 17:22:07 2012 +0100 @@ -84,7 +84,10 @@ int domain_vgic_init(struct domain *d) d->arch.vgic.pending_irqs = xzalloc_array(struct pending_irq, d->arch.vgic.nr_lines); for (i=0; iarch.vgic.nr_lines; i++) + { INIT_LIST_HEAD(&d->arch.vgic.pending_irqs[i].inflight); + INIT_LIST_HEAD(&d->arch.vgic.pending_irqs[i].lr_queue); + } for (i=0; iarch.vgic.shared_irqs[i].lock); 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 Jul 17 22:22:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 17 Jul 2012 22: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 1SrG9n-0001BV-H4; Tue, 17 Jul 2012 22:22:15 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SrG9l-0001Am-Bf for xen-changelog@lists.xensource.com; Tue, 17 Jul 2012 22:22:13 +0000 Received: from [85.158.143.99:15711] by server-3.bemta-4.messagelabs.com id AE/EA-01511-495E5005; Tue, 17 Jul 2012 22:22:12 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-216.messagelabs.com!1342563731!22153055!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 32504 invoked from network); 17 Jul 2012 22:22:12 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 17 Jul 2012 22:22:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SrG9j-0003qP-03 for xen-changelog@lists.xensource.com; Tue, 17 Jul 2012 22:22:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SrG9i-0007on-Uy for xen-changelog@lists.xensource.com; Tue, 17 Jul 2012 22:22:10 +0000 Message-Id: Date: Tue, 17 Jul 2012 22:22:10 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm/vgic: initialize pending_irqs.lr_queue X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Stefano Stabellini # Date 1342542127 -3600 # Node ID 4d1ca7cd04efd635c5dbf2c419849c4fdc549ada # Parent 10de6fc19fb928b3f5e4f2aef6dcb4dacde5d323 arm/vgic: initialize pending_irqs.lr_queue Properly initialize all the pending_irqs.lr_queue like we do for inflight. Check whether we already have the irq in lr_queue before adding it. Signed-off-by: Stefano Stabellini Acked-by: Tim Deegan Committed-by: Ian Campbell --- diff -r 10de6fc19fb9 -r 4d1ca7cd04ef xen/arch/arm/gic.c --- a/xen/arch/arm/gic.c Tue Jul 17 17:22:06 2012 +0100 +++ b/xen/arch/arm/gic.c Tue Jul 17 17:22:07 2012 +0100 @@ -456,6 +456,9 @@ void gic_set_guest_irq(struct vcpu *v, u } n = irq_to_pending(v, virtual_irq); + if ( !list_empty(&n->lr_queue) ) + goto out; + list_for_each_entry ( iter, &v->arch.vgic.lr_pending, lr_queue ) { if ( iter->priority > priority ) diff -r 10de6fc19fb9 -r 4d1ca7cd04ef xen/arch/arm/vgic.c --- a/xen/arch/arm/vgic.c Tue Jul 17 17:22:06 2012 +0100 +++ b/xen/arch/arm/vgic.c Tue Jul 17 17:22:07 2012 +0100 @@ -84,7 +84,10 @@ int domain_vgic_init(struct domain *d) d->arch.vgic.pending_irqs = xzalloc_array(struct pending_irq, d->arch.vgic.nr_lines); for (i=0; iarch.vgic.nr_lines; i++) + { INIT_LIST_HEAD(&d->arch.vgic.pending_irqs[i].inflight); + INIT_LIST_HEAD(&d->arch.vgic.pending_irqs[i].lr_queue); + } for (i=0; iarch.vgic.shared_irqs[i].lock); 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 Jul 17 22:22:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 17 Jul 2012 22: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 1SrG9o-0001Bg-Ln; Tue, 17 Jul 2012 22:22:16 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SrG9n-0001B8-1s for xen-changelog@lists.xensource.com; Tue, 17 Jul 2012 22:22:15 +0000 Received: from [85.158.139.83:5707] by server-2.bemta-5.messagelabs.com id 6F/00-04598-695E5005; Tue, 17 Jul 2012 22:22:14 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-182.messagelabs.com!1342563732!29211484!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 26225 invoked from network); 17 Jul 2012 22:22:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 17 Jul 2012 22:22:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SrG9j-0003qS-SW for xen-changelog@lists.xensource.com; Tue, 17 Jul 2012 22:22:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SrG9j-0007p3-FH for xen-changelog@lists.xensource.com; Tue, 17 Jul 2012 22:22:11 +0000 Message-Id: Date: Tue, 17 Jul 2012 22:22:10 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xen/arm: implement do_hvm_op for ARM X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Stefano Stabellini # Date 1342542809 -3600 # Node ID 9f5fc2a5471f897eacb24b710c5c1e5e5ab6a980 # Parent 4d1ca7cd04efd635c5dbf2c419849c4fdc549ada xen/arm: implement do_hvm_op for ARM Signed-off-by: Stefano Stabellini Acked-by: Tim Deegan Committed-by: Ian Campbell --- diff -r 4d1ca7cd04ef -r 9f5fc2a5471f xen/arch/arm/Makefile --- a/xen/arch/arm/Makefile Tue Jul 17 17:22:07 2012 +0100 +++ b/xen/arch/arm/Makefile Tue Jul 17 17:33:29 2012 +0100 @@ -26,6 +26,7 @@ obj-y += traps.o obj-y += vgic.o obj-y += vtimer.o obj-y += vpl011.o +obj-y += hvm.o #obj-bin-y += ....o diff -r 4d1ca7cd04ef -r 9f5fc2a5471f xen/arch/arm/hvm.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/xen/arch/arm/hvm.c Tue Jul 17 17:33:29 2012 +0100 @@ -0,0 +1,60 @@ +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include + +long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE(void) arg) + +{ + long rc = 0; + + switch ( op ) + { + case HVMOP_set_param: + case HVMOP_get_param: + { + struct xen_hvm_param a; + struct domain *d; + + if ( copy_from_guest(&a, arg, 1) ) + return -EFAULT; + + if ( a.index >= HVM_NR_PARAMS ) + return -EINVAL; + + rc = rcu_lock_target_domain_by_id(a.domid, &d); + if ( rc != 0 ) + return rc; + + if ( op == HVMOP_set_param ) + { + d->arch.hvm_domain.params[a.index] = a.value; + } + else + { + a.value = d->arch.hvm_domain.params[a.index]; + rc = copy_to_guest(arg, &a, 1) ? -EFAULT : 0; + } + + rcu_unlock_domain(d); + break; + } + + default: + { + printk("%s: Bad HVM op %ld.\n", __func__, op); + rc = -ENOSYS; + break; + } + } + + return rc; +} diff -r 4d1ca7cd04ef -r 9f5fc2a5471f xen/arch/arm/traps.c --- a/xen/arch/arm/traps.c Tue Jul 17 17:22:07 2012 +0100 +++ b/xen/arch/arm/traps.c Tue Jul 17 17:33:29 2012 +0100 @@ -430,6 +430,7 @@ static arm_hypercall_t *arm_hypercall_ta HYPERCALL(memory_op), HYPERCALL(physdev_op), HYPERCALL(sysctl), + HYPERCALL(hvm_op), }; static void do_debug_trap(struct cpu_user_regs *regs, unsigned int code) diff -r 4d1ca7cd04ef -r 9f5fc2a5471f xen/include/asm-arm/domain.h --- a/xen/include/asm-arm/domain.h Tue Jul 17 17:22:07 2012 +0100 +++ b/xen/include/asm-arm/domain.h Tue Jul 17 17:33:29 2012 +0100 @@ -5,6 +5,7 @@ #include #include #include +#include /* Represents state corresponding to a block of 32 interrupts */ struct vgic_irq_rank { @@ -28,9 +29,15 @@ struct pending_irq struct list_head lr_queue; }; +struct hvm_domain +{ + uint64_t params[HVM_NR_PARAMS]; +} __cacheline_aligned; + struct arch_domain { struct p2m_domain p2m; + struct hvm_domain hvm_domain; struct { /* _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jul 17 22:22:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 17 Jul 2012 22: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 1SrG9o-0001Bg-Ln; Tue, 17 Jul 2012 22:22:16 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SrG9n-0001B8-1s for xen-changelog@lists.xensource.com; Tue, 17 Jul 2012 22:22:15 +0000 Received: from [85.158.139.83:5707] by server-2.bemta-5.messagelabs.com id 6F/00-04598-695E5005; Tue, 17 Jul 2012 22:22:14 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-182.messagelabs.com!1342563732!29211484!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 26225 invoked from network); 17 Jul 2012 22:22:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 17 Jul 2012 22:22:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SrG9j-0003qS-SW for xen-changelog@lists.xensource.com; Tue, 17 Jul 2012 22:22:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SrG9j-0007p3-FH for xen-changelog@lists.xensource.com; Tue, 17 Jul 2012 22:22:11 +0000 Message-Id: Date: Tue, 17 Jul 2012 22:22:10 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xen/arm: implement do_hvm_op for ARM X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Stefano Stabellini # Date 1342542809 -3600 # Node ID 9f5fc2a5471f897eacb24b710c5c1e5e5ab6a980 # Parent 4d1ca7cd04efd635c5dbf2c419849c4fdc549ada xen/arm: implement do_hvm_op for ARM Signed-off-by: Stefano Stabellini Acked-by: Tim Deegan Committed-by: Ian Campbell --- diff -r 4d1ca7cd04ef -r 9f5fc2a5471f xen/arch/arm/Makefile --- a/xen/arch/arm/Makefile Tue Jul 17 17:22:07 2012 +0100 +++ b/xen/arch/arm/Makefile Tue Jul 17 17:33:29 2012 +0100 @@ -26,6 +26,7 @@ obj-y += traps.o obj-y += vgic.o obj-y += vtimer.o obj-y += vpl011.o +obj-y += hvm.o #obj-bin-y += ....o diff -r 4d1ca7cd04ef -r 9f5fc2a5471f xen/arch/arm/hvm.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/xen/arch/arm/hvm.c Tue Jul 17 17:33:29 2012 +0100 @@ -0,0 +1,60 @@ +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include + +long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE(void) arg) + +{ + long rc = 0; + + switch ( op ) + { + case HVMOP_set_param: + case HVMOP_get_param: + { + struct xen_hvm_param a; + struct domain *d; + + if ( copy_from_guest(&a, arg, 1) ) + return -EFAULT; + + if ( a.index >= HVM_NR_PARAMS ) + return -EINVAL; + + rc = rcu_lock_target_domain_by_id(a.domid, &d); + if ( rc != 0 ) + return rc; + + if ( op == HVMOP_set_param ) + { + d->arch.hvm_domain.params[a.index] = a.value; + } + else + { + a.value = d->arch.hvm_domain.params[a.index]; + rc = copy_to_guest(arg, &a, 1) ? -EFAULT : 0; + } + + rcu_unlock_domain(d); + break; + } + + default: + { + printk("%s: Bad HVM op %ld.\n", __func__, op); + rc = -ENOSYS; + break; + } + } + + return rc; +} diff -r 4d1ca7cd04ef -r 9f5fc2a5471f xen/arch/arm/traps.c --- a/xen/arch/arm/traps.c Tue Jul 17 17:22:07 2012 +0100 +++ b/xen/arch/arm/traps.c Tue Jul 17 17:33:29 2012 +0100 @@ -430,6 +430,7 @@ static arm_hypercall_t *arm_hypercall_ta HYPERCALL(memory_op), HYPERCALL(physdev_op), HYPERCALL(sysctl), + HYPERCALL(hvm_op), }; static void do_debug_trap(struct cpu_user_regs *regs, unsigned int code) diff -r 4d1ca7cd04ef -r 9f5fc2a5471f xen/include/asm-arm/domain.h --- a/xen/include/asm-arm/domain.h Tue Jul 17 17:22:07 2012 +0100 +++ b/xen/include/asm-arm/domain.h Tue Jul 17 17:33:29 2012 +0100 @@ -5,6 +5,7 @@ #include #include #include +#include /* Represents state corresponding to a block of 32 interrupts */ struct vgic_irq_rank { @@ -28,9 +29,15 @@ struct pending_irq struct list_head lr_queue; }; +struct hvm_domain +{ + uint64_t params[HVM_NR_PARAMS]; +} __cacheline_aligned; + struct arch_domain { struct p2m_domain p2m; + struct hvm_domain hvm_domain; struct { /* _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jul 17 22:22:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 17 Jul 2012 22: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 1SrG9o-0001Bl-PL; Tue, 17 Jul 2012 22:22:16 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SrG9n-0001Ak-21 for xen-changelog@lists.xensource.com; Tue, 17 Jul 2012 22:22:15 +0000 Received: from [85.158.143.35:32504] by server-1.bemta-4.messagelabs.com id 94/DC-24392-695E5005; Tue, 17 Jul 2012 22:22:14 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-21.messagelabs.com!1342563733!4055965!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 31100 invoked from network); 17 Jul 2012 22:22:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 17 Jul 2012 22:22:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SrG9k-0003qY-Qk for xen-changelog@lists.xensource.com; Tue, 17 Jul 2012 22:22:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SrG9k-0007pY-ME for xen-changelog@lists.xensource.com; Tue, 17 Jul 2012 22:22:12 +0000 Message-Id: Date: Tue, 17 Jul 2012 22:22:12 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xen/arm: disable the event optimization in the gic X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Stefano Stabellini # Date 1342542811 -3600 # Node ID 43e21ce7f22151524b800a6cf0ac4ba1233b34a7 # Parent 99941375ef10b602b2e8784de70b0a294d832497 xen/arm: disable the event optimization in the gic Currently we have an optimization in the GIC driver that allows us not to request maintenance interrupts for Xen events. The basic idea is that every time we are about to inject a new interrupt or event into a guest, we check whether we can remove some old event irqs from one or more LRs. We can do this because we know when a guest finishes processing event notifications: it sets the evtchn_upcall_pending bit to 0. However it is unsafe: the guest resets evtchn_upcall_pending before EOI'ing the event irq, therefore a small window of time exists when Xen could jump in and remove the event irq from the LR register before the guest has EOI'ed it. This is not a good practice according to the GIC manual. Remove the optimization for now. Signed-off-by: Stefano Stabellini Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r 99941375ef10 -r 43e21ce7f221 xen/arch/arm/gic.c --- a/xen/arch/arm/gic.c Tue Jul 17 17:33:30 2012 +0100 +++ b/xen/arch/arm/gic.c Tue Jul 17 17:33:31 2012 +0100 @@ -37,7 +37,6 @@ + (GIC_CR_OFFSET & 0xfff))) #define GICH ((volatile uint32_t *) (FIXMAP_ADDR(FIXMAP_GICH) \ + (GIC_HR_OFFSET & 0xfff))) -static void events_maintenance(struct vcpu *v); static void gic_restore_pending_irqs(struct vcpu *v); /* Global state */ @@ -48,7 +47,6 @@ static struct { unsigned int lines; unsigned int cpus; spinlock_t lock; - uint64_t event_mask; uint64_t lr_mask; } gic; @@ -62,7 +60,6 @@ void gic_save_state(struct vcpu *v) for ( i=0; iarch.gic_lr[i] = GICH[GICH_LR + i]; v->arch.lr_mask = gic.lr_mask; - v->arch.event_mask = gic.event_mask; /* Disable until next VCPU scheduled */ GICH[GICH_HCR] = 0; isb(); @@ -76,7 +73,6 @@ void gic_restore_state(struct vcpu *v) return; gic.lr_mask = v->arch.lr_mask; - gic.event_mask = v->arch.event_mask; for ( i=0; iarch.gic_lr[i]; GICH[GICH_HCR] = GICH_HCR_EN; @@ -318,7 +314,6 @@ int __init gic_init(void) gic_hyp_init(); gic.lr_mask = 0ULL; - gic.event_mask = 0ULL; spin_unlock(&gic.lock); @@ -421,9 +416,6 @@ static inline void gic_set_lr(int lr, un BUG_ON(lr > nr_lrs); - if (virtual_irq == VGIC_IRQ_EVTCHN_CALLBACK && nr_lrs > 1) - maintenance_int = 0; - GICH[GICH_LR + lr] = state | maintenance_int | ((priority >> 3) << GICH_LR_PRIORITY_SHIFT) | @@ -436,11 +428,6 @@ void gic_set_guest_irq(struct vcpu *v, u int i; struct pending_irq *iter, *n; - if ( v->is_running ) - { - events_maintenance(v); - } - spin_lock_irq(&gic.lock); if ( v->is_running && list_empty(&v->arch.vgic.lr_pending) ) @@ -448,8 +435,6 @@ void gic_set_guest_irq(struct vcpu *v, u i = find_first_zero_bit(&gic.lr_mask, nr_lrs); if (i < nr_lrs) { set_bit(i, &gic.lr_mask); - if ( virtual_irq == VGIC_IRQ_EVTCHN_CALLBACK ) - set_bit(i, &gic.event_mask); gic_set_lr(i, virtual_irq, state, priority); goto out; } @@ -487,8 +472,6 @@ static void gic_restore_pending_irqs(str gic_set_lr(i, p->irq, GICH_LR_PENDING, p->priority); list_del_init(&p->lr_queue); set_bit(i, &gic.lr_mask); - if ( p->irq == VGIC_IRQ_EVTCHN_CALLBACK ) - set_bit(i, &gic.event_mask); } } @@ -574,27 +557,6 @@ int gicv_setup(struct domain *d) GIC_BASE_ADDRESS + GIC_VR_OFFSET); } -static void events_maintenance(struct vcpu *v) -{ - int i = 0; - int already_pending = test_bit(0, - (unsigned long *)&vcpu_info(v, evtchn_upcall_pending)); - - if (!already_pending && gic.event_mask != 0) { - spin_lock_irq(&gic.lock); - while ((i = find_next_bit((const long unsigned int *) &gic.event_mask, - 64, i)) < 64) { - - GICH[GICH_LR + i] = 0; - clear_bit(i, &gic.lr_mask); - clear_bit(i, &gic.event_mask); - - i++; - } - spin_unlock_irq(&gic.lock); - } -} - static void maintenance_interrupt(int irq, void *dev_id, struct cpu_user_regs *regs) { int i = 0, virq; @@ -602,8 +564,6 @@ static void maintenance_interrupt(int ir struct vcpu *v = current; uint64_t eisr = GICH[GICH_EISR0] | (((uint64_t) GICH[GICH_EISR1]) << 32); - events_maintenance(v); - while ((i = find_next_bit((const long unsigned int *) &eisr, 64, i)) < 64) { struct pending_irq *p; @@ -619,8 +579,6 @@ static void maintenance_interrupt(int ir gic_set_lr(i, p->irq, GICH_LR_PENDING, p->priority); list_del_init(&p->lr_queue); set_bit(i, &gic.lr_mask); - if ( p->irq == VGIC_IRQ_EVTCHN_CALLBACK ) - set_bit(i, &gic.event_mask); } else { gic_inject_irq_stop(); } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jul 17 22:22:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 17 Jul 2012 22: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 1SrG9n-0001BD-97; Tue, 17 Jul 2012 22:22:15 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SrG9l-0001Al-6I for xen-changelog@lists.xensource.com; Tue, 17 Jul 2012 22:22:13 +0000 Received: from [85.158.143.99:34854] by server-2.bemta-4.messagelabs.com id 37/FC-17938-495E5005; Tue, 17 Jul 2012 22:22:12 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-216.messagelabs.com!1342563730!20397738!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 29467 invoked from network); 17 Jul 2012 22:22: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; 17 Jul 2012 22:22:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SrG9i-0003qM-Iw for xen-changelog@lists.xensource.com; Tue, 17 Jul 2012 22:22:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SrG9i-0007oY-ER for xen-changelog@lists.xensource.com; Tue, 17 Jul 2012 22:22:10 +0000 Message-Id: Date: Tue, 17 Jul 2012 22:22:09 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm/vgic: vgic: support irq enable/disable X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Stefano Stabellini # Date 1342542126 -3600 # Node ID 10de6fc19fb928b3f5e4f2aef6dcb4dacde5d323 # Parent 10fd80aa8beb0fce4ff2e453f73dc79b7a665fa3 arm/vgic: vgic: support irq enable/disable If vgic_vcpu_inject_irq is called (for example by a device emulator like vtimer.c) but the corresponding irq is not enabled in the virtual gicd just queue it in the inflight_irqs list. When the irq is enabled make sure to call gic_set_guest_irq. Signed-off-by: Stefano Stabellini Acked-by: Tim Deegan Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r 10fd80aa8beb -r 10de6fc19fb9 xen/arch/arm/vgic.c --- a/xen/arch/arm/vgic.c Tue Jul 17 17:22:05 2012 +0100 +++ b/xen/arch/arm/vgic.c Tue Jul 17 17:22:06 2012 +0100 @@ -346,6 +346,22 @@ read_as_zero: return 1; } +static void vgic_enable_irqs(struct vcpu *v, uint32_t r, int n) +{ + struct pending_irq *p; + unsigned int irq; + int i = 0; + + while ( (i = find_next_bit((const long unsigned int *) &r, + sizeof(uint32_t), i)) < sizeof(uint32_t) ) { + irq = i + (32 * n); + p = irq_to_pending(v, irq); + if ( !list_empty(&p->inflight) ) + gic_set_guest_irq(v, irq, GICH_LR_PENDING, p->priority); + i++; + } +} + static int vgic_distr_mmio_write(struct vcpu *v, mmio_info_t *info) { struct hsr_dabt dabt = info->dabt; @@ -354,6 +370,7 @@ static int vgic_distr_mmio_write(struct struct vgic_irq_rank *rank; int offset = (int)(info->gpa - VGIC_DISTR_BASE_ADDRESS); int gicd_reg = REG(offset); + uint32_t tr; switch ( gicd_reg ) { @@ -381,8 +398,10 @@ static int vgic_distr_mmio_write(struct rank = vgic_irq_rank(v, 8, gicd_reg - GICD_ISENABLER); if ( rank == NULL) goto write_ignore; vgic_lock_rank(v, rank); + tr = rank->ienable; rank->ienable |= *r; vgic_unlock_rank(v, rank); + vgic_enable_irqs(v, (*r) & (~tr), gicd_reg - GICD_ISENABLER); return 1; case GICD_ICENABLER ... GICD_ICENABLERN: @@ -572,7 +591,9 @@ void vgic_vcpu_inject_irq(struct vcpu *v else n->desc = NULL; - gic_set_guest_irq(v, irq, GICH_LR_PENDING, priority); + /* the irq is enabled */ + if ( rank->ienable & (1 << (irq % 32)) ) + gic_set_guest_irq(v, irq, GICH_LR_PENDING, priority); spin_lock_irqsave(&v->arch.vgic.lock, flags); list_for_each_entry ( iter, &v->arch.vgic.inflight_irqs, inflight ) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jul 17 22:22:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 17 Jul 2012 22: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 1SrG9n-0001BD-97; Tue, 17 Jul 2012 22:22:15 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SrG9l-0001Al-6I for xen-changelog@lists.xensource.com; Tue, 17 Jul 2012 22:22:13 +0000 Received: from [85.158.143.99:34854] by server-2.bemta-4.messagelabs.com id 37/FC-17938-495E5005; Tue, 17 Jul 2012 22:22:12 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-216.messagelabs.com!1342563730!20397738!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 29467 invoked from network); 17 Jul 2012 22:22: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; 17 Jul 2012 22:22:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SrG9i-0003qM-Iw for xen-changelog@lists.xensource.com; Tue, 17 Jul 2012 22:22:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SrG9i-0007oY-ER for xen-changelog@lists.xensource.com; Tue, 17 Jul 2012 22:22:10 +0000 Message-Id: Date: Tue, 17 Jul 2012 22:22:09 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm/vgic: vgic: support irq enable/disable X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Stefano Stabellini # Date 1342542126 -3600 # Node ID 10de6fc19fb928b3f5e4f2aef6dcb4dacde5d323 # Parent 10fd80aa8beb0fce4ff2e453f73dc79b7a665fa3 arm/vgic: vgic: support irq enable/disable If vgic_vcpu_inject_irq is called (for example by a device emulator like vtimer.c) but the corresponding irq is not enabled in the virtual gicd just queue it in the inflight_irqs list. When the irq is enabled make sure to call gic_set_guest_irq. Signed-off-by: Stefano Stabellini Acked-by: Tim Deegan Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r 10fd80aa8beb -r 10de6fc19fb9 xen/arch/arm/vgic.c --- a/xen/arch/arm/vgic.c Tue Jul 17 17:22:05 2012 +0100 +++ b/xen/arch/arm/vgic.c Tue Jul 17 17:22:06 2012 +0100 @@ -346,6 +346,22 @@ read_as_zero: return 1; } +static void vgic_enable_irqs(struct vcpu *v, uint32_t r, int n) +{ + struct pending_irq *p; + unsigned int irq; + int i = 0; + + while ( (i = find_next_bit((const long unsigned int *) &r, + sizeof(uint32_t), i)) < sizeof(uint32_t) ) { + irq = i + (32 * n); + p = irq_to_pending(v, irq); + if ( !list_empty(&p->inflight) ) + gic_set_guest_irq(v, irq, GICH_LR_PENDING, p->priority); + i++; + } +} + static int vgic_distr_mmio_write(struct vcpu *v, mmio_info_t *info) { struct hsr_dabt dabt = info->dabt; @@ -354,6 +370,7 @@ static int vgic_distr_mmio_write(struct struct vgic_irq_rank *rank; int offset = (int)(info->gpa - VGIC_DISTR_BASE_ADDRESS); int gicd_reg = REG(offset); + uint32_t tr; switch ( gicd_reg ) { @@ -381,8 +398,10 @@ static int vgic_distr_mmio_write(struct rank = vgic_irq_rank(v, 8, gicd_reg - GICD_ISENABLER); if ( rank == NULL) goto write_ignore; vgic_lock_rank(v, rank); + tr = rank->ienable; rank->ienable |= *r; vgic_unlock_rank(v, rank); + vgic_enable_irqs(v, (*r) & (~tr), gicd_reg - GICD_ISENABLER); return 1; case GICD_ICENABLER ... GICD_ICENABLERN: @@ -572,7 +591,9 @@ void vgic_vcpu_inject_irq(struct vcpu *v else n->desc = NULL; - gic_set_guest_irq(v, irq, GICH_LR_PENDING, priority); + /* the irq is enabled */ + if ( rank->ienable & (1 << (irq % 32)) ) + gic_set_guest_irq(v, irq, GICH_LR_PENDING, priority); spin_lock_irqsave(&v->arch.vgic.lock, flags); list_for_each_entry ( iter, &v->arch.vgic.inflight_irqs, inflight ) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jul 17 22:22:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 17 Jul 2012 22: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 1SrG9o-0001Bl-PL; Tue, 17 Jul 2012 22:22:16 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SrG9n-0001Ak-21 for xen-changelog@lists.xensource.com; Tue, 17 Jul 2012 22:22:15 +0000 Received: from [85.158.143.35:32504] by server-1.bemta-4.messagelabs.com id 94/DC-24392-695E5005; Tue, 17 Jul 2012 22:22:14 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-21.messagelabs.com!1342563733!4055965!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 31100 invoked from network); 17 Jul 2012 22:22:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 17 Jul 2012 22:22:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SrG9k-0003qY-Qk for xen-changelog@lists.xensource.com; Tue, 17 Jul 2012 22:22:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SrG9k-0007pY-ME for xen-changelog@lists.xensource.com; Tue, 17 Jul 2012 22:22:12 +0000 Message-Id: Date: Tue, 17 Jul 2012 22:22:12 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xen/arm: disable the event optimization in the gic X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Stefano Stabellini # Date 1342542811 -3600 # Node ID 43e21ce7f22151524b800a6cf0ac4ba1233b34a7 # Parent 99941375ef10b602b2e8784de70b0a294d832497 xen/arm: disable the event optimization in the gic Currently we have an optimization in the GIC driver that allows us not to request maintenance interrupts for Xen events. The basic idea is that every time we are about to inject a new interrupt or event into a guest, we check whether we can remove some old event irqs from one or more LRs. We can do this because we know when a guest finishes processing event notifications: it sets the evtchn_upcall_pending bit to 0. However it is unsafe: the guest resets evtchn_upcall_pending before EOI'ing the event irq, therefore a small window of time exists when Xen could jump in and remove the event irq from the LR register before the guest has EOI'ed it. This is not a good practice according to the GIC manual. Remove the optimization for now. Signed-off-by: Stefano Stabellini Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r 99941375ef10 -r 43e21ce7f221 xen/arch/arm/gic.c --- a/xen/arch/arm/gic.c Tue Jul 17 17:33:30 2012 +0100 +++ b/xen/arch/arm/gic.c Tue Jul 17 17:33:31 2012 +0100 @@ -37,7 +37,6 @@ + (GIC_CR_OFFSET & 0xfff))) #define GICH ((volatile uint32_t *) (FIXMAP_ADDR(FIXMAP_GICH) \ + (GIC_HR_OFFSET & 0xfff))) -static void events_maintenance(struct vcpu *v); static void gic_restore_pending_irqs(struct vcpu *v); /* Global state */ @@ -48,7 +47,6 @@ static struct { unsigned int lines; unsigned int cpus; spinlock_t lock; - uint64_t event_mask; uint64_t lr_mask; } gic; @@ -62,7 +60,6 @@ void gic_save_state(struct vcpu *v) for ( i=0; iarch.gic_lr[i] = GICH[GICH_LR + i]; v->arch.lr_mask = gic.lr_mask; - v->arch.event_mask = gic.event_mask; /* Disable until next VCPU scheduled */ GICH[GICH_HCR] = 0; isb(); @@ -76,7 +73,6 @@ void gic_restore_state(struct vcpu *v) return; gic.lr_mask = v->arch.lr_mask; - gic.event_mask = v->arch.event_mask; for ( i=0; iarch.gic_lr[i]; GICH[GICH_HCR] = GICH_HCR_EN; @@ -318,7 +314,6 @@ int __init gic_init(void) gic_hyp_init(); gic.lr_mask = 0ULL; - gic.event_mask = 0ULL; spin_unlock(&gic.lock); @@ -421,9 +416,6 @@ static inline void gic_set_lr(int lr, un BUG_ON(lr > nr_lrs); - if (virtual_irq == VGIC_IRQ_EVTCHN_CALLBACK && nr_lrs > 1) - maintenance_int = 0; - GICH[GICH_LR + lr] = state | maintenance_int | ((priority >> 3) << GICH_LR_PRIORITY_SHIFT) | @@ -436,11 +428,6 @@ void gic_set_guest_irq(struct vcpu *v, u int i; struct pending_irq *iter, *n; - if ( v->is_running ) - { - events_maintenance(v); - } - spin_lock_irq(&gic.lock); if ( v->is_running && list_empty(&v->arch.vgic.lr_pending) ) @@ -448,8 +435,6 @@ void gic_set_guest_irq(struct vcpu *v, u i = find_first_zero_bit(&gic.lr_mask, nr_lrs); if (i < nr_lrs) { set_bit(i, &gic.lr_mask); - if ( virtual_irq == VGIC_IRQ_EVTCHN_CALLBACK ) - set_bit(i, &gic.event_mask); gic_set_lr(i, virtual_irq, state, priority); goto out; } @@ -487,8 +472,6 @@ static void gic_restore_pending_irqs(str gic_set_lr(i, p->irq, GICH_LR_PENDING, p->priority); list_del_init(&p->lr_queue); set_bit(i, &gic.lr_mask); - if ( p->irq == VGIC_IRQ_EVTCHN_CALLBACK ) - set_bit(i, &gic.event_mask); } } @@ -574,27 +557,6 @@ int gicv_setup(struct domain *d) GIC_BASE_ADDRESS + GIC_VR_OFFSET); } -static void events_maintenance(struct vcpu *v) -{ - int i = 0; - int already_pending = test_bit(0, - (unsigned long *)&vcpu_info(v, evtchn_upcall_pending)); - - if (!already_pending && gic.event_mask != 0) { - spin_lock_irq(&gic.lock); - while ((i = find_next_bit((const long unsigned int *) &gic.event_mask, - 64, i)) < 64) { - - GICH[GICH_LR + i] = 0; - clear_bit(i, &gic.lr_mask); - clear_bit(i, &gic.event_mask); - - i++; - } - spin_unlock_irq(&gic.lock); - } -} - static void maintenance_interrupt(int irq, void *dev_id, struct cpu_user_regs *regs) { int i = 0, virq; @@ -602,8 +564,6 @@ static void maintenance_interrupt(int ir struct vcpu *v = current; uint64_t eisr = GICH[GICH_EISR0] | (((uint64_t) GICH[GICH_EISR1]) << 32); - events_maintenance(v); - while ((i = find_next_bit((const long unsigned int *) &eisr, 64, i)) < 64) { struct pending_irq *p; @@ -619,8 +579,6 @@ static void maintenance_interrupt(int ir gic_set_lr(i, p->irq, GICH_LR_PENDING, p->priority); list_del_init(&p->lr_queue); set_bit(i, &gic.lr_mask); - if ( p->irq == VGIC_IRQ_EVTCHN_CALLBACK ) - set_bit(i, &gic.event_mask); } else { gic_inject_irq_stop(); } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jul 17 22:22:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 17 Jul 2012 22: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 1SrG9n-0001BQ-Cq; Tue, 17 Jul 2012 22:22:15 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SrG9l-0001Ak-4F for xen-changelog@lists.xensource.com; Tue, 17 Jul 2012 22:22:13 +0000 Received: from [85.158.143.35:32482] by server-1.bemta-4.messagelabs.com id 8E/CC-24392-495E5005; Tue, 17 Jul 2012 22:22:12 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-21.messagelabs.com!1342563730!13244806!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 28094 invoked from network); 17 Jul 2012 22:22:11 -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; 17 Jul 2012 22:22:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SrG9i-0003qJ-9X for xen-changelog@lists.xensource.com; Tue, 17 Jul 2012 22:22:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SrG9h-0007oI-UF for xen-changelog@lists.xensource.com; Tue, 17 Jul 2012 22:22:09 +0000 Message-Id: Date: Tue, 17 Jul 2012 22:22:09 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm/gic: support injecting IRQs even to VCPUs not currently running X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Stefano Stabellini # Date 1342542125 -3600 # Node ID 10fd80aa8beb0fce4ff2e453f73dc79b7a665fa3 # Parent b9ddef1a35c085c29bf69d7a2014226fa2f61f8d arm/gic: support injecting IRQs even to VCPUs not currently running The lr_pending list belongs to the vgic rather than the gic, so move it there. gic_set_guest_irq should take into account whether the vcpu is currently running and if it is not it should add the irq to the right lr_pending list. When restoring the gic state we need to go through the lr_pending list because it is possible that some irqs have been "injected" while the vcpu wasn't running. Signed-off-by: Stefano Stabellini Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r b9ddef1a35c0 -r 10fd80aa8beb xen/arch/arm/gic.c --- a/xen/arch/arm/gic.c Tue Jul 17 17:22:04 2012 +0100 +++ b/xen/arch/arm/gic.c Tue Jul 17 17:22:05 2012 +0100 @@ -38,6 +38,7 @@ #define GICH ((volatile uint32_t *) (FIXMAP_ADDR(FIXMAP_GICH) \ + (GIC_HR_OFFSET & 0xfff))) static void events_maintenance(struct vcpu *v); +static void gic_restore_pending_irqs(struct vcpu *v); /* Global state */ static struct { @@ -49,13 +50,6 @@ static struct { spinlock_t lock; uint64_t event_mask; uint64_t lr_mask; - /* lr_pending is used to queue IRQs (struct pending_irq) that the - * vgic tried to inject in the guest (calling gic_set_guest_irq) but - * no LRs were available at the time. - * As soon as an LR is freed we remove the first IRQ from this - * list and write it to the LR register. - * lr_pending is a subset of vgic.inflight_irqs. */ - struct list_head lr_pending; } gic; irq_desc_t irq_desc[NR_IRQS]; @@ -87,6 +81,8 @@ void gic_restore_state(struct vcpu *v) GICH[GICH_LR + i] = v->arch.gic_lr[i]; GICH[GICH_HCR] = GICH_HCR_EN; isb(); + + gic_restore_pending_irqs(v); } static unsigned int gic_irq_startup(struct irq_desc *desc) @@ -323,7 +319,6 @@ int __init gic_init(void) gic.lr_mask = 0ULL; gic.event_mask = 0ULL; - INIT_LIST_HEAD(&gic.lr_pending); spin_unlock(&gic.lock); @@ -435,17 +430,20 @@ static inline void gic_set_lr(int lr, un ((virtual_irq & GICH_LR_VIRTUAL_MASK) << GICH_LR_VIRTUAL_SHIFT); } -void gic_set_guest_irq(unsigned int virtual_irq, +void gic_set_guest_irq(struct vcpu *v, unsigned int virtual_irq, unsigned int state, unsigned int priority) { int i; struct pending_irq *iter, *n; - events_maintenance(current); + if ( v->is_running ) + { + events_maintenance(v); + } spin_lock_irq(&gic.lock); - if ( list_empty(&gic.lr_pending) ) + if ( v->is_running && list_empty(&v->arch.vgic.lr_pending) ) { i = find_first_zero_bit(&gic.lr_mask, nr_lrs); if (i < nr_lrs) { @@ -457,8 +455,8 @@ void gic_set_guest_irq(unsigned int virt } } - n = irq_to_pending(current, virtual_irq); - list_for_each_entry ( iter, &gic.lr_pending, lr_queue ) + n = irq_to_pending(v, virtual_irq); + list_for_each_entry ( iter, &v->arch.vgic.lr_pending, lr_queue ) { if ( iter->priority > priority ) { @@ -466,13 +464,32 @@ void gic_set_guest_irq(unsigned int virt goto out; } } - list_add_tail(&n->lr_queue, &gic.lr_pending); + list_add_tail(&n->lr_queue, &v->arch.vgic.lr_pending); out: spin_unlock_irq(&gic.lock); return; } +static void gic_restore_pending_irqs(struct vcpu *v) +{ + int i; + struct pending_irq *p; + + list_for_each_entry ( p, &v->arch.vgic.lr_pending, lr_queue ) + { + i = find_first_zero_bit(&gic.lr_mask, nr_lrs); + if ( i >= nr_lrs ) return; + + gic_set_lr(i, p->irq, GICH_LR_PENDING, p->priority); + list_del_init(&p->lr_queue); + set_bit(i, &gic.lr_mask); + if ( p->irq == VGIC_IRQ_EVTCHN_CALLBACK ) + set_bit(i, &gic.event_mask); + } + +} + static void gic_inject_irq_start(void) { uint32_t hcr; @@ -579,9 +596,10 @@ static void maintenance_interrupt(int ir { int i = 0, virq; uint32_t lr; + struct vcpu *v = current; uint64_t eisr = GICH[GICH_EISR0] | (((uint64_t) GICH[GICH_EISR1]) << 32); - events_maintenance(current); + events_maintenance(v); while ((i = find_next_bit((const long unsigned int *) &eisr, sizeof(eisr), i)) < sizeof(eisr)) { @@ -593,8 +611,8 @@ static void maintenance_interrupt(int ir GICH[GICH_LR + i] = 0; clear_bit(i, &gic.lr_mask); - if ( !list_empty(&gic.lr_pending) ) { - p = list_entry(gic.lr_pending.next, typeof(*p), lr_queue); + if ( !list_empty(&v->arch.vgic.lr_pending) ) { + p = list_entry(v->arch.vgic.lr_pending.next, typeof(*p), lr_queue); gic_set_lr(i, p->irq, GICH_LR_PENDING, p->priority); list_del_init(&p->lr_queue); set_bit(i, &gic.lr_mask); @@ -605,14 +623,14 @@ static void maintenance_interrupt(int ir } spin_unlock_irq(&gic.lock); - spin_lock_irq(¤t->arch.vgic.lock); - p = irq_to_pending(current, virq); + spin_lock_irq(&v->arch.vgic.lock); + p = irq_to_pending(v, virq); if ( p->desc != NULL ) { p->desc->status &= ~IRQ_INPROGRESS; GICC[GICC_DIR] = virq; } list_del_init(&p->inflight); - spin_unlock_irq(¤t->arch.vgic.lock); + spin_unlock_irq(&v->arch.vgic.lock); i++; } diff -r b9ddef1a35c0 -r 10fd80aa8beb xen/arch/arm/gic.h --- a/xen/arch/arm/gic.h Tue Jul 17 17:22:04 2012 +0100 +++ b/xen/arch/arm/gic.h Tue Jul 17 17:22:05 2012 +0100 @@ -137,7 +137,7 @@ extern void gic_route_irqs(void); extern void gic_inject(void); extern void __cpuinit init_maintenance_interrupt(void); -extern void gic_set_guest_irq(unsigned int irq, +extern void gic_set_guest_irq(struct vcpu *v, unsigned int irq, unsigned int state, unsigned int priority); extern int gic_route_irq_to_guest(struct domain *d, unsigned int irq, const char * devname); diff -r b9ddef1a35c0 -r 10fd80aa8beb xen/arch/arm/vgic.c --- a/xen/arch/arm/vgic.c Tue Jul 17 17:22:04 2012 +0100 +++ b/xen/arch/arm/vgic.c Tue Jul 17 17:22:05 2012 +0100 @@ -115,6 +115,7 @@ int vcpu_vgic_init(struct vcpu *v) | (1<<(v->vcpu_id+16)) | (1<<(v->vcpu_id+24)); INIT_LIST_HEAD(&v->arch.vgic.inflight_irqs); + INIT_LIST_HEAD(&v->arch.vgic.lr_pending); spin_lock_init(&v->arch.vgic.lock); return 0; @@ -571,7 +572,7 @@ void vgic_vcpu_inject_irq(struct vcpu *v else n->desc = NULL; - gic_set_guest_irq(irq, GICH_LR_PENDING, priority); + gic_set_guest_irq(v, irq, GICH_LR_PENDING, priority); spin_lock_irqsave(&v->arch.vgic.lock, flags); list_for_each_entry ( iter, &v->arch.vgic.inflight_irqs, inflight ) diff -r b9ddef1a35c0 -r 10fd80aa8beb xen/include/asm-arm/domain.h --- a/xen/include/asm-arm/domain.h Tue Jul 17 17:22:04 2012 +0100 +++ b/xen/include/asm-arm/domain.h Tue Jul 17 17:22:05 2012 +0100 @@ -140,6 +140,13 @@ struct arch_vcpu * As soon as an IRQ is EOI'd by the guest and removed from the * corresponding LR it is also removed from this list. */ struct list_head inflight_irqs; + /* lr_pending is used to queue IRQs (struct pending_irq) that the + * vgic tried to inject in the guest (calling gic_set_guest_irq) but + * no LRs were available at the time. + * As soon as an LR is freed we remove the first IRQ from this + * list and write it to the LR register. + * lr_pending is a subset of vgic.inflight_irqs. */ + struct list_head lr_pending; spinlock_t lock; } vgic; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jul 17 22:22:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 17 Jul 2012 22: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 1SrG9n-0001BQ-Cq; Tue, 17 Jul 2012 22:22:15 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SrG9l-0001Ak-4F for xen-changelog@lists.xensource.com; Tue, 17 Jul 2012 22:22:13 +0000 Received: from [85.158.143.35:32482] by server-1.bemta-4.messagelabs.com id 8E/CC-24392-495E5005; Tue, 17 Jul 2012 22:22:12 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-21.messagelabs.com!1342563730!13244806!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 28094 invoked from network); 17 Jul 2012 22:22:11 -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; 17 Jul 2012 22:22:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SrG9i-0003qJ-9X for xen-changelog@lists.xensource.com; Tue, 17 Jul 2012 22:22:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SrG9h-0007oI-UF for xen-changelog@lists.xensource.com; Tue, 17 Jul 2012 22:22:09 +0000 Message-Id: Date: Tue, 17 Jul 2012 22:22:09 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm/gic: support injecting IRQs even to VCPUs not currently running X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Stefano Stabellini # Date 1342542125 -3600 # Node ID 10fd80aa8beb0fce4ff2e453f73dc79b7a665fa3 # Parent b9ddef1a35c085c29bf69d7a2014226fa2f61f8d arm/gic: support injecting IRQs even to VCPUs not currently running The lr_pending list belongs to the vgic rather than the gic, so move it there. gic_set_guest_irq should take into account whether the vcpu is currently running and if it is not it should add the irq to the right lr_pending list. When restoring the gic state we need to go through the lr_pending list because it is possible that some irqs have been "injected" while the vcpu wasn't running. Signed-off-by: Stefano Stabellini Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r b9ddef1a35c0 -r 10fd80aa8beb xen/arch/arm/gic.c --- a/xen/arch/arm/gic.c Tue Jul 17 17:22:04 2012 +0100 +++ b/xen/arch/arm/gic.c Tue Jul 17 17:22:05 2012 +0100 @@ -38,6 +38,7 @@ #define GICH ((volatile uint32_t *) (FIXMAP_ADDR(FIXMAP_GICH) \ + (GIC_HR_OFFSET & 0xfff))) static void events_maintenance(struct vcpu *v); +static void gic_restore_pending_irqs(struct vcpu *v); /* Global state */ static struct { @@ -49,13 +50,6 @@ static struct { spinlock_t lock; uint64_t event_mask; uint64_t lr_mask; - /* lr_pending is used to queue IRQs (struct pending_irq) that the - * vgic tried to inject in the guest (calling gic_set_guest_irq) but - * no LRs were available at the time. - * As soon as an LR is freed we remove the first IRQ from this - * list and write it to the LR register. - * lr_pending is a subset of vgic.inflight_irqs. */ - struct list_head lr_pending; } gic; irq_desc_t irq_desc[NR_IRQS]; @@ -87,6 +81,8 @@ void gic_restore_state(struct vcpu *v) GICH[GICH_LR + i] = v->arch.gic_lr[i]; GICH[GICH_HCR] = GICH_HCR_EN; isb(); + + gic_restore_pending_irqs(v); } static unsigned int gic_irq_startup(struct irq_desc *desc) @@ -323,7 +319,6 @@ int __init gic_init(void) gic.lr_mask = 0ULL; gic.event_mask = 0ULL; - INIT_LIST_HEAD(&gic.lr_pending); spin_unlock(&gic.lock); @@ -435,17 +430,20 @@ static inline void gic_set_lr(int lr, un ((virtual_irq & GICH_LR_VIRTUAL_MASK) << GICH_LR_VIRTUAL_SHIFT); } -void gic_set_guest_irq(unsigned int virtual_irq, +void gic_set_guest_irq(struct vcpu *v, unsigned int virtual_irq, unsigned int state, unsigned int priority) { int i; struct pending_irq *iter, *n; - events_maintenance(current); + if ( v->is_running ) + { + events_maintenance(v); + } spin_lock_irq(&gic.lock); - if ( list_empty(&gic.lr_pending) ) + if ( v->is_running && list_empty(&v->arch.vgic.lr_pending) ) { i = find_first_zero_bit(&gic.lr_mask, nr_lrs); if (i < nr_lrs) { @@ -457,8 +455,8 @@ void gic_set_guest_irq(unsigned int virt } } - n = irq_to_pending(current, virtual_irq); - list_for_each_entry ( iter, &gic.lr_pending, lr_queue ) + n = irq_to_pending(v, virtual_irq); + list_for_each_entry ( iter, &v->arch.vgic.lr_pending, lr_queue ) { if ( iter->priority > priority ) { @@ -466,13 +464,32 @@ void gic_set_guest_irq(unsigned int virt goto out; } } - list_add_tail(&n->lr_queue, &gic.lr_pending); + list_add_tail(&n->lr_queue, &v->arch.vgic.lr_pending); out: spin_unlock_irq(&gic.lock); return; } +static void gic_restore_pending_irqs(struct vcpu *v) +{ + int i; + struct pending_irq *p; + + list_for_each_entry ( p, &v->arch.vgic.lr_pending, lr_queue ) + { + i = find_first_zero_bit(&gic.lr_mask, nr_lrs); + if ( i >= nr_lrs ) return; + + gic_set_lr(i, p->irq, GICH_LR_PENDING, p->priority); + list_del_init(&p->lr_queue); + set_bit(i, &gic.lr_mask); + if ( p->irq == VGIC_IRQ_EVTCHN_CALLBACK ) + set_bit(i, &gic.event_mask); + } + +} + static void gic_inject_irq_start(void) { uint32_t hcr; @@ -579,9 +596,10 @@ static void maintenance_interrupt(int ir { int i = 0, virq; uint32_t lr; + struct vcpu *v = current; uint64_t eisr = GICH[GICH_EISR0] | (((uint64_t) GICH[GICH_EISR1]) << 32); - events_maintenance(current); + events_maintenance(v); while ((i = find_next_bit((const long unsigned int *) &eisr, sizeof(eisr), i)) < sizeof(eisr)) { @@ -593,8 +611,8 @@ static void maintenance_interrupt(int ir GICH[GICH_LR + i] = 0; clear_bit(i, &gic.lr_mask); - if ( !list_empty(&gic.lr_pending) ) { - p = list_entry(gic.lr_pending.next, typeof(*p), lr_queue); + if ( !list_empty(&v->arch.vgic.lr_pending) ) { + p = list_entry(v->arch.vgic.lr_pending.next, typeof(*p), lr_queue); gic_set_lr(i, p->irq, GICH_LR_PENDING, p->priority); list_del_init(&p->lr_queue); set_bit(i, &gic.lr_mask); @@ -605,14 +623,14 @@ static void maintenance_interrupt(int ir } spin_unlock_irq(&gic.lock); - spin_lock_irq(¤t->arch.vgic.lock); - p = irq_to_pending(current, virq); + spin_lock_irq(&v->arch.vgic.lock); + p = irq_to_pending(v, virq); if ( p->desc != NULL ) { p->desc->status &= ~IRQ_INPROGRESS; GICC[GICC_DIR] = virq; } list_del_init(&p->inflight); - spin_unlock_irq(¤t->arch.vgic.lock); + spin_unlock_irq(&v->arch.vgic.lock); i++; } diff -r b9ddef1a35c0 -r 10fd80aa8beb xen/arch/arm/gic.h --- a/xen/arch/arm/gic.h Tue Jul 17 17:22:04 2012 +0100 +++ b/xen/arch/arm/gic.h Tue Jul 17 17:22:05 2012 +0100 @@ -137,7 +137,7 @@ extern void gic_route_irqs(void); extern void gic_inject(void); extern void __cpuinit init_maintenance_interrupt(void); -extern void gic_set_guest_irq(unsigned int irq, +extern void gic_set_guest_irq(struct vcpu *v, unsigned int irq, unsigned int state, unsigned int priority); extern int gic_route_irq_to_guest(struct domain *d, unsigned int irq, const char * devname); diff -r b9ddef1a35c0 -r 10fd80aa8beb xen/arch/arm/vgic.c --- a/xen/arch/arm/vgic.c Tue Jul 17 17:22:04 2012 +0100 +++ b/xen/arch/arm/vgic.c Tue Jul 17 17:22:05 2012 +0100 @@ -115,6 +115,7 @@ int vcpu_vgic_init(struct vcpu *v) | (1<<(v->vcpu_id+16)) | (1<<(v->vcpu_id+24)); INIT_LIST_HEAD(&v->arch.vgic.inflight_irqs); + INIT_LIST_HEAD(&v->arch.vgic.lr_pending); spin_lock_init(&v->arch.vgic.lock); return 0; @@ -571,7 +572,7 @@ void vgic_vcpu_inject_irq(struct vcpu *v else n->desc = NULL; - gic_set_guest_irq(irq, GICH_LR_PENDING, priority); + gic_set_guest_irq(v, irq, GICH_LR_PENDING, priority); spin_lock_irqsave(&v->arch.vgic.lock, flags); list_for_each_entry ( iter, &v->arch.vgic.inflight_irqs, inflight ) diff -r b9ddef1a35c0 -r 10fd80aa8beb xen/include/asm-arm/domain.h --- a/xen/include/asm-arm/domain.h Tue Jul 17 17:22:04 2012 +0100 +++ b/xen/include/asm-arm/domain.h Tue Jul 17 17:22:05 2012 +0100 @@ -140,6 +140,13 @@ struct arch_vcpu * As soon as an IRQ is EOI'd by the guest and removed from the * corresponding LR it is also removed from this list. */ struct list_head inflight_irqs; + /* lr_pending is used to queue IRQs (struct pending_irq) that the + * vgic tried to inject in the guest (calling gic_set_guest_irq) but + * no LRs were available at the time. + * As soon as an LR is freed we remove the first IRQ from this + * list and write it to the LR register. + * lr_pending is a subset of vgic.inflight_irqs. */ + struct list_head lr_pending; spinlock_t lock; } vgic; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jul 17 22:22:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 17 Jul 2012 22:22: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 1SrG9q-0001C7-8x; Tue, 17 Jul 2012 22:22:18 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SrG9o-0001Ad-Rt for xen-changelog@lists.xensource.com; Tue, 17 Jul 2012 22:22:17 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-27.messagelabs.com!1342563729!9672337!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 21490 invoked from network); 17 Jul 2012 22:22:10 -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; 17 Jul 2012 22:22:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SrG9h-0003qG-Hp for xen-changelog@lists.xensource.com; Tue, 17 Jul 2012 22:22:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SrG9h-0007o3-DI for xen-changelog@lists.xensource.com; Tue, 17 Jul 2012 22:22:09 +0000 Message-Id: Date: Tue, 17 Jul 2012 22:22:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm/gic: fix gic context switch X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Stefano Stabellini # Date 1342542124 -3600 # Node ID b9ddef1a35c085c29bf69d7a2014226fa2f61f8d # Parent d53381ebdb3287d002e1179f6774516e70399490 arm/gic: fix gic context switch gic_save/restore_state should also save and restore lr_mask and event_mask too. Signed-off-by: Stefano Stabellini Acked-by: Tim Deegan Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r d53381ebdb32 -r b9ddef1a35c0 xen/arch/arm/gic.c --- a/xen/arch/arm/gic.c Tue Jul 17 17:22:04 2012 +0100 +++ b/xen/arch/arm/gic.c Tue Jul 17 17:22:04 2012 +0100 @@ -67,6 +67,8 @@ void gic_save_state(struct vcpu *v) for ( i=0; iarch.gic_lr[i] = GICH[GICH_LR + i]; + v->arch.lr_mask = gic.lr_mask; + v->arch.event_mask = gic.event_mask; /* Disable until next VCPU scheduled */ GICH[GICH_HCR] = 0; isb(); @@ -79,6 +81,8 @@ void gic_restore_state(struct vcpu *v) if ( is_idle_vcpu(v) ) return; + gic.lr_mask = v->arch.lr_mask; + gic.event_mask = v->arch.event_mask; for ( i=0; iarch.gic_lr[i]; GICH[GICH_HCR] = GICH_HCR_EN; diff -r d53381ebdb32 -r b9ddef1a35c0 xen/include/asm-arm/domain.h --- a/xen/include/asm-arm/domain.h Tue Jul 17 17:22:04 2012 +0100 +++ b/xen/include/asm-arm/domain.h Tue Jul 17 17:22:04 2012 +0100 @@ -121,6 +121,8 @@ struct arch_vcpu uint32_t gic_hcr, gic_vmcr, gic_apr; uint32_t gic_lr[64]; + uint64_t event_mask; + uint64_t lr_mask; struct { /* _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jul 17 22:22:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 17 Jul 2012 22:22: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 1SrG9q-0001C7-8x; Tue, 17 Jul 2012 22:22:18 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SrG9o-0001Ad-Rt for xen-changelog@lists.xensource.com; Tue, 17 Jul 2012 22:22:17 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-27.messagelabs.com!1342563729!9672337!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 21490 invoked from network); 17 Jul 2012 22:22:10 -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; 17 Jul 2012 22:22:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SrG9h-0003qG-Hp for xen-changelog@lists.xensource.com; Tue, 17 Jul 2012 22:22:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SrG9h-0007o3-DI for xen-changelog@lists.xensource.com; Tue, 17 Jul 2012 22:22:09 +0000 Message-Id: Date: Tue, 17 Jul 2012 22:22:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm/gic: fix gic context switch X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Stefano Stabellini # Date 1342542124 -3600 # Node ID b9ddef1a35c085c29bf69d7a2014226fa2f61f8d # Parent d53381ebdb3287d002e1179f6774516e70399490 arm/gic: fix gic context switch gic_save/restore_state should also save and restore lr_mask and event_mask too. Signed-off-by: Stefano Stabellini Acked-by: Tim Deegan Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r d53381ebdb32 -r b9ddef1a35c0 xen/arch/arm/gic.c --- a/xen/arch/arm/gic.c Tue Jul 17 17:22:04 2012 +0100 +++ b/xen/arch/arm/gic.c Tue Jul 17 17:22:04 2012 +0100 @@ -67,6 +67,8 @@ void gic_save_state(struct vcpu *v) for ( i=0; iarch.gic_lr[i] = GICH[GICH_LR + i]; + v->arch.lr_mask = gic.lr_mask; + v->arch.event_mask = gic.event_mask; /* Disable until next VCPU scheduled */ GICH[GICH_HCR] = 0; isb(); @@ -79,6 +81,8 @@ void gic_restore_state(struct vcpu *v) if ( is_idle_vcpu(v) ) return; + gic.lr_mask = v->arch.lr_mask; + gic.event_mask = v->arch.event_mask; for ( i=0; iarch.gic_lr[i]; GICH[GICH_HCR] = GICH_HCR_EN; diff -r d53381ebdb32 -r b9ddef1a35c0 xen/include/asm-arm/domain.h --- a/xen/include/asm-arm/domain.h Tue Jul 17 17:22:04 2012 +0100 +++ b/xen/include/asm-arm/domain.h Tue Jul 17 17:22:04 2012 +0100 @@ -121,6 +121,8 @@ struct arch_vcpu uint32_t gic_hcr, gic_vmcr, gic_apr; uint32_t gic_lr[64]; + uint64_t event_mask; + uint64_t lr_mask; struct { /* _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jul 17 22:22:22 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 17 Jul 2012 22:22: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 1SrG9t-0001Ea-Q7; Tue, 17 Jul 2012 22:22:21 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SrG9s-0001BC-Lk for xen-changelog@lists.xensource.com; Tue, 17 Jul 2012 22:22:20 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-27.messagelabs.com!1342563732!1074288!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 27909 invoked from network); 17 Jul 2012 22:22:13 -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; 17 Jul 2012 22:22:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SrG9k-0003qV-AA for xen-changelog@lists.xensource.com; Tue, 17 Jul 2012 22:22:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SrG9k-0007pJ-5n for xen-changelog@lists.xensource.com; Tue, 17 Jul 2012 22:22:12 +0000 Message-Id: Date: Tue, 17 Jul 2012 22:22:11 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xen/arm: gic and vgic fixes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Stefano Stabellini # Date 1342542810 -3600 # Node ID 99941375ef10b602b2e8784de70b0a294d832497 # Parent 9f5fc2a5471f897eacb24b710c5c1e5e5ab6a980 xen/arm: gic and vgic fixes - the last argument of find_next_bit is the maximum number of bits, not the maximum number of bytes; - use list_for_each_entry_safe instead of list_for_each_entry in gic_restore_pending_irqs because we are actually deleting entries in the loop. Signed-off-by: Stefano Stabellini Acked-by: Tim Deegan Committed-by: Ian Campbell --- diff -r 9f5fc2a5471f -r 99941375ef10 xen/arch/arm/gic.c --- a/xen/arch/arm/gic.c Tue Jul 17 17:33:29 2012 +0100 +++ b/xen/arch/arm/gic.c Tue Jul 17 17:33:30 2012 +0100 @@ -477,9 +477,9 @@ out: static void gic_restore_pending_irqs(struct vcpu *v) { int i; - struct pending_irq *p; + struct pending_irq *p, *t; - list_for_each_entry ( p, &v->arch.vgic.lr_pending, lr_queue ) + list_for_each_entry_safe ( p, t, &v->arch.vgic.lr_pending, lr_queue ) { i = find_first_zero_bit(&gic.lr_mask, nr_lrs); if ( i >= nr_lrs ) return; @@ -583,7 +583,7 @@ static void events_maintenance(struct vc if (!already_pending && gic.event_mask != 0) { spin_lock_irq(&gic.lock); while ((i = find_next_bit((const long unsigned int *) &gic.event_mask, - sizeof(uint64_t), i)) < sizeof(uint64_t)) { + 64, i)) < 64) { GICH[GICH_LR + i] = 0; clear_bit(i, &gic.lr_mask); @@ -605,7 +605,7 @@ static void maintenance_interrupt(int ir events_maintenance(v); while ((i = find_next_bit((const long unsigned int *) &eisr, - sizeof(eisr), i)) < sizeof(eisr)) { + 64, i)) < 64) { struct pending_irq *p; spin_lock_irq(&gic.lock); diff -r 9f5fc2a5471f -r 99941375ef10 xen/arch/arm/vgic.c --- a/xen/arch/arm/vgic.c Tue Jul 17 17:33:29 2012 +0100 +++ b/xen/arch/arm/vgic.c Tue Jul 17 17:33:30 2012 +0100 @@ -355,8 +355,7 @@ static void vgic_enable_irqs(struct vcpu unsigned int irq; int i = 0; - while ( (i = find_next_bit((const long unsigned int *) &r, - sizeof(uint32_t), i)) < sizeof(uint32_t) ) { + while ( (i = find_next_bit((const long unsigned int *) &r, 32, i)) < 32 ) { irq = i + (32 * n); p = irq_to_pending(v, irq); if ( !list_empty(&p->inflight) ) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jul 17 22:22:22 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 17 Jul 2012 22:22: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 1SrG9t-0001Ea-Q7; Tue, 17 Jul 2012 22:22:21 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SrG9s-0001BC-Lk for xen-changelog@lists.xensource.com; Tue, 17 Jul 2012 22:22:20 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-27.messagelabs.com!1342563732!1074288!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 27909 invoked from network); 17 Jul 2012 22:22:13 -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; 17 Jul 2012 22:22:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SrG9k-0003qV-AA for xen-changelog@lists.xensource.com; Tue, 17 Jul 2012 22:22:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SrG9k-0007pJ-5n for xen-changelog@lists.xensource.com; Tue, 17 Jul 2012 22:22:12 +0000 Message-Id: Date: Tue, 17 Jul 2012 22:22:11 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xen/arm: gic and vgic fixes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Stefano Stabellini # Date 1342542810 -3600 # Node ID 99941375ef10b602b2e8784de70b0a294d832497 # Parent 9f5fc2a5471f897eacb24b710c5c1e5e5ab6a980 xen/arm: gic and vgic fixes - the last argument of find_next_bit is the maximum number of bits, not the maximum number of bytes; - use list_for_each_entry_safe instead of list_for_each_entry in gic_restore_pending_irqs because we are actually deleting entries in the loop. Signed-off-by: Stefano Stabellini Acked-by: Tim Deegan Committed-by: Ian Campbell --- diff -r 9f5fc2a5471f -r 99941375ef10 xen/arch/arm/gic.c --- a/xen/arch/arm/gic.c Tue Jul 17 17:33:29 2012 +0100 +++ b/xen/arch/arm/gic.c Tue Jul 17 17:33:30 2012 +0100 @@ -477,9 +477,9 @@ out: static void gic_restore_pending_irqs(struct vcpu *v) { int i; - struct pending_irq *p; + struct pending_irq *p, *t; - list_for_each_entry ( p, &v->arch.vgic.lr_pending, lr_queue ) + list_for_each_entry_safe ( p, t, &v->arch.vgic.lr_pending, lr_queue ) { i = find_first_zero_bit(&gic.lr_mask, nr_lrs); if ( i >= nr_lrs ) return; @@ -583,7 +583,7 @@ static void events_maintenance(struct vc if (!already_pending && gic.event_mask != 0) { spin_lock_irq(&gic.lock); while ((i = find_next_bit((const long unsigned int *) &gic.event_mask, - sizeof(uint64_t), i)) < sizeof(uint64_t)) { + 64, i)) < 64) { GICH[GICH_LR + i] = 0; clear_bit(i, &gic.lr_mask); @@ -605,7 +605,7 @@ static void maintenance_interrupt(int ir events_maintenance(v); while ((i = find_next_bit((const long unsigned int *) &eisr, - sizeof(eisr), i)) < sizeof(eisr)) { + 64, i)) < 64) { struct pending_irq *p; spin_lock_irq(&gic.lock); diff -r 9f5fc2a5471f -r 99941375ef10 xen/arch/arm/vgic.c --- a/xen/arch/arm/vgic.c Tue Jul 17 17:33:29 2012 +0100 +++ b/xen/arch/arm/vgic.c Tue Jul 17 17:33:30 2012 +0100 @@ -355,8 +355,7 @@ static void vgic_enable_irqs(struct vcpu unsigned int irq; int i = 0; - while ( (i = find_next_bit((const long unsigned int *) &r, - sizeof(uint32_t), i)) < sizeof(uint32_t) ) { + while ( (i = find_next_bit((const long unsigned int *) &r, 32, i)) < 32 ) { irq = i + (32 * n); p = irq_to_pending(v, irq); if ( !list_empty(&p->inflight) ) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 19 16:33:16 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Jul 2012 16:33: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 1Srtf7-0000ep-7f; Thu, 19 Jul 2012 16:33:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Srtf5-0000ek-SI for xen-changelog@lists.xensource.com; Thu, 19 Jul 2012 16:33:12 +0000 Received: from [85.158.139.83:4464] by server-11.bemta-5.messagelabs.com id B8/8C-20400-7C638005; Thu, 19 Jul 2012 16:33:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-182.messagelabs.com!1342715589!27598630!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 9478 invoked from network); 19 Jul 2012 16:33:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 19 Jul 2012 16:33:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Srtf2-0002nG-TG for xen-changelog@lists.xensource.com; Thu, 19 Jul 2012 16:33:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Srtf2-00085Q-K9 for xen-changelog@lists.xensource.com; Thu, 19 Jul 2012 16:33:08 +0000 Message-Id: Date: Thu, 19 Jul 2012 16:33:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] nestedhvm: initialize pfec for l1 pagetable walk X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Christoph Egger # Date 1342692958 -3600 # Node ID 3625ff5e9f80aebb403d6efc75522eef08cd3802 # Parent 7d8a2e8412f2f86594abd3020776c0c58dfd1ee8 nestedhvm: initialize pfec for l1 pagetable walk Signed-off-by: Christoph Egger Acked-by: Tim Deegan Committed-by: Tim Deegan --- diff -r 7d8a2e8412f2 -r 3625ff5e9f80 xen/arch/x86/hvm/hvm.c --- a/xen/arch/x86/hvm/hvm.c Thu Jul 19 11:09:39 2012 +0100 +++ b/xen/arch/x86/hvm/hvm.c Thu Jul 19 11:15:58 2012 +0100 @@ -1278,7 +1278,8 @@ int hvm_hap_nested_page_fault(unsigned l * into l1 guest if not fixable. The algorithm is * the same as for shadow paging. */ - rv = nestedhvm_hap_nested_page_fault(v, gpa); + rv = nestedhvm_hap_nested_page_fault(v, gpa, + access_r, access_w, access_x); switch (rv) { case NESTEDHVM_PAGEFAULT_DONE: return 1; diff -r 7d8a2e8412f2 -r 3625ff5e9f80 xen/arch/x86/mm/hap/nested_hap.c --- a/xen/arch/x86/mm/hap/nested_hap.c Thu Jul 19 11:09:39 2012 +0100 +++ b/xen/arch/x86/mm/hap/nested_hap.c Thu Jul 19 11:15:58 2012 +0100 @@ -177,13 +177,20 @@ out: */ static int nestedhap_walk_L1_p2m(struct vcpu *v, paddr_t L2_gpa, paddr_t *L1_gpa, - unsigned int *page_order) + unsigned int *page_order, + bool_t access_r, bool_t access_w, bool_t access_x) { uint32_t pfec; unsigned long nested_cr3, gfn; nested_cr3 = nhvm_vcpu_hostcr3(v); + pfec = PFEC_user_mode | PFEC_page_present; + if (access_w) + pfec |= PFEC_write_access; + if (access_x) + pfec |= PFEC_insn_fetch; + /* Walk the guest-supplied NPT table, just as if it were a pagetable */ gfn = paging_ga_to_gfn_cr3(v, nested_cr3, L2_gpa, &pfec, page_order); @@ -200,7 +207,8 @@ nestedhap_walk_L1_p2m(struct vcpu *v, pa * Returns: */ int -nestedhvm_hap_nested_page_fault(struct vcpu *v, paddr_t L2_gpa) +nestedhvm_hap_nested_page_fault(struct vcpu *v, paddr_t L2_gpa, + bool_t access_r, bool_t access_w, bool_t access_x) { int rv; paddr_t L1_gpa, L0_gpa; @@ -212,7 +220,8 @@ nestedhvm_hap_nested_page_fault(struct v nested_p2m = p2m_get_nestedp2m(v, nhvm_vcpu_hostcr3(v)); /* walk the L1 P2M table */ - rv = nestedhap_walk_L1_p2m(v, L2_gpa, &L1_gpa, &page_order_21); + rv = nestedhap_walk_L1_p2m(v, L2_gpa, &L1_gpa, &page_order_21, + access_r, access_w, access_x); /* let caller to handle these two cases */ switch (rv) { diff -r 7d8a2e8412f2 -r 3625ff5e9f80 xen/include/asm-x86/hvm/nestedhvm.h --- a/xen/include/asm-x86/hvm/nestedhvm.h Thu Jul 19 11:09:39 2012 +0100 +++ b/xen/include/asm-x86/hvm/nestedhvm.h Thu Jul 19 11:15:58 2012 +0100 @@ -51,7 +51,8 @@ bool_t nestedhvm_vcpu_in_guestmode(struc #define NESTEDHVM_PAGEFAULT_INJECT 1 #define NESTEDHVM_PAGEFAULT_ERROR 2 #define NESTEDHVM_PAGEFAULT_MMIO 3 -int nestedhvm_hap_nested_page_fault(struct vcpu *v, paddr_t L2_gpa); +int nestedhvm_hap_nested_page_fault(struct vcpu *v, paddr_t L2_gpa, + bool_t access_r, bool_t access_w, bool_t access_x); /* IO permission map */ unsigned long *nestedhvm_vcpu_iomap_get(bool_t ioport_80, bool_t ioport_ed); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 19 16:33:16 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Jul 2012 16:33: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 1Srtf7-0000ep-7f; Thu, 19 Jul 2012 16:33:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Srtf5-0000ek-SI for xen-changelog@lists.xensource.com; Thu, 19 Jul 2012 16:33:12 +0000 Received: from [85.158.139.83:4464] by server-11.bemta-5.messagelabs.com id B8/8C-20400-7C638005; Thu, 19 Jul 2012 16:33:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-182.messagelabs.com!1342715589!27598630!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 9478 invoked from network); 19 Jul 2012 16:33:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 19 Jul 2012 16:33:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Srtf2-0002nG-TG for xen-changelog@lists.xensource.com; Thu, 19 Jul 2012 16:33:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Srtf2-00085Q-K9 for xen-changelog@lists.xensource.com; Thu, 19 Jul 2012 16:33:08 +0000 Message-Id: Date: Thu, 19 Jul 2012 16:33:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] nestedhvm: initialize pfec for l1 pagetable walk X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Christoph Egger # Date 1342692958 -3600 # Node ID 3625ff5e9f80aebb403d6efc75522eef08cd3802 # Parent 7d8a2e8412f2f86594abd3020776c0c58dfd1ee8 nestedhvm: initialize pfec for l1 pagetable walk Signed-off-by: Christoph Egger Acked-by: Tim Deegan Committed-by: Tim Deegan --- diff -r 7d8a2e8412f2 -r 3625ff5e9f80 xen/arch/x86/hvm/hvm.c --- a/xen/arch/x86/hvm/hvm.c Thu Jul 19 11:09:39 2012 +0100 +++ b/xen/arch/x86/hvm/hvm.c Thu Jul 19 11:15:58 2012 +0100 @@ -1278,7 +1278,8 @@ int hvm_hap_nested_page_fault(unsigned l * into l1 guest if not fixable. The algorithm is * the same as for shadow paging. */ - rv = nestedhvm_hap_nested_page_fault(v, gpa); + rv = nestedhvm_hap_nested_page_fault(v, gpa, + access_r, access_w, access_x); switch (rv) { case NESTEDHVM_PAGEFAULT_DONE: return 1; diff -r 7d8a2e8412f2 -r 3625ff5e9f80 xen/arch/x86/mm/hap/nested_hap.c --- a/xen/arch/x86/mm/hap/nested_hap.c Thu Jul 19 11:09:39 2012 +0100 +++ b/xen/arch/x86/mm/hap/nested_hap.c Thu Jul 19 11:15:58 2012 +0100 @@ -177,13 +177,20 @@ out: */ static int nestedhap_walk_L1_p2m(struct vcpu *v, paddr_t L2_gpa, paddr_t *L1_gpa, - unsigned int *page_order) + unsigned int *page_order, + bool_t access_r, bool_t access_w, bool_t access_x) { uint32_t pfec; unsigned long nested_cr3, gfn; nested_cr3 = nhvm_vcpu_hostcr3(v); + pfec = PFEC_user_mode | PFEC_page_present; + if (access_w) + pfec |= PFEC_write_access; + if (access_x) + pfec |= PFEC_insn_fetch; + /* Walk the guest-supplied NPT table, just as if it were a pagetable */ gfn = paging_ga_to_gfn_cr3(v, nested_cr3, L2_gpa, &pfec, page_order); @@ -200,7 +207,8 @@ nestedhap_walk_L1_p2m(struct vcpu *v, pa * Returns: */ int -nestedhvm_hap_nested_page_fault(struct vcpu *v, paddr_t L2_gpa) +nestedhvm_hap_nested_page_fault(struct vcpu *v, paddr_t L2_gpa, + bool_t access_r, bool_t access_w, bool_t access_x) { int rv; paddr_t L1_gpa, L0_gpa; @@ -212,7 +220,8 @@ nestedhvm_hap_nested_page_fault(struct v nested_p2m = p2m_get_nestedp2m(v, nhvm_vcpu_hostcr3(v)); /* walk the L1 P2M table */ - rv = nestedhap_walk_L1_p2m(v, L2_gpa, &L1_gpa, &page_order_21); + rv = nestedhap_walk_L1_p2m(v, L2_gpa, &L1_gpa, &page_order_21, + access_r, access_w, access_x); /* let caller to handle these two cases */ switch (rv) { diff -r 7d8a2e8412f2 -r 3625ff5e9f80 xen/include/asm-x86/hvm/nestedhvm.h --- a/xen/include/asm-x86/hvm/nestedhvm.h Thu Jul 19 11:09:39 2012 +0100 +++ b/xen/include/asm-x86/hvm/nestedhvm.h Thu Jul 19 11:15:58 2012 +0100 @@ -51,7 +51,8 @@ bool_t nestedhvm_vcpu_in_guestmode(struc #define NESTEDHVM_PAGEFAULT_INJECT 1 #define NESTEDHVM_PAGEFAULT_ERROR 2 #define NESTEDHVM_PAGEFAULT_MMIO 3 -int nestedhvm_hap_nested_page_fault(struct vcpu *v, paddr_t L2_gpa); +int nestedhvm_hap_nested_page_fault(struct vcpu *v, paddr_t L2_gpa, + bool_t access_r, bool_t access_w, bool_t access_x); /* IO permission map */ unsigned long *nestedhvm_vcpu_iomap_get(bool_t ioport_80, bool_t ioport_ed); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 19 16:33:21 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Jul 2012 16: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 1SrtfB-0000fF-BB; Thu, 19 Jul 2012 16:33:17 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Srtf9-0000eg-Jq for xen-changelog@lists.xensource.com; Thu, 19 Jul 2012 16:33:15 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-27.messagelabs.com!1342715588!4298111!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 1398 invoked from network); 19 Jul 2012 16:33:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 19 Jul 2012 16:33:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Srtf2-0002nD-Am for xen-changelog@lists.xensource.com; Thu, 19 Jul 2012 16:33:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Srtf2-00085B-1n for xen-changelog@lists.xensource.com; Thu, 19 Jul 2012 16:33:08 +0000 Message-Id: Date: Thu, 19 Jul 2012 16:33:07 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] x86/mm/p2m: use NX bit in p2m entries. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Christoph Egger # Date 1342692579 -3600 # Node ID 7d8a2e8412f2f86594abd3020776c0c58dfd1ee8 # Parent 43e21ce7f22151524b800a6cf0ac4ba1233b34a7 x86/mm/p2m: use NX bit in p2m entries. In p2m_type_to_flags() honor _PAGE_NX_BIT for grant type mappings. This brings this code in line with PV and EPT. Signed-off-by: Christoph Egger Acked-by: Tim Deegan Committed-by: Tim Deegan --- diff -r 43e21ce7f221 -r 7d8a2e8412f2 xen/arch/x86/mm/p2m-pt.c --- a/xen/arch/x86/mm/p2m-pt.c Tue Jul 17 17:33:31 2012 +0100 +++ b/xen/arch/x86/mm/p2m-pt.c Thu Jul 19 11:09:39 2012 +0100 @@ -89,14 +89,16 @@ static unsigned long p2m_type_to_flags(p case p2m_ram_paging_in: default: return flags; + case p2m_grant_map_ro: + return flags | P2M_BASE_FLAGS | _PAGE_NX_BIT; case p2m_ram_ro: - case p2m_grant_map_ro: case p2m_ram_logdirty: case p2m_ram_shared: return flags | P2M_BASE_FLAGS; case p2m_ram_rw: + return flags | P2M_BASE_FLAGS | _PAGE_RW; case p2m_grant_map_rw: - return flags | P2M_BASE_FLAGS | _PAGE_RW; + return flags | P2M_BASE_FLAGS | _PAGE_RW | _PAGE_NX_BIT; case p2m_mmio_direct: if ( !rangeset_contains_singleton(mmio_ro_ranges, mfn_x(mfn)) ) flags |= _PAGE_RW; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 19 16:33:21 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Jul 2012 16: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 1SrtfB-0000fF-BB; Thu, 19 Jul 2012 16:33:17 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Srtf9-0000eg-Jq for xen-changelog@lists.xensource.com; Thu, 19 Jul 2012 16:33:15 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-27.messagelabs.com!1342715588!4298111!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 1398 invoked from network); 19 Jul 2012 16:33:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 19 Jul 2012 16:33:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Srtf2-0002nD-Am for xen-changelog@lists.xensource.com; Thu, 19 Jul 2012 16:33:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Srtf2-00085B-1n for xen-changelog@lists.xensource.com; Thu, 19 Jul 2012 16:33:08 +0000 Message-Id: Date: Thu, 19 Jul 2012 16:33:07 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] x86/mm/p2m: use NX bit in p2m entries. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Christoph Egger # Date 1342692579 -3600 # Node ID 7d8a2e8412f2f86594abd3020776c0c58dfd1ee8 # Parent 43e21ce7f22151524b800a6cf0ac4ba1233b34a7 x86/mm/p2m: use NX bit in p2m entries. In p2m_type_to_flags() honor _PAGE_NX_BIT for grant type mappings. This brings this code in line with PV and EPT. Signed-off-by: Christoph Egger Acked-by: Tim Deegan Committed-by: Tim Deegan --- diff -r 43e21ce7f221 -r 7d8a2e8412f2 xen/arch/x86/mm/p2m-pt.c --- a/xen/arch/x86/mm/p2m-pt.c Tue Jul 17 17:33:31 2012 +0100 +++ b/xen/arch/x86/mm/p2m-pt.c Thu Jul 19 11:09:39 2012 +0100 @@ -89,14 +89,16 @@ static unsigned long p2m_type_to_flags(p case p2m_ram_paging_in: default: return flags; + case p2m_grant_map_ro: + return flags | P2M_BASE_FLAGS | _PAGE_NX_BIT; case p2m_ram_ro: - case p2m_grant_map_ro: case p2m_ram_logdirty: case p2m_ram_shared: return flags | P2M_BASE_FLAGS; case p2m_ram_rw: + return flags | P2M_BASE_FLAGS | _PAGE_RW; case p2m_grant_map_rw: - return flags | P2M_BASE_FLAGS | _PAGE_RW; + return flags | P2M_BASE_FLAGS | _PAGE_RW | _PAGE_NX_BIT; case p2m_mmio_direct: if ( !rangeset_contains_singleton(mmio_ro_ranges, mfn_x(mfn)) ) flags |= _PAGE_RW; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 19 22:44:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Jul 2012 22: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 1SrzS8-0003Gf-6J; Thu, 19 Jul 2012 22:44:12 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SrzS7-0003GS-1m for xen-changelog@lists.xensource.com; Thu, 19 Jul 2012 22:44:11 +0000 Received: from [85.158.138.51:37213] by server-1.bemta-3.messagelabs.com id 38/C7-31934-ABD88005; Thu, 19 Jul 2012 22:44:10 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-174.messagelabs.com!1342737848!19815986!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 11105 invoked from network); 19 Jul 2012 22:44:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 19 Jul 2012 22:44:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SrzS4-0007jx-3s for xen-changelog@lists.xensource.com; Thu, 19 Jul 2012 22:44:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SrzS3-0001f7-Qb for xen-changelog@lists.xensource.com; Thu, 19 Jul 2012 22:44:07 +0000 Message-Id: Date: Thu, 19 Jul 2012 22:44:07 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] Xen/MCE: stick all 1's to MCi_CTL of 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 1342709122 -3600 # Node ID 8a4cda0bbdc2309c7f86445eaa14e4f75e9bd21a # Parent 3625ff5e9f80aebb403d6efc75522eef08cd3802 Xen/MCE: stick all 1's to MCi_CTL of vMCE This patch is a middle-work patch, prepare for future new vMCE model. It remove mci_ctl array, and keep MCi_CTL all 1's. Signed-off-by: Liu, Jinsong Committed-by: Keir Fraser --- diff -r 3625ff5e9f80 -r 8a4cda0bbdc2 xen/arch/x86/cpu/mcheck/vmce.c --- a/xen/arch/x86/cpu/mcheck/vmce.c Thu Jul 19 11:15:58 2012 +0100 +++ b/xen/arch/x86/cpu/mcheck/vmce.c Thu Jul 19 15:45:22 2012 +0100 @@ -25,7 +25,6 @@ static uint64_t __read_mostly g_mcg_cap; /* Real value in physical CTL MSR */ static uint64_t __read_mostly h_mcg_ctl; -static uint64_t *__read_mostly h_mci_ctrl; int vmce_init_msr(struct domain *d) { @@ -33,15 +32,6 @@ int vmce_init_msr(struct domain *d) if ( !dom_vmce(d) ) return -ENOMEM; - dom_vmce(d)->mci_ctl = xmalloc_array(uint64_t, nr_mce_banks); - if ( !dom_vmce(d)->mci_ctl ) - { - xfree(dom_vmce(d)); - return -ENOMEM; - } - memset(dom_vmce(d)->mci_ctl, ~0, - nr_mce_banks * sizeof(*dom_vmce(d)->mci_ctl)); - dom_vmce(d)->mcg_status = 0x0; dom_vmce(d)->mcg_ctl = ~(uint64_t)0x0; dom_vmce(d)->nr_injection = 0; @@ -56,7 +46,6 @@ void vmce_destroy_msr(struct domain *d) { if ( !dom_vmce(d) ) return; - xfree(dom_vmce(d)->mci_ctl); xfree(dom_vmce(d)); dom_vmce(d) = NULL; } @@ -93,9 +82,8 @@ static int bank_mce_rdmsr(const struct v switch ( msr & (MSR_IA32_MC0_CTL | 3) ) { case MSR_IA32_MC0_CTL: - if ( bank < nr_mce_banks ) - *val = vmce->mci_ctl[bank] & - (h_mci_ctrl ? h_mci_ctrl[bank] : ~0UL); + /* stick all 1's to MCi_CTL */ + *val = ~0UL; mce_printk(MCE_VERBOSE, "MCE: rdmsr MC%u_CTL 0x%"PRIx64"\n", bank, *val); break; @@ -220,8 +208,10 @@ static int bank_mce_wrmsr(struct vcpu *v switch ( msr & (MSR_IA32_MC0_CTL | 3) ) { case MSR_IA32_MC0_CTL: - if ( bank < nr_mce_banks ) - vmce->mci_ctl[bank] = val; + /* + * if guest crazy clear any bit of MCi_CTL, + * treat it as not implement and ignore write change it. + */ break; case MSR_IA32_MC0_STATUS: if ( entry && (entry->bank == bank) ) @@ -523,22 +513,6 @@ int vmce_domain_inject( int vmce_init(struct cpuinfo_x86 *c) { u64 value; - unsigned int i; - - if ( !h_mci_ctrl ) - { - h_mci_ctrl = xmalloc_array(uint64_t, nr_mce_banks); - if (!h_mci_ctrl) - { - dprintk(XENLOG_INFO, "Failed to alloc h_mci_ctrl\n"); - return -ENOMEM; - } - /* Don't care banks before firstbank */ - memset(h_mci_ctrl, ~0, - min(firstbank, nr_mce_banks) * sizeof(*h_mci_ctrl)); - for (i = firstbank; i < nr_mce_banks; i++) - rdmsrl(MSR_IA32_MCx_CTL(i), h_mci_ctrl[i]); - } rdmsrl(MSR_IA32_MCG_CAP, value); /* For Guest vMCE usage */ @@ -551,18 +525,13 @@ int vmce_init(struct cpuinfo_x86 *c) static int mca_ctl_conflict(struct mcinfo_bank *bank, struct domain *d) { - int bank_nr; - - if ( !bank || !d || !h_mci_ctrl ) + 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; - bank_nr = bank->mc_bank; - if (~d->arch.vmca_msrs->mci_ctl[bank_nr] & h_mci_ctrl[bank_nr] ) - return 1; return 0; } diff -r 3625ff5e9f80 -r 8a4cda0bbdc2 xen/include/asm-x86/mce.h --- a/xen/include/asm-x86/mce.h Thu Jul 19 11:15:58 2012 +0100 +++ b/xen/include/asm-x86/mce.h Thu Jul 19 15:45:22 2012 +0100 @@ -18,7 +18,6 @@ struct domain_mca_msrs /* Guest should not change below values after DOM boot up */ uint64_t mcg_ctl; uint64_t mcg_status; - uint64_t *mci_ctl; uint16_t nr_injection; struct list_head impact_header; spinlock_t lock; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 19 22:44:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Jul 2012 22: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 1SrzS8-0003Gf-6J; Thu, 19 Jul 2012 22:44:12 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SrzS7-0003GS-1m for xen-changelog@lists.xensource.com; Thu, 19 Jul 2012 22:44:11 +0000 Received: from [85.158.138.51:37213] by server-1.bemta-3.messagelabs.com id 38/C7-31934-ABD88005; Thu, 19 Jul 2012 22:44:10 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-174.messagelabs.com!1342737848!19815986!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 11105 invoked from network); 19 Jul 2012 22:44:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 19 Jul 2012 22:44:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SrzS4-0007jx-3s for xen-changelog@lists.xensource.com; Thu, 19 Jul 2012 22:44:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SrzS3-0001f7-Qb for xen-changelog@lists.xensource.com; Thu, 19 Jul 2012 22:44:07 +0000 Message-Id: Date: Thu, 19 Jul 2012 22:44:07 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] Xen/MCE: stick all 1's to MCi_CTL of 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 1342709122 -3600 # Node ID 8a4cda0bbdc2309c7f86445eaa14e4f75e9bd21a # Parent 3625ff5e9f80aebb403d6efc75522eef08cd3802 Xen/MCE: stick all 1's to MCi_CTL of vMCE This patch is a middle-work patch, prepare for future new vMCE model. It remove mci_ctl array, and keep MCi_CTL all 1's. Signed-off-by: Liu, Jinsong Committed-by: Keir Fraser --- diff -r 3625ff5e9f80 -r 8a4cda0bbdc2 xen/arch/x86/cpu/mcheck/vmce.c --- a/xen/arch/x86/cpu/mcheck/vmce.c Thu Jul 19 11:15:58 2012 +0100 +++ b/xen/arch/x86/cpu/mcheck/vmce.c Thu Jul 19 15:45:22 2012 +0100 @@ -25,7 +25,6 @@ static uint64_t __read_mostly g_mcg_cap; /* Real value in physical CTL MSR */ static uint64_t __read_mostly h_mcg_ctl; -static uint64_t *__read_mostly h_mci_ctrl; int vmce_init_msr(struct domain *d) { @@ -33,15 +32,6 @@ int vmce_init_msr(struct domain *d) if ( !dom_vmce(d) ) return -ENOMEM; - dom_vmce(d)->mci_ctl = xmalloc_array(uint64_t, nr_mce_banks); - if ( !dom_vmce(d)->mci_ctl ) - { - xfree(dom_vmce(d)); - return -ENOMEM; - } - memset(dom_vmce(d)->mci_ctl, ~0, - nr_mce_banks * sizeof(*dom_vmce(d)->mci_ctl)); - dom_vmce(d)->mcg_status = 0x0; dom_vmce(d)->mcg_ctl = ~(uint64_t)0x0; dom_vmce(d)->nr_injection = 0; @@ -56,7 +46,6 @@ void vmce_destroy_msr(struct domain *d) { if ( !dom_vmce(d) ) return; - xfree(dom_vmce(d)->mci_ctl); xfree(dom_vmce(d)); dom_vmce(d) = NULL; } @@ -93,9 +82,8 @@ static int bank_mce_rdmsr(const struct v switch ( msr & (MSR_IA32_MC0_CTL | 3) ) { case MSR_IA32_MC0_CTL: - if ( bank < nr_mce_banks ) - *val = vmce->mci_ctl[bank] & - (h_mci_ctrl ? h_mci_ctrl[bank] : ~0UL); + /* stick all 1's to MCi_CTL */ + *val = ~0UL; mce_printk(MCE_VERBOSE, "MCE: rdmsr MC%u_CTL 0x%"PRIx64"\n", bank, *val); break; @@ -220,8 +208,10 @@ static int bank_mce_wrmsr(struct vcpu *v switch ( msr & (MSR_IA32_MC0_CTL | 3) ) { case MSR_IA32_MC0_CTL: - if ( bank < nr_mce_banks ) - vmce->mci_ctl[bank] = val; + /* + * if guest crazy clear any bit of MCi_CTL, + * treat it as not implement and ignore write change it. + */ break; case MSR_IA32_MC0_STATUS: if ( entry && (entry->bank == bank) ) @@ -523,22 +513,6 @@ int vmce_domain_inject( int vmce_init(struct cpuinfo_x86 *c) { u64 value; - unsigned int i; - - if ( !h_mci_ctrl ) - { - h_mci_ctrl = xmalloc_array(uint64_t, nr_mce_banks); - if (!h_mci_ctrl) - { - dprintk(XENLOG_INFO, "Failed to alloc h_mci_ctrl\n"); - return -ENOMEM; - } - /* Don't care banks before firstbank */ - memset(h_mci_ctrl, ~0, - min(firstbank, nr_mce_banks) * sizeof(*h_mci_ctrl)); - for (i = firstbank; i < nr_mce_banks; i++) - rdmsrl(MSR_IA32_MCx_CTL(i), h_mci_ctrl[i]); - } rdmsrl(MSR_IA32_MCG_CAP, value); /* For Guest vMCE usage */ @@ -551,18 +525,13 @@ int vmce_init(struct cpuinfo_x86 *c) static int mca_ctl_conflict(struct mcinfo_bank *bank, struct domain *d) { - int bank_nr; - - if ( !bank || !d || !h_mci_ctrl ) + 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; - bank_nr = bank->mc_bank; - if (~d->arch.vmca_msrs->mci_ctl[bank_nr] & h_mci_ctrl[bank_nr] ) - return 1; return 0; } diff -r 3625ff5e9f80 -r 8a4cda0bbdc2 xen/include/asm-x86/mce.h --- a/xen/include/asm-x86/mce.h Thu Jul 19 11:15:58 2012 +0100 +++ b/xen/include/asm-x86/mce.h Thu Jul 19 15:45:22 2012 +0100 @@ -18,7 +18,6 @@ struct domain_mca_msrs /* Guest should not change below values after DOM boot up */ uint64_t mcg_ctl; uint64_t mcg_status; - uint64_t *mci_ctl; uint16_t nr_injection; struct list_head impact_header; spinlock_t lock; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 19 22:44:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Jul 2012 22: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 1SrzSA-0003H1-B8; Thu, 19 Jul 2012 22:44:14 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SrzS8-0003Gd-KM for xen-changelog@lists.xensource.com; Thu, 19 Jul 2012 22:44:12 +0000 Received: from [85.158.138.51:37256] by server-6.bemta-3.messagelabs.com id C9/74-20447-BBD88005; Thu, 19 Jul 2012 22:44:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-174.messagelabs.com!1342737849!26085928!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 7420 invoked from network); 19 Jul 2012 22:44:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 19 Jul 2012 22:44:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SrzS5-0007k6-IH for xen-changelog@lists.xensource.com; Thu, 19 Jul 2012 22:44:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SrzS5-0001fq-Dg for xen-changelog@lists.xensource.com; Thu, 19 Jul 2012 22:44:09 +0000 Message-Id: Date: Thu, 19 Jul 2012 22:44:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] x86/numa: Remove warning about small NUMA nodes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1342709248 -3600 # Node ID afc5fee8ae12df8936f4f52c11e2b32aa97ff72a # Parent 8575d677b472c0849d05fc563157299c7455bd54 x86/numa: Remove warning about small NUMA nodes This logic came with the other NUMA logic from Linux 2.6.16 in c/s 11893:f312c2d01d8b. It appears that the Xen memory management subsystem does not suffer from the expressed problems. Furthermore, NUMA nodes with no memory are now quite easy to find, and are not BIOS bugs in the SRAT ACPI table. Signed-off-by: Andrew Cooper Committed-by: Keir Fraser --- diff -r 8575d677b472 -r afc5fee8ae12 xen/arch/x86/srat.c --- a/xen/arch/x86/srat.c Thu Jul 19 15:46:51 2012 +0100 +++ b/xen/arch/x86/srat.c Thu Jul 19 15:47:28 2012 +0100 @@ -34,9 +34,6 @@ static int num_node_memblks; static struct node node_memblk_range[NR_NODE_MEMBLKS]; static int memblk_nodeid[NR_NODE_MEMBLKS]; -/* Too small nodes confuse the VM badly. Usually they result - from BIOS bugs. */ -#define NODE_MIN_SIZE (4*1024*1024) static int node_to_pxm(int n); @@ -454,10 +451,6 @@ int __init acpi_scan_nodes(u64 start, u6 printk(KERN_WARNING "SRAT: Node %u has no memory. " "BIOS Bug or mis-configured hardware?\n", i); - else if (size < NODE_MIN_SIZE) - printk(KERN_WARNING "SRAT: Node %u has only %"PRIu64 - " bytes of memory. BIOS Bug?\n", i, size); - setup_node_bootmem(i, nodes[i].start, nodes[i].end); } for (i = 0; i < nr_cpu_ids; i++) { _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 19 22:44:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Jul 2012 22: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 1SrzSA-0003H1-B8; Thu, 19 Jul 2012 22:44:14 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SrzS8-0003Gd-KM for xen-changelog@lists.xensource.com; Thu, 19 Jul 2012 22:44:12 +0000 Received: from [85.158.138.51:37256] by server-6.bemta-3.messagelabs.com id C9/74-20447-BBD88005; Thu, 19 Jul 2012 22:44:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-174.messagelabs.com!1342737849!26085928!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 7420 invoked from network); 19 Jul 2012 22:44:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 19 Jul 2012 22:44:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SrzS5-0007k6-IH for xen-changelog@lists.xensource.com; Thu, 19 Jul 2012 22:44:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SrzS5-0001fq-Dg for xen-changelog@lists.xensource.com; Thu, 19 Jul 2012 22:44:09 +0000 Message-Id: Date: Thu, 19 Jul 2012 22:44:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] x86/numa: Remove warning about small NUMA nodes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1342709248 -3600 # Node ID afc5fee8ae12df8936f4f52c11e2b32aa97ff72a # Parent 8575d677b472c0849d05fc563157299c7455bd54 x86/numa: Remove warning about small NUMA nodes This logic came with the other NUMA logic from Linux 2.6.16 in c/s 11893:f312c2d01d8b. It appears that the Xen memory management subsystem does not suffer from the expressed problems. Furthermore, NUMA nodes with no memory are now quite easy to find, and are not BIOS bugs in the SRAT ACPI table. Signed-off-by: Andrew Cooper Committed-by: Keir Fraser --- diff -r 8575d677b472 -r afc5fee8ae12 xen/arch/x86/srat.c --- a/xen/arch/x86/srat.c Thu Jul 19 15:46:51 2012 +0100 +++ b/xen/arch/x86/srat.c Thu Jul 19 15:47:28 2012 +0100 @@ -34,9 +34,6 @@ static int num_node_memblks; static struct node node_memblk_range[NR_NODE_MEMBLKS]; static int memblk_nodeid[NR_NODE_MEMBLKS]; -/* Too small nodes confuse the VM badly. Usually they result - from BIOS bugs. */ -#define NODE_MIN_SIZE (4*1024*1024) static int node_to_pxm(int n); @@ -454,10 +451,6 @@ int __init acpi_scan_nodes(u64 start, u6 printk(KERN_WARNING "SRAT: Node %u has no memory. " "BIOS Bug or mis-configured hardware?\n", i); - else if (size < NODE_MIN_SIZE) - printk(KERN_WARNING "SRAT: Node %u has only %"PRIu64 - " bytes of memory. BIOS Bug?\n", i, size); - setup_node_bootmem(i, nodes[i].start, nodes[i].end); } for (i = 0; i < nr_cpu_ids; i++) { _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 19 22:44:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Jul 2012 22: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 1SrzS9-0003Gq-8Y; Thu, 19 Jul 2012 22:44:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SrzS7-0003GT-Gc for xen-changelog@lists.xensource.com; Thu, 19 Jul 2012 22:44:11 +0000 Received: from [85.158.139.83:5749] by server-11.bemta-5.messagelabs.com id 14/87-20400-ABD88005; Thu, 19 Jul 2012 22:44:10 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-11.tower-182.messagelabs.com!1342737848!20479560!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 2981 invoked from network); 19 Jul 2012 22:44:09 -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; 19 Jul 2012 22:44:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SrzS4-0007k0-HQ for xen-changelog@lists.xensource.com; Thu, 19 Jul 2012 22:44:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SrzS4-0001fM-Cv for xen-changelog@lists.xensource.com; Thu, 19 Jul 2012 22:44:08 +0000 Message-Id: Date: Thu, 19 Jul 2012 22:44:07 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] 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 1342709162 -3600 # Node ID 75eb78d6cf545a79878e3cf42d0fdadf32c8d7ce # Parent 8a4cda0bbdc2309c7f86445eaa14e4f75e9bd21a 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 --- diff -r 8a4cda0bbdc2 -r 75eb78d6cf54 xen/drivers/passthrough/vtd/qinval.c --- a/xen/drivers/passthrough/vtd/qinval.c Thu Jul 19 15:45:22 2012 +0100 +++ b/xen/drivers/passthrough/vtd/qinval.c Thu Jul 19 15:46:02 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 Thu Jul 19 22:44:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Jul 2012 22: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 1SrzS9-0003Gq-8Y; Thu, 19 Jul 2012 22:44:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SrzS7-0003GT-Gc for xen-changelog@lists.xensource.com; Thu, 19 Jul 2012 22:44:11 +0000 Received: from [85.158.139.83:5749] by server-11.bemta-5.messagelabs.com id 14/87-20400-ABD88005; Thu, 19 Jul 2012 22:44:10 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-11.tower-182.messagelabs.com!1342737848!20479560!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 2981 invoked from network); 19 Jul 2012 22:44:09 -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; 19 Jul 2012 22:44:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SrzS4-0007k0-HQ for xen-changelog@lists.xensource.com; Thu, 19 Jul 2012 22:44:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SrzS4-0001fM-Cv for xen-changelog@lists.xensource.com; Thu, 19 Jul 2012 22:44:08 +0000 Message-Id: Date: Thu, 19 Jul 2012 22:44:07 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] 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 1342709162 -3600 # Node ID 75eb78d6cf545a79878e3cf42d0fdadf32c8d7ce # Parent 8a4cda0bbdc2309c7f86445eaa14e4f75e9bd21a 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 --- diff -r 8a4cda0bbdc2 -r 75eb78d6cf54 xen/drivers/passthrough/vtd/qinval.c --- a/xen/drivers/passthrough/vtd/qinval.c Thu Jul 19 15:45:22 2012 +0100 +++ b/xen/drivers/passthrough/vtd/qinval.c Thu Jul 19 15:46:02 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 Thu Jul 19 22:44:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Jul 2012 22:44: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 1SrzSD-0003HL-Dp; Thu, 19 Jul 2012 22:44:17 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SrzSC-0003GU-9U for xen-changelog@lists.xensource.com; Thu, 19 Jul 2012 22:44:16 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-27.messagelabs.com!1342737849!8958677!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 25388 invoked from network); 19 Jul 2012 22:44:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 19 Jul 2012 22:44:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SrzS4-0007k3-V4 for xen-changelog@lists.xensource.com; Thu, 19 Jul 2012 22:44:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SrzS4-0001fb-Tf for xen-changelog@lists.xensource.com; Thu, 19 Jul 2012 22:44:08 +0000 Message-Id: Date: Thu, 19 Jul 2012 22:44:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] x86/numa: Correct assumption that each NUMA node has memory X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1342709211 -3600 # Node ID 8575d677b472c0849d05fc563157299c7455bd54 # Parent 75eb78d6cf545a79878e3cf42d0fdadf32c8d7ce x86/numa: Correct assumption that each NUMA node has memory It is now quite easy to buy servers with incorrectly populated DIMMs, especially with AMD Magny-Cours and Interlagos systems which have two NUMA nodes per socket. Currently, Xen will assign all CPUs on nodes without memory to node 0, which leads to interestingly wrong NUMA information, causing numa aware functionality such as alloc_domheap_pages() to get things very wrong. This patch splits the current logic to accept NUMA nodes without memory, which corrects the accounting of CPUs to online NUMA nodes. Signed-off-by: Andrew Cooper Committed-by: Keir Fraser --- diff -r 75eb78d6cf54 -r 8575d677b472 xen/arch/x86/setup.c --- a/xen/arch/x86/setup.c Thu Jul 19 15:46:02 2012 +0100 +++ b/xen/arch/x86/setup.c Thu Jul 19 15:46:51 2012 +0100 @@ -195,8 +195,10 @@ void __devinit srat_detect_node(int cpu) u32 apicid = x86_cpu_to_apicid[cpu]; node = apicid_to_node[apicid]; - if ( node == NUMA_NO_NODE || !node_online(node) ) + if ( node == NUMA_NO_NODE ) node = 0; + + node_set_online(node); numa_set_node(cpu, node); if ( opt_cpu_info && acpi_numa > 0 ) diff -r 75eb78d6cf54 -r 8575d677b472 xen/arch/x86/srat.c --- a/xen/arch/x86/srat.c Thu Jul 19 15:46:02 2012 +0100 +++ b/xen/arch/x86/srat.c Thu Jul 19 15:46:51 2012 +0100 @@ -23,7 +23,8 @@ static struct acpi_table_slit *__read_mostly acpi_slit; -static nodemask_t nodes_parsed __initdata; +static nodemask_t memory_nodes_parsed __initdata; +static nodemask_t processor_nodes_parsed __initdata; static nodemask_t nodes_found __initdata; static struct node nodes[MAX_NUMNODES] __initdata; static u8 __read_mostly pxm2node[256] = { [0 ... 255] = NUMA_NO_NODE }; @@ -221,6 +222,7 @@ acpi_numa_processor_affinity_init(struct return; } apicid_to_node[pa->apic_id] = node; + node_set(node, processor_nodes_parsed); acpi_numa = 1; printk(KERN_INFO "SRAT: PXM %u -> APIC %u -> Node %u\n", pxm, pa->apic_id, node); @@ -287,7 +289,7 @@ acpi_numa_memory_affinity_init(struct ac return; } nd = &nodes[node]; - if (!node_test_and_set(node, nodes_parsed)) { + if (!node_test_and_set(node, memory_nodes_parsed)) { nd->start = start; nd->end = end; } else { @@ -324,7 +326,7 @@ static int nodes_cover_memory(void) do { found = 0; - for_each_node_mask(j, nodes_parsed) + for_each_node_mask(j, memory_nodes_parsed) if (start < nodes[j].end && end > nodes[j].start) { if (start >= nodes[j].start) { @@ -418,6 +420,7 @@ void __init srat_parse_regions(u64 addr) int __init acpi_scan_nodes(u64 start, u64 end) { int i; + nodemask_t all_nodes_parsed; /* First clean up the node list */ for (i = 0; i < MAX_NUMNODES; i++) @@ -441,17 +444,26 @@ int __init acpi_scan_nodes(u64 start, u6 return -1; } + nodes_or(all_nodes_parsed, memory_nodes_parsed, processor_nodes_parsed); + /* Finally register nodes */ - for_each_node_mask(i, nodes_parsed) + for_each_node_mask(i, all_nodes_parsed) { - if ((nodes[i].end - nodes[i].start) < NODE_MIN_SIZE) - continue; + u64 size = nodes[i].end - nodes[i].start; + if ( size == 0 ) + printk(KERN_WARNING "SRAT: Node %u has no memory. " + "BIOS Bug or mis-configured hardware?\n", i); + + else if (size < NODE_MIN_SIZE) + printk(KERN_WARNING "SRAT: Node %u has only %"PRIu64 + " bytes of memory. BIOS Bug?\n", i, size); + setup_node_bootmem(i, nodes[i].start, nodes[i].end); } for (i = 0; i < nr_cpu_ids; i++) { if (cpu_to_node[i] == NUMA_NO_NODE) continue; - if (!node_isset(cpu_to_node[i], nodes_parsed)) + if (!node_isset(cpu_to_node[i], processor_nodes_parsed)) numa_set_node(i, NUMA_NO_NODE); } numa_init_array(); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 19 22:44:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Jul 2012 22:44: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 1SrzSD-0003HL-Dp; Thu, 19 Jul 2012 22:44:17 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SrzSC-0003GU-9U for xen-changelog@lists.xensource.com; Thu, 19 Jul 2012 22:44:16 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-27.messagelabs.com!1342737849!8958677!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 25388 invoked from network); 19 Jul 2012 22:44:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 19 Jul 2012 22:44:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SrzS4-0007k3-V4 for xen-changelog@lists.xensource.com; Thu, 19 Jul 2012 22:44:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SrzS4-0001fb-Tf for xen-changelog@lists.xensource.com; Thu, 19 Jul 2012 22:44:08 +0000 Message-Id: Date: Thu, 19 Jul 2012 22:44:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] x86/numa: Correct assumption that each NUMA node has memory X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1342709211 -3600 # Node ID 8575d677b472c0849d05fc563157299c7455bd54 # Parent 75eb78d6cf545a79878e3cf42d0fdadf32c8d7ce x86/numa: Correct assumption that each NUMA node has memory It is now quite easy to buy servers with incorrectly populated DIMMs, especially with AMD Magny-Cours and Interlagos systems which have two NUMA nodes per socket. Currently, Xen will assign all CPUs on nodes without memory to node 0, which leads to interestingly wrong NUMA information, causing numa aware functionality such as alloc_domheap_pages() to get things very wrong. This patch splits the current logic to accept NUMA nodes without memory, which corrects the accounting of CPUs to online NUMA nodes. Signed-off-by: Andrew Cooper Committed-by: Keir Fraser --- diff -r 75eb78d6cf54 -r 8575d677b472 xen/arch/x86/setup.c --- a/xen/arch/x86/setup.c Thu Jul 19 15:46:02 2012 +0100 +++ b/xen/arch/x86/setup.c Thu Jul 19 15:46:51 2012 +0100 @@ -195,8 +195,10 @@ void __devinit srat_detect_node(int cpu) u32 apicid = x86_cpu_to_apicid[cpu]; node = apicid_to_node[apicid]; - if ( node == NUMA_NO_NODE || !node_online(node) ) + if ( node == NUMA_NO_NODE ) node = 0; + + node_set_online(node); numa_set_node(cpu, node); if ( opt_cpu_info && acpi_numa > 0 ) diff -r 75eb78d6cf54 -r 8575d677b472 xen/arch/x86/srat.c --- a/xen/arch/x86/srat.c Thu Jul 19 15:46:02 2012 +0100 +++ b/xen/arch/x86/srat.c Thu Jul 19 15:46:51 2012 +0100 @@ -23,7 +23,8 @@ static struct acpi_table_slit *__read_mostly acpi_slit; -static nodemask_t nodes_parsed __initdata; +static nodemask_t memory_nodes_parsed __initdata; +static nodemask_t processor_nodes_parsed __initdata; static nodemask_t nodes_found __initdata; static struct node nodes[MAX_NUMNODES] __initdata; static u8 __read_mostly pxm2node[256] = { [0 ... 255] = NUMA_NO_NODE }; @@ -221,6 +222,7 @@ acpi_numa_processor_affinity_init(struct return; } apicid_to_node[pa->apic_id] = node; + node_set(node, processor_nodes_parsed); acpi_numa = 1; printk(KERN_INFO "SRAT: PXM %u -> APIC %u -> Node %u\n", pxm, pa->apic_id, node); @@ -287,7 +289,7 @@ acpi_numa_memory_affinity_init(struct ac return; } nd = &nodes[node]; - if (!node_test_and_set(node, nodes_parsed)) { + if (!node_test_and_set(node, memory_nodes_parsed)) { nd->start = start; nd->end = end; } else { @@ -324,7 +326,7 @@ static int nodes_cover_memory(void) do { found = 0; - for_each_node_mask(j, nodes_parsed) + for_each_node_mask(j, memory_nodes_parsed) if (start < nodes[j].end && end > nodes[j].start) { if (start >= nodes[j].start) { @@ -418,6 +420,7 @@ void __init srat_parse_regions(u64 addr) int __init acpi_scan_nodes(u64 start, u64 end) { int i; + nodemask_t all_nodes_parsed; /* First clean up the node list */ for (i = 0; i < MAX_NUMNODES; i++) @@ -441,17 +444,26 @@ int __init acpi_scan_nodes(u64 start, u6 return -1; } + nodes_or(all_nodes_parsed, memory_nodes_parsed, processor_nodes_parsed); + /* Finally register nodes */ - for_each_node_mask(i, nodes_parsed) + for_each_node_mask(i, all_nodes_parsed) { - if ((nodes[i].end - nodes[i].start) < NODE_MIN_SIZE) - continue; + u64 size = nodes[i].end - nodes[i].start; + if ( size == 0 ) + printk(KERN_WARNING "SRAT: Node %u has no memory. " + "BIOS Bug or mis-configured hardware?\n", i); + + else if (size < NODE_MIN_SIZE) + printk(KERN_WARNING "SRAT: Node %u has only %"PRIu64 + " bytes of memory. BIOS Bug?\n", i, size); + setup_node_bootmem(i, nodes[i].start, nodes[i].end); } for (i = 0; i < nr_cpu_ids; i++) { if (cpu_to_node[i] == NUMA_NO_NODE) continue; - if (!node_isset(cpu_to_node[i], nodes_parsed)) + if (!node_isset(cpu_to_node[i], processor_nodes_parsed)) numa_set_node(i, NUMA_NO_NODE); } numa_init_array(); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 19 23:44:14 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Jul 2012 23:44:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Ss0OB-0003lF-Sp; Thu, 19 Jul 2012 23: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 1Ss0OA-0003l1-QQ for xen-changelog@lists.xensource.com; Thu, 19 Jul 2012 23:44:10 +0000 Received: from [85.158.143.99:27344] by server-2.bemta-4.messagelabs.com id C4/68-17938-ACB98005; Thu, 19 Jul 2012 23:44:10 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-216.messagelabs.com!1342741448!27753516!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 32439 invoked from network); 19 Jul 2012 23:44:09 -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; 19 Jul 2012 23:44:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Ss0O8-0008N9-66 for xen-changelog@lists.xensource.com; Thu, 19 Jul 2012 23:44:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Ss0O7-0003Cv-Mi for xen-changelog@lists.xensource.com; Thu, 19 Jul 2012 23:44:07 +0000 Message-Id: Date: Thu, 19 Jul 2012 23:44:07 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] passthrough: fix xsm-related oversight X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1342709359 -3600 # Node ID a1087bfe2c5c04c2dd375626af264c9fe1910eaf # Parent 3ce155e77f39d0c3cc787c1cc3d6bab1ef45a1dc passthrough: fix xsm-related oversight Presumably a copy-and-paste mistake, which I also didn't notice while unifying x86's and ia64's respective domctl implementations. Signed-off-by: Jan Beulich Acked-by: Keir Fraser xen-unstable changeset: 25432:d7318231cfe3 xen-unstable date: Thu May 31 10:18:52 2012 +0200 --- diff -r 3ce155e77f39 -r a1087bfe2c5c xen/arch/x86/domctl.c --- a/xen/arch/x86/domctl.c Mon Jul 09 10:30:44 2012 +0100 +++ b/xen/arch/x86/domctl.c Thu Jul 19 15:49:19 2012 +0100 @@ -873,7 +873,7 @@ long arch_do_domctl( break; } - ret = xsm_assign_device(d, domctl->u.assign_device.machine_bdf); + ret = xsm_deassign_device(d, domctl->u.assign_device.machine_bdf); if ( ret ) goto deassign_device_out; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 19 23:44:14 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Jul 2012 23:44:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Ss0OB-0003lF-Sp; Thu, 19 Jul 2012 23: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 1Ss0OA-0003l1-QQ for xen-changelog@lists.xensource.com; Thu, 19 Jul 2012 23:44:10 +0000 Received: from [85.158.143.99:27344] by server-2.bemta-4.messagelabs.com id C4/68-17938-ACB98005; Thu, 19 Jul 2012 23:44:10 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-216.messagelabs.com!1342741448!27753516!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 32439 invoked from network); 19 Jul 2012 23:44:09 -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; 19 Jul 2012 23:44:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Ss0O8-0008N9-66 for xen-changelog@lists.xensource.com; Thu, 19 Jul 2012 23:44:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Ss0O7-0003Cv-Mi for xen-changelog@lists.xensource.com; Thu, 19 Jul 2012 23:44:07 +0000 Message-Id: Date: Thu, 19 Jul 2012 23:44:07 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] passthrough: fix xsm-related oversight X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1342709359 -3600 # Node ID a1087bfe2c5c04c2dd375626af264c9fe1910eaf # Parent 3ce155e77f39d0c3cc787c1cc3d6bab1ef45a1dc passthrough: fix xsm-related oversight Presumably a copy-and-paste mistake, which I also didn't notice while unifying x86's and ia64's respective domctl implementations. Signed-off-by: Jan Beulich Acked-by: Keir Fraser xen-unstable changeset: 25432:d7318231cfe3 xen-unstable date: Thu May 31 10:18:52 2012 +0200 --- diff -r 3ce155e77f39 -r a1087bfe2c5c xen/arch/x86/domctl.c --- a/xen/arch/x86/domctl.c Mon Jul 09 10:30:44 2012 +0100 +++ b/xen/arch/x86/domctl.c Thu Jul 19 15:49:19 2012 +0100 @@ -873,7 +873,7 @@ long arch_do_domctl( break; } - ret = xsm_assign_device(d, domctl->u.assign_device.machine_bdf); + ret = xsm_deassign_device(d, domctl->u.assign_device.machine_bdf); if ( ret ) goto deassign_device_out; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 23 01:00:30 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jul 2012 01:00: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 1St70Z-00070e-FO; Mon, 23 Jul 2012 01:00:23 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1St70Y-0006qB-QV for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 01:00:22 +0000 Received: from [85.158.143.35:53517] by server-1.bemta-4.messagelabs.com id 1E/8B-24392-522AC005; Mon, 23 Jul 2012 01:00:21 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-21.messagelabs.com!1343005220!10960494!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 29807 invoked from network); 23 Jul 2012 01:00:21 -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; 23 Jul 2012 01:00:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1St70V-0006Gm-Px for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 01:00:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1St70U-0004uR-FR for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 01:00:18 +0000 Message-Id: Date: Mon, 23 Jul 2012 01:00:17 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] Added tag 4.1.3-rc3 for changeset 5cdcfed7b5b1 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1342971531 -3600 # Node ID 74e010c1a2e909eca7d03641aa231871bec90d1a # Parent 5cdcfed7b5b129843e1602b5d43c7651de337092 Added tag 4.1.3-rc3 for changeset 5cdcfed7b5b1 --- diff -r 5cdcfed7b5b1 -r 74e010c1a2e9 .hgtags --- a/.hgtags Sun Jul 22 16:38:46 2012 +0100 +++ b/.hgtags Sun Jul 22 16:38:51 2012 +0100 @@ -64,3 +64,4 @@ 24041ed83728ac6c26d3c32d29d7d08eb8433149 3eca5bf65e6cca881d599c68f2305f865e0f9fd0 RELEASE-4.1.2 da64f68730cf1c42c06919578e70d8bc01041051 4.1.3-rc1 acbd3617691397911f34e4574d03385c08aec900 4.1.3-rc2 +5cdcfed7b5b129843e1602b5d43c7651de337092 4.1.3-rc3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 23 01:00:30 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jul 2012 01:00: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 1St70Z-00070e-FO; Mon, 23 Jul 2012 01:00:23 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1St70Y-0006qB-QV for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 01:00:22 +0000 Received: from [85.158.143.35:53517] by server-1.bemta-4.messagelabs.com id 1E/8B-24392-522AC005; Mon, 23 Jul 2012 01:00:21 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-21.messagelabs.com!1343005220!10960494!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 29807 invoked from network); 23 Jul 2012 01:00:21 -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; 23 Jul 2012 01:00:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1St70V-0006Gm-Px for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 01:00:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1St70U-0004uR-FR for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 01:00:18 +0000 Message-Id: Date: Mon, 23 Jul 2012 01:00:17 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] Added tag 4.1.3-rc3 for changeset 5cdcfed7b5b1 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1342971531 -3600 # Node ID 74e010c1a2e909eca7d03641aa231871bec90d1a # Parent 5cdcfed7b5b129843e1602b5d43c7651de337092 Added tag 4.1.3-rc3 for changeset 5cdcfed7b5b1 --- diff -r 5cdcfed7b5b1 -r 74e010c1a2e9 .hgtags --- a/.hgtags Sun Jul 22 16:38:46 2012 +0100 +++ b/.hgtags Sun Jul 22 16:38:51 2012 +0100 @@ -64,3 +64,4 @@ 24041ed83728ac6c26d3c32d29d7d08eb8433149 3eca5bf65e6cca881d599c68f2305f865e0f9fd0 RELEASE-4.1.2 da64f68730cf1c42c06919578e70d8bc01041051 4.1.3-rc1 acbd3617691397911f34e4574d03385c08aec900 4.1.3-rc2 +5cdcfed7b5b129843e1602b5d43c7651de337092 4.1.3-rc3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 23 01:00:32 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jul 2012 01:00:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1St70Z-0006zn-D6; Mon, 23 Jul 2012 01:00:23 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1St70Y-0006jF-4k for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 01:00:22 +0000 Received: from [85.158.138.51:30756] by server-10.bemta-3.messagelabs.com id 91/64-21993-522AC005; Mon, 23 Jul 2012 01:00:21 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-174.messagelabs.com!1343005218!21865273!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 7607 invoked from network); 23 Jul 2012 01:00:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 23 Jul 2012 01:00:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1St70U-00065S-HP for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 01:00:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1St70S-0004u1-7x for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 01:00:17 +0000 Message-Id: Date: Mon, 23 Jul 2012 01:00:15 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] Update Xen version to 4.1.3-rc3 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1342971526 -3600 # Node ID 5cdcfed7b5b129843e1602b5d43c7651de337092 # Parent a1087bfe2c5c04c2dd375626af264c9fe1910eaf Update Xen version to 4.1.3-rc3 --- diff -r a1087bfe2c5c -r 5cdcfed7b5b1 Config.mk --- a/Config.mk Thu Jul 19 15:49:19 2012 +0100 +++ b/Config.mk Sun Jul 22 16:38:46 2012 +0100 @@ -179,7 +179,7 @@ endif # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= xen-4.1.3-rc2 +QEMU_TAG ?= xen-4.1.3-rc3 # Mon Apr 2 17:55:05 2012 +0100 # qemu-xen-traditional: QDISK fixes diff -r a1087bfe2c5c -r 5cdcfed7b5b1 xen/Makefile --- a/xen/Makefile Thu Jul 19 15:49:19 2012 +0100 +++ b/xen/Makefile Sun Jul 22 16:38:46 2012 +0100 @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 1 -export XEN_EXTRAVERSION ?= .3-rc3-pre$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .3-rc3$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 23 01:00:32 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jul 2012 01:00:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1St70Z-0006zn-D6; Mon, 23 Jul 2012 01:00:23 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1St70Y-0006jF-4k for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 01:00:22 +0000 Received: from [85.158.138.51:30756] by server-10.bemta-3.messagelabs.com id 91/64-21993-522AC005; Mon, 23 Jul 2012 01:00:21 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-174.messagelabs.com!1343005218!21865273!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 7607 invoked from network); 23 Jul 2012 01:00:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 23 Jul 2012 01:00:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1St70U-00065S-HP for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 01:00:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1St70S-0004u1-7x for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 01:00:17 +0000 Message-Id: Date: Mon, 23 Jul 2012 01:00:15 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] Update Xen version to 4.1.3-rc3 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1342971526 -3600 # Node ID 5cdcfed7b5b129843e1602b5d43c7651de337092 # Parent a1087bfe2c5c04c2dd375626af264c9fe1910eaf Update Xen version to 4.1.3-rc3 --- diff -r a1087bfe2c5c -r 5cdcfed7b5b1 Config.mk --- a/Config.mk Thu Jul 19 15:49:19 2012 +0100 +++ b/Config.mk Sun Jul 22 16:38:46 2012 +0100 @@ -179,7 +179,7 @@ endif # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= xen-4.1.3-rc2 +QEMU_TAG ?= xen-4.1.3-rc3 # Mon Apr 2 17:55:05 2012 +0100 # qemu-xen-traditional: QDISK fixes diff -r a1087bfe2c5c -r 5cdcfed7b5b1 xen/Makefile --- a/xen/Makefile Thu Jul 19 15:49:19 2012 +0100 +++ b/xen/Makefile Sun Jul 22 16:38:46 2012 +0100 @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 1 -export XEN_EXTRAVERSION ?= .3-rc3-pre$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .3-rc3$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 23 01:00:45 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jul 2012 01:00:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1St70p-0001F4-IY; Mon, 23 Jul 2012 01:00:39 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1St70o-00009e-Ji for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 01:00:38 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-27.messagelabs.com!1343005222!10081666!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 31567 invoked from network); 23 Jul 2012 01:00:23 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 23 Jul 2012 01:00:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1St70X-0006cR-My for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 01:00:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1St70V-0004ui-TT for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 01:00:21 +0000 Message-Id: Date: Mon, 23 Jul 2012 01:00:19 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] Added signature for changeset 5cdcfed7b5b1 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1342971540 -3600 # Node ID e89be0dedeb4e4a9556cf3e1b9a5295ba0b59edf # Parent 74e010c1a2e909eca7d03641aa231871bec90d1a Added signature for changeset 5cdcfed7b5b1 --- diff -r 74e010c1a2e9 -r e89be0dedeb4 .hgsigs --- a/.hgsigs Sun Jul 22 16:38:51 2012 +0100 +++ b/.hgsigs Sun Jul 22 16:39:00 2012 +0100 @@ -17,3 +17,4 @@ 24041ed83728ac6c26d3c32d29d7d08eb8433149 3eca5bf65e6cca881d599c68f2305f865e0f9fd0 0 iQEcBAABAgAGBQJOoE3xAAoJEIP+FMlX6CvZ0P4IALamOXJi4s9OzfutsjD//V5QYU972Y+NxBo2j7VNKnRaFwZ57RbxLE8dzsAufvxx/886ScyvdehAfWkpqhU+brLfKNftG54Bm3DFd+mDCdcTvHOGkKw768YUPBNjOhQZ8voVSnalrQaOlbibluRTYGK1Y4lcWXwP8SSCCR7bpm8VLrSKQoatiaPtc/OxBO+9UOlHFUR2tWt5YY4a5NczaXJ2xGERMnOssE83GjxSD/07+y9aDLNjnQiYqQfSkF46Gv4s94hPv8KeHEiGDMoZF/YqHr+4YxDCt8y39TXiQfT67O3o9xx6VfynTIHRo9CZ0qGrEqz7o8GK1vWhlfq3T5M= da64f68730cf1c42c06919578e70d8bc01041051 0 iQEcBAABAgAGBQJPp8OUAAoJEIP+FMlX6CvZRkEIAKp5iVEADZyijVw0Jwj1vUWKqHJYVONzNjzRcnavWAEzsuwbAxQ6QfMJIai2ThjF79M2w7fPXY03S/vCV4/bXVE9R9s2/IUmS9B6pK+DAhw3ExuNUfsxq9UZd3Iul6hWifjjouYnBmgUtpF7O5z4pfQ+r1+z58FpIYPrv39NARt5YW7tcPeUJh4gOJ0ugORc5CclZqLLiljjIbVY6DN+jJDzjqCAwbWLGbkVw4kEGAeWI6aP3/5ZDpnk9Yytp9GpZ8d3BpmlHaR/kY6xepmZUqBPFGKUGY437+1jKWGgUYPLt2RC0S88W4iLRW6b9HXd7u3bhrn36ERz8XZ10KqjH7A= acbd3617691397911f34e4574d03385c08aec900 0 iQEcBAABAgAGBQJP3zbaAAoJEIP+FMlX6CvZoMUH/1TQcdw+e/7BmxtXBnMIrpiTJ7/tffSBYurcoQFq1cTaJJgz5in8iq1JWHgru/ToYQ9PaWY0wVQcb1Yj40rCGNnASlSzQqgRQbYMmZpKd0+TESDtMkl6q1FXECrs8ag/HMHwkVYsgdAEmQ/7IouRK4kBOXXzSWhMRU24YkHdJAnQCcXD9L99Yjmrr5oxF/fgVG7WnhfTGlhpu7FaUeWlDjBRlIuw6HeNnXMwubAn569dGXyPdwJnbU0nCLRrQGjQn7DsmeN25gL4R5Pz+uhp4eeGB7ORYT/mj5+xeS2Cjb3XfptV3qAW2FJVYRLit7lp5cmsKvtBnr8mAO8GS0R+8Pg= +5cdcfed7b5b129843e1602b5d43c7651de337092 0 iQEcBAABAgAGBQJQDB6TAAoJEIP+FMlX6CvZ+H8IAJbWR4PrKOt3gMpgEYdADts96vtduD3oet5C+l8FSlo0pDPtF32wPQ5tQz+Ll8OtCFckSIzobsw+9IMrZ38nRwP1UM2LgLUuo6WVVwYZ4DKVIntDrC1DV6Us1CmGiHiTHqPNDypBB2NponJ21rlD8zRY4Q661BgdKXVwqq5H6SDtxNRSn7RPDYnsIvavabr0fvcR38YOHVG4TvfXP+uge0UfEvIurGEBnTn25E0vadLG9la9SGKeEm8HuTDnzuxQmSic7tPdodQ0oQYQ5AAj+/mdW2B9uaCDsmOeP4udDNcV4yXxdLxNA2GkeSSJ/+U0hj2HBaHZvd+hvAeHBZGdMAU= _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 23 01:00:45 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jul 2012 01:00:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1St70p-0001F4-IY; Mon, 23 Jul 2012 01:00:39 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1St70o-00009e-Ji for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 01:00:38 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-27.messagelabs.com!1343005222!10081666!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 31567 invoked from network); 23 Jul 2012 01:00:23 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 23 Jul 2012 01:00:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1St70X-0006cR-My for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 01:00:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1St70V-0004ui-TT for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 01:00:21 +0000 Message-Id: Date: Mon, 23 Jul 2012 01:00:19 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] Added signature for changeset 5cdcfed7b5b1 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1342971540 -3600 # Node ID e89be0dedeb4e4a9556cf3e1b9a5295ba0b59edf # Parent 74e010c1a2e909eca7d03641aa231871bec90d1a Added signature for changeset 5cdcfed7b5b1 --- diff -r 74e010c1a2e9 -r e89be0dedeb4 .hgsigs --- a/.hgsigs Sun Jul 22 16:38:51 2012 +0100 +++ b/.hgsigs Sun Jul 22 16:39:00 2012 +0100 @@ -17,3 +17,4 @@ 24041ed83728ac6c26d3c32d29d7d08eb8433149 3eca5bf65e6cca881d599c68f2305f865e0f9fd0 0 iQEcBAABAgAGBQJOoE3xAAoJEIP+FMlX6CvZ0P4IALamOXJi4s9OzfutsjD//V5QYU972Y+NxBo2j7VNKnRaFwZ57RbxLE8dzsAufvxx/886ScyvdehAfWkpqhU+brLfKNftG54Bm3DFd+mDCdcTvHOGkKw768YUPBNjOhQZ8voVSnalrQaOlbibluRTYGK1Y4lcWXwP8SSCCR7bpm8VLrSKQoatiaPtc/OxBO+9UOlHFUR2tWt5YY4a5NczaXJ2xGERMnOssE83GjxSD/07+y9aDLNjnQiYqQfSkF46Gv4s94hPv8KeHEiGDMoZF/YqHr+4YxDCt8y39TXiQfT67O3o9xx6VfynTIHRo9CZ0qGrEqz7o8GK1vWhlfq3T5M= da64f68730cf1c42c06919578e70d8bc01041051 0 iQEcBAABAgAGBQJPp8OUAAoJEIP+FMlX6CvZRkEIAKp5iVEADZyijVw0Jwj1vUWKqHJYVONzNjzRcnavWAEzsuwbAxQ6QfMJIai2ThjF79M2w7fPXY03S/vCV4/bXVE9R9s2/IUmS9B6pK+DAhw3ExuNUfsxq9UZd3Iul6hWifjjouYnBmgUtpF7O5z4pfQ+r1+z58FpIYPrv39NARt5YW7tcPeUJh4gOJ0ugORc5CclZqLLiljjIbVY6DN+jJDzjqCAwbWLGbkVw4kEGAeWI6aP3/5ZDpnk9Yytp9GpZ8d3BpmlHaR/kY6xepmZUqBPFGKUGY437+1jKWGgUYPLt2RC0S88W4iLRW6b9HXd7u3bhrn36ERz8XZ10KqjH7A= acbd3617691397911f34e4574d03385c08aec900 0 iQEcBAABAgAGBQJP3zbaAAoJEIP+FMlX6CvZoMUH/1TQcdw+e/7BmxtXBnMIrpiTJ7/tffSBYurcoQFq1cTaJJgz5in8iq1JWHgru/ToYQ9PaWY0wVQcb1Yj40rCGNnASlSzQqgRQbYMmZpKd0+TESDtMkl6q1FXECrs8ag/HMHwkVYsgdAEmQ/7IouRK4kBOXXzSWhMRU24YkHdJAnQCcXD9L99Yjmrr5oxF/fgVG7WnhfTGlhpu7FaUeWlDjBRlIuw6HeNnXMwubAn569dGXyPdwJnbU0nCLRrQGjQn7DsmeN25gL4R5Pz+uhp4eeGB7ORYT/mj5+xeS2Cjb3XfptV3qAW2FJVYRLit7lp5cmsKvtBnr8mAO8GS0R+8Pg= +5cdcfed7b5b129843e1602b5d43c7651de337092 0 iQEcBAABAgAGBQJQDB6TAAoJEIP+FMlX6CvZ+H8IAJbWR4PrKOt3gMpgEYdADts96vtduD3oet5C+l8FSlo0pDPtF32wPQ5tQz+Ll8OtCFckSIzobsw+9IMrZ38nRwP1UM2LgLUuo6WVVwYZ4DKVIntDrC1DV6Us1CmGiHiTHqPNDypBB2NponJ21rlD8zRY4Q661BgdKXVwqq5H6SDtxNRSn7RPDYnsIvavabr0fvcR38YOHVG4TvfXP+uge0UfEvIurGEBnTn25E0vadLG9la9SGKeEm8HuTDnzuxQmSic7tPdodQ0oQYQ5AAj+/mdW2B9uaCDsmOeP4udDNcV4yXxdLxNA2GkeSSJ/+U0hj2HBaHZvd+hvAeHBZGdMAU= _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 23 03:22:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jul 2012 03:22: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 1St9Dq-0000jG-Vr; Mon, 23 Jul 2012 03:22:14 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1St9Dp-0000j4-8I for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 03:22:13 +0000 Received: from [85.158.143.99:30355] by server-3.bemta-4.messagelabs.com id BE/68-01511-463CC005; Mon, 23 Jul 2012 03:22:12 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-216.messagelabs.com!1343013730!28158354!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 31260 invoked from network); 23 Jul 2012 03:22:11 -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; 23 Jul 2012 03:22:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1St9Dm-00066R-DZ for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 03:22:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1St9Dl-0000fG-AN for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 03:22:09 +0000 Message-Id: Date: Mon, 23 Jul 2012 03:22:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] docs/cmdline: Add some more entries X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1342971445 -3600 # Node ID 3c426da4788e41cf798f709d9a3fef45e8503169 # Parent 8e7670c80200c2daeee190d48a1935afe6a45612 docs/cmdline: Add some more entries Signed-off-by: Andrew Cooper Committed-by: Keir Fraser --- diff -r 8e7670c80200 -r 3c426da4788e docs/misc/xen-command-line.markdown --- a/docs/misc/xen-command-line.markdown Sun Jul 22 16:36:59 2012 +0100 +++ b/docs/misc/xen-command-line.markdown Sun Jul 22 16:37:25 2012 +0100 @@ -118,6 +118,12 @@ domain 0 command line ### acpi\_sleep ### allowsuperpage +> `= ` + +> Default: `true` + +Permit Xen to use superpages when performing memory management. + ### apic > `= summit | bigsmp | default` @@ -128,6 +134,8 @@ there are more than 8 CPUs, Xen will swi ### allow\_unsafe > `= ` +> Default: `false` + Force boot on potentially unsafe systems. By default Xen will refuse to boot on systems with the following errata: @@ -141,7 +149,20 @@ systems with the following errata: Increase the verbosity of the APIC code from the default value. ### ats +> `= ` + +> Default: `true` + +Permits Xen to set up and use PCI Address Translation Services, which is required +for PCI Passthrough. + ### availmem +> `= ` + +> Default: `0` (no limit) + +Specify a maximum amount of available memory, to which Xen will clamp the e820 table. + ### badpage > `= List of [ | - ]` @@ -151,8 +172,23 @@ that byte `0x12345678` is bad, you would Xen's command line. ### bootscrub +> `= ` + +> Default: `true` + +Scrub free RAM during boot. This is a safety feature to prevent accidentally leaking +sensitive VM data into other VMs if Xen crashes and reboots. + ### cachesize +> `= ` + +If set, override Xen's calculation of the level 2 cache line size. + ### clocksource +> `= pit | hpet | cyclone | acpi` + +If set, override Xen's default choice for the platform timer. + ### com1,com2 > `= [/][,DPS[,[,[,[,]]]] | pci | amt ] ` @@ -249,13 +285,38 @@ including omission, causes Xen to automa console during dom0 boot. ### cpu\_type +> `= arch_perfmon` + +If set, force use of the performance counters for oprofile, rather than detecting +available support. + ### cpufreq -### cpuid\_mask\_cpu -### cpuid\_mask\_ecx -### cpuid\_mask\_edx -### cpuid\_mask\_ext\_ecx -### cpuid\_mask\_ext\_edx -### cpuid\_mask\_xsave\_eax +> `= dom0-kernel | none | xen` + +> Default: `xen` + +Indicate where the responsibility for driving power states lies. + +### cpuid\_mask\_cpu (AMD only) +> `= fam_0f_rev_c | fam_0f_rev_d | fam_0f_rev_e | fam_0f_rev_f | fam_0f_rev_g | fam_10_rev_b | fam_10_rev_c | fam_11_rev_b` + +If the other **cpuid\_mask\_{,ext\_}e{c,d}x** options are fully set (unspecified +on the command line), specify a pre-canned cpuid mask to mask the current +processor down to appear as the specified processor. It is important to ensure +that all hosts in a pool appear the same to guests to allow successful live +migration. + +### cpuid\_mask\_ ecx,edx,ext\_ecx,ext\_edx,xsave_eax +> `= ` + +> Default: `~0` (all bits set) + +These five command line parameters are used to specify cpuid masks to help with +cpuid levelling across a pool of hosts. Setting a bit in the mask indicates that +the feature should be enabled, while clearing a bit in the mask indicates that +the feature should be disabled. It is important to ensure that all hosts in a +pool appear the same to guests to allow successful live migration. + ### cpuidle ### cpuinfo ### crashinfo_maxaddr @@ -485,7 +546,9 @@ Choose the default scheduler. ### serial\_tx\_buffer > `= ` -Set the serial transmit buffer size. Defaults to 16kB. +> Default: `16kB` + +Set the serial transmit buffer size. ### smep ### snb\_igd\_quirk @@ -543,7 +606,13 @@ The optional `keep` parameter causes Xen console even after dom0 has been started. The default behaviour is to relinquish control to dom0. -### vpid +### vpid (Intel) +> `= ` + +> Default: `true` + +Use Virtual Processor ID support if available. This prevents the need for TLB +flushes on VM entry and exit, increasing performance. ### vpmu > `= ( bts )` @@ -583,5 +652,22 @@ Set the NMI watchdog timeout in seconds. the watchdog. ### x2apic +> `= ` + +> Default: `true` + +Permit use of x2apic setup for SMP environments. + ### x2apic\_phys +> `= ` + +> Default: `true` + +Use the x2apic physical apic driver. The alternative is the x2apic cluster driver. + ### xsave +> `= ` + +> Default: `true` + +Permit use of the `xsave/xrstor` instructions. _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 23 03:22:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jul 2012 03:22: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 1St9Dq-0000jG-Vr; Mon, 23 Jul 2012 03:22:14 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1St9Dp-0000j4-8I for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 03:22:13 +0000 Received: from [85.158.143.99:30355] by server-3.bemta-4.messagelabs.com id BE/68-01511-463CC005; Mon, 23 Jul 2012 03:22:12 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-216.messagelabs.com!1343013730!28158354!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 31260 invoked from network); 23 Jul 2012 03:22:11 -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; 23 Jul 2012 03:22:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1St9Dm-00066R-DZ for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 03:22:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1St9Dl-0000fG-AN for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 03:22:09 +0000 Message-Id: Date: Mon, 23 Jul 2012 03:22:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] docs/cmdline: Add some more entries X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1342971445 -3600 # Node ID 3c426da4788e41cf798f709d9a3fef45e8503169 # Parent 8e7670c80200c2daeee190d48a1935afe6a45612 docs/cmdline: Add some more entries Signed-off-by: Andrew Cooper Committed-by: Keir Fraser --- diff -r 8e7670c80200 -r 3c426da4788e docs/misc/xen-command-line.markdown --- a/docs/misc/xen-command-line.markdown Sun Jul 22 16:36:59 2012 +0100 +++ b/docs/misc/xen-command-line.markdown Sun Jul 22 16:37:25 2012 +0100 @@ -118,6 +118,12 @@ domain 0 command line ### acpi\_sleep ### allowsuperpage +> `= ` + +> Default: `true` + +Permit Xen to use superpages when performing memory management. + ### apic > `= summit | bigsmp | default` @@ -128,6 +134,8 @@ there are more than 8 CPUs, Xen will swi ### allow\_unsafe > `= ` +> Default: `false` + Force boot on potentially unsafe systems. By default Xen will refuse to boot on systems with the following errata: @@ -141,7 +149,20 @@ systems with the following errata: Increase the verbosity of the APIC code from the default value. ### ats +> `= ` + +> Default: `true` + +Permits Xen to set up and use PCI Address Translation Services, which is required +for PCI Passthrough. + ### availmem +> `= ` + +> Default: `0` (no limit) + +Specify a maximum amount of available memory, to which Xen will clamp the e820 table. + ### badpage > `= List of [ | - ]` @@ -151,8 +172,23 @@ that byte `0x12345678` is bad, you would Xen's command line. ### bootscrub +> `= ` + +> Default: `true` + +Scrub free RAM during boot. This is a safety feature to prevent accidentally leaking +sensitive VM data into other VMs if Xen crashes and reboots. + ### cachesize +> `= ` + +If set, override Xen's calculation of the level 2 cache line size. + ### clocksource +> `= pit | hpet | cyclone | acpi` + +If set, override Xen's default choice for the platform timer. + ### com1,com2 > `= [/][,DPS[,[,[,[,]]]] | pci | amt ] ` @@ -249,13 +285,38 @@ including omission, causes Xen to automa console during dom0 boot. ### cpu\_type +> `= arch_perfmon` + +If set, force use of the performance counters for oprofile, rather than detecting +available support. + ### cpufreq -### cpuid\_mask\_cpu -### cpuid\_mask\_ecx -### cpuid\_mask\_edx -### cpuid\_mask\_ext\_ecx -### cpuid\_mask\_ext\_edx -### cpuid\_mask\_xsave\_eax +> `= dom0-kernel | none | xen` + +> Default: `xen` + +Indicate where the responsibility for driving power states lies. + +### cpuid\_mask\_cpu (AMD only) +> `= fam_0f_rev_c | fam_0f_rev_d | fam_0f_rev_e | fam_0f_rev_f | fam_0f_rev_g | fam_10_rev_b | fam_10_rev_c | fam_11_rev_b` + +If the other **cpuid\_mask\_{,ext\_}e{c,d}x** options are fully set (unspecified +on the command line), specify a pre-canned cpuid mask to mask the current +processor down to appear as the specified processor. It is important to ensure +that all hosts in a pool appear the same to guests to allow successful live +migration. + +### cpuid\_mask\_ ecx,edx,ext\_ecx,ext\_edx,xsave_eax +> `= ` + +> Default: `~0` (all bits set) + +These five command line parameters are used to specify cpuid masks to help with +cpuid levelling across a pool of hosts. Setting a bit in the mask indicates that +the feature should be enabled, while clearing a bit in the mask indicates that +the feature should be disabled. It is important to ensure that all hosts in a +pool appear the same to guests to allow successful live migration. + ### cpuidle ### cpuinfo ### crashinfo_maxaddr @@ -485,7 +546,9 @@ Choose the default scheduler. ### serial\_tx\_buffer > `= ` -Set the serial transmit buffer size. Defaults to 16kB. +> Default: `16kB` + +Set the serial transmit buffer size. ### smep ### snb\_igd\_quirk @@ -543,7 +606,13 @@ The optional `keep` parameter causes Xen console even after dom0 has been started. The default behaviour is to relinquish control to dom0. -### vpid +### vpid (Intel) +> `= ` + +> Default: `true` + +Use Virtual Processor ID support if available. This prevents the need for TLB +flushes on VM entry and exit, increasing performance. ### vpmu > `= ( bts )` @@ -583,5 +652,22 @@ Set the NMI watchdog timeout in seconds. the watchdog. ### x2apic +> `= ` + +> Default: `true` + +Permit use of x2apic setup for SMP environments. + ### x2apic\_phys +> `= ` + +> Default: `true` + +Use the x2apic physical apic driver. The alternative is the x2apic cluster driver. + ### xsave +> `= ` + +> Default: `true` + +Permit use of the `xsave/xrstor` instructions. _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 23 03:22:23 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jul 2012 03:22: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 1St9Ds-0000jL-2S; Mon, 23 Jul 2012 03:22:16 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1St9Dq-0000jA-Bl for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 03:22:14 +0000 Received: from [85.158.143.99:30385] by server-2.bemta-4.messagelabs.com id 23/FB-17938-563CC005; Mon, 23 Jul 2012 03:22:13 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-216.messagelabs.com!1343013732!27551563!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 18402 invoked from network); 23 Jul 2012 03:22:12 -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; 23 Jul 2012 03:22:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1St9Dk-00066M-Oa for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 03:22:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1St9Dk-0000ek-6k for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 03:22:08 +0000 Message-Id: Date: Mon, 23 Jul 2012 03:22:07 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] docs/cmdline: Tweak some markdown formatting X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1342971390 -3600 # Node ID 41b462d86f390987649dbe23aadeb80ee5601b99 # Parent afc5fee8ae12df8936f4f52c11e2b32aa97ff72a docs/cmdline: Tweak some markdown formatting Some for readability, and some to escape underscores. Signed-off-by: Andrew Cooper Committed-by: Keir Fraser --- diff -r afc5fee8ae12 -r 41b462d86f39 docs/misc/xen-command-line.markdown --- a/docs/misc/xen-command-line.markdown Thu Jul 19 15:47:28 2012 +0100 +++ b/docs/misc/xen-command-line.markdown Sun Jul 22 16:36:30 2012 +0100 @@ -75,7 +75,7 @@ of Boolean and String. These are noted **String**, or **Boolean** to disable. -The `acpi` option is used to control a set of four related boolean +The **acpi** option is used to control a set of four related boolean flags; `acpi_force`, `acpi_ht`, `acpi_noirq` and `acpi_disabled`. By default, Xen will scan the DMI data and blacklist certain systems @@ -399,13 +399,13 @@ should be rate limited. ### low\_crashinfo > `= none | min | all` -> Default: `none` if not specified at all, or to `min` if `low\_crashinfo` is present without qualification. +> Default: `none` if not specified at all, or to `min` if **low_crashinfo** is present without qualification. This option is only useful for hosts with a 32bit dom0 kernel, wishing to use kexec functionality in the case of a crash. It represents which data structures should be deliberately allocated in low memory, so the crash kernel may find find them. Should be used in combination -with `crashinfo_maxaddr`. +with **crashinfo_maxaddr**. ### max\_cstate ### max\_gsi\_irqs @@ -457,7 +457,7 @@ BIOS. This option will accept value. Do not execute real-mode bootstrap code when booting Xen. This option should not be used except for debugging. It will effectively disable -the vga option, which relies on real mode to set the video mode. +the **vga** option, which relies on real mode to set the video mode. ### noreboot > `= ` @@ -566,7 +566,7 @@ If the current cpu isn't supported a mes is printed on the hypervisor serial log. For some Intel Nehalem processors a quirk handling exist for an unknown -wrong behaviour (see handle_pmc_quirk()). +wrong behaviour (see handle\_pmc\_quirk()). If 'vpmu=bts' is specified the virtualisation of the Branch Trace Store (BTS) feature is switched on on Intel processors supporting this feature. @@ -583,7 +583,7 @@ don't use the vpmu flag on production sy > Default: `false` Run an NMI watchdog on each processor. If a processor is stuck for -longer than the watchdog\_timeout, a panic occurs. +longer than the **watchdog\_timeout**, a panic occurs. ### watchdog\_timeout > `= ` _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 23 03:22:23 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jul 2012 03:22: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 1St9Ds-0000jL-2S; Mon, 23 Jul 2012 03:22:16 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1St9Dq-0000jA-Bl for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 03:22:14 +0000 Received: from [85.158.143.99:30385] by server-2.bemta-4.messagelabs.com id 23/FB-17938-563CC005; Mon, 23 Jul 2012 03:22:13 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-216.messagelabs.com!1343013732!27551563!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 18402 invoked from network); 23 Jul 2012 03:22:12 -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; 23 Jul 2012 03:22:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1St9Dk-00066M-Oa for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 03:22:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1St9Dk-0000ek-6k for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 03:22:08 +0000 Message-Id: Date: Mon, 23 Jul 2012 03:22:07 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] docs/cmdline: Tweak some markdown formatting X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1342971390 -3600 # Node ID 41b462d86f390987649dbe23aadeb80ee5601b99 # Parent afc5fee8ae12df8936f4f52c11e2b32aa97ff72a docs/cmdline: Tweak some markdown formatting Some for readability, and some to escape underscores. Signed-off-by: Andrew Cooper Committed-by: Keir Fraser --- diff -r afc5fee8ae12 -r 41b462d86f39 docs/misc/xen-command-line.markdown --- a/docs/misc/xen-command-line.markdown Thu Jul 19 15:47:28 2012 +0100 +++ b/docs/misc/xen-command-line.markdown Sun Jul 22 16:36:30 2012 +0100 @@ -75,7 +75,7 @@ of Boolean and String. These are noted **String**, or **Boolean** to disable. -The `acpi` option is used to control a set of four related boolean +The **acpi** option is used to control a set of four related boolean flags; `acpi_force`, `acpi_ht`, `acpi_noirq` and `acpi_disabled`. By default, Xen will scan the DMI data and blacklist certain systems @@ -399,13 +399,13 @@ should be rate limited. ### low\_crashinfo > `= none | min | all` -> Default: `none` if not specified at all, or to `min` if `low\_crashinfo` is present without qualification. +> Default: `none` if not specified at all, or to `min` if **low_crashinfo** is present without qualification. This option is only useful for hosts with a 32bit dom0 kernel, wishing to use kexec functionality in the case of a crash. It represents which data structures should be deliberately allocated in low memory, so the crash kernel may find find them. Should be used in combination -with `crashinfo_maxaddr`. +with **crashinfo_maxaddr**. ### max\_cstate ### max\_gsi\_irqs @@ -457,7 +457,7 @@ BIOS. This option will accept value. Do not execute real-mode bootstrap code when booting Xen. This option should not be used except for debugging. It will effectively disable -the vga option, which relies on real mode to set the video mode. +the **vga** option, which relies on real mode to set the video mode. ### noreboot > `= ` @@ -566,7 +566,7 @@ If the current cpu isn't supported a mes is printed on the hypervisor serial log. For some Intel Nehalem processors a quirk handling exist for an unknown -wrong behaviour (see handle_pmc_quirk()). +wrong behaviour (see handle\_pmc\_quirk()). If 'vpmu=bts' is specified the virtualisation of the Branch Trace Store (BTS) feature is switched on on Intel processors supporting this feature. @@ -583,7 +583,7 @@ don't use the vpmu flag on production sy > Default: `false` Run an NMI watchdog on each processor. If a processor is stuck for -longer than the watchdog\_timeout, a panic occurs. +longer than the **watchdog\_timeout**, a panic occurs. ### watchdog\_timeout > `= ` _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 23 03:22:25 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jul 2012 03:22:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1St9Dy-0000jz-5x; Mon, 23 Jul 2012 03:22:22 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1St9Dw-0000jc-HR for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 03:22:20 +0000 Received: from [85.158.143.35:21461] by server-3.bemta-4.messagelabs.com id 73/88-01511-B63CC005; Mon, 23 Jul 2012 03:22:19 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-21.messagelabs.com!1343013729!16466943!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 15524 invoked from network); 23 Jul 2012 03:22:11 -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; 23 Jul 2012 03:22:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1St9Dl-00066P-BN for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 03:22:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1St9Dk-0000f0-Q0 for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 03:22:08 +0000 Message-Id: Date: Mon, 23 Jul 2012 03:22:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] docs/cmdline: Remove ia64 specific arguments X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1342971419 -3600 # Node ID 8e7670c80200c2daeee190d48a1935afe6a45612 # Parent 41b462d86f390987649dbe23aadeb80ee5601b99 docs/cmdline: Remove ia64 specific arguments grep claims that all of these command line arguments no longer exist in the xen source tree. Signed-off-by: Andrew Cooper Committed-by: Keir Fraser --- diff -r 41b462d86f39 -r 8e7670c80200 docs/misc/xen-command-line.markdown --- a/docs/misc/xen-command-line.markdown Sun Jul 22 16:36:30 2012 +0100 +++ b/docs/misc/xen-command-line.markdown Sun Jul 22 16:36:59 2012 +0100 @@ -117,7 +117,6 @@ the domain 0 kernel this option is autom domain 0 command line ### acpi\_sleep -### additional\_cpus ### allowsuperpage ### apic > `= summit | bigsmp | default` @@ -249,7 +248,6 @@ switch the console input to dom0 during including omission, causes Xen to automatically switch to the dom0 console during dom0 boot. -### contig\_mem ### cpu\_type ### cpufreq ### cpuid\_mask\_cpu @@ -273,7 +271,6 @@ combination with the `low_crashinfo` com ### credit2\_balance\_under ### credit2\_load\_window\_shift ### debug\_stack\_lines -### debug\_stack\_lines ### debugtrace ### dma\_bits > `= ` @@ -287,12 +284,7 @@ Specify the bit width of the DMA heap. Specify the maximum number of vcpus to give to dom0. This defaults to the number of pcpus on the host. -### dom0\_mem (ia64) -> `= ` - -Specify the total size for dom0. - -### dom0\_mem (x86) +### dom0\_mem > `= List of ( min: | max: | )` Set the amount of memory for the initial domain (dom0). If a size is @@ -410,7 +402,6 @@ with **crashinfo_maxaddr**. ### max\_cstate ### max\_gsi\_irqs ### maxcpus -### maxcpus ### mce ### mce\_fb ### mce\_verbosity @@ -575,8 +566,6 @@ feature is switched on on Intel processo As the BTS virtualisation is not 100% safe and because of the nehalem quirk don't use the vpmu flag on production systems with Intel cpus! -### vti\_vhpt\_size -### vti\_vtlb\_size ### watchdog > `= ` @@ -595,6 +584,4 @@ the watchdog. ### x2apic ### x2apic\_phys -### xencons -### xencons\_poll ### xsave _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 23 03:22:25 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jul 2012 03:22:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1St9Dy-0000jz-5x; Mon, 23 Jul 2012 03:22:22 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1St9Dw-0000jc-HR for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 03:22:20 +0000 Received: from [85.158.143.35:21461] by server-3.bemta-4.messagelabs.com id 73/88-01511-B63CC005; Mon, 23 Jul 2012 03:22:19 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-21.messagelabs.com!1343013729!16466943!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 15524 invoked from network); 23 Jul 2012 03:22:11 -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; 23 Jul 2012 03:22:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1St9Dl-00066P-BN for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 03:22:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1St9Dk-0000f0-Q0 for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 03:22:08 +0000 Message-Id: Date: Mon, 23 Jul 2012 03:22:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] docs/cmdline: Remove ia64 specific arguments X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1342971419 -3600 # Node ID 8e7670c80200c2daeee190d48a1935afe6a45612 # Parent 41b462d86f390987649dbe23aadeb80ee5601b99 docs/cmdline: Remove ia64 specific arguments grep claims that all of these command line arguments no longer exist in the xen source tree. Signed-off-by: Andrew Cooper Committed-by: Keir Fraser --- diff -r 41b462d86f39 -r 8e7670c80200 docs/misc/xen-command-line.markdown --- a/docs/misc/xen-command-line.markdown Sun Jul 22 16:36:30 2012 +0100 +++ b/docs/misc/xen-command-line.markdown Sun Jul 22 16:36:59 2012 +0100 @@ -117,7 +117,6 @@ the domain 0 kernel this option is autom domain 0 command line ### acpi\_sleep -### additional\_cpus ### allowsuperpage ### apic > `= summit | bigsmp | default` @@ -249,7 +248,6 @@ switch the console input to dom0 during including omission, causes Xen to automatically switch to the dom0 console during dom0 boot. -### contig\_mem ### cpu\_type ### cpufreq ### cpuid\_mask\_cpu @@ -273,7 +271,6 @@ combination with the `low_crashinfo` com ### credit2\_balance\_under ### credit2\_load\_window\_shift ### debug\_stack\_lines -### debug\_stack\_lines ### debugtrace ### dma\_bits > `= ` @@ -287,12 +284,7 @@ Specify the bit width of the DMA heap. Specify the maximum number of vcpus to give to dom0. This defaults to the number of pcpus on the host. -### dom0\_mem (ia64) -> `= ` - -Specify the total size for dom0. - -### dom0\_mem (x86) +### dom0\_mem > `= List of ( min: | max: | )` Set the amount of memory for the initial domain (dom0). If a size is @@ -410,7 +402,6 @@ with **crashinfo_maxaddr**. ### max\_cstate ### max\_gsi\_irqs ### maxcpus -### maxcpus ### mce ### mce\_fb ### mce\_verbosity @@ -575,8 +566,6 @@ feature is switched on on Intel processo As the BTS virtualisation is not 100% safe and because of the nehalem quirk don't use the vpmu flag on production systems with Intel cpus! -### vti\_vhpt\_size -### vti\_vtlb\_size ### watchdog > `= ` @@ -595,6 +584,4 @@ the watchdog. ### x2apic ### x2apic\_phys -### xencons -### xencons\_poll ### xsave _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 23 08:55:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jul 2012 08:55: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 1StEQ7-0003cR-S1; Mon, 23 Jul 2012 08:55:15 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StEQ6-0003c9-0r for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 08:55:14 +0000 Received: from [85.158.139.83:61101] by server-9.bemta-5.messagelabs.com id 0D/4A-01069-1711D005; Mon, 23 Jul 2012 08:55:13 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-182.messagelabs.com!1343033711!28042127!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 12100 invoked from network); 23 Jul 2012 08:55:12 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 23 Jul 2012 08:55:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StEQ2-0001u8-Qh for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 08:55:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1StEQ2-0002mC-Fn for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 08:55:10 +0000 Message-Id: Date: Mon, 23 Jul 2012 08:55:10 +0000 From: Xen patchbot-4.0-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.0-testing] Added signature for changeset 9af8521e0411 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1342971580 -3600 # Node ID a25160773a384eefbe7d86b6caaf4ea516027436 # Parent f072ee634da92413ab3349dd831edc9eda666120 Added signature for changeset 9af8521e0411 --- diff -r f072ee634da9 -r a25160773a38 .hgsigs --- a/.hgsigs Sun Jul 22 16:39:32 2012 +0100 +++ b/.hgsigs Sun Jul 22 16:39:40 2012 +0100 @@ -19,3 +19,4 @@ fd7c4d4e52d9aa4ad228d73d068fa7db79a0c904 00b5807c08f266b11fe54de808bafc4f74dde972 0 iQEcBAABAgAGBQJOoE3nAAoJEIP+FMlX6CvZg6UH/1WLvfz7MiyLJ2igox5gOQdcfrMe8ohnyd/CGwG/vex+Ohc7mKXVRoIcrR02a247eA3FmJKDqj/NDAbLTjnCzFjlxWKBQo2HO1bGZSGBD8b+hbR1laBSinXB5WscQG5VO7S2uj4j0GZbZ9ATdF11qhzWTviiBxei0l/INtoOb5NhsWpkIubQWVJLBEw9X6COMvwCabcoCDa/xZUxQfOHhRfdp1ouk4V9Zf7amW3ne4p0tMHjN9e0Ic+waBDX4Fyfns4GqDKfBgTOq2AgMO8BSmUuBQtIcYw03Z5GYco1Tfz3Lk3tTq4E+TyWXKKSQ5NOFI+9AxJn813NyR+r+AwatrI= 94fddf2a19482c88a60c07a1a085374586d207e8 0 iQEcBAABAgAGBQJPp8P7AAoJEIP+FMlX6CvZticH/jEqpGGEdlhBftLU7IeQ+0y4E25rbwH4iPpcRFctOvjWi8AsNT3u87UYvP/IqPoCg5NlNIYzmm9GO5dRV+cfKrsNQ1zKB0LETUkElfo+RM1upwGzNc4Hct87Gu8TNGYOsXSovHH868vnZXN0ZylR0PcHMrawJaOi9bJP2GkKo9XKEkmx0Pq77VQCCRUijWSaBYhRKgAbJ3VTB1/qzXDrve2v4HXCg9vFILH6DPWz5M3EhIZQh3+IIcUVlWi/6WbPergm8moKU4TXZc7kpl/hO2x+/LnneA/v96PzyQIJcl/m3PcIBjiaB17UCxwSfkS4VUZjLtfL5rRAywcnjVYXOyY= fe1ae79f1a7f0c25445a4753aa9367b312f81910 0 iQEcBAABAgAGBQJP3zchAAoJEIP+FMlX6CvZib0H/A5jcY9NBbd4+QxPz67tdKMX1O0wVUvy160p9Nq1vQcbtrxcpVpR0o0/Ss2pbc9wJpBzcbKsBLxWffolkIxF7Dr5OiQU9Zu6lF1ou6WoJ9wscAWYvxjJY5KrS9cu2aTZged89WUJSJOZq96BujCp0bc3+jbin70Dn/Y9UvkghbUfb2x2ZJ2Tj3yxsfsogK6ShfN7xoyRhZSqCgczzcUQ72+HGJvqpMIvwUNkeKJzymM9nqbIKiP1HKK4rB97zCflwNgBrSJ4BNLQ49cJSFrbNB+X6p6MUXrNLrlBet19WR4C/wHMK9ovnOnSWgzg3mi3zlnJ/CcKOF+XmPHhg0kmi9M= +9af8521e0411930143150aba53ea0c8bc61a678a 0 iQEcBAABAgAGBQJQDB67AAoJEIP+FMlX6CvZLkYIALNpZT7CykRqQBzYnWWG5lY7KTDU/HcOhv2cXr3RXX9f8cBNTS6oTA6UcJ8J+hb6w1fY78LKNPGKpgafB0Ceuq2p+uywupNvg/E68xzIsQhXxKiQhziPzMCsGaFfuUE2Ea0CQYizL5p2/xfV46NEXff5pgJnTPFAYlQ/OznIu5wAsQEj0jsy0a7R+ygkFIjiwu4cm8F57z0+9NUKPjtYgXDZXaoir61vYVdyjgRYlaFdPCXzY5neIq7JwaZxXEpU+aGd0biMeS0wu4cwFLC9knY5YDsrVbwhoYZvOakUOm9JOnDViZII5ohB9MAgguQ1tf4CeAtWpPVDxj/C7lSlDz8= _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 23 08:55:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jul 2012 08:55: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 1StEQ7-0003cR-S1; Mon, 23 Jul 2012 08:55:15 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StEQ6-0003c9-0r for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 08:55:14 +0000 Received: from [85.158.139.83:61101] by server-9.bemta-5.messagelabs.com id 0D/4A-01069-1711D005; Mon, 23 Jul 2012 08:55:13 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-182.messagelabs.com!1343033711!28042127!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 12100 invoked from network); 23 Jul 2012 08:55:12 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 23 Jul 2012 08:55:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StEQ2-0001u8-Qh for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 08:55:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1StEQ2-0002mC-Fn for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 08:55:10 +0000 Message-Id: Date: Mon, 23 Jul 2012 08:55:10 +0000 From: Xen patchbot-4.0-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.0-testing] Added signature for changeset 9af8521e0411 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1342971580 -3600 # Node ID a25160773a384eefbe7d86b6caaf4ea516027436 # Parent f072ee634da92413ab3349dd831edc9eda666120 Added signature for changeset 9af8521e0411 --- diff -r f072ee634da9 -r a25160773a38 .hgsigs --- a/.hgsigs Sun Jul 22 16:39:32 2012 +0100 +++ b/.hgsigs Sun Jul 22 16:39:40 2012 +0100 @@ -19,3 +19,4 @@ fd7c4d4e52d9aa4ad228d73d068fa7db79a0c904 00b5807c08f266b11fe54de808bafc4f74dde972 0 iQEcBAABAgAGBQJOoE3nAAoJEIP+FMlX6CvZg6UH/1WLvfz7MiyLJ2igox5gOQdcfrMe8ohnyd/CGwG/vex+Ohc7mKXVRoIcrR02a247eA3FmJKDqj/NDAbLTjnCzFjlxWKBQo2HO1bGZSGBD8b+hbR1laBSinXB5WscQG5VO7S2uj4j0GZbZ9ATdF11qhzWTviiBxei0l/INtoOb5NhsWpkIubQWVJLBEw9X6COMvwCabcoCDa/xZUxQfOHhRfdp1ouk4V9Zf7amW3ne4p0tMHjN9e0Ic+waBDX4Fyfns4GqDKfBgTOq2AgMO8BSmUuBQtIcYw03Z5GYco1Tfz3Lk3tTq4E+TyWXKKSQ5NOFI+9AxJn813NyR+r+AwatrI= 94fddf2a19482c88a60c07a1a085374586d207e8 0 iQEcBAABAgAGBQJPp8P7AAoJEIP+FMlX6CvZticH/jEqpGGEdlhBftLU7IeQ+0y4E25rbwH4iPpcRFctOvjWi8AsNT3u87UYvP/IqPoCg5NlNIYzmm9GO5dRV+cfKrsNQ1zKB0LETUkElfo+RM1upwGzNc4Hct87Gu8TNGYOsXSovHH868vnZXN0ZylR0PcHMrawJaOi9bJP2GkKo9XKEkmx0Pq77VQCCRUijWSaBYhRKgAbJ3VTB1/qzXDrve2v4HXCg9vFILH6DPWz5M3EhIZQh3+IIcUVlWi/6WbPergm8moKU4TXZc7kpl/hO2x+/LnneA/v96PzyQIJcl/m3PcIBjiaB17UCxwSfkS4VUZjLtfL5rRAywcnjVYXOyY= fe1ae79f1a7f0c25445a4753aa9367b312f81910 0 iQEcBAABAgAGBQJP3zchAAoJEIP+FMlX6CvZib0H/A5jcY9NBbd4+QxPz67tdKMX1O0wVUvy160p9Nq1vQcbtrxcpVpR0o0/Ss2pbc9wJpBzcbKsBLxWffolkIxF7Dr5OiQU9Zu6lF1ou6WoJ9wscAWYvxjJY5KrS9cu2aTZged89WUJSJOZq96BujCp0bc3+jbin70Dn/Y9UvkghbUfb2x2ZJ2Tj3yxsfsogK6ShfN7xoyRhZSqCgczzcUQ72+HGJvqpMIvwUNkeKJzymM9nqbIKiP1HKK4rB97zCflwNgBrSJ4BNLQ49cJSFrbNB+X6p6MUXrNLrlBet19WR4C/wHMK9ovnOnSWgzg3mi3zlnJ/CcKOF+XmPHhg0kmi9M= +9af8521e0411930143150aba53ea0c8bc61a678a 0 iQEcBAABAgAGBQJQDB67AAoJEIP+FMlX6CvZLkYIALNpZT7CykRqQBzYnWWG5lY7KTDU/HcOhv2cXr3RXX9f8cBNTS6oTA6UcJ8J+hb6w1fY78LKNPGKpgafB0Ceuq2p+uywupNvg/E68xzIsQhXxKiQhziPzMCsGaFfuUE2Ea0CQYizL5p2/xfV46NEXff5pgJnTPFAYlQ/OznIu5wAsQEj0jsy0a7R+ygkFIjiwu4cm8F57z0+9NUKPjtYgXDZXaoir61vYVdyjgRYlaFdPCXzY5neIq7JwaZxXEpU+aGd0biMeS0wu4cwFLC9knY5YDsrVbwhoYZvOakUOm9JOnDViZII5ohB9MAgguQ1tf4CeAtWpPVDxj/C7lSlDz8= _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 23 08:55:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jul 2012 08:55: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 1StEQ7-0003cM-PW; Mon, 23 Jul 2012 08:55:15 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StEQ5-0003c8-TL for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 08:55:14 +0000 Received: from [85.158.143.99:2975] by server-1.bemta-4.messagelabs.com id AF/CD-24392-1711D005; Mon, 23 Jul 2012 08:55:13 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-216.messagelabs.com!1343033710!18410665!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 5939 invoked from network); 23 Jul 2012 08:55:12 -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; 23 Jul 2012 08:55:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StEQ2-0001u5-4t for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 08:55:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1StEQ1-0002lx-VA for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 08:55:09 +0000 Message-Id: Date: Mon, 23 Jul 2012 08:55:09 +0000 From: Xen patchbot-4.0-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.0-testing] Added tag 4.0.4-rc3 for changeset 9af8521e0411 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1342971572 -3600 # Node ID f072ee634da92413ab3349dd831edc9eda666120 # Parent 9af8521e0411930143150aba53ea0c8bc61a678a Added tag 4.0.4-rc3 for changeset 9af8521e0411 --- diff -r 9af8521e0411 -r f072ee634da9 .hgtags --- a/.hgtags Sun Jul 22 16:39:29 2012 +0100 +++ b/.hgtags Sun Jul 22 16:39:32 2012 +0100 @@ -66,3 +66,4 @@ fd7c4d4e52d9aa4ad228d73d068fa7db79a0c904 00b5807c08f266b11fe54de808bafc4f74dde972 RELEASE-4.0.3 94fddf2a19482c88a60c07a1a085374586d207e8 4.0.4-rc1 fe1ae79f1a7f0c25445a4753aa9367b312f81910 4.0.4-rc2 +9af8521e0411930143150aba53ea0c8bc61a678a 4.0.4-rc3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 23 08:55:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jul 2012 08:55: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 1StEQ7-0003cM-PW; Mon, 23 Jul 2012 08:55:15 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StEQ5-0003c8-TL for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 08:55:14 +0000 Received: from [85.158.143.99:2975] by server-1.bemta-4.messagelabs.com id AF/CD-24392-1711D005; Mon, 23 Jul 2012 08:55:13 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-216.messagelabs.com!1343033710!18410665!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 5939 invoked from network); 23 Jul 2012 08:55:12 -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; 23 Jul 2012 08:55:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StEQ2-0001u5-4t for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 08:55:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1StEQ1-0002lx-VA for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 08:55:09 +0000 Message-Id: Date: Mon, 23 Jul 2012 08:55:09 +0000 From: Xen patchbot-4.0-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.0-testing] Added tag 4.0.4-rc3 for changeset 9af8521e0411 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1342971572 -3600 # Node ID f072ee634da92413ab3349dd831edc9eda666120 # Parent 9af8521e0411930143150aba53ea0c8bc61a678a Added tag 4.0.4-rc3 for changeset 9af8521e0411 --- diff -r 9af8521e0411 -r f072ee634da9 .hgtags --- a/.hgtags Sun Jul 22 16:39:29 2012 +0100 +++ b/.hgtags Sun Jul 22 16:39:32 2012 +0100 @@ -66,3 +66,4 @@ fd7c4d4e52d9aa4ad228d73d068fa7db79a0c904 00b5807c08f266b11fe54de808bafc4f74dde972 RELEASE-4.0.3 94fddf2a19482c88a60c07a1a085374586d207e8 4.0.4-rc1 fe1ae79f1a7f0c25445a4753aa9367b312f81910 4.0.4-rc2 +9af8521e0411930143150aba53ea0c8bc61a678a 4.0.4-rc3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 23 08:55:21 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jul 2012 08:55: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 1StEQ7-0003cW-Ub; Mon, 23 Jul 2012 08:55:15 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StEQ6-0003c7-K6 for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 08:55:14 +0000 Received: from [85.158.143.35:60060] by server-2.bemta-4.messagelabs.com id E4/42-17938-0711D005; Mon, 23 Jul 2012 08:55:12 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-21.messagelabs.com!1343033710!6095167!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 24427 invoked from network); 23 Jul 2012 08:55:11 -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; 23 Jul 2012 08:55:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StEQ1-0001u2-Na for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 08:55:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1StEQ1-0002li-8t for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 08:55:09 +0000 Message-Id: Date: Mon, 23 Jul 2012 08:55:08 +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-rc3 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1342971569 -3600 # Node ID 9af8521e0411930143150aba53ea0c8bc61a678a # Parent 30c9bcaec782d200113dfaebb97d55a9e73cd869 Update Xen version to 4.0.4-rc3 --- diff -r 30c9bcaec782 -r 9af8521e0411 Config.mk --- a/Config.mk Tue Jul 03 13:51:14 2012 +0100 +++ b/Config.mk Sun Jul 22 16:39:29 2012 +0100 @@ -178,7 +178,7 @@ endif # CONFIG_QEMU ?= ../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG := xen-4.0.4-rc2 +QEMU_TAG := xen-4.0.4-rc3 # Thu Feb 2 13:47:06 2012 +0000 # e1000: bounds packet size against buffer size diff -r 30c9bcaec782 -r 9af8521e0411 xen/Makefile --- a/xen/Makefile Tue Jul 03 13:51:14 2012 +0100 +++ b/xen/Makefile Sun Jul 22 16:39:29 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-pre$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .4-rc3$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 23 08:55:21 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jul 2012 08:55: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 1StEQ7-0003cW-Ub; Mon, 23 Jul 2012 08:55:15 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StEQ6-0003c7-K6 for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 08:55:14 +0000 Received: from [85.158.143.35:60060] by server-2.bemta-4.messagelabs.com id E4/42-17938-0711D005; Mon, 23 Jul 2012 08:55:12 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-21.messagelabs.com!1343033710!6095167!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 24427 invoked from network); 23 Jul 2012 08:55:11 -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; 23 Jul 2012 08:55:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StEQ1-0001u2-Na for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 08:55:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1StEQ1-0002li-8t for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 08:55:09 +0000 Message-Id: Date: Mon, 23 Jul 2012 08:55:08 +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-rc3 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1342971569 -3600 # Node ID 9af8521e0411930143150aba53ea0c8bc61a678a # Parent 30c9bcaec782d200113dfaebb97d55a9e73cd869 Update Xen version to 4.0.4-rc3 --- diff -r 30c9bcaec782 -r 9af8521e0411 Config.mk --- a/Config.mk Tue Jul 03 13:51:14 2012 +0100 +++ b/Config.mk Sun Jul 22 16:39:29 2012 +0100 @@ -178,7 +178,7 @@ endif # CONFIG_QEMU ?= ../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG := xen-4.0.4-rc2 +QEMU_TAG := xen-4.0.4-rc3 # Thu Feb 2 13:47:06 2012 +0000 # e1000: bounds packet size against buffer size diff -r 30c9bcaec782 -r 9af8521e0411 xen/Makefile --- a/xen/Makefile Tue Jul 03 13:51:14 2012 +0100 +++ b/xen/Makefile Sun Jul 22 16:39:29 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-pre$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .4-rc3$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 23 17:11:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jul 2012 17: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 1StMA6-0006zb-Ch; Mon, 23 Jul 2012 17:11:14 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StMA4-0006zT-Bb for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 17:11:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1343063464!9506271!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 7602 invoked from network); 23 Jul 2012 17:11:05 -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; 23 Jul 2012 17:11:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StM9v-0008P2-Qy for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 17:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1StM9v-0000hz-Iw for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 17:11:03 +0000 Date: Mon, 23 Jul 2012 17:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-unstable] qemu-traditional: fix no-return-in-nonvoid-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 commit 00fb2aae68e915b7f456fd5e3997ddf31339004a Author: Olaf Hering Date: Mon Jul 23 17:56:13 2012 +0100 qemu-traditional: fix no-return-in-nonvoid-function rpm post-build-checks found a few issues in qemu-xen-traditional and marks them as errors. I: Program returns random data in a function E: xen no-return-in-nonvoid-function savevm.c:215 E: xen no-return-in-nonvoid-function /usr/src/packages/BUILD/xen-4.2.25602/non-dbg/stubdom/ioemu/xenfbfront.c:361 Signed-off-by: Olaf Hering --- qemu-xen.h | 2 +- savevm.c | 2 +- xenfbfront.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qemu-xen.h b/qemu-xen.h index d50c89f..0598668 100644 --- a/qemu-xen.h +++ b/qemu-xen.h @@ -129,7 +129,7 @@ int xenstore_find_device(BlockDriverState *bs); /* xenfbfront.c */ int xenfb_pv_display_init(DisplayState *ds); -int xenfb_pv_display_vram(void *vram_start); +void xenfb_pv_display_vram(void *vram_start); int xenfb_connect_vkbd(const char *path); int xenfb_connect_vfb(const char *path); diff --git a/savevm.c b/savevm.c index 71a57eb..746a713 100644 --- a/savevm.c +++ b/savevm.c @@ -210,8 +210,8 @@ static int popen_close(void *opaque) QEMUFilePopen *s = opaque; pclose(s->popen_file); qemu_free(s); - return 0; #endif + return 0; } QEMUFile *qemu_popen(FILE *popen_file, const char *mode) diff --git a/xenfbfront.c b/xenfbfront.c index ed79cde..d83693f 100644 --- a/xenfbfront.c +++ b/xenfbfront.c @@ -355,7 +355,7 @@ int xenfb_pv_display_init(DisplayState *ds) return 0; } -int xenfb_pv_display_vram(void *data) +void xenfb_pv_display_vram(void *data) { vga_vram = data; } -- generated by git-patchbot for /home/xen/git/qemu-xen-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 23 17:11:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jul 2012 17: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 1StMA6-0006zb-Ch; Mon, 23 Jul 2012 17:11:14 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StMA4-0006zT-Bb for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 17:11:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1343063464!9506271!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 7602 invoked from network); 23 Jul 2012 17:11:05 -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; 23 Jul 2012 17:11:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StM9v-0008P2-Qy for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 17:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1StM9v-0000hz-Iw for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 17:11:03 +0000 Date: Mon, 23 Jul 2012 17:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-unstable] qemu-traditional: fix no-return-in-nonvoid-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 commit 00fb2aae68e915b7f456fd5e3997ddf31339004a Author: Olaf Hering Date: Mon Jul 23 17:56:13 2012 +0100 qemu-traditional: fix no-return-in-nonvoid-function rpm post-build-checks found a few issues in qemu-xen-traditional and marks them as errors. I: Program returns random data in a function E: xen no-return-in-nonvoid-function savevm.c:215 E: xen no-return-in-nonvoid-function /usr/src/packages/BUILD/xen-4.2.25602/non-dbg/stubdom/ioemu/xenfbfront.c:361 Signed-off-by: Olaf Hering --- qemu-xen.h | 2 +- savevm.c | 2 +- xenfbfront.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qemu-xen.h b/qemu-xen.h index d50c89f..0598668 100644 --- a/qemu-xen.h +++ b/qemu-xen.h @@ -129,7 +129,7 @@ int xenstore_find_device(BlockDriverState *bs); /* xenfbfront.c */ int xenfb_pv_display_init(DisplayState *ds); -int xenfb_pv_display_vram(void *vram_start); +void xenfb_pv_display_vram(void *vram_start); int xenfb_connect_vkbd(const char *path); int xenfb_connect_vfb(const char *path); diff --git a/savevm.c b/savevm.c index 71a57eb..746a713 100644 --- a/savevm.c +++ b/savevm.c @@ -210,8 +210,8 @@ static int popen_close(void *opaque) QEMUFilePopen *s = opaque; pclose(s->popen_file); qemu_free(s); - return 0; #endif + return 0; } QEMUFile *qemu_popen(FILE *popen_file, const char *mode) diff --git a/xenfbfront.c b/xenfbfront.c index ed79cde..d83693f 100644 --- a/xenfbfront.c +++ b/xenfbfront.c @@ -355,7 +355,7 @@ int xenfb_pv_display_init(DisplayState *ds) return 0; } -int xenfb_pv_display_vram(void *data) +void xenfb_pv_display_vram(void *data) { vga_vram = data; } -- generated by git-patchbot for /home/xen/git/qemu-xen-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 23 19:55:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jul 2012 19:55: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 1StOip-0004nc-0f; Mon, 23 Jul 2012 19:55:15 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StOim-0004nJ-V6 for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:13 +0000 Received: from [85.158.138.51:24082] by server-10.bemta-3.messagelabs.com id 2B/F6-21993-02CAD005; Mon, 23 Jul 2012 19:55:12 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-174.messagelabs.com!1343073310!26633627!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 999 invoked from network); 23 Jul 2012 19:55:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 23 Jul 2012 19:55:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StOij-0001q5-OB for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1StOii-0005fT-Rw for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:09 +0000 Message-Id: Date: Mon, 23 Jul 2012 19:55:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xl: remove stray timer mode debug print X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343045377 -3600 # Node ID bb1b85f2ce981d61b9061f2d25a50583cadb358f # Parent 405c7ea7c5deac768a0ab325d5b4c444382ddc0e xl: remove stray timer mode debug print Reported-by: Andre Przywara Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r 405c7ea7c5de -r bb1b85f2ce98 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Mon Jul 23 13:09:36 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Mon Jul 23 13:09:37 2012 +0100 @@ -836,7 +836,6 @@ static void parse_config_data(const char } b_info->u.hvm.timer_mode = l; } else if (!xlu_cfg_get_string(config, "timer_mode", &buf, 0)) { - fprintf(stderr, "got a timer mode string: \"%s\"\n", buf); if (libxl_timer_mode_from_string(buf, &b_info->u.hvm.timer_mode)) { fprintf(stderr, "ERROR: invalid value \"%s\" for \"timer_mode\"\n", buf); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 23 19:55:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jul 2012 19:55: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 1StOip-0004nc-0f; Mon, 23 Jul 2012 19:55:15 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StOim-0004nJ-V6 for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:13 +0000 Received: from [85.158.138.51:24082] by server-10.bemta-3.messagelabs.com id 2B/F6-21993-02CAD005; Mon, 23 Jul 2012 19:55:12 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-174.messagelabs.com!1343073310!26633627!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 999 invoked from network); 23 Jul 2012 19:55:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 23 Jul 2012 19:55:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StOij-0001q5-OB for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1StOii-0005fT-Rw for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:09 +0000 Message-Id: Date: Mon, 23 Jul 2012 19:55:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xl: remove stray timer mode debug print X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343045377 -3600 # Node ID bb1b85f2ce981d61b9061f2d25a50583cadb358f # Parent 405c7ea7c5deac768a0ab325d5b4c444382ddc0e xl: remove stray timer mode debug print Reported-by: Andre Przywara Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r 405c7ea7c5de -r bb1b85f2ce98 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Mon Jul 23 13:09:36 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Mon Jul 23 13:09:37 2012 +0100 @@ -836,7 +836,6 @@ static void parse_config_data(const char } b_info->u.hvm.timer_mode = l; } else if (!xlu_cfg_get_string(config, "timer_mode", &buf, 0)) { - fprintf(stderr, "got a timer mode string: \"%s\"\n", buf); if (libxl_timer_mode_from_string(buf, &b_info->u.hvm.timer_mode)) { fprintf(stderr, "ERROR: invalid value \"%s\" for \"timer_mode\"\n", buf); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 23 19:55:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jul 2012 19:55: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 1StOio-0004nX-Uc; Mon, 23 Jul 2012 19:55:14 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StOim-0004nI-OC for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:12 +0000 Received: from [85.158.138.51:24070] by server-3.bemta-3.messagelabs.com id FD/04-08301-F1CAD005; Mon, 23 Jul 2012 19:55:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-174.messagelabs.com!1343073309!24345295!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 1621 invoked from network); 23 Jul 2012 19:55: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; 23 Jul 2012 19:55:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StOii-0001q2-Mv for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1StOii-0005fE-6n for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:08 +0000 Message-Id: Date: Mon, 23 Jul 2012 19:55:07 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: do not blunder on if bootloader fails X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1343045376 -3600 # Node ID 405c7ea7c5deac768a0ab325d5b4c444382ddc0e # Parent 3c426da4788e41cf798f709d9a3fef45e8503169 libxl: do not blunder on if bootloader fails If the bootloader failed, we would call the creation failure callback but _also_ blunder on trying to recreate the domain, due to a missing "return". Signed-off-by: Ian Jackson Reported-by: Roger Pau Monne Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r 3c426da4788e -r 405c7ea7c5de tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Sun Jul 22 16:37:25 2012 +0100 +++ b/tools/libxl/libxl_create.c Mon Jul 23 13:09:36 2012 +0100 @@ -672,7 +672,10 @@ static void domcreate_bootloader_done(li libxl__srm_restore_autogen_callbacks *const callbacks = &dcs->shs.callbacks.restore.a; - if (rc) domcreate_rebuild_done(egc, dcs, rc); + if (rc) { + domcreate_rebuild_done(egc, dcs, rc); + return; + } /* consume bootloader outputs. state->pv_{kernel,ramdisk} have * been initialised by the bootloader already. _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 23 19:55:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jul 2012 19:55: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 1StOio-0004nX-Uc; Mon, 23 Jul 2012 19:55:14 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StOim-0004nI-OC for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:12 +0000 Received: from [85.158.138.51:24070] by server-3.bemta-3.messagelabs.com id FD/04-08301-F1CAD005; Mon, 23 Jul 2012 19:55:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-174.messagelabs.com!1343073309!24345295!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 1621 invoked from network); 23 Jul 2012 19:55: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; 23 Jul 2012 19:55:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StOii-0001q2-Mv for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1StOii-0005fE-6n for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:08 +0000 Message-Id: Date: Mon, 23 Jul 2012 19:55:07 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: do not blunder on if bootloader fails X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1343045376 -3600 # Node ID 405c7ea7c5deac768a0ab325d5b4c444382ddc0e # Parent 3c426da4788e41cf798f709d9a3fef45e8503169 libxl: do not blunder on if bootloader fails If the bootloader failed, we would call the creation failure callback but _also_ blunder on trying to recreate the domain, due to a missing "return". Signed-off-by: Ian Jackson Reported-by: Roger Pau Monne Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r 3c426da4788e -r 405c7ea7c5de tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Sun Jul 22 16:37:25 2012 +0100 +++ b/tools/libxl/libxl_create.c Mon Jul 23 13:09:36 2012 +0100 @@ -672,7 +672,10 @@ static void domcreate_bootloader_done(li libxl__srm_restore_autogen_callbacks *const callbacks = &dcs->shs.callbacks.restore.a; - if (rc) domcreate_rebuild_done(egc, dcs, rc); + if (rc) { + domcreate_rebuild_done(egc, dcs, rc); + return; + } /* consume bootloader outputs. state->pv_{kernel,ramdisk} have * been initialised by the bootloader already. _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 23 19:55:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jul 2012 19:55: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 1StOir-0004nu-3Z; Mon, 23 Jul 2012 19:55:17 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StOip-0004nh-UX for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:16 +0000 Received: from [85.158.143.99:36714] by server-2.bemta-4.messagelabs.com id F8/60-17938-32CAD005; Mon, 23 Jul 2012 19:55:15 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-216.messagelabs.com!1343073313!18528136!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 29044 invoked from network); 23 Jul 2012 19:55:14 -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; 23 Jul 2012 19:55:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StOim-0001qH-W4 for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1StOim-0005gV-RU for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:12 +0000 Message-Id: Date: Mon, 23 Jul 2012 19:55:11 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: move device model creation prototypes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343045381 -3600 # Node ID fe3abe8878067043ab52d70d00f2c404edd1ff3a # Parent 971c3ab60288c004aadda2fdad585d21d9ce8cf1 libxl: move device model creation prototypes Move prototypes regarding device model creation, since they will depend on domain destruction in future patches. This patch is pure code motion. Signed-off-by: Roger Pau Monne Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r 971c3ab60288 -r fe3abe887806 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Mon Jul 23 13:09:40 2012 +0100 +++ b/tools/libxl/libxl_internal.h Mon Jul 23 13:09:41 2012 +0100 @@ -1150,44 +1150,6 @@ static inline int libxl__spawn_inuse(lib _hidden int libxl__spawn_record_pid(libxl__gc*, libxl__spawn_state*, pid_t innerchild); -/*----- device model creation -----*/ - -/* First layer; wraps libxl__spawn_spawn. */ - -typedef struct libxl__dm_spawn_state libxl__dm_spawn_state; - -typedef void libxl__dm_spawn_cb(libxl__egc *egc, libxl__dm_spawn_state*, - int rc /* if !0, error was logged */); - -struct libxl__dm_spawn_state { - /* mixed - spawn.ao must be initialised by user; rest is private: */ - libxl__spawn_state spawn; - /* filled in by user, must remain valid: */ - uint32_t guest_domid; /* domain being served */ - libxl_domain_config *guest_config; - libxl__domain_build_state *build_state; /* relates to guest_domid */ - libxl__dm_spawn_cb *callback; -}; - -_hidden void libxl__spawn_local_dm(libxl__egc *egc, libxl__dm_spawn_state*); - -/* Stubdom device models. */ - -typedef struct { - /* Mixed - user must fill in public parts EXCEPT callback, - * which may be undefined on entry. (See above for details) */ - libxl__dm_spawn_state dm; /* the stub domain device model */ - /* filled in by user, must remain valid: */ - libxl__dm_spawn_cb *callback; /* called as callback(,&sdss->dm,) */ - /* private to libxl__spawn_stub_dm: */ - libxl_domain_config dm_config; - libxl__domain_build_state dm_state; - libxl__dm_spawn_state pvqemu; -} libxl__stub_dm_spawn_state; - -_hidden void libxl__spawn_stub_dm(libxl__egc *egc, libxl__stub_dm_spawn_state*); - - /* * libxl__wait_for_offspring - Wait for child state * gc: allocation pool @@ -2136,6 +2098,43 @@ struct libxl__ao_device { _hidden void libxl__initiate_device_remove(libxl__egc *egc, libxl__ao_device *aodev); +/*----- device model creation -----*/ + +/* First layer; wraps libxl__spawn_spawn. */ + +typedef struct libxl__dm_spawn_state libxl__dm_spawn_state; + +typedef void libxl__dm_spawn_cb(libxl__egc *egc, libxl__dm_spawn_state*, + int rc /* if !0, error was logged */); + +struct libxl__dm_spawn_state { + /* mixed - spawn.ao must be initialised by user; rest is private: */ + libxl__spawn_state spawn; + /* filled in by user, must remain valid: */ + uint32_t guest_domid; /* domain being served */ + libxl_domain_config *guest_config; + libxl__domain_build_state *build_state; /* relates to guest_domid */ + libxl__dm_spawn_cb *callback; +}; + +_hidden void libxl__spawn_local_dm(libxl__egc *egc, libxl__dm_spawn_state*); + +/* Stubdom device models. */ + +typedef struct { + /* Mixed - user must fill in public parts EXCEPT callback, + * which may be undefined on entry. (See above for details) */ + libxl__dm_spawn_state dm; /* the stub domain device model */ + /* filled in by user, must remain valid: */ + libxl__dm_spawn_cb *callback; /* called as callback(,&sdss->dm,) */ + /* private to libxl__spawn_stub_dm: */ + libxl_domain_config dm_config; + libxl__domain_build_state dm_state; + libxl__dm_spawn_state pvqemu; +} libxl__stub_dm_spawn_state; + +_hidden void libxl__spawn_stub_dm(libxl__egc *egc, libxl__stub_dm_spawn_state*); + /*----- Domain creation -----*/ typedef struct libxl__domain_create_state libxl__domain_create_state; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 23 19:55:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jul 2012 19:55: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 1StOir-0004nu-3Z; Mon, 23 Jul 2012 19:55:17 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StOip-0004nh-UX for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:16 +0000 Received: from [85.158.143.99:36714] by server-2.bemta-4.messagelabs.com id F8/60-17938-32CAD005; Mon, 23 Jul 2012 19:55:15 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-216.messagelabs.com!1343073313!18528136!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 29044 invoked from network); 23 Jul 2012 19:55:14 -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; 23 Jul 2012 19:55:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StOim-0001qH-W4 for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1StOim-0005gV-RU for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:12 +0000 Message-Id: Date: Mon, 23 Jul 2012 19:55:11 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: move device model creation prototypes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343045381 -3600 # Node ID fe3abe8878067043ab52d70d00f2c404edd1ff3a # Parent 971c3ab60288c004aadda2fdad585d21d9ce8cf1 libxl: move device model creation prototypes Move prototypes regarding device model creation, since they will depend on domain destruction in future patches. This patch is pure code motion. Signed-off-by: Roger Pau Monne Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r 971c3ab60288 -r fe3abe887806 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Mon Jul 23 13:09:40 2012 +0100 +++ b/tools/libxl/libxl_internal.h Mon Jul 23 13:09:41 2012 +0100 @@ -1150,44 +1150,6 @@ static inline int libxl__spawn_inuse(lib _hidden int libxl__spawn_record_pid(libxl__gc*, libxl__spawn_state*, pid_t innerchild); -/*----- device model creation -----*/ - -/* First layer; wraps libxl__spawn_spawn. */ - -typedef struct libxl__dm_spawn_state libxl__dm_spawn_state; - -typedef void libxl__dm_spawn_cb(libxl__egc *egc, libxl__dm_spawn_state*, - int rc /* if !0, error was logged */); - -struct libxl__dm_spawn_state { - /* mixed - spawn.ao must be initialised by user; rest is private: */ - libxl__spawn_state spawn; - /* filled in by user, must remain valid: */ - uint32_t guest_domid; /* domain being served */ - libxl_domain_config *guest_config; - libxl__domain_build_state *build_state; /* relates to guest_domid */ - libxl__dm_spawn_cb *callback; -}; - -_hidden void libxl__spawn_local_dm(libxl__egc *egc, libxl__dm_spawn_state*); - -/* Stubdom device models. */ - -typedef struct { - /* Mixed - user must fill in public parts EXCEPT callback, - * which may be undefined on entry. (See above for details) */ - libxl__dm_spawn_state dm; /* the stub domain device model */ - /* filled in by user, must remain valid: */ - libxl__dm_spawn_cb *callback; /* called as callback(,&sdss->dm,) */ - /* private to libxl__spawn_stub_dm: */ - libxl_domain_config dm_config; - libxl__domain_build_state dm_state; - libxl__dm_spawn_state pvqemu; -} libxl__stub_dm_spawn_state; - -_hidden void libxl__spawn_stub_dm(libxl__egc *egc, libxl__stub_dm_spawn_state*); - - /* * libxl__wait_for_offspring - Wait for child state * gc: allocation pool @@ -2136,6 +2098,43 @@ struct libxl__ao_device { _hidden void libxl__initiate_device_remove(libxl__egc *egc, libxl__ao_device *aodev); +/*----- device model creation -----*/ + +/* First layer; wraps libxl__spawn_spawn. */ + +typedef struct libxl__dm_spawn_state libxl__dm_spawn_state; + +typedef void libxl__dm_spawn_cb(libxl__egc *egc, libxl__dm_spawn_state*, + int rc /* if !0, error was logged */); + +struct libxl__dm_spawn_state { + /* mixed - spawn.ao must be initialised by user; rest is private: */ + libxl__spawn_state spawn; + /* filled in by user, must remain valid: */ + uint32_t guest_domid; /* domain being served */ + libxl_domain_config *guest_config; + libxl__domain_build_state *build_state; /* relates to guest_domid */ + libxl__dm_spawn_cb *callback; +}; + +_hidden void libxl__spawn_local_dm(libxl__egc *egc, libxl__dm_spawn_state*); + +/* Stubdom device models. */ + +typedef struct { + /* Mixed - user must fill in public parts EXCEPT callback, + * which may be undefined on entry. (See above for details) */ + libxl__dm_spawn_state dm; /* the stub domain device model */ + /* filled in by user, must remain valid: */ + libxl__dm_spawn_cb *callback; /* called as callback(,&sdss->dm,) */ + /* private to libxl__spawn_stub_dm: */ + libxl_domain_config dm_config; + libxl__domain_build_state dm_state; + libxl__dm_spawn_state pvqemu; +} libxl__stub_dm_spawn_state; + +_hidden void libxl__spawn_stub_dm(libxl__egc *egc, libxl__stub_dm_spawn_state*); + /*----- Domain creation -----*/ typedef struct libxl__domain_create_state libxl__domain_create_state; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 23 19:55:22 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jul 2012 19:55: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 1StOiu-0004pH-EK; Mon, 23 Jul 2012 19:55:20 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StOit-0004nh-4X for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:19 +0000 Received: from [85.158.143.35:36549] by server-2.bemta-4.messagelabs.com id EF/60-17938-62CAD005; Mon, 23 Jul 2012 19:55:18 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-21.messagelabs.com!1343073314!5696170!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 23537 invoked from network); 23 Jul 2012 19:55:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Jul 2012 19:55:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StOio-0001qN-6P for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1StOio-0005h1-4j for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:14 +0000 Message-Id: Date: Mon, 23 Jul 2012 19:55:13 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: move bootloader data strucutres and prototypes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343045382 -3600 # Node ID 4e0221514a57e1530dcae4b403d44b72cfbc193d # Parent b01fe9f834a2148a7d99fbd7a71fbd85b595e14d libxl: move bootloader data strucutres and prototypes Move bootloader and related data after all the device stuff, since libxl__bootloader_state will depend on libxl__ao_device (to perform the local attach of a device). This is pure code motion. Signed-off-by: Roger Pau Monne Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r b01fe9f834a2 -r 4e0221514a57 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Mon Jul 23 13:09:42 2012 +0100 +++ b/tools/libxl/libxl_internal.h Mon Jul 23 13:09:42 2012 +0100 @@ -1747,227 +1747,6 @@ _hidden const char *libxl__xen_script_di _hidden const char *libxl__lock_dir_path(void); _hidden const char *libxl__run_dir_path(void); -/*----- datacopier: copies data from one fd to another -----*/ - -typedef struct libxl__datacopier_state libxl__datacopier_state; -typedef struct libxl__datacopier_buf libxl__datacopier_buf; - -/* onwrite==1 means failure happened when writing, logged, errnoval is valid - * onwrite==0 means failure happened when reading - * errnoval==0 means we got eof and all data was written - * errnoval!=0 means we had a read error, logged - * onwrite==-1 means some other internal failure, errnoval not valid, logged - * in all cases copier is killed before calling this callback */ -typedef void libxl__datacopier_callback(libxl__egc *egc, - libxl__datacopier_state *dc, int onwrite, int errnoval); - -struct libxl__datacopier_buf { - /* private to datacopier */ - LIBXL_TAILQ_ENTRY(libxl__datacopier_buf) entry; - int used; - char buf[1000]; -}; - -struct libxl__datacopier_state { - /* caller must fill these in, and they must all remain valid */ - libxl__ao *ao; - int readfd, writefd; - ssize_t maxsz; - const char *copywhat, *readwhat, *writewhat; /* for error msgs */ - FILE *log; /* gets a copy of everything */ - libxl__datacopier_callback *callback; - /* remaining fields are private to datacopier */ - libxl__ev_fd toread, towrite; - ssize_t used; - LIBXL_TAILQ_HEAD(libxl__datacopier_bufs, libxl__datacopier_buf) bufs; -}; - -_hidden void libxl__datacopier_init(libxl__datacopier_state *dc); -_hidden void libxl__datacopier_kill(libxl__datacopier_state *dc); -_hidden int libxl__datacopier_start(libxl__datacopier_state *dc); - -/* Inserts literal data into the output stream. The data is copied. - * May safely be used only immediately after libxl__datacopier_start - * (before the ctx is unlocked). But may be called multiple times. - * NB exceeding maxsz will fail an assertion! */ -_hidden void libxl__datacopier_prefixdata(libxl__egc*, libxl__datacopier_state*, - const void *data, size_t len); - -/*----- Save/restore helper (used by creation and suspend) -----*/ - -typedef struct libxl__srm_save_callbacks { - libxl__srm_save_autogen_callbacks a; - int (*toolstack_save)(uint32_t domid, uint8_t **buf, - uint32_t *len, void *data); -} libxl__srm_save_callbacks; - -typedef struct libxl__srm_restore_callbacks { - libxl__srm_restore_autogen_callbacks a; -} libxl__srm_restore_callbacks; - -/* a pointer to this struct is also passed as "user" to the - * save callout helper callback functions */ -typedef struct libxl__save_helper_state { - /* public, caller of run_helper initialises */ - libxl__ao *ao; - uint32_t domid; - union { - libxl__srm_save_callbacks save; - libxl__srm_restore_callbacks restore; - } callbacks; - int (*recv_callback)(const unsigned char *msg, uint32_t len, void *user); - void (*completion_callback)(libxl__egc *egc, void *caller_state, - int rc, int retval, int errnoval); - void *caller_state; - int need_results; /* set to 0 or 1 by caller of run_helper; - * if set to 1 then the ultimate caller's - * results function must set it to 0 */ - /* private */ - int rc; - int completed; /* retval/errnoval valid iff completed */ - int retval, errnoval; /* from xc_domain_save / xc_domain_restore */ - libxl__carefd *pipes[2]; /* 0 = helper's stdin, 1 = helper's stdout */ - libxl__ev_fd readable; - libxl__ev_child child; - const char *stdin_what, *stdout_what; - FILE *toolstack_data_file; - - libxl__egc *egc; /* valid only for duration of each event callback; - * is here in this struct for the benefit of the - * marshalling and xc callback functions */ -} libxl__save_helper_state; - - -/*----- Domain suspend (save) state structure -----*/ - -typedef struct libxl__domain_suspend_state libxl__domain_suspend_state; - -typedef void libxl__domain_suspend_cb(libxl__egc*, - libxl__domain_suspend_state*, int rc); -typedef void libxl__save_device_model_cb(libxl__egc*, - libxl__domain_suspend_state*, int rc); - -typedef struct libxl__logdirty_switch { - const char *cmd; - const char *cmd_path; - const char *ret_path; - libxl__ev_xswatch watch; - libxl__ev_time timeout; -} libxl__logdirty_switch; - -struct libxl__domain_suspend_state { - /* set by caller of libxl__domain_suspend */ - libxl__ao *ao; - libxl__domain_suspend_cb *callback; - - uint32_t domid; - int fd; - libxl_domain_type type; - int live; - int debug; - const libxl_domain_remus_info *remus; - /* private */ - xc_evtchn *xce; /* event channel handle */ - int suspend_eventchn; - int hvm; - int xcflags; - int guest_responded; - const char *dm_savefile; - int interval; /* checkpoint interval (for Remus) */ - libxl__save_helper_state shs; - libxl__logdirty_switch logdirty; - /* private for libxl__domain_save_device_model */ - libxl__save_device_model_cb *save_dm_callback; - libxl__datacopier_state save_dm_datacopier; -}; - - -/*----- openpty -----*/ - -/* - * opens count (>0) ptys like count calls to openpty, and then - * calls back. On entry, all op[].master and op[].slave must be - * 0. On callback, either rc==0 and master and slave are non-0, - * or rc is a libxl error and they are both 0. If libxl__openpty - * returns non-0 no callback will happen and everything is left - * cleaned up. - */ - -typedef struct libxl__openpty_state libxl__openpty_state; -typedef struct libxl__openpty_result libxl__openpty_result; -typedef void libxl__openpty_callback(libxl__egc *egc, libxl__openpty_state *op); - -struct libxl__openpty_state { - /* caller must fill these in, and they must all remain valid */ - libxl__ao *ao; - libxl__openpty_callback *callback; - int count; - libxl__openpty_result *results; /* actual size is count, out parameter */ - /* public, result, caller may only read in callback */ - int rc; - /* private for implementation */ - libxl__ev_child child; -}; - -struct libxl__openpty_result { - libxl__carefd *master, *slave; -}; - -int libxl__openptys(libxl__openpty_state *op, - struct termios *termp, - struct winsize *winp); - - -/*----- bootloader -----*/ - -typedef struct libxl__bootloader_state libxl__bootloader_state; -typedef void libxl__run_bootloader_callback(libxl__egc*, - libxl__bootloader_state*, int rc); -typedef void libxl__bootloader_console_callback(libxl__egc*, - libxl__bootloader_state*); - -struct libxl__bootloader_state { - /* caller must fill these in, and they must all remain valid */ - libxl__ao *ao; - libxl__run_bootloader_callback *callback; - libxl__bootloader_console_callback *console_available; - const libxl_domain_build_info *info; - libxl_device_disk *disk; - /* Should be zeroed by caller on entry. Will be filled in by - * bootloader machinery; represents the local attachment of the - * disk for the benefit of the bootloader. Must be detached by - * the caller using libxl__device_disk_local_detach, but only - * after the domain's kernel and initramfs have been loaded into - * memory and the file references disposed of. */ - libxl_device_disk localdisk; - uint32_t domid; - /* outputs: - * - caller must initialise kernel and ramdisk to point to file - * references, these will be updated and mapped; - * - caller must initialise cmdline to NULL, it will be updated with a - * string allocated from the gc; - */ - libxl__file_reference *kernel, *ramdisk; - const char *cmdline; - /* private to libxl__run_bootloader */ - char *outputpath, *outputdir, *logfile; - char *diskpath; /* not from gc, represents actually attached disk */ - libxl__openpty_state openpty; - libxl__openpty_result ptys[2]; /* [0] is for bootloader */ - libxl__ev_child child; - libxl__domaindeathcheck deathcheck; - int nargs, argsspace; - const char **args; - libxl__datacopier_state keystrokes, display; - int rc; -}; - -_hidden void libxl__bootloader_init(libxl__bootloader_state *bl); - -/* Will definitely call st->callback, perhaps reentrantly. - * If callback is passed rc==0, will have updated st->info appropriately */ -_hidden void libxl__bootloader_run(libxl__egc*, libxl__bootloader_state *st); - /*----- device addition/removal -----*/ /* Action to perform (either connect or disconnect) */ @@ -2129,6 +1908,227 @@ struct libxl__ao_devices { _hidden void libxl__initiate_device_remove(libxl__egc *egc, libxl__ao_device *aodev); +/*----- datacopier: copies data from one fd to another -----*/ + +typedef struct libxl__datacopier_state libxl__datacopier_state; +typedef struct libxl__datacopier_buf libxl__datacopier_buf; + +/* onwrite==1 means failure happened when writing, logged, errnoval is valid + * onwrite==0 means failure happened when reading + * errnoval==0 means we got eof and all data was written + * errnoval!=0 means we had a read error, logged + * onwrite==-1 means some other internal failure, errnoval not valid, logged + * in all cases copier is killed before calling this callback */ +typedef void libxl__datacopier_callback(libxl__egc *egc, + libxl__datacopier_state *dc, int onwrite, int errnoval); + +struct libxl__datacopier_buf { + /* private to datacopier */ + LIBXL_TAILQ_ENTRY(libxl__datacopier_buf) entry; + int used; + char buf[1000]; +}; + +struct libxl__datacopier_state { + /* caller must fill these in, and they must all remain valid */ + libxl__ao *ao; + int readfd, writefd; + ssize_t maxsz; + const char *copywhat, *readwhat, *writewhat; /* for error msgs */ + FILE *log; /* gets a copy of everything */ + libxl__datacopier_callback *callback; + /* remaining fields are private to datacopier */ + libxl__ev_fd toread, towrite; + ssize_t used; + LIBXL_TAILQ_HEAD(libxl__datacopier_bufs, libxl__datacopier_buf) bufs; +}; + +_hidden void libxl__datacopier_init(libxl__datacopier_state *dc); +_hidden void libxl__datacopier_kill(libxl__datacopier_state *dc); +_hidden int libxl__datacopier_start(libxl__datacopier_state *dc); + +/* Inserts literal data into the output stream. The data is copied. + * May safely be used only immediately after libxl__datacopier_start + * (before the ctx is unlocked). But may be called multiple times. + * NB exceeding maxsz will fail an assertion! */ +_hidden void libxl__datacopier_prefixdata(libxl__egc*, libxl__datacopier_state*, + const void *data, size_t len); + +/*----- Save/restore helper (used by creation and suspend) -----*/ + +typedef struct libxl__srm_save_callbacks { + libxl__srm_save_autogen_callbacks a; + int (*toolstack_save)(uint32_t domid, uint8_t **buf, + uint32_t *len, void *data); +} libxl__srm_save_callbacks; + +typedef struct libxl__srm_restore_callbacks { + libxl__srm_restore_autogen_callbacks a; +} libxl__srm_restore_callbacks; + +/* a pointer to this struct is also passed as "user" to the + * save callout helper callback functions */ +typedef struct libxl__save_helper_state { + /* public, caller of run_helper initialises */ + libxl__ao *ao; + uint32_t domid; + union { + libxl__srm_save_callbacks save; + libxl__srm_restore_callbacks restore; + } callbacks; + int (*recv_callback)(const unsigned char *msg, uint32_t len, void *user); + void (*completion_callback)(libxl__egc *egc, void *caller_state, + int rc, int retval, int errnoval); + void *caller_state; + int need_results; /* set to 0 or 1 by caller of run_helper; + * if set to 1 then the ultimate caller's + * results function must set it to 0 */ + /* private */ + int rc; + int completed; /* retval/errnoval valid iff completed */ + int retval, errnoval; /* from xc_domain_save / xc_domain_restore */ + libxl__carefd *pipes[2]; /* 0 = helper's stdin, 1 = helper's stdout */ + libxl__ev_fd readable; + libxl__ev_child child; + const char *stdin_what, *stdout_what; + FILE *toolstack_data_file; + + libxl__egc *egc; /* valid only for duration of each event callback; + * is here in this struct for the benefit of the + * marshalling and xc callback functions */ +} libxl__save_helper_state; + + +/*----- Domain suspend (save) state structure -----*/ + +typedef struct libxl__domain_suspend_state libxl__domain_suspend_state; + +typedef void libxl__domain_suspend_cb(libxl__egc*, + libxl__domain_suspend_state*, int rc); +typedef void libxl__save_device_model_cb(libxl__egc*, + libxl__domain_suspend_state*, int rc); + +typedef struct libxl__logdirty_switch { + const char *cmd; + const char *cmd_path; + const char *ret_path; + libxl__ev_xswatch watch; + libxl__ev_time timeout; +} libxl__logdirty_switch; + +struct libxl__domain_suspend_state { + /* set by caller of libxl__domain_suspend */ + libxl__ao *ao; + libxl__domain_suspend_cb *callback; + + uint32_t domid; + int fd; + libxl_domain_type type; + int live; + int debug; + const libxl_domain_remus_info *remus; + /* private */ + xc_evtchn *xce; /* event channel handle */ + int suspend_eventchn; + int hvm; + int xcflags; + int guest_responded; + const char *dm_savefile; + int interval; /* checkpoint interval (for Remus) */ + libxl__save_helper_state shs; + libxl__logdirty_switch logdirty; + /* private for libxl__domain_save_device_model */ + libxl__save_device_model_cb *save_dm_callback; + libxl__datacopier_state save_dm_datacopier; +}; + + +/*----- openpty -----*/ + +/* + * opens count (>0) ptys like count calls to openpty, and then + * calls back. On entry, all op[].master and op[].slave must be + * 0. On callback, either rc==0 and master and slave are non-0, + * or rc is a libxl error and they are both 0. If libxl__openpty + * returns non-0 no callback will happen and everything is left + * cleaned up. + */ + +typedef struct libxl__openpty_state libxl__openpty_state; +typedef struct libxl__openpty_result libxl__openpty_result; +typedef void libxl__openpty_callback(libxl__egc *egc, libxl__openpty_state *op); + +struct libxl__openpty_state { + /* caller must fill these in, and they must all remain valid */ + libxl__ao *ao; + libxl__openpty_callback *callback; + int count; + libxl__openpty_result *results; /* actual size is count, out parameter */ + /* public, result, caller may only read in callback */ + int rc; + /* private for implementation */ + libxl__ev_child child; +}; + +struct libxl__openpty_result { + libxl__carefd *master, *slave; +}; + +int libxl__openptys(libxl__openpty_state *op, + struct termios *termp, + struct winsize *winp); + + +/*----- bootloader -----*/ + +typedef struct libxl__bootloader_state libxl__bootloader_state; +typedef void libxl__run_bootloader_callback(libxl__egc*, + libxl__bootloader_state*, int rc); +typedef void libxl__bootloader_console_callback(libxl__egc*, + libxl__bootloader_state*); + +struct libxl__bootloader_state { + /* caller must fill these in, and they must all remain valid */ + libxl__ao *ao; + libxl__run_bootloader_callback *callback; + libxl__bootloader_console_callback *console_available; + const libxl_domain_build_info *info; + libxl_device_disk *disk; + /* Should be zeroed by caller on entry. Will be filled in by + * bootloader machinery; represents the local attachment of the + * disk for the benefit of the bootloader. Must be detached by + * the caller using libxl__device_disk_local_detach, but only + * after the domain's kernel and initramfs have been loaded into + * memory and the file references disposed of. */ + libxl_device_disk localdisk; + uint32_t domid; + /* outputs: + * - caller must initialise kernel and ramdisk to point to file + * references, these will be updated and mapped; + * - caller must initialise cmdline to NULL, it will be updated with a + * string allocated from the gc; + */ + libxl__file_reference *kernel, *ramdisk; + const char *cmdline; + /* private to libxl__run_bootloader */ + char *outputpath, *outputdir, *logfile; + char *diskpath; /* not from gc, represents actually attached disk */ + libxl__openpty_state openpty; + libxl__openpty_result ptys[2]; /* [0] is for bootloader */ + libxl__ev_child child; + libxl__domaindeathcheck deathcheck; + int nargs, argsspace; + const char **args; + libxl__datacopier_state keystrokes, display; + int rc; +}; + +_hidden void libxl__bootloader_init(libxl__bootloader_state *bl); + +/* Will definitely call st->callback, perhaps reentrantly. + * If callback is passed rc==0, will have updated st->info appropriately */ +_hidden void libxl__bootloader_run(libxl__egc*, libxl__bootloader_state *st); + /*----- Domain destruction -----*/ /* Domain destruction has been split into two functions: _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 23 19:55:22 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jul 2012 19:55: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 1StOit-0004oQ-BY; Mon, 23 Jul 2012 19:55:19 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StOis-0004nh-6N for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:18 +0000 Received: from [85.158.143.99:36804] by server-2.bemta-4.messagelabs.com id EE/60-17938-52CAD005; Mon, 23 Jul 2012 19:55:17 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-216.messagelabs.com!1343073315!28320921!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 6443 invoked from network); 23 Jul 2012 19:55:16 -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; 23 Jul 2012 19:55:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StOio-0001qQ-R5 for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1StOio-0005hG-NR for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:14 +0000 Message-Id: Date: Mon, 23 Jul 2012 19:55:14 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: rename stubdomain when renaming domain. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343045383 -3600 # Node ID 2b8b5c0d3a174ca13a29c5868a45cefe13379243 # Parent 4e0221514a57e1530dcae4b403d44b72cfbc193d libxl: rename stubdomain when renaming domain. Otherwise after a localhost migrate of an HVM domain with a stubdomain we end up with domains called "FOO" and "FOO--incoming-dm". This because we initially create the domains as "FOO--incoming" and then rename to "FOO" inorder to maintain the uniqueness of domain names on a host. In this state a second attempt to migrate will fail upon attempting to create a new domain named "FOO--incoming-dm" Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r 4e0221514a57 -r 2b8b5c0d3a17 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Mon Jul 23 13:09:42 2012 +0100 +++ b/tools/libxl/libxl.c Mon Jul 23 13:09:43 2012 +0100 @@ -276,6 +276,8 @@ int libxl__domain_rename(libxl__gc *gc, char *got_old_name; unsigned int got_old_len; xs_transaction_t our_trans = 0; + uint32_t stub_dm_domid; + const char *stub_dm_old_name = NULL, *stub_dm_new_name = NULL; int rc; dom_path = libxl__xs_get_dompath(gc, domid); @@ -284,6 +286,12 @@ int libxl__domain_rename(libxl__gc *gc, name_path= libxl__sprintf(gc, "%s/name", dom_path); if (!name_path) goto x_nomem; + stub_dm_domid = libxl_get_stubdom_id(CTX, domid); + if (stub_dm_domid) { + stub_dm_old_name = libxl__stub_dm_name(gc, old_name); + stub_dm_new_name = libxl__stub_dm_name(gc, new_name); + } + retry_transaction: if (!trans) { trans = our_trans = xs_transaction_start(ctx->xsh); @@ -341,6 +349,17 @@ int libxl__domain_rename(libxl__gc *gc, goto x_fail; } + if (stub_dm_domid) { + rc = libxl__domain_rename(gc, stub_dm_domid, + stub_dm_old_name, + stub_dm_new_name, + trans); + if (rc) { + LOGE(ERROR, "unable to rename stub-domain"); + goto x_rc; + } + } + if (our_trans) { if (!xs_transaction_end(ctx->xsh, our_trans, 0)) { trans = our_trans = 0; diff -r 4e0221514a57 -r 2b8b5c0d3a17 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Mon Jul 23 13:09:42 2012 +0100 +++ b/tools/libxl/libxl_dm.c Mon Jul 23 13:09:43 2012 +0100 @@ -698,6 +698,11 @@ static void spaw_stubdom_pvqemu_destroy_ libxl__destroy_domid_state *dis, int rc); +char *libxl__stub_dm_name(libxl__gc *gc, const char *guest_name) +{ + return libxl__sprintf(gc, "%s-dm", guest_name); +} + void libxl__spawn_stub_dm(libxl__egc *egc, libxl__stub_dm_spawn_state *sdss) { STATE_AO_GC(sdss->dm.spawn.ao); @@ -727,7 +732,7 @@ void libxl__spawn_stub_dm(libxl__egc *eg libxl_domain_create_info_init(&dm_config->c_info); dm_config->c_info.type = LIBXL_DOMAIN_TYPE_PV; - dm_config->c_info.name = libxl__sprintf(gc, "%s-dm", + dm_config->c_info.name = libxl__stub_dm_name(gc, libxl__domid_to_name(gc, guest_domid)); dm_config->c_info.ssidref = guest_config->b_info.device_model_ssidref; diff -r 4e0221514a57 -r 2b8b5c0d3a17 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Mon Jul 23 13:09:42 2012 +0100 +++ b/tools/libxl/libxl_internal.h Mon Jul 23 13:09:43 2012 +0100 @@ -2247,6 +2247,8 @@ typedef struct { _hidden void libxl__spawn_stub_dm(libxl__egc *egc, libxl__stub_dm_spawn_state*); +_hidden char *libxl__stub_dm_name(libxl__gc *gc, const char * guest_name); + /*----- Domain creation -----*/ typedef struct libxl__domain_create_state libxl__domain_create_state; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 23 19:55:22 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jul 2012 19:55: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 1StOiu-0004pH-EK; Mon, 23 Jul 2012 19:55:20 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StOit-0004nh-4X for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:19 +0000 Received: from [85.158.143.35:36549] by server-2.bemta-4.messagelabs.com id EF/60-17938-62CAD005; Mon, 23 Jul 2012 19:55:18 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-21.messagelabs.com!1343073314!5696170!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 23537 invoked from network); 23 Jul 2012 19:55:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Jul 2012 19:55:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StOio-0001qN-6P for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1StOio-0005h1-4j for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:14 +0000 Message-Id: Date: Mon, 23 Jul 2012 19:55:13 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: move bootloader data strucutres and prototypes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343045382 -3600 # Node ID 4e0221514a57e1530dcae4b403d44b72cfbc193d # Parent b01fe9f834a2148a7d99fbd7a71fbd85b595e14d libxl: move bootloader data strucutres and prototypes Move bootloader and related data after all the device stuff, since libxl__bootloader_state will depend on libxl__ao_device (to perform the local attach of a device). This is pure code motion. Signed-off-by: Roger Pau Monne Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r b01fe9f834a2 -r 4e0221514a57 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Mon Jul 23 13:09:42 2012 +0100 +++ b/tools/libxl/libxl_internal.h Mon Jul 23 13:09:42 2012 +0100 @@ -1747,227 +1747,6 @@ _hidden const char *libxl__xen_script_di _hidden const char *libxl__lock_dir_path(void); _hidden const char *libxl__run_dir_path(void); -/*----- datacopier: copies data from one fd to another -----*/ - -typedef struct libxl__datacopier_state libxl__datacopier_state; -typedef struct libxl__datacopier_buf libxl__datacopier_buf; - -/* onwrite==1 means failure happened when writing, logged, errnoval is valid - * onwrite==0 means failure happened when reading - * errnoval==0 means we got eof and all data was written - * errnoval!=0 means we had a read error, logged - * onwrite==-1 means some other internal failure, errnoval not valid, logged - * in all cases copier is killed before calling this callback */ -typedef void libxl__datacopier_callback(libxl__egc *egc, - libxl__datacopier_state *dc, int onwrite, int errnoval); - -struct libxl__datacopier_buf { - /* private to datacopier */ - LIBXL_TAILQ_ENTRY(libxl__datacopier_buf) entry; - int used; - char buf[1000]; -}; - -struct libxl__datacopier_state { - /* caller must fill these in, and they must all remain valid */ - libxl__ao *ao; - int readfd, writefd; - ssize_t maxsz; - const char *copywhat, *readwhat, *writewhat; /* for error msgs */ - FILE *log; /* gets a copy of everything */ - libxl__datacopier_callback *callback; - /* remaining fields are private to datacopier */ - libxl__ev_fd toread, towrite; - ssize_t used; - LIBXL_TAILQ_HEAD(libxl__datacopier_bufs, libxl__datacopier_buf) bufs; -}; - -_hidden void libxl__datacopier_init(libxl__datacopier_state *dc); -_hidden void libxl__datacopier_kill(libxl__datacopier_state *dc); -_hidden int libxl__datacopier_start(libxl__datacopier_state *dc); - -/* Inserts literal data into the output stream. The data is copied. - * May safely be used only immediately after libxl__datacopier_start - * (before the ctx is unlocked). But may be called multiple times. - * NB exceeding maxsz will fail an assertion! */ -_hidden void libxl__datacopier_prefixdata(libxl__egc*, libxl__datacopier_state*, - const void *data, size_t len); - -/*----- Save/restore helper (used by creation and suspend) -----*/ - -typedef struct libxl__srm_save_callbacks { - libxl__srm_save_autogen_callbacks a; - int (*toolstack_save)(uint32_t domid, uint8_t **buf, - uint32_t *len, void *data); -} libxl__srm_save_callbacks; - -typedef struct libxl__srm_restore_callbacks { - libxl__srm_restore_autogen_callbacks a; -} libxl__srm_restore_callbacks; - -/* a pointer to this struct is also passed as "user" to the - * save callout helper callback functions */ -typedef struct libxl__save_helper_state { - /* public, caller of run_helper initialises */ - libxl__ao *ao; - uint32_t domid; - union { - libxl__srm_save_callbacks save; - libxl__srm_restore_callbacks restore; - } callbacks; - int (*recv_callback)(const unsigned char *msg, uint32_t len, void *user); - void (*completion_callback)(libxl__egc *egc, void *caller_state, - int rc, int retval, int errnoval); - void *caller_state; - int need_results; /* set to 0 or 1 by caller of run_helper; - * if set to 1 then the ultimate caller's - * results function must set it to 0 */ - /* private */ - int rc; - int completed; /* retval/errnoval valid iff completed */ - int retval, errnoval; /* from xc_domain_save / xc_domain_restore */ - libxl__carefd *pipes[2]; /* 0 = helper's stdin, 1 = helper's stdout */ - libxl__ev_fd readable; - libxl__ev_child child; - const char *stdin_what, *stdout_what; - FILE *toolstack_data_file; - - libxl__egc *egc; /* valid only for duration of each event callback; - * is here in this struct for the benefit of the - * marshalling and xc callback functions */ -} libxl__save_helper_state; - - -/*----- Domain suspend (save) state structure -----*/ - -typedef struct libxl__domain_suspend_state libxl__domain_suspend_state; - -typedef void libxl__domain_suspend_cb(libxl__egc*, - libxl__domain_suspend_state*, int rc); -typedef void libxl__save_device_model_cb(libxl__egc*, - libxl__domain_suspend_state*, int rc); - -typedef struct libxl__logdirty_switch { - const char *cmd; - const char *cmd_path; - const char *ret_path; - libxl__ev_xswatch watch; - libxl__ev_time timeout; -} libxl__logdirty_switch; - -struct libxl__domain_suspend_state { - /* set by caller of libxl__domain_suspend */ - libxl__ao *ao; - libxl__domain_suspend_cb *callback; - - uint32_t domid; - int fd; - libxl_domain_type type; - int live; - int debug; - const libxl_domain_remus_info *remus; - /* private */ - xc_evtchn *xce; /* event channel handle */ - int suspend_eventchn; - int hvm; - int xcflags; - int guest_responded; - const char *dm_savefile; - int interval; /* checkpoint interval (for Remus) */ - libxl__save_helper_state shs; - libxl__logdirty_switch logdirty; - /* private for libxl__domain_save_device_model */ - libxl__save_device_model_cb *save_dm_callback; - libxl__datacopier_state save_dm_datacopier; -}; - - -/*----- openpty -----*/ - -/* - * opens count (>0) ptys like count calls to openpty, and then - * calls back. On entry, all op[].master and op[].slave must be - * 0. On callback, either rc==0 and master and slave are non-0, - * or rc is a libxl error and they are both 0. If libxl__openpty - * returns non-0 no callback will happen and everything is left - * cleaned up. - */ - -typedef struct libxl__openpty_state libxl__openpty_state; -typedef struct libxl__openpty_result libxl__openpty_result; -typedef void libxl__openpty_callback(libxl__egc *egc, libxl__openpty_state *op); - -struct libxl__openpty_state { - /* caller must fill these in, and they must all remain valid */ - libxl__ao *ao; - libxl__openpty_callback *callback; - int count; - libxl__openpty_result *results; /* actual size is count, out parameter */ - /* public, result, caller may only read in callback */ - int rc; - /* private for implementation */ - libxl__ev_child child; -}; - -struct libxl__openpty_result { - libxl__carefd *master, *slave; -}; - -int libxl__openptys(libxl__openpty_state *op, - struct termios *termp, - struct winsize *winp); - - -/*----- bootloader -----*/ - -typedef struct libxl__bootloader_state libxl__bootloader_state; -typedef void libxl__run_bootloader_callback(libxl__egc*, - libxl__bootloader_state*, int rc); -typedef void libxl__bootloader_console_callback(libxl__egc*, - libxl__bootloader_state*); - -struct libxl__bootloader_state { - /* caller must fill these in, and they must all remain valid */ - libxl__ao *ao; - libxl__run_bootloader_callback *callback; - libxl__bootloader_console_callback *console_available; - const libxl_domain_build_info *info; - libxl_device_disk *disk; - /* Should be zeroed by caller on entry. Will be filled in by - * bootloader machinery; represents the local attachment of the - * disk for the benefit of the bootloader. Must be detached by - * the caller using libxl__device_disk_local_detach, but only - * after the domain's kernel and initramfs have been loaded into - * memory and the file references disposed of. */ - libxl_device_disk localdisk; - uint32_t domid; - /* outputs: - * - caller must initialise kernel and ramdisk to point to file - * references, these will be updated and mapped; - * - caller must initialise cmdline to NULL, it will be updated with a - * string allocated from the gc; - */ - libxl__file_reference *kernel, *ramdisk; - const char *cmdline; - /* private to libxl__run_bootloader */ - char *outputpath, *outputdir, *logfile; - char *diskpath; /* not from gc, represents actually attached disk */ - libxl__openpty_state openpty; - libxl__openpty_result ptys[2]; /* [0] is for bootloader */ - libxl__ev_child child; - libxl__domaindeathcheck deathcheck; - int nargs, argsspace; - const char **args; - libxl__datacopier_state keystrokes, display; - int rc; -}; - -_hidden void libxl__bootloader_init(libxl__bootloader_state *bl); - -/* Will definitely call st->callback, perhaps reentrantly. - * If callback is passed rc==0, will have updated st->info appropriately */ -_hidden void libxl__bootloader_run(libxl__egc*, libxl__bootloader_state *st); - /*----- device addition/removal -----*/ /* Action to perform (either connect or disconnect) */ @@ -2129,6 +1908,227 @@ struct libxl__ao_devices { _hidden void libxl__initiate_device_remove(libxl__egc *egc, libxl__ao_device *aodev); +/*----- datacopier: copies data from one fd to another -----*/ + +typedef struct libxl__datacopier_state libxl__datacopier_state; +typedef struct libxl__datacopier_buf libxl__datacopier_buf; + +/* onwrite==1 means failure happened when writing, logged, errnoval is valid + * onwrite==0 means failure happened when reading + * errnoval==0 means we got eof and all data was written + * errnoval!=0 means we had a read error, logged + * onwrite==-1 means some other internal failure, errnoval not valid, logged + * in all cases copier is killed before calling this callback */ +typedef void libxl__datacopier_callback(libxl__egc *egc, + libxl__datacopier_state *dc, int onwrite, int errnoval); + +struct libxl__datacopier_buf { + /* private to datacopier */ + LIBXL_TAILQ_ENTRY(libxl__datacopier_buf) entry; + int used; + char buf[1000]; +}; + +struct libxl__datacopier_state { + /* caller must fill these in, and they must all remain valid */ + libxl__ao *ao; + int readfd, writefd; + ssize_t maxsz; + const char *copywhat, *readwhat, *writewhat; /* for error msgs */ + FILE *log; /* gets a copy of everything */ + libxl__datacopier_callback *callback; + /* remaining fields are private to datacopier */ + libxl__ev_fd toread, towrite; + ssize_t used; + LIBXL_TAILQ_HEAD(libxl__datacopier_bufs, libxl__datacopier_buf) bufs; +}; + +_hidden void libxl__datacopier_init(libxl__datacopier_state *dc); +_hidden void libxl__datacopier_kill(libxl__datacopier_state *dc); +_hidden int libxl__datacopier_start(libxl__datacopier_state *dc); + +/* Inserts literal data into the output stream. The data is copied. + * May safely be used only immediately after libxl__datacopier_start + * (before the ctx is unlocked). But may be called multiple times. + * NB exceeding maxsz will fail an assertion! */ +_hidden void libxl__datacopier_prefixdata(libxl__egc*, libxl__datacopier_state*, + const void *data, size_t len); + +/*----- Save/restore helper (used by creation and suspend) -----*/ + +typedef struct libxl__srm_save_callbacks { + libxl__srm_save_autogen_callbacks a; + int (*toolstack_save)(uint32_t domid, uint8_t **buf, + uint32_t *len, void *data); +} libxl__srm_save_callbacks; + +typedef struct libxl__srm_restore_callbacks { + libxl__srm_restore_autogen_callbacks a; +} libxl__srm_restore_callbacks; + +/* a pointer to this struct is also passed as "user" to the + * save callout helper callback functions */ +typedef struct libxl__save_helper_state { + /* public, caller of run_helper initialises */ + libxl__ao *ao; + uint32_t domid; + union { + libxl__srm_save_callbacks save; + libxl__srm_restore_callbacks restore; + } callbacks; + int (*recv_callback)(const unsigned char *msg, uint32_t len, void *user); + void (*completion_callback)(libxl__egc *egc, void *caller_state, + int rc, int retval, int errnoval); + void *caller_state; + int need_results; /* set to 0 or 1 by caller of run_helper; + * if set to 1 then the ultimate caller's + * results function must set it to 0 */ + /* private */ + int rc; + int completed; /* retval/errnoval valid iff completed */ + int retval, errnoval; /* from xc_domain_save / xc_domain_restore */ + libxl__carefd *pipes[2]; /* 0 = helper's stdin, 1 = helper's stdout */ + libxl__ev_fd readable; + libxl__ev_child child; + const char *stdin_what, *stdout_what; + FILE *toolstack_data_file; + + libxl__egc *egc; /* valid only for duration of each event callback; + * is here in this struct for the benefit of the + * marshalling and xc callback functions */ +} libxl__save_helper_state; + + +/*----- Domain suspend (save) state structure -----*/ + +typedef struct libxl__domain_suspend_state libxl__domain_suspend_state; + +typedef void libxl__domain_suspend_cb(libxl__egc*, + libxl__domain_suspend_state*, int rc); +typedef void libxl__save_device_model_cb(libxl__egc*, + libxl__domain_suspend_state*, int rc); + +typedef struct libxl__logdirty_switch { + const char *cmd; + const char *cmd_path; + const char *ret_path; + libxl__ev_xswatch watch; + libxl__ev_time timeout; +} libxl__logdirty_switch; + +struct libxl__domain_suspend_state { + /* set by caller of libxl__domain_suspend */ + libxl__ao *ao; + libxl__domain_suspend_cb *callback; + + uint32_t domid; + int fd; + libxl_domain_type type; + int live; + int debug; + const libxl_domain_remus_info *remus; + /* private */ + xc_evtchn *xce; /* event channel handle */ + int suspend_eventchn; + int hvm; + int xcflags; + int guest_responded; + const char *dm_savefile; + int interval; /* checkpoint interval (for Remus) */ + libxl__save_helper_state shs; + libxl__logdirty_switch logdirty; + /* private for libxl__domain_save_device_model */ + libxl__save_device_model_cb *save_dm_callback; + libxl__datacopier_state save_dm_datacopier; +}; + + +/*----- openpty -----*/ + +/* + * opens count (>0) ptys like count calls to openpty, and then + * calls back. On entry, all op[].master and op[].slave must be + * 0. On callback, either rc==0 and master and slave are non-0, + * or rc is a libxl error and they are both 0. If libxl__openpty + * returns non-0 no callback will happen and everything is left + * cleaned up. + */ + +typedef struct libxl__openpty_state libxl__openpty_state; +typedef struct libxl__openpty_result libxl__openpty_result; +typedef void libxl__openpty_callback(libxl__egc *egc, libxl__openpty_state *op); + +struct libxl__openpty_state { + /* caller must fill these in, and they must all remain valid */ + libxl__ao *ao; + libxl__openpty_callback *callback; + int count; + libxl__openpty_result *results; /* actual size is count, out parameter */ + /* public, result, caller may only read in callback */ + int rc; + /* private for implementation */ + libxl__ev_child child; +}; + +struct libxl__openpty_result { + libxl__carefd *master, *slave; +}; + +int libxl__openptys(libxl__openpty_state *op, + struct termios *termp, + struct winsize *winp); + + +/*----- bootloader -----*/ + +typedef struct libxl__bootloader_state libxl__bootloader_state; +typedef void libxl__run_bootloader_callback(libxl__egc*, + libxl__bootloader_state*, int rc); +typedef void libxl__bootloader_console_callback(libxl__egc*, + libxl__bootloader_state*); + +struct libxl__bootloader_state { + /* caller must fill these in, and they must all remain valid */ + libxl__ao *ao; + libxl__run_bootloader_callback *callback; + libxl__bootloader_console_callback *console_available; + const libxl_domain_build_info *info; + libxl_device_disk *disk; + /* Should be zeroed by caller on entry. Will be filled in by + * bootloader machinery; represents the local attachment of the + * disk for the benefit of the bootloader. Must be detached by + * the caller using libxl__device_disk_local_detach, but only + * after the domain's kernel and initramfs have been loaded into + * memory and the file references disposed of. */ + libxl_device_disk localdisk; + uint32_t domid; + /* outputs: + * - caller must initialise kernel and ramdisk to point to file + * references, these will be updated and mapped; + * - caller must initialise cmdline to NULL, it will be updated with a + * string allocated from the gc; + */ + libxl__file_reference *kernel, *ramdisk; + const char *cmdline; + /* private to libxl__run_bootloader */ + char *outputpath, *outputdir, *logfile; + char *diskpath; /* not from gc, represents actually attached disk */ + libxl__openpty_state openpty; + libxl__openpty_result ptys[2]; /* [0] is for bootloader */ + libxl__ev_child child; + libxl__domaindeathcheck deathcheck; + int nargs, argsspace; + const char **args; + libxl__datacopier_state keystrokes, display; + int rc; +}; + +_hidden void libxl__bootloader_init(libxl__bootloader_state *bl); + +/* Will definitely call st->callback, perhaps reentrantly. + * If callback is passed rc==0, will have updated st->info appropriately */ +_hidden void libxl__bootloader_run(libxl__egc*, libxl__bootloader_state *st); + /*----- Domain destruction -----*/ /* Domain destruction has been split into two functions: _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 23 19:55:22 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jul 2012 19:55: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 1StOit-0004oQ-BY; Mon, 23 Jul 2012 19:55:19 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StOis-0004nh-6N for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:18 +0000 Received: from [85.158.143.99:36804] by server-2.bemta-4.messagelabs.com id EE/60-17938-52CAD005; Mon, 23 Jul 2012 19:55:17 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-216.messagelabs.com!1343073315!28320921!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 6443 invoked from network); 23 Jul 2012 19:55:16 -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; 23 Jul 2012 19:55:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StOio-0001qQ-R5 for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1StOio-0005hG-NR for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:14 +0000 Message-Id: Date: Mon, 23 Jul 2012 19:55:14 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: rename stubdomain when renaming domain. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343045383 -3600 # Node ID 2b8b5c0d3a174ca13a29c5868a45cefe13379243 # Parent 4e0221514a57e1530dcae4b403d44b72cfbc193d libxl: rename stubdomain when renaming domain. Otherwise after a localhost migrate of an HVM domain with a stubdomain we end up with domains called "FOO" and "FOO--incoming-dm". This because we initially create the domains as "FOO--incoming" and then rename to "FOO" inorder to maintain the uniqueness of domain names on a host. In this state a second attempt to migrate will fail upon attempting to create a new domain named "FOO--incoming-dm" Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r 4e0221514a57 -r 2b8b5c0d3a17 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Mon Jul 23 13:09:42 2012 +0100 +++ b/tools/libxl/libxl.c Mon Jul 23 13:09:43 2012 +0100 @@ -276,6 +276,8 @@ int libxl__domain_rename(libxl__gc *gc, char *got_old_name; unsigned int got_old_len; xs_transaction_t our_trans = 0; + uint32_t stub_dm_domid; + const char *stub_dm_old_name = NULL, *stub_dm_new_name = NULL; int rc; dom_path = libxl__xs_get_dompath(gc, domid); @@ -284,6 +286,12 @@ int libxl__domain_rename(libxl__gc *gc, name_path= libxl__sprintf(gc, "%s/name", dom_path); if (!name_path) goto x_nomem; + stub_dm_domid = libxl_get_stubdom_id(CTX, domid); + if (stub_dm_domid) { + stub_dm_old_name = libxl__stub_dm_name(gc, old_name); + stub_dm_new_name = libxl__stub_dm_name(gc, new_name); + } + retry_transaction: if (!trans) { trans = our_trans = xs_transaction_start(ctx->xsh); @@ -341,6 +349,17 @@ int libxl__domain_rename(libxl__gc *gc, goto x_fail; } + if (stub_dm_domid) { + rc = libxl__domain_rename(gc, stub_dm_domid, + stub_dm_old_name, + stub_dm_new_name, + trans); + if (rc) { + LOGE(ERROR, "unable to rename stub-domain"); + goto x_rc; + } + } + if (our_trans) { if (!xs_transaction_end(ctx->xsh, our_trans, 0)) { trans = our_trans = 0; diff -r 4e0221514a57 -r 2b8b5c0d3a17 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Mon Jul 23 13:09:42 2012 +0100 +++ b/tools/libxl/libxl_dm.c Mon Jul 23 13:09:43 2012 +0100 @@ -698,6 +698,11 @@ static void spaw_stubdom_pvqemu_destroy_ libxl__destroy_domid_state *dis, int rc); +char *libxl__stub_dm_name(libxl__gc *gc, const char *guest_name) +{ + return libxl__sprintf(gc, "%s-dm", guest_name); +} + void libxl__spawn_stub_dm(libxl__egc *egc, libxl__stub_dm_spawn_state *sdss) { STATE_AO_GC(sdss->dm.spawn.ao); @@ -727,7 +732,7 @@ void libxl__spawn_stub_dm(libxl__egc *eg libxl_domain_create_info_init(&dm_config->c_info); dm_config->c_info.type = LIBXL_DOMAIN_TYPE_PV; - dm_config->c_info.name = libxl__sprintf(gc, "%s-dm", + dm_config->c_info.name = libxl__stub_dm_name(gc, libxl__domid_to_name(gc, guest_domid)); dm_config->c_info.ssidref = guest_config->b_info.device_model_ssidref; diff -r 4e0221514a57 -r 2b8b5c0d3a17 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Mon Jul 23 13:09:42 2012 +0100 +++ b/tools/libxl/libxl_internal.h Mon Jul 23 13:09:43 2012 +0100 @@ -2247,6 +2247,8 @@ typedef struct { _hidden void libxl__spawn_stub_dm(libxl__egc *egc, libxl__stub_dm_spawn_state*); +_hidden char *libxl__stub_dm_name(libxl__gc *gc, const char * guest_name); + /*----- Domain creation -----*/ typedef struct libxl__domain_create_state libxl__domain_create_state; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 23 19:55:22 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jul 2012 19:55: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 1StOis-0004o5-6h; Mon, 23 Jul 2012 19:55:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StOiq-0004nm-Hh for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:17 +0000 Received: from [85.158.138.51:24224] by server-1.bemta-3.messagelabs.com id 2D/DC-31934-32CAD005; Mon, 23 Jul 2012 19:55:15 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-11.tower-174.messagelabs.com!1343073312!28385446!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 5894 invoked from network); 23 Jul 2012 19:55: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; 23 Jul 2012 19:55:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StOim-0001qE-8g for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1StOil-0005gG-Mo for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:11 +0000 Message-Id: Date: Mon, 23 Jul 2012 19:55:10 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: change ao_device_remove to ao_device X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343045380 -3600 # Node ID 971c3ab60288c004aadda2fdad585d21d9ce8cf1 # Parent 9387f8c77f9aa859f1eee7d4a86a6e8585a555fd libxl: change ao_device_remove to ao_device Introduce a new structure to track state of device backends, that will be used in following patches on this series. This structure if used for both device creation and device destruction and removes libxl__ao_device_remove. Signed-off-by: Roger Pau Monne Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r 9387f8c77f9a -r 971c3ab60288 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Mon Jul 23 13:09:39 2012 +0100 +++ b/tools/libxl/libxl.c Mon Jul 23 13:09:40 2012 +0100 @@ -1503,6 +1503,31 @@ int libxl_vncviewer_exec(libxl_ctx *ctx, /******************************************************************************/ +/* generic callback for devices that only need to set ao_complete */ +static void device_addrm_aocomplete(libxl__egc *egc, libxl__ao_device *aodev) +{ + STATE_AO_GC(aodev->ao); + + if (aodev->rc) { + if (aodev->dev) { + LOG(ERROR, "unable to %s %s with id %u", + aodev->action == DEVICE_CONNECT ? "add" : "remove", + libxl__device_kind_to_string(aodev->dev->kind), + aodev->dev->devid); + } else { + LOG(ERROR, "unable to %s device", + aodev->action == DEVICE_CONNECT ? "add" : "remove"); + } + goto out; + } + +out: + libxl__ao_complete(egc, ao, aodev->rc); + return; +} + +/******************************************************************************/ + int libxl__device_disk_setdefault(libxl__gc *gc, libxl_device_disk *disk) { int rc; @@ -1680,42 +1705,6 @@ int libxl_device_disk_add(libxl_ctx *ctx return rc; } -int libxl_device_disk_remove(libxl_ctx *ctx, uint32_t domid, - libxl_device_disk *disk, - const libxl_asyncop_how *ao_how) -{ - AO_CREATE(ctx, domid, ao_how); - libxl__device device; - int rc; - - rc = libxl__device_from_disk(gc, domid, disk, &device); - if (rc != 0) goto out; - - rc = libxl__initiate_device_remove(egc, ao, &device); - if (rc) goto out; - - return AO_INPROGRESS; - -out: - return AO_ABORT(rc); -} - -int libxl_device_disk_destroy(libxl_ctx *ctx, uint32_t domid, - libxl_device_disk *disk) -{ - GC_INIT(ctx); - libxl__device device; - int rc; - - rc = libxl__device_from_disk(gc, domid, disk, &device); - if (rc != 0) goto out; - - rc = libxl__device_destroy(gc, &device); -out: - GC_FREE; - return rc; -} - static void libxl__device_disk_from_xs_be(libxl__gc *gc, const char *be_path, libxl_device_disk *disk) @@ -2080,8 +2069,9 @@ int libxl__device_disk_local_detach(libx if (disk->vdev != NULL) { libxl_device_disk_remove(gc->owner, LIBXL_TOOLSTACK_DOMID, disk, 0); + /* fixme-ao */ rc = libxl_device_disk_destroy(gc->owner, - LIBXL_TOOLSTACK_DOMID, disk); + LIBXL_TOOLSTACK_DOMID, disk, 0); } break; default: @@ -2249,42 +2239,6 @@ out: return rc; } -int libxl_device_nic_remove(libxl_ctx *ctx, uint32_t domid, - libxl_device_nic *nic, - const libxl_asyncop_how *ao_how) -{ - AO_CREATE(ctx, domid, ao_how); - libxl__device device; - int rc; - - rc = libxl__device_from_nic(gc, domid, nic, &device); - if (rc != 0) goto out; - - rc = libxl__initiate_device_remove(egc, ao, &device); - if (rc) goto out; - - return AO_INPROGRESS; - -out: - return AO_ABORT(rc); -} - -int libxl_device_nic_destroy(libxl_ctx *ctx, uint32_t domid, - libxl_device_nic *nic) -{ - GC_INIT(ctx); - libxl__device device; - int rc; - - rc = libxl__device_from_nic(gc, domid, nic, &device); - if (rc != 0) goto out; - - rc = libxl__device_destroy(gc, &device); -out: - GC_FREE; - return rc; -} - static void libxl__device_nic_from_xs_be(libxl__gc *gc, const char *be_path, libxl_device_nic *nic) @@ -2611,42 +2565,6 @@ out: return rc; } -int libxl_device_vkb_remove(libxl_ctx *ctx, uint32_t domid, - libxl_device_vkb *vkb, - const libxl_asyncop_how *ao_how) -{ - AO_CREATE(ctx, domid, ao_how); - libxl__device device; - int rc; - - rc = libxl__device_from_vkb(gc, domid, vkb, &device); - if (rc != 0) goto out; - - rc = libxl__initiate_device_remove(egc, ao, &device); - if (rc) goto out; - - return AO_INPROGRESS; - -out: - return AO_ABORT(rc); -} - -int libxl_device_vkb_destroy(libxl_ctx *ctx, uint32_t domid, - libxl_device_vkb *vkb) -{ - GC_INIT(ctx); - libxl__device device; - int rc; - - rc = libxl__device_from_vkb(gc, domid, vkb, &device); - if (rc != 0) goto out; - - rc = libxl__device_destroy(gc, &device); -out: - GC_FREE; - return rc; -} - /******************************************************************************/ int libxl__device_vfb_setdefault(libxl__gc *gc, libxl_device_vfb *vfb) @@ -2744,41 +2662,66 @@ out: return rc; } -int libxl_device_vfb_remove(libxl_ctx *ctx, uint32_t domid, - libxl_device_vfb *vfb, - const libxl_asyncop_how *ao_how) -{ - AO_CREATE(ctx, domid, ao_how); - libxl__device device; - int rc; - - rc = libxl__device_from_vfb(gc, domid, vfb, &device); - if (rc != 0) goto out; - - rc = libxl__initiate_device_remove(egc, ao, &device); - if (rc) goto out; - - return AO_INPROGRESS; - -out: - return AO_ABORT(rc); -} - -int libxl_device_vfb_destroy(libxl_ctx *ctx, uint32_t domid, - libxl_device_vfb *vfb) -{ - GC_INIT(ctx); - libxl__device device; - int rc; - - rc = libxl__device_from_vfb(gc, domid, vfb, &device); - if (rc != 0) goto out; - - rc = libxl__device_destroy(gc, &device); -out: - GC_FREE; - return rc; -} +/******************************************************************************/ + +/* Macro for defining device remove/destroy functions in a compact way */ +/* The following functions are defined: + * libxl_device_disk_remove + * libxl_device_disk_destroy + * libxl_device_nic_remove + * libxl_device_nic_destroy + * libxl_device_vkb_remove + * libxl_device_vkb_destroy + * libxl_device_vfb_remove + * libxl_device_vfb_destroy + */ +#define DEFINE_DEVICE_REMOVE(type, removedestroy, f) \ + int libxl_device_##type##_##removedestroy(libxl_ctx *ctx, \ + uint32_t domid, libxl_device_##type *type, \ + const libxl_asyncop_how *ao_how) \ + { \ + AO_CREATE(ctx, domid, ao_how); \ + libxl__device *device; \ + libxl__ao_device *aodev; \ + int rc; \ + \ + GCNEW(device); \ + rc = libxl__device_from_##type(gc, domid, type, device); \ + if (rc != 0) goto out; \ + \ + GCNEW(aodev); \ + libxl__prepare_ao_device(ao, aodev); \ + aodev->action = DEVICE_DISCONNECT; \ + aodev->dev = device; \ + aodev->callback = device_addrm_aocomplete; \ + aodev->force = f; \ + libxl__initiate_device_remove(egc, aodev); \ + \ + out: \ + if (rc) return AO_ABORT(rc); \ + return AO_INPROGRESS; \ + } + +/* Define all remove/destroy functions and undef the macro */ + +/* disk */ +DEFINE_DEVICE_REMOVE(disk, remove, 0) +DEFINE_DEVICE_REMOVE(disk, destroy, 1) + +/* nic */ +DEFINE_DEVICE_REMOVE(nic, remove, 0) +DEFINE_DEVICE_REMOVE(nic, destroy, 1) + +/* vkb */ +DEFINE_DEVICE_REMOVE(vkb, remove, 0) +DEFINE_DEVICE_REMOVE(vkb, destroy, 1) + +/* vfb */ + +DEFINE_DEVICE_REMOVE(vfb, remove, 0) +DEFINE_DEVICE_REMOVE(vfb, destroy, 1) + +#undef DEFINE_DEVICE_REMOVE /******************************************************************************/ diff -r 9387f8c77f9a -r 971c3ab60288 tools/libxl/libxl.h --- a/tools/libxl/libxl.h Mon Jul 23 13:09:39 2012 +0100 +++ b/tools/libxl/libxl.h Mon Jul 23 13:09:40 2012 +0100 @@ -679,7 +679,8 @@ int libxl_device_disk_remove(libxl_ctx * libxl_device_disk *disk, const libxl_asyncop_how *ao_how); int libxl_device_disk_destroy(libxl_ctx *ctx, uint32_t domid, - libxl_device_disk *disk); + libxl_device_disk *disk, + const libxl_asyncop_how *ao_how); 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, @@ -696,7 +697,9 @@ int libxl_device_nic_add(libxl_ctx *ctx, int libxl_device_nic_remove(libxl_ctx *ctx, uint32_t domid, libxl_device_nic *nic, const libxl_asyncop_how *ao_how); -int libxl_device_nic_destroy(libxl_ctx *ctx, uint32_t domid, libxl_device_nic *nic); +int libxl_device_nic_destroy(libxl_ctx *ctx, uint32_t domid, + libxl_device_nic *nic, + const libxl_asyncop_how *ao_how); 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, @@ -707,14 +710,18 @@ int libxl_device_vkb_add(libxl_ctx *ctx, int libxl_device_vkb_remove(libxl_ctx *ctx, uint32_t domid, libxl_device_vkb *vkb, const libxl_asyncop_how *ao_how); -int libxl_device_vkb_destroy(libxl_ctx *ctx, uint32_t domid, libxl_device_vkb *vkb); +int libxl_device_vkb_destroy(libxl_ctx *ctx, uint32_t domid, + libxl_device_vkb *vkb, + const libxl_asyncop_how *ao_how); /* Framebuffer */ int libxl_device_vfb_add(libxl_ctx *ctx, uint32_t domid, libxl_device_vfb *vfb); int libxl_device_vfb_remove(libxl_ctx *ctx, uint32_t domid, libxl_device_vfb *vfb, const libxl_asyncop_how *ao_how); -int libxl_device_vfb_destroy(libxl_ctx *ctx, uint32_t domid, libxl_device_vfb *vfb); +int libxl_device_vfb_destroy(libxl_ctx *ctx, uint32_t domid, + libxl_device_vfb *vfb, + const libxl_asyncop_how *ao_how); /* PCI Passthrough */ int libxl_device_pci_add(libxl_ctx *ctx, uint32_t domid, libxl_device_pci *pcidev); diff -r 9387f8c77f9a -r 971c3ab60288 tools/libxl/libxl_device.c --- a/tools/libxl/libxl_device.c Mon Jul 23 13:09:39 2012 +0100 +++ b/tools/libxl/libxl_device.c Mon Jul 23 13:09:40 2012 +0100 @@ -361,11 +361,16 @@ int libxl__device_disk_dev_number(const return -1; } +/* Device AO operations */ -typedef struct { - libxl__ao *ao; - libxl__ev_devstate ds; -} libxl__ao_device_remove; +void libxl__prepare_ao_device(libxl__ao *ao, libxl__ao_device *aodev) +{ + aodev->ao = ao; + aodev->rc = 0; + aodev->dev = NULL; + /* Initialize timer for QEMU Bodge */ + libxl__ev_time_init(&aodev->timeout); +} int libxl__device_destroy(libxl__gc *gc, libxl__device *dev) { @@ -441,36 +446,81 @@ out: /* Callbacks for device related operations */ -static void device_remove_callback(libxl__egc *egc, libxl__ev_devstate *ds, +/* + * device_backend_callback is the main callback entry point, for both device + * addition and removal. It gets called if we reach the desired state + * (XenbusStateClosed or XenbusStateInitWait). After that, all this + * functions get called in the order displayed below. + * + * If new device types are added, they should only need to modify the + * specific hotplug scripts call, which can be found in each OS specific + * file. If this new devices don't need a hotplug script, no modification + * should be needed. + */ + +/* This callback is part of the Qemu devices Badge */ +static void device_qemu_timeout(libxl__egc *egc, libxl__ev_time *ev, + const struct timeval *requested_abs); + +static void device_backend_callback(libxl__egc *egc, libxl__ev_devstate *ds, int rc); -static void device_remove_cleanup(libxl__gc *gc, - libxl__ao_device_remove *aorm); +static void device_backend_cleanup(libxl__gc *gc, + libxl__ao_device *aodev); -int libxl__initiate_device_remove(libxl__egc *egc, libxl__ao *ao, - libxl__device *dev) +static void device_hotplug_done(libxl__egc *egc, libxl__ao_device *aodev); + +void libxl__initiate_device_remove(libxl__egc *egc, + libxl__ao_device *aodev) { - AO_GC; + STATE_AO_GC(aodev->ao); xs_transaction_t t = 0; - char *be_path = libxl__device_backend_path(gc, dev); + char *be_path = libxl__device_backend_path(gc, aodev->dev); char *state_path = libxl__sprintf(gc, "%s/state", be_path); char *online_path = GCSPRINTF("%s/online", be_path); const char *state; + libxl_dominfo info; + uint32_t domid = aodev->dev->domid; + int rc = 0; - int rc = 0; - libxl__ao_device_remove *aorm = 0; + libxl_dominfo_init(&info); + rc = libxl_domain_info(CTX, &info, domid); + if (rc) { + LOG(ERROR, "unable to get info for domain %d", domid); + goto out; + } + if (QEMU_BACKEND(aodev->dev) && + (info.paused || info.dying || info.shutdown)) { + /* + * TODO: 4.2 Bodge due to QEMU, see comment on top of + * libxl__initiate_device_remove in libxl_internal.h + */ + rc = libxl__ev_time_register_rel(gc, &aodev->timeout, + device_qemu_timeout, + LIBXL_QEMU_BODGE_TIMEOUT * 1000); + if (rc) { + LOG(ERROR, "unable to register timeout for Qemu device %s", + be_path); + goto out; + } + return; + } for (;;) { rc = libxl__xs_transaction_start(gc, &t); if (rc) { LOG(ERROR, "unable to start transaction"); - goto out_fail; + goto out; } + if (aodev->force) + libxl__xs_path_cleanup(gc, t, + libxl__device_frontend_path(gc, aodev->dev)); + rc = libxl__xs_read_checked(gc, t, state_path, &state); if (rc) { LOG(ERROR, "unable to read device state from path %s", state_path); - goto out_fail; + goto out; } /* @@ -481,53 +531,118 @@ int libxl__initiate_device_remove(libxl_ rc = libxl__xs_write_checked(gc, t, online_path, "0"); if (rc) { LOG(ERROR, "unable to write to xenstore path %s", online_path); - goto out_fail; + goto out; } rc = libxl__xs_write_checked(gc, t, state_path, "5"); if (rc) { LOG(ERROR, "unable to write to xenstore path %s", state_path); - goto out_fail; + goto out; } } rc = libxl__xs_transaction_commit(gc, &t); if (!rc) break; - if (rc < 0) goto out_fail; + if (rc < 0) goto out; } libxl__device_destroy_tapdisk(gc, be_path); - aorm = libxl__zalloc(gc, sizeof(*aorm)); - aorm->ao = ao; - libxl__ev_devstate_init(&aorm->ds); - - rc = libxl__ev_devstate_wait(gc, &aorm->ds, device_remove_callback, + rc = libxl__ev_devstate_wait(gc, &aodev->backend_ds, + device_backend_callback, state_path, XenbusStateClosed, LIBXL_DESTROY_TIMEOUT * 1000); - if (rc) goto out_fail; + if (rc) { + LOG(ERROR, "unable to remove device %s", be_path); + goto out; + } - libxl__ao_complete(egc, ao, 0); - return 0; + libxl_dominfo_dispose(&info); + return; - out_fail: - assert(rc); +out: + aodev->rc = rc; + libxl_dominfo_dispose(&info); libxl__xs_transaction_abort(gc, &t); - device_remove_cleanup(gc, aorm); - return rc; + device_hotplug_done(egc, aodev); + return; } -static void device_remove_callback(libxl__egc *egc, libxl__ev_devstate *ds, - int rc) { - libxl__ao_device_remove *aorm = CONTAINER_OF(ds, *aorm, ds); - libxl__gc *gc = &aorm->ao->gc; - libxl__ao_complete(egc, aorm->ao, rc); - device_remove_cleanup(gc, aorm); +static void device_qemu_timeout(libxl__egc *egc, libxl__ev_time *ev, + const struct timeval *requested_abs) +{ + libxl__ao_device *aodev = CONTAINER_OF(ev, *aodev, timeout); + STATE_AO_GC(aodev->ao); + char *be_path = libxl__device_backend_path(gc, aodev->dev); + char *state_path = GCSPRINTF("%s/state", be_path); + int rc = 0; + + libxl__ev_time_deregister(gc, &aodev->timeout); + + rc = libxl__xs_write_checked(gc, XBT_NULL, state_path, "6"); + if (rc) goto out; + +out: + aodev->rc = rc; + device_hotplug_done(egc, aodev); } -static void device_remove_cleanup(libxl__gc *gc, - libxl__ao_device_remove *aorm) { - if (!aorm) return; - libxl__ev_devstate_cancel(gc, &aorm->ds); +static void device_backend_callback(libxl__egc *egc, libxl__ev_devstate *ds, + int rc) { + libxl__ao_device *aodev = CONTAINER_OF(ds, *aodev, backend_ds); + STATE_AO_GC(aodev->ao); + + device_backend_cleanup(gc, aodev); + + if (rc == ERROR_TIMEDOUT && aodev->action == DEVICE_DISCONNECT && + !aodev->force) { + aodev->force = 1; + libxl__initiate_device_remove(egc, aodev); + return; + } + + if (rc) { + LOG(ERROR, "unable to disconnect device with path %s", + libxl__device_backend_path(gc, aodev->dev)); + goto out; + } + +out: + aodev->rc = rc; + device_hotplug_done(egc, aodev); + return; +} + +static void device_backend_cleanup(libxl__gc *gc, libxl__ao_device *aodev) +{ + if (!aodev) return; + libxl__ev_devstate_cancel(gc, &aodev->backend_ds); +} + +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; + + 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; + } + } + +out: + aodev->callback(egc, aodev); + return; } int libxl__wait_for_device_model(libxl__gc *gc, diff -r 9387f8c77f9a -r 971c3ab60288 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Mon Jul 23 13:09:39 2012 +0100 +++ b/tools/libxl/libxl_internal.h Mon Jul 23 13:09:40 2012 +0100 @@ -74,6 +74,7 @@ #define LIBXL_DESTROY_TIMEOUT 10 #define LIBXL_DEVICE_MODEL_START_TIMEOUT 10 +#define LIBXL_QEMU_BODGE_TIMEOUT 2 #define LIBXL_XENCONSOLE_LIMIT 1048576 #define LIBXL_XENCONSOLE_PROTOCOL "vt100" #define LIBXL_MAXMEM_CONSTANT 1024 @@ -350,6 +351,12 @@ typedef struct { libxl__device_kind kind; } libxl__device; +/* Used to know if backend of given device is QEMU */ +#define QEMU_BACKEND(dev) (\ + (dev)->backend_kind == LIBXL__DEVICE_KIND_QDISK || \ + (dev)->backend_kind == LIBXL__DEVICE_KIND_VFB || \ + (dev)->backend_kind == LIBXL__DEVICE_KIND_VKBD) + #define XC_PCI_BDF "0x%x, 0x%x, 0x%x, 0x%x" #define PCI_DEVFN(slot, func) ((((slot) & 0x1f) << 3) | ((func) & 0x07)) #define PCI_SLOT(devfn) (((devfn) >> 3) & 0x1f) @@ -899,13 +906,6 @@ _hidden const char *libxl__device_nic_de uint32_t devid, libxl_nic_type type); -/* Arranges that dev will be removed from its guest. When - * this is done, the ao will be completed. An error - * return from libxl__initiate_device_remove means that the ao - * will _not_ be completed and the caller must do so. */ -_hidden int libxl__initiate_device_remove(libxl__egc*, libxl__ao*, - libxl__device *dev); - /* * libxl__ev_devstate - waits a given time for a device to * reach a given state. Follows the libxl_ev_* conventions. @@ -2007,6 +2007,135 @@ _hidden void libxl__bootloader_init(libx * If callback is passed rc==0, will have updated st->info appropriately */ _hidden void libxl__bootloader_run(libxl__egc*, libxl__bootloader_state *st); +/*----- device addition/removal -----*/ + +/* Action to perform (either connect or disconnect) */ +typedef enum { + DEVICE_CONNECT, + DEVICE_DISCONNECT +} libxl__device_action; + +typedef struct libxl__ao_device libxl__ao_device; +typedef void libxl__device_callback(libxl__egc*, libxl__ao_device*); + +/* This functions sets the necessary libxl__ao_device struct values to use + * safely inside functions. It marks the operation as "active" + * since we need to be sure that all device status structs are set + * to active before start queueing events, or we might call + * ao_complete before all devices had finished + * + * libxl__initiate_device_{remove/addition} should not be called without + * calling libxl__prepare_ao_device first, since it initializes the private + * fields of the struct libxl__ao_device to what this functions expect. + * + * Once _prepare has been called on a libxl__ao_device, it is safe to just + * discard this struct, there's no need to call any destroy function. + * _prepare can also be called multiple times with the same libxl__ao_device. + */ +_hidden void libxl__prepare_ao_device(libxl__ao *ao, libxl__ao_device *aodev); + +struct libxl__ao_device { + /* filled in by user */ + libxl__ao *ao; + libxl__device_action action; + libxl__device *dev; + int force; + libxl__device_callback *callback; + /* private for implementation */ + int rc; + libxl__ev_devstate backend_ds; + /* Bodge for Qemu devices */ + libxl__ev_time timeout; +}; + +/* + * Algorithm for handling device removal (including domain + * destruction). This is somewhat subtle because we may already have + * killed the domain and caused the death of qemu. + * + * In current versions of qemu there is no mechanism for ensuring that + * the resources used by its devices (both emulated and any PV devices + * provided by qemu) are freed (eg, fds closed) before it shuts down, + * and no confirmation from a terminating qemu back to the toolstack. + * + * This will need to be fixed in Xen 4.3. In the meantime (Xen 4.2) + * we implement a bodge. + * + * WE WANT TO UNPLUG WE WANT TO SHUT DOWN OR DESTROY + * | | + * | LIBXL SENDS SIGHUP TO QEMU + * | .....................|........................ + * | : XEN 4.3+ PLANNED | : + * | : QEMU TEARS DOWN ALL DEVICES : + * | : FREES RESOURCES (closing fds) : + * | : SETS PV BACKENDS TO STATE 5, : + * | : waits for PV frontends to shut down : + * | : SETS PV BACKENDS TO STATE 6 : + * | : | : + * | : QEMU NOTIFIES TOOLSTACK (via : + * | : xenstore) that it is exiting : + * | : QEMU EXITS (parent may be init) : + * | : | : + * | : TOOLSTACK WAITS FOR QEMU : + * | : notices qemu has finished : + * | :....................|.......................: + * | .--------------------' + * V V + * for each device + * we want to unplug/remove + * ..................|........................................... + * : V XEN 4.2 RACY BODGE : + * : device is provided by qemu : + * : | `-----------. : + * : something| V : + * : else, eg| domain (that is domain for which : + * : blkback| this PV device is the backend, : + * : | which might be the stub dm) : + * : | is still alive? : + * : | | | : + * : | |alive |dead : + * : |<-----------------' | : + * : | hopefully qemu is | : + * : | still running | : + * :............|................. | : + * ,----->| : we may be racing : + * | backend state? : with qemu's death : + * ^ | | : | : + * xenstore| |other |6 : WAIT 2.0s : + * conflict| | | : TIMEOUT : + * | WRITE B.E. | : | : + * | STATE:=5 | : hopefully qemu has : + * `---' | | : gone by now and : + * |ok | : freed its resources : + * | | : | : + * WAIT FOR | : SET B.E. : + * STATE==6 | : STATE:=6 : + * / | | :..........|...................: + * timeout/ ok| | | + * / | | | + * | RUN HOTPLUG <-'<----------------' + * | SCRIPT + * | | + * `---> NUKE + * BACKEND + * | + * DONE. + */ + +/* Arranges that dev will be removed to the guest, and the + * hotplug scripts will be executed (if necessary). When + * this is done (or an error happens), the callback in + * aodev->callback will be called. + * + * The libxl__ao_device passed to this function should be + * prepared using libxl__prepare_ao_device prior to calling + * this function. + * + * Once finished, aodev->callback will be executed. + */ +_hidden void libxl__initiate_device_remove(libxl__egc *egc, + libxl__ao_device *aodev); + /*----- Domain creation -----*/ typedef struct libxl__domain_create_state libxl__domain_create_state; diff -r 9387f8c77f9a -r 971c3ab60288 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Mon Jul 23 13:09:39 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Mon Jul 23 13:09:40 2012 +0100 @@ -5415,7 +5415,7 @@ int main_blockdetach(int argc, char **ar if (libxl_device_disk_remove(ctx, domid, &disk, 0)) { fprintf(stderr, "libxl_device_disk_remove failed.\n"); } else - libxl_device_disk_destroy(ctx, domid, &disk); + libxl_device_disk_destroy(ctx, domid, &disk, 0); return 0; } diff -r 9387f8c77f9a -r 971c3ab60288 tools/ocaml/libs/xl/xenlight_stubs.c --- a/tools/ocaml/libs/xl/xenlight_stubs.c Mon Jul 23 13:09:39 2012 +0100 +++ b/tools/ocaml/libs/xl/xenlight_stubs.c Mon Jul 23 13:09:40 2012 +0100 @@ -351,7 +351,7 @@ value stub_xl_device_vkb_destroy(value i device_vkb_val(&gc, &lg, &c_info, info); INIT_CTX(); - ret = libxl_device_vkb_destroy(ctx, Int_val(domid), &c_info); + ret = libxl_device_vkb_destroy(ctx, Int_val(domid), &c_info, 0); if (ret != 0) failwith_xl("vkb_hard_shutdown", &lg); FREE_CTX(); @@ -405,7 +405,7 @@ value stub_xl_device_vfb_destroy(value i device_vfb_val(&gc, &lg, &c_info, info); INIT_CTX(); - ret = libxl_device_vfb_destroy(ctx, Int_val(domid), &c_info); + ret = libxl_device_vfb_destroy(ctx, Int_val(domid), &c_info, 0); if (ret != 0) failwith_xl("vfb_hard_shutdown", &lg); FREE_CTX(); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 23 19:55:22 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jul 2012 19:55: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 1StOis-0004o5-6h; Mon, 23 Jul 2012 19:55:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StOiq-0004nm-Hh for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:17 +0000 Received: from [85.158.138.51:24224] by server-1.bemta-3.messagelabs.com id 2D/DC-31934-32CAD005; Mon, 23 Jul 2012 19:55:15 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-11.tower-174.messagelabs.com!1343073312!28385446!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 5894 invoked from network); 23 Jul 2012 19:55: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; 23 Jul 2012 19:55:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StOim-0001qE-8g for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1StOil-0005gG-Mo for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:11 +0000 Message-Id: Date: Mon, 23 Jul 2012 19:55:10 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: change ao_device_remove to ao_device X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343045380 -3600 # Node ID 971c3ab60288c004aadda2fdad585d21d9ce8cf1 # Parent 9387f8c77f9aa859f1eee7d4a86a6e8585a555fd libxl: change ao_device_remove to ao_device Introduce a new structure to track state of device backends, that will be used in following patches on this series. This structure if used for both device creation and device destruction and removes libxl__ao_device_remove. Signed-off-by: Roger Pau Monne Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r 9387f8c77f9a -r 971c3ab60288 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Mon Jul 23 13:09:39 2012 +0100 +++ b/tools/libxl/libxl.c Mon Jul 23 13:09:40 2012 +0100 @@ -1503,6 +1503,31 @@ int libxl_vncviewer_exec(libxl_ctx *ctx, /******************************************************************************/ +/* generic callback for devices that only need to set ao_complete */ +static void device_addrm_aocomplete(libxl__egc *egc, libxl__ao_device *aodev) +{ + STATE_AO_GC(aodev->ao); + + if (aodev->rc) { + if (aodev->dev) { + LOG(ERROR, "unable to %s %s with id %u", + aodev->action == DEVICE_CONNECT ? "add" : "remove", + libxl__device_kind_to_string(aodev->dev->kind), + aodev->dev->devid); + } else { + LOG(ERROR, "unable to %s device", + aodev->action == DEVICE_CONNECT ? "add" : "remove"); + } + goto out; + } + +out: + libxl__ao_complete(egc, ao, aodev->rc); + return; +} + +/******************************************************************************/ + int libxl__device_disk_setdefault(libxl__gc *gc, libxl_device_disk *disk) { int rc; @@ -1680,42 +1705,6 @@ int libxl_device_disk_add(libxl_ctx *ctx return rc; } -int libxl_device_disk_remove(libxl_ctx *ctx, uint32_t domid, - libxl_device_disk *disk, - const libxl_asyncop_how *ao_how) -{ - AO_CREATE(ctx, domid, ao_how); - libxl__device device; - int rc; - - rc = libxl__device_from_disk(gc, domid, disk, &device); - if (rc != 0) goto out; - - rc = libxl__initiate_device_remove(egc, ao, &device); - if (rc) goto out; - - return AO_INPROGRESS; - -out: - return AO_ABORT(rc); -} - -int libxl_device_disk_destroy(libxl_ctx *ctx, uint32_t domid, - libxl_device_disk *disk) -{ - GC_INIT(ctx); - libxl__device device; - int rc; - - rc = libxl__device_from_disk(gc, domid, disk, &device); - if (rc != 0) goto out; - - rc = libxl__device_destroy(gc, &device); -out: - GC_FREE; - return rc; -} - static void libxl__device_disk_from_xs_be(libxl__gc *gc, const char *be_path, libxl_device_disk *disk) @@ -2080,8 +2069,9 @@ int libxl__device_disk_local_detach(libx if (disk->vdev != NULL) { libxl_device_disk_remove(gc->owner, LIBXL_TOOLSTACK_DOMID, disk, 0); + /* fixme-ao */ rc = libxl_device_disk_destroy(gc->owner, - LIBXL_TOOLSTACK_DOMID, disk); + LIBXL_TOOLSTACK_DOMID, disk, 0); } break; default: @@ -2249,42 +2239,6 @@ out: return rc; } -int libxl_device_nic_remove(libxl_ctx *ctx, uint32_t domid, - libxl_device_nic *nic, - const libxl_asyncop_how *ao_how) -{ - AO_CREATE(ctx, domid, ao_how); - libxl__device device; - int rc; - - rc = libxl__device_from_nic(gc, domid, nic, &device); - if (rc != 0) goto out; - - rc = libxl__initiate_device_remove(egc, ao, &device); - if (rc) goto out; - - return AO_INPROGRESS; - -out: - return AO_ABORT(rc); -} - -int libxl_device_nic_destroy(libxl_ctx *ctx, uint32_t domid, - libxl_device_nic *nic) -{ - GC_INIT(ctx); - libxl__device device; - int rc; - - rc = libxl__device_from_nic(gc, domid, nic, &device); - if (rc != 0) goto out; - - rc = libxl__device_destroy(gc, &device); -out: - GC_FREE; - return rc; -} - static void libxl__device_nic_from_xs_be(libxl__gc *gc, const char *be_path, libxl_device_nic *nic) @@ -2611,42 +2565,6 @@ out: return rc; } -int libxl_device_vkb_remove(libxl_ctx *ctx, uint32_t domid, - libxl_device_vkb *vkb, - const libxl_asyncop_how *ao_how) -{ - AO_CREATE(ctx, domid, ao_how); - libxl__device device; - int rc; - - rc = libxl__device_from_vkb(gc, domid, vkb, &device); - if (rc != 0) goto out; - - rc = libxl__initiate_device_remove(egc, ao, &device); - if (rc) goto out; - - return AO_INPROGRESS; - -out: - return AO_ABORT(rc); -} - -int libxl_device_vkb_destroy(libxl_ctx *ctx, uint32_t domid, - libxl_device_vkb *vkb) -{ - GC_INIT(ctx); - libxl__device device; - int rc; - - rc = libxl__device_from_vkb(gc, domid, vkb, &device); - if (rc != 0) goto out; - - rc = libxl__device_destroy(gc, &device); -out: - GC_FREE; - return rc; -} - /******************************************************************************/ int libxl__device_vfb_setdefault(libxl__gc *gc, libxl_device_vfb *vfb) @@ -2744,41 +2662,66 @@ out: return rc; } -int libxl_device_vfb_remove(libxl_ctx *ctx, uint32_t domid, - libxl_device_vfb *vfb, - const libxl_asyncop_how *ao_how) -{ - AO_CREATE(ctx, domid, ao_how); - libxl__device device; - int rc; - - rc = libxl__device_from_vfb(gc, domid, vfb, &device); - if (rc != 0) goto out; - - rc = libxl__initiate_device_remove(egc, ao, &device); - if (rc) goto out; - - return AO_INPROGRESS; - -out: - return AO_ABORT(rc); -} - -int libxl_device_vfb_destroy(libxl_ctx *ctx, uint32_t domid, - libxl_device_vfb *vfb) -{ - GC_INIT(ctx); - libxl__device device; - int rc; - - rc = libxl__device_from_vfb(gc, domid, vfb, &device); - if (rc != 0) goto out; - - rc = libxl__device_destroy(gc, &device); -out: - GC_FREE; - return rc; -} +/******************************************************************************/ + +/* Macro for defining device remove/destroy functions in a compact way */ +/* The following functions are defined: + * libxl_device_disk_remove + * libxl_device_disk_destroy + * libxl_device_nic_remove + * libxl_device_nic_destroy + * libxl_device_vkb_remove + * libxl_device_vkb_destroy + * libxl_device_vfb_remove + * libxl_device_vfb_destroy + */ +#define DEFINE_DEVICE_REMOVE(type, removedestroy, f) \ + int libxl_device_##type##_##removedestroy(libxl_ctx *ctx, \ + uint32_t domid, libxl_device_##type *type, \ + const libxl_asyncop_how *ao_how) \ + { \ + AO_CREATE(ctx, domid, ao_how); \ + libxl__device *device; \ + libxl__ao_device *aodev; \ + int rc; \ + \ + GCNEW(device); \ + rc = libxl__device_from_##type(gc, domid, type, device); \ + if (rc != 0) goto out; \ + \ + GCNEW(aodev); \ + libxl__prepare_ao_device(ao, aodev); \ + aodev->action = DEVICE_DISCONNECT; \ + aodev->dev = device; \ + aodev->callback = device_addrm_aocomplete; \ + aodev->force = f; \ + libxl__initiate_device_remove(egc, aodev); \ + \ + out: \ + if (rc) return AO_ABORT(rc); \ + return AO_INPROGRESS; \ + } + +/* Define all remove/destroy functions and undef the macro */ + +/* disk */ +DEFINE_DEVICE_REMOVE(disk, remove, 0) +DEFINE_DEVICE_REMOVE(disk, destroy, 1) + +/* nic */ +DEFINE_DEVICE_REMOVE(nic, remove, 0) +DEFINE_DEVICE_REMOVE(nic, destroy, 1) + +/* vkb */ +DEFINE_DEVICE_REMOVE(vkb, remove, 0) +DEFINE_DEVICE_REMOVE(vkb, destroy, 1) + +/* vfb */ + +DEFINE_DEVICE_REMOVE(vfb, remove, 0) +DEFINE_DEVICE_REMOVE(vfb, destroy, 1) + +#undef DEFINE_DEVICE_REMOVE /******************************************************************************/ diff -r 9387f8c77f9a -r 971c3ab60288 tools/libxl/libxl.h --- a/tools/libxl/libxl.h Mon Jul 23 13:09:39 2012 +0100 +++ b/tools/libxl/libxl.h Mon Jul 23 13:09:40 2012 +0100 @@ -679,7 +679,8 @@ int libxl_device_disk_remove(libxl_ctx * libxl_device_disk *disk, const libxl_asyncop_how *ao_how); int libxl_device_disk_destroy(libxl_ctx *ctx, uint32_t domid, - libxl_device_disk *disk); + libxl_device_disk *disk, + const libxl_asyncop_how *ao_how); 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, @@ -696,7 +697,9 @@ int libxl_device_nic_add(libxl_ctx *ctx, int libxl_device_nic_remove(libxl_ctx *ctx, uint32_t domid, libxl_device_nic *nic, const libxl_asyncop_how *ao_how); -int libxl_device_nic_destroy(libxl_ctx *ctx, uint32_t domid, libxl_device_nic *nic); +int libxl_device_nic_destroy(libxl_ctx *ctx, uint32_t domid, + libxl_device_nic *nic, + const libxl_asyncop_how *ao_how); 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, @@ -707,14 +710,18 @@ int libxl_device_vkb_add(libxl_ctx *ctx, int libxl_device_vkb_remove(libxl_ctx *ctx, uint32_t domid, libxl_device_vkb *vkb, const libxl_asyncop_how *ao_how); -int libxl_device_vkb_destroy(libxl_ctx *ctx, uint32_t domid, libxl_device_vkb *vkb); +int libxl_device_vkb_destroy(libxl_ctx *ctx, uint32_t domid, + libxl_device_vkb *vkb, + const libxl_asyncop_how *ao_how); /* Framebuffer */ int libxl_device_vfb_add(libxl_ctx *ctx, uint32_t domid, libxl_device_vfb *vfb); int libxl_device_vfb_remove(libxl_ctx *ctx, uint32_t domid, libxl_device_vfb *vfb, const libxl_asyncop_how *ao_how); -int libxl_device_vfb_destroy(libxl_ctx *ctx, uint32_t domid, libxl_device_vfb *vfb); +int libxl_device_vfb_destroy(libxl_ctx *ctx, uint32_t domid, + libxl_device_vfb *vfb, + const libxl_asyncop_how *ao_how); /* PCI Passthrough */ int libxl_device_pci_add(libxl_ctx *ctx, uint32_t domid, libxl_device_pci *pcidev); diff -r 9387f8c77f9a -r 971c3ab60288 tools/libxl/libxl_device.c --- a/tools/libxl/libxl_device.c Mon Jul 23 13:09:39 2012 +0100 +++ b/tools/libxl/libxl_device.c Mon Jul 23 13:09:40 2012 +0100 @@ -361,11 +361,16 @@ int libxl__device_disk_dev_number(const return -1; } +/* Device AO operations */ -typedef struct { - libxl__ao *ao; - libxl__ev_devstate ds; -} libxl__ao_device_remove; +void libxl__prepare_ao_device(libxl__ao *ao, libxl__ao_device *aodev) +{ + aodev->ao = ao; + aodev->rc = 0; + aodev->dev = NULL; + /* Initialize timer for QEMU Bodge */ + libxl__ev_time_init(&aodev->timeout); +} int libxl__device_destroy(libxl__gc *gc, libxl__device *dev) { @@ -441,36 +446,81 @@ out: /* Callbacks for device related operations */ -static void device_remove_callback(libxl__egc *egc, libxl__ev_devstate *ds, +/* + * device_backend_callback is the main callback entry point, for both device + * addition and removal. It gets called if we reach the desired state + * (XenbusStateClosed or XenbusStateInitWait). After that, all this + * functions get called in the order displayed below. + * + * If new device types are added, they should only need to modify the + * specific hotplug scripts call, which can be found in each OS specific + * file. If this new devices don't need a hotplug script, no modification + * should be needed. + */ + +/* This callback is part of the Qemu devices Badge */ +static void device_qemu_timeout(libxl__egc *egc, libxl__ev_time *ev, + const struct timeval *requested_abs); + +static void device_backend_callback(libxl__egc *egc, libxl__ev_devstate *ds, int rc); -static void device_remove_cleanup(libxl__gc *gc, - libxl__ao_device_remove *aorm); +static void device_backend_cleanup(libxl__gc *gc, + libxl__ao_device *aodev); -int libxl__initiate_device_remove(libxl__egc *egc, libxl__ao *ao, - libxl__device *dev) +static void device_hotplug_done(libxl__egc *egc, libxl__ao_device *aodev); + +void libxl__initiate_device_remove(libxl__egc *egc, + libxl__ao_device *aodev) { - AO_GC; + STATE_AO_GC(aodev->ao); xs_transaction_t t = 0; - char *be_path = libxl__device_backend_path(gc, dev); + char *be_path = libxl__device_backend_path(gc, aodev->dev); char *state_path = libxl__sprintf(gc, "%s/state", be_path); char *online_path = GCSPRINTF("%s/online", be_path); const char *state; + libxl_dominfo info; + uint32_t domid = aodev->dev->domid; + int rc = 0; - int rc = 0; - libxl__ao_device_remove *aorm = 0; + libxl_dominfo_init(&info); + rc = libxl_domain_info(CTX, &info, domid); + if (rc) { + LOG(ERROR, "unable to get info for domain %d", domid); + goto out; + } + if (QEMU_BACKEND(aodev->dev) && + (info.paused || info.dying || info.shutdown)) { + /* + * TODO: 4.2 Bodge due to QEMU, see comment on top of + * libxl__initiate_device_remove in libxl_internal.h + */ + rc = libxl__ev_time_register_rel(gc, &aodev->timeout, + device_qemu_timeout, + LIBXL_QEMU_BODGE_TIMEOUT * 1000); + if (rc) { + LOG(ERROR, "unable to register timeout for Qemu device %s", + be_path); + goto out; + } + return; + } for (;;) { rc = libxl__xs_transaction_start(gc, &t); if (rc) { LOG(ERROR, "unable to start transaction"); - goto out_fail; + goto out; } + if (aodev->force) + libxl__xs_path_cleanup(gc, t, + libxl__device_frontend_path(gc, aodev->dev)); + rc = libxl__xs_read_checked(gc, t, state_path, &state); if (rc) { LOG(ERROR, "unable to read device state from path %s", state_path); - goto out_fail; + goto out; } /* @@ -481,53 +531,118 @@ int libxl__initiate_device_remove(libxl_ rc = libxl__xs_write_checked(gc, t, online_path, "0"); if (rc) { LOG(ERROR, "unable to write to xenstore path %s", online_path); - goto out_fail; + goto out; } rc = libxl__xs_write_checked(gc, t, state_path, "5"); if (rc) { LOG(ERROR, "unable to write to xenstore path %s", state_path); - goto out_fail; + goto out; } } rc = libxl__xs_transaction_commit(gc, &t); if (!rc) break; - if (rc < 0) goto out_fail; + if (rc < 0) goto out; } libxl__device_destroy_tapdisk(gc, be_path); - aorm = libxl__zalloc(gc, sizeof(*aorm)); - aorm->ao = ao; - libxl__ev_devstate_init(&aorm->ds); - - rc = libxl__ev_devstate_wait(gc, &aorm->ds, device_remove_callback, + rc = libxl__ev_devstate_wait(gc, &aodev->backend_ds, + device_backend_callback, state_path, XenbusStateClosed, LIBXL_DESTROY_TIMEOUT * 1000); - if (rc) goto out_fail; + if (rc) { + LOG(ERROR, "unable to remove device %s", be_path); + goto out; + } - libxl__ao_complete(egc, ao, 0); - return 0; + libxl_dominfo_dispose(&info); + return; - out_fail: - assert(rc); +out: + aodev->rc = rc; + libxl_dominfo_dispose(&info); libxl__xs_transaction_abort(gc, &t); - device_remove_cleanup(gc, aorm); - return rc; + device_hotplug_done(egc, aodev); + return; } -static void device_remove_callback(libxl__egc *egc, libxl__ev_devstate *ds, - int rc) { - libxl__ao_device_remove *aorm = CONTAINER_OF(ds, *aorm, ds); - libxl__gc *gc = &aorm->ao->gc; - libxl__ao_complete(egc, aorm->ao, rc); - device_remove_cleanup(gc, aorm); +static void device_qemu_timeout(libxl__egc *egc, libxl__ev_time *ev, + const struct timeval *requested_abs) +{ + libxl__ao_device *aodev = CONTAINER_OF(ev, *aodev, timeout); + STATE_AO_GC(aodev->ao); + char *be_path = libxl__device_backend_path(gc, aodev->dev); + char *state_path = GCSPRINTF("%s/state", be_path); + int rc = 0; + + libxl__ev_time_deregister(gc, &aodev->timeout); + + rc = libxl__xs_write_checked(gc, XBT_NULL, state_path, "6"); + if (rc) goto out; + +out: + aodev->rc = rc; + device_hotplug_done(egc, aodev); } -static void device_remove_cleanup(libxl__gc *gc, - libxl__ao_device_remove *aorm) { - if (!aorm) return; - libxl__ev_devstate_cancel(gc, &aorm->ds); +static void device_backend_callback(libxl__egc *egc, libxl__ev_devstate *ds, + int rc) { + libxl__ao_device *aodev = CONTAINER_OF(ds, *aodev, backend_ds); + STATE_AO_GC(aodev->ao); + + device_backend_cleanup(gc, aodev); + + if (rc == ERROR_TIMEDOUT && aodev->action == DEVICE_DISCONNECT && + !aodev->force) { + aodev->force = 1; + libxl__initiate_device_remove(egc, aodev); + return; + } + + if (rc) { + LOG(ERROR, "unable to disconnect device with path %s", + libxl__device_backend_path(gc, aodev->dev)); + goto out; + } + +out: + aodev->rc = rc; + device_hotplug_done(egc, aodev); + return; +} + +static void device_backend_cleanup(libxl__gc *gc, libxl__ao_device *aodev) +{ + if (!aodev) return; + libxl__ev_devstate_cancel(gc, &aodev->backend_ds); +} + +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; + + 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; + } + } + +out: + aodev->callback(egc, aodev); + return; } int libxl__wait_for_device_model(libxl__gc *gc, diff -r 9387f8c77f9a -r 971c3ab60288 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Mon Jul 23 13:09:39 2012 +0100 +++ b/tools/libxl/libxl_internal.h Mon Jul 23 13:09:40 2012 +0100 @@ -74,6 +74,7 @@ #define LIBXL_DESTROY_TIMEOUT 10 #define LIBXL_DEVICE_MODEL_START_TIMEOUT 10 +#define LIBXL_QEMU_BODGE_TIMEOUT 2 #define LIBXL_XENCONSOLE_LIMIT 1048576 #define LIBXL_XENCONSOLE_PROTOCOL "vt100" #define LIBXL_MAXMEM_CONSTANT 1024 @@ -350,6 +351,12 @@ typedef struct { libxl__device_kind kind; } libxl__device; +/* Used to know if backend of given device is QEMU */ +#define QEMU_BACKEND(dev) (\ + (dev)->backend_kind == LIBXL__DEVICE_KIND_QDISK || \ + (dev)->backend_kind == LIBXL__DEVICE_KIND_VFB || \ + (dev)->backend_kind == LIBXL__DEVICE_KIND_VKBD) + #define XC_PCI_BDF "0x%x, 0x%x, 0x%x, 0x%x" #define PCI_DEVFN(slot, func) ((((slot) & 0x1f) << 3) | ((func) & 0x07)) #define PCI_SLOT(devfn) (((devfn) >> 3) & 0x1f) @@ -899,13 +906,6 @@ _hidden const char *libxl__device_nic_de uint32_t devid, libxl_nic_type type); -/* Arranges that dev will be removed from its guest. When - * this is done, the ao will be completed. An error - * return from libxl__initiate_device_remove means that the ao - * will _not_ be completed and the caller must do so. */ -_hidden int libxl__initiate_device_remove(libxl__egc*, libxl__ao*, - libxl__device *dev); - /* * libxl__ev_devstate - waits a given time for a device to * reach a given state. Follows the libxl_ev_* conventions. @@ -2007,6 +2007,135 @@ _hidden void libxl__bootloader_init(libx * If callback is passed rc==0, will have updated st->info appropriately */ _hidden void libxl__bootloader_run(libxl__egc*, libxl__bootloader_state *st); +/*----- device addition/removal -----*/ + +/* Action to perform (either connect or disconnect) */ +typedef enum { + DEVICE_CONNECT, + DEVICE_DISCONNECT +} libxl__device_action; + +typedef struct libxl__ao_device libxl__ao_device; +typedef void libxl__device_callback(libxl__egc*, libxl__ao_device*); + +/* This functions sets the necessary libxl__ao_device struct values to use + * safely inside functions. It marks the operation as "active" + * since we need to be sure that all device status structs are set + * to active before start queueing events, or we might call + * ao_complete before all devices had finished + * + * libxl__initiate_device_{remove/addition} should not be called without + * calling libxl__prepare_ao_device first, since it initializes the private + * fields of the struct libxl__ao_device to what this functions expect. + * + * Once _prepare has been called on a libxl__ao_device, it is safe to just + * discard this struct, there's no need to call any destroy function. + * _prepare can also be called multiple times with the same libxl__ao_device. + */ +_hidden void libxl__prepare_ao_device(libxl__ao *ao, libxl__ao_device *aodev); + +struct libxl__ao_device { + /* filled in by user */ + libxl__ao *ao; + libxl__device_action action; + libxl__device *dev; + int force; + libxl__device_callback *callback; + /* private for implementation */ + int rc; + libxl__ev_devstate backend_ds; + /* Bodge for Qemu devices */ + libxl__ev_time timeout; +}; + +/* + * Algorithm for handling device removal (including domain + * destruction). This is somewhat subtle because we may already have + * killed the domain and caused the death of qemu. + * + * In current versions of qemu there is no mechanism for ensuring that + * the resources used by its devices (both emulated and any PV devices + * provided by qemu) are freed (eg, fds closed) before it shuts down, + * and no confirmation from a terminating qemu back to the toolstack. + * + * This will need to be fixed in Xen 4.3. In the meantime (Xen 4.2) + * we implement a bodge. + * + * WE WANT TO UNPLUG WE WANT TO SHUT DOWN OR DESTROY + * | | + * | LIBXL SENDS SIGHUP TO QEMU + * | .....................|........................ + * | : XEN 4.3+ PLANNED | : + * | : QEMU TEARS DOWN ALL DEVICES : + * | : FREES RESOURCES (closing fds) : + * | : SETS PV BACKENDS TO STATE 5, : + * | : waits for PV frontends to shut down : + * | : SETS PV BACKENDS TO STATE 6 : + * | : | : + * | : QEMU NOTIFIES TOOLSTACK (via : + * | : xenstore) that it is exiting : + * | : QEMU EXITS (parent may be init) : + * | : | : + * | : TOOLSTACK WAITS FOR QEMU : + * | : notices qemu has finished : + * | :....................|.......................: + * | .--------------------' + * V V + * for each device + * we want to unplug/remove + * ..................|........................................... + * : V XEN 4.2 RACY BODGE : + * : device is provided by qemu : + * : | `-----------. : + * : something| V : + * : else, eg| domain (that is domain for which : + * : blkback| this PV device is the backend, : + * : | which might be the stub dm) : + * : | is still alive? : + * : | | | : + * : | |alive |dead : + * : |<-----------------' | : + * : | hopefully qemu is | : + * : | still running | : + * :............|................. | : + * ,----->| : we may be racing : + * | backend state? : with qemu's death : + * ^ | | : | : + * xenstore| |other |6 : WAIT 2.0s : + * conflict| | | : TIMEOUT : + * | WRITE B.E. | : | : + * | STATE:=5 | : hopefully qemu has : + * `---' | | : gone by now and : + * |ok | : freed its resources : + * | | : | : + * WAIT FOR | : SET B.E. : + * STATE==6 | : STATE:=6 : + * / | | :..........|...................: + * timeout/ ok| | | + * / | | | + * | RUN HOTPLUG <-'<----------------' + * | SCRIPT + * | | + * `---> NUKE + * BACKEND + * | + * DONE. + */ + +/* Arranges that dev will be removed to the guest, and the + * hotplug scripts will be executed (if necessary). When + * this is done (or an error happens), the callback in + * aodev->callback will be called. + * + * The libxl__ao_device passed to this function should be + * prepared using libxl__prepare_ao_device prior to calling + * this function. + * + * Once finished, aodev->callback will be executed. + */ +_hidden void libxl__initiate_device_remove(libxl__egc *egc, + libxl__ao_device *aodev); + /*----- Domain creation -----*/ typedef struct libxl__domain_create_state libxl__domain_create_state; diff -r 9387f8c77f9a -r 971c3ab60288 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Mon Jul 23 13:09:39 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Mon Jul 23 13:09:40 2012 +0100 @@ -5415,7 +5415,7 @@ int main_blockdetach(int argc, char **ar if (libxl_device_disk_remove(ctx, domid, &disk, 0)) { fprintf(stderr, "libxl_device_disk_remove failed.\n"); } else - libxl_device_disk_destroy(ctx, domid, &disk); + libxl_device_disk_destroy(ctx, domid, &disk, 0); return 0; } diff -r 9387f8c77f9a -r 971c3ab60288 tools/ocaml/libs/xl/xenlight_stubs.c --- a/tools/ocaml/libs/xl/xenlight_stubs.c Mon Jul 23 13:09:39 2012 +0100 +++ b/tools/ocaml/libs/xl/xenlight_stubs.c Mon Jul 23 13:09:40 2012 +0100 @@ -351,7 +351,7 @@ value stub_xl_device_vkb_destroy(value i device_vkb_val(&gc, &lg, &c_info, info); INIT_CTX(); - ret = libxl_device_vkb_destroy(ctx, Int_val(domid), &c_info); + ret = libxl_device_vkb_destroy(ctx, Int_val(domid), &c_info, 0); if (ret != 0) failwith_xl("vkb_hard_shutdown", &lg); FREE_CTX(); @@ -405,7 +405,7 @@ value stub_xl_device_vfb_destroy(value i device_vfb_val(&gc, &lg, &c_info, info); INIT_CTX(); - ret = libxl_device_vfb_destroy(ctx, Int_val(domid), &c_info); + ret = libxl_device_vfb_destroy(ctx, Int_val(domid), &c_info, 0); if (ret != 0) failwith_xl("vfb_hard_shutdown", &lg); FREE_CTX(); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 23 19:55:22 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jul 2012 19:55: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 1StOiu-0004pN-HJ; Mon, 23 Jul 2012 19:55:20 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StOit-0004nW-BA for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:19 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-27.messagelabs.com!1343073310!10375132!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 10526 invoked from network); 23 Jul 2012 19:55:11 -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; 23 Jul 2012 19:55:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StOik-0001q8-Ce for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1StOik-0005fj-40 for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:10 +0000 Message-Id: Date: Mon, 23 Jul 2012 19:55:09 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxc: restore: bounds check for start_info.{store_mfn, console.domU.mfn} X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343045378 -3600 # Node ID c1d4d2b87505f749089e9a11fc42287c41b08870 # Parent bb1b85f2ce981d61b9061f2d25a50583cadb358f libxc: restore: bounds check for start_info.{store_mfn,console.domU.mfn} These fields are canonicalised by the guest on suspend and therefore must be valid pfns during restore. Reported-by: Jonathan Ludlam Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r bb1b85f2ce98 -r c1d4d2b87505 tools/libxc/xc_domain_restore.c --- a/tools/libxc/xc_domain_restore.c Mon Jul 23 13:09:37 2012 +0100 +++ b/tools/libxc/xc_domain_restore.c Mon Jul 23 13:09:38 2012 +0100 @@ -1912,9 +1912,21 @@ int xc_domain_restore(xc_interface *xch, SET_FIELD(start_info, nr_pages, dinfo->p2m_size); SET_FIELD(start_info, shared_info, shared_info_frame< dinfo->p2m_size ) + { + ERROR("Suspend record xenstore frame number is bad"); + munmap(start_info, PAGE_SIZE); + goto out; + } *store_mfn = ctx->p2m[GET_FIELD(start_info, store_mfn)]; SET_FIELD(start_info, store_mfn, *store_mfn); SET_FIELD(start_info, store_evtchn, store_evtchn); + if ( GET_FIELD(start_info, console.domU.mfn) > dinfo->p2m_size ) + { + ERROR("Suspend record console frame number is bad"); + munmap(start_info, PAGE_SIZE); + goto out; + } *console_mfn = ctx->p2m[GET_FIELD(start_info, console.domU.mfn)]; SET_FIELD(start_info, console.domU.mfn, *console_mfn); SET_FIELD(start_info, console.domU.evtchn, console_evtchn); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 23 19:55:22 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jul 2012 19:55: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 1StOiu-0004pN-HJ; Mon, 23 Jul 2012 19:55:20 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StOit-0004nW-BA for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:19 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-27.messagelabs.com!1343073310!10375132!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 10526 invoked from network); 23 Jul 2012 19:55:11 -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; 23 Jul 2012 19:55:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StOik-0001q8-Ce for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1StOik-0005fj-40 for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:10 +0000 Message-Id: Date: Mon, 23 Jul 2012 19:55:09 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxc: restore: bounds check for start_info.{store_mfn, console.domU.mfn} X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343045378 -3600 # Node ID c1d4d2b87505f749089e9a11fc42287c41b08870 # Parent bb1b85f2ce981d61b9061f2d25a50583cadb358f libxc: restore: bounds check for start_info.{store_mfn,console.domU.mfn} These fields are canonicalised by the guest on suspend and therefore must be valid pfns during restore. Reported-by: Jonathan Ludlam Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r bb1b85f2ce98 -r c1d4d2b87505 tools/libxc/xc_domain_restore.c --- a/tools/libxc/xc_domain_restore.c Mon Jul 23 13:09:37 2012 +0100 +++ b/tools/libxc/xc_domain_restore.c Mon Jul 23 13:09:38 2012 +0100 @@ -1912,9 +1912,21 @@ int xc_domain_restore(xc_interface *xch, SET_FIELD(start_info, nr_pages, dinfo->p2m_size); SET_FIELD(start_info, shared_info, shared_info_frame< dinfo->p2m_size ) + { + ERROR("Suspend record xenstore frame number is bad"); + munmap(start_info, PAGE_SIZE); + goto out; + } *store_mfn = ctx->p2m[GET_FIELD(start_info, store_mfn)]; SET_FIELD(start_info, store_mfn, *store_mfn); SET_FIELD(start_info, store_evtchn, store_evtchn); + if ( GET_FIELD(start_info, console.domU.mfn) > dinfo->p2m_size ) + { + ERROR("Suspend record console frame number is bad"); + munmap(start_info, PAGE_SIZE); + goto out; + } *console_mfn = ctx->p2m[GET_FIELD(start_info, console.domU.mfn)]; SET_FIELD(start_info, console.domU.mfn, *console_mfn); SET_FIELD(start_info, console.domU.evtchn, console_evtchn); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 23 19:55:25 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jul 2012 19:55: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 1StOix-0004rQ-Lk; Mon, 23 Jul 2012 19:55:23 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StOiv-0004pu-T5 for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:22 +0000 Received: from [85.158.138.51:24430] by server-4.bemta-3.messagelabs.com id 8C/38-29069-82CAD005; Mon, 23 Jul 2012 19:55:20 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-174.messagelabs.com!1343073316!24345310!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 2435 invoked from network); 23 Jul 2012 19:55:17 -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; 23 Jul 2012 19:55:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StOiq-0001qZ-EW for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1StOiq-0005hz-AK for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:16 +0000 Message-Id: Date: Mon, 23 Jul 2012 19:55:15 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] hotplug: vif: fail if a duplicate vifname is used. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1343045386 -3600 # Node ID c2575d6b9650a39e34971f75eceee6dc9d456ba9 # Parent 7b8b143e4a86a49ca2c82c450b84ad6d4f023c34 hotplug: vif: fail if a duplicate vifname is used. This is based on a patch from Hans van Kranenburg in http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=658305. Quoting that bug report: When configurating a duplicate custom vifname for interfaces in the Xen dom0 that are added to a bridge (which is obviously a configuration error), the hotplug scripts fail silently to rename the new vifX.0 to the custom vifname, if it's already existing. The result of this, is that the domU will start normally, but no network traffic between domU and the dom0 bridge is possible, because the vifX.0 never gets added to the bridge. Worse... when doing xm shutdown on the newly created domU, while investigating the issue, the interface of another running domU gets shut down, and remains hanging around in a DOWN state, because it cannot be removed (the other unrelated domU is still running, but succesfully made unavailable on the network!). When starting the new domU again, the interface of the other domU will be added to the bridge again, and while looking at the output of brctl show, tcpdump and ping, which make no sense, because everything will seem to be right, nagios will notify you of another host being down. :| Note that libxl doesn't actually check the hotplug status yet, this changes with Rogers hotplug script changes. xend correctly picks the failure up. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r 7b8b143e4a86 -r c2575d6b9650 tools/hotplug/Linux/vif-common.sh --- a/tools/hotplug/Linux/vif-common.sh Mon Jul 23 13:09:45 2012 +0100 +++ b/tools/hotplug/Linux/vif-common.sh Mon Jul 23 13:09:46 2012 +0100 @@ -65,6 +65,20 @@ case "$command" in ;; esac +rename_vif() { + local dev=$1 + local vifname=$2 + + # if a custom vifname was chosen and a link with that desired name + # already exists, then stop, before messing up whatever is using + # that interface (e.g. another running domU) because it's likely a + # configuration error + if ip link show "$vifname" >&/dev/null + then + fatal "Cannot rename interface $dev. An interface with name $vifname already exists." + fi + do_or_die ip link set "$dev" name "$vifname" +} if [ "$type_if" = vif ]; then # Check presence of compulsory args. @@ -74,9 +88,9 @@ if [ "$type_if" = vif ]; then vifname=$(xenstore_read_default "$XENBUS_PATH/vifname" "") if [ "$vifname" ] then - if [ "$command" == "online" ] && ! ip link show "$vifname" >&/dev/null + if [ "$command" == "online" ] then - do_or_die ip link set "$dev" name "$vifname" + rename_vif "$dev" "$vifname" fi dev="$vifname" fi @@ -96,9 +110,9 @@ elif [ "$type_if" = tap ]; then if [ "$vifname" ] then vifname="${vifname}-emu" - if [ "$command" == "add" ] && ! ip link show "$vifname" >&/dev/null + if [ "$command" == "add" ] then - do_or_die ip link set "$dev" name "$vifname" + rename_vif "$dev" "$vifname" fi dev="$vifname" fi _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 23 19:55:25 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jul 2012 19:55: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 1StOix-0004rQ-Lk; Mon, 23 Jul 2012 19:55:23 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StOiv-0004pu-T5 for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:22 +0000 Received: from [85.158.138.51:24430] by server-4.bemta-3.messagelabs.com id 8C/38-29069-82CAD005; Mon, 23 Jul 2012 19:55:20 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-174.messagelabs.com!1343073316!24345310!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 2435 invoked from network); 23 Jul 2012 19:55:17 -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; 23 Jul 2012 19:55:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StOiq-0001qZ-EW for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1StOiq-0005hz-AK for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:16 +0000 Message-Id: Date: Mon, 23 Jul 2012 19:55:15 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] hotplug: vif: fail if a duplicate vifname is used. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1343045386 -3600 # Node ID c2575d6b9650a39e34971f75eceee6dc9d456ba9 # Parent 7b8b143e4a86a49ca2c82c450b84ad6d4f023c34 hotplug: vif: fail if a duplicate vifname is used. This is based on a patch from Hans van Kranenburg in http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=658305. Quoting that bug report: When configurating a duplicate custom vifname for interfaces in the Xen dom0 that are added to a bridge (which is obviously a configuration error), the hotplug scripts fail silently to rename the new vifX.0 to the custom vifname, if it's already existing. The result of this, is that the domU will start normally, but no network traffic between domU and the dom0 bridge is possible, because the vifX.0 never gets added to the bridge. Worse... when doing xm shutdown on the newly created domU, while investigating the issue, the interface of another running domU gets shut down, and remains hanging around in a DOWN state, because it cannot be removed (the other unrelated domU is still running, but succesfully made unavailable on the network!). When starting the new domU again, the interface of the other domU will be added to the bridge again, and while looking at the output of brctl show, tcpdump and ping, which make no sense, because everything will seem to be right, nagios will notify you of another host being down. :| Note that libxl doesn't actually check the hotplug status yet, this changes with Rogers hotplug script changes. xend correctly picks the failure up. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r 7b8b143e4a86 -r c2575d6b9650 tools/hotplug/Linux/vif-common.sh --- a/tools/hotplug/Linux/vif-common.sh Mon Jul 23 13:09:45 2012 +0100 +++ b/tools/hotplug/Linux/vif-common.sh Mon Jul 23 13:09:46 2012 +0100 @@ -65,6 +65,20 @@ case "$command" in ;; esac +rename_vif() { + local dev=$1 + local vifname=$2 + + # if a custom vifname was chosen and a link with that desired name + # already exists, then stop, before messing up whatever is using + # that interface (e.g. another running domU) because it's likely a + # configuration error + if ip link show "$vifname" >&/dev/null + then + fatal "Cannot rename interface $dev. An interface with name $vifname already exists." + fi + do_or_die ip link set "$dev" name "$vifname" +} if [ "$type_if" = vif ]; then # Check presence of compulsory args. @@ -74,9 +88,9 @@ if [ "$type_if" = vif ]; then vifname=$(xenstore_read_default "$XENBUS_PATH/vifname" "") if [ "$vifname" ] then - if [ "$command" == "online" ] && ! ip link show "$vifname" >&/dev/null + if [ "$command" == "online" ] then - do_or_die ip link set "$dev" name "$vifname" + rename_vif "$dev" "$vifname" fi dev="$vifname" fi @@ -96,9 +110,9 @@ elif [ "$type_if" = tap ]; then if [ "$vifname" ] then vifname="${vifname}-emu" - if [ "$command" == "add" ] && ! ip link show "$vifname" >&/dev/null + if [ "$command" == "add" ] then - do_or_die ip link set "$dev" name "$vifname" + rename_vif "$dev" "$vifname" fi dev="$vifname" fi _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 23 19:55:26 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jul 2012 19:55:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StOiy-0004rp-OT; Mon, 23 Jul 2012 19:55:24 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StOix-0004o3-9D for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:23 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-27.messagelabs.com!1343073315!1841625!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 19398 invoked from network); 23 Jul 2012 19:55:17 -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; 23 Jul 2012 19:55:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StOip-0001qT-AU for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1StOip-0005hV-8w for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:15 +0000 Message-Id: Date: Mon, 23 Jul 2012 19:55:14 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xenstore: don't print an error when gntdev cannot be opened X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343045384 -3600 # Node ID 8948b4b1084544490b6dff60ea6d4e1b86ce4fa4 # Parent 2b8b5c0d3a174ca13a29c5868a45cefe13379243 xenstore: don't print an error when gntdev cannot be opened NetBSD doesn't have a gntdev, but we should not print an error when falling back to the previous implementation. Signed-off-by: Roger Pau Monne Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r 2b8b5c0d3a17 -r 8948b4b10845 tools/libxc/xc_private.c --- a/tools/libxc/xc_private.c Mon Jul 23 13:09:43 2012 +0100 +++ b/tools/libxc/xc_private.c Mon Jul 23 13:09:44 2012 +0100 @@ -174,7 +174,7 @@ static struct xc_interface_core *xc_inte xch->ops = xch->osdep.init(xch, type); if ( xch->ops == NULL ) { - ERROR("OSDEP: interface %d (%s) not supported on this platform", + DPRINTF("OSDEP: interface %d (%s) not supported on this platform", type, xc_osdep_type_name(type)); goto err_put_iface; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 23 19:55:26 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jul 2012 19:55:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StOiy-0004rp-OT; Mon, 23 Jul 2012 19:55:24 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StOix-0004o3-9D for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:23 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-27.messagelabs.com!1343073315!1841625!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 19398 invoked from network); 23 Jul 2012 19:55:17 -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; 23 Jul 2012 19:55:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StOip-0001qT-AU for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1StOip-0005hV-8w for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:15 +0000 Message-Id: Date: Mon, 23 Jul 2012 19:55:14 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xenstore: don't print an error when gntdev cannot be opened X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343045384 -3600 # Node ID 8948b4b1084544490b6dff60ea6d4e1b86ce4fa4 # Parent 2b8b5c0d3a174ca13a29c5868a45cefe13379243 xenstore: don't print an error when gntdev cannot be opened NetBSD doesn't have a gntdev, but we should not print an error when falling back to the previous implementation. Signed-off-by: Roger Pau Monne Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r 2b8b5c0d3a17 -r 8948b4b10845 tools/libxc/xc_private.c --- a/tools/libxc/xc_private.c Mon Jul 23 13:09:43 2012 +0100 +++ b/tools/libxc/xc_private.c Mon Jul 23 13:09:44 2012 +0100 @@ -174,7 +174,7 @@ static struct xc_interface_core *xc_inte xch->ops = xch->osdep.init(xch, type); if ( xch->ops == NULL ) { - ERROR("OSDEP: interface %d (%s) not supported on this platform", + DPRINTF("OSDEP: interface %d (%s) not supported on this platform", type, xc_osdep_type_name(type)); goto err_put_iface; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 23 19:56:07 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jul 2012 19:56:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StOje-00051w-Sn; Mon, 23 Jul 2012 19:56:06 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StOj8-0004rm-Vf for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:56:05 +0000 Received: from [85.158.139.83:57864] by server-11.bemta-5.messagelabs.com id 61/69-20400-12CAD005; Mon, 23 Jul 2012 19:55:13 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-182.messagelabs.com!1343073311!25526949!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 24328 invoked from network); 23 Jul 2012 19:55:12 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 23 Jul 2012 19:55:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StOik-0001qB-Nf for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1StOik-0005fy-Li for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:10 +0000 Message-Id: Date: Mon, 23 Jul 2012 19:55:10 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: check backend state before setting it to "closing" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343045379 -3600 # Node ID 9387f8c77f9aa859f1eee7d4a86a6e8585a555fd # Parent c1d4d2b87505f749089e9a11fc42287c41b08870 libxl: check backend state before setting it to "closing" Check backend state before unconditionally setting it to "closing" (5), since it might already be in "closed" (6). Signed-off-by: Roger Pau Monne Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r c1d4d2b87505 -r 9387f8c77f9a tools/libxl/libxl_device.c --- a/tools/libxl/libxl_device.c Mon Jul 23 13:09:38 2012 +0100 +++ b/tools/libxl/libxl_device.c Mon Jul 23 13:09:39 2012 +0100 @@ -451,33 +451,48 @@ int libxl__initiate_device_remove(libxl_ libxl__device *dev) { AO_GC; - libxl_ctx *ctx = libxl__gc_owner(gc); - xs_transaction_t t; + xs_transaction_t t = 0; char *be_path = libxl__device_backend_path(gc, dev); char *state_path = libxl__sprintf(gc, "%s/state", be_path); - char *state = libxl__xs_read(gc, XBT_NULL, state_path); + char *online_path = GCSPRINTF("%s/online", be_path); + const char *state; + int rc = 0; libxl__ao_device_remove *aorm = 0; - if (!state) - goto out_ok; - if (atoi(state) != 4) { - libxl__device_destroy_tapdisk(gc, be_path); - xs_rm(ctx->xsh, XBT_NULL, be_path); - goto out_ok; - } - -retry_transaction: - t = xs_transaction_start(ctx->xsh); - xs_write(ctx->xsh, t, libxl__sprintf(gc, "%s/online", be_path), "0", strlen("0")); - xs_write(ctx->xsh, t, state_path, "5", strlen("5")); - if (!xs_transaction_end(ctx->xsh, t, 0)) { - if (errno == EAGAIN) - goto retry_transaction; - else { - rc = ERROR_FAIL; + for (;;) { + rc = libxl__xs_transaction_start(gc, &t); + if (rc) { + LOG(ERROR, "unable to start transaction"); goto out_fail; } + + rc = libxl__xs_read_checked(gc, t, state_path, &state); + if (rc) { + LOG(ERROR, "unable to read device state from path %s", state_path); + goto out_fail; + } + + /* + * Check if device is already in "closed" state, in which case + * it should not be changed. + */ + if (state && atoi(state) != XenbusStateClosed) { + rc = libxl__xs_write_checked(gc, t, online_path, "0"); + if (rc) { + LOG(ERROR, "unable to write to xenstore path %s", online_path); + goto out_fail; + } + rc = libxl__xs_write_checked(gc, t, state_path, "5"); + if (rc) { + LOG(ERROR, "unable to write to xenstore path %s", state_path); + goto out_fail; + } + } + + rc = libxl__xs_transaction_commit(gc, &t); + if (!rc) break; + if (rc < 0) goto out_fail; } libxl__device_destroy_tapdisk(gc, be_path); @@ -491,16 +506,14 @@ retry_transaction: LIBXL_DESTROY_TIMEOUT * 1000); if (rc) goto out_fail; + libxl__ao_complete(egc, ao, 0); return 0; out_fail: assert(rc); + libxl__xs_transaction_abort(gc, &t); device_remove_cleanup(gc, aorm); return rc; - - out_ok: - libxl__ao_complete(egc, ao, 0); - return 0; } static void device_remove_callback(libxl__egc *egc, libxl__ev_devstate *ds, _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 23 19:56:07 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jul 2012 19:56:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StOje-00051w-Sn; Mon, 23 Jul 2012 19:56:06 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StOj8-0004rm-Vf for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:56:05 +0000 Received: from [85.158.139.83:57864] by server-11.bemta-5.messagelabs.com id 61/69-20400-12CAD005; Mon, 23 Jul 2012 19:55:13 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-182.messagelabs.com!1343073311!25526949!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 24328 invoked from network); 23 Jul 2012 19:55:12 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 23 Jul 2012 19:55:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StOik-0001qB-Nf for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1StOik-0005fy-Li for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:10 +0000 Message-Id: Date: Mon, 23 Jul 2012 19:55:10 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: check backend state before setting it to "closing" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343045379 -3600 # Node ID 9387f8c77f9aa859f1eee7d4a86a6e8585a555fd # Parent c1d4d2b87505f749089e9a11fc42287c41b08870 libxl: check backend state before setting it to "closing" Check backend state before unconditionally setting it to "closing" (5), since it might already be in "closed" (6). Signed-off-by: Roger Pau Monne Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r c1d4d2b87505 -r 9387f8c77f9a tools/libxl/libxl_device.c --- a/tools/libxl/libxl_device.c Mon Jul 23 13:09:38 2012 +0100 +++ b/tools/libxl/libxl_device.c Mon Jul 23 13:09:39 2012 +0100 @@ -451,33 +451,48 @@ int libxl__initiate_device_remove(libxl_ libxl__device *dev) { AO_GC; - libxl_ctx *ctx = libxl__gc_owner(gc); - xs_transaction_t t; + xs_transaction_t t = 0; char *be_path = libxl__device_backend_path(gc, dev); char *state_path = libxl__sprintf(gc, "%s/state", be_path); - char *state = libxl__xs_read(gc, XBT_NULL, state_path); + char *online_path = GCSPRINTF("%s/online", be_path); + const char *state; + int rc = 0; libxl__ao_device_remove *aorm = 0; - if (!state) - goto out_ok; - if (atoi(state) != 4) { - libxl__device_destroy_tapdisk(gc, be_path); - xs_rm(ctx->xsh, XBT_NULL, be_path); - goto out_ok; - } - -retry_transaction: - t = xs_transaction_start(ctx->xsh); - xs_write(ctx->xsh, t, libxl__sprintf(gc, "%s/online", be_path), "0", strlen("0")); - xs_write(ctx->xsh, t, state_path, "5", strlen("5")); - if (!xs_transaction_end(ctx->xsh, t, 0)) { - if (errno == EAGAIN) - goto retry_transaction; - else { - rc = ERROR_FAIL; + for (;;) { + rc = libxl__xs_transaction_start(gc, &t); + if (rc) { + LOG(ERROR, "unable to start transaction"); goto out_fail; } + + rc = libxl__xs_read_checked(gc, t, state_path, &state); + if (rc) { + LOG(ERROR, "unable to read device state from path %s", state_path); + goto out_fail; + } + + /* + * Check if device is already in "closed" state, in which case + * it should not be changed. + */ + if (state && atoi(state) != XenbusStateClosed) { + rc = libxl__xs_write_checked(gc, t, online_path, "0"); + if (rc) { + LOG(ERROR, "unable to write to xenstore path %s", online_path); + goto out_fail; + } + rc = libxl__xs_write_checked(gc, t, state_path, "5"); + if (rc) { + LOG(ERROR, "unable to write to xenstore path %s", state_path); + goto out_fail; + } + } + + rc = libxl__xs_transaction_commit(gc, &t); + if (!rc) break; + if (rc < 0) goto out_fail; } libxl__device_destroy_tapdisk(gc, be_path); @@ -491,16 +506,14 @@ retry_transaction: LIBXL_DESTROY_TIMEOUT * 1000); if (rc) goto out_fail; + libxl__ao_complete(egc, ao, 0); return 0; out_fail: assert(rc); + libxl__xs_transaction_abort(gc, &t); device_remove_cleanup(gc, aorm); return rc; - - out_ok: - libxl__ao_complete(egc, ao, 0); - return 0; } static void device_remove_callback(libxl__egc *egc, libxl__ev_devstate *ds, _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 23 19:56:09 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jul 2012 19:56:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StOjf-00052E-VV; Mon, 23 Jul 2012 19:56:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StOje-00051t-Jy for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:56:06 +0000 Received: from [85.158.139.83:58052] by server-5.bemta-5.messagelabs.com id 44/EE-02722-62CAD005; Mon, 23 Jul 2012 19:55:18 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-182.messagelabs.com!1343073316!28235298!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 28404 invoked from network); 23 Jul 2012 19:55:17 -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; 23 Jul 2012 19:55:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StOip-0001qW-RH for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1StOip-0005hk-Ph for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:15 +0000 Message-Id: Date: Mon, 23 Jul 2012 19:55:15 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] pygrub: don't leave fds open X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343045385 -3600 # Node ID 7b8b143e4a86a49ca2c82c450b84ad6d4f023c34 # Parent 8948b4b1084544490b6dff60ea6d4e1b86ce4fa4 pygrub: don't leave fds open On NetBSD a block device can only be opened once, so make sure pygrub closes it every time, if this is not done libfsimage is not able to open the disk later. Signed-off-by: Roger Pau Monne Acked-by: Christoph Egger Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r 8948b4b10845 -r 7b8b143e4a86 tools/pygrub/src/pygrub --- a/tools/pygrub/src/pygrub Mon Jul 23 13:09:44 2012 +0100 +++ b/tools/pygrub/src/pygrub Mon Jul 23 13:09:45 2012 +0100 @@ -67,6 +67,7 @@ def get_solaris_slice(file, offset): fd = os.open(file, os.O_RDONLY) os.lseek(fd, offset + (DK_LABEL_LOC * SECTOR_SIZE), 0) buf = os.read(fd, 512) + os.close(fd) if struct.unpack(" Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jul 2012 19:56:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StOjf-00052E-VV; Mon, 23 Jul 2012 19:56:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StOje-00051t-Jy for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:56:06 +0000 Received: from [85.158.139.83:58052] by server-5.bemta-5.messagelabs.com id 44/EE-02722-62CAD005; Mon, 23 Jul 2012 19:55:18 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-182.messagelabs.com!1343073316!28235298!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 28404 invoked from network); 23 Jul 2012 19:55:17 -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; 23 Jul 2012 19:55:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StOip-0001qW-RH for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1StOip-0005hk-Ph for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:15 +0000 Message-Id: Date: Mon, 23 Jul 2012 19:55:15 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] pygrub: don't leave fds open X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343045385 -3600 # Node ID 7b8b143e4a86a49ca2c82c450b84ad6d4f023c34 # Parent 8948b4b1084544490b6dff60ea6d4e1b86ce4fa4 pygrub: don't leave fds open On NetBSD a block device can only be opened once, so make sure pygrub closes it every time, if this is not done libfsimage is not able to open the disk later. Signed-off-by: Roger Pau Monne Acked-by: Christoph Egger Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r 8948b4b10845 -r 7b8b143e4a86 tools/pygrub/src/pygrub --- a/tools/pygrub/src/pygrub Mon Jul 23 13:09:44 2012 +0100 +++ b/tools/pygrub/src/pygrub Mon Jul 23 13:09:45 2012 +0100 @@ -67,6 +67,7 @@ def get_solaris_slice(file, offset): fd = os.open(file, os.O_RDONLY) os.lseek(fd, offset + (DK_LABEL_LOC * SECTOR_SIZE), 0) buf = os.read(fd, 512) + os.close(fd) if struct.unpack(" Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jul 2012 20:19:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StP6U-0005ok-6b; Mon, 23 Jul 2012 20:19:42 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StP6S-0005of-B7 for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 20:19:40 +0000 Received: from [85.158.139.83:58016] by server-6.bemta-5.messagelabs.com id A2/04-11348-52CAD005; Mon, 23 Jul 2012 19:55:17 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-182.messagelabs.com!1343073314!16959535!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 9798 invoked from network); 23 Jul 2012 19:55:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 23 Jul 2012 19:55:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StOin-0001qK-My for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1StOin-0005gm-Hk for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:13 +0000 Message-Id: Date: Mon, 23 Jul 2012 19:55:12 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: convert libxl_domain_destroy to an async op X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343045382 -3600 # Node ID b01fe9f834a2148a7d99fbd7a71fbd85b595e14d # Parent fe3abe8878067043ab52d70d00f2c404edd1ff3a libxl: convert libxl_domain_destroy to an async op This change introduces some new structures, and breaks the mutual dependency that libxl_domain_destroy and libxl__destroy_device_model had. This is done by checking if the domid passed to libxl_domain_destroy has a stubdom, and then having the bulk of the destroy machinery in a separate function (libxl__destroy_domid) that doesn't check for stubdom presence, since we check for it in the upper level function. The reason behind this change is the need to use structures for ao operations, and it was impossible to have two different self-referencing structs. All uses of libxl_domain_destroy have been changed, and either replaced by the new libxl_domain_destroy ao function or by the internal libxl__domain_destroy that can be used inside an already running ao. Signed-off-by: Roger Pau Monne Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r fe3abe887806 -r b01fe9f834a2 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Mon Jul 23 13:09:41 2012 +0100 +++ b/tools/libxl/libxl.c Mon Jul 23 13:09:42 2012 +0100 @@ -1216,11 +1216,133 @@ void libxl_evdisable_disk_eject(libxl_ct GC_FREE; } -int libxl_domain_destroy(libxl_ctx *ctx, uint32_t domid) +/* Callbacks for libxl_domain_destroy */ + +static void domain_destroy_cb(libxl__egc *egc, libxl__domain_destroy_state *dds, + int rc); + +int libxl_domain_destroy(libxl_ctx *ctx, uint32_t domid, + const libxl_asyncop_how *ao_how) { - GC_INIT(ctx); + AO_CREATE(ctx, domid, ao_how); + libxl__domain_destroy_state *dds; + + GCNEW(dds); + dds->ao = ao; + dds->domid = domid; + dds->callback = domain_destroy_cb; + libxl__domain_destroy(egc, dds); + + return AO_INPROGRESS; +} + +static void domain_destroy_cb(libxl__egc *egc, libxl__domain_destroy_state *dds, + int rc) +{ + STATE_AO_GC(dds->ao); + + if (rc) + LOG(ERROR, "destruction of domain %u failed", dds->domid); + + libxl__ao_complete(egc, ao, rc); +} + +/* Callbacks for libxl__domain_destroy */ + +static void stubdom_destroy_callback(libxl__egc *egc, + libxl__destroy_domid_state *dis, + int rc); + +static void domain_destroy_callback(libxl__egc *egc, + libxl__destroy_domid_state *dis, + int rc); + +static void destroy_finish_check(libxl__egc *egc, + libxl__domain_destroy_state *dds); + +void libxl__domain_destroy(libxl__egc *egc, libxl__domain_destroy_state *dds) +{ + STATE_AO_GC(dds->ao); + uint32_t stubdomid = libxl_get_stubdom_id(CTX, dds->domid); + + if (stubdomid) { + dds->stubdom.ao = ao; + dds->stubdom.domid = stubdomid; + dds->stubdom.callback = stubdom_destroy_callback; + libxl__destroy_domid(egc, &dds->stubdom); + } else { + dds->stubdom_finished = 1; + } + + dds->domain.ao = ao; + dds->domain.domid = dds->domid; + dds->domain.callback = domain_destroy_callback; + libxl__destroy_domid(egc, &dds->domain); +} + +static void stubdom_destroy_callback(libxl__egc *egc, + libxl__destroy_domid_state *dis, + int rc) +{ + STATE_AO_GC(dis->ao); + libxl__domain_destroy_state *dds = CONTAINER_OF(dis, *dds, stubdom); + const char *savefile; + + if (rc) { + LOG(ERROR, "unable to destroy stubdom with domid %u", dis->domid); + dds->rc = rc; + } + + dds->stubdom_finished = 1; + savefile = libxl__device_model_savefile(gc, dis->domid); + rc = libxl__remove_file(gc, savefile); + /* + * On suspend libxl__domain_save_device_model will have already + * unlinked the save file. + */ + if (rc) { + LOG(ERROR, "failed to remove device-model savefile %s", savefile); + } + + destroy_finish_check(egc, dds); +} + +static void domain_destroy_callback(libxl__egc *egc, + libxl__destroy_domid_state *dis, + int rc) +{ + STATE_AO_GC(dis->ao); + libxl__domain_destroy_state *dds = CONTAINER_OF(dis, *dds, domain); + + if (rc) { + LOG(ERROR, "unable to destroy guest with domid %u", dis->domid); + dds->rc = rc; + } + + dds->domain_finished = 1; + destroy_finish_check(egc, dds); +} + +static void destroy_finish_check(libxl__egc *egc, + libxl__domain_destroy_state *dds) +{ + if (!(dds->domain_finished && dds->stubdom_finished)) + return; + + dds->callback(egc, dds, dds->rc); +} + +/* Callbacks for libxl__destroy_domid */ +static void devices_destroy_cb(libxl__egc *egc, + libxl__devices_remove_state *drs, + int rc); + +void libxl__destroy_domid(libxl__egc *egc, libxl__destroy_domid_state *dis) +{ + STATE_AO_GC(dis->ao); + libxl_ctx *ctx = CTX; + uint32_t domid = dis->domid; char *dom_path; - char *vm_path; char *pid; int rc, dm_present; @@ -1231,12 +1353,15 @@ int libxl_domain_destroy(libxl_ctx *ctx, case ERROR_INVAL: LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "non-existant domain %d", domid); default: - return rc; + goto out; } switch (libxl__domain_type(gc, domid)) { case LIBXL_DOMAIN_TYPE_HVM: - dm_present = 1; + if (!libxl_get_stubdom_id(CTX, domid)) + dm_present = 1; + else + dm_present = 0; break; case LIBXL_DOMAIN_TYPE_PV: pid = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, "/local/domain/%d/image/device-model-pid", domid)); @@ -1267,7 +1392,37 @@ int libxl_domain_destroy(libxl_ctx *ctx, libxl__qmp_cleanup(gc, domid); } - if (libxl__devices_destroy(gc, domid) < 0) + dis->drs.ao = ao; + dis->drs.domid = domid; + dis->drs.callback = devices_destroy_cb; + dis->drs.force = 1; + libxl__devices_destroy(egc, &dis->drs); + return; + +out: + assert(rc); + dis->callback(egc, dis, rc); + return; +} + +static void devices_destroy_cb(libxl__egc *egc, + libxl__devices_remove_state *drs, + int rc) +{ + STATE_AO_GC(drs->ao); + libxl__destroy_domid_state *dis = CONTAINER_OF(drs, *dis, drs); + libxl_ctx *ctx = CTX; + uint32_t domid = dis->domid; + char *dom_path; + char *vm_path; + + dom_path = libxl__xs_get_dompath(gc, domid); + if (!dom_path) { + rc = ERROR_FAIL; + goto out; + } + + if (rc < 0) LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "libxl__devices_destroy failed for %d", domid); @@ -1280,6 +1435,10 @@ int libxl_domain_destroy(libxl_ctx *ctx, LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "xs_rm failed for %s", dom_path); xs_rm(ctx->xsh, XBT_NULL, libxl__xs_libxl_path(gc, domid)); + xs_rm(ctx->xsh, XBT_NULL, libxl__sprintf(gc, + "/local/domain/0/device-model/%d", domid)); + xs_rm(ctx->xsh, XBT_NULL, libxl__sprintf(gc, + "/local/domain/%d/hvmloader", domid)); libxl__userdata_destroyall(gc, domid); @@ -1290,9 +1449,10 @@ int libxl_domain_destroy(libxl_ctx *ctx, goto out; } rc = 0; + out: - GC_FREE; - return rc; + dis->callback(egc, dis, rc); + return; } int libxl_console_exec(libxl_ctx *ctx, uint32_t domid, int cons_num, diff -r fe3abe887806 -r b01fe9f834a2 tools/libxl/libxl.h --- a/tools/libxl/libxl.h Mon Jul 23 13:09:41 2012 +0100 +++ b/tools/libxl/libxl.h Mon Jul 23 13:09:42 2012 +0100 @@ -527,7 +527,8 @@ int libxl_domain_remus_start(libxl_ctx * 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); +int libxl_domain_destroy(libxl_ctx *ctx, uint32_t domid, + const libxl_asyncop_how *ao_how); 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 */ diff -r fe3abe887806 -r b01fe9f834a2 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Mon Jul 23 13:09:41 2012 +0100 +++ b/tools/libxl/libxl_create.c Mon Jul 23 13:09:42 2012 +0100 @@ -571,6 +571,12 @@ static void domcreate_complete(libxl__eg libxl__domain_create_state *dcs, int rc); +/* If creation is not successful, this callback will be executed + * when domain destruction is finished */ +static void domcreate_destruction_cb(libxl__egc *egc, + libxl__domain_destroy_state *dds, + int rc); + static void initiate_domain_create(libxl__egc *egc, libxl__domain_create_state *dcs) { @@ -999,16 +1005,31 @@ static void domcreate_complete(libxl__eg if (rc) { if (dcs->guest_domid) { - int rc2 = libxl_domain_destroy(CTX, dcs->guest_domid); - if (rc2) - LOG(ERROR, "unable to destroy domain %d following" - " failed creation", dcs->guest_domid); + dcs->dds.ao = ao; + dcs->dds.domid = dcs->guest_domid; + dcs->dds.callback = domcreate_destruction_cb; + libxl__domain_destroy(egc, &dcs->dds); + return; } dcs->guest_domid = -1; } dcs->callback(egc, dcs, rc, dcs->guest_domid); } +static void domcreate_destruction_cb(libxl__egc *egc, + libxl__domain_destroy_state *dds, + int rc) +{ + STATE_AO_GC(dds->ao); + libxl__domain_create_state *dcs = CONTAINER_OF(dds, *dcs, dds); + + if (rc) + LOG(ERROR, "unable to destroy domain %u following failed creation", + dds->domid); + + dcs->callback(egc, dcs, ERROR_FAIL, dcs->guest_domid); +} + /*----- application-facing domain creation interface -----*/ typedef struct { diff -r fe3abe887806 -r b01fe9f834a2 tools/libxl/libxl_device.c --- a/tools/libxl/libxl_device.c Mon Jul 23 13:09:41 2012 +0100 +++ b/tools/libxl/libxl_device.c Mon Jul 23 13:09:42 2012 +0100 @@ -58,6 +58,48 @@ 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; + + 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__device_generic_add(libxl__gc *gc, xs_transaction_t t, libxl__device *device, char **bents, char **fents) { @@ -370,6 +412,37 @@ void libxl__prepare_ao_device(libxl__ao aodev->dev = NULL; /* Initialize timer for QEMU Bodge */ libxl__ev_time_init(&aodev->timeout); + aodev->active = 1; +} + +void libxl__prepare_ao_devices(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]); + } +} + +void libxl__ao_devices_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) + return; + + if (aodevs->array[i].rc) + error = aodevs->array[i].rc; + } + + aodevs->callback(egc, aodevs, error); + return; } int libxl__device_destroy(libxl__gc *gc, libxl__device *dev) @@ -386,16 +459,35 @@ int libxl__device_destroy(libxl__gc *gc, return 0; } -int libxl__devices_destroy(libxl__gc *gc, uint32_t domid) +/* Callback for device destruction */ + +static void devices_remove_callback(libxl__egc *egc, libxl__ao_devices *aodevs, + int rc); + +void libxl__devices_destroy(libxl__egc *egc, libxl__devices_remove_state *drs) { + STATE_AO_GC(drs->ao); libxl_ctx *ctx = libxl__gc_owner(gc); + uint32_t domid = drs->domid; char *path; - unsigned int num_kinds, num_devs; + unsigned int num_kinds, num_dev_xsentries; char **kinds = NULL, **devs = NULL; - int i, j; - libxl__device dev; + int i, j, numdev = 0, 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); + aodevs->callback = devices_remove_callback; + path = libxl__sprintf(gc, "/local/domain/%d/device", domid); kinds = libxl__xs_directory(gc, XBT_NULL, path, &num_kinds); if (!kinds) { @@ -411,19 +503,25 @@ int libxl__devices_destroy(libxl__gc *gc continue; path = libxl__sprintf(gc, "/local/domain/%d/device/%s", domid, kinds[i]); - devs = libxl__xs_directory(gc, XBT_NULL, path, &num_devs); + devs = libxl__xs_directory(gc, XBT_NULL, path, &num_dev_xsentries); if (!devs) continue; - for (j = 0; j < num_devs; j++) { + for (j = 0; j < num_dev_xsentries; j++) { path = libxl__sprintf(gc, "/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) { - dev.domid = domid; - dev.kind = kind; - dev.devid = atoi(devs[j]); - - libxl__device_destroy(gc, &dev); + GCNEW(dev); + if (path && libxl__parse_backend_path(gc, path, dev) == 0) { + aodev = &aodevs->array[numdev]; + dev->domid = domid; + dev->kind = kind; + dev->devid = atoi(devs[j]); + aodev->action = DEVICE_DISCONNECT; + aodev->dev = dev; + aodev->callback = libxl__ao_devices_callback; + aodev->force = drs->force; + libxl__initiate_device_remove(egc, aodev); + numdev++; } } } @@ -431,17 +529,22 @@ int libxl__devices_destroy(libxl__gc *gc /* console 0 frontend directory is not under /local/domain//device */ path = libxl__sprintf(gc, "/local/domain/%d/console/backend", domid); path = libxl__xs_read(gc, XBT_NULL, path); + GCNEW(dev); if (path && strcmp(path, "") && - libxl__parse_backend_path(gc, path, &dev) == 0) { - dev.domid = domid; - dev.kind = LIBXL__DEVICE_KIND_CONSOLE; - dev.devid = 0; + libxl__parse_backend_path(gc, path, dev) == 0) { + dev->domid = domid; + dev->kind = LIBXL__DEVICE_KIND_CONSOLE; + dev->devid = 0; - libxl__device_destroy(gc, &dev); + /* Currently console devices can be destroyed synchronously by just + * removing xenstore entries, this is what libxl__device_destroy does. + */ + libxl__device_destroy(gc, dev); } out: - return 0; + if (!numdev) drs->callback(egc, drs, rc); + return; } /* Callbacks for device related operations */ @@ -645,6 +748,16 @@ out: return; } +static void devices_remove_callback(libxl__egc *egc, libxl__ao_devices *aodevs, + int rc) +{ + libxl__devices_remove_state *drs = CONTAINER_OF(aodevs, *drs, aodevs); + STATE_AO_GC(drs->ao); + + drs->callback(egc, drs, rc); + return; +} + int libxl__wait_for_device_model(libxl__gc *gc, uint32_t domid, char *state, libxl__spawn_starting *spawning, diff -r fe3abe887806 -r b01fe9f834a2 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Mon Jul 23 13:09:41 2012 +0100 +++ b/tools/libxl/libxl_dm.c Mon Jul 23 13:09:42 2012 +0100 @@ -694,6 +694,10 @@ static void spawn_stubdom_pvqemu_cb(libx libxl__dm_spawn_state *stubdom_dmss, int rc); +static void spaw_stubdom_pvqemu_destroy_cb(libxl__egc *egc, + libxl__destroy_domid_state *dis, + int rc); + void libxl__spawn_stub_dm(libxl__egc *egc, libxl__stub_dm_spawn_state *sdss) { STATE_AO_GC(sdss->dm.spawn.ao); @@ -914,12 +918,31 @@ static void spawn_stubdom_pvqemu_cb(libx out: if (rc) { - if (dm_domid) - libxl_domain_destroy(CTX, dm_domid); + if (dm_domid) { + sdss->dis.ao = ao; + sdss->dis.domid = dm_domid; + sdss->dis.callback = spaw_stubdom_pvqemu_destroy_cb; + libxl__destroy_domid(egc, &sdss->dis); + return; + } } sdss->callback(egc, &sdss->dm, rc); } +static void spaw_stubdom_pvqemu_destroy_cb(libxl__egc *egc, + libxl__destroy_domid_state *dis, + int rc) +{ + libxl__stub_dm_spawn_state *sdss = CONTAINER_OF(dis, *sdss, dis); + STATE_AO_GC(sdss->dis.ao); + + if (rc) + LOG(ERROR, "destruction of domain %u after failed creation failed", + sdss->pvqemu.guest_domid); + + sdss->callback(egc, &sdss->dm, rc); +} + /* callbacks passed to libxl__spawn_spawn */ static void device_model_confirm(libxl__egc *egc, libxl__spawn_state *spawn, const char *xsdata); @@ -1115,55 +1138,27 @@ static void device_model_spawn_outcome(l int libxl__destroy_device_model(libxl__gc *gc, uint32_t domid) { - libxl_ctx *ctx = libxl__gc_owner(gc); char *pid; int ret; pid = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, "/local/domain/%d/image/device-model-pid", domid)); - if (!pid) { - int stubdomid = libxl_get_stubdom_id(ctx, domid); - const char *savefile; - - if (!stubdomid) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Couldn't find device model's pid"); - ret = ERROR_INVAL; - goto out; - } - LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "Device model is a stubdom, domid=%d", stubdomid); - ret = libxl_domain_destroy(ctx, stubdomid); - if (ret) - goto out; - - savefile = libxl__device_model_savefile(gc, domid); - ret = unlink(savefile); - /* - * On suspend libxl__domain_save_device_model will have already - * unlinked the save file. - */ - if (ret && errno == ENOENT) ret = 0; - if (ret) { - LIBXL__LOG_ERRNO(ctx, XTL_ERROR, - "failed to remove device-model savefile %s\n", - savefile); - goto out; - } + if (!pid || !atoi(pid)) { + LOG(ERROR, "could not find device-model's pid for dom %u", domid); + ret = ERROR_FAIL; + goto out; + } + ret = kill(atoi(pid), SIGHUP); + if (ret < 0 && errno == ESRCH) { + LOG(ERROR, "Device Model already exited"); + ret = 0; + } else if (ret == 0) { + LOG(DEBUG, "Device Model signaled"); + ret = 0; } else { - ret = kill(atoi(pid), SIGHUP); - if (ret < 0 && errno == ESRCH) { - LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "Device Model already exited"); - ret = 0; - } else if (ret == 0) { - LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "Device Model signaled"); - ret = 0; - } else { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "failed to kill Device Model [%d]", - atoi(pid)); - ret = ERROR_FAIL; - goto out; - } + LOGE(ERROR, "failed to kill Device Model [%d]", atoi(pid)); + ret = ERROR_FAIL; + goto out; } - xs_rm(ctx->xsh, XBT_NULL, libxl__sprintf(gc, "/local/domain/0/device-model/%d", domid)); - xs_rm(ctx->xsh, XBT_NULL, libxl__sprintf(gc, "/local/domain/%d/hvmloader", domid)); out: return ret; diff -r fe3abe887806 -r b01fe9f834a2 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Mon Jul 23 13:09:41 2012 +0100 +++ b/tools/libxl/libxl_internal.h Mon Jul 23 13:09:42 2012 +0100 @@ -875,7 +875,6 @@ _hidden char *libxl__device_frontend_pat _hidden int libxl__parse_backend_path(libxl__gc *gc, const char *path, libxl__device *dev); _hidden int libxl__device_destroy(libxl__gc *gc, libxl__device *dev); -_hidden int libxl__devices_destroy(libxl__gc *gc, uint32_t domid); _hidden int libxl__wait_for_backend(libxl__gc *gc, char *be_path, char *state); /* @@ -1978,6 +1977,7 @@ typedef enum { } libxl__device_action; typedef struct libxl__ao_device libxl__ao_device; +typedef struct libxl__ao_devices libxl__ao_devices; typedef void libxl__device_callback(libxl__egc*, libxl__ao_device*); /* This functions sets the necessary libxl__ao_device struct values to use @@ -1996,6 +1996,20 @@ 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; @@ -2004,10 +2018,27 @@ struct libxl__ao_device { int force; libxl__device_callback *callback; /* private for implementation */ + int active; int rc; libxl__ev_devstate backend_ds; /* Bodge for Qemu devices */ libxl__ev_time timeout; + /* Used internally to have a reference to the upper libxl__ao_devices + * struct when present */ + libxl__ao_devices *aodevs; +}; + +/* Helper struct to simply the plug/unplug of multiple devices at the same + * time. + * + * This structure holds several devices, and the callback is only called + * when all the devices inside of the array have finished. + */ +typedef void libxl__devices_callback(libxl__egc*, libxl__ao_devices*, int rc); +struct libxl__ao_devices { + libxl__ao_device *array; + int size; + libxl__devices_callback *callback; }; /* @@ -2098,6 +2129,86 @@ struct libxl__ao_device { _hidden void libxl__initiate_device_remove(libxl__egc *egc, libxl__ao_device *aodev); +/*----- Domain destruction -----*/ + +/* Domain destruction has been split into two functions: + * + * libxl__domain_destroy is the main destroy function, which detects + * stubdoms and calls libxl__destroy_domid on the domain and its + * stubdom if present, creating a different libxl__destroy_domid_state + * for each one of them. + * + * libxl__destroy_domid actually destroys the domain, but it + * doesn't check for stubdomains, since that would involve + * recursion, which we want to avoid. + */ + +typedef struct libxl__domain_destroy_state libxl__domain_destroy_state; +typedef struct libxl__destroy_domid_state libxl__destroy_domid_state; +typedef struct libxl__devices_remove_state libxl__devices_remove_state; + +typedef void libxl__domain_destroy_cb(libxl__egc *egc, + libxl__domain_destroy_state *dds, + int rc); + +typedef void libxl__domid_destroy_cb(libxl__egc *egc, + libxl__destroy_domid_state *dis, + int rc); + +typedef void libxl__devices_remove_callback(libxl__egc *egc, + libxl__devices_remove_state *drs, + int rc); + +struct libxl__devices_remove_state { + /* filled in by user */ + libxl__ao *ao; + uint32_t domid; + libxl__devices_remove_callback *callback; + int force; /* libxl_device_TYPE_destroy rather than _remove */ + /* private */ + libxl__ao_devices aodevs; + int num_devices; +}; + +struct libxl__destroy_domid_state { + /* filled in by user */ + libxl__ao *ao; + uint32_t domid; + libxl__domid_destroy_cb *callback; + /* private to implementation */ + libxl__devices_remove_state drs; +}; + +struct libxl__domain_destroy_state { + /* filled by the user */ + libxl__ao *ao; + uint32_t domid; + libxl__domain_destroy_cb *callback; + /* Private */ + int rc; + uint32_t stubdomid; + libxl__destroy_domid_state stubdom; + int stubdom_finished; + libxl__destroy_domid_state domain; + int domain_finished; +}; + +/* + * Entry point for domain destruction + * This function checks for stubdom presence and then calls + * libxl__destroy_domid on the passed domain and its stubdom if found. + */ +_hidden void libxl__domain_destroy(libxl__egc *egc, + libxl__domain_destroy_state *dds); + +/* Used to destroy a domain with the passed id (it doesn't check for stubs) */ +_hidden void libxl__destroy_domid(libxl__egc *egc, + libxl__destroy_domid_state *dis); + +/* Entry point for devices destruction */ +_hidden void libxl__devices_destroy(libxl__egc *egc, + libxl__devices_remove_state *drs); + /*----- device model creation -----*/ /* First layer; wraps libxl__spawn_spawn. */ @@ -2131,6 +2242,7 @@ typedef struct { libxl_domain_config dm_config; libxl__domain_build_state dm_state; libxl__dm_spawn_state pvqemu; + libxl__destroy_domid_state dis; } libxl__stub_dm_spawn_state; _hidden void libxl__spawn_stub_dm(libxl__egc *egc, libxl__stub_dm_spawn_state*); @@ -2158,6 +2270,8 @@ struct libxl__domain_create_state { /* If we're not doing stubdom, we use only dmss.dm, * for the non-stubdom device model. */ libxl__save_helper_state shs; + /* necessary if the domain creation failed and we have to destroy it */ + libxl__domain_destroy_state dds; }; /*----- Domain suspend (save) functions -----*/ diff -r fe3abe887806 -r b01fe9f834a2 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Mon Jul 23 13:09:41 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Mon Jul 23 13:09:42 2012 +0100 @@ -1400,7 +1400,7 @@ static int handle_domain_death(uint32_t case LIBXL_ACTION_ON_SHUTDOWN_DESTROY: LOG("Domain %d needs to be cleaned up: destroying the domain", *r_domid); - libxl_domain_destroy(ctx, *r_domid); + libxl_domain_destroy(ctx, *r_domid, 0); *r_domid = INVALID_DOMID; break; @@ -2015,7 +2015,7 @@ start: error_out: release_lock(); if (libxl_domid_valid_guest(domid)) { - libxl_domain_destroy(ctx, domid); + libxl_domain_destroy(ctx, domid, 0); domid = INVALID_DOMID; } @@ -2580,7 +2580,7 @@ static void destroy_domain(const char *p fprintf(stderr, "Cannot destroy privileged domain 0.\n\n"); exit(-1); } - rc = libxl_domain_destroy(ctx, domid); + rc = libxl_domain_destroy(ctx, domid, 0); if (rc) { fprintf(stderr,"destroy failed (rc=%d)\n",rc); exit(-1); } } @@ -2854,7 +2854,7 @@ static int save_domain(const char *p, co if (checkpoint) libxl_domain_resume(ctx, domid, 1); else - libxl_domain_destroy(ctx, domid); + libxl_domain_destroy(ctx, domid, 0); exit(0); } @@ -3111,7 +3111,7 @@ static void migrate_domain(const char *d } fprintf(stderr, "migration sender: Target reports successful startup.\n"); - libxl_domain_destroy(ctx, domid); /* bang! */ + libxl_domain_destroy(ctx, domid, 0); /* bang! */ fprintf(stderr, "Migration successful.\n"); exit(0); @@ -3264,7 +3264,7 @@ static void migrate_receive(int debug, i if (rc) { fprintf(stderr, "migration target: Failure, destroying our copy.\n"); - rc2 = libxl_domain_destroy(ctx, domid); + rc2 = libxl_domain_destroy(ctx, domid, 0); if (rc2) { fprintf(stderr, "migration target: Failed to destroy our copy" " (code %d).\n", rc2); diff -r fe3abe887806 -r b01fe9f834a2 tools/python/xen/lowlevel/xl/xl.c --- a/tools/python/xen/lowlevel/xl/xl.c Mon Jul 23 13:09:41 2012 +0100 +++ b/tools/python/xen/lowlevel/xl/xl.c Mon Jul 23 13:09:42 2012 +0100 @@ -437,7 +437,7 @@ static PyObject *pyxl_domain_destroy(XlO int domid; if ( !PyArg_ParseTuple(args, "i", &domid) ) return NULL; - if ( libxl_domain_destroy(self->ctx, domid) ) { + if ( libxl_domain_destroy(self->ctx, domid, 0) ) { PyErr_SetString(xl_error_obj, "cannot destroy domain"); return NULL; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 23 20:19:43 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jul 2012 20:19:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StP6U-0005ok-6b; Mon, 23 Jul 2012 20:19:42 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StP6S-0005of-B7 for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 20:19:40 +0000 Received: from [85.158.139.83:58016] by server-6.bemta-5.messagelabs.com id A2/04-11348-52CAD005; Mon, 23 Jul 2012 19:55:17 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-182.messagelabs.com!1343073314!16959535!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 9798 invoked from network); 23 Jul 2012 19:55:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 23 Jul 2012 19:55:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StOin-0001qK-My for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1StOin-0005gm-Hk for xen-changelog@lists.xensource.com; Mon, 23 Jul 2012 19:55:13 +0000 Message-Id: Date: Mon, 23 Jul 2012 19:55:12 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: convert libxl_domain_destroy to an async op X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343045382 -3600 # Node ID b01fe9f834a2148a7d99fbd7a71fbd85b595e14d # Parent fe3abe8878067043ab52d70d00f2c404edd1ff3a libxl: convert libxl_domain_destroy to an async op This change introduces some new structures, and breaks the mutual dependency that libxl_domain_destroy and libxl__destroy_device_model had. This is done by checking if the domid passed to libxl_domain_destroy has a stubdom, and then having the bulk of the destroy machinery in a separate function (libxl__destroy_domid) that doesn't check for stubdom presence, since we check for it in the upper level function. The reason behind this change is the need to use structures for ao operations, and it was impossible to have two different self-referencing structs. All uses of libxl_domain_destroy have been changed, and either replaced by the new libxl_domain_destroy ao function or by the internal libxl__domain_destroy that can be used inside an already running ao. Signed-off-by: Roger Pau Monne Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r fe3abe887806 -r b01fe9f834a2 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Mon Jul 23 13:09:41 2012 +0100 +++ b/tools/libxl/libxl.c Mon Jul 23 13:09:42 2012 +0100 @@ -1216,11 +1216,133 @@ void libxl_evdisable_disk_eject(libxl_ct GC_FREE; } -int libxl_domain_destroy(libxl_ctx *ctx, uint32_t domid) +/* Callbacks for libxl_domain_destroy */ + +static void domain_destroy_cb(libxl__egc *egc, libxl__domain_destroy_state *dds, + int rc); + +int libxl_domain_destroy(libxl_ctx *ctx, uint32_t domid, + const libxl_asyncop_how *ao_how) { - GC_INIT(ctx); + AO_CREATE(ctx, domid, ao_how); + libxl__domain_destroy_state *dds; + + GCNEW(dds); + dds->ao = ao; + dds->domid = domid; + dds->callback = domain_destroy_cb; + libxl__domain_destroy(egc, dds); + + return AO_INPROGRESS; +} + +static void domain_destroy_cb(libxl__egc *egc, libxl__domain_destroy_state *dds, + int rc) +{ + STATE_AO_GC(dds->ao); + + if (rc) + LOG(ERROR, "destruction of domain %u failed", dds->domid); + + libxl__ao_complete(egc, ao, rc); +} + +/* Callbacks for libxl__domain_destroy */ + +static void stubdom_destroy_callback(libxl__egc *egc, + libxl__destroy_domid_state *dis, + int rc); + +static void domain_destroy_callback(libxl__egc *egc, + libxl__destroy_domid_state *dis, + int rc); + +static void destroy_finish_check(libxl__egc *egc, + libxl__domain_destroy_state *dds); + +void libxl__domain_destroy(libxl__egc *egc, libxl__domain_destroy_state *dds) +{ + STATE_AO_GC(dds->ao); + uint32_t stubdomid = libxl_get_stubdom_id(CTX, dds->domid); + + if (stubdomid) { + dds->stubdom.ao = ao; + dds->stubdom.domid = stubdomid; + dds->stubdom.callback = stubdom_destroy_callback; + libxl__destroy_domid(egc, &dds->stubdom); + } else { + dds->stubdom_finished = 1; + } + + dds->domain.ao = ao; + dds->domain.domid = dds->domid; + dds->domain.callback = domain_destroy_callback; + libxl__destroy_domid(egc, &dds->domain); +} + +static void stubdom_destroy_callback(libxl__egc *egc, + libxl__destroy_domid_state *dis, + int rc) +{ + STATE_AO_GC(dis->ao); + libxl__domain_destroy_state *dds = CONTAINER_OF(dis, *dds, stubdom); + const char *savefile; + + if (rc) { + LOG(ERROR, "unable to destroy stubdom with domid %u", dis->domid); + dds->rc = rc; + } + + dds->stubdom_finished = 1; + savefile = libxl__device_model_savefile(gc, dis->domid); + rc = libxl__remove_file(gc, savefile); + /* + * On suspend libxl__domain_save_device_model will have already + * unlinked the save file. + */ + if (rc) { + LOG(ERROR, "failed to remove device-model savefile %s", savefile); + } + + destroy_finish_check(egc, dds); +} + +static void domain_destroy_callback(libxl__egc *egc, + libxl__destroy_domid_state *dis, + int rc) +{ + STATE_AO_GC(dis->ao); + libxl__domain_destroy_state *dds = CONTAINER_OF(dis, *dds, domain); + + if (rc) { + LOG(ERROR, "unable to destroy guest with domid %u", dis->domid); + dds->rc = rc; + } + + dds->domain_finished = 1; + destroy_finish_check(egc, dds); +} + +static void destroy_finish_check(libxl__egc *egc, + libxl__domain_destroy_state *dds) +{ + if (!(dds->domain_finished && dds->stubdom_finished)) + return; + + dds->callback(egc, dds, dds->rc); +} + +/* Callbacks for libxl__destroy_domid */ +static void devices_destroy_cb(libxl__egc *egc, + libxl__devices_remove_state *drs, + int rc); + +void libxl__destroy_domid(libxl__egc *egc, libxl__destroy_domid_state *dis) +{ + STATE_AO_GC(dis->ao); + libxl_ctx *ctx = CTX; + uint32_t domid = dis->domid; char *dom_path; - char *vm_path; char *pid; int rc, dm_present; @@ -1231,12 +1353,15 @@ int libxl_domain_destroy(libxl_ctx *ctx, case ERROR_INVAL: LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "non-existant domain %d", domid); default: - return rc; + goto out; } switch (libxl__domain_type(gc, domid)) { case LIBXL_DOMAIN_TYPE_HVM: - dm_present = 1; + if (!libxl_get_stubdom_id(CTX, domid)) + dm_present = 1; + else + dm_present = 0; break; case LIBXL_DOMAIN_TYPE_PV: pid = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, "/local/domain/%d/image/device-model-pid", domid)); @@ -1267,7 +1392,37 @@ int libxl_domain_destroy(libxl_ctx *ctx, libxl__qmp_cleanup(gc, domid); } - if (libxl__devices_destroy(gc, domid) < 0) + dis->drs.ao = ao; + dis->drs.domid = domid; + dis->drs.callback = devices_destroy_cb; + dis->drs.force = 1; + libxl__devices_destroy(egc, &dis->drs); + return; + +out: + assert(rc); + dis->callback(egc, dis, rc); + return; +} + +static void devices_destroy_cb(libxl__egc *egc, + libxl__devices_remove_state *drs, + int rc) +{ + STATE_AO_GC(drs->ao); + libxl__destroy_domid_state *dis = CONTAINER_OF(drs, *dis, drs); + libxl_ctx *ctx = CTX; + uint32_t domid = dis->domid; + char *dom_path; + char *vm_path; + + dom_path = libxl__xs_get_dompath(gc, domid); + if (!dom_path) { + rc = ERROR_FAIL; + goto out; + } + + if (rc < 0) LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "libxl__devices_destroy failed for %d", domid); @@ -1280,6 +1435,10 @@ int libxl_domain_destroy(libxl_ctx *ctx, LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "xs_rm failed for %s", dom_path); xs_rm(ctx->xsh, XBT_NULL, libxl__xs_libxl_path(gc, domid)); + xs_rm(ctx->xsh, XBT_NULL, libxl__sprintf(gc, + "/local/domain/0/device-model/%d", domid)); + xs_rm(ctx->xsh, XBT_NULL, libxl__sprintf(gc, + "/local/domain/%d/hvmloader", domid)); libxl__userdata_destroyall(gc, domid); @@ -1290,9 +1449,10 @@ int libxl_domain_destroy(libxl_ctx *ctx, goto out; } rc = 0; + out: - GC_FREE; - return rc; + dis->callback(egc, dis, rc); + return; } int libxl_console_exec(libxl_ctx *ctx, uint32_t domid, int cons_num, diff -r fe3abe887806 -r b01fe9f834a2 tools/libxl/libxl.h --- a/tools/libxl/libxl.h Mon Jul 23 13:09:41 2012 +0100 +++ b/tools/libxl/libxl.h Mon Jul 23 13:09:42 2012 +0100 @@ -527,7 +527,8 @@ int libxl_domain_remus_start(libxl_ctx * 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); +int libxl_domain_destroy(libxl_ctx *ctx, uint32_t domid, + const libxl_asyncop_how *ao_how); 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 */ diff -r fe3abe887806 -r b01fe9f834a2 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Mon Jul 23 13:09:41 2012 +0100 +++ b/tools/libxl/libxl_create.c Mon Jul 23 13:09:42 2012 +0100 @@ -571,6 +571,12 @@ static void domcreate_complete(libxl__eg libxl__domain_create_state *dcs, int rc); +/* If creation is not successful, this callback will be executed + * when domain destruction is finished */ +static void domcreate_destruction_cb(libxl__egc *egc, + libxl__domain_destroy_state *dds, + int rc); + static void initiate_domain_create(libxl__egc *egc, libxl__domain_create_state *dcs) { @@ -999,16 +1005,31 @@ static void domcreate_complete(libxl__eg if (rc) { if (dcs->guest_domid) { - int rc2 = libxl_domain_destroy(CTX, dcs->guest_domid); - if (rc2) - LOG(ERROR, "unable to destroy domain %d following" - " failed creation", dcs->guest_domid); + dcs->dds.ao = ao; + dcs->dds.domid = dcs->guest_domid; + dcs->dds.callback = domcreate_destruction_cb; + libxl__domain_destroy(egc, &dcs->dds); + return; } dcs->guest_domid = -1; } dcs->callback(egc, dcs, rc, dcs->guest_domid); } +static void domcreate_destruction_cb(libxl__egc *egc, + libxl__domain_destroy_state *dds, + int rc) +{ + STATE_AO_GC(dds->ao); + libxl__domain_create_state *dcs = CONTAINER_OF(dds, *dcs, dds); + + if (rc) + LOG(ERROR, "unable to destroy domain %u following failed creation", + dds->domid); + + dcs->callback(egc, dcs, ERROR_FAIL, dcs->guest_domid); +} + /*----- application-facing domain creation interface -----*/ typedef struct { diff -r fe3abe887806 -r b01fe9f834a2 tools/libxl/libxl_device.c --- a/tools/libxl/libxl_device.c Mon Jul 23 13:09:41 2012 +0100 +++ b/tools/libxl/libxl_device.c Mon Jul 23 13:09:42 2012 +0100 @@ -58,6 +58,48 @@ 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; + + 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__device_generic_add(libxl__gc *gc, xs_transaction_t t, libxl__device *device, char **bents, char **fents) { @@ -370,6 +412,37 @@ void libxl__prepare_ao_device(libxl__ao aodev->dev = NULL; /* Initialize timer for QEMU Bodge */ libxl__ev_time_init(&aodev->timeout); + aodev->active = 1; +} + +void libxl__prepare_ao_devices(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]); + } +} + +void libxl__ao_devices_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) + return; + + if (aodevs->array[i].rc) + error = aodevs->array[i].rc; + } + + aodevs->callback(egc, aodevs, error); + return; } int libxl__device_destroy(libxl__gc *gc, libxl__device *dev) @@ -386,16 +459,35 @@ int libxl__device_destroy(libxl__gc *gc, return 0; } -int libxl__devices_destroy(libxl__gc *gc, uint32_t domid) +/* Callback for device destruction */ + +static void devices_remove_callback(libxl__egc *egc, libxl__ao_devices *aodevs, + int rc); + +void libxl__devices_destroy(libxl__egc *egc, libxl__devices_remove_state *drs) { + STATE_AO_GC(drs->ao); libxl_ctx *ctx = libxl__gc_owner(gc); + uint32_t domid = drs->domid; char *path; - unsigned int num_kinds, num_devs; + unsigned int num_kinds, num_dev_xsentries; char **kinds = NULL, **devs = NULL; - int i, j; - libxl__device dev; + int i, j, numdev = 0, 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); + aodevs->callback = devices_remove_callback; + path = libxl__sprintf(gc, "/local/domain/%d/device", domid); kinds = libxl__xs_directory(gc, XBT_NULL, path, &num_kinds); if (!kinds) { @@ -411,19 +503,25 @@ int libxl__devices_destroy(libxl__gc *gc continue; path = libxl__sprintf(gc, "/local/domain/%d/device/%s", domid, kinds[i]); - devs = libxl__xs_directory(gc, XBT_NULL, path, &num_devs); + devs = libxl__xs_directory(gc, XBT_NULL, path, &num_dev_xsentries); if (!devs) continue; - for (j = 0; j < num_devs; j++) { + for (j = 0; j < num_dev_xsentries; j++) { path = libxl__sprintf(gc, "/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) { - dev.domid = domid; - dev.kind = kind; - dev.devid = atoi(devs[j]); - - libxl__device_destroy(gc, &dev); + GCNEW(dev); + if (path && libxl__parse_backend_path(gc, path, dev) == 0) { + aodev = &aodevs->array[numdev]; + dev->domid = domid; + dev->kind = kind; + dev->devid = atoi(devs[j]); + aodev->action = DEVICE_DISCONNECT; + aodev->dev = dev; + aodev->callback = libxl__ao_devices_callback; + aodev->force = drs->force; + libxl__initiate_device_remove(egc, aodev); + numdev++; } } } @@ -431,17 +529,22 @@ int libxl__devices_destroy(libxl__gc *gc /* console 0 frontend directory is not under /local/domain//device */ path = libxl__sprintf(gc, "/local/domain/%d/console/backend", domid); path = libxl__xs_read(gc, XBT_NULL, path); + GCNEW(dev); if (path && strcmp(path, "") && - libxl__parse_backend_path(gc, path, &dev) == 0) { - dev.domid = domid; - dev.kind = LIBXL__DEVICE_KIND_CONSOLE; - dev.devid = 0; + libxl__parse_backend_path(gc, path, dev) == 0) { + dev->domid = domid; + dev->kind = LIBXL__DEVICE_KIND_CONSOLE; + dev->devid = 0; - libxl__device_destroy(gc, &dev); + /* Currently console devices can be destroyed synchronously by just + * removing xenstore entries, this is what libxl__device_destroy does. + */ + libxl__device_destroy(gc, dev); } out: - return 0; + if (!numdev) drs->callback(egc, drs, rc); + return; } /* Callbacks for device related operations */ @@ -645,6 +748,16 @@ out: return; } +static void devices_remove_callback(libxl__egc *egc, libxl__ao_devices *aodevs, + int rc) +{ + libxl__devices_remove_state *drs = CONTAINER_OF(aodevs, *drs, aodevs); + STATE_AO_GC(drs->ao); + + drs->callback(egc, drs, rc); + return; +} + int libxl__wait_for_device_model(libxl__gc *gc, uint32_t domid, char *state, libxl__spawn_starting *spawning, diff -r fe3abe887806 -r b01fe9f834a2 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Mon Jul 23 13:09:41 2012 +0100 +++ b/tools/libxl/libxl_dm.c Mon Jul 23 13:09:42 2012 +0100 @@ -694,6 +694,10 @@ static void spawn_stubdom_pvqemu_cb(libx libxl__dm_spawn_state *stubdom_dmss, int rc); +static void spaw_stubdom_pvqemu_destroy_cb(libxl__egc *egc, + libxl__destroy_domid_state *dis, + int rc); + void libxl__spawn_stub_dm(libxl__egc *egc, libxl__stub_dm_spawn_state *sdss) { STATE_AO_GC(sdss->dm.spawn.ao); @@ -914,12 +918,31 @@ static void spawn_stubdom_pvqemu_cb(libx out: if (rc) { - if (dm_domid) - libxl_domain_destroy(CTX, dm_domid); + if (dm_domid) { + sdss->dis.ao = ao; + sdss->dis.domid = dm_domid; + sdss->dis.callback = spaw_stubdom_pvqemu_destroy_cb; + libxl__destroy_domid(egc, &sdss->dis); + return; + } } sdss->callback(egc, &sdss->dm, rc); } +static void spaw_stubdom_pvqemu_destroy_cb(libxl__egc *egc, + libxl__destroy_domid_state *dis, + int rc) +{ + libxl__stub_dm_spawn_state *sdss = CONTAINER_OF(dis, *sdss, dis); + STATE_AO_GC(sdss->dis.ao); + + if (rc) + LOG(ERROR, "destruction of domain %u after failed creation failed", + sdss->pvqemu.guest_domid); + + sdss->callback(egc, &sdss->dm, rc); +} + /* callbacks passed to libxl__spawn_spawn */ static void device_model_confirm(libxl__egc *egc, libxl__spawn_state *spawn, const char *xsdata); @@ -1115,55 +1138,27 @@ static void device_model_spawn_outcome(l int libxl__destroy_device_model(libxl__gc *gc, uint32_t domid) { - libxl_ctx *ctx = libxl__gc_owner(gc); char *pid; int ret; pid = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, "/local/domain/%d/image/device-model-pid", domid)); - if (!pid) { - int stubdomid = libxl_get_stubdom_id(ctx, domid); - const char *savefile; - - if (!stubdomid) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Couldn't find device model's pid"); - ret = ERROR_INVAL; - goto out; - } - LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "Device model is a stubdom, domid=%d", stubdomid); - ret = libxl_domain_destroy(ctx, stubdomid); - if (ret) - goto out; - - savefile = libxl__device_model_savefile(gc, domid); - ret = unlink(savefile); - /* - * On suspend libxl__domain_save_device_model will have already - * unlinked the save file. - */ - if (ret && errno == ENOENT) ret = 0; - if (ret) { - LIBXL__LOG_ERRNO(ctx, XTL_ERROR, - "failed to remove device-model savefile %s\n", - savefile); - goto out; - } + if (!pid || !atoi(pid)) { + LOG(ERROR, "could not find device-model's pid for dom %u", domid); + ret = ERROR_FAIL; + goto out; + } + ret = kill(atoi(pid), SIGHUP); + if (ret < 0 && errno == ESRCH) { + LOG(ERROR, "Device Model already exited"); + ret = 0; + } else if (ret == 0) { + LOG(DEBUG, "Device Model signaled"); + ret = 0; } else { - ret = kill(atoi(pid), SIGHUP); - if (ret < 0 && errno == ESRCH) { - LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "Device Model already exited"); - ret = 0; - } else if (ret == 0) { - LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "Device Model signaled"); - ret = 0; - } else { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "failed to kill Device Model [%d]", - atoi(pid)); - ret = ERROR_FAIL; - goto out; - } + LOGE(ERROR, "failed to kill Device Model [%d]", atoi(pid)); + ret = ERROR_FAIL; + goto out; } - xs_rm(ctx->xsh, XBT_NULL, libxl__sprintf(gc, "/local/domain/0/device-model/%d", domid)); - xs_rm(ctx->xsh, XBT_NULL, libxl__sprintf(gc, "/local/domain/%d/hvmloader", domid)); out: return ret; diff -r fe3abe887806 -r b01fe9f834a2 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Mon Jul 23 13:09:41 2012 +0100 +++ b/tools/libxl/libxl_internal.h Mon Jul 23 13:09:42 2012 +0100 @@ -875,7 +875,6 @@ _hidden char *libxl__device_frontend_pat _hidden int libxl__parse_backend_path(libxl__gc *gc, const char *path, libxl__device *dev); _hidden int libxl__device_destroy(libxl__gc *gc, libxl__device *dev); -_hidden int libxl__devices_destroy(libxl__gc *gc, uint32_t domid); _hidden int libxl__wait_for_backend(libxl__gc *gc, char *be_path, char *state); /* @@ -1978,6 +1977,7 @@ typedef enum { } libxl__device_action; typedef struct libxl__ao_device libxl__ao_device; +typedef struct libxl__ao_devices libxl__ao_devices; typedef void libxl__device_callback(libxl__egc*, libxl__ao_device*); /* This functions sets the necessary libxl__ao_device struct values to use @@ -1996,6 +1996,20 @@ 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; @@ -2004,10 +2018,27 @@ struct libxl__ao_device { int force; libxl__device_callback *callback; /* private for implementation */ + int active; int rc; libxl__ev_devstate backend_ds; /* Bodge for Qemu devices */ libxl__ev_time timeout; + /* Used internally to have a reference to the upper libxl__ao_devices + * struct when present */ + libxl__ao_devices *aodevs; +}; + +/* Helper struct to simply the plug/unplug of multiple devices at the same + * time. + * + * This structure holds several devices, and the callback is only called + * when all the devices inside of the array have finished. + */ +typedef void libxl__devices_callback(libxl__egc*, libxl__ao_devices*, int rc); +struct libxl__ao_devices { + libxl__ao_device *array; + int size; + libxl__devices_callback *callback; }; /* @@ -2098,6 +2129,86 @@ struct libxl__ao_device { _hidden void libxl__initiate_device_remove(libxl__egc *egc, libxl__ao_device *aodev); +/*----- Domain destruction -----*/ + +/* Domain destruction has been split into two functions: + * + * libxl__domain_destroy is the main destroy function, which detects + * stubdoms and calls libxl__destroy_domid on the domain and its + * stubdom if present, creating a different libxl__destroy_domid_state + * for each one of them. + * + * libxl__destroy_domid actually destroys the domain, but it + * doesn't check for stubdomains, since that would involve + * recursion, which we want to avoid. + */ + +typedef struct libxl__domain_destroy_state libxl__domain_destroy_state; +typedef struct libxl__destroy_domid_state libxl__destroy_domid_state; +typedef struct libxl__devices_remove_state libxl__devices_remove_state; + +typedef void libxl__domain_destroy_cb(libxl__egc *egc, + libxl__domain_destroy_state *dds, + int rc); + +typedef void libxl__domid_destroy_cb(libxl__egc *egc, + libxl__destroy_domid_state *dis, + int rc); + +typedef void libxl__devices_remove_callback(libxl__egc *egc, + libxl__devices_remove_state *drs, + int rc); + +struct libxl__devices_remove_state { + /* filled in by user */ + libxl__ao *ao; + uint32_t domid; + libxl__devices_remove_callback *callback; + int force; /* libxl_device_TYPE_destroy rather than _remove */ + /* private */ + libxl__ao_devices aodevs; + int num_devices; +}; + +struct libxl__destroy_domid_state { + /* filled in by user */ + libxl__ao *ao; + uint32_t domid; + libxl__domid_destroy_cb *callback; + /* private to implementation */ + libxl__devices_remove_state drs; +}; + +struct libxl__domain_destroy_state { + /* filled by the user */ + libxl__ao *ao; + uint32_t domid; + libxl__domain_destroy_cb *callback; + /* Private */ + int rc; + uint32_t stubdomid; + libxl__destroy_domid_state stubdom; + int stubdom_finished; + libxl__destroy_domid_state domain; + int domain_finished; +}; + +/* + * Entry point for domain destruction + * This function checks for stubdom presence and then calls + * libxl__destroy_domid on the passed domain and its stubdom if found. + */ +_hidden void libxl__domain_destroy(libxl__egc *egc, + libxl__domain_destroy_state *dds); + +/* Used to destroy a domain with the passed id (it doesn't check for stubs) */ +_hidden void libxl__destroy_domid(libxl__egc *egc, + libxl__destroy_domid_state *dis); + +/* Entry point for devices destruction */ +_hidden void libxl__devices_destroy(libxl__egc *egc, + libxl__devices_remove_state *drs); + /*----- device model creation -----*/ /* First layer; wraps libxl__spawn_spawn. */ @@ -2131,6 +2242,7 @@ typedef struct { libxl_domain_config dm_config; libxl__domain_build_state dm_state; libxl__dm_spawn_state pvqemu; + libxl__destroy_domid_state dis; } libxl__stub_dm_spawn_state; _hidden void libxl__spawn_stub_dm(libxl__egc *egc, libxl__stub_dm_spawn_state*); @@ -2158,6 +2270,8 @@ struct libxl__domain_create_state { /* If we're not doing stubdom, we use only dmss.dm, * for the non-stubdom device model. */ libxl__save_helper_state shs; + /* necessary if the domain creation failed and we have to destroy it */ + libxl__domain_destroy_state dds; }; /*----- Domain suspend (save) functions -----*/ diff -r fe3abe887806 -r b01fe9f834a2 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Mon Jul 23 13:09:41 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Mon Jul 23 13:09:42 2012 +0100 @@ -1400,7 +1400,7 @@ static int handle_domain_death(uint32_t case LIBXL_ACTION_ON_SHUTDOWN_DESTROY: LOG("Domain %d needs to be cleaned up: destroying the domain", *r_domid); - libxl_domain_destroy(ctx, *r_domid); + libxl_domain_destroy(ctx, *r_domid, 0); *r_domid = INVALID_DOMID; break; @@ -2015,7 +2015,7 @@ start: error_out: release_lock(); if (libxl_domid_valid_guest(domid)) { - libxl_domain_destroy(ctx, domid); + libxl_domain_destroy(ctx, domid, 0); domid = INVALID_DOMID; } @@ -2580,7 +2580,7 @@ static void destroy_domain(const char *p fprintf(stderr, "Cannot destroy privileged domain 0.\n\n"); exit(-1); } - rc = libxl_domain_destroy(ctx, domid); + rc = libxl_domain_destroy(ctx, domid, 0); if (rc) { fprintf(stderr,"destroy failed (rc=%d)\n",rc); exit(-1); } } @@ -2854,7 +2854,7 @@ static int save_domain(const char *p, co if (checkpoint) libxl_domain_resume(ctx, domid, 1); else - libxl_domain_destroy(ctx, domid); + libxl_domain_destroy(ctx, domid, 0); exit(0); } @@ -3111,7 +3111,7 @@ static void migrate_domain(const char *d } fprintf(stderr, "migration sender: Target reports successful startup.\n"); - libxl_domain_destroy(ctx, domid); /* bang! */ + libxl_domain_destroy(ctx, domid, 0); /* bang! */ fprintf(stderr, "Migration successful.\n"); exit(0); @@ -3264,7 +3264,7 @@ static void migrate_receive(int debug, i if (rc) { fprintf(stderr, "migration target: Failure, destroying our copy.\n"); - rc2 = libxl_domain_destroy(ctx, domid); + rc2 = libxl_domain_destroy(ctx, domid, 0); if (rc2) { fprintf(stderr, "migration target: Failed to destroy our copy" " (code %d).\n", rc2); diff -r fe3abe887806 -r b01fe9f834a2 tools/python/xen/lowlevel/xl/xl.c --- a/tools/python/xen/lowlevel/xl/xl.c Mon Jul 23 13:09:41 2012 +0100 +++ b/tools/python/xen/lowlevel/xl/xl.c Mon Jul 23 13:09:42 2012 +0100 @@ -437,7 +437,7 @@ static PyObject *pyxl_domain_destroy(XlO int domid; if ( !PyArg_ParseTuple(args, "i", &domid) ) return NULL; - if ( libxl_domain_destroy(self->ctx, domid) ) { + if ( libxl_domain_destroy(self->ctx, domid, 0) ) { PyErr_SetString(xl_error_obj, "cannot destroy domain"); 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 Jul 24 01:11:21 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Jul 2012 01:11: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 1StTed-0004et-6B; Tue, 24 Jul 2012 01:11:15 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StTeb-0004ek-KR for xen-changelog@lists.xensource.com; Tue, 24 Jul 2012 01:11:13 +0000 Received: from [85.158.143.35:40547] by server-2.bemta-4.messagelabs.com id F6/B5-17938-036FD005; Tue, 24 Jul 2012 01:11:12 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-11.tower-21.messagelabs.com!1343092269!11335616!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 17160 invoked from network); 24 Jul 2012 01:11:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 24 Jul 2012 01:11:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StTeV-0005vh-P7 for xen-changelog@lists.xensource.com; Tue, 24 Jul 2012 01:11:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1StTeV-0007Fw-Bv for xen-changelog@lists.xensource.com; Tue, 24 Jul 2012 01:11:07 +0000 Message-Id: Date: Tue, 24 Jul 2012 01:11:06 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xen/arm: Initialize lr_queue in vcpu_vgic_init for the first 32 irqs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Stefano Stabellini # Date 1343060968 -3600 # Node ID 9a36965a233d749c6cb876189b05aa860ca76bf7 # Parent c2575d6b9650a39e34971f75eceee6dc9d456ba9 xen/arm: Initialize lr_queue in vcpu_vgic_init for the first 32 irqs Signed-off-by: Stefano Stabellini Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r c2575d6b9650 -r 9a36965a233d xen/arch/arm/vgic.c --- a/xen/arch/arm/vgic.c Mon Jul 23 13:09:46 2012 +0100 +++ b/xen/arch/arm/vgic.c Mon Jul 23 17:29:28 2012 +0100 @@ -108,7 +108,10 @@ int vcpu_vgic_init(struct vcpu *v) memset(&v->arch.vgic.pending_irqs, 0, sizeof(v->arch.vgic.pending_irqs)); for (i = 0; i < 32; i++) + { INIT_LIST_HEAD(&v->arch.vgic.pending_irqs[i].inflight); + INIT_LIST_HEAD(&v->arch.vgic.pending_irqs[i].lr_queue); + } /* For SGI and PPI the target is always this CPU */ for ( i = 0 ; i < 8 ; i++ ) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jul 24 01:11:21 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Jul 2012 01:11: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 1StTed-0004et-6B; Tue, 24 Jul 2012 01:11:15 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StTeb-0004ek-KR for xen-changelog@lists.xensource.com; Tue, 24 Jul 2012 01:11:13 +0000 Received: from [85.158.143.35:40547] by server-2.bemta-4.messagelabs.com id F6/B5-17938-036FD005; Tue, 24 Jul 2012 01:11:12 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-11.tower-21.messagelabs.com!1343092269!11335616!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 17160 invoked from network); 24 Jul 2012 01:11:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 24 Jul 2012 01:11:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StTeV-0005vh-P7 for xen-changelog@lists.xensource.com; Tue, 24 Jul 2012 01:11:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1StTeV-0007Fw-Bv for xen-changelog@lists.xensource.com; Tue, 24 Jul 2012 01:11:07 +0000 Message-Id: Date: Tue, 24 Jul 2012 01:11:06 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xen/arm: Initialize lr_queue in vcpu_vgic_init for the first 32 irqs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Stefano Stabellini # Date 1343060968 -3600 # Node ID 9a36965a233d749c6cb876189b05aa860ca76bf7 # Parent c2575d6b9650a39e34971f75eceee6dc9d456ba9 xen/arm: Initialize lr_queue in vcpu_vgic_init for the first 32 irqs Signed-off-by: Stefano Stabellini Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r c2575d6b9650 -r 9a36965a233d xen/arch/arm/vgic.c --- a/xen/arch/arm/vgic.c Mon Jul 23 13:09:46 2012 +0100 +++ b/xen/arch/arm/vgic.c Mon Jul 23 17:29:28 2012 +0100 @@ -108,7 +108,10 @@ int vcpu_vgic_init(struct vcpu *v) memset(&v->arch.vgic.pending_irqs, 0, sizeof(v->arch.vgic.pending_irqs)); for (i = 0; i < 32; i++) + { INIT_LIST_HEAD(&v->arch.vgic.pending_irqs[i].inflight); + INIT_LIST_HEAD(&v->arch.vgic.pending_irqs[i].lr_queue); + } /* For SGI and PPI the target is always this CPU */ for ( i = 0 ; i < 8 ; i++ ) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jul 24 01:11:21 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Jul 2012 01:11: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 1StTeb-0004ef-3p; Tue, 24 Jul 2012 01: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 1StTeZ-0004eQ-RO for xen-changelog@lists.xensource.com; Tue, 24 Jul 2012 01:11:11 +0000 Received: from [85.158.139.83:43493] by server-5.bemta-5.messagelabs.com id B6/20-02722-E26FD005; Tue, 24 Jul 2012 01:11:10 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-182.messagelabs.com!1343092269!24329575!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 4299 invoked from network); 24 Jul 2012 01: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; 24 Jul 2012 01:11:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StTeW-0005vn-Ns for xen-changelog@lists.xensource.com; Tue, 24 Jul 2012 01:11:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1StTeW-0007GU-DL for xen-changelog@lists.xensource.com; Tue, 24 Jul 2012 01:11:08 +0000 Message-Id: Date: Tue, 24 Jul 2012 01:11:07 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] QEMU_TAG update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1343062713 -3600 # Node ID 4a28c496acbf731e92b0b289cd6d323d1e0408c5 # Parent 18adcc01517c2162c41dc7ac0bb5e77253a9e967 QEMU_TAG update --- diff -r 18adcc01517c -r 4a28c496acbf Config.mk --- a/Config.mk Mon Jul 23 17:29:28 2012 +0100 +++ b/Config.mk Mon Jul 23 17:58:33 2012 +0100 @@ -213,9 +213,9 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= fa2e8e3bc869c04d4a4d9b8f70c1cab7e53778d6 -# Fri Jun 29 17:06:25 2012 +0100 -# passthrough: fix off-by-one in PCI config space register index check +QEMU_TAG ?= 00fb2aae68e915b7f456fd5e3997ddf31339004a +# Mon Jul 23 17:56:13 2012 +0100 +# qemu-traditional: fix no-return-in-nonvoid-function # Short answer -- do not enable this unless you know what you are # doing and are prepared for some pain. _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jul 24 01:11:21 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Jul 2012 01:11: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 1StTeb-0004ef-3p; Tue, 24 Jul 2012 01: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 1StTeZ-0004eQ-RO for xen-changelog@lists.xensource.com; Tue, 24 Jul 2012 01:11:11 +0000 Received: from [85.158.139.83:43493] by server-5.bemta-5.messagelabs.com id B6/20-02722-E26FD005; Tue, 24 Jul 2012 01:11:10 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-182.messagelabs.com!1343092269!24329575!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 4299 invoked from network); 24 Jul 2012 01: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; 24 Jul 2012 01:11:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StTeW-0005vn-Ns for xen-changelog@lists.xensource.com; Tue, 24 Jul 2012 01:11:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1StTeW-0007GU-DL for xen-changelog@lists.xensource.com; Tue, 24 Jul 2012 01:11:08 +0000 Message-Id: Date: Tue, 24 Jul 2012 01:11:07 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] QEMU_TAG update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Jackson # Date 1343062713 -3600 # Node ID 4a28c496acbf731e92b0b289cd6d323d1e0408c5 # Parent 18adcc01517c2162c41dc7ac0bb5e77253a9e967 QEMU_TAG update --- diff -r 18adcc01517c -r 4a28c496acbf Config.mk --- a/Config.mk Mon Jul 23 17:29:28 2012 +0100 +++ b/Config.mk Mon Jul 23 17:58:33 2012 +0100 @@ -213,9 +213,9 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= fa2e8e3bc869c04d4a4d9b8f70c1cab7e53778d6 -# Fri Jun 29 17:06:25 2012 +0100 -# passthrough: fix off-by-one in PCI config space register index check +QEMU_TAG ?= 00fb2aae68e915b7f456fd5e3997ddf31339004a +# Mon Jul 23 17:56:13 2012 +0100 +# qemu-traditional: fix no-return-in-nonvoid-function # Short answer -- do not enable this unless you know what you are # doing and are prepared for some pain. _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jul 24 01:11:21 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Jul 2012 01:11: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 1StTeb-0004ea-1R; Tue, 24 Jul 2012 01: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 1StTeZ-0004eO-2g for xen-changelog@lists.xensource.com; Tue, 24 Jul 2012 01:11:11 +0000 Received: from [85.158.143.99:39704] by server-3.bemta-4.messagelabs.com id DF/FC-01511-E26FD005; Tue, 24 Jul 2012 01:11:10 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-216.messagelabs.com!1343092268!23048341!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 17453 invoked from network); 24 Jul 2012 01:11:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 24 Jul 2012 01:11:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StTeW-0005vk-5D for xen-changelog@lists.xensource.com; Tue, 24 Jul 2012 01:11:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1StTeV-0007GB-TI for xen-changelog@lists.xensource.com; Tue, 24 Jul 2012 01:11:07 +0000 Message-Id: Date: Tue, 24 Jul 2012 01:11:07 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xen/arm: set paging_mode_translate and paging_mode_external X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Stefano Stabellini # Date 1343060968 -3600 # Node ID 18adcc01517c2162c41dc7ac0bb5e77253a9e967 # Parent 9a36965a233d749c6cb876189b05aa860ca76bf7 xen/arm: set paging_mode_translate and paging_mode_external On ARM, given the kind of guests we support, it makes sense to set paging_mode_translate and paging_mode_external by default. Signed-off-by: Stefano Stabellini Acked-by: Tim Deegan Committed-by: Ian Campbell --- diff -r 9a36965a233d -r 18adcc01517c xen/include/asm-arm/paging.h --- a/xen/include/asm-arm/paging.h Mon Jul 23 17:29:28 2012 +0100 +++ b/xen/include/asm-arm/paging.h Mon Jul 23 17:29:28 2012 +0100 @@ -1,8 +1,8 @@ #ifndef _XEN_PAGING_H #define _XEN_PAGING_H -#define paging_mode_translate(d) (0) -#define paging_mode_external(d) (0) +#define paging_mode_translate(d) (1) +#define paging_mode_external(d) (1) #endif /* XEN_PAGING_H */ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jul 24 01:11:21 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Jul 2012 01:11: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 1StTeb-0004ea-1R; Tue, 24 Jul 2012 01: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 1StTeZ-0004eO-2g for xen-changelog@lists.xensource.com; Tue, 24 Jul 2012 01:11:11 +0000 Received: from [85.158.143.99:39704] by server-3.bemta-4.messagelabs.com id DF/FC-01511-E26FD005; Tue, 24 Jul 2012 01:11:10 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-216.messagelabs.com!1343092268!23048341!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 17453 invoked from network); 24 Jul 2012 01:11:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 24 Jul 2012 01:11:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StTeW-0005vk-5D for xen-changelog@lists.xensource.com; Tue, 24 Jul 2012 01:11:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1StTeV-0007GB-TI for xen-changelog@lists.xensource.com; Tue, 24 Jul 2012 01:11:07 +0000 Message-Id: Date: Tue, 24 Jul 2012 01:11:07 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xen/arm: set paging_mode_translate and paging_mode_external X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Stefano Stabellini # Date 1343060968 -3600 # Node ID 18adcc01517c2162c41dc7ac0bb5e77253a9e967 # Parent 9a36965a233d749c6cb876189b05aa860ca76bf7 xen/arm: set paging_mode_translate and paging_mode_external On ARM, given the kind of guests we support, it makes sense to set paging_mode_translate and paging_mode_external by default. Signed-off-by: Stefano Stabellini Acked-by: Tim Deegan Committed-by: Ian Campbell --- diff -r 9a36965a233d -r 18adcc01517c xen/include/asm-arm/paging.h --- a/xen/include/asm-arm/paging.h Mon Jul 23 17:29:28 2012 +0100 +++ b/xen/include/asm-arm/paging.h Mon Jul 23 17:29:28 2012 +0100 @@ -1,8 +1,8 @@ #ifndef _XEN_PAGING_H #define _XEN_PAGING_H -#define paging_mode_translate(d) (0) -#define paging_mode_external(d) (0) +#define paging_mode_translate(d) (1) +#define paging_mode_external(d) (1) #endif /* XEN_PAGING_H */ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jul 24 17:22:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Jul 2012 17: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 1StioK-0005H6-8Z; Tue, 24 Jul 2012 17:22:16 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StioI-0005Gn-HN for xen-changelog@lists.xensource.com; Tue, 24 Jul 2012 17:22:14 +0000 Received: from [85.158.139.83:3952] by server-5.bemta-5.messagelabs.com id 80/B8-02722-5C9DE005; Tue, 24 Jul 2012 17:22:13 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-182.messagelabs.com!1343150530!28347705!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 12520 invoked from network); 24 Jul 2012 17:22:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 24 Jul 2012 17:22:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StioD-00016x-Vj for xen-changelog@lists.xensource.com; Tue, 24 Jul 2012 17:22:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1StioD-0003RQ-SB for xen-changelog@lists.xensource.com; Tue, 24 Jul 2012 17:22:09 +0000 Message-Id: Date: Tue, 24 Jul 2012 17:22:09 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] docs: fix link in qemu-upstream doc X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343122157 -3600 # Node ID 8fb6a645b80eaf9d692bdc6653d5aa0eb4a8e28c # Parent cea026d5a378eca5c4fc3885bf9a462175bc43fe docs: fix link in qemu-upstream doc The current syntax created a link back to the source page rather than to the wiki. I couldn't find the markdown syntax to make the link text be the link as well, without repreating the URL, so I reworded it slightly. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r cea026d5a378 -r 8fb6a645b80e docs/misc/qemu-upstream_howto_use_it.markdown --- a/docs/misc/qemu-upstream_howto_use_it.markdown Tue Jul 24 10:29:17 2012 +0100 +++ b/docs/misc/qemu-upstream_howto_use_it.markdown Tue Jul 24 10:29:17 2012 +0100 @@ -1,8 +1,8 @@ Using Upstream QEMU with Xen ============================ -If you want to build with the QEMU unstable tree, follow the wiki page: - [http://wiki.xen.org/wiki/QEMU_Upstream]() +If you want to build with the QEMU unstable tree, follow the [QEMU +Upstream](http://wiki.xen.org/wiki/QEMU_Upstream) wiki page. Otherwise, QEMU/SeaBIOS is now integrated into the build system, so you just have to specify the device model version in an `xl` config file: _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jul 24 17:22:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Jul 2012 17: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 1StioK-0005H6-8Z; Tue, 24 Jul 2012 17:22:16 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StioI-0005Gn-HN for xen-changelog@lists.xensource.com; Tue, 24 Jul 2012 17:22:14 +0000 Received: from [85.158.139.83:3952] by server-5.bemta-5.messagelabs.com id 80/B8-02722-5C9DE005; Tue, 24 Jul 2012 17:22:13 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-182.messagelabs.com!1343150530!28347705!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 12520 invoked from network); 24 Jul 2012 17:22:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 24 Jul 2012 17:22:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StioD-00016x-Vj for xen-changelog@lists.xensource.com; Tue, 24 Jul 2012 17:22:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1StioD-0003RQ-SB for xen-changelog@lists.xensource.com; Tue, 24 Jul 2012 17:22:09 +0000 Message-Id: Date: Tue, 24 Jul 2012 17:22:09 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] docs: fix link in qemu-upstream doc X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343122157 -3600 # Node ID 8fb6a645b80eaf9d692bdc6653d5aa0eb4a8e28c # Parent cea026d5a378eca5c4fc3885bf9a462175bc43fe docs: fix link in qemu-upstream doc The current syntax created a link back to the source page rather than to the wiki. I couldn't find the markdown syntax to make the link text be the link as well, without repreating the URL, so I reworded it slightly. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r cea026d5a378 -r 8fb6a645b80e docs/misc/qemu-upstream_howto_use_it.markdown --- a/docs/misc/qemu-upstream_howto_use_it.markdown Tue Jul 24 10:29:17 2012 +0100 +++ b/docs/misc/qemu-upstream_howto_use_it.markdown Tue Jul 24 10:29:17 2012 +0100 @@ -1,8 +1,8 @@ Using Upstream QEMU with Xen ============================ -If you want to build with the QEMU unstable tree, follow the wiki page: - [http://wiki.xen.org/wiki/QEMU_Upstream]() +If you want to build with the QEMU unstable tree, follow the [QEMU +Upstream](http://wiki.xen.org/wiki/QEMU_Upstream) wiki page. Otherwise, QEMU/SeaBIOS is now integrated into the build system, so you just have to specify the device model version in an `xl` config file: _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jul 24 17:22:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Jul 2012 17: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 1StioI-0005Gt-5z; Tue, 24 Jul 2012 17:22:14 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StioH-0005Ge-Ac for xen-changelog@lists.xensource.com; Tue, 24 Jul 2012 17:22:13 +0000 Received: from [85.158.143.99:17573] by server-3.bemta-4.messagelabs.com id 6C/1E-01511-4C9DE005; Tue, 24 Jul 2012 17:22:12 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-216.messagelabs.com!1343150530!27911771!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 22266 invoked from network); 24 Jul 2012 17:22:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 24 Jul 2012 17:22:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StioE-000170-HW for xen-changelog@lists.xensource.com; Tue, 24 Jul 2012 17:22:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1StioE-0003Rf-Cs for xen-changelog@lists.xensource.com; Tue, 24 Jul 2012 17:22:10 +0000 Message-Id: Date: Tue, 24 Jul 2012 17:22:09 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: fix bug the number of running vcpu inconsistent with config 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 Zhang, Yang Z # Date 1343122158 -3600 # Node ID 2fb65af3e859ac8d07c1dae4dc033948b0776f24 # Parent 8fb6a645b80eaf9d692bdc6653d5aa0eb4a8e28c libxl: fix bug the number of running vcpu inconsistent with config file The following patch will fix the bug 1825. http://bugzilla.xen.org/bugzilla/show_bug.cgi?id=1825 When using memcpy to update vcpu_online, the high bits of vcpu_online may unmodified if the size of avail_vcpus less than vcpu_online. So we need to clear it before the memory copying. Signed-off-by: Yang Zhang Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r 8fb6a645b80e -r 2fb65af3e859 tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Tue Jul 24 10:29:17 2012 +0100 +++ b/tools/libxl/libxl_dom.c Tue Jul 24 10:29:18 2012 +0100 @@ -357,6 +357,7 @@ static int hvm_build_set_params(xc_inter va_hvm = (struct hvm_info_table *)(va_map + HVM_INFO_OFFSET); va_hvm->apic_mode = libxl_defbool_val(info->u.hvm.apic); va_hvm->nr_vcpus = info->max_vcpus; + memset(va_hvm->vcpu_online, 0, sizeof(va_hvm->vcpu_online)); memcpy(va_hvm->vcpu_online, info->avail_vcpus.map, info->avail_vcpus.size); for (i = 0, sum = 0; i < va_hvm->length; i++) sum += ((uint8_t *) va_hvm)[i]; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jul 24 17:22:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Jul 2012 17: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 1StioI-0005Gt-5z; Tue, 24 Jul 2012 17:22:14 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StioH-0005Ge-Ac for xen-changelog@lists.xensource.com; Tue, 24 Jul 2012 17:22:13 +0000 Received: from [85.158.143.99:17573] by server-3.bemta-4.messagelabs.com id 6C/1E-01511-4C9DE005; Tue, 24 Jul 2012 17:22:12 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-216.messagelabs.com!1343150530!27911771!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 22266 invoked from network); 24 Jul 2012 17:22:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 24 Jul 2012 17:22:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StioE-000170-HW for xen-changelog@lists.xensource.com; Tue, 24 Jul 2012 17:22:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1StioE-0003Rf-Cs for xen-changelog@lists.xensource.com; Tue, 24 Jul 2012 17:22:10 +0000 Message-Id: Date: Tue, 24 Jul 2012 17:22:09 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: fix bug the number of running vcpu inconsistent with config 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 Zhang, Yang Z # Date 1343122158 -3600 # Node ID 2fb65af3e859ac8d07c1dae4dc033948b0776f24 # Parent 8fb6a645b80eaf9d692bdc6653d5aa0eb4a8e28c libxl: fix bug the number of running vcpu inconsistent with config file The following patch will fix the bug 1825. http://bugzilla.xen.org/bugzilla/show_bug.cgi?id=1825 When using memcpy to update vcpu_online, the high bits of vcpu_online may unmodified if the size of avail_vcpus less than vcpu_online. So we need to clear it before the memory copying. Signed-off-by: Yang Zhang Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r 8fb6a645b80e -r 2fb65af3e859 tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Tue Jul 24 10:29:17 2012 +0100 +++ b/tools/libxl/libxl_dom.c Tue Jul 24 10:29:18 2012 +0100 @@ -357,6 +357,7 @@ static int hvm_build_set_params(xc_inter va_hvm = (struct hvm_info_table *)(va_map + HVM_INFO_OFFSET); va_hvm->apic_mode = libxl_defbool_val(info->u.hvm.apic); va_hvm->nr_vcpus = info->max_vcpus; + memset(va_hvm->vcpu_online, 0, sizeof(va_hvm->vcpu_online)); memcpy(va_hvm->vcpu_online, info->avail_vcpus.map, info->avail_vcpus.size); for (i = 0, sum = 0; i < va_hvm->length; i++) sum += ((uint8_t *) va_hvm)[i]; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jul 24 17:22:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Jul 2012 17:22: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 1StioI-0005Go-3K; Tue, 24 Jul 2012 17: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 1StioG-0005Gc-KS for xen-changelog@lists.xensource.com; Tue, 24 Jul 2012 17:22:12 +0000 Received: from [85.158.138.51:27199] by server-1.bemta-3.messagelabs.com id 56/A9-31934-3C9DE005; Tue, 24 Jul 2012 17:22:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-174.messagelabs.com!1343150529!28535112!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 10653 invoked from network); 24 Jul 2012 17:22:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 24 Jul 2012 17:22:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StioD-00016q-5J for xen-changelog@lists.xensource.com; Tue, 24 Jul 2012 17:22:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1StioC-0003Qv-Q4 for xen-changelog@lists.xensource.com; Tue, 24 Jul 2012 17:22:08 +0000 Message-Id: Date: Tue, 24 Jul 2012 17:22:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] autoconf: only check for dev86 and iasl checks on x86 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Roger Pau Monne # Date 1343118944 -3600 # Node ID ce24b84f6af85fd606233100cc313be611b615c8 # Parent dbe672ae0f1fe5d99c4997d61c6a600f60f2838c autoconf: only check for dev86 and iasl checks on x86 The previous patch (25331:dfe39bd65137) only touched the definition of the variables used to refer to the paths to the tools but didn't remove the actual checks. Run autogen after applying this patch. Signed-off-by: Roger Pau Monne Acked-by: Ian Campbell [ ijc -- added a comment about "build" vs "host" terminology and a note about the previous attempt to the changelog, reintroduce AC_CANONICAL_HOST which was remove by 25303:078c7d4cde1d after this patch was posted but is required for $host_cpu ] Committed-by: Ian Campbell --- diff -r dbe672ae0f1f -r ce24b84f6af8 tools/configure --- a/tools/configure Tue Jul 24 09:35:44 2012 +0100 +++ b/tools/configure Tue Jul 24 09:35:44 2012 +0100 @@ -670,6 +670,14 @@ xenapi vtpm monitors githttp +host_os +host_vendor +host_cpu +host +build_os +build_vendor +build_cpu +build target_alias host_alias build_alias @@ -1352,6 +1360,10 @@ Fine tuning of the installation director _ACEOF cat <<\_ACEOF + +System types: + --build=BUILD configure for building on BUILD [guessed] + --host=HOST cross-compile to build programs to run on HOST [BUILD] _ACEOF fi @@ -2181,6 +2193,78 @@ APPEND_INCLUDES and APPEND_LIB instead w fi +# Make sure we can run config.sub. +$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 +$as_echo_n "checking build system type... " >&6; } +if test "${ac_cv_build+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_build_alias=$build_alias +test "x$ac_build_alias" = x && + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` +test "x$ac_build_alias" = x && + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 +ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 +$as_echo "$ac_cv_build" >&6; } +case $ac_cv_build in +*-*-*) ;; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; +esac +build=$ac_cv_build +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_build +shift +build_cpu=$1 +build_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +build_os=$* +IFS=$ac_save_IFS +case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 +$as_echo_n "checking host system type... " >&6; } +if test "${ac_cv_host+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test "x$host_alias" = x; then + ac_cv_host=$ac_cv_build +else + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 +$as_echo "$ac_cv_host" >&6; } +case $ac_cv_host in +*-*-*) ;; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; +esac +host=$ac_cv_host +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_host +shift +host_cpu=$1 +host_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +host_os=$* +IFS=$ac_save_IFS +case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac + + + # M4 Macro includes @@ -5417,7 +5501,7 @@ LDLFAGS=$ac_previous_ldflags fi -# Extract the first word of "xgettext", so it can be a program name with args. + # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } @@ -5462,7 +5546,9 @@ if test x"${XGETTEXT}" == x"no" then as_fn_error $? "Unable to find xgettext, please install xgettext" "$LINENO" 5 fi -# Extract the first word of "as86", so it can be a program name with args. +case "$host_cpu" in +i[3456]86|x86_64) + # Extract the first word of "as86", so it can be a program name with args. set dummy as86; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } @@ -5507,7 +5593,7 @@ if test x"${AS86}" == x"no" then as_fn_error $? "Unable to find as86, please install as86" "$LINENO" 5 fi -# Extract the first word of "ld86", so it can be a program name with args. + # Extract the first word of "ld86", so it can be a program name with args. set dummy ld86; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } @@ -5552,7 +5638,7 @@ if test x"${LD86}" == x"no" then as_fn_error $? "Unable to find ld86, please install ld86" "$LINENO" 5 fi -# Extract the first word of "bcc", so it can be a program name with args. + # Extract the first word of "bcc", so it can be a program name with args. set dummy bcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } @@ -5597,7 +5683,7 @@ if test x"${BCC}" == x"no" then as_fn_error $? "Unable to find bcc, please install bcc" "$LINENO" 5 fi -# Extract the first word of "iasl", so it can be a program name with args. + # Extract the first word of "iasl", so it can be a program name with args. set dummy iasl; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } @@ -5642,6 +5728,8 @@ if test x"${IASL}" == x"no" then as_fn_error $? "Unable to find iasl, please install iasl" "$LINENO" 5 fi + ;; +esac ac_fn_c_check_header_mongrel "$LINENO" "uuid/uuid.h" "ac_cv_header_uuid_uuid_h" "$ac_includes_default" if test "x$ac_cv_header_uuid_uuid_h" = x""yes; then : diff -r dbe672ae0f1f -r ce24b84f6af8 tools/configure.ac --- a/tools/configure.ac Tue Jul 24 09:35:44 2012 +0100 +++ b/tools/configure.ac Tue Jul 24 09:35:44 2012 +0100 @@ -19,6 +19,8 @@ recommended, use PREPEND_INCLUDES, PREPE APPEND_INCLUDES and APPEND_LIB instead when possible.]) ]) +AC_CANONICAL_HOST + # M4 Macro includes m4_include([m4/savevar.m4]) m4_include([m4/features.m4]) @@ -100,15 +102,23 @@ AS_IF([test "x$pythontools" = "xy"], [ [AC_MSG_ERROR([PYTHON specified, but is not an absolute path])]) AX_PATH_PROG_OR_FAIL([PYTHONPATH], [$PYTHON]) AX_CHECK_PYTHON_VERSION([2], [3]) - AX_CHECK_PYTHON_DEVEL() -]) -AX_PATH_PROG_OR_FAIL([XGETTEXT], [xgettext]) -AX_PATH_PROG_OR_FAIL([AS86], [as86]) -AX_PATH_PROG_OR_FAIL([LD86], [ld86]) -AX_PATH_PROG_OR_FAIL([BCC], [bcc]) -AX_PATH_PROG_OR_FAIL([IASL], [iasl]) -AX_CHECK_UUID -AX_CHECK_CURSES + AX_CHECK_PYTHON_DEVEL() + ]) + AX_PATH_PROG_OR_FAIL([XGETTEXT], [xgettext]) +dnl as86, ld86, bcc and iasl are only required when the host system is x86*. +dnl "host" here means the platform on which the hypervisor and tools is +dnl going to run, not the platform on which we are building (known as +dnl "build" in gnu speak). +case "$host_cpu" in +i[[3456]]86|x86_64) + AX_PATH_PROG_OR_FAIL([AS86], [as86]) + AX_PATH_PROG_OR_FAIL([LD86], [ld86]) + AX_PATH_PROG_OR_FAIL([BCC], [bcc]) + AX_PATH_PROG_OR_FAIL([IASL], [iasl]) + ;; +esac + AX_CHECK_UUID + AX_CHECK_CURSES PKG_CHECK_MODULES(glib, [glib-2.0 >= 2.12]) # Check library path _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jul 24 17:22:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Jul 2012 17:22: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 1StioI-0005Go-3K; Tue, 24 Jul 2012 17: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 1StioG-0005Gc-KS for xen-changelog@lists.xensource.com; Tue, 24 Jul 2012 17:22:12 +0000 Received: from [85.158.138.51:27199] by server-1.bemta-3.messagelabs.com id 56/A9-31934-3C9DE005; Tue, 24 Jul 2012 17:22:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-174.messagelabs.com!1343150529!28535112!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 10653 invoked from network); 24 Jul 2012 17:22:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 24 Jul 2012 17:22:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StioD-00016q-5J for xen-changelog@lists.xensource.com; Tue, 24 Jul 2012 17:22:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1StioC-0003Qv-Q4 for xen-changelog@lists.xensource.com; Tue, 24 Jul 2012 17:22:08 +0000 Message-Id: Date: Tue, 24 Jul 2012 17:22:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] autoconf: only check for dev86 and iasl checks on x86 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Roger Pau Monne # Date 1343118944 -3600 # Node ID ce24b84f6af85fd606233100cc313be611b615c8 # Parent dbe672ae0f1fe5d99c4997d61c6a600f60f2838c autoconf: only check for dev86 and iasl checks on x86 The previous patch (25331:dfe39bd65137) only touched the definition of the variables used to refer to the paths to the tools but didn't remove the actual checks. Run autogen after applying this patch. Signed-off-by: Roger Pau Monne Acked-by: Ian Campbell [ ijc -- added a comment about "build" vs "host" terminology and a note about the previous attempt to the changelog, reintroduce AC_CANONICAL_HOST which was remove by 25303:078c7d4cde1d after this patch was posted but is required for $host_cpu ] Committed-by: Ian Campbell --- diff -r dbe672ae0f1f -r ce24b84f6af8 tools/configure --- a/tools/configure Tue Jul 24 09:35:44 2012 +0100 +++ b/tools/configure Tue Jul 24 09:35:44 2012 +0100 @@ -670,6 +670,14 @@ xenapi vtpm monitors githttp +host_os +host_vendor +host_cpu +host +build_os +build_vendor +build_cpu +build target_alias host_alias build_alias @@ -1352,6 +1360,10 @@ Fine tuning of the installation director _ACEOF cat <<\_ACEOF + +System types: + --build=BUILD configure for building on BUILD [guessed] + --host=HOST cross-compile to build programs to run on HOST [BUILD] _ACEOF fi @@ -2181,6 +2193,78 @@ APPEND_INCLUDES and APPEND_LIB instead w fi +# Make sure we can run config.sub. +$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 +$as_echo_n "checking build system type... " >&6; } +if test "${ac_cv_build+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_build_alias=$build_alias +test "x$ac_build_alias" = x && + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` +test "x$ac_build_alias" = x && + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 +ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 +$as_echo "$ac_cv_build" >&6; } +case $ac_cv_build in +*-*-*) ;; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; +esac +build=$ac_cv_build +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_build +shift +build_cpu=$1 +build_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +build_os=$* +IFS=$ac_save_IFS +case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 +$as_echo_n "checking host system type... " >&6; } +if test "${ac_cv_host+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test "x$host_alias" = x; then + ac_cv_host=$ac_cv_build +else + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 +$as_echo "$ac_cv_host" >&6; } +case $ac_cv_host in +*-*-*) ;; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; +esac +host=$ac_cv_host +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_host +shift +host_cpu=$1 +host_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +host_os=$* +IFS=$ac_save_IFS +case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac + + + # M4 Macro includes @@ -5417,7 +5501,7 @@ LDLFAGS=$ac_previous_ldflags fi -# Extract the first word of "xgettext", so it can be a program name with args. + # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } @@ -5462,7 +5546,9 @@ if test x"${XGETTEXT}" == x"no" then as_fn_error $? "Unable to find xgettext, please install xgettext" "$LINENO" 5 fi -# Extract the first word of "as86", so it can be a program name with args. +case "$host_cpu" in +i[3456]86|x86_64) + # Extract the first word of "as86", so it can be a program name with args. set dummy as86; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } @@ -5507,7 +5593,7 @@ if test x"${AS86}" == x"no" then as_fn_error $? "Unable to find as86, please install as86" "$LINENO" 5 fi -# Extract the first word of "ld86", so it can be a program name with args. + # Extract the first word of "ld86", so it can be a program name with args. set dummy ld86; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } @@ -5552,7 +5638,7 @@ if test x"${LD86}" == x"no" then as_fn_error $? "Unable to find ld86, please install ld86" "$LINENO" 5 fi -# Extract the first word of "bcc", so it can be a program name with args. + # Extract the first word of "bcc", so it can be a program name with args. set dummy bcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } @@ -5597,7 +5683,7 @@ if test x"${BCC}" == x"no" then as_fn_error $? "Unable to find bcc, please install bcc" "$LINENO" 5 fi -# Extract the first word of "iasl", so it can be a program name with args. + # Extract the first word of "iasl", so it can be a program name with args. set dummy iasl; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } @@ -5642,6 +5728,8 @@ if test x"${IASL}" == x"no" then as_fn_error $? "Unable to find iasl, please install iasl" "$LINENO" 5 fi + ;; +esac ac_fn_c_check_header_mongrel "$LINENO" "uuid/uuid.h" "ac_cv_header_uuid_uuid_h" "$ac_includes_default" if test "x$ac_cv_header_uuid_uuid_h" = x""yes; then : diff -r dbe672ae0f1f -r ce24b84f6af8 tools/configure.ac --- a/tools/configure.ac Tue Jul 24 09:35:44 2012 +0100 +++ b/tools/configure.ac Tue Jul 24 09:35:44 2012 +0100 @@ -19,6 +19,8 @@ recommended, use PREPEND_INCLUDES, PREPE APPEND_INCLUDES and APPEND_LIB instead when possible.]) ]) +AC_CANONICAL_HOST + # M4 Macro includes m4_include([m4/savevar.m4]) m4_include([m4/features.m4]) @@ -100,15 +102,23 @@ AS_IF([test "x$pythontools" = "xy"], [ [AC_MSG_ERROR([PYTHON specified, but is not an absolute path])]) AX_PATH_PROG_OR_FAIL([PYTHONPATH], [$PYTHON]) AX_CHECK_PYTHON_VERSION([2], [3]) - AX_CHECK_PYTHON_DEVEL() -]) -AX_PATH_PROG_OR_FAIL([XGETTEXT], [xgettext]) -AX_PATH_PROG_OR_FAIL([AS86], [as86]) -AX_PATH_PROG_OR_FAIL([LD86], [ld86]) -AX_PATH_PROG_OR_FAIL([BCC], [bcc]) -AX_PATH_PROG_OR_FAIL([IASL], [iasl]) -AX_CHECK_UUID -AX_CHECK_CURSES + AX_CHECK_PYTHON_DEVEL() + ]) + AX_PATH_PROG_OR_FAIL([XGETTEXT], [xgettext]) +dnl as86, ld86, bcc and iasl are only required when the host system is x86*. +dnl "host" here means the platform on which the hypervisor and tools is +dnl going to run, not the platform on which we are building (known as +dnl "build" in gnu speak). +case "$host_cpu" in +i[[3456]]86|x86_64) + AX_PATH_PROG_OR_FAIL([AS86], [as86]) + AX_PATH_PROG_OR_FAIL([LD86], [ld86]) + AX_PATH_PROG_OR_FAIL([BCC], [bcc]) + AX_PATH_PROG_OR_FAIL([IASL], [iasl]) + ;; +esac + AX_CHECK_UUID + AX_CHECK_CURSES PKG_CHECK_MODULES(glib, [glib-2.0 >= 2.12]) # Check library path _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jul 24 17:22:21 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Jul 2012 17: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 1StioM-0005HO-BF; Tue, 24 Jul 2012 17:22:18 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StioK-0005GX-Iy for xen-changelog@lists.xensource.com; Tue, 24 Jul 2012 17:22:16 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-27.messagelabs.com!1343150529!9009870!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 25666 invoked from network); 24 Jul 2012 17:22:10 -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; 24 Jul 2012 17:22:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StioC-00016o-Sq for xen-changelog@lists.xensource.com; Tue, 24 Jul 2012 17:22:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1StioC-0003Qg-7U for xen-changelog@lists.xensource.com; Tue, 24 Jul 2012 17:22:08 +0000 Message-Id: Date: Tue, 24 Jul 2012 17:22:07 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] autoconf: revert 25178:181478052ea2 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343118944 -3600 # Node ID dbe672ae0f1fe5d99c4997d61c6a600f60f2838c # Parent 4a28c496acbf731e92b0b289cd6d323d1e0408c5 autoconf: revert 25178:181478052ea2 This change only removed the variables used to supply the path to the tool but didn't remove the checks. Will be fixed properly in a subsequent patch. Signed-off-by: Ian Campbell Committed-by: Ian Campbell --- diff -r 4a28c496acbf -r dbe672ae0f1f tools/configure --- a/tools/configure Mon Jul 23 17:58:33 2012 +0100 +++ b/tools/configure Tue Jul 24 09:35:44 2012 +0100 @@ -2622,14 +2622,9 @@ LDFLAGS="$PREPEND_LDFLAGS $LDFLAGS $APPE -case "$host_cpu" in -i[3456]86|x86_64) - - - - - ;; -esac + + + # Checks for programs. ac_ext=c diff -r 4a28c496acbf -r dbe672ae0f1f tools/configure.ac --- a/tools/configure.ac Mon Jul 23 17:58:33 2012 +0100 +++ b/tools/configure.ac Tue Jul 24 09:35:44 2012 +0100 @@ -67,16 +67,10 @@ AC_ARG_VAR([CURL], [Path to curl-config AC_ARG_VAR([XML], [Path to xml2-config tool]) AC_ARG_VAR([BASH], [Path to bash shell]) AC_ARG_VAR([XGETTEXT], [Path to xgetttext tool]) - -dnl as86, ld86, bcc and iasl are only present in x86* systems -case "$host_cpu" in -i[[3456]]86|x86_64) - AC_ARG_VAR([AS86], [Path to as86 tool]) - AC_ARG_VAR([LD86], [Path to ld86 tool]) - AC_ARG_VAR([BCC], [Path to bcc tool]) - AC_ARG_VAR([IASL], [Path to iasl tool]) - ;; -esac +AC_ARG_VAR([AS86], [Path to as86 tool]) +AC_ARG_VAR([LD86], [Path to ld86 tool]) +AC_ARG_VAR([BCC], [Path to bcc tool]) +AC_ARG_VAR([IASL], [Path to iasl tool]) # Checks for programs. AC_PROG_CC _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jul 24 17:22:21 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Jul 2012 17: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 1StioM-0005HO-BF; Tue, 24 Jul 2012 17:22:18 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StioK-0005GX-Iy for xen-changelog@lists.xensource.com; Tue, 24 Jul 2012 17:22:16 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-27.messagelabs.com!1343150529!9009870!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 25666 invoked from network); 24 Jul 2012 17:22:10 -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; 24 Jul 2012 17:22:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StioC-00016o-Sq for xen-changelog@lists.xensource.com; Tue, 24 Jul 2012 17:22:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1StioC-0003Qg-7U for xen-changelog@lists.xensource.com; Tue, 24 Jul 2012 17:22:08 +0000 Message-Id: Date: Tue, 24 Jul 2012 17:22:07 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] autoconf: revert 25178:181478052ea2 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343118944 -3600 # Node ID dbe672ae0f1fe5d99c4997d61c6a600f60f2838c # Parent 4a28c496acbf731e92b0b289cd6d323d1e0408c5 autoconf: revert 25178:181478052ea2 This change only removed the variables used to supply the path to the tool but didn't remove the checks. Will be fixed properly in a subsequent patch. Signed-off-by: Ian Campbell Committed-by: Ian Campbell --- diff -r 4a28c496acbf -r dbe672ae0f1f tools/configure --- a/tools/configure Mon Jul 23 17:58:33 2012 +0100 +++ b/tools/configure Tue Jul 24 09:35:44 2012 +0100 @@ -2622,14 +2622,9 @@ LDFLAGS="$PREPEND_LDFLAGS $LDFLAGS $APPE -case "$host_cpu" in -i[3456]86|x86_64) - - - - - ;; -esac + + + # Checks for programs. ac_ext=c diff -r 4a28c496acbf -r dbe672ae0f1f tools/configure.ac --- a/tools/configure.ac Mon Jul 23 17:58:33 2012 +0100 +++ b/tools/configure.ac Tue Jul 24 09:35:44 2012 +0100 @@ -67,16 +67,10 @@ AC_ARG_VAR([CURL], [Path to curl-config AC_ARG_VAR([XML], [Path to xml2-config tool]) AC_ARG_VAR([BASH], [Path to bash shell]) AC_ARG_VAR([XGETTEXT], [Path to xgetttext tool]) - -dnl as86, ld86, bcc and iasl are only present in x86* systems -case "$host_cpu" in -i[[3456]]86|x86_64) - AC_ARG_VAR([AS86], [Path to as86 tool]) - AC_ARG_VAR([LD86], [Path to ld86 tool]) - AC_ARG_VAR([BCC], [Path to bcc tool]) - AC_ARG_VAR([IASL], [Path to iasl tool]) - ;; -esac +AC_ARG_VAR([AS86], [Path to as86 tool]) +AC_ARG_VAR([LD86], [Path to ld86 tool]) +AC_ARG_VAR([BCC], [Path to bcc tool]) +AC_ARG_VAR([IASL], [Path to iasl tool]) # Checks for programs. AC_PROG_CC _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jul 24 17:22:22 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Jul 2012 17:22: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 1StioN-0005Hz-E2; Tue, 24 Jul 2012 17:22:19 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StioL-0005Gb-FH for xen-changelog@lists.xensource.com; Tue, 24 Jul 2012 17:22:17 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-27.messagelabs.com!1343150530!3710802!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 30196 invoked from network); 24 Jul 2012 17:22:10 -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; 24 Jul 2012 17:22:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StioD-00016u-MD for xen-changelog@lists.xensource.com; Tue, 24 Jul 2012 17:22:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1StioD-0003RA-BP for xen-changelog@lists.xensource.com; Tue, 24 Jul 2012 17:22:09 +0000 Message-Id: Date: Tue, 24 Jul 2012 17:22:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: fix vif.ifname when used with stub device model. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343122157 -3600 # Node ID cea026d5a378eca5c4fc3885bf9a462175bc43fe # Parent ce24b84f6af85fd606233100cc313be611b615c8 libxl: fix vif.ifname when used with stub device model. Currently the same libxl_device_nic is used to create both the HVM domain and its stub domain's NICs. This means that if a vifname is provided both the HVM domains PV NIC and the stub domains PV NIC will get the same name and the DM's NIC will fail to be attached. Instead launder the libxl_device_nic to add the TAP_DEVICE_SUFFIX ("-emu"). This is a bit of a misnomer, since the device is actually PV, but it is used to "back" the emulated device in the stub domain and this naming scheme is consistent with the non-stub case and is known to work e.g. with our hotplug scripts. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r ce24b84f6af8 -r cea026d5a378 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Tue Jul 24 09:35:44 2012 +0100 +++ b/tools/libxl/libxl_dm.c Tue Jul 24 10:29:17 2012 +0100 @@ -616,6 +616,24 @@ static char ** libxl__build_device_model } } +static void libxl__dm_vifs_from_hvm_guest_config(libxl__gc *gc, + libxl_domain_config * const guest_config, + libxl_domain_config *dm_config) +{ + int i, nr = guest_config->num_vifs; + + GCNEW_ARRAY(dm_config->vifs, nr); + + for (i=0; ivifs[i] = guest_config->vifs[i]; + if (dm_config->vifs[i].ifname) + dm_config->vifs[i].ifname = GCSPRINTF("%s" TAP_DEVICE_SUFFIX, + dm_config->vifs[i].ifname); + } + + dm_config->num_vifs = nr; +} + static int libxl__vfb_and_vkb_from_hvm_guest_config(libxl__gc *gc, const libxl_domain_config *guest_config, libxl_device_vfb *vfb, @@ -758,8 +776,7 @@ void libxl__spawn_stub_dm(libxl__egc *eg dm_config->disks = guest_config->disks; dm_config->num_disks = guest_config->num_disks; - dm_config->vifs = guest_config->vifs; - dm_config->num_vifs = guest_config->num_vifs; + libxl__dm_vifs_from_hvm_guest_config(gc, guest_config, dm_config); ret = libxl__domain_create_info_setdefault(gc, &dm_config->c_info); if (ret) goto out; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jul 24 17:22:22 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Jul 2012 17:22: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 1StioN-0005Hz-E2; Tue, 24 Jul 2012 17:22:19 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StioL-0005Gb-FH for xen-changelog@lists.xensource.com; Tue, 24 Jul 2012 17:22:17 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-27.messagelabs.com!1343150530!3710802!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 30196 invoked from network); 24 Jul 2012 17:22:10 -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; 24 Jul 2012 17:22:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StioD-00016u-MD for xen-changelog@lists.xensource.com; Tue, 24 Jul 2012 17:22:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1StioD-0003RA-BP for xen-changelog@lists.xensource.com; Tue, 24 Jul 2012 17:22:09 +0000 Message-Id: Date: Tue, 24 Jul 2012 17:22:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: fix vif.ifname when used with stub device model. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343122157 -3600 # Node ID cea026d5a378eca5c4fc3885bf9a462175bc43fe # Parent ce24b84f6af85fd606233100cc313be611b615c8 libxl: fix vif.ifname when used with stub device model. Currently the same libxl_device_nic is used to create both the HVM domain and its stub domain's NICs. This means that if a vifname is provided both the HVM domains PV NIC and the stub domains PV NIC will get the same name and the DM's NIC will fail to be attached. Instead launder the libxl_device_nic to add the TAP_DEVICE_SUFFIX ("-emu"). This is a bit of a misnomer, since the device is actually PV, but it is used to "back" the emulated device in the stub domain and this naming scheme is consistent with the non-stub case and is known to work e.g. with our hotplug scripts. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r ce24b84f6af8 -r cea026d5a378 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Tue Jul 24 09:35:44 2012 +0100 +++ b/tools/libxl/libxl_dm.c Tue Jul 24 10:29:17 2012 +0100 @@ -616,6 +616,24 @@ static char ** libxl__build_device_model } } +static void libxl__dm_vifs_from_hvm_guest_config(libxl__gc *gc, + libxl_domain_config * const guest_config, + libxl_domain_config *dm_config) +{ + int i, nr = guest_config->num_vifs; + + GCNEW_ARRAY(dm_config->vifs, nr); + + for (i=0; ivifs[i] = guest_config->vifs[i]; + if (dm_config->vifs[i].ifname) + dm_config->vifs[i].ifname = GCSPRINTF("%s" TAP_DEVICE_SUFFIX, + dm_config->vifs[i].ifname); + } + + dm_config->num_vifs = nr; +} + static int libxl__vfb_and_vkb_from_hvm_guest_config(libxl__gc *gc, const libxl_domain_config *guest_config, libxl_device_vfb *vfb, @@ -758,8 +776,7 @@ void libxl__spawn_stub_dm(libxl__egc *eg dm_config->disks = guest_config->disks; dm_config->num_disks = guest_config->num_disks; - dm_config->vifs = guest_config->vifs; - dm_config->num_vifs = guest_config->num_vifs; + libxl__dm_vifs_from_hvm_guest_config(gc, guest_config, dm_config); ret = libxl__domain_create_info_setdefault(gc, &dm_config->c_info); if (ret) goto out; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jul 24 23:55:26 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Jul 2012 23:55:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Stowg-0003SG-GL; Tue, 24 Jul 2012 23:55:18 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Stowf-0003SB-H1 for xen-changelog@lists.xensource.com; Tue, 24 Jul 2012 23:55:17 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-27.messagelabs.com!1343174109!10570124!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 26022 invoked from network); 24 Jul 2012 23:55:10 -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; 24 Jul 2012 23:55:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StowX-0005bB-3f for xen-changelog@lists.xensource.com; Tue, 24 Jul 2012 23:55:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1StowW-0006kI-Aw for xen-changelog@lists.xensource.com; Tue, 24 Jul 2012 23:55:08 +0000 Message-Id: Date: Tue, 24 Jul 2012 23:55:07 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] x86/EFI: define and use EFI_DIR make variable, defaulting to /usr/lib64/efi X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Matt Wilson # Date 1343142124 -7200 # Node ID 663eb766cdde864cd8c8b9037677a07a56bb0290 # Parent 2fb65af3e859ac8d07c1dae4dc033948b0776f24 x86/EFI: define and use EFI_DIR make variable, defaulting to /usr/lib64/efi After commit 25594:ad08cd8e7097, EFI Xen binaries were installed to /efi instead of /usr/lib64/efi. This patch restores the previous behaviour established in commit 23645:638f31a30b6c. Signed-off-by: Matt Wilson Reported-by: Olaf Hering Committed-by: Jan Beulich --- diff -r 2fb65af3e859 -r 663eb766cdde config/x86_64.mk --- a/config/x86_64.mk Tue Jul 24 10:29:18 2012 +0100 +++ b/config/x86_64.mk Tue Jul 24 17:02:04 2012 +0200 @@ -12,6 +12,8 @@ CFLAGS += -m64 SunOS_LIBDIR = $(SunOS_LIBDIR_x86_64) +EFI_DIR ?= /usr/lib64/efi + # Use only if calling $(LD) directly. ifeq ($(XEN_OS),OpenBSD) LDFLAGS_DIRECT += -melf_x86_64_obsd diff -r 2fb65af3e859 -r 663eb766cdde docs/misc/efi.markdown --- a/docs/misc/efi.markdown Tue Jul 24 10:29:18 2012 +0100 +++ b/docs/misc/efi.markdown Tue Jul 24 17:02:04 2012 +0200 @@ -4,10 +4,12 @@ newer. Additionally, the binutils build for the x86_64-pep emulation (i.e. `--enable-targets=x86_64-pep` or an option of equivalent effect should be passed to the configure script). -Once built, `make install-xen` can place the resulting binary directly into +Once built, `make install-xen` will place the resulting binary directly into the EFI boot partition, provided `EFI_VENDOR` is set in the environment (and `EFI_MOUNTPOINT` is overridden as needed, should the default of `/boot/efi` not -match your system). +match your system). The xen.efi binary will also be installed in +`/usr/lib64/efi/`, unless `EFI_DIR` is set in the environment to override this +default. The binary itself will require a configuration file (names with the `.efi` extension of the binary's name replaced by `.cfg`, and - until an existing diff -r 2fb65af3e859 -r 663eb766cdde xen/Makefile --- a/xen/Makefile Tue Jul 24 10:29:18 2012 +0100 +++ b/xen/Makefile Tue Jul 24 17:02:04 2012 +0200 @@ -35,12 +35,12 @@ _install: $(TARGET).gz ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION).gz $(DESTDIR)/boot/$(notdir $(TARGET))-$(XEN_VERSION).gz ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION).gz $(DESTDIR)/boot/$(notdir $(TARGET)).gz $(INSTALL_DATA) $(TARGET)-syms $(DESTDIR)/boot/$(notdir $(TARGET))-syms-$(XEN_FULLVERSION) - if [ -r $(TARGET).efi ]; then \ - [ -d $(DESTDIR)$(LIBDIR)/efi ] || $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/efi; \ - $(INSTALL_DATA) $(TARGET).efi $(DESTDIR)$(LIBDIR)/efi/$(notdir $(TARGET))-$(XEN_FULLVERSION).efi; \ - ln -sf $(notdir $(TARGET))-$(XEN_FULLVERSION).efi $(DESTDIR)$(LIBDIR)/efi/$(notdir $(TARGET))-$(XEN_VERSION).$(XEN_SUBVERSION).efi; \ - ln -sf $(notdir $(TARGET))-$(XEN_FULLVERSION).efi $(DESTDIR)$(LIBDIR)/efi/$(notdir $(TARGET))-$(XEN_VERSION).efi; \ - ln -sf $(notdir $(TARGET))-$(XEN_FULLVERSION).efi $(DESTDIR)$(LIBDIR)/efi/$(notdir $(TARGET)).efi; \ + if [ -r $(TARGET).efi -a -n '$(EFI_DIR)' ]; then \ + [ -d $(DESTDIR)$(EFI_DIR) ] || $(INSTALL_DIR) $(DESTDIR)$(EFI_DIR); \ + $(INSTALL_DATA) $(TARGET).efi $(DESTDIR)$(EFI_DIR)/$(notdir $(TARGET))-$(XEN_FULLVERSION).efi; \ + ln -sf $(notdir $(TARGET))-$(XEN_FULLVERSION).efi $(DESTDIR)$(EFI_DIR)/$(notdir $(TARGET))-$(XEN_VERSION).$(XEN_SUBVERSION).efi; \ + ln -sf $(notdir $(TARGET))-$(XEN_FULLVERSION).efi $(DESTDIR)$(EFI_DIR)/$(notdir $(TARGET))-$(XEN_VERSION).efi; \ + ln -sf $(notdir $(TARGET))-$(XEN_FULLVERSION).efi $(DESTDIR)$(EFI_DIR)/$(notdir $(TARGET)).efi; \ if [ -n '$(EFI_MOUNTPOINT)' -a -n '$(EFI_VENDOR)' ]; then \ $(INSTALL_DATA) $(TARGET).efi $(DESTDIR)$(EFI_MOUNTPOINT)/efi/$(EFI_VENDOR)/$(notdir $(TARGET))-$(XEN_FULLVERSION).efi; \ elif [ "$(DESTDIR)" = "$(patsubst $(shell cd $(XEN_ROOT) && pwd)/%,%,$(DESTDIR))" ]; then \ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jul 24 23:55:26 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Jul 2012 23:55:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Stowg-0003SG-GL; Tue, 24 Jul 2012 23:55:18 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Stowf-0003SB-H1 for xen-changelog@lists.xensource.com; Tue, 24 Jul 2012 23:55:17 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-27.messagelabs.com!1343174109!10570124!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 26022 invoked from network); 24 Jul 2012 23:55:10 -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; 24 Jul 2012 23:55:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1StowX-0005bB-3f for xen-changelog@lists.xensource.com; Tue, 24 Jul 2012 23:55:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1StowW-0006kI-Aw for xen-changelog@lists.xensource.com; Tue, 24 Jul 2012 23:55:08 +0000 Message-Id: Date: Tue, 24 Jul 2012 23:55:07 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] x86/EFI: define and use EFI_DIR make variable, defaulting to /usr/lib64/efi X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Matt Wilson # Date 1343142124 -7200 # Node ID 663eb766cdde864cd8c8b9037677a07a56bb0290 # Parent 2fb65af3e859ac8d07c1dae4dc033948b0776f24 x86/EFI: define and use EFI_DIR make variable, defaulting to /usr/lib64/efi After commit 25594:ad08cd8e7097, EFI Xen binaries were installed to /efi instead of /usr/lib64/efi. This patch restores the previous behaviour established in commit 23645:638f31a30b6c. Signed-off-by: Matt Wilson Reported-by: Olaf Hering Committed-by: Jan Beulich --- diff -r 2fb65af3e859 -r 663eb766cdde config/x86_64.mk --- a/config/x86_64.mk Tue Jul 24 10:29:18 2012 +0100 +++ b/config/x86_64.mk Tue Jul 24 17:02:04 2012 +0200 @@ -12,6 +12,8 @@ CFLAGS += -m64 SunOS_LIBDIR = $(SunOS_LIBDIR_x86_64) +EFI_DIR ?= /usr/lib64/efi + # Use only if calling $(LD) directly. ifeq ($(XEN_OS),OpenBSD) LDFLAGS_DIRECT += -melf_x86_64_obsd diff -r 2fb65af3e859 -r 663eb766cdde docs/misc/efi.markdown --- a/docs/misc/efi.markdown Tue Jul 24 10:29:18 2012 +0100 +++ b/docs/misc/efi.markdown Tue Jul 24 17:02:04 2012 +0200 @@ -4,10 +4,12 @@ newer. Additionally, the binutils build for the x86_64-pep emulation (i.e. `--enable-targets=x86_64-pep` or an option of equivalent effect should be passed to the configure script). -Once built, `make install-xen` can place the resulting binary directly into +Once built, `make install-xen` will place the resulting binary directly into the EFI boot partition, provided `EFI_VENDOR` is set in the environment (and `EFI_MOUNTPOINT` is overridden as needed, should the default of `/boot/efi` not -match your system). +match your system). The xen.efi binary will also be installed in +`/usr/lib64/efi/`, unless `EFI_DIR` is set in the environment to override this +default. The binary itself will require a configuration file (names with the `.efi` extension of the binary's name replaced by `.cfg`, and - until an existing diff -r 2fb65af3e859 -r 663eb766cdde xen/Makefile --- a/xen/Makefile Tue Jul 24 10:29:18 2012 +0100 +++ b/xen/Makefile Tue Jul 24 17:02:04 2012 +0200 @@ -35,12 +35,12 @@ _install: $(TARGET).gz ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION).gz $(DESTDIR)/boot/$(notdir $(TARGET))-$(XEN_VERSION).gz ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION).gz $(DESTDIR)/boot/$(notdir $(TARGET)).gz $(INSTALL_DATA) $(TARGET)-syms $(DESTDIR)/boot/$(notdir $(TARGET))-syms-$(XEN_FULLVERSION) - if [ -r $(TARGET).efi ]; then \ - [ -d $(DESTDIR)$(LIBDIR)/efi ] || $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/efi; \ - $(INSTALL_DATA) $(TARGET).efi $(DESTDIR)$(LIBDIR)/efi/$(notdir $(TARGET))-$(XEN_FULLVERSION).efi; \ - ln -sf $(notdir $(TARGET))-$(XEN_FULLVERSION).efi $(DESTDIR)$(LIBDIR)/efi/$(notdir $(TARGET))-$(XEN_VERSION).$(XEN_SUBVERSION).efi; \ - ln -sf $(notdir $(TARGET))-$(XEN_FULLVERSION).efi $(DESTDIR)$(LIBDIR)/efi/$(notdir $(TARGET))-$(XEN_VERSION).efi; \ - ln -sf $(notdir $(TARGET))-$(XEN_FULLVERSION).efi $(DESTDIR)$(LIBDIR)/efi/$(notdir $(TARGET)).efi; \ + if [ -r $(TARGET).efi -a -n '$(EFI_DIR)' ]; then \ + [ -d $(DESTDIR)$(EFI_DIR) ] || $(INSTALL_DIR) $(DESTDIR)$(EFI_DIR); \ + $(INSTALL_DATA) $(TARGET).efi $(DESTDIR)$(EFI_DIR)/$(notdir $(TARGET))-$(XEN_FULLVERSION).efi; \ + ln -sf $(notdir $(TARGET))-$(XEN_FULLVERSION).efi $(DESTDIR)$(EFI_DIR)/$(notdir $(TARGET))-$(XEN_VERSION).$(XEN_SUBVERSION).efi; \ + ln -sf $(notdir $(TARGET))-$(XEN_FULLVERSION).efi $(DESTDIR)$(EFI_DIR)/$(notdir $(TARGET))-$(XEN_VERSION).efi; \ + ln -sf $(notdir $(TARGET))-$(XEN_FULLVERSION).efi $(DESTDIR)$(EFI_DIR)/$(notdir $(TARGET)).efi; \ if [ -n '$(EFI_MOUNTPOINT)' -a -n '$(EFI_VENDOR)' ]; then \ $(INSTALL_DATA) $(TARGET).efi $(DESTDIR)$(EFI_MOUNTPOINT)/efi/$(EFI_VENDOR)/$(notdir $(TARGET))-$(XEN_FULLVERSION).efi; \ elif [ "$(DESTDIR)" = "$(patsubst $(shell cd $(XEN_ROOT) && pwd)/%,%,$(DESTDIR))" ]; then \ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 26 20:55:16 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jul 2012 20:55: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 1SuV5U-0006iY-QV; Thu, 26 Jul 2012 20:55:12 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5U-0006iR-50 for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:12 +0000 Received: from [85.158.138.51:21311] by server-12.bemta-3.messagelabs.com id DE/B4-15259-FAEA1105; Thu, 26 Jul 2012 20:55:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-174.messagelabs.com!1343336109!20966586!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 21733 invoked from network); 26 Jul 2012 20:55:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 26 Jul 2012 20:55:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5R-00061Z-0p for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuV5Q-0005kd-G3 for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:08 +0000 Message-Id: Date: Thu, 26 Jul 2012 20:55:07 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: refuse to try and migrate an HVM guest using qemu-xen X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343234354 -3600 # Node ID d35e84ac821dea78667d81d6d75a69f946b09a76 # Parent 2fb65af3e859ac8d07c1dae4dc033948b0776f24 libxl: refuse to try and migrate an HVM guest using qemu-xen libxl/qemu-upstream currently do not collude together to enable log-dirty mode and therefore migrations are unsafe. Refuse to even try for now. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r 2fb65af3e859 -r d35e84ac821d tools/libxl/libxl.c --- a/tools/libxl/libxl.c Tue Jul 24 10:29:18 2012 +0100 +++ b/tools/libxl/libxl.c Wed Jul 25 17:39:14 2012 +0100 @@ -765,6 +765,23 @@ int libxl_domain_suspend(libxl_ctx *ctx, goto out_err; } + if (type == LIBXL_DOMAIN_TYPE_HVM && flags & LIBXL_SUSPEND_LIVE) { + switch (libxl__device_model_version_running(gc, domid)) { + case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: + LOG(ERROR, + "cannot live migrate HVM domains with qemu-xen device-model"); + rc = ERROR_FAIL; + goto out_err; + case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: + /* No problem */ + break; + case -1: + rc = ERROR_FAIL; + goto out_err; + default: abort(); + } + } + libxl__domain_suspend_state *dss; GCNEW(dss); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 26 20:55:16 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jul 2012 20:55: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 1SuV5U-0006iY-QV; Thu, 26 Jul 2012 20:55:12 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5U-0006iR-50 for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:12 +0000 Received: from [85.158.138.51:21311] by server-12.bemta-3.messagelabs.com id DE/B4-15259-FAEA1105; Thu, 26 Jul 2012 20:55:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-174.messagelabs.com!1343336109!20966586!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 21733 invoked from network); 26 Jul 2012 20:55:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 26 Jul 2012 20:55:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5R-00061Z-0p for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuV5Q-0005kd-G3 for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:08 +0000 Message-Id: Date: Thu, 26 Jul 2012 20:55:07 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: refuse to try and migrate an HVM guest using qemu-xen X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343234354 -3600 # Node ID d35e84ac821dea78667d81d6d75a69f946b09a76 # Parent 2fb65af3e859ac8d07c1dae4dc033948b0776f24 libxl: refuse to try and migrate an HVM guest using qemu-xen libxl/qemu-upstream currently do not collude together to enable log-dirty mode and therefore migrations are unsafe. Refuse to even try for now. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r 2fb65af3e859 -r d35e84ac821d tools/libxl/libxl.c --- a/tools/libxl/libxl.c Tue Jul 24 10:29:18 2012 +0100 +++ b/tools/libxl/libxl.c Wed Jul 25 17:39:14 2012 +0100 @@ -765,6 +765,23 @@ int libxl_domain_suspend(libxl_ctx *ctx, goto out_err; } + if (type == LIBXL_DOMAIN_TYPE_HVM && flags & LIBXL_SUSPEND_LIVE) { + switch (libxl__device_model_version_running(gc, domid)) { + case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: + LOG(ERROR, + "cannot live migrate HVM domains with qemu-xen device-model"); + rc = ERROR_FAIL; + goto out_err; + case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: + /* No problem */ + break; + case -1: + rc = ERROR_FAIL; + goto out_err; + default: abort(); + } + } + libxl__domain_suspend_state *dss; GCNEW(dss); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 26 20:55:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jul 2012 20:55: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 1SuV5X-0006jE-T5; Thu, 26 Jul 2012 20:55:15 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5W-0006il-H6 for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:14 +0000 Received: from [85.158.139.83:11602] by server-2.bemta-5.messagelabs.com id F6/EF-04598-1BEA1105; Thu, 26 Jul 2012 20:55:13 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-182.messagelabs.com!1343336111!21509890!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 8174 invoked from network); 26 Jul 2012 20:55:12 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 26 Jul 2012 20:55:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5T-00061l-2P for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuV5S-0005ld-Tt for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:10 +0000 Message-Id: Date: Thu, 26 Jul 2012 20:55:10 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: fix comment regarding bootloader disk lifetime X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343234357 -3600 # Node ID 50bc30bafbce95ae046c0a06d88968989bf5728a # Parent b0d31b81aa588ef712cfbc6c8e4531082b2e26cd libxl: fix comment regarding bootloader disk lifetime Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r b0d31b81aa58 -r 50bc30bafbce tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Wed Jul 25 17:39:17 2012 +0100 +++ b/tools/libxl/libxl_internal.h Wed Jul 25 17:39:17 2012 +0100 @@ -2133,9 +2133,11 @@ struct libxl__bootloader_state { /* Should be zeroed by caller on entry. Will be filled in by * bootloader machinery; represents the local attachment of the * disk for the benefit of the bootloader. Must be detached by - * the caller using libxl__device_disk_local_detach, but only - * after the domain's kernel and initramfs have been loaded into - * memory and the file references disposed of. */ + * the caller using libxl__device_disk_local_detach. + * (This is safe to do after ->callback() has happened since + * the domain's kernel and initramfs will have been copied + * out of the guest's disk into a temporary directory, mapped + * as file references, and deleted. */ libxl_device_disk localdisk; uint32_t domid; /* outputs: _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 26 20:55:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jul 2012 20:55: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 1SuV5X-0006jE-T5; Thu, 26 Jul 2012 20:55:15 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5W-0006il-H6 for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:14 +0000 Received: from [85.158.139.83:11602] by server-2.bemta-5.messagelabs.com id F6/EF-04598-1BEA1105; Thu, 26 Jul 2012 20:55:13 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-182.messagelabs.com!1343336111!21509890!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 8174 invoked from network); 26 Jul 2012 20:55:12 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 26 Jul 2012 20:55:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5T-00061l-2P for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuV5S-0005ld-Tt for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:10 +0000 Message-Id: Date: Thu, 26 Jul 2012 20:55:10 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: fix comment regarding bootloader disk lifetime X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343234357 -3600 # Node ID 50bc30bafbce95ae046c0a06d88968989bf5728a # Parent b0d31b81aa588ef712cfbc6c8e4531082b2e26cd libxl: fix comment regarding bootloader disk lifetime Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r b0d31b81aa58 -r 50bc30bafbce tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Wed Jul 25 17:39:17 2012 +0100 +++ b/tools/libxl/libxl_internal.h Wed Jul 25 17:39:17 2012 +0100 @@ -2133,9 +2133,11 @@ struct libxl__bootloader_state { /* Should be zeroed by caller on entry. Will be filled in by * bootloader machinery; represents the local attachment of the * disk for the benefit of the bootloader. Must be detached by - * the caller using libxl__device_disk_local_detach, but only - * after the domain's kernel and initramfs have been loaded into - * memory and the file references disposed of. */ + * the caller using libxl__device_disk_local_detach. + * (This is safe to do after ->callback() has happened since + * the domain's kernel and initramfs will have been copied + * out of the guest's disk into a temporary directory, mapped + * as file references, and deleted. */ libxl_device_disk localdisk; uint32_t domid; /* outputs: _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 26 20:55:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jul 2012 20:55: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 1SuV5X-0006jJ-Vo; Thu, 26 Jul 2012 20:55:15 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5X-0006ir-9L for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:15 +0000 Received: from [85.158.138.51:21383] by server-8.bemta-3.messagelabs.com id E0/E4-30925-2BEA1105; Thu, 26 Jul 2012 20:55:14 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-174.messagelabs.com!1343336112!28890805!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 18326 invoked from network); 26 Jul 2012 20:55:13 -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; 26 Jul 2012 20:55:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5U-00061o-CP for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuV5U-0005m9-7V for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:12 +0000 Message-Id: Date: Thu, 26 Jul 2012 20:55:11 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] python: disable libxl bindings X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343234359 -3600 # Node ID 2859b79fbbc7bf09f3113a36789826a732b0fdca # Parent ad4829c26a233c4de206fd667a388298fde5b6cb python: disable libxl bindings They are rather incomplete and have no users or maintainer. Many of the functions which do exsit raise a NotImplemented exception. Disable them so that users of the 4.2 release aren't confused into trying to use them. This only does the minimal to disable them and makes it easy to locally reenable if anyone wants to hack these into shape in the future. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r ad4829c26a23 -r 2859b79fbbc7 tools/python/setup.py --- a/tools/python/setup.py Wed Jul 25 17:39:18 2012 +0100 +++ b/tools/python/setup.py Wed Jul 25 17:39:19 2012 +0100 @@ -88,7 +88,8 @@ xl = Extension("xl", sources = [ "xen/lowlevel/xl/xl.c", "xen/lowlevel/xl/_pyxl_types.c" ]) plat = os.uname()[0] -modules = [ xc, xs, ptsname, flask, xl ] +modules = [ xc, xs, ptsname, flask ] +#modules.extend([ xl ]) if plat == 'SunOS': modules.extend([ scf, process ]) if plat == 'Linux': _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 26 20:55:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jul 2012 20:55: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 1SuV5X-0006jJ-Vo; Thu, 26 Jul 2012 20:55:15 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5X-0006ir-9L for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:15 +0000 Received: from [85.158.138.51:21383] by server-8.bemta-3.messagelabs.com id E0/E4-30925-2BEA1105; Thu, 26 Jul 2012 20:55:14 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-174.messagelabs.com!1343336112!28890805!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 18326 invoked from network); 26 Jul 2012 20:55:13 -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; 26 Jul 2012 20:55:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5U-00061o-CP for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuV5U-0005m9-7V for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:12 +0000 Message-Id: Date: Thu, 26 Jul 2012 20:55:11 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] python: disable libxl bindings X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343234359 -3600 # Node ID 2859b79fbbc7bf09f3113a36789826a732b0fdca # Parent ad4829c26a233c4de206fd667a388298fde5b6cb python: disable libxl bindings They are rather incomplete and have no users or maintainer. Many of the functions which do exsit raise a NotImplemented exception. Disable them so that users of the 4.2 release aren't confused into trying to use them. This only does the minimal to disable them and makes it easy to locally reenable if anyone wants to hack these into shape in the future. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r ad4829c26a23 -r 2859b79fbbc7 tools/python/setup.py --- a/tools/python/setup.py Wed Jul 25 17:39:18 2012 +0100 +++ b/tools/python/setup.py Wed Jul 25 17:39:19 2012 +0100 @@ -88,7 +88,8 @@ xl = Extension("xl", sources = [ "xen/lowlevel/xl/xl.c", "xen/lowlevel/xl/_pyxl_types.c" ]) plat = os.uname()[0] -modules = [ xc, xs, ptsname, flask, xl ] +modules = [ xc, xs, ptsname, flask ] +#modules.extend([ xl ]) if plat == 'SunOS': modules.extend([ scf, process ]) if plat == 'Linux': _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 26 20:55:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jul 2012 20:55: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 1SuV5Z-0006jp-2l; Thu, 26 Jul 2012 20:55:17 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5Y-0006jB-9F for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:16 +0000 Received: from [85.158.143.99:30962] by server-1.bemta-4.messagelabs.com id BA/C5-24392-3BEA1105; Thu, 26 Jul 2012 20:55:15 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-216.messagelabs.com!1343336113!23605780!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 14936 invoked from network); 26 Jul 2012 20:55:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 26 Jul 2012 20:55:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5V-00061u-GD for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuV5V-0005mf-Ec for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:13 +0000 Message-Id: Date: Thu, 26 Jul 2012 20:55:12 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: add bounds check on hypercall array X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343234361 -3600 # Node ID a1ee7eccd83e533785aa35caa49833a1277807d3 # Parent 7118869c9cbee6d8bd850aa58ebec00e6486fb16 arm: add bounds check on hypercall array Otherwise a guest can cause us to run off the end of the array. Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini [ ijc -- switched to >= not > ] Committed-by: Ian Campbell --- diff -r 7118869c9cbe -r a1ee7eccd83e xen/arch/arm/traps.c --- a/xen/arch/arm/traps.c Wed Jul 25 17:39:20 2012 +0100 +++ b/xen/arch/arm/traps.c Wed Jul 25 17:39:21 2012 +0100 @@ -479,6 +479,12 @@ static void do_trap_hypercall(struct cpu return; } + if ( regs->r12 >= ARRAY_SIZE(arm_hypercall_table) ) + { + regs->r0 = -ENOSYS; + return; + } + call = arm_hypercall_table[regs->r12].fn; if ( call == NULL ) { _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 26 20:55:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jul 2012 20:55: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 1SuV5Z-0006jp-2l; Thu, 26 Jul 2012 20:55:17 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5Y-0006jB-9F for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:16 +0000 Received: from [85.158.143.99:30962] by server-1.bemta-4.messagelabs.com id BA/C5-24392-3BEA1105; Thu, 26 Jul 2012 20:55:15 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-216.messagelabs.com!1343336113!23605780!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 14936 invoked from network); 26 Jul 2012 20:55:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 26 Jul 2012 20:55:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5V-00061u-GD for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuV5V-0005mf-Ec for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:13 +0000 Message-Id: Date: Thu, 26 Jul 2012 20:55:12 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: add bounds check on hypercall array X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343234361 -3600 # Node ID a1ee7eccd83e533785aa35caa49833a1277807d3 # Parent 7118869c9cbee6d8bd850aa58ebec00e6486fb16 arm: add bounds check on hypercall array Otherwise a guest can cause us to run off the end of the array. Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini [ ijc -- switched to >= not > ] Committed-by: Ian Campbell --- diff -r 7118869c9cbe -r a1ee7eccd83e xen/arch/arm/traps.c --- a/xen/arch/arm/traps.c Wed Jul 25 17:39:20 2012 +0100 +++ b/xen/arch/arm/traps.c Wed Jul 25 17:39:21 2012 +0100 @@ -479,6 +479,12 @@ static void do_trap_hypercall(struct cpu return; } + if ( regs->r12 >= ARRAY_SIZE(arm_hypercall_table) ) + { + regs->r0 = -ENOSYS; + return; + } + call = arm_hypercall_table[regs->r12].fn; if ( call == NULL ) { _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 26 20:55:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jul 2012 20:55: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 1SuV5a-0006kE-7y; Thu, 26 Jul 2012 20:55:18 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5Z-0006iS-A8 for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:17 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-27.messagelabs.com!1343336109!5297096!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 27442 invoked from network); 26 Jul 2012 20:55:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 26 Jul 2012 20:55:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5R-00061c-8M for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuV5R-0005ku-66 for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:09 +0000 Message-Id: Date: Thu, 26 Jul 2012 20:55:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] hotplug: fix ip_of for systems using a peer-to-peer link X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343234355 -3600 # Node ID c8f1e4a98f7f10c095377e8f7c61dc07fb203dfd # Parent d35e84ac821dea78667d81d6d75a69f946b09a76 hotplug: fix ip_of for systems using a peer-to-peer link This is from an old Debian bug at http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=437127 I'm slightly inferring what the configuration which trigger this issue is, the bug report says: This code however fails if no slash is present in the address, which is the case in my configuration: $ ip addr show dev eth0 2: eth0: mtu 1500 qdisc pfifo_fast qlen 1000 link/ether 00:16:17:90:b4:35 brd ff:ff:ff:ff:ff:ff inet 88.198.12.XXX peer 88.198.12.XXX/32 brd 88.255.255.255 scope global eth0 I hope either Marc or Stefan can correct me if I have surmised wrongly what this configuration represents. This function is used in the vif-route configuration. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r d35e84ac821d -r c8f1e4a98f7f tools/hotplug/Linux/vif-common.sh --- a/tools/hotplug/Linux/vif-common.sh Wed Jul 25 17:39:14 2012 +0100 +++ b/tools/hotplug/Linux/vif-common.sh Wed Jul 25 17:39:15 2012 +0100 @@ -189,7 +189,7 @@ handle_iptable() # ip_of() { - ip addr show "$1" | awk "/^.*inet.*$1\$/{print \$2}" | sed -n '1 s,/.*,,p' + ip -4 -o addr show primary dev "$1" | awk '$3 == "inet" {split($4,i,"/"); print i[1]; exit}' } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 26 20:55:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jul 2012 20:55: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 1SuV5a-0006kE-7y; Thu, 26 Jul 2012 20:55:18 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5Z-0006iS-A8 for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:17 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-27.messagelabs.com!1343336109!5297096!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 27442 invoked from network); 26 Jul 2012 20:55:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 26 Jul 2012 20:55:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5R-00061c-8M for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuV5R-0005ku-66 for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:09 +0000 Message-Id: Date: Thu, 26 Jul 2012 20:55:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] hotplug: fix ip_of for systems using a peer-to-peer link X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343234355 -3600 # Node ID c8f1e4a98f7f10c095377e8f7c61dc07fb203dfd # Parent d35e84ac821dea78667d81d6d75a69f946b09a76 hotplug: fix ip_of for systems using a peer-to-peer link This is from an old Debian bug at http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=437127 I'm slightly inferring what the configuration which trigger this issue is, the bug report says: This code however fails if no slash is present in the address, which is the case in my configuration: $ ip addr show dev eth0 2: eth0: mtu 1500 qdisc pfifo_fast qlen 1000 link/ether 00:16:17:90:b4:35 brd ff:ff:ff:ff:ff:ff inet 88.198.12.XXX peer 88.198.12.XXX/32 brd 88.255.255.255 scope global eth0 I hope either Marc or Stefan can correct me if I have surmised wrongly what this configuration represents. This function is used in the vif-route configuration. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r d35e84ac821d -r c8f1e4a98f7f tools/hotplug/Linux/vif-common.sh --- a/tools/hotplug/Linux/vif-common.sh Wed Jul 25 17:39:14 2012 +0100 +++ b/tools/hotplug/Linux/vif-common.sh Wed Jul 25 17:39:15 2012 +0100 @@ -189,7 +189,7 @@ handle_iptable() # ip_of() { - ip addr show "$1" | awk "/^.*inet.*$1\$/{print \$2}" | sed -n '1 s,/.*,,p' + ip -4 -o addr show primary dev "$1" | awk '$3 == "inet" {split($4,i,"/"); print i[1]; exit}' } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 26 20:55:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jul 2012 20:55: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 1SuV5a-0006k9-5H; Thu, 26 Jul 2012 20:55:18 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5Y-0006jB-UK for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:17 +0000 Received: from [85.158.143.99:30994] by server-1.bemta-4.messagelabs.com id 8D/C5-24392-4BEA1105; Thu, 26 Jul 2012 20:55:16 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-216.messagelabs.com!1343336114!28553665!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 2460 invoked from network); 26 Jul 2012 20:55:15 -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; 26 Jul 2012 20:55:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5W-000620-IJ for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuV5W-0005nA-H5 for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:14 +0000 Message-Id: Date: Thu, 26 Jul 2012 20:55:14 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: libxl_domain_sched_params_set case for ARINC 653 scheduler X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 Kane # Date 1343234362 -3600 # Node ID 38dbecf592f7a2a9e01c1f0e542e42b63e2ef281 # Parent afece34aca520ca54939c2146f5a0a6822955148 libxl: libxl_domain_sched_params_set case for ARINC 653 scheduler Implements sched_arinc653_domain_set to match the existing API. Currently, there is no domain-specific configuration when using the ARINC 653 scheduler, so we simply return success. Signed-off-by: Andrew Kane Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r afece34aca52 -r 38dbecf592f7 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Wed Jul 25 17:39:21 2012 +0100 +++ b/tools/libxl/libxl.c Wed Jul 25 17:39:22 2012 +0100 @@ -3659,6 +3659,14 @@ libxl_scheduler libxl_get_scheduler(libx return sched; } +static int sched_arinc653_domain_set(libxl__gc *gc, uint32_t domid, + const libxl_domain_sched_params *scinfo) +{ + /* Currently, the ARINC 653 scheduler does not take any domain-specific + configuration, so we simply return success. */ + return 0; +} + static int sched_credit_domain_get(libxl__gc *gc, uint32_t domid, libxl_domain_sched_params *scinfo) { @@ -3926,6 +3934,9 @@ int libxl_domain_sched_params_set(libxl_ case LIBXL_SCHEDULER_CREDIT2: ret=sched_credit2_domain_set(gc, domid, scinfo); break; + case LIBXL_SCHEDULER_ARINC653: + ret=sched_arinc653_domain_set(gc, domid, scinfo); + break; default: LOG(ERROR, "Unknown scheduler"); ret=ERROR_INVAL; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 26 20:55:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jul 2012 20:55: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 1SuV5a-0006k9-5H; Thu, 26 Jul 2012 20:55:18 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5Y-0006jB-UK for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:17 +0000 Received: from [85.158.143.99:30994] by server-1.bemta-4.messagelabs.com id 8D/C5-24392-4BEA1105; Thu, 26 Jul 2012 20:55:16 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-216.messagelabs.com!1343336114!28553665!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 2460 invoked from network); 26 Jul 2012 20:55:15 -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; 26 Jul 2012 20:55:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5W-000620-IJ for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuV5W-0005nA-H5 for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:14 +0000 Message-Id: Date: Thu, 26 Jul 2012 20:55:14 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: libxl_domain_sched_params_set case for ARINC 653 scheduler X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 Kane # Date 1343234362 -3600 # Node ID 38dbecf592f7a2a9e01c1f0e542e42b63e2ef281 # Parent afece34aca520ca54939c2146f5a0a6822955148 libxl: libxl_domain_sched_params_set case for ARINC 653 scheduler Implements sched_arinc653_domain_set to match the existing API. Currently, there is no domain-specific configuration when using the ARINC 653 scheduler, so we simply return success. Signed-off-by: Andrew Kane Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r afece34aca52 -r 38dbecf592f7 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Wed Jul 25 17:39:21 2012 +0100 +++ b/tools/libxl/libxl.c Wed Jul 25 17:39:22 2012 +0100 @@ -3659,6 +3659,14 @@ libxl_scheduler libxl_get_scheduler(libx return sched; } +static int sched_arinc653_domain_set(libxl__gc *gc, uint32_t domid, + const libxl_domain_sched_params *scinfo) +{ + /* Currently, the ARINC 653 scheduler does not take any domain-specific + configuration, so we simply return success. */ + return 0; +} + static int sched_credit_domain_get(libxl__gc *gc, uint32_t domid, libxl_domain_sched_params *scinfo) { @@ -3926,6 +3934,9 @@ int libxl_domain_sched_params_set(libxl_ case LIBXL_SCHEDULER_CREDIT2: ret=sched_credit2_domain_set(gc, domid, scinfo); break; + case LIBXL_SCHEDULER_ARINC653: + ret=sched_arinc653_domain_set(gc, domid, scinfo); + break; default: LOG(ERROR, "Unknown scheduler"); ret=ERROR_INVAL; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 26 20:55:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jul 2012 20:55: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 1SuV5b-0006lL-Au; Thu, 26 Jul 2012 20:55:19 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5a-0006ie-BF for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:18 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-27.messagelabs.com!1343336110!10929774!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 925 invoked from network); 26 Jul 2012 20:55:11 -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; 26 Jul 2012 20:55:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5R-00061f-VH for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuV5R-0005l9-Nt for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:09 +0000 Message-Id: Date: Thu, 26 Jul 2012 20:55:09 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] hotplug: network-bridge: fix for interfaces with no gateway X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343234356 -3600 # Node ID e37bd3d6f769a9604adacbef747d9dff9705e69a # Parent c8f1e4a98f7f10c095377e8f7c61dc07fb203dfd hotplug: network-bridge: fix for interfaces with no gateway This comes from an old Debian bug report http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=588477 which refers to http://lists.xen.org/archives/html/xen-users/2010-06/msg00420.html. Although we no longer have a trap in _claim_lock as described (this was removed in 25590:bb250383a4f5 "hotplug/Linux: use flock based locking") and the use of network-* scripts is discouraged (in favour of using distro provided mechanisms) the general principal that relying on the semantics of /bin/sh's && is unwise seems sound. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r c8f1e4a98f7f -r e37bd3d6f769 tools/hotplug/Linux/network-bridge --- a/tools/hotplug/Linux/network-bridge Wed Jul 25 17:39:15 2012 +0100 +++ b/tools/hotplug/Linux/network-bridge Wed Jul 25 17:39:16 2012 +0100 @@ -115,7 +115,9 @@ do_ifup() { ip addr add ${addr_pfx} dev $1 fi ip link set dev $1 up - [ -n "$gateway" ] && ip route add default via ${gateway} + if [ -n "$gateway" ] ; then + ip route add default via ${gateway} + fi fi } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 26 20:55:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jul 2012 20:55: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 1SuV5b-0006lL-Au; Thu, 26 Jul 2012 20:55:19 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5a-0006ie-BF for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:18 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-27.messagelabs.com!1343336110!10929774!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 925 invoked from network); 26 Jul 2012 20:55:11 -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; 26 Jul 2012 20:55:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5R-00061f-VH for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuV5R-0005l9-Nt for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:09 +0000 Message-Id: Date: Thu, 26 Jul 2012 20:55:09 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] hotplug: network-bridge: fix for interfaces with no gateway X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343234356 -3600 # Node ID e37bd3d6f769a9604adacbef747d9dff9705e69a # Parent c8f1e4a98f7f10c095377e8f7c61dc07fb203dfd hotplug: network-bridge: fix for interfaces with no gateway This comes from an old Debian bug report http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=588477 which refers to http://lists.xen.org/archives/html/xen-users/2010-06/msg00420.html. Although we no longer have a trap in _claim_lock as described (this was removed in 25590:bb250383a4f5 "hotplug/Linux: use flock based locking") and the use of network-* scripts is discouraged (in favour of using distro provided mechanisms) the general principal that relying on the semantics of /bin/sh's && is unwise seems sound. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r c8f1e4a98f7f -r e37bd3d6f769 tools/hotplug/Linux/network-bridge --- a/tools/hotplug/Linux/network-bridge Wed Jul 25 17:39:15 2012 +0100 +++ b/tools/hotplug/Linux/network-bridge Wed Jul 25 17:39:16 2012 +0100 @@ -115,7 +115,9 @@ do_ifup() { ip addr add ${addr_pfx} dev $1 fi ip link set dev $1 up - [ -n "$gateway" ] && ip route add default via ${gateway} + if [ -n "$gateway" ] ; then + ip route add default via ${gateway} + fi fi } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 26 20:55:21 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jul 2012 20:55: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 1SuV5c-0006mX-Dv; Thu, 26 Jul 2012 20:55:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5a-0006k8-Ew for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:18 +0000 Received: from [85.158.138.51:21434] by server-10.bemta-3.messagelabs.com id A7/2F-21993-5BEA1105; Thu, 26 Jul 2012 20:55:17 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-174.messagelabs.com!1343336115!29074547!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 3770 invoked from network); 26 Jul 2012 20:55:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 26 Jul 2012 20:55:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5X-000626-3w for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuV5X-0005nP-2j for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:15 +0000 Message-Id: Date: Thu, 26 Jul 2012 20:55:14 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: kill the need for checking and linking to libm X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343234363 -3600 # Node ID be2ca8280da9709248d606c057afe27a46117943 # Parent 38dbecf592f7a2a9e01c1f0e542e42b63e2ef281 libxl: kill the need for checking and linking to libm Which was introduced in 7b0dc7f3ddfe. This is because the NUMA placement heuristic does not need FP arith anymore. As usual when changing configure.ac, remember to rerun autoconf after applying this change. Signed-off-by: Dario Faggioli Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r 38dbecf592f7 -r be2ca8280da9 tools/config.h.in --- a/tools/config.h.in Wed Jul 25 17:39:22 2012 +0100 +++ b/tools/config.h.in Wed Jul 25 17:39:23 2012 +0100 @@ -6,9 +6,6 @@ /* Define to 1 if you have the `crypto' library (-lcrypto). */ #undef HAVE_LIBCRYPTO -/* Define to 1 if you have the `m' library (-lm). */ -#undef HAVE_LIBM - /* Define to 1 if you have the `yajl' library (-lyajl). */ #undef HAVE_LIBYAJL diff -r 38dbecf592f7 -r be2ca8280da9 tools/configure --- a/tools/configure Wed Jul 25 17:39:22 2012 +0100 +++ b/tools/configure Wed Jul 25 17:39:23 2012 +0100 @@ -6336,53 +6336,6 @@ else fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for isnan in -lm" >&5 -$as_echo_n "checking for isnan in -lm... " >&6; } -if test "${ac_cv_lib_m_isnan+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lm $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char isnan (); -int -main () -{ -return isnan (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_m_isnan=yes -else - ac_cv_lib_m_isnan=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_isnan" >&5 -$as_echo "$ac_cv_lib_m_isnan" >&6; } -if test "x$ac_cv_lib_m_isnan" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBM 1 -_ACEOF - - LIBS="-lm $LIBS" - -else - as_fn_error $? "Could not find libm" "$LINENO" 5 -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MD5 in -lcrypto" >&5 $as_echo_n "checking for MD5 in -lcrypto... " >&6; } if test "${ac_cv_lib_crypto_MD5+set}" = set; then : diff -r 38dbecf592f7 -r be2ca8280da9 tools/configure.ac --- a/tools/configure.ac Wed Jul 25 17:39:22 2012 +0100 +++ b/tools/configure.ac Wed Jul 25 17:39:23 2012 +0100 @@ -137,7 +137,6 @@ AC_CHECK_LIB([lzo2], [lzo1x_decompress], AC_SUBST(zlib) AC_CHECK_LIB([aio], [io_setup], [system_aio="y"], [system_aio="n"]) AC_SUBST(system_aio) -AC_CHECK_LIB([m], [isnan], [], [AC_MSG_ERROR([Could not find libm])]) AC_CHECK_LIB([crypto], [MD5], [], [AC_MSG_ERROR([Could not find libcrypto])]) AC_CHECK_LIB([ext2fs], [ext2fs_open2], [libext2fs="y"], [libext2fs="n"]) AC_SUBST(libext2fs) diff -r 38dbecf592f7 -r be2ca8280da9 tools/libxl/Makefile --- a/tools/libxl/Makefile Wed Jul 25 17:39:22 2012 +0100 +++ b/tools/libxl/Makefile Wed Jul 25 17:39:23 2012 +0100 @@ -61,7 +61,7 @@ ifeq ($(BISON),) scanners, please install it an rerun configure) endif -LIBXL_LIBS += -lyajl -lm +LIBXL_LIBS += -lyajl LIBXL_OBJS = flexarray.o libxl.o libxl_create.o libxl_dm.o libxl_pci.o \ libxl_dom.o libxl_exec.o libxl_xshelp.o libxl_device.o \ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 26 20:55:21 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jul 2012 20:55: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 1SuV5c-0006mX-Dv; Thu, 26 Jul 2012 20:55:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5a-0006k8-Ew for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:18 +0000 Received: from [85.158.138.51:21434] by server-10.bemta-3.messagelabs.com id A7/2F-21993-5BEA1105; Thu, 26 Jul 2012 20:55:17 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-174.messagelabs.com!1343336115!29074547!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 3770 invoked from network); 26 Jul 2012 20:55:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 26 Jul 2012 20:55:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5X-000626-3w for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuV5X-0005nP-2j for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:15 +0000 Message-Id: Date: Thu, 26 Jul 2012 20:55:14 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: kill the need for checking and linking to libm X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343234363 -3600 # Node ID be2ca8280da9709248d606c057afe27a46117943 # Parent 38dbecf592f7a2a9e01c1f0e542e42b63e2ef281 libxl: kill the need for checking and linking to libm Which was introduced in 7b0dc7f3ddfe. This is because the NUMA placement heuristic does not need FP arith anymore. As usual when changing configure.ac, remember to rerun autoconf after applying this change. Signed-off-by: Dario Faggioli Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r 38dbecf592f7 -r be2ca8280da9 tools/config.h.in --- a/tools/config.h.in Wed Jul 25 17:39:22 2012 +0100 +++ b/tools/config.h.in Wed Jul 25 17:39:23 2012 +0100 @@ -6,9 +6,6 @@ /* Define to 1 if you have the `crypto' library (-lcrypto). */ #undef HAVE_LIBCRYPTO -/* Define to 1 if you have the `m' library (-lm). */ -#undef HAVE_LIBM - /* Define to 1 if you have the `yajl' library (-lyajl). */ #undef HAVE_LIBYAJL diff -r 38dbecf592f7 -r be2ca8280da9 tools/configure --- a/tools/configure Wed Jul 25 17:39:22 2012 +0100 +++ b/tools/configure Wed Jul 25 17:39:23 2012 +0100 @@ -6336,53 +6336,6 @@ else fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for isnan in -lm" >&5 -$as_echo_n "checking for isnan in -lm... " >&6; } -if test "${ac_cv_lib_m_isnan+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lm $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char isnan (); -int -main () -{ -return isnan (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_m_isnan=yes -else - ac_cv_lib_m_isnan=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_isnan" >&5 -$as_echo "$ac_cv_lib_m_isnan" >&6; } -if test "x$ac_cv_lib_m_isnan" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBM 1 -_ACEOF - - LIBS="-lm $LIBS" - -else - as_fn_error $? "Could not find libm" "$LINENO" 5 -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MD5 in -lcrypto" >&5 $as_echo_n "checking for MD5 in -lcrypto... " >&6; } if test "${ac_cv_lib_crypto_MD5+set}" = set; then : diff -r 38dbecf592f7 -r be2ca8280da9 tools/configure.ac --- a/tools/configure.ac Wed Jul 25 17:39:22 2012 +0100 +++ b/tools/configure.ac Wed Jul 25 17:39:23 2012 +0100 @@ -137,7 +137,6 @@ AC_CHECK_LIB([lzo2], [lzo1x_decompress], AC_SUBST(zlib) AC_CHECK_LIB([aio], [io_setup], [system_aio="y"], [system_aio="n"]) AC_SUBST(system_aio) -AC_CHECK_LIB([m], [isnan], [], [AC_MSG_ERROR([Could not find libm])]) AC_CHECK_LIB([crypto], [MD5], [], [AC_MSG_ERROR([Could not find libcrypto])]) AC_CHECK_LIB([ext2fs], [ext2fs_open2], [libext2fs="y"], [libext2fs="n"]) AC_SUBST(libext2fs) diff -r 38dbecf592f7 -r be2ca8280da9 tools/libxl/Makefile --- a/tools/libxl/Makefile Wed Jul 25 17:39:22 2012 +0100 +++ b/tools/libxl/Makefile Wed Jul 25 17:39:23 2012 +0100 @@ -61,7 +61,7 @@ ifeq ($(BISON),) scanners, please install it an rerun configure) endif -LIBXL_LIBS += -lyajl -lm +LIBXL_LIBS += -lyajl LIBXL_OBJS = flexarray.o libxl.o libxl_create.o libxl_dm.o libxl_pci.o \ libxl_dom.o libxl_exec.o libxl_xshelp.o libxl_device.o \ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 26 20:55:22 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jul 2012 20:55: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 1SuV5e-0006ok-3u; Thu, 26 Jul 2012 20:55:22 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5c-0006j0-JZ for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:20 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-27.messagelabs.com!1343336113!4122758!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 32639 invoked from network); 26 Jul 2012 20:55:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 26 Jul 2012 20:55:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5U-00061r-V3 for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuV5U-0005mP-Tm for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:12 +0000 Message-Id: Date: Thu, 26 Jul 2012 20:55:12 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: clobber only argument registers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343234360 -3600 # Node ID 7118869c9cbee6d8bd850aa58ebec00e6486fb16 # Parent 2859b79fbbc7bf09f3113a36789826a732b0fdca arm: clobber only argument registers Previously it was declared that r1..r4 would all be clobbered by all hypercalls. Instead declare that only actually used hypercall argument registers are clobbered. This is more inline with generally expected conventions and allows for more optimal code in the caller in some cases. This is an ABI change, although an older guest which expects more things to be clobbered than we do now won't be adversely impacted. Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini Committed-by: Ian Campbell --- diff -r 2859b79fbbc7 -r 7118869c9cbe xen/arch/arm/traps.c --- a/xen/arch/arm/traps.c Wed Jul 25 17:39:19 2012 +0100 +++ b/xen/arch/arm/traps.c Wed Jul 25 17:39:20 2012 +0100 @@ -413,24 +413,31 @@ unsigned long do_arch_0(unsigned int cmd return 0; } -typedef unsigned long arm_hypercall_t( +typedef unsigned long (*arm_hypercall_fn_t)( unsigned int, unsigned int, unsigned int, unsigned int, unsigned int); -#define HYPERCALL(x) \ - [ __HYPERVISOR_ ## x ] = (arm_hypercall_t *) do_ ## x +typedef struct { + arm_hypercall_fn_t fn; + int nr_args; +} arm_hypercall_t; -static arm_hypercall_t *arm_hypercall_table[] = { - HYPERCALL(memory_op), - HYPERCALL(domctl), - HYPERCALL(arch_0), - HYPERCALL(sched_op), - HYPERCALL(console_io), - HYPERCALL(xen_version), - HYPERCALL(event_channel_op), - HYPERCALL(memory_op), - HYPERCALL(physdev_op), - HYPERCALL(sysctl), - HYPERCALL(hvm_op), +#define HYPERCALL(_name, _nr_args) \ + [ __HYPERVISOR_ ## _name ] = { \ + .fn = (arm_hypercall_fn_t) &do_ ## _name, \ + .nr_args = _nr_args, \ + } + +static arm_hypercall_t arm_hypercall_table[] = { + HYPERCALL(memory_op, 2), + HYPERCALL(domctl, 1), + HYPERCALL(arch_0, 2), + HYPERCALL(sched_op, 2), + HYPERCALL(console_io, 3), + HYPERCALL(xen_version, 2), + HYPERCALL(event_channel_op, 2), + HYPERCALL(physdev_op, 2), + HYPERCALL(sysctl, 2), + HYPERCALL(hvm_op, 2), }; static void do_debug_trap(struct cpu_user_regs *regs, unsigned int code) @@ -462,7 +469,7 @@ static void do_debug_trap(struct cpu_use static void do_trap_hypercall(struct cpu_user_regs *regs, unsigned long iss) { - arm_hypercall_t *call = NULL; + arm_hypercall_fn_t call = NULL; if ( iss != XEN_HYPERCALL_TAG ) { @@ -472,7 +479,7 @@ static void do_trap_hypercall(struct cpu return; } - call = arm_hypercall_table[regs->r12]; + call = arm_hypercall_table[regs->r12].fn; if ( call == NULL ) { regs->r0 = -ENOSYS; @@ -482,8 +489,17 @@ static void do_trap_hypercall(struct cpu regs->r0 = call(regs->r0, regs->r1, regs->r2, regs->r3, regs->r4); #ifndef NDEBUG - /* clobber registers */ - regs->r1 = regs->r2 = regs->r3 = regs->r4 = regs->r12 = 0xDEADBEEF; + /* Clobber argument registers */ + switch ( arm_hypercall_table[regs->r12].nr_args ) { + case 5: regs->r4 = 0xDEADBEEF; + case 4: regs->r3 = 0xDEADBEEF; + case 3: regs->r2 = 0xDEADBEEF; + case 2: regs->r1 = 0xDEADBEEF; + case 1: /* Don't clobber r0 -- it's the return value */ + break; + default: BUG(); + } + regs->r12 = 0xDEADBEEF; #endif } diff -r 2859b79fbbc7 -r 7118869c9cbe xen/include/public/arch-arm.h --- a/xen/include/public/arch-arm.h Wed Jul 25 17:39:19 2012 +0100 +++ b/xen/include/public/arch-arm.h Wed Jul 25 17:39:20 2012 +0100 @@ -42,8 +42,10 @@ * * The return value is in r0. * - * The hypercall will always clobber r0, r1, r2, r3, r4 and r12, - * regardless of how many arguments the particular hypercall takes. + * The hypercall will clobber r12 and the argument registers used by + * that hypercall (except r0 which is the return value) i.e. a 2 + * argument hypercall will clobber r1 and a 4 argument hypercall will + * clobber r1, r2 and r3. * */ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 26 20:55:22 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jul 2012 20:55: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 1SuV5e-0006ok-3u; Thu, 26 Jul 2012 20:55:22 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5c-0006j0-JZ for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:20 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-27.messagelabs.com!1343336113!4122758!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 32639 invoked from network); 26 Jul 2012 20:55:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 26 Jul 2012 20:55:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5U-00061r-V3 for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuV5U-0005mP-Tm for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:12 +0000 Message-Id: Date: Thu, 26 Jul 2012 20:55:12 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: clobber only argument registers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343234360 -3600 # Node ID 7118869c9cbee6d8bd850aa58ebec00e6486fb16 # Parent 2859b79fbbc7bf09f3113a36789826a732b0fdca arm: clobber only argument registers Previously it was declared that r1..r4 would all be clobbered by all hypercalls. Instead declare that only actually used hypercall argument registers are clobbered. This is more inline with generally expected conventions and allows for more optimal code in the caller in some cases. This is an ABI change, although an older guest which expects more things to be clobbered than we do now won't be adversely impacted. Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini Committed-by: Ian Campbell --- diff -r 2859b79fbbc7 -r 7118869c9cbe xen/arch/arm/traps.c --- a/xen/arch/arm/traps.c Wed Jul 25 17:39:19 2012 +0100 +++ b/xen/arch/arm/traps.c Wed Jul 25 17:39:20 2012 +0100 @@ -413,24 +413,31 @@ unsigned long do_arch_0(unsigned int cmd return 0; } -typedef unsigned long arm_hypercall_t( +typedef unsigned long (*arm_hypercall_fn_t)( unsigned int, unsigned int, unsigned int, unsigned int, unsigned int); -#define HYPERCALL(x) \ - [ __HYPERVISOR_ ## x ] = (arm_hypercall_t *) do_ ## x +typedef struct { + arm_hypercall_fn_t fn; + int nr_args; +} arm_hypercall_t; -static arm_hypercall_t *arm_hypercall_table[] = { - HYPERCALL(memory_op), - HYPERCALL(domctl), - HYPERCALL(arch_0), - HYPERCALL(sched_op), - HYPERCALL(console_io), - HYPERCALL(xen_version), - HYPERCALL(event_channel_op), - HYPERCALL(memory_op), - HYPERCALL(physdev_op), - HYPERCALL(sysctl), - HYPERCALL(hvm_op), +#define HYPERCALL(_name, _nr_args) \ + [ __HYPERVISOR_ ## _name ] = { \ + .fn = (arm_hypercall_fn_t) &do_ ## _name, \ + .nr_args = _nr_args, \ + } + +static arm_hypercall_t arm_hypercall_table[] = { + HYPERCALL(memory_op, 2), + HYPERCALL(domctl, 1), + HYPERCALL(arch_0, 2), + HYPERCALL(sched_op, 2), + HYPERCALL(console_io, 3), + HYPERCALL(xen_version, 2), + HYPERCALL(event_channel_op, 2), + HYPERCALL(physdev_op, 2), + HYPERCALL(sysctl, 2), + HYPERCALL(hvm_op, 2), }; static void do_debug_trap(struct cpu_user_regs *regs, unsigned int code) @@ -462,7 +469,7 @@ static void do_debug_trap(struct cpu_use static void do_trap_hypercall(struct cpu_user_regs *regs, unsigned long iss) { - arm_hypercall_t *call = NULL; + arm_hypercall_fn_t call = NULL; if ( iss != XEN_HYPERCALL_TAG ) { @@ -472,7 +479,7 @@ static void do_trap_hypercall(struct cpu return; } - call = arm_hypercall_table[regs->r12]; + call = arm_hypercall_table[regs->r12].fn; if ( call == NULL ) { regs->r0 = -ENOSYS; @@ -482,8 +489,17 @@ static void do_trap_hypercall(struct cpu regs->r0 = call(regs->r0, regs->r1, regs->r2, regs->r3, regs->r4); #ifndef NDEBUG - /* clobber registers */ - regs->r1 = regs->r2 = regs->r3 = regs->r4 = regs->r12 = 0xDEADBEEF; + /* Clobber argument registers */ + switch ( arm_hypercall_table[regs->r12].nr_args ) { + case 5: regs->r4 = 0xDEADBEEF; + case 4: regs->r3 = 0xDEADBEEF; + case 3: regs->r2 = 0xDEADBEEF; + case 2: regs->r1 = 0xDEADBEEF; + case 1: /* Don't clobber r0 -- it's the return value */ + break; + default: BUG(); + } + regs->r12 = 0xDEADBEEF; #endif } diff -r 2859b79fbbc7 -r 7118869c9cbe xen/include/public/arch-arm.h --- a/xen/include/public/arch-arm.h Wed Jul 25 17:39:19 2012 +0100 +++ b/xen/include/public/arch-arm.h Wed Jul 25 17:39:20 2012 +0100 @@ -42,8 +42,10 @@ * * The return value is in r0. * - * The hypercall will always clobber r0, r1, r2, r3, r4 and r12, - * regardless of how many arguments the particular hypercall takes. + * The hypercall will clobber r12 and the argument registers used by + * that hypercall (except r0 which is the return value) i.e. a 2 + * argument hypercall will clobber r1 and a 4 argument hypercall will + * clobber r1, r2 and r3. * */ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 26 20:55:22 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jul 2012 20:55: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 1SuV5d-0006oD-S9; Thu, 26 Jul 2012 20:55:21 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5c-0006m9-76 for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:20 +0000 Received: from [85.158.143.99:20066] by server-2.bemta-4.messagelabs.com id F4/85-17938-7BEA1105; Thu, 26 Jul 2012 20:55:19 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-11.tower-216.messagelabs.com!1343336117!21358493!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 13257 invoked from network); 26 Jul 2012 20:55:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 26 Jul 2012 20:55:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5Z-00062I-BE for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuV5Z-0005oN-70 for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:17 +0000 Message-Id: Date: Thu, 26 Jul 2012 20:55:16 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: rename _IOEMU nic type to VIF_IOEMU X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343295331 -3600 # Node ID 6572f993810a43364f4c72cf97bcf3c085b45b8b # Parent ab99fc63a22ea8fc3e73e12560d81326ffdf5636 libxl: rename _IOEMU nic type to VIF_IOEMU This change will avoid the confusion caused by the fact that IOEMU means both PV and TAP network interfaces. Signed-off-by: Roger Pau Monne Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r ab99fc63a22e -r 6572f993810a tools/libxl/libxl.c --- a/tools/libxl/libxl.c Thu Jul 26 10:35:31 2012 +0100 +++ b/tools/libxl/libxl.c Thu Jul 26 10:35:31 2012 +0100 @@ -2316,7 +2316,7 @@ int libxl__device_nic_setdefault(libxl__ libxl__xen_script_dir_path()) < 0 ) return ERROR_FAIL; if (!nic->nictype) - nic->nictype = LIBXL_NIC_TYPE_IOEMU; + nic->nictype = LIBXL_NIC_TYPE_VIF_IOEMU; return 0; } @@ -2470,7 +2470,7 @@ static void libxl__device_nic_from_xs_be nic->script = xs_read(ctx->xsh, XBT_NULL, libxl__sprintf(gc, "%s/script", be_path), &len); - /* XXX ioemu nics are not in xenstore at all? */ + /* vif_ioemu nics use the same xenstore entries as vif interfaces */ nic->nictype = LIBXL_NIC_TYPE_VIF; nic->model = NULL; /* XXX Only for TYPE_IOEMU */ nic->ifname = NULL; /* XXX Only for TYPE_IOEMU */ @@ -2603,7 +2603,7 @@ const char *libxl__device_nic_devname(li switch (type) { case LIBXL_NIC_TYPE_VIF: return GCSPRINTF("vif%u.%d", domid, devid); - case LIBXL_NIC_TYPE_IOEMU: + case LIBXL_NIC_TYPE_VIF_IOEMU: return GCSPRINTF("vif%u.%d" TAP_DEVICE_SUFFIX, domid, devid); default: abort(); diff -r ab99fc63a22e -r 6572f993810a tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Thu Jul 26 10:35:31 2012 +0100 +++ b/tools/libxl/libxl_dm.c Thu Jul 26 10:35:31 2012 +0100 @@ -215,12 +215,12 @@ static char ** libxl__build_device_model free(s); for (i = 0; i < num_nics; i++) { - if (nics[i].nictype == LIBXL_NIC_TYPE_IOEMU) { + if (nics[i].nictype == LIBXL_NIC_TYPE_VIF_IOEMU) { char *smac = libxl__sprintf(gc, LIBXL_MAC_FMT, LIBXL_MAC_BYTES(nics[i].mac)); const char *ifname = libxl__device_nic_devname(gc, domid, nics[i].devid, - LIBXL_NIC_TYPE_IOEMU); + LIBXL_NIC_TYPE_VIF_IOEMU); flexarray_vappend(dm_args, "-net", GCSPRINTF( @@ -469,12 +469,12 @@ static char ** libxl__build_device_model b_info->max_vcpus)); } for (i = 0; i < num_nics; i++) { - if (nics[i].nictype == LIBXL_NIC_TYPE_IOEMU) { + if (nics[i].nictype == LIBXL_NIC_TYPE_VIF_IOEMU) { char *smac = libxl__sprintf(gc, LIBXL_MAC_FMT, LIBXL_MAC_BYTES(nics[i].mac)); const char *ifname = libxl__device_nic_devname(gc, guest_domid, nics[i].devid, - LIBXL_NIC_TYPE_IOEMU); + LIBXL_NIC_TYPE_VIF_IOEMU); flexarray_append(dm_args, "-device"); flexarray_append(dm_args, libxl__sprintf(gc, "%s,id=nic%d,netdev=net%d,mac=%s", diff -r ab99fc63a22e -r 6572f993810a tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Thu Jul 26 10:35:31 2012 +0100 +++ b/tools/libxl/libxl_types.idl Thu Jul 26 10:35:31 2012 +0100 @@ -60,7 +60,7 @@ libxl_disk_backend = Enumeration("disk_b ]) libxl_nic_type = Enumeration("nic_type", [ - (1, "IOEMU"), + (1, "VIF_IOEMU"), (2, "VIF"), ]) diff -r ab99fc63a22e -r 6572f993810a tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Thu Jul 26 10:35:31 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Thu Jul 26 10:35:31 2012 +0100 @@ -977,7 +977,7 @@ static void parse_config_data(const char nic->bridge = strdup(p2 + 1); } else if (!strcmp(p, "type")) { if (!strcmp(p2 + 1, "ioemu")) - nic->nictype = LIBXL_NIC_TYPE_IOEMU; + nic->nictype = LIBXL_NIC_TYPE_VIF_IOEMU; else nic->nictype = LIBXL_NIC_TYPE_VIF; } else if (!strcmp(p, "ip")) { @@ -5194,7 +5194,7 @@ int main_networkattach(int argc, char ** if (!strcmp("vif", oparg)) { nic.nictype = LIBXL_NIC_TYPE_VIF; } else if (!strcmp("ioemu", oparg)) { - nic.nictype = LIBXL_NIC_TYPE_IOEMU; + nic.nictype = LIBXL_NIC_TYPE_VIF_IOEMU; } else { fprintf(stderr, "Invalid parameter `type'.\n"); return 1; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 26 20:55:22 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jul 2012 20:55: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 1SuV5d-0006nw-Ok; Thu, 26 Jul 2012 20:55:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5c-0006lt-5v for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:20 +0000 Received: from [85.158.139.83:11808] by server-10.bemta-5.messagelabs.com id 2A/EE-02190-7BEA1105; Thu, 26 Jul 2012 20:55:19 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-182.messagelabs.com!1343336115!28162910!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 25702 invoked from network); 26 Jul 2012 20:55:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 26 Jul 2012 20:55:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5X-000629-KH for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuV5X-0005ne-J6 for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:15 +0000 Message-Id: Date: Thu, 26 Jul 2012 20:55:15 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] Merge X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1343235399 -3600 # Node ID a955d722c2e3366d7776be7f2ec0c436f5f9aee4 # Parent be2ca8280da9709248d606c057afe27a46117943 # Parent 663eb766cdde864cd8c8b9037677a07a56bb0290 Merge --- diff -r be2ca8280da9 -r a955d722c2e3 config/x86_64.mk --- a/config/x86_64.mk Wed Jul 25 17:39:23 2012 +0100 +++ b/config/x86_64.mk Wed Jul 25 17:56:39 2012 +0100 @@ -12,6 +12,8 @@ CFLAGS += -m64 SunOS_LIBDIR = $(SunOS_LIBDIR_x86_64) +EFI_DIR ?= /usr/lib64/efi + # Use only if calling $(LD) directly. ifeq ($(XEN_OS),OpenBSD) LDFLAGS_DIRECT += -melf_x86_64_obsd diff -r be2ca8280da9 -r a955d722c2e3 docs/misc/efi.markdown --- a/docs/misc/efi.markdown Wed Jul 25 17:39:23 2012 +0100 +++ b/docs/misc/efi.markdown Wed Jul 25 17:56:39 2012 +0100 @@ -4,10 +4,12 @@ newer. Additionally, the binutils build for the x86_64-pep emulation (i.e. `--enable-targets=x86_64-pep` or an option of equivalent effect should be passed to the configure script). -Once built, `make install-xen` can place the resulting binary directly into +Once built, `make install-xen` will place the resulting binary directly into the EFI boot partition, provided `EFI_VENDOR` is set in the environment (and `EFI_MOUNTPOINT` is overridden as needed, should the default of `/boot/efi` not -match your system). +match your system). The xen.efi binary will also be installed in +`/usr/lib64/efi/`, unless `EFI_DIR` is set in the environment to override this +default. The binary itself will require a configuration file (names with the `.efi` extension of the binary's name replaced by `.cfg`, and - until an existing diff -r be2ca8280da9 -r a955d722c2e3 xen/Makefile --- a/xen/Makefile Wed Jul 25 17:39:23 2012 +0100 +++ b/xen/Makefile Wed Jul 25 17:56:39 2012 +0100 @@ -35,12 +35,12 @@ _install: $(TARGET).gz ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION).gz $(DESTDIR)/boot/$(notdir $(TARGET))-$(XEN_VERSION).gz ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION).gz $(DESTDIR)/boot/$(notdir $(TARGET)).gz $(INSTALL_DATA) $(TARGET)-syms $(DESTDIR)/boot/$(notdir $(TARGET))-syms-$(XEN_FULLVERSION) - if [ -r $(TARGET).efi ]; then \ - [ -d $(DESTDIR)$(LIBDIR)/efi ] || $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/efi; \ - $(INSTALL_DATA) $(TARGET).efi $(DESTDIR)$(LIBDIR)/efi/$(notdir $(TARGET))-$(XEN_FULLVERSION).efi; \ - ln -sf $(notdir $(TARGET))-$(XEN_FULLVERSION).efi $(DESTDIR)$(LIBDIR)/efi/$(notdir $(TARGET))-$(XEN_VERSION).$(XEN_SUBVERSION).efi; \ - ln -sf $(notdir $(TARGET))-$(XEN_FULLVERSION).efi $(DESTDIR)$(LIBDIR)/efi/$(notdir $(TARGET))-$(XEN_VERSION).efi; \ - ln -sf $(notdir $(TARGET))-$(XEN_FULLVERSION).efi $(DESTDIR)$(LIBDIR)/efi/$(notdir $(TARGET)).efi; \ + if [ -r $(TARGET).efi -a -n '$(EFI_DIR)' ]; then \ + [ -d $(DESTDIR)$(EFI_DIR) ] || $(INSTALL_DIR) $(DESTDIR)$(EFI_DIR); \ + $(INSTALL_DATA) $(TARGET).efi $(DESTDIR)$(EFI_DIR)/$(notdir $(TARGET))-$(XEN_FULLVERSION).efi; \ + ln -sf $(notdir $(TARGET))-$(XEN_FULLVERSION).efi $(DESTDIR)$(EFI_DIR)/$(notdir $(TARGET))-$(XEN_VERSION).$(XEN_SUBVERSION).efi; \ + ln -sf $(notdir $(TARGET))-$(XEN_FULLVERSION).efi $(DESTDIR)$(EFI_DIR)/$(notdir $(TARGET))-$(XEN_VERSION).efi; \ + ln -sf $(notdir $(TARGET))-$(XEN_FULLVERSION).efi $(DESTDIR)$(EFI_DIR)/$(notdir $(TARGET)).efi; \ if [ -n '$(EFI_MOUNTPOINT)' -a -n '$(EFI_VENDOR)' ]; then \ $(INSTALL_DATA) $(TARGET).efi $(DESTDIR)$(EFI_MOUNTPOINT)/efi/$(EFI_VENDOR)/$(notdir $(TARGET))-$(XEN_FULLVERSION).efi; \ elif [ "$(DESTDIR)" = "$(patsubst $(shell cd $(XEN_ROOT) && pwd)/%,%,$(DESTDIR))" ]; then \ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 26 20:55:22 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jul 2012 20:55: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 1SuV5d-0006nw-Ok; Thu, 26 Jul 2012 20:55:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5c-0006lt-5v for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:20 +0000 Received: from [85.158.139.83:11808] by server-10.bemta-5.messagelabs.com id 2A/EE-02190-7BEA1105; Thu, 26 Jul 2012 20:55:19 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-182.messagelabs.com!1343336115!28162910!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 25702 invoked from network); 26 Jul 2012 20:55:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 26 Jul 2012 20:55:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5X-000629-KH for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuV5X-0005ne-J6 for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:15 +0000 Message-Id: Date: Thu, 26 Jul 2012 20:55:15 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] Merge X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1343235399 -3600 # Node ID a955d722c2e3366d7776be7f2ec0c436f5f9aee4 # Parent be2ca8280da9709248d606c057afe27a46117943 # Parent 663eb766cdde864cd8c8b9037677a07a56bb0290 Merge --- diff -r be2ca8280da9 -r a955d722c2e3 config/x86_64.mk --- a/config/x86_64.mk Wed Jul 25 17:39:23 2012 +0100 +++ b/config/x86_64.mk Wed Jul 25 17:56:39 2012 +0100 @@ -12,6 +12,8 @@ CFLAGS += -m64 SunOS_LIBDIR = $(SunOS_LIBDIR_x86_64) +EFI_DIR ?= /usr/lib64/efi + # Use only if calling $(LD) directly. ifeq ($(XEN_OS),OpenBSD) LDFLAGS_DIRECT += -melf_x86_64_obsd diff -r be2ca8280da9 -r a955d722c2e3 docs/misc/efi.markdown --- a/docs/misc/efi.markdown Wed Jul 25 17:39:23 2012 +0100 +++ b/docs/misc/efi.markdown Wed Jul 25 17:56:39 2012 +0100 @@ -4,10 +4,12 @@ newer. Additionally, the binutils build for the x86_64-pep emulation (i.e. `--enable-targets=x86_64-pep` or an option of equivalent effect should be passed to the configure script). -Once built, `make install-xen` can place the resulting binary directly into +Once built, `make install-xen` will place the resulting binary directly into the EFI boot partition, provided `EFI_VENDOR` is set in the environment (and `EFI_MOUNTPOINT` is overridden as needed, should the default of `/boot/efi` not -match your system). +match your system). The xen.efi binary will also be installed in +`/usr/lib64/efi/`, unless `EFI_DIR` is set in the environment to override this +default. The binary itself will require a configuration file (names with the `.efi` extension of the binary's name replaced by `.cfg`, and - until an existing diff -r be2ca8280da9 -r a955d722c2e3 xen/Makefile --- a/xen/Makefile Wed Jul 25 17:39:23 2012 +0100 +++ b/xen/Makefile Wed Jul 25 17:56:39 2012 +0100 @@ -35,12 +35,12 @@ _install: $(TARGET).gz ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION).gz $(DESTDIR)/boot/$(notdir $(TARGET))-$(XEN_VERSION).gz ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION).gz $(DESTDIR)/boot/$(notdir $(TARGET)).gz $(INSTALL_DATA) $(TARGET)-syms $(DESTDIR)/boot/$(notdir $(TARGET))-syms-$(XEN_FULLVERSION) - if [ -r $(TARGET).efi ]; then \ - [ -d $(DESTDIR)$(LIBDIR)/efi ] || $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/efi; \ - $(INSTALL_DATA) $(TARGET).efi $(DESTDIR)$(LIBDIR)/efi/$(notdir $(TARGET))-$(XEN_FULLVERSION).efi; \ - ln -sf $(notdir $(TARGET))-$(XEN_FULLVERSION).efi $(DESTDIR)$(LIBDIR)/efi/$(notdir $(TARGET))-$(XEN_VERSION).$(XEN_SUBVERSION).efi; \ - ln -sf $(notdir $(TARGET))-$(XEN_FULLVERSION).efi $(DESTDIR)$(LIBDIR)/efi/$(notdir $(TARGET))-$(XEN_VERSION).efi; \ - ln -sf $(notdir $(TARGET))-$(XEN_FULLVERSION).efi $(DESTDIR)$(LIBDIR)/efi/$(notdir $(TARGET)).efi; \ + if [ -r $(TARGET).efi -a -n '$(EFI_DIR)' ]; then \ + [ -d $(DESTDIR)$(EFI_DIR) ] || $(INSTALL_DIR) $(DESTDIR)$(EFI_DIR); \ + $(INSTALL_DATA) $(TARGET).efi $(DESTDIR)$(EFI_DIR)/$(notdir $(TARGET))-$(XEN_FULLVERSION).efi; \ + ln -sf $(notdir $(TARGET))-$(XEN_FULLVERSION).efi $(DESTDIR)$(EFI_DIR)/$(notdir $(TARGET))-$(XEN_VERSION).$(XEN_SUBVERSION).efi; \ + ln -sf $(notdir $(TARGET))-$(XEN_FULLVERSION).efi $(DESTDIR)$(EFI_DIR)/$(notdir $(TARGET))-$(XEN_VERSION).efi; \ + ln -sf $(notdir $(TARGET))-$(XEN_FULLVERSION).efi $(DESTDIR)$(EFI_DIR)/$(notdir $(TARGET)).efi; \ if [ -n '$(EFI_MOUNTPOINT)' -a -n '$(EFI_VENDOR)' ]; then \ $(INSTALL_DATA) $(TARGET).efi $(DESTDIR)$(EFI_MOUNTPOINT)/efi/$(EFI_VENDOR)/$(notdir $(TARGET))-$(XEN_FULLVERSION).efi; \ elif [ "$(DESTDIR)" = "$(patsubst $(shell cd $(XEN_ROOT) && pwd)/%,%,$(DESTDIR))" ]; then \ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 26 20:55:22 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jul 2012 20:55: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 1SuV5d-0006oD-S9; Thu, 26 Jul 2012 20:55:21 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5c-0006m9-76 for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:20 +0000 Received: from [85.158.143.99:20066] by server-2.bemta-4.messagelabs.com id F4/85-17938-7BEA1105; Thu, 26 Jul 2012 20:55:19 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-11.tower-216.messagelabs.com!1343336117!21358493!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 13257 invoked from network); 26 Jul 2012 20:55:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 26 Jul 2012 20:55:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5Z-00062I-BE for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuV5Z-0005oN-70 for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:17 +0000 Message-Id: Date: Thu, 26 Jul 2012 20:55:16 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: rename _IOEMU nic type to VIF_IOEMU X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343295331 -3600 # Node ID 6572f993810a43364f4c72cf97bcf3c085b45b8b # Parent ab99fc63a22ea8fc3e73e12560d81326ffdf5636 libxl: rename _IOEMU nic type to VIF_IOEMU This change will avoid the confusion caused by the fact that IOEMU means both PV and TAP network interfaces. Signed-off-by: Roger Pau Monne Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r ab99fc63a22e -r 6572f993810a tools/libxl/libxl.c --- a/tools/libxl/libxl.c Thu Jul 26 10:35:31 2012 +0100 +++ b/tools/libxl/libxl.c Thu Jul 26 10:35:31 2012 +0100 @@ -2316,7 +2316,7 @@ int libxl__device_nic_setdefault(libxl__ libxl__xen_script_dir_path()) < 0 ) return ERROR_FAIL; if (!nic->nictype) - nic->nictype = LIBXL_NIC_TYPE_IOEMU; + nic->nictype = LIBXL_NIC_TYPE_VIF_IOEMU; return 0; } @@ -2470,7 +2470,7 @@ static void libxl__device_nic_from_xs_be nic->script = xs_read(ctx->xsh, XBT_NULL, libxl__sprintf(gc, "%s/script", be_path), &len); - /* XXX ioemu nics are not in xenstore at all? */ + /* vif_ioemu nics use the same xenstore entries as vif interfaces */ nic->nictype = LIBXL_NIC_TYPE_VIF; nic->model = NULL; /* XXX Only for TYPE_IOEMU */ nic->ifname = NULL; /* XXX Only for TYPE_IOEMU */ @@ -2603,7 +2603,7 @@ const char *libxl__device_nic_devname(li switch (type) { case LIBXL_NIC_TYPE_VIF: return GCSPRINTF("vif%u.%d", domid, devid); - case LIBXL_NIC_TYPE_IOEMU: + case LIBXL_NIC_TYPE_VIF_IOEMU: return GCSPRINTF("vif%u.%d" TAP_DEVICE_SUFFIX, domid, devid); default: abort(); diff -r ab99fc63a22e -r 6572f993810a tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Thu Jul 26 10:35:31 2012 +0100 +++ b/tools/libxl/libxl_dm.c Thu Jul 26 10:35:31 2012 +0100 @@ -215,12 +215,12 @@ static char ** libxl__build_device_model free(s); for (i = 0; i < num_nics; i++) { - if (nics[i].nictype == LIBXL_NIC_TYPE_IOEMU) { + if (nics[i].nictype == LIBXL_NIC_TYPE_VIF_IOEMU) { char *smac = libxl__sprintf(gc, LIBXL_MAC_FMT, LIBXL_MAC_BYTES(nics[i].mac)); const char *ifname = libxl__device_nic_devname(gc, domid, nics[i].devid, - LIBXL_NIC_TYPE_IOEMU); + LIBXL_NIC_TYPE_VIF_IOEMU); flexarray_vappend(dm_args, "-net", GCSPRINTF( @@ -469,12 +469,12 @@ static char ** libxl__build_device_model b_info->max_vcpus)); } for (i = 0; i < num_nics; i++) { - if (nics[i].nictype == LIBXL_NIC_TYPE_IOEMU) { + if (nics[i].nictype == LIBXL_NIC_TYPE_VIF_IOEMU) { char *smac = libxl__sprintf(gc, LIBXL_MAC_FMT, LIBXL_MAC_BYTES(nics[i].mac)); const char *ifname = libxl__device_nic_devname(gc, guest_domid, nics[i].devid, - LIBXL_NIC_TYPE_IOEMU); + LIBXL_NIC_TYPE_VIF_IOEMU); flexarray_append(dm_args, "-device"); flexarray_append(dm_args, libxl__sprintf(gc, "%s,id=nic%d,netdev=net%d,mac=%s", diff -r ab99fc63a22e -r 6572f993810a tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Thu Jul 26 10:35:31 2012 +0100 +++ b/tools/libxl/libxl_types.idl Thu Jul 26 10:35:31 2012 +0100 @@ -60,7 +60,7 @@ libxl_disk_backend = Enumeration("disk_b ]) libxl_nic_type = Enumeration("nic_type", [ - (1, "IOEMU"), + (1, "VIF_IOEMU"), (2, "VIF"), ]) diff -r ab99fc63a22e -r 6572f993810a tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Thu Jul 26 10:35:31 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Thu Jul 26 10:35:31 2012 +0100 @@ -977,7 +977,7 @@ static void parse_config_data(const char nic->bridge = strdup(p2 + 1); } else if (!strcmp(p, "type")) { if (!strcmp(p2 + 1, "ioemu")) - nic->nictype = LIBXL_NIC_TYPE_IOEMU; + nic->nictype = LIBXL_NIC_TYPE_VIF_IOEMU; else nic->nictype = LIBXL_NIC_TYPE_VIF; } else if (!strcmp(p, "ip")) { @@ -5194,7 +5194,7 @@ int main_networkattach(int argc, char ** if (!strcmp("vif", oparg)) { nic.nictype = LIBXL_NIC_TYPE_VIF; } else if (!strcmp("ioemu", oparg)) { - nic.nictype = LIBXL_NIC_TYPE_IOEMU; + nic.nictype = LIBXL_NIC_TYPE_VIF_IOEMU; } else { fprintf(stderr, "Invalid parameter `type'.\n"); return 1; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 26 20:55:22 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jul 2012 20:55: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 1SuV5d-0006nh-M3; Thu, 26 Jul 2012 20:55:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5c-0006m3-5y for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:20 +0000 Received: from [85.158.139.83:38070] by server-12.bemta-5.messagelabs.com id 60/44-25233-7BEA1105; Thu, 26 Jul 2012 20:55:19 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-182.messagelabs.com!1343336116!28312224!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 13920 invoked from network); 26 Jul 2012 20:55:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 26 Jul 2012 20:55:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5Y-00062C-4t for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuV5Y-0005nt-3i for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:16 +0000 Message-Id: Date: Thu, 26 Jul 2012 20:55:15 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: libxl__device_model_version_running should return an int X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343235442 -3600 # Node ID fb9a2cd50cab9b7ad4f2dd30d786bc9c574b9f5e # Parent a955d722c2e3366d7776be7f2ec0c436f5f9aee4 libxl: libxl__device_model_version_running should return an int On error it returns -1 and therefore it needs to return int and not libxl_device_model_enum. Otherwise gcc 4.6.2 complains: libxl.c: In function ?libxl_domain_suspend?: libxl.c:778:9: error: case value ?4294967295? not in enumerated type ?libxl_device_model_version? [-Werror=switch] Signed-off-by: Ian Campbell Committed-by: Ian Campbell --- diff -r a955d722c2e3 -r fb9a2cd50cab tools/libxl/libxl_internal.c --- a/tools/libxl/libxl_internal.c Wed Jul 25 17:56:39 2012 +0100 +++ b/tools/libxl/libxl_internal.c Wed Jul 25 17:57:22 2012 +0100 @@ -330,8 +330,7 @@ out: return rc; } -libxl_device_model_version libxl__device_model_version_running(libxl__gc *gc, - uint32_t domid) +int libxl__device_model_version_running(libxl__gc *gc, uint32_t domid) { char *path = NULL; char *dm_version = NULL; diff -r a955d722c2e3 -r fb9a2cd50cab tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Wed Jul 25 17:56:39 2012 +0100 +++ b/tools/libxl/libxl_internal.h Wed Jul 25 17:57:22 2012 +0100 @@ -1515,8 +1515,7 @@ _hidden libxl__json_object *libxl__json_ /* Based on /local/domain/$domid/dm-version xenstore key * default is qemu xen traditional */ -_hidden libxl_device_model_version -libxl__device_model_version_running(libxl__gc *gc, uint32_t domid); +_hidden int libxl__device_model_version_running(libxl__gc *gc, uint32_t domid); /* _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 26 20:55:22 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jul 2012 20:55: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 1SuV5d-0006nh-M3; Thu, 26 Jul 2012 20:55:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5c-0006m3-5y for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:20 +0000 Received: from [85.158.139.83:38070] by server-12.bemta-5.messagelabs.com id 60/44-25233-7BEA1105; Thu, 26 Jul 2012 20:55:19 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-182.messagelabs.com!1343336116!28312224!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 13920 invoked from network); 26 Jul 2012 20:55:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 26 Jul 2012 20:55:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5Y-00062C-4t for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuV5Y-0005nt-3i for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:16 +0000 Message-Id: Date: Thu, 26 Jul 2012 20:55:15 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: libxl__device_model_version_running should return an int X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343235442 -3600 # Node ID fb9a2cd50cab9b7ad4f2dd30d786bc9c574b9f5e # Parent a955d722c2e3366d7776be7f2ec0c436f5f9aee4 libxl: libxl__device_model_version_running should return an int On error it returns -1 and therefore it needs to return int and not libxl_device_model_enum. Otherwise gcc 4.6.2 complains: libxl.c: In function ?libxl_domain_suspend?: libxl.c:778:9: error: case value ?4294967295? not in enumerated type ?libxl_device_model_version? [-Werror=switch] Signed-off-by: Ian Campbell Committed-by: Ian Campbell --- diff -r a955d722c2e3 -r fb9a2cd50cab tools/libxl/libxl_internal.c --- a/tools/libxl/libxl_internal.c Wed Jul 25 17:56:39 2012 +0100 +++ b/tools/libxl/libxl_internal.c Wed Jul 25 17:57:22 2012 +0100 @@ -330,8 +330,7 @@ out: return rc; } -libxl_device_model_version libxl__device_model_version_running(libxl__gc *gc, - uint32_t domid) +int libxl__device_model_version_running(libxl__gc *gc, uint32_t domid) { char *path = NULL; char *dm_version = NULL; diff -r a955d722c2e3 -r fb9a2cd50cab tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Wed Jul 25 17:56:39 2012 +0100 +++ b/tools/libxl/libxl_internal.h Wed Jul 25 17:57:22 2012 +0100 @@ -1515,8 +1515,7 @@ _hidden libxl__json_object *libxl__json_ /* Based on /local/domain/$domid/dm-version xenstore key * default is qemu xen traditional */ -_hidden libxl_device_model_version -libxl__device_model_version_running(libxl__gc *gc, uint32_t domid); +_hidden int libxl__device_model_version_running(libxl__gc *gc, uint32_t domid); /* _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 26 20:55:22 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jul 2012 20:55: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 1SuV5e-0006oy-9Q; Thu, 26 Jul 2012 20:55:22 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5d-0006m8-BI for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:21 +0000 Received: from [85.158.138.51:21493] by server-12.bemta-3.messagelabs.com id AC/D4-15259-8BEA1105; Thu, 26 Jul 2012 20:55:20 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-174.messagelabs.com!1343336118!29043587!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 24664 invoked from network); 26 Jul 2012 20:55:19 -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; 26 Jul 2012 20:55:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5a-00062O-Gl for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuV5a-0005or-9P for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:18 +0000 Message-Id: Date: Thu, 26 Jul 2012 20:55:17 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xl: main_blockdetach don't call destroy if remove succeeds X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343295333 -3600 # Node ID c93f602084ccb26cdf9ff60056c5ffa88d45729d # Parent 4de762a22f54870da9fe7afd3850b89ca76014fb xl: main_blockdetach don't call destroy if remove succeeds xl was calling libxl_device_disk_destroy after a successful call to libxl_device_disk_remove, which leads to an error. Signed-off-by: Roger Pau Monne Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r 4de762a22f54 -r c93f602084cc tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Thu Jul 26 10:35:32 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Thu Jul 26 10:35:33 2012 +0100 @@ -5398,7 +5398,7 @@ int main_blocklist(int argc, char **argv int main_blockdetach(int argc, char **argv) { - int opt; + int opt, rc = 0; libxl_device_disk disk; if ((opt = def_getopt(argc, argv, "", "block-detach", 2)) != -1) @@ -5412,11 +5412,12 @@ int main_blockdetach(int argc, char **ar fprintf(stderr, "Error: Device %s not connected.\n", argv[optind+1]); return 1; } - if (libxl_device_disk_remove(ctx, domid, &disk, 0)) { + rc = libxl_device_disk_remove(ctx, domid, &disk, 0); + if (rc) { fprintf(stderr, "libxl_device_disk_remove failed.\n"); - } else - libxl_device_disk_destroy(ctx, domid, &disk, 0); - return 0; + } + libxl_device_disk_dispose(&disk); + return rc; } static char *uptime_to_string(unsigned long time, int short_mode) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 26 20:55:22 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jul 2012 20:55: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 1SuV5e-0006oX-0J; Thu, 26 Jul 2012 20:55:22 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5c-0006m8-BK for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:20 +0000 Received: from [85.158.138.51:21456] by server-12.bemta-3.messagelabs.com id B8/D4-15259-7BEA1105; Thu, 26 Jul 2012 20:55:19 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-174.messagelabs.com!1343336117!8732914!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 15701 invoked from network); 26 Jul 2012 20:55:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 26 Jul 2012 20:55:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5Y-00062F-M8 for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuV5Y-0005o8-Kw for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:16 +0000 Message-Id: Date: Thu, 26 Jul 2012 20:55:16 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: rename vifs to nics X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343295331 -3600 # Node ID ab99fc63a22ea8fc3e73e12560d81326ffdf5636 # Parent fb9a2cd50cab9b7ad4f2dd30d786bc9c574b9f5e libxl: rename vifs to nics This change renames functions and struct values that used to contain vifs in their names to nics, that provides a more clear name to define network interfaces without referring to the backend that is behind them. This is not a functional change. Signed-off-by: Roger Pau Monne Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r fb9a2cd50cab -r ab99fc63a22e tools/libxl/libxl.h --- a/tools/libxl/libxl.h Wed Jul 25 17:57:22 2012 +0100 +++ b/tools/libxl/libxl.h Thu Jul 26 10:35:31 2012 +0100 @@ -470,10 +470,10 @@ typedef struct { libxl_domain_create_info c_info; libxl_domain_build_info b_info; - int num_disks, num_vifs, num_pcidevs, num_vfbs, num_vkbs; + int num_disks, num_nics, num_pcidevs, num_vfbs, num_vkbs; libxl_device_disk *disks; - libxl_device_nic *vifs; + libxl_device_nic *nics; libxl_device_pci *pcidevs; libxl_device_vfb *vfbs; libxl_device_vkb *vkbs; diff -r fb9a2cd50cab -r ab99fc63a22e tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Wed Jul 25 17:57:22 2012 +0100 +++ b/tools/libxl/libxl_create.c Thu Jul 26 10:35:31 2012 +0100 @@ -39,9 +39,9 @@ void libxl_domain_config_dispose(libxl_d libxl_device_disk_dispose(&d_config->disks[i]); free(d_config->disks); - for (i=0; inum_vifs; i++) - libxl_device_nic_dispose(&d_config->vifs[i]); - free(d_config->vifs); + for (i=0; inum_nics; i++) + libxl_device_nic_dispose(&d_config->nics[i]); + free(d_config->nics); for (i=0; inum_pcidevs; i++) libxl_device_pci_dispose(&d_config->pcidevs[i]); @@ -873,8 +873,8 @@ static void domcreate_rebuild_done(libxl goto error_out; } } - for (i = 0; i < d_config->num_vifs; i++) { - ret = libxl_device_nic_add(ctx, domid, &d_config->vifs[i]); + for (i = 0; i < d_config->num_nics; i++) { + ret = libxl_device_nic_add(ctx, domid, &d_config->nics[i]); if (ret) { LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "cannot add nic %d to domain: %d", i, ret); diff -r fb9a2cd50cab -r ab99fc63a22e tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Wed Jul 25 17:57:22 2012 +0100 +++ b/tools/libxl/libxl_dm.c Thu Jul 26 10:35:31 2012 +0100 @@ -102,10 +102,10 @@ static char ** libxl__build_device_model { const libxl_domain_create_info *c_info = &guest_config->c_info; const libxl_domain_build_info *b_info = &guest_config->b_info; - const libxl_device_nic *vifs = guest_config->vifs; + const libxl_device_nic *nics = guest_config->nics; const libxl_vnc_info *vnc = libxl__dm_vnc(guest_config); const libxl_sdl_info *sdl = dm_sdl(guest_config); - const int num_vifs = guest_config->num_vifs; + const int num_nics = guest_config->num_nics; const char *keymap = dm_keymap(guest_config); int i; flexarray_t *dm_args; @@ -159,7 +159,7 @@ static char ** libxl__build_device_model flexarray_vappend(dm_args, "-k", keymap, NULL); } if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) { - int ioemu_vifs = 0; + int ioemu_nics = 0; int nr_set_cpus = 0; char *s; @@ -214,31 +214,31 @@ static char ** libxl__build_device_model libxl__sprintf(gc, "%s", s), NULL); free(s); - for (i = 0; i < num_vifs; i++) { - if (vifs[i].nictype == LIBXL_NIC_TYPE_IOEMU) { + for (i = 0; i < num_nics; i++) { + if (nics[i].nictype == LIBXL_NIC_TYPE_IOEMU) { char *smac = libxl__sprintf(gc, - LIBXL_MAC_FMT, LIBXL_MAC_BYTES(vifs[i].mac)); + LIBXL_MAC_FMT, LIBXL_MAC_BYTES(nics[i].mac)); const char *ifname = libxl__device_nic_devname(gc, - domid, vifs[i].devid, + domid, nics[i].devid, LIBXL_NIC_TYPE_IOEMU); flexarray_vappend(dm_args, "-net", GCSPRINTF( "nic,vlan=%d,macaddr=%s,model=%s", - vifs[i].devid, smac, vifs[i].model), + nics[i].devid, smac, nics[i].model), "-net", GCSPRINTF( "tap,vlan=%d,ifname=%s,bridge=%s," "script=%s,downscript=%s", - vifs[i].devid, ifname, vifs[i].bridge, + nics[i].devid, ifname, nics[i].bridge, libxl_tapif_script(gc), libxl_tapif_script(gc)), NULL); - ioemu_vifs++; + ioemu_nics++; } } /* If we have no emulated nics, tell qemu not to create any */ - if ( ioemu_vifs == 0 ) { + if ( ioemu_nics == 0 ) { flexarray_vappend(dm_args, "-net", "none", NULL); } if (libxl_defbool_val(b_info->u.hvm.gfx_passthru)) { @@ -330,9 +330,9 @@ static char ** libxl__build_device_model const libxl_domain_create_info *c_info = &guest_config->c_info; const libxl_domain_build_info *b_info = &guest_config->b_info; const libxl_device_disk *disks = guest_config->disks; - const libxl_device_nic *vifs = guest_config->vifs; + const libxl_device_nic *nics = guest_config->nics; const int num_disks = guest_config->num_disks; - const int num_vifs = guest_config->num_vifs; + const int num_nics = guest_config->num_nics; const libxl_vnc_info *vnc = libxl__dm_vnc(guest_config); const libxl_sdl_info *sdl = dm_sdl(guest_config); const char *keymap = dm_keymap(guest_config); @@ -409,7 +409,7 @@ static char ** libxl__build_device_model } if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) { - int ioemu_vifs = 0; + int ioemu_nics = 0; if (b_info->u.hvm.serial) { flexarray_vappend(dm_args, "-serial", b_info->u.hvm.serial, NULL); @@ -468,30 +468,30 @@ static char ** libxl__build_device_model flexarray_append(dm_args, libxl__sprintf(gc, "%d", b_info->max_vcpus)); } - for (i = 0; i < num_vifs; i++) { - if (vifs[i].nictype == LIBXL_NIC_TYPE_IOEMU) { + for (i = 0; i < num_nics; i++) { + if (nics[i].nictype == LIBXL_NIC_TYPE_IOEMU) { char *smac = libxl__sprintf(gc, - LIBXL_MAC_FMT, LIBXL_MAC_BYTES(vifs[i].mac)); + LIBXL_MAC_FMT, LIBXL_MAC_BYTES(nics[i].mac)); const char *ifname = libxl__device_nic_devname(gc, - guest_domid, vifs[i].devid, + guest_domid, nics[i].devid, LIBXL_NIC_TYPE_IOEMU); flexarray_append(dm_args, "-device"); flexarray_append(dm_args, libxl__sprintf(gc, "%s,id=nic%d,netdev=net%d,mac=%s", - vifs[i].model, vifs[i].devid, - vifs[i].devid, smac)); + nics[i].model, nics[i].devid, + nics[i].devid, smac)); flexarray_append(dm_args, "-netdev"); flexarray_append(dm_args, GCSPRINTF( "type=tap,id=net%d,ifname=%s," "script=%s,downscript=%s", - vifs[i].devid, ifname, + nics[i].devid, ifname, libxl_tapif_script(gc), libxl_tapif_script(gc))); - ioemu_vifs++; + ioemu_nics++; } } /* If we have no emulated nics, tell qemu not to create any */ - if ( ioemu_vifs == 0 ) { + if ( ioemu_nics == 0 ) { flexarray_append(dm_args, "-net"); flexarray_append(dm_args, "none"); } @@ -620,18 +620,18 @@ static void libxl__dm_vifs_from_hvm_gues libxl_domain_config * const guest_config, libxl_domain_config *dm_config) { - int i, nr = guest_config->num_vifs; + int i, nr = guest_config->num_nics; - GCNEW_ARRAY(dm_config->vifs, nr); + GCNEW_ARRAY(dm_config->nics, nr); for (i=0; ivifs[i] = guest_config->vifs[i]; - if (dm_config->vifs[i].ifname) - dm_config->vifs[i].ifname = GCSPRINTF("%s" TAP_DEVICE_SUFFIX, - dm_config->vifs[i].ifname); + dm_config->nics[i] = guest_config->nics[i]; + if (dm_config->nics[i].ifname) + dm_config->nics[i].ifname = GCSPRINTF("%s" TAP_DEVICE_SUFFIX, + dm_config->nics[i].ifname); } - dm_config->num_vifs = nr; + dm_config->num_nics = nr; } static int libxl__vfb_and_vkb_from_hvm_guest_config(libxl__gc *gc, @@ -849,8 +849,8 @@ retry_transaction: if (ret) goto out_free; } - for (i = 0; i < dm_config->num_vifs; i++) { - ret = libxl_device_nic_add(ctx, dm_domid, &dm_config->vifs[i]); + for (i = 0; i < dm_config->num_nics; i++) { + ret = libxl_device_nic_add(ctx, dm_domid, &dm_config->nics[i]); if (ret) goto out_free; } diff -r fb9a2cd50cab -r ab99fc63a22e tools/libxl/libxl_json.c --- a/tools/libxl/libxl_json.c Wed Jul 25 17:57:22 2012 +0100 +++ b/tools/libxl/libxl_json.c Thu Jul 26 10:35:31 2012 +0100 @@ -822,15 +822,15 @@ yajl_gen_status libxl_domain_config_gen_ if (s != yajl_gen_status_ok) goto out; - s = yajl_gen_string(hand, (const unsigned char *)"vifs", - sizeof("vifs")-1); + s = yajl_gen_string(hand, (const unsigned char *)"nics", + sizeof("nics")-1); if (s != yajl_gen_status_ok) goto out; s = yajl_gen_array_open(hand); if (s != yajl_gen_status_ok) goto out; - for (i = 0; i < p->num_vifs; i++) { - s = libxl_device_nic_gen_json(hand, &p->vifs[i]); + for (i = 0; i < p->num_nics; i++) { + s = libxl_device_nic_gen_json(hand, &p->nics[i]); if (s != yajl_gen_status_ok) goto out; } diff -r fb9a2cd50cab -r ab99fc63a22e tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Wed Jul 25 17:57:22 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Thu Jul 26 10:35:31 2012 +0100 @@ -919,17 +919,17 @@ static void parse_config_data(const char } if (!xlu_cfg_get_list (config, "vif", &nics, 0, 0)) { - d_config->num_vifs = 0; - d_config->vifs = NULL; - while ((buf = xlu_cfg_get_listitem (nics, d_config->num_vifs)) != NULL) { + d_config->num_nics = 0; + d_config->nics = NULL; + while ((buf = xlu_cfg_get_listitem (nics, d_config->num_nics)) != NULL) { libxl_device_nic *nic; char *buf2 = strdup(buf); char *p, *p2; - d_config->vifs = (libxl_device_nic *) realloc(d_config->vifs, sizeof (libxl_device_nic) * (d_config->num_vifs+1)); - nic = d_config->vifs + d_config->num_vifs; + d_config->nics = (libxl_device_nic *) realloc(d_config->nics, sizeof (libxl_device_nic) * (d_config->num_nics+1)); + nic = d_config->nics + d_config->num_nics; libxl_device_nic_init(nic); - nic->devid = d_config->num_vifs; + nic->devid = d_config->num_nics; if (default_vifscript) { free(nic->script); @@ -1002,7 +1002,7 @@ static void parse_config_data(const char } while ((p = strtok(NULL, ",")) != NULL); skip: free(buf2); - d_config->num_vifs++; + d_config->num_nics++; } } diff -r fb9a2cd50cab -r ab99fc63a22e tools/libxl/xl_sxp.c --- a/tools/libxl/xl_sxp.c Wed Jul 25 17:57:22 2012 +0100 +++ b/tools/libxl/xl_sxp.c Thu Jul 26 10:35:31 2012 +0100 @@ -175,20 +175,20 @@ void printf_info_sexp(int domid, libxl_d printf("\t)\n"); } - for (i = 0; i < d_config->num_vifs; i++) { + for (i = 0; i < d_config->num_nics; i++) { printf("\t(device\n"); printf("\t\t(vif\n"); - if (d_config->vifs[i].ifname) - printf("\t\t\t(vifname %s)\n", d_config->vifs[i].ifname); - printf("\t\t\t(backend_domid %d)\n", d_config->vifs[i].backend_domid); + if (d_config->nics[i].ifname) + printf("\t\t\t(vifname %s)\n", d_config->nics[i].ifname); + printf("\t\t\t(backend_domid %d)\n", d_config->nics[i].backend_domid); printf("\t\t\t(frontend_domid %d)\n", domid); - printf("\t\t\t(devid %d)\n", d_config->vifs[i].devid); - printf("\t\t\t(mtu %d)\n", d_config->vifs[i].mtu); - printf("\t\t\t(model %s)\n", d_config->vifs[i].model); + printf("\t\t\t(devid %d)\n", d_config->nics[i].devid); + printf("\t\t\t(mtu %d)\n", d_config->nics[i].mtu); + printf("\t\t\t(model %s)\n", d_config->nics[i].model); printf("\t\t\t(mac %02x%02x%02x%02x%02x%02x)\n", - d_config->vifs[i].mac[0], d_config->vifs[i].mac[1], - d_config->vifs[i].mac[2], d_config->vifs[i].mac[3], - d_config->vifs[i].mac[4], d_config->vifs[i].mac[5]); + d_config->nics[i].mac[0], d_config->nics[i].mac[1], + d_config->nics[i].mac[2], d_config->nics[i].mac[3], + d_config->nics[i].mac[4], d_config->nics[i].mac[5]); printf("\t\t)\n"); printf("\t)\n"); } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 26 20:55:22 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jul 2012 20:55: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 1SuV5e-0006oy-9Q; Thu, 26 Jul 2012 20:55:22 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5d-0006m8-BI for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:21 +0000 Received: from [85.158.138.51:21493] by server-12.bemta-3.messagelabs.com id AC/D4-15259-8BEA1105; Thu, 26 Jul 2012 20:55:20 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-174.messagelabs.com!1343336118!29043587!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 24664 invoked from network); 26 Jul 2012 20:55:19 -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; 26 Jul 2012 20:55:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5a-00062O-Gl for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuV5a-0005or-9P for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:18 +0000 Message-Id: Date: Thu, 26 Jul 2012 20:55:17 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xl: main_blockdetach don't call destroy if remove succeeds X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343295333 -3600 # Node ID c93f602084ccb26cdf9ff60056c5ffa88d45729d # Parent 4de762a22f54870da9fe7afd3850b89ca76014fb xl: main_blockdetach don't call destroy if remove succeeds xl was calling libxl_device_disk_destroy after a successful call to libxl_device_disk_remove, which leads to an error. Signed-off-by: Roger Pau Monne Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r 4de762a22f54 -r c93f602084cc tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Thu Jul 26 10:35:32 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Thu Jul 26 10:35:33 2012 +0100 @@ -5398,7 +5398,7 @@ int main_blocklist(int argc, char **argv int main_blockdetach(int argc, char **argv) { - int opt; + int opt, rc = 0; libxl_device_disk disk; if ((opt = def_getopt(argc, argv, "", "block-detach", 2)) != -1) @@ -5412,11 +5412,12 @@ int main_blockdetach(int argc, char **ar fprintf(stderr, "Error: Device %s not connected.\n", argv[optind+1]); return 1; } - if (libxl_device_disk_remove(ctx, domid, &disk, 0)) { + rc = libxl_device_disk_remove(ctx, domid, &disk, 0); + if (rc) { fprintf(stderr, "libxl_device_disk_remove failed.\n"); - } else - libxl_device_disk_destroy(ctx, domid, &disk, 0); - return 0; + } + libxl_device_disk_dispose(&disk); + return rc; } static char *uptime_to_string(unsigned long time, int short_mode) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 26 20:55:22 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jul 2012 20:55: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 1SuV5e-0006oX-0J; Thu, 26 Jul 2012 20:55:22 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5c-0006m8-BK for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:20 +0000 Received: from [85.158.138.51:21456] by server-12.bemta-3.messagelabs.com id B8/D4-15259-7BEA1105; Thu, 26 Jul 2012 20:55:19 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-174.messagelabs.com!1343336117!8732914!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 15701 invoked from network); 26 Jul 2012 20:55:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 26 Jul 2012 20:55:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5Y-00062F-M8 for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuV5Y-0005o8-Kw for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:16 +0000 Message-Id: Date: Thu, 26 Jul 2012 20:55:16 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: rename vifs to nics X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343295331 -3600 # Node ID ab99fc63a22ea8fc3e73e12560d81326ffdf5636 # Parent fb9a2cd50cab9b7ad4f2dd30d786bc9c574b9f5e libxl: rename vifs to nics This change renames functions and struct values that used to contain vifs in their names to nics, that provides a more clear name to define network interfaces without referring to the backend that is behind them. This is not a functional change. Signed-off-by: Roger Pau Monne Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r fb9a2cd50cab -r ab99fc63a22e tools/libxl/libxl.h --- a/tools/libxl/libxl.h Wed Jul 25 17:57:22 2012 +0100 +++ b/tools/libxl/libxl.h Thu Jul 26 10:35:31 2012 +0100 @@ -470,10 +470,10 @@ typedef struct { libxl_domain_create_info c_info; libxl_domain_build_info b_info; - int num_disks, num_vifs, num_pcidevs, num_vfbs, num_vkbs; + int num_disks, num_nics, num_pcidevs, num_vfbs, num_vkbs; libxl_device_disk *disks; - libxl_device_nic *vifs; + libxl_device_nic *nics; libxl_device_pci *pcidevs; libxl_device_vfb *vfbs; libxl_device_vkb *vkbs; diff -r fb9a2cd50cab -r ab99fc63a22e tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Wed Jul 25 17:57:22 2012 +0100 +++ b/tools/libxl/libxl_create.c Thu Jul 26 10:35:31 2012 +0100 @@ -39,9 +39,9 @@ void libxl_domain_config_dispose(libxl_d libxl_device_disk_dispose(&d_config->disks[i]); free(d_config->disks); - for (i=0; inum_vifs; i++) - libxl_device_nic_dispose(&d_config->vifs[i]); - free(d_config->vifs); + for (i=0; inum_nics; i++) + libxl_device_nic_dispose(&d_config->nics[i]); + free(d_config->nics); for (i=0; inum_pcidevs; i++) libxl_device_pci_dispose(&d_config->pcidevs[i]); @@ -873,8 +873,8 @@ static void domcreate_rebuild_done(libxl goto error_out; } } - for (i = 0; i < d_config->num_vifs; i++) { - ret = libxl_device_nic_add(ctx, domid, &d_config->vifs[i]); + for (i = 0; i < d_config->num_nics; i++) { + ret = libxl_device_nic_add(ctx, domid, &d_config->nics[i]); if (ret) { LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "cannot add nic %d to domain: %d", i, ret); diff -r fb9a2cd50cab -r ab99fc63a22e tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Wed Jul 25 17:57:22 2012 +0100 +++ b/tools/libxl/libxl_dm.c Thu Jul 26 10:35:31 2012 +0100 @@ -102,10 +102,10 @@ static char ** libxl__build_device_model { const libxl_domain_create_info *c_info = &guest_config->c_info; const libxl_domain_build_info *b_info = &guest_config->b_info; - const libxl_device_nic *vifs = guest_config->vifs; + const libxl_device_nic *nics = guest_config->nics; const libxl_vnc_info *vnc = libxl__dm_vnc(guest_config); const libxl_sdl_info *sdl = dm_sdl(guest_config); - const int num_vifs = guest_config->num_vifs; + const int num_nics = guest_config->num_nics; const char *keymap = dm_keymap(guest_config); int i; flexarray_t *dm_args; @@ -159,7 +159,7 @@ static char ** libxl__build_device_model flexarray_vappend(dm_args, "-k", keymap, NULL); } if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) { - int ioemu_vifs = 0; + int ioemu_nics = 0; int nr_set_cpus = 0; char *s; @@ -214,31 +214,31 @@ static char ** libxl__build_device_model libxl__sprintf(gc, "%s", s), NULL); free(s); - for (i = 0; i < num_vifs; i++) { - if (vifs[i].nictype == LIBXL_NIC_TYPE_IOEMU) { + for (i = 0; i < num_nics; i++) { + if (nics[i].nictype == LIBXL_NIC_TYPE_IOEMU) { char *smac = libxl__sprintf(gc, - LIBXL_MAC_FMT, LIBXL_MAC_BYTES(vifs[i].mac)); + LIBXL_MAC_FMT, LIBXL_MAC_BYTES(nics[i].mac)); const char *ifname = libxl__device_nic_devname(gc, - domid, vifs[i].devid, + domid, nics[i].devid, LIBXL_NIC_TYPE_IOEMU); flexarray_vappend(dm_args, "-net", GCSPRINTF( "nic,vlan=%d,macaddr=%s,model=%s", - vifs[i].devid, smac, vifs[i].model), + nics[i].devid, smac, nics[i].model), "-net", GCSPRINTF( "tap,vlan=%d,ifname=%s,bridge=%s," "script=%s,downscript=%s", - vifs[i].devid, ifname, vifs[i].bridge, + nics[i].devid, ifname, nics[i].bridge, libxl_tapif_script(gc), libxl_tapif_script(gc)), NULL); - ioemu_vifs++; + ioemu_nics++; } } /* If we have no emulated nics, tell qemu not to create any */ - if ( ioemu_vifs == 0 ) { + if ( ioemu_nics == 0 ) { flexarray_vappend(dm_args, "-net", "none", NULL); } if (libxl_defbool_val(b_info->u.hvm.gfx_passthru)) { @@ -330,9 +330,9 @@ static char ** libxl__build_device_model const libxl_domain_create_info *c_info = &guest_config->c_info; const libxl_domain_build_info *b_info = &guest_config->b_info; const libxl_device_disk *disks = guest_config->disks; - const libxl_device_nic *vifs = guest_config->vifs; + const libxl_device_nic *nics = guest_config->nics; const int num_disks = guest_config->num_disks; - const int num_vifs = guest_config->num_vifs; + const int num_nics = guest_config->num_nics; const libxl_vnc_info *vnc = libxl__dm_vnc(guest_config); const libxl_sdl_info *sdl = dm_sdl(guest_config); const char *keymap = dm_keymap(guest_config); @@ -409,7 +409,7 @@ static char ** libxl__build_device_model } if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) { - int ioemu_vifs = 0; + int ioemu_nics = 0; if (b_info->u.hvm.serial) { flexarray_vappend(dm_args, "-serial", b_info->u.hvm.serial, NULL); @@ -468,30 +468,30 @@ static char ** libxl__build_device_model flexarray_append(dm_args, libxl__sprintf(gc, "%d", b_info->max_vcpus)); } - for (i = 0; i < num_vifs; i++) { - if (vifs[i].nictype == LIBXL_NIC_TYPE_IOEMU) { + for (i = 0; i < num_nics; i++) { + if (nics[i].nictype == LIBXL_NIC_TYPE_IOEMU) { char *smac = libxl__sprintf(gc, - LIBXL_MAC_FMT, LIBXL_MAC_BYTES(vifs[i].mac)); + LIBXL_MAC_FMT, LIBXL_MAC_BYTES(nics[i].mac)); const char *ifname = libxl__device_nic_devname(gc, - guest_domid, vifs[i].devid, + guest_domid, nics[i].devid, LIBXL_NIC_TYPE_IOEMU); flexarray_append(dm_args, "-device"); flexarray_append(dm_args, libxl__sprintf(gc, "%s,id=nic%d,netdev=net%d,mac=%s", - vifs[i].model, vifs[i].devid, - vifs[i].devid, smac)); + nics[i].model, nics[i].devid, + nics[i].devid, smac)); flexarray_append(dm_args, "-netdev"); flexarray_append(dm_args, GCSPRINTF( "type=tap,id=net%d,ifname=%s," "script=%s,downscript=%s", - vifs[i].devid, ifname, + nics[i].devid, ifname, libxl_tapif_script(gc), libxl_tapif_script(gc))); - ioemu_vifs++; + ioemu_nics++; } } /* If we have no emulated nics, tell qemu not to create any */ - if ( ioemu_vifs == 0 ) { + if ( ioemu_nics == 0 ) { flexarray_append(dm_args, "-net"); flexarray_append(dm_args, "none"); } @@ -620,18 +620,18 @@ static void libxl__dm_vifs_from_hvm_gues libxl_domain_config * const guest_config, libxl_domain_config *dm_config) { - int i, nr = guest_config->num_vifs; + int i, nr = guest_config->num_nics; - GCNEW_ARRAY(dm_config->vifs, nr); + GCNEW_ARRAY(dm_config->nics, nr); for (i=0; ivifs[i] = guest_config->vifs[i]; - if (dm_config->vifs[i].ifname) - dm_config->vifs[i].ifname = GCSPRINTF("%s" TAP_DEVICE_SUFFIX, - dm_config->vifs[i].ifname); + dm_config->nics[i] = guest_config->nics[i]; + if (dm_config->nics[i].ifname) + dm_config->nics[i].ifname = GCSPRINTF("%s" TAP_DEVICE_SUFFIX, + dm_config->nics[i].ifname); } - dm_config->num_vifs = nr; + dm_config->num_nics = nr; } static int libxl__vfb_and_vkb_from_hvm_guest_config(libxl__gc *gc, @@ -849,8 +849,8 @@ retry_transaction: if (ret) goto out_free; } - for (i = 0; i < dm_config->num_vifs; i++) { - ret = libxl_device_nic_add(ctx, dm_domid, &dm_config->vifs[i]); + for (i = 0; i < dm_config->num_nics; i++) { + ret = libxl_device_nic_add(ctx, dm_domid, &dm_config->nics[i]); if (ret) goto out_free; } diff -r fb9a2cd50cab -r ab99fc63a22e tools/libxl/libxl_json.c --- a/tools/libxl/libxl_json.c Wed Jul 25 17:57:22 2012 +0100 +++ b/tools/libxl/libxl_json.c Thu Jul 26 10:35:31 2012 +0100 @@ -822,15 +822,15 @@ yajl_gen_status libxl_domain_config_gen_ if (s != yajl_gen_status_ok) goto out; - s = yajl_gen_string(hand, (const unsigned char *)"vifs", - sizeof("vifs")-1); + s = yajl_gen_string(hand, (const unsigned char *)"nics", + sizeof("nics")-1); if (s != yajl_gen_status_ok) goto out; s = yajl_gen_array_open(hand); if (s != yajl_gen_status_ok) goto out; - for (i = 0; i < p->num_vifs; i++) { - s = libxl_device_nic_gen_json(hand, &p->vifs[i]); + for (i = 0; i < p->num_nics; i++) { + s = libxl_device_nic_gen_json(hand, &p->nics[i]); if (s != yajl_gen_status_ok) goto out; } diff -r fb9a2cd50cab -r ab99fc63a22e tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Wed Jul 25 17:57:22 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Thu Jul 26 10:35:31 2012 +0100 @@ -919,17 +919,17 @@ static void parse_config_data(const char } if (!xlu_cfg_get_list (config, "vif", &nics, 0, 0)) { - d_config->num_vifs = 0; - d_config->vifs = NULL; - while ((buf = xlu_cfg_get_listitem (nics, d_config->num_vifs)) != NULL) { + d_config->num_nics = 0; + d_config->nics = NULL; + while ((buf = xlu_cfg_get_listitem (nics, d_config->num_nics)) != NULL) { libxl_device_nic *nic; char *buf2 = strdup(buf); char *p, *p2; - d_config->vifs = (libxl_device_nic *) realloc(d_config->vifs, sizeof (libxl_device_nic) * (d_config->num_vifs+1)); - nic = d_config->vifs + d_config->num_vifs; + d_config->nics = (libxl_device_nic *) realloc(d_config->nics, sizeof (libxl_device_nic) * (d_config->num_nics+1)); + nic = d_config->nics + d_config->num_nics; libxl_device_nic_init(nic); - nic->devid = d_config->num_vifs; + nic->devid = d_config->num_nics; if (default_vifscript) { free(nic->script); @@ -1002,7 +1002,7 @@ static void parse_config_data(const char } while ((p = strtok(NULL, ",")) != NULL); skip: free(buf2); - d_config->num_vifs++; + d_config->num_nics++; } } diff -r fb9a2cd50cab -r ab99fc63a22e tools/libxl/xl_sxp.c --- a/tools/libxl/xl_sxp.c Wed Jul 25 17:57:22 2012 +0100 +++ b/tools/libxl/xl_sxp.c Thu Jul 26 10:35:31 2012 +0100 @@ -175,20 +175,20 @@ void printf_info_sexp(int domid, libxl_d printf("\t)\n"); } - for (i = 0; i < d_config->num_vifs; i++) { + for (i = 0; i < d_config->num_nics; i++) { printf("\t(device\n"); printf("\t\t(vif\n"); - if (d_config->vifs[i].ifname) - printf("\t\t\t(vifname %s)\n", d_config->vifs[i].ifname); - printf("\t\t\t(backend_domid %d)\n", d_config->vifs[i].backend_domid); + if (d_config->nics[i].ifname) + printf("\t\t\t(vifname %s)\n", d_config->nics[i].ifname); + printf("\t\t\t(backend_domid %d)\n", d_config->nics[i].backend_domid); printf("\t\t\t(frontend_domid %d)\n", domid); - printf("\t\t\t(devid %d)\n", d_config->vifs[i].devid); - printf("\t\t\t(mtu %d)\n", d_config->vifs[i].mtu); - printf("\t\t\t(model %s)\n", d_config->vifs[i].model); + printf("\t\t\t(devid %d)\n", d_config->nics[i].devid); + printf("\t\t\t(mtu %d)\n", d_config->nics[i].mtu); + printf("\t\t\t(model %s)\n", d_config->nics[i].model); printf("\t\t\t(mac %02x%02x%02x%02x%02x%02x)\n", - d_config->vifs[i].mac[0], d_config->vifs[i].mac[1], - d_config->vifs[i].mac[2], d_config->vifs[i].mac[3], - d_config->vifs[i].mac[4], d_config->vifs[i].mac[5]); + d_config->nics[i].mac[0], d_config->nics[i].mac[1], + d_config->nics[i].mac[2], d_config->nics[i].mac[3], + d_config->nics[i].mac[4], d_config->nics[i].mac[5]); printf("\t\t)\n"); printf("\t)\n"); } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 26 20:55:22 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jul 2012 20:55: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 1SuV5d-0006nc-JZ; Thu, 26 Jul 2012 20:55:21 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5b-0006lK-P6 for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:19 +0000 Received: from [85.158.143.35:23878] by server-3.bemta-4.messagelabs.com id 97/C3-01511-7BEA1105; Thu, 26 Jul 2012 20:55:19 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-21.messagelabs.com!1343336110!17337292!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 7084 invoked from network); 26 Jul 2012 20:55:12 -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; 26 Jul 2012 20:55:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5S-00061i-Dc for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuV5S-0005lO-CP for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:10 +0000 Message-Id: Date: Thu, 26 Jul 2012 20:55:09 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: fix transaction leak in logdirty error path X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343234357 -3600 # Node ID b0d31b81aa588ef712cfbc6c8e4531082b2e26cd # Parent e37bd3d6f769a9604adacbef747d9dff9705e69a libxl: fix transaction leak in logdirty error path libxl__domain_suspend_common_switch_qemu_logdirty would leak t if there was an error. Fix this. Also, document the intended usage for libxl__xs_transaction_* in the doc comment in libxl_internal.h. Reported-by: Ian Campbell Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r e37bd3d6f769 -r b0d31b81aa58 tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Wed Jul 25 17:39:16 2012 +0100 +++ b/tools/libxl/libxl_dom.c Wed Jul 25 17:39:17 2012 +0100 @@ -628,6 +628,7 @@ void libxl__domain_suspend_common_switch out: LOG(ERROR,"logdirty switch failed (rc=%d), aborting suspend",rc); + libxl__xs_transaction_abort(gc, &t); switch_logdirty_done(egc,dss,-1); } diff -r e37bd3d6f769 -r b0d31b81aa58 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Wed Jul 25 17:39:16 2012 +0100 +++ b/tools/libxl/libxl_internal.h Wed Jul 25 17:39:17 2012 +0100 @@ -550,6 +550,42 @@ int libxl__xs_rm_checked(libxl__gc *gc, * +1 commit conflict; transaction has been destroyed and caller * must go round again (call _start again and retry) * 0 committed successfully + * + * The intended usage pattern looks like this: + * int some_function() + * { + * int rc; + * xs_transaction_t t = 0; + * // other initialisations + * + * // do whatever you need to do before the xenstore stuff + * // errors? set rc and goto out. + * + * for (;;) { + * rc = libxl__xs_transaction_start(gc, &t); + * if (rc) goto out; + * + * // do your work here, including all xenstore reads and writes + * // libxl__xs_*_checked are useful; pass them t. + * // errors? set rc and goto out. + * + * rc = libxl__xs_transaction_commit(gc, &t); + * if (!rc) break; + * if (rc<0) goto out; + * } + * + * // now the xenstore transaction succeeded + * // do whatever else you need to do + * // errors? set rc and goto out. + * + * return something; + * + * out: + * // other cleanups + * libxl__xs_transaction_abort(gc, &t); + * // other cleanups + * return rc; + * } */ int libxl__xs_transaction_start(libxl__gc *gc, xs_transaction_t *t); int libxl__xs_transaction_commit(libxl__gc *gc, xs_transaction_t *t); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 26 20:55:22 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jul 2012 20:55: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 1SuV5d-0006nc-JZ; Thu, 26 Jul 2012 20:55:21 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5b-0006lK-P6 for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:19 +0000 Received: from [85.158.143.35:23878] by server-3.bemta-4.messagelabs.com id 97/C3-01511-7BEA1105; Thu, 26 Jul 2012 20:55:19 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-21.messagelabs.com!1343336110!17337292!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 7084 invoked from network); 26 Jul 2012 20:55:12 -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; 26 Jul 2012 20:55:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5S-00061i-Dc for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuV5S-0005lO-CP for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:10 +0000 Message-Id: Date: Thu, 26 Jul 2012 20:55:09 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: fix transaction leak in logdirty error path X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343234357 -3600 # Node ID b0d31b81aa588ef712cfbc6c8e4531082b2e26cd # Parent e37bd3d6f769a9604adacbef747d9dff9705e69a libxl: fix transaction leak in logdirty error path libxl__domain_suspend_common_switch_qemu_logdirty would leak t if there was an error. Fix this. Also, document the intended usage for libxl__xs_transaction_* in the doc comment in libxl_internal.h. Reported-by: Ian Campbell Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r e37bd3d6f769 -r b0d31b81aa58 tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Wed Jul 25 17:39:16 2012 +0100 +++ b/tools/libxl/libxl_dom.c Wed Jul 25 17:39:17 2012 +0100 @@ -628,6 +628,7 @@ void libxl__domain_suspend_common_switch out: LOG(ERROR,"logdirty switch failed (rc=%d), aborting suspend",rc); + libxl__xs_transaction_abort(gc, &t); switch_logdirty_done(egc,dss,-1); } diff -r e37bd3d6f769 -r b0d31b81aa58 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Wed Jul 25 17:39:16 2012 +0100 +++ b/tools/libxl/libxl_internal.h Wed Jul 25 17:39:17 2012 +0100 @@ -550,6 +550,42 @@ int libxl__xs_rm_checked(libxl__gc *gc, * +1 commit conflict; transaction has been destroyed and caller * must go round again (call _start again and retry) * 0 committed successfully + * + * The intended usage pattern looks like this: + * int some_function() + * { + * int rc; + * xs_transaction_t t = 0; + * // other initialisations + * + * // do whatever you need to do before the xenstore stuff + * // errors? set rc and goto out. + * + * for (;;) { + * rc = libxl__xs_transaction_start(gc, &t); + * if (rc) goto out; + * + * // do your work here, including all xenstore reads and writes + * // libxl__xs_*_checked are useful; pass them t. + * // errors? set rc and goto out. + * + * rc = libxl__xs_transaction_commit(gc, &t); + * if (!rc) break; + * if (rc<0) goto out; + * } + * + * // now the xenstore transaction succeeded + * // do whatever else you need to do + * // errors? set rc and goto out. + * + * return something; + * + * out: + * // other cleanups + * libxl__xs_transaction_abort(gc, &t); + * // other cleanups + * return rc; + * } */ int libxl__xs_transaction_start(libxl__gc *gc, xs_transaction_t *t); int libxl__xs_transaction_commit(libxl__gc *gc, xs_transaction_t *t); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 26 20:55:23 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jul 2012 20:55: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 1SuV5e-0006p9-Cn; Thu, 26 Jul 2012 20:55:22 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5d-0006jB-Nm for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:21 +0000 Received: from [85.158.143.35:26736] by server-1.bemta-4.messagelabs.com id 08/D5-24392-9BEA1105; Thu, 26 Jul 2012 20:55:21 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-21.messagelabs.com!1343336117!16016495!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 11906 invoked from network); 26 Jul 2012 20:55:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 26 Jul 2012 20:55:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5Z-00062L-PR for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuV5Z-0005oc-OD for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:17 +0000 Message-Id: Date: Thu, 26 Jul 2012 20:55:17 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: use libxl__xs_path_cleanup on 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 Roger Pau Monne # Date 1343295332 -3600 # Node ID 4de762a22f54870da9fe7afd3850b89ca76014fb # Parent 6572f993810a43364f4c72cf97bcf3c085b45b8b libxl: use libxl__xs_path_cleanup on device_destroy Since the hotplug script that was in charge of cleaning the backend is no longer launched, we need to clean the backend by ourselves, so use libxl__xs_path_cleanup instead of xs_rm. Signed-off-by: Roger Pau Monne Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r 6572f993810a -r 4de762a22f54 tools/libxl/libxl_device.c --- a/tools/libxl/libxl_device.c Thu Jul 26 10:35:31 2012 +0100 +++ b/tools/libxl/libxl_device.c Thu Jul 26 10:35:32 2012 +0100 @@ -447,16 +447,26 @@ void libxl__ao_devices_callback(libxl__e int libxl__device_destroy(libxl__gc *gc, libxl__device *dev) { - libxl_ctx *ctx = libxl__gc_owner(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; - xs_rm(ctx->xsh, XBT_NULL, be_path); - xs_rm(ctx->xsh, XBT_NULL, fe_path); + do { + t = xs_transaction_start(CTX->xsh); + 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; + } libxl__device_destroy_tapdisk(gc, be_path); - return 0; +out: + return rc; } /* Callback for device destruction */ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 26 20:55:23 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jul 2012 20:55: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 1SuV5e-0006p9-Cn; Thu, 26 Jul 2012 20:55:22 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5d-0006jB-Nm for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:21 +0000 Received: from [85.158.143.35:26736] by server-1.bemta-4.messagelabs.com id 08/D5-24392-9BEA1105; Thu, 26 Jul 2012 20:55:21 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-21.messagelabs.com!1343336117!16016495!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 11906 invoked from network); 26 Jul 2012 20:55:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 26 Jul 2012 20:55:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5Z-00062L-PR for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuV5Z-0005oc-OD for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:17 +0000 Message-Id: Date: Thu, 26 Jul 2012 20:55:17 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: use libxl__xs_path_cleanup on 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 Roger Pau Monne # Date 1343295332 -3600 # Node ID 4de762a22f54870da9fe7afd3850b89ca76014fb # Parent 6572f993810a43364f4c72cf97bcf3c085b45b8b libxl: use libxl__xs_path_cleanup on device_destroy Since the hotplug script that was in charge of cleaning the backend is no longer launched, we need to clean the backend by ourselves, so use libxl__xs_path_cleanup instead of xs_rm. Signed-off-by: Roger Pau Monne Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r 6572f993810a -r 4de762a22f54 tools/libxl/libxl_device.c --- a/tools/libxl/libxl_device.c Thu Jul 26 10:35:31 2012 +0100 +++ b/tools/libxl/libxl_device.c Thu Jul 26 10:35:32 2012 +0100 @@ -447,16 +447,26 @@ void libxl__ao_devices_callback(libxl__e int libxl__device_destroy(libxl__gc *gc, libxl__device *dev) { - libxl_ctx *ctx = libxl__gc_owner(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; - xs_rm(ctx->xsh, XBT_NULL, be_path); - xs_rm(ctx->xsh, XBT_NULL, fe_path); + do { + t = xs_transaction_start(CTX->xsh); + 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; + } libxl__device_destroy_tapdisk(gc, be_path); - return 0; +out: + return rc; } /* Callback for device destruction */ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 26 20:55:23 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jul 2012 20:55: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 1SuV5f-0006rb-GO; Thu, 26 Jul 2012 20:55:23 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5d-0006jP-Mc for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:21 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-11.tower-27.messagelabs.com!1343336114!4166779!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 13594 invoked from network); 26 Jul 2012 20:55:15 -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; 26 Jul 2012 20:55:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5W-00061x-3y for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuV5V-0005mu-Vy for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:13 +0000 Message-Id: Date: Thu, 26 Jul 2012 20:55:13 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: implement hypercall continuations X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343234361 -3600 # Node ID afece34aca520ca54939c2146f5a0a6822955148 # Parent a1ee7eccd83e533785aa35caa49833a1277807d3 arm: implement hypercall continuations Largely cribbed from x86, register names differ and the return value is r0 == the first argument rather than the hypercall number (which is r12). We must only clobber the hypercall arguments if PC has not been changed since continuations rely on them. Multicall variant is untested, On ARM do_multicall_call is currently a BUG() so we obviously don't use that yet. I have left a BUG in the hypercall continuation path too since it will need validation once multicalls are implemented. Since the multicall state is local we do not need a globally atomic {test,set}_bit. However we do need to be atomic WRT interrupts so can't just use the naive RMW version. Stick with the global atomic implementation for now but keep the __ as documentaion of the intention. Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini Committed-by: Ian Campbell --- diff -r a1ee7eccd83e -r afece34aca52 xen/arch/arm/domain.c --- a/xen/arch/arm/domain.c Wed Jul 25 17:39:21 2012 +0100 +++ b/xen/arch/arm/domain.c Wed Jul 25 17:39:21 2012 +0100 @@ -5,6 +5,7 @@ #include #include #include +#include #include #include @@ -224,6 +225,92 @@ void sync_vcpu_execstate(struct vcpu *v) /* Nothing to do -- no lazy switching */ } +#define next_arg(fmt, args) ({ \ + unsigned long __arg; \ + switch ( *(fmt)++ ) \ + { \ + case 'i': __arg = (unsigned long)va_arg(args, unsigned int); break; \ + case 'l': __arg = (unsigned long)va_arg(args, unsigned long); break; \ + case 'h': __arg = (unsigned long)va_arg(args, void *); break; \ + default: __arg = 0; BUG(); \ + } \ + __arg; \ +}) + +void hypercall_cancel_continuation(void) +{ + struct cpu_user_regs *regs = guest_cpu_user_regs(); + struct mc_state *mcs = ¤t->mc_state; + + if ( test_bit(_MCSF_in_multicall, &mcs->flags) ) + { + __clear_bit(_MCSF_call_preempted, &mcs->flags); + } + else + { + regs->pc += 4; /* undo re-execute 'hvc #XEN_HYPERCALL_TAG' */ + } +} + +unsigned long hypercall_create_continuation( + unsigned int op, const char *format, ...) +{ + struct mc_state *mcs = ¤t->mc_state; + struct cpu_user_regs *regs; + const char *p = format; + unsigned long arg, rc; + unsigned int i; + va_list args; + + /* All hypercalls take at least one argument */ + BUG_ON( !p || *p == '\0' ); + + va_start(args, format); + + if ( test_bit(_MCSF_in_multicall, &mcs->flags) ) + { + BUG(); /* XXX multicalls not implemented yet. */ + + __set_bit(_MCSF_call_preempted, &mcs->flags); + + for ( i = 0; *p != '\0'; i++ ) + mcs->call.args[i] = next_arg(p, args); + + /* Return value gets written back to mcs->call.result */ + rc = mcs->call.result; + } + else + { + regs = guest_cpu_user_regs(); + regs->r12 = op; + + /* Ensure the hypercall trap instruction is re-executed. */ + regs->pc -= 4; /* re-execute 'hvc #XEN_HYPERCALL_TAG' */ + + for ( i = 0; *p != '\0'; i++ ) + { + arg = next_arg(p, args); + + switch ( i ) + { + case 0: regs->r0 = arg; break; + case 1: regs->r1 = arg; break; + case 2: regs->r2 = arg; break; + case 3: regs->r3 = arg; break; + case 4: regs->r4 = arg; break; + case 5: regs->r5 = arg; break; + } + } + + /* Return value gets written back to r0 */ + rc = regs->r0; + } + + va_end(args); + + return rc; +} + void startup_cpu_idle_loop(void) { struct vcpu *v = current; diff -r a1ee7eccd83e -r afece34aca52 xen/arch/arm/dummy.S --- a/xen/arch/arm/dummy.S Wed Jul 25 17:39:21 2012 +0100 +++ b/xen/arch/arm/dummy.S Wed Jul 25 17:39:21 2012 +0100 @@ -46,7 +46,6 @@ DUMMY(domain_relinquish_resources); DUMMY(domain_set_time_offset); DUMMY(dom_cow); DUMMY(gmfn_to_mfn); -DUMMY(hypercall_create_continuation); DUMMY(send_timer_event); DUMMY(share_xen_page_with_privileged_guests); DUMMY(wallclock_time); diff -r a1ee7eccd83e -r afece34aca52 xen/arch/arm/traps.c --- a/xen/arch/arm/traps.c Wed Jul 25 17:39:21 2012 +0100 +++ b/xen/arch/arm/traps.c Wed Jul 25 17:39:21 2012 +0100 @@ -470,6 +470,9 @@ static void do_debug_trap(struct cpu_use static void do_trap_hypercall(struct cpu_user_regs *regs, unsigned long iss) { arm_hypercall_fn_t call = NULL; +#ifndef NDEBUG + uint32_t orig_pc = regs->pc; +#endif if ( iss != XEN_HYPERCALL_TAG ) { @@ -495,17 +498,23 @@ static void do_trap_hypercall(struct cpu regs->r0 = call(regs->r0, regs->r1, regs->r2, regs->r3, regs->r4); #ifndef NDEBUG - /* Clobber argument registers */ - switch ( arm_hypercall_table[regs->r12].nr_args ) { - case 5: regs->r4 = 0xDEADBEEF; - case 4: regs->r3 = 0xDEADBEEF; - case 3: regs->r2 = 0xDEADBEEF; - case 2: regs->r1 = 0xDEADBEEF; - case 1: /* Don't clobber r0 -- it's the return value */ - break; - default: BUG(); + /* + * Clobber argument registers only if pc is unchanged, otherwise + * this is a hypercall continuation. + */ + if ( orig_pc == regs->pc ) + { + switch ( arm_hypercall_table[regs->r12].nr_args ) { + case 5: regs->r4 = 0xDEADBEEF; + case 4: regs->r3 = 0xDEADBEEF; + case 3: regs->r2 = 0xDEADBEEF; + case 2: regs->r1 = 0xDEADBEEF; + case 1: /* Don't clobber r0 -- it's the return value */ + break; + default: BUG(); + } + regs->r12 = 0xDEADBEEF; } - regs->r12 = 0xDEADBEEF; #endif } diff -r a1ee7eccd83e -r afece34aca52 xen/include/asm-arm/bitops.h --- a/xen/include/asm-arm/bitops.h Wed Jul 25 17:39:21 2012 +0100 +++ b/xen/include/asm-arm/bitops.h Wed Jul 25 17:39:21 2012 +0100 @@ -23,6 +23,15 @@ extern int _test_and_change_bit(int nr, #define test_and_clear_bit(n,p) _test_and_clear_bit(n,p) #define test_and_change_bit(n,p) _test_and_change_bit(n,p) +/* + * Non-atomic bit manipulation. + * + * Implemented using atomics to be interrupt safe. Could alternatively + * implement with local interrupt masking. + */ +#define __set_bit(n,p) _set_bit(n,p) +#define __clear_bit(n,p) _clear_bit(n,p) + #define BIT(nr) (1UL << (nr)) #define BIT_MASK(nr) (1UL << ((nr) % BITS_PER_LONG)) #define BIT_WORD(nr) ((nr) / BITS_PER_LONG) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 26 20:55:23 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jul 2012 20:55: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 1SuV5f-0006rb-GO; Thu, 26 Jul 2012 20:55:23 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5d-0006jP-Mc for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:21 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-11.tower-27.messagelabs.com!1343336114!4166779!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 13594 invoked from network); 26 Jul 2012 20:55:15 -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; 26 Jul 2012 20:55:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5W-00061x-3y for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuV5V-0005mu-Vy for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:13 +0000 Message-Id: Date: Thu, 26 Jul 2012 20:55:13 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: implement hypercall continuations X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343234361 -3600 # Node ID afece34aca520ca54939c2146f5a0a6822955148 # Parent a1ee7eccd83e533785aa35caa49833a1277807d3 arm: implement hypercall continuations Largely cribbed from x86, register names differ and the return value is r0 == the first argument rather than the hypercall number (which is r12). We must only clobber the hypercall arguments if PC has not been changed since continuations rely on them. Multicall variant is untested, On ARM do_multicall_call is currently a BUG() so we obviously don't use that yet. I have left a BUG in the hypercall continuation path too since it will need validation once multicalls are implemented. Since the multicall state is local we do not need a globally atomic {test,set}_bit. However we do need to be atomic WRT interrupts so can't just use the naive RMW version. Stick with the global atomic implementation for now but keep the __ as documentaion of the intention. Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini Committed-by: Ian Campbell --- diff -r a1ee7eccd83e -r afece34aca52 xen/arch/arm/domain.c --- a/xen/arch/arm/domain.c Wed Jul 25 17:39:21 2012 +0100 +++ b/xen/arch/arm/domain.c Wed Jul 25 17:39:21 2012 +0100 @@ -5,6 +5,7 @@ #include #include #include +#include #include #include @@ -224,6 +225,92 @@ void sync_vcpu_execstate(struct vcpu *v) /* Nothing to do -- no lazy switching */ } +#define next_arg(fmt, args) ({ \ + unsigned long __arg; \ + switch ( *(fmt)++ ) \ + { \ + case 'i': __arg = (unsigned long)va_arg(args, unsigned int); break; \ + case 'l': __arg = (unsigned long)va_arg(args, unsigned long); break; \ + case 'h': __arg = (unsigned long)va_arg(args, void *); break; \ + default: __arg = 0; BUG(); \ + } \ + __arg; \ +}) + +void hypercall_cancel_continuation(void) +{ + struct cpu_user_regs *regs = guest_cpu_user_regs(); + struct mc_state *mcs = ¤t->mc_state; + + if ( test_bit(_MCSF_in_multicall, &mcs->flags) ) + { + __clear_bit(_MCSF_call_preempted, &mcs->flags); + } + else + { + regs->pc += 4; /* undo re-execute 'hvc #XEN_HYPERCALL_TAG' */ + } +} + +unsigned long hypercall_create_continuation( + unsigned int op, const char *format, ...) +{ + struct mc_state *mcs = ¤t->mc_state; + struct cpu_user_regs *regs; + const char *p = format; + unsigned long arg, rc; + unsigned int i; + va_list args; + + /* All hypercalls take at least one argument */ + BUG_ON( !p || *p == '\0' ); + + va_start(args, format); + + if ( test_bit(_MCSF_in_multicall, &mcs->flags) ) + { + BUG(); /* XXX multicalls not implemented yet. */ + + __set_bit(_MCSF_call_preempted, &mcs->flags); + + for ( i = 0; *p != '\0'; i++ ) + mcs->call.args[i] = next_arg(p, args); + + /* Return value gets written back to mcs->call.result */ + rc = mcs->call.result; + } + else + { + regs = guest_cpu_user_regs(); + regs->r12 = op; + + /* Ensure the hypercall trap instruction is re-executed. */ + regs->pc -= 4; /* re-execute 'hvc #XEN_HYPERCALL_TAG' */ + + for ( i = 0; *p != '\0'; i++ ) + { + arg = next_arg(p, args); + + switch ( i ) + { + case 0: regs->r0 = arg; break; + case 1: regs->r1 = arg; break; + case 2: regs->r2 = arg; break; + case 3: regs->r3 = arg; break; + case 4: regs->r4 = arg; break; + case 5: regs->r5 = arg; break; + } + } + + /* Return value gets written back to r0 */ + rc = regs->r0; + } + + va_end(args); + + return rc; +} + void startup_cpu_idle_loop(void) { struct vcpu *v = current; diff -r a1ee7eccd83e -r afece34aca52 xen/arch/arm/dummy.S --- a/xen/arch/arm/dummy.S Wed Jul 25 17:39:21 2012 +0100 +++ b/xen/arch/arm/dummy.S Wed Jul 25 17:39:21 2012 +0100 @@ -46,7 +46,6 @@ DUMMY(domain_relinquish_resources); DUMMY(domain_set_time_offset); DUMMY(dom_cow); DUMMY(gmfn_to_mfn); -DUMMY(hypercall_create_continuation); DUMMY(send_timer_event); DUMMY(share_xen_page_with_privileged_guests); DUMMY(wallclock_time); diff -r a1ee7eccd83e -r afece34aca52 xen/arch/arm/traps.c --- a/xen/arch/arm/traps.c Wed Jul 25 17:39:21 2012 +0100 +++ b/xen/arch/arm/traps.c Wed Jul 25 17:39:21 2012 +0100 @@ -470,6 +470,9 @@ static void do_debug_trap(struct cpu_use static void do_trap_hypercall(struct cpu_user_regs *regs, unsigned long iss) { arm_hypercall_fn_t call = NULL; +#ifndef NDEBUG + uint32_t orig_pc = regs->pc; +#endif if ( iss != XEN_HYPERCALL_TAG ) { @@ -495,17 +498,23 @@ static void do_trap_hypercall(struct cpu regs->r0 = call(regs->r0, regs->r1, regs->r2, regs->r3, regs->r4); #ifndef NDEBUG - /* Clobber argument registers */ - switch ( arm_hypercall_table[regs->r12].nr_args ) { - case 5: regs->r4 = 0xDEADBEEF; - case 4: regs->r3 = 0xDEADBEEF; - case 3: regs->r2 = 0xDEADBEEF; - case 2: regs->r1 = 0xDEADBEEF; - case 1: /* Don't clobber r0 -- it's the return value */ - break; - default: BUG(); + /* + * Clobber argument registers only if pc is unchanged, otherwise + * this is a hypercall continuation. + */ + if ( orig_pc == regs->pc ) + { + switch ( arm_hypercall_table[regs->r12].nr_args ) { + case 5: regs->r4 = 0xDEADBEEF; + case 4: regs->r3 = 0xDEADBEEF; + case 3: regs->r2 = 0xDEADBEEF; + case 2: regs->r1 = 0xDEADBEEF; + case 1: /* Don't clobber r0 -- it's the return value */ + break; + default: BUG(); + } + regs->r12 = 0xDEADBEEF; } - regs->r12 = 0xDEADBEEF; #endif } diff -r a1ee7eccd83e -r afece34aca52 xen/include/asm-arm/bitops.h --- a/xen/include/asm-arm/bitops.h Wed Jul 25 17:39:21 2012 +0100 +++ b/xen/include/asm-arm/bitops.h Wed Jul 25 17:39:21 2012 +0100 @@ -23,6 +23,15 @@ extern int _test_and_change_bit(int nr, #define test_and_clear_bit(n,p) _test_and_clear_bit(n,p) #define test_and_change_bit(n,p) _test_and_change_bit(n,p) +/* + * Non-atomic bit manipulation. + * + * Implemented using atomics to be interrupt safe. Could alternatively + * implement with local interrupt masking. + */ +#define __set_bit(n,p) _set_bit(n,p) +#define __clear_bit(n,p) _clear_bit(n,p) + #define BIT(nr) (1UL << (nr)) #define BIT_MASK(nr) (1UL << ((nr) % BITS_PER_LONG)) #define BIT_WORD(nr) ((nr) / BITS_PER_LONG) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 26 20:55:23 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jul 2012 20:55: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 1SuV5f-0006rk-KG; Thu, 26 Jul 2012 20:55:23 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5d-0006nP-Pi for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:21 +0000 Received: from [85.158.138.51:13879] by server-3.bemta-3.messagelabs.com id D7/0D-08301-8BEA1105; Thu, 26 Jul 2012 20:55:20 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-174.messagelabs.com!1343336119!28957642!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 839 invoked from network); 26 Jul 2012 20:55:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 26 Jul 2012 20:55:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5a-00062R-Qr for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuV5a-0005p6-Pk for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:18 +0000 Message-Id: Date: Thu, 26 Jul 2012 20:55:18 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: set nic type of stub to PV instead of copying from the parent X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343295334 -3600 # Node ID 07a69dbf7e85bca9c3e69c43a9f189612479cbc8 # Parent c93f602084ccb26cdf9ff60056c5ffa88d45729d libxl: set nic type of stub to PV instead of copying from the parent Set the type of the nics used in sutbdoms to PV unconditianlly, or the call to setdefaults later is going to fail. Signed-off-by: Roger Pau Monne Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r c93f602084cc -r 07a69dbf7e85 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Thu Jul 26 10:35:33 2012 +0100 +++ b/tools/libxl/libxl_dm.c Thu Jul 26 10:35:34 2012 +0100 @@ -626,6 +626,7 @@ static void libxl__dm_vifs_from_hvm_gues for (i=0; inics[i] = guest_config->nics[i]; + dm_config->nics[i].nictype = LIBXL_NIC_TYPE_VIF; if (dm_config->nics[i].ifname) dm_config->nics[i].ifname = GCSPRINTF("%s" TAP_DEVICE_SUFFIX, dm_config->nics[i].ifname); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 26 20:55:23 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jul 2012 20:55: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 1SuV5f-0006rk-KG; Thu, 26 Jul 2012 20:55:23 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5d-0006nP-Pi for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:21 +0000 Received: from [85.158.138.51:13879] by server-3.bemta-3.messagelabs.com id D7/0D-08301-8BEA1105; Thu, 26 Jul 2012 20:55:20 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-174.messagelabs.com!1343336119!28957642!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 839 invoked from network); 26 Jul 2012 20:55:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 26 Jul 2012 20:55:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5a-00062R-Qr for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuV5a-0005p6-Pk for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:18 +0000 Message-Id: Date: Thu, 26 Jul 2012 20:55:18 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: set nic type of stub to PV instead of copying from the parent X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343295334 -3600 # Node ID 07a69dbf7e85bca9c3e69c43a9f189612479cbc8 # Parent c93f602084ccb26cdf9ff60056c5ffa88d45729d libxl: set nic type of stub to PV instead of copying from the parent Set the type of the nics used in sutbdoms to PV unconditianlly, or the call to setdefaults later is going to fail. Signed-off-by: Roger Pau Monne Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r c93f602084cc -r 07a69dbf7e85 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Thu Jul 26 10:35:33 2012 +0100 +++ b/tools/libxl/libxl_dm.c Thu Jul 26 10:35:34 2012 +0100 @@ -626,6 +626,7 @@ static void libxl__dm_vifs_from_hvm_gues for (i=0; inics[i] = guest_config->nics[i]; + dm_config->nics[i].nictype = LIBXL_NIC_TYPE_VIF; if (dm_config->nics[i].ifname) dm_config->nics[i].ifname = GCSPRINTF("%s" TAP_DEVICE_SUFFIX, dm_config->nics[i].ifname); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 26 20:55:24 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jul 2012 20:55:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5g-0006tB-NA; Thu, 26 Jul 2012 20:55:24 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5f-0006m8-BG for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:23 +0000 Received: from [85.158.138.51:15924] by server-12.bemta-3.messagelabs.com id E0/E4-15259-ABEA1105; Thu, 26 Jul 2012 20:55:22 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-174.messagelabs.com!1343336120!28967894!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 14590 invoked from network); 26 Jul 2012 20:55:21 -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; 26 Jul 2012 20:55:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5b-00062a-Vz for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuV5b-0005pa-Rp for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:19 +0000 Message-Id: Date: Thu, 26 Jul 2012 20:55:19 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xl: disk parsing preparation for empty cdrom devices X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343295336 -3600 # Node ID fa411577ef8b5a58acc054cdcdb57a70ce1cb7e9 # Parent 968b205da696708ece522690ca10a823e03058db xl: disk parsing preparation for empty cdrom devices Prepare the ground for parsing the xend empty cdrom syntax, by separating out some non-functional changes as this pre-patch: * Clarify the disk syntax documentation wording to refer to deprecated syntaxes too. * Make DPC in libxlu_disk_l.l useable in the helper functions as well as in lexer rules, by providing two definitions, each in force in the appropriate parts of the file. * Break the [:] parsing out into a helper function, `vdev_and_devtype'. No functional change. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r 968b205da696 -r fa411577ef8b docs/misc/xl-disk-configuration.txt --- a/docs/misc/xl-disk-configuration.txt Thu Jul 26 10:35:35 2012 +0100 +++ b/docs/misc/xl-disk-configuration.txt Thu Jul 26 10:35:36 2012 +0100 @@ -164,16 +164,17 @@ information to be interpreted by /etc/xe -================================== -DEPRECATED PARAMETERS AND PREFIXES -================================== +============================================ +DEPRECATED PARAMETERS, PREFIXES AND SYNTAXES +============================================ -Deprecated values are acceptable and are intended work compatibly with +Deprecated forms are acceptable and are intended work compatibly with xend and xl from xen 4.1. In future they may print a warning. Support for deprecated parameters and syntaxes are likely to be dropped in future versions of xl. -There is also support for a deprecated old syntax for : + +There is support for a deprecated old syntax for : [:][],[:], (deprecated) diff -r 968b205da696 -r fa411577ef8b tools/libxl/libxlu_disk_l.c --- a/tools/libxl/libxlu_disk_l.c Thu Jul 26 10:35:35 2012 +0100 +++ b/tools/libxl/libxlu_disk_l.c Thu Jul 26 10:35:36 2012 +0100 @@ -794,8 +794,6 @@ void xlu__disk_yyset_column(int column_ * and particularly to avoid repeating boilerplate values such as * DPC->disk, yytext, etc. */ -#define DPC ((DiskParseContext*)yyextra) - /* Sets an enum, checking it hasn't already been set to a different value */ #define DSET(dpc,member,enumname,str,valname) do{ \ if (dpc->disk->member != LIBXL_DISK_##enumname##_UNKNOWN && \ @@ -828,6 +826,8 @@ static void savestring(DiskParseContext *update = strdup(value); } +#define DPC dpc /* our convention in lexer helper functions */ + /* Sets ->readwrite from the string. This ought to be an enum, perhaps. */ static void setaccess(DiskParseContext *dpc, const char *str) { if (!strcmp(str, "r") || !strcmp(str, "ro")) { @@ -860,8 +860,32 @@ static void setbackendtype(DiskParseCont #define DEPRECATE(usewhatinstead) /* not currently reported */ +/* Handles a vdev positional parameter which includes a devtype. */ +static int vdev_and_devtype(DiskParseContext *dpc, char *str) { + /* returns 1 if it was :, 0 (doing nothing) otherwise */ + char *colon = strrchr(str, ':'); + if (!colon) + return 0; -#line 865 "libxlu_disk_l.c" + DEPRECATE("use `devtype=...'"); + *colon++ = 0; + SAVESTRING("vdev", vdev, str); + + if (!strcmp(colon,"cdrom")) { + DPC->disk->is_cdrom = 1; + } else if (!strcmp(colon,"disk")) { + DPC->disk->is_cdrom = 0; + } else { + xlu__disk_err(DPC,colon,"unknown deprecated type"); + } + return 1; +} + +#undef DPC /* needs to be defined differently the actual lexer */ +#define DPC ((DiskParseContext*)yyextra) + + +#line 889 "libxlu_disk_l.c" #define INITIAL 0 #define LEXERR 1 @@ -1097,12 +1121,12 @@ YY_DECL register int yy_act; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; -#line 127 "libxlu_disk_l.l" +#line 151 "libxlu_disk_l.l" /*----- the scanner rules which do the parsing -----*/ -#line 1106 "libxlu_disk_l.c" +#line 1130 "libxlu_disk_l.c" if ( !yyg->yy_init ) { @@ -1223,72 +1247,72 @@ do_action: /* This label is used only to case 1: /* rule 1 can match eol */ YY_RULE_SETUP -#line 130 "libxlu_disk_l.l" +#line 155 "libxlu_disk_l.l" { /* ignore whitespace before parameters */ } YY_BREAK /* ordinary parameters setting enums or strings */ case 2: /* rule 2 can match eol */ YY_RULE_SETUP -#line 134 "libxlu_disk_l.l" +#line 159 "libxlu_disk_l.l" { STRIP(','); setformat(DPC, FROMEQUALS); } YY_BREAK case 3: YY_RULE_SETUP -#line 136 "libxlu_disk_l.l" +#line 161 "libxlu_disk_l.l" { DPC->disk->is_cdrom = 1; } YY_BREAK case 4: YY_RULE_SETUP -#line 137 "libxlu_disk_l.l" +#line 162 "libxlu_disk_l.l" { DPC->disk->is_cdrom = 1; } YY_BREAK case 5: YY_RULE_SETUP -#line 138 "libxlu_disk_l.l" +#line 163 "libxlu_disk_l.l" { DPC->disk->is_cdrom = 0; } YY_BREAK case 6: /* rule 6 can match eol */ YY_RULE_SETUP -#line 139 "libxlu_disk_l.l" +#line 164 "libxlu_disk_l.l" { xlu__disk_err(DPC,yytext,"unknown value for type"); } YY_BREAK case 7: /* rule 7 can match eol */ YY_RULE_SETUP -#line 141 "libxlu_disk_l.l" +#line 166 "libxlu_disk_l.l" { STRIP(','); setaccess(DPC, FROMEQUALS); } YY_BREAK case 8: /* rule 8 can match eol */ YY_RULE_SETUP -#line 142 "libxlu_disk_l.l" +#line 167 "libxlu_disk_l.l" { STRIP(','); setbackendtype(DPC,FROMEQUALS); } YY_BREAK case 9: /* rule 9 can match eol */ YY_RULE_SETUP -#line 144 "libxlu_disk_l.l" +#line 169 "libxlu_disk_l.l" { STRIP(','); SAVESTRING("vdev", vdev, FROMEQUALS); } YY_BREAK case 10: /* rule 10 can match eol */ YY_RULE_SETUP -#line 145 "libxlu_disk_l.l" +#line 170 "libxlu_disk_l.l" { STRIP(','); SAVESTRING("script", script, FROMEQUALS); } YY_BREAK /* the target magic parameter, eats the rest of the string */ case 11: YY_RULE_SETUP -#line 149 "libxlu_disk_l.l" +#line 174 "libxlu_disk_l.l" { STRIP(','); SAVESTRING("target", pdev_path, FROMEQUALS); } YY_BREAK /* unknown parameters */ case 12: /* rule 12 can match eol */ YY_RULE_SETUP -#line 153 "libxlu_disk_l.l" +#line 178 "libxlu_disk_l.l" { xlu__disk_err(DPC,yytext,"unknown parameter"); } YY_BREAK /* deprecated prefixes */ @@ -1296,7 +1320,7 @@ YY_RULE_SETUP * matched the whole string, so these patterns take precedence */ case 13: YY_RULE_SETUP -#line 161 "libxlu_disk_l.l" +#line 185 "libxlu_disk_l.l" { STRIP(':'); DPC->had_depr_prefix=1; DEPRECATE("use `[format=]...,'"); @@ -1305,7 +1329,7 @@ YY_RULE_SETUP YY_BREAK case 14: YY_RULE_SETUP -#line 167 "libxlu_disk_l.l" +#line 191 "libxlu_disk_l.l" { STRIP(':'); DPC->had_depr_prefix=1; DEPRECATE("use `script=...'"); @@ -1317,12 +1341,12 @@ case 15: yyg->yy_c_buf_p = yy_cp = yy_bp + 8; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 172 "libxlu_disk_l.l" +#line 197 "libxlu_disk_l.l" { DPC->had_depr_prefix=1; DEPRECATE(0); } YY_BREAK case 16: YY_RULE_SETUP -#line 173 "libxlu_disk_l.l" +#line 198 "libxlu_disk_l.l" { DPC->had_depr_prefix=1; DEPRECATE(0); } YY_BREAK case 17: @@ -1330,7 +1354,7 @@ case 17: yyg->yy_c_buf_p = yy_cp = yy_bp + 4; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 175 "libxlu_disk_l.l" +#line 199 "libxlu_disk_l.l" { DPC->had_depr_prefix=1; DEPRECATE(0); } YY_BREAK case 18: @@ -1338,7 +1362,7 @@ case 18: yyg->yy_c_buf_p = yy_cp = yy_bp + 6; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 176 "libxlu_disk_l.l" +#line 200 "libxlu_disk_l.l" { DPC->had_depr_prefix=1; DEPRECATE(0); } YY_BREAK case 19: @@ -1346,7 +1370,7 @@ case 19: yyg->yy_c_buf_p = yy_cp = yy_bp + 5; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 177 "libxlu_disk_l.l" +#line 201 "libxlu_disk_l.l" { DPC->had_depr_prefix=1; DEPRECATE(0); } YY_BREAK case 20: @@ -1354,13 +1378,13 @@ case 20: yyg->yy_c_buf_p = yy_cp = yy_bp + 4; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 177 "libxlu_disk_l.l" +#line 202 "libxlu_disk_l.l" { DPC->had_depr_prefix=1; DEPRECATE(0); } YY_BREAK case 21: /* rule 21 can match eol */ YY_RULE_SETUP -#line 179 "libxlu_disk_l.l" +#line 204 "libxlu_disk_l.l" { xlu__disk_err(DPC,yytext,"unknown deprecated disk prefix"); return 0; @@ -1370,9 +1394,8 @@ YY_RULE_SETUP case 22: /* rule 22 can match eol */ YY_RULE_SETUP -#line 187 "libxlu_disk_l.l" +#line 211 "libxlu_disk_l.l" { - char *colon; STRIP(','); if (DPC->err) { @@ -1383,19 +1406,8 @@ YY_RULE_SETUP DPC->disk->format == LIBXL_DISK_FORMAT_UNKNOWN) { setformat(DPC,yytext); } else if (!DPC->disk->vdev) { - colon = strrchr(yytext, ':'); - if (colon) { - DEPRECATE("use `devtype=...'"); - *colon++ = 0; - if (!strcmp(colon,"cdrom")) { - DPC->disk->is_cdrom = 1; - } else if (!strcmp(colon,"disk")) { - DPC->disk->is_cdrom = 0; - } else { - xlu__disk_err(DPC,colon,"unknown deprecated type"); - } - } - SAVESTRING("vdev", vdev, yytext); + if (!vdev_and_devtype(DPC,yytext)) + SAVESTRING("vdev", vdev, yytext); } else if (!DPC->access_set) { DPC->access_set = 1; setaccess(DPC,yytext); @@ -1407,7 +1419,7 @@ YY_RULE_SETUP YY_BREAK case 23: YY_RULE_SETUP -#line 221 "libxlu_disk_l.l" +#line 233 "libxlu_disk_l.l" { BEGIN(LEXERR); yymore(); @@ -1415,17 +1427,17 @@ YY_RULE_SETUP YY_BREAK case 24: YY_RULE_SETUP -#line 224 "libxlu_disk_l.l" +#line 237 "libxlu_disk_l.l" { xlu__disk_err(DPC,yytext,"bad disk syntax"); return 0; } YY_BREAK case 25: YY_RULE_SETUP -#line 227 "libxlu_disk_l.l" +#line 240 "libxlu_disk_l.l" YY_FATAL_ERROR( "flex scanner jammed" ); YY_BREAK -#line 1428 "libxlu_disk_l.c" +#line 1441 "libxlu_disk_l.c" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(LEXERR): yyterminate(); @@ -2517,4 +2529,4 @@ void xlu__disk_yyfree (void * ptr , yysc #define YYTABLES_NAME "yytables" -#line 228 "libxlu_disk_l.l" +#line 240 "libxlu_disk_l.l" diff -r 968b205da696 -r fa411577ef8b tools/libxl/libxlu_disk_l.h --- a/tools/libxl/libxlu_disk_l.h Thu Jul 26 10:35:35 2012 +0100 +++ b/tools/libxl/libxlu_disk_l.h Thu Jul 26 10:35:36 2012 +0100 @@ -340,7 +340,7 @@ extern int xlu__disk_yylex (yyscan_t yys #undef YY_DECL #endif -#line 228 "libxlu_disk_l.l" +#line 240 "libxlu_disk_l.l" #line 346 "libxlu_disk_l.h" #undef xlu__disk_yyIN_HEADER diff -r 968b205da696 -r fa411577ef8b tools/libxl/libxlu_disk_l.l --- a/tools/libxl/libxlu_disk_l.l Thu Jul 26 10:35:35 2012 +0100 +++ b/tools/libxl/libxlu_disk_l.l Thu Jul 26 10:35:36 2012 +0100 @@ -45,8 +45,6 @@ void xlu__disk_yyset_column(int column_ * and particularly to avoid repeating boilerplate values such as * DPC->disk, yytext, etc. */ -#define DPC ((DiskParseContext*)yyextra) - /* Sets an enum, checking it hasn't already been set to a different value */ #define DSET(dpc,member,enumname,str,valname) do{ \ if (dpc->disk->member != LIBXL_DISK_##enumname##_UNKNOWN && \ @@ -79,6 +77,8 @@ static void savestring(DiskParseContext *update = strdup(value); } +#define DPC dpc /* our convention in lexer helper functions */ + /* Sets ->readwrite from the string. This ought to be an enum, perhaps. */ static void setaccess(DiskParseContext *dpc, const char *str) { if (!strcmp(str, "r") || !strcmp(str, "ro")) { @@ -111,6 +111,30 @@ static void setbackendtype(DiskParseCont #define DEPRECATE(usewhatinstead) /* not currently reported */ +/* Handles a vdev positional parameter which includes a devtype. */ +static int vdev_and_devtype(DiskParseContext *dpc, char *str) { + /* returns 1 if it was :, 0 (doing nothing) otherwise */ + char *colon = strrchr(str, ':'); + if (!colon) + return 0; + + DEPRECATE("use `devtype=...'"); + *colon++ = 0; + SAVESTRING("vdev", vdev, str); + + if (!strcmp(colon,"cdrom")) { + DPC->disk->is_cdrom = 1; + } else if (!strcmp(colon,"disk")) { + DPC->disk->is_cdrom = 0; + } else { + xlu__disk_err(DPC,colon,"unknown deprecated type"); + } + return 1; +} + +#undef DPC /* needs to be defined differently the actual lexer */ +#define DPC ((DiskParseContext*)yyextra) + %} %option warn @@ -185,7 +209,6 @@ phy:/.* { DPC->had_depr_prefix=1; DEPRE /* positional parameters */ [^=,]*,|[^=,]+,? { - char *colon; STRIP(','); if (DPC->err) { @@ -196,19 +219,8 @@ phy:/.* { DPC->had_depr_prefix=1; DEPRE DPC->disk->format == LIBXL_DISK_FORMAT_UNKNOWN) { setformat(DPC,yytext); } else if (!DPC->disk->vdev) { - colon = strrchr(yytext, ':'); - if (colon) { - DEPRECATE("use `devtype=...'"); - *colon++ = 0; - if (!strcmp(colon,"cdrom")) { - DPC->disk->is_cdrom = 1; - } else if (!strcmp(colon,"disk")) { - DPC->disk->is_cdrom = 0; - } else { - xlu__disk_err(DPC,colon,"unknown deprecated type"); - } - } - SAVESTRING("vdev", vdev, yytext); + if (!vdev_and_devtype(DPC,yytext)) + SAVESTRING("vdev", vdev, yytext); } else if (!DPC->access_set) { DPC->access_set = 1; setaccess(DPC,yytext); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 26 20:55:24 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jul 2012 20:55:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5g-0006tB-NA; Thu, 26 Jul 2012 20:55:24 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5f-0006m8-BG for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:23 +0000 Received: from [85.158.138.51:15924] by server-12.bemta-3.messagelabs.com id E0/E4-15259-ABEA1105; Thu, 26 Jul 2012 20:55:22 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-174.messagelabs.com!1343336120!28967894!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 14590 invoked from network); 26 Jul 2012 20:55:21 -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; 26 Jul 2012 20:55:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5b-00062a-Vz for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuV5b-0005pa-Rp for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:19 +0000 Message-Id: Date: Thu, 26 Jul 2012 20:55:19 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xl: disk parsing preparation for empty cdrom devices X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343295336 -3600 # Node ID fa411577ef8b5a58acc054cdcdb57a70ce1cb7e9 # Parent 968b205da696708ece522690ca10a823e03058db xl: disk parsing preparation for empty cdrom devices Prepare the ground for parsing the xend empty cdrom syntax, by separating out some non-functional changes as this pre-patch: * Clarify the disk syntax documentation wording to refer to deprecated syntaxes too. * Make DPC in libxlu_disk_l.l useable in the helper functions as well as in lexer rules, by providing two definitions, each in force in the appropriate parts of the file. * Break the [:] parsing out into a helper function, `vdev_and_devtype'. No functional change. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r 968b205da696 -r fa411577ef8b docs/misc/xl-disk-configuration.txt --- a/docs/misc/xl-disk-configuration.txt Thu Jul 26 10:35:35 2012 +0100 +++ b/docs/misc/xl-disk-configuration.txt Thu Jul 26 10:35:36 2012 +0100 @@ -164,16 +164,17 @@ information to be interpreted by /etc/xe -================================== -DEPRECATED PARAMETERS AND PREFIXES -================================== +============================================ +DEPRECATED PARAMETERS, PREFIXES AND SYNTAXES +============================================ -Deprecated values are acceptable and are intended work compatibly with +Deprecated forms are acceptable and are intended work compatibly with xend and xl from xen 4.1. In future they may print a warning. Support for deprecated parameters and syntaxes are likely to be dropped in future versions of xl. -There is also support for a deprecated old syntax for : + +There is support for a deprecated old syntax for : [:][],[:], (deprecated) diff -r 968b205da696 -r fa411577ef8b tools/libxl/libxlu_disk_l.c --- a/tools/libxl/libxlu_disk_l.c Thu Jul 26 10:35:35 2012 +0100 +++ b/tools/libxl/libxlu_disk_l.c Thu Jul 26 10:35:36 2012 +0100 @@ -794,8 +794,6 @@ void xlu__disk_yyset_column(int column_ * and particularly to avoid repeating boilerplate values such as * DPC->disk, yytext, etc. */ -#define DPC ((DiskParseContext*)yyextra) - /* Sets an enum, checking it hasn't already been set to a different value */ #define DSET(dpc,member,enumname,str,valname) do{ \ if (dpc->disk->member != LIBXL_DISK_##enumname##_UNKNOWN && \ @@ -828,6 +826,8 @@ static void savestring(DiskParseContext *update = strdup(value); } +#define DPC dpc /* our convention in lexer helper functions */ + /* Sets ->readwrite from the string. This ought to be an enum, perhaps. */ static void setaccess(DiskParseContext *dpc, const char *str) { if (!strcmp(str, "r") || !strcmp(str, "ro")) { @@ -860,8 +860,32 @@ static void setbackendtype(DiskParseCont #define DEPRECATE(usewhatinstead) /* not currently reported */ +/* Handles a vdev positional parameter which includes a devtype. */ +static int vdev_and_devtype(DiskParseContext *dpc, char *str) { + /* returns 1 if it was :, 0 (doing nothing) otherwise */ + char *colon = strrchr(str, ':'); + if (!colon) + return 0; -#line 865 "libxlu_disk_l.c" + DEPRECATE("use `devtype=...'"); + *colon++ = 0; + SAVESTRING("vdev", vdev, str); + + if (!strcmp(colon,"cdrom")) { + DPC->disk->is_cdrom = 1; + } else if (!strcmp(colon,"disk")) { + DPC->disk->is_cdrom = 0; + } else { + xlu__disk_err(DPC,colon,"unknown deprecated type"); + } + return 1; +} + +#undef DPC /* needs to be defined differently the actual lexer */ +#define DPC ((DiskParseContext*)yyextra) + + +#line 889 "libxlu_disk_l.c" #define INITIAL 0 #define LEXERR 1 @@ -1097,12 +1121,12 @@ YY_DECL register int yy_act; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; -#line 127 "libxlu_disk_l.l" +#line 151 "libxlu_disk_l.l" /*----- the scanner rules which do the parsing -----*/ -#line 1106 "libxlu_disk_l.c" +#line 1130 "libxlu_disk_l.c" if ( !yyg->yy_init ) { @@ -1223,72 +1247,72 @@ do_action: /* This label is used only to case 1: /* rule 1 can match eol */ YY_RULE_SETUP -#line 130 "libxlu_disk_l.l" +#line 155 "libxlu_disk_l.l" { /* ignore whitespace before parameters */ } YY_BREAK /* ordinary parameters setting enums or strings */ case 2: /* rule 2 can match eol */ YY_RULE_SETUP -#line 134 "libxlu_disk_l.l" +#line 159 "libxlu_disk_l.l" { STRIP(','); setformat(DPC, FROMEQUALS); } YY_BREAK case 3: YY_RULE_SETUP -#line 136 "libxlu_disk_l.l" +#line 161 "libxlu_disk_l.l" { DPC->disk->is_cdrom = 1; } YY_BREAK case 4: YY_RULE_SETUP -#line 137 "libxlu_disk_l.l" +#line 162 "libxlu_disk_l.l" { DPC->disk->is_cdrom = 1; } YY_BREAK case 5: YY_RULE_SETUP -#line 138 "libxlu_disk_l.l" +#line 163 "libxlu_disk_l.l" { DPC->disk->is_cdrom = 0; } YY_BREAK case 6: /* rule 6 can match eol */ YY_RULE_SETUP -#line 139 "libxlu_disk_l.l" +#line 164 "libxlu_disk_l.l" { xlu__disk_err(DPC,yytext,"unknown value for type"); } YY_BREAK case 7: /* rule 7 can match eol */ YY_RULE_SETUP -#line 141 "libxlu_disk_l.l" +#line 166 "libxlu_disk_l.l" { STRIP(','); setaccess(DPC, FROMEQUALS); } YY_BREAK case 8: /* rule 8 can match eol */ YY_RULE_SETUP -#line 142 "libxlu_disk_l.l" +#line 167 "libxlu_disk_l.l" { STRIP(','); setbackendtype(DPC,FROMEQUALS); } YY_BREAK case 9: /* rule 9 can match eol */ YY_RULE_SETUP -#line 144 "libxlu_disk_l.l" +#line 169 "libxlu_disk_l.l" { STRIP(','); SAVESTRING("vdev", vdev, FROMEQUALS); } YY_BREAK case 10: /* rule 10 can match eol */ YY_RULE_SETUP -#line 145 "libxlu_disk_l.l" +#line 170 "libxlu_disk_l.l" { STRIP(','); SAVESTRING("script", script, FROMEQUALS); } YY_BREAK /* the target magic parameter, eats the rest of the string */ case 11: YY_RULE_SETUP -#line 149 "libxlu_disk_l.l" +#line 174 "libxlu_disk_l.l" { STRIP(','); SAVESTRING("target", pdev_path, FROMEQUALS); } YY_BREAK /* unknown parameters */ case 12: /* rule 12 can match eol */ YY_RULE_SETUP -#line 153 "libxlu_disk_l.l" +#line 178 "libxlu_disk_l.l" { xlu__disk_err(DPC,yytext,"unknown parameter"); } YY_BREAK /* deprecated prefixes */ @@ -1296,7 +1320,7 @@ YY_RULE_SETUP * matched the whole string, so these patterns take precedence */ case 13: YY_RULE_SETUP -#line 161 "libxlu_disk_l.l" +#line 185 "libxlu_disk_l.l" { STRIP(':'); DPC->had_depr_prefix=1; DEPRECATE("use `[format=]...,'"); @@ -1305,7 +1329,7 @@ YY_RULE_SETUP YY_BREAK case 14: YY_RULE_SETUP -#line 167 "libxlu_disk_l.l" +#line 191 "libxlu_disk_l.l" { STRIP(':'); DPC->had_depr_prefix=1; DEPRECATE("use `script=...'"); @@ -1317,12 +1341,12 @@ case 15: yyg->yy_c_buf_p = yy_cp = yy_bp + 8; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 172 "libxlu_disk_l.l" +#line 197 "libxlu_disk_l.l" { DPC->had_depr_prefix=1; DEPRECATE(0); } YY_BREAK case 16: YY_RULE_SETUP -#line 173 "libxlu_disk_l.l" +#line 198 "libxlu_disk_l.l" { DPC->had_depr_prefix=1; DEPRECATE(0); } YY_BREAK case 17: @@ -1330,7 +1354,7 @@ case 17: yyg->yy_c_buf_p = yy_cp = yy_bp + 4; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 175 "libxlu_disk_l.l" +#line 199 "libxlu_disk_l.l" { DPC->had_depr_prefix=1; DEPRECATE(0); } YY_BREAK case 18: @@ -1338,7 +1362,7 @@ case 18: yyg->yy_c_buf_p = yy_cp = yy_bp + 6; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 176 "libxlu_disk_l.l" +#line 200 "libxlu_disk_l.l" { DPC->had_depr_prefix=1; DEPRECATE(0); } YY_BREAK case 19: @@ -1346,7 +1370,7 @@ case 19: yyg->yy_c_buf_p = yy_cp = yy_bp + 5; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 177 "libxlu_disk_l.l" +#line 201 "libxlu_disk_l.l" { DPC->had_depr_prefix=1; DEPRECATE(0); } YY_BREAK case 20: @@ -1354,13 +1378,13 @@ case 20: yyg->yy_c_buf_p = yy_cp = yy_bp + 4; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 177 "libxlu_disk_l.l" +#line 202 "libxlu_disk_l.l" { DPC->had_depr_prefix=1; DEPRECATE(0); } YY_BREAK case 21: /* rule 21 can match eol */ YY_RULE_SETUP -#line 179 "libxlu_disk_l.l" +#line 204 "libxlu_disk_l.l" { xlu__disk_err(DPC,yytext,"unknown deprecated disk prefix"); return 0; @@ -1370,9 +1394,8 @@ YY_RULE_SETUP case 22: /* rule 22 can match eol */ YY_RULE_SETUP -#line 187 "libxlu_disk_l.l" +#line 211 "libxlu_disk_l.l" { - char *colon; STRIP(','); if (DPC->err) { @@ -1383,19 +1406,8 @@ YY_RULE_SETUP DPC->disk->format == LIBXL_DISK_FORMAT_UNKNOWN) { setformat(DPC,yytext); } else if (!DPC->disk->vdev) { - colon = strrchr(yytext, ':'); - if (colon) { - DEPRECATE("use `devtype=...'"); - *colon++ = 0; - if (!strcmp(colon,"cdrom")) { - DPC->disk->is_cdrom = 1; - } else if (!strcmp(colon,"disk")) { - DPC->disk->is_cdrom = 0; - } else { - xlu__disk_err(DPC,colon,"unknown deprecated type"); - } - } - SAVESTRING("vdev", vdev, yytext); + if (!vdev_and_devtype(DPC,yytext)) + SAVESTRING("vdev", vdev, yytext); } else if (!DPC->access_set) { DPC->access_set = 1; setaccess(DPC,yytext); @@ -1407,7 +1419,7 @@ YY_RULE_SETUP YY_BREAK case 23: YY_RULE_SETUP -#line 221 "libxlu_disk_l.l" +#line 233 "libxlu_disk_l.l" { BEGIN(LEXERR); yymore(); @@ -1415,17 +1427,17 @@ YY_RULE_SETUP YY_BREAK case 24: YY_RULE_SETUP -#line 224 "libxlu_disk_l.l" +#line 237 "libxlu_disk_l.l" { xlu__disk_err(DPC,yytext,"bad disk syntax"); return 0; } YY_BREAK case 25: YY_RULE_SETUP -#line 227 "libxlu_disk_l.l" +#line 240 "libxlu_disk_l.l" YY_FATAL_ERROR( "flex scanner jammed" ); YY_BREAK -#line 1428 "libxlu_disk_l.c" +#line 1441 "libxlu_disk_l.c" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(LEXERR): yyterminate(); @@ -2517,4 +2529,4 @@ void xlu__disk_yyfree (void * ptr , yysc #define YYTABLES_NAME "yytables" -#line 228 "libxlu_disk_l.l" +#line 240 "libxlu_disk_l.l" diff -r 968b205da696 -r fa411577ef8b tools/libxl/libxlu_disk_l.h --- a/tools/libxl/libxlu_disk_l.h Thu Jul 26 10:35:35 2012 +0100 +++ b/tools/libxl/libxlu_disk_l.h Thu Jul 26 10:35:36 2012 +0100 @@ -340,7 +340,7 @@ extern int xlu__disk_yylex (yyscan_t yys #undef YY_DECL #endif -#line 228 "libxlu_disk_l.l" +#line 240 "libxlu_disk_l.l" #line 346 "libxlu_disk_l.h" #undef xlu__disk_yyIN_HEADER diff -r 968b205da696 -r fa411577ef8b tools/libxl/libxlu_disk_l.l --- a/tools/libxl/libxlu_disk_l.l Thu Jul 26 10:35:35 2012 +0100 +++ b/tools/libxl/libxlu_disk_l.l Thu Jul 26 10:35:36 2012 +0100 @@ -45,8 +45,6 @@ void xlu__disk_yyset_column(int column_ * and particularly to avoid repeating boilerplate values such as * DPC->disk, yytext, etc. */ -#define DPC ((DiskParseContext*)yyextra) - /* Sets an enum, checking it hasn't already been set to a different value */ #define DSET(dpc,member,enumname,str,valname) do{ \ if (dpc->disk->member != LIBXL_DISK_##enumname##_UNKNOWN && \ @@ -79,6 +77,8 @@ static void savestring(DiskParseContext *update = strdup(value); } +#define DPC dpc /* our convention in lexer helper functions */ + /* Sets ->readwrite from the string. This ought to be an enum, perhaps. */ static void setaccess(DiskParseContext *dpc, const char *str) { if (!strcmp(str, "r") || !strcmp(str, "ro")) { @@ -111,6 +111,30 @@ static void setbackendtype(DiskParseCont #define DEPRECATE(usewhatinstead) /* not currently reported */ +/* Handles a vdev positional parameter which includes a devtype. */ +static int vdev_and_devtype(DiskParseContext *dpc, char *str) { + /* returns 1 if it was :, 0 (doing nothing) otherwise */ + char *colon = strrchr(str, ':'); + if (!colon) + return 0; + + DEPRECATE("use `devtype=...'"); + *colon++ = 0; + SAVESTRING("vdev", vdev, str); + + if (!strcmp(colon,"cdrom")) { + DPC->disk->is_cdrom = 1; + } else if (!strcmp(colon,"disk")) { + DPC->disk->is_cdrom = 0; + } else { + xlu__disk_err(DPC,colon,"unknown deprecated type"); + } + return 1; +} + +#undef DPC /* needs to be defined differently the actual lexer */ +#define DPC ((DiskParseContext*)yyextra) + %} %option warn @@ -185,7 +209,6 @@ phy:/.* { DPC->had_depr_prefix=1; DEPRE /* positional parameters */ [^=,]*,|[^=,]+,? { - char *colon; STRIP(','); if (DPC->err) { @@ -196,19 +219,8 @@ phy:/.* { DPC->had_depr_prefix=1; DEPRE DPC->disk->format == LIBXL_DISK_FORMAT_UNKNOWN) { setformat(DPC,yytext); } else if (!DPC->disk->vdev) { - colon = strrchr(yytext, ':'); - if (colon) { - DEPRECATE("use `devtype=...'"); - *colon++ = 0; - if (!strcmp(colon,"cdrom")) { - DPC->disk->is_cdrom = 1; - } else if (!strcmp(colon,"disk")) { - DPC->disk->is_cdrom = 0; - } else { - xlu__disk_err(DPC,colon,"unknown deprecated type"); - } - } - SAVESTRING("vdev", vdev, yytext); + if (!vdev_and_devtype(DPC,yytext)) + SAVESTRING("vdev", vdev, yytext); } else if (!DPC->access_set) { DPC->access_set = 1; setaccess(DPC,yytext); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 26 20:55:26 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jul 2012 20:55:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5h-0006uL-Sa; Thu, 26 Jul 2012 20:55:25 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5g-0006m8-3S for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:24 +0000 Received: from [85.158.138.51:15955] by server-12.bemta-3.messagelabs.com id B2/E4-15259-BBEA1105; Thu, 26 Jul 2012 20:55:23 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-174.messagelabs.com!1343336121!24949009!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 30122 invoked from network); 26 Jul 2012 20:55:22 -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; 26 Jul 2012 20:55:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5d-00062h-0H for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuV5c-0005q4-VO for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:20 +0000 Message-Id: Date: Thu, 26 Jul 2012 20:55:20 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xen: update xensource.com to xen.org X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343295337 -3600 # Node ID d79db0ea07d5094343fc34af8d9cca3a96a6564a # Parent fab03d9ee1ba33e4dc73cfe32dff3f4c8e581396 xen: update xensource.com to xen.org This patch was constructed by grepping for xensource.com over the entire repository and eyeballing which ones were sensible to update. In addition, the xen-tools mailing list has been deprecated, so update xentop to refer to xen-devel instead. Signed-off-by: Andrew Cooper Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r fab03d9ee1ba -r d79db0ea07d5 Config.mk --- a/Config.mk Thu Jul 26 10:35:36 2012 +0100 +++ b/Config.mk Thu Jul 26 10:35:37 2012 +0100 @@ -180,15 +180,15 @@ EMBEDDED_EXTRA_CFLAGS += -fno-exceptions XSM_ENABLE ?= n FLASK_ENABLE ?= $(XSM_ENABLE) -XEN_EXTFILES_URL=http://xenbits.xensource.com/xen-extfiles +XEN_EXTFILES_URL=http://xenbits.xen.org/xen-extfiles # All the files at that location were downloaded from elsewhere on # the internet. The original download URL is preserved as a comment # near the place in the Xen Makefiles where the file is used. ifeq ($(GIT_HTTP),y) -QEMU_REMOTE=http://xenbits.xensource.com/git-http/qemu-xen-unstable.git +QEMU_REMOTE=http://xenbits.xen.org/git-http/qemu-xen-unstable.git else -QEMU_REMOTE=git://xenbits.xensource.com/qemu-xen-unstable.git +QEMU_REMOTE=git://xenbits.xen.org/qemu-xen-unstable.git endif ifeq ($(GIT_HTTP),y) diff -r fab03d9ee1ba -r d79db0ea07d5 buildconfigs/select-repository --- a/buildconfigs/select-repository Thu Jul 26 10:35:36 2012 +0100 +++ b/buildconfigs/select-repository Thu Jul 26 10:35:37 2012 +0100 @@ -63,7 +63,7 @@ if [ -d ${XEN_ROOT}/.hgxxx ] ; then else echo "Unable to determine path to Linux source tree." 1>&2 echo "Falling back to linux-2.6.18-xen Mercurial repository." 1>&2 - echo http://xenbits.xensource.com/linux-2.6.18-xen.hg + echo http://xenbits.xen.org/linux-2.6.18-xen.hg fi exit 0 diff -r fab03d9ee1ba -r d79db0ea07d5 tools/configure --- a/tools/configure Thu Jul 26 10:35:36 2012 +0100 +++ b/tools/configure Thu Jul 26 10:35:37 2012 +0100 @@ -2,7 +2,7 @@ # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.67 for Xen Hypervisor 4.2. # -# Report bugs to . +# Report bugs to . # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -231,10 +231,10 @@ fi $as_echo "$0: be upgraded to zsh 4.3.4 or later." else $as_echo "$0: Please tell bug-autoconf@gnu.org and -$0: xen-devel@lists.xensource.com about your system, -$0: including any error possibly output before this -$0: message. Then install a modern shell, or manually run -$0: the script under such a shell if you do have one." +$0: xen-devel@lists.xen.org about your system, including +$0: any error possibly output before this message. Then +$0: install a modern shell, or manually run the script +$0: under such a shell if you do have one." fi exit 1 fi @@ -554,7 +554,7 @@ PACKAGE_NAME='Xen Hypervisor' PACKAGE_TARNAME='xen-hypervisor' PACKAGE_VERSION='4.2' PACKAGE_STRING='Xen Hypervisor 4.2' -PACKAGE_BUGREPORT='xen-devel@lists.xensource.com' +PACKAGE_BUGREPORT='xen-devel@lists.xen.org' PACKAGE_URL='' ac_unique_file="libxl/libxl.c" @@ -1431,7 +1431,7 @@ Some influential environment variables: Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to . +Report bugs to . _ACEOF ac_status=$? fi @@ -1653,9 +1653,9 @@ case $ac_header_compiler:$ac_header_prep $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -( $as_echo "## -------------------------------------------- ## -## Report this to xen-devel@lists.xensource.com ## -## -------------------------------------------- ##" +( $as_echo "## -------------------------------------- ## +## Report this to xen-devel@lists.xen.org ## +## -------------------------------------- ##" ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -7306,7 +7306,7 @@ Configuration files: Configuration headers: $config_headers -Report bugs to ." +Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 diff -r fab03d9ee1ba -r d79db0ea07d5 tools/configure.ac --- a/tools/configure.ac Thu Jul 26 10:35:36 2012 +0100 +++ b/tools/configure.ac Thu Jul 26 10:35:37 2012 +0100 @@ -3,7 +3,7 @@ AC_PREREQ([2.67]) AC_INIT([Xen Hypervisor], m4_esyscmd([../version.sh ../xen/Makefile]), - [xen-devel@lists.xensource.com]) + [xen-devel@lists.xen.org]) AC_CONFIG_SRCDIR([libxl/libxl.c]) AC_CONFIG_FILES([../config/Tools.mk]) AC_CONFIG_HEADERS([config.h]) diff -r fab03d9ee1ba -r d79db0ea07d5 tools/python/xen/util/bugtool.py --- a/tools/python/xen/util/bugtool.py Thu Jul 26 10:35:36 2012 +0100 +++ b/tools/python/xen/util/bugtool.py Thu Jul 26 10:35:37 2012 +0100 @@ -34,7 +34,7 @@ import xen.lowlevel.xc from xen.xend import encode -SERVER = 'bugzilla.xensource.com' +SERVER = 'bugzilla.xen.org' SHOW_BUG_PATTERN = 'http://%s/bugzilla/show_bug.cgi?id=%%d' % SERVER ATTACH_PATTERN = \ 'http://%s/bugzilla/attachment.cgi?bugid=%%d&action=enter' % SERVER diff -r fab03d9ee1ba -r d79db0ea07d5 tools/python/xen/xm/main.py --- a/tools/python/xen/xm/main.py Thu Jul 26 10:35:36 2012 +0100 +++ b/tools/python/xen/xm/main.py Thu Jul 26 10:35:37 2012 +0100 @@ -4058,7 +4058,7 @@ def _run_cmd(cmd, cmd_name, args): return False, 1 print "Unexpected error:", sys.exc_info()[0] print - print "Please report to xen-devel@lists.xensource.com" + print "Please report to xen-devel@lists.xen.org" raise return False, 1 diff -r fab03d9ee1ba -r d79db0ea07d5 tools/xenstat/xentop/xentop.1 --- a/tools/xenstat/xentop/xentop.1 Thu Jul 26 10:35:36 2012 +0100 +++ b/tools/xenstat/xentop/xentop.1 Thu Jul 26 10:35:37 2012 +0100 @@ -91,7 +91,7 @@ scroll domain display Written by Judy Fischbach, David Hendricks, and Josh Triplett .SH "REPORTING BUGS" -Report bugs to . +Report bugs to . .SH COPYRIGHT Copyright \(co 2005 International Business Machines Corp diff -r fab03d9ee1ba -r d79db0ea07d5 tools/xenstat/xentop/xentop.c --- a/tools/xenstat/xentop/xentop.c Thu Jul 26 10:35:36 2012 +0100 +++ b/tools/xenstat/xentop/xentop.c Thu Jul 26 10:35:37 2012 +0100 @@ -47,7 +47,7 @@ "Copyright (C) 2005 International Business Machines Corp\n"\ "This is free software; see the source for copying conditions.There is NO\n"\ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" -#define XENTOP_BUGSTO "Report bugs to .\n" +#define XENTOP_BUGSTO "Report bugs to .\n" #define _GNU_SOURCE #include _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 26 20:55:26 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jul 2012 20:55:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5h-0006uL-Sa; Thu, 26 Jul 2012 20:55:25 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5g-0006m8-3S for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:24 +0000 Received: from [85.158.138.51:15955] by server-12.bemta-3.messagelabs.com id B2/E4-15259-BBEA1105; Thu, 26 Jul 2012 20:55:23 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-174.messagelabs.com!1343336121!24949009!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 30122 invoked from network); 26 Jul 2012 20:55:22 -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; 26 Jul 2012 20:55:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5d-00062h-0H for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuV5c-0005q4-VO for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:20 +0000 Message-Id: Date: Thu, 26 Jul 2012 20:55:20 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xen: update xensource.com to xen.org X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343295337 -3600 # Node ID d79db0ea07d5094343fc34af8d9cca3a96a6564a # Parent fab03d9ee1ba33e4dc73cfe32dff3f4c8e581396 xen: update xensource.com to xen.org This patch was constructed by grepping for xensource.com over the entire repository and eyeballing which ones were sensible to update. In addition, the xen-tools mailing list has been deprecated, so update xentop to refer to xen-devel instead. Signed-off-by: Andrew Cooper Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r fab03d9ee1ba -r d79db0ea07d5 Config.mk --- a/Config.mk Thu Jul 26 10:35:36 2012 +0100 +++ b/Config.mk Thu Jul 26 10:35:37 2012 +0100 @@ -180,15 +180,15 @@ EMBEDDED_EXTRA_CFLAGS += -fno-exceptions XSM_ENABLE ?= n FLASK_ENABLE ?= $(XSM_ENABLE) -XEN_EXTFILES_URL=http://xenbits.xensource.com/xen-extfiles +XEN_EXTFILES_URL=http://xenbits.xen.org/xen-extfiles # All the files at that location were downloaded from elsewhere on # the internet. The original download URL is preserved as a comment # near the place in the Xen Makefiles where the file is used. ifeq ($(GIT_HTTP),y) -QEMU_REMOTE=http://xenbits.xensource.com/git-http/qemu-xen-unstable.git +QEMU_REMOTE=http://xenbits.xen.org/git-http/qemu-xen-unstable.git else -QEMU_REMOTE=git://xenbits.xensource.com/qemu-xen-unstable.git +QEMU_REMOTE=git://xenbits.xen.org/qemu-xen-unstable.git endif ifeq ($(GIT_HTTP),y) diff -r fab03d9ee1ba -r d79db0ea07d5 buildconfigs/select-repository --- a/buildconfigs/select-repository Thu Jul 26 10:35:36 2012 +0100 +++ b/buildconfigs/select-repository Thu Jul 26 10:35:37 2012 +0100 @@ -63,7 +63,7 @@ if [ -d ${XEN_ROOT}/.hgxxx ] ; then else echo "Unable to determine path to Linux source tree." 1>&2 echo "Falling back to linux-2.6.18-xen Mercurial repository." 1>&2 - echo http://xenbits.xensource.com/linux-2.6.18-xen.hg + echo http://xenbits.xen.org/linux-2.6.18-xen.hg fi exit 0 diff -r fab03d9ee1ba -r d79db0ea07d5 tools/configure --- a/tools/configure Thu Jul 26 10:35:36 2012 +0100 +++ b/tools/configure Thu Jul 26 10:35:37 2012 +0100 @@ -2,7 +2,7 @@ # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.67 for Xen Hypervisor 4.2. # -# Report bugs to . +# Report bugs to . # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -231,10 +231,10 @@ fi $as_echo "$0: be upgraded to zsh 4.3.4 or later." else $as_echo "$0: Please tell bug-autoconf@gnu.org and -$0: xen-devel@lists.xensource.com about your system, -$0: including any error possibly output before this -$0: message. Then install a modern shell, or manually run -$0: the script under such a shell if you do have one." +$0: xen-devel@lists.xen.org about your system, including +$0: any error possibly output before this message. Then +$0: install a modern shell, or manually run the script +$0: under such a shell if you do have one." fi exit 1 fi @@ -554,7 +554,7 @@ PACKAGE_NAME='Xen Hypervisor' PACKAGE_TARNAME='xen-hypervisor' PACKAGE_VERSION='4.2' PACKAGE_STRING='Xen Hypervisor 4.2' -PACKAGE_BUGREPORT='xen-devel@lists.xensource.com' +PACKAGE_BUGREPORT='xen-devel@lists.xen.org' PACKAGE_URL='' ac_unique_file="libxl/libxl.c" @@ -1431,7 +1431,7 @@ Some influential environment variables: Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to . +Report bugs to . _ACEOF ac_status=$? fi @@ -1653,9 +1653,9 @@ case $ac_header_compiler:$ac_header_prep $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -( $as_echo "## -------------------------------------------- ## -## Report this to xen-devel@lists.xensource.com ## -## -------------------------------------------- ##" +( $as_echo "## -------------------------------------- ## +## Report this to xen-devel@lists.xen.org ## +## -------------------------------------- ##" ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -7306,7 +7306,7 @@ Configuration files: Configuration headers: $config_headers -Report bugs to ." +Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 diff -r fab03d9ee1ba -r d79db0ea07d5 tools/configure.ac --- a/tools/configure.ac Thu Jul 26 10:35:36 2012 +0100 +++ b/tools/configure.ac Thu Jul 26 10:35:37 2012 +0100 @@ -3,7 +3,7 @@ AC_PREREQ([2.67]) AC_INIT([Xen Hypervisor], m4_esyscmd([../version.sh ../xen/Makefile]), - [xen-devel@lists.xensource.com]) + [xen-devel@lists.xen.org]) AC_CONFIG_SRCDIR([libxl/libxl.c]) AC_CONFIG_FILES([../config/Tools.mk]) AC_CONFIG_HEADERS([config.h]) diff -r fab03d9ee1ba -r d79db0ea07d5 tools/python/xen/util/bugtool.py --- a/tools/python/xen/util/bugtool.py Thu Jul 26 10:35:36 2012 +0100 +++ b/tools/python/xen/util/bugtool.py Thu Jul 26 10:35:37 2012 +0100 @@ -34,7 +34,7 @@ import xen.lowlevel.xc from xen.xend import encode -SERVER = 'bugzilla.xensource.com' +SERVER = 'bugzilla.xen.org' SHOW_BUG_PATTERN = 'http://%s/bugzilla/show_bug.cgi?id=%%d' % SERVER ATTACH_PATTERN = \ 'http://%s/bugzilla/attachment.cgi?bugid=%%d&action=enter' % SERVER diff -r fab03d9ee1ba -r d79db0ea07d5 tools/python/xen/xm/main.py --- a/tools/python/xen/xm/main.py Thu Jul 26 10:35:36 2012 +0100 +++ b/tools/python/xen/xm/main.py Thu Jul 26 10:35:37 2012 +0100 @@ -4058,7 +4058,7 @@ def _run_cmd(cmd, cmd_name, args): return False, 1 print "Unexpected error:", sys.exc_info()[0] print - print "Please report to xen-devel@lists.xensource.com" + print "Please report to xen-devel@lists.xen.org" raise return False, 1 diff -r fab03d9ee1ba -r d79db0ea07d5 tools/xenstat/xentop/xentop.1 --- a/tools/xenstat/xentop/xentop.1 Thu Jul 26 10:35:36 2012 +0100 +++ b/tools/xenstat/xentop/xentop.1 Thu Jul 26 10:35:37 2012 +0100 @@ -91,7 +91,7 @@ scroll domain display Written by Judy Fischbach, David Hendricks, and Josh Triplett .SH "REPORTING BUGS" -Report bugs to . +Report bugs to . .SH COPYRIGHT Copyright \(co 2005 International Business Machines Corp diff -r fab03d9ee1ba -r d79db0ea07d5 tools/xenstat/xentop/xentop.c --- a/tools/xenstat/xentop/xentop.c Thu Jul 26 10:35:36 2012 +0100 +++ b/tools/xenstat/xentop/xentop.c Thu Jul 26 10:35:37 2012 +0100 @@ -47,7 +47,7 @@ "Copyright (C) 2005 International Business Machines Corp\n"\ "This is free software; see the source for copying conditions.There is NO\n"\ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" -#define XENTOP_BUGSTO "Report bugs to .\n" +#define XENTOP_BUGSTO "Report bugs to .\n" #define _GNU_SOURCE #include _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 26 20:55:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jul 2012 20:55: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 1SuV5i-0006vP-VS; Thu, 26 Jul 2012 20:55:26 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5h-0006tb-GC for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:25 +0000 Received: from [85.158.138.51:15949] by server-5.bemta-3.messagelabs.com id 4C/FD-28237-CBEA1105; Thu, 26 Jul 2012 20:55:24 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-174.messagelabs.com!1343336120!27238819!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 32683 invoked from network); 26 Jul 2012 20:55:21 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 26 Jul 2012 20:55:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5c-00062d-E4 for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuV5c-0005pp-Cd for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:20 +0000 Message-Id: Date: Thu, 26 Jul 2012 20:55:19 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xl: support xend empty cdrom device syntax X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343295336 -3600 # Node ID fab03d9ee1ba33e4dc73cfe32dff3f4c8e581396 # Parent fa411577ef8b5a58acc054cdcdb57a70ce1cb7e9 xl: support xend empty cdrom device syntax xend accepts `,hdc:cdrom,r' as an empty CDROM drive. However this is not consistent with the existing xl syntax in docs/misc/xl-disk-configuration.txt which requires `,,hdc:cdrom,r' (the additional positional paramter is the format). We fix this by spotting the case specially: when the target is empty and the format contains a colon, reinterpret the format as :. Signed-off-by: Ian Campbell Signed-off-by: Ian Jackson Committed-by: Ian Campbell --- diff -r fa411577ef8b -r fab03d9ee1ba docs/misc/xl-disk-configuration.txt --- a/docs/misc/xl-disk-configuration.txt Thu Jul 26 10:35:36 2012 +0100 +++ b/docs/misc/xl-disk-configuration.txt Thu Jul 26 10:35:36 2012 +0100 @@ -221,3 +221,14 @@ to specify several of these, for example "tap:aio:/some/path..." All of these prefixes are now stripped and ignored. + + +Missing format and empty target +------------------------------- + +The following syntax is also supported: + + ,:, (deprecated) + +This is soley for compatibility with xend's syntax for empty cdroms, +which is (for example) ",hdc:cdrom,r". diff -r fa411577ef8b -r fab03d9ee1ba tools/libxl/check-xl-disk-parse --- a/tools/libxl/check-xl-disk-parse Thu Jul 26 10:35:36 2012 +0100 +++ b/tools/libxl/check-xl-disk-parse Thu Jul 26 10:35:36 2012 +0100 @@ -123,6 +123,7 @@ disk: { EOF one 0 devtype=cdrom,,,hdc one 0 ,,hdc:cdrom,r +one 0 ,hdc:cdrom,r one 0 vdev=hdc,access=r,devtype=cdrom,target= one 0 ,empty,hdc:cdrom,r diff -r fa411577ef8b -r fab03d9ee1ba tools/libxl/libxlu_disk_l.c --- a/tools/libxl/libxlu_disk_l.c Thu Jul 26 10:35:36 2012 +0100 +++ b/tools/libxl/libxlu_disk_l.c Thu Jul 26 10:35:36 2012 +0100 @@ -1404,7 +1404,11 @@ YY_RULE_SETUP SAVESTRING("target", pdev_path, yytext); } else if (!DPC->had_depr_prefix && DPC->disk->format == LIBXL_DISK_FORMAT_UNKNOWN) { - setformat(DPC,yytext); + if (!*DPC->disk->pdev_path && vdev_and_devtype(DPC,yytext)) { + DPC->disk->format = LIBXL_DISK_FORMAT_EMPTY; + } else { + setformat(DPC,yytext); + } } else if (!DPC->disk->vdev) { if (!vdev_and_devtype(DPC,yytext)) SAVESTRING("vdev", vdev, yytext); @@ -1419,7 +1423,7 @@ YY_RULE_SETUP YY_BREAK case 23: YY_RULE_SETUP -#line 233 "libxlu_disk_l.l" +#line 237 "libxlu_disk_l.l" { BEGIN(LEXERR); yymore(); @@ -1427,17 +1431,17 @@ YY_RULE_SETUP YY_BREAK case 24: YY_RULE_SETUP -#line 237 "libxlu_disk_l.l" +#line 241 "libxlu_disk_l.l" { xlu__disk_err(DPC,yytext,"bad disk syntax"); return 0; } YY_BREAK case 25: YY_RULE_SETUP -#line 240 "libxlu_disk_l.l" +#line 244 "libxlu_disk_l.l" YY_FATAL_ERROR( "flex scanner jammed" ); YY_BREAK -#line 1441 "libxlu_disk_l.c" +#line 1445 "libxlu_disk_l.c" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(LEXERR): yyterminate(); @@ -2529,4 +2533,4 @@ void xlu__disk_yyfree (void * ptr , yysc #define YYTABLES_NAME "yytables" -#line 240 "libxlu_disk_l.l" +#line 244 "libxlu_disk_l.l" diff -r fa411577ef8b -r fab03d9ee1ba tools/libxl/libxlu_disk_l.h --- a/tools/libxl/libxlu_disk_l.h Thu Jul 26 10:35:36 2012 +0100 +++ b/tools/libxl/libxlu_disk_l.h Thu Jul 26 10:35:36 2012 +0100 @@ -340,7 +340,7 @@ extern int xlu__disk_yylex (yyscan_t yys #undef YY_DECL #endif -#line 240 "libxlu_disk_l.l" +#line 244 "libxlu_disk_l.l" #line 346 "libxlu_disk_l.h" #undef xlu__disk_yyIN_HEADER diff -r fa411577ef8b -r fab03d9ee1ba tools/libxl/libxlu_disk_l.l --- a/tools/libxl/libxlu_disk_l.l Thu Jul 26 10:35:36 2012 +0100 +++ b/tools/libxl/libxlu_disk_l.l Thu Jul 26 10:35:36 2012 +0100 @@ -217,7 +217,11 @@ phy:/.* { DPC->had_depr_prefix=1; DEPRE SAVESTRING("target", pdev_path, yytext); } else if (!DPC->had_depr_prefix && DPC->disk->format == LIBXL_DISK_FORMAT_UNKNOWN) { - setformat(DPC,yytext); + if (!*DPC->disk->pdev_path && vdev_and_devtype(DPC,yytext)) { + DPC->disk->format = LIBXL_DISK_FORMAT_EMPTY; + } else { + setformat(DPC,yytext); + } } else if (!DPC->disk->vdev) { if (!vdev_and_devtype(DPC,yytext)) SAVESTRING("vdev", vdev, yytext); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 26 20:55:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jul 2012 20:55: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 1SuV5i-0006vP-VS; Thu, 26 Jul 2012 20:55:26 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5h-0006tb-GC for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:25 +0000 Received: from [85.158.138.51:15949] by server-5.bemta-3.messagelabs.com id 4C/FD-28237-CBEA1105; Thu, 26 Jul 2012 20:55:24 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-174.messagelabs.com!1343336120!27238819!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 32683 invoked from network); 26 Jul 2012 20:55:21 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 26 Jul 2012 20:55:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5c-00062d-E4 for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuV5c-0005pp-Cd for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:20 +0000 Message-Id: Date: Thu, 26 Jul 2012 20:55:19 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xl: support xend empty cdrom device syntax X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343295336 -3600 # Node ID fab03d9ee1ba33e4dc73cfe32dff3f4c8e581396 # Parent fa411577ef8b5a58acc054cdcdb57a70ce1cb7e9 xl: support xend empty cdrom device syntax xend accepts `,hdc:cdrom,r' as an empty CDROM drive. However this is not consistent with the existing xl syntax in docs/misc/xl-disk-configuration.txt which requires `,,hdc:cdrom,r' (the additional positional paramter is the format). We fix this by spotting the case specially: when the target is empty and the format contains a colon, reinterpret the format as :. Signed-off-by: Ian Campbell Signed-off-by: Ian Jackson Committed-by: Ian Campbell --- diff -r fa411577ef8b -r fab03d9ee1ba docs/misc/xl-disk-configuration.txt --- a/docs/misc/xl-disk-configuration.txt Thu Jul 26 10:35:36 2012 +0100 +++ b/docs/misc/xl-disk-configuration.txt Thu Jul 26 10:35:36 2012 +0100 @@ -221,3 +221,14 @@ to specify several of these, for example "tap:aio:/some/path..." All of these prefixes are now stripped and ignored. + + +Missing format and empty target +------------------------------- + +The following syntax is also supported: + + ,:, (deprecated) + +This is soley for compatibility with xend's syntax for empty cdroms, +which is (for example) ",hdc:cdrom,r". diff -r fa411577ef8b -r fab03d9ee1ba tools/libxl/check-xl-disk-parse --- a/tools/libxl/check-xl-disk-parse Thu Jul 26 10:35:36 2012 +0100 +++ b/tools/libxl/check-xl-disk-parse Thu Jul 26 10:35:36 2012 +0100 @@ -123,6 +123,7 @@ disk: { EOF one 0 devtype=cdrom,,,hdc one 0 ,,hdc:cdrom,r +one 0 ,hdc:cdrom,r one 0 vdev=hdc,access=r,devtype=cdrom,target= one 0 ,empty,hdc:cdrom,r diff -r fa411577ef8b -r fab03d9ee1ba tools/libxl/libxlu_disk_l.c --- a/tools/libxl/libxlu_disk_l.c Thu Jul 26 10:35:36 2012 +0100 +++ b/tools/libxl/libxlu_disk_l.c Thu Jul 26 10:35:36 2012 +0100 @@ -1404,7 +1404,11 @@ YY_RULE_SETUP SAVESTRING("target", pdev_path, yytext); } else if (!DPC->had_depr_prefix && DPC->disk->format == LIBXL_DISK_FORMAT_UNKNOWN) { - setformat(DPC,yytext); + if (!*DPC->disk->pdev_path && vdev_and_devtype(DPC,yytext)) { + DPC->disk->format = LIBXL_DISK_FORMAT_EMPTY; + } else { + setformat(DPC,yytext); + } } else if (!DPC->disk->vdev) { if (!vdev_and_devtype(DPC,yytext)) SAVESTRING("vdev", vdev, yytext); @@ -1419,7 +1423,7 @@ YY_RULE_SETUP YY_BREAK case 23: YY_RULE_SETUP -#line 233 "libxlu_disk_l.l" +#line 237 "libxlu_disk_l.l" { BEGIN(LEXERR); yymore(); @@ -1427,17 +1431,17 @@ YY_RULE_SETUP YY_BREAK case 24: YY_RULE_SETUP -#line 237 "libxlu_disk_l.l" +#line 241 "libxlu_disk_l.l" { xlu__disk_err(DPC,yytext,"bad disk syntax"); return 0; } YY_BREAK case 25: YY_RULE_SETUP -#line 240 "libxlu_disk_l.l" +#line 244 "libxlu_disk_l.l" YY_FATAL_ERROR( "flex scanner jammed" ); YY_BREAK -#line 1441 "libxlu_disk_l.c" +#line 1445 "libxlu_disk_l.c" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(LEXERR): yyterminate(); @@ -2529,4 +2533,4 @@ void xlu__disk_yyfree (void * ptr , yysc #define YYTABLES_NAME "yytables" -#line 240 "libxlu_disk_l.l" +#line 244 "libxlu_disk_l.l" diff -r fa411577ef8b -r fab03d9ee1ba tools/libxl/libxlu_disk_l.h --- a/tools/libxl/libxlu_disk_l.h Thu Jul 26 10:35:36 2012 +0100 +++ b/tools/libxl/libxlu_disk_l.h Thu Jul 26 10:35:36 2012 +0100 @@ -340,7 +340,7 @@ extern int xlu__disk_yylex (yyscan_t yys #undef YY_DECL #endif -#line 240 "libxlu_disk_l.l" +#line 244 "libxlu_disk_l.l" #line 346 "libxlu_disk_l.h" #undef xlu__disk_yyIN_HEADER diff -r fa411577ef8b -r fab03d9ee1ba tools/libxl/libxlu_disk_l.l --- a/tools/libxl/libxlu_disk_l.l Thu Jul 26 10:35:36 2012 +0100 +++ b/tools/libxl/libxlu_disk_l.l Thu Jul 26 10:35:36 2012 +0100 @@ -217,7 +217,11 @@ phy:/.* { DPC->had_depr_prefix=1; DEPRE SAVESTRING("target", pdev_path, yytext); } else if (!DPC->had_depr_prefix && DPC->disk->format == LIBXL_DISK_FORMAT_UNKNOWN) { - setformat(DPC,yytext); + if (!*DPC->disk->pdev_path && vdev_and_devtype(DPC,yytext)) { + DPC->disk->format = LIBXL_DISK_FORMAT_EMPTY; + } else { + setformat(DPC,yytext); + } } else if (!DPC->disk->vdev) { if (!vdev_and_devtype(DPC,yytext)) SAVESTRING("vdev", vdev, yytext); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 26 20:55:29 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jul 2012 20:55: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 1SuV5l-0006xq-39; Thu, 26 Jul 2012 20:55:29 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5j-0006oe-Fp for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:27 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-27.messagelabs.com!1343336119!2422011!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 13698 invoked from network); 26 Jul 2012 20:55:20 -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; 26 Jul 2012 20:55:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5b-00062V-CM for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuV5b-0005pL-BF for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:19 +0000 Message-Id: Date: Thu, 26 Jul 2012 20:55:18 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xl: support empty CDROM devices X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343295335 -3600 # Node ID 968b205da696708ece522690ca10a823e03058db # Parent 07a69dbf7e85bca9c3e69c43a9f189612479cbc8 xl: support empty CDROM devices The important change here is to xlu_disk_parse to correctly set format == EMPTY for CDROM devices which are empty. Test cases are added which check for correctness here. xend accepts ',hdc:cdrom,r'[0] as an empty CDROM drive however this is not consistent with the xl syntax in docs/misc/xl-disk-configuration.txt which requires ',,hdc:cdrom,r' (the additional positional paramter is the format). I'm not sure if/how this can be fixed. Note that xend does not accept ',,hdc:cdrom,r' There are several incidental cleanups included the the cdrom-{insert,eject} commands: - add a dry-run mode - use the non-deprecated disk specification syntax - check for and report errors from libxl_cdrom_insert [0] http://wiki.xen.org/wiki/CD_Rom_Support_in_Xen Signed-off-by: Ian Campbell Acked-by: Ian Jackson Signed-off-by: Ian Jackson Committed-by: Ian Campbell --- diff -r 07a69dbf7e85 -r 968b205da696 docs/man/xl.pod.1 --- a/docs/man/xl.pod.1 Thu Jul 26 10:35:34 2012 +0100 +++ b/docs/man/xl.pod.1 Thu Jul 26 10:35:35 2012 +0100 @@ -1037,9 +1037,12 @@ in the domain. List virtual block devices for a domain. -=item B I I I +=item B I I I -Insert a cdrom into a guest domain's cd drive. Only works with HVM domains. +Insert a cdrom into a guest domain's existing virtial cd drive. The +virtual drive must already exist but can be current empty. + +Only works with HVM domains. B @@ -1047,20 +1050,29 @@ B =item I -How the device should be presented to the guest domain; for example /dev/hdc. +How the device should be presented to the guest domain; for example "hdc". -=item I +=item I -the device in the backend domain (usually domain 0) to be exported; it -can be a path to a file (file://path/to/file.iso). See B in -L for the details. +the target path in the backend domain (usually domain 0) to be +exported; Can be a block device or a file etc. See B in +F. =back =item B I I -Eject a cdrom from a guest's cd drive. Only works with HVM domains. -I is the cdrom device in the guest to eject. +Eject a cdrom from a guest's virtual cd drive. Only works with HVM domains. + +B + +=over 4 + +=item I + +How the device should be presented to the guest domain; for example "hdc". + +=back =back diff -r 07a69dbf7e85 -r 968b205da696 tools/libxl/check-xl-disk-parse --- a/tools/libxl/check-xl-disk-parse Thu Jul 26 10:35:34 2012 +0100 +++ b/tools/libxl/check-xl-disk-parse Thu Jul 26 10:35:35 2012 +0100 @@ -107,4 +107,39 @@ disk: { EOF one 0 backendtype=phy,vdev=xvdb,access=w,target=/dev/vg/guest-volume +expected <is_cdrom) { disk->removable = 1; disk->readwrite = 0; + if (!disk->pdev_path || !strcmp(disk->pdev_path, "")) + disk->format = LIBXL_DISK_FORMAT_EMPTY; } if (!disk->vdev) { diff -r 07a69dbf7e85 -r 968b205da696 tools/libxl/libxlu_disk_l.c --- a/tools/libxl/libxlu_disk_l.c Thu Jul 26 10:35:34 2012 +0100 +++ b/tools/libxl/libxlu_disk_l.c Thu Jul 26 10:35:35 2012 +0100 @@ -841,11 +841,12 @@ static void setaccess(DiskParseContext * /* Sets ->format from the string. IDL should provide something for this. */ static void setformat(DiskParseContext *dpc, const char *str) { - if (!strcmp(str,"") || - !strcmp(str,"raw")) DSET(dpc,format,FORMAT,str,RAW); + if (!strcmp(str,"")) DSET(dpc,format,FORMAT,str,RAW); + else if (!strcmp(str,"raw")) DSET(dpc,format,FORMAT,str,RAW); else if (!strcmp(str,"qcow")) DSET(dpc,format,FORMAT,str,QCOW); else if (!strcmp(str,"qcow2")) DSET(dpc,format,FORMAT,str,QCOW2); else if (!strcmp(str,"vhd")) DSET(dpc,format,FORMAT,str,VHD); + else if (!strcmp(str,"empty")) DSET(dpc,format,FORMAT,str,EMPTY); else xlu__disk_err(dpc,str,"unknown value for format"); } @@ -860,7 +861,7 @@ static void setbackendtype(DiskParseCont #define DEPRECATE(usewhatinstead) /* not currently reported */ -#line 864 "libxlu_disk_l.c" +#line 865 "libxlu_disk_l.c" #define INITIAL 0 #define LEXERR 1 @@ -1096,12 +1097,12 @@ YY_DECL register int yy_act; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; -#line 126 "libxlu_disk_l.l" +#line 127 "libxlu_disk_l.l" /*----- the scanner rules which do the parsing -----*/ -#line 1105 "libxlu_disk_l.c" +#line 1106 "libxlu_disk_l.c" if ( !yyg->yy_init ) { @@ -1295,7 +1296,7 @@ YY_RULE_SETUP * matched the whole string, so these patterns take precedence */ case 13: YY_RULE_SETUP -#line 160 "libxlu_disk_l.l" +#line 161 "libxlu_disk_l.l" { STRIP(':'); DPC->had_depr_prefix=1; DEPRECATE("use `[format=]...,'"); @@ -1304,7 +1305,7 @@ YY_RULE_SETUP YY_BREAK case 14: YY_RULE_SETUP -#line 166 "libxlu_disk_l.l" +#line 167 "libxlu_disk_l.l" { STRIP(':'); DPC->had_depr_prefix=1; DEPRECATE("use `script=...'"); @@ -1329,7 +1330,7 @@ case 17: yyg->yy_c_buf_p = yy_cp = yy_bp + 4; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 174 "libxlu_disk_l.l" +#line 175 "libxlu_disk_l.l" { DPC->had_depr_prefix=1; DEPRECATE(0); } YY_BREAK case 18: @@ -1337,7 +1338,7 @@ case 18: yyg->yy_c_buf_p = yy_cp = yy_bp + 6; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 175 "libxlu_disk_l.l" +#line 176 "libxlu_disk_l.l" { DPC->had_depr_prefix=1; DEPRECATE(0); } YY_BREAK case 19: @@ -1345,7 +1346,7 @@ case 19: yyg->yy_c_buf_p = yy_cp = yy_bp + 5; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 176 "libxlu_disk_l.l" +#line 177 "libxlu_disk_l.l" { DPC->had_depr_prefix=1; DEPRECATE(0); } YY_BREAK case 20: @@ -1369,7 +1370,7 @@ YY_RULE_SETUP case 22: /* rule 22 can match eol */ YY_RULE_SETUP -#line 186 "libxlu_disk_l.l" +#line 187 "libxlu_disk_l.l" { char *colon; STRIP(','); @@ -1406,7 +1407,7 @@ YY_RULE_SETUP YY_BREAK case 23: YY_RULE_SETUP -#line 220 "libxlu_disk_l.l" +#line 221 "libxlu_disk_l.l" { BEGIN(LEXERR); yymore(); @@ -2516,12 +2517,4 @@ void xlu__disk_yyfree (void * ptr , yysc #define YYTABLES_NAME "yytables" -#line 227 "libxlu_disk_l.l" - -/* - * Local variables: - * mode: C - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - */ +#line 228 "libxlu_disk_l.l" diff -r 07a69dbf7e85 -r 968b205da696 tools/libxl/libxlu_disk_l.h --- a/tools/libxl/libxlu_disk_l.h Thu Jul 26 10:35:34 2012 +0100 +++ b/tools/libxl/libxlu_disk_l.h Thu Jul 26 10:35:35 2012 +0100 @@ -340,16 +340,8 @@ extern int xlu__disk_yylex (yyscan_t yys #undef YY_DECL #endif -#line 227 "libxlu_disk_l.l" +#line 228 "libxlu_disk_l.l" #line 346 "libxlu_disk_l.h" #undef xlu__disk_yyIN_HEADER #endif /* xlu__disk_yyHEADER_H */ - -/* - * Local variables: - * mode: C - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - */ diff -r 07a69dbf7e85 -r 968b205da696 tools/libxl/libxlu_disk_l.l --- a/tools/libxl/libxlu_disk_l.l Thu Jul 26 10:35:34 2012 +0100 +++ b/tools/libxl/libxlu_disk_l.l Thu Jul 26 10:35:35 2012 +0100 @@ -92,11 +92,12 @@ static void setaccess(DiskParseContext * /* Sets ->format from the string. IDL should provide something for this. */ static void setformat(DiskParseContext *dpc, const char *str) { - if (!strcmp(str,"") || - !strcmp(str,"raw")) DSET(dpc,format,FORMAT,str,RAW); + if (!strcmp(str,"")) DSET(dpc,format,FORMAT,str,RAW); + else if (!strcmp(str,"raw")) DSET(dpc,format,FORMAT,str,RAW); else if (!strcmp(str,"qcow")) DSET(dpc,format,FORMAT,str,QCOW); else if (!strcmp(str,"qcow2")) DSET(dpc,format,FORMAT,str,QCOW2); else if (!strcmp(str,"vhd")) DSET(dpc,format,FORMAT,str,VHD); + else if (!strcmp(str,"empty")) DSET(dpc,format,FORMAT,str,EMPTY); else xlu__disk_err(dpc,str,"unknown value for format"); } diff -r 07a69dbf7e85 -r 968b205da696 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Thu Jul 26 10:35:34 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Thu Jul 26 10:35:35 2012 +0100 @@ -2210,7 +2210,8 @@ static void cd_insert(const char *dom, c find_domain(dom); - if (asprintf(&buf, "%s,%s:cdrom,r", phys ? phys : "", virtdev) < 0) { + if (asprintf(&buf, "vdev=%s,access=r,devtype=cdrom,target=%s", + virtdev, phys ? phys : "") < 0) { fprintf(stderr, "out of memory\n"); return; } diff -r 07a69dbf7e85 -r 968b205da696 tools/libxl/xl_cmdtable.c --- a/tools/libxl/xl_cmdtable.c Thu Jul 26 10:35:34 2012 +0100 +++ b/tools/libxl/xl_cmdtable.c Thu Jul 26 10:35:35 2012 +0100 @@ -174,12 +174,12 @@ struct cmd_spec cmd_table[] = { "- for internal use only", }, { "cd-insert", - &main_cd_insert, 0, 1, + &main_cd_insert, 1, 1, "Insert a cdrom into a guest's cd drive", " ", }, { "cd-eject", - &main_cd_eject, 0, 1, + &main_cd_eject, 1, 1, "Eject a cdrom from a guest's cd drive", " ", }, _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 26 20:55:29 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jul 2012 20:55: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 1SuV5l-0006xq-39; Thu, 26 Jul 2012 20:55:29 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5j-0006oe-Fp for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:27 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-27.messagelabs.com!1343336119!2422011!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 13698 invoked from network); 26 Jul 2012 20:55:20 -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; 26 Jul 2012 20:55:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5b-00062V-CM for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuV5b-0005pL-BF for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:19 +0000 Message-Id: Date: Thu, 26 Jul 2012 20:55:18 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xl: support empty CDROM devices X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343295335 -3600 # Node ID 968b205da696708ece522690ca10a823e03058db # Parent 07a69dbf7e85bca9c3e69c43a9f189612479cbc8 xl: support empty CDROM devices The important change here is to xlu_disk_parse to correctly set format == EMPTY for CDROM devices which are empty. Test cases are added which check for correctness here. xend accepts ',hdc:cdrom,r'[0] as an empty CDROM drive however this is not consistent with the xl syntax in docs/misc/xl-disk-configuration.txt which requires ',,hdc:cdrom,r' (the additional positional paramter is the format). I'm not sure if/how this can be fixed. Note that xend does not accept ',,hdc:cdrom,r' There are several incidental cleanups included the the cdrom-{insert,eject} commands: - add a dry-run mode - use the non-deprecated disk specification syntax - check for and report errors from libxl_cdrom_insert [0] http://wiki.xen.org/wiki/CD_Rom_Support_in_Xen Signed-off-by: Ian Campbell Acked-by: Ian Jackson Signed-off-by: Ian Jackson Committed-by: Ian Campbell --- diff -r 07a69dbf7e85 -r 968b205da696 docs/man/xl.pod.1 --- a/docs/man/xl.pod.1 Thu Jul 26 10:35:34 2012 +0100 +++ b/docs/man/xl.pod.1 Thu Jul 26 10:35:35 2012 +0100 @@ -1037,9 +1037,12 @@ in the domain. List virtual block devices for a domain. -=item B I I I +=item B I I I -Insert a cdrom into a guest domain's cd drive. Only works with HVM domains. +Insert a cdrom into a guest domain's existing virtial cd drive. The +virtual drive must already exist but can be current empty. + +Only works with HVM domains. B @@ -1047,20 +1050,29 @@ B =item I -How the device should be presented to the guest domain; for example /dev/hdc. +How the device should be presented to the guest domain; for example "hdc". -=item I +=item I -the device in the backend domain (usually domain 0) to be exported; it -can be a path to a file (file://path/to/file.iso). See B in -L for the details. +the target path in the backend domain (usually domain 0) to be +exported; Can be a block device or a file etc. See B in +F. =back =item B I I -Eject a cdrom from a guest's cd drive. Only works with HVM domains. -I is the cdrom device in the guest to eject. +Eject a cdrom from a guest's virtual cd drive. Only works with HVM domains. + +B + +=over 4 + +=item I + +How the device should be presented to the guest domain; for example "hdc". + +=back =back diff -r 07a69dbf7e85 -r 968b205da696 tools/libxl/check-xl-disk-parse --- a/tools/libxl/check-xl-disk-parse Thu Jul 26 10:35:34 2012 +0100 +++ b/tools/libxl/check-xl-disk-parse Thu Jul 26 10:35:35 2012 +0100 @@ -107,4 +107,39 @@ disk: { EOF one 0 backendtype=phy,vdev=xvdb,access=w,target=/dev/vg/guest-volume +expected <is_cdrom) { disk->removable = 1; disk->readwrite = 0; + if (!disk->pdev_path || !strcmp(disk->pdev_path, "")) + disk->format = LIBXL_DISK_FORMAT_EMPTY; } if (!disk->vdev) { diff -r 07a69dbf7e85 -r 968b205da696 tools/libxl/libxlu_disk_l.c --- a/tools/libxl/libxlu_disk_l.c Thu Jul 26 10:35:34 2012 +0100 +++ b/tools/libxl/libxlu_disk_l.c Thu Jul 26 10:35:35 2012 +0100 @@ -841,11 +841,12 @@ static void setaccess(DiskParseContext * /* Sets ->format from the string. IDL should provide something for this. */ static void setformat(DiskParseContext *dpc, const char *str) { - if (!strcmp(str,"") || - !strcmp(str,"raw")) DSET(dpc,format,FORMAT,str,RAW); + if (!strcmp(str,"")) DSET(dpc,format,FORMAT,str,RAW); + else if (!strcmp(str,"raw")) DSET(dpc,format,FORMAT,str,RAW); else if (!strcmp(str,"qcow")) DSET(dpc,format,FORMAT,str,QCOW); else if (!strcmp(str,"qcow2")) DSET(dpc,format,FORMAT,str,QCOW2); else if (!strcmp(str,"vhd")) DSET(dpc,format,FORMAT,str,VHD); + else if (!strcmp(str,"empty")) DSET(dpc,format,FORMAT,str,EMPTY); else xlu__disk_err(dpc,str,"unknown value for format"); } @@ -860,7 +861,7 @@ static void setbackendtype(DiskParseCont #define DEPRECATE(usewhatinstead) /* not currently reported */ -#line 864 "libxlu_disk_l.c" +#line 865 "libxlu_disk_l.c" #define INITIAL 0 #define LEXERR 1 @@ -1096,12 +1097,12 @@ YY_DECL register int yy_act; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; -#line 126 "libxlu_disk_l.l" +#line 127 "libxlu_disk_l.l" /*----- the scanner rules which do the parsing -----*/ -#line 1105 "libxlu_disk_l.c" +#line 1106 "libxlu_disk_l.c" if ( !yyg->yy_init ) { @@ -1295,7 +1296,7 @@ YY_RULE_SETUP * matched the whole string, so these patterns take precedence */ case 13: YY_RULE_SETUP -#line 160 "libxlu_disk_l.l" +#line 161 "libxlu_disk_l.l" { STRIP(':'); DPC->had_depr_prefix=1; DEPRECATE("use `[format=]...,'"); @@ -1304,7 +1305,7 @@ YY_RULE_SETUP YY_BREAK case 14: YY_RULE_SETUP -#line 166 "libxlu_disk_l.l" +#line 167 "libxlu_disk_l.l" { STRIP(':'); DPC->had_depr_prefix=1; DEPRECATE("use `script=...'"); @@ -1329,7 +1330,7 @@ case 17: yyg->yy_c_buf_p = yy_cp = yy_bp + 4; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 174 "libxlu_disk_l.l" +#line 175 "libxlu_disk_l.l" { DPC->had_depr_prefix=1; DEPRECATE(0); } YY_BREAK case 18: @@ -1337,7 +1338,7 @@ case 18: yyg->yy_c_buf_p = yy_cp = yy_bp + 6; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 175 "libxlu_disk_l.l" +#line 176 "libxlu_disk_l.l" { DPC->had_depr_prefix=1; DEPRECATE(0); } YY_BREAK case 19: @@ -1345,7 +1346,7 @@ case 19: yyg->yy_c_buf_p = yy_cp = yy_bp + 5; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 176 "libxlu_disk_l.l" +#line 177 "libxlu_disk_l.l" { DPC->had_depr_prefix=1; DEPRECATE(0); } YY_BREAK case 20: @@ -1369,7 +1370,7 @@ YY_RULE_SETUP case 22: /* rule 22 can match eol */ YY_RULE_SETUP -#line 186 "libxlu_disk_l.l" +#line 187 "libxlu_disk_l.l" { char *colon; STRIP(','); @@ -1406,7 +1407,7 @@ YY_RULE_SETUP YY_BREAK case 23: YY_RULE_SETUP -#line 220 "libxlu_disk_l.l" +#line 221 "libxlu_disk_l.l" { BEGIN(LEXERR); yymore(); @@ -2516,12 +2517,4 @@ void xlu__disk_yyfree (void * ptr , yysc #define YYTABLES_NAME "yytables" -#line 227 "libxlu_disk_l.l" - -/* - * Local variables: - * mode: C - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - */ +#line 228 "libxlu_disk_l.l" diff -r 07a69dbf7e85 -r 968b205da696 tools/libxl/libxlu_disk_l.h --- a/tools/libxl/libxlu_disk_l.h Thu Jul 26 10:35:34 2012 +0100 +++ b/tools/libxl/libxlu_disk_l.h Thu Jul 26 10:35:35 2012 +0100 @@ -340,16 +340,8 @@ extern int xlu__disk_yylex (yyscan_t yys #undef YY_DECL #endif -#line 227 "libxlu_disk_l.l" +#line 228 "libxlu_disk_l.l" #line 346 "libxlu_disk_l.h" #undef xlu__disk_yyIN_HEADER #endif /* xlu__disk_yyHEADER_H */ - -/* - * Local variables: - * mode: C - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - */ diff -r 07a69dbf7e85 -r 968b205da696 tools/libxl/libxlu_disk_l.l --- a/tools/libxl/libxlu_disk_l.l Thu Jul 26 10:35:34 2012 +0100 +++ b/tools/libxl/libxlu_disk_l.l Thu Jul 26 10:35:35 2012 +0100 @@ -92,11 +92,12 @@ static void setaccess(DiskParseContext * /* Sets ->format from the string. IDL should provide something for this. */ static void setformat(DiskParseContext *dpc, const char *str) { - if (!strcmp(str,"") || - !strcmp(str,"raw")) DSET(dpc,format,FORMAT,str,RAW); + if (!strcmp(str,"")) DSET(dpc,format,FORMAT,str,RAW); + else if (!strcmp(str,"raw")) DSET(dpc,format,FORMAT,str,RAW); else if (!strcmp(str,"qcow")) DSET(dpc,format,FORMAT,str,QCOW); else if (!strcmp(str,"qcow2")) DSET(dpc,format,FORMAT,str,QCOW2); else if (!strcmp(str,"vhd")) DSET(dpc,format,FORMAT,str,VHD); + else if (!strcmp(str,"empty")) DSET(dpc,format,FORMAT,str,EMPTY); else xlu__disk_err(dpc,str,"unknown value for format"); } diff -r 07a69dbf7e85 -r 968b205da696 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Thu Jul 26 10:35:34 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Thu Jul 26 10:35:35 2012 +0100 @@ -2210,7 +2210,8 @@ static void cd_insert(const char *dom, c find_domain(dom); - if (asprintf(&buf, "%s,%s:cdrom,r", phys ? phys : "", virtdev) < 0) { + if (asprintf(&buf, "vdev=%s,access=r,devtype=cdrom,target=%s", + virtdev, phys ? phys : "") < 0) { fprintf(stderr, "out of memory\n"); return; } diff -r 07a69dbf7e85 -r 968b205da696 tools/libxl/xl_cmdtable.c --- a/tools/libxl/xl_cmdtable.c Thu Jul 26 10:35:34 2012 +0100 +++ b/tools/libxl/xl_cmdtable.c Thu Jul 26 10:35:35 2012 +0100 @@ -174,12 +174,12 @@ struct cmd_spec cmd_table[] = { "- for internal use only", }, { "cd-insert", - &main_cd_insert, 0, 1, + &main_cd_insert, 1, 1, "Insert a cdrom into a guest's cd drive", " ", }, { "cd-eject", - &main_cd_eject, 0, 1, + &main_cd_eject, 1, 1, "Eject a cdrom from a guest's cd drive", " ", }, _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 26 20:55:31 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jul 2012 20:55: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 1SuV5n-00070k-5j; Thu, 26 Jul 2012 20:55:31 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5l-0006sa-CR for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:29 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-27.messagelabs.com!1343336121!4122774!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 647 invoked from network); 26 Jul 2012 20:55:22 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 26 Jul 2012 20:55:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5d-00062n-Gs for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuV5d-0005qJ-Fn for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:21 +0000 Message-Id: Date: Thu, 26 Jul 2012 20:55:21 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: libxl__xs_path_cleanup don't print error if ENOENT X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343296509 -3600 # Node ID b0fc6f8d5066498d79d9bcbb29ccf3b1fc2a9e2c # Parent d79db0ea07d5094343fc34af8d9cca3a96a6564a libxl: libxl__xs_path_cleanup don't print error if ENOENT Signed-off-by: Roger Pau Monne Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r d79db0ea07d5 -r b0fc6f8d5066 tools/libxl/libxl_xshelp.c --- a/tools/libxl/libxl_xshelp.c Thu Jul 26 10:35:37 2012 +0100 +++ b/tools/libxl/libxl_xshelp.c Thu Jul 26 10:55:09 2012 +0100 @@ -219,7 +219,8 @@ int libxl__xs_path_cleanup(libxl__gc *gc path = libxl__strdup(gc, user_path); if (!xs_rm(CTX->xsh, t, path)) { - LOGE(DEBUG, "unable to remove path %s", path); + if (errno != ENOENT) + LOGE(DEBUG, "unable to remove path %s", path); rc = ERROR_FAIL; goto out; } @@ -235,7 +236,8 @@ int libxl__xs_path_cleanup(libxl__gc *gc if (!libxl__xs_directory(gc, t, path, &nb) || nb != 0) break; if (!xs_rm(CTX->xsh, t, path)) { - LOGE(DEBUG, "unable to remove path %s", path); + if (errno != ENOENT) + LOGE(DEBUG, "unable to remove path %s", path); rc = ERROR_FAIL; goto out; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 26 20:55:31 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jul 2012 20:55: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 1SuV5n-00070k-5j; Thu, 26 Jul 2012 20:55:31 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5l-0006sa-CR for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:29 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-27.messagelabs.com!1343336121!4122774!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 647 invoked from network); 26 Jul 2012 20:55:22 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 26 Jul 2012 20:55:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5d-00062n-Gs for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuV5d-0005qJ-Fn for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:21 +0000 Message-Id: Date: Thu, 26 Jul 2012 20:55:21 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: libxl__xs_path_cleanup don't print error if ENOENT X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343296509 -3600 # Node ID b0fc6f8d5066498d79d9bcbb29ccf3b1fc2a9e2c # Parent d79db0ea07d5094343fc34af8d9cca3a96a6564a libxl: libxl__xs_path_cleanup don't print error if ENOENT Signed-off-by: Roger Pau Monne Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r d79db0ea07d5 -r b0fc6f8d5066 tools/libxl/libxl_xshelp.c --- a/tools/libxl/libxl_xshelp.c Thu Jul 26 10:35:37 2012 +0100 +++ b/tools/libxl/libxl_xshelp.c Thu Jul 26 10:55:09 2012 +0100 @@ -219,7 +219,8 @@ int libxl__xs_path_cleanup(libxl__gc *gc path = libxl__strdup(gc, user_path); if (!xs_rm(CTX->xsh, t, path)) { - LOGE(DEBUG, "unable to remove path %s", path); + if (errno != ENOENT) + LOGE(DEBUG, "unable to remove path %s", path); rc = ERROR_FAIL; goto out; } @@ -235,7 +236,8 @@ int libxl__xs_path_cleanup(libxl__gc *gc if (!libxl__xs_directory(gc, t, path, &nb) || nb != 0) break; if (!xs_rm(CTX->xsh, t, path)) { - LOGE(DEBUG, "unable to remove path %s", path); + if (errno != ENOENT) + LOGE(DEBUG, "unable to remove path %s", path); rc = ERROR_FAIL; goto out; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 26 20:55:35 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jul 2012 20:55:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5r-00075U-Bb; Thu, 26 Jul 2012 20:55:35 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5p-000733-HD for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:33 +0000 Received: from [85.158.143.35:27180] by server-2.bemta-4.messagelabs.com id 95/A5-17938-4CEA1105; Thu, 26 Jul 2012 20:55:32 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-21.messagelabs.com!1343336114!6805976!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 12173 invoked from network); 26 Jul 2012 20:55:16 -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; 26 Jul 2012 20:55:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5W-000623-OM for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuV5T-0005ls-GF for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:11 +0000 Message-Id: Date: Thu, 26 Jul 2012 20:55:10 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] build: include Tools.mk first in tools/Rules.mk X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343234358 -3600 # Node ID ad4829c26a233c4de206fd667a388298fde5b6cb # Parent 50bc30bafbce95ae046c0a06d88968989bf5728a build: include Tools.mk first in tools/Rules.mk Tools.mk should be included first, or PREFIX is not honoured in the other conf/ files that define the paths of several tools. Signed-off-by: Roger Pau Monne Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r 50bc30bafbce -r ad4829c26a23 tools/Rules.mk --- a/tools/Rules.mk Wed Jul 25 17:39:17 2012 +0100 +++ b/tools/Rules.mk Wed Jul 25 17:39:18 2012 +0100 @@ -3,8 +3,8 @@ # `all' is the default target all: +-include $(XEN_ROOT)/config/Tools.mk include $(XEN_ROOT)/Config.mk --include $(XEN_ROOT)/config/Tools.mk export _INSTALL := $(INSTALL) INSTALL = $(XEN_ROOT)/tools/cross-install _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 26 20:55:35 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jul 2012 20:55:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5r-00075U-Bb; Thu, 26 Jul 2012 20:55:35 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5p-000733-HD for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:33 +0000 Received: from [85.158.143.35:27180] by server-2.bemta-4.messagelabs.com id 95/A5-17938-4CEA1105; Thu, 26 Jul 2012 20:55:32 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-21.messagelabs.com!1343336114!6805976!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 12173 invoked from network); 26 Jul 2012 20:55:16 -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; 26 Jul 2012 20:55:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuV5W-000623-OM for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuV5T-0005ls-GF for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 20:55:11 +0000 Message-Id: Date: Thu, 26 Jul 2012 20:55:10 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] build: include Tools.mk first in tools/Rules.mk X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343234358 -3600 # Node ID ad4829c26a233c4de206fd667a388298fde5b6cb # Parent 50bc30bafbce95ae046c0a06d88968989bf5728a build: include Tools.mk first in tools/Rules.mk Tools.mk should be included first, or PREFIX is not honoured in the other conf/ files that define the paths of several tools. Signed-off-by: Roger Pau Monne Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r 50bc30bafbce -r ad4829c26a23 tools/Rules.mk --- a/tools/Rules.mk Wed Jul 25 17:39:17 2012 +0100 +++ b/tools/Rules.mk Wed Jul 25 17:39:18 2012 +0100 @@ -3,8 +3,8 @@ # `all' is the default target all: +-include $(XEN_ROOT)/config/Tools.mk include $(XEN_ROOT)/Config.mk --include $(XEN_ROOT)/config/Tools.mk export _INSTALL := $(INSTALL) INSTALL = $(XEN_ROOT)/tools/cross-install _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 26 23:44:26 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jul 2012 23:44: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 1SuXj7-0003XG-Vt; Thu, 26 Jul 2012 23:44:17 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuXj6-0003X8-KE for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 23:44:16 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-27.messagelabs.com!1343346248!9480528!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 26322 invoked from network); 26 Jul 2012 23:44:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 26 Jul 2012 23:44:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuXiy-0007t3-JR for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 23:44:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuXix-0002yh-Vz for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 23:44:08 +0000 Message-Id: Date: Thu, 26 Jul 2012 23:44:07 +0000 From: Xen patchbot-4.0-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.0-testing] x86/hvm: don't leave emulator in inconsistent state X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343318238 -3600 # Node ID 82fcf3a5dc3aafc5be375d52a901e00ecbe01fa4 # Parent a25160773a384eefbe7d86b6caaf4ea516027436 x86/hvm: don't leave emulator in inconsistent state The fact that handle_mmio(), and thus the instruction emulator, is being run through twice for emulations that require involvement of the device model, allows for the second run to see a different guest state than the first one. Since only the MMIO-specific emulation routines update the vCPU's io_state, if they get invoked on the second pass, internal state (and particularly this variable) can be left in a state making successful emulation of a subsequent MMIO operation impossible. Consequently, whenever the emulator invocation returns without requesting a retry of the guest instruction, reset io_state. [ This is a security issue. XSA#10. -iwj ] Signed-off-by: Jan Beulich Acked-by: Keir Fraser Committed-by: Ian Jackson xen-unstable changeset: 25682:ffcb24876b4f Committed-by: Ian Jackson --- diff -r a25160773a38 -r 82fcf3a5dc3a xen/arch/x86/hvm/io.c --- a/xen/arch/x86/hvm/io.c Sun Jul 22 16:39:40 2012 +0100 +++ b/xen/arch/x86/hvm/io.c Thu Jul 26 16:57:18 2012 +0100 @@ -176,6 +176,8 @@ int handle_mmio(void) rc = hvm_emulate_one(&ctxt); + if ( rc != X86EMUL_RETRY ) + curr->arch.hvm_vcpu.io_state = HVMIO_none; if ( curr->arch.hvm_vcpu.io_state == HVMIO_awaiting_completion ) curr->arch.hvm_vcpu.io_state = HVMIO_handle_mmio_awaiting_completion; else _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 26 23:44:26 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jul 2012 23:44: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 1SuXj7-0003XG-Vt; Thu, 26 Jul 2012 23:44:17 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuXj6-0003X8-KE for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 23:44:16 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-27.messagelabs.com!1343346248!9480528!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 26322 invoked from network); 26 Jul 2012 23:44:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 26 Jul 2012 23:44:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuXiy-0007t3-JR for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 23:44:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuXix-0002yh-Vz for xen-changelog@lists.xensource.com; Thu, 26 Jul 2012 23:44:08 +0000 Message-Id: Date: Thu, 26 Jul 2012 23:44:07 +0000 From: Xen patchbot-4.0-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.0-testing] x86/hvm: don't leave emulator in inconsistent state X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343318238 -3600 # Node ID 82fcf3a5dc3aafc5be375d52a901e00ecbe01fa4 # Parent a25160773a384eefbe7d86b6caaf4ea516027436 x86/hvm: don't leave emulator in inconsistent state The fact that handle_mmio(), and thus the instruction emulator, is being run through twice for emulations that require involvement of the device model, allows for the second run to see a different guest state than the first one. Since only the MMIO-specific emulation routines update the vCPU's io_state, if they get invoked on the second pass, internal state (and particularly this variable) can be left in a state making successful emulation of a subsequent MMIO operation impossible. Consequently, whenever the emulator invocation returns without requesting a retry of the guest instruction, reset io_state. [ This is a security issue. XSA#10. -iwj ] Signed-off-by: Jan Beulich Acked-by: Keir Fraser Committed-by: Ian Jackson xen-unstable changeset: 25682:ffcb24876b4f Committed-by: Ian Jackson --- diff -r a25160773a38 -r 82fcf3a5dc3a xen/arch/x86/hvm/io.c --- a/xen/arch/x86/hvm/io.c Sun Jul 22 16:39:40 2012 +0100 +++ b/xen/arch/x86/hvm/io.c Thu Jul 26 16:57:18 2012 +0100 @@ -176,6 +176,8 @@ int handle_mmio(void) rc = hvm_emulate_one(&ctxt); + if ( rc != X86EMUL_RETRY ) + curr->arch.hvm_vcpu.io_state = HVMIO_none; if ( curr->arch.hvm_vcpu.io_state == HVMIO_awaiting_completion ) curr->arch.hvm_vcpu.io_state = HVMIO_handle_mmio_awaiting_completion; else _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jul 27 02:00:25 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Jul 2012 02:00: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 1SuZql-0001Mx-FF; Fri, 27 Jul 2012 02:00:19 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuZqj-0001Ms-Lh for xen-changelog@lists.xensource.com; Fri, 27 Jul 2012 02:00:17 +0000 Received: from [85.158.143.35:6601] by server-3.bemta-4.messagelabs.com id D3/3E-01511-036F1105; Fri, 27 Jul 2012 02:00:16 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-21.messagelabs.com!1343354413!17370135!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 31898 invoked from network); 27 Jul 2012 02:00:14 -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; 27 Jul 2012 02:00:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuZqe-0001pq-S9 for xen-changelog@lists.xensource.com; Fri, 27 Jul 2012 02:00:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuZqd-0007Nb-Hy for xen-changelog@lists.xensource.com; Fri, 27 Jul 2012 02:00:12 +0000 Message-Id: Date: Fri, 27 Jul 2012 02:00:10 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] x86/hvm: don't leave emulator in inconsistent state X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343318195 -3600 # Node ID a43f5b4b03319117edba76ebca8f827119d4e9a8 # Parent e89be0dedeb4e4a9556cf3e1b9a5295ba0b59edf x86/hvm: don't leave emulator in inconsistent state The fact that handle_mmio(), and thus the instruction emulator, is being run through twice for emulations that require involvement of the device model, allows for the second run to see a different guest state than the first one. Since only the MMIO-specific emulation routines update the vCPU's io_state, if they get invoked on the second pass, internal state (and particularly this variable) can be left in a state making successful emulation of a subsequent MMIO operation impossible. Consequently, whenever the emulator invocation returns without requesting a retry of the guest instruction, reset io_state. [ This is a security issue. XSA#10. -iwj ] Signed-off-by: Jan Beulich Acked-by: Keir Fraser Committed-by: Ian Jackson xen-unstable changeset: 25682:ffcb24876b4f Committed-by: Ian Jackson --- diff -r e89be0dedeb4 -r a43f5b4b0331 xen/arch/x86/hvm/io.c --- a/xen/arch/x86/hvm/io.c Sun Jul 22 16:39:00 2012 +0100 +++ b/xen/arch/x86/hvm/io.c Thu Jul 26 16:56:35 2012 +0100 @@ -176,6 +176,8 @@ int handle_mmio(void) rc = hvm_emulate_one(&ctxt); + if ( rc != X86EMUL_RETRY ) + curr->arch.hvm_vcpu.io_state = HVMIO_none; if ( curr->arch.hvm_vcpu.io_state == HVMIO_awaiting_completion ) curr->arch.hvm_vcpu.io_state = HVMIO_handle_mmio_awaiting_completion; else _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jul 27 02:00:25 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Jul 2012 02:00: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 1SuZql-0001Mx-FF; Fri, 27 Jul 2012 02:00:19 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuZqj-0001Ms-Lh for xen-changelog@lists.xensource.com; Fri, 27 Jul 2012 02:00:17 +0000 Received: from [85.158.143.35:6601] by server-3.bemta-4.messagelabs.com id D3/3E-01511-036F1105; Fri, 27 Jul 2012 02:00:16 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-21.messagelabs.com!1343354413!17370135!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 31898 invoked from network); 27 Jul 2012 02:00:14 -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; 27 Jul 2012 02:00:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuZqe-0001pq-S9 for xen-changelog@lists.xensource.com; Fri, 27 Jul 2012 02:00:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuZqd-0007Nb-Hy for xen-changelog@lists.xensource.com; Fri, 27 Jul 2012 02:00:12 +0000 Message-Id: Date: Fri, 27 Jul 2012 02:00:10 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] x86/hvm: don't leave emulator in inconsistent state X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343318195 -3600 # Node ID a43f5b4b03319117edba76ebca8f827119d4e9a8 # Parent e89be0dedeb4e4a9556cf3e1b9a5295ba0b59edf x86/hvm: don't leave emulator in inconsistent state The fact that handle_mmio(), and thus the instruction emulator, is being run through twice for emulations that require involvement of the device model, allows for the second run to see a different guest state than the first one. Since only the MMIO-specific emulation routines update the vCPU's io_state, if they get invoked on the second pass, internal state (and particularly this variable) can be left in a state making successful emulation of a subsequent MMIO operation impossible. Consequently, whenever the emulator invocation returns without requesting a retry of the guest instruction, reset io_state. [ This is a security issue. XSA#10. -iwj ] Signed-off-by: Jan Beulich Acked-by: Keir Fraser Committed-by: Ian Jackson xen-unstable changeset: 25682:ffcb24876b4f Committed-by: Ian Jackson --- diff -r e89be0dedeb4 -r a43f5b4b0331 xen/arch/x86/hvm/io.c --- a/xen/arch/x86/hvm/io.c Sun Jul 22 16:39:00 2012 +0100 +++ b/xen/arch/x86/hvm/io.c Thu Jul 26 16:56:35 2012 +0100 @@ -176,6 +176,8 @@ int handle_mmio(void) rc = hvm_emulate_one(&ctxt); + if ( rc != X86EMUL_RETRY ) + curr->arch.hvm_vcpu.io_state = HVMIO_none; if ( curr->arch.hvm_vcpu.io_state == HVMIO_awaiting_completion ) curr->arch.hvm_vcpu.io_state = HVMIO_handle_mmio_awaiting_completion; else _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jul 28 03:00:28 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Jul 2012 03:00:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGR-0001oG-RO; Sat, 28 Jul 2012 03:00:23 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGQ-0001nN-7z for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:22 +0000 Received: from [85.158.143.99:37786] by server-3.bemta-4.messagelabs.com id 27/1E-01511-5C553105; Sat, 28 Jul 2012 03:00:21 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-216.messagelabs.com!1343444418!23882252!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 5072 invoked from network); 28 Jul 2012 03:00:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 28 Jul 2012 03:00:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGM-0003Q5-D4 for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuxGM-0002jw-7f for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:18 +0000 Message-Id: Date: Sat, 28 Jul 2012 03:00:17 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: refactor disk addition to take a helper X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343317649 -3600 # Node ID f5febaba5484b92bf7a63a046b1d95a634cbcaf4 # Parent fece26a64f9e8c8be2b5a5e49f1fd430340eac8c libxl: refactor disk addition to take a helper Change libxl__device_disk_add to no longer take a xs transaction and instead pass a helper for the local attach case that's used to get the free vdev. This function contains some non-functional changes due to an indentation change. Signed-off-by: Roger Pau Monne Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r fece26a64f9e -r f5febaba5484 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Thu Jul 26 16:47:28 2012 +0100 +++ b/tools/libxl/libxl.c Thu Jul 26 16:47:29 2012 +0100 @@ -1774,129 +1774,173 @@ int libxl__device_from_disk(libxl__gc *g return 0; } -int libxl__device_disk_add(libxl__gc *gc, uint32_t domid, - xs_transaction_t t, libxl_device_disk *disk) +/* Specific function called directly only by local disk attach, + * all other users should instead use the regular + * libxl__device_disk_add wrapper + * + * The (optionally) passed function get_vdev will be used to + * set the vdev the disk should be attached to. When it is set the caller + * must also pass get_vdev_user, which will be passed to get_vdev. + * + * The passed get_vdev function is also in charge of printing + * the corresponding error message when appropiate. + */ +static int device_disk_add(libxl__gc *gc, uint32_t domid, + libxl_device_disk *disk, + char *get_vdev(libxl__gc *, void *, + xs_transaction_t), + void *get_vdev_user) { - flexarray_t *front; - flexarray_t *back; + flexarray_t *front = NULL; + flexarray_t *back = NULL; char *dev; libxl__device device; int major, minor, rc; libxl_ctx *ctx = gc->owner; - - rc = libxl__device_disk_setdefault(gc, disk); - if (rc) goto out; - - front = flexarray_make(16, 1); - if (!front) { - rc = ERROR_NOMEM; - goto out; - } - back = flexarray_make(16, 1); - if (!back) { - rc = ERROR_NOMEM; - goto out_free; - } - - if (disk->script) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "External block scripts" - " not yet supported, sorry"); - rc = ERROR_INVAL; - goto out_free; - } - - rc = libxl__device_from_disk(gc, domid, disk, &device); - if (rc != 0) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "Invalid or unsupported" - " virtual disk identifier %s", disk->vdev); - goto out_free; - } - - switch (disk->backend) { - case LIBXL_DISK_BACKEND_PHY: - dev = disk->pdev_path; - do_backend_phy: - libxl__device_physdisk_major_minor(dev, &major, &minor); - flexarray_append(back, "physical-device"); - flexarray_append(back, libxl__sprintf(gc, "%x:%x", major, minor)); - - flexarray_append(back, "params"); - flexarray_append(back, dev); - - assert(device.backend_kind == LIBXL__DEVICE_KIND_VBD); - break; - case LIBXL_DISK_BACKEND_TAP: - dev = libxl__blktap_devpath(gc, disk->pdev_path, disk->format); - if (!dev) { - LOG(ERROR, "failed to get blktap devpath for %p\n", - disk->pdev_path); + xs_transaction_t t = XBT_NULL; + + for (;;) { + rc = libxl__xs_transaction_start(gc, &t); + if (rc) goto out; + + if (get_vdev) { + assert(get_vdev_user); + disk->vdev = get_vdev(gc, get_vdev_user, t); + if (disk->vdev == NULL) { rc = ERROR_FAIL; - goto out_free; + goto out; } - flexarray_append(back, "tapdisk-params"); - flexarray_append(back, libxl__sprintf(gc, "%s:%s", - libxl__device_disk_string_of_format(disk->format), - disk->pdev_path)); - - /* now create a phy device to export the device to the guest */ - goto do_backend_phy; - case LIBXL_DISK_BACKEND_QDISK: - flexarray_append(back, "params"); - flexarray_append(back, libxl__sprintf(gc, "%s:%s", - libxl__device_disk_string_of_format(disk->format), disk->pdev_path)); - assert(device.backend_kind == LIBXL__DEVICE_KIND_QDISK); - break; - default: - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "unrecognized disk backend type: %d\n", disk->backend); + } + + rc = libxl__device_disk_setdefault(gc, disk); + if (rc) goto out; + + if (front) + flexarray_free(front); + front = flexarray_make(16, 1); + if (!front) { + rc = ERROR_NOMEM; + goto out; + } + if (back) + flexarray_free(back); + back = flexarray_make(16, 1); + if (!back) { + rc = ERROR_NOMEM; + goto out_free; + } + + if (disk->script) { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "External block scripts" + " not yet supported, sorry"); rc = ERROR_INVAL; goto out_free; + } + + rc = libxl__device_from_disk(gc, domid, disk, &device); + if (rc != 0) { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "Invalid or unsupported" + " virtual disk identifier %s", disk->vdev); + goto out_free; + } + + switch (disk->backend) { + case LIBXL_DISK_BACKEND_PHY: + dev = disk->pdev_path; + do_backend_phy: + libxl__device_physdisk_major_minor(dev, &major, &minor); + flexarray_append(back, "physical-device"); + flexarray_append(back, libxl__sprintf(gc, "%x:%x", major, minor)); + + flexarray_append(back, "params"); + flexarray_append(back, dev); + + assert(device.backend_kind == LIBXL__DEVICE_KIND_VBD); + break; + case LIBXL_DISK_BACKEND_TAP: + dev = libxl__blktap_devpath(gc, disk->pdev_path, disk->format); + if (!dev) { + LOG(ERROR, "failed to get blktap devpath for %p\n", + disk->pdev_path); + rc = ERROR_FAIL; + goto out_free; + } + flexarray_append(back, "tapdisk-params"); + flexarray_append(back, libxl__sprintf(gc, "%s:%s", + libxl__device_disk_string_of_format(disk->format), + disk->pdev_path)); + + /* now create a phy device to export the device to the guest */ + goto do_backend_phy; + case LIBXL_DISK_BACKEND_QDISK: + flexarray_append(back, "params"); + flexarray_append(back, libxl__sprintf(gc, "%s:%s", + libxl__device_disk_string_of_format(disk->format), disk->pdev_path)); + assert(device.backend_kind == LIBXL__DEVICE_KIND_QDISK); + break; + default: + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "unrecognized disk backend type: %d\n", disk->backend); + rc = ERROR_INVAL; + goto out_free; + } + + flexarray_append(back, "frontend-id"); + flexarray_append(back, libxl__sprintf(gc, "%d", domid)); + flexarray_append(back, "online"); + flexarray_append(back, "1"); + flexarray_append(back, "removable"); + flexarray_append(back, libxl__sprintf(gc, "%d", (disk->removable) ? 1 : 0)); + flexarray_append(back, "bootable"); + flexarray_append(back, libxl__sprintf(gc, "%d", 1)); + flexarray_append(back, "state"); + flexarray_append(back, libxl__sprintf(gc, "%d", 1)); + flexarray_append(back, "dev"); + flexarray_append(back, disk->vdev); + flexarray_append(back, "type"); + flexarray_append(back, libxl__device_disk_string_of_backend(disk->backend)); + flexarray_append(back, "mode"); + flexarray_append(back, disk->readwrite ? "w" : "r"); + flexarray_append(back, "device-type"); + flexarray_append(back, disk->is_cdrom ? "cdrom" : "disk"); + + flexarray_append(front, "backend-id"); + flexarray_append(front, libxl__sprintf(gc, "%d", disk->backend_domid)); + flexarray_append(front, "state"); + flexarray_append(front, libxl__sprintf(gc, "%d", 1)); + flexarray_append(front, "virtual-device"); + flexarray_append(front, libxl__sprintf(gc, "%d", device.devid)); + flexarray_append(front, "device-type"); + flexarray_append(front, disk->is_cdrom ? "cdrom" : "disk"); + + libxl__device_generic_add(gc, t, &device, + libxl__xs_kvs_of_flexarray(gc, back, back->count), + libxl__xs_kvs_of_flexarray(gc, front, front->count)); + + rc = libxl__xs_transaction_commit(gc, &t); + if (!rc) break; + if (rc < 0) goto out_free; } - flexarray_append(back, "frontend-id"); - flexarray_append(back, libxl__sprintf(gc, "%d", domid)); - flexarray_append(back, "online"); - flexarray_append(back, "1"); - flexarray_append(back, "removable"); - flexarray_append(back, libxl__sprintf(gc, "%d", (disk->removable) ? 1 : 0)); - flexarray_append(back, "bootable"); - flexarray_append(back, libxl__sprintf(gc, "%d", 1)); - flexarray_append(back, "state"); - flexarray_append(back, libxl__sprintf(gc, "%d", 1)); - flexarray_append(back, "dev"); - flexarray_append(back, disk->vdev); - flexarray_append(back, "type"); - flexarray_append(back, libxl__device_disk_string_of_backend(disk->backend)); - flexarray_append(back, "mode"); - flexarray_append(back, disk->readwrite ? "w" : "r"); - flexarray_append(back, "device-type"); - flexarray_append(back, disk->is_cdrom ? "cdrom" : "disk"); - - flexarray_append(front, "backend-id"); - flexarray_append(front, libxl__sprintf(gc, "%d", disk->backend_domid)); - flexarray_append(front, "state"); - flexarray_append(front, libxl__sprintf(gc, "%d", 1)); - flexarray_append(front, "virtual-device"); - flexarray_append(front, libxl__sprintf(gc, "%d", device.devid)); - flexarray_append(front, "device-type"); - flexarray_append(front, disk->is_cdrom ? "cdrom" : "disk"); - - libxl__device_generic_add(gc, t, &device, - libxl__xs_kvs_of_flexarray(gc, back, back->count), - libxl__xs_kvs_of_flexarray(gc, front, front->count)); - rc = 0; out_free: flexarray_free(back); flexarray_free(front); out: + libxl__xs_transaction_abort(gc, &t); return rc; } +int libxl__device_disk_add(libxl__gc *gc, uint32_t domid, + libxl_device_disk *disk) +{ + return device_disk_add(gc, domid, disk, NULL, NULL); +} + int libxl_device_disk_add(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk) { GC_INIT(ctx); - int rc = libxl__device_disk_add(gc, domid, XBT_NULL, disk); + int rc = libxl__device_disk_add(gc, domid, disk); GC_FREE; return rc; } @@ -2177,9 +2221,10 @@ out: /* libxl__alloc_vdev only works on the local domain, that is the domain * where the toolstack is running */ -static char * libxl__alloc_vdev(libxl__gc *gc, const char *blkdev_start, +static char * libxl__alloc_vdev(libxl__gc *gc, void *get_vdev_user, xs_transaction_t t) { + const char *blkdev_start = (const char *) get_vdev_user; int devid = 0, disk = 0, part = 0; char *dompath = libxl__xs_get_dompath(gc, LIBXL_TOOLSTACK_DOMID); @@ -2215,9 +2260,8 @@ char * libxl__device_disk_local_attach(l libxl_ctx *ctx = gc->owner; char *dev = NULL, *be_path = NULL; char *ret = NULL; - int rc, xs_ret; + int rc; libxl__device device; - xs_transaction_t t = XBT_NULL; if (in_disk->pdev_path == NULL) return NULL; @@ -2261,27 +2305,10 @@ char * libxl__device_disk_local_attach(l break; case LIBXL_DISK_BACKEND_QDISK: if (disk->format != LIBXL_DISK_FORMAT_RAW) { - do { - t = xs_transaction_start(ctx->xsh); - if (t == XBT_NULL) { - LOG(ERROR, "failed to start a xenstore transaction"); - goto out; - } - disk->vdev = libxl__alloc_vdev(gc, blkdev_start, t); - if (disk->vdev == NULL) { - LOG(ERROR, "libxl__alloc_vdev failed"); - goto out; - } - if (libxl__device_disk_add(gc, LIBXL_TOOLSTACK_DOMID, - t, disk)) { - LOG(ERROR, "libxl_device_disk_add failed"); - goto out; - } - xs_ret = xs_transaction_end(ctx->xsh, t, 0); - } while (xs_ret == 0 && errno == EAGAIN); - t = XBT_NULL; - if (xs_ret == 0) { - LOGE(ERROR, "xenstore transaction failed"); + if (device_disk_add(gc, LIBXL_TOOLSTACK_DOMID, disk, + libxl__alloc_vdev, + (void *) blkdev_start)) { + LOG(ERROR, "libxl_device_disk_add failed"); goto out; } dev = GCSPRINTF("/dev/%s", disk->vdev); @@ -2310,10 +2337,7 @@ char * libxl__device_disk_local_attach(l return ret; out: - if (t != XBT_NULL) - xs_transaction_end(ctx->xsh, t, 1); - else - libxl__device_disk_local_detach(gc, disk); + libxl__device_disk_local_detach(gc, disk); return NULL; } diff -r fece26a64f9e -r f5febaba5484 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Thu Jul 26 16:47:28 2012 +0100 +++ b/tools/libxl/libxl_internal.h Thu Jul 26 16:47:29 2012 +0100 @@ -1339,7 +1339,7 @@ _hidden int libxl__device_from_disk(libx libxl_device_disk *disk, libxl__device *device); _hidden int libxl__device_disk_add(libxl__gc *gc, uint32_t domid, - xs_transaction_t t, libxl_device_disk *disk); + libxl_device_disk *disk); /* * Make a disk available in this (the control) domain. Returns path to _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jul 28 03:00:28 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Jul 2012 03:00:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGQ-0001o8-Oz; Sat, 28 Jul 2012 03:00:22 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGQ-0001np-16 for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:22 +0000 Received: from [85.158.139.83:8268] by server-11.bemta-5.messagelabs.com id 3F/79-20400-4C553105; Sat, 28 Jul 2012 03:00:20 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-182.messagelabs.com!1343444418!29371226!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 17754 invoked from network); 28 Jul 2012 03:00:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 28 Jul 2012 03:00:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGL-0003Q2-U7 for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuxGI-0002jb-Nt for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:17 +0000 Message-Id: Date: Sat, 28 Jul 2012 03:00:13 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: fix removal of secondary consoles X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343317648 -3600 # Node ID fece26a64f9e8c8be2b5a5e49f1fd430340eac8c # Parent 3666e9712eaf6d4908505cab86e2cfd20d1b72f1 libxl: fix removal of secondary consoles Secondary consoles are processed by libxl with the rest of the devices by calling libxl__initiate_device_remove that waits for the device to reach state 6 before procceeding with the removal. When libxl is destroying the console devices, Qemu is already dead or dying, and xenconsoled completely ignores the state backend entry for console devices, since it performs the cleanup based on the result of reads/writes to the tty. Since we don't want to execute hotplug scripts for consoles, leave the behaviour as it was previously, and just nuke the backend/frontend xenstore entries by calling libxl__device_destroy. Report: http://markmail.org/message/yqgppcsdip6tnmh6 Reported-by: Ian Campbell Signed-off-by: Roger Pau Monne Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r 3666e9712eaf -r fece26a64f9e tools/libxl/libxl_device.c --- a/tools/libxl/libxl_device.c Thu Jul 26 15:58:18 2012 +0100 +++ b/tools/libxl/libxl_device.c Thu Jul 26 16:47:28 2012 +0100 @@ -81,6 +81,8 @@ static int libxl__num_devices(libxl__gc 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); @@ -522,10 +524,18 @@ void libxl__devices_destroy(libxl__egc * path = libxl__xs_read(gc, XBT_NULL, path); GCNEW(dev); if (path && libxl__parse_backend_path(gc, path, dev) == 0) { - aodev = &aodevs->array[numdev]; dev->domid = domid; dev->kind = kind; dev->devid = atoi(devs[j]); + if (dev->backend_kind == LIBXL__DEVICE_KIND_CONSOLE) { + /* Currently console devices can be destroyed + * synchronously by just removing xenstore entries, + * this is what libxl__device_destroy does. + */ + libxl__device_destroy(gc, dev); + continue; + } + aodev = &aodevs->array[numdev]; aodev->action = DEVICE_DISCONNECT; aodev->dev = dev; aodev->callback = libxl__ao_devices_callback; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jul 28 03:00:28 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Jul 2012 03:00:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGO-0001nf-H5; Sat, 28 Jul 2012 03:00:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGM-0001nM-Rr for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:19 +0000 Received: from [85.158.138.51:11575] by server-5.bemta-3.messagelabs.com id 02/6B-28237-1C553105; Sat, 28 Jul 2012 03:00:17 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-174.messagelabs.com!1343444415!29211208!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 27936 invoked from network); 28 Jul 2012 03:00:16 -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; 28 Jul 2012 03:00:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGI-0003Pz-8m for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuxGH-0002jL-Td for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:13 +0000 Message-Id: Date: Sat, 28 Jul 2012 03:00:13 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: make libxl_cdrom_insert async. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343314698 -3600 # Node ID 3666e9712eaf6d4908505cab86e2cfd20d1b72f1 # Parent b444cce77ce0605cf7d743fcac7825a3119a0701 libxl: make libxl_cdrom_insert async. This functionality is a bit of a mess and several configurations are not properly supported. The protocol for changing is basically to change the params node in the disk xenstore backend. There is no interlock or error reporting in this protocol. Completely removing the device and recreating it is not necessary nor expected. For reference the equivalent xend code is tools/python/xen/xend/server/blkif.py::BlkifController::reconfigureDevice(). Device model stub domains are not supported. There appears to be no way correctly to do a media change on the emulated device while also changing the stub domains PV backend to point to the new backend. Reworking this is a significant task deferred until 4.3. xend (via the equivalent "xm block-configure" functionality) also does not support media change for stub domains (confirmed by code inspection and experiment). Unlike xend this version errors out instead of silently not achieving anything in this case. There is no support for qemu-xen (upstream) media change. I expect this is supported on the qemu side and required QMP plumbing on the libxl side. Again this is deferred until 4.3. On the plus side the current implementation is trivially "asynchronous". Adds a libxl__xs_writev_atonce helper to write a key-value list to xenstore in one go. Tested with Windows 7. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r b444cce77ce0 -r 3666e9712eaf tools/libxl/libxl.c --- a/tools/libxl/libxl.c Thu Jul 26 15:41:54 2012 +0100 +++ b/tools/libxl/libxl.c Thu Jul 26 15:58:18 2012 +0100 @@ -2076,17 +2076,49 @@ int libxl_device_disk_getinfo(libxl_ctx return 0; } -int libxl_cdrom_insert(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk) +int libxl_cdrom_insert(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk, + const libxl_asyncop_how *ao_how) { - int num, i; - uint32_t stubdomid; - libxl_device_disk *disks; - int ret = ERROR_FAIL; - - if (!disk->pdev_path) { - disk->pdev_path = strdup(""); - disk->format = LIBXL_DISK_FORMAT_EMPTY; + AO_CREATE(ctx, domid, ao_how); + int num = 0, i; + libxl_device_disk *disks = NULL; + int rc, dm_ver; + + libxl__device device; + const char * path; + + flexarray_t *insert = NULL; + + libxl_domain_type type = libxl__domain_type(gc, domid); + if (type == LIBXL_DOMAIN_TYPE_INVALID) { + rc = ERROR_FAIL; + goto out; } + if (type != LIBXL_DOMAIN_TYPE_HVM) { + LOG(ERROR, "cdrom-insert requires an HVM domain"); + rc = ERROR_INVAL; + goto out; + } + + if (libxl_get_stubdom_id(ctx, domid) != 0) { + LOG(ERROR, "cdrom-insert doesn't work for stub domains"); + rc = ERROR_INVAL; + goto out; + } + + dm_ver = libxl__device_model_version_running(gc, domid); + if (dm_ver == -1) { + LOG(ERROR, "cannot determine device model version"); + rc = ERROR_FAIL; + goto out; + } + if (dm_ver != LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL) { + LOG(ERROR, "cdrom-insert does not work with %s", + libxl_device_model_version_to_string(dm_ver)); + rc = ERROR_INVAL; + goto out; + } + disks = libxl_device_disk_list(ctx, domid, &num); for (i = 0; i < num; i++) { if (disks[i].is_cdrom && !strcmp(disk->vdev, disks[i].vdev)) @@ -2095,23 +2127,52 @@ int libxl_cdrom_insert(libxl_ctx *ctx, u } if (i == num) { LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "Virtual device not found"); + rc = ERROR_FAIL; goto out; } - ret = 0; - - libxl_device_disk_remove(ctx, domid, disks + i, 0); - libxl_device_disk_add(ctx, domid, disk); - stubdomid = libxl_get_stubdom_id(ctx, domid); - if (stubdomid) { - libxl_device_disk_remove(ctx, stubdomid, disks + i, 0); - libxl_device_disk_add(ctx, stubdomid, disk); + rc = libxl__device_disk_setdefault(gc, disk); + if (rc) goto out; + + if (!disk->pdev_path) { + disk->pdev_path = libxl__strdup(NOGC, ""); + disk->format = LIBXL_DISK_FORMAT_EMPTY; } + + rc = libxl__device_from_disk(gc, domid, disk, &device); + if (rc) goto out; + path = libxl__device_backend_path(gc, &device); + + insert = flexarray_make(4, 1); + + flexarray_append_pair(insert, "type", + libxl__device_disk_string_of_backend(disk->backend)); + if (disk->format != LIBXL_DISK_FORMAT_EMPTY) + flexarray_append_pair(insert, "params", + GCSPRINTF("%s:%s", + libxl__device_disk_string_of_format(disk->format), + disk->pdev_path)); + else + flexarray_append_pair(insert, "params", ""); + + rc = libxl__xs_writev_atonce(gc, path, + libxl__xs_kvs_of_flexarray(gc, insert, insert->count)); + if (rc) goto out; + + /* success, no actual async */ + libxl__ao_complete(egc, ao, 0); + + rc = 0; + out: for (i = 0; i < num; i++) libxl_device_disk_dispose(&disks[i]); free(disks); - return ret; + + if (insert) flexarray_free(insert); + + if (rc) return AO_ABORT(rc); + return AO_INPROGRESS; } /* libxl__alloc_vdev only works on the local domain, that is the domain diff -r b444cce77ce0 -r 3666e9712eaf tools/libxl/libxl.h --- a/tools/libxl/libxl.h Thu Jul 26 15:41:54 2012 +0100 +++ b/tools/libxl/libxl.h Thu Jul 26 15:58:18 2012 +0100 @@ -691,7 +691,8 @@ int libxl_device_disk_getinfo(libxl_ctx * Insert a CD-ROM device. A device corresponding to disk must already * be attached to the guest. */ -int libxl_cdrom_insert(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk); +int libxl_cdrom_insert(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk, + const libxl_asyncop_how *ao_how); /* Network Interfaces */ int libxl_device_nic_add(libxl_ctx *ctx, uint32_t domid, libxl_device_nic *nic); diff -r b444cce77ce0 -r 3666e9712eaf tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Thu Jul 26 15:41:54 2012 +0100 +++ b/tools/libxl/libxl_internal.h Thu Jul 26 15:58:18 2012 +0100 @@ -498,8 +498,13 @@ _hidden int libxl__remove_file_or_direct _hidden char **libxl__xs_kvs_of_flexarray(libxl__gc *gc, flexarray_t *array, int length); +/* treats kvs as pairs of keys and values and writes each to dir. */ _hidden int libxl__xs_writev(libxl__gc *gc, xs_transaction_t t, const char *dir, char **kvs); +/* _atonce creates a transaction and writes all keys at once */ +_hidden int libxl__xs_writev_atonce(libxl__gc *gc, + const char *dir, char **kvs); + _hidden int libxl__xs_write(libxl__gc *gc, xs_transaction_t t, const char *path, const char *fmt, ...) PRINTF_ATTRIBUTE(4, 5); /* Each fn returns 0 on success. diff -r b444cce77ce0 -r 3666e9712eaf tools/libxl/libxl_xshelp.c --- a/tools/libxl/libxl_xshelp.c Thu Jul 26 15:41:54 2012 +0100 +++ b/tools/libxl/libxl_xshelp.c Thu Jul 26 15:58:18 2012 +0100 @@ -61,6 +61,31 @@ int libxl__xs_writev(libxl__gc *gc, xs_t return 0; } +int libxl__xs_writev_atonce(libxl__gc *gc, + const char *dir, char *kvs[]) +{ + int rc; + xs_transaction_t t = XBT_NULL; + + for (;;) { + rc = libxl__xs_transaction_start(gc, &t); + if (rc) goto out; + + rc = libxl__xs_writev(gc, t, dir, kvs); + if (rc) goto out; + + rc = libxl__xs_transaction_commit(gc, &t); + if (!rc) break; + if (rc<0) goto out; + } + +out: + libxl__xs_transaction_abort(gc, &t); + + return rc; + +} + int libxl__xs_write(libxl__gc *gc, xs_transaction_t t, const char *path, const char *fmt, ...) { diff -r b444cce77ce0 -r 3666e9712eaf tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Thu Jul 26 15:41:54 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Thu Jul 26 15:58:18 2012 +0100 @@ -2004,7 +2004,7 @@ start: case LIBXL_EVENT_TYPE_DISK_EJECT: /* XXX what is this for? */ - libxl_cdrom_insert(ctx, domid, &event->u.disk_eject.disk); + libxl_cdrom_insert(ctx, domid, &event->u.disk_eject.disk, NULL); break; default:; @@ -2225,7 +2225,7 @@ static void cd_insert(const char *dom, c disk.backend_domid = 0; - libxl_cdrom_insert(ctx, domid, &disk); + libxl_cdrom_insert(ctx, domid, &disk, NULL); libxl_device_disk_dispose(&disk); free(buf); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jul 28 03:00:28 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Jul 2012 03:00:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGO-0001na-Dv; Sat, 28 Jul 2012 03:00:20 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGM-0001nN-OR for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:19 +0000 Received: from [85.158.143.99:59040] by server-3.bemta-4.messagelabs.com id A2/1E-01511-2C553105; Sat, 28 Jul 2012 03:00:18 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-216.messagelabs.com!1343444414!29155921!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 4681 invoked from network); 28 Jul 2012 03:00:15 -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; 28 Jul 2012 03:00:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGH-0003Pv-Nq for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuxGG-0002iv-Ow for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:13 +0000 Message-Id: Date: Sat, 28 Jul 2012 03:00:12 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: have NUMA placement deal with cpupools X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Dario Faggioli # Date 1343313714 -3600 # Node ID b444cce77ce0605cf7d743fcac7825a3119a0701 # Parent 4165d71479f92c58f3b7029d19e69cd779345d9a libxl: have NUMA placement deal with cpupools In such a way that only the cpus belonging to the cpupool of the domain being placed are considered for the placement itself. This happens by filtering out all the nodes in which the cpupool has not any cpu from the placement candidates. After that ---as cpu pooling not necessarily happens at NUMA nodes boundaries--- we also make sure only the actual cpus that are part of the pool are considered when counting how much processors a placement candidate provides. Signed-off-by: Dario Faggioli Acked-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r 4165d71479f9 -r b444cce77ce0 tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Thu Jul 26 15:41:54 2012 +0100 +++ b/tools/libxl/libxl_dom.c Thu Jul 26 15:41:54 2012 +0100 @@ -128,26 +128,30 @@ static int numa_cmpf(const libxl__numa_c } /* The actual automatic NUMA placement routine */ -static int numa_place_domain(libxl__gc *gc, libxl_domain_build_info *info) +static int numa_place_domain(libxl__gc *gc, uint32_t domid, + libxl_domain_build_info *info) { int found; libxl__numa_candidate candidate; libxl_bitmap candidate_nodemap; - libxl_cpupoolinfo *pinfo; - int nr_pools, rc = 0; + libxl_cpupoolinfo cpupool_info; + int i, cpupool, rc = 0; uint32_t memkb; libxl__numa_candidate_init(&candidate); libxl_bitmap_init(&candidate_nodemap); - /* First of all, if cpupools are in use, better not to mess with them */ - pinfo = libxl_list_cpupool(CTX, &nr_pools); - if (!pinfo) - return ERROR_FAIL; - if (nr_pools > 1) { - LOG(NOTICE, "Skipping NUMA placement as cpupools are in use"); - goto out; - } + /* + * Extract the cpumap from the cpupool the domain belong to. In fact, + * it only makes sense to consider the cpus/nodes that are in there + * for placement. + */ + rc = cpupool = libxl__domain_cpupool(gc, domid); + if (rc < 0) + return rc; + rc = libxl_cpupool_info(CTX, &cpupool_info, cpupool); + if (rc) + return rc; rc = libxl_domain_need_memory(CTX, info, &memkb); if (rc) @@ -159,7 +163,8 @@ static int numa_place_domain(libxl__gc * /* Find the best candidate with enough free memory and at least * as much pcpus as the domain has vcpus. */ - rc = libxl__get_numa_candidate(gc, memkb, info->max_vcpus, 0, 0, + rc = libxl__get_numa_candidate(gc, memkb, info->max_vcpus, + 0, 0, &cpupool_info.cpumap, numa_cmpf, &candidate, &found); if (rc) goto out; @@ -175,6 +180,13 @@ static int numa_place_domain(libxl__gc * if (rc) goto out; + /* Avoid trying to set the affinity to cpus that might be in the + * nodemap but not in our cpupool. */ + libxl_for_each_set_bit(i, info->cpumap) { + if (!libxl_bitmap_test(&cpupool_info.cpumap, i)) + libxl_bitmap_reset(&info->cpumap, i); + } + LOG(DETAIL, "NUMA placement candidate with %d nodes, %d cpus and " "%"PRIu32" KB free selected", candidate.nr_nodes, candidate.nr_cpus, candidate.free_memkb / 1024); @@ -182,7 +194,7 @@ static int numa_place_domain(libxl__gc * out: libxl__numa_candidate_dispose(&candidate); libxl_bitmap_dispose(&candidate_nodemap); - libxl_cpupoolinfo_list_free(pinfo, nr_pools); + libxl_cpupoolinfo_dispose(&cpupool_info); return rc; } @@ -214,7 +226,7 @@ int libxl__build_pre(libxl__gc *gc, uint return ERROR_INVAL; } - rc = numa_place_domain(gc, info); + rc = numa_place_domain(gc, domid, info); if (rc) return rc; } diff -r 4165d71479f9 -r b444cce77ce0 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Thu Jul 26 15:41:54 2012 +0100 +++ b/tools/libxl/libxl_internal.h Thu Jul 26 15:41:54 2012 +0100 @@ -2568,6 +2568,10 @@ typedef int (*libxl__numa_candidate_cmpf * other hand, if not even one single candidate can be found, the function * still returns successfully but cndt_found will be zero. * + * Finally, suitable_cpumap is useful for telling that only the cpus in that + * mask should be considered when generating placement candidates (for + * example because of cpupools). + * * It is up to the function to properly allocate cndt_out (by calling * libxl__numa_candidate_alloc()), while it is the caller that should init * (libxl__numa_candidate_init()) and free (libxl__numa_candidate_dispose()) @@ -2576,6 +2580,7 @@ typedef int (*libxl__numa_candidate_cmpf _hidden int libxl__get_numa_candidate(libxl__gc *gc, uint32_t min_free_memkb, int min_cpus, int min_nodes, int max_nodes, + const libxl_bitmap *suitable_cpumap, libxl__numa_candidate_cmpf numa_cmpf, libxl__numa_candidate *cndt_out, int *cndt_found); diff -r 4165d71479f9 -r b444cce77ce0 tools/libxl/libxl_numa.c --- a/tools/libxl/libxl_numa.c Thu Jul 26 15:41:54 2012 +0100 +++ b/tools/libxl/libxl_numa.c Thu Jul 26 15:41:54 2012 +0100 @@ -105,30 +105,48 @@ static int comb_next(comb_iter_t it, int /* NUMA automatic placement (see libxl_internal.h for details) */ /* - * This function turns a k-combination iterator into a node map. - * This means the bits in the node map corresponding to the indexes - * of the given combination are the ones that will be set. - * For example, if the iterator represents the combination { 0, 2, 4}, - * the node map will have bits #0, #2 and #4 set. + * This function turns a k-combination iterator into a node map, + * given another map, telling us which nodes should be considered. + * + * This means the bits that are set in suitable_nodemap and that + * corresponds to the indexes of the given combination are the ones + * that will be set in nodemap. + * + * For example, given a fully set suitable_nodemap, if the iterator + * represents the combination { 0, 2, 4}, nodmeap will have bits #0, + * #2 and #4 set. + * On the other hand, if, say, suitable_nodemap=01011011, the same + * iterator will cause bits #1, #4 and #7 of nodemap to be set. */ -static void comb_get_nodemap(comb_iter_t it, libxl_bitmap *nodemap, int k) +static void comb_get_nodemap(comb_iter_t it, libxl_bitmap *suitable_nodemap, + libxl_bitmap *nodemap, int k) { - int i; + int i, m = 0, n = 0; libxl_bitmap_set_none(nodemap); - for (i = 0; i < k; i++) - libxl_bitmap_set(nodemap, it[i]); + libxl_for_each_set_bit(i, *suitable_nodemap) { + /* Check wether the n-th set bit of suitable_nodemap + * matches with the m-th element of the iterator (and, + * only if it does, advance to the next one) */ + if (m < k && n == it[m]) { + libxl_bitmap_set(nodemap, i); + m++; + } + n++; + } } /* Retrieve the number of cpus that the nodes that are part of the nodemap - * span. */ + * span and are also set in suitable_cpumap. */ static int nodemap_to_nr_cpus(libxl_cputopology *tinfo, int nr_cpus, + const libxl_bitmap *suitable_cpumap, const libxl_bitmap *nodemap) { int i, nodes_cpus = 0; for (i = 0; i < nr_cpus; i++) { - if (libxl_bitmap_test(nodemap, tinfo[i].node)) + if (libxl_bitmap_test(suitable_cpumap, i) && + libxl_bitmap_test(nodemap, tinfo[i].node)) nodes_cpus++; } return nodes_cpus; @@ -242,6 +260,7 @@ static int count_cpus_per_node(libxl_cpu int libxl__get_numa_candidate(libxl__gc *gc, uint32_t min_free_memkb, int min_cpus, int min_nodes, int max_nodes, + const libxl_bitmap *suitable_cpumap, libxl__numa_candidate_cmpf numa_cmpf, libxl__numa_candidate *cndt_out, int *cndt_found) @@ -249,11 +268,12 @@ int libxl__get_numa_candidate(libxl__gc libxl__numa_candidate new_cndt; libxl_cputopology *tinfo = NULL; libxl_numainfo *ninfo = NULL; - int nr_nodes = 0, nr_cpus = 0; - libxl_bitmap nodemap; + int nr_nodes = 0, nr_suit_nodes, nr_cpus = 0; + libxl_bitmap suitable_nodemap, nodemap; int rc = 0; libxl_bitmap_init(&nodemap); + libxl_bitmap_init(&suitable_nodemap); libxl__numa_candidate_init(&new_cndt); /* Get platform info and prepare the map for testing the combinations */ @@ -300,6 +320,15 @@ int libxl__get_numa_candidate(libxl__gc if (rc) goto out; + /* Allocate and prepare the map of the node that can be utilized for + * placement, basing on the map of suitable cpus. */ + rc = libxl_node_bitmap_alloc(CTX, &suitable_nodemap, 0); + if (rc) + goto out; + rc = libxl_cpumap_to_nodemap(CTX, suitable_cpumap, &suitable_nodemap); + if (rc) + goto out; + /* * If the minimum number of NUMA nodes is not explicitly specified * (i.e., min_nodes == 0), we try to figure out a sensible number of nodes @@ -317,10 +346,14 @@ int libxl__get_numa_candidate(libxl__gc else min_nodes = (min_cpus + cpus_per_node - 1) / cpus_per_node; } - if (min_nodes > nr_nodes) - min_nodes = nr_nodes; - if (!max_nodes || max_nodes > nr_nodes) - max_nodes = nr_nodes; + /* We also need to be sure we do not exceed the number of + * nodes we are allowed to use. */ + nr_suit_nodes = libxl_bitmap_count_set(&suitable_nodemap); + + if (min_nodes > nr_suit_nodes) + min_nodes = nr_suit_nodes; + if (!max_nodes || max_nodes > nr_suit_nodes) + max_nodes = nr_suit_nodes; if (min_nodes > max_nodes) { LOG(ERROR, "Inconsistent minimum or maximum number of guest nodes"); rc = ERROR_INVAL; @@ -353,12 +386,16 @@ int libxl__get_numa_candidate(libxl__gc * amount of free memory and number of cpus) and it can concur to * become our best placement iff it passes the check. */ - for (comb_ok = comb_init(gc, &comb_iter, nr_nodes, min_nodes); comb_ok; - comb_ok = comb_next(comb_iter, nr_nodes, min_nodes)) { + for (comb_ok = comb_init(gc, &comb_iter, nr_suit_nodes, min_nodes); + comb_ok; + comb_ok = comb_next(comb_iter, nr_suit_nodes, min_nodes)) { uint32_t nodes_free_memkb; int nodes_cpus; - comb_get_nodemap(comb_iter, &nodemap, min_nodes); + /* Get the nodemap for the combination, only considering + * suitable nodes. */ + comb_get_nodemap(comb_iter, &suitable_nodemap, + &nodemap, min_nodes); /* If there is not enough memory in this combination, skip it * and go generating the next one... */ @@ -367,7 +404,8 @@ int libxl__get_numa_candidate(libxl__gc continue; /* And the same applies if this combination is short in cpus */ - nodes_cpus = nodemap_to_nr_cpus(tinfo, nr_cpus, &nodemap); + nodes_cpus = nodemap_to_nr_cpus(tinfo, nr_cpus, suitable_cpumap, + &nodemap); if (min_cpus && nodes_cpus < min_cpus) continue; @@ -378,7 +416,7 @@ int libxl__get_numa_candidate(libxl__gc libxl__numa_candidate_put_nodemap(gc, &new_cndt, &nodemap); new_cndt.nr_vcpus = nodemap_to_nr_vcpus(gc, tinfo, &nodemap); new_cndt.free_memkb = nodes_free_memkb; - new_cndt.nr_nodes = min_nodes; + new_cndt.nr_nodes = libxl_bitmap_count_set(&nodemap); new_cndt.nr_cpus = nodes_cpus; /* @@ -392,8 +430,9 @@ int libxl__get_numa_candidate(libxl__gc LOG(DEBUG, "New best NUMA placement candidate found: " "nr_nodes=%d, nr_cpus=%d, nr_vcpus=%d, " - "free_memkb=%"PRIu32"", min_nodes, new_cndt.nr_cpus, - new_cndt.nr_vcpus, new_cndt.free_memkb / 1024); + "free_memkb=%"PRIu32"", new_cndt.nr_nodes, + new_cndt.nr_cpus, new_cndt.nr_vcpus, + new_cndt.free_memkb / 1024); libxl__numa_candidate_put_nodemap(gc, cndt_out, &nodemap); cndt_out->nr_vcpus = new_cndt.nr_vcpus; @@ -413,6 +452,7 @@ int libxl__get_numa_candidate(libxl__gc out: libxl_bitmap_dispose(&nodemap); + libxl_bitmap_dispose(&suitable_nodemap); libxl__numa_candidate_dispose(&new_cndt); libxl_numainfo_list_free(ninfo, nr_nodes); libxl_cputopology_list_free(tinfo, nr_cpus); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jul 28 03:00:28 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Jul 2012 03:00:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGR-0001oG-RO; Sat, 28 Jul 2012 03:00:23 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGQ-0001nN-7z for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:22 +0000 Received: from [85.158.143.99:37786] by server-3.bemta-4.messagelabs.com id 27/1E-01511-5C553105; Sat, 28 Jul 2012 03:00:21 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-216.messagelabs.com!1343444418!23882252!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 5072 invoked from network); 28 Jul 2012 03:00:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 28 Jul 2012 03:00:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGM-0003Q5-D4 for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuxGM-0002jw-7f for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:18 +0000 Message-Id: Date: Sat, 28 Jul 2012 03:00:17 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: refactor disk addition to take a helper X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343317649 -3600 # Node ID f5febaba5484b92bf7a63a046b1d95a634cbcaf4 # Parent fece26a64f9e8c8be2b5a5e49f1fd430340eac8c libxl: refactor disk addition to take a helper Change libxl__device_disk_add to no longer take a xs transaction and instead pass a helper for the local attach case that's used to get the free vdev. This function contains some non-functional changes due to an indentation change. Signed-off-by: Roger Pau Monne Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r fece26a64f9e -r f5febaba5484 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Thu Jul 26 16:47:28 2012 +0100 +++ b/tools/libxl/libxl.c Thu Jul 26 16:47:29 2012 +0100 @@ -1774,129 +1774,173 @@ int libxl__device_from_disk(libxl__gc *g return 0; } -int libxl__device_disk_add(libxl__gc *gc, uint32_t domid, - xs_transaction_t t, libxl_device_disk *disk) +/* Specific function called directly only by local disk attach, + * all other users should instead use the regular + * libxl__device_disk_add wrapper + * + * The (optionally) passed function get_vdev will be used to + * set the vdev the disk should be attached to. When it is set the caller + * must also pass get_vdev_user, which will be passed to get_vdev. + * + * The passed get_vdev function is also in charge of printing + * the corresponding error message when appropiate. + */ +static int device_disk_add(libxl__gc *gc, uint32_t domid, + libxl_device_disk *disk, + char *get_vdev(libxl__gc *, void *, + xs_transaction_t), + void *get_vdev_user) { - flexarray_t *front; - flexarray_t *back; + flexarray_t *front = NULL; + flexarray_t *back = NULL; char *dev; libxl__device device; int major, minor, rc; libxl_ctx *ctx = gc->owner; - - rc = libxl__device_disk_setdefault(gc, disk); - if (rc) goto out; - - front = flexarray_make(16, 1); - if (!front) { - rc = ERROR_NOMEM; - goto out; - } - back = flexarray_make(16, 1); - if (!back) { - rc = ERROR_NOMEM; - goto out_free; - } - - if (disk->script) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "External block scripts" - " not yet supported, sorry"); - rc = ERROR_INVAL; - goto out_free; - } - - rc = libxl__device_from_disk(gc, domid, disk, &device); - if (rc != 0) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "Invalid or unsupported" - " virtual disk identifier %s", disk->vdev); - goto out_free; - } - - switch (disk->backend) { - case LIBXL_DISK_BACKEND_PHY: - dev = disk->pdev_path; - do_backend_phy: - libxl__device_physdisk_major_minor(dev, &major, &minor); - flexarray_append(back, "physical-device"); - flexarray_append(back, libxl__sprintf(gc, "%x:%x", major, minor)); - - flexarray_append(back, "params"); - flexarray_append(back, dev); - - assert(device.backend_kind == LIBXL__DEVICE_KIND_VBD); - break; - case LIBXL_DISK_BACKEND_TAP: - dev = libxl__blktap_devpath(gc, disk->pdev_path, disk->format); - if (!dev) { - LOG(ERROR, "failed to get blktap devpath for %p\n", - disk->pdev_path); + xs_transaction_t t = XBT_NULL; + + for (;;) { + rc = libxl__xs_transaction_start(gc, &t); + if (rc) goto out; + + if (get_vdev) { + assert(get_vdev_user); + disk->vdev = get_vdev(gc, get_vdev_user, t); + if (disk->vdev == NULL) { rc = ERROR_FAIL; - goto out_free; + goto out; } - flexarray_append(back, "tapdisk-params"); - flexarray_append(back, libxl__sprintf(gc, "%s:%s", - libxl__device_disk_string_of_format(disk->format), - disk->pdev_path)); - - /* now create a phy device to export the device to the guest */ - goto do_backend_phy; - case LIBXL_DISK_BACKEND_QDISK: - flexarray_append(back, "params"); - flexarray_append(back, libxl__sprintf(gc, "%s:%s", - libxl__device_disk_string_of_format(disk->format), disk->pdev_path)); - assert(device.backend_kind == LIBXL__DEVICE_KIND_QDISK); - break; - default: - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "unrecognized disk backend type: %d\n", disk->backend); + } + + rc = libxl__device_disk_setdefault(gc, disk); + if (rc) goto out; + + if (front) + flexarray_free(front); + front = flexarray_make(16, 1); + if (!front) { + rc = ERROR_NOMEM; + goto out; + } + if (back) + flexarray_free(back); + back = flexarray_make(16, 1); + if (!back) { + rc = ERROR_NOMEM; + goto out_free; + } + + if (disk->script) { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "External block scripts" + " not yet supported, sorry"); rc = ERROR_INVAL; goto out_free; + } + + rc = libxl__device_from_disk(gc, domid, disk, &device); + if (rc != 0) { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "Invalid or unsupported" + " virtual disk identifier %s", disk->vdev); + goto out_free; + } + + switch (disk->backend) { + case LIBXL_DISK_BACKEND_PHY: + dev = disk->pdev_path; + do_backend_phy: + libxl__device_physdisk_major_minor(dev, &major, &minor); + flexarray_append(back, "physical-device"); + flexarray_append(back, libxl__sprintf(gc, "%x:%x", major, minor)); + + flexarray_append(back, "params"); + flexarray_append(back, dev); + + assert(device.backend_kind == LIBXL__DEVICE_KIND_VBD); + break; + case LIBXL_DISK_BACKEND_TAP: + dev = libxl__blktap_devpath(gc, disk->pdev_path, disk->format); + if (!dev) { + LOG(ERROR, "failed to get blktap devpath for %p\n", + disk->pdev_path); + rc = ERROR_FAIL; + goto out_free; + } + flexarray_append(back, "tapdisk-params"); + flexarray_append(back, libxl__sprintf(gc, "%s:%s", + libxl__device_disk_string_of_format(disk->format), + disk->pdev_path)); + + /* now create a phy device to export the device to the guest */ + goto do_backend_phy; + case LIBXL_DISK_BACKEND_QDISK: + flexarray_append(back, "params"); + flexarray_append(back, libxl__sprintf(gc, "%s:%s", + libxl__device_disk_string_of_format(disk->format), disk->pdev_path)); + assert(device.backend_kind == LIBXL__DEVICE_KIND_QDISK); + break; + default: + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "unrecognized disk backend type: %d\n", disk->backend); + rc = ERROR_INVAL; + goto out_free; + } + + flexarray_append(back, "frontend-id"); + flexarray_append(back, libxl__sprintf(gc, "%d", domid)); + flexarray_append(back, "online"); + flexarray_append(back, "1"); + flexarray_append(back, "removable"); + flexarray_append(back, libxl__sprintf(gc, "%d", (disk->removable) ? 1 : 0)); + flexarray_append(back, "bootable"); + flexarray_append(back, libxl__sprintf(gc, "%d", 1)); + flexarray_append(back, "state"); + flexarray_append(back, libxl__sprintf(gc, "%d", 1)); + flexarray_append(back, "dev"); + flexarray_append(back, disk->vdev); + flexarray_append(back, "type"); + flexarray_append(back, libxl__device_disk_string_of_backend(disk->backend)); + flexarray_append(back, "mode"); + flexarray_append(back, disk->readwrite ? "w" : "r"); + flexarray_append(back, "device-type"); + flexarray_append(back, disk->is_cdrom ? "cdrom" : "disk"); + + flexarray_append(front, "backend-id"); + flexarray_append(front, libxl__sprintf(gc, "%d", disk->backend_domid)); + flexarray_append(front, "state"); + flexarray_append(front, libxl__sprintf(gc, "%d", 1)); + flexarray_append(front, "virtual-device"); + flexarray_append(front, libxl__sprintf(gc, "%d", device.devid)); + flexarray_append(front, "device-type"); + flexarray_append(front, disk->is_cdrom ? "cdrom" : "disk"); + + libxl__device_generic_add(gc, t, &device, + libxl__xs_kvs_of_flexarray(gc, back, back->count), + libxl__xs_kvs_of_flexarray(gc, front, front->count)); + + rc = libxl__xs_transaction_commit(gc, &t); + if (!rc) break; + if (rc < 0) goto out_free; } - flexarray_append(back, "frontend-id"); - flexarray_append(back, libxl__sprintf(gc, "%d", domid)); - flexarray_append(back, "online"); - flexarray_append(back, "1"); - flexarray_append(back, "removable"); - flexarray_append(back, libxl__sprintf(gc, "%d", (disk->removable) ? 1 : 0)); - flexarray_append(back, "bootable"); - flexarray_append(back, libxl__sprintf(gc, "%d", 1)); - flexarray_append(back, "state"); - flexarray_append(back, libxl__sprintf(gc, "%d", 1)); - flexarray_append(back, "dev"); - flexarray_append(back, disk->vdev); - flexarray_append(back, "type"); - flexarray_append(back, libxl__device_disk_string_of_backend(disk->backend)); - flexarray_append(back, "mode"); - flexarray_append(back, disk->readwrite ? "w" : "r"); - flexarray_append(back, "device-type"); - flexarray_append(back, disk->is_cdrom ? "cdrom" : "disk"); - - flexarray_append(front, "backend-id"); - flexarray_append(front, libxl__sprintf(gc, "%d", disk->backend_domid)); - flexarray_append(front, "state"); - flexarray_append(front, libxl__sprintf(gc, "%d", 1)); - flexarray_append(front, "virtual-device"); - flexarray_append(front, libxl__sprintf(gc, "%d", device.devid)); - flexarray_append(front, "device-type"); - flexarray_append(front, disk->is_cdrom ? "cdrom" : "disk"); - - libxl__device_generic_add(gc, t, &device, - libxl__xs_kvs_of_flexarray(gc, back, back->count), - libxl__xs_kvs_of_flexarray(gc, front, front->count)); - rc = 0; out_free: flexarray_free(back); flexarray_free(front); out: + libxl__xs_transaction_abort(gc, &t); return rc; } +int libxl__device_disk_add(libxl__gc *gc, uint32_t domid, + libxl_device_disk *disk) +{ + return device_disk_add(gc, domid, disk, NULL, NULL); +} + int libxl_device_disk_add(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk) { GC_INIT(ctx); - int rc = libxl__device_disk_add(gc, domid, XBT_NULL, disk); + int rc = libxl__device_disk_add(gc, domid, disk); GC_FREE; return rc; } @@ -2177,9 +2221,10 @@ out: /* libxl__alloc_vdev only works on the local domain, that is the domain * where the toolstack is running */ -static char * libxl__alloc_vdev(libxl__gc *gc, const char *blkdev_start, +static char * libxl__alloc_vdev(libxl__gc *gc, void *get_vdev_user, xs_transaction_t t) { + const char *blkdev_start = (const char *) get_vdev_user; int devid = 0, disk = 0, part = 0; char *dompath = libxl__xs_get_dompath(gc, LIBXL_TOOLSTACK_DOMID); @@ -2215,9 +2260,8 @@ char * libxl__device_disk_local_attach(l libxl_ctx *ctx = gc->owner; char *dev = NULL, *be_path = NULL; char *ret = NULL; - int rc, xs_ret; + int rc; libxl__device device; - xs_transaction_t t = XBT_NULL; if (in_disk->pdev_path == NULL) return NULL; @@ -2261,27 +2305,10 @@ char * libxl__device_disk_local_attach(l break; case LIBXL_DISK_BACKEND_QDISK: if (disk->format != LIBXL_DISK_FORMAT_RAW) { - do { - t = xs_transaction_start(ctx->xsh); - if (t == XBT_NULL) { - LOG(ERROR, "failed to start a xenstore transaction"); - goto out; - } - disk->vdev = libxl__alloc_vdev(gc, blkdev_start, t); - if (disk->vdev == NULL) { - LOG(ERROR, "libxl__alloc_vdev failed"); - goto out; - } - if (libxl__device_disk_add(gc, LIBXL_TOOLSTACK_DOMID, - t, disk)) { - LOG(ERROR, "libxl_device_disk_add failed"); - goto out; - } - xs_ret = xs_transaction_end(ctx->xsh, t, 0); - } while (xs_ret == 0 && errno == EAGAIN); - t = XBT_NULL; - if (xs_ret == 0) { - LOGE(ERROR, "xenstore transaction failed"); + if (device_disk_add(gc, LIBXL_TOOLSTACK_DOMID, disk, + libxl__alloc_vdev, + (void *) blkdev_start)) { + LOG(ERROR, "libxl_device_disk_add failed"); goto out; } dev = GCSPRINTF("/dev/%s", disk->vdev); @@ -2310,10 +2337,7 @@ char * libxl__device_disk_local_attach(l return ret; out: - if (t != XBT_NULL) - xs_transaction_end(ctx->xsh, t, 1); - else - libxl__device_disk_local_detach(gc, disk); + libxl__device_disk_local_detach(gc, disk); return NULL; } diff -r fece26a64f9e -r f5febaba5484 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Thu Jul 26 16:47:28 2012 +0100 +++ b/tools/libxl/libxl_internal.h Thu Jul 26 16:47:29 2012 +0100 @@ -1339,7 +1339,7 @@ _hidden int libxl__device_from_disk(libx libxl_device_disk *disk, libxl__device *device); _hidden int libxl__device_disk_add(libxl__gc *gc, uint32_t domid, - xs_transaction_t t, libxl_device_disk *disk); + libxl_device_disk *disk); /* * Make a disk available in this (the control) domain. Returns path to _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jul 28 03:00:28 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Jul 2012 03:00:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGO-0001nf-H5; Sat, 28 Jul 2012 03:00:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGM-0001nM-Rr for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:19 +0000 Received: from [85.158.138.51:11575] by server-5.bemta-3.messagelabs.com id 02/6B-28237-1C553105; Sat, 28 Jul 2012 03:00:17 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-174.messagelabs.com!1343444415!29211208!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 27936 invoked from network); 28 Jul 2012 03:00:16 -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; 28 Jul 2012 03:00:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGI-0003Pz-8m for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuxGH-0002jL-Td for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:13 +0000 Message-Id: Date: Sat, 28 Jul 2012 03:00:13 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: make libxl_cdrom_insert async. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343314698 -3600 # Node ID 3666e9712eaf6d4908505cab86e2cfd20d1b72f1 # Parent b444cce77ce0605cf7d743fcac7825a3119a0701 libxl: make libxl_cdrom_insert async. This functionality is a bit of a mess and several configurations are not properly supported. The protocol for changing is basically to change the params node in the disk xenstore backend. There is no interlock or error reporting in this protocol. Completely removing the device and recreating it is not necessary nor expected. For reference the equivalent xend code is tools/python/xen/xend/server/blkif.py::BlkifController::reconfigureDevice(). Device model stub domains are not supported. There appears to be no way correctly to do a media change on the emulated device while also changing the stub domains PV backend to point to the new backend. Reworking this is a significant task deferred until 4.3. xend (via the equivalent "xm block-configure" functionality) also does not support media change for stub domains (confirmed by code inspection and experiment). Unlike xend this version errors out instead of silently not achieving anything in this case. There is no support for qemu-xen (upstream) media change. I expect this is supported on the qemu side and required QMP plumbing on the libxl side. Again this is deferred until 4.3. On the plus side the current implementation is trivially "asynchronous". Adds a libxl__xs_writev_atonce helper to write a key-value list to xenstore in one go. Tested with Windows 7. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r b444cce77ce0 -r 3666e9712eaf tools/libxl/libxl.c --- a/tools/libxl/libxl.c Thu Jul 26 15:41:54 2012 +0100 +++ b/tools/libxl/libxl.c Thu Jul 26 15:58:18 2012 +0100 @@ -2076,17 +2076,49 @@ int libxl_device_disk_getinfo(libxl_ctx return 0; } -int libxl_cdrom_insert(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk) +int libxl_cdrom_insert(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk, + const libxl_asyncop_how *ao_how) { - int num, i; - uint32_t stubdomid; - libxl_device_disk *disks; - int ret = ERROR_FAIL; - - if (!disk->pdev_path) { - disk->pdev_path = strdup(""); - disk->format = LIBXL_DISK_FORMAT_EMPTY; + AO_CREATE(ctx, domid, ao_how); + int num = 0, i; + libxl_device_disk *disks = NULL; + int rc, dm_ver; + + libxl__device device; + const char * path; + + flexarray_t *insert = NULL; + + libxl_domain_type type = libxl__domain_type(gc, domid); + if (type == LIBXL_DOMAIN_TYPE_INVALID) { + rc = ERROR_FAIL; + goto out; } + if (type != LIBXL_DOMAIN_TYPE_HVM) { + LOG(ERROR, "cdrom-insert requires an HVM domain"); + rc = ERROR_INVAL; + goto out; + } + + if (libxl_get_stubdom_id(ctx, domid) != 0) { + LOG(ERROR, "cdrom-insert doesn't work for stub domains"); + rc = ERROR_INVAL; + goto out; + } + + dm_ver = libxl__device_model_version_running(gc, domid); + if (dm_ver == -1) { + LOG(ERROR, "cannot determine device model version"); + rc = ERROR_FAIL; + goto out; + } + if (dm_ver != LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL) { + LOG(ERROR, "cdrom-insert does not work with %s", + libxl_device_model_version_to_string(dm_ver)); + rc = ERROR_INVAL; + goto out; + } + disks = libxl_device_disk_list(ctx, domid, &num); for (i = 0; i < num; i++) { if (disks[i].is_cdrom && !strcmp(disk->vdev, disks[i].vdev)) @@ -2095,23 +2127,52 @@ int libxl_cdrom_insert(libxl_ctx *ctx, u } if (i == num) { LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "Virtual device not found"); + rc = ERROR_FAIL; goto out; } - ret = 0; - - libxl_device_disk_remove(ctx, domid, disks + i, 0); - libxl_device_disk_add(ctx, domid, disk); - stubdomid = libxl_get_stubdom_id(ctx, domid); - if (stubdomid) { - libxl_device_disk_remove(ctx, stubdomid, disks + i, 0); - libxl_device_disk_add(ctx, stubdomid, disk); + rc = libxl__device_disk_setdefault(gc, disk); + if (rc) goto out; + + if (!disk->pdev_path) { + disk->pdev_path = libxl__strdup(NOGC, ""); + disk->format = LIBXL_DISK_FORMAT_EMPTY; } + + rc = libxl__device_from_disk(gc, domid, disk, &device); + if (rc) goto out; + path = libxl__device_backend_path(gc, &device); + + insert = flexarray_make(4, 1); + + flexarray_append_pair(insert, "type", + libxl__device_disk_string_of_backend(disk->backend)); + if (disk->format != LIBXL_DISK_FORMAT_EMPTY) + flexarray_append_pair(insert, "params", + GCSPRINTF("%s:%s", + libxl__device_disk_string_of_format(disk->format), + disk->pdev_path)); + else + flexarray_append_pair(insert, "params", ""); + + rc = libxl__xs_writev_atonce(gc, path, + libxl__xs_kvs_of_flexarray(gc, insert, insert->count)); + if (rc) goto out; + + /* success, no actual async */ + libxl__ao_complete(egc, ao, 0); + + rc = 0; + out: for (i = 0; i < num; i++) libxl_device_disk_dispose(&disks[i]); free(disks); - return ret; + + if (insert) flexarray_free(insert); + + if (rc) return AO_ABORT(rc); + return AO_INPROGRESS; } /* libxl__alloc_vdev only works on the local domain, that is the domain diff -r b444cce77ce0 -r 3666e9712eaf tools/libxl/libxl.h --- a/tools/libxl/libxl.h Thu Jul 26 15:41:54 2012 +0100 +++ b/tools/libxl/libxl.h Thu Jul 26 15:58:18 2012 +0100 @@ -691,7 +691,8 @@ int libxl_device_disk_getinfo(libxl_ctx * Insert a CD-ROM device. A device corresponding to disk must already * be attached to the guest. */ -int libxl_cdrom_insert(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk); +int libxl_cdrom_insert(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk, + const libxl_asyncop_how *ao_how); /* Network Interfaces */ int libxl_device_nic_add(libxl_ctx *ctx, uint32_t domid, libxl_device_nic *nic); diff -r b444cce77ce0 -r 3666e9712eaf tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Thu Jul 26 15:41:54 2012 +0100 +++ b/tools/libxl/libxl_internal.h Thu Jul 26 15:58:18 2012 +0100 @@ -498,8 +498,13 @@ _hidden int libxl__remove_file_or_direct _hidden char **libxl__xs_kvs_of_flexarray(libxl__gc *gc, flexarray_t *array, int length); +/* treats kvs as pairs of keys and values and writes each to dir. */ _hidden int libxl__xs_writev(libxl__gc *gc, xs_transaction_t t, const char *dir, char **kvs); +/* _atonce creates a transaction and writes all keys at once */ +_hidden int libxl__xs_writev_atonce(libxl__gc *gc, + const char *dir, char **kvs); + _hidden int libxl__xs_write(libxl__gc *gc, xs_transaction_t t, const char *path, const char *fmt, ...) PRINTF_ATTRIBUTE(4, 5); /* Each fn returns 0 on success. diff -r b444cce77ce0 -r 3666e9712eaf tools/libxl/libxl_xshelp.c --- a/tools/libxl/libxl_xshelp.c Thu Jul 26 15:41:54 2012 +0100 +++ b/tools/libxl/libxl_xshelp.c Thu Jul 26 15:58:18 2012 +0100 @@ -61,6 +61,31 @@ int libxl__xs_writev(libxl__gc *gc, xs_t return 0; } +int libxl__xs_writev_atonce(libxl__gc *gc, + const char *dir, char *kvs[]) +{ + int rc; + xs_transaction_t t = XBT_NULL; + + for (;;) { + rc = libxl__xs_transaction_start(gc, &t); + if (rc) goto out; + + rc = libxl__xs_writev(gc, t, dir, kvs); + if (rc) goto out; + + rc = libxl__xs_transaction_commit(gc, &t); + if (!rc) break; + if (rc<0) goto out; + } + +out: + libxl__xs_transaction_abort(gc, &t); + + return rc; + +} + int libxl__xs_write(libxl__gc *gc, xs_transaction_t t, const char *path, const char *fmt, ...) { diff -r b444cce77ce0 -r 3666e9712eaf tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Thu Jul 26 15:41:54 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Thu Jul 26 15:58:18 2012 +0100 @@ -2004,7 +2004,7 @@ start: case LIBXL_EVENT_TYPE_DISK_EJECT: /* XXX what is this for? */ - libxl_cdrom_insert(ctx, domid, &event->u.disk_eject.disk); + libxl_cdrom_insert(ctx, domid, &event->u.disk_eject.disk, NULL); break; default:; @@ -2225,7 +2225,7 @@ static void cd_insert(const char *dom, c disk.backend_domid = 0; - libxl_cdrom_insert(ctx, domid, &disk); + libxl_cdrom_insert(ctx, domid, &disk, NULL); libxl_device_disk_dispose(&disk); free(buf); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jul 28 03:00:28 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Jul 2012 03:00:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGQ-0001o8-Oz; Sat, 28 Jul 2012 03:00:22 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGQ-0001np-16 for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:22 +0000 Received: from [85.158.139.83:8268] by server-11.bemta-5.messagelabs.com id 3F/79-20400-4C553105; Sat, 28 Jul 2012 03:00:20 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-182.messagelabs.com!1343444418!29371226!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 17754 invoked from network); 28 Jul 2012 03:00:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 28 Jul 2012 03:00:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGL-0003Q2-U7 for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuxGI-0002jb-Nt for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:17 +0000 Message-Id: Date: Sat, 28 Jul 2012 03:00:13 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: fix removal of secondary consoles X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343317648 -3600 # Node ID fece26a64f9e8c8be2b5a5e49f1fd430340eac8c # Parent 3666e9712eaf6d4908505cab86e2cfd20d1b72f1 libxl: fix removal of secondary consoles Secondary consoles are processed by libxl with the rest of the devices by calling libxl__initiate_device_remove that waits for the device to reach state 6 before procceeding with the removal. When libxl is destroying the console devices, Qemu is already dead or dying, and xenconsoled completely ignores the state backend entry for console devices, since it performs the cleanup based on the result of reads/writes to the tty. Since we don't want to execute hotplug scripts for consoles, leave the behaviour as it was previously, and just nuke the backend/frontend xenstore entries by calling libxl__device_destroy. Report: http://markmail.org/message/yqgppcsdip6tnmh6 Reported-by: Ian Campbell Signed-off-by: Roger Pau Monne Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r 3666e9712eaf -r fece26a64f9e tools/libxl/libxl_device.c --- a/tools/libxl/libxl_device.c Thu Jul 26 15:58:18 2012 +0100 +++ b/tools/libxl/libxl_device.c Thu Jul 26 16:47:28 2012 +0100 @@ -81,6 +81,8 @@ static int libxl__num_devices(libxl__gc 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); @@ -522,10 +524,18 @@ void libxl__devices_destroy(libxl__egc * path = libxl__xs_read(gc, XBT_NULL, path); GCNEW(dev); if (path && libxl__parse_backend_path(gc, path, dev) == 0) { - aodev = &aodevs->array[numdev]; dev->domid = domid; dev->kind = kind; dev->devid = atoi(devs[j]); + if (dev->backend_kind == LIBXL__DEVICE_KIND_CONSOLE) { + /* Currently console devices can be destroyed + * synchronously by just removing xenstore entries, + * this is what libxl__device_destroy does. + */ + libxl__device_destroy(gc, dev); + continue; + } + aodev = &aodevs->array[numdev]; aodev->action = DEVICE_DISCONNECT; aodev->dev = dev; aodev->callback = libxl__ao_devices_callback; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jul 28 03:00:28 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Jul 2012 03:00:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGO-0001na-Dv; Sat, 28 Jul 2012 03:00:20 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGM-0001nN-OR for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:19 +0000 Received: from [85.158.143.99:59040] by server-3.bemta-4.messagelabs.com id A2/1E-01511-2C553105; Sat, 28 Jul 2012 03:00:18 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-216.messagelabs.com!1343444414!29155921!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 4681 invoked from network); 28 Jul 2012 03:00:15 -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; 28 Jul 2012 03:00:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGH-0003Pv-Nq for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuxGG-0002iv-Ow for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:13 +0000 Message-Id: Date: Sat, 28 Jul 2012 03:00:12 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: have NUMA placement deal with cpupools X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Dario Faggioli # Date 1343313714 -3600 # Node ID b444cce77ce0605cf7d743fcac7825a3119a0701 # Parent 4165d71479f92c58f3b7029d19e69cd779345d9a libxl: have NUMA placement deal with cpupools In such a way that only the cpus belonging to the cpupool of the domain being placed are considered for the placement itself. This happens by filtering out all the nodes in which the cpupool has not any cpu from the placement candidates. After that ---as cpu pooling not necessarily happens at NUMA nodes boundaries--- we also make sure only the actual cpus that are part of the pool are considered when counting how much processors a placement candidate provides. Signed-off-by: Dario Faggioli Acked-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r 4165d71479f9 -r b444cce77ce0 tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Thu Jul 26 15:41:54 2012 +0100 +++ b/tools/libxl/libxl_dom.c Thu Jul 26 15:41:54 2012 +0100 @@ -128,26 +128,30 @@ static int numa_cmpf(const libxl__numa_c } /* The actual automatic NUMA placement routine */ -static int numa_place_domain(libxl__gc *gc, libxl_domain_build_info *info) +static int numa_place_domain(libxl__gc *gc, uint32_t domid, + libxl_domain_build_info *info) { int found; libxl__numa_candidate candidate; libxl_bitmap candidate_nodemap; - libxl_cpupoolinfo *pinfo; - int nr_pools, rc = 0; + libxl_cpupoolinfo cpupool_info; + int i, cpupool, rc = 0; uint32_t memkb; libxl__numa_candidate_init(&candidate); libxl_bitmap_init(&candidate_nodemap); - /* First of all, if cpupools are in use, better not to mess with them */ - pinfo = libxl_list_cpupool(CTX, &nr_pools); - if (!pinfo) - return ERROR_FAIL; - if (nr_pools > 1) { - LOG(NOTICE, "Skipping NUMA placement as cpupools are in use"); - goto out; - } + /* + * Extract the cpumap from the cpupool the domain belong to. In fact, + * it only makes sense to consider the cpus/nodes that are in there + * for placement. + */ + rc = cpupool = libxl__domain_cpupool(gc, domid); + if (rc < 0) + return rc; + rc = libxl_cpupool_info(CTX, &cpupool_info, cpupool); + if (rc) + return rc; rc = libxl_domain_need_memory(CTX, info, &memkb); if (rc) @@ -159,7 +163,8 @@ static int numa_place_domain(libxl__gc * /* Find the best candidate with enough free memory and at least * as much pcpus as the domain has vcpus. */ - rc = libxl__get_numa_candidate(gc, memkb, info->max_vcpus, 0, 0, + rc = libxl__get_numa_candidate(gc, memkb, info->max_vcpus, + 0, 0, &cpupool_info.cpumap, numa_cmpf, &candidate, &found); if (rc) goto out; @@ -175,6 +180,13 @@ static int numa_place_domain(libxl__gc * if (rc) goto out; + /* Avoid trying to set the affinity to cpus that might be in the + * nodemap but not in our cpupool. */ + libxl_for_each_set_bit(i, info->cpumap) { + if (!libxl_bitmap_test(&cpupool_info.cpumap, i)) + libxl_bitmap_reset(&info->cpumap, i); + } + LOG(DETAIL, "NUMA placement candidate with %d nodes, %d cpus and " "%"PRIu32" KB free selected", candidate.nr_nodes, candidate.nr_cpus, candidate.free_memkb / 1024); @@ -182,7 +194,7 @@ static int numa_place_domain(libxl__gc * out: libxl__numa_candidate_dispose(&candidate); libxl_bitmap_dispose(&candidate_nodemap); - libxl_cpupoolinfo_list_free(pinfo, nr_pools); + libxl_cpupoolinfo_dispose(&cpupool_info); return rc; } @@ -214,7 +226,7 @@ int libxl__build_pre(libxl__gc *gc, uint return ERROR_INVAL; } - rc = numa_place_domain(gc, info); + rc = numa_place_domain(gc, domid, info); if (rc) return rc; } diff -r 4165d71479f9 -r b444cce77ce0 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Thu Jul 26 15:41:54 2012 +0100 +++ b/tools/libxl/libxl_internal.h Thu Jul 26 15:41:54 2012 +0100 @@ -2568,6 +2568,10 @@ typedef int (*libxl__numa_candidate_cmpf * other hand, if not even one single candidate can be found, the function * still returns successfully but cndt_found will be zero. * + * Finally, suitable_cpumap is useful for telling that only the cpus in that + * mask should be considered when generating placement candidates (for + * example because of cpupools). + * * It is up to the function to properly allocate cndt_out (by calling * libxl__numa_candidate_alloc()), while it is the caller that should init * (libxl__numa_candidate_init()) and free (libxl__numa_candidate_dispose()) @@ -2576,6 +2580,7 @@ typedef int (*libxl__numa_candidate_cmpf _hidden int libxl__get_numa_candidate(libxl__gc *gc, uint32_t min_free_memkb, int min_cpus, int min_nodes, int max_nodes, + const libxl_bitmap *suitable_cpumap, libxl__numa_candidate_cmpf numa_cmpf, libxl__numa_candidate *cndt_out, int *cndt_found); diff -r 4165d71479f9 -r b444cce77ce0 tools/libxl/libxl_numa.c --- a/tools/libxl/libxl_numa.c Thu Jul 26 15:41:54 2012 +0100 +++ b/tools/libxl/libxl_numa.c Thu Jul 26 15:41:54 2012 +0100 @@ -105,30 +105,48 @@ static int comb_next(comb_iter_t it, int /* NUMA automatic placement (see libxl_internal.h for details) */ /* - * This function turns a k-combination iterator into a node map. - * This means the bits in the node map corresponding to the indexes - * of the given combination are the ones that will be set. - * For example, if the iterator represents the combination { 0, 2, 4}, - * the node map will have bits #0, #2 and #4 set. + * This function turns a k-combination iterator into a node map, + * given another map, telling us which nodes should be considered. + * + * This means the bits that are set in suitable_nodemap and that + * corresponds to the indexes of the given combination are the ones + * that will be set in nodemap. + * + * For example, given a fully set suitable_nodemap, if the iterator + * represents the combination { 0, 2, 4}, nodmeap will have bits #0, + * #2 and #4 set. + * On the other hand, if, say, suitable_nodemap=01011011, the same + * iterator will cause bits #1, #4 and #7 of nodemap to be set. */ -static void comb_get_nodemap(comb_iter_t it, libxl_bitmap *nodemap, int k) +static void comb_get_nodemap(comb_iter_t it, libxl_bitmap *suitable_nodemap, + libxl_bitmap *nodemap, int k) { - int i; + int i, m = 0, n = 0; libxl_bitmap_set_none(nodemap); - for (i = 0; i < k; i++) - libxl_bitmap_set(nodemap, it[i]); + libxl_for_each_set_bit(i, *suitable_nodemap) { + /* Check wether the n-th set bit of suitable_nodemap + * matches with the m-th element of the iterator (and, + * only if it does, advance to the next one) */ + if (m < k && n == it[m]) { + libxl_bitmap_set(nodemap, i); + m++; + } + n++; + } } /* Retrieve the number of cpus that the nodes that are part of the nodemap - * span. */ + * span and are also set in suitable_cpumap. */ static int nodemap_to_nr_cpus(libxl_cputopology *tinfo, int nr_cpus, + const libxl_bitmap *suitable_cpumap, const libxl_bitmap *nodemap) { int i, nodes_cpus = 0; for (i = 0; i < nr_cpus; i++) { - if (libxl_bitmap_test(nodemap, tinfo[i].node)) + if (libxl_bitmap_test(suitable_cpumap, i) && + libxl_bitmap_test(nodemap, tinfo[i].node)) nodes_cpus++; } return nodes_cpus; @@ -242,6 +260,7 @@ static int count_cpus_per_node(libxl_cpu int libxl__get_numa_candidate(libxl__gc *gc, uint32_t min_free_memkb, int min_cpus, int min_nodes, int max_nodes, + const libxl_bitmap *suitable_cpumap, libxl__numa_candidate_cmpf numa_cmpf, libxl__numa_candidate *cndt_out, int *cndt_found) @@ -249,11 +268,12 @@ int libxl__get_numa_candidate(libxl__gc libxl__numa_candidate new_cndt; libxl_cputopology *tinfo = NULL; libxl_numainfo *ninfo = NULL; - int nr_nodes = 0, nr_cpus = 0; - libxl_bitmap nodemap; + int nr_nodes = 0, nr_suit_nodes, nr_cpus = 0; + libxl_bitmap suitable_nodemap, nodemap; int rc = 0; libxl_bitmap_init(&nodemap); + libxl_bitmap_init(&suitable_nodemap); libxl__numa_candidate_init(&new_cndt); /* Get platform info and prepare the map for testing the combinations */ @@ -300,6 +320,15 @@ int libxl__get_numa_candidate(libxl__gc if (rc) goto out; + /* Allocate and prepare the map of the node that can be utilized for + * placement, basing on the map of suitable cpus. */ + rc = libxl_node_bitmap_alloc(CTX, &suitable_nodemap, 0); + if (rc) + goto out; + rc = libxl_cpumap_to_nodemap(CTX, suitable_cpumap, &suitable_nodemap); + if (rc) + goto out; + /* * If the minimum number of NUMA nodes is not explicitly specified * (i.e., min_nodes == 0), we try to figure out a sensible number of nodes @@ -317,10 +346,14 @@ int libxl__get_numa_candidate(libxl__gc else min_nodes = (min_cpus + cpus_per_node - 1) / cpus_per_node; } - if (min_nodes > nr_nodes) - min_nodes = nr_nodes; - if (!max_nodes || max_nodes > nr_nodes) - max_nodes = nr_nodes; + /* We also need to be sure we do not exceed the number of + * nodes we are allowed to use. */ + nr_suit_nodes = libxl_bitmap_count_set(&suitable_nodemap); + + if (min_nodes > nr_suit_nodes) + min_nodes = nr_suit_nodes; + if (!max_nodes || max_nodes > nr_suit_nodes) + max_nodes = nr_suit_nodes; if (min_nodes > max_nodes) { LOG(ERROR, "Inconsistent minimum or maximum number of guest nodes"); rc = ERROR_INVAL; @@ -353,12 +386,16 @@ int libxl__get_numa_candidate(libxl__gc * amount of free memory and number of cpus) and it can concur to * become our best placement iff it passes the check. */ - for (comb_ok = comb_init(gc, &comb_iter, nr_nodes, min_nodes); comb_ok; - comb_ok = comb_next(comb_iter, nr_nodes, min_nodes)) { + for (comb_ok = comb_init(gc, &comb_iter, nr_suit_nodes, min_nodes); + comb_ok; + comb_ok = comb_next(comb_iter, nr_suit_nodes, min_nodes)) { uint32_t nodes_free_memkb; int nodes_cpus; - comb_get_nodemap(comb_iter, &nodemap, min_nodes); + /* Get the nodemap for the combination, only considering + * suitable nodes. */ + comb_get_nodemap(comb_iter, &suitable_nodemap, + &nodemap, min_nodes); /* If there is not enough memory in this combination, skip it * and go generating the next one... */ @@ -367,7 +404,8 @@ int libxl__get_numa_candidate(libxl__gc continue; /* And the same applies if this combination is short in cpus */ - nodes_cpus = nodemap_to_nr_cpus(tinfo, nr_cpus, &nodemap); + nodes_cpus = nodemap_to_nr_cpus(tinfo, nr_cpus, suitable_cpumap, + &nodemap); if (min_cpus && nodes_cpus < min_cpus) continue; @@ -378,7 +416,7 @@ int libxl__get_numa_candidate(libxl__gc libxl__numa_candidate_put_nodemap(gc, &new_cndt, &nodemap); new_cndt.nr_vcpus = nodemap_to_nr_vcpus(gc, tinfo, &nodemap); new_cndt.free_memkb = nodes_free_memkb; - new_cndt.nr_nodes = min_nodes; + new_cndt.nr_nodes = libxl_bitmap_count_set(&nodemap); new_cndt.nr_cpus = nodes_cpus; /* @@ -392,8 +430,9 @@ int libxl__get_numa_candidate(libxl__gc LOG(DEBUG, "New best NUMA placement candidate found: " "nr_nodes=%d, nr_cpus=%d, nr_vcpus=%d, " - "free_memkb=%"PRIu32"", min_nodes, new_cndt.nr_cpus, - new_cndt.nr_vcpus, new_cndt.free_memkb / 1024); + "free_memkb=%"PRIu32"", new_cndt.nr_nodes, + new_cndt.nr_cpus, new_cndt.nr_vcpus, + new_cndt.free_memkb / 1024); libxl__numa_candidate_put_nodemap(gc, cndt_out, &nodemap); cndt_out->nr_vcpus = new_cndt.nr_vcpus; @@ -413,6 +452,7 @@ int libxl__get_numa_candidate(libxl__gc out: libxl_bitmap_dispose(&nodemap); + libxl_bitmap_dispose(&suitable_nodemap); libxl__numa_candidate_dispose(&new_cndt); libxl_numainfo_list_free(ninfo, nr_nodes); libxl_cputopology_list_free(tinfo, nr_cpus); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jul 28 03:00:28 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Jul 2012 03:00:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGS-0001oe-UM; Sat, 28 Jul 2012 03:00:24 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGR-0001nN-W0 for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:24 +0000 Received: from [85.158.143.99:37825] by server-3.bemta-4.messagelabs.com id F8/1E-01511-7C553105; Sat, 28 Jul 2012 03:00:23 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-216.messagelabs.com!1343444421!28232066!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 2520 invoked from network); 28 Jul 2012 03:00:22 -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; 28 Jul 2012 03:00:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGO-0003QH-Qs for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuxGO-0002kv-MW for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:20 +0000 Message-Id: Date: Sat, 28 Jul 2012 03:00:20 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: add option to choose who executes hotplug scripts X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Roger Pau Monne # Date 1343317652 -3600 # Node ID 2e21281b2c10074256f4f964f28ec851baff4244 # Parent 69a0fa5473d379845a486feb538f3fea2b450c53 libxl: add option to choose who executes hotplug scripts Add and option to xl.conf file to decide if hotplug scripts are executed from the toolstack (xl) or from udev as it used to be in the past. This option is only introduced in this patch, but it has no effect since the code to call hotplug scripts from libxl is introduced in a latter patch. This choice will be saved in "libxl/disable_udev", as specified in the DISABLE_UDEV_PATH constant. Signed-off-by: Roger Pau Monne Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r 69a0fa5473d3 -r 2e21281b2c10 docs/man/xl.conf.pod.5 --- a/docs/man/xl.conf.pod.5 Thu Jul 26 16:47:31 2012 +0100 +++ b/docs/man/xl.conf.pod.5 Thu Jul 26 16:47:32 2012 +0100 @@ -55,6 +55,14 @@ default. Default: C<1> +=item B + +If disabled hotplug scripts will be called from udev, as it used to +be in the previous releases. With the default option, hotplug scripts +will be launched by xl directly. + +Default: C<1> + =item B Sets the path to the lock file used by xl to serialise certain diff -r 69a0fa5473d3 -r 2e21281b2c10 tools/examples/xl.conf --- a/tools/examples/xl.conf Thu Jul 26 16:47:31 2012 +0100 +++ b/tools/examples/xl.conf Thu Jul 26 16:47:32 2012 +0100 @@ -15,3 +15,8 @@ # first block device to be used for temporary VM disk mounts #blkdev_start="xvda" + +# default option to run hotplug scripts from xl +# if disabled the old behaviour will be used, and hotplug scripts will be +# launched by udev. +#run_hotplug_scripts=1 diff -r 69a0fa5473d3 -r 2e21281b2c10 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Thu Jul 26 16:47:31 2012 +0100 +++ b/tools/libxl/libxl_create.c Thu Jul 26 16:47:32 2012 +0100 @@ -70,6 +70,8 @@ int libxl__domain_create_info_setdefault libxl_defbool_setdefault(&c_info->oos, true); } + libxl_defbool_setdefault(&c_info->run_hotplug_scripts, true); + return 0; } @@ -384,7 +386,7 @@ int libxl__domain_make(libxl__gc *gc, li uint32_t *domid) { libxl_ctx *ctx = libxl__gc_owner(gc); - int flags, ret, rc; + int flags, ret, rc, nb_vm; char *uuid_string; char *dom_path, *vm_path, *libxl_path; struct xs_permissions roperm[2]; @@ -392,6 +394,7 @@ int libxl__domain_make(libxl__gc *gc, li struct xs_permissions noperm[1]; xs_transaction_t t = 0; xen_domain_handle_t handle; + libxl_vminfo *vm_list; assert(!libxl_domid_valid_guest(*domid)); @@ -505,6 +508,41 @@ retry_transaction: libxl__sprintf(gc, "%s/hvmloader/generation-id-address", dom_path), rwperm, ARRAY_SIZE(rwperm)); + vm_list = libxl_list_vm(ctx, &nb_vm); + if (!vm_list) { + LOG(ERROR, "cannot get number of running guests"); + rc = ERROR_FAIL; + goto out; + } + libxl_vminfo_list_free(vm_list, nb_vm); + int hotplug_setting = libxl__hotplug_settings(gc, t); + if (hotplug_setting < 0) { + LOG(ERROR, "unable to get current hotplug scripts execution setting"); + rc = ERROR_FAIL; + goto out; + } + if (libxl_defbool_val(info->run_hotplug_scripts) != hotplug_setting && + (nb_vm - 1)) { + LOG(ERROR, "cannot change hotplug execution option once set, " + "please shutdown all guests before changing it"); + rc = ERROR_FAIL; + goto out; + } + + if (libxl_defbool_val(info->run_hotplug_scripts)) { + rc = libxl__xs_write_checked(gc, t, DISABLE_UDEV_PATH, "1"); + if (rc) { + LOGE(ERROR, "unable to write %s = 1", DISABLE_UDEV_PATH); + goto out; + } + } else { + rc = libxl__xs_rm_checked(gc, t, DISABLE_UDEV_PATH); + if (rc) { + LOGE(ERROR, "unable to delete %s", DISABLE_UDEV_PATH); + goto out; + } + } + xs_write(ctx->xsh, t, libxl__sprintf(gc, "%s/uuid", vm_path), uuid_string, strlen(uuid_string)); xs_write(ctx->xsh, t, libxl__sprintf(gc, "%s/name", vm_path), info->name, strlen(info->name)); diff -r 69a0fa5473d3 -r 2e21281b2c10 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Thu Jul 26 16:47:31 2012 +0100 +++ b/tools/libxl/libxl_dm.c Thu Jul 26 16:47:32 2012 +0100 @@ -785,6 +785,9 @@ void libxl__spawn_stub_dm(libxl__egc *eg libxl__dm_vifs_from_hvm_guest_config(gc, guest_config, dm_config); + dm_config->c_info.run_hotplug_scripts = + guest_config->c_info.run_hotplug_scripts; + ret = libxl__domain_create_info_setdefault(gc, &dm_config->c_info); if (ret) goto out; ret = libxl__domain_build_info_setdefault(gc, &dm_config->b_info); diff -r 69a0fa5473d3 -r 2e21281b2c10 tools/libxl/libxl_internal.c --- a/tools/libxl/libxl_internal.c Thu Jul 26 16:47:31 2012 +0100 +++ b/tools/libxl/libxl_internal.c Thu Jul 26 16:47:32 2012 +0100 @@ -352,6 +352,25 @@ int libxl__device_model_version_running( return value; } +int libxl__hotplug_settings(libxl__gc *gc, xs_transaction_t t) +{ + int rc = 0; + char *val; + + val = libxl__xs_read(gc, t, DISABLE_UDEV_PATH); + if (!val && errno != ENOENT) { + LOGE(ERROR, "cannot read %s from xenstore", DISABLE_UDEV_PATH); + rc = ERROR_FAIL; + goto out; + } + if (!val) val = "0"; + + rc = !!atoi(val); + +out: + return rc; +} + /* * Local variables: * mode: C diff -r 69a0fa5473d3 -r 2e21281b2c10 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Thu Jul 26 16:47:31 2012 +0100 +++ b/tools/libxl/libxl_internal.h Thu Jul 26 16:47:32 2012 +0100 @@ -91,6 +91,7 @@ #define STUBDOM_CONSOLE_SERIAL 3 #define STUBDOM_SPECIAL_CONSOLES 3 #define TAP_DEVICE_SUFFIX "-emu" +#define DISABLE_UDEV_PATH "libxl/disable_udev" #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0])) @@ -1510,6 +1511,8 @@ _hidden libxl__json_object *libxl__json_ * default is qemu xen traditional */ _hidden int libxl__device_model_version_running(libxl__gc *gc, uint32_t domid); +/* Check how executes hotplug script currently */ +int libxl__hotplug_settings(libxl__gc *gc, xs_transaction_t t); /* * Calling context and GC for event-generating functions: diff -r 69a0fa5473d3 -r 2e21281b2c10 tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Thu Jul 26 16:47:31 2012 +0100 +++ b/tools/libxl/libxl_types.idl Thu Jul 26 16:47:32 2012 +0100 @@ -231,6 +231,7 @@ libxl_domain_create_info = Struct("domai ("xsdata", libxl_key_value_list), ("platformdata", libxl_key_value_list), ("poolid", uint32), + ("run_hotplug_scripts",libxl_defbool), ], dir=DIR_IN) MemKB = UInt(64, init_val = "LIBXL_MEMKB_DEFAULT") diff -r 69a0fa5473d3 -r 2e21281b2c10 tools/libxl/xl.c --- a/tools/libxl/xl.c Thu Jul 26 16:47:31 2012 +0100 +++ b/tools/libxl/xl.c Thu Jul 26 16:47:32 2012 +0100 @@ -39,6 +39,7 @@ int dryrun_only; int force_execution; int autoballoon = 1; char *blkdev_start; +int run_hotplug_scripts = 1; char *lockfile; char *default_vifscript = NULL; char *default_bridge = NULL; @@ -70,6 +71,9 @@ static void parse_global_config(const ch if (!xlu_cfg_get_long (config, "autoballoon", &l, 0)) autoballoon = l; + if (!xlu_cfg_get_long (config, "run_hotplug_scripts", &l, 0)) + run_hotplug_scripts = l; + if (!xlu_cfg_get_string (config, "lockfile", &buf, 0)) lockfile = strdup(buf); else { diff -r 69a0fa5473d3 -r 2e21281b2c10 tools/libxl/xl.h --- a/tools/libxl/xl.h Thu Jul 26 16:47:31 2012 +0100 +++ b/tools/libxl/xl.h Thu Jul 26 16:47:32 2012 +0100 @@ -140,6 +140,7 @@ int xl_child_pid(xlchildnum); /* returns /* global options */ extern int autoballoon; +extern int run_hotplug_scripts; extern int dryrun_only; extern char *lockfile; extern char *default_vifscript; diff -r 69a0fa5473d3 -r 2e21281b2c10 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Thu Jul 26 16:47:31 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Thu Jul 26 16:47:32 2012 +0100 @@ -595,6 +595,7 @@ static void parse_config_data(const char } } + libxl_defbool_set(&c_info->run_hotplug_scripts, run_hotplug_scripts); c_info->type = LIBXL_DOMAIN_TYPE_PV; if (!xlu_cfg_get_string (config, "builder", &buf, 0) && !strncmp(buf, "hvm", strlen(buf))) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jul 28 03:00:28 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Jul 2012 03:00:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGS-0001oe-UM; Sat, 28 Jul 2012 03:00:24 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGR-0001nN-W0 for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:24 +0000 Received: from [85.158.143.99:37825] by server-3.bemta-4.messagelabs.com id F8/1E-01511-7C553105; Sat, 28 Jul 2012 03:00:23 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-216.messagelabs.com!1343444421!28232066!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 2520 invoked from network); 28 Jul 2012 03:00:22 -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; 28 Jul 2012 03:00:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGO-0003QH-Qs for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuxGO-0002kv-MW for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:20 +0000 Message-Id: Date: Sat, 28 Jul 2012 03:00:20 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: add option to choose who executes hotplug scripts X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Roger Pau Monne # Date 1343317652 -3600 # Node ID 2e21281b2c10074256f4f964f28ec851baff4244 # Parent 69a0fa5473d379845a486feb538f3fea2b450c53 libxl: add option to choose who executes hotplug scripts Add and option to xl.conf file to decide if hotplug scripts are executed from the toolstack (xl) or from udev as it used to be in the past. This option is only introduced in this patch, but it has no effect since the code to call hotplug scripts from libxl is introduced in a latter patch. This choice will be saved in "libxl/disable_udev", as specified in the DISABLE_UDEV_PATH constant. Signed-off-by: Roger Pau Monne Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r 69a0fa5473d3 -r 2e21281b2c10 docs/man/xl.conf.pod.5 --- a/docs/man/xl.conf.pod.5 Thu Jul 26 16:47:31 2012 +0100 +++ b/docs/man/xl.conf.pod.5 Thu Jul 26 16:47:32 2012 +0100 @@ -55,6 +55,14 @@ default. Default: C<1> +=item B + +If disabled hotplug scripts will be called from udev, as it used to +be in the previous releases. With the default option, hotplug scripts +will be launched by xl directly. + +Default: C<1> + =item B Sets the path to the lock file used by xl to serialise certain diff -r 69a0fa5473d3 -r 2e21281b2c10 tools/examples/xl.conf --- a/tools/examples/xl.conf Thu Jul 26 16:47:31 2012 +0100 +++ b/tools/examples/xl.conf Thu Jul 26 16:47:32 2012 +0100 @@ -15,3 +15,8 @@ # first block device to be used for temporary VM disk mounts #blkdev_start="xvda" + +# default option to run hotplug scripts from xl +# if disabled the old behaviour will be used, and hotplug scripts will be +# launched by udev. +#run_hotplug_scripts=1 diff -r 69a0fa5473d3 -r 2e21281b2c10 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Thu Jul 26 16:47:31 2012 +0100 +++ b/tools/libxl/libxl_create.c Thu Jul 26 16:47:32 2012 +0100 @@ -70,6 +70,8 @@ int libxl__domain_create_info_setdefault libxl_defbool_setdefault(&c_info->oos, true); } + libxl_defbool_setdefault(&c_info->run_hotplug_scripts, true); + return 0; } @@ -384,7 +386,7 @@ int libxl__domain_make(libxl__gc *gc, li uint32_t *domid) { libxl_ctx *ctx = libxl__gc_owner(gc); - int flags, ret, rc; + int flags, ret, rc, nb_vm; char *uuid_string; char *dom_path, *vm_path, *libxl_path; struct xs_permissions roperm[2]; @@ -392,6 +394,7 @@ int libxl__domain_make(libxl__gc *gc, li struct xs_permissions noperm[1]; xs_transaction_t t = 0; xen_domain_handle_t handle; + libxl_vminfo *vm_list; assert(!libxl_domid_valid_guest(*domid)); @@ -505,6 +508,41 @@ retry_transaction: libxl__sprintf(gc, "%s/hvmloader/generation-id-address", dom_path), rwperm, ARRAY_SIZE(rwperm)); + vm_list = libxl_list_vm(ctx, &nb_vm); + if (!vm_list) { + LOG(ERROR, "cannot get number of running guests"); + rc = ERROR_FAIL; + goto out; + } + libxl_vminfo_list_free(vm_list, nb_vm); + int hotplug_setting = libxl__hotplug_settings(gc, t); + if (hotplug_setting < 0) { + LOG(ERROR, "unable to get current hotplug scripts execution setting"); + rc = ERROR_FAIL; + goto out; + } + if (libxl_defbool_val(info->run_hotplug_scripts) != hotplug_setting && + (nb_vm - 1)) { + LOG(ERROR, "cannot change hotplug execution option once set, " + "please shutdown all guests before changing it"); + rc = ERROR_FAIL; + goto out; + } + + if (libxl_defbool_val(info->run_hotplug_scripts)) { + rc = libxl__xs_write_checked(gc, t, DISABLE_UDEV_PATH, "1"); + if (rc) { + LOGE(ERROR, "unable to write %s = 1", DISABLE_UDEV_PATH); + goto out; + } + } else { + rc = libxl__xs_rm_checked(gc, t, DISABLE_UDEV_PATH); + if (rc) { + LOGE(ERROR, "unable to delete %s", DISABLE_UDEV_PATH); + goto out; + } + } + xs_write(ctx->xsh, t, libxl__sprintf(gc, "%s/uuid", vm_path), uuid_string, strlen(uuid_string)); xs_write(ctx->xsh, t, libxl__sprintf(gc, "%s/name", vm_path), info->name, strlen(info->name)); diff -r 69a0fa5473d3 -r 2e21281b2c10 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Thu Jul 26 16:47:31 2012 +0100 +++ b/tools/libxl/libxl_dm.c Thu Jul 26 16:47:32 2012 +0100 @@ -785,6 +785,9 @@ void libxl__spawn_stub_dm(libxl__egc *eg libxl__dm_vifs_from_hvm_guest_config(gc, guest_config, dm_config); + dm_config->c_info.run_hotplug_scripts = + guest_config->c_info.run_hotplug_scripts; + ret = libxl__domain_create_info_setdefault(gc, &dm_config->c_info); if (ret) goto out; ret = libxl__domain_build_info_setdefault(gc, &dm_config->b_info); diff -r 69a0fa5473d3 -r 2e21281b2c10 tools/libxl/libxl_internal.c --- a/tools/libxl/libxl_internal.c Thu Jul 26 16:47:31 2012 +0100 +++ b/tools/libxl/libxl_internal.c Thu Jul 26 16:47:32 2012 +0100 @@ -352,6 +352,25 @@ int libxl__device_model_version_running( return value; } +int libxl__hotplug_settings(libxl__gc *gc, xs_transaction_t t) +{ + int rc = 0; + char *val; + + val = libxl__xs_read(gc, t, DISABLE_UDEV_PATH); + if (!val && errno != ENOENT) { + LOGE(ERROR, "cannot read %s from xenstore", DISABLE_UDEV_PATH); + rc = ERROR_FAIL; + goto out; + } + if (!val) val = "0"; + + rc = !!atoi(val); + +out: + return rc; +} + /* * Local variables: * mode: C diff -r 69a0fa5473d3 -r 2e21281b2c10 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Thu Jul 26 16:47:31 2012 +0100 +++ b/tools/libxl/libxl_internal.h Thu Jul 26 16:47:32 2012 +0100 @@ -91,6 +91,7 @@ #define STUBDOM_CONSOLE_SERIAL 3 #define STUBDOM_SPECIAL_CONSOLES 3 #define TAP_DEVICE_SUFFIX "-emu" +#define DISABLE_UDEV_PATH "libxl/disable_udev" #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0])) @@ -1510,6 +1511,8 @@ _hidden libxl__json_object *libxl__json_ * default is qemu xen traditional */ _hidden int libxl__device_model_version_running(libxl__gc *gc, uint32_t domid); +/* Check how executes hotplug script currently */ +int libxl__hotplug_settings(libxl__gc *gc, xs_transaction_t t); /* * Calling context and GC for event-generating functions: diff -r 69a0fa5473d3 -r 2e21281b2c10 tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Thu Jul 26 16:47:31 2012 +0100 +++ b/tools/libxl/libxl_types.idl Thu Jul 26 16:47:32 2012 +0100 @@ -231,6 +231,7 @@ libxl_domain_create_info = Struct("domai ("xsdata", libxl_key_value_list), ("platformdata", libxl_key_value_list), ("poolid", uint32), + ("run_hotplug_scripts",libxl_defbool), ], dir=DIR_IN) MemKB = UInt(64, init_val = "LIBXL_MEMKB_DEFAULT") diff -r 69a0fa5473d3 -r 2e21281b2c10 tools/libxl/xl.c --- a/tools/libxl/xl.c Thu Jul 26 16:47:31 2012 +0100 +++ b/tools/libxl/xl.c Thu Jul 26 16:47:32 2012 +0100 @@ -39,6 +39,7 @@ int dryrun_only; int force_execution; int autoballoon = 1; char *blkdev_start; +int run_hotplug_scripts = 1; char *lockfile; char *default_vifscript = NULL; char *default_bridge = NULL; @@ -70,6 +71,9 @@ static void parse_global_config(const ch if (!xlu_cfg_get_long (config, "autoballoon", &l, 0)) autoballoon = l; + if (!xlu_cfg_get_long (config, "run_hotplug_scripts", &l, 0)) + run_hotplug_scripts = l; + if (!xlu_cfg_get_string (config, "lockfile", &buf, 0)) lockfile = strdup(buf); else { diff -r 69a0fa5473d3 -r 2e21281b2c10 tools/libxl/xl.h --- a/tools/libxl/xl.h Thu Jul 26 16:47:31 2012 +0100 +++ b/tools/libxl/xl.h Thu Jul 26 16:47:32 2012 +0100 @@ -140,6 +140,7 @@ int xl_child_pid(xlchildnum); /* returns /* global options */ extern int autoballoon; +extern int run_hotplug_scripts; extern int dryrun_only; extern char *lockfile; extern char *default_vifscript; diff -r 69a0fa5473d3 -r 2e21281b2c10 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Thu Jul 26 16:47:31 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Thu Jul 26 16:47:32 2012 +0100 @@ -595,6 +595,7 @@ static void parse_config_data(const char } } + libxl_defbool_set(&c_info->run_hotplug_scripts, run_hotplug_scripts); c_info->type = LIBXL_DOMAIN_TYPE_PV; if (!xlu_cfg_get_string (config, "builder", &buf, 0) && !strncmp(buf, "hvm", strlen(buf))) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jul 28 03:00:28 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Jul 2012 03:00:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGT-0001oj-0Y; Sat, 28 Jul 2012 03:00:25 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGS-0001oF-01 for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:24 +0000 Received: from [85.158.138.51:38677] by server-1.bemta-3.messagelabs.com id C0/20-31934-7C553105; Sat, 28 Jul 2012 03:00:23 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-174.messagelabs.com!1343444419!21149432!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 8846 invoked from network); 28 Jul 2012 03:00:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 28 Jul 2012 03:00:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGN-0003Q8-1u for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuxGM-0002kB-Qb for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:18 +0000 Message-Id: Date: Sat, 28 Jul 2012 03:00:18 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: convert libxl__device_disk_local_attach to an async op X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343317649 -3600 # Node ID 34b942aae898e0e26b3576d4c63bc16d5e7aeed5 # Parent f5febaba5484b92bf7a63a046b1d95a634cbcaf4 libxl: convert libxl__device_disk_local_attach to an async op This will be needed in future patches, when libxl__device_disk_add becomes async also. Create a new status structure that defines the local attach of a disk device and use it in libxl__device_disk_local_attach. This is done in this patch to split the changes introduced when libxl__device_disk_add becomes async. Signed-off-by: Roger Pau Monne Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r f5febaba5484 -r 34b942aae898 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Thu Jul 26 16:47:29 2012 +0100 +++ b/tools/libxl/libxl.c Thu Jul 26 16:47:29 2012 +0100 @@ -2252,19 +2252,19 @@ static char * libxl__alloc_vdev(libxl__g return NULL; } -char * libxl__device_disk_local_attach(libxl__gc *gc, - const libxl_device_disk *in_disk, - libxl_device_disk *disk, - const char *blkdev_start) +void libxl__device_disk_local_initiate_attach(libxl__egc *egc, + libxl__disk_local_state *dls) { - libxl_ctx *ctx = gc->owner; + STATE_AO_GC(dls->ao); + libxl_ctx *ctx = CTX; char *dev = NULL, *be_path = NULL; - char *ret = NULL; int rc; libxl__device device; - - if (in_disk->pdev_path == NULL) - return NULL; + const libxl_device_disk *in_disk = dls->in_disk; + libxl_device_disk *disk = &dls->disk; + const char *blkdev_start = dls->blkdev_start; + + assert(in_disk->pdev_path); memcpy(disk, in_disk, sizeof(libxl_device_disk)); disk->pdev_path = libxl__strdup(gc, in_disk->pdev_path); @@ -2300,7 +2300,8 @@ char * libxl__device_disk_local_attach(l default: LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "unrecognized disk format: %d", disk->format); - break; + rc = ERROR_FAIL; + goto out; } break; case LIBXL_DISK_BACKEND_QDISK: @@ -2309,6 +2310,7 @@ char * libxl__device_disk_local_attach(l libxl__alloc_vdev, (void *) blkdev_start)) { LOG(ERROR, "libxl_device_disk_add failed"); + rc = ERROR_FAIL; goto out; } dev = GCSPRINTF("/dev/%s", disk->vdev); @@ -2320,7 +2322,8 @@ char * libxl__device_disk_local_attach(l default: LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "unrecognized disk backend " "type: %d", disk->backend); - break; + rc = ERROR_FAIL; + goto out; } if (disk->vdev != NULL) { @@ -2333,39 +2336,88 @@ char * libxl__device_disk_local_attach(l goto out; } if (dev != NULL) - ret = strdup(dev); - return ret; + dls->diskpath = libxl__strdup(gc, dev); + + dls->callback(egc, dls, 0); + return; out: - libxl__device_disk_local_detach(gc, disk); - return NULL; + assert(rc); + dls->rc = rc; + libxl__device_disk_local_initiate_detach(egc, dls); + return; } -int libxl__device_disk_local_detach(libxl__gc *gc, libxl_device_disk *disk) +/* Callbacks for local detach */ + +static void local_device_detach_cb(libxl__egc *egc, libxl__ao_device *aodev); + +void libxl__device_disk_local_initiate_detach(libxl__egc *egc, + libxl__disk_local_state *dls) { + STATE_AO_GC(dls->ao); int rc = 0; + libxl_device_disk *disk = &dls->disk; + libxl__device *device; + libxl__ao_device *aodev = &dls->aodev; + libxl__prepare_ao_device(ao, aodev); + + if (!dls->diskpath) goto out; switch (disk->backend) { case LIBXL_DISK_BACKEND_QDISK: if (disk->vdev != NULL) { - libxl_device_disk_remove(gc->owner, LIBXL_TOOLSTACK_DOMID, - disk, 0); - /* fixme-ao */ - rc = libxl_device_disk_destroy(gc->owner, - LIBXL_TOOLSTACK_DOMID, disk, 0); + GCNEW(device); + rc = libxl__device_from_disk(gc, LIBXL_TOOLSTACK_DOMID, + disk, device); + if (rc != 0) goto out; + + aodev->action = DEVICE_DISCONNECT; + aodev->dev = device; + aodev->callback = local_device_detach_cb; + aodev->force = 0; + libxl__initiate_device_remove(egc, aodev); + return; } - break; + /* disk->vdev == NULL; fall through */ default: /* * Nothing to do for PHYSTYPE_PHY. * For other device types assume that the blktap2 process is * needed by the soon to be started domain and do nothing. */ - break; + goto out; } - - return rc; +out: + aodev->rc = rc; + local_device_detach_cb(egc, aodev); + return; +} + +static void local_device_detach_cb(libxl__egc *egc, libxl__ao_device *aodev) +{ + STATE_AO_GC(aodev->ao); + libxl__disk_local_state *dls = CONTAINER_OF(aodev, *dls, aodev); + int rc; + + if (aodev->rc) { + LOGE(ERROR, "unable to %s %s with id %u", + aodev->action == DEVICE_CONNECT ? "add" : "remove", + libxl__device_kind_to_string(aodev->dev->kind), + aodev->dev->devid); + goto out; + } + +out: + /* + * If there was an error in dls->rc, it means we have been called from + * a failed execution of libxl__device_disk_local_initiate_attach, + * so return the original error. + */ + rc = dls->rc ? dls->rc : aodev->rc; + dls->callback(egc, dls, rc); + return; } /******************************************************************************/ diff -r f5febaba5484 -r 34b942aae898 tools/libxl/libxl_bootloader.c --- a/tools/libxl/libxl_bootloader.c Thu Jul 26 16:47:29 2012 +0100 +++ b/tools/libxl/libxl_bootloader.c Thu Jul 26 16:47:29 2012 +0100 @@ -75,7 +75,7 @@ static void make_bootloader_args(libxl__ } } - ARG(bl->diskpath); + ARG(bl->dls.diskpath); /* Sentinel for execv */ ARG(NULL); @@ -206,8 +206,9 @@ static int parse_bootloader_result(libxl void libxl__bootloader_init(libxl__bootloader_state *bl) { assert(bl->ao); - bl->diskpath = NULL; + bl->dls.diskpath = NULL; bl->openpty.ao = bl->ao; + bl->dls.ao = bl->ao; bl->ptys[0].master = bl->ptys[0].slave = 0; bl->ptys[1].master = bl->ptys[1].slave = 0; libxl__ev_child_init(&bl->child); @@ -224,11 +225,6 @@ static void bootloader_cleanup(libxl__eg if (bl->outputpath) libxl__remove_file(gc, bl->outputpath); if (bl->outputdir) libxl__remove_directory(gc, bl->outputdir); - if (bl->diskpath) { - libxl__device_disk_local_detach(gc, &bl->localdisk); - free(bl->diskpath); - bl->diskpath = 0; - } libxl__domaindeathcheck_stop(gc,&bl->deathcheck); libxl__datacopier_kill(&bl->keystrokes); libxl__datacopier_kill(&bl->display); @@ -249,10 +245,32 @@ static void bootloader_setpaths(libxl__g bl->outputpath = GCSPRINTF(XEN_RUN_DIR "/bootloader.%"PRIu32".out", domid); } +/* Callbacks */ + +static void bootloader_local_detached_cb(libxl__egc *egc, + libxl__disk_local_state *dls, + int rc); + static void bootloader_callback(libxl__egc *egc, libxl__bootloader_state *bl, int rc) { bootloader_cleanup(egc, bl); + + bl->dls.callback = bootloader_local_detached_cb; + libxl__device_disk_local_initiate_detach(egc, &bl->dls); +} + +static void bootloader_local_detached_cb(libxl__egc *egc, + libxl__disk_local_state *dls, + int rc) +{ + STATE_AO_GC(dls->ao); + libxl__bootloader_state *bl = CONTAINER_OF(dls, *bl, dls); + + if (rc) { + LOG(ERROR, "unable to detach locally attached disk"); + } + bl->callback(egc, bl, rc); } @@ -275,6 +293,12 @@ static void bootloader_abort(libxl__egc /*----- main flow of control -----*/ +/* Callbacks */ + +static void bootloader_disk_attached_cb(libxl__egc *egc, + libxl__disk_local_state *dls, + int rc); + void libxl__bootloader_run(libxl__egc *egc, libxl__bootloader_state *bl) { STATE_AO_GC(bl->ao); @@ -282,7 +306,6 @@ void libxl__bootloader_run(libxl__egc *e uint32_t domid = bl->domid; char *logfile_tmp = NULL; int rc, r; - const char *bootloader; libxl__bootloader_init(bl); @@ -344,10 +367,34 @@ void libxl__bootloader_run(libxl__egc *e goto out; } - bl->diskpath = libxl__device_disk_local_attach(gc, bl->disk, &bl->localdisk, - info->blkdev_start); - if (!bl->diskpath) { - rc = ERROR_FAIL; + + /* This sets the state of the dls struct from Undefined to Idle */ + libxl__device_disk_local_init(&bl->dls); + bl->dls.ao = ao; + bl->dls.in_disk = bl->disk; + bl->dls.blkdev_start = info->blkdev_start; + bl->dls.callback = bootloader_disk_attached_cb; + libxl__device_disk_local_initiate_attach(egc, &bl->dls); + return; + + out: + assert(rc); + out_ok: + free(logfile_tmp); + bootloader_callback(egc, bl, rc); +} + +static void bootloader_disk_attached_cb(libxl__egc *egc, + libxl__disk_local_state *dls, + int rc) +{ + STATE_AO_GC(dls->ao); + libxl__bootloader_state *bl = CONTAINER_OF(dls, *bl, dls); + const libxl_domain_build_info *info = bl->info; + const char *bootloader; + + if (rc) { + LOG(ERROR, "failed to attach local disk for bootloader execution"); goto out; } @@ -389,8 +436,6 @@ void libxl__bootloader_run(libxl__egc *e out: assert(rc); - out_ok: - free(logfile_tmp); bootloader_callback(egc, bl, rc); } diff -r f5febaba5484 -r 34b942aae898 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Thu Jul 26 16:47:29 2012 +0100 +++ b/tools/libxl/libxl_internal.h Thu Jul 26 16:47:29 2012 +0100 @@ -1341,17 +1341,6 @@ _hidden int libxl__device_from_disk(libx _hidden int libxl__device_disk_add(libxl__gc *gc, uint32_t domid, libxl_device_disk *disk); -/* - * Make a disk available in this (the control) domain. Returns path to - * a device. - */ -_hidden char * libxl__device_disk_local_attach(libxl__gc *gc, - const libxl_device_disk *in_disk, - libxl_device_disk *new_disk, - const char *blkdev_start); -_hidden int libxl__device_disk_local_detach(libxl__gc *gc, - libxl_device_disk *disk); - _hidden char *libxl__uuid2string(libxl__gc *gc, const libxl_uuid uuid); struct libxl__xen_console_reader { @@ -1948,6 +1937,62 @@ struct libxl__ao_devices { _hidden void libxl__initiate_device_remove(libxl__egc *egc, libxl__ao_device *aodev); +/*----- local disk attach: attach a disk locally to run the bootloader -----*/ + +typedef struct libxl__disk_local_state libxl__disk_local_state; +typedef void libxl__disk_local_state_callback(libxl__egc*, + libxl__disk_local_state*, + int rc); + +/* A libxl__disk_local_state may be in the following states: + * Undefined, Idle, Attaching, Attached, Detaching. + */ +struct libxl__disk_local_state { + /* filled by the user */ + libxl__ao *ao; + const libxl_device_disk *in_disk; + libxl_device_disk disk; + const char *blkdev_start; + libxl__disk_local_state_callback *callback; + /* filled by libxl__device_disk_local_initiate_attach */ + char *diskpath; + /* private for implementation of local detach */ + libxl__ao_device aodev; + int rc; +}; + +/* + * Prepares a dls for use. + * State Undefined -> Idle + */ +static inline void libxl__device_disk_local_init(libxl__disk_local_state *dls) +{ + dls->rc = 0; +} + +/* Make a disk available in this (the control) domain. Always calls + * dls->callback when finished. + * State Idle -> Attaching + * + * The state of dls on entry to the callback depends on the value + * of rc passed to the callback: + * rc == 0: Attached if rc == 0 + * rc != 0: Idle + */ +_hidden void libxl__device_disk_local_initiate_attach(libxl__egc *egc, + libxl__disk_local_state *dls); + +/* Disconnects a disk device form the control domain. If the passed + * dls is not attached (or has already been detached), + * libxl__device_disk_local_initiate_detach will just call the callback + * directly. + * State Idle/Attached -> Detaching + * + * The state of dls on entry to the callback is Idle. + */ +_hidden void libxl__device_disk_local_initiate_detach(libxl__egc *egc, + libxl__disk_local_state *dls); + /*----- datacopier: copies data from one fd to another -----*/ typedef struct libxl__datacopier_state libxl__datacopier_state; @@ -2137,12 +2182,12 @@ struct libxl__bootloader_state { /* Should be zeroed by caller on entry. Will be filled in by * bootloader machinery; represents the local attachment of the * disk for the benefit of the bootloader. Must be detached by - * the caller using libxl__device_disk_local_detach. + * the caller using libxl__device_disk_local_initiate_detach. * (This is safe to do after ->callback() has happened since * the domain's kernel and initramfs will have been copied * out of the guest's disk into a temporary directory, mapped * as file references, and deleted. */ - libxl_device_disk localdisk; + libxl__disk_local_state dls; uint32_t domid; /* outputs: * - caller must initialise kernel and ramdisk to point to file @@ -2154,7 +2199,6 @@ struct libxl__bootloader_state { const char *cmdline; /* private to libxl__run_bootloader */ char *outputpath, *outputdir, *logfile; - char *diskpath; /* not from gc, represents actually attached disk */ libxl__openpty_state openpty; libxl__openpty_result ptys[2]; /* [0] is for bootloader */ libxl__ev_child child; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jul 28 03:00:28 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Jul 2012 03:00:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGT-0001oj-0Y; Sat, 28 Jul 2012 03:00:25 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGS-0001oF-01 for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:24 +0000 Received: from [85.158.138.51:38677] by server-1.bemta-3.messagelabs.com id C0/20-31934-7C553105; Sat, 28 Jul 2012 03:00:23 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-174.messagelabs.com!1343444419!21149432!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 8846 invoked from network); 28 Jul 2012 03:00:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 28 Jul 2012 03:00:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGN-0003Q8-1u for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuxGM-0002kB-Qb for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:18 +0000 Message-Id: Date: Sat, 28 Jul 2012 03:00:18 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: convert libxl__device_disk_local_attach to an async op X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343317649 -3600 # Node ID 34b942aae898e0e26b3576d4c63bc16d5e7aeed5 # Parent f5febaba5484b92bf7a63a046b1d95a634cbcaf4 libxl: convert libxl__device_disk_local_attach to an async op This will be needed in future patches, when libxl__device_disk_add becomes async also. Create a new status structure that defines the local attach of a disk device and use it in libxl__device_disk_local_attach. This is done in this patch to split the changes introduced when libxl__device_disk_add becomes async. Signed-off-by: Roger Pau Monne Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r f5febaba5484 -r 34b942aae898 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Thu Jul 26 16:47:29 2012 +0100 +++ b/tools/libxl/libxl.c Thu Jul 26 16:47:29 2012 +0100 @@ -2252,19 +2252,19 @@ static char * libxl__alloc_vdev(libxl__g return NULL; } -char * libxl__device_disk_local_attach(libxl__gc *gc, - const libxl_device_disk *in_disk, - libxl_device_disk *disk, - const char *blkdev_start) +void libxl__device_disk_local_initiate_attach(libxl__egc *egc, + libxl__disk_local_state *dls) { - libxl_ctx *ctx = gc->owner; + STATE_AO_GC(dls->ao); + libxl_ctx *ctx = CTX; char *dev = NULL, *be_path = NULL; - char *ret = NULL; int rc; libxl__device device; - - if (in_disk->pdev_path == NULL) - return NULL; + const libxl_device_disk *in_disk = dls->in_disk; + libxl_device_disk *disk = &dls->disk; + const char *blkdev_start = dls->blkdev_start; + + assert(in_disk->pdev_path); memcpy(disk, in_disk, sizeof(libxl_device_disk)); disk->pdev_path = libxl__strdup(gc, in_disk->pdev_path); @@ -2300,7 +2300,8 @@ char * libxl__device_disk_local_attach(l default: LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "unrecognized disk format: %d", disk->format); - break; + rc = ERROR_FAIL; + goto out; } break; case LIBXL_DISK_BACKEND_QDISK: @@ -2309,6 +2310,7 @@ char * libxl__device_disk_local_attach(l libxl__alloc_vdev, (void *) blkdev_start)) { LOG(ERROR, "libxl_device_disk_add failed"); + rc = ERROR_FAIL; goto out; } dev = GCSPRINTF("/dev/%s", disk->vdev); @@ -2320,7 +2322,8 @@ char * libxl__device_disk_local_attach(l default: LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "unrecognized disk backend " "type: %d", disk->backend); - break; + rc = ERROR_FAIL; + goto out; } if (disk->vdev != NULL) { @@ -2333,39 +2336,88 @@ char * libxl__device_disk_local_attach(l goto out; } if (dev != NULL) - ret = strdup(dev); - return ret; + dls->diskpath = libxl__strdup(gc, dev); + + dls->callback(egc, dls, 0); + return; out: - libxl__device_disk_local_detach(gc, disk); - return NULL; + assert(rc); + dls->rc = rc; + libxl__device_disk_local_initiate_detach(egc, dls); + return; } -int libxl__device_disk_local_detach(libxl__gc *gc, libxl_device_disk *disk) +/* Callbacks for local detach */ + +static void local_device_detach_cb(libxl__egc *egc, libxl__ao_device *aodev); + +void libxl__device_disk_local_initiate_detach(libxl__egc *egc, + libxl__disk_local_state *dls) { + STATE_AO_GC(dls->ao); int rc = 0; + libxl_device_disk *disk = &dls->disk; + libxl__device *device; + libxl__ao_device *aodev = &dls->aodev; + libxl__prepare_ao_device(ao, aodev); + + if (!dls->diskpath) goto out; switch (disk->backend) { case LIBXL_DISK_BACKEND_QDISK: if (disk->vdev != NULL) { - libxl_device_disk_remove(gc->owner, LIBXL_TOOLSTACK_DOMID, - disk, 0); - /* fixme-ao */ - rc = libxl_device_disk_destroy(gc->owner, - LIBXL_TOOLSTACK_DOMID, disk, 0); + GCNEW(device); + rc = libxl__device_from_disk(gc, LIBXL_TOOLSTACK_DOMID, + disk, device); + if (rc != 0) goto out; + + aodev->action = DEVICE_DISCONNECT; + aodev->dev = device; + aodev->callback = local_device_detach_cb; + aodev->force = 0; + libxl__initiate_device_remove(egc, aodev); + return; } - break; + /* disk->vdev == NULL; fall through */ default: /* * Nothing to do for PHYSTYPE_PHY. * For other device types assume that the blktap2 process is * needed by the soon to be started domain and do nothing. */ - break; + goto out; } - - return rc; +out: + aodev->rc = rc; + local_device_detach_cb(egc, aodev); + return; +} + +static void local_device_detach_cb(libxl__egc *egc, libxl__ao_device *aodev) +{ + STATE_AO_GC(aodev->ao); + libxl__disk_local_state *dls = CONTAINER_OF(aodev, *dls, aodev); + int rc; + + if (aodev->rc) { + LOGE(ERROR, "unable to %s %s with id %u", + aodev->action == DEVICE_CONNECT ? "add" : "remove", + libxl__device_kind_to_string(aodev->dev->kind), + aodev->dev->devid); + goto out; + } + +out: + /* + * If there was an error in dls->rc, it means we have been called from + * a failed execution of libxl__device_disk_local_initiate_attach, + * so return the original error. + */ + rc = dls->rc ? dls->rc : aodev->rc; + dls->callback(egc, dls, rc); + return; } /******************************************************************************/ diff -r f5febaba5484 -r 34b942aae898 tools/libxl/libxl_bootloader.c --- a/tools/libxl/libxl_bootloader.c Thu Jul 26 16:47:29 2012 +0100 +++ b/tools/libxl/libxl_bootloader.c Thu Jul 26 16:47:29 2012 +0100 @@ -75,7 +75,7 @@ static void make_bootloader_args(libxl__ } } - ARG(bl->diskpath); + ARG(bl->dls.diskpath); /* Sentinel for execv */ ARG(NULL); @@ -206,8 +206,9 @@ static int parse_bootloader_result(libxl void libxl__bootloader_init(libxl__bootloader_state *bl) { assert(bl->ao); - bl->diskpath = NULL; + bl->dls.diskpath = NULL; bl->openpty.ao = bl->ao; + bl->dls.ao = bl->ao; bl->ptys[0].master = bl->ptys[0].slave = 0; bl->ptys[1].master = bl->ptys[1].slave = 0; libxl__ev_child_init(&bl->child); @@ -224,11 +225,6 @@ static void bootloader_cleanup(libxl__eg if (bl->outputpath) libxl__remove_file(gc, bl->outputpath); if (bl->outputdir) libxl__remove_directory(gc, bl->outputdir); - if (bl->diskpath) { - libxl__device_disk_local_detach(gc, &bl->localdisk); - free(bl->diskpath); - bl->diskpath = 0; - } libxl__domaindeathcheck_stop(gc,&bl->deathcheck); libxl__datacopier_kill(&bl->keystrokes); libxl__datacopier_kill(&bl->display); @@ -249,10 +245,32 @@ static void bootloader_setpaths(libxl__g bl->outputpath = GCSPRINTF(XEN_RUN_DIR "/bootloader.%"PRIu32".out", domid); } +/* Callbacks */ + +static void bootloader_local_detached_cb(libxl__egc *egc, + libxl__disk_local_state *dls, + int rc); + static void bootloader_callback(libxl__egc *egc, libxl__bootloader_state *bl, int rc) { bootloader_cleanup(egc, bl); + + bl->dls.callback = bootloader_local_detached_cb; + libxl__device_disk_local_initiate_detach(egc, &bl->dls); +} + +static void bootloader_local_detached_cb(libxl__egc *egc, + libxl__disk_local_state *dls, + int rc) +{ + STATE_AO_GC(dls->ao); + libxl__bootloader_state *bl = CONTAINER_OF(dls, *bl, dls); + + if (rc) { + LOG(ERROR, "unable to detach locally attached disk"); + } + bl->callback(egc, bl, rc); } @@ -275,6 +293,12 @@ static void bootloader_abort(libxl__egc /*----- main flow of control -----*/ +/* Callbacks */ + +static void bootloader_disk_attached_cb(libxl__egc *egc, + libxl__disk_local_state *dls, + int rc); + void libxl__bootloader_run(libxl__egc *egc, libxl__bootloader_state *bl) { STATE_AO_GC(bl->ao); @@ -282,7 +306,6 @@ void libxl__bootloader_run(libxl__egc *e uint32_t domid = bl->domid; char *logfile_tmp = NULL; int rc, r; - const char *bootloader; libxl__bootloader_init(bl); @@ -344,10 +367,34 @@ void libxl__bootloader_run(libxl__egc *e goto out; } - bl->diskpath = libxl__device_disk_local_attach(gc, bl->disk, &bl->localdisk, - info->blkdev_start); - if (!bl->diskpath) { - rc = ERROR_FAIL; + + /* This sets the state of the dls struct from Undefined to Idle */ + libxl__device_disk_local_init(&bl->dls); + bl->dls.ao = ao; + bl->dls.in_disk = bl->disk; + bl->dls.blkdev_start = info->blkdev_start; + bl->dls.callback = bootloader_disk_attached_cb; + libxl__device_disk_local_initiate_attach(egc, &bl->dls); + return; + + out: + assert(rc); + out_ok: + free(logfile_tmp); + bootloader_callback(egc, bl, rc); +} + +static void bootloader_disk_attached_cb(libxl__egc *egc, + libxl__disk_local_state *dls, + int rc) +{ + STATE_AO_GC(dls->ao); + libxl__bootloader_state *bl = CONTAINER_OF(dls, *bl, dls); + const libxl_domain_build_info *info = bl->info; + const char *bootloader; + + if (rc) { + LOG(ERROR, "failed to attach local disk for bootloader execution"); goto out; } @@ -389,8 +436,6 @@ void libxl__bootloader_run(libxl__egc *e out: assert(rc); - out_ok: - free(logfile_tmp); bootloader_callback(egc, bl, rc); } diff -r f5febaba5484 -r 34b942aae898 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Thu Jul 26 16:47:29 2012 +0100 +++ b/tools/libxl/libxl_internal.h Thu Jul 26 16:47:29 2012 +0100 @@ -1341,17 +1341,6 @@ _hidden int libxl__device_from_disk(libx _hidden int libxl__device_disk_add(libxl__gc *gc, uint32_t domid, libxl_device_disk *disk); -/* - * Make a disk available in this (the control) domain. Returns path to - * a device. - */ -_hidden char * libxl__device_disk_local_attach(libxl__gc *gc, - const libxl_device_disk *in_disk, - libxl_device_disk *new_disk, - const char *blkdev_start); -_hidden int libxl__device_disk_local_detach(libxl__gc *gc, - libxl_device_disk *disk); - _hidden char *libxl__uuid2string(libxl__gc *gc, const libxl_uuid uuid); struct libxl__xen_console_reader { @@ -1948,6 +1937,62 @@ struct libxl__ao_devices { _hidden void libxl__initiate_device_remove(libxl__egc *egc, libxl__ao_device *aodev); +/*----- local disk attach: attach a disk locally to run the bootloader -----*/ + +typedef struct libxl__disk_local_state libxl__disk_local_state; +typedef void libxl__disk_local_state_callback(libxl__egc*, + libxl__disk_local_state*, + int rc); + +/* A libxl__disk_local_state may be in the following states: + * Undefined, Idle, Attaching, Attached, Detaching. + */ +struct libxl__disk_local_state { + /* filled by the user */ + libxl__ao *ao; + const libxl_device_disk *in_disk; + libxl_device_disk disk; + const char *blkdev_start; + libxl__disk_local_state_callback *callback; + /* filled by libxl__device_disk_local_initiate_attach */ + char *diskpath; + /* private for implementation of local detach */ + libxl__ao_device aodev; + int rc; +}; + +/* + * Prepares a dls for use. + * State Undefined -> Idle + */ +static inline void libxl__device_disk_local_init(libxl__disk_local_state *dls) +{ + dls->rc = 0; +} + +/* Make a disk available in this (the control) domain. Always calls + * dls->callback when finished. + * State Idle -> Attaching + * + * The state of dls on entry to the callback depends on the value + * of rc passed to the callback: + * rc == 0: Attached if rc == 0 + * rc != 0: Idle + */ +_hidden void libxl__device_disk_local_initiate_attach(libxl__egc *egc, + libxl__disk_local_state *dls); + +/* Disconnects a disk device form the control domain. If the passed + * dls is not attached (or has already been detached), + * libxl__device_disk_local_initiate_detach will just call the callback + * directly. + * State Idle/Attached -> Detaching + * + * The state of dls on entry to the callback is Idle. + */ +_hidden void libxl__device_disk_local_initiate_detach(libxl__egc *egc, + libxl__disk_local_state *dls); + /*----- datacopier: copies data from one fd to another -----*/ typedef struct libxl__datacopier_state libxl__datacopier_state; @@ -2137,12 +2182,12 @@ struct libxl__bootloader_state { /* Should be zeroed by caller on entry. Will be filled in by * bootloader machinery; represents the local attachment of the * disk for the benefit of the bootloader. Must be detached by - * the caller using libxl__device_disk_local_detach. + * the caller using libxl__device_disk_local_initiate_detach. * (This is safe to do after ->callback() has happened since * the domain's kernel and initramfs will have been copied * out of the guest's disk into a temporary directory, mapped * as file references, and deleted. */ - libxl_device_disk localdisk; + libxl__disk_local_state dls; uint32_t domid; /* outputs: * - caller must initialise kernel and ramdisk to point to file @@ -2154,7 +2199,6 @@ struct libxl__bootloader_state { const char *cmdline; /* private to libxl__run_bootloader */ char *outputpath, *outputdir, *logfile; - char *diskpath; /* not from gc, represents actually attached disk */ libxl__openpty_state openpty; libxl__openpty_result ptys[2]; /* [0] is for bootloader */ libxl__ev_child child; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jul 28 03:00:28 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Jul 2012 03:00:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGO-0001nk-Ji; Sat, 28 Jul 2012 03:00:20 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGN-0001nN-FL for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:19 +0000 Received: from [85.158.143.35:23205] by server-3.bemta-4.messagelabs.com id 92/1E-01511-2C553105; Sat, 28 Jul 2012 03:00:18 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-21.messagelabs.com!1343444414!17500732!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 19455 invoked from network); 28 Jul 2012 03:00: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; 28 Jul 2012 03:00:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGH-0003Pt-DE for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuxGC-0002iE-KU for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:10 +0000 Message-Id: Date: Sat, 28 Jul 2012 03:00:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: enable automatic placement of guests on NUMA nodes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343313714 -3600 # Node ID 4165d71479f92c58f3b7029d19e69cd779345d9a # Parent b0fc6f8d5066498d79d9bcbb29ccf3b1fc2a9e2c libxl: enable automatic placement of guests on NUMA nodes If a domain does not have a VCPU affinity, try to pin it automatically to some PCPUs. This is done taking into account the NUMA characteristics of the host. In fact, we look for a combination of host's NUMA nodes with enough free memory and number of PCPUs for the new domain, and pin it to the VCPUs of those nodes. Deciding which placement is the best happens by means of some heuristics. For instance, smaller candidates are better, both from a domain perspective (less memory spreading among nodes) and from the entire system perspective (smaller memory fragmentation). In case of candidates of equal sizes (i.e., with the same number of nodes), the amount of free memory and the number of domains' vCPUs already pinned to the candidates' nodes are both considered. Very often, candidates with greater amount of memory are the one we wants, as this is good for keeping memory fragmentation under control. However, we do not want to overcommit some node too much, just because it has a lot of memory, and that's why the number of vCPUs must be accounted for. This all happens internally to libxl, and no API for driving the mechanism is provided for now. This matches what xend already does. Signed-off-by: Dario Faggioli Acked-by: George Dunlap Acked-by: Ian Jackson Tested-by: Andre Przywara Committed-by: Ian Campbell --- diff -r b0fc6f8d5066 -r 4165d71479f9 docs/man/xl.cfg.pod.5 --- a/docs/man/xl.cfg.pod.5 Thu Jul 26 10:55:09 2012 +0100 +++ b/docs/man/xl.cfg.pod.5 Thu Jul 26 15:41:54 2012 +0100 @@ -111,8 +111,8 @@ created online and the remainder will be =item B -List of which cpus the guest is allowed to use. Default behavior is -`all cpus`. A C may be specified as follows: +List of which cpus the guest is allowed to use. By default xl will pick +some cpus on its own (see below). A C may be specified as follows: =over 4 @@ -132,6 +132,12 @@ run on cpu #3 of the host. =back +If this option is not specified, libxl automatically tries to place the new +domain on the host's NUMA nodes (provided the host has more than one NUMA +node) by pinning it to the cpus of those nodes. A heuristic approach is +utilized with the goals of maximizing performance for the domain and, at +the same time, achieving efficient utilization of the host's CPUs and RAM. + =item B A domain with a weight of 512 will get twice as much CPU as a domain diff -r b0fc6f8d5066 -r 4165d71479f9 tools/libxl/Makefile --- a/tools/libxl/Makefile Thu Jul 26 10:55:09 2012 +0100 +++ b/tools/libxl/Makefile Thu Jul 26 15:41:54 2012 +0100 @@ -66,7 +66,7 @@ LIBXL_LIBS += -lyajl LIBXL_OBJS = flexarray.o libxl.o libxl_create.o libxl_dm.o libxl_pci.o \ libxl_dom.o libxl_exec.o libxl_xshelp.o libxl_device.o \ libxl_internal.o libxl_utils.o libxl_uuid.o \ - libxl_json.o libxl_aoutils.o \ + libxl_json.o libxl_aoutils.o libxl_numa.o \ libxl_save_callout.o _libxl_save_msgs_callout.o \ libxl_qmp.o libxl_event.o libxl_fork.o $(LIBXL_OBJS-y) LIBXL_OBJS += _libxl_types.o libxl_flask.o _libxl_types_internal.o diff -r b0fc6f8d5066 -r 4165d71479f9 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Thu Jul 26 10:55:09 2012 +0100 +++ b/tools/libxl/libxl_create.c Thu Jul 26 15:41:54 2012 +0100 @@ -215,6 +215,8 @@ int libxl__domain_build_info_setdefault( libxl_bitmap_set_any(&b_info->cpumap); } + libxl_defbool_setdefault(&b_info->numa_placement, true); + if (b_info->max_memkb == LIBXL_MEMKB_DEFAULT) b_info->max_memkb = 32 * 1024; if (b_info->target_memkb == LIBXL_MEMKB_DEFAULT) diff -r b0fc6f8d5066 -r 4165d71479f9 tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Thu Jul 26 10:55:09 2012 +0100 +++ b/tools/libxl/libxl_dom.c Thu Jul 26 15:41:54 2012 +0100 @@ -98,6 +98,94 @@ out: return sched; } +/* + * Two NUMA placement candidates are compared by means of the following + * heuristics: + + * - the number of vcpus runnable on the candidates is considered, and + * candidates with fewer of them are preferred. If two candidate have + * the same number of runnable vcpus, + * - the amount of free memory in the candidates is considered, and the + * candidate with greater amount of it is preferred. + * + * In fact, leaving larger memory holes, maximizes the probability of being + * able to put other domains on the node. That hopefully means many domains + * will benefit from local memory accesses, but also introduces the risk of + * overloading large (from a memory POV) nodes. That's right the effect + * that counting the vcpus able to run on the nodes tries to prevent. + * + * Note that this completely ignore the number of nodes each candidate span, + * as the fact that fewer nodes is better is already accounted for in the + * algorithm. + */ +static int numa_cmpf(const libxl__numa_candidate *c1, + const libxl__numa_candidate *c2) +{ + if (c1->nr_vcpus != c2->nr_vcpus) + return c1->nr_vcpus - c2->nr_vcpus; + + return c2->free_memkb - c1->free_memkb; +} + +/* The actual automatic NUMA placement routine */ +static int numa_place_domain(libxl__gc *gc, libxl_domain_build_info *info) +{ + int found; + libxl__numa_candidate candidate; + libxl_bitmap candidate_nodemap; + libxl_cpupoolinfo *pinfo; + int nr_pools, rc = 0; + uint32_t memkb; + + libxl__numa_candidate_init(&candidate); + libxl_bitmap_init(&candidate_nodemap); + + /* First of all, if cpupools are in use, better not to mess with them */ + pinfo = libxl_list_cpupool(CTX, &nr_pools); + if (!pinfo) + return ERROR_FAIL; + if (nr_pools > 1) { + LOG(NOTICE, "Skipping NUMA placement as cpupools are in use"); + goto out; + } + + rc = libxl_domain_need_memory(CTX, info, &memkb); + if (rc) + goto out; + if (libxl_node_bitmap_alloc(CTX, &candidate_nodemap, 0)) { + rc = ERROR_FAIL; + goto out; + } + + /* Find the best candidate with enough free memory and at least + * as much pcpus as the domain has vcpus. */ + rc = libxl__get_numa_candidate(gc, memkb, info->max_vcpus, 0, 0, + numa_cmpf, &candidate, &found); + if (rc) + goto out; + + /* Not even a suitable placement candidate! Let's just don't touch the + * domain's info->cpumap. It will have affinity with all nodes/cpus. */ + if (found == 0) + goto out; + + /* Map the candidate's node map to the domain's info->cpumap */ + libxl__numa_candidate_get_nodemap(gc, &candidate, &candidate_nodemap); + rc = libxl_nodemap_to_cpumap(CTX, &candidate_nodemap, &info->cpumap); + if (rc) + goto out; + + LOG(DETAIL, "NUMA placement candidate with %d nodes, %d cpus and " + "%"PRIu32" KB free selected", candidate.nr_nodes, + candidate.nr_cpus, candidate.free_memkb / 1024); + + out: + libxl__numa_candidate_dispose(&candidate); + libxl_bitmap_dispose(&candidate_nodemap); + libxl_cpupoolinfo_list_free(pinfo, nr_pools); + return rc; +} + int libxl__build_pre(libxl__gc *gc, uint32_t domid, libxl_domain_build_info *info, libxl__domain_build_state *state) { @@ -107,7 +195,31 @@ int libxl__build_pre(libxl__gc *gc, uint uint32_t rtc_timeoffset; xc_domain_max_vcpus(ctx->xch, domid, info->max_vcpus); + + /* + * Check if the domain has any CPU affinity. If not, try to build + * up one. In case numa_place_domain() find at least a suitable + * candidate, it will affect info->cpumap accordingly; if it + * does not, it just leaves it as it is. This means (unless + * some weird error manifests) the subsequent call to + * libxl_set_vcpuaffinity_all() will do the actual placement, + * whatever that turns out to be. + */ + if (libxl_defbool_val(info->numa_placement)) { + int rc; + + if (!libxl_bitmap_is_full(&info->cpumap)) { + LOG(ERROR, "Can run NUMA placement only if no vcpu " + "affinity is specified"); + return ERROR_INVAL; + } + + rc = numa_place_domain(gc, info); + if (rc) + return rc; + } libxl_set_vcpuaffinity_all(ctx, domid, info->max_vcpus, &info->cpumap); + xc_domain_setmaxmem(ctx->xch, domid, info->target_memkb + LIBXL_MAXMEM_CONSTANT); if (info->type == LIBXL_DOMAIN_TYPE_PV) xc_domain_set_memmap_limit(ctx->xch, domid, diff -r b0fc6f8d5066 -r 4165d71479f9 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Thu Jul 26 10:55:09 2012 +0100 +++ b/tools/libxl/libxl_internal.h Thu Jul 26 15:41:54 2012 +0100 @@ -2497,6 +2497,123 @@ static inline void libxl__ctx_unlock(lib #define CTX_LOCK (libxl__ctx_lock(CTX)) #define CTX_UNLOCK (libxl__ctx_unlock(CTX)) +/* + * Automatic NUMA placement + * + * These functions and data structures deal with the initial placement of a + * domain onto the host NUMA nodes. + * + * The key concept here is the one of "NUMA placement candidate", which is + * basically a set of nodes whose characteristics have been successfully + * checked against some specific requirements. More precisely, a candidate + * is the nodemap associated with one of the possible subset of the host + * NUMA nodes providing a certain amount of free memory, or a given number + * of cpus, or even both (depending in what the caller wants). For + * convenience of use, some of this information are stored within the + * candidate itself, instead of always being dynamically computed. A single + * node can be valid placement candidate, as well as it is possible for a + * candidate to contain all the nodes of the host. The fewer nodes there + * are in a candidate, the better performance a domain placed onto it + * should get (at least from a NUMA point of view). For instance, looking + * for a numa candidates with 2GB of free memory means we want the subsets + * of the host NUMA nodes with, cumulatively, at least 2GB of free memory. + * This condition can be satisfied by just one particular node, or it may + * require more nodes, depending on the characteristics of the host, on how + * many domains have been created already, on how big they are, etc. + * + * The intended usage is as follows: + * 1. first of all, call libxl__get_numa_candidates(), and specify the + * proper constraints to it (e.g., the amount of memory a domain need + * as the minimum amount of free memory for the candidates). If a + * candidate comparison function is provided, the candidate with fewer + * nodes that is found to be best according to what such fucntion says + * is returned. If no comparison function is passed, the very first + * candidate is. + * 2. The chosen candidate's nodemap should be utilized for computing the + * actual affinity of the domain which, given the current NUMA support + * in the hypervisor, is what determines the placement of the domain's + * vcpus and memory. + */ + +typedef struct { + int nr_cpus, nr_nodes; + int nr_vcpus; + uint32_t free_memkb; + libxl_bitmap nodemap; +} libxl__numa_candidate; + +/* Signature for the comparison function between two candidates */ +typedef int (*libxl__numa_candidate_cmpf)(const libxl__numa_candidate *c1, + const libxl__numa_candidate *c2); + +/* + * This looks for the best NUMA placement candidate satisfying some + * specific conditions. If min_nodes and/or max_nodes are not 0, their + * value is used to determine the minimum and maximum number of nodes the + * candidate can have. If they are 0, it means the candidate can contain + * from 1 node (min_nodes=0) to the total number of nodes of the host + * (max_ndoes=0). If min_free_memkb and/or min_cpus are not 0, the caller + * only wants candidates with at least the amount of free memory and the + * number of cpus they specify, respectively. If they are 0, the + * candidates' free memory and/or number of cpus won't be checked at all. + * + * Candidates are compared among each others by calling numa_cmpf(), which + * is where the heuristics for determining which candidate is the best + * one is actually implemented. The only bit of it that is hardcoded in + * this function is the fact that candidates with fewer nodes are always + * preferrable. + * + * If at least one suitable candidate is found, it is returned in cndt_out, + * cndt_found is set to one, and the function returns successfully. On the + * other hand, if not even one single candidate can be found, the function + * still returns successfully but cndt_found will be zero. + * + * It is up to the function to properly allocate cndt_out (by calling + * libxl__numa_candidate_alloc()), while it is the caller that should init + * (libxl__numa_candidate_init()) and free (libxl__numa_candidate_dispose()) + * it. + */ +_hidden int libxl__get_numa_candidate(libxl__gc *gc, + uint32_t min_free_memkb, int min_cpus, + int min_nodes, int max_nodes, + libxl__numa_candidate_cmpf numa_cmpf, + libxl__numa_candidate *cndt_out, + int *cndt_found); + +/* Initialization, allocation and deallocation for placement candidates */ +static inline void libxl__numa_candidate_init(libxl__numa_candidate *cndt) +{ + cndt->free_memkb = 0; + cndt->nr_cpus = cndt->nr_nodes = cndt->nr_vcpus = 0; + libxl_bitmap_init(&cndt->nodemap); +} + +static inline int libxl__numa_candidate_alloc(libxl__gc *gc, + libxl__numa_candidate *cndt) +{ + return libxl_node_bitmap_alloc(CTX, &cndt->nodemap, 0); +} +static inline void libxl__numa_candidate_dispose(libxl__numa_candidate *cndt) +{ + libxl_bitmap_dispose(&cndt->nodemap); +} + +/* Retrieve (in nodemap) the node map associated to placement candidate cndt */ +static inline +void libxl__numa_candidate_get_nodemap(libxl__gc *gc, + const libxl__numa_candidate *cndt, + libxl_bitmap *nodemap) +{ + libxl_bitmap_copy(CTX, nodemap, &cndt->nodemap); +} +/* Set the node map of placement candidate cndt to match nodemap */ +static inline +void libxl__numa_candidate_put_nodemap(libxl__gc *gc, + libxl__numa_candidate *cndt, + const libxl_bitmap *nodemap) +{ + libxl_bitmap_copy(CTX, &cndt->nodemap, nodemap); +} /* * Inserts "elm_new" into the sorted list "head". diff -r b0fc6f8d5066 -r 4165d71479f9 tools/libxl/libxl_numa.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/libxl/libxl_numa.c Thu Jul 26 15:41:54 2012 +0100 @@ -0,0 +1,428 @@ +/* + * Copyright (C) 2012 Citrix Ltd. + * Author Dario Faggioli + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; version 2.1 only. with the special + * exception on linking described in file LICENSE. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + */ + +#include "libxl_osdeps.h" /* must come before any other headers */ + +#include + +#include "libxl_internal.h" + +/* + * What follows are helpers for generating all the k-combinations + * without repetitions of a set S with n elements in it. Formally + * speaking, they are subsets of k distinct elements of S and, if + * S is n elements big, the number of k-combinations is equal to the + * binomial coefficient C(n k)=n!/(k! * (n - k)!). + * + * The various subset are generated one after the other by calling + * comb_init() first, and, after that, comb_next() + * C(n k)-1 times. An iterator is used to store the current status + * of the whole generation operation (i.e., basically, the last + * combination that has been generated). As soon as all combinations + * have been generated, comb_next() will start returning 0 instead of + * 1. The same instance of the iterator and the same values for + * n and k _must_ be used for each call (if that doesn't happen, the + * result is unspecified). + * + * The algorithm is a well known one (see, for example, D. Knuth's "The + * Art of Computer Programming - Volume 4, Fascicle 3" and it produces + * the combinations in such a way that they (well, more precisely, their + * indexes it the array/map representing the set) come with lexicographic + * ordering. + * + * For example, with n = 5 and k = 3, calling comb_init() + * will generate { 0, 1, 2 }, while subsequent valid calls to + * comb_next() will produce the following: + * { { 0, 1, 3 }, { 0, 1, 4 }, + * { 0, 2, 3 }, { 0, 2, 4 }, { 0, 3, 4 }, + * { 1, 2, 3 }, { 1, 2, 4 }, { 1, 3, 4 }, + * { 2, 3, 4 } } + * + * This is used by the automatic NUMA placement logic below. + */ +typedef int* comb_iter_t; + +static int comb_init(libxl__gc *gc, comb_iter_t *it, int n, int k) +{ + comb_iter_t new_iter; + int i; + + if (n < k) + return 0; + + /* First set is always { 0, 1, 2, ..., k-1 } */ + GCNEW_ARRAY(new_iter, k); + for (i = 0; i < k; i++) + new_iter[i] = i; + + *it = new_iter; + return 1; +} + +static int comb_next(comb_iter_t it, int n, int k) +{ + int i; + + /* + * The idea here is to find the leftmost element from where + * we should start incrementing the indexes of the iterator. + * This means looking for the highest index that can be increased + * while still producing value smaller than n-1. In the example + * above, when dealing with { 0, 1, 4 }, such an element is the + * second one, as the third is already equal to 4 (which actually + * is n-1). + * Once we found from where to start, we increment that element + * and override the right-hand rest of the iterator with its + * successors, thus achieving lexicographic ordering. + * + * Regarding the termination of the generation process, when we + * manage in bringing n-k at the very first position of the iterator, + * we know that is the last valid combination ( { 2, 3, 4 }, with + * n - k = 5 - 2 = 2, in the example above), and thus we start + * returning 0 as soon as we cross that border. + */ + for (i = k - 1; it[i] == n - k + i; i--) { + if (i <= 0) + return 0; + } + for (it[i]++, i++; i < k; i++) + it[i] = it[i - 1] + 1; + return 1; +} + +/* NUMA automatic placement (see libxl_internal.h for details) */ + +/* + * This function turns a k-combination iterator into a node map. + * This means the bits in the node map corresponding to the indexes + * of the given combination are the ones that will be set. + * For example, if the iterator represents the combination { 0, 2, 4}, + * the node map will have bits #0, #2 and #4 set. + */ +static void comb_get_nodemap(comb_iter_t it, libxl_bitmap *nodemap, int k) +{ + int i; + + libxl_bitmap_set_none(nodemap); + for (i = 0; i < k; i++) + libxl_bitmap_set(nodemap, it[i]); +} + +/* Retrieve the number of cpus that the nodes that are part of the nodemap + * span. */ +static int nodemap_to_nr_cpus(libxl_cputopology *tinfo, int nr_cpus, + const libxl_bitmap *nodemap) +{ + int i, nodes_cpus = 0; + + for (i = 0; i < nr_cpus; i++) { + if (libxl_bitmap_test(nodemap, tinfo[i].node)) + nodes_cpus++; + } + return nodes_cpus; +} + +/* Retrieve the amount of free memory within the nodemap */ +static uint32_t nodemap_to_free_memkb(libxl_numainfo *ninfo, + libxl_bitmap *nodemap) +{ + uint32_t free_memkb = 0; + int i; + + libxl_for_each_set_bit(i, *nodemap) + free_memkb += ninfo[i].free / 1024; + + return free_memkb; +} + +/* Retrieve the number of vcpus able to run on the cpus of the nodes + * that are part of the nodemap. */ +static int nodemap_to_nr_vcpus(libxl__gc *gc, libxl_cputopology *tinfo, + const libxl_bitmap *nodemap) +{ + libxl_dominfo *dinfo = NULL; + libxl_bitmap vcpu_nodemap; + int nr_doms, nr_cpus; + int nr_vcpus = 0; + int i, j, k; + + dinfo = libxl_list_domain(CTX, &nr_doms); + if (dinfo == NULL) + return ERROR_FAIL; + + if (libxl_node_bitmap_alloc(CTX, &vcpu_nodemap, 0) < 0) { + libxl_dominfo_list_free(dinfo, nr_doms); + return ERROR_FAIL; + } + + for (i = 0; i < nr_doms; i++) { + libxl_vcpuinfo *vinfo; + int nr_dom_vcpus; + + vinfo = libxl_list_vcpu(CTX, dinfo[i].domid, &nr_dom_vcpus, &nr_cpus); + if (vinfo == NULL) + continue; + + /* For each vcpu of each domain ... */ + for (j = 0; j < nr_dom_vcpus; j++) { + + /* Build up a map telling on which nodes the vcpu is runnable on */ + libxl_bitmap_set_none(&vcpu_nodemap); + libxl_for_each_set_bit(k, vinfo[j].cpumap) + libxl_bitmap_set(&vcpu_nodemap, tinfo[k].node); + + /* And check if that map has any intersection with our nodemap */ + libxl_for_each_set_bit(k, vcpu_nodemap) { + if (libxl_bitmap_test(nodemap, k)) { + nr_vcpus++; + break; + } + } + } + + libxl_vcpuinfo_list_free(vinfo, nr_dom_vcpus); + } + + libxl_bitmap_dispose(&vcpu_nodemap); + libxl_dominfo_list_free(dinfo, nr_doms); + return nr_vcpus; +} + +/* + * This function tries to figure out if the host has a consistent number + * of cpus along all its NUMA nodes. In fact, if that is the case, we can + * calculate the minimum number of nodes needed for a domain by just + * dividing its total number of vcpus by this value computed here. + * However, we are not allowed to assume that all the nodes have the + * same number of cpus. Therefore, in case discrepancies among different + * nodes are found, this function just returns 0, for the caller to know + * it shouldn't rely on this 'optimization', and sort out things in some + * other way (by doing something basic, like starting trying with + * candidates with just one node). + */ +static int count_cpus_per_node(libxl_cputopology *tinfo, int nr_cpus, + libxl_numainfo *ninfo, int nr_nodes) +{ + int cpus_per_node = 0; + int j, i; + + /* This makes sense iff # of PCPUs is the same for all nodes */ + for (j = 0; j < nr_nodes; j++) { + int curr_cpus = 0; + + for (i = 0; i < nr_cpus; i++) { + if (tinfo[i].node == j) + curr_cpus++; + } + /* So, if the above does not hold, turn the whole thing off! */ + cpus_per_node = cpus_per_node == 0 ? curr_cpus : cpus_per_node; + if (cpus_per_node != curr_cpus) + return 0; + } + return cpus_per_node; +} + +/* + * Looks for the placement candidates that satisfyies some specific + * conditions and return the best one according to the provided + * comparison function. + */ +int libxl__get_numa_candidate(libxl__gc *gc, + uint32_t min_free_memkb, int min_cpus, + int min_nodes, int max_nodes, + libxl__numa_candidate_cmpf numa_cmpf, + libxl__numa_candidate *cndt_out, + int *cndt_found) +{ + libxl__numa_candidate new_cndt; + libxl_cputopology *tinfo = NULL; + libxl_numainfo *ninfo = NULL; + int nr_nodes = 0, nr_cpus = 0; + libxl_bitmap nodemap; + int rc = 0; + + libxl_bitmap_init(&nodemap); + libxl__numa_candidate_init(&new_cndt); + + /* Get platform info and prepare the map for testing the combinations */ + ninfo = libxl_get_numainfo(CTX, &nr_nodes); + if (ninfo == NULL) + return ERROR_FAIL; + + /* + * The good thing about this solution is that it is based on heuristics + * (implemented in numa_cmpf() ), but we at least can evaluate it on + * all the possible placement candidates. That can happen because the + * number of nodes present in current NUMA systems is quite small. + * In fact, even if a sum of binomials is involved, if the system has + * up to 16 nodes it "only" takes 65535 steps. This is fine, as the + * number of nodes the biggest NUMA systems provide at the time of this + * writing is 8 (and it will probably continue to be so for a while). + * However, computanional complexity would explode on systems bigger + * than that, and it's really important we avoid trying to run this + * on monsters with 32, 64 or more nodes (if they ever pop into being). + * Therefore, here it comes a safety catch that disables the algorithm + * for the cases when it wouldn't work well. + */ + if (nr_nodes > 16) { + /* Log we did nothing and return 0, as no real error occurred */ + LOG(WARN, "System has %d NUMA nodes, which is too big for the " + "placement algorithm to work effectively: skipping it. " + "Consider manually pinning the vCPUs and/or looking at " + "cpupools for manually partitioning the system.", + nr_nodes); + *cndt_found = 0; + goto out; + } + + tinfo = libxl_get_cpu_topology(CTX, &nr_cpus); + if (tinfo == NULL) { + rc = ERROR_FAIL; + goto out; + } + + rc = libxl_node_bitmap_alloc(CTX, &nodemap, 0); + if (rc) + goto out; + rc = libxl__numa_candidate_alloc(gc, &new_cndt); + if (rc) + goto out; + + /* + * If the minimum number of NUMA nodes is not explicitly specified + * (i.e., min_nodes == 0), we try to figure out a sensible number of nodes + * from where to start generating candidates, if possible (or just start + * from 1 otherwise). The maximum number of nodes should not exceed the + * number of existent NUMA nodes on the host, or the candidate generation + * won't work properly. + */ + if (!min_nodes) { + int cpus_per_node; + + cpus_per_node = count_cpus_per_node(tinfo, nr_cpus, ninfo, nr_nodes); + if (cpus_per_node == 0) + min_nodes = 1; + else + min_nodes = (min_cpus + cpus_per_node - 1) / cpus_per_node; + } + if (min_nodes > nr_nodes) + min_nodes = nr_nodes; + if (!max_nodes || max_nodes > nr_nodes) + max_nodes = nr_nodes; + if (min_nodes > max_nodes) { + LOG(ERROR, "Inconsistent minimum or maximum number of guest nodes"); + rc = ERROR_INVAL; + goto out; + } + + /* This is up to the caller to be disposed */ + rc = libxl__numa_candidate_alloc(gc, cndt_out); + if (rc) + goto out; + + /* + * Consider all the combinations with sizes in [min_nodes, max_nodes] + * (see comb_init() and comb_next()). Note that, since the fewer the + * number of nodes the better, it is guaranteed that any candidate + * found during the i-eth step will be better than any other one we + * could find during the (i+1)-eth and all the subsequent steps (they + * all will have more nodes). It's thus pointless to keep going if + * we already found something. + */ + *cndt_found = 0; + while (min_nodes <= max_nodes && *cndt_found == 0) { + comb_iter_t comb_iter; + int comb_ok; + + /* + * And here it is. Each step of this cycle generates a combination of + * nodes as big as min_nodes mandates. Each of these combinations is + * checked against the constraints provided by the caller (namely, + * amount of free memory and number of cpus) and it can concur to + * become our best placement iff it passes the check. + */ + for (comb_ok = comb_init(gc, &comb_iter, nr_nodes, min_nodes); comb_ok; + comb_ok = comb_next(comb_iter, nr_nodes, min_nodes)) { + uint32_t nodes_free_memkb; + int nodes_cpus; + + comb_get_nodemap(comb_iter, &nodemap, min_nodes); + + /* If there is not enough memory in this combination, skip it + * and go generating the next one... */ + nodes_free_memkb = nodemap_to_free_memkb(ninfo, &nodemap); + if (min_free_memkb && nodes_free_memkb < min_free_memkb) + continue; + + /* And the same applies if this combination is short in cpus */ + nodes_cpus = nodemap_to_nr_cpus(tinfo, nr_cpus, &nodemap); + if (min_cpus && nodes_cpus < min_cpus) + continue; + + /* + * Conditions are met, we can compare this candidate with the + * current best one (if any). + */ + libxl__numa_candidate_put_nodemap(gc, &new_cndt, &nodemap); + new_cndt.nr_vcpus = nodemap_to_nr_vcpus(gc, tinfo, &nodemap); + new_cndt.free_memkb = nodes_free_memkb; + new_cndt.nr_nodes = min_nodes; + new_cndt.nr_cpus = nodes_cpus; + + /* + * Check if the new candidate we is better the what we found up + * to now by means of the comparison function. If no comparison + * function is provided, just return as soon as we find our first + * candidate. + */ + if (*cndt_found == 0 || numa_cmpf(&new_cndt, cndt_out) < 0) { + *cndt_found = 1; + + LOG(DEBUG, "New best NUMA placement candidate found: " + "nr_nodes=%d, nr_cpus=%d, nr_vcpus=%d, " + "free_memkb=%"PRIu32"", min_nodes, new_cndt.nr_cpus, + new_cndt.nr_vcpus, new_cndt.free_memkb / 1024); + + libxl__numa_candidate_put_nodemap(gc, cndt_out, &nodemap); + cndt_out->nr_vcpus = new_cndt.nr_vcpus; + cndt_out->free_memkb = new_cndt.free_memkb; + cndt_out->nr_nodes = new_cndt.nr_nodes; + cndt_out->nr_cpus = new_cndt.nr_cpus; + + if (numa_cmpf == NULL) + break; + } + } + min_nodes++; + } + + if (*cndt_found == 0) + LOG(NOTICE, "NUMA placement failed, performance might be affected"); + + out: + libxl_bitmap_dispose(&nodemap); + libxl__numa_candidate_dispose(&new_cndt); + libxl_numainfo_list_free(ninfo, nr_nodes); + libxl_cputopology_list_free(tinfo, nr_cpus); + return rc; +} + +/* + * Local variables: + * mode: C + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff -r b0fc6f8d5066 -r 4165d71479f9 tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Thu Jul 26 10:55:09 2012 +0100 +++ b/tools/libxl/libxl_types.idl Thu Jul 26 15:41:54 2012 +0100 @@ -249,6 +249,7 @@ libxl_domain_build_info = Struct("domain ("max_vcpus", integer), ("avail_vcpus", libxl_bitmap), ("cpumap", libxl_bitmap), + ("numa_placement", libxl_defbool), ("tsc_mode", libxl_tsc_mode), ("max_memkb", MemKB), ("target_memkb", MemKB), diff -r b0fc6f8d5066 -r 4165d71479f9 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Thu Jul 26 10:55:09 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Thu Jul 26 15:41:54 2012 +0100 @@ -696,6 +696,9 @@ static void parse_config_data(const char vcpu_to_pcpu[n_cpus] = i; n_cpus++; } + + /* We have a cpumap, disable automatic placement */ + libxl_defbool_set(&b_info->numa_placement, false); } else if (!xlu_cfg_get_string (config, "cpus", &buf, 0)) { char *buf2 = strdup(buf); @@ -709,6 +712,8 @@ static void parse_config_data(const char if (vcpupin_parse(buf2, &b_info->cpumap)) exit(1); free(buf2); + + libxl_defbool_set(&b_info->numa_placement, false); } if (!xlu_cfg_get_long (config, "memory", &l, 0)) { _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jul 28 03:00:28 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Jul 2012 03:00:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGO-0001nk-Ji; Sat, 28 Jul 2012 03:00:20 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGN-0001nN-FL for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:19 +0000 Received: from [85.158.143.35:23205] by server-3.bemta-4.messagelabs.com id 92/1E-01511-2C553105; Sat, 28 Jul 2012 03:00:18 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-21.messagelabs.com!1343444414!17500732!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 19455 invoked from network); 28 Jul 2012 03:00: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; 28 Jul 2012 03:00:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGH-0003Pt-DE for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuxGC-0002iE-KU for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:10 +0000 Message-Id: Date: Sat, 28 Jul 2012 03:00:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: enable automatic placement of guests on NUMA nodes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343313714 -3600 # Node ID 4165d71479f92c58f3b7029d19e69cd779345d9a # Parent b0fc6f8d5066498d79d9bcbb29ccf3b1fc2a9e2c libxl: enable automatic placement of guests on NUMA nodes If a domain does not have a VCPU affinity, try to pin it automatically to some PCPUs. This is done taking into account the NUMA characteristics of the host. In fact, we look for a combination of host's NUMA nodes with enough free memory and number of PCPUs for the new domain, and pin it to the VCPUs of those nodes. Deciding which placement is the best happens by means of some heuristics. For instance, smaller candidates are better, both from a domain perspective (less memory spreading among nodes) and from the entire system perspective (smaller memory fragmentation). In case of candidates of equal sizes (i.e., with the same number of nodes), the amount of free memory and the number of domains' vCPUs already pinned to the candidates' nodes are both considered. Very often, candidates with greater amount of memory are the one we wants, as this is good for keeping memory fragmentation under control. However, we do not want to overcommit some node too much, just because it has a lot of memory, and that's why the number of vCPUs must be accounted for. This all happens internally to libxl, and no API for driving the mechanism is provided for now. This matches what xend already does. Signed-off-by: Dario Faggioli Acked-by: George Dunlap Acked-by: Ian Jackson Tested-by: Andre Przywara Committed-by: Ian Campbell --- diff -r b0fc6f8d5066 -r 4165d71479f9 docs/man/xl.cfg.pod.5 --- a/docs/man/xl.cfg.pod.5 Thu Jul 26 10:55:09 2012 +0100 +++ b/docs/man/xl.cfg.pod.5 Thu Jul 26 15:41:54 2012 +0100 @@ -111,8 +111,8 @@ created online and the remainder will be =item B -List of which cpus the guest is allowed to use. Default behavior is -`all cpus`. A C may be specified as follows: +List of which cpus the guest is allowed to use. By default xl will pick +some cpus on its own (see below). A C may be specified as follows: =over 4 @@ -132,6 +132,12 @@ run on cpu #3 of the host. =back +If this option is not specified, libxl automatically tries to place the new +domain on the host's NUMA nodes (provided the host has more than one NUMA +node) by pinning it to the cpus of those nodes. A heuristic approach is +utilized with the goals of maximizing performance for the domain and, at +the same time, achieving efficient utilization of the host's CPUs and RAM. + =item B A domain with a weight of 512 will get twice as much CPU as a domain diff -r b0fc6f8d5066 -r 4165d71479f9 tools/libxl/Makefile --- a/tools/libxl/Makefile Thu Jul 26 10:55:09 2012 +0100 +++ b/tools/libxl/Makefile Thu Jul 26 15:41:54 2012 +0100 @@ -66,7 +66,7 @@ LIBXL_LIBS += -lyajl LIBXL_OBJS = flexarray.o libxl.o libxl_create.o libxl_dm.o libxl_pci.o \ libxl_dom.o libxl_exec.o libxl_xshelp.o libxl_device.o \ libxl_internal.o libxl_utils.o libxl_uuid.o \ - libxl_json.o libxl_aoutils.o \ + libxl_json.o libxl_aoutils.o libxl_numa.o \ libxl_save_callout.o _libxl_save_msgs_callout.o \ libxl_qmp.o libxl_event.o libxl_fork.o $(LIBXL_OBJS-y) LIBXL_OBJS += _libxl_types.o libxl_flask.o _libxl_types_internal.o diff -r b0fc6f8d5066 -r 4165d71479f9 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Thu Jul 26 10:55:09 2012 +0100 +++ b/tools/libxl/libxl_create.c Thu Jul 26 15:41:54 2012 +0100 @@ -215,6 +215,8 @@ int libxl__domain_build_info_setdefault( libxl_bitmap_set_any(&b_info->cpumap); } + libxl_defbool_setdefault(&b_info->numa_placement, true); + if (b_info->max_memkb == LIBXL_MEMKB_DEFAULT) b_info->max_memkb = 32 * 1024; if (b_info->target_memkb == LIBXL_MEMKB_DEFAULT) diff -r b0fc6f8d5066 -r 4165d71479f9 tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Thu Jul 26 10:55:09 2012 +0100 +++ b/tools/libxl/libxl_dom.c Thu Jul 26 15:41:54 2012 +0100 @@ -98,6 +98,94 @@ out: return sched; } +/* + * Two NUMA placement candidates are compared by means of the following + * heuristics: + + * - the number of vcpus runnable on the candidates is considered, and + * candidates with fewer of them are preferred. If two candidate have + * the same number of runnable vcpus, + * - the amount of free memory in the candidates is considered, and the + * candidate with greater amount of it is preferred. + * + * In fact, leaving larger memory holes, maximizes the probability of being + * able to put other domains on the node. That hopefully means many domains + * will benefit from local memory accesses, but also introduces the risk of + * overloading large (from a memory POV) nodes. That's right the effect + * that counting the vcpus able to run on the nodes tries to prevent. + * + * Note that this completely ignore the number of nodes each candidate span, + * as the fact that fewer nodes is better is already accounted for in the + * algorithm. + */ +static int numa_cmpf(const libxl__numa_candidate *c1, + const libxl__numa_candidate *c2) +{ + if (c1->nr_vcpus != c2->nr_vcpus) + return c1->nr_vcpus - c2->nr_vcpus; + + return c2->free_memkb - c1->free_memkb; +} + +/* The actual automatic NUMA placement routine */ +static int numa_place_domain(libxl__gc *gc, libxl_domain_build_info *info) +{ + int found; + libxl__numa_candidate candidate; + libxl_bitmap candidate_nodemap; + libxl_cpupoolinfo *pinfo; + int nr_pools, rc = 0; + uint32_t memkb; + + libxl__numa_candidate_init(&candidate); + libxl_bitmap_init(&candidate_nodemap); + + /* First of all, if cpupools are in use, better not to mess with them */ + pinfo = libxl_list_cpupool(CTX, &nr_pools); + if (!pinfo) + return ERROR_FAIL; + if (nr_pools > 1) { + LOG(NOTICE, "Skipping NUMA placement as cpupools are in use"); + goto out; + } + + rc = libxl_domain_need_memory(CTX, info, &memkb); + if (rc) + goto out; + if (libxl_node_bitmap_alloc(CTX, &candidate_nodemap, 0)) { + rc = ERROR_FAIL; + goto out; + } + + /* Find the best candidate with enough free memory and at least + * as much pcpus as the domain has vcpus. */ + rc = libxl__get_numa_candidate(gc, memkb, info->max_vcpus, 0, 0, + numa_cmpf, &candidate, &found); + if (rc) + goto out; + + /* Not even a suitable placement candidate! Let's just don't touch the + * domain's info->cpumap. It will have affinity with all nodes/cpus. */ + if (found == 0) + goto out; + + /* Map the candidate's node map to the domain's info->cpumap */ + libxl__numa_candidate_get_nodemap(gc, &candidate, &candidate_nodemap); + rc = libxl_nodemap_to_cpumap(CTX, &candidate_nodemap, &info->cpumap); + if (rc) + goto out; + + LOG(DETAIL, "NUMA placement candidate with %d nodes, %d cpus and " + "%"PRIu32" KB free selected", candidate.nr_nodes, + candidate.nr_cpus, candidate.free_memkb / 1024); + + out: + libxl__numa_candidate_dispose(&candidate); + libxl_bitmap_dispose(&candidate_nodemap); + libxl_cpupoolinfo_list_free(pinfo, nr_pools); + return rc; +} + int libxl__build_pre(libxl__gc *gc, uint32_t domid, libxl_domain_build_info *info, libxl__domain_build_state *state) { @@ -107,7 +195,31 @@ int libxl__build_pre(libxl__gc *gc, uint uint32_t rtc_timeoffset; xc_domain_max_vcpus(ctx->xch, domid, info->max_vcpus); + + /* + * Check if the domain has any CPU affinity. If not, try to build + * up one. In case numa_place_domain() find at least a suitable + * candidate, it will affect info->cpumap accordingly; if it + * does not, it just leaves it as it is. This means (unless + * some weird error manifests) the subsequent call to + * libxl_set_vcpuaffinity_all() will do the actual placement, + * whatever that turns out to be. + */ + if (libxl_defbool_val(info->numa_placement)) { + int rc; + + if (!libxl_bitmap_is_full(&info->cpumap)) { + LOG(ERROR, "Can run NUMA placement only if no vcpu " + "affinity is specified"); + return ERROR_INVAL; + } + + rc = numa_place_domain(gc, info); + if (rc) + return rc; + } libxl_set_vcpuaffinity_all(ctx, domid, info->max_vcpus, &info->cpumap); + xc_domain_setmaxmem(ctx->xch, domid, info->target_memkb + LIBXL_MAXMEM_CONSTANT); if (info->type == LIBXL_DOMAIN_TYPE_PV) xc_domain_set_memmap_limit(ctx->xch, domid, diff -r b0fc6f8d5066 -r 4165d71479f9 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Thu Jul 26 10:55:09 2012 +0100 +++ b/tools/libxl/libxl_internal.h Thu Jul 26 15:41:54 2012 +0100 @@ -2497,6 +2497,123 @@ static inline void libxl__ctx_unlock(lib #define CTX_LOCK (libxl__ctx_lock(CTX)) #define CTX_UNLOCK (libxl__ctx_unlock(CTX)) +/* + * Automatic NUMA placement + * + * These functions and data structures deal with the initial placement of a + * domain onto the host NUMA nodes. + * + * The key concept here is the one of "NUMA placement candidate", which is + * basically a set of nodes whose characteristics have been successfully + * checked against some specific requirements. More precisely, a candidate + * is the nodemap associated with one of the possible subset of the host + * NUMA nodes providing a certain amount of free memory, or a given number + * of cpus, or even both (depending in what the caller wants). For + * convenience of use, some of this information are stored within the + * candidate itself, instead of always being dynamically computed. A single + * node can be valid placement candidate, as well as it is possible for a + * candidate to contain all the nodes of the host. The fewer nodes there + * are in a candidate, the better performance a domain placed onto it + * should get (at least from a NUMA point of view). For instance, looking + * for a numa candidates with 2GB of free memory means we want the subsets + * of the host NUMA nodes with, cumulatively, at least 2GB of free memory. + * This condition can be satisfied by just one particular node, or it may + * require more nodes, depending on the characteristics of the host, on how + * many domains have been created already, on how big they are, etc. + * + * The intended usage is as follows: + * 1. first of all, call libxl__get_numa_candidates(), and specify the + * proper constraints to it (e.g., the amount of memory a domain need + * as the minimum amount of free memory for the candidates). If a + * candidate comparison function is provided, the candidate with fewer + * nodes that is found to be best according to what such fucntion says + * is returned. If no comparison function is passed, the very first + * candidate is. + * 2. The chosen candidate's nodemap should be utilized for computing the + * actual affinity of the domain which, given the current NUMA support + * in the hypervisor, is what determines the placement of the domain's + * vcpus and memory. + */ + +typedef struct { + int nr_cpus, nr_nodes; + int nr_vcpus; + uint32_t free_memkb; + libxl_bitmap nodemap; +} libxl__numa_candidate; + +/* Signature for the comparison function between two candidates */ +typedef int (*libxl__numa_candidate_cmpf)(const libxl__numa_candidate *c1, + const libxl__numa_candidate *c2); + +/* + * This looks for the best NUMA placement candidate satisfying some + * specific conditions. If min_nodes and/or max_nodes are not 0, their + * value is used to determine the minimum and maximum number of nodes the + * candidate can have. If they are 0, it means the candidate can contain + * from 1 node (min_nodes=0) to the total number of nodes of the host + * (max_ndoes=0). If min_free_memkb and/or min_cpus are not 0, the caller + * only wants candidates with at least the amount of free memory and the + * number of cpus they specify, respectively. If they are 0, the + * candidates' free memory and/or number of cpus won't be checked at all. + * + * Candidates are compared among each others by calling numa_cmpf(), which + * is where the heuristics for determining which candidate is the best + * one is actually implemented. The only bit of it that is hardcoded in + * this function is the fact that candidates with fewer nodes are always + * preferrable. + * + * If at least one suitable candidate is found, it is returned in cndt_out, + * cndt_found is set to one, and the function returns successfully. On the + * other hand, if not even one single candidate can be found, the function + * still returns successfully but cndt_found will be zero. + * + * It is up to the function to properly allocate cndt_out (by calling + * libxl__numa_candidate_alloc()), while it is the caller that should init + * (libxl__numa_candidate_init()) and free (libxl__numa_candidate_dispose()) + * it. + */ +_hidden int libxl__get_numa_candidate(libxl__gc *gc, + uint32_t min_free_memkb, int min_cpus, + int min_nodes, int max_nodes, + libxl__numa_candidate_cmpf numa_cmpf, + libxl__numa_candidate *cndt_out, + int *cndt_found); + +/* Initialization, allocation and deallocation for placement candidates */ +static inline void libxl__numa_candidate_init(libxl__numa_candidate *cndt) +{ + cndt->free_memkb = 0; + cndt->nr_cpus = cndt->nr_nodes = cndt->nr_vcpus = 0; + libxl_bitmap_init(&cndt->nodemap); +} + +static inline int libxl__numa_candidate_alloc(libxl__gc *gc, + libxl__numa_candidate *cndt) +{ + return libxl_node_bitmap_alloc(CTX, &cndt->nodemap, 0); +} +static inline void libxl__numa_candidate_dispose(libxl__numa_candidate *cndt) +{ + libxl_bitmap_dispose(&cndt->nodemap); +} + +/* Retrieve (in nodemap) the node map associated to placement candidate cndt */ +static inline +void libxl__numa_candidate_get_nodemap(libxl__gc *gc, + const libxl__numa_candidate *cndt, + libxl_bitmap *nodemap) +{ + libxl_bitmap_copy(CTX, nodemap, &cndt->nodemap); +} +/* Set the node map of placement candidate cndt to match nodemap */ +static inline +void libxl__numa_candidate_put_nodemap(libxl__gc *gc, + libxl__numa_candidate *cndt, + const libxl_bitmap *nodemap) +{ + libxl_bitmap_copy(CTX, &cndt->nodemap, nodemap); +} /* * Inserts "elm_new" into the sorted list "head". diff -r b0fc6f8d5066 -r 4165d71479f9 tools/libxl/libxl_numa.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/libxl/libxl_numa.c Thu Jul 26 15:41:54 2012 +0100 @@ -0,0 +1,428 @@ +/* + * Copyright (C) 2012 Citrix Ltd. + * Author Dario Faggioli + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; version 2.1 only. with the special + * exception on linking described in file LICENSE. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + */ + +#include "libxl_osdeps.h" /* must come before any other headers */ + +#include + +#include "libxl_internal.h" + +/* + * What follows are helpers for generating all the k-combinations + * without repetitions of a set S with n elements in it. Formally + * speaking, they are subsets of k distinct elements of S and, if + * S is n elements big, the number of k-combinations is equal to the + * binomial coefficient C(n k)=n!/(k! * (n - k)!). + * + * The various subset are generated one after the other by calling + * comb_init() first, and, after that, comb_next() + * C(n k)-1 times. An iterator is used to store the current status + * of the whole generation operation (i.e., basically, the last + * combination that has been generated). As soon as all combinations + * have been generated, comb_next() will start returning 0 instead of + * 1. The same instance of the iterator and the same values for + * n and k _must_ be used for each call (if that doesn't happen, the + * result is unspecified). + * + * The algorithm is a well known one (see, for example, D. Knuth's "The + * Art of Computer Programming - Volume 4, Fascicle 3" and it produces + * the combinations in such a way that they (well, more precisely, their + * indexes it the array/map representing the set) come with lexicographic + * ordering. + * + * For example, with n = 5 and k = 3, calling comb_init() + * will generate { 0, 1, 2 }, while subsequent valid calls to + * comb_next() will produce the following: + * { { 0, 1, 3 }, { 0, 1, 4 }, + * { 0, 2, 3 }, { 0, 2, 4 }, { 0, 3, 4 }, + * { 1, 2, 3 }, { 1, 2, 4 }, { 1, 3, 4 }, + * { 2, 3, 4 } } + * + * This is used by the automatic NUMA placement logic below. + */ +typedef int* comb_iter_t; + +static int comb_init(libxl__gc *gc, comb_iter_t *it, int n, int k) +{ + comb_iter_t new_iter; + int i; + + if (n < k) + return 0; + + /* First set is always { 0, 1, 2, ..., k-1 } */ + GCNEW_ARRAY(new_iter, k); + for (i = 0; i < k; i++) + new_iter[i] = i; + + *it = new_iter; + return 1; +} + +static int comb_next(comb_iter_t it, int n, int k) +{ + int i; + + /* + * The idea here is to find the leftmost element from where + * we should start incrementing the indexes of the iterator. + * This means looking for the highest index that can be increased + * while still producing value smaller than n-1. In the example + * above, when dealing with { 0, 1, 4 }, such an element is the + * second one, as the third is already equal to 4 (which actually + * is n-1). + * Once we found from where to start, we increment that element + * and override the right-hand rest of the iterator with its + * successors, thus achieving lexicographic ordering. + * + * Regarding the termination of the generation process, when we + * manage in bringing n-k at the very first position of the iterator, + * we know that is the last valid combination ( { 2, 3, 4 }, with + * n - k = 5 - 2 = 2, in the example above), and thus we start + * returning 0 as soon as we cross that border. + */ + for (i = k - 1; it[i] == n - k + i; i--) { + if (i <= 0) + return 0; + } + for (it[i]++, i++; i < k; i++) + it[i] = it[i - 1] + 1; + return 1; +} + +/* NUMA automatic placement (see libxl_internal.h for details) */ + +/* + * This function turns a k-combination iterator into a node map. + * This means the bits in the node map corresponding to the indexes + * of the given combination are the ones that will be set. + * For example, if the iterator represents the combination { 0, 2, 4}, + * the node map will have bits #0, #2 and #4 set. + */ +static void comb_get_nodemap(comb_iter_t it, libxl_bitmap *nodemap, int k) +{ + int i; + + libxl_bitmap_set_none(nodemap); + for (i = 0; i < k; i++) + libxl_bitmap_set(nodemap, it[i]); +} + +/* Retrieve the number of cpus that the nodes that are part of the nodemap + * span. */ +static int nodemap_to_nr_cpus(libxl_cputopology *tinfo, int nr_cpus, + const libxl_bitmap *nodemap) +{ + int i, nodes_cpus = 0; + + for (i = 0; i < nr_cpus; i++) { + if (libxl_bitmap_test(nodemap, tinfo[i].node)) + nodes_cpus++; + } + return nodes_cpus; +} + +/* Retrieve the amount of free memory within the nodemap */ +static uint32_t nodemap_to_free_memkb(libxl_numainfo *ninfo, + libxl_bitmap *nodemap) +{ + uint32_t free_memkb = 0; + int i; + + libxl_for_each_set_bit(i, *nodemap) + free_memkb += ninfo[i].free / 1024; + + return free_memkb; +} + +/* Retrieve the number of vcpus able to run on the cpus of the nodes + * that are part of the nodemap. */ +static int nodemap_to_nr_vcpus(libxl__gc *gc, libxl_cputopology *tinfo, + const libxl_bitmap *nodemap) +{ + libxl_dominfo *dinfo = NULL; + libxl_bitmap vcpu_nodemap; + int nr_doms, nr_cpus; + int nr_vcpus = 0; + int i, j, k; + + dinfo = libxl_list_domain(CTX, &nr_doms); + if (dinfo == NULL) + return ERROR_FAIL; + + if (libxl_node_bitmap_alloc(CTX, &vcpu_nodemap, 0) < 0) { + libxl_dominfo_list_free(dinfo, nr_doms); + return ERROR_FAIL; + } + + for (i = 0; i < nr_doms; i++) { + libxl_vcpuinfo *vinfo; + int nr_dom_vcpus; + + vinfo = libxl_list_vcpu(CTX, dinfo[i].domid, &nr_dom_vcpus, &nr_cpus); + if (vinfo == NULL) + continue; + + /* For each vcpu of each domain ... */ + for (j = 0; j < nr_dom_vcpus; j++) { + + /* Build up a map telling on which nodes the vcpu is runnable on */ + libxl_bitmap_set_none(&vcpu_nodemap); + libxl_for_each_set_bit(k, vinfo[j].cpumap) + libxl_bitmap_set(&vcpu_nodemap, tinfo[k].node); + + /* And check if that map has any intersection with our nodemap */ + libxl_for_each_set_bit(k, vcpu_nodemap) { + if (libxl_bitmap_test(nodemap, k)) { + nr_vcpus++; + break; + } + } + } + + libxl_vcpuinfo_list_free(vinfo, nr_dom_vcpus); + } + + libxl_bitmap_dispose(&vcpu_nodemap); + libxl_dominfo_list_free(dinfo, nr_doms); + return nr_vcpus; +} + +/* + * This function tries to figure out if the host has a consistent number + * of cpus along all its NUMA nodes. In fact, if that is the case, we can + * calculate the minimum number of nodes needed for a domain by just + * dividing its total number of vcpus by this value computed here. + * However, we are not allowed to assume that all the nodes have the + * same number of cpus. Therefore, in case discrepancies among different + * nodes are found, this function just returns 0, for the caller to know + * it shouldn't rely on this 'optimization', and sort out things in some + * other way (by doing something basic, like starting trying with + * candidates with just one node). + */ +static int count_cpus_per_node(libxl_cputopology *tinfo, int nr_cpus, + libxl_numainfo *ninfo, int nr_nodes) +{ + int cpus_per_node = 0; + int j, i; + + /* This makes sense iff # of PCPUs is the same for all nodes */ + for (j = 0; j < nr_nodes; j++) { + int curr_cpus = 0; + + for (i = 0; i < nr_cpus; i++) { + if (tinfo[i].node == j) + curr_cpus++; + } + /* So, if the above does not hold, turn the whole thing off! */ + cpus_per_node = cpus_per_node == 0 ? curr_cpus : cpus_per_node; + if (cpus_per_node != curr_cpus) + return 0; + } + return cpus_per_node; +} + +/* + * Looks for the placement candidates that satisfyies some specific + * conditions and return the best one according to the provided + * comparison function. + */ +int libxl__get_numa_candidate(libxl__gc *gc, + uint32_t min_free_memkb, int min_cpus, + int min_nodes, int max_nodes, + libxl__numa_candidate_cmpf numa_cmpf, + libxl__numa_candidate *cndt_out, + int *cndt_found) +{ + libxl__numa_candidate new_cndt; + libxl_cputopology *tinfo = NULL; + libxl_numainfo *ninfo = NULL; + int nr_nodes = 0, nr_cpus = 0; + libxl_bitmap nodemap; + int rc = 0; + + libxl_bitmap_init(&nodemap); + libxl__numa_candidate_init(&new_cndt); + + /* Get platform info and prepare the map for testing the combinations */ + ninfo = libxl_get_numainfo(CTX, &nr_nodes); + if (ninfo == NULL) + return ERROR_FAIL; + + /* + * The good thing about this solution is that it is based on heuristics + * (implemented in numa_cmpf() ), but we at least can evaluate it on + * all the possible placement candidates. That can happen because the + * number of nodes present in current NUMA systems is quite small. + * In fact, even if a sum of binomials is involved, if the system has + * up to 16 nodes it "only" takes 65535 steps. This is fine, as the + * number of nodes the biggest NUMA systems provide at the time of this + * writing is 8 (and it will probably continue to be so for a while). + * However, computanional complexity would explode on systems bigger + * than that, and it's really important we avoid trying to run this + * on monsters with 32, 64 or more nodes (if they ever pop into being). + * Therefore, here it comes a safety catch that disables the algorithm + * for the cases when it wouldn't work well. + */ + if (nr_nodes > 16) { + /* Log we did nothing and return 0, as no real error occurred */ + LOG(WARN, "System has %d NUMA nodes, which is too big for the " + "placement algorithm to work effectively: skipping it. " + "Consider manually pinning the vCPUs and/or looking at " + "cpupools for manually partitioning the system.", + nr_nodes); + *cndt_found = 0; + goto out; + } + + tinfo = libxl_get_cpu_topology(CTX, &nr_cpus); + if (tinfo == NULL) { + rc = ERROR_FAIL; + goto out; + } + + rc = libxl_node_bitmap_alloc(CTX, &nodemap, 0); + if (rc) + goto out; + rc = libxl__numa_candidate_alloc(gc, &new_cndt); + if (rc) + goto out; + + /* + * If the minimum number of NUMA nodes is not explicitly specified + * (i.e., min_nodes == 0), we try to figure out a sensible number of nodes + * from where to start generating candidates, if possible (or just start + * from 1 otherwise). The maximum number of nodes should not exceed the + * number of existent NUMA nodes on the host, or the candidate generation + * won't work properly. + */ + if (!min_nodes) { + int cpus_per_node; + + cpus_per_node = count_cpus_per_node(tinfo, nr_cpus, ninfo, nr_nodes); + if (cpus_per_node == 0) + min_nodes = 1; + else + min_nodes = (min_cpus + cpus_per_node - 1) / cpus_per_node; + } + if (min_nodes > nr_nodes) + min_nodes = nr_nodes; + if (!max_nodes || max_nodes > nr_nodes) + max_nodes = nr_nodes; + if (min_nodes > max_nodes) { + LOG(ERROR, "Inconsistent minimum or maximum number of guest nodes"); + rc = ERROR_INVAL; + goto out; + } + + /* This is up to the caller to be disposed */ + rc = libxl__numa_candidate_alloc(gc, cndt_out); + if (rc) + goto out; + + /* + * Consider all the combinations with sizes in [min_nodes, max_nodes] + * (see comb_init() and comb_next()). Note that, since the fewer the + * number of nodes the better, it is guaranteed that any candidate + * found during the i-eth step will be better than any other one we + * could find during the (i+1)-eth and all the subsequent steps (they + * all will have more nodes). It's thus pointless to keep going if + * we already found something. + */ + *cndt_found = 0; + while (min_nodes <= max_nodes && *cndt_found == 0) { + comb_iter_t comb_iter; + int comb_ok; + + /* + * And here it is. Each step of this cycle generates a combination of + * nodes as big as min_nodes mandates. Each of these combinations is + * checked against the constraints provided by the caller (namely, + * amount of free memory and number of cpus) and it can concur to + * become our best placement iff it passes the check. + */ + for (comb_ok = comb_init(gc, &comb_iter, nr_nodes, min_nodes); comb_ok; + comb_ok = comb_next(comb_iter, nr_nodes, min_nodes)) { + uint32_t nodes_free_memkb; + int nodes_cpus; + + comb_get_nodemap(comb_iter, &nodemap, min_nodes); + + /* If there is not enough memory in this combination, skip it + * and go generating the next one... */ + nodes_free_memkb = nodemap_to_free_memkb(ninfo, &nodemap); + if (min_free_memkb && nodes_free_memkb < min_free_memkb) + continue; + + /* And the same applies if this combination is short in cpus */ + nodes_cpus = nodemap_to_nr_cpus(tinfo, nr_cpus, &nodemap); + if (min_cpus && nodes_cpus < min_cpus) + continue; + + /* + * Conditions are met, we can compare this candidate with the + * current best one (if any). + */ + libxl__numa_candidate_put_nodemap(gc, &new_cndt, &nodemap); + new_cndt.nr_vcpus = nodemap_to_nr_vcpus(gc, tinfo, &nodemap); + new_cndt.free_memkb = nodes_free_memkb; + new_cndt.nr_nodes = min_nodes; + new_cndt.nr_cpus = nodes_cpus; + + /* + * Check if the new candidate we is better the what we found up + * to now by means of the comparison function. If no comparison + * function is provided, just return as soon as we find our first + * candidate. + */ + if (*cndt_found == 0 || numa_cmpf(&new_cndt, cndt_out) < 0) { + *cndt_found = 1; + + LOG(DEBUG, "New best NUMA placement candidate found: " + "nr_nodes=%d, nr_cpus=%d, nr_vcpus=%d, " + "free_memkb=%"PRIu32"", min_nodes, new_cndt.nr_cpus, + new_cndt.nr_vcpus, new_cndt.free_memkb / 1024); + + libxl__numa_candidate_put_nodemap(gc, cndt_out, &nodemap); + cndt_out->nr_vcpus = new_cndt.nr_vcpus; + cndt_out->free_memkb = new_cndt.free_memkb; + cndt_out->nr_nodes = new_cndt.nr_nodes; + cndt_out->nr_cpus = new_cndt.nr_cpus; + + if (numa_cmpf == NULL) + break; + } + } + min_nodes++; + } + + if (*cndt_found == 0) + LOG(NOTICE, "NUMA placement failed, performance might be affected"); + + out: + libxl_bitmap_dispose(&nodemap); + libxl__numa_candidate_dispose(&new_cndt); + libxl_numainfo_list_free(ninfo, nr_nodes); + libxl_cputopology_list_free(tinfo, nr_cpus); + return rc; +} + +/* + * Local variables: + * mode: C + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff -r b0fc6f8d5066 -r 4165d71479f9 tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Thu Jul 26 10:55:09 2012 +0100 +++ b/tools/libxl/libxl_types.idl Thu Jul 26 15:41:54 2012 +0100 @@ -249,6 +249,7 @@ libxl_domain_build_info = Struct("domain ("max_vcpus", integer), ("avail_vcpus", libxl_bitmap), ("cpumap", libxl_bitmap), + ("numa_placement", libxl_defbool), ("tsc_mode", libxl_tsc_mode), ("max_memkb", MemKB), ("target_memkb", MemKB), diff -r b0fc6f8d5066 -r 4165d71479f9 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Thu Jul 26 10:55:09 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Thu Jul 26 15:41:54 2012 +0100 @@ -696,6 +696,9 @@ static void parse_config_data(const char vcpu_to_pcpu[n_cpus] = i; n_cpus++; } + + /* We have a cpumap, disable automatic placement */ + libxl_defbool_set(&b_info->numa_placement, false); } else if (!xlu_cfg_get_string (config, "cpus", &buf, 0)) { char *buf2 = strdup(buf); @@ -709,6 +712,8 @@ static void parse_config_data(const char if (vcpupin_parse(buf2, &b_info->cpumap)) exit(1); free(buf2); + + libxl_defbool_set(&b_info->numa_placement, false); } if (!xlu_cfg_get_long (config, "memory", &l, 0)) { _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jul 28 03:00:29 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Jul 2012 03:00: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 1SuxGV-0001pj-FT; Sat, 28 Jul 2012 03:00:27 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGT-0001oT-Tv for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:26 +0000 Received: from [85.158.138.51:38736] by server-2.bemta-3.messagelabs.com id 5D/B2-00359-9C553105; Sat, 28 Jul 2012 03:00:25 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-174.messagelabs.com!1343444422!21149440!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 8892 invoked from network); 28 Jul 2012 03:00:24 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 28 Jul 2012 03:00:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGQ-0003QN-Ih for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuxGP-0002lQ-RX for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:22 +0000 Message-Id: Date: Sat, 28 Jul 2012 03:00:21 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: call hotplug scripts for disk devices from libxl X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343317654 -3600 # Node ID 24dac62c0458bee85a8b7398c4c47094f503acb1 # Parent 0d98248a77ce87ed0a0766a2c50d884bb2687790 libxl: call hotplug scripts for disk devices from libxl Since most of the needed work is already done in previous patches, this patch only contains the necessary code to call hotplug scripts for disk devices, that should be called when the device is added or removed from a guest. We will chain the launch of the disk hotplug scripts after the device_backend_callback callback, or directly from libxl__initiate_device_{add,remove} if the device is already in the desired state. Signed-off-by: Roger Pau Monne Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r 0d98248a77ce -r 24dac62c0458 tools/hotplug/Linux/xen-backend.rules --- a/tools/hotplug/Linux/xen-backend.rules Thu Jul 26 16:47:33 2012 +0100 +++ b/tools/hotplug/Linux/xen-backend.rules Thu Jul 26 16:47:34 2012 +0100 @@ -1,11 +1,11 @@ -SUBSYSTEM=="xen-backend", KERNEL=="tap*", RUN+="/etc/xen/scripts/blktap $env{ACTION}" -SUBSYSTEM=="xen-backend", KERNEL=="vbd*", RUN+="/etc/xen/scripts/block $env{ACTION}" +SUBSYSTEM=="xen-backend", KERNEL=="tap*", ENV{UDEV_CALL}="1", RUN+="/etc/xen/scripts/blktap $env{ACTION}" +SUBSYSTEM=="xen-backend", KERNEL=="vbd*", ENV{UDEV_CALL}="1", RUN+="/etc/xen/scripts/block $env{ACTION}" SUBSYSTEM=="xen-backend", KERNEL=="vtpm*", RUN+="/etc/xen/scripts/vtpm $env{ACTION}" SUBSYSTEM=="xen-backend", KERNEL=="vif2-*", RUN+="/etc/xen/scripts/vif2 $env{ACTION}" SUBSYSTEM=="xen-backend", KERNEL=="vif-*", ACTION=="online", RUN+="/etc/xen/scripts/vif-setup online type_if=vif" SUBSYSTEM=="xen-backend", KERNEL=="vif-*", ACTION=="offline", RUN+="/etc/xen/scripts/vif-setup offline type_if=vif" SUBSYSTEM=="xen-backend", KERNEL=="vscsi*", RUN+="/etc/xen/scripts/vscsi $env{ACTION}" -SUBSYSTEM=="xen-backend", ACTION=="remove", RUN+="/etc/xen/scripts/xen-hotplug-cleanup" +SUBSYSTEM=="xen-backend", ACTION=="remove", ENV{UDEV_CALL}="1", RUN+="/etc/xen/scripts/xen-hotplug-cleanup" KERNEL=="evtchn", NAME="xen/%k" SUBSYSTEM=="xen", KERNEL=="blktap[0-9]*", NAME="xen/%k", MODE="0600" SUBSYSTEM=="blktap2", KERNEL=="blktap[0-9]*", NAME="xen/blktap-2/%k", MODE="0600" diff -r 0d98248a77ce -r 24dac62c0458 tools/hotplug/Linux/xen-hotplug-common.sh --- a/tools/hotplug/Linux/xen-hotplug-common.sh Thu Jul 26 16:47:33 2012 +0100 +++ b/tools/hotplug/Linux/xen-hotplug-common.sh Thu Jul 26 16:47:34 2012 +0100 @@ -15,6 +15,12 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# Hack to prevent the execution of hotplug scripts from udev if the domain +# has been launched from libxl +if [ -n "${UDEV_CALL}" ] && \ + xenstore-read "libxl/disable_udev" >/dev/null 2>&1; then + exit 0 +fi dir=$(dirname "$0") . "$dir/hotplugpath.sh" diff -r 0d98248a77ce -r 24dac62c0458 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Thu Jul 26 16:47:33 2012 +0100 +++ b/tools/libxl/libxl.c Thu Jul 26 16:47:34 2012 +0100 @@ -1858,6 +1858,11 @@ static void device_disk_add(libxl__egc * flexarray_append(back, "params"); flexarray_append(back, dev); + flexarray_append(back, "script"); + flexarray_append(back, GCSPRINTF("%s/%s", + libxl__xen_script_dir_path(), + "block")); + assert(device->backend_kind == LIBXL__DEVICE_KIND_VBD); break; case LIBXL_DISK_BACKEND_TAP: @@ -1873,6 +1878,11 @@ static void device_disk_add(libxl__egc * libxl__device_disk_string_of_format(disk->format), disk->pdev_path)); + flexarray_append(back, "script"); + flexarray_append(back, GCSPRINTF("%s/%s", + libxl__xen_script_dir_path(), + "blktap")); + /* now create a phy device to export the device to the guest */ goto do_backend_phy; case LIBXL_DISK_BACKEND_QDISK: diff -r 0d98248a77ce -r 24dac62c0458 tools/libxl/libxl_device.c --- a/tools/libxl/libxl_device.c Thu Jul 26 16:47:33 2012 +0100 +++ b/tools/libxl/libxl_device.c Thu Jul 26 16:47:34 2012 +0100 @@ -412,9 +412,12 @@ void libxl__prepare_ao_device(libxl__ao aodev->ao = ao; aodev->rc = 0; aodev->dev = NULL; - /* Initialize timer for QEMU Bodge */ + /* Initialize timer for QEMU Bodge and hotplug execution */ libxl__ev_time_init(&aodev->timeout); aodev->active = 1; + /* We init this here because we might call device_hotplug_done + * without actually calling any hotplug script */ + libxl__ev_child_init(&aodev->child); } void libxl__prepare_ao_devices(libxl__ao *ao, libxl__ao_devices *aodevs) @@ -624,6 +627,15 @@ static void device_backend_callback(libx static void device_backend_cleanup(libxl__gc *gc, libxl__ao_device *aodev); +static void device_hotplug(libxl__egc *egc, libxl__ao_device *aodev); + +static void device_hotplug_timeout_cb(libxl__egc *egc, libxl__ev_time *ev, + const struct timeval *requested_abs); + +static void device_hotplug_child_death_cb(libxl__egc *egc, + libxl__ev_child *child, + pid_t pid, int status); + static void device_hotplug_done(libxl__egc *egc, libxl__ao_device *aodev); void libxl__wait_device_connection(libxl__egc *egc, libxl__ao_device *aodev) @@ -649,7 +661,7 @@ void libxl__wait_device_connection(libxl * If Qemu is running, it will set the state of the device to * 4 directly, without waiting in state 2 for any hotplug execution. */ - device_hotplug_done(egc, aodev); + device_hotplug(egc, aodev); return; } @@ -783,6 +795,9 @@ static void device_qemu_timeout(libxl__e rc = libxl__xs_write_checked(gc, XBT_NULL, state_path, "6"); if (rc) goto out; + device_hotplug(egc, aodev); + return; + out: aodev->rc = rc; device_hotplug_done(egc, aodev); @@ -808,6 +823,9 @@ static void device_backend_callback(libx goto out; } + device_hotplug(egc, aodev); + return; + out: aodev->rc = rc; device_hotplug_done(egc, aodev); @@ -820,6 +838,111 @@ static void device_backend_cleanup(libxl libxl__ev_devstate_cancel(gc, &aodev->backend_ds); } +static void device_hotplug(libxl__egc *egc, libxl__ao_device *aodev) +{ + STATE_AO_GC(aodev->ao); + char *be_path = libxl__device_backend_path(gc, aodev->dev); + char **args = NULL, **env = NULL; + int rc = 0; + int hotplug; + pid_t pid; + + /* Check if we have to execute hotplug scripts for this device + * and return the necessary args/env vars for execution */ + hotplug = libxl__get_hotplug_script_info(gc, aodev->dev, &args, &env, + aodev->action); + switch (hotplug) { + case 0: + /* no hotplug script to execute */ + goto out; + case 1: + /* execute hotplug script */ + break; + default: + /* everything else is an error */ + LOG(ERROR, "unable to get args/env to execute hotplug script for " + "device %s", libxl__device_backend_path(gc, aodev->dev)); + rc = hotplug; + goto out; + } + + /* Set hotplug timeout */ + rc = libxl__ev_time_register_rel(gc, &aodev->timeout, + device_hotplug_timeout_cb, + LIBXL_HOTPLUG_TIMEOUT * 1000); + if (rc) { + LOG(ERROR, "unable to register timeout for hotplug device %s", be_path); + goto out; + } + + aodev->what = GCSPRINTF("%s %s", args[0], args[1]); + LOG(DEBUG, "calling hotplug script: %s %s", args[0], args[1]); + + /* fork and execute hotplug script */ + pid = libxl__ev_child_fork(gc, &aodev->child, device_hotplug_child_death_cb); + if (pid == -1) { + LOG(ERROR, "unable to fork"); + rc = ERROR_FAIL; + goto out; + } + + if (!pid) { + /* child */ + libxl__exec(gc, -1, -1, -1, args[0], args, env); + /* notreached */ + abort(); + } + + assert(libxl__ev_child_inuse(&aodev->child)); + + return; + +out: + aodev->rc = rc; + device_hotplug_done(egc, aodev); + return; +} + +static void device_hotplug_timeout_cb(libxl__egc *egc, libxl__ev_time *ev, + const struct timeval *requested_abs) +{ + libxl__ao_device *aodev = CONTAINER_OF(ev, *aodev, timeout); + STATE_AO_GC(aodev->ao); + + libxl__ev_time_deregister(gc, &aodev->timeout); + + assert(libxl__ev_child_inuse(&aodev->child)); + LOG(DEBUG, "killing hotplug script %s because of timeout", aodev->what); + if (kill(aodev->child.pid, SIGKILL)) { + LOGEV(ERROR, errno, "unable to kill hotplug script %s [%ld]", + aodev->what, (unsigned long)aodev->child.pid); + } + + return; +} + +static void device_hotplug_child_death_cb(libxl__egc *egc, + libxl__ev_child *child, + pid_t pid, int status) +{ + libxl__ao_device *aodev = CONTAINER_OF(child, *aodev, child); + STATE_AO_GC(aodev->ao); + char *be_path = libxl__device_backend_path(gc, aodev->dev); + char *hotplug_error; + + if (status) { + libxl_report_child_exitstatus(CTX, LIBXL__LOG_ERROR, + aodev->what, pid, status); + hotplug_error = libxl__xs_read(gc, XBT_NULL, + GCSPRINTF("%s/hotplug-error", be_path)); + if (hotplug_error) + LOG(ERROR, "script: %s", hotplug_error); + aodev->rc = ERROR_FAIL; + } + + device_hotplug_done(egc, aodev); +} + static void device_hotplug_done(libxl__egc *egc, libxl__ao_device *aodev) { STATE_AO_GC(aodev->ao); @@ -828,6 +951,11 @@ static void device_hotplug_done(libxl__e xs_transaction_t t = 0; int rc; + /* Clean events and check reentrancy */ + libxl__ev_time_deregister(gc, &aodev->timeout); + assert(!libxl__ev_child_inuse(&aodev->child)); + + /* Clean xenstore if it's a disconnection */ if (aodev->action == DEVICE_DISCONNECT) { for (;;) { rc = libxl__xs_transaction_start(gc, &t); diff -r 0d98248a77ce -r 24dac62c0458 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Thu Jul 26 16:47:33 2012 +0100 +++ b/tools/libxl/libxl_internal.h Thu Jul 26 16:47:34 2012 +0100 @@ -74,6 +74,7 @@ #define LIBXL_INIT_TIMEOUT 10 #define LIBXL_DESTROY_TIMEOUT 10 +#define LIBXL_HOTPLUG_TIMEOUT 10 #define LIBXL_DEVICE_MODEL_START_TIMEOUT 10 #define LIBXL_QEMU_BODGE_TIMEOUT 2 #define LIBXL_XENCONSOLE_LIMIT 1048576 @@ -1832,11 +1833,14 @@ struct libxl__ao_device { int active; int rc; libxl__ev_devstate backend_ds; - /* Bodge for Qemu devices */ + /* 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; + libxl__ev_child child; }; /* Helper struct to simply the plug/unplug of multiple devices at the same @@ -1966,6 +1970,20 @@ _hidden void libxl__wait_device_connecti _hidden void libxl__initiate_device_remove(libxl__egc *egc, libxl__ao_device *aodev); +/* + * libxl__get_hotplug_script_info returns the args and env that should + * be passed to the hotplug script for the requested device. + * + * Since a device might not need to execute any hotplug script, this function + * can return the following values: + * < 0: Error + * 0: No need to execute hotplug script + * 1: Execute hotplug script + */ +_hidden int libxl__get_hotplug_script_info(libxl__gc *gc, libxl__device *dev, + char ***args, char ***env, + libxl__device_action action); + /*----- local disk attach: attach a disk locally to run the bootloader -----*/ typedef struct libxl__disk_local_state libxl__disk_local_state; diff -r 0d98248a77ce -r 24dac62c0458 tools/libxl/libxl_linux.c --- a/tools/libxl/libxl_linux.c Thu Jul 26 16:47:33 2012 +0100 +++ b/tools/libxl/libxl_linux.c Thu Jul 26 16:47:34 2012 +0100 @@ -77,3 +77,100 @@ char *libxl__devid_to_localdev(libxl__gc "%d", minor & (nr_parts - 1)); return ret; } + +/* Hotplug scripts helpers */ + +static char **get_hotplug_env(libxl__gc *gc, 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; + + 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 = 9; + GCNEW_ARRAY(env, arraysize); + env[nr++] = "script"; + env[nr++] = script; + env[nr++] = "XENBUS_TYPE"; + env[nr++] = libxl__strdup(gc, type); + env[nr++] = "XENBUS_PATH"; + env[nr++] = GCSPRINTF("backend/%s/%u/%d", type, dev->domid, dev->devid); + env[nr++] = "XENBUS_BASE_PATH"; + env[nr++] = "backend"; + env[nr++] = NULL; + assert(nr == arraysize); + + return env; +} + +/* Hotplug scripts caller functions */ + +static int libxl__hotplug_disk(libxl__gc *gc, libxl__device *dev, + char ***args, char ***env, + libxl__device_action action) +{ + char *be_path = libxl__device_backend_path(gc, dev); + char *script; + int nr = 0, rc = 0; + + 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 error; + } + + *env = get_hotplug_env(gc, dev); + if (!*env) { + rc = ERROR_FAIL; + goto error; + } + + const int arraysize = 3; + GCNEW_ARRAY(*args, arraysize); + (*args)[nr++] = script; + (*args)[nr++] = action == DEVICE_CONNECT ? "add" : "remove"; + (*args)[nr++] = NULL; + assert(nr == arraysize); + + rc = 1; + +error: + return rc; +} + +int libxl__get_hotplug_script_info(libxl__gc *gc, libxl__device *dev, + char ***args, char ***env, + libxl__device_action action) +{ + 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) { + rc = 0; + goto out; + } + + switch (dev->backend_kind) { + case LIBXL__DEVICE_KIND_VBD: + rc = libxl__hotplug_disk(gc, dev, args, env, action); + break; + default: + /* No need to execute any hotplug scripts */ + rc = 0; + break; + } + +out: + return rc; +} diff -r 0d98248a77ce -r 24dac62c0458 tools/libxl/libxl_netbsd.c --- a/tools/libxl/libxl_netbsd.c Thu Jul 26 16:47:33 2012 +0100 +++ b/tools/libxl/libxl_netbsd.c Thu Jul 26 16:47:34 2012 +0100 @@ -30,3 +30,11 @@ char *libxl__devid_to_localdev(libxl__gc /* TODO */ return NULL; } + +/* Hotplug scripts caller functions */ +int libxl__get_hotplug_script_info(libxl__gc *gc, libxl__device *dev, + char ***args, char ***env, + libxl__device_action action) +{ + return 0; +} _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jul 28 03:00:29 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Jul 2012 03:00: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 1SuxGV-0001pj-FT; Sat, 28 Jul 2012 03:00:27 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGT-0001oT-Tv for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:26 +0000 Received: from [85.158.138.51:38736] by server-2.bemta-3.messagelabs.com id 5D/B2-00359-9C553105; Sat, 28 Jul 2012 03:00:25 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-174.messagelabs.com!1343444422!21149440!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 8892 invoked from network); 28 Jul 2012 03:00:24 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 28 Jul 2012 03:00:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGQ-0003QN-Ih for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuxGP-0002lQ-RX for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:22 +0000 Message-Id: Date: Sat, 28 Jul 2012 03:00:21 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: call hotplug scripts for disk devices from libxl X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343317654 -3600 # Node ID 24dac62c0458bee85a8b7398c4c47094f503acb1 # Parent 0d98248a77ce87ed0a0766a2c50d884bb2687790 libxl: call hotplug scripts for disk devices from libxl Since most of the needed work is already done in previous patches, this patch only contains the necessary code to call hotplug scripts for disk devices, that should be called when the device is added or removed from a guest. We will chain the launch of the disk hotplug scripts after the device_backend_callback callback, or directly from libxl__initiate_device_{add,remove} if the device is already in the desired state. Signed-off-by: Roger Pau Monne Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r 0d98248a77ce -r 24dac62c0458 tools/hotplug/Linux/xen-backend.rules --- a/tools/hotplug/Linux/xen-backend.rules Thu Jul 26 16:47:33 2012 +0100 +++ b/tools/hotplug/Linux/xen-backend.rules Thu Jul 26 16:47:34 2012 +0100 @@ -1,11 +1,11 @@ -SUBSYSTEM=="xen-backend", KERNEL=="tap*", RUN+="/etc/xen/scripts/blktap $env{ACTION}" -SUBSYSTEM=="xen-backend", KERNEL=="vbd*", RUN+="/etc/xen/scripts/block $env{ACTION}" +SUBSYSTEM=="xen-backend", KERNEL=="tap*", ENV{UDEV_CALL}="1", RUN+="/etc/xen/scripts/blktap $env{ACTION}" +SUBSYSTEM=="xen-backend", KERNEL=="vbd*", ENV{UDEV_CALL}="1", RUN+="/etc/xen/scripts/block $env{ACTION}" SUBSYSTEM=="xen-backend", KERNEL=="vtpm*", RUN+="/etc/xen/scripts/vtpm $env{ACTION}" SUBSYSTEM=="xen-backend", KERNEL=="vif2-*", RUN+="/etc/xen/scripts/vif2 $env{ACTION}" SUBSYSTEM=="xen-backend", KERNEL=="vif-*", ACTION=="online", RUN+="/etc/xen/scripts/vif-setup online type_if=vif" SUBSYSTEM=="xen-backend", KERNEL=="vif-*", ACTION=="offline", RUN+="/etc/xen/scripts/vif-setup offline type_if=vif" SUBSYSTEM=="xen-backend", KERNEL=="vscsi*", RUN+="/etc/xen/scripts/vscsi $env{ACTION}" -SUBSYSTEM=="xen-backend", ACTION=="remove", RUN+="/etc/xen/scripts/xen-hotplug-cleanup" +SUBSYSTEM=="xen-backend", ACTION=="remove", ENV{UDEV_CALL}="1", RUN+="/etc/xen/scripts/xen-hotplug-cleanup" KERNEL=="evtchn", NAME="xen/%k" SUBSYSTEM=="xen", KERNEL=="blktap[0-9]*", NAME="xen/%k", MODE="0600" SUBSYSTEM=="blktap2", KERNEL=="blktap[0-9]*", NAME="xen/blktap-2/%k", MODE="0600" diff -r 0d98248a77ce -r 24dac62c0458 tools/hotplug/Linux/xen-hotplug-common.sh --- a/tools/hotplug/Linux/xen-hotplug-common.sh Thu Jul 26 16:47:33 2012 +0100 +++ b/tools/hotplug/Linux/xen-hotplug-common.sh Thu Jul 26 16:47:34 2012 +0100 @@ -15,6 +15,12 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# Hack to prevent the execution of hotplug scripts from udev if the domain +# has been launched from libxl +if [ -n "${UDEV_CALL}" ] && \ + xenstore-read "libxl/disable_udev" >/dev/null 2>&1; then + exit 0 +fi dir=$(dirname "$0") . "$dir/hotplugpath.sh" diff -r 0d98248a77ce -r 24dac62c0458 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Thu Jul 26 16:47:33 2012 +0100 +++ b/tools/libxl/libxl.c Thu Jul 26 16:47:34 2012 +0100 @@ -1858,6 +1858,11 @@ static void device_disk_add(libxl__egc * flexarray_append(back, "params"); flexarray_append(back, dev); + flexarray_append(back, "script"); + flexarray_append(back, GCSPRINTF("%s/%s", + libxl__xen_script_dir_path(), + "block")); + assert(device->backend_kind == LIBXL__DEVICE_KIND_VBD); break; case LIBXL_DISK_BACKEND_TAP: @@ -1873,6 +1878,11 @@ static void device_disk_add(libxl__egc * libxl__device_disk_string_of_format(disk->format), disk->pdev_path)); + flexarray_append(back, "script"); + flexarray_append(back, GCSPRINTF("%s/%s", + libxl__xen_script_dir_path(), + "blktap")); + /* now create a phy device to export the device to the guest */ goto do_backend_phy; case LIBXL_DISK_BACKEND_QDISK: diff -r 0d98248a77ce -r 24dac62c0458 tools/libxl/libxl_device.c --- a/tools/libxl/libxl_device.c Thu Jul 26 16:47:33 2012 +0100 +++ b/tools/libxl/libxl_device.c Thu Jul 26 16:47:34 2012 +0100 @@ -412,9 +412,12 @@ void libxl__prepare_ao_device(libxl__ao aodev->ao = ao; aodev->rc = 0; aodev->dev = NULL; - /* Initialize timer for QEMU Bodge */ + /* Initialize timer for QEMU Bodge and hotplug execution */ libxl__ev_time_init(&aodev->timeout); aodev->active = 1; + /* We init this here because we might call device_hotplug_done + * without actually calling any hotplug script */ + libxl__ev_child_init(&aodev->child); } void libxl__prepare_ao_devices(libxl__ao *ao, libxl__ao_devices *aodevs) @@ -624,6 +627,15 @@ static void device_backend_callback(libx static void device_backend_cleanup(libxl__gc *gc, libxl__ao_device *aodev); +static void device_hotplug(libxl__egc *egc, libxl__ao_device *aodev); + +static void device_hotplug_timeout_cb(libxl__egc *egc, libxl__ev_time *ev, + const struct timeval *requested_abs); + +static void device_hotplug_child_death_cb(libxl__egc *egc, + libxl__ev_child *child, + pid_t pid, int status); + static void device_hotplug_done(libxl__egc *egc, libxl__ao_device *aodev); void libxl__wait_device_connection(libxl__egc *egc, libxl__ao_device *aodev) @@ -649,7 +661,7 @@ void libxl__wait_device_connection(libxl * If Qemu is running, it will set the state of the device to * 4 directly, without waiting in state 2 for any hotplug execution. */ - device_hotplug_done(egc, aodev); + device_hotplug(egc, aodev); return; } @@ -783,6 +795,9 @@ static void device_qemu_timeout(libxl__e rc = libxl__xs_write_checked(gc, XBT_NULL, state_path, "6"); if (rc) goto out; + device_hotplug(egc, aodev); + return; + out: aodev->rc = rc; device_hotplug_done(egc, aodev); @@ -808,6 +823,9 @@ static void device_backend_callback(libx goto out; } + device_hotplug(egc, aodev); + return; + out: aodev->rc = rc; device_hotplug_done(egc, aodev); @@ -820,6 +838,111 @@ static void device_backend_cleanup(libxl libxl__ev_devstate_cancel(gc, &aodev->backend_ds); } +static void device_hotplug(libxl__egc *egc, libxl__ao_device *aodev) +{ + STATE_AO_GC(aodev->ao); + char *be_path = libxl__device_backend_path(gc, aodev->dev); + char **args = NULL, **env = NULL; + int rc = 0; + int hotplug; + pid_t pid; + + /* Check if we have to execute hotplug scripts for this device + * and return the necessary args/env vars for execution */ + hotplug = libxl__get_hotplug_script_info(gc, aodev->dev, &args, &env, + aodev->action); + switch (hotplug) { + case 0: + /* no hotplug script to execute */ + goto out; + case 1: + /* execute hotplug script */ + break; + default: + /* everything else is an error */ + LOG(ERROR, "unable to get args/env to execute hotplug script for " + "device %s", libxl__device_backend_path(gc, aodev->dev)); + rc = hotplug; + goto out; + } + + /* Set hotplug timeout */ + rc = libxl__ev_time_register_rel(gc, &aodev->timeout, + device_hotplug_timeout_cb, + LIBXL_HOTPLUG_TIMEOUT * 1000); + if (rc) { + LOG(ERROR, "unable to register timeout for hotplug device %s", be_path); + goto out; + } + + aodev->what = GCSPRINTF("%s %s", args[0], args[1]); + LOG(DEBUG, "calling hotplug script: %s %s", args[0], args[1]); + + /* fork and execute hotplug script */ + pid = libxl__ev_child_fork(gc, &aodev->child, device_hotplug_child_death_cb); + if (pid == -1) { + LOG(ERROR, "unable to fork"); + rc = ERROR_FAIL; + goto out; + } + + if (!pid) { + /* child */ + libxl__exec(gc, -1, -1, -1, args[0], args, env); + /* notreached */ + abort(); + } + + assert(libxl__ev_child_inuse(&aodev->child)); + + return; + +out: + aodev->rc = rc; + device_hotplug_done(egc, aodev); + return; +} + +static void device_hotplug_timeout_cb(libxl__egc *egc, libxl__ev_time *ev, + const struct timeval *requested_abs) +{ + libxl__ao_device *aodev = CONTAINER_OF(ev, *aodev, timeout); + STATE_AO_GC(aodev->ao); + + libxl__ev_time_deregister(gc, &aodev->timeout); + + assert(libxl__ev_child_inuse(&aodev->child)); + LOG(DEBUG, "killing hotplug script %s because of timeout", aodev->what); + if (kill(aodev->child.pid, SIGKILL)) { + LOGEV(ERROR, errno, "unable to kill hotplug script %s [%ld]", + aodev->what, (unsigned long)aodev->child.pid); + } + + return; +} + +static void device_hotplug_child_death_cb(libxl__egc *egc, + libxl__ev_child *child, + pid_t pid, int status) +{ + libxl__ao_device *aodev = CONTAINER_OF(child, *aodev, child); + STATE_AO_GC(aodev->ao); + char *be_path = libxl__device_backend_path(gc, aodev->dev); + char *hotplug_error; + + if (status) { + libxl_report_child_exitstatus(CTX, LIBXL__LOG_ERROR, + aodev->what, pid, status); + hotplug_error = libxl__xs_read(gc, XBT_NULL, + GCSPRINTF("%s/hotplug-error", be_path)); + if (hotplug_error) + LOG(ERROR, "script: %s", hotplug_error); + aodev->rc = ERROR_FAIL; + } + + device_hotplug_done(egc, aodev); +} + static void device_hotplug_done(libxl__egc *egc, libxl__ao_device *aodev) { STATE_AO_GC(aodev->ao); @@ -828,6 +951,11 @@ static void device_hotplug_done(libxl__e xs_transaction_t t = 0; int rc; + /* Clean events and check reentrancy */ + libxl__ev_time_deregister(gc, &aodev->timeout); + assert(!libxl__ev_child_inuse(&aodev->child)); + + /* Clean xenstore if it's a disconnection */ if (aodev->action == DEVICE_DISCONNECT) { for (;;) { rc = libxl__xs_transaction_start(gc, &t); diff -r 0d98248a77ce -r 24dac62c0458 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Thu Jul 26 16:47:33 2012 +0100 +++ b/tools/libxl/libxl_internal.h Thu Jul 26 16:47:34 2012 +0100 @@ -74,6 +74,7 @@ #define LIBXL_INIT_TIMEOUT 10 #define LIBXL_DESTROY_TIMEOUT 10 +#define LIBXL_HOTPLUG_TIMEOUT 10 #define LIBXL_DEVICE_MODEL_START_TIMEOUT 10 #define LIBXL_QEMU_BODGE_TIMEOUT 2 #define LIBXL_XENCONSOLE_LIMIT 1048576 @@ -1832,11 +1833,14 @@ struct libxl__ao_device { int active; int rc; libxl__ev_devstate backend_ds; - /* Bodge for Qemu devices */ + /* 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; + libxl__ev_child child; }; /* Helper struct to simply the plug/unplug of multiple devices at the same @@ -1966,6 +1970,20 @@ _hidden void libxl__wait_device_connecti _hidden void libxl__initiate_device_remove(libxl__egc *egc, libxl__ao_device *aodev); +/* + * libxl__get_hotplug_script_info returns the args and env that should + * be passed to the hotplug script for the requested device. + * + * Since a device might not need to execute any hotplug script, this function + * can return the following values: + * < 0: Error + * 0: No need to execute hotplug script + * 1: Execute hotplug script + */ +_hidden int libxl__get_hotplug_script_info(libxl__gc *gc, libxl__device *dev, + char ***args, char ***env, + libxl__device_action action); + /*----- local disk attach: attach a disk locally to run the bootloader -----*/ typedef struct libxl__disk_local_state libxl__disk_local_state; diff -r 0d98248a77ce -r 24dac62c0458 tools/libxl/libxl_linux.c --- a/tools/libxl/libxl_linux.c Thu Jul 26 16:47:33 2012 +0100 +++ b/tools/libxl/libxl_linux.c Thu Jul 26 16:47:34 2012 +0100 @@ -77,3 +77,100 @@ char *libxl__devid_to_localdev(libxl__gc "%d", minor & (nr_parts - 1)); return ret; } + +/* Hotplug scripts helpers */ + +static char **get_hotplug_env(libxl__gc *gc, 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; + + 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 = 9; + GCNEW_ARRAY(env, arraysize); + env[nr++] = "script"; + env[nr++] = script; + env[nr++] = "XENBUS_TYPE"; + env[nr++] = libxl__strdup(gc, type); + env[nr++] = "XENBUS_PATH"; + env[nr++] = GCSPRINTF("backend/%s/%u/%d", type, dev->domid, dev->devid); + env[nr++] = "XENBUS_BASE_PATH"; + env[nr++] = "backend"; + env[nr++] = NULL; + assert(nr == arraysize); + + return env; +} + +/* Hotplug scripts caller functions */ + +static int libxl__hotplug_disk(libxl__gc *gc, libxl__device *dev, + char ***args, char ***env, + libxl__device_action action) +{ + char *be_path = libxl__device_backend_path(gc, dev); + char *script; + int nr = 0, rc = 0; + + 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 error; + } + + *env = get_hotplug_env(gc, dev); + if (!*env) { + rc = ERROR_FAIL; + goto error; + } + + const int arraysize = 3; + GCNEW_ARRAY(*args, arraysize); + (*args)[nr++] = script; + (*args)[nr++] = action == DEVICE_CONNECT ? "add" : "remove"; + (*args)[nr++] = NULL; + assert(nr == arraysize); + + rc = 1; + +error: + return rc; +} + +int libxl__get_hotplug_script_info(libxl__gc *gc, libxl__device *dev, + char ***args, char ***env, + libxl__device_action action) +{ + 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) { + rc = 0; + goto out; + } + + switch (dev->backend_kind) { + case LIBXL__DEVICE_KIND_VBD: + rc = libxl__hotplug_disk(gc, dev, args, env, action); + break; + default: + /* No need to execute any hotplug scripts */ + rc = 0; + break; + } + +out: + return rc; +} diff -r 0d98248a77ce -r 24dac62c0458 tools/libxl/libxl_netbsd.c --- a/tools/libxl/libxl_netbsd.c Thu Jul 26 16:47:33 2012 +0100 +++ b/tools/libxl/libxl_netbsd.c Thu Jul 26 16:47:34 2012 +0100 @@ -30,3 +30,11 @@ char *libxl__devid_to_localdev(libxl__gc /* TODO */ return NULL; } + +/* Hotplug scripts caller functions */ +int libxl__get_hotplug_script_info(libxl__gc *gc, libxl__device *dev, + char ***args, char ***env, + libxl__device_action action) +{ + return 0; +} _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jul 28 03:00:29 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Jul 2012 03:00: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 1SuxGU-0001pD-7g; Sat, 28 Jul 2012 03:00:26 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGS-0001oM-HV for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:25 +0000 Received: from [85.158.143.99:37845] by server-1.bemta-4.messagelabs.com id C6/2E-24392-7C553105; Sat, 28 Jul 2012 03:00:23 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-216.messagelabs.com!1343444420!28524331!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 5010 invoked from network); 28 Jul 2012 03:00:21 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 28 Jul 2012 03:00:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGN-0003QB-M6 for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuxGN-0002kR-EC for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:19 +0000 Message-Id: Date: Sat, 28 Jul 2012 03:00:18 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: convert libxl_device_disk_add to an async op X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343317650 -3600 # Node ID fe34db0860d312ca1000192aede47c8cf563c16f # Parent 34b942aae898e0e26b3576d4c63bc16d5e7aeed5 libxl: convert libxl_device_disk_add to an async op This patch converts libxl_device_disk_add to an ao operation that waits for device backend to reach state XenbusStateInitWait and then marks the operation as completed. This is not really useful now, but will be used by later patches that will launch hotplug scripts after we reached the desired xenbus state. As usual, libxl_device_disk_add callers have been modified, and the internal function libxl__device_disk_add has been used if the call was inside an already running ao. Signed-off-by: Roger Pau Monne Acked-by: Ian Jackson [ ijc -- drop hunk modifying libxl_cdrom_insert which is not needed after 25670:3666e9712eaf "libxl: make libxl_cdrom_insert async" ] Committed-by: Ian Campbell --- diff -r 34b942aae898 -r fe34db0860d3 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Thu Jul 26 16:47:29 2012 +0100 +++ b/tools/libxl/libxl.c Thu Jul 26 16:47:30 2012 +0100 @@ -1785,16 +1785,18 @@ int libxl__device_from_disk(libxl__gc *g * The passed get_vdev function is also in charge of printing * the corresponding error message when appropiate. */ -static int device_disk_add(libxl__gc *gc, uint32_t domid, +static void device_disk_add(libxl__egc *egc, uint32_t domid, libxl_device_disk *disk, + libxl__ao_device *aodev, char *get_vdev(libxl__gc *, void *, xs_transaction_t), void *get_vdev_user) { + STATE_AO_GC(aodev->ao); flexarray_t *front = NULL; flexarray_t *back = NULL; char *dev; - libxl__device device; + libxl__device *device; int major, minor, rc; libxl_ctx *ctx = gc->owner; xs_transaction_t t = XBT_NULL; @@ -1837,7 +1839,8 @@ static int device_disk_add(libxl__gc *gc goto out_free; } - rc = libxl__device_from_disk(gc, domid, disk, &device); + GCNEW(device); + rc = libxl__device_from_disk(gc, domid, disk, device); if (rc != 0) { LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "Invalid or unsupported" " virtual disk identifier %s", disk->vdev); @@ -1855,7 +1858,7 @@ static int device_disk_add(libxl__gc *gc flexarray_append(back, "params"); flexarray_append(back, dev); - assert(device.backend_kind == LIBXL__DEVICE_KIND_VBD); + assert(device->backend_kind == LIBXL__DEVICE_KIND_VBD); break; case LIBXL_DISK_BACKEND_TAP: dev = libxl__blktap_devpath(gc, disk->pdev_path, disk->format); @@ -1876,7 +1879,7 @@ static int device_disk_add(libxl__gc *gc flexarray_append(back, "params"); flexarray_append(back, libxl__sprintf(gc, "%s:%s", libxl__device_disk_string_of_format(disk->format), disk->pdev_path)); - assert(device.backend_kind == LIBXL__DEVICE_KIND_QDISK); + assert(device->backend_kind == LIBXL__DEVICE_KIND_QDISK); break; default: LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "unrecognized disk backend type: %d\n", disk->backend); @@ -1908,11 +1911,11 @@ static int device_disk_add(libxl__gc *gc flexarray_append(front, "state"); flexarray_append(front, libxl__sprintf(gc, "%d", 1)); flexarray_append(front, "virtual-device"); - flexarray_append(front, libxl__sprintf(gc, "%d", device.devid)); + flexarray_append(front, libxl__sprintf(gc, "%d", device->devid)); flexarray_append(front, "device-type"); flexarray_append(front, disk->is_cdrom ? "cdrom" : "disk"); - libxl__device_generic_add(gc, t, &device, + libxl__device_generic_add(gc, t, device, libxl__xs_kvs_of_flexarray(gc, back, back->count), libxl__xs_kvs_of_flexarray(gc, front, front->count)); @@ -1921,6 +1924,10 @@ static int device_disk_add(libxl__gc *gc if (rc < 0) goto out_free; } + aodev->dev = device; + aodev->action = DEVICE_CONNECT; + libxl__wait_device_connection(egc, aodev); + rc = 0; out_free: @@ -1928,21 +1935,15 @@ out_free: flexarray_free(front); out: libxl__xs_transaction_abort(gc, &t); - return rc; + aodev->rc = rc; + if (rc) aodev->callback(egc, aodev); + return; } -int libxl__device_disk_add(libxl__gc *gc, uint32_t domid, - libxl_device_disk *disk) +void libxl__device_disk_add(libxl__egc *egc, uint32_t domid, + libxl_device_disk *disk, libxl__ao_device *aodev) { - return device_disk_add(gc, domid, disk, NULL, NULL); -} - -int libxl_device_disk_add(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk) -{ - GC_INIT(ctx); - int rc = libxl__device_disk_add(gc, domid, disk); - GC_FREE; - return rc; + device_disk_add(egc, domid, disk, aodev, NULL, NULL); } static void libxl__device_disk_from_xs_be(libxl__gc *gc, @@ -2252,14 +2253,17 @@ static char * libxl__alloc_vdev(libxl__g return NULL; } +/* Callbacks */ + +static void local_device_attach_cb(libxl__egc *egc, libxl__ao_device *aodev); + void libxl__device_disk_local_initiate_attach(libxl__egc *egc, libxl__disk_local_state *dls) { STATE_AO_GC(dls->ao); libxl_ctx *ctx = CTX; - char *dev = NULL, *be_path = NULL; + char *dev = NULL; int rc; - libxl__device device; const libxl_device_disk *in_disk = dls->in_disk; libxl_device_disk *disk = &dls->disk; const char *blkdev_start = dls->blkdev_start; @@ -2306,14 +2310,12 @@ void libxl__device_disk_local_initiate_a break; case LIBXL_DISK_BACKEND_QDISK: if (disk->format != LIBXL_DISK_FORMAT_RAW) { - if (device_disk_add(gc, LIBXL_TOOLSTACK_DOMID, disk, - libxl__alloc_vdev, - (void *) blkdev_start)) { - LOG(ERROR, "libxl_device_disk_add failed"); - rc = ERROR_FAIL; - goto out; - } - dev = GCSPRINTF("/dev/%s", disk->vdev); + libxl__prepare_ao_device(ao, &dls->aodev); + dls->aodev.callback = local_device_attach_cb; + device_disk_add(egc, LIBXL_TOOLSTACK_DOMID, disk, + &dls->aodev, libxl__alloc_vdev, + (void *) blkdev_start); + return; } else { dev = disk->pdev_path; } @@ -2326,15 +2328,48 @@ void libxl__device_disk_local_initiate_a goto out; } - if (disk->vdev != NULL) { - rc = libxl__device_from_disk(gc, LIBXL_TOOLSTACK_DOMID, disk, &device); - if (rc < 0) - goto out; - be_path = libxl__device_backend_path(gc, &device); - rc = libxl__wait_for_backend(gc, be_path, "4"); - if (rc < 0) - goto out; + if (dev != NULL) + dls->diskpath = strdup(dev); + + dls->callback(egc, dls, 0); + return; + + out: + assert(rc); + dls->rc = rc; + libxl__device_disk_local_initiate_detach(egc, dls); + dls->callback(egc, dls, rc); +} + +static void local_device_attach_cb(libxl__egc *egc, libxl__ao_device *aodev) +{ + STATE_AO_GC(aodev->ao); + libxl__disk_local_state *dls = CONTAINER_OF(aodev, *dls, aodev); + char *dev = NULL, *be_path = NULL; + int rc; + libxl__device device; + libxl_device_disk *disk = &dls->disk; + + rc = aodev->rc; + if (rc) { + LOGE(ERROR, "unable to %s %s with id %u", + aodev->action == DEVICE_CONNECT ? "add" : "remove", + libxl__device_kind_to_string(aodev->dev->kind), + aodev->dev->devid); + goto out; } + + dev = GCSPRINTF("/dev/%s", disk->vdev); + LOG(DEBUG, "locally attaching qdisk %s", dev); + + rc = libxl__device_from_disk(gc, LIBXL_TOOLSTACK_DOMID, disk, &device); + if (rc < 0) + goto out; + be_path = libxl__device_backend_path(gc, &device); + rc = libxl__wait_for_backend(gc, be_path, "4"); + if (rc < 0) + goto out; + if (dev != NULL) dls->diskpath = libxl__strdup(gc, dev); @@ -3058,6 +3093,36 @@ DEFINE_DEVICE_REMOVE(vfb, destroy, 1) /******************************************************************************/ +/* Macro for defining device addition functions in a compact way */ +/* The following functions are defined: + * libxl_device_disk_add + */ + +#define DEFINE_DEVICE_ADD(type) \ + int libxl_device_##type##_add(libxl_ctx *ctx, \ + uint32_t domid, libxl_device_##type *type, \ + const libxl_asyncop_how *ao_how) \ + { \ + AO_CREATE(ctx, domid, ao_how); \ + libxl__ao_device *aodev; \ + \ + GCNEW(aodev); \ + libxl__prepare_ao_device(ao, aodev); \ + aodev->callback = device_addrm_aocomplete; \ + libxl__device_##type##_add(egc, domid, type, aodev); \ + \ + return AO_INPROGRESS; \ + } + +/* Define alladd functions and undef the macro */ + +/* disk */ +DEFINE_DEVICE_ADD(disk) + +#undef DEFINE_DEVICE_ADD + +/******************************************************************************/ + int libxl_domain_setmaxmem(libxl_ctx *ctx, uint32_t domid, uint32_t max_memkb) { GC_INIT(ctx); diff -r 34b942aae898 -r fe34db0860d3 tools/libxl/libxl.h --- a/tools/libxl/libxl.h Thu Jul 26 16:47:29 2012 +0100 +++ b/tools/libxl/libxl.h Thu Jul 26 16:47:30 2012 +0100 @@ -675,7 +675,9 @@ void libxl_vcpuinfo_list_free(libxl_vcpu */ /* Disks */ -int libxl_device_disk_add(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk); +int libxl_device_disk_add(libxl_ctx *ctx, uint32_t domid, + libxl_device_disk *disk, + const libxl_asyncop_how *ao_how); int libxl_device_disk_remove(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk, const libxl_asyncop_how *ao_how); diff -r 34b942aae898 -r fe34db0860d3 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Thu Jul 26 16:47:29 2012 +0100 +++ b/tools/libxl/libxl_create.c Thu Jul 26 16:47:30 2012 +0100 @@ -560,6 +560,10 @@ static void domcreate_bootloader_console static void domcreate_bootloader_done(libxl__egc *egc, libxl__bootloader_state *bl, int rc); + +static void domcreate_launch_dm(libxl__egc *egc, libxl__ao_devices *aodevs, + int ret); + static void domcreate_console_available(libxl__egc *egc, libxl__domain_create_state *dcs); @@ -850,12 +854,10 @@ static void domcreate_rebuild_done(libxl int ret) { STATE_AO_GC(dcs->ao); - int i; /* convenience aliases */ const uint32_t domid = dcs->guest_domid; libxl_domain_config *const d_config = dcs->guest_config; - libxl__domain_build_state *const state = &dcs->build_state; libxl_ctx *const ctx = CTX; if (ret) { @@ -866,14 +868,34 @@ static void domcreate_rebuild_done(libxl store_libxl_entry(gc, domid, &d_config->b_info); - for (i = 0; i < d_config->num_disks; i++) { - ret = libxl_device_disk_add(ctx, domid, &d_config->disks[i]); - if (ret) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, - "cannot add disk %d to domain: %d", i, ret); - ret = ERROR_FAIL; - goto error_out; - } + dcs->aodevs.size = d_config->num_disks; + dcs->aodevs.callback = domcreate_launch_dm; + libxl__prepare_ao_devices(ao, &dcs->aodevs); + libxl__add_disks(egc, ao, domid, 0, d_config, &dcs->aodevs); + + return; + + error_out: + assert(ret); + domcreate_complete(egc, dcs, ret); +} + +static void domcreate_launch_dm(libxl__egc *egc, libxl__ao_devices *aodevs, + int ret) +{ + libxl__domain_create_state *dcs = CONTAINER_OF(aodevs, *dcs, aodevs); + STATE_AO_GC(dcs->ao); + int i; + + /* convenience aliases */ + const uint32_t domid = dcs->guest_domid; + libxl_domain_config *const d_config = dcs->guest_config; + libxl__domain_build_state *const state = &dcs->build_state; + libxl_ctx *const ctx = CTX; + + if (ret) { + LOG(ERROR, "unable to add disk devices"); + goto error_out; } for (i = 0; i < d_config->num_nics; i++) { ret = libxl_device_nic_add(ctx, domid, &d_config->nics[i]); diff -r 34b942aae898 -r fe34db0860d3 tools/libxl/libxl_device.c --- a/tools/libxl/libxl_device.c Thu Jul 26 16:47:29 2012 +0100 +++ b/tools/libxl/libxl_device.c Thu Jul 26 16:47:30 2012 +0100 @@ -447,6 +447,37 @@ void libxl__ao_devices_callback(libxl__e return; } +/******************************************************************************/ + +/* Macro for defining the functions that will add a bunch of disks when + * inside an async op. + * This macro is added to prevent repetition of code. + * + * The following functions are defined: + * libxl__add_disks + */ + +#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++) { \ + aodevs->array[i].callback = libxl__ao_devices_callback; \ + libxl__device_##type##_add(egc, domid, &d_config->type##s[i-start],\ + &aodevs->array[i]); \ + } \ + } + +DEFINE_DEVICES_ADD(disk) + +#undef DEFINE_DEVICES_ADD + +/******************************************************************************/ + int libxl__device_destroy(libxl__gc *gc, libxl__device *dev) { char *be_path = libxl__device_backend_path(gc, dev); @@ -593,6 +624,52 @@ static void device_backend_cleanup(libxl static void device_hotplug_done(libxl__egc *egc, libxl__ao_device *aodev); +void libxl__wait_device_connection(libxl__egc *egc, libxl__ao_device *aodev) +{ + STATE_AO_GC(aodev->ao); + char *be_path = libxl__device_backend_path(gc, aodev->dev); + char *state_path = libxl__sprintf(gc, "%s/state", be_path); + libxl_dominfo info; + uint32_t domid = aodev->dev->domid; + int rc = 0; + + libxl_dominfo_init(&info); + rc = libxl_domain_info(CTX, &info, domid); + if (rc) { + LOG(ERROR, "unable to get info for domain %d", domid); + goto out; + } + if (QEMU_BACKEND(aodev->dev)) { + /* + * If Qemu is not running, there's no point in waiting for + * it to change the state of the device. + * + * If Qemu is running, it will set the state of the device to + * 4 directly, without waiting in state 2 for any hotplug execution. + */ + device_hotplug_done(egc, aodev); + return; + } + + rc = libxl__ev_devstate_wait(gc, &aodev->backend_ds, + device_backend_callback, + state_path, XenbusStateInitWait, + LIBXL_INIT_TIMEOUT * 1000); + if (rc) { + LOG(ERROR, "unable to initialize device %s", be_path); + goto out; + } + + libxl_dominfo_dispose(&info); + return; + +out: + aodev->rc = rc; + libxl_dominfo_dispose(&info); + device_hotplug_done(egc, aodev); + return; +} + void libxl__initiate_device_remove(libxl__egc *egc, libxl__ao_device *aodev) { diff -r 34b942aae898 -r fe34db0860d3 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Thu Jul 26 16:47:29 2012 +0100 +++ b/tools/libxl/libxl_dm.c Thu Jul 26 16:47:30 2012 +0100 @@ -713,6 +713,9 @@ static void spawn_stubdom_pvqemu_cb(libx libxl__dm_spawn_state *stubdom_dmss, int rc); +static void spawn_stub_launch_dm(libxl__egc *egc, + libxl__ao_devices *aodevs, int ret); + static void spaw_stubdom_pvqemu_destroy_cb(libxl__egc *egc, libxl__destroy_domid_state *dis, int rc); @@ -726,10 +729,9 @@ void libxl__spawn_stub_dm(libxl__egc *eg { STATE_AO_GC(sdss->dm.spawn.ao); libxl_ctx *ctx = libxl__gc_owner(gc); - int i, num_console = STUBDOM_SPECIAL_CONSOLES, ret; - libxl__device_console *console; - libxl_device_vfb vfb; - libxl_device_vkb vkb; + int ret; + libxl_device_vfb *vfb; + libxl_device_vkb *vkb; char **args; struct xs_permissions perm[2]; xs_transaction_t t; @@ -784,10 +786,12 @@ void libxl__spawn_stub_dm(libxl__egc *eg ret = libxl__domain_build_info_setdefault(gc, &dm_config->b_info); if (ret) goto out; - libxl__vfb_and_vkb_from_hvm_guest_config(gc, guest_config, &vfb, &vkb); - dm_config->vfbs = &vfb; + GCNEW(vfb); + GCNEW(vkb); + libxl__vfb_and_vkb_from_hvm_guest_config(gc, guest_config, vfb, vkb); + dm_config->vfbs = vfb; dm_config->num_vfbs = 1; - dm_config->vkbs = &vkb; + dm_config->vkbs = vkb; dm_config->num_vkbs = 1; stubdom_state->pv_kernel.path @@ -845,22 +849,54 @@ retry_transaction: if (errno == EAGAIN) goto retry_transaction; - for (i = 0; i < dm_config->num_disks; i++) { - ret = libxl_device_disk_add(ctx, dm_domid, &dm_config->disks[i]); - if (ret) - goto out_free; - } + sdss->aodevs.size = dm_config->num_disks; + 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); + + free(args); + return; + +out_free: + free(args); +out: + assert(ret); + spawn_stubdom_pvqemu_cb(egc, &sdss->pvqemu, ret); +} + +static void spawn_stub_launch_dm(libxl__egc *egc, + libxl__ao_devices *aodevs, int ret) +{ + libxl__stub_dm_spawn_state *sdss = CONTAINER_OF(aodevs, *sdss, aodevs); + STATE_AO_GC(sdss->dm.spawn.ao); + libxl_ctx *ctx = libxl__gc_owner(gc); + int i, num_console = STUBDOM_SPECIAL_CONSOLES; + libxl__device_console *console; + + /* convenience aliases */ + libxl_domain_config *const dm_config = &sdss->dm_config; + libxl_domain_config *const guest_config = sdss->dm.guest_config; + const int guest_domid = sdss->dm.guest_domid; + libxl__domain_build_state *const d_state = sdss->dm.build_state; + libxl__domain_build_state *const stubdom_state = &sdss->dm_state; + uint32_t dm_domid = sdss->pvqemu.guest_domid; + + if (ret) { + LOG(ERROR, "error connecting disk devices"); + goto out; + } + for (i = 0; i < dm_config->num_nics; i++) { ret = libxl_device_nic_add(ctx, dm_domid, &dm_config->nics[i]); if (ret) - goto out_free; + goto out; } ret = libxl_device_vfb_add(ctx, dm_domid, &dm_config->vfbs[0]); if (ret) - goto out_free; + goto out; ret = libxl_device_vkb_add(ctx, dm_domid, &dm_config->vkbs[0]); if (ret) - goto out_free; + goto out; if (guest_config->b_info.u.hvm.serial) num_console++; @@ -868,7 +904,7 @@ retry_transaction: console = libxl__calloc(gc, num_console, sizeof(libxl__device_console)); if (!console) { ret = ERROR_NOMEM; - goto out_free; + goto out; } for (i = 0; i < num_console; i++) { @@ -904,7 +940,7 @@ retry_transaction: ret = libxl__device_console_add(gc, dm_domid, &console[i], i == STUBDOM_CONSOLE_LOGGING ? stubdom_state : NULL); if (ret) - goto out_free; + goto out; } sdss->pvqemu.spawn.ao = ao; @@ -915,11 +951,8 @@ retry_transaction: libxl__spawn_local_dm(egc, &sdss->pvqemu); - free(args); return; -out_free: - free(args); out: assert(ret); spawn_stubdom_pvqemu_cb(egc, &sdss->pvqemu, ret); diff -r 34b942aae898 -r fe34db0860d3 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Thu Jul 26 16:47:29 2012 +0100 +++ b/tools/libxl/libxl_internal.h Thu Jul 26 16:47:30 2012 +0100 @@ -72,6 +72,7 @@ #include "_libxl_types_internal.h" #include "_libxl_types_internal_json.h" +#define LIBXL_INIT_TIMEOUT 10 #define LIBXL_DESTROY_TIMEOUT 10 #define LIBXL_DEVICE_MODEL_START_TIMEOUT 10 #define LIBXL_QEMU_BODGE_TIMEOUT 2 @@ -1338,8 +1339,6 @@ _hidden void libxl__device_destroy_tapdi _hidden int libxl__device_from_disk(libxl__gc *gc, uint32_t domid, libxl_device_disk *disk, libxl__device *device); -_hidden int libxl__device_disk_add(libxl__gc *gc, uint32_t domid, - libxl_device_disk *disk); _hidden char *libxl__uuid2string(libxl__gc *gc, const libxl_uuid uuid); @@ -1923,6 +1922,27 @@ struct libxl__ao_devices { * DONE. */ +/* AO operation to connect a disk device, called by + * libxl_device_disk_add and libxl__add_disks. This function calls + * libxl__wait_device_connection to wait for the device to + * finish the connection (might involve executing hotplug scripts). + * + * Once finished, aodev->callback will be executed. + */ +_hidden void libxl__device_disk_add(libxl__egc *egc, uint32_t domid, + libxl_device_disk *disk, + libxl__ao_device *aodev); + +/* Waits for the passed device to reach state XenbusStateInitWait. + * This is not really useful by itself, but is important when executing + * hotplug scripts, since we need to be sure the device is in the correct + * state before executing them. + * + * Once finished, aodev->callback will be executed. + */ +_hidden void libxl__wait_device_connection(libxl__egc*, + libxl__ao_device *aodev); + /* Arranges that dev will be removed to the guest, and the * hotplug scripts will be executed (if necessary). When * this is done (or an error happens), the callback in @@ -2295,6 +2315,19 @@ _hidden void libxl__destroy_domid(libxl_ _hidden void libxl__devices_destroy(libxl__egc *egc, 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 "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__ao_devices *aodevs); + /*----- device model creation -----*/ /* First layer; wraps libxl__spawn_spawn. */ @@ -2329,6 +2362,7 @@ typedef struct { libxl__domain_build_state dm_state; libxl__dm_spawn_state pvqemu; libxl__destroy_domid_state dis; + libxl__ao_devices aodevs; } libxl__stub_dm_spawn_state; _hidden void libxl__spawn_stub_dm(libxl__egc *egc, libxl__stub_dm_spawn_state*); @@ -2360,6 +2394,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; }; /*----- Domain suspend (save) functions -----*/ diff -r 34b942aae898 -r fe34db0860d3 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Thu Jul 26 16:47:29 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Thu Jul 26 16:47:30 2012 +0100 @@ -5360,7 +5360,7 @@ int main_blockattach(int argc, char **ar return 0; } - if (libxl_device_disk_add(ctx, fe_domid, &disk)) { + if (libxl_device_disk_add(ctx, fe_domid, &disk, 0)) { fprintf(stderr, "libxl_device_disk_add failed.\n"); } return 0; diff -r 34b942aae898 -r fe34db0860d3 tools/ocaml/libs/xl/xenlight_stubs.c --- a/tools/ocaml/libs/xl/xenlight_stubs.c Thu Jul 26 16:47:29 2012 +0100 +++ b/tools/ocaml/libs/xl/xenlight_stubs.c Thu Jul 26 16:47:30 2012 +0100 @@ -247,7 +247,7 @@ value stub_xl_device_disk_add(value info device_disk_val(&gc, &lg, &c_info, info); INIT_CTX(); - ret = libxl_device_disk_add(ctx, Int_val(domid), &c_info); + ret = libxl_device_disk_add(ctx, Int_val(domid), &c_info, 0); if (ret != 0) failwith_xl("disk_add", &lg); FREE_CTX(); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jul 28 03:00:29 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Jul 2012 03:00: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 1SuxGU-0001pD-7g; Sat, 28 Jul 2012 03:00:26 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGS-0001oM-HV for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:25 +0000 Received: from [85.158.143.99:37845] by server-1.bemta-4.messagelabs.com id C6/2E-24392-7C553105; Sat, 28 Jul 2012 03:00:23 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-216.messagelabs.com!1343444420!28524331!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 5010 invoked from network); 28 Jul 2012 03:00:21 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 28 Jul 2012 03:00:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGN-0003QB-M6 for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuxGN-0002kR-EC for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:19 +0000 Message-Id: Date: Sat, 28 Jul 2012 03:00:18 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: convert libxl_device_disk_add to an async op X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343317650 -3600 # Node ID fe34db0860d312ca1000192aede47c8cf563c16f # Parent 34b942aae898e0e26b3576d4c63bc16d5e7aeed5 libxl: convert libxl_device_disk_add to an async op This patch converts libxl_device_disk_add to an ao operation that waits for device backend to reach state XenbusStateInitWait and then marks the operation as completed. This is not really useful now, but will be used by later patches that will launch hotplug scripts after we reached the desired xenbus state. As usual, libxl_device_disk_add callers have been modified, and the internal function libxl__device_disk_add has been used if the call was inside an already running ao. Signed-off-by: Roger Pau Monne Acked-by: Ian Jackson [ ijc -- drop hunk modifying libxl_cdrom_insert which is not needed after 25670:3666e9712eaf "libxl: make libxl_cdrom_insert async" ] Committed-by: Ian Campbell --- diff -r 34b942aae898 -r fe34db0860d3 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Thu Jul 26 16:47:29 2012 +0100 +++ b/tools/libxl/libxl.c Thu Jul 26 16:47:30 2012 +0100 @@ -1785,16 +1785,18 @@ int libxl__device_from_disk(libxl__gc *g * The passed get_vdev function is also in charge of printing * the corresponding error message when appropiate. */ -static int device_disk_add(libxl__gc *gc, uint32_t domid, +static void device_disk_add(libxl__egc *egc, uint32_t domid, libxl_device_disk *disk, + libxl__ao_device *aodev, char *get_vdev(libxl__gc *, void *, xs_transaction_t), void *get_vdev_user) { + STATE_AO_GC(aodev->ao); flexarray_t *front = NULL; flexarray_t *back = NULL; char *dev; - libxl__device device; + libxl__device *device; int major, minor, rc; libxl_ctx *ctx = gc->owner; xs_transaction_t t = XBT_NULL; @@ -1837,7 +1839,8 @@ static int device_disk_add(libxl__gc *gc goto out_free; } - rc = libxl__device_from_disk(gc, domid, disk, &device); + GCNEW(device); + rc = libxl__device_from_disk(gc, domid, disk, device); if (rc != 0) { LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "Invalid or unsupported" " virtual disk identifier %s", disk->vdev); @@ -1855,7 +1858,7 @@ static int device_disk_add(libxl__gc *gc flexarray_append(back, "params"); flexarray_append(back, dev); - assert(device.backend_kind == LIBXL__DEVICE_KIND_VBD); + assert(device->backend_kind == LIBXL__DEVICE_KIND_VBD); break; case LIBXL_DISK_BACKEND_TAP: dev = libxl__blktap_devpath(gc, disk->pdev_path, disk->format); @@ -1876,7 +1879,7 @@ static int device_disk_add(libxl__gc *gc flexarray_append(back, "params"); flexarray_append(back, libxl__sprintf(gc, "%s:%s", libxl__device_disk_string_of_format(disk->format), disk->pdev_path)); - assert(device.backend_kind == LIBXL__DEVICE_KIND_QDISK); + assert(device->backend_kind == LIBXL__DEVICE_KIND_QDISK); break; default: LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "unrecognized disk backend type: %d\n", disk->backend); @@ -1908,11 +1911,11 @@ static int device_disk_add(libxl__gc *gc flexarray_append(front, "state"); flexarray_append(front, libxl__sprintf(gc, "%d", 1)); flexarray_append(front, "virtual-device"); - flexarray_append(front, libxl__sprintf(gc, "%d", device.devid)); + flexarray_append(front, libxl__sprintf(gc, "%d", device->devid)); flexarray_append(front, "device-type"); flexarray_append(front, disk->is_cdrom ? "cdrom" : "disk"); - libxl__device_generic_add(gc, t, &device, + libxl__device_generic_add(gc, t, device, libxl__xs_kvs_of_flexarray(gc, back, back->count), libxl__xs_kvs_of_flexarray(gc, front, front->count)); @@ -1921,6 +1924,10 @@ static int device_disk_add(libxl__gc *gc if (rc < 0) goto out_free; } + aodev->dev = device; + aodev->action = DEVICE_CONNECT; + libxl__wait_device_connection(egc, aodev); + rc = 0; out_free: @@ -1928,21 +1935,15 @@ out_free: flexarray_free(front); out: libxl__xs_transaction_abort(gc, &t); - return rc; + aodev->rc = rc; + if (rc) aodev->callback(egc, aodev); + return; } -int libxl__device_disk_add(libxl__gc *gc, uint32_t domid, - libxl_device_disk *disk) +void libxl__device_disk_add(libxl__egc *egc, uint32_t domid, + libxl_device_disk *disk, libxl__ao_device *aodev) { - return device_disk_add(gc, domid, disk, NULL, NULL); -} - -int libxl_device_disk_add(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk) -{ - GC_INIT(ctx); - int rc = libxl__device_disk_add(gc, domid, disk); - GC_FREE; - return rc; + device_disk_add(egc, domid, disk, aodev, NULL, NULL); } static void libxl__device_disk_from_xs_be(libxl__gc *gc, @@ -2252,14 +2253,17 @@ static char * libxl__alloc_vdev(libxl__g return NULL; } +/* Callbacks */ + +static void local_device_attach_cb(libxl__egc *egc, libxl__ao_device *aodev); + void libxl__device_disk_local_initiate_attach(libxl__egc *egc, libxl__disk_local_state *dls) { STATE_AO_GC(dls->ao); libxl_ctx *ctx = CTX; - char *dev = NULL, *be_path = NULL; + char *dev = NULL; int rc; - libxl__device device; const libxl_device_disk *in_disk = dls->in_disk; libxl_device_disk *disk = &dls->disk; const char *blkdev_start = dls->blkdev_start; @@ -2306,14 +2310,12 @@ void libxl__device_disk_local_initiate_a break; case LIBXL_DISK_BACKEND_QDISK: if (disk->format != LIBXL_DISK_FORMAT_RAW) { - if (device_disk_add(gc, LIBXL_TOOLSTACK_DOMID, disk, - libxl__alloc_vdev, - (void *) blkdev_start)) { - LOG(ERROR, "libxl_device_disk_add failed"); - rc = ERROR_FAIL; - goto out; - } - dev = GCSPRINTF("/dev/%s", disk->vdev); + libxl__prepare_ao_device(ao, &dls->aodev); + dls->aodev.callback = local_device_attach_cb; + device_disk_add(egc, LIBXL_TOOLSTACK_DOMID, disk, + &dls->aodev, libxl__alloc_vdev, + (void *) blkdev_start); + return; } else { dev = disk->pdev_path; } @@ -2326,15 +2328,48 @@ void libxl__device_disk_local_initiate_a goto out; } - if (disk->vdev != NULL) { - rc = libxl__device_from_disk(gc, LIBXL_TOOLSTACK_DOMID, disk, &device); - if (rc < 0) - goto out; - be_path = libxl__device_backend_path(gc, &device); - rc = libxl__wait_for_backend(gc, be_path, "4"); - if (rc < 0) - goto out; + if (dev != NULL) + dls->diskpath = strdup(dev); + + dls->callback(egc, dls, 0); + return; + + out: + assert(rc); + dls->rc = rc; + libxl__device_disk_local_initiate_detach(egc, dls); + dls->callback(egc, dls, rc); +} + +static void local_device_attach_cb(libxl__egc *egc, libxl__ao_device *aodev) +{ + STATE_AO_GC(aodev->ao); + libxl__disk_local_state *dls = CONTAINER_OF(aodev, *dls, aodev); + char *dev = NULL, *be_path = NULL; + int rc; + libxl__device device; + libxl_device_disk *disk = &dls->disk; + + rc = aodev->rc; + if (rc) { + LOGE(ERROR, "unable to %s %s with id %u", + aodev->action == DEVICE_CONNECT ? "add" : "remove", + libxl__device_kind_to_string(aodev->dev->kind), + aodev->dev->devid); + goto out; } + + dev = GCSPRINTF("/dev/%s", disk->vdev); + LOG(DEBUG, "locally attaching qdisk %s", dev); + + rc = libxl__device_from_disk(gc, LIBXL_TOOLSTACK_DOMID, disk, &device); + if (rc < 0) + goto out; + be_path = libxl__device_backend_path(gc, &device); + rc = libxl__wait_for_backend(gc, be_path, "4"); + if (rc < 0) + goto out; + if (dev != NULL) dls->diskpath = libxl__strdup(gc, dev); @@ -3058,6 +3093,36 @@ DEFINE_DEVICE_REMOVE(vfb, destroy, 1) /******************************************************************************/ +/* Macro for defining device addition functions in a compact way */ +/* The following functions are defined: + * libxl_device_disk_add + */ + +#define DEFINE_DEVICE_ADD(type) \ + int libxl_device_##type##_add(libxl_ctx *ctx, \ + uint32_t domid, libxl_device_##type *type, \ + const libxl_asyncop_how *ao_how) \ + { \ + AO_CREATE(ctx, domid, ao_how); \ + libxl__ao_device *aodev; \ + \ + GCNEW(aodev); \ + libxl__prepare_ao_device(ao, aodev); \ + aodev->callback = device_addrm_aocomplete; \ + libxl__device_##type##_add(egc, domid, type, aodev); \ + \ + return AO_INPROGRESS; \ + } + +/* Define alladd functions and undef the macro */ + +/* disk */ +DEFINE_DEVICE_ADD(disk) + +#undef DEFINE_DEVICE_ADD + +/******************************************************************************/ + int libxl_domain_setmaxmem(libxl_ctx *ctx, uint32_t domid, uint32_t max_memkb) { GC_INIT(ctx); diff -r 34b942aae898 -r fe34db0860d3 tools/libxl/libxl.h --- a/tools/libxl/libxl.h Thu Jul 26 16:47:29 2012 +0100 +++ b/tools/libxl/libxl.h Thu Jul 26 16:47:30 2012 +0100 @@ -675,7 +675,9 @@ void libxl_vcpuinfo_list_free(libxl_vcpu */ /* Disks */ -int libxl_device_disk_add(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk); +int libxl_device_disk_add(libxl_ctx *ctx, uint32_t domid, + libxl_device_disk *disk, + const libxl_asyncop_how *ao_how); int libxl_device_disk_remove(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk, const libxl_asyncop_how *ao_how); diff -r 34b942aae898 -r fe34db0860d3 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Thu Jul 26 16:47:29 2012 +0100 +++ b/tools/libxl/libxl_create.c Thu Jul 26 16:47:30 2012 +0100 @@ -560,6 +560,10 @@ static void domcreate_bootloader_console static void domcreate_bootloader_done(libxl__egc *egc, libxl__bootloader_state *bl, int rc); + +static void domcreate_launch_dm(libxl__egc *egc, libxl__ao_devices *aodevs, + int ret); + static void domcreate_console_available(libxl__egc *egc, libxl__domain_create_state *dcs); @@ -850,12 +854,10 @@ static void domcreate_rebuild_done(libxl int ret) { STATE_AO_GC(dcs->ao); - int i; /* convenience aliases */ const uint32_t domid = dcs->guest_domid; libxl_domain_config *const d_config = dcs->guest_config; - libxl__domain_build_state *const state = &dcs->build_state; libxl_ctx *const ctx = CTX; if (ret) { @@ -866,14 +868,34 @@ static void domcreate_rebuild_done(libxl store_libxl_entry(gc, domid, &d_config->b_info); - for (i = 0; i < d_config->num_disks; i++) { - ret = libxl_device_disk_add(ctx, domid, &d_config->disks[i]); - if (ret) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, - "cannot add disk %d to domain: %d", i, ret); - ret = ERROR_FAIL; - goto error_out; - } + dcs->aodevs.size = d_config->num_disks; + dcs->aodevs.callback = domcreate_launch_dm; + libxl__prepare_ao_devices(ao, &dcs->aodevs); + libxl__add_disks(egc, ao, domid, 0, d_config, &dcs->aodevs); + + return; + + error_out: + assert(ret); + domcreate_complete(egc, dcs, ret); +} + +static void domcreate_launch_dm(libxl__egc *egc, libxl__ao_devices *aodevs, + int ret) +{ + libxl__domain_create_state *dcs = CONTAINER_OF(aodevs, *dcs, aodevs); + STATE_AO_GC(dcs->ao); + int i; + + /* convenience aliases */ + const uint32_t domid = dcs->guest_domid; + libxl_domain_config *const d_config = dcs->guest_config; + libxl__domain_build_state *const state = &dcs->build_state; + libxl_ctx *const ctx = CTX; + + if (ret) { + LOG(ERROR, "unable to add disk devices"); + goto error_out; } for (i = 0; i < d_config->num_nics; i++) { ret = libxl_device_nic_add(ctx, domid, &d_config->nics[i]); diff -r 34b942aae898 -r fe34db0860d3 tools/libxl/libxl_device.c --- a/tools/libxl/libxl_device.c Thu Jul 26 16:47:29 2012 +0100 +++ b/tools/libxl/libxl_device.c Thu Jul 26 16:47:30 2012 +0100 @@ -447,6 +447,37 @@ void libxl__ao_devices_callback(libxl__e return; } +/******************************************************************************/ + +/* Macro for defining the functions that will add a bunch of disks when + * inside an async op. + * This macro is added to prevent repetition of code. + * + * The following functions are defined: + * libxl__add_disks + */ + +#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++) { \ + aodevs->array[i].callback = libxl__ao_devices_callback; \ + libxl__device_##type##_add(egc, domid, &d_config->type##s[i-start],\ + &aodevs->array[i]); \ + } \ + } + +DEFINE_DEVICES_ADD(disk) + +#undef DEFINE_DEVICES_ADD + +/******************************************************************************/ + int libxl__device_destroy(libxl__gc *gc, libxl__device *dev) { char *be_path = libxl__device_backend_path(gc, dev); @@ -593,6 +624,52 @@ static void device_backend_cleanup(libxl static void device_hotplug_done(libxl__egc *egc, libxl__ao_device *aodev); +void libxl__wait_device_connection(libxl__egc *egc, libxl__ao_device *aodev) +{ + STATE_AO_GC(aodev->ao); + char *be_path = libxl__device_backend_path(gc, aodev->dev); + char *state_path = libxl__sprintf(gc, "%s/state", be_path); + libxl_dominfo info; + uint32_t domid = aodev->dev->domid; + int rc = 0; + + libxl_dominfo_init(&info); + rc = libxl_domain_info(CTX, &info, domid); + if (rc) { + LOG(ERROR, "unable to get info for domain %d", domid); + goto out; + } + if (QEMU_BACKEND(aodev->dev)) { + /* + * If Qemu is not running, there's no point in waiting for + * it to change the state of the device. + * + * If Qemu is running, it will set the state of the device to + * 4 directly, without waiting in state 2 for any hotplug execution. + */ + device_hotplug_done(egc, aodev); + return; + } + + rc = libxl__ev_devstate_wait(gc, &aodev->backend_ds, + device_backend_callback, + state_path, XenbusStateInitWait, + LIBXL_INIT_TIMEOUT * 1000); + if (rc) { + LOG(ERROR, "unable to initialize device %s", be_path); + goto out; + } + + libxl_dominfo_dispose(&info); + return; + +out: + aodev->rc = rc; + libxl_dominfo_dispose(&info); + device_hotplug_done(egc, aodev); + return; +} + void libxl__initiate_device_remove(libxl__egc *egc, libxl__ao_device *aodev) { diff -r 34b942aae898 -r fe34db0860d3 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Thu Jul 26 16:47:29 2012 +0100 +++ b/tools/libxl/libxl_dm.c Thu Jul 26 16:47:30 2012 +0100 @@ -713,6 +713,9 @@ static void spawn_stubdom_pvqemu_cb(libx libxl__dm_spawn_state *stubdom_dmss, int rc); +static void spawn_stub_launch_dm(libxl__egc *egc, + libxl__ao_devices *aodevs, int ret); + static void spaw_stubdom_pvqemu_destroy_cb(libxl__egc *egc, libxl__destroy_domid_state *dis, int rc); @@ -726,10 +729,9 @@ void libxl__spawn_stub_dm(libxl__egc *eg { STATE_AO_GC(sdss->dm.spawn.ao); libxl_ctx *ctx = libxl__gc_owner(gc); - int i, num_console = STUBDOM_SPECIAL_CONSOLES, ret; - libxl__device_console *console; - libxl_device_vfb vfb; - libxl_device_vkb vkb; + int ret; + libxl_device_vfb *vfb; + libxl_device_vkb *vkb; char **args; struct xs_permissions perm[2]; xs_transaction_t t; @@ -784,10 +786,12 @@ void libxl__spawn_stub_dm(libxl__egc *eg ret = libxl__domain_build_info_setdefault(gc, &dm_config->b_info); if (ret) goto out; - libxl__vfb_and_vkb_from_hvm_guest_config(gc, guest_config, &vfb, &vkb); - dm_config->vfbs = &vfb; + GCNEW(vfb); + GCNEW(vkb); + libxl__vfb_and_vkb_from_hvm_guest_config(gc, guest_config, vfb, vkb); + dm_config->vfbs = vfb; dm_config->num_vfbs = 1; - dm_config->vkbs = &vkb; + dm_config->vkbs = vkb; dm_config->num_vkbs = 1; stubdom_state->pv_kernel.path @@ -845,22 +849,54 @@ retry_transaction: if (errno == EAGAIN) goto retry_transaction; - for (i = 0; i < dm_config->num_disks; i++) { - ret = libxl_device_disk_add(ctx, dm_domid, &dm_config->disks[i]); - if (ret) - goto out_free; - } + sdss->aodevs.size = dm_config->num_disks; + 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); + + free(args); + return; + +out_free: + free(args); +out: + assert(ret); + spawn_stubdom_pvqemu_cb(egc, &sdss->pvqemu, ret); +} + +static void spawn_stub_launch_dm(libxl__egc *egc, + libxl__ao_devices *aodevs, int ret) +{ + libxl__stub_dm_spawn_state *sdss = CONTAINER_OF(aodevs, *sdss, aodevs); + STATE_AO_GC(sdss->dm.spawn.ao); + libxl_ctx *ctx = libxl__gc_owner(gc); + int i, num_console = STUBDOM_SPECIAL_CONSOLES; + libxl__device_console *console; + + /* convenience aliases */ + libxl_domain_config *const dm_config = &sdss->dm_config; + libxl_domain_config *const guest_config = sdss->dm.guest_config; + const int guest_domid = sdss->dm.guest_domid; + libxl__domain_build_state *const d_state = sdss->dm.build_state; + libxl__domain_build_state *const stubdom_state = &sdss->dm_state; + uint32_t dm_domid = sdss->pvqemu.guest_domid; + + if (ret) { + LOG(ERROR, "error connecting disk devices"); + goto out; + } + for (i = 0; i < dm_config->num_nics; i++) { ret = libxl_device_nic_add(ctx, dm_domid, &dm_config->nics[i]); if (ret) - goto out_free; + goto out; } ret = libxl_device_vfb_add(ctx, dm_domid, &dm_config->vfbs[0]); if (ret) - goto out_free; + goto out; ret = libxl_device_vkb_add(ctx, dm_domid, &dm_config->vkbs[0]); if (ret) - goto out_free; + goto out; if (guest_config->b_info.u.hvm.serial) num_console++; @@ -868,7 +904,7 @@ retry_transaction: console = libxl__calloc(gc, num_console, sizeof(libxl__device_console)); if (!console) { ret = ERROR_NOMEM; - goto out_free; + goto out; } for (i = 0; i < num_console; i++) { @@ -904,7 +940,7 @@ retry_transaction: ret = libxl__device_console_add(gc, dm_domid, &console[i], i == STUBDOM_CONSOLE_LOGGING ? stubdom_state : NULL); if (ret) - goto out_free; + goto out; } sdss->pvqemu.spawn.ao = ao; @@ -915,11 +951,8 @@ retry_transaction: libxl__spawn_local_dm(egc, &sdss->pvqemu); - free(args); return; -out_free: - free(args); out: assert(ret); spawn_stubdom_pvqemu_cb(egc, &sdss->pvqemu, ret); diff -r 34b942aae898 -r fe34db0860d3 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Thu Jul 26 16:47:29 2012 +0100 +++ b/tools/libxl/libxl_internal.h Thu Jul 26 16:47:30 2012 +0100 @@ -72,6 +72,7 @@ #include "_libxl_types_internal.h" #include "_libxl_types_internal_json.h" +#define LIBXL_INIT_TIMEOUT 10 #define LIBXL_DESTROY_TIMEOUT 10 #define LIBXL_DEVICE_MODEL_START_TIMEOUT 10 #define LIBXL_QEMU_BODGE_TIMEOUT 2 @@ -1338,8 +1339,6 @@ _hidden void libxl__device_destroy_tapdi _hidden int libxl__device_from_disk(libxl__gc *gc, uint32_t domid, libxl_device_disk *disk, libxl__device *device); -_hidden int libxl__device_disk_add(libxl__gc *gc, uint32_t domid, - libxl_device_disk *disk); _hidden char *libxl__uuid2string(libxl__gc *gc, const libxl_uuid uuid); @@ -1923,6 +1922,27 @@ struct libxl__ao_devices { * DONE. */ +/* AO operation to connect a disk device, called by + * libxl_device_disk_add and libxl__add_disks. This function calls + * libxl__wait_device_connection to wait for the device to + * finish the connection (might involve executing hotplug scripts). + * + * Once finished, aodev->callback will be executed. + */ +_hidden void libxl__device_disk_add(libxl__egc *egc, uint32_t domid, + libxl_device_disk *disk, + libxl__ao_device *aodev); + +/* Waits for the passed device to reach state XenbusStateInitWait. + * This is not really useful by itself, but is important when executing + * hotplug scripts, since we need to be sure the device is in the correct + * state before executing them. + * + * Once finished, aodev->callback will be executed. + */ +_hidden void libxl__wait_device_connection(libxl__egc*, + libxl__ao_device *aodev); + /* Arranges that dev will be removed to the guest, and the * hotplug scripts will be executed (if necessary). When * this is done (or an error happens), the callback in @@ -2295,6 +2315,19 @@ _hidden void libxl__destroy_domid(libxl_ _hidden void libxl__devices_destroy(libxl__egc *egc, 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 "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__ao_devices *aodevs); + /*----- device model creation -----*/ /* First layer; wraps libxl__spawn_spawn. */ @@ -2329,6 +2362,7 @@ typedef struct { libxl__domain_build_state dm_state; libxl__dm_spawn_state pvqemu; libxl__destroy_domid_state dis; + libxl__ao_devices aodevs; } libxl__stub_dm_spawn_state; _hidden void libxl__spawn_stub_dm(libxl__egc *egc, libxl__stub_dm_spawn_state*); @@ -2360,6 +2394,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; }; /*----- Domain suspend (save) functions -----*/ diff -r 34b942aae898 -r fe34db0860d3 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Thu Jul 26 16:47:29 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Thu Jul 26 16:47:30 2012 +0100 @@ -5360,7 +5360,7 @@ int main_blockattach(int argc, char **ar return 0; } - if (libxl_device_disk_add(ctx, fe_domid, &disk)) { + if (libxl_device_disk_add(ctx, fe_domid, &disk, 0)) { fprintf(stderr, "libxl_device_disk_add failed.\n"); } return 0; diff -r 34b942aae898 -r fe34db0860d3 tools/ocaml/libs/xl/xenlight_stubs.c --- a/tools/ocaml/libs/xl/xenlight_stubs.c Thu Jul 26 16:47:29 2012 +0100 +++ b/tools/ocaml/libs/xl/xenlight_stubs.c Thu Jul 26 16:47:30 2012 +0100 @@ -247,7 +247,7 @@ value stub_xl_device_disk_add(value info device_disk_val(&gc, &lg, &c_info, info); INIT_CTX(); - ret = libxl_device_disk_add(ctx, Int_val(domid), &c_info); + ret = libxl_device_disk_add(ctx, Int_val(domid), &c_info, 0); if (ret != 0) failwith_xl("disk_add", &lg); FREE_CTX(); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jul 28 03:00:29 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Jul 2012 03:00: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 1SuxGU-0001p8-5L; Sat, 28 Jul 2012 03:00:26 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGS-0001oL-J6 for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:24 +0000 Received: from [85.158.138.51:38690] by server-12.bemta-3.messagelabs.com id 25/AC-15259-7C553105; Sat, 28 Jul 2012 03:00:23 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-174.messagelabs.com!1343444421!8974917!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 15165 invoked from network); 28 Jul 2012 03:00:22 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 28 Jul 2012 03:00:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGP-0003QK-Dz for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuxGP-0002lB-9E for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:21 +0000 Message-Id: Date: Sat, 28 Jul 2012 03:00:20 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: set correct nic type depending on the guest X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343317653 -3600 # Node ID 0d98248a77ce87ed0a0766a2c50d884bb2687790 # Parent 2e21281b2c10074256f4f964f28ec851baff4244 libxl: set correct nic type depending on the guest Fix the use of nic type, which results in the following for each type of domain: * HVM: let the user choose, if none specified use VIF_IOEMU. * PV: use VIF is none provided, return error if VIF_IOEMU requested. Signed-off-by: Roger Pau Monne Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r 2e21281b2c10 -r 0d98248a77ce tools/libxl/libxl.c --- a/tools/libxl/libxl.c Thu Jul 26 16:47:32 2012 +0100 +++ b/tools/libxl/libxl.c Thu Jul 26 16:47:33 2012 +0100 @@ -2457,7 +2457,8 @@ out: /******************************************************************************/ -int libxl__device_nic_setdefault(libxl__gc *gc, libxl_device_nic *nic) +int libxl__device_nic_setdefault(libxl__gc *gc, libxl_device_nic *nic, + uint32_t domid) { if (!nic->mtu) nic->mtu = 1492; @@ -2487,8 +2488,25 @@ int libxl__device_nic_setdefault(libxl__ if ( !nic->script && asprintf(&nic->script, "%s/vif-bridge", libxl__xen_script_dir_path()) < 0 ) return ERROR_FAIL; - if (!nic->nictype) - nic->nictype = LIBXL_NIC_TYPE_VIF_IOEMU; + + switch (libxl__domain_type(gc, domid)) { + case LIBXL_DOMAIN_TYPE_HVM: + if (!nic->nictype) + nic->nictype = LIBXL_NIC_TYPE_VIF_IOEMU; + break; + case LIBXL_DOMAIN_TYPE_PV: + if (nic->nictype == LIBXL_NIC_TYPE_VIF_IOEMU) { + LOG(ERROR, "trying to create PV guest with an emulated interface"); + return ERROR_INVAL; + } + nic->nictype = LIBXL_NIC_TYPE_VIF; + break; + case LIBXL_DOMAIN_TYPE_INVALID: + return ERROR_FAIL; + default: + abort(); + } + return 0; } @@ -2516,7 +2534,7 @@ void libxl__device_nic_add(libxl__egc *e char *dompath, **l; unsigned int nb, rc; - rc = libxl__device_nic_setdefault(gc, nic); + rc = libxl__device_nic_setdefault(gc, nic, domid); if (rc) goto out; front = flexarray_make(16, 1); diff -r 2e21281b2c10 -r 0d98248a77ce tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Thu Jul 26 16:47:32 2012 +0100 +++ b/tools/libxl/libxl_create.c Thu Jul 26 16:47:33 2012 +0100 @@ -943,7 +943,9 @@ static void domcreate_launch_dm(libxl__e * called libxl_device_nic_add at this point, but qemu needs * the nic information to be complete. */ - libxl__device_nic_setdefault(gc, &d_config->nics[i]); + ret = libxl__device_nic_setdefault(gc, &d_config->nics[i], domid); + if (ret) + goto error_out; } switch (d_config->c_info.type) { case LIBXL_DOMAIN_TYPE_HVM: diff -r 2e21281b2c10 -r 0d98248a77ce tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Thu Jul 26 16:47:32 2012 +0100 +++ b/tools/libxl/libxl_dm.c Thu Jul 26 16:47:33 2012 +0100 @@ -898,7 +898,9 @@ static void spawn_stub_launch_dm(libxl__ * called libxl_device_nic_add at this point, but qemu needs * the nic information to be complete. */ - libxl__device_nic_setdefault(gc, &dm_config->nics[i]); + ret = libxl__device_nic_setdefault(gc, &dm_config->nics[i], dm_domid); + if (ret) + goto out; } ret = libxl_device_vfb_add(ctx, dm_domid, &dm_config->vfbs[0]); if (ret) diff -r 2e21281b2c10 -r 0d98248a77ce tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Thu Jul 26 16:47:32 2012 +0100 +++ b/tools/libxl/libxl_internal.h Thu Jul 26 16:47:33 2012 +0100 @@ -938,7 +938,8 @@ _hidden int libxl__domain_build_info_set libxl_domain_build_info *b_info); _hidden int libxl__device_disk_setdefault(libxl__gc *gc, libxl_device_disk *disk); -_hidden int libxl__device_nic_setdefault(libxl__gc *gc, libxl_device_nic *nic); +_hidden int libxl__device_nic_setdefault(libxl__gc *gc, libxl_device_nic *nic, + uint32_t domid); _hidden int libxl__device_vfb_setdefault(libxl__gc *gc, libxl_device_vfb *vfb); _hidden int libxl__device_vkb_setdefault(libxl__gc *gc, libxl_device_vkb *vkb); _hidden int libxl__device_pci_setdefault(libxl__gc *gc, libxl_device_pci *pci); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jul 28 03:00:29 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Jul 2012 03:00: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 1SuxGU-0001p8-5L; Sat, 28 Jul 2012 03:00:26 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGS-0001oL-J6 for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:24 +0000 Received: from [85.158.138.51:38690] by server-12.bemta-3.messagelabs.com id 25/AC-15259-7C553105; Sat, 28 Jul 2012 03:00:23 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-174.messagelabs.com!1343444421!8974917!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 15165 invoked from network); 28 Jul 2012 03:00:22 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 28 Jul 2012 03:00:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGP-0003QK-Dz for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuxGP-0002lB-9E for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:21 +0000 Message-Id: Date: Sat, 28 Jul 2012 03:00:20 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: set correct nic type depending on the guest X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343317653 -3600 # Node ID 0d98248a77ce87ed0a0766a2c50d884bb2687790 # Parent 2e21281b2c10074256f4f964f28ec851baff4244 libxl: set correct nic type depending on the guest Fix the use of nic type, which results in the following for each type of domain: * HVM: let the user choose, if none specified use VIF_IOEMU. * PV: use VIF is none provided, return error if VIF_IOEMU requested. Signed-off-by: Roger Pau Monne Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r 2e21281b2c10 -r 0d98248a77ce tools/libxl/libxl.c --- a/tools/libxl/libxl.c Thu Jul 26 16:47:32 2012 +0100 +++ b/tools/libxl/libxl.c Thu Jul 26 16:47:33 2012 +0100 @@ -2457,7 +2457,8 @@ out: /******************************************************************************/ -int libxl__device_nic_setdefault(libxl__gc *gc, libxl_device_nic *nic) +int libxl__device_nic_setdefault(libxl__gc *gc, libxl_device_nic *nic, + uint32_t domid) { if (!nic->mtu) nic->mtu = 1492; @@ -2487,8 +2488,25 @@ int libxl__device_nic_setdefault(libxl__ if ( !nic->script && asprintf(&nic->script, "%s/vif-bridge", libxl__xen_script_dir_path()) < 0 ) return ERROR_FAIL; - if (!nic->nictype) - nic->nictype = LIBXL_NIC_TYPE_VIF_IOEMU; + + switch (libxl__domain_type(gc, domid)) { + case LIBXL_DOMAIN_TYPE_HVM: + if (!nic->nictype) + nic->nictype = LIBXL_NIC_TYPE_VIF_IOEMU; + break; + case LIBXL_DOMAIN_TYPE_PV: + if (nic->nictype == LIBXL_NIC_TYPE_VIF_IOEMU) { + LOG(ERROR, "trying to create PV guest with an emulated interface"); + return ERROR_INVAL; + } + nic->nictype = LIBXL_NIC_TYPE_VIF; + break; + case LIBXL_DOMAIN_TYPE_INVALID: + return ERROR_FAIL; + default: + abort(); + } + return 0; } @@ -2516,7 +2534,7 @@ void libxl__device_nic_add(libxl__egc *e char *dompath, **l; unsigned int nb, rc; - rc = libxl__device_nic_setdefault(gc, nic); + rc = libxl__device_nic_setdefault(gc, nic, domid); if (rc) goto out; front = flexarray_make(16, 1); diff -r 2e21281b2c10 -r 0d98248a77ce tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Thu Jul 26 16:47:32 2012 +0100 +++ b/tools/libxl/libxl_create.c Thu Jul 26 16:47:33 2012 +0100 @@ -943,7 +943,9 @@ static void domcreate_launch_dm(libxl__e * called libxl_device_nic_add at this point, but qemu needs * the nic information to be complete. */ - libxl__device_nic_setdefault(gc, &d_config->nics[i]); + ret = libxl__device_nic_setdefault(gc, &d_config->nics[i], domid); + if (ret) + goto error_out; } switch (d_config->c_info.type) { case LIBXL_DOMAIN_TYPE_HVM: diff -r 2e21281b2c10 -r 0d98248a77ce tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Thu Jul 26 16:47:32 2012 +0100 +++ b/tools/libxl/libxl_dm.c Thu Jul 26 16:47:33 2012 +0100 @@ -898,7 +898,9 @@ static void spawn_stub_launch_dm(libxl__ * called libxl_device_nic_add at this point, but qemu needs * the nic information to be complete. */ - libxl__device_nic_setdefault(gc, &dm_config->nics[i]); + ret = libxl__device_nic_setdefault(gc, &dm_config->nics[i], dm_domid); + if (ret) + goto out; } ret = libxl_device_vfb_add(ctx, dm_domid, &dm_config->vfbs[0]); if (ret) diff -r 2e21281b2c10 -r 0d98248a77ce tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Thu Jul 26 16:47:32 2012 +0100 +++ b/tools/libxl/libxl_internal.h Thu Jul 26 16:47:33 2012 +0100 @@ -938,7 +938,8 @@ _hidden int libxl__domain_build_info_set libxl_domain_build_info *b_info); _hidden int libxl__device_disk_setdefault(libxl__gc *gc, libxl_device_disk *disk); -_hidden int libxl__device_nic_setdefault(libxl__gc *gc, libxl_device_nic *nic); +_hidden int libxl__device_nic_setdefault(libxl__gc *gc, libxl_device_nic *nic, + uint32_t domid); _hidden int libxl__device_vfb_setdefault(libxl__gc *gc, libxl_device_vfb *vfb); _hidden int libxl__device_vkb_setdefault(libxl__gc *gc, libxl_device_vkb *vkb); _hidden int libxl__device_pci_setdefault(libxl__gc *gc, libxl_device_pci *pci); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jul 28 03:00:31 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Jul 2012 03:00: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 1SuxGU-0001pN-A5; Sat, 28 Jul 2012 03:00:26 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGS-0001oT-Th for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:25 +0000 Received: from [85.158.138.51:38699] by server-2.bemta-3.messagelabs.com id 28/B2-00359-8C553105; Sat, 28 Jul 2012 03:00:24 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-174.messagelabs.com!1343444420!8974914!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 15141 invoked from network); 28 Jul 2012 03:00:21 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 28 Jul 2012 03:00:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGO-0003QE-5F for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuxGO-0002kg-2Z for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:20 +0000 Message-Id: Date: Sat, 28 Jul 2012 03:00:19 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: convert libxl_device_nic_add to an async operation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Roger Pau Monne # Date 1343317651 -3600 # Node ID 69a0fa5473d379845a486feb538f3fea2b450c53 # Parent fe34db0860d312ca1000192aede47c8cf563c16f libxl: convert libxl_device_nic_add to an async operation This patch converts libxl_device_nic_add to an ao operation that waits for device backend to reach state XenbusStateInitWait and then marks the operation as completed. This is not really useful now, but will be used by latter patches that will launch hotplug scripts after we reached the desired xenbus state. Calls to libxl_device_nic_add have also been moved to occur after the device model has been launched, so when hotplug scripts are called from this functions the interfaces already exists. As usual, libxl_device_nic_add callers have been modified, and the internal function libxl__device_disk_add has been used if the call was inside an already running ao. Signed-off-by: Roger Pau Monne Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r fe34db0860d3 -r 69a0fa5473d3 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Thu Jul 26 16:47:30 2012 +0100 +++ b/tools/libxl/libxl.c Thu Jul 26 16:47:31 2012 +0100 @@ -2506,12 +2506,13 @@ static int libxl__device_from_nic(libxl_ return 0; } -int libxl_device_nic_add(libxl_ctx *ctx, uint32_t domid, libxl_device_nic *nic) +void libxl__device_nic_add(libxl__egc *egc, uint32_t domid, + libxl_device_nic *nic, libxl__ao_device *aodev) { - GC_INIT(ctx); + STATE_AO_GC(aodev->ao); flexarray_t *front; flexarray_t *back; - libxl__device device; + libxl__device *device; char *dompath, **l; unsigned int nb, rc; @@ -2542,7 +2543,8 @@ int libxl_device_nic_add(libxl_ctx *ctx, } } - rc = libxl__device_from_nic(gc, domid, nic, &device); + GCNEW(device); + rc = libxl__device_from_nic(gc, domid, nic, device); if ( rc != 0 ) goto out_free; flexarray_append(back, "frontend-id"); @@ -2583,6 +2585,9 @@ int libxl_device_nic_add(libxl_ctx *ctx, flexarray_append(back, libxl__strdup(gc, nic->bridge)); flexarray_append(back, "handle"); flexarray_append(back, libxl__sprintf(gc, "%d", nic->devid)); + flexarray_append(back, "type"); + flexarray_append(back, libxl__strdup(gc, + libxl_nic_type_to_string(nic->nictype))); flexarray_append(front, "backend-id"); flexarray_append(front, libxl__sprintf(gc, "%d", nic->backend_domid)); @@ -2593,18 +2598,22 @@ int libxl_device_nic_add(libxl_ctx *ctx, flexarray_append(front, "mac"); flexarray_append(front, libxl__sprintf(gc, LIBXL_MAC_FMT, LIBXL_MAC_BYTES(nic->mac))); - libxl__device_generic_add(gc, XBT_NULL, &device, + libxl__device_generic_add(gc, XBT_NULL, device, libxl__xs_kvs_of_flexarray(gc, back, back->count), libxl__xs_kvs_of_flexarray(gc, front, front->count)); - /* FIXME: wait for plug */ + aodev->dev = device; + aodev->action = DEVICE_CONNECT; + libxl__wait_device_connection(egc, aodev); + rc = 0; out_free: flexarray_free(back); flexarray_free(front); out: - GC_FREE; - return rc; + aodev->rc = rc; + if (rc) aodev->callback(egc, aodev); + return; } static void libxl__device_nic_from_xs_be(libxl__gc *gc, @@ -3096,6 +3105,7 @@ DEFINE_DEVICE_REMOVE(vfb, destroy, 1) /* Macro for defining device addition functions in a compact way */ /* The following functions are defined: * libxl_device_disk_add + * libxl_device_nic_add */ #define DEFINE_DEVICE_ADD(type) \ @@ -3119,6 +3129,9 @@ DEFINE_DEVICE_REMOVE(vfb, destroy, 1) /* disk */ DEFINE_DEVICE_ADD(disk) +/* nic */ +DEFINE_DEVICE_ADD(nic) + #undef DEFINE_DEVICE_ADD /******************************************************************************/ diff -r fe34db0860d3 -r 69a0fa5473d3 tools/libxl/libxl.h --- a/tools/libxl/libxl.h Thu Jul 26 16:47:30 2012 +0100 +++ b/tools/libxl/libxl.h Thu Jul 26 16:47:31 2012 +0100 @@ -697,7 +697,8 @@ int libxl_cdrom_insert(libxl_ctx *ctx, u const libxl_asyncop_how *ao_how); /* Network Interfaces */ -int libxl_device_nic_add(libxl_ctx *ctx, uint32_t domid, libxl_device_nic *nic); +int libxl_device_nic_add(libxl_ctx *ctx, uint32_t domid, libxl_device_nic *nic, + const libxl_asyncop_how *ao_how); int libxl_device_nic_remove(libxl_ctx *ctx, uint32_t domid, libxl_device_nic *nic, const libxl_asyncop_how *ao_how); diff -r fe34db0860d3 -r 69a0fa5473d3 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Thu Jul 26 16:47:30 2012 +0100 +++ b/tools/libxl/libxl_create.c Thu Jul 26 16:47:31 2012 +0100 @@ -564,6 +564,9 @@ static void domcreate_bootloader_done(li static void domcreate_launch_dm(libxl__egc *egc, libxl__ao_devices *aodevs, int ret); +static void domcreate_attach_pci(libxl__egc *egc, libxl__ao_devices *aodevs, + int ret); + static void domcreate_console_available(libxl__egc *egc, libxl__domain_create_state *dcs); @@ -898,13 +901,11 @@ static void domcreate_launch_dm(libxl__e goto error_out; } for (i = 0; i < d_config->num_nics; i++) { - ret = libxl_device_nic_add(ctx, domid, &d_config->nics[i]); - if (ret) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, - "cannot add nic %d to domain: %d", i, ret); - ret = ERROR_FAIL; - goto error_out; - } + /* We have to init the nic here, because we still haven't + * called libxl_device_nic_add at this point, but qemu needs + * the nic information to be complete. + */ + libxl__device_nic_setdefault(gc, &d_config->nics[i]); } switch (d_config->c_info.type) { case LIBXL_DOMAIN_TYPE_HVM: @@ -977,7 +978,6 @@ static void domcreate_devmodel_started(l { libxl__domain_create_state *dcs = CONTAINER_OF(dmss, *dcs, dmss.dm); STATE_AO_GC(dmss->spawn.ao); - int i; libxl_ctx *ctx = CTX; int domid = dcs->guest_domid; @@ -997,6 +997,41 @@ static void domcreate_devmodel_started(l } } + /* Plug nic interfaces */ + if (d_config->num_nics > 0) { + /* Attach nics */ + dcs->aodevs.size = d_config->num_nics; + dcs->aodevs.callback = domcreate_attach_pci; + libxl__prepare_ao_devices(ao, &dcs->aodevs); + libxl__add_nics(egc, ao, domid, 0, d_config, &dcs->aodevs); + return; + } + + domcreate_attach_pci(egc, &dcs->aodevs, 0); + return; + +error_out: + assert(ret); + domcreate_complete(egc, dcs, ret); +} + +static void domcreate_attach_pci(libxl__egc *egc, libxl__ao_devices *aodevs, + int ret) +{ + libxl__domain_create_state *dcs = CONTAINER_OF(aodevs, *dcs, aodevs); + STATE_AO_GC(dcs->ao); + int i; + libxl_ctx *ctx = CTX; + int domid = dcs->guest_domid; + + /* convenience aliases */ + libxl_domain_config *const d_config = dcs->guest_config; + + if (ret) { + LOG(ERROR, "unable to add nic devices"); + goto error_out; + } + for (i = 0; i < d_config->num_pcidevs; i++) libxl__device_pci_add(gc, domid, &d_config->pcidevs[i], 1); diff -r fe34db0860d3 -r 69a0fa5473d3 tools/libxl/libxl_device.c --- a/tools/libxl/libxl_device.c Thu Jul 26 16:47:30 2012 +0100 +++ b/tools/libxl/libxl_device.c Thu Jul 26 16:47:31 2012 +0100 @@ -455,6 +455,7 @@ void libxl__ao_devices_callback(libxl__e * * The following functions are defined: * libxl__add_disks + * libxl__add_nics */ #define DEFINE_DEVICES_ADD(type) \ @@ -473,6 +474,7 @@ void libxl__ao_devices_callback(libxl__e } DEFINE_DEVICES_ADD(disk) +DEFINE_DEVICES_ADD(nic) #undef DEFINE_DEVICES_ADD diff -r fe34db0860d3 -r 69a0fa5473d3 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Thu Jul 26 16:47:30 2012 +0100 +++ b/tools/libxl/libxl_dm.c Thu Jul 26 16:47:31 2012 +0100 @@ -716,6 +716,10 @@ static void spawn_stubdom_pvqemu_cb(libx static void spawn_stub_launch_dm(libxl__egc *egc, libxl__ao_devices *aodevs, int ret); +static void stubdom_pvqemu_cb(libxl__egc *egc, + libxl__ao_devices *aodevs, + int rc); + static void spaw_stubdom_pvqemu_destroy_cb(libxl__egc *egc, libxl__destroy_domid_state *dis, int rc); @@ -887,9 +891,11 @@ static void spawn_stub_launch_dm(libxl__ } for (i = 0; i < dm_config->num_nics; i++) { - ret = libxl_device_nic_add(ctx, dm_domid, &dm_config->nics[i]); - if (ret) - goto out; + /* We have to init the nic here, because we still haven't + * called libxl_device_nic_add at this point, but qemu needs + * the nic information to be complete. + */ + libxl__device_nic_setdefault(gc, &dm_config->nics[i]); } ret = libxl_device_vfb_add(ctx, dm_domid, &dm_config->vfbs[0]); if (ret) @@ -966,9 +972,35 @@ static void spawn_stubdom_pvqemu_cb(libx CONTAINER_OF(stubdom_dmss, *sdss, pvqemu); STATE_AO_GC(sdss->dm.spawn.ao); uint32_t dm_domid = sdss->pvqemu.guest_domid; + libxl_domain_config *d_config = stubdom_dmss->guest_config; if (rc) goto out; + if (d_config->num_nics > 0) { + sdss->aodevs.size = d_config->num_nics; + 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); + return; + } + +out: + stubdom_pvqemu_cb(egc, &sdss->aodevs, rc); +} + +static void stubdom_pvqemu_cb(libxl__egc *egc, + libxl__ao_devices *aodevs, + int rc) +{ + libxl__stub_dm_spawn_state *sdss = CONTAINER_OF(aodevs, *sdss, aodevs); + STATE_AO_GC(sdss->dm.spawn.ao); + uint32_t dm_domid = sdss->pvqemu.guest_domid; + + if (rc) { + LOGE(ERROR, "error connecting nics devices"); + goto out; + } + rc = libxl_domain_unpause(CTX, dm_domid); if (rc) goto out; diff -r fe34db0860d3 -r 69a0fa5473d3 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Thu Jul 26 16:47:30 2012 +0100 +++ b/tools/libxl/libxl_internal.h Thu Jul 26 16:47:31 2012 +0100 @@ -1933,6 +1933,11 @@ _hidden void libxl__device_disk_add(libx libxl_device_disk *disk, libxl__ao_device *aodev); +/* AO operation to connect a nic device */ +_hidden void libxl__device_nic_add(libxl__egc *egc, uint32_t domid, + libxl_device_nic *nic, + libxl__ao_device *aodev); + /* Waits for the passed device to reach state XenbusStateInitWait. * This is not really useful by itself, but is important when executing * hotplug scripts, since we need to be sure the device is in the correct @@ -2328,6 +2333,10 @@ _hidden void libxl__add_disks(libxl__egc int start, 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__ao_devices *aodevs); + /*----- device model creation -----*/ /* First layer; wraps libxl__spawn_spawn. */ diff -r fe34db0860d3 -r 69a0fa5473d3 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Thu Jul 26 16:47:30 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Thu Jul 26 16:47:31 2012 +0100 @@ -5249,7 +5249,7 @@ int main_networkattach(int argc, char ** return 0; } - if (libxl_device_nic_add(ctx, domid, &nic)) { + if (libxl_device_nic_add(ctx, domid, &nic, 0)) { fprintf(stderr, "libxl_device_nic_add failed.\n"); return 1; } diff -r fe34db0860d3 -r 69a0fa5473d3 tools/ocaml/libs/xl/xenlight_stubs.c --- a/tools/ocaml/libs/xl/xenlight_stubs.c Thu Jul 26 16:47:30 2012 +0100 +++ b/tools/ocaml/libs/xl/xenlight_stubs.c Thu Jul 26 16:47:31 2012 +0100 @@ -281,7 +281,7 @@ value stub_xl_device_nic_add(value info, device_nic_val(&gc, &lg, &c_info, info); INIT_CTX(); - ret = libxl_device_nic_add(ctx, Int_val(domid), &c_info); + ret = libxl_device_nic_add(ctx, Int_val(domid), &c_info, 0); if (ret != 0) failwith_xl("nic_add", &lg); FREE_CTX(); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jul 28 03:00:31 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Jul 2012 03:00: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 1SuxGU-0001pN-A5; Sat, 28 Jul 2012 03:00:26 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGS-0001oT-Th for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:25 +0000 Received: from [85.158.138.51:38699] by server-2.bemta-3.messagelabs.com id 28/B2-00359-8C553105; Sat, 28 Jul 2012 03:00:24 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-174.messagelabs.com!1343444420!8974914!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 15141 invoked from network); 28 Jul 2012 03:00:21 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 28 Jul 2012 03:00:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGO-0003QE-5F for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuxGO-0002kg-2Z for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:20 +0000 Message-Id: Date: Sat, 28 Jul 2012 03:00:19 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: convert libxl_device_nic_add to an async operation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Roger Pau Monne # Date 1343317651 -3600 # Node ID 69a0fa5473d379845a486feb538f3fea2b450c53 # Parent fe34db0860d312ca1000192aede47c8cf563c16f libxl: convert libxl_device_nic_add to an async operation This patch converts libxl_device_nic_add to an ao operation that waits for device backend to reach state XenbusStateInitWait and then marks the operation as completed. This is not really useful now, but will be used by latter patches that will launch hotplug scripts after we reached the desired xenbus state. Calls to libxl_device_nic_add have also been moved to occur after the device model has been launched, so when hotplug scripts are called from this functions the interfaces already exists. As usual, libxl_device_nic_add callers have been modified, and the internal function libxl__device_disk_add has been used if the call was inside an already running ao. Signed-off-by: Roger Pau Monne Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r fe34db0860d3 -r 69a0fa5473d3 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Thu Jul 26 16:47:30 2012 +0100 +++ b/tools/libxl/libxl.c Thu Jul 26 16:47:31 2012 +0100 @@ -2506,12 +2506,13 @@ static int libxl__device_from_nic(libxl_ return 0; } -int libxl_device_nic_add(libxl_ctx *ctx, uint32_t domid, libxl_device_nic *nic) +void libxl__device_nic_add(libxl__egc *egc, uint32_t domid, + libxl_device_nic *nic, libxl__ao_device *aodev) { - GC_INIT(ctx); + STATE_AO_GC(aodev->ao); flexarray_t *front; flexarray_t *back; - libxl__device device; + libxl__device *device; char *dompath, **l; unsigned int nb, rc; @@ -2542,7 +2543,8 @@ int libxl_device_nic_add(libxl_ctx *ctx, } } - rc = libxl__device_from_nic(gc, domid, nic, &device); + GCNEW(device); + rc = libxl__device_from_nic(gc, domid, nic, device); if ( rc != 0 ) goto out_free; flexarray_append(back, "frontend-id"); @@ -2583,6 +2585,9 @@ int libxl_device_nic_add(libxl_ctx *ctx, flexarray_append(back, libxl__strdup(gc, nic->bridge)); flexarray_append(back, "handle"); flexarray_append(back, libxl__sprintf(gc, "%d", nic->devid)); + flexarray_append(back, "type"); + flexarray_append(back, libxl__strdup(gc, + libxl_nic_type_to_string(nic->nictype))); flexarray_append(front, "backend-id"); flexarray_append(front, libxl__sprintf(gc, "%d", nic->backend_domid)); @@ -2593,18 +2598,22 @@ int libxl_device_nic_add(libxl_ctx *ctx, flexarray_append(front, "mac"); flexarray_append(front, libxl__sprintf(gc, LIBXL_MAC_FMT, LIBXL_MAC_BYTES(nic->mac))); - libxl__device_generic_add(gc, XBT_NULL, &device, + libxl__device_generic_add(gc, XBT_NULL, device, libxl__xs_kvs_of_flexarray(gc, back, back->count), libxl__xs_kvs_of_flexarray(gc, front, front->count)); - /* FIXME: wait for plug */ + aodev->dev = device; + aodev->action = DEVICE_CONNECT; + libxl__wait_device_connection(egc, aodev); + rc = 0; out_free: flexarray_free(back); flexarray_free(front); out: - GC_FREE; - return rc; + aodev->rc = rc; + if (rc) aodev->callback(egc, aodev); + return; } static void libxl__device_nic_from_xs_be(libxl__gc *gc, @@ -3096,6 +3105,7 @@ DEFINE_DEVICE_REMOVE(vfb, destroy, 1) /* Macro for defining device addition functions in a compact way */ /* The following functions are defined: * libxl_device_disk_add + * libxl_device_nic_add */ #define DEFINE_DEVICE_ADD(type) \ @@ -3119,6 +3129,9 @@ DEFINE_DEVICE_REMOVE(vfb, destroy, 1) /* disk */ DEFINE_DEVICE_ADD(disk) +/* nic */ +DEFINE_DEVICE_ADD(nic) + #undef DEFINE_DEVICE_ADD /******************************************************************************/ diff -r fe34db0860d3 -r 69a0fa5473d3 tools/libxl/libxl.h --- a/tools/libxl/libxl.h Thu Jul 26 16:47:30 2012 +0100 +++ b/tools/libxl/libxl.h Thu Jul 26 16:47:31 2012 +0100 @@ -697,7 +697,8 @@ int libxl_cdrom_insert(libxl_ctx *ctx, u const libxl_asyncop_how *ao_how); /* Network Interfaces */ -int libxl_device_nic_add(libxl_ctx *ctx, uint32_t domid, libxl_device_nic *nic); +int libxl_device_nic_add(libxl_ctx *ctx, uint32_t domid, libxl_device_nic *nic, + const libxl_asyncop_how *ao_how); int libxl_device_nic_remove(libxl_ctx *ctx, uint32_t domid, libxl_device_nic *nic, const libxl_asyncop_how *ao_how); diff -r fe34db0860d3 -r 69a0fa5473d3 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Thu Jul 26 16:47:30 2012 +0100 +++ b/tools/libxl/libxl_create.c Thu Jul 26 16:47:31 2012 +0100 @@ -564,6 +564,9 @@ static void domcreate_bootloader_done(li static void domcreate_launch_dm(libxl__egc *egc, libxl__ao_devices *aodevs, int ret); +static void domcreate_attach_pci(libxl__egc *egc, libxl__ao_devices *aodevs, + int ret); + static void domcreate_console_available(libxl__egc *egc, libxl__domain_create_state *dcs); @@ -898,13 +901,11 @@ static void domcreate_launch_dm(libxl__e goto error_out; } for (i = 0; i < d_config->num_nics; i++) { - ret = libxl_device_nic_add(ctx, domid, &d_config->nics[i]); - if (ret) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, - "cannot add nic %d to domain: %d", i, ret); - ret = ERROR_FAIL; - goto error_out; - } + /* We have to init the nic here, because we still haven't + * called libxl_device_nic_add at this point, but qemu needs + * the nic information to be complete. + */ + libxl__device_nic_setdefault(gc, &d_config->nics[i]); } switch (d_config->c_info.type) { case LIBXL_DOMAIN_TYPE_HVM: @@ -977,7 +978,6 @@ static void domcreate_devmodel_started(l { libxl__domain_create_state *dcs = CONTAINER_OF(dmss, *dcs, dmss.dm); STATE_AO_GC(dmss->spawn.ao); - int i; libxl_ctx *ctx = CTX; int domid = dcs->guest_domid; @@ -997,6 +997,41 @@ static void domcreate_devmodel_started(l } } + /* Plug nic interfaces */ + if (d_config->num_nics > 0) { + /* Attach nics */ + dcs->aodevs.size = d_config->num_nics; + dcs->aodevs.callback = domcreate_attach_pci; + libxl__prepare_ao_devices(ao, &dcs->aodevs); + libxl__add_nics(egc, ao, domid, 0, d_config, &dcs->aodevs); + return; + } + + domcreate_attach_pci(egc, &dcs->aodevs, 0); + return; + +error_out: + assert(ret); + domcreate_complete(egc, dcs, ret); +} + +static void domcreate_attach_pci(libxl__egc *egc, libxl__ao_devices *aodevs, + int ret) +{ + libxl__domain_create_state *dcs = CONTAINER_OF(aodevs, *dcs, aodevs); + STATE_AO_GC(dcs->ao); + int i; + libxl_ctx *ctx = CTX; + int domid = dcs->guest_domid; + + /* convenience aliases */ + libxl_domain_config *const d_config = dcs->guest_config; + + if (ret) { + LOG(ERROR, "unable to add nic devices"); + goto error_out; + } + for (i = 0; i < d_config->num_pcidevs; i++) libxl__device_pci_add(gc, domid, &d_config->pcidevs[i], 1); diff -r fe34db0860d3 -r 69a0fa5473d3 tools/libxl/libxl_device.c --- a/tools/libxl/libxl_device.c Thu Jul 26 16:47:30 2012 +0100 +++ b/tools/libxl/libxl_device.c Thu Jul 26 16:47:31 2012 +0100 @@ -455,6 +455,7 @@ void libxl__ao_devices_callback(libxl__e * * The following functions are defined: * libxl__add_disks + * libxl__add_nics */ #define DEFINE_DEVICES_ADD(type) \ @@ -473,6 +474,7 @@ void libxl__ao_devices_callback(libxl__e } DEFINE_DEVICES_ADD(disk) +DEFINE_DEVICES_ADD(nic) #undef DEFINE_DEVICES_ADD diff -r fe34db0860d3 -r 69a0fa5473d3 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Thu Jul 26 16:47:30 2012 +0100 +++ b/tools/libxl/libxl_dm.c Thu Jul 26 16:47:31 2012 +0100 @@ -716,6 +716,10 @@ static void spawn_stubdom_pvqemu_cb(libx static void spawn_stub_launch_dm(libxl__egc *egc, libxl__ao_devices *aodevs, int ret); +static void stubdom_pvqemu_cb(libxl__egc *egc, + libxl__ao_devices *aodevs, + int rc); + static void spaw_stubdom_pvqemu_destroy_cb(libxl__egc *egc, libxl__destroy_domid_state *dis, int rc); @@ -887,9 +891,11 @@ static void spawn_stub_launch_dm(libxl__ } for (i = 0; i < dm_config->num_nics; i++) { - ret = libxl_device_nic_add(ctx, dm_domid, &dm_config->nics[i]); - if (ret) - goto out; + /* We have to init the nic here, because we still haven't + * called libxl_device_nic_add at this point, but qemu needs + * the nic information to be complete. + */ + libxl__device_nic_setdefault(gc, &dm_config->nics[i]); } ret = libxl_device_vfb_add(ctx, dm_domid, &dm_config->vfbs[0]); if (ret) @@ -966,9 +972,35 @@ static void spawn_stubdom_pvqemu_cb(libx CONTAINER_OF(stubdom_dmss, *sdss, pvqemu); STATE_AO_GC(sdss->dm.spawn.ao); uint32_t dm_domid = sdss->pvqemu.guest_domid; + libxl_domain_config *d_config = stubdom_dmss->guest_config; if (rc) goto out; + if (d_config->num_nics > 0) { + sdss->aodevs.size = d_config->num_nics; + 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); + return; + } + +out: + stubdom_pvqemu_cb(egc, &sdss->aodevs, rc); +} + +static void stubdom_pvqemu_cb(libxl__egc *egc, + libxl__ao_devices *aodevs, + int rc) +{ + libxl__stub_dm_spawn_state *sdss = CONTAINER_OF(aodevs, *sdss, aodevs); + STATE_AO_GC(sdss->dm.spawn.ao); + uint32_t dm_domid = sdss->pvqemu.guest_domid; + + if (rc) { + LOGE(ERROR, "error connecting nics devices"); + goto out; + } + rc = libxl_domain_unpause(CTX, dm_domid); if (rc) goto out; diff -r fe34db0860d3 -r 69a0fa5473d3 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Thu Jul 26 16:47:30 2012 +0100 +++ b/tools/libxl/libxl_internal.h Thu Jul 26 16:47:31 2012 +0100 @@ -1933,6 +1933,11 @@ _hidden void libxl__device_disk_add(libx libxl_device_disk *disk, libxl__ao_device *aodev); +/* AO operation to connect a nic device */ +_hidden void libxl__device_nic_add(libxl__egc *egc, uint32_t domid, + libxl_device_nic *nic, + libxl__ao_device *aodev); + /* Waits for the passed device to reach state XenbusStateInitWait. * This is not really useful by itself, but is important when executing * hotplug scripts, since we need to be sure the device is in the correct @@ -2328,6 +2333,10 @@ _hidden void libxl__add_disks(libxl__egc int start, 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__ao_devices *aodevs); + /*----- device model creation -----*/ /* First layer; wraps libxl__spawn_spawn. */ diff -r fe34db0860d3 -r 69a0fa5473d3 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Thu Jul 26 16:47:30 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Thu Jul 26 16:47:31 2012 +0100 @@ -5249,7 +5249,7 @@ int main_networkattach(int argc, char ** return 0; } - if (libxl_device_nic_add(ctx, domid, &nic)) { + if (libxl_device_nic_add(ctx, domid, &nic, 0)) { fprintf(stderr, "libxl_device_nic_add failed.\n"); return 1; } diff -r fe34db0860d3 -r 69a0fa5473d3 tools/ocaml/libs/xl/xenlight_stubs.c --- a/tools/ocaml/libs/xl/xenlight_stubs.c Thu Jul 26 16:47:30 2012 +0100 +++ b/tools/ocaml/libs/xl/xenlight_stubs.c Thu Jul 26 16:47:31 2012 +0100 @@ -281,7 +281,7 @@ value stub_xl_device_nic_add(value info, device_nic_val(&gc, &lg, &c_info, info); INIT_CTX(); - ret = libxl_device_nic_add(ctx, Int_val(domid), &c_info); + ret = libxl_device_nic_add(ctx, Int_val(domid), &c_info, 0); if (ret != 0) failwith_xl("nic_add", &lg); FREE_CTX(); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jul 28 03:00:31 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Jul 2012 03:00: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 1SuxGY-0001te-Kr; Sat, 28 Jul 2012 03:00:30 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGW-0001nN-G2 for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:28 +0000 Received: from [85.158.143.99:59245] by server-3.bemta-4.messagelabs.com id 7E/1E-01511-CC553105; Sat, 28 Jul 2012 03:00:28 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-216.messagelabs.com!1343444426!19363325!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 26569 invoked from network); 28 Jul 2012 03:00:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 28 Jul 2012 03:00:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGT-0003QW-R0 for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuxGT-0002mD-PK for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:25 +0000 Message-Id: Date: Sat, 28 Jul 2012 03:00:25 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: convert libxl_device_vfb_add to an async operation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Roger Pau Monne # Date 1343317657 -3600 # Node ID c29feacecfc4b0564b364adf0fd9c8bf19e250d8 # Parent 21ffb640c61ccd53784c8d4c3fbf2a453db4bb60 libxl: convert libxl_device_vfb_add to an async operation Split libxl_device_vfb_add into libxl__device_vfb_add (to be used inside already running ao's), and make libxl_device_vfb_add a stub to call libxl__device_vfb_add. Signed-off-by: Roger Pau Monne Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r 21ffb640c61c -r c29feacecfc4 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Thu Jul 26 16:47:36 2012 +0100 +++ b/tools/libxl/libxl.c Thu Jul 26 16:47:37 2012 +0100 @@ -3019,9 +3019,25 @@ static int libxl__device_from_vfb(libxl_ return 0; } -int libxl_device_vfb_add(libxl_ctx *ctx, uint32_t domid, libxl_device_vfb *vfb) +int libxl_device_vfb_add(libxl_ctx *ctx, uint32_t domid, libxl_device_vfb *vfb, + const libxl_asyncop_how *ao_how) { - GC_INIT(ctx); + AO_CREATE(ctx, domid, ao_how); + int rc; + + rc = libxl__device_vfb_add(gc, domid, vfb); + if (rc) { + LOG(ERROR, "unable to add vfb device"); + goto out; + } + +out: + libxl__ao_complete(egc, ao, rc); + return AO_INPROGRESS; +} + +int libxl__device_vfb_add(libxl__gc *gc, uint32_t domid, libxl_device_vfb *vfb) +{ flexarray_t *front; flexarray_t *back; libxl__device device; @@ -3079,7 +3095,6 @@ out_free: flexarray_free(front); flexarray_free(back); out: - GC_FREE; return rc; } diff -r 21ffb640c61c -r c29feacecfc4 tools/libxl/libxl.h --- a/tools/libxl/libxl.h Thu Jul 26 16:47:36 2012 +0100 +++ b/tools/libxl/libxl.h Thu Jul 26 16:47:37 2012 +0100 @@ -721,7 +721,8 @@ int libxl_device_vkb_destroy(libxl_ctx * const libxl_asyncop_how *ao_how); /* Framebuffer */ -int libxl_device_vfb_add(libxl_ctx *ctx, uint32_t domid, libxl_device_vfb *vfb); +int libxl_device_vfb_add(libxl_ctx *ctx, uint32_t domid, libxl_device_vfb *vfb, + const libxl_asyncop_how *ao_how); int libxl_device_vfb_remove(libxl_ctx *ctx, uint32_t domid, libxl_device_vfb *vfb, const libxl_asyncop_how *ao_how); diff -r 21ffb640c61c -r c29feacecfc4 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Thu Jul 26 16:47:36 2012 +0100 +++ b/tools/libxl/libxl_create.c Thu Jul 26 16:47:37 2012 +0100 @@ -932,7 +932,6 @@ static void domcreate_launch_dm(libxl__e const uint32_t domid = dcs->guest_domid; libxl_domain_config *const d_config = dcs->guest_config; libxl__domain_build_state *const state = &dcs->build_state; - libxl_ctx *const ctx = CTX; if (ret) { LOG(ERROR, "unable to add disk devices"); @@ -976,7 +975,7 @@ static void domcreate_launch_dm(libxl__e libxl__device_console console; for (i = 0; i < d_config->num_vfbs; i++) { - libxl_device_vfb_add(ctx, domid, &d_config->vfbs[i]); + libxl__device_vfb_add(gc, domid, &d_config->vfbs[i]); libxl__device_vkb_add(gc, domid, &d_config->vkbs[i]); } diff -r 21ffb640c61c -r c29feacecfc4 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Thu Jul 26 16:47:36 2012 +0100 +++ b/tools/libxl/libxl_dm.c Thu Jul 26 16:47:37 2012 +0100 @@ -902,7 +902,7 @@ static void spawn_stub_launch_dm(libxl__ if (ret) goto out; } - ret = libxl_device_vfb_add(ctx, dm_domid, &dm_config->vfbs[0]); + ret = libxl__device_vfb_add(gc, dm_domid, &dm_config->vfbs[0]); if (ret) goto out; ret = libxl__device_vkb_add(gc, dm_domid, &dm_config->vkbs[0]); diff -r 21ffb640c61c -r c29feacecfc4 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Thu Jul 26 16:47:36 2012 +0100 +++ b/tools/libxl/libxl_internal.h Thu Jul 26 16:47:37 2012 +0100 @@ -1953,6 +1953,10 @@ _hidden void libxl__device_nic_add(libxl _hidden int libxl__device_vkb_add(libxl__gc *gc, uint32_t domid, libxl_device_vkb *vkb); +/* Internal function to connect a vfb device */ +_hidden int libxl__device_vfb_add(libxl__gc *gc, uint32_t domid, + libxl_device_vfb *vfb); + /* Waits for the passed device to reach state XenbusStateInitWait. * This is not really useful by itself, but is important when executing * hotplug scripts, since we need to be sure the device is in the correct diff -r 21ffb640c61c -r c29feacecfc4 tools/ocaml/libs/xl/xenlight_stubs.c --- a/tools/ocaml/libs/xl/xenlight_stubs.c Thu Jul 26 16:47:36 2012 +0100 +++ b/tools/ocaml/libs/xl/xenlight_stubs.c Thu Jul 26 16:47:37 2012 +0100 @@ -369,7 +369,7 @@ value stub_xl_device_vfb_add(value info, device_vfb_val(&gc, &lg, &c_info, info); INIT_CTX(); - ret = libxl_device_vfb_add(ctx, Int_val(domid), &c_info); + ret = libxl_device_vfb_add(ctx, Int_val(domid), &c_info, 0); if (ret != 0) failwith_xl("vfb_add", &lg); FREE_CTX(); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jul 28 03:00:31 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Jul 2012 03:00: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 1SuxGY-0001te-Kr; Sat, 28 Jul 2012 03:00:30 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGW-0001nN-G2 for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:28 +0000 Received: from [85.158.143.99:59245] by server-3.bemta-4.messagelabs.com id 7E/1E-01511-CC553105; Sat, 28 Jul 2012 03:00:28 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-216.messagelabs.com!1343444426!19363325!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 26569 invoked from network); 28 Jul 2012 03:00:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 28 Jul 2012 03:00:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGT-0003QW-R0 for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuxGT-0002mD-PK for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:25 +0000 Message-Id: Date: Sat, 28 Jul 2012 03:00:25 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: convert libxl_device_vfb_add to an async operation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Roger Pau Monne # Date 1343317657 -3600 # Node ID c29feacecfc4b0564b364adf0fd9c8bf19e250d8 # Parent 21ffb640c61ccd53784c8d4c3fbf2a453db4bb60 libxl: convert libxl_device_vfb_add to an async operation Split libxl_device_vfb_add into libxl__device_vfb_add (to be used inside already running ao's), and make libxl_device_vfb_add a stub to call libxl__device_vfb_add. Signed-off-by: Roger Pau Monne Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r 21ffb640c61c -r c29feacecfc4 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Thu Jul 26 16:47:36 2012 +0100 +++ b/tools/libxl/libxl.c Thu Jul 26 16:47:37 2012 +0100 @@ -3019,9 +3019,25 @@ static int libxl__device_from_vfb(libxl_ return 0; } -int libxl_device_vfb_add(libxl_ctx *ctx, uint32_t domid, libxl_device_vfb *vfb) +int libxl_device_vfb_add(libxl_ctx *ctx, uint32_t domid, libxl_device_vfb *vfb, + const libxl_asyncop_how *ao_how) { - GC_INIT(ctx); + AO_CREATE(ctx, domid, ao_how); + int rc; + + rc = libxl__device_vfb_add(gc, domid, vfb); + if (rc) { + LOG(ERROR, "unable to add vfb device"); + goto out; + } + +out: + libxl__ao_complete(egc, ao, rc); + return AO_INPROGRESS; +} + +int libxl__device_vfb_add(libxl__gc *gc, uint32_t domid, libxl_device_vfb *vfb) +{ flexarray_t *front; flexarray_t *back; libxl__device device; @@ -3079,7 +3095,6 @@ out_free: flexarray_free(front); flexarray_free(back); out: - GC_FREE; return rc; } diff -r 21ffb640c61c -r c29feacecfc4 tools/libxl/libxl.h --- a/tools/libxl/libxl.h Thu Jul 26 16:47:36 2012 +0100 +++ b/tools/libxl/libxl.h Thu Jul 26 16:47:37 2012 +0100 @@ -721,7 +721,8 @@ int libxl_device_vkb_destroy(libxl_ctx * const libxl_asyncop_how *ao_how); /* Framebuffer */ -int libxl_device_vfb_add(libxl_ctx *ctx, uint32_t domid, libxl_device_vfb *vfb); +int libxl_device_vfb_add(libxl_ctx *ctx, uint32_t domid, libxl_device_vfb *vfb, + const libxl_asyncop_how *ao_how); int libxl_device_vfb_remove(libxl_ctx *ctx, uint32_t domid, libxl_device_vfb *vfb, const libxl_asyncop_how *ao_how); diff -r 21ffb640c61c -r c29feacecfc4 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Thu Jul 26 16:47:36 2012 +0100 +++ b/tools/libxl/libxl_create.c Thu Jul 26 16:47:37 2012 +0100 @@ -932,7 +932,6 @@ static void domcreate_launch_dm(libxl__e const uint32_t domid = dcs->guest_domid; libxl_domain_config *const d_config = dcs->guest_config; libxl__domain_build_state *const state = &dcs->build_state; - libxl_ctx *const ctx = CTX; if (ret) { LOG(ERROR, "unable to add disk devices"); @@ -976,7 +975,7 @@ static void domcreate_launch_dm(libxl__e libxl__device_console console; for (i = 0; i < d_config->num_vfbs; i++) { - libxl_device_vfb_add(ctx, domid, &d_config->vfbs[i]); + libxl__device_vfb_add(gc, domid, &d_config->vfbs[i]); libxl__device_vkb_add(gc, domid, &d_config->vkbs[i]); } diff -r 21ffb640c61c -r c29feacecfc4 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Thu Jul 26 16:47:36 2012 +0100 +++ b/tools/libxl/libxl_dm.c Thu Jul 26 16:47:37 2012 +0100 @@ -902,7 +902,7 @@ static void spawn_stub_launch_dm(libxl__ if (ret) goto out; } - ret = libxl_device_vfb_add(ctx, dm_domid, &dm_config->vfbs[0]); + ret = libxl__device_vfb_add(gc, dm_domid, &dm_config->vfbs[0]); if (ret) goto out; ret = libxl__device_vkb_add(gc, dm_domid, &dm_config->vkbs[0]); diff -r 21ffb640c61c -r c29feacecfc4 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Thu Jul 26 16:47:36 2012 +0100 +++ b/tools/libxl/libxl_internal.h Thu Jul 26 16:47:37 2012 +0100 @@ -1953,6 +1953,10 @@ _hidden void libxl__device_nic_add(libxl _hidden int libxl__device_vkb_add(libxl__gc *gc, uint32_t domid, libxl_device_vkb *vkb); +/* Internal function to connect a vfb device */ +_hidden int libxl__device_vfb_add(libxl__gc *gc, uint32_t domid, + libxl_device_vfb *vfb); + /* Waits for the passed device to reach state XenbusStateInitWait. * This is not really useful by itself, but is important when executing * hotplug scripts, since we need to be sure the device is in the correct diff -r 21ffb640c61c -r c29feacecfc4 tools/ocaml/libs/xl/xenlight_stubs.c --- a/tools/ocaml/libs/xl/xenlight_stubs.c Thu Jul 26 16:47:36 2012 +0100 +++ b/tools/ocaml/libs/xl/xenlight_stubs.c Thu Jul 26 16:47:37 2012 +0100 @@ -369,7 +369,7 @@ value stub_xl_device_vfb_add(value info, device_vfb_val(&gc, &lg, &c_info, info); INIT_CTX(); - ret = libxl_device_vfb_add(ctx, Int_val(domid), &c_info); + ret = libxl_device_vfb_add(ctx, Int_val(domid), &c_info, 0); if (ret != 0) failwith_xl("vfb_add", &lg); FREE_CTX(); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jul 28 03:00:32 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Jul 2012 03:00:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGZ-0001um-VL; Sat, 28 Jul 2012 03:00:31 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGX-0001oT-Qf for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:29 +0000 Received: from [85.158.138.51:11876] by server-2.bemta-3.messagelabs.com id 04/C2-00359-DC553105; Sat, 28 Jul 2012 03:00:29 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-174.messagelabs.com!1343444427!25194107!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 23026 invoked from network); 28 Jul 2012 03:00:28 -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; 28 Jul 2012 03:00:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGV-0003Qf-Bk for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuxGV-0002mz-AP for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:27 +0000 Message-Id: Date: Sat, 28 Jul 2012 03:00:26 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] x86/mm/p2m: use NX bit for p2m entries X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Christoph Egger # Date 1343325764 -3600 # Node ID 131148d57fa2a4c6dfe96c73e527ef9e028b6e90 # Parent b63d4890d15e74b4c8ca45607563245076b3e770 x86/mm/p2m: use NX bit for p2m entries In addition to c/s 25614:7d8a2e8412f2 also use the NX bit for non-ram types. Signed-off-by: Christoph Egger Acked-by: Tim Deegan Committed-by: Tim Deegan --- diff -r b63d4890d15e -r 131148d57fa2 xen/arch/x86/mm/p2m-pt.c --- a/xen/arch/x86/mm/p2m-pt.c Thu Jul 26 17:22:39 2012 +0100 +++ b/xen/arch/x86/mm/p2m-pt.c Thu Jul 26 19:02:44 2012 +0100 @@ -88,7 +88,7 @@ static unsigned long p2m_type_to_flags(p case p2m_ram_paged: case p2m_ram_paging_in: default: - return flags; + return flags | _PAGE_NX_BIT; case p2m_grant_map_ro: return flags | P2M_BASE_FLAGS | _PAGE_NX_BIT; case p2m_ram_ro: _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jul 28 03:00:32 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Jul 2012 03:00:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGZ-0001um-VL; Sat, 28 Jul 2012 03:00:31 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGX-0001oT-Qf for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:29 +0000 Received: from [85.158.138.51:11876] by server-2.bemta-3.messagelabs.com id 04/C2-00359-DC553105; Sat, 28 Jul 2012 03:00:29 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-174.messagelabs.com!1343444427!25194107!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 23026 invoked from network); 28 Jul 2012 03:00:28 -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; 28 Jul 2012 03:00:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGV-0003Qf-Bk for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuxGV-0002mz-AP for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:27 +0000 Message-Id: Date: Sat, 28 Jul 2012 03:00:26 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] x86/mm/p2m: use NX bit for p2m entries X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Christoph Egger # Date 1343325764 -3600 # Node ID 131148d57fa2a4c6dfe96c73e527ef9e028b6e90 # Parent b63d4890d15e74b4c8ca45607563245076b3e770 x86/mm/p2m: use NX bit for p2m entries In addition to c/s 25614:7d8a2e8412f2 also use the NX bit for non-ram types. Signed-off-by: Christoph Egger Acked-by: Tim Deegan Committed-by: Tim Deegan --- diff -r b63d4890d15e -r 131148d57fa2 xen/arch/x86/mm/p2m-pt.c --- a/xen/arch/x86/mm/p2m-pt.c Thu Jul 26 17:22:39 2012 +0100 +++ b/xen/arch/x86/mm/p2m-pt.c Thu Jul 26 19:02:44 2012 +0100 @@ -88,7 +88,7 @@ static unsigned long p2m_type_to_flags(p case p2m_ram_paged: case p2m_ram_paging_in: default: - return flags; + return flags | _PAGE_NX_BIT; case p2m_grant_map_ro: return flags | P2M_BASE_FLAGS | _PAGE_NX_BIT; case p2m_ram_ro: _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jul 28 03:00:32 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Jul 2012 03:00:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGZ-0001uD-Ne; Sat, 28 Jul 2012 03:00:31 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGX-0001oM-KR for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:29 +0000 Received: from [85.158.143.99:37995] by server-1.bemta-4.messagelabs.com id 3D/2E-24392-DC553105; Sat, 28 Jul 2012 03:00:29 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-216.messagelabs.com!1343444427!28232078!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 2631 invoked from network); 28 Jul 2012 03:00:28 -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; 28 Jul 2012 03:00:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGU-0003Qc-RY for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuxGU-0002mi-QE for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:26 +0000 Message-Id: Date: Sat, 28 Jul 2012 03:00:26 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: fix reentrancy hazard in fd event processing X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343319759 -3600 # Node ID b63d4890d15e74b4c8ca45607563245076b3e770 # Parent ffcb24876b4f2e3c24be7db2a20318df81b0fc6c libxl: fix reentrancy hazard in fd event processing In afterpoll_internal, the callback functions may register and deregister events arbitrarily. This means that we need to consider the reentrancy-safety of the event machinery state variables. Most of the code is safe but the fd handling is not. Fix this by arranging to restart the fd scan loop every time we call one of these callback functions. For this loop to terminate, we modify afterpoll_check_fd so that it returns only once for each of afterpoll's efds. Another possible solution would be simply to return from afterpoll_internal after calling efd->func. That would be a small and more obviously correct change but would prevent the process from handling more than one fd event with a single call to poll. This is apropos of a report from Roger Pau Monne to me (pers.comm.) of this crash on NetBSD: Program terminated with signal 11, Segmentation fault. #0 0x00007f7ff743131b in afterpoll_check_fd (poller=, fds=0x7f7ff7b241c0, nfds=7, fd=-1, events=1) at libxl_event.c:856 856 if (fds[slot].fd != fd) Signed-off-by: Ian Jackson Reported-by: Roger Pau Monne Tested-by: Roger Pau Monne Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r ffcb24876b4f -r b63d4890d15e tools/libxl/libxl_event.c --- a/tools/libxl/libxl_event.c Thu Jul 26 16:51:51 2012 +0100 +++ b/tools/libxl/libxl_event.c Thu Jul 26 17:22:39 2012 +0100 @@ -839,18 +839,26 @@ int libxl_osevent_beforepoll(libxl_ctx * static int afterpoll_check_fd(libxl__poller *poller, const struct pollfd *fds, int nfds, int fd, int events) - /* returns mask of events which were requested and occurred */ + /* Returns mask of events which were requested and occurred. Will + * return nonzero only once for each (poller,fd,events) + * combination, until the next beforepoll. If events from + * different combinations overlap, between one such combination + * and all distinct combinations will produce nonzero returns. */ { if (fd >= poller->fd_rindices_allocd) /* added after we went into poll, have to try again */ return 0; + events |= POLLERR | POLLHUP; + int i, revents = 0; for (i=0; i<3; i++) { - int slot = poller->fd_rindices[fd][i]; + int *slotp = &poller->fd_rindices[fd][i]; + int slot = *slotp; if (slot >= nfds) - /* stale slot entry; again, added afterwards */ + /* stale slot entry (again, added afterwards), */ + /* or slot for which we have already returned nonzero */ continue; if (fds[slot].fd != fd) @@ -858,12 +866,17 @@ static int afterpoll_check_fd(libxl__pol continue; assert(!(fds[slot].revents & POLLNVAL)); - revents |= fds[slot].revents; + + /* we mask in case requested events have changed */ + int slot_revents = fds[slot].revents & events; + if (!slot_revents) + /* this slot is for a different set of events */ + continue; + + revents |= slot_revents; + *slotp = INT_MAX; /* so that next time we'll see slot >= nfds */ } - /* we mask in case requested events have changed */ - revents &= (events | POLLERR | POLLHUP); - return revents; } @@ -876,16 +889,63 @@ static void afterpoll_internal(libxl__eg EGC_GC; libxl__ev_fd *efd; - LIBXL_LIST_FOREACH(efd, &CTX->efds, entry) { - if (!efd->events) - continue; + /* + * Warning! Reentrancy hazards! + * + * Many parts of this function eventually call arbitrary callback + * functions which may modify the event handling data structures. + * + * Of the data structures used here: + * + * egc, poller, now + * are allocated by our caller and relate to the + * current thread and its call stack down into the + * event machinery; it is not freed until we return. + * So it is safe. + * + * fds is either what application passed into + * libxl_osevent_afterpoll (which, although this + * isn't explicitly stated, clearly must remain + * valid until libxl_osevent_afterpoll returns) or + * it's poller->fd_polls which is modified only by + * our (non-recursive) caller eventloop_iteration. + * + * CTX comes from our caller, and applications are + * forbidden from destroying it while we are running. + * So the ctx pointer itself is safe to use; now + * for its contents: + * + * CTX->etimes is used in a simple reentrancy-safe manner. + * + * CTX->efds is more complicated; see below. + */ - int revents = afterpoll_check_fd(poller,fds,nfds, efd->fd,efd->events); - if (revents) { - DBG("ev_fd=%p occurs fd=%d events=%x revents=%x", - efd, efd->fd, efd->events, revents); - efd->func(egc, efd, efd->fd, efd->events, revents); + for (;;) { + /* We restart our scan of fd events whenever we call a + * callback function. This is necessary because such + * a callback might make arbitrary changes to CTX->efds. + * We invalidate the fd_rindices[] entries which were used + * so that we don't call the same function again. */ + int revents; + + LIBXL_LIST_FOREACH(efd, &CTX->efds, entry) { + + if (!efd->events) + continue; + + revents = afterpoll_check_fd(poller,fds,nfds, + efd->fd,efd->events); + if (revents) + goto found_fd_event; } + /* no ordinary fd events, then */ + break; + + found_fd_event: + DBG("ev_fd=%p occurs fd=%d events=%x revents=%x", + efd, efd->fd, efd->events, revents); + + efd->func(egc, efd, efd->fd, efd->events, revents); } if (afterpoll_check_fd(poller,fds,nfds, poller->wakeup_pipe[0],POLLIN)) { diff -r ffcb24876b4f -r b63d4890d15e tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Thu Jul 26 16:51:51 2012 +0100 +++ b/tools/libxl/libxl_internal.h Thu Jul 26 17:22:39 2012 +0100 @@ -276,7 +276,7 @@ struct libxl__poller { int fd_polls_allocd; int fd_rindices_allocd; - int (*fd_rindices)[3]; /* see libxl_osevent_beforepoll */ + int (*fd_rindices)[3]; /* see libxl_event.c:beforepoll_internal */ int wakeup_pipe[2]; /* 0 means no fd allocated */ }; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jul 28 03:00:32 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Jul 2012 03:00:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGZ-0001uD-Ne; Sat, 28 Jul 2012 03:00:31 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGX-0001oM-KR for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:29 +0000 Received: from [85.158.143.99:37995] by server-1.bemta-4.messagelabs.com id 3D/2E-24392-DC553105; Sat, 28 Jul 2012 03:00:29 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-216.messagelabs.com!1343444427!28232078!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 2631 invoked from network); 28 Jul 2012 03:00:28 -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; 28 Jul 2012 03:00:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGU-0003Qc-RY for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuxGU-0002mi-QE for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:26 +0000 Message-Id: Date: Sat, 28 Jul 2012 03:00:26 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: fix reentrancy hazard in fd event processing X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343319759 -3600 # Node ID b63d4890d15e74b4c8ca45607563245076b3e770 # Parent ffcb24876b4f2e3c24be7db2a20318df81b0fc6c libxl: fix reentrancy hazard in fd event processing In afterpoll_internal, the callback functions may register and deregister events arbitrarily. This means that we need to consider the reentrancy-safety of the event machinery state variables. Most of the code is safe but the fd handling is not. Fix this by arranging to restart the fd scan loop every time we call one of these callback functions. For this loop to terminate, we modify afterpoll_check_fd so that it returns only once for each of afterpoll's efds. Another possible solution would be simply to return from afterpoll_internal after calling efd->func. That would be a small and more obviously correct change but would prevent the process from handling more than one fd event with a single call to poll. This is apropos of a report from Roger Pau Monne to me (pers.comm.) of this crash on NetBSD: Program terminated with signal 11, Segmentation fault. #0 0x00007f7ff743131b in afterpoll_check_fd (poller=, fds=0x7f7ff7b241c0, nfds=7, fd=-1, events=1) at libxl_event.c:856 856 if (fds[slot].fd != fd) Signed-off-by: Ian Jackson Reported-by: Roger Pau Monne Tested-by: Roger Pau Monne Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r ffcb24876b4f -r b63d4890d15e tools/libxl/libxl_event.c --- a/tools/libxl/libxl_event.c Thu Jul 26 16:51:51 2012 +0100 +++ b/tools/libxl/libxl_event.c Thu Jul 26 17:22:39 2012 +0100 @@ -839,18 +839,26 @@ int libxl_osevent_beforepoll(libxl_ctx * static int afterpoll_check_fd(libxl__poller *poller, const struct pollfd *fds, int nfds, int fd, int events) - /* returns mask of events which were requested and occurred */ + /* Returns mask of events which were requested and occurred. Will + * return nonzero only once for each (poller,fd,events) + * combination, until the next beforepoll. If events from + * different combinations overlap, between one such combination + * and all distinct combinations will produce nonzero returns. */ { if (fd >= poller->fd_rindices_allocd) /* added after we went into poll, have to try again */ return 0; + events |= POLLERR | POLLHUP; + int i, revents = 0; for (i=0; i<3; i++) { - int slot = poller->fd_rindices[fd][i]; + int *slotp = &poller->fd_rindices[fd][i]; + int slot = *slotp; if (slot >= nfds) - /* stale slot entry; again, added afterwards */ + /* stale slot entry (again, added afterwards), */ + /* or slot for which we have already returned nonzero */ continue; if (fds[slot].fd != fd) @@ -858,12 +866,17 @@ static int afterpoll_check_fd(libxl__pol continue; assert(!(fds[slot].revents & POLLNVAL)); - revents |= fds[slot].revents; + + /* we mask in case requested events have changed */ + int slot_revents = fds[slot].revents & events; + if (!slot_revents) + /* this slot is for a different set of events */ + continue; + + revents |= slot_revents; + *slotp = INT_MAX; /* so that next time we'll see slot >= nfds */ } - /* we mask in case requested events have changed */ - revents &= (events | POLLERR | POLLHUP); - return revents; } @@ -876,16 +889,63 @@ static void afterpoll_internal(libxl__eg EGC_GC; libxl__ev_fd *efd; - LIBXL_LIST_FOREACH(efd, &CTX->efds, entry) { - if (!efd->events) - continue; + /* + * Warning! Reentrancy hazards! + * + * Many parts of this function eventually call arbitrary callback + * functions which may modify the event handling data structures. + * + * Of the data structures used here: + * + * egc, poller, now + * are allocated by our caller and relate to the + * current thread and its call stack down into the + * event machinery; it is not freed until we return. + * So it is safe. + * + * fds is either what application passed into + * libxl_osevent_afterpoll (which, although this + * isn't explicitly stated, clearly must remain + * valid until libxl_osevent_afterpoll returns) or + * it's poller->fd_polls which is modified only by + * our (non-recursive) caller eventloop_iteration. + * + * CTX comes from our caller, and applications are + * forbidden from destroying it while we are running. + * So the ctx pointer itself is safe to use; now + * for its contents: + * + * CTX->etimes is used in a simple reentrancy-safe manner. + * + * CTX->efds is more complicated; see below. + */ - int revents = afterpoll_check_fd(poller,fds,nfds, efd->fd,efd->events); - if (revents) { - DBG("ev_fd=%p occurs fd=%d events=%x revents=%x", - efd, efd->fd, efd->events, revents); - efd->func(egc, efd, efd->fd, efd->events, revents); + for (;;) { + /* We restart our scan of fd events whenever we call a + * callback function. This is necessary because such + * a callback might make arbitrary changes to CTX->efds. + * We invalidate the fd_rindices[] entries which were used + * so that we don't call the same function again. */ + int revents; + + LIBXL_LIST_FOREACH(efd, &CTX->efds, entry) { + + if (!efd->events) + continue; + + revents = afterpoll_check_fd(poller,fds,nfds, + efd->fd,efd->events); + if (revents) + goto found_fd_event; } + /* no ordinary fd events, then */ + break; + + found_fd_event: + DBG("ev_fd=%p occurs fd=%d events=%x revents=%x", + efd, efd->fd, efd->events, revents); + + efd->func(egc, efd, efd->fd, efd->events, revents); } if (afterpoll_check_fd(poller,fds,nfds, poller->wakeup_pipe[0],POLLIN)) { diff -r ffcb24876b4f -r b63d4890d15e tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Thu Jul 26 16:51:51 2012 +0100 +++ b/tools/libxl/libxl_internal.h Thu Jul 26 17:22:39 2012 +0100 @@ -276,7 +276,7 @@ struct libxl__poller { int fd_polls_allocd; int fd_rindices_allocd; - int (*fd_rindices)[3]; /* see libxl_osevent_beforepoll */ + int (*fd_rindices)[3]; /* see libxl_event.c:beforepoll_internal */ int wakeup_pipe[2]; /* 0 means no fd allocated */ }; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jul 28 03:00:33 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Jul 2012 03:00:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGZ-0001uY-RD; Sat, 28 Jul 2012 03:00:31 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGX-0001ry-Lo for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:29 +0000 Received: from [85.158.138.51:11853] by server-8.bemta-3.messagelabs.com id 94/7C-30925-CC553105; Sat, 28 Jul 2012 03:00:28 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-174.messagelabs.com!1343444426!8974926!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 15253 invoked from network); 28 Jul 2012 03:00:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 28 Jul 2012 03:00:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGU-0003QZ-Al for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuxGU-0002mT-9N for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:26 +0000 Message-Id: Date: Sat, 28 Jul 2012 03:00:25 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] x86/hvm: don't leave emulator in inconsistent state X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343317911 -3600 # Node ID ffcb24876b4f2e3c24be7db2a20318df81b0fc6c # Parent c29feacecfc4b0564b364adf0fd9c8bf19e250d8 x86/hvm: don't leave emulator in inconsistent state The fact that handle_mmio(), and thus the instruction emulator, is being run through twice for emulations that require involvement of the device model, allows for the second run to see a different guest state than the first one. Since only the MMIO-specific emulation routines update the vCPU's io_state, if they get invoked on the second pass, internal state (and particularly this variable) can be left in a state making successful emulation of a subsequent MMIO operation impossible. Consequently, whenever the emulator invocation returns without requesting a retry of the guest instruction, reset io_state. Signed-off-by: Jan Beulich Acked-by: Keir Fraser Committed-by: Ian Jackson --- diff -r c29feacecfc4 -r ffcb24876b4f xen/arch/x86/hvm/io.c --- a/xen/arch/x86/hvm/io.c Thu Jul 26 16:47:37 2012 +0100 +++ b/xen/arch/x86/hvm/io.c Thu Jul 26 16:51:51 2012 +0100 @@ -179,6 +179,8 @@ int handle_mmio(void) rc = hvm_emulate_one(&ctxt); + if ( rc != X86EMUL_RETRY ) + vio->io_state = HVMIO_none; if ( vio->io_state == HVMIO_awaiting_completion ) vio->io_state = HVMIO_handle_mmio_awaiting_completion; else _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jul 28 03:00:33 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Jul 2012 03:00:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGZ-0001uY-RD; Sat, 28 Jul 2012 03:00:31 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGX-0001ry-Lo for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:29 +0000 Received: from [85.158.138.51:11853] by server-8.bemta-3.messagelabs.com id 94/7C-30925-CC553105; Sat, 28 Jul 2012 03:00:28 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-174.messagelabs.com!1343444426!8974926!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 15253 invoked from network); 28 Jul 2012 03:00:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 28 Jul 2012 03:00:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGU-0003QZ-Al for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuxGU-0002mT-9N for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:26 +0000 Message-Id: Date: Sat, 28 Jul 2012 03:00:25 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] x86/hvm: don't leave emulator in inconsistent state X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343317911 -3600 # Node ID ffcb24876b4f2e3c24be7db2a20318df81b0fc6c # Parent c29feacecfc4b0564b364adf0fd9c8bf19e250d8 x86/hvm: don't leave emulator in inconsistent state The fact that handle_mmio(), and thus the instruction emulator, is being run through twice for emulations that require involvement of the device model, allows for the second run to see a different guest state than the first one. Since only the MMIO-specific emulation routines update the vCPU's io_state, if they get invoked on the second pass, internal state (and particularly this variable) can be left in a state making successful emulation of a subsequent MMIO operation impossible. Consequently, whenever the emulator invocation returns without requesting a retry of the guest instruction, reset io_state. Signed-off-by: Jan Beulich Acked-by: Keir Fraser Committed-by: Ian Jackson --- diff -r c29feacecfc4 -r ffcb24876b4f xen/arch/x86/hvm/io.c --- a/xen/arch/x86/hvm/io.c Thu Jul 26 16:47:37 2012 +0100 +++ b/xen/arch/x86/hvm/io.c Thu Jul 26 16:51:51 2012 +0100 @@ -179,6 +179,8 @@ int handle_mmio(void) rc = hvm_emulate_one(&ctxt); + if ( rc != X86EMUL_RETRY ) + vio->io_state = HVMIO_none; if ( vio->io_state == HVMIO_awaiting_completion ) vio->io_state = HVMIO_handle_mmio_awaiting_completion; else _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jul 28 03:00:34 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Jul 2012 03:00:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGb-0001vn-6a; Sat, 28 Jul 2012 03:00:33 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGZ-0001oT-VW for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:32 +0000 Received: from [85.158.138.51:11949] by server-2.bemta-3.messagelabs.com id 97/C2-00359-FC553105; Sat, 28 Jul 2012 03:00:31 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-174.messagelabs.com!1343444429!29211234!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 28195 invoked from network); 28 Jul 2012 03:00:31 -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; 28 Jul 2012 03:00:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGX-0003Qr-Ol for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuxGW-0002nk-TS for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:29 +0000 Message-Id: Date: Sat, 28 Jul 2012 03:00:28 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] x86-64: drop updating of UREGS_rip when converting sysenter to #GP X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343376012 -7200 # Node ID fab4434f514532dba54ff4eec8b8ffa230f8330f # Parent 70cf2aa3083ca69d4568b11e3b1243cff670422b x86-64: drop updating of UREGS_rip when converting sysenter to #GP This was set to zero immediately before the #GP injection code, since SYSENTER doesn't really have a return address. Reported-by: Ian Campbell Furthermore, UREGS_cs and UREGS_rip don't need to be written a second time, as the PUSHes above already can/do take care of putting in place the intended values. Signed-off-by: Jan Beulich Acked-by: Ian Campbell Acked-by: Keir Fraser --- diff -r 70cf2aa3083c -r fab4434f5145 xen/arch/x86/x86_64/entry.S --- a/xen/arch/x86/x86_64/entry.S Fri Jul 27 09:59:25 2012 +0200 +++ b/xen/arch/x86/x86_64/entry.S Fri Jul 27 10:00:12 2012 +0200 @@ -275,15 +275,13 @@ ENTRY(sysenter_entry) pushfq .globl sysenter_eflags_saved sysenter_eflags_saved: - pushq $0 - pushq $0 + pushq $3 /* ring 3 null cs */ + pushq $0 /* null rip */ pushq $0 movl $TRAP_syscall,4(%rsp) SAVE_ALL GET_CURRENT(%rbx) cmpb $0,VCPU_sysenter_disables_events(%rbx) - movq $0,UREGS_rip(%rsp) /* null rip */ - movl $3,UREGS_cs(%rsp) /* ring 3 null cs */ movq VCPU_sysenter_addr(%rbx),%rax setne %cl leaq VCPU_trap_bounce(%rbx),%rdx @@ -292,7 +290,6 @@ sysenter_eflags_saved: UNLIKELY_START(z, sysenter_gpf) movq VCPU_trap_ctxt(%rbx),%rsi movl $TRAP_gp_fault,UREGS_entry_vector(%rsp) - subq $2,UREGS_rip(%rsp) movl %eax,TRAPBOUNCE_error_code(%rdx) movq TRAP_gp_fault * TRAPINFO_sizeof + TRAPINFO_eip(%rsi),%rax testb $4,TRAP_gp_fault * TRAPINFO_sizeof + TRAPINFO_flags(%rsi) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jul 28 03:00:34 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Jul 2012 03:00:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGb-0001vn-6a; Sat, 28 Jul 2012 03:00:33 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGZ-0001oT-VW for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:32 +0000 Received: from [85.158.138.51:11949] by server-2.bemta-3.messagelabs.com id 97/C2-00359-FC553105; Sat, 28 Jul 2012 03:00:31 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-174.messagelabs.com!1343444429!29211234!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 28195 invoked from network); 28 Jul 2012 03:00:31 -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; 28 Jul 2012 03:00:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGX-0003Qr-Ol for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuxGW-0002nk-TS for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:29 +0000 Message-Id: Date: Sat, 28 Jul 2012 03:00:28 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] x86-64: drop updating of UREGS_rip when converting sysenter to #GP X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343376012 -7200 # Node ID fab4434f514532dba54ff4eec8b8ffa230f8330f # Parent 70cf2aa3083ca69d4568b11e3b1243cff670422b x86-64: drop updating of UREGS_rip when converting sysenter to #GP This was set to zero immediately before the #GP injection code, since SYSENTER doesn't really have a return address. Reported-by: Ian Campbell Furthermore, UREGS_cs and UREGS_rip don't need to be written a second time, as the PUSHes above already can/do take care of putting in place the intended values. Signed-off-by: Jan Beulich Acked-by: Ian Campbell Acked-by: Keir Fraser --- diff -r 70cf2aa3083c -r fab4434f5145 xen/arch/x86/x86_64/entry.S --- a/xen/arch/x86/x86_64/entry.S Fri Jul 27 09:59:25 2012 +0200 +++ b/xen/arch/x86/x86_64/entry.S Fri Jul 27 10:00:12 2012 +0200 @@ -275,15 +275,13 @@ ENTRY(sysenter_entry) pushfq .globl sysenter_eflags_saved sysenter_eflags_saved: - pushq $0 - pushq $0 + pushq $3 /* ring 3 null cs */ + pushq $0 /* null rip */ pushq $0 movl $TRAP_syscall,4(%rsp) SAVE_ALL GET_CURRENT(%rbx) cmpb $0,VCPU_sysenter_disables_events(%rbx) - movq $0,UREGS_rip(%rsp) /* null rip */ - movl $3,UREGS_cs(%rsp) /* ring 3 null cs */ movq VCPU_sysenter_addr(%rbx),%rax setne %cl leaq VCPU_trap_bounce(%rbx),%rdx @@ -292,7 +290,6 @@ sysenter_eflags_saved: UNLIKELY_START(z, sysenter_gpf) movq VCPU_trap_ctxt(%rbx),%rsi movl $TRAP_gp_fault,UREGS_entry_vector(%rsp) - subq $2,UREGS_rip(%rsp) movl %eax,TRAPBOUNCE_error_code(%rdx) movq TRAP_gp_fault * TRAPINFO_sizeof + TRAPINFO_eip(%rsi),%rax testb $4,TRAP_gp_fault * TRAPINFO_sizeof + TRAPINFO_flags(%rsi) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jul 28 03:00:34 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Jul 2012 03:00:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGc-0001x4-Cr; Sat, 28 Jul 2012 03:00:34 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGb-0001pm-05 for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:33 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-27.messagelabs.com!1343444425!4348273!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 10660 invoked from network); 28 Jul 2012 03:00:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 28 Jul 2012 03:00:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGT-0003QT-Bq for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuxGT-0002lx-76 for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:25 +0000 Message-Id: Date: Sat, 28 Jul 2012 03:00:24 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: convert libxl_device_vkb_add to an async operation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Roger Pau Monne # Date 1343317656 -3600 # Node ID 21ffb640c61ccd53784c8d4c3fbf2a453db4bb60 # Parent 112ad131dca825a87903e60a3da7c022b9805cc6 libxl: convert libxl_device_vkb_add to an async operation Split libxl_device_vkb_add into libxl__device_vkb_add (to be used inside already running ao's), and make libxl_device_vkb_add a stub to call libxl__device_vkb_add. Signed-off-by: Roger Pau Monne Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r 112ad131dca8 -r 21ffb640c61c tools/libxl/libxl.c --- a/tools/libxl/libxl.c Thu Jul 26 16:47:35 2012 +0100 +++ b/tools/libxl/libxl.c Thu Jul 26 16:47:36 2012 +0100 @@ -2919,9 +2919,26 @@ static int libxl__device_from_vkb(libxl_ return 0; } -int libxl_device_vkb_add(libxl_ctx *ctx, uint32_t domid, libxl_device_vkb *vkb) +int libxl_device_vkb_add(libxl_ctx *ctx, uint32_t domid, libxl_device_vkb *vkb, + const libxl_asyncop_how *ao_how) { - GC_INIT(ctx); + AO_CREATE(ctx, domid, ao_how); + int rc; + + rc = libxl__device_vkb_add(gc, domid, vkb); + if (rc) { + LOG(ERROR, "unable to add vkb device"); + goto out; + } + +out: + libxl__ao_complete(egc, ao, rc); + return AO_INPROGRESS; +} + +int libxl__device_vkb_add(libxl__gc *gc, uint32_t domid, + libxl_device_vkb *vkb) +{ flexarray_t *front; flexarray_t *back; libxl__device device; @@ -2966,7 +2983,6 @@ out_free: flexarray_free(back); flexarray_free(front); out: - GC_FREE; return rc; } diff -r 112ad131dca8 -r 21ffb640c61c tools/libxl/libxl.h --- a/tools/libxl/libxl.h Thu Jul 26 16:47:35 2012 +0100 +++ b/tools/libxl/libxl.h Thu Jul 26 16:47:36 2012 +0100 @@ -711,7 +711,8 @@ int libxl_device_nic_getinfo(libxl_ctx * libxl_device_nic *nic, libxl_nicinfo *nicinfo); /* Keyboard */ -int libxl_device_vkb_add(libxl_ctx *ctx, uint32_t domid, libxl_device_vkb *vkb); +int libxl_device_vkb_add(libxl_ctx *ctx, uint32_t domid, libxl_device_vkb *vkb, + const libxl_asyncop_how *ao_how); int libxl_device_vkb_remove(libxl_ctx *ctx, uint32_t domid, libxl_device_vkb *vkb, const libxl_asyncop_how *ao_how); diff -r 112ad131dca8 -r 21ffb640c61c tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Thu Jul 26 16:47:35 2012 +0100 +++ b/tools/libxl/libxl_create.c Thu Jul 26 16:47:36 2012 +0100 @@ -960,7 +960,7 @@ static void domcreate_launch_dm(libxl__e libxl__device_console_dispose(&console); libxl_device_vkb_init(&vkb); - libxl_device_vkb_add(ctx, domid, &vkb); + libxl__device_vkb_add(gc, domid, &vkb); libxl_device_vkb_dispose(&vkb); dcs->dmss.dm.guest_domid = domid; @@ -977,7 +977,7 @@ static void domcreate_launch_dm(libxl__e for (i = 0; i < d_config->num_vfbs; i++) { libxl_device_vfb_add(ctx, domid, &d_config->vfbs[i]); - libxl_device_vkb_add(ctx, domid, &d_config->vkbs[i]); + libxl__device_vkb_add(gc, domid, &d_config->vkbs[i]); } ret = init_console_info(&console, 0); diff -r 112ad131dca8 -r 21ffb640c61c tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Thu Jul 26 16:47:35 2012 +0100 +++ b/tools/libxl/libxl_dm.c Thu Jul 26 16:47:36 2012 +0100 @@ -905,7 +905,7 @@ static void spawn_stub_launch_dm(libxl__ ret = libxl_device_vfb_add(ctx, dm_domid, &dm_config->vfbs[0]); if (ret) goto out; - ret = libxl_device_vkb_add(ctx, dm_domid, &dm_config->vkbs[0]); + ret = libxl__device_vkb_add(gc, dm_domid, &dm_config->vkbs[0]); if (ret) goto out; diff -r 112ad131dca8 -r 21ffb640c61c tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Thu Jul 26 16:47:35 2012 +0100 +++ b/tools/libxl/libxl_internal.h Thu Jul 26 16:47:36 2012 +0100 @@ -1949,6 +1949,10 @@ _hidden void libxl__device_nic_add(libxl libxl_device_nic *nic, libxl__ao_device *aodev); +/* Internal function to connect a vkb device */ +_hidden int libxl__device_vkb_add(libxl__gc *gc, uint32_t domid, + libxl_device_vkb *vkb); + /* Waits for the passed device to reach state XenbusStateInitWait. * This is not really useful by itself, but is important when executing * hotplug scripts, since we need to be sure the device is in the correct diff -r 112ad131dca8 -r 21ffb640c61c tools/ocaml/libs/xl/xenlight_stubs.c --- a/tools/ocaml/libs/xl/xenlight_stubs.c Thu Jul 26 16:47:35 2012 +0100 +++ b/tools/ocaml/libs/xl/xenlight_stubs.c Thu Jul 26 16:47:36 2012 +0100 @@ -315,7 +315,7 @@ value stub_xl_device_vkb_add(value info, device_vkb_val(&gc, &lg, &c_info, info); INIT_CTX(); - ret = libxl_device_vkb_add(ctx, Int_val(domid), &c_info); + ret = libxl_device_vkb_add(ctx, Int_val(domid), &c_info, 0); if (ret != 0) failwith_xl("vkb_add", &lg); FREE_CTX(); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jul 28 03:00:34 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Jul 2012 03:00:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGc-0001x4-Cr; Sat, 28 Jul 2012 03:00:34 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGb-0001pm-05 for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:33 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-27.messagelabs.com!1343444425!4348273!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 10660 invoked from network); 28 Jul 2012 03:00:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 28 Jul 2012 03:00:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGT-0003QT-Bq for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuxGT-0002lx-76 for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:25 +0000 Message-Id: Date: Sat, 28 Jul 2012 03:00:24 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: convert libxl_device_vkb_add to an async operation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Roger Pau Monne # Date 1343317656 -3600 # Node ID 21ffb640c61ccd53784c8d4c3fbf2a453db4bb60 # Parent 112ad131dca825a87903e60a3da7c022b9805cc6 libxl: convert libxl_device_vkb_add to an async operation Split libxl_device_vkb_add into libxl__device_vkb_add (to be used inside already running ao's), and make libxl_device_vkb_add a stub to call libxl__device_vkb_add. Signed-off-by: Roger Pau Monne Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r 112ad131dca8 -r 21ffb640c61c tools/libxl/libxl.c --- a/tools/libxl/libxl.c Thu Jul 26 16:47:35 2012 +0100 +++ b/tools/libxl/libxl.c Thu Jul 26 16:47:36 2012 +0100 @@ -2919,9 +2919,26 @@ static int libxl__device_from_vkb(libxl_ return 0; } -int libxl_device_vkb_add(libxl_ctx *ctx, uint32_t domid, libxl_device_vkb *vkb) +int libxl_device_vkb_add(libxl_ctx *ctx, uint32_t domid, libxl_device_vkb *vkb, + const libxl_asyncop_how *ao_how) { - GC_INIT(ctx); + AO_CREATE(ctx, domid, ao_how); + int rc; + + rc = libxl__device_vkb_add(gc, domid, vkb); + if (rc) { + LOG(ERROR, "unable to add vkb device"); + goto out; + } + +out: + libxl__ao_complete(egc, ao, rc); + return AO_INPROGRESS; +} + +int libxl__device_vkb_add(libxl__gc *gc, uint32_t domid, + libxl_device_vkb *vkb) +{ flexarray_t *front; flexarray_t *back; libxl__device device; @@ -2966,7 +2983,6 @@ out_free: flexarray_free(back); flexarray_free(front); out: - GC_FREE; return rc; } diff -r 112ad131dca8 -r 21ffb640c61c tools/libxl/libxl.h --- a/tools/libxl/libxl.h Thu Jul 26 16:47:35 2012 +0100 +++ b/tools/libxl/libxl.h Thu Jul 26 16:47:36 2012 +0100 @@ -711,7 +711,8 @@ int libxl_device_nic_getinfo(libxl_ctx * libxl_device_nic *nic, libxl_nicinfo *nicinfo); /* Keyboard */ -int libxl_device_vkb_add(libxl_ctx *ctx, uint32_t domid, libxl_device_vkb *vkb); +int libxl_device_vkb_add(libxl_ctx *ctx, uint32_t domid, libxl_device_vkb *vkb, + const libxl_asyncop_how *ao_how); int libxl_device_vkb_remove(libxl_ctx *ctx, uint32_t domid, libxl_device_vkb *vkb, const libxl_asyncop_how *ao_how); diff -r 112ad131dca8 -r 21ffb640c61c tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Thu Jul 26 16:47:35 2012 +0100 +++ b/tools/libxl/libxl_create.c Thu Jul 26 16:47:36 2012 +0100 @@ -960,7 +960,7 @@ static void domcreate_launch_dm(libxl__e libxl__device_console_dispose(&console); libxl_device_vkb_init(&vkb); - libxl_device_vkb_add(ctx, domid, &vkb); + libxl__device_vkb_add(gc, domid, &vkb); libxl_device_vkb_dispose(&vkb); dcs->dmss.dm.guest_domid = domid; @@ -977,7 +977,7 @@ static void domcreate_launch_dm(libxl__e for (i = 0; i < d_config->num_vfbs; i++) { libxl_device_vfb_add(ctx, domid, &d_config->vfbs[i]); - libxl_device_vkb_add(ctx, domid, &d_config->vkbs[i]); + libxl__device_vkb_add(gc, domid, &d_config->vkbs[i]); } ret = init_console_info(&console, 0); diff -r 112ad131dca8 -r 21ffb640c61c tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Thu Jul 26 16:47:35 2012 +0100 +++ b/tools/libxl/libxl_dm.c Thu Jul 26 16:47:36 2012 +0100 @@ -905,7 +905,7 @@ static void spawn_stub_launch_dm(libxl__ ret = libxl_device_vfb_add(ctx, dm_domid, &dm_config->vfbs[0]); if (ret) goto out; - ret = libxl_device_vkb_add(ctx, dm_domid, &dm_config->vkbs[0]); + ret = libxl__device_vkb_add(gc, dm_domid, &dm_config->vkbs[0]); if (ret) goto out; diff -r 112ad131dca8 -r 21ffb640c61c tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Thu Jul 26 16:47:35 2012 +0100 +++ b/tools/libxl/libxl_internal.h Thu Jul 26 16:47:36 2012 +0100 @@ -1949,6 +1949,10 @@ _hidden void libxl__device_nic_add(libxl libxl_device_nic *nic, libxl__ao_device *aodev); +/* Internal function to connect a vkb device */ +_hidden int libxl__device_vkb_add(libxl__gc *gc, uint32_t domid, + libxl_device_vkb *vkb); + /* Waits for the passed device to reach state XenbusStateInitWait. * This is not really useful by itself, but is important when executing * hotplug scripts, since we need to be sure the device is in the correct diff -r 112ad131dca8 -r 21ffb640c61c tools/ocaml/libs/xl/xenlight_stubs.c --- a/tools/ocaml/libs/xl/xenlight_stubs.c Thu Jul 26 16:47:35 2012 +0100 +++ b/tools/ocaml/libs/xl/xenlight_stubs.c Thu Jul 26 16:47:36 2012 +0100 @@ -315,7 +315,7 @@ value stub_xl_device_vkb_add(value info, device_vkb_val(&gc, &lg, &c_info, info); INIT_CTX(); - ret = libxl_device_vkb_add(ctx, Int_val(domid), &c_info); + ret = libxl_device_vkb_add(ctx, Int_val(domid), &c_info, 0); if (ret != 0) failwith_xl("vkb_add", &lg); FREE_CTX(); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jul 28 03:00:34 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Jul 2012 03:00:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGb-0001vc-2J; Sat, 28 Jul 2012 03:00:33 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGZ-0001tn-Er for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:31 +0000 Received: from [85.158.138.51:11917] by server-5.bemta-3.messagelabs.com id 19/7B-28237-EC553105; Sat, 28 Jul 2012 03:00:30 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-174.messagelabs.com!1343444428!27481638!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 24461 invoked from network); 28 Jul 2012 03:00:29 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 28 Jul 2012 03:00:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGW-0003Ql-Db for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuxGW-0002nV-Bj for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:28 +0000 Message-Id: Date: Sat, 28 Jul 2012 03:00:27 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] use C11's _Static_assert() for BUILD_BUG_ON etc when available X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343375965 -7200 # Node ID 70cf2aa3083ca69d4568b11e3b1243cff670422b # Parent 3298156d6cfa9bfe3db5a7c8f175a753c62550d4 use C11's _Static_assert() for BUILD_BUG_ON etc when available This produces a more meaningful compiler diagnostic in case it happens to trigger. As a minor piece of cleanup, at once also use BUILD_BUG_ON_ZERO() to actually define BUILD_BUG_ON() in the legacy case, slightly reducing redundancy. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- diff -r 3298156d6cfa -r 70cf2aa3083c xen/include/xen/lib.h --- a/xen/include/xen/lib.h Fri Jul 27 09:57:20 2012 +0200 +++ b/xen/include/xen/lib.h Fri Jul 27 09:59:25 2012 +0200 @@ -14,14 +14,20 @@ void __warn(char *file, int line); #define BUG_ON(p) do { if (unlikely(p)) BUG(); } while (0) #define WARN_ON(p) do { if (unlikely(p)) WARN(); } while (0) +#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) /* Force a compilation error if condition is true */ -#define BUILD_BUG_ON(condition) ((void)sizeof(struct { int:-!!(condition); })) +#define BUILD_BUG_ON(cond) ({ _Static_assert(!(cond), "!(" #cond ")"); }) /* Force a compilation error if condition is true, but also produce a result (of value 0 and type size_t), so the expression can be used e.g. in a structure initializer (or where-ever else comma expressions aren't permitted). */ -#define BUILD_BUG_ON_ZERO(e) (sizeof(struct { int:-!!(e); })) +#define BUILD_BUG_ON_ZERO(cond) \ + sizeof(struct { _Static_assert(!(cond), "!(" #cond ")"); }) +#else +#define BUILD_BUG_ON_ZERO(cond) sizeof(struct { int:-!!(cond); }) +#define BUILD_BUG_ON(cond) ((void)BUILD_BUG_ON_ZERO(cond)) +#endif #ifndef assert_failed #define assert_failed(p) \ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jul 28 03:00:34 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Jul 2012 03:00:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGb-0001vc-2J; Sat, 28 Jul 2012 03:00:33 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGZ-0001tn-Er for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:31 +0000 Received: from [85.158.138.51:11917] by server-5.bemta-3.messagelabs.com id 19/7B-28237-EC553105; Sat, 28 Jul 2012 03:00:30 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-174.messagelabs.com!1343444428!27481638!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 24461 invoked from network); 28 Jul 2012 03:00:29 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 28 Jul 2012 03:00:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGW-0003Ql-Db for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuxGW-0002nV-Bj for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:28 +0000 Message-Id: Date: Sat, 28 Jul 2012 03:00:27 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] use C11's _Static_assert() for BUILD_BUG_ON etc when available X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343375965 -7200 # Node ID 70cf2aa3083ca69d4568b11e3b1243cff670422b # Parent 3298156d6cfa9bfe3db5a7c8f175a753c62550d4 use C11's _Static_assert() for BUILD_BUG_ON etc when available This produces a more meaningful compiler diagnostic in case it happens to trigger. As a minor piece of cleanup, at once also use BUILD_BUG_ON_ZERO() to actually define BUILD_BUG_ON() in the legacy case, slightly reducing redundancy. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- diff -r 3298156d6cfa -r 70cf2aa3083c xen/include/xen/lib.h --- a/xen/include/xen/lib.h Fri Jul 27 09:57:20 2012 +0200 +++ b/xen/include/xen/lib.h Fri Jul 27 09:59:25 2012 +0200 @@ -14,14 +14,20 @@ void __warn(char *file, int line); #define BUG_ON(p) do { if (unlikely(p)) BUG(); } while (0) #define WARN_ON(p) do { if (unlikely(p)) WARN(); } while (0) +#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) /* Force a compilation error if condition is true */ -#define BUILD_BUG_ON(condition) ((void)sizeof(struct { int:-!!(condition); })) +#define BUILD_BUG_ON(cond) ({ _Static_assert(!(cond), "!(" #cond ")"); }) /* Force a compilation error if condition is true, but also produce a result (of value 0 and type size_t), so the expression can be used e.g. in a structure initializer (or where-ever else comma expressions aren't permitted). */ -#define BUILD_BUG_ON_ZERO(e) (sizeof(struct { int:-!!(e); })) +#define BUILD_BUG_ON_ZERO(cond) \ + sizeof(struct { _Static_assert(!(cond), "!(" #cond ")"); }) +#else +#define BUILD_BUG_ON_ZERO(cond) sizeof(struct { int:-!!(cond); }) +#define BUILD_BUG_ON(cond) ((void)BUILD_BUG_ON_ZERO(cond)) +#endif #ifndef assert_failed #define assert_failed(p) \ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jul 28 03:00:36 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Jul 2012 03:00: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 1SuxGe-0001ys-Fw; Sat, 28 Jul 2012 03:00:36 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGd-0001t6-3P for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:35 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-27.messagelabs.com!1343444428!10330871!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 23834 invoked from network); 28 Jul 2012 03:00:29 -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; 28 Jul 2012 03:00:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGV-0003Qi-ST for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuxGV-0002nF-R3 for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:27 +0000 Message-Id: Date: Sat, 28 Jul 2012 03:00:27 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] serial: don't waste space allocated for the tx buffer(s) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343375840 -7200 # Node ID 3298156d6cfa9bfe3db5a7c8f175a753c62550d4 # Parent 131148d57fa2a4c6dfe96c73e527ef9e028b6e90 serial: don't waste space allocated for the tx buffer(s) We're allocating minimally a full page, so no reason to not also use all that space. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- diff -r 131148d57fa2 -r 3298156d6cfa xen/drivers/char/serial.c --- a/xen/drivers/char/serial.c Thu Jul 26 19:02:44 2012 +0100 +++ b/xen/drivers/char/serial.c Fri Jul 27 09:57:20 2012 +0200 @@ -483,8 +483,8 @@ void __init serial_async_transmit(struct BUG_ON(!port->driver->tx_empty); if ( port->txbuf != NULL ) return; - if ( serial_txbufsz < 512 ) - serial_txbufsz = 512; + if ( serial_txbufsz < PAGE_SIZE ) + serial_txbufsz = PAGE_SIZE; while ( serial_txbufsz & (serial_txbufsz - 1) ) serial_txbufsz &= serial_txbufsz - 1; port->txbuf = alloc_xenheap_pages( _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jul 28 03:00:36 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Jul 2012 03:00: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 1SuxGe-0001ys-Fw; Sat, 28 Jul 2012 03:00:36 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGd-0001t6-3P for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:35 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-27.messagelabs.com!1343444428!10330871!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 23834 invoked from network); 28 Jul 2012 03:00:29 -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; 28 Jul 2012 03:00:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGV-0003Qi-ST for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuxGV-0002nF-R3 for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:27 +0000 Message-Id: Date: Sat, 28 Jul 2012 03:00:27 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] serial: don't waste space allocated for the tx buffer(s) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343375840 -7200 # Node ID 3298156d6cfa9bfe3db5a7c8f175a753c62550d4 # Parent 131148d57fa2a4c6dfe96c73e527ef9e028b6e90 serial: don't waste space allocated for the tx buffer(s) We're allocating minimally a full page, so no reason to not also use all that space. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- diff -r 131148d57fa2 -r 3298156d6cfa xen/drivers/char/serial.c --- a/xen/drivers/char/serial.c Thu Jul 26 19:02:44 2012 +0100 +++ b/xen/drivers/char/serial.c Fri Jul 27 09:57:20 2012 +0200 @@ -483,8 +483,8 @@ void __init serial_async_transmit(struct BUG_ON(!port->driver->tx_empty); if ( port->txbuf != NULL ) return; - if ( serial_txbufsz < 512 ) - serial_txbufsz = 512; + if ( serial_txbufsz < PAGE_SIZE ) + serial_txbufsz = PAGE_SIZE; while ( serial_txbufsz & (serial_txbufsz - 1) ) serial_txbufsz &= serial_txbufsz - 1; port->txbuf = alloc_xenheap_pages( _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jul 28 03:00:37 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Jul 2012 03:00:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGe-0001yz-IF; Sat, 28 Jul 2012 03:00:36 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGd-0001t5-2R for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:35 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-27.messagelabs.com!1343444424!4345418!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 3511 invoked from network); 28 Jul 2012 03:00:25 -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; 28 Jul 2012 03:00:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGS-0003QQ-PO for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuxGR-0002lg-33 for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:23 +0000 Message-Id: Date: Sat, 28 Jul 2012 03:00:22 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: call hotplug scripts for nic devices from libxl X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343317655 -3600 # Node ID 112ad131dca825a87903e60a3da7c022b9805cc6 # Parent 24dac62c0458bee85a8b7398c4c47094f503acb1 libxl: call hotplug scripts for nic devices from libxl Since most of the needed work is already done in previous patches, this patch only contains the necessary code to call hotplug scripts for nic devices, that should be called when the device is added or removed from a guest. Added another parameter to libxl__get_hotplug_script_info, that is used to know the number of times hotplug scripts have been called for that device. This is currently used by IOEMU nics on Linux. Signed-off-by: Roger Pau Monne Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r 24dac62c0458 -r 112ad131dca8 tools/hotplug/Linux/xen-backend.rules --- a/tools/hotplug/Linux/xen-backend.rules Thu Jul 26 16:47:34 2012 +0100 +++ b/tools/hotplug/Linux/xen-backend.rules Thu Jul 26 16:47:35 2012 +0100 @@ -2,8 +2,8 @@ SUBSYSTEM=="xen-backend", KERNEL=="tap*" SUBSYSTEM=="xen-backend", KERNEL=="vbd*", ENV{UDEV_CALL}="1", RUN+="/etc/xen/scripts/block $env{ACTION}" SUBSYSTEM=="xen-backend", KERNEL=="vtpm*", RUN+="/etc/xen/scripts/vtpm $env{ACTION}" SUBSYSTEM=="xen-backend", KERNEL=="vif2-*", RUN+="/etc/xen/scripts/vif2 $env{ACTION}" -SUBSYSTEM=="xen-backend", KERNEL=="vif-*", ACTION=="online", RUN+="/etc/xen/scripts/vif-setup online type_if=vif" -SUBSYSTEM=="xen-backend", KERNEL=="vif-*", ACTION=="offline", RUN+="/etc/xen/scripts/vif-setup offline type_if=vif" +SUBSYSTEM=="xen-backend", KERNEL=="vif-*", ENV{UDEV_CALL}="1", ACTION=="online", RUN+="/etc/xen/scripts/vif-setup online type_if=vif" +SUBSYSTEM=="xen-backend", KERNEL=="vif-*", ENV{UDEV_CALL}="1", ACTION=="offline", RUN+="/etc/xen/scripts/vif-setup offline type_if=vif" SUBSYSTEM=="xen-backend", KERNEL=="vscsi*", RUN+="/etc/xen/scripts/vscsi $env{ACTION}" SUBSYSTEM=="xen-backend", ACTION=="remove", ENV{UDEV_CALL}="1", RUN+="/etc/xen/scripts/xen-hotplug-cleanup" KERNEL=="evtchn", NAME="xen/%k" @@ -13,4 +13,4 @@ KERNEL=="blktap-control", NAME="xen/blkt KERNEL=="gntdev", NAME="xen/%k", MODE="0600" KERNEL=="pci_iomul", NAME="xen/%k", MODE="0600" KERNEL=="tapdev[a-z]*", NAME="xen/blktap-2/tapdev%m", MODE="0600" -SUBSYSTEM=="net", KERNEL=="vif*-emu", ACTION=="add", RUN+="/etc/xen/scripts/vif-setup $env{ACTION} type_if=tap" +SUBSYSTEM=="net", KERNEL=="vif*-emu", ACTION=="add", ENV{UDEV_CALL}="1", RUN+="/etc/xen/scripts/vif-setup $env{ACTION} type_if=tap" diff -r 24dac62c0458 -r 112ad131dca8 tools/libxl/libxl_device.c --- a/tools/libxl/libxl_device.c Thu Jul 26 16:47:34 2012 +0100 +++ b/tools/libxl/libxl_device.c Thu Jul 26 16:47:35 2012 +0100 @@ -102,6 +102,31 @@ out: return numdevs; } +int libxl__nic_type(libxl__gc *gc, libxl__device *dev, libxl_nic_type *nictype) +{ + char *snictype, *be_path; + int rc = 0; + + be_path = libxl__device_backend_path(gc, dev); + snictype = libxl__xs_read(gc, XBT_NULL, + GCSPRINTF("%s/%s", be_path, "type")); + if (!snictype) { + LOGE(ERROR, "unable to read nictype from %s", be_path); + rc = ERROR_FAIL; + goto out; + } + rc = libxl_nic_type_from_string(snictype, nictype); + if (rc) { + LOGE(ERROR, "unable to parse nictype from %s", be_path); + goto out; + } + + rc = 0; + +out: + return rc; +} + int libxl__device_generic_add(libxl__gc *gc, xs_transaction_t t, libxl__device *device, char **bents, char **fents) { @@ -638,6 +663,8 @@ static void device_hotplug_child_death_c static void device_hotplug_done(libxl__egc *egc, libxl__ao_device *aodev); +static void device_hotplug_clean(libxl__gc *gc, libxl__ao_device *aodev); + void libxl__wait_device_connection(libxl__egc *egc, libxl__ao_device *aodev) { STATE_AO_GC(aodev->ao); @@ -850,7 +877,8 @@ static void device_hotplug(libxl__egc *e /* Check if we have to execute hotplug scripts for this device * and return the necessary args/env vars for execution */ hotplug = libxl__get_hotplug_script_info(gc, aodev->dev, &args, &env, - aodev->action); + aodev->action, + aodev->num_exec); switch (hotplug) { case 0: /* no hotplug script to execute */ @@ -930,6 +958,8 @@ static void device_hotplug_child_death_c char *be_path = libxl__device_backend_path(gc, aodev->dev); char *hotplug_error; + device_hotplug_clean(gc, aodev); + if (status) { libxl_report_child_exitstatus(CTX, LIBXL__LOG_ERROR, aodev->what, pid, status); @@ -938,8 +968,25 @@ static void device_hotplug_child_death_c if (hotplug_error) LOG(ERROR, "script: %s", hotplug_error); aodev->rc = ERROR_FAIL; + if (aodev->action == DEVICE_CONNECT) + /* + * Only fail on device connection, on disconnection + * ignore error, and continue with the remove process + */ + goto error; } + /* Increase num_exec and call hotplug scripts again if necessary + * If no more executions are needed, device_hotplug will call + * device_hotplug_done breaking the loop. + */ + aodev->num_exec++; + device_hotplug(egc, aodev); + + return; + +error: + assert(aodev->rc); device_hotplug_done(egc, aodev); } @@ -951,9 +998,7 @@ static void device_hotplug_done(libxl__e xs_transaction_t t = 0; int rc; - /* Clean events and check reentrancy */ - libxl__ev_time_deregister(gc, &aodev->timeout); - assert(!libxl__ev_child_inuse(&aodev->child)); + device_hotplug_clean(gc, aodev); /* Clean xenstore if it's a disconnection */ if (aodev->action == DEVICE_DISCONNECT) { @@ -975,6 +1020,13 @@ out: return; } +static void device_hotplug_clean(libxl__gc *gc, libxl__ao_device *aodev) +{ + /* Clean events and check reentrancy */ + libxl__ev_time_deregister(gc, &aodev->timeout); + assert(!libxl__ev_child_inuse(&aodev->child)); +} + static void devices_remove_callback(libxl__egc *egc, libxl__ao_devices *aodevs, int rc) { diff -r 24dac62c0458 -r 112ad131dca8 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Thu Jul 26 16:47:34 2012 +0100 +++ b/tools/libxl/libxl_internal.h Thu Jul 26 16:47:35 2012 +0100 @@ -920,6 +920,8 @@ _hidden int libxl__parse_backend_path(li libxl__device *dev); _hidden int libxl__device_destroy(libxl__gc *gc, libxl__device *dev); _hidden int libxl__wait_for_backend(libxl__gc *gc, char *be_path, char *state); +_hidden int libxl__nic_type(libxl__gc *gc, libxl__device *dev, + libxl_nic_type *nictype); /* * For each aggregate type which can be used as an input we provide: @@ -1840,6 +1842,7 @@ struct libxl__ao_device { libxl__ao_devices *aodevs; /* device hotplug execution */ const char *what; + int num_exec; libxl__ev_child child; }; @@ -1979,10 +1982,19 @@ _hidden void libxl__initiate_device_remo * < 0: Error * 0: No need to execute hotplug script * 1: Execute hotplug script + * + * The last parameter, "num_exec" refeers to the number of times hotplug + * scripts have been called for this device. + * + * The main body of libxl will, for each device, keep calling + * libxl__get_hotplug_script_info, with incrementing values of + * num_exec, and executing the resulting script accordingly, + * until libxl__get_hotplug_script_info returns<=0. */ _hidden int libxl__get_hotplug_script_info(libxl__gc *gc, libxl__device *dev, char ***args, char ***env, - libxl__device_action action); + libxl__device_action action, + int num_exec); /*----- local disk attach: attach a disk locally to run the bootloader -----*/ diff -r 24dac62c0458 -r 112ad131dca8 tools/libxl/libxl_linux.c --- a/tools/libxl/libxl_linux.c Thu Jul 26 16:47:34 2012 +0100 +++ b/tools/libxl/libxl_linux.c Thu Jul 26 16:47:35 2012 +0100 @@ -87,6 +87,7 @@ static char **get_hotplug_env(libxl__gc 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")); @@ -95,24 +96,106 @@ static char **get_hotplug_env(libxl__gc return NULL; } - const int arraysize = 9; + const int arraysize = 13; GCNEW_ARRAY(env, arraysize); env[nr++] = "script"; env[nr++] = script; env[nr++] = "XENBUS_TYPE"; - env[nr++] = libxl__strdup(gc, type); + env[nr++] = (char *) type; env[nr++] = "XENBUS_PATH"; env[nr++] = GCSPRINTF("backend/%s/%u/%d", type, dev->domid, dev->devid); env[nr++] = "XENBUS_BASE_PATH"; env[nr++] = "backend"; + if (dev->backend_kind == LIBXL__DEVICE_KIND_VIF) { + if (libxl__nic_type(gc, dev, &nictype)) { + LOG(ERROR, "unable to get nictype"); + return NULL; + } + switch (nictype) { + case LIBXL_NIC_TYPE_VIF_IOEMU: + env[nr++] = "INTERFACE"; + env[nr++] = (char *) libxl__device_nic_devname(gc, dev->domid, + dev->devid, + LIBXL_NIC_TYPE_VIF_IOEMU); + /* + * We need to fall through because for PV_IOEMU nic types we need + * to execute both the vif and the tap hotplug script, and we + * don't know which one we are executing in this call, so provide + * both env variables. + */ + case LIBXL_NIC_TYPE_VIF: + env[nr++] = "vif"; + env[nr++] = (char *) libxl__device_nic_devname(gc, dev->domid, + dev->devid, + LIBXL_NIC_TYPE_VIF); + break; + default: + return NULL; + } + } + env[nr++] = NULL; - assert(nr == arraysize); + assert(nr <= arraysize); return env; } /* Hotplug scripts caller functions */ +static int libxl__hotplug_nic(libxl__gc *gc, libxl__device *dev, + char ***args, char ***env, + libxl__device_action action, int num_exec) +{ + char *be_path = libxl__device_backend_path(gc, dev); + char *script; + int nr = 0, rc = 0; + libxl_nic_type nictype; + + script = libxl__xs_read(gc, XBT_NULL, GCSPRINTF("%s/%s", be_path, + "script")); + if (!script) { + LOGE(ERROR, "unable to read script from %s", be_path); + rc = ERROR_FAIL; + goto out; + } + + rc = libxl__nic_type(gc, dev, &nictype); + if (rc) { + LOG(ERROR, "error when fetching nic type"); + rc = ERROR_FAIL; + goto out; + } + if (nictype == LIBXL_NIC_TYPE_VIF && num_exec != 0) { + rc = 0; + goto out; + } + + *env = get_hotplug_env(gc, dev); + if (!env) { + rc = ERROR_FAIL; + goto out; + } + + const int arraysize = 4; + GCNEW_ARRAY(*args, arraysize); + (*args)[nr++] = script; + + if (nictype == LIBXL_NIC_TYPE_VIF_IOEMU && num_exec) { + (*args)[nr++] = action == DEVICE_CONNECT ? "add" : "remove"; + (*args)[nr++] = "type_if=tap"; + (*args)[nr++] = NULL; + } else { + (*args)[nr++] = action == DEVICE_CONNECT ? "online" : "offline"; + (*args)[nr++] = "type_if=vif"; + (*args)[nr++] = NULL; + } + assert(nr == arraysize); + rc = 1; + +out: + return rc; +} + static int libxl__hotplug_disk(libxl__gc *gc, libxl__device *dev, char ***args, char ***env, libxl__device_action action) @@ -150,7 +233,8 @@ error: int libxl__get_hotplug_script_info(libxl__gc *gc, libxl__device *dev, char ***args, char ***env, - libxl__device_action action) + libxl__device_action action, + int num_exec) { char *disable_udev = libxl__xs_read(gc, XBT_NULL, DISABLE_UDEV_PATH); int rc; @@ -163,8 +247,24 @@ int libxl__get_hotplug_script_info(libxl switch (dev->backend_kind) { case LIBXL__DEVICE_KIND_VBD: + if (num_exec != 0) { + rc = 0; + goto out; + } rc = libxl__hotplug_disk(gc, dev, args, env, action); break; + case LIBXL__DEVICE_KIND_VIF: + /* + * If domain has a stubdom we don't have to execute hotplug scripts + * for emulated interfaces + */ + if ((num_exec > 1) || + (libxl_get_stubdom_id(CTX, dev->domid) && num_exec)) { + rc = 0; + goto out; + } + rc = libxl__hotplug_nic(gc, dev, args, env, action, num_exec); + break; default: /* No need to execute any hotplug scripts */ rc = 0; diff -r 24dac62c0458 -r 112ad131dca8 tools/libxl/libxl_netbsd.c --- a/tools/libxl/libxl_netbsd.c Thu Jul 26 16:47:34 2012 +0100 +++ b/tools/libxl/libxl_netbsd.c Thu Jul 26 16:47:35 2012 +0100 @@ -34,7 +34,8 @@ char *libxl__devid_to_localdev(libxl__gc /* Hotplug scripts caller functions */ int libxl__get_hotplug_script_info(libxl__gc *gc, libxl__device *dev, char ***args, char ***env, - libxl__device_action action) + libxl__device_action action, + int num_exec) { return 0; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jul 28 03:00:37 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Jul 2012 03:00:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGe-0001yz-IF; Sat, 28 Jul 2012 03:00:36 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGd-0001t5-2R for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:35 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-27.messagelabs.com!1343444424!4345418!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 3511 invoked from network); 28 Jul 2012 03:00:25 -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; 28 Jul 2012 03:00:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGS-0003QQ-PO for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuxGR-0002lg-33 for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:23 +0000 Message-Id: Date: Sat, 28 Jul 2012 03:00:22 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: call hotplug scripts for nic devices from libxl X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343317655 -3600 # Node ID 112ad131dca825a87903e60a3da7c022b9805cc6 # Parent 24dac62c0458bee85a8b7398c4c47094f503acb1 libxl: call hotplug scripts for nic devices from libxl Since most of the needed work is already done in previous patches, this patch only contains the necessary code to call hotplug scripts for nic devices, that should be called when the device is added or removed from a guest. Added another parameter to libxl__get_hotplug_script_info, that is used to know the number of times hotplug scripts have been called for that device. This is currently used by IOEMU nics on Linux. Signed-off-by: Roger Pau Monne Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r 24dac62c0458 -r 112ad131dca8 tools/hotplug/Linux/xen-backend.rules --- a/tools/hotplug/Linux/xen-backend.rules Thu Jul 26 16:47:34 2012 +0100 +++ b/tools/hotplug/Linux/xen-backend.rules Thu Jul 26 16:47:35 2012 +0100 @@ -2,8 +2,8 @@ SUBSYSTEM=="xen-backend", KERNEL=="tap*" SUBSYSTEM=="xen-backend", KERNEL=="vbd*", ENV{UDEV_CALL}="1", RUN+="/etc/xen/scripts/block $env{ACTION}" SUBSYSTEM=="xen-backend", KERNEL=="vtpm*", RUN+="/etc/xen/scripts/vtpm $env{ACTION}" SUBSYSTEM=="xen-backend", KERNEL=="vif2-*", RUN+="/etc/xen/scripts/vif2 $env{ACTION}" -SUBSYSTEM=="xen-backend", KERNEL=="vif-*", ACTION=="online", RUN+="/etc/xen/scripts/vif-setup online type_if=vif" -SUBSYSTEM=="xen-backend", KERNEL=="vif-*", ACTION=="offline", RUN+="/etc/xen/scripts/vif-setup offline type_if=vif" +SUBSYSTEM=="xen-backend", KERNEL=="vif-*", ENV{UDEV_CALL}="1", ACTION=="online", RUN+="/etc/xen/scripts/vif-setup online type_if=vif" +SUBSYSTEM=="xen-backend", KERNEL=="vif-*", ENV{UDEV_CALL}="1", ACTION=="offline", RUN+="/etc/xen/scripts/vif-setup offline type_if=vif" SUBSYSTEM=="xen-backend", KERNEL=="vscsi*", RUN+="/etc/xen/scripts/vscsi $env{ACTION}" SUBSYSTEM=="xen-backend", ACTION=="remove", ENV{UDEV_CALL}="1", RUN+="/etc/xen/scripts/xen-hotplug-cleanup" KERNEL=="evtchn", NAME="xen/%k" @@ -13,4 +13,4 @@ KERNEL=="blktap-control", NAME="xen/blkt KERNEL=="gntdev", NAME="xen/%k", MODE="0600" KERNEL=="pci_iomul", NAME="xen/%k", MODE="0600" KERNEL=="tapdev[a-z]*", NAME="xen/blktap-2/tapdev%m", MODE="0600" -SUBSYSTEM=="net", KERNEL=="vif*-emu", ACTION=="add", RUN+="/etc/xen/scripts/vif-setup $env{ACTION} type_if=tap" +SUBSYSTEM=="net", KERNEL=="vif*-emu", ACTION=="add", ENV{UDEV_CALL}="1", RUN+="/etc/xen/scripts/vif-setup $env{ACTION} type_if=tap" diff -r 24dac62c0458 -r 112ad131dca8 tools/libxl/libxl_device.c --- a/tools/libxl/libxl_device.c Thu Jul 26 16:47:34 2012 +0100 +++ b/tools/libxl/libxl_device.c Thu Jul 26 16:47:35 2012 +0100 @@ -102,6 +102,31 @@ out: return numdevs; } +int libxl__nic_type(libxl__gc *gc, libxl__device *dev, libxl_nic_type *nictype) +{ + char *snictype, *be_path; + int rc = 0; + + be_path = libxl__device_backend_path(gc, dev); + snictype = libxl__xs_read(gc, XBT_NULL, + GCSPRINTF("%s/%s", be_path, "type")); + if (!snictype) { + LOGE(ERROR, "unable to read nictype from %s", be_path); + rc = ERROR_FAIL; + goto out; + } + rc = libxl_nic_type_from_string(snictype, nictype); + if (rc) { + LOGE(ERROR, "unable to parse nictype from %s", be_path); + goto out; + } + + rc = 0; + +out: + return rc; +} + int libxl__device_generic_add(libxl__gc *gc, xs_transaction_t t, libxl__device *device, char **bents, char **fents) { @@ -638,6 +663,8 @@ static void device_hotplug_child_death_c static void device_hotplug_done(libxl__egc *egc, libxl__ao_device *aodev); +static void device_hotplug_clean(libxl__gc *gc, libxl__ao_device *aodev); + void libxl__wait_device_connection(libxl__egc *egc, libxl__ao_device *aodev) { STATE_AO_GC(aodev->ao); @@ -850,7 +877,8 @@ static void device_hotplug(libxl__egc *e /* Check if we have to execute hotplug scripts for this device * and return the necessary args/env vars for execution */ hotplug = libxl__get_hotplug_script_info(gc, aodev->dev, &args, &env, - aodev->action); + aodev->action, + aodev->num_exec); switch (hotplug) { case 0: /* no hotplug script to execute */ @@ -930,6 +958,8 @@ static void device_hotplug_child_death_c char *be_path = libxl__device_backend_path(gc, aodev->dev); char *hotplug_error; + device_hotplug_clean(gc, aodev); + if (status) { libxl_report_child_exitstatus(CTX, LIBXL__LOG_ERROR, aodev->what, pid, status); @@ -938,8 +968,25 @@ static void device_hotplug_child_death_c if (hotplug_error) LOG(ERROR, "script: %s", hotplug_error); aodev->rc = ERROR_FAIL; + if (aodev->action == DEVICE_CONNECT) + /* + * Only fail on device connection, on disconnection + * ignore error, and continue with the remove process + */ + goto error; } + /* Increase num_exec and call hotplug scripts again if necessary + * If no more executions are needed, device_hotplug will call + * device_hotplug_done breaking the loop. + */ + aodev->num_exec++; + device_hotplug(egc, aodev); + + return; + +error: + assert(aodev->rc); device_hotplug_done(egc, aodev); } @@ -951,9 +998,7 @@ static void device_hotplug_done(libxl__e xs_transaction_t t = 0; int rc; - /* Clean events and check reentrancy */ - libxl__ev_time_deregister(gc, &aodev->timeout); - assert(!libxl__ev_child_inuse(&aodev->child)); + device_hotplug_clean(gc, aodev); /* Clean xenstore if it's a disconnection */ if (aodev->action == DEVICE_DISCONNECT) { @@ -975,6 +1020,13 @@ out: return; } +static void device_hotplug_clean(libxl__gc *gc, libxl__ao_device *aodev) +{ + /* Clean events and check reentrancy */ + libxl__ev_time_deregister(gc, &aodev->timeout); + assert(!libxl__ev_child_inuse(&aodev->child)); +} + static void devices_remove_callback(libxl__egc *egc, libxl__ao_devices *aodevs, int rc) { diff -r 24dac62c0458 -r 112ad131dca8 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Thu Jul 26 16:47:34 2012 +0100 +++ b/tools/libxl/libxl_internal.h Thu Jul 26 16:47:35 2012 +0100 @@ -920,6 +920,8 @@ _hidden int libxl__parse_backend_path(li libxl__device *dev); _hidden int libxl__device_destroy(libxl__gc *gc, libxl__device *dev); _hidden int libxl__wait_for_backend(libxl__gc *gc, char *be_path, char *state); +_hidden int libxl__nic_type(libxl__gc *gc, libxl__device *dev, + libxl_nic_type *nictype); /* * For each aggregate type which can be used as an input we provide: @@ -1840,6 +1842,7 @@ struct libxl__ao_device { libxl__ao_devices *aodevs; /* device hotplug execution */ const char *what; + int num_exec; libxl__ev_child child; }; @@ -1979,10 +1982,19 @@ _hidden void libxl__initiate_device_remo * < 0: Error * 0: No need to execute hotplug script * 1: Execute hotplug script + * + * The last parameter, "num_exec" refeers to the number of times hotplug + * scripts have been called for this device. + * + * The main body of libxl will, for each device, keep calling + * libxl__get_hotplug_script_info, with incrementing values of + * num_exec, and executing the resulting script accordingly, + * until libxl__get_hotplug_script_info returns<=0. */ _hidden int libxl__get_hotplug_script_info(libxl__gc *gc, libxl__device *dev, char ***args, char ***env, - libxl__device_action action); + libxl__device_action action, + int num_exec); /*----- local disk attach: attach a disk locally to run the bootloader -----*/ diff -r 24dac62c0458 -r 112ad131dca8 tools/libxl/libxl_linux.c --- a/tools/libxl/libxl_linux.c Thu Jul 26 16:47:34 2012 +0100 +++ b/tools/libxl/libxl_linux.c Thu Jul 26 16:47:35 2012 +0100 @@ -87,6 +87,7 @@ static char **get_hotplug_env(libxl__gc 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")); @@ -95,24 +96,106 @@ static char **get_hotplug_env(libxl__gc return NULL; } - const int arraysize = 9; + const int arraysize = 13; GCNEW_ARRAY(env, arraysize); env[nr++] = "script"; env[nr++] = script; env[nr++] = "XENBUS_TYPE"; - env[nr++] = libxl__strdup(gc, type); + env[nr++] = (char *) type; env[nr++] = "XENBUS_PATH"; env[nr++] = GCSPRINTF("backend/%s/%u/%d", type, dev->domid, dev->devid); env[nr++] = "XENBUS_BASE_PATH"; env[nr++] = "backend"; + if (dev->backend_kind == LIBXL__DEVICE_KIND_VIF) { + if (libxl__nic_type(gc, dev, &nictype)) { + LOG(ERROR, "unable to get nictype"); + return NULL; + } + switch (nictype) { + case LIBXL_NIC_TYPE_VIF_IOEMU: + env[nr++] = "INTERFACE"; + env[nr++] = (char *) libxl__device_nic_devname(gc, dev->domid, + dev->devid, + LIBXL_NIC_TYPE_VIF_IOEMU); + /* + * We need to fall through because for PV_IOEMU nic types we need + * to execute both the vif and the tap hotplug script, and we + * don't know which one we are executing in this call, so provide + * both env variables. + */ + case LIBXL_NIC_TYPE_VIF: + env[nr++] = "vif"; + env[nr++] = (char *) libxl__device_nic_devname(gc, dev->domid, + dev->devid, + LIBXL_NIC_TYPE_VIF); + break; + default: + return NULL; + } + } + env[nr++] = NULL; - assert(nr == arraysize); + assert(nr <= arraysize); return env; } /* Hotplug scripts caller functions */ +static int libxl__hotplug_nic(libxl__gc *gc, libxl__device *dev, + char ***args, char ***env, + libxl__device_action action, int num_exec) +{ + char *be_path = libxl__device_backend_path(gc, dev); + char *script; + int nr = 0, rc = 0; + libxl_nic_type nictype; + + script = libxl__xs_read(gc, XBT_NULL, GCSPRINTF("%s/%s", be_path, + "script")); + if (!script) { + LOGE(ERROR, "unable to read script from %s", be_path); + rc = ERROR_FAIL; + goto out; + } + + rc = libxl__nic_type(gc, dev, &nictype); + if (rc) { + LOG(ERROR, "error when fetching nic type"); + rc = ERROR_FAIL; + goto out; + } + if (nictype == LIBXL_NIC_TYPE_VIF && num_exec != 0) { + rc = 0; + goto out; + } + + *env = get_hotplug_env(gc, dev); + if (!env) { + rc = ERROR_FAIL; + goto out; + } + + const int arraysize = 4; + GCNEW_ARRAY(*args, arraysize); + (*args)[nr++] = script; + + if (nictype == LIBXL_NIC_TYPE_VIF_IOEMU && num_exec) { + (*args)[nr++] = action == DEVICE_CONNECT ? "add" : "remove"; + (*args)[nr++] = "type_if=tap"; + (*args)[nr++] = NULL; + } else { + (*args)[nr++] = action == DEVICE_CONNECT ? "online" : "offline"; + (*args)[nr++] = "type_if=vif"; + (*args)[nr++] = NULL; + } + assert(nr == arraysize); + rc = 1; + +out: + return rc; +} + static int libxl__hotplug_disk(libxl__gc *gc, libxl__device *dev, char ***args, char ***env, libxl__device_action action) @@ -150,7 +233,8 @@ error: int libxl__get_hotplug_script_info(libxl__gc *gc, libxl__device *dev, char ***args, char ***env, - libxl__device_action action) + libxl__device_action action, + int num_exec) { char *disable_udev = libxl__xs_read(gc, XBT_NULL, DISABLE_UDEV_PATH); int rc; @@ -163,8 +247,24 @@ int libxl__get_hotplug_script_info(libxl switch (dev->backend_kind) { case LIBXL__DEVICE_KIND_VBD: + if (num_exec != 0) { + rc = 0; + goto out; + } rc = libxl__hotplug_disk(gc, dev, args, env, action); break; + case LIBXL__DEVICE_KIND_VIF: + /* + * If domain has a stubdom we don't have to execute hotplug scripts + * for emulated interfaces + */ + if ((num_exec > 1) || + (libxl_get_stubdom_id(CTX, dev->domid) && num_exec)) { + rc = 0; + goto out; + } + rc = libxl__hotplug_nic(gc, dev, args, env, action, num_exec); + break; default: /* No need to execute any hotplug scripts */ rc = 0; diff -r 24dac62c0458 -r 112ad131dca8 tools/libxl/libxl_netbsd.c --- a/tools/libxl/libxl_netbsd.c Thu Jul 26 16:47:34 2012 +0100 +++ b/tools/libxl/libxl_netbsd.c Thu Jul 26 16:47:35 2012 +0100 @@ -34,7 +34,8 @@ char *libxl__devid_to_localdev(libxl__gc /* Hotplug scripts caller functions */ int libxl__get_hotplug_script_info(libxl__gc *gc, libxl__device *dev, char ***args, char ***env, - libxl__device_action action) + libxl__device_action action, + int num_exec) { return 0; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jul 28 03:00:40 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Jul 2012 03:00:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGh-00021t-LX; Sat, 28 Jul 2012 03:00:39 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGf-0001v4-Ve for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:38 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-27.messagelabs.com!1343444430!9641612!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 3354 invoked from network); 28 Jul 2012 03:00:31 -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; 28 Jul 2012 03:00:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGY-0003Qu-AI for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuxGY-0002o0-8q for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:30 +0000 Message-Id: Date: Sat, 28 Jul 2012 03:00:29 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] 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 1343384533 -7200 # Node ID e6266fc76d08b7297fdce7a6ff66cde58fe87ef8 # Parent fab4434f514532dba54ff4eec8b8ffa230f8330f 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 --- diff -r fab4434f5145 -r e6266fc76d08 xen/arch/x86/io_apic.c --- a/xen/arch/x86/io_apic.c Fri Jul 27 10:00:12 2012 +0200 +++ b/xen/arch/x86/io_apic.c Fri Jul 27 12:22:13 2012 +0200 @@ -2531,7 +2531,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 ( max_gsi_irqs == 0 ) max_gsi_irqs = nr_irqs ? nr_irqs / 8 : PAGE_SIZE; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jul 28 03:00:40 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Jul 2012 03:00:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGh-00021t-LX; Sat, 28 Jul 2012 03:00:39 +0000 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGf-0001v4-Ve for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:38 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-27.messagelabs.com!1343444430!9641612!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 3354 invoked from network); 28 Jul 2012 03:00:31 -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; 28 Jul 2012 03:00:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SuxGY-0003Qu-AI for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SuxGY-0002o0-8q for xen-changelog@lists.xensource.com; Sat, 28 Jul 2012 03:00:30 +0000 Message-Id: Date: Sat, 28 Jul 2012 03:00:29 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] 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 1343384533 -7200 # Node ID e6266fc76d08b7297fdce7a6ff66cde58fe87ef8 # Parent fab4434f514532dba54ff4eec8b8ffa230f8330f 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 --- diff -r fab4434f5145 -r e6266fc76d08 xen/arch/x86/io_apic.c --- a/xen/arch/x86/io_apic.c Fri Jul 27 10:00:12 2012 +0200 +++ b/xen/arch/x86/io_apic.c Fri Jul 27 12:22:13 2012 +0200 @@ -2531,7 +2531,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 ( max_gsi_irqs == 0 ) max_gsi_irqs = nr_irqs ? nr_irqs / 8 : PAGE_SIZE; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jul 31 11:44:17 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 31 Jul 2012 11:44:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwAs1-0007lC-LX; Tue, 31 Jul 2012 11:44:13 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwArz-0007kc-Mr for xen-changelog@lists.xensource.com; Tue, 31 Jul 2012 11:44:11 +0000 Received: from [85.158.143.99:30460] by server-3.bemta-4.messagelabs.com id 09/61-01511-A05C7105; Tue, 31 Jul 2012 11:44:10 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-216.messagelabs.com!1343735049!17889480!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 8783 invoked from network); 31 Jul 2012 11:44:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 31 Jul 2012 11:44:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwArw-0003Nz-Aa for xen-changelog@lists.xensource.com; Tue, 31 Jul 2012 11:44:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SwArw-0003Q5-6K for xen-changelog@lists.xensource.com; Tue, 31 Jul 2012 11:44:08 +0000 Message-Id: Date: Tue, 31 Jul 2012 11:44:07 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] Added tag 4.2.0-rc1 for changeset 8e620dc570ce X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343661327 -3600 # Node ID 72160635df2cba0347375fc929731afe43dc0aeb # Parent 8e620dc570ce42564c1630de5798e23909ee809c Added tag 4.2.0-rc1 for changeset 8e620dc570ce --- diff -r 8e620dc570ce -r 72160635df2c .hgtags --- a/.hgtags Mon Jul 30 16:15:18 2012 +0100 +++ b/.hgtags Mon Jul 30 16:15:27 2012 +0100 @@ -52,3 +52,4 @@ 8df0c7f9cda6cb271a1414114e26f72e1d93a69a d2d27d989ebce4325575f871415337cc54891dde 4.1.0-rc5 7b6791dbfecdb2eba6acd2c8bf0ced17d06746b2 4.1.0-rc6 6241fa0ad1a939d2eba11bdec929564276f56a9e 4.1.0-branched +8e620dc570ce42564c1630de5798e23909ee809c 4.2.0-rc1 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jul 31 11:44:17 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 31 Jul 2012 11:44:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwAs1-0007lC-LX; Tue, 31 Jul 2012 11:44:13 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwArz-0007kc-Mr for xen-changelog@lists.xensource.com; Tue, 31 Jul 2012 11:44:11 +0000 Received: from [85.158.143.99:30460] by server-3.bemta-4.messagelabs.com id 09/61-01511-A05C7105; Tue, 31 Jul 2012 11:44:10 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-216.messagelabs.com!1343735049!17889480!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 8783 invoked from network); 31 Jul 2012 11:44:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 31 Jul 2012 11:44:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwArw-0003Nz-Aa for xen-changelog@lists.xensource.com; Tue, 31 Jul 2012 11:44:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SwArw-0003Q5-6K for xen-changelog@lists.xensource.com; Tue, 31 Jul 2012 11:44:08 +0000 Message-Id: Date: Tue, 31 Jul 2012 11:44:07 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] Added tag 4.2.0-rc1 for changeset 8e620dc570ce X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343661327 -3600 # Node ID 72160635df2cba0347375fc929731afe43dc0aeb # Parent 8e620dc570ce42564c1630de5798e23909ee809c Added tag 4.2.0-rc1 for changeset 8e620dc570ce --- diff -r 8e620dc570ce -r 72160635df2c .hgtags --- a/.hgtags Mon Jul 30 16:15:18 2012 +0100 +++ b/.hgtags Mon Jul 30 16:15:27 2012 +0100 @@ -52,3 +52,4 @@ 8df0c7f9cda6cb271a1414114e26f72e1d93a69a d2d27d989ebce4325575f871415337cc54891dde 4.1.0-rc5 7b6791dbfecdb2eba6acd2c8bf0ced17d06746b2 4.1.0-rc6 6241fa0ad1a939d2eba11bdec929564276f56a9e 4.1.0-branched +8e620dc570ce42564c1630de5798e23909ee809c 4.2.0-rc1 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jul 31 11:44:17 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 31 Jul 2012 11:44:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwAs1-0007lN-QE; Tue, 31 Jul 2012 11: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 1SwAs0-0007kj-3A for xen-changelog@lists.xensource.com; Tue, 31 Jul 2012 11:44:12 +0000 Received: from [85.158.138.51:14773] by server-7.bemta-3.messagelabs.com id 87/B3-21158-B05C7105; Tue, 31 Jul 2012 11:44:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-174.messagelabs.com!1343735049!29584399!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 7921 invoked from network); 31 Jul 2012 11:44:10 -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; 31 Jul 2012 11:44:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwArx-0003O4-8Z for xen-changelog@lists.xensource.com; Tue, 31 Jul 2012 11:44:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SwArx-0003QZ-7H for xen-changelog@lists.xensource.com; Tue, 31 Jul 2012 11:44:09 +0000 Message-Id: Date: Tue, 31 Jul 2012 11:44:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] Update Xen version to 4.2.0-rc2-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 1343661369 -3600 # Node ID cf0e661cb321b1c898c9008dc17ba21db434c976 # Parent 72f98dc7caeb4616039e392a25dec6662fd91ff7 Update Xen version to 4.2.0-rc2-pre --- diff -r 72f98dc7caeb -r cf0e661cb321 xen/Makefile --- a/xen/Makefile Mon Jul 30 16:15:37 2012 +0100 +++ b/xen/Makefile Mon Jul 30 16:16:09 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 = 2 -export XEN_EXTRAVERSION ?= .0-rc1$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .0-rc2-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 Tue Jul 31 11:44:17 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 31 Jul 2012 11:44:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwAs1-0007lN-QE; Tue, 31 Jul 2012 11: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 1SwAs0-0007kj-3A for xen-changelog@lists.xensource.com; Tue, 31 Jul 2012 11:44:12 +0000 Received: from [85.158.138.51:14773] by server-7.bemta-3.messagelabs.com id 87/B3-21158-B05C7105; Tue, 31 Jul 2012 11:44:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-174.messagelabs.com!1343735049!29584399!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 7921 invoked from network); 31 Jul 2012 11:44:10 -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; 31 Jul 2012 11:44:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwArx-0003O4-8Z for xen-changelog@lists.xensource.com; Tue, 31 Jul 2012 11:44:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SwArx-0003QZ-7H for xen-changelog@lists.xensource.com; Tue, 31 Jul 2012 11:44:09 +0000 Message-Id: Date: Tue, 31 Jul 2012 11:44:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] Update Xen version to 4.2.0-rc2-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 1343661369 -3600 # Node ID cf0e661cb321b1c898c9008dc17ba21db434c976 # Parent 72f98dc7caeb4616039e392a25dec6662fd91ff7 Update Xen version to 4.2.0-rc2-pre --- diff -r 72f98dc7caeb -r cf0e661cb321 xen/Makefile --- a/xen/Makefile Mon Jul 30 16:15:37 2012 +0100 +++ b/xen/Makefile Mon Jul 30 16:16:09 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 = 2 -export XEN_EXTRAVERSION ?= .0-rc1$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .0-rc2-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 Tue Jul 31 11:44:17 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 31 Jul 2012 11:44:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwAs1-0007l5-Bq; Tue, 31 Jul 2012 11: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 1SwArz-0007kW-4k for xen-changelog@lists.xensource.com; Tue, 31 Jul 2012 11:44:11 +0000 Received: from [85.158.138.51:14672] by server-2.bemta-3.messagelabs.com id FF/C4-00359-A05C7105; Tue, 31 Jul 2012 11:44:10 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-174.messagelabs.com!1343735048!20164401!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 19043 invoked from network); 31 Jul 2012 11:44:09 -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; 31 Jul 2012 11:44:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwArw-0003Nw-3T for xen-changelog@lists.xensource.com; Tue, 31 Jul 2012 11:44:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SwArv-0003Pq-Ju for xen-changelog@lists.xensource.com; Tue, 31 Jul 2012 11:44:07 +0000 Message-Id: Date: Tue, 31 Jul 2012 11:44:07 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] Update Xen version to 4.2.0-rc1 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Keir Fraser # Date 1343661318 -3600 # Node ID 8e620dc570ce42564c1630de5798e23909ee809c # Parent e6266fc76d08b7297fdce7a6ff66cde58fe87ef8 Update Xen version to 4.2.0-rc1 --- diff -r e6266fc76d08 -r 8e620dc570ce Config.mk --- a/Config.mk Fri Jul 27 12:22:13 2012 +0200 +++ b/Config.mk Mon Jul 30 16:15:18 2012 +0100 @@ -213,7 +213,7 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= 00fb2aae68e915b7f456fd5e3997ddf31339004a +QEMU_TAG ?= xen-4.2.0-rc1 # Mon Jul 23 17:56:13 2012 +0100 # qemu-traditional: fix no-return-in-nonvoid-function diff -r e6266fc76d08 -r 8e620dc570ce xen/Makefile --- a/xen/Makefile Fri Jul 27 12:22:13 2012 +0200 +++ b/xen/Makefile Mon Jul 30 16:15:18 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 = 2 -export XEN_EXTRAVERSION ?= -unstable$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .0-rc1$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jul 31 11:44:17 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 31 Jul 2012 11:44:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwAs1-0007l5-Bq; Tue, 31 Jul 2012 11: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 1SwArz-0007kW-4k for xen-changelog@lists.xensource.com; Tue, 31 Jul 2012 11:44:11 +0000 Received: from [85.158.138.51:14672] by server-2.bemta-3.messagelabs.com id FF/C4-00359-A05C7105; Tue, 31 Jul 2012 11:44:10 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-174.messagelabs.com!1343735048!20164401!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 19043 invoked from network); 31 Jul 2012 11:44:09 -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; 31 Jul 2012 11:44:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwArw-0003Nw-3T for xen-changelog@lists.xensource.com; Tue, 31 Jul 2012 11:44:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SwArv-0003Pq-Ju for xen-changelog@lists.xensource.com; Tue, 31 Jul 2012 11:44:07 +0000 Message-Id: Date: Tue, 31 Jul 2012 11:44:07 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] Update Xen version to 4.2.0-rc1 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Keir Fraser # Date 1343661318 -3600 # Node ID 8e620dc570ce42564c1630de5798e23909ee809c # Parent e6266fc76d08b7297fdce7a6ff66cde58fe87ef8 Update Xen version to 4.2.0-rc1 --- diff -r e6266fc76d08 -r 8e620dc570ce Config.mk --- a/Config.mk Fri Jul 27 12:22:13 2012 +0200 +++ b/Config.mk Mon Jul 30 16:15:18 2012 +0100 @@ -213,7 +213,7 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= 00fb2aae68e915b7f456fd5e3997ddf31339004a +QEMU_TAG ?= xen-4.2.0-rc1 # Mon Jul 23 17:56:13 2012 +0100 # qemu-traditional: fix no-return-in-nonvoid-function diff -r e6266fc76d08 -r 8e620dc570ce xen/Makefile --- a/xen/Makefile Fri Jul 27 12:22:13 2012 +0200 +++ b/xen/Makefile Mon Jul 30 16:15:18 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 = 2 -export XEN_EXTRAVERSION ?= -unstable$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .0-rc1$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jul 31 11:44:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 31 Jul 2012 11:44:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwAs1-0007lH-O2; Tue, 31 Jul 2012 11: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 1SwArz-0007ke-RR for xen-changelog@lists.xensource.com; Tue, 31 Jul 2012 11:44:12 +0000 Received: from [85.158.138.51:13184] by server-11.bemta-3.messagelabs.com id D9/72-00679-B05C7105; Tue, 31 Jul 2012 11:44:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-174.messagelabs.com!1343735049!29740426!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 16429 invoked from network); 31 Jul 2012 11:44:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 31 Jul 2012 11:44:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwArw-0003O1-S6 for xen-changelog@lists.xensource.com; Tue, 31 Jul 2012 11:44:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SwArw-0003QK-Mz for xen-changelog@lists.xensource.com; Tue, 31 Jul 2012 11:44:08 +0000 Message-Id: Date: Tue, 31 Jul 2012 11:44:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] Added signature for changeset 8e620dc570ce X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343661337 -3600 # Node ID 72f98dc7caeb4616039e392a25dec6662fd91ff7 # Parent 72160635df2cba0347375fc929731afe43dc0aeb Added signature for changeset 8e620dc570ce --- diff -r 72160635df2c -r 72f98dc7caeb .hgsigs --- a/.hgsigs Mon Jul 30 16:15:27 2012 +0100 +++ b/.hgsigs Mon Jul 30 16:15:37 2012 +0100 @@ -5,3 +5,4 @@ 8df0c7f9cda6cb271a1414114e26f72e1d93a69a d2d27d989ebce4325575f871415337cc54891dde 0 iQEcBAABAgAGBQJNXBYbAAoJEIP+FMlX6CvZTGIH/2bxz3UrQNNwsUMmx5tNKwoAzmTjX5IjpsibwZgIlWFTpZhmbdAK5jvUVdPgmAURgPUHIkcic9MRfXZepzqxEyE/zz2itCcDE6oo1ibb2cwn54c2RlHhcweaDzEDroRfcGZ2tEWXIjTEAyNwlhy9IQZ9wC3XAA0wTwXoHx7o9fUs3WSFahr+Cz93w/sc7uQ6LK52WvVvUd7UflSEx2X4uACDknxbKucG6POCxnQ3A+eVXJmdnHak5c+ySsjwu+fHiQ3/ca0JY1RlEF+8NT+aFobZ51kr7acCmFDvOsGd7h6hhgNVe0mujq5pyooklA4qW83/VudS/jOVPnSt+cGhBpE= 7b6791dbfecdb2eba6acd2c8bf0ced17d06746b2 0 iQEcBAABAgAGBQJNa9NOAAoJEIP+FMlX6CvZK+sH/REZ7jV0iWnDbvfPgdl/KlxEVvj4LsmLFAVBa0sEHa8ih+THp3C8Bso7izIs424y667QH6Pq+wAiB5TELOOHRsp6VV5AxYXuNF1Vw9xD9YGUQ5ECAIfc9gldfZZAv4QZayHOgdz4zRnMOrO1D8rqNDVO7BcgNutgf25WtrLsg+mxxyLjcA9Q5Q7a6dY1WSzzSf6beOW9MLh6Hy2pGTzO3CcS6M0Aa6sXZKisy7CWMOueAbwSmRBmw3il1oM62I44ovAJUxBvLTQZm0mNPzeq0IP59rLrGzdhZ76+iE47GK/zGjcC7o/jSQUy6xhuUwgcx3PdB8vzJzNsz6p8mIR+UKo= 6241fa0ad1a939d2eba11bdec929564276f56a9e 0 iQEcBAABAgAGBQJNcSJqAAoJEIP+FMlX6CvZbxEH/206722t0t46MfPq0/buPpQDNiB0HtFZY79u1Yc8xGTo23rQ2NTG10JdCurN2pyxwFesiSIZ4Ua3zqpZ0EA2EN6xAFY9Vua4WEPNJwK8pxxWABcHI017QTidQs41bEaUn92yyfmixq6iYCGvR+b46KWbip/i9Z6vZpw0g3JyOaxgAhkA+p4w90yUIKUkjTrtiuqnI31MUQE0urwWAXQUj78knrqEu3wb91+me1KLH9WzReBB7tt3/GmaK4qSdnHNpIkulVK0XJYzFkJzFr5eHVeYTGFb25Sgir2sIN2gxaCPI3/p90akFMJKmeNV5XCmOQ5g2GWUZTff8LGF6Fk0Me8= +8e620dc570ce42564c1630de5798e23909ee809c 0 iQEcBAABAgAGBQJQFqUYAAoJEIP+FMlX6CvZDGEH/jxUFG29okRASHY6XwFrJ4AU7tLyC8Bt2vAH3ZaA/h1Tn2GWkQXf4tzBAvvwWNBrm1hdj73OaB7dD2l2kvL551AhoSd4/5z+pPtpC72ItwFFTr3Ep9GRZEvEHculuei5IUzw1lxZuNCPCScBxQl+KI+dZHIeP0YO46VZTtG+EeBlj0SJ7JojKN4REd382eIgSLvpEFHCM6vqeCWM9FtDyomiMXdSosDLcWdFauFmV7cdWybA5WPj6bkJenABwX0A1V9uf225S0DTdO0t/7ncZ8h+wXTzqiixywA+lqza+u+HzNyopWmwiFcseFZjuHbKx6M2v0EvKPBcyTgdRZF/+Kg= _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jul 31 11:44:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 31 Jul 2012 11:44:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwAs1-0007lH-O2; Tue, 31 Jul 2012 11: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 1SwArz-0007ke-RR for xen-changelog@lists.xensource.com; Tue, 31 Jul 2012 11:44:12 +0000 Received: from [85.158.138.51:13184] by server-11.bemta-3.messagelabs.com id D9/72-00679-B05C7105; Tue, 31 Jul 2012 11:44:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-174.messagelabs.com!1343735049!29740426!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 16429 invoked from network); 31 Jul 2012 11:44:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 31 Jul 2012 11:44:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwArw-0003O1-S6 for xen-changelog@lists.xensource.com; Tue, 31 Jul 2012 11:44:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SwArw-0003QK-Mz for xen-changelog@lists.xensource.com; Tue, 31 Jul 2012 11:44:08 +0000 Message-Id: Date: Tue, 31 Jul 2012 11:44:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] Added signature for changeset 8e620dc570ce X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343661337 -3600 # Node ID 72f98dc7caeb4616039e392a25dec6662fd91ff7 # Parent 72160635df2cba0347375fc929731afe43dc0aeb Added signature for changeset 8e620dc570ce --- diff -r 72160635df2c -r 72f98dc7caeb .hgsigs --- a/.hgsigs Mon Jul 30 16:15:27 2012 +0100 +++ b/.hgsigs Mon Jul 30 16:15:37 2012 +0100 @@ -5,3 +5,4 @@ 8df0c7f9cda6cb271a1414114e26f72e1d93a69a d2d27d989ebce4325575f871415337cc54891dde 0 iQEcBAABAgAGBQJNXBYbAAoJEIP+FMlX6CvZTGIH/2bxz3UrQNNwsUMmx5tNKwoAzmTjX5IjpsibwZgIlWFTpZhmbdAK5jvUVdPgmAURgPUHIkcic9MRfXZepzqxEyE/zz2itCcDE6oo1ibb2cwn54c2RlHhcweaDzEDroRfcGZ2tEWXIjTEAyNwlhy9IQZ9wC3XAA0wTwXoHx7o9fUs3WSFahr+Cz93w/sc7uQ6LK52WvVvUd7UflSEx2X4uACDknxbKucG6POCxnQ3A+eVXJmdnHak5c+ySsjwu+fHiQ3/ca0JY1RlEF+8NT+aFobZ51kr7acCmFDvOsGd7h6hhgNVe0mujq5pyooklA4qW83/VudS/jOVPnSt+cGhBpE= 7b6791dbfecdb2eba6acd2c8bf0ced17d06746b2 0 iQEcBAABAgAGBQJNa9NOAAoJEIP+FMlX6CvZK+sH/REZ7jV0iWnDbvfPgdl/KlxEVvj4LsmLFAVBa0sEHa8ih+THp3C8Bso7izIs424y667QH6Pq+wAiB5TELOOHRsp6VV5AxYXuNF1Vw9xD9YGUQ5ECAIfc9gldfZZAv4QZayHOgdz4zRnMOrO1D8rqNDVO7BcgNutgf25WtrLsg+mxxyLjcA9Q5Q7a6dY1WSzzSf6beOW9MLh6Hy2pGTzO3CcS6M0Aa6sXZKisy7CWMOueAbwSmRBmw3il1oM62I44ovAJUxBvLTQZm0mNPzeq0IP59rLrGzdhZ76+iE47GK/zGjcC7o/jSQUy6xhuUwgcx3PdB8vzJzNsz6p8mIR+UKo= 6241fa0ad1a939d2eba11bdec929564276f56a9e 0 iQEcBAABAgAGBQJNcSJqAAoJEIP+FMlX6CvZbxEH/206722t0t46MfPq0/buPpQDNiB0HtFZY79u1Yc8xGTo23rQ2NTG10JdCurN2pyxwFesiSIZ4Ua3zqpZ0EA2EN6xAFY9Vua4WEPNJwK8pxxWABcHI017QTidQs41bEaUn92yyfmixq6iYCGvR+b46KWbip/i9Z6vZpw0g3JyOaxgAhkA+p4w90yUIKUkjTrtiuqnI31MUQE0urwWAXQUj78knrqEu3wb91+me1KLH9WzReBB7tt3/GmaK4qSdnHNpIkulVK0XJYzFkJzFr5eHVeYTGFb25Sgir2sIN2gxaCPI3/p90akFMJKmeNV5XCmOQ5g2GWUZTff8LGF6Fk0Me8= +8e620dc570ce42564c1630de5798e23909ee809c 0 iQEcBAABAgAGBQJQFqUYAAoJEIP+FMlX6CvZDGEH/jxUFG29okRASHY6XwFrJ4AU7tLyC8Bt2vAH3ZaA/h1Tn2GWkQXf4tzBAvvwWNBrm1hdj73OaB7dD2l2kvL551AhoSd4/5z+pPtpC72ItwFFTr3Ep9GRZEvEHculuei5IUzw1lxZuNCPCScBxQl+KI+dZHIeP0YO46VZTtG+EeBlj0SJ7JojKN4REd382eIgSLvpEFHCM6vqeCWM9FtDyomiMXdSosDLcWdFauFmV7cdWybA5WPj6bkJenABwX0A1V9uf225S0DTdO0t/7ncZ8h+wXTzqiixywA+lqza+u+HzNyopWmwiFcseFZjuHbKx6M2v0EvKPBcyTgdRZF/+Kg= _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jul 31 11:44:23 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 31 Jul 2012 11:44: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 1SwAs9-0007o1-1a; Tue, 31 Jul 2012 11:44:21 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwAs7-0007nF-3W for xen-changelog@lists.xensource.com; Tue, 31 Jul 2012 11:44:19 +0000 Received: from [85.158.138.51:13795] by server-1.bemta-3.messagelabs.com id D6/5B-31934-215C7105; Tue, 31 Jul 2012 11:44:18 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-174.messagelabs.com!1343735056!29740449!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 16774 invoked from network); 31 Jul 2012 11:44:17 -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; 31 Jul 2012 11:44:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwAs4-0003OB-4x for xen-changelog@lists.xensource.com; Tue, 31 Jul 2012 11:44:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SwAs3-0003Rt-Tj for xen-changelog@lists.xensource.com; Tue, 31 Jul 2012 11:44:15 +0000 Message-Id: Date: Tue, 31 Jul 2012 11:44:15 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] Revert xen-unstable:25487:baa85434d0ec. Not applicable to 4.1 branch. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343651864 -3600 # Node ID 9d30201cbcc4f50fec6ee7302785ee0f916423f8 # Parent c23c84dbd98990dd67f1f3d593a91750e753372e Revert xen-unstable:25487:baa85434d0ec. Not applicable to 4.1 branch. --- diff -r c23c84dbd989 -r 9d30201cbcc4 xen/arch/x86/mm.c --- a/xen/arch/x86/mm.c Mon Jul 30 13:34:45 2012 +0100 +++ b/xen/arch/x86/mm.c Mon Jul 30 13:37:44 2012 +0100 @@ -1801,7 +1801,6 @@ static int mod_l1_entry(l1_pgentry_t *pl return 0; case -1: l1e_remove_flags(nl1e, _PAGE_RW); - rc = 0; break; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jul 31 11:44:23 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 31 Jul 2012 11:44: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 1SwAs9-0007o1-1a; Tue, 31 Jul 2012 11:44:21 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwAs7-0007nF-3W for xen-changelog@lists.xensource.com; Tue, 31 Jul 2012 11:44:19 +0000 Received: from [85.158.138.51:13795] by server-1.bemta-3.messagelabs.com id D6/5B-31934-215C7105; Tue, 31 Jul 2012 11:44:18 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-174.messagelabs.com!1343735056!29740449!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 16774 invoked from network); 31 Jul 2012 11:44:17 -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; 31 Jul 2012 11:44:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwAs4-0003OB-4x for xen-changelog@lists.xensource.com; Tue, 31 Jul 2012 11:44:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SwAs3-0003Rt-Tj for xen-changelog@lists.xensource.com; Tue, 31 Jul 2012 11:44:15 +0000 Message-Id: Date: Tue, 31 Jul 2012 11:44:15 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] Revert xen-unstable:25487:baa85434d0ec. Not applicable to 4.1 branch. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-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 1343651864 -3600 # Node ID 9d30201cbcc4f50fec6ee7302785ee0f916423f8 # Parent c23c84dbd98990dd67f1f3d593a91750e753372e Revert xen-unstable:25487:baa85434d0ec. Not applicable to 4.1 branch. --- diff -r c23c84dbd989 -r 9d30201cbcc4 xen/arch/x86/mm.c --- a/xen/arch/x86/mm.c Mon Jul 30 13:34:45 2012 +0100 +++ b/xen/arch/x86/mm.c Mon Jul 30 13:37:44 2012 +0100 @@ -1801,7 +1801,6 @@ static int mod_l1_entry(l1_pgentry_t *pl return 0; case -1: l1e_remove_flags(nl1e, _PAGE_RW); - rc = 0; break; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jul 31 11:44:24 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 31 Jul 2012 11:44:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwAs7-0007nj-Us; Tue, 31 Jul 2012 11:44:19 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwAs6-0007md-Bl for xen-changelog@lists.xensource.com; Tue, 31 Jul 2012 11:44:18 +0000 Received: from [85.158.138.51:15263] by server-4.bemta-3.messagelabs.com id D4/AB-29069-115C7105; Tue, 31 Jul 2012 11:44:17 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-174.messagelabs.com!1343735055!20164427!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 19388 invoked from network); 31 Jul 2012 11:44:16 -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; 31 Jul 2012 11:44:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwAs3-0003O8-ES for xen-changelog@lists.xensource.com; Tue, 31 Jul 2012 11:44:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SwAs3-0003Re-Cc for xen-changelog@lists.xensource.com; Tue, 31 Jul 2012 11:44:15 +0000 Message-Id: Date: Tue, 31 Jul 2012 11:44:14 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] Update Xen version to 4.1.3-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 1343651685 -3600 # Node ID c23c84dbd98990dd67f1f3d593a91750e753372e # Parent a43f5b4b03319117edba76ebca8f827119d4e9a8 Update Xen version to 4.1.3-rc4-pre --- diff -r a43f5b4b0331 -r c23c84dbd989 xen/Makefile --- a/xen/Makefile Thu Jul 26 16:56:35 2012 +0100 +++ b/xen/Makefile Mon Jul 30 13:34:45 2012 +0100 @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 1 -export XEN_EXTRAVERSION ?= .3-rc3$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .3-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 Tue Jul 31 11:44:24 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 31 Jul 2012 11:44:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwAs9-0007oD-67; Tue, 31 Jul 2012 11:44:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwAs7-0007nN-IX for xen-changelog@lists.xensource.com; Tue, 31 Jul 2012 11:44:19 +0000 Received: from [85.158.139.83:58336] by server-2.bemta-5.messagelabs.com id 64/68-04598-215C7105; Tue, 31 Jul 2012 11:44:18 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-182.messagelabs.com!1343735057!29589354!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 21964 invoked from network); 31 Jul 2012 11:44:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 31 Jul 2012 11:44:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwAs4-0003OH-Uj for xen-changelog@lists.xensource.com; Tue, 31 Jul 2012 11:44:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SwAs4-0003SP-TT for xen-changelog@lists.xensource.com; Tue, 31 Jul 2012 11:44:16 +0000 Message-Id: Date: Tue, 31 Jul 2012 11:44:16 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-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 1343651938 -3600 # Node ID fa34499e8f6c579d20d18b308c51fc8640b7e0b3 # Parent 9908dc9808b7751f40c6c9174b70cc27842b07ae 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 9908dc9808b7 -r fa34499e8f6c xen/arch/x86/io_apic.c --- a/xen/arch/x86/io_apic.c Mon Jul 30 13:38:26 2012 +0100 +++ b/xen/arch/x86/io_apic.c Mon Jul 30 13:38:58 2012 +0100 @@ -2665,7 +2665,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 ( max_gsi_irqs == 0 ) max_gsi_irqs = nr_irqs ? nr_irqs / 8 : PAGE_SIZE; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jul 31 11:44:24 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 31 Jul 2012 11:44:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwAs7-0007nj-Us; Tue, 31 Jul 2012 11:44:19 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwAs6-0007md-Bl for xen-changelog@lists.xensource.com; Tue, 31 Jul 2012 11:44:18 +0000 Received: from [85.158.138.51:15263] by server-4.bemta-3.messagelabs.com id D4/AB-29069-115C7105; Tue, 31 Jul 2012 11:44:17 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-174.messagelabs.com!1343735055!20164427!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 19388 invoked from network); 31 Jul 2012 11:44:16 -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; 31 Jul 2012 11:44:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwAs3-0003O8-ES for xen-changelog@lists.xensource.com; Tue, 31 Jul 2012 11:44:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SwAs3-0003Re-Cc for xen-changelog@lists.xensource.com; Tue, 31 Jul 2012 11:44:15 +0000 Message-Id: Date: Tue, 31 Jul 2012 11:44:14 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-testing] Update Xen version to 4.1.3-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 1343651685 -3600 # Node ID c23c84dbd98990dd67f1f3d593a91750e753372e # Parent a43f5b4b03319117edba76ebca8f827119d4e9a8 Update Xen version to 4.1.3-rc4-pre --- diff -r a43f5b4b0331 -r c23c84dbd989 xen/Makefile --- a/xen/Makefile Thu Jul 26 16:56:35 2012 +0100 +++ b/xen/Makefile Mon Jul 30 13:34:45 2012 +0100 @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 1 -export XEN_EXTRAVERSION ?= .3-rc3$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .3-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 Tue Jul 31 11:44:24 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 31 Jul 2012 11:44:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwAs9-0007oD-67; Tue, 31 Jul 2012 11:44:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwAs7-0007nN-IX for xen-changelog@lists.xensource.com; Tue, 31 Jul 2012 11:44:19 +0000 Received: from [85.158.139.83:58336] by server-2.bemta-5.messagelabs.com id 64/68-04598-215C7105; Tue, 31 Jul 2012 11:44:18 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-182.messagelabs.com!1343735057!29589354!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 21964 invoked from network); 31 Jul 2012 11:44:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 31 Jul 2012 11:44:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwAs4-0003OH-Uj for xen-changelog@lists.xensource.com; Tue, 31 Jul 2012 11:44:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SwAs4-0003SP-TT for xen-changelog@lists.xensource.com; Tue, 31 Jul 2012 11:44:16 +0000 Message-Id: Date: Tue, 31 Jul 2012 11:44:16 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-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 1343651938 -3600 # Node ID fa34499e8f6c579d20d18b308c51fc8640b7e0b3 # Parent 9908dc9808b7751f40c6c9174b70cc27842b07ae 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 9908dc9808b7 -r fa34499e8f6c xen/arch/x86/io_apic.c --- a/xen/arch/x86/io_apic.c Mon Jul 30 13:38:26 2012 +0100 +++ b/xen/arch/x86/io_apic.c Mon Jul 30 13:38:58 2012 +0100 @@ -2665,7 +2665,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 ( max_gsi_irqs == 0 ) max_gsi_irqs = nr_irqs ? nr_irqs / 8 : PAGE_SIZE; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jul 31 11:44:25 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 31 Jul 2012 11:44: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 1SwAs9-0007o8-3v; Tue, 31 Jul 2012 11:44:21 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwAs7-0007nK-97 for xen-changelog@lists.xensource.com; Tue, 31 Jul 2012 11:44:19 +0000 Received: from [85.158.143.35:46089] by server-1.bemta-4.messagelabs.com id 35/A2-24392-215C7105; Tue, 31 Jul 2012 11:44:18 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-21.messagelabs.com!1343735056!16128809!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 26235 invoked from network); 31 Jul 2012 11:44:17 -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; 31 Jul 2012 11:44:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwAs4-0003OE-Nc for xen-changelog@lists.xensource.com; Tue, 31 Jul 2012 11:44:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SwAs4-0003SA-DL for xen-changelog@lists.xensource.com; Tue, 31 Jul 2012 11:44:16 +0000 Message-Id: Date: Tue, 31 Jul 2012 11:44:15 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-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 1343651906 -3600 # Node ID 9908dc9808b7751f40c6c9174b70cc27842b07ae # Parent 9d30201cbcc4f50fec6ee7302785ee0f916423f8 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 9d30201cbcc4 -r 9908dc9808b7 xen/drivers/passthrough/vtd/qinval.c --- a/xen/drivers/passthrough/vtd/qinval.c Mon Jul 30 13:37:44 2012 +0100 +++ b/xen/drivers/passthrough/vtd/qinval.c Mon Jul 30 13:38:26 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 Tue Jul 31 11:44:25 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 31 Jul 2012 11:44: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 1SwAs9-0007o8-3v; Tue, 31 Jul 2012 11:44:21 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwAs7-0007nK-97 for xen-changelog@lists.xensource.com; Tue, 31 Jul 2012 11:44:19 +0000 Received: from [85.158.143.35:46089] by server-1.bemta-4.messagelabs.com id 35/A2-24392-215C7105; Tue, 31 Jul 2012 11:44:18 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-21.messagelabs.com!1343735056!16128809!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 26235 invoked from network); 31 Jul 2012 11:44:17 -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; 31 Jul 2012 11:44:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SwAs4-0003OE-Nc for xen-changelog@lists.xensource.com; Tue, 31 Jul 2012 11:44:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SwAs4-0003SA-DL for xen-changelog@lists.xensource.com; Tue, 31 Jul 2012 11:44:16 +0000 Message-Id: Date: Tue, 31 Jul 2012 11:44:15 +0000 From: Xen patchbot-4.1-testing To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-4.1-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 1343651906 -3600 # Node ID 9908dc9808b7751f40c6c9174b70cc27842b07ae # Parent 9d30201cbcc4f50fec6ee7302785ee0f916423f8 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 9d30201cbcc4 -r 9908dc9808b7 xen/drivers/passthrough/vtd/qinval.c --- a/xen/drivers/passthrough/vtd/qinval.c Mon Jul 30 13:37:44 2012 +0100 +++ b/xen/drivers/passthrough/vtd/qinval.c Mon Jul 30 13:38:26 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