From kraxel at fedoraproject.org Tue Feb 3 11:28:27 2009 From: kraxel at fedoraproject.org (Gerd Hoffmann) Date: Tue, 3 Feb 2009 11:28:27 +0000 (UTC) Subject: [fedora-virt-maint] rpms/xen/devel xen-backport-hg19075.patch, NONE, 1.1 xen-backport-hg19108.patch, NONE, 1.1 xen-backport-hg19109.patch, NONE, 1.1 xen-backport-hg19110.patch, NONE, 1.1 xen.spec, 1.226, 1.227 Message-ID: <20090203112827.955D370134@cvs1.fedora.phx.redhat.com> Author: kraxel Update of /cvs/pkgs/rpms/xen/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5652 Modified Files: xen.spec Added Files: xen-backport-hg19075.patch xen-backport-hg19108.patch xen-backport-hg19109.patch xen-backport-hg19110.patch Log Message: backport bzImage support for dom0 builder xen-backport-hg19075.patch: --- NEW FILE xen-backport-hg19075.patch --- bzImage support for dom0 builder. --- a/xen/arch/x86/Makefile.19075 2009-01-05 12:27:00.000000000 +0100 +++ b/xen/arch/x86/Makefile 2009-02-03 12:03:52.000000000 +0100 @@ -51,6 +51,7 @@ obj-y += machine_kexec.o obj-y += crash.o obj-y += tboot.o obj-y += hpet.o +obj-y += bzimage.o obj-$(crash_debug) += gdbstub.o --- /dev/null 2009-02-03 09:21:03.623030083 +0100 +++ b/xen/arch/x86/bzimage.c 2009-02-03 12:03:52.000000000 +0100 @@ -0,0 +1,242 @@ +#include +#include +#include +#include +#include +#include + +#define HEAPORDER 3 + +static unsigned char *window; +#define memptr long +static memptr free_mem_ptr; +static memptr free_mem_end_ptr; + +#define WSIZE 0x80000000 + +static unsigned char *inbuf; +static unsigned insize; + +/* Index of next byte to be processed in inbuf: */ +static unsigned inptr; + +/* Bytes in output buffer: */ +static unsigned outcnt; + +#define OF(args) args +#define STATIC static + +#define memzero(s, n) memset((s), 0, (n)) + +typedef unsigned char uch; +typedef unsigned short ush; +typedef unsigned long ulg; + +#define INIT __init + +#define get_byte() (inptr < insize ? inbuf[inptr++] : fill_inbuf()) + +/* Diagnostic functions */ +#ifdef DEBUG +# define Assert(cond, msg) do { if (!(cond)) error(msg); } while (0) +# define Trace(x) do { fprintf x; } while (0) +# define Tracev(x) do { if (verbose) fprintf x ; } while (0) +# define Tracevv(x) do { if (verbose > 1) fprintf x ; } while (0) +# define Tracec(c, x) do { if (verbose && (c)) fprintf x ; } while (0) +# define Tracecv(c, x) do { if (verbose > 1 && (c)) fprintf x ; } while (0) +#else +# define Assert(cond, msg) +# define Trace(x) +# define Tracev(x) +# define Tracevv(x) +# define Tracec(c, x) +# define Tracecv(c, x) +#endif + +static long bytes_out; +static void flush_window(void); + +static __init void error(char *x) +{ + printk("%s\n", x); + BUG(); +} + +static __init int fill_inbuf(void) +{ + error("ran out of input data"); + return 0; +} + + +#include "../../common/inflate.c" + +static __init void flush_window(void) +{ + /* + * The window is equal to the output buffer therefore only need to + * compute the crc. + */ + unsigned long c = crc; + unsigned n; + unsigned char *in, ch; + + in = window; + for ( n = 0; n < outcnt; n++ ) + { + ch = *in++; + c = crc_32_tab[((int)c ^ ch) & 0xff] ^ (c >> 8); + } + crc = c; + + bytes_out += (unsigned long)outcnt; + outcnt = 0; +} + +static __init int gzip_length(char *image, unsigned long image_len) +{ + return *(uint32_t *)&image[image_len - 4]; +} + +static __init int perform_gunzip(char *output, char **_image_start, unsigned long *image_len) +{ + char *image = *_image_start; + int rc; + unsigned char magic0 = (unsigned char)image[0]; + unsigned char magic1 = (unsigned char)image[1]; + + if ( magic0 != 0x1f || ( (magic1 != 0x8b) && (magic1 != 0x9e) ) ) + return 0; + + window = (unsigned char *)output; + + free_mem_ptr = (unsigned long)alloc_xenheap_pages(HEAPORDER); + free_mem_end_ptr = free_mem_ptr + (PAGE_SIZE << HEAPORDER); + + inbuf = (unsigned char *)image; + insize = *image_len; + inptr = 0; + + makecrc(); + + if ( gunzip() < 0 ) + { + rc = -EINVAL; + } + else + { + *_image_start = (char *)window; + *image_len = gzip_length(image, *image_len); + rc = 0; + } + + free_xenheap_pages((void *)free_mem_ptr, HEAPORDER); + + return rc; +} + +struct setup_header { + uint8_t _pad0[0x1f1]; /* skip uninteresting stuff */ + uint8_t setup_sects; + uint16_t root_flags; + uint32_t syssize; + uint16_t ram_size; + uint16_t vid_mode; + uint16_t root_dev; + uint16_t boot_flag; + uint16_t jump; + uint32_t header; +#define HDR_MAGIC "HdrS" +#define HDR_MAGIC_SZ 4 + uint16_t version; +#define VERSION(h,l) (((h)<<8) | (l)) + uint32_t realmode_swtch; + uint16_t start_sys; + uint16_t kernel_version; + uint8_t type_of_loader; + uint8_t loadflags; + uint16_t setup_move_size; + uint32_t code32_start; + uint32_t ramdisk_image; + uint32_t ramdisk_size; + uint32_t bootsect_kludge; + uint16_t heap_end_ptr; + uint16_t _pad1; + uint32_t cmd_line_ptr; + uint32_t initrd_addr_max; + uint32_t kernel_alignment; + uint8_t relocatable_kernel; + uint8_t _pad2[3]; + uint32_t cmdline_size; + uint32_t hardware_subarch; + uint64_t hardware_subarch_data; + uint32_t payload_offset; + uint32_t payload_length; + } __attribute__((packed)); + +static __init int bzimage_check(struct setup_header *hdr, unsigned long len) +{ + if ( len < sizeof(struct setup_header) ) + return 0; + + if ( memcmp(&hdr->header, HDR_MAGIC, HDR_MAGIC_SZ) != 0 ) + return 0; + + if ( hdr->version < VERSION(2,8) ) { + printk("Cannot load bzImage v%d.%02d at least v2.08 is required\n", + hdr->version >> 8, hdr->version & 0xff); + return -EINVAL; + } + return 1; +} + +int __init bzimage_headroom(char *image_start, unsigned long image_length) +{ + struct setup_header *hdr = (struct setup_header *)image_start; + char *img; + int err, headroom; + + err = bzimage_check(hdr, image_length); + if (err < 1) + return err; + + img = image_start + (hdr->setup_sects+1) * 512; + img += hdr->payload_offset; + + headroom = gzip_length(img, hdr->payload_length); + headroom += headroom >> 12; /* Add 8 bytes for every 32K input block */ + headroom += (32768 + 18); /* Add 32K + 18 bytes of extra headroom */ + headroom = (headroom + 4095) & ~4095; + + return headroom; +} + +int __init bzimage_parse(char *image_base, char **image_start, unsigned long *image_len) +{ + struct setup_header *hdr = (struct setup_header *)(*image_start); + int err = bzimage_check(hdr, *image_len); + + if (err < 1) + return err; + + BUG_ON(!(image_base < *image_start)); + + *image_start += (hdr->setup_sects+1) * 512; + *image_start += hdr->payload_offset; + *image_len = hdr->payload_length; + + if ( (err = perform_gunzip(image_base, image_start, image_len)) < 0 ) + return err; + + return 0; +} + +/* + * Local variables: + * mode: C + * c-set-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ --- a/xen/arch/x86/domain_build.c.19075 2009-01-05 12:27:00.000000000 +0100 +++ b/xen/arch/x86/domain_build.c 2009-02-03 12:03:52.000000000 +0100 @@ -32,6 +32,9 @@ #include #include +int __init bzimage_parse( + char *output, char **image_start, unsigned long *image_len); + extern unsigned long initial_images_nrpages(void); extern void discard_initial_images(void); @@ -196,7 +199,8 @@ static void __init process_dom0_ioports_ int __init construct_dom0( struct domain *d, - unsigned long _image_start, unsigned long image_len, + unsigned long _image_base, + unsigned long _image_start, unsigned long image_len, unsigned long _initrd_start, unsigned long initrd_len, char *cmdline) { @@ -213,9 +217,11 @@ int __init construct_dom0( struct vcpu *v = d->vcpu[0]; unsigned long long value; #if defined(__i386__) + char *image_base = (char *)_image_base; /* use lowmem mappings */ char *image_start = (char *)_image_start; /* use lowmem mappings */ char *initrd_start = (char *)_initrd_start; /* use lowmem mappings */ #elif defined(__x86_64__) + char *image_base = __va(_image_base); char *image_start = __va(_image_start); char *initrd_start = __va(_initrd_start); #endif @@ -262,6 +268,9 @@ int __init construct_dom0( nr_pages = compute_dom0_nr_pages(); + if ( (rc = bzimage_parse(image_base, &image_start, &image_len)) != 0 ) + return rc; + if ( (rc = elf_init(&elf, image_start, image_len)) != 0 ) return rc; #ifdef VERBOSE --- a/xen/arch/x86/setup.c.19075 2009-01-05 12:27:00.000000000 +0100 +++ b/xen/arch/x86/setup.c 2009-02-03 12:04:37.000000000 +0100 @@ -39,6 +39,8 @@ #include #include +int __init bzimage_headroom(char *image_start, unsigned long image_length); + #if defined(CONFIG_X86_64) #define BOOTSTRAP_DIRECTMAP_END (1UL << 32) /* 4GB */ #define maddr_to_bootstrap_virt(m) maddr_to_virt(m) @@ -172,19 +174,21 @@ static void __init do_initcalls(void) for ( ; ; ) halt(); \ } while (0) -static unsigned long __initdata initial_images_start, initial_images_end; +static unsigned long __initdata initial_images_base; +static unsigned long __initdata initial_images_start; +static unsigned long __initdata initial_images_end; unsigned long __init initial_images_nrpages(void) { - ASSERT(!(initial_images_start & ~PAGE_MASK)); + ASSERT(!(initial_images_base & ~PAGE_MASK)); ASSERT(!(initial_images_end & ~PAGE_MASK)); return ((initial_images_end >> PAGE_SHIFT) - - (initial_images_start >> PAGE_SHIFT)); + (initial_images_base >> PAGE_SHIFT)); } void __init discard_initial_images(void) { - init_domheap_pages(initial_images_start, initial_images_end); + init_domheap_pages(initial_images_base, initial_images_end); } extern char __per_cpu_start[], __per_cpu_data_end[], __per_cpu_end[]; @@ -413,7 +417,7 @@ void __init __start_xen(unsigned long mb unsigned int initrdidx = 1; multiboot_info_t *mbi = __va(mbi_p); module_t *mod = (module_t *)__va(mbi->mods_addr); - unsigned long nr_pages, modules_length; + unsigned long nr_pages, modules_length, modules_headroom; int i, e820_warn = 0, bytes = 0; struct ns16550_defaults ns16550 = { .data_bits = 8, @@ -629,6 +633,10 @@ void __init __start_xen(unsigned long mb * x86/64, we relocate Xen to higher memory. */ modules_length = mod[mbi->mods_count-1].mod_end - mod[0].mod_start; + modules_headroom = bzimage_headroom( + (char *)(unsigned long)mod[0].mod_start, + (unsigned long)(mod[0].mod_end - mod[0].mod_start)); + for ( i = boot_e820.nr_map-1; i >= 0; i-- ) { uint64_t s, e, mask = (1UL << L2_PAGETABLE_SHIFT) - 1; @@ -732,12 +740,15 @@ void __init __start_xen(unsigned long mb #endif /* Is the region suitable for relocating the multiboot modules? */ - if ( !initial_images_start && (s < e) && ((e-s) >= modules_length) ) + if ( !initial_images_start && (s < e) && + ((e-s) >= (modules_length+modules_headroom)) ) { initial_images_end = e; e = (e - modules_length) & PAGE_MASK; initial_images_start = e; - move_memory(initial_images_start, + e -= modules_headroom; + initial_images_base = e; + move_memory(initial_images_start, mod[0].mod_start, mod[mbi->mods_count-1].mod_end); } @@ -751,7 +762,7 @@ void __init __start_xen(unsigned long mb if ( !initial_images_start ) EARLY_FAIL("Not enough memory to relocate the dom0 kernel image.\n"); - reserve_e820_ram(&boot_e820, initial_images_start, initial_images_end); + reserve_e820_ram(&boot_e820, initial_images_base, initial_images_end); /* Initialise Xen heap and boot heap. */ xenheap_phys_start = init_boot_allocator(__pa(&_end)); @@ -1040,7 +1051,8 @@ void __init __start_xen(unsigned long mb * above our heap. The second module, if present, is an initrd ramdisk. */ if ( construct_dom0(dom0, - initial_images_start, + initial_images_base, + initial_images_start, mod[0].mod_end-mod[0].mod_start, _initrd_start, _initrd_len, --- /dev/null 2009-02-03 09:21:03.623030083 +0100 +++ b/xen/common/inflate.c 2009-02-03 12:03:52.000000000 +0100 @@ -0,0 +1,1303 @@ +#define DEBG(x) +#define DEBG1(x) +/* inflate.c -- Not copyrighted 1992 by Mark Adler + version c10p1, 10 January 1993 */ + +/* + * Adapted for booting Linux by Hannu Savolainen 1993 + * based on gzip-1.0.3 + * + * Nicolas Pitre , 1999/04/14 : + * Little mods for all variable to reside either into rodata or bss segments + * by marking constant variables with 'const' and initializing all the others + * at run-time only. This allows for the kernel uncompressor to run + * directly from Flash or ROM memory on embedded systems. + */ + +/* + Inflate deflated (PKZIP's method 8 compressed) data. The compression + method searches for as much of the current string of bytes (up to a + length of 258) in the previous 32 K bytes. If it doesn't find any + matches (of at least length 3), it codes the next byte. Otherwise, it + codes the length of the matched string and its distance backwards from + the current position. There is a single Huffman code that codes both + single bytes (called "literals") and match lengths. A second Huffman + code codes the distance information, which follows a length code. Each + length or distance code actually represents a base value and a number + of "extra" (sometimes zero) bits to get to add to the base value. At + the end of each deflated block is a special end-of-block (EOB) literal/ + length code. The decoding process is basically: get a literal/length + code; if EOB then done; if a literal, emit the decoded byte; if a + length then get the distance and emit the referred-to bytes from the + sliding window of previously emitted data. + + There are (currently) three kinds of inflate blocks: stored, fixed, and + dynamic. The compressor deals with some chunk of data at a time, and + decides which method to use on a chunk-by-chunk basis. A chunk might + typically be 32 K or 64 K. If the chunk is incompressible, then the + "stored" method is used. In this case, the bytes are simply stored as + is, eight bits per byte, with none of the above coding. The bytes are + preceded by a count, since there is no longer an EOB code. + + If the data is compressible, then either the fixed or dynamic methods + are used. In the dynamic method, the compressed data is preceded by + an encoding of the literal/length and distance Huffman codes that are + to be used to decode this block. The representation is itself Huffman + coded, and so is preceded by a description of that code. These code + descriptions take up a little space, and so for small blocks, there is + a predefined set of codes, called the fixed codes. The fixed method is + used if the block codes up smaller that way (usually for quite small + chunks), otherwise the dynamic method is used. In the latter case, the + codes are customized to the probabilities in the current block, and so + can code it much better than the pre-determined fixed codes. + + The Huffman codes themselves are decoded using a multi-level table + lookup, in order to maximize the speed of decoding plus the speed of + building the decoding tables. See the comments below that precede the + lbits and dbits tuning parameters. + */ + + +/* + Notes beyond the 1.93a appnote.txt: + + 1. Distance pointers never point before the beginning of the output + stream. + 2. Distance pointers can point back across blocks, up to 32k away. + 3. There is an implied maximum of 7 bits for the bit length table and + 15 bits for the actual data. + 4. If only one code exists, then it is encoded using one bit. (Zero + would be more efficient, but perhaps a little confusing.) If two + codes exist, they are coded using one bit each (0 and 1). + 5. There is no way of sending zero distance codes--a dummy must be + sent if there are none. (History: a pre 2.0 version of PKZIP would + store blocks with no distance codes, but this was discovered to be + too harsh a criterion.) Valid only for 1.93a. 2.04c does allow + zero distance codes, which is sent as one code of zero bits in + length. + 6. There are up to 286 literal/length codes. Code 256 represents the + end-of-block. Note however that the static length tree defines + 288 codes just to fill out the Huffman codes. Codes 286 and 287 + cannot be used though, since there is no length base or extra bits + defined for them. Similarly, there are up to 30 distance codes. + However, static trees define 32 codes (all 5 bits) to fill out the + Huffman codes, but the last two had better not show up in the data. + 7. Unzip can check dynamic Huffman blocks for complete code sets. + The exception is that a single code would not be complete (see #4). + 8. The five bits following the block type is really the number of + literal codes sent minus 257. + 9. Length codes 8,16,16 are interpreted as 13 length codes of 8 bits + (1+6+6). Therefore, to output three times the length, you output + three codes (1+1+1), whereas to output four times the same length, + you only need two codes (1+3). Hmm. + 10. In the tree reconstruction algorithm, Code = Code + Increment + only if BitLength(i) is not zero. (Pretty obvious.) + 11. Correction: 4 Bits: # of Bit Length codes - 4 (4 - 19) + 12. Note: length code 284 can represent 227-258, but length code 285 + really is 258. The last length deserves its own, short code + since it gets used a lot in very redundant files. The length + 258 is special since 258 - 3 (the min match length) is 255. + 13. The literal/length and distance code bit lengths are read as a + single stream of lengths. It is possible (and advantageous) for + a repeat code (16, 17, or 18) to go across the boundary between + the two sets of lengths. + */ + +#ifdef RCSID +static char rcsid[] = "#Id: inflate.c,v 0.14 1993/06/10 13:27:04 jloup Exp #"; +#endif + +#ifndef STATIC + +#if defined(STDC_HEADERS) || defined(HAVE_STDLIB_H) +# include +# include +#endif + +#include "gzip.h" +#define STATIC +#endif /* !STATIC */ + +#ifndef INIT +#define INIT +#endif + +#define slide window + +/* Huffman code lookup table entry--this entry is four bytes for machines + that have 16-bit pointers (e.g. PC's in the small or medium model). + Valid extra bits are 0..13. e == 15 is EOB (end of block), e == 16 + means that v is a literal, 16 < e < 32 means that v is a pointer to + the next table, which codes e - 16 bits, and lastly e == 99 indicates + an unused code. If a code with e == 99 is looked up, this implies an + error in the data. */ +struct huft { + uch e; /* number of extra bits or operation */ + uch b; /* number of bits in this code or subcode */ + union { + ush n; /* literal, length base, or distance base */ + struct huft *t; /* pointer to next level of table */ + } v; +}; + + +/* Function prototypes */ +STATIC int INIT huft_build OF((unsigned *, unsigned, unsigned, + const ush *, const ush *, struct huft **, int *)); +STATIC int INIT huft_free OF((struct huft *)); +STATIC int INIT inflate_codes OF((struct huft *, struct huft *, int, int)); +STATIC int INIT inflate_stored OF((void)); +STATIC int INIT inflate_fixed OF((void)); +STATIC int INIT inflate_dynamic OF((void)); +STATIC int INIT inflate_block OF((int *)); +STATIC int INIT inflate OF((void)); + + +/* The inflate algorithm uses a sliding 32 K byte window on the uncompressed + stream to find repeated byte strings. This is implemented here as a + circular buffer. The index is updated simply by incrementing and then + ANDing with 0x7fff (32K-1). */ +/* It is left to other modules to supply the 32 K area. It is assumed + to be usable as if it were declared "uch slide[32768];" or as just + "uch *slide;" and then malloc'ed in the latter case. The definition + must be in unzip.h, included above. */ +/* unsigned wp; current position in slide */ +#define wp outcnt +#define flush_output(w) (wp=(w),flush_window()) + +/* Tables for deflate from PKZIP's appnote.txt. */ +static const unsigned border[] = { /* Order of the bit length code lengths */ + 16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15}; +static const ush cplens[] = { /* Copy lengths for literal codes 257..285 */ + 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31, + 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0}; +/* note: see note #13 above about the 258 in this list. */ +static const ush cplext[] = { /* Extra bits for literal codes 257..285 */ + 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, + 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0, 99, 99}; /* 99==invalid */ +static const ush cpdist[] = { /* Copy offsets for distance codes 0..29 */ + 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, + 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, + 8193, 12289, 16385, 24577}; +static const ush cpdext[] = { /* Extra bits for distance codes */ + 0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, + 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, + 12, 12, 13, 13}; + + + +/* Macros for inflate() bit peeking and grabbing. + The usage is: + + NEEDBITS(j) + x = b & mask_bits[j]; + DUMPBITS(j) + + where NEEDBITS makes sure that b has at least j bits in it, and + DUMPBITS removes the bits from b. The macros use the variable k + for the number of bits in b. Normally, b and k are register + variables for speed, and are initialized at the beginning of a + routine that uses these macros from a global bit buffer and count. + + If we assume that EOB will be the longest code, then we will never + ask for bits with NEEDBITS that are beyond the end of the stream. + So, NEEDBITS should not read any more bytes than are needed to + meet the request. Then no bytes need to be "returned" to the buffer + at the end of the last block. + + However, this assumption is not true for fixed blocks--the EOB code + is 7 bits, but the other literal/length codes can be 8 or 9 bits. + (The EOB code is shorter than other codes because fixed blocks are + generally short. So, while a block always has an EOB, many other + literal/length codes have a significantly lower probability of + showing up at all.) However, by making the first table have a + lookup of seven bits, the EOB code will be found in that first + lookup, and so will not require that too many bits be pulled from + the stream. + */ + +STATIC ulg bb; /* bit buffer */ +STATIC unsigned bk; /* bits in bit buffer */ + +STATIC const ush mask_bits[] = { + 0x0000, + 0x0001, 0x0003, 0x0007, 0x000f, 0x001f, 0x003f, 0x007f, 0x00ff, + 0x01ff, 0x03ff, 0x07ff, 0x0fff, 0x1fff, 0x3fff, 0x7fff, 0xffff +}; + +#define NEXTBYTE() ({ int v = get_byte(); if (v < 0) goto underrun; (uch)v; }) +#define NEEDBITS(n) {while(k<(n)){b|=((ulg)NEXTBYTE())<>=(n);k-=(n);} + +#ifndef NO_INFLATE_MALLOC +/* A trivial malloc implementation, adapted from + * malloc by Hannu Savolainen 1993 and Matthias Urlichs 1994 + */ + +static unsigned long malloc_ptr; +static int malloc_count; + +static void *malloc(int size) +{ + void *p; + + if (size < 0) + error("Malloc error"); + if (!malloc_ptr) + malloc_ptr = free_mem_ptr; + + malloc_ptr = (malloc_ptr + 3) & ~3; /* Align */ + + p = (void *)malloc_ptr; + malloc_ptr += size; + + if (free_mem_end_ptr && malloc_ptr >= free_mem_end_ptr) + error("Out of memory"); + + malloc_count++; + return p; +} + +static void free(void *where) +{ + malloc_count--; + if (!malloc_count) + malloc_ptr = free_mem_ptr; +} +#else +#define malloc(a) kmalloc(a, GFP_KERNEL) +#define free(a) kfree(a) +#endif + +/* + Huffman code decoding is performed using a multi-level table lookup. + The fastest way to decode is to simply build a lookup table whose + size is determined by the longest code. However, the time it takes + to build this table can also be a factor if the data being decoded + is not very long. The most common codes are necessarily the + shortest codes, so those codes dominate the decoding time, and hence + the speed. The idea is you can have a shorter table that decodes the + shorter, more probable codes, and then point to subsidiary tables for + the longer codes. The time it costs to decode the longer codes is + then traded against the time it takes to make longer tables. + + This results of this trade are in the variables lbits and dbits + below. lbits is the number of bits the first level table for literal/ + length codes can decode in one step, and dbits is the same thing for + the distance codes. Subsequent tables are also less than or equal to + those sizes. These values may be adjusted either when all of the + codes are shorter than that, in which case the longest code length in + bits is used, or when the shortest code is *longer* than the requested + table size, in which case the length of the shortest code in bits is + used. + + There are two different values for the two tables, since they code a + different number of possibilities each. The literal/length table + codes 286 possible values, or in a flat code, a little over eight + bits. The distance table codes 30 possible values, or a little less + than five bits, flat. The optimum values for speed end up being + about one bit more than those, so lbits is 8+1 and dbits is 5+1. + The optimum values may differ though from machine to machine, and + possibly even between compilers. Your mileage may vary. + */ + + +STATIC const int lbits = 9; /* bits in base literal/length lookup table */ +STATIC const int dbits = 6; /* bits in base distance lookup table */ + + +/* If BMAX needs to be larger than 16, then h and x[] should be ulg. */ +#define BMAX 16 /* maximum bit length of any code (16 for explode) */ +#define N_MAX 288 /* maximum number of codes in any set */ + + +STATIC unsigned hufts; /* track memory usage */ + + +STATIC int INIT huft_build( + unsigned *b, /* code lengths in bits (all assumed <= BMAX) */ + unsigned n, /* number of codes (assumed <= N_MAX) */ + unsigned s, /* number of simple-valued codes (0..s-1) */ + const ush *d, /* list of base values for non-simple codes */ + const ush *e, /* list of extra bits for non-simple codes */ + struct huft **t, /* result: starting table */ + int *m /* maximum lookup bits, returns actual */ + ) +/* Given a list of code lengths and a maximum table size, make a set of + tables to decode that set of codes. Return zero on success, one if + the given code set is incomplete (the tables are still built in this + case), two if the input is invalid (all zero length codes or an + oversubscribed set of lengths), and three if not enough memory. */ +{ + unsigned a; /* counter for codes of length k */ + unsigned f; /* i repeats in table every f entries */ + int g; /* maximum code length */ + int h; /* table level */ + register unsigned i; /* counter, current code */ + register unsigned j; /* counter */ + register int k; /* number of bits in current code */ + int l; /* bits per table (returned in m) */ + register unsigned *p; /* pointer into c[], b[], or v[] */ + register struct huft *q; /* points to current table */ + struct huft r; /* table entry for structure assignment */ + register int w; /* bits before this table == (l * h) */ + unsigned *xp; /* pointer into x */ + int y; /* number of dummy codes added */ + unsigned z; /* number of entries in current table */ + struct { + unsigned c[BMAX+1]; /* bit length count table */ + struct huft *u[BMAX]; /* table stack */ + unsigned v[N_MAX]; /* values in order of bit length */ + unsigned x[BMAX+1]; /* bit offsets, then code stack */ + } *stk; + unsigned *c, *v, *x; + struct huft **u; + int ret; + + DEBG("huft1 "); + + stk = malloc(sizeof(*stk)); + if (stk == NULL) + return 3; /* out of memory */ + + c = stk->c; + v = stk->v; + x = stk->x; + u = stk->u; + + /* Generate counts for each bit length */ + memzero(stk->c, sizeof(stk->c)); + p = b; i = n; + do { + Tracecv(*p, (stderr, (n-i >= ' ' && n-i <= '~' ? "%c %d\n" : "0x%x %d\n"), + n-i, *p)); + c[*p]++; /* assume all entries <= BMAX */ + p++; /* Can't combine with above line (Solaris bug) */ + } while (--i); + if (c[0] == n) /* null input--all zero length codes */ + { + *t = (struct huft *)NULL; + *m = 0; + ret = 2; + goto out; + } + + DEBG("huft2 "); + + /* Find minimum and maximum length, bound *m by those */ + l = *m; + for (j = 1; j <= BMAX; j++) + if (c[j]) + break; + k = j; /* minimum code length */ + if ((unsigned)l < j) + l = j; + for (i = BMAX; i; i--) + if (c[i]) + break; + g = i; /* maximum code length */ + if ((unsigned)l > i) + l = i; + *m = l; + + DEBG("huft3 "); + + /* Adjust last length count to fill out codes, if needed */ + for (y = 1 << j; j < i; j++, y <<= 1) + if ((y -= c[j]) < 0) { + ret = 2; /* bad input: more codes than bits */ + goto out; + } + if ((y -= c[i]) < 0) { + ret = 2; + goto out; + } + c[i] += y; + + DEBG("huft4 "); + + /* Generate starting offsets into the value table for each length */ + x[1] = j = 0; + p = c + 1; xp = x + 2; + while (--i) { /* note that i == g from above */ + *xp++ = (j += *p++); + } + + DEBG("huft5 "); + + /* Make a table of values in order of bit lengths */ + p = b; i = 0; + do { + if ((j = *p++) != 0) + v[x[j]++] = i; + } while (++i < n); + n = x[g]; /* set n to length of v */ + + DEBG("h6 "); + + /* Generate the Huffman codes and for each, make the table entries */ + x[0] = i = 0; /* first Huffman code is zero */ + p = v; /* grab values in bit order */ + h = -1; /* no tables yet--level -1 */ + w = -l; /* bits decoded == (l * h) */ + u[0] = (struct huft *)NULL; /* just to keep compilers happy */ + q = (struct huft *)NULL; /* ditto */ + z = 0; /* ditto */ + DEBG("h6a "); + + /* go through the bit lengths (k already is bits in shortest code) */ + for (; k <= g; k++) + { + DEBG("h6b "); + a = c[k]; + while (a--) + { + DEBG("h6b1 "); + /* here i is the Huffman code of length k bits for value *p */ + /* make tables up to required level */ + while (k > w + l) + { + DEBG1("1 "); + h++; + w += l; /* previous table always l bits */ + + /* compute minimum size table less than or equal to l bits */ + z = (z = g - w) > (unsigned)l ? l : z; /* upper limit on table size */ + if ((f = 1 << (j = k - w)) > a + 1) /* try a k-w bit table */ + { /* too few codes for k-w bit table */ + DEBG1("2 "); + f -= a + 1; /* deduct codes from patterns left */ + xp = c + k; + if (j < z) + while (++j < z) /* try smaller tables up to z bits */ + { + if ((f <<= 1) <= *++xp) + break; /* enough codes to use up j bits */ + f -= *xp; /* else deduct codes from patterns */ + } + } + DEBG1("3 "); + z = 1 << j; /* table entries for j-bit table */ + + /* allocate and link in new table */ + if ((q = (struct huft *)malloc((z + 1)*sizeof(struct huft))) == + (struct huft *)NULL) + { + if (h) + huft_free(u[0]); + ret = 3; /* not enough memory */ + goto out; + } + DEBG1("4 "); + hufts += z + 1; /* track memory usage */ + *t = q + 1; /* link to list for huft_free() */ + *(t = &(q->v.t)) = (struct huft *)NULL; + u[h] = ++q; /* table starts after link */ + + DEBG1("5 "); + /* connect to last table, if there is one */ + if (h) + { + x[h] = i; /* save pattern for backing up */ + r.b = (uch)l; /* bits to dump before this table */ + r.e = (uch)(16 + j); /* bits in this table */ + r.v.t = q; /* pointer to this table */ + j = i >> (w - l); /* (get around Turbo C bug) */ + u[h-1][j] = r; /* connect to last table */ + } + DEBG1("6 "); + } + DEBG("h6c "); + + /* set up table entry in r */ + r.b = (uch)(k - w); + if (p >= v + n) + r.e = 99; /* out of values--invalid code */ + else if (*p < s) + { + r.e = (uch)(*p < 256 ? 16 : 15); /* 256 is end-of-block code */ + r.v.n = (ush)(*p); /* simple code is just the value */ + p++; /* one compiler does not like *p++ */ + } + else + { + r.e = (uch)e[*p - s]; /* non-simple--look up in lists */ + r.v.n = d[*p++ - s]; + } + DEBG("h6d "); + + /* fill code-like entries with r */ + f = 1 << (k - w); + for (j = i >> w; j < z; j += f) + q[j] = r; + + /* backwards increment the k-bit code i */ + for (j = 1 << (k - 1); i & j; j >>= 1) + i ^= j; + i ^= j; + + /* backup over finished tables */ + while ((i & ((1 << w) - 1)) != x[h]) + { + h--; /* don't need to update q */ + w -= l; + } + DEBG("h6e "); + } + DEBG("h6f "); + } + + DEBG("huft7 "); + + /* Return true (1) if we were given an incomplete table */ + ret = y != 0 && g != 1; + + out: + free(stk); + return ret; +} + + + +STATIC int INIT huft_free( + struct huft *t /* table to free */ + ) +/* Free the malloc'ed tables built by huft_build(), which makes a linked + list of the tables it made, with the links in a dummy first entry of + each table. */ +{ + register struct huft *p, *q; + + + /* Go through linked list, freeing from the malloced (t[-1]) address. */ + p = t; + while (p != (struct huft *)NULL) + { + q = (--p)->v.t; + free((char*)p); + p = q; + } + return 0; +} + + +STATIC int INIT inflate_codes( + struct huft *tl, /* literal/length decoder tables */ + struct huft *td, /* distance decoder tables */ + int bl, /* number of bits decoded by tl[] */ + int bd /* number of bits decoded by td[] */ + ) +/* inflate (decompress) the codes in a deflated (compressed) block. + Return an error code or zero if it all goes ok. */ +{ + register unsigned e; /* table entry flag/number of extra bits */ + unsigned n, d; /* length and index for copy */ + unsigned w; /* current window position */ + struct huft *t; /* pointer to table entry */ + unsigned ml, md; /* masks for bl and bd bits */ + register ulg b; /* bit buffer */ + register unsigned k; /* number of bits in bit buffer */ + + + /* make local copies of globals */ + b = bb; /* initialize bit buffer */ + k = bk; + w = wp; /* initialize window position */ + + /* inflate the coded data */ + ml = mask_bits[bl]; /* precompute masks for speed */ + md = mask_bits[bd]; + for (;;) /* do until end of block */ + { + NEEDBITS((unsigned)bl) + if ((e = (t = tl + ((unsigned)b & ml))->e) > 16) + do { + if (e == 99) + return 1; + DUMPBITS(t->b) + e -= 16; + NEEDBITS(e) + } while ((e = (t = t->v.t + ((unsigned)b & mask_bits[e]))->e) > 16); + DUMPBITS(t->b) + if (e == 16) /* then it's a literal */ + { + slide[w++] = (uch)t->v.n; + Tracevv((stderr, "%c", slide[w-1])); + if (w == WSIZE) + { + flush_output(w); + w = 0; + } + } + else /* it's an EOB or a length */ + { + /* exit if end of block */ + if (e == 15) + break; + + /* get length of block to copy */ + NEEDBITS(e) + n = t->v.n + ((unsigned)b & mask_bits[e]); + DUMPBITS(e); + + /* decode distance of block to copy */ + NEEDBITS((unsigned)bd) + if ((e = (t = td + ((unsigned)b & md))->e) > 16) + do { + if (e == 99) + return 1; + DUMPBITS(t->b) + e -= 16; + NEEDBITS(e) + } while ((e = (t = t->v.t + ((unsigned)b & mask_bits[e]))->e) > 16); + DUMPBITS(t->b) + NEEDBITS(e) + d = w - t->v.n - ((unsigned)b & mask_bits[e]); + DUMPBITS(e) + Tracevv((stderr,"\\[%d,%d]", w-d, n)); + + /* do the copy */ + do { + n -= (e = (e = WSIZE - ((d &= WSIZE-1) > w ? d : w)) > n ? n : e); +#if !defined(NOMEMCPY) && !defined(DEBUG) + if (w - d >= e) /* (this test assumes unsigned comparison) */ + { + memcpy(slide + w, slide + d, e); + w += e; + d += e; + } + else /* do it slow to avoid memcpy() overlap */ +#endif /* !NOMEMCPY */ + do { + slide[w++] = slide[d++]; + Tracevv((stderr, "%c", slide[w-1])); + } while (--e); + if (w == WSIZE) + { + flush_output(w); + w = 0; + } + } while (n); + } + } + + + /* restore the globals from the locals */ + wp = w; /* restore global window pointer */ + bb = b; /* restore global bit buffer */ + bk = k; + + /* done */ + return 0; + + underrun: + return 4; /* Input underrun */ +} + + + +STATIC int INIT inflate_stored(void) +/* "decompress" an inflated type 0 (stored) block. */ +{ + unsigned n; /* number of bytes in block */ + unsigned w; /* current window position */ + register ulg b; /* bit buffer */ + register unsigned k; /* number of bits in bit buffer */ + + DEBG(""); + return 0; + + underrun: + return 4; /* Input underrun */ +} + + +/* + * We use `noinline' here to prevent gcc-3.5 from using too much stack space + */ +STATIC int noinline INIT inflate_fixed(void) +/* decompress an inflated type 1 (fixed Huffman codes) block. We should + either replace this with a custom decoder, or at least precompute the + Huffman tables. */ +{ + int i; /* temporary variable */ + struct huft *tl; /* literal/length code table */ + struct huft *td; /* distance code table */ + int bl; /* lookup bits for tl */ + int bd; /* lookup bits for td */ + unsigned *l; /* length list for huft_build */ + + DEBG(" 1) + { + huft_free(tl); + free(l); + + DEBG(">"); + return i; + } + + + /* decompress until an end-of-block code */ + if (inflate_codes(tl, td, bl, bd)) { + free(l); + return 1; + } + + /* free the decoding tables, return */ + free(l); + huft_free(tl); + huft_free(td); + return 0; +} + + +/* + * We use `noinline' here to prevent gcc-3.5 from using too much stack space + */ +STATIC int noinline INIT inflate_dynamic(void) +/* decompress an inflated type 2 (dynamic Huffman codes) block. */ +{ + int i; /* temporary variables */ + unsigned j; + unsigned l; /* last length */ + unsigned m; /* mask for bit lengths table */ + unsigned n; /* number of lengths to get */ + struct huft *tl; /* literal/length code table */ + struct huft *td; /* distance code table */ + int bl; /* lookup bits for tl */ + int bd; /* lookup bits for td */ + unsigned nb; /* number of bit length codes */ + unsigned nl; /* number of literal/length codes */ + unsigned nd; /* number of distance codes */ + unsigned *ll; /* literal/length and distance code lengths */ + register ulg b; /* bit buffer */ + register unsigned k; /* number of bits in bit buffer */ + int ret; + + DEBG(" 288 || nd > 32) +#else + if (nl > 286 || nd > 30) +#endif + { + ret = 1; /* bad lengths */ + goto out; + } + + DEBG("dyn1 "); + + /* read in bit-length-code lengths */ + for (j = 0; j < nb; j++) + { + NEEDBITS(3) + ll[border[j]] = (unsigned)b & 7; + DUMPBITS(3) + } + for (; j < 19; j++) + ll[border[j]] = 0; + + DEBG("dyn2 "); + + /* build decoding table for trees--single level, 7 bit lookup */ + bl = 7; + if ((i = huft_build(ll, 19, 19, NULL, NULL, &tl, &bl)) != 0) + { + if (i == 1) + huft_free(tl); + ret = i; /* incomplete code set */ + goto out; + } + + DEBG("dyn3 "); + + /* read in literal and distance code lengths */ + n = nl + nd; + m = mask_bits[bl]; + i = l = 0; + while ((unsigned)i < n) + { + NEEDBITS((unsigned)bl) + j = (td = tl + ((unsigned)b & m))->b; + DUMPBITS(j) + j = td->v.n; + if (j < 16) /* length of code in bits (0..15) */ + ll[i++] = l = j; /* save last length in l */ + else if (j == 16) /* repeat last length 3 to 6 times */ + { + NEEDBITS(2) + j = 3 + ((unsigned)b & 3); + DUMPBITS(2) + if ((unsigned)i + j > n) { + ret = 1; + goto out; + } + while (j--) + ll[i++] = l; + } + else if (j == 17) /* 3 to 10 zero length codes */ + { + NEEDBITS(3) + j = 3 + ((unsigned)b & 7); + DUMPBITS(3) + if ((unsigned)i + j > n) { + ret = 1; + goto out; + } + while (j--) + ll[i++] = 0; + l = 0; + } + else /* j == 18: 11 to 138 zero length codes */ + { + NEEDBITS(7) + j = 11 + ((unsigned)b & 0x7f); + DUMPBITS(7) + if ((unsigned)i + j > n) { + ret = 1; + goto out; + } + while (j--) + ll[i++] = 0; + l = 0; + } + } + + DEBG("dyn4 "); + + /* free decoding table for trees */ + huft_free(tl); + + DEBG("dyn5 "); + + /* restore the global bit buffer */ + bb = b; + bk = k; + + DEBG("dyn5a "); + + /* build the decoding tables for literal/length and distance codes */ + bl = lbits; + if ((i = huft_build(ll, nl, 257, cplens, cplext, &tl, &bl)) != 0) + { + DEBG("dyn5b "); + if (i == 1) { + error("incomplete literal tree"); + huft_free(tl); + } + ret = i; /* incomplete code set */ + goto out; + } + DEBG("dyn5c "); + bd = dbits; + if ((i = huft_build(ll + nl, nd, 0, cpdist, cpdext, &td, &bd)) != 0) + { + DEBG("dyn5d "); + if (i == 1) { + error("incomplete distance tree"); +#ifdef PKZIP_BUG_WORKAROUND + i = 0; + } +#else + huft_free(td); + } + huft_free(tl); + ret = i; /* incomplete code set */ + goto out; +#endif +} + +DEBG("dyn6 "); + + /* decompress until an end-of-block code */ +if (inflate_codes(tl, td, bl, bd)) { + ret = 1; + goto out; +} + +DEBG("dyn7 "); + + /* free the decoding tables, return */ +huft_free(tl); +huft_free(td); + +DEBG(">"); +ret = 0; +out: +free(ll); +return ret; + +underrun: +ret = 4; /* Input underrun */ +goto out; +} + + + +STATIC int INIT inflate_block( +int *e /* last block flag */ +) +/* decompress an inflated block */ +{ +unsigned t; /* block type */ +register ulg b; /* bit buffer */ +register unsigned k; /* number of bits in bit buffer */ + +DEBG(""); + + /* bad block type */ + return 2; + + underrun: + return 4; /* Input underrun */ +} + + + +STATIC int INIT inflate(void) +/* decompress an inflated entry */ +{ + int e; /* last block flag */ + int r; /* result code */ + unsigned h; /* maximum struct huft's malloc'ed */ + + /* initialize window, bit buffer */ + wp = 0; + bk = 0; + bb = 0; + + + /* decompress until the last block */ + h = 0; + do { + hufts = 0; +#ifdef ARCH_HAS_DECOMP_WDOG + arch_decomp_wdog(); +#endif + r = inflate_block(&e); + if (r) + return r; + if (hufts > h) + h = hufts; + } while (!e); + + /* Undo too much lookahead. The next read will be byte aligned so we + * can discard unused bits in the last meaningful byte. + */ + while (bk >= 8) { + bk -= 8; + inptr--; + } + + /* flush out slide */ + flush_output(wp); + + + /* return success */ +#ifdef DEBUG + fprintf(stderr, "<%u> ", h); +#endif /* DEBUG */ + return 0; +} + +/********************************************************************** + * + * The following are support routines for inflate.c + * + **********************************************************************/ + +static ulg crc_32_tab[256]; +static ulg crc; /* initialized in makecrc() so it'll reside in bss */ +#define CRC_VALUE (crc ^ 0xffffffffUL) + +/* + * Code to compute the CRC-32 table. Borrowed from + * gzip-1.0.3/makecrc.c. + */ + +static void INIT +makecrc(void) +{ +/* Not copyrighted 1990 Mark Adler */ + + unsigned long c; /* crc shift register */ + unsigned long e; /* polynomial exclusive-or pattern */ + int i; /* counter for all possible eight bit values */ + int k; /* byte being shifted into crc apparatus */ + + /* terms of polynomial defining this crc (except x^32): */ + static const int p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26}; + + /* Make exclusive-or pattern from polynomial */ + e = 0; + for (i = 0; i < sizeof(p)/sizeof(int); i++) + e |= 1L << (31 - p[i]); + + crc_32_tab[0] = 0; + + for (i = 1; i < 256; i++) + { + c = 0; + for (k = i | 256; k != 1; k >>= 1) + { + c = c & 1 ? (c >> 1) ^ e : c >> 1; + if (k & 1) + c ^= e; + } + crc_32_tab[i] = c; + } + + /* this is initialized here so this code could reside in ROM */ + crc = (ulg)0xffffffffUL; /* shift register contents */ +} + +/* gzip flag byte */ +#define ASCII_FLAG 0x01 /* bit 0 set: file probably ASCII text */ +#define CONTINUATION 0x02 /* bit 1 set: continuation of multi-part gzip file */ +#define EXTRA_FIELD 0x04 /* bit 2 set: extra field present */ +#define ORIG_NAME 0x08 /* bit 3 set: original file name present */ +#define COMMENT 0x10 /* bit 4 set: file comment present */ +#define ENCRYPTED 0x20 /* bit 5 set: file is encrypted */ +#define RESERVED 0xC0 /* bit 6,7: reserved */ + +/* + * Do the uncompression! + */ +static int INIT gunzip(void) +{ + uch flags; + unsigned char magic[2]; /* magic header */ + char method; + ulg orig_crc = 0; /* original crc */ + ulg orig_len = 0; /* original uncompressed length */ + int res; + + magic[0] = NEXTBYTE(); + magic[1] = NEXTBYTE(); + method = NEXTBYTE(); + + if (magic[0] != 037 || + ((magic[1] != 0213) && (magic[1] != 0236))) { + error("bad gzip magic numbers"); + return -1; + } + + /* We only support method #8, DEFLATED */ + if (method != 8) { + error("internal error, invalid method"); + return -1; + } + + flags = (uch)get_byte(); + if ((flags & ENCRYPTED) != 0) { + error("Input is encrypted"); + return -1; + } + if ((flags & CONTINUATION) != 0) { + error("Multi part input"); + return -1; + } + if ((flags & RESERVED) != 0) { + error("Input has invalid flags"); + return -1; + } + NEXTBYTE(); /* Get timestamp */ + NEXTBYTE(); + NEXTBYTE(); + NEXTBYTE(); + + (void)NEXTBYTE(); /* Ignore extra flags for the moment */ + (void)NEXTBYTE(); /* Ignore OS type for the moment */ + + if ((flags & EXTRA_FIELD) != 0) { + unsigned len = (unsigned)NEXTBYTE(); + len |= ((unsigned)NEXTBYTE())<<8; + while (len--) (void)NEXTBYTE(); + } + + /* Get original file name if it was truncated */ + if ((flags & ORIG_NAME) != 0) { + /* Discard the old name */ + while (NEXTBYTE() != 0) /* null */ ; + } + + /* Discard file comment if any */ + if ((flags & COMMENT) != 0) { + while (NEXTBYTE() != 0) /* null */ ; + } + + /* Decompress */ + if ((res = inflate())) { + switch (res) { + case 0: + break; + case 1: + error("invalid compressed format (err=1)"); + break; + case 2: + error("invalid compressed format (err=2)"); + break; + case 3: + error("out of memory"); + break; + case 4: + error("out of input data"); + break; + default: + error("invalid compressed format (other)"); + } + return -1; + } + + /* Get the crc and original length */ + /* crc32 (see algorithm.doc) + * uncompressed input size modulo 2^32 + */ + orig_crc = (ulg) NEXTBYTE(); + orig_crc |= (ulg) NEXTBYTE() << 8; + orig_crc |= (ulg) NEXTBYTE() << 16; + orig_crc |= (ulg) NEXTBYTE() << 24; + + orig_len = (ulg) NEXTBYTE(); + orig_len |= (ulg) NEXTBYTE() << 8; + orig_len |= (ulg) NEXTBYTE() << 16; + orig_len |= (ulg) NEXTBYTE() << 24; + + /* Validate decompression */ + if (orig_crc != CRC_VALUE) { + error("crc error"); + return -1; + } + if (orig_len != bytes_out) { + error("length error"); + return -1; + } + return 0; + + underrun: /* NEXTBYTE() goto's here if needed */ + error("out of input data"); + return -1; +} --- a/xen/include/xen/sched.h.19075 2009-01-05 12:27:01.000000000 +0100 +++ b/xen/include/xen/sched.h 2009-02-03 12:03:52.000000000 +0100 @@ -345,7 +345,8 @@ struct domain *domain_create( int construct_dom0( struct domain *d, - unsigned long image_start, unsigned long image_len, + unsigned long image_base, + unsigned long image_start, unsigned long image_len, unsigned long initrd_start, unsigned long initrd_len, char *cmdline); xen-backport-hg19108.patch: --- NEW FILE xen-backport-hg19108.patch --- # HG changeset patch # User Keir Fraser # Date 1233191510 0 # Node ID 3449d8e50fb92c1477feab5e8703c8ddf6f08596 # Parent 0858f961c77a4ef463d061a9f06e4f83ee95399f x86: Do not check dom0 kernel header for bzimage magic until we are sure it is mapped. This fixes a crash when running on top of tboot. Signed-off-by: Joseph Cihula diff -up xen-3.3.1/xen/arch/x86/setup.c.orig xen-3.3.1/xen/arch/x86/setup.c --- xen-3.3.1/xen/arch/x86/setup.c.orig 2009-02-03 12:22:38.000000000 +0100 +++ xen-3.3.1/xen/arch/x86/setup.c 2009-02-03 12:23:17.000000000 +0100 @@ -417,7 +417,7 @@ void __init __start_xen(unsigned long mb unsigned int initrdidx = 1; multiboot_info_t *mbi = __va(mbi_p); module_t *mod = (module_t *)__va(mbi->mods_addr); - unsigned long nr_pages, modules_length, modules_headroom; + unsigned long nr_pages, modules_length, modules_headroom = -1; int i, e820_warn = 0, bytes = 0; struct ns16550_defaults ns16550 = { .data_bits = 8, @@ -633,9 +633,6 @@ void __init __start_xen(unsigned long mb * x86/64, we relocate Xen to higher memory. */ modules_length = mod[mbi->mods_count-1].mod_end - mod[0].mod_start; - modules_headroom = bzimage_headroom( - (char *)(unsigned long)mod[0].mod_start, - (unsigned long)(mod[0].mod_end - mod[0].mod_start)); for ( i = boot_e820.nr_map-1; i >= 0; i-- ) { @@ -739,6 +736,11 @@ void __init __start_xen(unsigned long mb } #endif + if ( modules_headroom == -1 ) + modules_headroom = bzimage_headroom( + (char *)(unsigned long)mod[0].mod_start, + (unsigned long)(mod[0].mod_end - mod[0].mod_start)); + /* Is the region suitable for relocating the multiboot modules? */ if ( !initial_images_start && (s < e) && ((e-s) >= (modules_length+modules_headroom)) ) xen-backport-hg19109.patch: --- NEW FILE xen-backport-hg19109.patch --- # HG changeset patch # User Keir Fraser # Date 1233191790 0 # Node ID 1bd06ed9369d5ebc196f893661921948d9965211 # Parent 3449d8e50fb92c1477feab5e8703c8ddf6f08596 x86: bzimage_headroom does not return -ve error codes. Signed-off-by: Keir Fraser diff -r 3449d8e50fb9 -r 1bd06ed9369d xen/arch/x86/bzimage.c --- a/xen/arch/x86/bzimage.c Thu Jan 29 01:11:50 2009 +0000 +++ b/xen/arch/x86/bzimage.c Thu Jan 29 01:16:30 2009 +0000 @@ -185,7 +185,7 @@ if ( hdr->version < VERSION(2,8) ) { printk("Cannot load bzImage v%d.%02d at least v2.08 is required\n", hdr->version >> 8, hdr->version & 0xff); - return -EINVAL; + return 0; } return 1; } xen-backport-hg19110.patch: --- NEW FILE xen-backport-hg19110.patch --- # HG changeset patch # User Keir Fraser # Date 1233228489 0 # Node ID a8c342f352c385cd42c4f22fdbb90860c4c6802f # Parent 1bd06ed9369d5ebc196f893661921948d9965211 x86: Although bzimage_headroom() doesn't return -ve values, bzimage_parse() can. Signed-off-by: Keir Fraser diff -r 1bd06ed9369d -r a8c342f352c3 xen/arch/x86/bzimage.c --- a/xen/arch/x86/bzimage.c Thu Jan 29 01:16:30 2009 +0000 +++ b/xen/arch/x86/bzimage.c Thu Jan 29 11:28:09 2009 +0000 @@ -185,7 +185,7 @@ if ( hdr->version < VERSION(2,8) ) { printk("Cannot load bzImage v%d.%02d at least v2.08 is required\n", hdr->version >> 8, hdr->version & 0xff); - return 0; + return -EINVAL; } return 1; } @@ -198,7 +198,7 @@ err = bzimage_check(hdr, image_length); if (err < 1) - return err; + return 0; img = image_start + (hdr->setup_sects+1) * 512; img += hdr->payload_offset; Index: xen.spec =================================================================== RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v retrieving revision 1.226 retrieving revision 1.227 diff -u -r1.226 -r1.227 --- xen.spec 18 Jan 2009 17:58:57 -0000 1.226 +++ xen.spec 3 Feb 2009 11:27:57 -0000 1.227 @@ -2,7 +2,7 @@ # Always set these 3 tags %define base_version 3.3.1 -%define base_release 2 +%define base_release 3 # Hypervisor ABI %define hv_abi 3.3 @@ -71,6 +71,10 @@ Patch14: xen-net-disable-bridge-by-default.patch Patch15: xen-net-disable-iptables-on-bridge.patch Patch20: xen-backport-hg18782.patch +Patch21: xen-backport-hg19075.patch +Patch22: xen-backport-hg19108.patch +Patch23: xen-backport-hg19109.patch +Patch24: xen-backport-hg19110.patch # Patches to modify the default config of xend Patch100: xen-config-dom0-minmem.patch @@ -165,6 +169,10 @@ %patch15 -p1 %patch20 -p1 +%patch21 -p1 +%patch22 -p1 +%patch23 -p1 +%patch24 -p1 # config patches %patch100 -p1 @@ -479,6 +487,9 @@ %{_libdir}/*.a %changelog +* Tue Feb 3 2009 Gerd Hoffmann - 3.3.1-3 +- backport bzImage support for dom0 builder. + * Sun Jan 18 2009 Tomas Mraz - 3.3.1-2 - rebuild with new openssl From ehabkost at fedoraproject.org Wed Feb 4 21:31:40 2009 From: ehabkost at fedoraproject.org (Eduardo Habkost) Date: Wed, 4 Feb 2009 21:31:40 +0000 (UTC) Subject: [fedora-virt-maint] rpms/kvm/devel kvm.spec,1.84,1.85 Message-ID: <20090204213140.1B1B770130@cvs1.fedora.phx.redhat.com> Author: ehabkost Update of /cvs/pkgs/rpms/kvm/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13874 Modified Files: kvm.spec Log Message: Package kvmtrace and kvm_stat on kvm-tools subpackage (bz#480942) Index: kvm.spec =================================================================== RCS file: /cvs/pkgs/rpms/kvm/devel/kvm.spec,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- kvm.spec 27 Jan 2009 12:14:15 -0000 1.84 +++ kvm.spec 4 Feb 2009 21:31:09 -0000 1.85 @@ -1,7 +1,7 @@ Summary: Kernel-based Virtual Machine Name: kvm Version: 83 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ and LGPLv2+ Group: Development/Tools URL: http://%{name}.sf.net @@ -31,6 +31,11 @@ Requires: etherboot-roms-kvm +%package tools +Summary: KVM debugging and diagnostics tools +Group: Development/Tools + + %description KVM (for Kernel-based Virtual Machine) is a full virtualization solution for Linux on x86 hardware. @@ -39,6 +44,12 @@ or Windows images. Each virtual machine has private virtualized hardware: a network card, disk, graphics adapter, etc. + +%description tools +This package contains some diagnostics and debugging tools for KVM, +such as kvmtrace and kvm_stat. + + %prep %setup -q @@ -125,6 +136,7 @@ install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules/kvm.modules install -m 0755 user/kvmtrace %{buildroot}/%{_bindir}/ install -m 0755 user/kvmtrace_format %{buildroot}/%{_bindir}/ +install -m 0755 kvm_stat %{buildroot}/%{_bindir}/ # the pxe etherboot images will be symlinks to the images on # /usr/share/etherboot, as KVM doesn't know how to look @@ -151,8 +163,6 @@ %files %defattr(-,root,root,-) -%{_bindir}/kvmtrace -%{_bindir}/kvmtrace_format %{_bindir}/qemu-kvm %{_bindir}/qemu-nbd @@ -176,7 +186,18 @@ %{_sysconfdir}/sysconfig/modules/%{name}.modules + +%files tools +%defattr(-,root,root,-) +%{_bindir}/kvmtrace +%{_bindir}/kvmtrace_format +%{_bindir}/kvm_stat + + %changelog +* Wed Feb 04 2009 Eduardo Habkost - 83-3 +- Package kvmtrace and kvm_stat on kvm-tools subpackage (bz#480942) + * Tue Jan 20 2009 Warren Togami - 83-2 - sdl sound output to avoid grabbing OSS and causing pulseaudio failure From berrange at fedoraproject.org Fri Feb 6 19:28:51 2009 From: berrange at fedoraproject.org (Daniel P. Berrange) Date: Fri, 6 Feb 2009 19:28:51 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libvirt/devel libvirt-0.6.0-rpccall.patch, NONE, 1.1 libvirt-0.6.0-timeout.patch, NONE, 1.1 libvirt.spec, 1.108, 1.109 sources, 1.37, 1.38 Message-ID: <20090206192851.7DE86700FB@cvs1.fedora.phx.redhat.com> Author: berrange Update of /cvs/pkgs/rpms/libvirt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13505 Modified Files: libvirt.spec sources Added Files: libvirt-0.6.0-rpccall.patch libvirt-0.6.0-timeout.patch Log Message: Fix libvirtd --timeout usage Fix RPC call problems and QEMU startup handling (rhbz #484414) Fix unowned directories (rhbz #483442) libvirt-0.6.0-rpccall.patch: --- NEW FILE libvirt-0.6.0-rpccall.patch --- ? mingw-fixes Index: qemud/event.c =================================================================== RCS file: /data/cvs/libvirt/qemud/event.c,v retrieving revision 1.17 diff -u -p -u -p -r1.17 event.c --- qemud/event.c 22 Dec 2008 12:55:47 -0000 1.17 +++ qemud/event.c 5 Feb 2009 17:12:51 -0000 @@ -653,6 +653,8 @@ virPollEventToEventHandleType(int events ret |= VIR_EVENT_HANDLE_WRITABLE; if(events & POLLERR) ret |= VIR_EVENT_HANDLE_ERROR; + if(events & POLLNVAL) /* Treat NVAL as error, since libvirt doesn't distinguish */ + ret |= VIR_EVENT_HANDLE_ERROR; if(events & POLLHUP) ret |= VIR_EVENT_HANDLE_HANGUP; return ret; Index: src/domain_conf.c =================================================================== RCS file: /data/cvs/libvirt/src/domain_conf.c,v retrieving revision 1.64 diff -u -p -u -p -r1.64 domain_conf.c --- src/domain_conf.c 30 Jan 2009 21:52:22 -0000 1.64 +++ src/domain_conf.c 5 Feb 2009 17:12:51 -0000 @@ -504,6 +504,7 @@ virDomainObjPtr virDomainAssignDef(virCo domain->state = VIR_DOMAIN_SHUTOFF; domain->def = def; domain->monitor_watch = -1; + domain->monitor = -1; if (VIR_REALLOC_N(doms->objs, doms->count + 1) < 0) { virReportOOMError(conn); Index: src/remote_internal.c =================================================================== RCS file: /data/cvs/libvirt/src/remote_internal.c,v retrieving revision 1.136 diff -u -p -u -p -r1.136 remote_internal.c --- src/remote_internal.c 3 Feb 2009 13:08:07 -0000 1.136 +++ src/remote_internal.c 5 Feb 2009 17:12:52 -0000 @@ -6192,17 +6192,17 @@ processCalls(virConnectPtr conn, continue; virReportSystemError(in_open ? NULL : conn, errno, "%s", _("poll on socket failed")); - return -1; + goto error; } if (fds[0].revents & POLLOUT) { if (processCallSend(conn, priv, in_open) < 0) - return -1; + goto error; } if (fds[0].revents & POLLIN) { if (processCallRecv(conn, priv, in_open) < 0) - return -1; + goto error; } /* Iterate through waiting threads and if @@ -6253,9 +6253,21 @@ processCalls(virConnectPtr conn, if (fds[0].revents & (POLLHUP | POLLERR)) { errorf(in_open ? NULL : conn, VIR_ERR_INTERNAL_ERROR, "%s", _("received hangup / error event on socket")); - return -1; + goto error; } } + + +error: + priv->waitDispatch = thiscall->next; + DEBUG("Giving up the buck due to I/O error %d %p %p", thiscall->proc_nr, thiscall, priv->waitDispatch); + /* See if someone else is still waiting + * and if so, then pass the buck ! */ + if (priv->waitDispatch) { + DEBUG("Passing the buck to %d %p", priv->waitDispatch->proc_nr, priv->waitDispatch); + virCondSignal(&priv->waitDispatch->cond); + } + return -1; } /* libvirt-0.6.0-timeout.patch: --- NEW FILE libvirt-0.6.0-timeout.patch --- Index: qemud/event.c =================================================================== RCS file: /data/cvs/libvirt/qemud/event.c,v retrieving revision 1.17 diff -u -p -u -r1.17 event.c --- qemud/event.c 22 Dec 2008 12:55:47 -0000 1.17 +++ qemud/event.c 4 Feb 2009 15:08:06 -0000 @@ -68,6 +68,7 @@ struct virEventTimeout { /* State for the main event loop */ struct virEventLoop { pthread_mutex_t lock; + int running; pthread_t leader; int wakeupfd[2]; int handlesCount; @@ -521,6 +522,7 @@ int virEventRunOnce(void) { int ret, timeout, nfds; virEventLock(); + eventLoop.running = 1; eventLoop.leader = pthread_self(); if ((nfds = virEventMakePollFDs(&fds)) < 0) { virEventUnlock(); @@ -572,7 +574,7 @@ int virEventRunOnce(void) { return -1; } - eventLoop.leader = 0; + eventLoop.running = 0; virEventUnlock(); return 0; } @@ -611,7 +613,9 @@ int virEventInit(void) static int virEventInterruptLocked(void) { char c = '\0'; - if (pthread_self() == eventLoop.leader) + + if (!eventLoop.running || + pthread_self() == eventLoop.leader) return 0; if (safewrite(eventLoop.wakeupfd[1], &c, sizeof(c)) != sizeof(c)) Index: qemud/qemud.c =================================================================== RCS file: /data/cvs/libvirt/qemud/qemud.c,v retrieving revision 1.138 diff -u -p -u -r1.138 qemud.c --- qemud/qemud.c 28 Jan 2009 11:31:39 -0000 1.138 +++ qemud/qemud.c 4 Feb 2009 15:08:06 -0000 @@ -2013,11 +2013,15 @@ static int qemudOneLoop(void) { return 0; } -static void qemudInactiveTimer(int timer ATTRIBUTE_UNUSED, void *data) { +static void qemudInactiveTimer(int timerid, void *data) { struct qemud_server *server = (struct qemud_server *)data; - DEBUG0("Got inactive timer expiry"); - if (!virStateActive()) { - DEBUG0("No state active, shutting down"); + + if (virStateActive() || + server->clients) { + DEBUG0("Timer expired but still active, not shutting down"); + virEventUpdateTimeoutImpl(timerid, -1); + } else { + DEBUG0("Timer expired and inactive, shutting down"); server->shutdown = 1; } } @@ -2048,9 +2052,18 @@ static void qemudFreeClient(struct qemud static int qemudRunLoop(struct qemud_server *server) { int timerid = -1; int ret = -1, i; + int timerActive = 0; virMutexLock(&server->lock); + if (timeout > 0 && + (timerid = virEventAddTimeoutImpl(-1, + qemudInactiveTimer, + server, NULL)) < 0) { + VIR_ERROR0(_("Failed to register shutdown timeout")); + return -1; + } + if (min_workers > max_workers) max_workers = min_workers; @@ -2071,11 +2084,21 @@ static int qemudRunLoop(struct qemud_ser * if any drivers have active state, if not * shutdown after timeout seconds */ - if (timeout > 0 && !virStateActive() && !server->clients) { - timerid = virEventAddTimeoutImpl(timeout*1000, - qemudInactiveTimer, - server, NULL); - DEBUG("Scheduling shutdown timer %d", timerid); + if (timeout > 0) { + if (timerActive) { + if (server->clients) { + DEBUG("Deactivating shutdown timer %d", timerid); + virEventUpdateTimeoutImpl(timerid, -1); + timerActive = 0; + } + } else { + if (!virStateActive() && + !server->clients) { + DEBUG("Activating shutdown timer %d", timerid); + virEventUpdateTimeoutImpl(timerid, timeout * 1000); + timerActive = 1; + } + } } virMutexUnlock(&server->lock); @@ -2129,15 +2152,6 @@ static int qemudRunLoop(struct qemud_ser } } - /* Unregister any timeout that's active, since we - * just had an event processed - */ - if (timerid != -1) { - DEBUG("Removing shutdown timer %d", timerid); - virEventRemoveTimeoutImpl(timerid); - timerid = -1; - } - if (server->shutdown) { ret = 0; break; Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v retrieving revision 1.108 retrieving revision 1.109 diff -u -r1.108 -r1.109 --- libvirt.spec 31 Jan 2009 09:48:47 -0000 1.108 +++ libvirt.spec 6 Feb 2009 19:28:20 -0000 1.109 @@ -47,10 +47,12 @@ Summary: Library providing a simple API virtualization Name: libvirt Version: 0.6.0 -Release: 1%{?dist}%{?extra_release} +Release: 2%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries Source: libvirt-%{version}.tar.gz +Patch1: %{name}-%{version}-timeout.patch +Patch2: %{name}-%{version}-rpccall.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root URL: http://libvirt.org/ BuildRequires: python python-devel @@ -177,6 +179,8 @@ %prep %setup -q +%patch1 -p1 +%patch2 -p1 %build %if ! %{with_xen} @@ -390,6 +394,7 @@ %if %{with_network} %dir %{_localstatedir}/run/libvirt/network/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/network/ +%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/iptables/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/iptables/filter/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/iptables/nat/ %endif @@ -408,6 +413,7 @@ %{_datadir}/PolicyKit/policy/org.libvirt.unix.policy %endif +%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/ %if %{with_qemu} %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/ %endif @@ -457,6 +463,11 @@ %endif %changelog +* Fri Feb 6 2009 Daniel P. Berrange - 0.6.0-2.fc11 +- Fix libvirtd --timeout usage +- Fix RPC call problems and QEMU startup handling (rhbz #484414) +- Fix unowned directories (rhbz #483442) + * Sat Jan 31 2009 Daniel Veillard - 0.6.0-1.fc11 - upstream release 0.6.0 - thread safety of API Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/devel/sources,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- sources 31 Jan 2009 09:48:48 -0000 1.37 +++ sources 6 Feb 2009 19:28:21 -0000 1.38 @@ -1,2 +1 @@ -abc697978e9c66cbc8d8db4fa3f1c1b6 libvirt-0.5.1.tar.gz 8e0120d5452b37179f682031bf0895ea libvirt-0.6.0.tar.gz From berrange at fedoraproject.org Fri Feb 6 19:36:12 2009 From: berrange at fedoraproject.org (Daniel P. Berrange) Date: Fri, 6 Feb 2009 19:36:12 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libvirt/devel libvirt-0.6.0-rpccall.patch, 1.1, 1.2 libvirt-0.6.0-timeout.patch, 1.1, 1.2 Message-ID: <20090206193612.E3298700FB@cvs1.fedora.phx.redhat.com> Author: berrange Update of /cvs/pkgs/rpms/libvirt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15049 Modified Files: libvirt-0.6.0-rpccall.patch libvirt-0.6.0-timeout.patch Log Message: Fix patches to be -p1 not -p0 libvirt-0.6.0-rpccall.patch: Index: libvirt-0.6.0-rpccall.patch =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt-0.6.0-rpccall.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libvirt-0.6.0-rpccall.patch 6 Feb 2009 19:28:20 -0000 1.1 +++ libvirt-0.6.0-rpccall.patch 6 Feb 2009 19:36:12 -0000 1.2 @@ -1,12 +1,7 @@ -? mingw-fixes -Index: qemud/event.c -=================================================================== -RCS file: /data/cvs/libvirt/qemud/event.c,v -retrieving revision 1.17 -diff -u -p -u -p -r1.17 event.c ---- qemud/event.c 22 Dec 2008 12:55:47 -0000 1.17 -+++ qemud/event.c 5 Feb 2009 17:12:51 -0000 -@@ -653,6 +653,8 @@ virPollEventToEventHandleType(int events +diff -rup libvirt-0.6.0.orig/qemud/event.c libvirt-0.6.0.new/qemud/event.c +--- libvirt-0.6.0.orig/qemud/event.c 2009-02-06 19:30:58.000000000 +0000 ++++ libvirt-0.6.0.new/qemud/event.c 2009-02-06 19:30:00.000000000 +0000 +@@ -657,6 +657,8 @@ virPollEventToEventHandleType(int events ret |= VIR_EVENT_HANDLE_WRITABLE; if(events & POLLERR) ret |= VIR_EVENT_HANDLE_ERROR; @@ -15,13 +10,9 @@ if(events & POLLHUP) ret |= VIR_EVENT_HANDLE_HANGUP; return ret; -Index: src/domain_conf.c -=================================================================== -RCS file: /data/cvs/libvirt/src/domain_conf.c,v -retrieving revision 1.64 -diff -u -p -u -p -r1.64 domain_conf.c ---- src/domain_conf.c 30 Jan 2009 21:52:22 -0000 1.64 -+++ src/domain_conf.c 5 Feb 2009 17:12:51 -0000 +diff -rup libvirt-0.6.0.orig/src/domain_conf.c libvirt-0.6.0.new/src/domain_conf.c +--- libvirt-0.6.0.orig/src/domain_conf.c 2009-01-31 09:04:17.000000000 +0000 ++++ libvirt-0.6.0.new/src/domain_conf.c 2009-02-06 19:30:00.000000000 +0000 @@ -504,6 +504,7 @@ virDomainObjPtr virDomainAssignDef(virCo domain->state = VIR_DOMAIN_SHUTOFF; domain->def = def; @@ -30,14 +21,10 @@ if (VIR_REALLOC_N(doms->objs, doms->count + 1) < 0) { virReportOOMError(conn); -Index: src/remote_internal.c -=================================================================== -RCS file: /data/cvs/libvirt/src/remote_internal.c,v -retrieving revision 1.136 -diff -u -p -u -p -r1.136 remote_internal.c ---- src/remote_internal.c 3 Feb 2009 13:08:07 -0000 1.136 -+++ src/remote_internal.c 5 Feb 2009 17:12:52 -0000 -@@ -6192,17 +6192,17 @@ processCalls(virConnectPtr conn, +diff -rup libvirt-0.6.0.orig/src/remote_internal.c libvirt-0.6.0.new/src/remote_internal.c +--- libvirt-0.6.0.orig/src/remote_internal.c 2009-01-31 09:04:18.000000000 +0000 ++++ libvirt-0.6.0.new/src/remote_internal.c 2009-02-06 19:30:00.000000000 +0000 +@@ -6198,17 +6198,17 @@ processCalls(virConnectPtr conn, continue; virReportSystemError(in_open ? NULL : conn, errno, "%s", _("poll on socket failed")); @@ -58,7 +45,7 @@ } /* Iterate through waiting threads and if -@@ -6253,9 +6253,21 @@ processCalls(virConnectPtr conn, +@@ -6259,9 +6259,21 @@ processCalls(virConnectPtr conn, if (fds[0].revents & (POLLHUP | POLLERR)) { errorf(in_open ? NULL : conn, VIR_ERR_INTERNAL_ERROR, "%s", _("received hangup / error event on socket")); libvirt-0.6.0-timeout.patch: Index: libvirt-0.6.0-timeout.patch =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt-0.6.0-timeout.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libvirt-0.6.0-timeout.patch 6 Feb 2009 19:28:20 -0000 1.1 +++ libvirt-0.6.0-timeout.patch 6 Feb 2009 19:36:12 -0000 1.2 @@ -1,10 +1,6 @@ -Index: qemud/event.c -=================================================================== -RCS file: /data/cvs/libvirt/qemud/event.c,v -retrieving revision 1.17 -diff -u -p -u -r1.17 event.c ---- qemud/event.c 22 Dec 2008 12:55:47 -0000 1.17 -+++ qemud/event.c 4 Feb 2009 15:08:06 -0000 +diff -rup libvirt-0.6.0.orig/qemud/event.c libvirt-0.6.0.new/qemud/event.c +--- libvirt-0.6.0.orig/qemud/event.c 2008-12-22 13:02:54.000000000 +0000 ++++ libvirt-0.6.0.new/qemud/event.c 2009-02-06 19:29:28.000000000 +0000 @@ -68,6 +68,7 @@ struct virEventTimeout { /* State for the main event loop */ struct virEventLoop { @@ -41,13 +37,9 @@ return 0; if (safewrite(eventLoop.wakeupfd[1], &c, sizeof(c)) != sizeof(c)) -Index: qemud/qemud.c -=================================================================== -RCS file: /data/cvs/libvirt/qemud/qemud.c,v -retrieving revision 1.138 -diff -u -p -u -r1.138 qemud.c ---- qemud/qemud.c 28 Jan 2009 11:31:39 -0000 1.138 -+++ qemud/qemud.c 4 Feb 2009 15:08:06 -0000 +diff -rup libvirt-0.6.0.orig/qemud/qemud.c libvirt-0.6.0.new/qemud/qemud.c +--- libvirt-0.6.0.orig/qemud/qemud.c 2009-01-31 09:04:17.000000000 +0000 ++++ libvirt-0.6.0.new/qemud/qemud.c 2009-02-06 19:29:28.000000000 +0000 @@ -2013,11 +2013,15 @@ static int qemudOneLoop(void) { return 0; } From berrange at fedoraproject.org Fri Feb 6 20:01:32 2009 From: berrange at fedoraproject.org (Daniel P. Berrange) Date: Fri, 6 Feb 2009 20:01:32 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libvirt/F-9 libvirt-0.6.0-rpccall.patch, NONE, 1.1 libvirt-0.6.0-timeout.patch, NONE, 1.1 libvirt.spec, 1.98, 1.99 sources, 1.36, 1.37 Message-ID: <20090206200132.9314C700FB@cvs1.fedora.phx.redhat.com> Author: berrange Update of /cvs/pkgs/rpms/libvirt/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18995 Modified Files: libvirt.spec sources Added Files: libvirt-0.6.0-rpccall.patch libvirt-0.6.0-timeout.patch Log Message: Fix libvirtd --timeout usage Fix RPC call problems and QEMU startup handling (rhbz #484414) Fix unowned directories (rhbz #483442) libvirt-0.6.0-rpccall.patch: --- NEW FILE libvirt-0.6.0-rpccall.patch --- diff -rup libvirt-0.6.0.orig/qemud/event.c libvirt-0.6.0.new/qemud/event.c --- libvirt-0.6.0.orig/qemud/event.c 2009-02-06 19:30:58.000000000 +0000 +++ libvirt-0.6.0.new/qemud/event.c 2009-02-06 19:30:00.000000000 +0000 @@ -657,6 +657,8 @@ virPollEventToEventHandleType(int events ret |= VIR_EVENT_HANDLE_WRITABLE; if(events & POLLERR) ret |= VIR_EVENT_HANDLE_ERROR; + if(events & POLLNVAL) /* Treat NVAL as error, since libvirt doesn't distinguish */ + ret |= VIR_EVENT_HANDLE_ERROR; if(events & POLLHUP) ret |= VIR_EVENT_HANDLE_HANGUP; return ret; diff -rup libvirt-0.6.0.orig/src/domain_conf.c libvirt-0.6.0.new/src/domain_conf.c --- libvirt-0.6.0.orig/src/domain_conf.c 2009-01-31 09:04:17.000000000 +0000 +++ libvirt-0.6.0.new/src/domain_conf.c 2009-02-06 19:30:00.000000000 +0000 @@ -504,6 +504,7 @@ virDomainObjPtr virDomainAssignDef(virCo domain->state = VIR_DOMAIN_SHUTOFF; domain->def = def; domain->monitor_watch = -1; + domain->monitor = -1; if (VIR_REALLOC_N(doms->objs, doms->count + 1) < 0) { virReportOOMError(conn); diff -rup libvirt-0.6.0.orig/src/remote_internal.c libvirt-0.6.0.new/src/remote_internal.c --- libvirt-0.6.0.orig/src/remote_internal.c 2009-01-31 09:04:18.000000000 +0000 +++ libvirt-0.6.0.new/src/remote_internal.c 2009-02-06 19:30:00.000000000 +0000 @@ -6198,17 +6198,17 @@ processCalls(virConnectPtr conn, continue; virReportSystemError(in_open ? NULL : conn, errno, "%s", _("poll on socket failed")); - return -1; + goto error; } if (fds[0].revents & POLLOUT) { if (processCallSend(conn, priv, in_open) < 0) - return -1; + goto error; } if (fds[0].revents & POLLIN) { if (processCallRecv(conn, priv, in_open) < 0) - return -1; + goto error; } /* Iterate through waiting threads and if @@ -6259,9 +6259,21 @@ processCalls(virConnectPtr conn, if (fds[0].revents & (POLLHUP | POLLERR)) { errorf(in_open ? NULL : conn, VIR_ERR_INTERNAL_ERROR, "%s", _("received hangup / error event on socket")); - return -1; + goto error; } } + + +error: + priv->waitDispatch = thiscall->next; + DEBUG("Giving up the buck due to I/O error %d %p %p", thiscall->proc_nr, thiscall, priv->waitDispatch); + /* See if someone else is still waiting + * and if so, then pass the buck ! */ + if (priv->waitDispatch) { + DEBUG("Passing the buck to %d %p", priv->waitDispatch->proc_nr, priv->waitDispatch); + virCondSignal(&priv->waitDispatch->cond); + } + return -1; } /* libvirt-0.6.0-timeout.patch: --- NEW FILE libvirt-0.6.0-timeout.patch --- diff -rup libvirt-0.6.0.orig/qemud/event.c libvirt-0.6.0.new/qemud/event.c --- libvirt-0.6.0.orig/qemud/event.c 2008-12-22 13:02:54.000000000 +0000 +++ libvirt-0.6.0.new/qemud/event.c 2009-02-06 19:29:28.000000000 +0000 @@ -68,6 +68,7 @@ struct virEventTimeout { /* State for the main event loop */ struct virEventLoop { pthread_mutex_t lock; + int running; pthread_t leader; int wakeupfd[2]; int handlesCount; @@ -521,6 +522,7 @@ int virEventRunOnce(void) { int ret, timeout, nfds; virEventLock(); + eventLoop.running = 1; eventLoop.leader = pthread_self(); if ((nfds = virEventMakePollFDs(&fds)) < 0) { virEventUnlock(); @@ -572,7 +574,7 @@ int virEventRunOnce(void) { return -1; } - eventLoop.leader = 0; + eventLoop.running = 0; virEventUnlock(); return 0; } @@ -611,7 +613,9 @@ int virEventInit(void) static int virEventInterruptLocked(void) { char c = '\0'; - if (pthread_self() == eventLoop.leader) + + if (!eventLoop.running || + pthread_self() == eventLoop.leader) return 0; if (safewrite(eventLoop.wakeupfd[1], &c, sizeof(c)) != sizeof(c)) diff -rup libvirt-0.6.0.orig/qemud/qemud.c libvirt-0.6.0.new/qemud/qemud.c --- libvirt-0.6.0.orig/qemud/qemud.c 2009-01-31 09:04:17.000000000 +0000 +++ libvirt-0.6.0.new/qemud/qemud.c 2009-02-06 19:29:28.000000000 +0000 @@ -2013,11 +2013,15 @@ static int qemudOneLoop(void) { return 0; } -static void qemudInactiveTimer(int timer ATTRIBUTE_UNUSED, void *data) { +static void qemudInactiveTimer(int timerid, void *data) { struct qemud_server *server = (struct qemud_server *)data; - DEBUG0("Got inactive timer expiry"); - if (!virStateActive()) { - DEBUG0("No state active, shutting down"); + + if (virStateActive() || + server->clients) { + DEBUG0("Timer expired but still active, not shutting down"); + virEventUpdateTimeoutImpl(timerid, -1); + } else { + DEBUG0("Timer expired and inactive, shutting down"); server->shutdown = 1; } } @@ -2048,9 +2052,18 @@ static void qemudFreeClient(struct qemud static int qemudRunLoop(struct qemud_server *server) { int timerid = -1; int ret = -1, i; + int timerActive = 0; virMutexLock(&server->lock); + if (timeout > 0 && + (timerid = virEventAddTimeoutImpl(-1, + qemudInactiveTimer, + server, NULL)) < 0) { + VIR_ERROR0(_("Failed to register shutdown timeout")); + return -1; + } + if (min_workers > max_workers) max_workers = min_workers; @@ -2071,11 +2084,21 @@ static int qemudRunLoop(struct qemud_ser * if any drivers have active state, if not * shutdown after timeout seconds */ - if (timeout > 0 && !virStateActive() && !server->clients) { - timerid = virEventAddTimeoutImpl(timeout*1000, - qemudInactiveTimer, - server, NULL); - DEBUG("Scheduling shutdown timer %d", timerid); + if (timeout > 0) { + if (timerActive) { + if (server->clients) { + DEBUG("Deactivating shutdown timer %d", timerid); + virEventUpdateTimeoutImpl(timerid, -1); + timerActive = 0; + } + } else { + if (!virStateActive() && + !server->clients) { + DEBUG("Activating shutdown timer %d", timerid); + virEventUpdateTimeoutImpl(timerid, timeout * 1000); + timerActive = 1; + } + } } virMutexUnlock(&server->lock); @@ -2129,15 +2152,6 @@ static int qemudRunLoop(struct qemud_ser } } - /* Unregister any timeout that's active, since we - * just had an event processed - */ - if (timerid != -1) { - DEBUG("Removing shutdown timer %d", timerid); - virEventRemoveTimeoutImpl(timerid); - timerid = -1; - } - if (server->shutdown) { ret = 0; break; Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/F-9/libvirt.spec,v retrieving revision 1.98 retrieving revision 1.99 diff -u -r1.98 -r1.99 --- libvirt.spec 31 Jan 2009 10:16:17 -0000 1.98 +++ libvirt.spec 6 Feb 2009 20:01:02 -0000 1.99 @@ -47,10 +47,12 @@ Summary: Library providing a simple API virtualization Name: libvirt Version: 0.6.0 -Release: 1%{?dist}%{?extra_release} +Release: 2%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries Source: libvirt-%{version}.tar.gz +Patch1: %{name}-%{version}-timeout.patch +Patch2: %{name}-%{version}-rpccall.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root URL: http://libvirt.org/ BuildRequires: python python-devel @@ -177,6 +179,8 @@ %prep %setup -q +%patch1 -p1 +%patch2 -p1 %build %if ! %{with_xen} @@ -390,6 +394,7 @@ %if %{with_network} %dir %{_localstatedir}/run/libvirt/network/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/network/ +%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/iptables/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/iptables/filter/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/iptables/nat/ %endif @@ -408,6 +413,7 @@ %{_datadir}/PolicyKit/policy/org.libvirt.unix.policy %endif +%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/ %if %{with_qemu} %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/ %endif @@ -457,6 +463,11 @@ %endif %changelog +* Fri Feb 6 2009 Daniel P. Berrange - 0.6.0-2.fc9 +- Fix libvirtd --timeout usage +- Fix RPC call problems and QEMU startup handling (rhbz #484414) +- Fix unowned directories (rhbz #483442) + * Sat Jan 31 2009 Daniel Veillard - 0.6.0-1.fc9 - upstream release 0.6.0 - thread safety of API Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/F-9/sources,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- sources 31 Jan 2009 10:16:17 -0000 1.36 +++ sources 6 Feb 2009 20:01:02 -0000 1.37 @@ -1,2 +1 @@ -abc697978e9c66cbc8d8db4fa3f1c1b6 libvirt-0.5.1.tar.gz 8e0120d5452b37179f682031bf0895ea libvirt-0.6.0.tar.gz From berrange at fedoraproject.org Fri Feb 6 20:23:01 2009 From: berrange at fedoraproject.org (Daniel P. Berrange) Date: Fri, 6 Feb 2009 20:23:01 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libvirt/F-10 libvirt-0.6.0-rpccall2.patch, NONE, 1.1 libvirt-0.6.0-timeout.patch, NONE, 1.1 libvirt.spec, 1.107, 1.108 sources, 1.37, 1.38 Message-ID: <20090206202301.077F0700FB@cvs1.fedora.phx.redhat.com> Author: berrange Update of /cvs/pkgs/rpms/libvirt/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22995 Modified Files: libvirt.spec sources Added Files: libvirt-0.6.0-rpccall2.patch libvirt-0.6.0-timeout.patch Log Message: Fix libvirtd --timeout usage Fix RPC call problems and QEMU startup handling (rhbz #484414) Fix unowned directories (rhbz #483442) libvirt-0.6.0-rpccall2.patch: --- NEW FILE libvirt-0.6.0-rpccall2.patch --- diff -rup libvirt-0.6.0.orig/qemud/event.c libvirt-0.6.0.new/qemud/event.c --- libvirt-0.6.0.orig/qemud/event.c 2009-02-06 19:30:58.000000000 +0000 +++ libvirt-0.6.0.new/qemud/event.c 2009-02-06 19:30:00.000000000 +0000 @@ -657,6 +657,8 @@ virPollEventToEventHandleType(int events ret |= VIR_EVENT_HANDLE_WRITABLE; if(events & POLLERR) ret |= VIR_EVENT_HANDLE_ERROR; + if(events & POLLNVAL) /* Treat NVAL as error, since libvirt doesn't distinguish */ + ret |= VIR_EVENT_HANDLE_ERROR; if(events & POLLHUP) ret |= VIR_EVENT_HANDLE_HANGUP; return ret; diff -rup libvirt-0.6.0.orig/src/domain_conf.c libvirt-0.6.0.new/src/domain_conf.c --- libvirt-0.6.0.orig/src/domain_conf.c 2009-01-31 09:04:17.000000000 +0000 +++ libvirt-0.6.0.new/src/domain_conf.c 2009-02-06 19:30:00.000000000 +0000 @@ -504,6 +504,7 @@ virDomainObjPtr virDomainAssignDef(virCo domain->state = VIR_DOMAIN_SHUTOFF; domain->def = def; domain->monitor_watch = -1; + domain->monitor = -1; if (VIR_REALLOC_N(doms->objs, doms->count + 1) < 0) { virReportOOMError(conn); diff -rup libvirt-0.6.0.orig/src/remote_internal.c libvirt-0.6.0.new/src/remote_internal.c --- libvirt-0.6.0.orig/src/remote_internal.c 2009-01-31 09:04:18.000000000 +0000 +++ libvirt-0.6.0.new/src/remote_internal.c 2009-02-06 19:30:00.000000000 +0000 @@ -6198,17 +6198,17 @@ processCalls(virConnectPtr conn, continue; virReportSystemError(in_open ? NULL : conn, errno, "%s", _("poll on socket failed")); - return -1; + goto error; } if (fds[0].revents & POLLOUT) { if (processCallSend(conn, priv, in_open) < 0) - return -1; + goto error; } if (fds[0].revents & POLLIN) { if (processCallRecv(conn, priv, in_open) < 0) - return -1; + goto error; } /* Iterate through waiting threads and if @@ -6259,9 +6259,21 @@ processCalls(virConnectPtr conn, if (fds[0].revents & (POLLHUP | POLLERR)) { errorf(in_open ? NULL : conn, VIR_ERR_INTERNAL_ERROR, "%s", _("received hangup / error event on socket")); - return -1; + goto error; } } + + +error: + priv->waitDispatch = thiscall->next; + DEBUG("Giving up the buck due to I/O error %d %p %p", thiscall->proc_nr, thiscall, priv->waitDispatch); + /* See if someone else is still waiting + * and if so, then pass the buck ! */ + if (priv->waitDispatch) { + DEBUG("Passing the buck to %d %p", priv->waitDispatch->proc_nr, priv->waitDispatch); + virCondSignal(&priv->waitDispatch->cond); + } + return -1; } /* libvirt-0.6.0-timeout.patch: --- NEW FILE libvirt-0.6.0-timeout.patch --- diff -rup libvirt-0.6.0.orig/qemud/event.c libvirt-0.6.0.new/qemud/event.c --- libvirt-0.6.0.orig/qemud/event.c 2008-12-22 13:02:54.000000000 +0000 +++ libvirt-0.6.0.new/qemud/event.c 2009-02-06 19:29:28.000000000 +0000 @@ -68,6 +68,7 @@ struct virEventTimeout { /* State for the main event loop */ struct virEventLoop { pthread_mutex_t lock; + int running; pthread_t leader; int wakeupfd[2]; int handlesCount; @@ -521,6 +522,7 @@ int virEventRunOnce(void) { int ret, timeout, nfds; virEventLock(); + eventLoop.running = 1; eventLoop.leader = pthread_self(); if ((nfds = virEventMakePollFDs(&fds)) < 0) { virEventUnlock(); @@ -572,7 +574,7 @@ int virEventRunOnce(void) { return -1; } - eventLoop.leader = 0; + eventLoop.running = 0; virEventUnlock(); return 0; } @@ -611,7 +613,9 @@ int virEventInit(void) static int virEventInterruptLocked(void) { char c = '\0'; - if (pthread_self() == eventLoop.leader) + + if (!eventLoop.running || + pthread_self() == eventLoop.leader) return 0; if (safewrite(eventLoop.wakeupfd[1], &c, sizeof(c)) != sizeof(c)) diff -rup libvirt-0.6.0.orig/qemud/qemud.c libvirt-0.6.0.new/qemud/qemud.c --- libvirt-0.6.0.orig/qemud/qemud.c 2009-01-31 09:04:17.000000000 +0000 +++ libvirt-0.6.0.new/qemud/qemud.c 2009-02-06 19:29:28.000000000 +0000 @@ -2013,11 +2013,15 @@ static int qemudOneLoop(void) { return 0; } -static void qemudInactiveTimer(int timer ATTRIBUTE_UNUSED, void *data) { +static void qemudInactiveTimer(int timerid, void *data) { struct qemud_server *server = (struct qemud_server *)data; - DEBUG0("Got inactive timer expiry"); - if (!virStateActive()) { - DEBUG0("No state active, shutting down"); + + if (virStateActive() || + server->clients) { + DEBUG0("Timer expired but still active, not shutting down"); + virEventUpdateTimeoutImpl(timerid, -1); + } else { + DEBUG0("Timer expired and inactive, shutting down"); server->shutdown = 1; } } @@ -2048,9 +2052,18 @@ static void qemudFreeClient(struct qemud static int qemudRunLoop(struct qemud_server *server) { int timerid = -1; int ret = -1, i; + int timerActive = 0; virMutexLock(&server->lock); + if (timeout > 0 && + (timerid = virEventAddTimeoutImpl(-1, + qemudInactiveTimer, + server, NULL)) < 0) { + VIR_ERROR0(_("Failed to register shutdown timeout")); + return -1; + } + if (min_workers > max_workers) max_workers = min_workers; @@ -2071,11 +2084,21 @@ static int qemudRunLoop(struct qemud_ser * if any drivers have active state, if not * shutdown after timeout seconds */ - if (timeout > 0 && !virStateActive() && !server->clients) { - timerid = virEventAddTimeoutImpl(timeout*1000, - qemudInactiveTimer, - server, NULL); - DEBUG("Scheduling shutdown timer %d", timerid); + if (timeout > 0) { + if (timerActive) { + if (server->clients) { + DEBUG("Deactivating shutdown timer %d", timerid); + virEventUpdateTimeoutImpl(timerid, -1); + timerActive = 0; + } + } else { + if (!virStateActive() && + !server->clients) { + DEBUG("Activating shutdown timer %d", timerid); + virEventUpdateTimeoutImpl(timerid, timeout * 1000); + timerActive = 1; + } + } } virMutexUnlock(&server->lock); @@ -2129,15 +2152,6 @@ static int qemudRunLoop(struct qemud_ser } } - /* Unregister any timeout that's active, since we - * just had an event processed - */ - if (timerid != -1) { - DEBUG("Removing shutdown timer %d", timerid); - virEventRemoveTimeoutImpl(timerid); - timerid = -1; - } - if (server->shutdown) { ret = 0; break; Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/F-10/libvirt.spec,v retrieving revision 1.107 retrieving revision 1.108 diff -u -r1.107 -r1.108 --- libvirt.spec 31 Jan 2009 10:08:45 -0000 1.107 +++ libvirt.spec 6 Feb 2009 20:22:30 -0000 1.108 @@ -47,10 +47,12 @@ Summary: Library providing a simple API virtualization Name: libvirt Version: 0.6.0 -Release: 1%{?dist}%{?extra_release} +Release: 2%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries Source: libvirt-%{version}.tar.gz +Patch1: %{name}-%{version}-timeout.patch +Patch2: %{name}-%{version}-rpccall2.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root URL: http://libvirt.org/ BuildRequires: python python-devel @@ -177,6 +179,8 @@ %prep %setup -q +%patch1 -p1 +%patch2 -p1 %build %if ! %{with_xen} @@ -390,6 +394,7 @@ %if %{with_network} %dir %{_localstatedir}/run/libvirt/network/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/network/ +%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/iptables/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/iptables/filter/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/iptables/nat/ %endif @@ -408,6 +413,7 @@ %{_datadir}/PolicyKit/policy/org.libvirt.unix.policy %endif +%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/ %if %{with_qemu} %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/ %endif @@ -457,6 +463,11 @@ %endif %changelog +* Fri Feb 6 2009 Daniel P. Berrange - 0.6.0-2.fc10 +- Fix libvirtd --timeout usage +- Fix RPC call problems and QEMU startup handling (rhbz #484414) +- Fix unowned directories (rhbz #483442) + * Sat Jan 31 2009 Daniel Veillard - 0.6.0-1.fc10 - upstream release 0.6.0 - thread safety of API Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/F-10/sources,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- sources 31 Jan 2009 10:08:45 -0000 1.37 +++ sources 6 Feb 2009 20:22:30 -0000 1.38 @@ -1,2 +1 @@ -abc697978e9c66cbc8d8db4fa3f1c1b6 libvirt-0.5.1.tar.gz 8e0120d5452b37179f682031bf0895ea libvirt-0.6.0.tar.gz From markmc at fedoraproject.org Mon Feb 9 08:56:28 2009 From: markmc at fedoraproject.org (Mark McLoughlin) Date: Mon, 9 Feb 2009 08:56:28 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libvirt/devel .cvsignore,1.36,1.37 Message-ID: <20090209085628.B8E807011C@cvs1.fedora.phx.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/libvirt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2652 Modified Files: .cvsignore Log Message: Kill some old tarballs (Just a test commit to see if it gets through mailman) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/devel/.cvsignore,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- .cvsignore 31 Jan 2009 09:48:47 -0000 1.36 +++ .cvsignore 9 Feb 2009 08:55:58 -0000 1.37 @@ -3,7 +3,4 @@ i686 x86_64 libvirt-*.tar.gz -libvirt-0.4.6.tar.gz -libvirt-0.5.0.tar.gz -libvirt-0.5.1.tar.gz libvirt-0.6.0.tar.gz From crobinso at fedoraproject.org Mon Feb 9 19:49:11 2009 From: crobinso at fedoraproject.org (Cole Robinson) Date: Mon, 9 Feb 2009 19:49:11 +0000 (UTC) Subject: [fedora-virt-maint] rpms/virt-manager/devel virt-manager.spec, 1.44, 1.45 Message-ID: <20090209194911.B25037011C@cvs1.fedora.phx.redhat.com> Author: crobinso Update of /cvs/pkgs/rpms/virt-manager/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4432 Modified Files: virt-manager.spec Log Message: Spec file fix (remove no longer present sbin path from filelist) Index: virt-manager.spec =================================================================== RCS file: /cvs/pkgs/rpms/virt-manager/devel/virt-manager.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- virt-manager.spec 9 Feb 2009 19:33:41 -0000 1.44 +++ virt-manager.spec 9 Feb 2009 19:48:41 -0000 1.45 @@ -131,7 +131,6 @@ %doc README COPYING COPYING-DOCS AUTHORS ChangeLog NEWS %{_sysconfdir}/gconf/schemas/%{name}.schemas %{_bindir}/%{name} -%{_sbindir}/%{name} %{_libexecdir}/%{name}-launch %dir %{_libdir}/%{name}/ %{_libdir}/%{name}/* From crobinso at fedoraproject.org Mon Feb 9 19:34:11 2009 From: crobinso at fedoraproject.org (Cole Robinson) Date: Mon, 9 Feb 2009 19:34:11 +0000 (UTC) Subject: [fedora-virt-maint] rpms/virt-manager/devel virt-manager.spec, 1.43, 1.44 virt-manager.console, 1.1, NONE virt-manager.pam, 1.1, NONE Message-ID: <20090209193411.381277011C@cvs1.fedora.phx.redhat.com> Author: crobinso Update of /cvs/pkgs/rpms/virt-manager/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32195 Modified Files: virt-manager.spec Removed Files: virt-manager.console virt-manager.pam Log Message: Kill off consolehelper (PolicyKit is sufficient) Index: virt-manager.spec =================================================================== RCS file: /cvs/pkgs/rpms/virt-manager/devel/virt-manager.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- virt-manager.spec 27 Jan 2009 01:28:19 -0000 1.43 +++ virt-manager.spec 9 Feb 2009 19:33:41 -0000 1.44 @@ -8,15 +8,13 @@ Name: virt-manager Version: 0.6.1 -Release: 1%{_extra_release} +Release: 2%{_extra_release} Summary: Virtual Machine Manager Group: Applications/Emulators License: GPLv2+ URL: http://virt-manager.org/ Source0: http://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.gz -Source1: %{name}.pam -Source2: %{name}.console BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # These two are just the oldest version tested @@ -50,8 +48,6 @@ Requires: librsvg2 # Earlier vte had broken python binding module Requires: vte >= 0.12.2 -# For the consolehelper PAM stuff -Requires: usermode # For online help Requires: scrollkeeper # For console widget @@ -97,15 +93,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/sparkline.a rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/sparkline.la -# Adjust for console-helper magic -mkdir -p $RPM_BUILD_ROOT%{_sbindir} -mv $RPM_BUILD_ROOT%{_bindir}/%{name} $RPM_BUILD_ROOT%{_sbindir}/%{name} -ln -s ../bin/consolehelper $RPM_BUILD_ROOT%{_bindir}/%{name} -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d -cp %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/%{name} -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps -cp %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/%{name} - %find_lang %{name} %clean @@ -143,8 +130,6 @@ %defattr(-,root,root,-) %doc README COPYING COPYING-DOCS AUTHORS ChangeLog NEWS %{_sysconfdir}/gconf/schemas/%{name}.schemas -%config(noreplace) %{_sysconfdir}/pam.d/%{name} -%{_sysconfdir}/security/console.apps/%{name} %{_bindir}/%{name} %{_sbindir}/%{name} %{_libexecdir}/%{name}-launch @@ -175,6 +160,9 @@ %{_datadir}/dbus-1/services/%{name}.service %changelog +* Mon Feb 9 2009 Cole Robinson - 0.6.1-2 +- Kill off consolehelper (PolicyKit is sufficient) + * Mon Jan 26 2009 Cole Robinson - 0.6.1-1 - Update to 0.6.1 release - Disk and Network VM stats reporting --- virt-manager.console DELETED --- --- virt-manager.pam DELETED --- From ehabkost at fedoraproject.org Wed Feb 11 13:36:41 2009 From: ehabkost at fedoraproject.org (Eduardo Habkost) Date: Wed, 11 Feb 2009 13:36:41 +0000 (UTC) Subject: [fedora-virt-maint] rpms/kvm/devel kvm-62-block-rw-range-check.patch, 1.7, 1.8 kvm.spec, 1.85, 1.86 Message-ID: <20090211133641.C4F2C70094@cvs1.fedora.phx.redhat.com> Author: ehabkost Update of /cvs/pkgs/rpms/kvm/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26825 Modified Files: kvm-62-block-rw-range-check.patch kvm.spec Log Message: Fix block range check patch bdrv_aio_write() (bug #484364) kvm-62-block-rw-range-check.patch: Index: kvm-62-block-rw-range-check.patch =================================================================== RCS file: /cvs/pkgs/rpms/kvm/devel/kvm-62-block-rw-range-check.patch,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- kvm-62-block-rw-range-check.patch 22 Dec 2008 16:55:46 -0000 1.7 +++ kvm-62-block-rw-range-check.patch 11 Feb 2009 13:36:41 -0000 1.8 @@ -190,7 +190,7 @@ if (bs->read_only) return NULL; -+ if (bdrv_rd_badreq_sectors(bs, sector_num, nb_sectors)) ++ if (bdrv_wr_badreq_sectors(bs, sector_num, nb_sectors)) + return NULL; + ret = drv->bdrv_aio_write(bs, sector_num, buf, nb_sectors, cb, opaque); Index: kvm.spec =================================================================== RCS file: /cvs/pkgs/rpms/kvm/devel/kvm.spec,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- kvm.spec 4 Feb 2009 21:31:09 -0000 1.85 +++ kvm.spec 11 Feb 2009 13:36:41 -0000 1.86 @@ -1,7 +1,7 @@ Summary: Kernel-based Virtual Machine Name: kvm Version: 83 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ and LGPLv2+ Group: Development/Tools URL: http://%{name}.sf.net @@ -195,6 +195,10 @@ %changelog +* Wed Feb 11 2009 Eduardo Habkost - 83-4 +- Fix block range check patch to use bdrv_wr_badreq_sectors() on + bdrv_aio_write() (bug #484364) + * Wed Feb 04 2009 Eduardo Habkost - 83-3 - Package kvmtrace and kvm_stat on kvm-tools subpackage (bz#480942) From ehabkost at fedoraproject.org Wed Feb 11 16:15:00 2009 From: ehabkost at fedoraproject.org (Eduardo Habkost) Date: Wed, 11 Feb 2009 16:15:00 +0000 (UTC) Subject: [fedora-virt-maint] rpms/kvm/devel kvm-83-compile-fixes.patch, NONE, 1.1 kvm.spec, 1.86, 1.87 Message-ID: <20090211161500.A85AE70094@cvs1.fedora.phx.redhat.com> Author: ehabkost Update of /cvs/pkgs/rpms/kvm/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22145 Modified Files: kvm.spec Added Files: kvm-83-compile-fixes.patch Log Message: compile fixes for newer gcc kvm-83-compile-fixes.patch: --- NEW FILE kvm-83-compile-fixes.patch --- From: Eduardo Habkost Subject: Compile fixes for gcc 4.4.0 Newer gcc versions support a r"foobar" construct, so we can't use "abc"R"def" constructs, without any space between R and the quotes, when using -std=gcc99. Signed-off-by: Eduardo Habkost --- Index: kvm-83/user/test/x86/vmexit.c =================================================================== --- kvm-83.orig/user/test/x86/vmexit.c +++ kvm-83/user/test/x86/vmexit.c @@ -31,7 +31,7 @@ int main() t1 = rdtsc(); for (i = 0; i < N; ++i) - asm volatile ("push %%"R"bx; cpuid; pop %%"R"bx" + asm volatile ("push %%" R "bx; cpuid; pop %%" R "bx" : : : "eax", "ecx", "edx"); t2 = rdtsc(); printf("vmexit latency: %d\n", (int)((t2 - t1) / N)); Index: kvm-83/user/test/x86/apic.c =================================================================== --- kvm-83.orig/user/test/x86/apic.c +++ kvm-83/user/test/x86/apic.c @@ -54,14 +54,14 @@ asm ( "push %r9 \n\t" "push %r8 \n\t" #endif - "push %"R"di \n\t" - "push %"R"si \n\t" - "push %"R"bp \n\t" - "push %"R"sp \n\t" - "push %"R"bx \n\t" - "push %"R"dx \n\t" - "push %"R"cx \n\t" - "push %"R"ax \n\t" + "push %" R "di \n\t" + "push %" R "si \n\t" + "push %" R "bp \n\t" + "push %" R "sp \n\t" + "push %" R "bx \n\t" + "push %" R "dx \n\t" + "push %" R "cx \n\t" + "push %" R "ax \n\t" #ifdef __x86_64__ "mov %rsp, %rdi \n\t" "callq *8*16(%rsp) \n\t" @@ -70,14 +70,14 @@ asm ( "calll *4+4*8(%esp) \n\t" "add $4, %esp \n\t" #endif - "pop %"R"ax \n\t" - "pop %"R"cx \n\t" - "pop %"R"dx \n\t" - "pop %"R"bx \n\t" - "pop %"R"bp \n\t" - "pop %"R"bp \n\t" - "pop %"R"si \n\t" - "pop %"R"di \n\t" + "pop %" R "ax \n\t" + "pop %" R "cx \n\t" + "pop %" R "dx \n\t" + "pop %" R "bx \n\t" + "pop %" R "bp \n\t" + "pop %" R "bp \n\t" + "pop %" R "si \n\t" + "pop %" R "di \n\t" #ifdef __x86_64__ "pop %r8 \n\t" "pop %r9 \n\t" Index: kvm.spec =================================================================== RCS file: /cvs/pkgs/rpms/kvm/devel/kvm.spec,v retrieving revision 1.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- kvm.spec 11 Feb 2009 13:36:41 -0000 1.86 +++ kvm.spec 11 Feb 2009 16:14:30 -0000 1.87 @@ -1,7 +1,7 @@ Summary: Kernel-based Virtual Machine Name: kvm Version: 83 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ and LGPLv2+ Group: Development/Tools URL: http://%{name}.sf.net @@ -9,6 +9,7 @@ #Source0: http://people.qumranet.com:8888/avi/snapshots/kvm-snapshot-%{snapshot}.tar.gz Source1: %{name}.modules Patch0: %{name}-62-block-rw-range-check.patch +Patch1: %{name}-83-compile-fixes.patch # patches from upstream qemu BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel @@ -54,6 +55,7 @@ %setup -q %patch0 -p1 +%patch1 -p1 # "configure --kerneldir" looks for this # FIXME: kvm-84 or later shouldn't need this anymore, see: @@ -195,6 +197,9 @@ %changelog +* Wed Feb 11 2009 Eduardo Habkost - 83-5 +- Compile fixes for newer gcc + * Wed Feb 11 2009 Eduardo Habkost - 83-4 - Fix block range check patch to use bdrv_wr_badreq_sectors() on bdrv_aio_write() (bug #484364) From pkgdb at fedoraproject.org Wed Feb 11 17:25:11 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 11 Feb 2009 17:25:11 +0000 Subject: [fedora-virt-maint] [pkgdb] gnome-applet-vm had acl change status Message-ID: <20090211172511.A0216208515@bastion.fedora.phx.redhat.com> crobinso has set the watchcommits acl on gnome-applet-vm (Fedora 10) to Approved for virtmaint To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-applet-vm From pkgdb at fedoraproject.org Wed Feb 11 17:25:16 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 11 Feb 2009 17:25:16 +0000 Subject: [fedora-virt-maint] [pkgdb] gnome-applet-vm had acl change status Message-ID: <20090211172516.6AA99208519@bastion.fedora.phx.redhat.com> crobinso has set the watchcommits acl on gnome-applet-vm (Fedora 9) to Approved for virtmaint To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-applet-vm From pkgdb at fedoraproject.org Wed Feb 11 17:25:18 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 11 Feb 2009 17:25:18 +0000 Subject: [fedora-virt-maint] [pkgdb] gnome-applet-vm had acl change status Message-ID: <20090211172518.42B1420851D@bastion.fedora.phx.redhat.com> crobinso has set the watchbugzilla acl on gnome-applet-vm (Fedora 9) to Approved for virtmaint To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-applet-vm From pkgdb at fedoraproject.org Wed Feb 11 17:25:20 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 11 Feb 2009 17:25:20 +0000 Subject: [fedora-virt-maint] [pkgdb] gnome-applet-vm had acl change status Message-ID: <20090211172520.8BAAD208521@bastion.fedora.phx.redhat.com> crobinso has set the watchbugzilla acl on gnome-applet-vm (Fedora devel) to Approved for virtmaint To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-applet-vm From pkgdb at fedoraproject.org Wed Feb 11 17:25:14 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 11 Feb 2009 17:25:14 +0000 Subject: [fedora-virt-maint] [pkgdb] gnome-applet-vm had acl change status Message-ID: <20090211172515.2199B208466@bastion.fedora.phx.redhat.com> crobinso has set the watchbugzilla acl on gnome-applet-vm (Fedora 10) to Approved for virtmaint To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-applet-vm From pkgdb at fedoraproject.org Wed Feb 11 17:25:21 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 11 Feb 2009 17:25:21 +0000 Subject: [fedora-virt-maint] [pkgdb] gnome-applet-vm had acl change status Message-ID: <20090211172521.EDA2B208524@bastion.fedora.phx.redhat.com> crobinso has set the watchcommits acl on gnome-applet-vm (Fedora devel) to Approved for virtmaint To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-applet-vm From pkgdb at fedoraproject.org Wed Feb 11 20:56:48 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 11 Feb 2009 20:56:48 +0000 Subject: [fedora-virt-maint] [pkgdb] kvm had acl change status Message-ID: <20090211205648.7EAFF20851A@bastion.fedora.phx.redhat.com> glommer has set the watchbugzilla acl on kvm (Fedora 7) to Approved for virtmaint To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kvm From pkgdb at fedoraproject.org Wed Feb 11 20:56:52 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 11 Feb 2009 20:56:52 +0000 Subject: [fedora-virt-maint] [pkgdb] kvm had acl change status Message-ID: <20090211205652.B93D5208528@bastion.fedora.phx.redhat.com> glommer has set the watchcommits acl on kvm (Fedora 7) to Approved for virtmaint To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kvm From pkgdb at fedoraproject.org Wed Feb 11 20:56:58 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 11 Feb 2009 20:56:58 +0000 Subject: [fedora-virt-maint] [pkgdb] kvm had acl change status Message-ID: <20090211205658.E6CC7208540@bastion.fedora.phx.redhat.com> glommer has set the watchbugzilla acl on kvm (Fedora 8) to Approved for virtmaint To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kvm From pkgdb at fedoraproject.org Wed Feb 11 20:56:59 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 11 Feb 2009 20:56:59 +0000 Subject: [fedora-virt-maint] [pkgdb] kvm had acl change status Message-ID: <20090211205700.5B401208547@bastion.fedora.phx.redhat.com> glommer has set the watchbugzilla acl on kvm (Fedora 9) to Approved for virtmaint To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kvm From rjones at fedoraproject.org Thu Feb 12 12:35:47 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Thu, 12 Feb 2009 12:35:47 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libvirt/devel libvirt.spec,1.109,1.110 Message-ID: <20090212123547.C922670123@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/libvirt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14550 Modified Files: libvirt.spec Log Message: Multiple fixes to remove rpmlint warnings/errors (rhbz #226055) Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v retrieving revision 1.109 retrieving revision 1.110 diff -u -r1.109 -r1.110 --- libvirt.spec 6 Feb 2009 19:28:20 -0000 1.109 +++ libvirt.spec 12 Feb 2009 12:35:17 -0000 1.110 @@ -47,7 +47,7 @@ Summary: Library providing a simple API virtualization Name: libvirt Version: 0.6.0 -Release: 2%{?dist}%{?extra_release} +Release: 3%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries Source: libvirt-%{version}.tar.gz @@ -56,7 +56,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root URL: http://libvirt.org/ BuildRequires: python python-devel -Requires: libxml2 Requires: readline Requires: ncurses Requires: dnsmasq @@ -140,7 +139,8 @@ BuildRequires: parted-devel # For QEMU/LXC numa info BuildRequires: numactl-devel -Obsoletes: libvir +Obsoletes: libvir <= 0.2 +Provides: libvir = %{version}-%{release} # Fedora build root suckage BuildRequires: gawk @@ -152,12 +152,13 @@ %package devel Summary: Libraries, includes, etc. to compile with the libvirt library Group: Development/Libraries -Requires: libvirt = %{version} +Requires: libvirt = %{version}-%{release} Requires: pkgconfig %if %{with_xen} Requires: xen-devel %endif -Obsoletes: libvir-devel +Obsoletes: libvir-devel <= 0.2 +Provides: libvir-devel = %{version}-%{release} %description devel Includes and documentations for the C library providing an API to use @@ -167,8 +168,9 @@ %package python Summary: Python bindings for the libvirt library Group: Development/Libraries -Requires: libvirt = %{version} -Obsoletes: libvir-python +Requires: libvirt = %{version}-%{release} +Obsoletes: libvir-python <= 0.2 +Provides: libvir-python = %{version}-%{release} %description python The libvirt-python package contains a module that permits applications @@ -182,6 +184,9 @@ %patch1 -p1 %patch2 -p1 +mv NEWS NEWS.old +iconv -f ISO-8859-1 -t UTF-8 < NEWS.old > NEWS + %build %if ! %{with_xen} %define _without_xen --without-xen @@ -249,7 +254,7 @@ make %{?_smp_mflags} %install -rm -fr %{buildroot} +rm -rf %{buildroot} %makeinstall (cd docs/examples ; make clean ; rm -rf .deps Makefile Makefile.in) @@ -291,6 +296,10 @@ rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu.conf %endif +%if %{with_libvirtd} +chmod 0644 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/libvirtd +%endif + %clean rm -fr %{buildroot} @@ -324,8 +333,7 @@ fi %endif -%postun -/sbin/ldconfig +%postun -p /sbin/ldconfig %files -f %{name}.lang %defattr(-, root, root) @@ -463,6 +471,9 @@ %endif %changelog +* Wed Feb 11 2009 Richard W.M. Jones - 0.6.0-3.fc11 +- Multiple fixes to remove rpmlint warnings/errors (rhbz #226055) + * Fri Feb 6 2009 Daniel P. Berrange - 0.6.0-2.fc11 - Fix libvirtd --timeout usage - Fix RPC call problems and QEMU startup handling (rhbz #484414) @@ -531,7 +542,7 @@ * Wed Jun 4 2008 Mark McLoughlin - 0.4.2-6.fc10 - Disable lokkit support again (#449996, #447633) -- Ensure %{fedora} is evaluated correctly +- Ensure %-fedora is evaluated correctly * Thu May 15 2008 Daniel P. Berrange - 0.4.2-5.fc10 - Rebuild with policy enabled (rhbz #446616) @@ -716,7 +727,7 @@ - it's pkgconfig not pgkconfig ! * Mon Nov 6 2006 Daniel Veillard 0.1.8-2 -- fixing spec file, added %dist, -devel requires pkgconfig and xen-devel +- fixing spec file, added %-dist, -devel requires pkgconfig and xen-devel - Resolves: rhbz#202320 * Mon Oct 16 2006 Daniel Veillard 0.1.8-1 From rjones at fedoraproject.org Thu Feb 12 12:41:15 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Thu, 12 Feb 2009 12:41:15 +0000 (UTC) Subject: [fedora-virt-maint] rpms/gnome-applet-vm/devel gnome-applet-vm.spec, 1.19, 1.20 Message-ID: <20090212124115.AD9A270123@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/gnome-applet-vm/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14946 Modified Files: gnome-applet-vm.spec Log Message: Multiple fixes to quieten rpmlint (rhbz#225811). Index: gnome-applet-vm.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-applet-vm/devel/gnome-applet-vm.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- gnome-applet-vm.spec 23 Jul 2008 16:00:37 -0000 1.19 +++ gnome-applet-vm.spec 12 Feb 2009 12:40:45 -0000 1.20 @@ -1,7 +1,7 @@ Summary: Simple virtual domains monitor which embeds itself in the GNOME panel Name: gnome-applet-vm Version: 0.2.0 -Release: 3%{?dist} +Release: 4%{?dist} # No license attribution in code, only COPYING. License: GPL+ Group: User Interface/Desktops @@ -9,7 +9,6 @@ Source: http://people.redhat.com/kzak/gnome-applet-vm/v0.2/%{upstreamname}.tar.bz2 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: https://fedorahosted.org/gnome-applet-vm -ExclusiveArch: i386 x86_64 %define glib2_version 2.2.0 %define pango_version 1.2.0 @@ -37,7 +36,6 @@ BuildRequires: libxml2-devel Requires: gtk2 >= %{gtk2_version} -Requires: libvirt Requires: gnome-panel >= %{gnome_panel_version} Requires: usermode Requires: virt-manager @@ -74,19 +72,15 @@ rm -rf $RPM_BUILD_ROOT %post -/sbin/ldconfig /usr/bin/scrollkeeper-update export GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` /usr/bin/gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/vm-applet.schemas > /dev/null -%postun -/sbin/ldconfig - %files %defattr(-, root, root) %doc AUTHORS COPYING NEWS README -%{_datadir}/pixmaps +%{_datadir}/pixmaps/vm-applet/ %{_datadir}/gnome-2.0/ui/* %{_datadir}/gnome/help/* %{_datadir}/omf/* @@ -95,10 +89,13 @@ %{_sbindir}/* %{_bindir}/* %{_sysconfdir}/gconf/schemas/* -%config %{_sysconfdir}/pam.d/vm_applet_wrapper -%config %{_sysconfdir}/security/console.apps/vm_applet_wrapper +%config(noreplace) %{_sysconfdir}/pam.d/vm_applet_wrapper +%config(noreplace) %{_sysconfdir}/security/console.apps/vm_applet_wrapper %changelog +* Wed Feb 11 2009 Richard W.M. Jones 0.2.0-4 +- Multiple fixes to quieten rpmlint (rhbz#225811). + * Wed Jul 23 2008 Tom "spot" Callaway 0.2.0-3 - fix license tag From rjones at fedoraproject.org Thu Feb 12 12:56:17 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Thu, 12 Feb 2009 12:56:17 +0000 (UTC) Subject: [fedora-virt-maint] rpms/gnome-applet-vm/devel gnome-applet-vm-0.2.0-no-gnome-help-h.patch, NONE, 1.1 gnome-applet-vm.spec, 1.20, 1.21 Message-ID: <20090212125617.747CB70123@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/gnome-applet-vm/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16315 Modified Files: gnome-applet-vm.spec Added Files: gnome-applet-vm-0.2.0-no-gnome-help-h.patch Log Message: Small patch needed to compile on Rawhide. gnome-applet-vm-0.2.0-no-gnome-help-h.patch: --- NEW FILE gnome-applet-vm-0.2.0-no-gnome-help-h.patch --- --- gnome-applet-vm-0.2.0-rc1/src/applet.c 2008-03-03 13:55:36.000000000 +0000 +++ gnome-applet-vm-0.2.0-rc1.gnomeui/src/applet.c 2009-02-12 12:53:21.000000000 +0000 @@ -22,7 +22,6 @@ #include #include -#include #include #include #include Index: gnome-applet-vm.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-applet-vm/devel/gnome-applet-vm.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- gnome-applet-vm.spec 12 Feb 2009 12:40:45 -0000 1.20 +++ gnome-applet-vm.spec 12 Feb 2009 12:55:47 -0000 1.21 @@ -1,7 +1,7 @@ Summary: Simple virtual domains monitor which embeds itself in the GNOME panel Name: gnome-applet-vm Version: 0.2.0 -Release: 4%{?dist} +Release: 5%{?dist} # No license attribution in code, only COPYING. License: GPL+ Group: User Interface/Desktops @@ -10,6 +10,9 @@ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: https://fedorahosted.org/gnome-applet-vm +# Sent upstream 2009-02-12 (RWMJ). +Patch0: gnome-applet-vm-0.2.0-no-gnome-help-h.patch + %define glib2_version 2.2.0 %define pango_version 1.2.0 %define gtk2_version 2.6.0 @@ -93,6 +96,9 @@ %config(noreplace) %{_sysconfdir}/security/console.apps/vm_applet_wrapper %changelog +* Thu Feb 12 2009 Richard W.M. Jones 0.2.0-5 +- Small patch needed to compile on Rawhide. + * Wed Feb 11 2009 Richard W.M. Jones 0.2.0-4 - Multiple fixes to quieten rpmlint (rhbz#225811). From rjones at fedoraproject.org Thu Feb 12 13:02:45 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Thu, 12 Feb 2009 13:02:45 +0000 (UTC) Subject: [fedora-virt-maint] rpms/gnome-applet-vm/devel gnome-applet-vm.spec, 1.21, 1.22 Message-ID: <20090212130245.06FEB70123@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/gnome-applet-vm/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17131 Modified Files: gnome-applet-vm.spec Log Message: Actually apply the patch. Index: gnome-applet-vm.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-applet-vm/devel/gnome-applet-vm.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- gnome-applet-vm.spec 12 Feb 2009 12:55:47 -0000 1.21 +++ gnome-applet-vm.spec 12 Feb 2009 13:02:14 -0000 1.22 @@ -1,7 +1,7 @@ Summary: Simple virtual domains monitor which embeds itself in the GNOME panel Name: gnome-applet-vm Version: 0.2.0 -Release: 5%{?dist} +Release: 6%{?dist} # No license attribution in code, only COPYING. License: GPL+ Group: User Interface/Desktops @@ -52,6 +52,7 @@ %prep %setup -q -n %{upstreamname} +%patch0 -p1 %build %configure --enable-consolehelper @@ -96,7 +97,7 @@ %config(noreplace) %{_sysconfdir}/security/console.apps/vm_applet_wrapper %changelog -* Thu Feb 12 2009 Richard W.M. Jones 0.2.0-5 +* Thu Feb 12 2009 Richard W.M. Jones 0.2.0-6 - Small patch needed to compile on Rawhide. * Wed Feb 11 2009 Richard W.M. Jones 0.2.0-4 From rjones at fedoraproject.org Thu Feb 12 13:16:38 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Thu, 12 Feb 2009 13:16:38 +0000 (UTC) Subject: [fedora-virt-maint] rpms/gnome-applet-vm/devel gnome-applet-vm-0.2.0-gnome-libs.patch, NONE, 1.1 gnome-applet-vm.spec, 1.22, 1.23 gnome-applet-vm-0.2.0-no-gnome-help-h.patch, 1.1, NONE Message-ID: <20090212131638.090F570123@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/gnome-applet-vm/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19359 Modified Files: gnome-applet-vm.spec Added Files: gnome-applet-vm-0.2.0-gnome-libs.patch Removed Files: gnome-applet-vm-0.2.0-no-gnome-help-h.patch Log Message: Small patch needed to compile on Rawhide. gnome-applet-vm-0.2.0-gnome-libs.patch: --- NEW FILE gnome-applet-vm-0.2.0-gnome-libs.patch --- diff -ur gnome-applet-vm-0.2.0-rc1/src/Makefile.am gnome-applet-vm-0.2.0-rc1.gnome_libs2/src/Makefile.am --- gnome-applet-vm-0.2.0-rc1/src/Makefile.am 2008-02-28 00:20:17.000000000 +0000 +++ gnome-applet-vm-0.2.0-rc1.gnome_libs2/src/Makefile.am 2009-02-12 13:13:23.000000000 +0000 @@ -8,7 +8,7 @@ vm_applet_SOURCES = applet.c properties.c gtkutils.c connections.c \ amenu.c domains.c -vm_applet_LDADD = $(LIBVIRT_LIBS) $(GNOME_APPLETS_LIBS) $(DBUS_LIBS) $(LIBXML_LIBS) +vm_applet_LDADD = $(LIBVIRT_LIBS) $(GNOME_APPLETS_LIBS) $(DBUS_LIBS) $(LIBXML_LIBS) $(GNOME_LIBS2_LIBS) vm_applet_CFLAGS = -I. -I$(srcdir) \ -include $(top_builddir)/config.h \ -DG_DISABLE_DEPRECATED \ @@ -17,6 +17,7 @@ $(GNOME_APPLETS_CFLAGS) \ $(LIBXML_CFLAGS) \ $(DBUS_CFLAGS) \ + $(GNOME_LIBS2_CFLAGS) \ -DVM_ICONDIR=\"$(icondir)\" \ -DVM_VIRTMANAGER=\"$(virtnamager)\" Index: gnome-applet-vm.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-applet-vm/devel/gnome-applet-vm.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- gnome-applet-vm.spec 12 Feb 2009 13:02:14 -0000 1.22 +++ gnome-applet-vm.spec 12 Feb 2009 13:16:07 -0000 1.23 @@ -1,7 +1,7 @@ Summary: Simple virtual domains monitor which embeds itself in the GNOME panel Name: gnome-applet-vm Version: 0.2.0 -Release: 6%{?dist} +Release: 7%{?dist} # No license attribution in code, only COPYING. License: GPL+ Group: User Interface/Desktops @@ -11,7 +11,7 @@ URL: https://fedorahosted.org/gnome-applet-vm # Sent upstream 2009-02-12 (RWMJ). -Patch0: gnome-applet-vm-0.2.0-no-gnome-help-h.patch +Patch0: gnome-applet-vm-0.2.0-gnome-libs.patch %define glib2_version 2.2.0 %define pango_version 1.2.0 @@ -97,7 +97,7 @@ %config(noreplace) %{_sysconfdir}/security/console.apps/vm_applet_wrapper %changelog -* Thu Feb 12 2009 Richard W.M. Jones 0.2.0-6 +* Thu Feb 12 2009 Richard W.M. Jones 0.2.0-7 - Small patch needed to compile on Rawhide. * Wed Feb 11 2009 Richard W.M. Jones 0.2.0-4 --- gnome-applet-vm-0.2.0-no-gnome-help-h.patch DELETED --- From rjones at fedoraproject.org Thu Feb 12 13:23:13 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Thu, 12 Feb 2009 13:23:13 +0000 (UTC) Subject: [fedora-virt-maint] rpms/gnome-applet-vm/devel gnome-applet-vm.spec, 1.23, 1.24 Message-ID: <20090212132313.269F670123@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/gnome-applet-vm/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19989 Modified Files: gnome-applet-vm.spec Log Message: Now try running automake. Index: gnome-applet-vm.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-applet-vm/devel/gnome-applet-vm.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- gnome-applet-vm.spec 12 Feb 2009 13:16:07 -0000 1.23 +++ gnome-applet-vm.spec 12 Feb 2009 13:22:42 -0000 1.24 @@ -1,7 +1,7 @@ Summary: Simple virtual domains monitor which embeds itself in the GNOME panel Name: gnome-applet-vm Version: 0.2.0 -Release: 7%{?dist} +Release: 8%{?dist} # No license attribution in code, only COPYING. License: GPL+ Group: User Interface/Desktops @@ -53,6 +53,8 @@ %prep %setup -q -n %{upstreamname} %patch0 -p1 +automake +autoconf %build %configure --enable-consolehelper @@ -97,7 +99,7 @@ %config(noreplace) %{_sysconfdir}/security/console.apps/vm_applet_wrapper %changelog -* Thu Feb 12 2009 Richard W.M. Jones 0.2.0-7 +* Thu Feb 12 2009 Richard W.M. Jones 0.2.0-8 - Small patch needed to compile on Rawhide. * Wed Feb 11 2009 Richard W.M. Jones 0.2.0-4 From pkgdb at fedoraproject.org Fri Feb 13 09:26:58 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 13 Feb 2009 09:26:58 +0000 Subject: [fedora-virt-maint] [pkgdb] etherboot: virtmaint has requested watchbugzilla Message-ID: <20090213092659.75B4B208421@bastion.fedora.phx.redhat.com> virtmaint has requested the watchbugzilla acl on etherboot (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/etherboot From pkgdb at fedoraproject.org Fri Feb 13 09:26:59 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 13 Feb 2009 09:26:59 +0000 Subject: [fedora-virt-maint] [pkgdb] etherboot: virtmaint has requested watchcommits Message-ID: <20090213092659.E78EA208517@bastion.fedora.phx.redhat.com> virtmaint has requested the watchcommits acl on etherboot (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/etherboot From pkgdb at fedoraproject.org Fri Feb 13 09:27:05 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 13 Feb 2009 09:27:05 +0000 Subject: [fedora-virt-maint] [pkgdb] etherboot: virtmaint has requested watchbugzilla Message-ID: <20090213092705.54D0720846B@bastion.fedora.phx.redhat.com> virtmaint has requested the watchbugzilla acl on etherboot (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/etherboot From pkgdb at fedoraproject.org Fri Feb 13 09:27:05 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 13 Feb 2009 09:27:05 +0000 Subject: [fedora-virt-maint] [pkgdb] etherboot: virtmaint has requested watchcommits Message-ID: <20090213092705.DF6E7208521@bastion.fedora.phx.redhat.com> virtmaint has requested the watchcommits acl on etherboot (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/etherboot From pkgdb at fedoraproject.org Fri Feb 13 13:09:54 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 13 Feb 2009 13:09:54 +0000 Subject: [fedora-virt-maint] [pkgdb] etherboot had acl change status Message-ID: <20090213130955.C0414208519@bastion.fedora.phx.redhat.com> glommer has set the watchbugzilla acl on etherboot (Fedora devel) to Approved for virtmaint To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/etherboot From pkgdb at fedoraproject.org Fri Feb 13 13:09:56 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 13 Feb 2009 13:09:56 +0000 Subject: [fedora-virt-maint] [pkgdb] etherboot had acl change status Message-ID: <20090213130956.62F20208521@bastion.fedora.phx.redhat.com> glommer has set the watchcommits acl on etherboot (Fedora devel) to Approved for virtmaint To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/etherboot From pkgdb at fedoraproject.org Fri Feb 13 13:09:58 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 13 Feb 2009 13:09:58 +0000 Subject: [fedora-virt-maint] [pkgdb] etherboot had acl change status Message-ID: <20090213130958.171C120851A@bastion.fedora.phx.redhat.com> glommer has set the watchbugzilla acl on etherboot (Fedora 10) to Approved for virtmaint To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/etherboot From pkgdb at fedoraproject.org Fri Feb 13 13:09:59 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 13 Feb 2009 13:09:59 +0000 Subject: [fedora-virt-maint] [pkgdb] etherboot had acl change status Message-ID: <20090213130959.AB492208523@bastion.fedora.phx.redhat.com> glommer has set the watchcommits acl on etherboot (Fedora 10) to Approved for virtmaint To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/etherboot From berrange at fedoraproject.org Wed Feb 18 13:51:53 2009 From: berrange at fedoraproject.org (Daniel P. Berrange) Date: Wed, 18 Feb 2009 13:51:53 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libvirt/devel libvirt-0.6.0-autostart-timeout.patch, NONE, 1.1 libvirt-0.6.0-dbus-threads.patch, NONE, 1.1 libvirt-0.6.0-qemu-startup.patch, NONE, 1.1 libvirt.spec, 1.110, 1.111 Message-ID: <20090218135153.0DE15700F7@cvs1.fedora.phx.redhat.com> Author: berrange Update of /cvs/pkgs/rpms/libvirt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7008 Modified Files: libvirt.spec Added Files: libvirt-0.6.0-autostart-timeout.patch libvirt-0.6.0-dbus-threads.patch libvirt-0.6.0-qemu-startup.patch Log Message: Fix QEMU startup timeout/race (rhbz #484649) Setup DBus threading. Don't allow dbus to call _exit / change SIGPIPE (rhbz #484553) Fix timeout when autostarting session daemon libvirt-0.6.0-autostart-timeout.patch: --- NEW FILE libvirt-0.6.0-autostart-timeout.patch --- diff -rup libvirt-0.6.0.orig/src/remote_internal.c libvirt-0.6.0.new/src/remote_internal.c --- libvirt-0.6.0.orig/src/remote_internal.c 2009-02-18 10:56:34.000000000 +0000 +++ libvirt-0.6.0.new/src/remote_internal.c 2009-02-18 13:35:26.000000000 +0000 @@ -654,12 +654,13 @@ doRemoteOpen (virConnectPtr conn, */ if (errno == ECONNREFUSED && flags & VIR_DRV_OPEN_REMOTE_AUTOSTART && - trials < 5) { + trials < 20) { close(priv->sock); priv->sock = -1; - if (remoteForkDaemon(conn) == 0) { + if (trials > 0 || + remoteForkDaemon(conn) == 0) { trials++; - usleep(5000 * trials * trials); + usleep(1000 * 100 * trials); goto autostart_retry; } } Only in libvirt-0.6.0.new/src: remote_internal.c~ libvirt-0.6.0-dbus-threads.patch: --- NEW FILE libvirt-0.6.0-dbus-threads.patch --- diff -rup libvirt-0.6.0.orig/qemud/qemud.c libvirt-0.6.0.new/qemud/qemud.c --- libvirt-0.6.0.orig/qemud/qemud.c 2009-02-18 10:56:34.000000000 +0000 +++ libvirt-0.6.0.new/qemud/qemud.c 2009-02-18 12:52:18.000000000 +0000 @@ -860,6 +860,10 @@ static struct qemud_server *qemudNetwork if (auth_unix_rw == REMOTE_AUTH_POLKIT || auth_unix_ro == REMOTE_AUTH_POLKIT) { DBusError derr; + + dbus_connection_set_change_sigpipe(FALSE); + dbus_threads_init_default(); + dbus_error_init(&derr); server->sysbus = dbus_bus_get(DBUS_BUS_SYSTEM, &derr); if (!(server->sysbus)) { @@ -868,6 +872,7 @@ static struct qemud_server *qemudNetwork dbus_error_free(&derr); goto cleanup; } + dbus_connection_set_exit_on_disconnect(server->sysbus, FALSE); } #endif diff -rup libvirt-0.6.0.orig/src/node_device_hal.c libvirt-0.6.0.new/src/node_device_hal.c --- libvirt-0.6.0.orig/src/node_device_hal.c 2009-01-16 12:44:22.000000000 +0000 +++ libvirt-0.6.0.new/src/node_device_hal.c 2009-02-18 12:52:48.000000000 +0000 @@ -685,6 +685,9 @@ static int halDeviceMonitorStartup(void) nodeDeviceLock(driverState); /* Allocate and initialize a new HAL context */ + dbus_connection_set_change_sigpipe(FALSE); + dbus_threads_init_default(); + dbus_error_init(&err); hal_ctx = libhal_ctx_new(); if (hal_ctx == NULL) { @@ -696,6 +699,8 @@ static int halDeviceMonitorStartup(void) fprintf(stderr, "%s: dbus_bus_get failed\n", __FUNCTION__); goto failure; } + dbus_connection_set_exit_on_disconnect(dbus_conn, FALSE); + if (!libhal_ctx_set_dbus_connection(hal_ctx, dbus_conn)) { fprintf(stderr, "%s: libhal_ctx_set_dbus_connection failed\n", __FUNCTION__); libvirt-0.6.0-qemu-startup.patch: --- NEW FILE libvirt-0.6.0-qemu-startup.patch --- diff -rup libvirt-0.6.0.orig/src/qemu_driver.c libvirt-0.6.0.new/src/qemu_driver.c --- libvirt-0.6.0.orig/src/qemu_driver.c 2009-01-31 09:04:18.000000000 +0000 +++ libvirt-0.6.0.new/src/qemu_driver.c 2009-02-18 11:15:37.000000000 +0000 @@ -633,6 +633,7 @@ qemudReadMonitorOutput(virConnectPtr con { int got = 0; buf[0] = '\0'; + timeout *= 1000; /* poll wants milli seconds */ /* Consume & discard the initial greeting */ while (got < (buflen-1)) { @@ -694,6 +695,56 @@ qemudReadMonitorOutput(virConnectPtr con } + +/* + * Returns -1 for error, 0 on success + */ +static int +qemudReadLogOutput(virConnectPtr conn, + virDomainObjPtr vm, + int fd, + char *buf, + int buflen, + qemudHandlerMonitorOutput func, + const char *what, + int timeout) +{ + int got = 0; + int ret; + int retries = timeout*10; + buf[0] = '\0'; + + while (retries) { + while((ret = read(fd, buf+got, buflen-got-1)) > 0) { + got += ret; + buf[got] = '\0'; + if ((buflen-got-1) == 0) { + qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + _("Out of space while reading %s log output"), what); + return -1; + } + } + + if (ret < 0 && errno != EINTR) { + virReportSystemError(conn, errno, + _("Failure while reading %s log output"), + what); + return -1; + } + + ret = func(conn, vm, buf, fd); + if (ret <= 0) + return ret; + + usleep(100*1000); + retries--; + } + if (retries == 0) + qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + _("Timed out while reading %s log output"), what); + return -1; +} + static int qemudCheckMonitorPrompt(virConnectPtr conn ATTRIBUTE_UNUSED, virDomainObjPtr vm, @@ -738,7 +789,7 @@ static int qemudOpenMonitor(virConnectPt vm, monfd, buf, sizeof(buf), qemudCheckMonitorPrompt, - "monitor", 10000) <= 0) + "monitor", 10) <= 0) ret = -1; else ret = 0; @@ -770,6 +821,7 @@ static int qemudOpenMonitor(virConnectPt return ret; } +/* Returns -1 for error, 0 success, 1 continue reading */ static int qemudExtractMonitorPath(virConnectPtr conn, const char *haystack, size_t *offset, @@ -873,19 +925,16 @@ static int qemudWaitForMonitor(virConnec < 0) return -1; - ret = qemudReadMonitorOutput(conn, vm, logfd, buf, sizeof(buf), - qemudFindCharDevicePTYs, - "console", 3000); + ret = qemudReadLogOutput(conn, vm, logfd, buf, sizeof(buf), + qemudFindCharDevicePTYs, + "console", 3); if (close(logfd) < 0) qemudLog(QEMUD_WARN, _("Unable to close logfile: %s\n"), strerror(errno)); - if (ret == 1) /* Success */ + if (ret == 0) /* success */ return 0; - if (ret == -1) - return -1; - /* Unexpected end of file - inform user of QEMU log data */ qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, _("unable to start guest: %s"), buf); Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v retrieving revision 1.110 retrieving revision 1.111 diff -u -r1.110 -r1.111 --- libvirt.spec 12 Feb 2009 12:35:17 -0000 1.110 +++ libvirt.spec 18 Feb 2009 13:51:22 -0000 1.111 @@ -47,12 +47,15 @@ Summary: Library providing a simple API virtualization Name: libvirt Version: 0.6.0 -Release: 3%{?dist}%{?extra_release} +Release: 4%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries Source: libvirt-%{version}.tar.gz Patch1: %{name}-%{version}-timeout.patch Patch2: %{name}-%{version}-rpccall.patch +Patch3: %{name}-%{version}-qemu-startup.patch +Patch4: %{name}-%{version}-dbus-threads.patch +Patch5: %{name}-%{version}-autostart-timeout.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root URL: http://libvirt.org/ BuildRequires: python python-devel @@ -183,6 +186,9 @@ %setup -q %patch1 -p1 %patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 mv NEWS NEWS.old iconv -f ISO-8859-1 -t UTF-8 < NEWS.old > NEWS @@ -471,6 +477,11 @@ %endif %changelog +* Wed Feb 18 2009 Daniel P. Berrange - 0.6.0-4.fc11 +- Fix QEMU startup timeout/race (rhbz #484649) +- Setup DBus threading. Don't allow dbus to call _exit / change SIGPIPE (rhbz #484553) +- Fix timeout when autostarting session daemon + * Wed Feb 11 2009 Richard W.M. Jones - 0.6.0-3.fc11 - Multiple fixes to remove rpmlint warnings/errors (rhbz #226055) From berrange at fedoraproject.org Wed Feb 18 14:06:17 2009 From: berrange at fedoraproject.org (Daniel P. Berrange) Date: Wed, 18 Feb 2009 14:06:17 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libvirt/F-10 libvirt-0.6.0-autostart-timeout.patch, NONE, 1.1 libvirt-0.6.0-dbus-threads.patch, NONE, 1.1 libvirt-0.6.0-qemu-startup.patch, NONE, 1.1 libvirt.spec, 1.108, 1.109 Message-ID: <20090218140617.CA35C700F7@cvs1.fedora.phx.redhat.com> Author: berrange Update of /cvs/pkgs/rpms/libvirt/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10123 Modified Files: libvirt.spec Added Files: libvirt-0.6.0-autostart-timeout.patch libvirt-0.6.0-dbus-threads.patch libvirt-0.6.0-qemu-startup.patch Log Message: Fix QEMU startup timeout/race (rhbz #484649) Setup DBus threading. Don't allow dbus to call _exit / change SIGPIPE (rhbz #484553) Fix timeout when autostarting session daemon libvirt-0.6.0-autostart-timeout.patch: --- NEW FILE libvirt-0.6.0-autostart-timeout.patch --- diff -rup libvirt-0.6.0.orig/src/remote_internal.c libvirt-0.6.0.new/src/remote_internal.c --- libvirt-0.6.0.orig/src/remote_internal.c 2009-02-18 10:56:34.000000000 +0000 +++ libvirt-0.6.0.new/src/remote_internal.c 2009-02-18 13:35:26.000000000 +0000 @@ -654,12 +654,13 @@ doRemoteOpen (virConnectPtr conn, */ if (errno == ECONNREFUSED && flags & VIR_DRV_OPEN_REMOTE_AUTOSTART && - trials < 5) { + trials < 20) { close(priv->sock); priv->sock = -1; - if (remoteForkDaemon(conn) == 0) { + if (trials > 0 || + remoteForkDaemon(conn) == 0) { trials++; - usleep(5000 * trials * trials); + usleep(1000 * 100 * trials); goto autostart_retry; } } Only in libvirt-0.6.0.new/src: remote_internal.c~ libvirt-0.6.0-dbus-threads.patch: --- NEW FILE libvirt-0.6.0-dbus-threads.patch --- diff -rup libvirt-0.6.0.orig/qemud/qemud.c libvirt-0.6.0.new/qemud/qemud.c --- libvirt-0.6.0.orig/qemud/qemud.c 2009-02-18 10:56:34.000000000 +0000 +++ libvirt-0.6.0.new/qemud/qemud.c 2009-02-18 12:52:18.000000000 +0000 @@ -860,6 +860,10 @@ static struct qemud_server *qemudNetwork if (auth_unix_rw == REMOTE_AUTH_POLKIT || auth_unix_ro == REMOTE_AUTH_POLKIT) { DBusError derr; + + dbus_connection_set_change_sigpipe(FALSE); + dbus_threads_init_default(); + dbus_error_init(&derr); server->sysbus = dbus_bus_get(DBUS_BUS_SYSTEM, &derr); if (!(server->sysbus)) { @@ -868,6 +872,7 @@ static struct qemud_server *qemudNetwork dbus_error_free(&derr); goto cleanup; } + dbus_connection_set_exit_on_disconnect(server->sysbus, FALSE); } #endif diff -rup libvirt-0.6.0.orig/src/node_device_hal.c libvirt-0.6.0.new/src/node_device_hal.c --- libvirt-0.6.0.orig/src/node_device_hal.c 2009-01-16 12:44:22.000000000 +0000 +++ libvirt-0.6.0.new/src/node_device_hal.c 2009-02-18 12:52:48.000000000 +0000 @@ -685,6 +685,9 @@ static int halDeviceMonitorStartup(void) nodeDeviceLock(driverState); /* Allocate and initialize a new HAL context */ + dbus_connection_set_change_sigpipe(FALSE); + dbus_threads_init_default(); + dbus_error_init(&err); hal_ctx = libhal_ctx_new(); if (hal_ctx == NULL) { @@ -696,6 +699,8 @@ static int halDeviceMonitorStartup(void) fprintf(stderr, "%s: dbus_bus_get failed\n", __FUNCTION__); goto failure; } + dbus_connection_set_exit_on_disconnect(dbus_conn, FALSE); + if (!libhal_ctx_set_dbus_connection(hal_ctx, dbus_conn)) { fprintf(stderr, "%s: libhal_ctx_set_dbus_connection failed\n", __FUNCTION__); libvirt-0.6.0-qemu-startup.patch: --- NEW FILE libvirt-0.6.0-qemu-startup.patch --- diff -rup libvirt-0.6.0.orig/src/qemu_driver.c libvirt-0.6.0.new/src/qemu_driver.c --- libvirt-0.6.0.orig/src/qemu_driver.c 2009-01-31 09:04:18.000000000 +0000 +++ libvirt-0.6.0.new/src/qemu_driver.c 2009-02-18 11:15:37.000000000 +0000 @@ -633,6 +633,7 @@ qemudReadMonitorOutput(virConnectPtr con { int got = 0; buf[0] = '\0'; + timeout *= 1000; /* poll wants milli seconds */ /* Consume & discard the initial greeting */ while (got < (buflen-1)) { @@ -694,6 +695,56 @@ qemudReadMonitorOutput(virConnectPtr con } + +/* + * Returns -1 for error, 0 on success + */ +static int +qemudReadLogOutput(virConnectPtr conn, + virDomainObjPtr vm, + int fd, + char *buf, + int buflen, + qemudHandlerMonitorOutput func, + const char *what, + int timeout) +{ + int got = 0; + int ret; + int retries = timeout*10; + buf[0] = '\0'; + + while (retries) { + while((ret = read(fd, buf+got, buflen-got-1)) > 0) { + got += ret; + buf[got] = '\0'; + if ((buflen-got-1) == 0) { + qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + _("Out of space while reading %s log output"), what); + return -1; + } + } + + if (ret < 0 && errno != EINTR) { + virReportSystemError(conn, errno, + _("Failure while reading %s log output"), + what); + return -1; + } + + ret = func(conn, vm, buf, fd); + if (ret <= 0) + return ret; + + usleep(100*1000); + retries--; + } + if (retries == 0) + qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + _("Timed out while reading %s log output"), what); + return -1; +} + static int qemudCheckMonitorPrompt(virConnectPtr conn ATTRIBUTE_UNUSED, virDomainObjPtr vm, @@ -738,7 +789,7 @@ static int qemudOpenMonitor(virConnectPt vm, monfd, buf, sizeof(buf), qemudCheckMonitorPrompt, - "monitor", 10000) <= 0) + "monitor", 10) <= 0) ret = -1; else ret = 0; @@ -770,6 +821,7 @@ static int qemudOpenMonitor(virConnectPt return ret; } +/* Returns -1 for error, 0 success, 1 continue reading */ static int qemudExtractMonitorPath(virConnectPtr conn, const char *haystack, size_t *offset, @@ -873,19 +925,16 @@ static int qemudWaitForMonitor(virConnec < 0) return -1; - ret = qemudReadMonitorOutput(conn, vm, logfd, buf, sizeof(buf), - qemudFindCharDevicePTYs, - "console", 3000); + ret = qemudReadLogOutput(conn, vm, logfd, buf, sizeof(buf), + qemudFindCharDevicePTYs, + "console", 3); if (close(logfd) < 0) qemudLog(QEMUD_WARN, _("Unable to close logfile: %s\n"), strerror(errno)); - if (ret == 1) /* Success */ + if (ret == 0) /* success */ return 0; - if (ret == -1) - return -1; - /* Unexpected end of file - inform user of QEMU log data */ qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, _("unable to start guest: %s"), buf); Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/F-10/libvirt.spec,v retrieving revision 1.108 retrieving revision 1.109 diff -u -r1.108 -r1.109 --- libvirt.spec 6 Feb 2009 20:22:30 -0000 1.108 +++ libvirt.spec 18 Feb 2009 14:05:47 -0000 1.109 @@ -47,12 +47,15 @@ Summary: Library providing a simple API virtualization Name: libvirt Version: 0.6.0 -Release: 2%{?dist}%{?extra_release} +Release: 3%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries Source: libvirt-%{version}.tar.gz Patch1: %{name}-%{version}-timeout.patch Patch2: %{name}-%{version}-rpccall2.patch +Patch3: %{name}-%{version}-qemu-startup.patch +Patch4: %{name}-%{version}-dbus-threads.patch +Patch5: %{name}-%{version}-autostart-timeout.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root URL: http://libvirt.org/ BuildRequires: python python-devel @@ -181,6 +184,9 @@ %setup -q %patch1 -p1 %patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 %build %if ! %{with_xen} @@ -463,6 +469,11 @@ %endif %changelog +* Wed Feb 18 2009 Daniel P. Berrange - 0.6.0-3.fc10 +- Fix QEMU startup timeout/race (rhbz #484649) +- Setup DBus threading. Don't allow dbus to call _exit / change SIGPIPE (rhbz #484553) +- Fix timeout when autostarting session daemon + * Fri Feb 6 2009 Daniel P. Berrange - 0.6.0-2.fc10 - Fix libvirtd --timeout usage - Fix RPC call problems and QEMU startup handling (rhbz #484414) From berrange at fedoraproject.org Wed Feb 18 14:15:50 2009 From: berrange at fedoraproject.org (Daniel P. Berrange) Date: Wed, 18 Feb 2009 14:15:50 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libvirt/F-9 libvirt-0.6.0-autostart-timeout.patch, NONE, 1.1 libvirt-0.6.0-dbus-threads.patch, NONE, 1.1 libvirt-0.6.0-qemu-startup.patch, NONE, 1.1 libvirt.spec, 1.99, 1.100 Message-ID: <20090218141550.027D5700F7@cvs1.fedora.phx.redhat.com> Author: berrange Update of /cvs/pkgs/rpms/libvirt/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11469 Modified Files: libvirt.spec Added Files: libvirt-0.6.0-autostart-timeout.patch libvirt-0.6.0-dbus-threads.patch libvirt-0.6.0-qemu-startup.patch Log Message: Fix QEMU startup timeout/race (rhbz #484649) Setup DBus threading. Don't allow dbus to call _exit / change SIGPIPE (rhbz #484553) Fix timeout when autostarting session daemon libvirt-0.6.0-autostart-timeout.patch: --- NEW FILE libvirt-0.6.0-autostart-timeout.patch --- diff -rup libvirt-0.6.0.orig/src/remote_internal.c libvirt-0.6.0.new/src/remote_internal.c --- libvirt-0.6.0.orig/src/remote_internal.c 2009-02-18 10:56:34.000000000 +0000 +++ libvirt-0.6.0.new/src/remote_internal.c 2009-02-18 13:35:26.000000000 +0000 @@ -654,12 +654,13 @@ doRemoteOpen (virConnectPtr conn, */ if (errno == ECONNREFUSED && flags & VIR_DRV_OPEN_REMOTE_AUTOSTART && - trials < 5) { + trials < 20) { close(priv->sock); priv->sock = -1; - if (remoteForkDaemon(conn) == 0) { + if (trials > 0 || + remoteForkDaemon(conn) == 0) { trials++; - usleep(5000 * trials * trials); + usleep(1000 * 100 * trials); goto autostart_retry; } } Only in libvirt-0.6.0.new/src: remote_internal.c~ libvirt-0.6.0-dbus-threads.patch: --- NEW FILE libvirt-0.6.0-dbus-threads.patch --- diff -rup libvirt-0.6.0.orig/qemud/qemud.c libvirt-0.6.0.new/qemud/qemud.c --- libvirt-0.6.0.orig/qemud/qemud.c 2009-02-18 10:56:34.000000000 +0000 +++ libvirt-0.6.0.new/qemud/qemud.c 2009-02-18 12:52:18.000000000 +0000 @@ -860,6 +860,10 @@ static struct qemud_server *qemudNetwork if (auth_unix_rw == REMOTE_AUTH_POLKIT || auth_unix_ro == REMOTE_AUTH_POLKIT) { DBusError derr; + + dbus_connection_set_change_sigpipe(FALSE); + dbus_threads_init_default(); + dbus_error_init(&derr); server->sysbus = dbus_bus_get(DBUS_BUS_SYSTEM, &derr); if (!(server->sysbus)) { @@ -868,6 +872,7 @@ static struct qemud_server *qemudNetwork dbus_error_free(&derr); goto cleanup; } + dbus_connection_set_exit_on_disconnect(server->sysbus, FALSE); } #endif diff -rup libvirt-0.6.0.orig/src/node_device_hal.c libvirt-0.6.0.new/src/node_device_hal.c --- libvirt-0.6.0.orig/src/node_device_hal.c 2009-01-16 12:44:22.000000000 +0000 +++ libvirt-0.6.0.new/src/node_device_hal.c 2009-02-18 12:52:48.000000000 +0000 @@ -685,6 +685,9 @@ static int halDeviceMonitorStartup(void) nodeDeviceLock(driverState); /* Allocate and initialize a new HAL context */ + dbus_connection_set_change_sigpipe(FALSE); + dbus_threads_init_default(); + dbus_error_init(&err); hal_ctx = libhal_ctx_new(); if (hal_ctx == NULL) { @@ -696,6 +699,8 @@ static int halDeviceMonitorStartup(void) fprintf(stderr, "%s: dbus_bus_get failed\n", __FUNCTION__); goto failure; } + dbus_connection_set_exit_on_disconnect(dbus_conn, FALSE); + if (!libhal_ctx_set_dbus_connection(hal_ctx, dbus_conn)) { fprintf(stderr, "%s: libhal_ctx_set_dbus_connection failed\n", __FUNCTION__); libvirt-0.6.0-qemu-startup.patch: --- NEW FILE libvirt-0.6.0-qemu-startup.patch --- diff -rup libvirt-0.6.0.orig/src/qemu_driver.c libvirt-0.6.0.new/src/qemu_driver.c --- libvirt-0.6.0.orig/src/qemu_driver.c 2009-01-31 09:04:18.000000000 +0000 +++ libvirt-0.6.0.new/src/qemu_driver.c 2009-02-18 11:15:37.000000000 +0000 @@ -633,6 +633,7 @@ qemudReadMonitorOutput(virConnectPtr con { int got = 0; buf[0] = '\0'; + timeout *= 1000; /* poll wants milli seconds */ /* Consume & discard the initial greeting */ while (got < (buflen-1)) { @@ -694,6 +695,56 @@ qemudReadMonitorOutput(virConnectPtr con } + +/* + * Returns -1 for error, 0 on success + */ +static int +qemudReadLogOutput(virConnectPtr conn, + virDomainObjPtr vm, + int fd, + char *buf, + int buflen, + qemudHandlerMonitorOutput func, + const char *what, + int timeout) +{ + int got = 0; + int ret; + int retries = timeout*10; + buf[0] = '\0'; + + while (retries) { + while((ret = read(fd, buf+got, buflen-got-1)) > 0) { + got += ret; + buf[got] = '\0'; + if ((buflen-got-1) == 0) { + qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + _("Out of space while reading %s log output"), what); + return -1; + } + } + + if (ret < 0 && errno != EINTR) { + virReportSystemError(conn, errno, + _("Failure while reading %s log output"), + what); + return -1; + } + + ret = func(conn, vm, buf, fd); + if (ret <= 0) + return ret; + + usleep(100*1000); + retries--; + } + if (retries == 0) + qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + _("Timed out while reading %s log output"), what); + return -1; +} + static int qemudCheckMonitorPrompt(virConnectPtr conn ATTRIBUTE_UNUSED, virDomainObjPtr vm, @@ -738,7 +789,7 @@ static int qemudOpenMonitor(virConnectPt vm, monfd, buf, sizeof(buf), qemudCheckMonitorPrompt, - "monitor", 10000) <= 0) + "monitor", 10) <= 0) ret = -1; else ret = 0; @@ -770,6 +821,7 @@ static int qemudOpenMonitor(virConnectPt return ret; } +/* Returns -1 for error, 0 success, 1 continue reading */ static int qemudExtractMonitorPath(virConnectPtr conn, const char *haystack, size_t *offset, @@ -873,19 +925,16 @@ static int qemudWaitForMonitor(virConnec < 0) return -1; - ret = qemudReadMonitorOutput(conn, vm, logfd, buf, sizeof(buf), - qemudFindCharDevicePTYs, - "console", 3000); + ret = qemudReadLogOutput(conn, vm, logfd, buf, sizeof(buf), + qemudFindCharDevicePTYs, + "console", 3); if (close(logfd) < 0) qemudLog(QEMUD_WARN, _("Unable to close logfile: %s\n"), strerror(errno)); - if (ret == 1) /* Success */ + if (ret == 0) /* success */ return 0; - if (ret == -1) - return -1; - /* Unexpected end of file - inform user of QEMU log data */ qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, _("unable to start guest: %s"), buf); Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/F-9/libvirt.spec,v retrieving revision 1.99 retrieving revision 1.100 diff -u -r1.99 -r1.100 --- libvirt.spec 6 Feb 2009 20:01:02 -0000 1.99 +++ libvirt.spec 18 Feb 2009 14:15:19 -0000 1.100 @@ -47,12 +47,15 @@ Summary: Library providing a simple API virtualization Name: libvirt Version: 0.6.0 -Release: 2%{?dist}%{?extra_release} +Release: 3%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries Source: libvirt-%{version}.tar.gz Patch1: %{name}-%{version}-timeout.patch Patch2: %{name}-%{version}-rpccall.patch +Patch3: %{name}-%{version}-qemu-startup.patch +Patch4: %{name}-%{version}-dbus-threads.patch +Patch5: %{name}-%{version}-autostart-timeout.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root URL: http://libvirt.org/ BuildRequires: python python-devel @@ -181,6 +184,9 @@ %setup -q %patch1 -p1 %patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 %build %if ! %{with_xen} @@ -463,6 +469,11 @@ %endif %changelog +* Wed Feb 18 2009 Daniel P. Berrange - 0.6.0-3.fc9 +- Fix QEMU startup timeout/race (rhbz #484649) +- Setup DBus threading. Don't allow dbus to call _exit / change SIGPIPE (rhbz #484553) +- Fix timeout when autostarting session daemon + * Fri Feb 6 2009 Daniel P. Berrange - 0.6.0-2.fc9 - Fix libvirtd --timeout usage - Fix RPC call problems and QEMU startup handling (rhbz #484414) From markmc at fedoraproject.org Sun Feb 22 11:56:28 2009 From: markmc at fedoraproject.org (Mark McLoughlin) Date: Sun, 22 Feb 2009 11:56:28 +0000 (UTC) Subject: [fedora-virt-maint] rpms/kvm/devel .cvsignore, 1.42, 1.43 kvm-62-block-rw-range-check.patch, 1.8, 1.9 kvm.spec, 1.87, 1.88 sources, 1.42, 1.43 Message-ID: <20090222115628.72598700FE@cvs1.fedora.phx.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/kvm/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16529 Modified Files: .cvsignore kvm-62-block-rw-range-check.patch kvm.spec sources Log Message: * Sun Feb 22 2009 Mark McLoughlin - 84-1 - Update to kvm-84 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kvm/devel/.cvsignore,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- .cvsignore 15 Jan 2009 17:30:42 -0000 1.42 +++ .cvsignore 22 Feb 2009 11:55:57 -0000 1.43 @@ -1 +1 @@ -kvm-83.tar.gz +kvm-84.tar.gz kvm-62-block-rw-range-check.patch: Index: kvm-62-block-rw-range-check.patch =================================================================== RCS file: /cvs/pkgs/rpms/kvm/devel/kvm-62-block-rw-range-check.patch,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- kvm-62-block-rw-range-check.patch 11 Feb 2009 13:36:41 -0000 1.8 +++ kvm-62-block-rw-range-check.patch 22 Feb 2009 11:55:57 -0000 1.9 @@ -1,46 +1,6 @@ -Index: kvm-81/qemu/block-qcow.c -=================================================================== ---- kvm-81.orig/qemu/block-qcow.c -+++ kvm-81/qemu/block-qcow.c -@@ -95,7 +95,7 @@ static int qcow_open(BlockDriverState *b - int len, i, shift, ret; - QCowHeader header; - -- ret = bdrv_file_open(&s->hd, filename, flags); -+ ret = bdrv_file_open(&s->hd, filename, flags | BDRV_O_AUTOGROW); - if (ret < 0) - return ret; - if (bdrv_pread(s->hd, 0, &header, sizeof(header)) != sizeof(header)) -Index: kvm-81/qemu/block-qcow2.c -=================================================================== ---- kvm-81.orig/qemu/block-qcow2.c -+++ kvm-81/qemu/block-qcow2.c -@@ -197,7 +197,7 @@ static int qcow_open(BlockDriverState *b - flags |= BDRV_O_CACHE_WB; - flags &= ~BDRV_O_CACHE_DEF; - } -- ret = bdrv_file_open(&s->hd, filename, flags); -+ ret = bdrv_file_open(&s->hd, filename, flags | BDRV_O_AUTOGROW); - if (ret < 0) - return ret; - if (bdrv_pread(s->hd, 0, &header, sizeof(header)) != sizeof(header)) -Index: kvm-81/qemu/block-vmdk.c -=================================================================== ---- kvm-81.orig/qemu/block-vmdk.c -+++ kvm-81/qemu/block-vmdk.c -@@ -377,7 +377,7 @@ static int vmdk_open(BlockDriverState *b - // Parent must be opened as RO. - flags = BDRV_O_RDONLY; - -- ret = bdrv_file_open(&s->hd, filename, flags); -+ ret = bdrv_file_open(&s->hd, filename, flags | BDRV_O_AUTOGROW); - if (ret < 0) - return ret; - if (bdrv_pread(s->hd, 0, &magic, sizeof(magic)) != sizeof(magic)) -Index: kvm-81/qemu/block.c -=================================================================== ---- kvm-81.orig/qemu/block.c -+++ kvm-81/qemu/block.c +diff -up kvm-84/qemu/block.c.block-rw-range-check kvm-84/qemu/block.c +--- kvm-84/qemu/block.c.block-rw-range-check 2009-02-12 15:19:26.000000000 +0000 ++++ kvm-84/qemu/block.c 2009-02-22 11:49:55.000000000 +0000 @@ -128,6 +128,60 @@ void path_combine(char *dest, int dest_s } } @@ -102,7 +62,7 @@ static void bdrv_register(BlockDriver *bdrv) { -@@ -340,6 +394,10 @@ int bdrv_open2(BlockDriverState *bs, con +@@ -338,6 +392,10 @@ int bdrv_open2(BlockDriverState *bs, con bs->read_only = 0; bs->is_temporary = 0; bs->encrypted = 0; @@ -113,15 +73,15 @@ if (flags & BDRV_O_SNAPSHOT) { BlockDriverState *bs1; -@@ -396,6 +454,7 @@ int bdrv_open2(BlockDriverState *bs, con +@@ -394,6 +452,7 @@ int bdrv_open2(BlockDriverState *bs, con } bs->drv = drv; bs->opaque = qemu_mallocz(drv->instance_size); + bs->total_sectors = 0; /* driver will set if it does not do getlength */ - if (bs->opaque == NULL && drv->instance_size > 0) - return -1; /* Note: for compatibility, we open disk image files as RDWR, and -@@ -461,6 +520,7 @@ void bdrv_close(BlockDriverState *bs) + RDONLY as fallback */ + if (!(flags & BDRV_O_FILE)) +@@ -457,6 +516,7 @@ void bdrv_close(BlockDriverState *bs) bs->drv = NULL; /* call the change callback */ @@ -129,7 +89,7 @@ bs->media_changed = 1; if (bs->change_cb) bs->change_cb(bs->change_opaque); -@@ -533,6 +593,9 @@ int bdrv_read(BlockDriverState *bs, int6 +@@ -529,6 +589,9 @@ int bdrv_read(BlockDriverState *bs, int6 if (!drv) return -ENOMEDIUM; @@ -139,18 +99,16 @@ if (drv->bdrv_pread) { int ret, len; len = nb_sectors * 512; -@@ -565,6 +628,10 @@ int bdrv_write(BlockDriverState *bs, int +@@ -561,6 +624,8 @@ int bdrv_write(BlockDriverState *bs, int return -ENOMEDIUM; if (bs->read_only) return -EACCES; -+ + if (bdrv_wr_badreq_sectors(bs, sector_num, nb_sectors)) + return -EDOM; -+ if (drv->bdrv_pwrite) { - int ret, len; + int ret, len, count = 0; len = nb_sectors * 512; -@@ -687,6 +754,8 @@ int bdrv_pread(BlockDriverState *bs, int +@@ -684,6 +749,8 @@ int bdrv_pread(BlockDriverState *bs, int return -ENOMEDIUM; if (!drv->bdrv_pread) return bdrv_pread_em(bs, offset, buf1, count1); @@ -159,7 +117,7 @@ return drv->bdrv_pread(bs, offset, buf1, count1); } -@@ -702,6 +771,8 @@ int bdrv_pwrite(BlockDriverState *bs, in +@@ -699,6 +766,8 @@ int bdrv_pwrite(BlockDriverState *bs, in return -ENOMEDIUM; if (!drv->bdrv_pwrite) return bdrv_pwrite_em(bs, offset, buf1, count1); @@ -168,7 +126,7 @@ return drv->bdrv_pwrite(bs, offset, buf1, count1); } -@@ -1127,6 +1198,8 @@ int bdrv_write_compressed(BlockDriverSta +@@ -1120,6 +1189,8 @@ int bdrv_write_compressed(BlockDriverSta return -ENOMEDIUM; if (!drv->bdrv_write_compressed) return -ENOTSUP; @@ -177,7 +135,7 @@ return drv->bdrv_write_compressed(bs, sector_num, buf, nb_sectors); } -@@ -1273,6 +1346,8 @@ BlockDriverAIOCB *bdrv_aio_read(BlockDri +@@ -1329,6 +1400,8 @@ BlockDriverAIOCB *bdrv_aio_read(BlockDri if (!drv) return NULL; @@ -186,7 +144,7 @@ ret = drv->bdrv_aio_read(bs, sector_num, buf, nb_sectors, cb, opaque); -@@ -1297,6 +1372,9 @@ BlockDriverAIOCB *bdrv_aio_write(BlockDr +@@ -1353,6 +1426,9 @@ BlockDriverAIOCB *bdrv_aio_write(BlockDr if (bs->read_only) return NULL; @@ -196,10 +154,20 @@ ret = drv->bdrv_aio_write(bs, sector_num, buf, nb_sectors, cb, opaque); if (ret) { -Index: kvm-81/qemu/block_int.h -=================================================================== ---- kvm-81.orig/qemu/block_int.h -+++ kvm-81/qemu/block_int.h +diff -up kvm-84/qemu/block.h.block-rw-range-check kvm-84/qemu/block.h +--- kvm-84/qemu/block.h.block-rw-range-check 2009-02-12 15:19:26.000000000 +0000 ++++ kvm-84/qemu/block.h 2009-02-22 11:47:19.000000000 +0000 +@@ -53,6 +53,7 @@ typedef struct QEMUSnapshotInfo { + #define BDRV_O_NOCACHE 0x0020 /* do not use the host page cache */ + #define BDRV_O_CACHE_WB 0x0040 /* use write-back caching */ + #define BDRV_O_CACHE_DEF 0x0080 /* use default caching */ ++#define BDRV_O_AUTOGROW 0x0100 /* Allow backing file to extend when writing past end of file */ + + #define BDRV_O_CACHE_MASK (BDRV_O_NOCACHE | BDRV_O_CACHE_WB | BDRV_O_CACHE_DEF) + +diff -up kvm-84/qemu/block_int.h.block-rw-range-check kvm-84/qemu/block_int.h +--- kvm-84/qemu/block_int.h.block-rw-range-check 2009-02-12 15:19:26.000000000 +0000 ++++ kvm-84/qemu/block_int.h 2009-02-22 11:47:19.000000000 +0000 @@ -97,6 +97,7 @@ struct BlockDriverState { int locked; /* if true, the media cannot temporarily be ejected */ int encrypted; /* if true, the media is encrypted */ @@ -208,15 +176,39 @@ /* event callback when inserting/removing */ void (*change_cb)(void *opaque); void *change_opaque; -Index: kvm-81/qemu/block.h -=================================================================== ---- kvm-81.orig/qemu/block.h -+++ kvm-81/qemu/block.h -@@ -50,6 +50,7 @@ typedef struct QEMUSnapshotInfo { - #define BDRV_O_NOCACHE 0x0020 /* do not use the host page cache */ - #define BDRV_O_CACHE_WB 0x0040 /* use write-back caching */ - #define BDRV_O_CACHE_DEF 0x0080 /* use default caching */ -+#define BDRV_O_AUTOGROW 0x0100 /* Allow backing file to extend when writing past end of file */ +diff -up kvm-84/qemu/block-qcow2.c.block-rw-range-check kvm-84/qemu/block-qcow2.c +--- kvm-84/qemu/block-qcow2.c.block-rw-range-check 2009-02-12 15:19:26.000000000 +0000 ++++ kvm-84/qemu/block-qcow2.c 2009-02-22 11:47:19.000000000 +0000 +@@ -203,7 +203,7 @@ static int qcow_open(BlockDriverState *b + flags |= BDRV_O_CACHE_WB; + flags &= ~BDRV_O_CACHE_DEF; + } +- ret = bdrv_file_open(&s->hd, filename, flags); ++ ret = bdrv_file_open(&s->hd, filename, flags | BDRV_O_AUTOGROW); + if (ret < 0) + return ret; + if (bdrv_pread(s->hd, 0, &header, sizeof(header)) != sizeof(header)) +diff -up kvm-84/qemu/block-qcow.c.block-rw-range-check kvm-84/qemu/block-qcow.c +--- kvm-84/qemu/block-qcow.c.block-rw-range-check 2009-02-12 15:19:26.000000000 +0000 ++++ kvm-84/qemu/block-qcow.c 2009-02-22 11:47:19.000000000 +0000 +@@ -95,7 +95,7 @@ static int qcow_open(BlockDriverState *b + int len, i, shift, ret; + QCowHeader header; - #define BDRV_O_CACHE_MASK (BDRV_O_NOCACHE | BDRV_O_CACHE_WB | BDRV_O_CACHE_DEF) +- ret = bdrv_file_open(&s->hd, filename, flags); ++ ret = bdrv_file_open(&s->hd, filename, flags | BDRV_O_AUTOGROW); + if (ret < 0) + return ret; + if (bdrv_pread(s->hd, 0, &header, sizeof(header)) != sizeof(header)) +diff -up kvm-84/qemu/block-vmdk.c.block-rw-range-check kvm-84/qemu/block-vmdk.c +--- kvm-84/qemu/block-vmdk.c.block-rw-range-check 2009-02-12 15:19:26.000000000 +0000 ++++ kvm-84/qemu/block-vmdk.c 2009-02-22 11:47:19.000000000 +0000 +@@ -373,7 +373,7 @@ static int vmdk_open(BlockDriverState *b + // Parent must be opened as RO. + flags = BDRV_O_RDONLY; +- ret = bdrv_file_open(&s->hd, filename, flags); ++ ret = bdrv_file_open(&s->hd, filename, flags | BDRV_O_AUTOGROW); + if (ret < 0) + return ret; + if (bdrv_pread(s->hd, 0, &magic, sizeof(magic)) != sizeof(magic)) Index: kvm.spec =================================================================== RCS file: /cvs/pkgs/rpms/kvm/devel/kvm.spec,v retrieving revision 1.87 retrieving revision 1.88 diff -u -r1.87 -r1.88 --- kvm.spec 11 Feb 2009 16:14:30 -0000 1.87 +++ kvm.spec 22 Feb 2009 11:55:57 -0000 1.88 @@ -1,7 +1,7 @@ Summary: Kernel-based Virtual Machine Name: kvm -Version: 83 -Release: 5%{?dist} +Version: 84 +Release: 1%{?dist} License: GPLv2+ and LGPLv2+ Group: Development/Tools URL: http://%{name}.sf.net @@ -54,8 +54,8 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 +%patch0 -p1 -b .block-rw-range-check +%patch1 -p1 -b .compile-fixes # "configure --kerneldir" looks for this # FIXME: kvm-84 or later shouldn't need this anymore, see: @@ -74,13 +74,13 @@ # to the debug packages. build_id_available() { - echo "int main () { return 0; }" | gcc -x c -Wl,--build-id - 2>/dev/null + echo "int main () { return 0; }" | gcc -x c -Wl,--build-id - 2>/dev/null } if build_id_available; then - qemuldflags="-Wl,--build-id"; + qemuldflags="-Wl,--build-id"; else - qemuldflags=""; + qemuldflags=""; fi @@ -197,6 +197,9 @@ %changelog +* Sun Feb 22 2009 Mark McLoughlin - 84-1 +- Update to kvm-84 + * Wed Feb 11 2009 Eduardo Habkost - 83-5 - Compile fixes for newer gcc Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kvm/devel/sources,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- sources 15 Jan 2009 17:24:44 -0000 1.42 +++ sources 22 Feb 2009 11:55:57 -0000 1.43 @@ -1 +1 @@ -dfb3cc36029d84e83c5006c600337754 kvm-83.tar.gz +39b7206ef400845800f081a5b901f757 kvm-84.tar.gz From Matt_Domsch at dell.com Sun Feb 22 03:13:25 2009 From: Matt_Domsch at dell.com (Matt Domsch) Date: Sat, 21 Feb 2009 21:13:25 -0600 Subject: [fedora-virt-maint] Fedora rawhide rebuild in mock status 2009-02-20 x86_64 Message-ID: <20090222031325.GA16375@mock.linuxdev.us.dell.com> Fedora Rawhide-in-Mock Build Results for x86_64 based on rawhide as of Friday Feb 20, 2009. Most packages were actually built as of the F11 Alpha cut on or around Feb 1. Any newer packages in rawhide as of Feb 20 were then pulled in and rebuilt, and any previously-failed packages were also rebuilt, so I believe this list to be current and correct. I did have a couple servers fail during the builds, so it is possible that at most 8 of these are not true failures, but a result of builders crashing. Don't pin your hopes on that though. :-) Full logs at http://linux.dell.com/files/fedora/FixBuildRequires/ 1 Open Bugs which now build, and can be marked CLOSED RAWHIDE: grub: [u'484329'] Total packages: 7073 Number failed to build: 306 Number expected to fail due to ExclusiveArch or ExcludeArch: 33 Leaving: 273 Of those expected to have worked... Without a bug filed: 271 ---------------------------------- ConsoleKit-0.3.0-3.fc11 (build/make) mccann,jmccann DevIL-1.7.7-1.fc11 (patch_fuzz) jwrdegoede DeviceKit-disks-002-0.git20080720.fc10 (build/make) davidz Macaulay2-1.1-2.fc10 (build/make) rdieter PyQt4-4.4.4-3.fc11 (build/make) rdieter,than R-BSgenome.Celegans.UCSC.ce2-1.2.0-5 (build/make) pingou R-BSgenome.Dmelanogaster.FlyBase.r51-1.3.1-3 (build/make) pingou R-hgu95av2probe-2.0.0-1.fc9 (build/make) pingou R-lmtest-0.9-2.fc10 (build/make) orion R-pls-2.1-2.fc9 (build/make) pingou Sprog-0.14-13.fc9 (build/make) ghenry UnihanDb-5.1.0-7.fc10 (build/make) dchen,i18n-team agistudio-1.2.3-8.fc11 (build/make) limb alsa-oss-1.0.17-1.fc10 (build/make) jima anjuta-2.25.901-2.fc11 (build/make) rishi,rakesh atlas-3.8.2-5.fc11 (build/make) deji,deji autotrace-0.31.1-18.fc10 (build/make) qspencer avogadro-0.9.0-1.fc11 (build/make) sdz ax25-apps-0.0.6-2.fc9 (build/make) bjensen,sindrepb,sconklin,dp67 banshee-1.4.2-3.fc11 (build/make) salimma,spot batik-1.7-3.fc11 (build/make) langel,fitzsim binutils-2.19.51.0.2-12.fc11 (patch_fuzz) nickc,jakub,jkratoch,nickc blackbox-0.70.1-11 (build/make) thias bluez-gnome-1.8-12.fc11 (build/make) hadess,hadess boo-0.8.1.2865-4.fc9 (build/make) pfj castor-0.9.5-3.fc10 (build/make) pcheung cdo-1.0.8-2.fc9 (build/make) edhill cegui-0.6.2-1.fc11 (build/make) jwrdegoede clustermon-0.15.0-8.fc11 (build/make) rmccabe compat-db-4.6.21-5.fc10 (build/make) jnovy,pmatilai compat-gcc-32-3.2.3-64 (build/make) jakub coredumper-1.2.1-6.fc10 (build/make) rakesh corosync-0.92-7.svn1756.fc11 (build/make) sdake,agk,fabbione cowbell-0.3-0.svn34.4.fc10 (build/make) sindrepb dbmail-2.2.11-2.fc10 (build/make) bjohnson dbxml-2.4.16-0.2.fc11 (build/make) mzazrive dvb-apps-1.1.1-12.fc10 (build/make) scop eclipse-3.4.1-15.fc11 (build/make) overholt,oliver,overholt,akurtakov eel2-2.25.1-4.fc11 (build/make) tbzatek enigma-1.01-8.1 (build/make) thl,wart etherboot-5.4.4-8.fc11 (build/make) ehabkost,glommer,virtmaint evolution-brutus-1.2.34-2.fc11 (build/make) bpepple,colding fbreader-0.10.3-1.fc11 (build/make) salimma festival-1.96-7.fc10 (build/make) davidz,mattdm file-browser-applet-0.6.0-1.fc11 (build/make) deji firewalk-5.0-2.fc9 (build/make) sindrepb flite-1.3-10.fc10 (build/make) faucamp fpc-2.2.2-3.fc10 (build/make) joost,tbzatek freealut-1.1.0-6.fc9 (build/make) awjb freetds-0.82-3.fc10 (build/make) buc g3data-1.5.1-8.fc9 (build/make) jspaleta gambas2-2.11.1-1.fc11 (build/make) spot gauche-0.8.13-2.fc10 (build/make) gemi gauche-gl-0.4.4-3.fc9 (build/make) gemi gauche-gtk-0.4.1-17.fc9 (build/make) gemi gcl-2.6.8-0.1.20080902cvs.2.fc11 (build/make) jjames,green gcombust-0.1.55-13 (build/make) thias gdbm-1.8.0-29.fc10 (build/make) kasal gedit-vala-0.3.2-3.fc11 (build/make) salimma geronimo-specs-1.0-2.M2.fc10 (build/make) fnasser gfan-0.3-3.fc11 (build/make) konradm ggz-gtk-client-0.0.14.1-1.fc9 (build/make) bpepple,rdieter ghdl-0.27-0.110svn.3.fc11 (build/make) sailer glibc-2.9.90-7 (build/make) jakub glunarclock-0.32.4-12.fc10 (build/make) limb gmp-4.2.4-4.fc11 (build/make) varekova gnome-applet-vm-0.2.0-2.fc9 (build/make) crobinso,virtmaint gnome-chemistry-utils-0.10.2-1.fc11 (build/make) belegdol gnome-desktop-sharp-2.24.0-3.fc10 (build/make) laxathom gnome-specimen-0.3-3.fc11 (build/make) splinux gnome-themes-extras-2.22.0-2.fc9 (build/make) mwiriadi,mwiriadi gnu-smalltalk-3.1-1.fc10 (build/make) s4504kr,laxathom gpm-1.20.6-1.fc11 (build/make) zprikryl,pertusus graphviz-2.20.3-1.fc11.2 (build/make) jima grass-6.3.0-10.fc11 (build/make) rezso,pertusus gthumb-2.10.10-3.fc10 (build/make) behdad gtkspell-2.0.15-1.fc10 (build/make) mbarnes haddock09-0.9-3.fc10 (build/make) bos,haskell-sig,petersen happy-1.18.2-1.fc11 (build/make) bos,haskell-sig,petersen hdf5-1.8.1-2.fc10 (build/make) orion,pertusus ibus-chewing-0.1.1.20081023-2.fc11 (build/make) dchen,i18n-team,phuang ibus-table-0.1.1.20081014-4.fc11 (build/make) cchance,i18n-team,cchance,phuang ice-3.3.0-12.fc11 (build/make) mef iml-1.0.2-4.fc11 (build/make) konradm imsettings-0.105.1-2.fc10 (build/make) tagoh,i18n-team incollector-1.0-6.fc9.1 (build/make) kurzawa ini4j-0.3.2-4.fc10 (build/make) victorv iscsi-initiator-utils-6.2.0.870-4.fc11 (build/make) michaelc,jwrdegoede jakarta-commons-el-1.0-9.4.fc10 (build/make) fnasser jakarta-commons-httpclient-3.1-0.3.fc10 (build/make) pcheung java-1.6.0-openjdk-1.6.0.0-10.b14.fc11 (build/make) langel,lkundrak,dbhole,langel,mjw javahelp2-2.0.05-5.fc10 (build/make) jtulach,fitzsim jline-0.9.94-0.2.fc10 (build/make) mwringe jrefactory-2.8.9-7.6.fc10 (build/make) dbhole jsr-305-0-0.1.20080824svn.fc10 (build/make) jjames jtidy-1.0-0.2.r7dev.1.3.fc10 (build/make) nsantos,fitzsim,dbhole kaffeine-0.8.7-2.fc10 (build/make) rdieter,scop,mef kaya-0.5.1-1.fc10 (build/make) s4504kr kbd-1.15-4.fc11 (build/make) vcrhonek kde-l10n-4.2.0-2.fc11 (build/make) than,rdieter,kkofler,tuxbrewr,ltinkl kdeedu-4.2.0-6.fc11 (build/make) than,rdieter,kkofler,tuxbrewr,arbiter,jreznik kdetv-0.8.9-10.fc9 (build/make) subhodip kipi-plugins-0.2.0-0.14.rc1.fc11 (build/make) rdieter,abompard,silfreed,mgarski,tuxbrewr,ltinkl klear-0.7.0-2.svn113.fc10 (build/make) trasher ladspa-1.12-9.fc9 (build/make) thomasvs ladspa-swh-plugins-0.4.15-12.fc9 (build/make) green lam-7.1.4-1.fc10 (build/make) dledford lash-0.5.4-2.fc9 (build/make) green lasi-1.1.0-2.fc10 (build/make) orion lcdproc-0.5.2-7.fc11 (build/make) kwizart,jwilson libXp-1.0.0-11.fc9 (build/make) ssp libbonoboui-2.24.0-1.fc10 (build/make) rstrode libcompizconfig-0.7.8-1.fc11 (build/make) izhar libctl-3.0.2-6.fc9 (build/make) edhill libdv-1.0.0-5.fc10 (build/make) jwilson libfakekey-0.1-1.fc10 (build/make) mccann libgnomedbmm-2.9.5-4.fc9 (build/make) denis libibcommon-1.1.0-1.fc10 (build/make) dledford libibmad-1.2.0-1.fc10 (build/make) dledford libibumad-1.2.0-1.fc10 (build/make) dledford libopensync-plugin-syncml-0.35-4.fc10 (build/make) cheese libpolyxmass-0.9.1-2.fc9 (build/make) awjb libpqxx-2.6.8-10.fc9 (build/make) awjb,rdieter libresample-0.1.3-9.fc10 (build/make) jcollie libsmbios-2.2.13-1.fc11 (build/make) mebrown libsndfile-1.0.17-6.fc10 (build/make) ixs libtar-1.2.11-11.fc10 (build/make) huzaifas,huzaifas libthai-0.1.9-4.fc9 (build/make) behdad linkage-0.2.0-4.fc11 (build/make) drago01 linphone-2.1.1-1.fc9 (build/make) rakesh linpsk-0.9-4.fc10 (build/make) bjensen,bjensen,sindrepb,sconklin,dp67 linux-atm-2.5.0-5 (build/make) dwmw2 listen-0.5-21.fc11 (build/make) hguemar lpsolve-5.5.0.14-1.fc11 (patch_fuzz) caolanm m17n-lib-1.5.3-1.fc10 (build/make) pnemade,i18n-team,petersen maildrop-2.0.4-6.fc9 (build/make) athimm mapnik-0.5.2-0.10.svn780.fc11 (build/make) rezso,snecker maven-scm-1.0-0.2.b3.1.6.fc10 (build/make) dbhole maven-shared-1.0-4.6.fc10 (build/make) dbhole maven2-2.0.4-10.15.fc10 (build/make) dbhole mdadm-3.0-0.devel2.1.fc11 (build/make) dledford mingw32-atk-1.25.2-5.fc11 (build/make) rjones,berrange mingw32-libgcrypt-1.4.4-1.fc11 (build/make) rjones,berrange mingw32-libltdl-1.5.26-12.fc11 (build/make) ndim mingw32-runtime-3.15.2-1.fc11 (build/make) rjones,berrange,mingwmaint minirpc-0.3.2-1.fc10 (build/make) agoode modello-1.0-0.1.a8.4.4.fc10 (build/make) mwringe module-init-tools-3.7-1.fc11 (build/make) jcm monodoc-2.0-5.fc10 (build/make) pfj msv-1.2-0.2.20050722.3.4.fc10 (build/make) mwringe mysql-5.1.31-1.fc11 (build/make) tgl nautilus-share-0.7.2-13.fc10 (build/make) orphan nautilus-sound-converter-1.0.1-1.fc11 (build/make) bpepple nethack-3.4.3-19.fc11 (build/make) lmacken nightview-0.3.2-2.fc11 (build/make) lkundrak nqc-3.1.6-2.fc9 (build/make) rvinyard nted-1.4.17-2.fc11 (build/make) ndim ocaml-omake-0.9.8.5-5.fc11 (build/make) rjones,ocamlmaint ochusha-0.6.0.1-0.3.cvs20090106T1430.fc11 (build/make) mtasaka octave-3.0.3-1.fc11 (build/make) rakesh,alexlan,mmahut,rakesh openjpeg-1.3-2.fc9 (patch_fuzz) seg openlierox-0.57-0.11.beta8.fc11 (build/make) jwrdegoede openser-1.3.4-2.fc11 (build/make) peter,ondrejj openvrml-0.17.10-2.0.fc11 (build/make) braden orpie-1.5.1-4.fc10 (build/make) xris orsa-0.7.0-2.fc10 (build/make) mjakubicek,mmahut pam_keyring-0.0.9-2.fc9 (build/make) denis pan-0.133-1.fc10 (build/make) adalloz,mpeters papyrus-0.9.0-1.fc11 (build/make) rvinyard,timn pdns-recursor-3.1.7-2.fc10 (build/make) ruben perl-5.10.0-58.fc11 (build/make) mmaslano,spot,corsepiu,rnorwood,kasal perl-Class-Autouse-1.29-3.fc9 (build/make) corsepiu,perl-sig,laxathom perl-Class-Inspector-1.23-1.fc10 (build/make) corsepiu,perl-sig,laxathom perl-File-Find-Rule-Perl-1.04-2.fc10 (build/make) corsepiu,perl-sig perl-Net-SSH-Perl-1.34-1.fc11 (build/make) pghmcfc,perl-sig perl-PDL-2.4.4-2.fc11 (build/make) kasal,orion,rnorwood,mmaslano perl-POE-Component-SNMP-1.07-3.fc9 (build/make) cweyl,perl-sig perl-RRD-Simple-1.43-3.fc9 (build/make) cweyl,perl-sig perl-Sys-Virt-0.1.2-3.fc9 (build/make) steve,perl-sig,berrange perl-Test-Inline-2.208-3.fc10 (build/make) corsepiu,perl-sig,laxathom perl-Test-WWW-Mechanize-Catalyst-0.42-1.fc10 (build/make) cweyl,perl-sig perl-WWW-Search-2.504-1.fc10 (build/make) xavierb perl-XML-LibXSLT-1.68-1.fc11 (build/make) kasal,perl-sig,shishz pfstools-1.7.0-3.fc11 (build/make) drepper plexus-appserver-1.0-0.2.a5.2.6.fc10 (build/make) dbhole plexus-cdc-1.0-0.2.a4.1.6.fc10 (build/make) dbhole plexus-i18n-1.0-0.b6.5.3.fc10 (build/make) pcheung plexus-maven-plugin-1.2-2.4.fc10 (build/make) dbhole plexus-runtime-builder-1.0-0.2.a9.1.6.fc10 (build/make) dbhole plexus-xmlrpc-1.0-0.2.b4.2.11.fc10 (build/make) dbhole plplot-5.9.2-2.fc11 (build/make) orion plt-scheme-4.1.2-1.fc11 (build/make) gemi polyxmass-bin-0.9.7-2.fc8 (build/make) awjb prelink-0.4.0-3 (build/make) jakub preload-0.6.3-1.fc10 (build/make) behdad pysvn-1.6.2-3.fc11 (build/make) ravenoak python-peak-rules-0.5a1.dev-4.2582.fc11 (build/make) lmacken python-reportlab-2.1-4.fc11 (build/make) bpepple q-7.11-2.fc10 (build/make) gemi qbittorrent-1.3.1-7.fc11 (build/make) leigh123linux qgo-1.5.4r2-1.fc9 (build/make) kaboom qpidc-0.4.738618-2.fc11 (build/make) aconway,nsantos quesa-1.8-1.fc9 (build/make) ajax radvd-1.1-6.fc11 (patch_fuzz) jskala revelation-0.4.11-7 (build/make) jspaleta,jspaleta rhm-0.4.3088-1.fc11 (build/make) aconway,nsantos rhythmbox-0.11.6-25.r6096.fc11 (build/make) hadess ruby-libvirt-0.1.0-2.fc11 (build/make) lutter,stahnma,clalance,virtmaint ruby-rpm-1.2.3-4.fc9 (build/make) lutter,stahnma rxvt-unicode-9.06-1.fc11 (build/make) awjb,mlichvar sagator-1.1.1-0.beta1.fc10 (build/make) ondrejj sane-backends-1.0.19-12.fc10 (build/make) nphilipp scidavis-0.1.4-1.fc11 (build/make) tanguy scrip-1.4-9.fc8 (build/make) edhill seahorse-plugins-2.25.90-1.fc11 (build/make) mclasen,tbzatek sigen-0.0.2-0.26.20081206git529cd0e.fc11 (build/make) mathstuf skychart-3.0.1.5-3.20081026svn.fc11 (build/make) lkundrak,mmahut slim-1.3.1-3.fc11 (build/make) afb,pertusus smarteiffel-2.3-2.fc9 (build/make) gemi sound-juicer-2.25.3-1.fc11 (build/make) hadess squid-3.0.STABLE13-1.fc11 (build/make) jskala,jsteffan,mnagy,hno,jskala srm-1.2.9-2.fc11 (build/make) fab strigi-0.6.4-1.fc11 (build/make) deji,kkofler,arbiter subtitleeditor-0.30.0-3.fc10 (build/make) mso sudo-1.6.9p17-5.fc10 (build/make) mildew,kzak synce-software-manager-0.9.0-10.fc9 (build/make) awjb thibault-fonts-0.1-3.fc11 (build/make) lyosnorezel tightvnc-1.5.0-0.12.20090204svn3586.fc11 (patch_fuzz) atkac tog-pegasus-2.7.2-4.fc11 (build/make) vcrhonek,hamzy uim-1.5.3-1.fc10 (build/make) tagoh,i18n-team ularn-1.5p4-12.fc11 (build/make) wart unixODBC-2.2.12-9.fc10 (build/make) tgl vdr-1.6.0-16.fc11 (build/make) scop,vpv velocity-1.4-7.3.fc10 (build/make) dbhole,devrim,jmrodri widelands-0-0.13.Build13.fc11 (build/make) karlik ws-commons-util-1.0.1-10.fc10 (build/make) green,overholt xdotool-20071230-2.fc10 (build/make) sindrepb xlhtml-0.5-8.fc9 (build/make) abompard xmlcopyeditor-1.1.0.6-4.fc9 (build/make) ivazquez xmlrpc3-3.0-2.9.fc10 (build/make) overholt,akurtakov xmms-cdread-0.14-13.fc9 (build/make) jsoeterb xmoto-0.5.0-5.fc11 (build/make) limb xorg-x11-drv-acecad-1.2.2-1.fc9 (build/make) xgl-maint xorg-x11-drv-aiptek-1.1.1-1.fc9 (build/make) xgl-maint xorg-x11-drv-ark-0.7.0-1.fc9 (build/make) xgl-maint xorg-x11-drv-calcomp-1.1.2-1.fc9 (build/make) xgl-maint xorg-x11-drv-citron-2.2.1-1.fc9 (build/make) xgl-maint xorg-x11-drv-diamondtouch-0.2.0-0.1.fc9 (build/make) ajax xorg-x11-drv-digitaledge-1.1.1-1.fc9 (build/make) xgl-maint xorg-x11-drv-dmc-1.1.2-1.fc9 (build/make) xgl-maint xorg-x11-drv-dummy-0.3.0-1.fc9 (build/make) xgl-maint xorg-x11-drv-dynapro-1.1.2-1.fc9 (build/make) xgl-maint xorg-x11-drv-hyperpen-1.2.0-1.fc9 (build/make) xgl-maint xorg-x11-drv-jamstudio-1.2.0-1.fc9 (build/make) xgl-maint xorg-x11-drv-magellan-1.2.0-1.fc9 (build/make) xgl-maint xorg-x11-drv-mga-1.4.9-1.fc11 (patch_fuzz) xgl-maint xorg-x11-drv-microtouch-1.2.0-1.fc9 (build/make) xgl-maint xorg-x11-drv-palmax-1.2.0-1.fc9 (build/make) xgl-maint xorg-x11-drv-penmount-1.3.0-1.fc9 (build/make) xgl-maint xorg-x11-drv-rendition-4.2.0-1.fc9 (build/make) xgl-maint xorg-x11-drv-siliconmotion-1.6.0-1.fc9 (build/make) xgl-maint xorg-x11-drv-sisusb-0.9.0-1.fc9 (build/make) xgl-maint xorg-x11-drv-spaceorb-1.1.0-6.fc9 (build/make) xgl-maint xorg-x11-drv-summa-1.2.0-2.fc10 (build/make) xgl-maint xorg-x11-drv-tek4957-1.2.0-1.fc9 (build/make) xgl-maint xorg-x11-drv-ur98-1.1.0-5.fc9 (build/make) xgl-maint xorg-x11-drv-void-1.1.1-9.fc9 (build/make) xgl-maint xorg-x11-drv-voodoo-1.2.0-1.fc9 (build/make) xgl-maint xorg-x11-drv-wiimote-0.0.1-1.fc9 (build/make) ajax xscorch-0.2.0-12.fc8 (build/make) mgarski zsh-4.3.4-8.fc9 (patch_fuzz) james With bugs filed: 2 ---------------------------------- classpathx-jaf-1.0-12.fc10 [u'479701 NEW'] (build/make) devrim,dwalluck libFoundation-1.1.3-11.fc9 [u'440564 ASSIGNED'] (build/make) athimm ---------------------------------- Packages by owner: abompard: kipi-plugins,xlhtml aconway: qpidc,rhm adalloz: pan afb: slim agk: corosync agoode: minirpc ajax: quesa,xorg-x11-drv-diamondtouch,xorg-x11-drv-wiimote akurtakov: eclipse,xmlrpc3 alexlan: octave arbiter: kdeedu,strigi athimm: libFoundation,maildrop atkac: tightvnc awjb: freealut,libpolyxmass,libpqxx,polyxmass-bin,rxvt-unicode,synce-software-manager behdad: gthumb,libthai,preload belegdol: gnome-chemistry-utils berrange: mingw32-atk,mingw32-libgcrypt,mingw32-runtime,perl-Sys-Virt bjensen: ax25-apps,linpsk,linpsk bjohnson: dbmail bos: haddock09,happy bpepple: evolution-brutus,ggz-gtk-client,nautilus-sound-converter,python-reportlab braden: openvrml buc: freetds caolanm: lpsolve cchance: ibus-table,ibus-table cheese: libopensync-plugin-syncml clalance: ruby-libvirt colding: evolution-brutus corsepiu: perl,perl-Class-Autouse,perl-Class-Inspector,perl-File-Find-Rule-Perl,perl-Test-Inline crobinso: gnome-applet-vm cweyl: perl-POE-Component-SNMP,perl-RRD-Simple,perl-Test-WWW-Mechanize-Catalyst davidz: DeviceKit-disks,festival dbhole: java-1.6.0-openjdk,jrefactory,jtidy,maven-scm,maven-shared,maven2,plexus-appserver,plexus-cdc,plexus-maven-plugin,plexus-runtime-builder,plexus-xmlrpc,velocity dchen: UnihanDb,ibus-chewing deji: atlas,atlas,file-browser-applet,strigi denis: libgnomedbmm,pam_keyring devrim: classpathx-jaf,velocity dledford: lam,libibcommon,libibmad,libibumad,mdadm dp67: ax25-apps,linpsk drago01: linkage drepper: pfstools dwalluck: classpathx-jaf dwmw2: linux-atm edhill: cdo,libctl,scrip ehabkost: etherboot fab: srm fabbione: corosync faucamp: flite fitzsim: batik,javahelp2,jtidy fnasser: geronimo-specs,jakarta-commons-el gemi: gauche,gauche-gl,gauche-gtk,plt-scheme,q,smarteiffel ghenry: Sprog glommer: etherboot green: gcl,ladspa-swh-plugins,lash,ws-commons-util hadess: bluez-gnome,bluez-gnome,rhythmbox,sound-juicer hamzy: tog-pegasus haskell-sig: haddock09,happy hguemar: listen hno: squid huzaifas: libtar,libtar i18n-team: UnihanDb,ibus-chewing,ibus-table,imsettings,m17n-lib,uim ivazquez: xmlcopyeditor ixs: libsndfile izhar: libcompizconfig jakub: binutils,compat-gcc-32,glibc,prelink james: zsh jcm: module-init-tools jcollie: libresample jima: alsa-oss,graphviz jjames: gcl,jsr-305 jkratoch: binutils jmccann: ConsoleKit jmrodri: velocity jnovy: compat-db joost: fpc jreznik: kdeedu jskala: radvd,squid,squid jsoeterb: xmms-cdread jspaleta: g3data,revelation,revelation jsteffan: squid jtulach: javahelp2 jwilson: lcdproc,libdv jwrdegoede: DevIL,cegui,iscsi-initiator-utils,openlierox kaboom: qgo karlik: widelands kasal: gdbm,perl,perl-PDL,perl-XML-LibXSLT kkofler: kde-l10n,kdeedu,strigi konradm: gfan,iml kurzawa: incollector kwizart: lcdproc kzak: sudo langel: batik,java-1.6.0-openjdk,java-1.6.0-openjdk laxathom: gnome-desktop-sharp,gnu-smalltalk,perl-Class-Autouse,perl-Class-Inspector,perl-Test-Inline leigh123linux: qbittorrent limb: agistudio,glunarclock,xmoto lkundrak: java-1.6.0-openjdk,nightview,skychart lmacken: nethack,python-peak-rules ltinkl: kde-l10n,kipi-plugins lutter: ruby-libvirt,ruby-rpm lyosnorezel: thibault-fonts mathstuf: sigen mattdm: festival mbarnes: gtkspell mccann: ConsoleKit,libfakekey mclasen: seahorse-plugins mebrown: libsmbios mef: ice,kaffeine mgarski: kipi-plugins,xscorch michaelc: iscsi-initiator-utils mildew: sudo mingwmaint: mingw32-runtime mjakubicek: orsa mjw: java-1.6.0-openjdk mlichvar: rxvt-unicode mmahut: octave,orsa,skychart mmaslano: perl,perl-PDL mnagy: squid mpeters: pan mso: subtitleeditor mtasaka: ochusha mwiriadi: gnome-themes-extras,gnome-themes-extras mwringe: jline,modello,msv mzazrive: dbxml ndim: mingw32-libltdl,nted nickc: binutils,binutils nphilipp: sane-backends nsantos: jtidy,qpidc,rhm ocamlmaint: ocaml-omake oliver: eclipse ondrejj: openser,sagator orion: R-lmtest,hdf5,lasi,perl-PDL,plplot orphan: nautilus-share overholt: eclipse,eclipse,ws-commons-util,xmlrpc3 pcheung: castor,jakarta-commons-httpclient,plexus-i18n perl-sig: perl-Class-Autouse,perl-Class-Inspector,perl-File-Find-Rule-Perl,perl-Net-SSH-Perl,perl-POE-Component-SNMP,perl-RRD-Simple,perl-Sys-Virt,perl-Test-Inline,perl-Test-WWW-Mechanize-Catalyst,perl-XML-LibXSLT pertusus: gpm,grass,hdf5,slim peter: openser petersen: haddock09,happy,m17n-lib pfj: boo,monodoc pghmcfc: perl-Net-SSH-Perl phuang: ibus-chewing,ibus-table pingou: R-BSgenome.Celegans.UCSC.ce2,R-BSgenome.Dmelanogaster.FlyBase.r51,R-hgu95av2probe,R-pls pmatilai: compat-db pnemade: m17n-lib qspencer: autotrace rakesh: anjuta,coredumper,linphone,octave,octave ravenoak: pysvn rdieter: Macaulay2,PyQt4,ggz-gtk-client,kaffeine,kde-l10n,kdeedu,kipi-plugins,libpqxx rezso: grass,mapnik rishi: anjuta rjones: mingw32-atk,mingw32-libgcrypt,mingw32-runtime,ocaml-omake rmccabe: clustermon rnorwood: perl,perl-PDL rstrode: libbonoboui ruben: pdns-recursor rvinyard: nqc,papyrus s4504kr: gnu-smalltalk,kaya sailer: ghdl salimma: banshee,fbreader,gedit-vala sconklin: ax25-apps,linpsk scop: dvb-apps,kaffeine,vdr sdake: corosync sdz: avogadro seg: openjpeg shishz: perl-XML-LibXSLT silfreed: kipi-plugins sindrepb: ax25-apps,cowbell,firewalk,linpsk,xdotool snecker: mapnik splinux: gnome-specimen spot: banshee,gambas2,perl ssp: libXp stahnma: ruby-libvirt,ruby-rpm steve: perl-Sys-Virt subhodip: kdetv tagoh: imsettings,uim tanguy: scidavis tbzatek: eel2,fpc,seahorse-plugins tgl: mysql,unixODBC than: PyQt4,kde-l10n,kdeedu thias: blackbox,gcombust thl: enigma thomasvs: ladspa timn: papyrus trasher: klear tuxbrewr: kde-l10n,kdeedu,kipi-plugins varekova: gmp vcrhonek: kbd,tog-pegasus victorv: ini4j virtmaint: etherboot,gnome-applet-vm,ruby-libvirt vpv: vdr wart: enigma,ularn xavierb: perl-WWW-Search xgl-maint: xorg-x11-drv-acecad,xorg-x11-drv-aiptek,xorg-x11-drv-ark,xorg-x11-drv-calcomp,xorg-x11-drv-citron,xorg-x11-drv-digitaledge,xorg-x11-drv-dmc,xorg-x11-drv-dummy,xorg-x11-drv-dynapro,xorg-x11-drv-hyperpen,xorg-x11-drv-jamstudio,xorg-x11-drv-magellan,xorg-x11-drv-mga,xorg-x11-drv-microtouch,xorg-x11-drv-palmax,xorg-x11-drv-penmount,xorg-x11-drv-rendition,xorg-x11-drv-siliconmotion,xorg-x11-drv-sisusb,xorg-x11-drv-spaceorb,xorg-x11-drv-summa,xorg-x11-drv-tek4957,xorg-x11-drv-ur98,xorg-x11-drv-void,xorg-x11-drv-voodoo xris: orpie zprikryl: gpm -- Matt Domsch Linux Technology Strategist, Dell Office of the CTO linux.dell.com & www.dell.com/linux From Matt_Domsch at dell.com Sun Feb 22 03:14:12 2009 From: Matt_Domsch at dell.com (Matt Domsch) Date: Sat, 21 Feb 2009 21:14:12 -0600 Subject: [fedora-virt-maint] Fedora rawhide rebuild in mock status 2009-02-20 i386 Message-ID: <20090222031412.GA16588@mock.linuxdev.us.dell.com> Fedora Rawhide-in-Mock Build Results for i386 based on rawhide as of Friday Feb 20, 2009. Most packages were actually built as of the F11 Alpha cut on or around Feb 1. Any newer packages in rawhide as of Feb 20 were then pulled in and rebuilt, and any previously-failed packages were also rebuilt, so I believe this list to be current and correct. I did have a couple servers fail during the builds, so it is possible that at most 8 of these are not true failures, but a result of builders crashing. Don't pin your hopes on that though. :-) Full logs at http://linux.dell.com/files/fedora/FixBuildRequires/ 1 Open Bugs which now build, and can be marked CLOSED RAWHIDE: grub: [u'484329'] Total packages: 7074 Number failed to build: 274 Number expected to fail due to ExclusiveArch or ExcludeArch: 14 Leaving: 260 Of those expected to have worked... Without a bug filed: 258 ---------------------------------- ConsoleKit-0.3.0-3.fc11 (build/make) mccann,jmccann DevIL-1.7.7-1.fc11 (patch_fuzz) jwrdegoede DeviceKit-disks-002-0.git20080720.fc10 (build/make) davidz Macaulay2-1.1-2.fc10 (build/make) rdieter OpenSceneGraph-2.8.0-1.fc11 (build/make) corsepiu R-BSgenome.Celegans.UCSC.ce2-1.2.0-5 (build/make) pingou R-BSgenome.Dmelanogaster.FlyBase.r51-1.3.1-3 (build/make) pingou R-hgu95av2probe-2.0.0-1.fc9 (build/make) pingou R-lmtest-0.9-2.fc10 (build/make) orion R-pls-2.1-2.fc9 (build/make) pingou Sprog-0.14-13.fc9 (build/make) ghenry alsa-oss-1.0.17-1.fc10 (build/make) jima anjuta-2.25.901-2.fc11 (build/make) rishi,rakesh atlas-3.8.2-5.fc11 (build/make) deji,deji autotrace-0.31.1-18.fc10 (build/make) qspencer avogadro-0.9.0-1.fc11 (build/make) sdz ax25-apps-0.0.6-2.fc9 (build/make) bjensen,sindrepb,sconklin,dp67 banshee-1.4.2-3.fc11 (build/make) salimma,spot binutils-2.19.51.0.2-12.fc11 (patch_fuzz) nickc,jakub,jkratoch,nickc blackbox-0.70.1-11 (build/make) thias bluez-gnome-1.8-12.fc11 (build/make) hadess,hadess boo-0.8.1.2865-4.fc9 (build/make) pfj castor-0.9.5-3.fc10 (build/make) pcheung cdo-1.0.8-2.fc9 (build/make) edhill cegui-0.6.2-1.fc11 (build/make) jwrdegoede chrony-1.23-2.20081106gitbe42b4.fc11 (build/make) mlichvar cln-1.2.2-2.fc11 (build/make) deji,deji clustermon-0.15.0-8.fc11 (build/make) rmccabe compat-db-4.6.21-5.fc10 (build/make) jnovy,pmatilai compat-gcc-32-3.2.3-64 (build/make) jakub coredumper-1.2.1-6.fc10 (build/make) rakesh coreutils-7.0-7.fc11 (build/make) ovasik,twaugh,kdudka corosync-0.92-7.svn1756.fc11 (build/make) sdake,agk,fabbione cowbell-0.3-0.svn34.4.fc10 (build/make) sindrepb dbmail-2.2.11-2.fc10 (build/make) bjohnson dbxml-2.4.16-0.2.fc11 (build/make) mzazrive dvb-apps-1.1.1-12.fc10 (build/make) scop eel2-2.25.1-4.fc11 (build/make) tbzatek ember-0.5.5-1.fc11 (build/make) atorkhov,wart enigma-1.01-8.1 (build/make) thl,wart evolution-brutus-1.2.34-2.fc11 (build/make) bpepple,colding fbreader-0.10.3-1.fc11 (build/make) salimma festival-1.96-7.fc10 (build/make) davidz,mattdm file-browser-applet-0.6.0-1.fc11 (build/make) deji flite-1.3-10.fc10 (build/make) faucamp freealut-1.1.0-6.fc9 (build/make) awjb freetds-0.82-3.fc10 (build/make) buc g3data-1.5.1-8.fc9 (build/make) jspaleta gambas2-2.11.1-1.fc11 (build/make) spot gdbm-1.8.0-29.fc10 (build/make) kasal gedit-vala-0.3.2-3.fc11 (build/make) salimma geronimo-specs-1.0-2.M2.fc10 (build/make) fnasser gfan-0.3-3.fc11 (build/make) konradm ggz-gtk-client-0.0.14.1-1.fc9 (build/make) bpepple,rdieter glunarclock-0.32.4-12.fc10 (build/make) limb gmp-4.2.4-4.fc11 (build/make) varekova gnome-applet-vm-0.2.0-2.fc9 (build/make) crobinso,virtmaint gnome-chemistry-utils-0.10.2-1.fc11 (build/make) belegdol gnome-themes-extras-2.22.0-2.fc9 (build/make) mwiriadi,mwiriadi gnu-smalltalk-3.1-1.fc10 (build/make) s4504kr,laxathom graphviz-2.20.3-1.fc11.2 (build/make) jima grass-6.3.0-10.fc11 (build/make) rezso,pertusus gthumb-2.10.10-3.fc10 (build/make) behdad gtkspell-2.0.15-1.fc10 (build/make) mbarnes haddock09-0.9-3.fc10 (build/make) bos,haskell-sig,petersen happy-1.18.2-1.fc11 (build/make) bos,haskell-sig,petersen hdf5-1.8.1-2.fc10 (build/make) orion,pertusus hercules-3.06-1.fc11 (build/make) thias ibus-chewing-0.1.1.20081023-2.fc11 (build/make) dchen,i18n-team,phuang ibus-table-0.1.1.20081014-4.fc11 (build/make) cchance,i18n-team,cchance,phuang ice-3.3.0-12.fc11 (build/make) mef iml-1.0.2-4.fc11 (build/make) konradm imsettings-0.105.1-2.fc10 (build/make) tagoh,i18n-team incollector-1.0-6.fc9.1 (build/make) kurzawa ini4j-0.3.2-4.fc10 (build/make) victorv iscsi-initiator-utils-6.2.0.870-4.fc11 (build/make) michaelc,jwrdegoede jakarta-commons-el-1.0-9.4.fc10 (build/make) fnasser jakarta-commons-httpclient-3.1-0.3.fc10 (build/make) pcheung java-1.6.0-openjdk-1.6.0.0-10.b14.fc11 (build/make) langel,lkundrak,dbhole,langel,mjw javahelp2-2.0.05-5.fc10 (build/make) jtulach,fitzsim jline-0.9.94-0.2.fc10 (build/make) mwringe jrefactory-2.8.9-7.6.fc10 (build/make) dbhole jsr-305-0-0.1.20080824svn.fc10 (build/make) jjames jtidy-1.0-0.2.r7dev.1.3.fc10 (build/make) nsantos,fitzsim,dbhole kaffeine-0.8.7-2.fc10 (build/make) rdieter,scop,mef kaya-0.5.1-1.fc10 (build/make) s4504kr kbd-1.15-4.fc11 (build/make) vcrhonek kdeedu-4.2.0-6.fc11 (build/make) than,rdieter,kkofler,tuxbrewr,arbiter,jreznik kdetv-0.8.9-10.fc9 (build/make) subhodip kipi-plugins-0.2.0-0.14.rc1.fc11 (build/make) rdieter,abompard,silfreed,mgarski,tuxbrewr,ltinkl klear-0.7.0-2.svn113.fc10 (build/make) trasher labrea-2.5.1-2.fc10 (build/make) huzaifas ladspa-1.12-9.fc9 (build/make) thomasvs ladspa-swh-plugins-0.4.15-12.fc9 (build/make) green lam-7.1.4-1.fc10 (build/make) dledford lash-0.5.4-2.fc9 (build/make) green lasi-1.1.0-2.fc10 (build/make) orion lcdproc-0.5.2-7.fc11 (build/make) kwizart,jwilson libXp-1.0.0-11.fc9 (build/make) ssp libbonoboui-2.24.0-1.fc10 (build/make) rstrode libcap-2.10-2.fc10 (build/make) karsten libcompizconfig-0.7.8-1.fc11 (build/make) izhar libctl-3.0.2-6.fc9 (build/make) edhill libdv-1.0.0-5.fc10 (build/make) jwilson libfakekey-0.1-1.fc10 (build/make) mccann libgnomedbmm-2.9.5-4.fc9 (build/make) denis libibcommon-1.1.0-1.fc10 (build/make) dledford libibmad-1.2.0-1.fc10 (build/make) dledford libibumad-1.2.0-1.fc10 (build/make) dledford libopensync-plugin-syncml-0.35-4.fc10 (build/make) cheese libpolyxmass-0.9.1-2.fc9 (build/make) awjb libpqxx-2.6.8-10.fc9 (build/make) awjb,rdieter libresample-0.1.3-9.fc10 (build/make) jcollie libsmbios-2.2.13-1.fc11 (build/make) mebrown libsndfile-1.0.17-6.fc10 (build/make) ixs libtar-1.2.11-11.fc10 (build/make) huzaifas,huzaifas libthai-0.1.9-4.fc9 (build/make) behdad licq-1.3.5-5.fc11 (build/make) jmoskovc lightning-1.2c-1.fc10 (build/make) s4504kr,laxathom linkage-0.2.0-4.fc11 (build/make) drago01 linphone-2.1.1-1.fc9 (build/make) rakesh linpsk-0.9-4.fc10 (build/make) bjensen,bjensen,sindrepb,sconklin,dp67 linux-atm-2.5.0-5 (build/make) dwmw2 listen-0.5-21.fc11 (build/make) hguemar log4net-1.2.10-4.fc9 (build/make) snecker lpsolve-5.5.0.14-1.fc11 (patch_fuzz) caolanm m17n-lib-1.5.3-1.fc10 (build/make) pnemade,i18n-team,petersen maildrop-2.0.4-6.fc9 (build/make) athimm mapnik-0.5.2-0.10.svn780.fc11 (build/make) rezso,snecker maven-scm-1.0-0.2.b3.1.6.fc10 (build/make) dbhole maven-shared-1.0-4.6.fc10 (build/make) dbhole maven2-2.0.4-10.15.fc10 (build/make) dbhole mdadm-3.0-0.devel2.1.fc11 (build/make) dledford mingw32-atk-1.25.2-5.fc11 (build/make) rjones,berrange mingw32-libgcrypt-1.4.4-1.fc11 (build/make) rjones,berrange mingw32-libltdl-1.5.26-12.fc11 (build/make) ndim mingw32-runtime-3.15.2-1.fc11 (build/make) rjones,berrange,mingwmaint minirpc-0.3.2-1.fc10 (build/make) agoode modello-1.0-0.1.a8.4.4.fc10 (build/make) mwringe module-init-tools-3.7-1.fc11 (build/make) jcm monodoc-2.0-5.fc10 (build/make) pfj monotone-0.42-3.fc11 (build/make) thm msv-1.2-0.2.20050722.3.4.fc10 (build/make) mwringe mysql-5.1.31-1.fc11 (build/make) tgl nautilus-share-0.7.2-13.fc10 (build/make) orphan nightview-0.3.2-2.fc11 (build/make) lkundrak nted-1.4.17-2.fc11 (build/make) ndim ocaml-omake-0.9.8.5-5.fc11 (build/make) rjones,ocamlmaint ochusha-0.6.0.1-0.3.cvs20090106T1430.fc11 (build/make) mtasaka octave-3.0.3-1.fc11 (build/make) rakesh,alexlan,mmahut,rakesh openjpeg-1.3-2.fc9 (patch_fuzz) seg openlierox-0.57-0.11.beta8.fc11 (build/make) jwrdegoede openser-1.3.4-2.fc11 (build/make) peter,ondrejj openvrml-0.17.10-2.0.fc11 (build/make) braden orpie-1.5.1-4.fc10 (build/make) xris orsa-0.7.0-2.fc10 (build/make) mjakubicek,mmahut pam_keyring-0.0.9-2.fc9 (build/make) denis pan-0.133-1.fc10 (build/make) adalloz,mpeters papyrus-0.9.0-1.fc11 (build/make) rvinyard,timn pdns-recursor-3.1.7-2.fc10 (build/make) ruben perl-5.10.0-58.fc11 (build/make) mmaslano,spot,corsepiu,rnorwood,kasal perl-Class-Autouse-1.29-3.fc9 (build/make) corsepiu,perl-sig,laxathom perl-Class-Inspector-1.23-1.fc10 (build/make) corsepiu,perl-sig,laxathom perl-Crypt-OpenSSL-DSA-0.13-9.fc11 (build/make) hardaker,perl-sig perl-File-Find-Rule-Perl-1.04-2.fc10 (build/make) corsepiu,perl-sig perl-Net-SSH-Perl-1.34-1.fc11 (build/make) pghmcfc,perl-sig perl-POE-Component-SNMP-1.07-3.fc9 (build/make) cweyl,perl-sig perl-RRD-Simple-1.43-3.fc9 (build/make) cweyl,perl-sig perl-Sys-Virt-0.1.2-3.fc9 (build/make) steve,perl-sig,berrange perl-Test-Inline-2.208-3.fc10 (build/make) corsepiu,perl-sig,laxathom perl-Test-WWW-Mechanize-Catalyst-0.42-1.fc10 (build/make) cweyl,perl-sig perl-WWW-Search-2.504-1.fc10 (build/make) xavierb perl-XML-LibXSLT-1.68-1.fc11 (build/make) kasal,perl-sig,shishz pfstools-1.7.0-3.fc11 (build/make) drepper plexus-appserver-1.0-0.2.a5.2.6.fc10 (build/make) dbhole plexus-cdc-1.0-0.2.a4.1.6.fc10 (build/make) dbhole plexus-i18n-1.0-0.b6.5.3.fc10 (build/make) pcheung plexus-maven-plugin-1.2-2.4.fc10 (build/make) dbhole plexus-runtime-builder-1.0-0.2.a9.1.6.fc10 (build/make) dbhole plexus-xmlrpc-1.0-0.2.b4.2.11.fc10 (build/make) dbhole polyxmass-bin-0.9.7-2.fc8 (build/make) awjb prelink-0.4.0-3 (build/make) jakub preload-0.6.3-1.fc10 (build/make) behdad pysvn-1.6.2-3.fc11 (build/make) ravenoak q-7.11-2.fc10 (build/make) gemi qbittorrent-1.3.1-7.fc11 (build/make) leigh123linux qgo-1.5.4r2-1.fc9 (build/make) kaboom qpidc-0.4.738618-2.fc11 (build/make) aconway,nsantos quesa-1.8-1.fc9 (build/make) ajax radvd-1.1-6.fc11 (patch_fuzz) jskala revelation-0.4.11-7 (build/make) jspaleta,jspaleta rhm-0.4.3088-1.fc11 (build/make) aconway,nsantos rhythmbox-0.11.6-25.r6096.fc11 (build/make) hadess ruby-libvirt-0.1.0-2.fc11 (build/make) lutter,stahnma,clalance,virtmaint ruby-openid-2.1.4-1.fc11 (build/make) allisson ruby-rpm-1.2.3-4.fc9 (build/make) lutter,stahnma rxvt-unicode-9.06-1.fc11 (build/make) awjb,mlichvar sagator-1.1.1-0.beta1.fc10 (build/make) ondrejj sane-backends-1.0.19-12.fc10 (build/make) nphilipp scidavis-0.1.4-1.fc11 (build/make) tanguy scrip-1.4-9.fc8 (build/make) edhill seahorse-plugins-2.25.90-1.fc11 (build/make) mclasen,tbzatek sigen-0.0.2-0.26.20081206git529cd0e.fc11 (build/make) mathstuf slim-1.3.1-3.fc11 (build/make) afb,pertusus smarteiffel-2.3-2.fc9 (build/make) gemi sound-juicer-2.25.3-1.fc11 (build/make) hadess squid-3.0.STABLE13-1.fc11 (build/make) jskala,jsteffan,mnagy,hno,jskala srm-1.2.9-2.fc11 (build/make) fab strigi-0.6.4-1.fc11 (build/make) deji,kkofler,arbiter subtitleeditor-0.30.0-3.fc10 (build/make) mso sudo-1.6.9p17-5.fc10 (build/make) mildew,kzak sugar-finance-0-0.1.20090126.fc11 (build/make) fab synce-software-manager-0.9.0-10.fc9 (build/make) awjb tex-musixtex-0.114-4.fc11 (build/make) oget thibault-fonts-0.1-3.fc11 (build/make) lyosnorezel tightvnc-1.5.0-0.12.20090204svn3586.fc11 (patch_fuzz) atkac tog-pegasus-2.7.2-4.fc11 (build/make) vcrhonek,hamzy uim-1.5.3-1.fc10 (build/make) tagoh,i18n-team ularn-1.5p4-12.fc11 (build/make) wart unixODBC-2.2.12-9.fc10 (build/make) tgl vdr-1.6.0-16.fc11 (build/make) scop,vpv velocity-1.4-7.3.fc10 (build/make) dbhole,devrim,jmrodri widelands-0-0.13.Build13.fc11 (build/make) karlik ws-commons-util-1.0.1-10.fc10 (build/make) green,overholt xdotool-20071230-2.fc10 (build/make) sindrepb xen-3.3.1-3.fc11 (build/make) xen-maint,berrange,kraxel,virtmaint xmlcopyeditor-1.1.0.6-4.fc9 (build/make) ivazquez xmlrpc3-3.0-2.9.fc10 (build/make) overholt,akurtakov xmoto-0.5.0-5.fc11 (build/make) limb xorg-x11-drv-acecad-1.2.2-1.fc9 (build/make) xgl-maint xorg-x11-drv-aiptek-1.1.1-1.fc9 (build/make) xgl-maint xorg-x11-drv-ark-0.7.0-1.fc9 (build/make) xgl-maint xorg-x11-drv-calcomp-1.1.2-1.fc9 (build/make) xgl-maint xorg-x11-drv-citron-2.2.1-1.fc9 (build/make) xgl-maint xorg-x11-drv-diamondtouch-0.2.0-0.1.fc9 (build/make) ajax xorg-x11-drv-digitaledge-1.1.1-1.fc9 (build/make) xgl-maint xorg-x11-drv-dmc-1.1.2-1.fc9 (build/make) xgl-maint xorg-x11-drv-dummy-0.3.0-1.fc9 (build/make) xgl-maint xorg-x11-drv-dynapro-1.1.2-1.fc9 (build/make) xgl-maint xorg-x11-drv-hyperpen-1.2.0-1.fc9 (build/make) xgl-maint xorg-x11-drv-jamstudio-1.2.0-1.fc9 (build/make) xgl-maint xorg-x11-drv-magellan-1.2.0-1.fc9 (build/make) xgl-maint xorg-x11-drv-mga-1.4.9-1.fc11 (patch_fuzz) xgl-maint xorg-x11-drv-microtouch-1.2.0-1.fc9 (build/make) xgl-maint xorg-x11-drv-palmax-1.2.0-1.fc9 (build/make) xgl-maint xorg-x11-drv-penmount-1.3.0-1.fc9 (build/make) xgl-maint xorg-x11-drv-rendition-4.2.0-1.fc9 (build/make) xgl-maint xorg-x11-drv-siliconmotion-1.6.0-1.fc9 (build/make) xgl-maint xorg-x11-drv-sisusb-0.9.0-1.fc9 (build/make) xgl-maint xorg-x11-drv-spaceorb-1.1.0-6.fc9 (build/make) xgl-maint xorg-x11-drv-summa-1.2.0-2.fc10 (build/make) xgl-maint xorg-x11-drv-tek4957-1.2.0-1.fc9 (build/make) xgl-maint xorg-x11-drv-ur98-1.1.0-5.fc9 (build/make) xgl-maint xorg-x11-drv-void-1.1.1-9.fc9 (build/make) xgl-maint xorg-x11-drv-voodoo-1.2.0-1.fc9 (build/make) xgl-maint xorg-x11-drv-wiimote-0.0.1-1.fc9 (build/make) ajax xscorch-0.2.0-12.fc8 (build/make) mgarski zsh-4.3.4-8.fc9 (patch_fuzz) james With bugs filed: 2 ---------------------------------- classpathx-jaf-1.0-12.fc10 [u'479701 NEW'] (build/make) devrim,dwalluck libFoundation-1.1.3-11.fc9 [u'440564 ASSIGNED'] (build/make) athimm ---------------------------------- Packages by owner: abompard: kipi-plugins aconway: qpidc,rhm adalloz: pan afb: slim agk: corosync agoode: minirpc ajax: quesa,xorg-x11-drv-diamondtouch,xorg-x11-drv-wiimote akurtakov: xmlrpc3 alexlan: octave allisson: ruby-openid arbiter: kdeedu,strigi athimm: libFoundation,maildrop atkac: tightvnc atorkhov: ember awjb: freealut,libpolyxmass,libpqxx,polyxmass-bin,rxvt-unicode,synce-software-manager behdad: gthumb,libthai,preload belegdol: gnome-chemistry-utils berrange: mingw32-atk,mingw32-libgcrypt,mingw32-runtime,perl-Sys-Virt,xen bjensen: ax25-apps,linpsk,linpsk bjohnson: dbmail bos: haddock09,happy bpepple: evolution-brutus,ggz-gtk-client braden: openvrml buc: freetds caolanm: lpsolve cchance: ibus-table,ibus-table cheese: libopensync-plugin-syncml clalance: ruby-libvirt colding: evolution-brutus corsepiu: OpenSceneGraph,perl,perl-Class-Autouse,perl-Class-Inspector,perl-File-Find-Rule-Perl,perl-Test-Inline crobinso: gnome-applet-vm cweyl: perl-POE-Component-SNMP,perl-RRD-Simple,perl-Test-WWW-Mechanize-Catalyst davidz: DeviceKit-disks,festival dbhole: java-1.6.0-openjdk,jrefactory,jtidy,maven-scm,maven-shared,maven2,plexus-appserver,plexus-cdc,plexus-maven-plugin,plexus-runtime-builder,plexus-xmlrpc,velocity dchen: ibus-chewing deji: atlas,atlas,cln,cln,file-browser-applet,strigi denis: libgnomedbmm,pam_keyring devrim: classpathx-jaf,velocity dledford: lam,libibcommon,libibmad,libibumad,mdadm dp67: ax25-apps,linpsk drago01: linkage drepper: pfstools dwalluck: classpathx-jaf dwmw2: linux-atm edhill: cdo,libctl,scrip fab: srm,sugar-finance fabbione: corosync faucamp: flite fitzsim: javahelp2,jtidy fnasser: geronimo-specs,jakarta-commons-el gemi: q,smarteiffel ghenry: Sprog green: ladspa-swh-plugins,lash,ws-commons-util hadess: bluez-gnome,bluez-gnome,rhythmbox,sound-juicer hamzy: tog-pegasus hardaker: perl-Crypt-OpenSSL-DSA haskell-sig: haddock09,happy hguemar: listen hno: squid huzaifas: labrea,libtar,libtar i18n-team: ibus-chewing,ibus-table,imsettings,m17n-lib,uim ivazquez: xmlcopyeditor ixs: libsndfile izhar: libcompizconfig jakub: binutils,compat-gcc-32,prelink james: zsh jcm: module-init-tools jcollie: libresample jima: alsa-oss,graphviz jjames: jsr-305 jkratoch: binutils jmccann: ConsoleKit jmoskovc: licq jmrodri: velocity jnovy: compat-db jreznik: kdeedu jskala: radvd,squid,squid jspaleta: g3data,revelation,revelation jsteffan: squid jtulach: javahelp2 jwilson: lcdproc,libdv jwrdegoede: DevIL,cegui,iscsi-initiator-utils,openlierox kaboom: qgo karlik: widelands karsten: libcap kasal: gdbm,perl,perl-XML-LibXSLT kdudka: coreutils kkofler: kdeedu,strigi konradm: gfan,iml kraxel: xen kurzawa: incollector kwizart: lcdproc kzak: sudo langel: java-1.6.0-openjdk,java-1.6.0-openjdk laxathom: gnu-smalltalk,lightning,perl-Class-Autouse,perl-Class-Inspector,perl-Test-Inline leigh123linux: qbittorrent limb: glunarclock,xmoto lkundrak: java-1.6.0-openjdk,nightview ltinkl: kipi-plugins lutter: ruby-libvirt,ruby-rpm lyosnorezel: thibault-fonts mathstuf: sigen mattdm: festival mbarnes: gtkspell mccann: ConsoleKit,libfakekey mclasen: seahorse-plugins mebrown: libsmbios mef: ice,kaffeine mgarski: kipi-plugins,xscorch michaelc: iscsi-initiator-utils mildew: sudo mingwmaint: mingw32-runtime mjakubicek: orsa mjw: java-1.6.0-openjdk mlichvar: chrony,rxvt-unicode mmahut: octave,orsa mmaslano: perl mnagy: squid mpeters: pan mso: subtitleeditor mtasaka: ochusha mwiriadi: gnome-themes-extras,gnome-themes-extras mwringe: jline,modello,msv mzazrive: dbxml ndim: mingw32-libltdl,nted nickc: binutils,binutils nphilipp: sane-backends nsantos: jtidy,qpidc,rhm ocamlmaint: ocaml-omake oget: tex-musixtex ondrejj: openser,sagator orion: R-lmtest,hdf5,lasi orphan: nautilus-share ovasik: coreutils overholt: ws-commons-util,xmlrpc3 pcheung: castor,jakarta-commons-httpclient,plexus-i18n perl-sig: perl-Class-Autouse,perl-Class-Inspector,perl-Crypt-OpenSSL-DSA,perl-File-Find-Rule-Perl,perl-Net-SSH-Perl,perl-POE-Component-SNMP,perl-RRD-Simple,perl-Sys-Virt,perl-Test-Inline,perl-Test-WWW-Mechanize-Catalyst,perl-XML-LibXSLT pertusus: grass,hdf5,slim peter: openser petersen: haddock09,happy,m17n-lib pfj: boo,monodoc pghmcfc: perl-Net-SSH-Perl phuang: ibus-chewing,ibus-table pingou: R-BSgenome.Celegans.UCSC.ce2,R-BSgenome.Dmelanogaster.FlyBase.r51,R-hgu95av2probe,R-pls pmatilai: compat-db pnemade: m17n-lib qspencer: autotrace rakesh: anjuta,coredumper,linphone,octave,octave ravenoak: pysvn rdieter: Macaulay2,ggz-gtk-client,kaffeine,kdeedu,kipi-plugins,libpqxx rezso: grass,mapnik rishi: anjuta rjones: mingw32-atk,mingw32-libgcrypt,mingw32-runtime,ocaml-omake rmccabe: clustermon rnorwood: perl rstrode: libbonoboui ruben: pdns-recursor rvinyard: papyrus s4504kr: gnu-smalltalk,kaya,lightning salimma: banshee,fbreader,gedit-vala sconklin: ax25-apps,linpsk scop: dvb-apps,kaffeine,vdr sdake: corosync sdz: avogadro seg: openjpeg shishz: perl-XML-LibXSLT silfreed: kipi-plugins sindrepb: ax25-apps,cowbell,linpsk,xdotool snecker: log4net,mapnik spot: banshee,gambas2,perl ssp: libXp stahnma: ruby-libvirt,ruby-rpm steve: perl-Sys-Virt subhodip: kdetv tagoh: imsettings,uim tanguy: scidavis tbzatek: eel2,seahorse-plugins tgl: mysql,unixODBC than: kdeedu thias: blackbox,hercules thl: enigma thm: monotone thomasvs: ladspa timn: papyrus trasher: klear tuxbrewr: kdeedu,kipi-plugins twaugh: coreutils varekova: gmp vcrhonek: kbd,tog-pegasus victorv: ini4j virtmaint: gnome-applet-vm,ruby-libvirt,xen vpv: vdr wart: ember,enigma,ularn xavierb: perl-WWW-Search xen-maint: xen xgl-maint: xorg-x11-drv-acecad,xorg-x11-drv-aiptek,xorg-x11-drv-ark,xorg-x11-drv-calcomp,xorg-x11-drv-citron,xorg-x11-drv-digitaledge,xorg-x11-drv-dmc,xorg-x11-drv-dummy,xorg-x11-drv-dynapro,xorg-x11-drv-hyperpen,xorg-x11-drv-jamstudio,xorg-x11-drv-magellan,xorg-x11-drv-mga,xorg-x11-drv-microtouch,xorg-x11-drv-palmax,xorg-x11-drv-penmount,xorg-x11-drv-rendition,xorg-x11-drv-siliconmotion,xorg-x11-drv-sisusb,xorg-x11-drv-spaceorb,xorg-x11-drv-summa,xorg-x11-drv-tek4957,xorg-x11-drv-ur98,xorg-x11-drv-void,xorg-x11-drv-voodoo xris: orpie -- Matt Domsch Linux Technology Strategist, Dell Office of the CTO linux.dell.com & www.dell.com/linux From jkeating at fedoraproject.org Tue Feb 24 01:28:27 2009 From: jkeating at fedoraproject.org (Jesse Keating) Date: Tue, 24 Feb 2009 01:28:27 +0000 (UTC) Subject: [fedora-virt-maint] rpms/appliance-tools/devel appliance-tools.spec, 1.8, 1.9 Message-ID: <20090224012827.822CD70107@cvs1.fedora.phx.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/appliance-tools/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6299 Modified Files: appliance-tools.spec Log Message: - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: appliance-tools.spec =================================================================== RCS file: /cvs/pkgs/rpms/appliance-tools/devel/appliance-tools.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- appliance-tools.spec 1 Dec 2008 22:41:57 -0000 1.8 +++ appliance-tools.spec 24 Feb 2009 01:27:57 -0000 1.9 @@ -5,7 +5,7 @@ Summary: Tools for building Appliances Name: appliance-tools Version: 004 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Group: System Environment/Base URL: http://git.et.redhat.com/?p=act.git @@ -59,6 +59,9 @@ %{python_sitelib}/ec2convert/*.pyc %changelog +* Mon Feb 23 2009 Fedora Release Engineering - 004-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + *Mon Dec 01 2008 David Huff -004-2 - changed form ExclusiveArch to EcludeArch to fix broken deps From jkeating at fedoraproject.org Tue Feb 24 08:20:37 2009 From: jkeating at fedoraproject.org (Jesse Keating) Date: Tue, 24 Feb 2009 08:20:37 +0000 (UTC) Subject: [fedora-virt-maint] rpms/collectd/devel collectd.spec,1.14,1.15 Message-ID: <20090224082037.22AF470107@cvs1.fedora.phx.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/collectd/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4389 Modified Files: collectd.spec Log Message: - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: collectd.spec =================================================================== RCS file: /cvs/pkgs/rpms/collectd/devel/collectd.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- collectd.spec 23 Jan 2009 09:52:15 -0000 1.14 +++ collectd.spec 24 Feb 2009 08:20:06 -0000 1.15 @@ -1,7 +1,7 @@ Summary: Statistics collection daemon for filling RRD files Name: collectd Version: 4.5.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 Group: System Environment/Daemons URL: http://collectd.org/ @@ -380,6 +380,9 @@ %changelog +* Tue Feb 24 2009 Fedora Release Engineering - 4.5.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Fri Jan 23 2009 Richard W.M. Jones - 4.5.1-3 - Rebuild against new mysql client. From kraxel at fedoraproject.org Tue Feb 24 11:35:07 2009 From: kraxel at fedoraproject.org (Gerd Hoffmann) Date: Tue, 24 Feb 2009 11:35:07 +0000 (UTC) Subject: [fedora-virt-maint] rpms/xen/devel xen-gcc44-buildfix.patch, NONE, 1.1 xen.spec, 1.227, 1.228 Message-ID: <20090224113507.342DE70107@cvs1.fedora.phx.redhat.com> Author: kraxel Update of /cvs/pkgs/rpms/xen/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19459 Modified Files: xen.spec Added Files: xen-gcc44-buildfix.patch Log Message: fix gcc44 build xen-gcc44-buildfix.patch: --- NEW FILE xen-gcc44-buildfix.patch --- --- a/xen/arch/x86/hvm/vpic.c~ 2009-02-24 10:59:27.000000000 +0100 +++ b/xen/arch/x86/hvm/vpic.c 2009-02-24 12:20:46.000000000 +0100 @@ -56,7 +56,7 @@ static int vpic_get_priority(struct hvm_ /* prio = ffs(mask ROR vpic->priority_add); */ asm ( "ror %%cl,%b1 ; bsf %1,%0" - : "=r" (prio) : "r" ((uint32_t)mask), "c" (vpic->priority_add) ); + : "=r" (prio) : "q" ((uint32_t)mask), "c" (vpic->priority_add) ); return prio; } Index: xen.spec =================================================================== RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v retrieving revision 1.227 retrieving revision 1.228 diff -u -r1.227 -r1.228 --- xen.spec 3 Feb 2009 11:27:57 -0000 1.227 +++ xen.spec 24 Feb 2009 11:34:35 -0000 1.228 @@ -2,7 +2,7 @@ # Always set these 3 tags %define base_version 3.3.1 -%define base_release 3 +%define base_release 4 # Hypervisor ABI %define hv_abi 3.3 @@ -70,6 +70,7 @@ Patch13: xen-dumpdir.patch Patch14: xen-net-disable-bridge-by-default.patch Patch15: xen-net-disable-iptables-on-bridge.patch +Patch16: xen-gcc44-buildfix.patch Patch20: xen-backport-hg18782.patch Patch21: xen-backport-hg19075.patch Patch22: xen-backport-hg19108.patch @@ -167,6 +168,7 @@ %patch13 -p1 %patch14 -p1 %patch15 -p1 +%patch16 -p1 %patch20 -p1 %patch21 -p1 @@ -487,6 +489,9 @@ %{_libdir}/*.a %changelog +* Tue Feb 24 2009 Gerd Hoffmann - 3.3.1-4 +- fix gcc44 build (broken constrain in inline asm). + * Tue Feb 3 2009 Gerd Hoffmann - 3.3.1-3 - backport bzImage support for dom0 builder. From kraxel at fedoraproject.org Tue Feb 24 14:29:12 2009 From: kraxel at fedoraproject.org (Gerd Hoffmann) Date: Tue, 24 Feb 2009 14:29:12 +0000 (UTC) Subject: [fedora-virt-maint] rpms/xen/devel xen.spec,1.228,1.229 Message-ID: <20090224142912.9438470107@cvs1.fedora.phx.redhat.com> Author: kraxel Update of /cvs/pkgs/rpms/xen/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2951 Modified Files: xen.spec Log Message: fix ExclusiveArch Index: xen.spec =================================================================== RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v retrieving revision 1.228 retrieving revision 1.229 diff -u -r1.228 -r1.229 --- xen.spec 24 Feb 2009 11:34:35 -0000 1.228 +++ xen.spec 24 Feb 2009 14:28:42 -0000 1.229 @@ -2,7 +2,7 @@ # Always set these 3 tags %define base_version 3.3.1 -%define base_release 4 +%define base_release 5 # Hypervisor ABI %define hv_abi 3.3 @@ -109,7 +109,7 @@ # installs xen. Requires: kpartx Prereq: chkconfig -ExclusiveArch: i386 i686 x86_64 ia64 +ExclusiveArch: i386 i586 i686 x86_64 ia64 %description This package contains the XenD daemon and xm command line @@ -489,8 +489,9 @@ %{_libdir}/*.a %changelog -* Tue Feb 24 2009 Gerd Hoffmann - 3.3.1-4 +* Tue Feb 24 2009 Gerd Hoffmann - 3.3.1-5 - fix gcc44 build (broken constrain in inline asm). +- fix ExclusiveArch * Tue Feb 3 2009 Gerd Hoffmann - 3.3.1-3 - backport bzImage support for dom0 builder. From jkeating at fedoraproject.org Tue Feb 24 15:33:03 2009 From: jkeating at fedoraproject.org (Jesse Keating) Date: Tue, 24 Feb 2009 15:33:03 +0000 (UTC) Subject: [fedora-virt-maint] rpms/etherboot/devel etherboot.spec,1.8,1.9 Message-ID: <20090224153303.0F0BE70107@cvs1.fedora.phx.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/etherboot/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23864 Modified Files: etherboot.spec Log Message: - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: etherboot.spec =================================================================== RCS file: /cvs/pkgs/rpms/etherboot/devel/etherboot.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- etherboot.spec 27 Jan 2009 16:23:36 -0000 1.8 +++ etherboot.spec 24 Feb 2009 15:32:32 -0000 1.9 @@ -6,7 +6,7 @@ Name: etherboot Version: 5.4.4 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Etherboot collection of boot roms Group: Development/Tools @@ -189,6 +189,9 @@ %changelog +* Tue Feb 24 2009 Fedora Release Engineering - 5.4.4-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Tue Jan 27 2009 Eduardo Habkost - 5.4.5-8 - Strips proto_fsp.c from etherboot tarball due to licensing reasons From crobinso at fedoraproject.org Tue Feb 24 16:55:46 2009 From: crobinso at fedoraproject.org (Cole Robinson) Date: Tue, 24 Feb 2009 16:55:46 +0000 (UTC) Subject: [fedora-virt-maint] rpms/gnome-applet-vm/devel gnome-applet-vm.spec, 1.24, 1.25 gnome-applet-vm-0.2.0-gnome-libs.patch, 1.1, 1.2 Message-ID: <20090224165546.ECAF370107@cvs1.fedora.phx.redhat.com> Author: crobinso Update of /cvs/pkgs/rpms/gnome-applet-vm/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15800 Modified Files: gnome-applet-vm.spec gnome-applet-vm-0.2.0-gnome-libs.patch Log Message: Tweak build fix patch to not require re-automake. Index: gnome-applet-vm.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-applet-vm/devel/gnome-applet-vm.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- gnome-applet-vm.spec 12 Feb 2009 13:22:42 -0000 1.24 +++ gnome-applet-vm.spec 24 Feb 2009 16:55:16 -0000 1.25 @@ -1,7 +1,7 @@ Summary: Simple virtual domains monitor which embeds itself in the GNOME panel Name: gnome-applet-vm Version: 0.2.0 -Release: 8%{?dist} +Release: 9%{?dist} # No license attribution in code, only COPYING. License: GPL+ Group: User Interface/Desktops @@ -53,8 +53,6 @@ %prep %setup -q -n %{upstreamname} %patch0 -p1 -automake -autoconf %build %configure --enable-consolehelper @@ -99,6 +97,9 @@ %config(noreplace) %{_sysconfdir}/security/console.apps/vm_applet_wrapper %changelog +* Tue Feb 24 2009 Cole Robinson 0.2.0-9 +- Tweak build fix patch to not require re-automake. + * Thu Feb 12 2009 Richard W.M. Jones 0.2.0-8 - Small patch needed to compile on Rawhide. gnome-applet-vm-0.2.0-gnome-libs.patch: Index: gnome-applet-vm-0.2.0-gnome-libs.patch =================================================================== RCS file: /cvs/pkgs/rpms/gnome-applet-vm/devel/gnome-applet-vm-0.2.0-gnome-libs.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gnome-applet-vm-0.2.0-gnome-libs.patch 12 Feb 2009 13:16:07 -0000 1.1 +++ gnome-applet-vm-0.2.0-gnome-libs.patch 24 Feb 2009 16:55:16 -0000 1.2 @@ -1,20 +1,20 @@ -diff -ur gnome-applet-vm-0.2.0-rc1/src/Makefile.am gnome-applet-vm-0.2.0-rc1.gnome_libs2/src/Makefile.am ---- gnome-applet-vm-0.2.0-rc1/src/Makefile.am 2008-02-28 00:20:17.000000000 +0000 -+++ gnome-applet-vm-0.2.0-rc1.gnome_libs2/src/Makefile.am 2009-02-12 13:13:23.000000000 +0000 -@@ -8,7 +8,7 @@ - +diff -rup gnome-applet-vm-0.2.0-rc1/src/Makefile.in new/src/Makefile.in +--- gnome-applet-vm-0.2.0-rc1/src/Makefile.in 2008-03-03 08:18:14.000000000 -0500 ++++ new/src/Makefile.in 2009-02-24 10:28:22.491661000 -0500 +@@ -293,7 +293,7 @@ noinst_HEADERS = applet.h vm_applet_SOURCES = applet.c properties.c gtkutils.c connections.c \ amenu.c domains.c + -vm_applet_LDADD = $(LIBVIRT_LIBS) $(GNOME_APPLETS_LIBS) $(DBUS_LIBS) $(LIBXML_LIBS) +vm_applet_LDADD = $(LIBVIRT_LIBS) $(GNOME_APPLETS_LIBS) $(DBUS_LIBS) $(LIBXML_LIBS) $(GNOME_LIBS2_LIBS) vm_applet_CFLAGS = -I. -I$(srcdir) \ -include $(top_builddir)/config.h \ -DG_DISABLE_DEPRECATED \ -@@ -17,6 +17,7 @@ +@@ -302,6 +302,7 @@ vm_applet_CFLAGS = -I. -I$(srcdir) \ $(GNOME_APPLETS_CFLAGS) \ $(LIBXML_CFLAGS) \ $(DBUS_CFLAGS) \ -+ $(GNOME_LIBS2_CFLAGS) \ ++ $(GNOME_LIBS2_CFLAGS) \ -DVM_ICONDIR=\"$(icondir)\" \ -DVM_VIRTMANAGER=\"$(virtnamager)\" From jkeating at fedoraproject.org Wed Feb 25 12:16:06 2009 From: jkeating at fedoraproject.org (Jesse Keating) Date: Wed, 25 Feb 2009 12:16:06 +0000 (UTC) Subject: [fedora-virt-maint] rpms/kvm/devel kvm.spec,1.88,1.89 Message-ID: <20090225121606.7006470125@cvs1.fedora.phx.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/kvm/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14650 Modified Files: kvm.spec Log Message: - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: kvm.spec =================================================================== RCS file: /cvs/pkgs/rpms/kvm/devel/kvm.spec,v retrieving revision 1.88 retrieving revision 1.89 diff -u -r1.88 -r1.89 --- kvm.spec 22 Feb 2009 11:55:57 -0000 1.88 +++ kvm.spec 25 Feb 2009 12:15:36 -0000 1.89 @@ -1,7 +1,7 @@ Summary: Kernel-based Virtual Machine Name: kvm Version: 84 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ and LGPLv2+ Group: Development/Tools URL: http://%{name}.sf.net @@ -197,6 +197,9 @@ %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 84-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Sun Feb 22 2009 Mark McLoughlin - 84-1 - Update to kvm-84 From jkeating at fedoraproject.org Wed Feb 25 17:26:48 2009 From: jkeating at fedoraproject.org (Jesse Keating) Date: Wed, 25 Feb 2009 17:26:48 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/devel qemu.spec,1.45,1.46 Message-ID: <20090225172648.485A070125@cvs1.fedora.phx.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3830 Modified Files: qemu.spec Log Message: - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- qemu.spec 11 Jan 2009 17:38:20 -0000 1.45 +++ qemu.spec 25 Feb 2009 17:26:18 -0000 1.46 @@ -8,7 +8,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.9.1 -Release: 12%{?dist} +Release: 13%{?dist} License: GPLv2+ and LGPLv2+ Group: Development/Tools URL: http://www.qemu.org/ @@ -159,6 +159,9 @@ %{_mandir}/man1/qemu-img.1* %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 0.9.1-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Sun Jan 11 2009 Debarshi Ray - 0.9.1-12 - Updated build patch. Closes Red Hat Bugzilla bug #465041. From jkeating at fedoraproject.org Wed Feb 25 19:48:54 2009 From: jkeating at fedoraproject.org (Jesse Keating) Date: Wed, 25 Feb 2009 19:48:54 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libvirt-java/devel libvirt-java.spec, 1.3, 1.4 Message-ID: <20090225194854.3DF5270125@cvs1.fedora.phx.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/libvirt-java/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31057 Modified Files: libvirt-java.spec Log Message: - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: libvirt-java.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt-java/devel/libvirt-java.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- libvirt-java.spec 8 Aug 2008 13:23:09 -0000 1.3 +++ libvirt-java.spec 25 Feb 2009 19:48:23 -0000 1.4 @@ -1,7 +1,7 @@ Summary: Java bindings for the libvirt virtualization API Name: libvirt-java Version: 0.2.1 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: Development/Libraries Source: http://libvirt.org/sources/java/libvirt-java-%{version}.tar.gz @@ -92,6 +92,9 @@ /usr/share/javadoc/%{name}-%{version} %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 0.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Fri Aug 8 2008 Daniel Veillard - 0.2.1-1.fc10 - new release 0.2.1 - avoid leaks From jkeating at fedoraproject.org Wed Feb 25 19:46:58 2009 From: jkeating at fedoraproject.org (Jesse Keating) Date: Wed, 25 Feb 2009 19:46:58 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libvirt/devel libvirt.spec,1.111,1.112 Message-ID: <20090225194658.5048170125@cvs1.fedora.phx.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/libvirt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30309 Modified Files: libvirt.spec Log Message: - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v retrieving revision 1.111 retrieving revision 1.112 diff -u -r1.111 -r1.112 --- libvirt.spec 18 Feb 2009 13:51:22 -0000 1.111 +++ libvirt.spec 25 Feb 2009 19:46:28 -0000 1.112 @@ -47,7 +47,7 @@ Summary: Library providing a simple API virtualization Name: libvirt Version: 0.6.0 -Release: 4%{?dist}%{?extra_release} +Release: 5%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries Source: libvirt-%{version}.tar.gz @@ -477,6 +477,9 @@ %endif %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 0.6.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Wed Feb 18 2009 Daniel P. Berrange - 0.6.0-4.fc11 - Fix QEMU startup timeout/race (rhbz #484649) - Setup DBus threading. Don't allow dbus to call _exit / change SIGPIPE (rhbz #484553) From jkeating at fedoraproject.org Wed Feb 25 21:25:53 2009 From: jkeating at fedoraproject.org (Jesse Keating) Date: Wed, 25 Feb 2009 21:25:53 +0000 (UTC) Subject: [fedora-virt-maint] rpms/ruby-libvirt/devel ruby-libvirt.spec, 1.10, 1.11 Message-ID: <20090225212553.7249D70125@cvs1.fedora.phx.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/ruby-libvirt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6581 Modified Files: ruby-libvirt.spec Log Message: - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: ruby-libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/ruby-libvirt/devel/ruby-libvirt.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- ruby-libvirt.spec 18 Nov 2008 14:42:51 -0000 1.10 +++ ruby-libvirt.spec 25 Feb 2009 21:25:23 -0000 1.11 @@ -3,7 +3,7 @@ Name: ruby-libvirt Version: 0.1.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Ruby bindings for libvirt Group: Development/Languages @@ -53,6 +53,9 @@ %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 0.1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Tue Nov 18 2008 David Lutterkort - 0.1.0-2 - Added test-sort-list.patch to fix fragile test From jkeating at fedoraproject.org Thu Feb 26 00:31:10 2009 From: jkeating at fedoraproject.org (Jesse Keating) Date: Thu, 26 Feb 2009 00:31:10 +0000 (UTC) Subject: [fedora-virt-maint] rpms/virt-df/devel virt-df.spec,1.8,1.9 Message-ID: <20090226003110.531FF7010C@cvs1.fedora.phx.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/virt-df/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13581 Modified Files: virt-df.spec Log Message: - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: virt-df.spec =================================================================== RCS file: /cvs/pkgs/rpms/virt-df/devel/virt-df.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- virt-df.spec 5 Dec 2008 16:33:54 -0000 1.8 +++ virt-df.spec 26 Feb 2009 00:30:40 -0000 1.9 @@ -4,7 +4,7 @@ Name: virt-df Version: 2.1.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Utility like 'df' for virtual guests Group: Development/Libraries @@ -100,6 +100,9 @@ %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 2.1.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Fri Nov 5 2008 Richard W.M. Jones - 2.1.4-3 - Patch to fix camlp4 parsing problem in 3.11.0. From jkeating at fedoraproject.org Thu Feb 26 00:32:49 2009 From: jkeating at fedoraproject.org (Jesse Keating) Date: Thu, 26 Feb 2009 00:32:49 +0000 (UTC) Subject: [fedora-virt-maint] rpms/virt-manager/devel virt-manager.spec, 1.45, 1.46 Message-ID: <20090226003249.173DE7010C@cvs1.fedora.phx.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/virt-manager/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14086 Modified Files: virt-manager.spec Log Message: - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: virt-manager.spec =================================================================== RCS file: /cvs/pkgs/rpms/virt-manager/devel/virt-manager.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- virt-manager.spec 9 Feb 2009 19:48:41 -0000 1.45 +++ virt-manager.spec 26 Feb 2009 00:32:18 -0000 1.46 @@ -8,7 +8,7 @@ Name: virt-manager Version: 0.6.1 -Release: 2%{_extra_release} +Release: 3%{_extra_release} Summary: Virtual Machine Manager Group: Applications/Emulators @@ -159,6 +159,9 @@ %{_datadir}/dbus-1/services/%{name}.service %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 0.6.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Mon Feb 9 2009 Cole Robinson - 0.6.1-2 - Kill off consolehelper (PolicyKit is sufficient) From jkeating at fedoraproject.org Thu Feb 26 00:33:56 2009 From: jkeating at fedoraproject.org (Jesse Keating) Date: Thu, 26 Feb 2009 00:33:56 +0000 (UTC) Subject: [fedora-virt-maint] rpms/virt-mem/devel virt-mem.spec,1.7,1.8 Message-ID: <20090226003356.4F00A7010C@cvs1.fedora.phx.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/virt-mem/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14580 Modified Files: virt-mem.spec Log Message: - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: virt-mem.spec =================================================================== RCS file: /cvs/pkgs/rpms/virt-mem/devel/virt-mem.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- virt-mem.spec 5 Dec 2008 20:25:43 -0000 1.7 +++ virt-mem.spec 26 Feb 2009 00:33:26 -0000 1.8 @@ -3,7 +3,7 @@ Name: virt-mem Version: 0.3.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Management tools for virtual machines Group: Development/Libraries @@ -112,6 +112,9 @@ %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 0.3.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Fri Dec 5 2008 Richard W.M. Jones - 0.3.1-5 - Rebuild for OCaml 3.11.0. - Fix for bitstring 2.0.0. From jkeating at fedoraproject.org Thu Feb 26 00:35:33 2009 From: jkeating at fedoraproject.org (Jesse Keating) Date: Thu, 26 Feb 2009 00:35:33 +0000 (UTC) Subject: [fedora-virt-maint] rpms/virt-top/devel virt-top.spec,1.4,1.5 Message-ID: <20090226003533.072A67010C@cvs1.fedora.phx.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/virt-top/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15159 Modified Files: virt-top.spec Log Message: - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: virt-top.spec =================================================================== RCS file: /cvs/pkgs/rpms/virt-top/devel/virt-top.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- virt-top.spec 5 Dec 2008 14:47:05 -0000 1.4 +++ virt-top.spec 26 Feb 2009 00:35:02 -0000 1.5 @@ -3,7 +3,7 @@ Name: virt-top Version: 1.0.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Utility like top(1) for displaying virtualization stats Group: Development/Libraries @@ -98,6 +98,9 @@ %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 1.0.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Wed Nov 26 2008 Richard W.M. Jones - 1.0.3-3 - Rebuild for OCaml 3.11.0+rc1. From jkeating at fedoraproject.org Thu Feb 26 00:36:39 2009 From: jkeating at fedoraproject.org (Jesse Keating) Date: Thu, 26 Feb 2009 00:36:39 +0000 (UTC) Subject: [fedora-virt-maint] rpms/virt-viewer/devel virt-viewer.spec, 1.11, 1.12 Message-ID: <20090226003639.BB4287010C@cvs1.fedora.phx.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/virt-viewer/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15690 Modified Files: virt-viewer.spec Log Message: - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: virt-viewer.spec =================================================================== RCS file: /cvs/pkgs/rpms/virt-viewer/devel/virt-viewer.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- virt-viewer.spec 7 Jul 2008 19:29:36 -0000 1.11 +++ virt-viewer.spec 26 Feb 2009 00:36:09 -0000 1.12 @@ -6,7 +6,7 @@ Name: virt-viewer Version: 0.0.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Virtual Machine Viewer Group: Applications/System License: GPLv2+ @@ -84,6 +84,9 @@ %endif %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 0.0.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Mon Jul 7 2008 Tom "spot" Callaway - 0.0.3-3.fc10 - fix conditional comparison - remove file dep From jkeating at fedoraproject.org Thu Feb 26 07:14:12 2009 From: jkeating at fedoraproject.org (Jesse Keating) Date: Thu, 26 Feb 2009 07:14:12 +0000 (UTC) Subject: [fedora-virt-maint] rpms/ocaml-libvirt/devel ocaml-libvirt.spec, 1.26, 1.27 Message-ID: <20090226071412.4C84970129@cvs1.fedora.phx.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/ocaml-libvirt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13931 Modified Files: ocaml-libvirt.spec Log Message: - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: ocaml-libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-libvirt/devel/ocaml-libvirt.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- ocaml-libvirt.spec 4 Dec 2008 19:25:17 -0000 1.26 +++ ocaml-libvirt.spec 26 Feb 2009 07:14:11 -0000 1.27 @@ -6,7 +6,7 @@ Name: ocaml-libvirt Version: 0.4.4.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: OCaml binding for libvirt Group: Development/Libraries @@ -123,6 +123,9 @@ %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 0.4.4.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Wed Nov 26 2008 Richard W.M. Jones - 0.4.4.2-3 - Rebuild for OCaml 3.11.0+rc1. From jkeating at fedoraproject.org Thu Feb 26 08:30:57 2009 From: jkeating at fedoraproject.org (Jesse Keating) Date: Thu, 26 Feb 2009 08:30:57 +0000 (UTC) Subject: [fedora-virt-maint] rpms/xenner/devel xenner.spec,1.37,1.38 Message-ID: <20090226083057.0493B70129@cvs1.fedora.phx.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/xenner/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4323 Modified Files: xenner.spec Log Message: - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: xenner.spec =================================================================== RCS file: /cvs/pkgs/rpms/xenner/devel/xenner.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- xenner.spec 27 Oct 2008 12:08:48 -0000 1.37 +++ xenner.spec 26 Feb 2009 08:30:26 -0000 1.38 @@ -1,7 +1,7 @@ Name: xenner License: GPLv2+ Version: 0.46 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Xen emulator for kvm Group: Applications/Emulators Source0: %{name}-%{version}.tar.gz @@ -59,6 +59,9 @@ rm -rf %{buildroot} %changelog +* Thu Feb 26 2009 Fedora Release Engineering - 0.46-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Fri Sep 26 2008 Gerd Hoffmann - 0.46-3.fc10 - don't update empty stats file (rhbz #468434). * Fri Sep 26 2008 Gerd Hoffmann - 0.46-1.fc10 From jkeating at fedoraproject.org Fri Feb 27 00:06:31 2009 From: jkeating at fedoraproject.org (Jesse Keating) Date: Fri, 27 Feb 2009 00:06:31 +0000 (UTC) Subject: [fedora-virt-maint] rpms/python-virtinst/devel python-virtinst.spec, 1.52, 1.53 Message-ID: <20090227000631.912F07010D@cvs1.fedora.phx.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/python-virtinst/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6821 Modified Files: python-virtinst.spec Log Message: - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: python-virtinst.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-virtinst/devel/python-virtinst.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- python-virtinst.spec 27 Jan 2009 00:49:30 -0000 1.52 +++ python-virtinst.spec 27 Feb 2009 00:06:01 -0000 1.53 @@ -11,7 +11,7 @@ Summary: Python modules and utilities for installing virtual machines Name: python-%{appname} Version: 0.400.1 -Release: 1%{_extra_release} +Release: 2%{_extra_release} Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz Patch1: %{appname}-%{version}-fix-extra-args.patch License: GPLv2+ @@ -76,6 +76,9 @@ %{_bindir}/virt-convert %changelog +* Thu Feb 26 2009 Fedora Release Engineering - 0.400.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Mon Jan 26 2009 Cole Robinson - 0.400.1-1.fc11 - Update to 0.400.1 - virt-convert virt-image -> vmx support From kraxel at fedoraproject.org Fri Feb 27 09:58:38 2009 From: kraxel at fedoraproject.org (Gerd Hoffmann) Date: Fri, 27 Feb 2009 09:58:38 +0000 (UTC) Subject: [fedora-virt-maint] rpms/xen/devel xen-qemu-dm-unplug.diff, NONE, 1.1 xen-xenstored-fix.diff, NONE, 1.1 xen.spec, 1.229, 1.230 Message-ID: <20090227095838.0AF157010D@cvs1.fedora.phx.redhat.com> Author: kraxel Update of /cvs/pkgs/rpms/xen/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32064 Modified Files: xen.spec Added Files: xen-qemu-dm-unplug.diff xen-xenstored-fix.diff Log Message: fix xenstored crash, backport qemu-unplug patch xen-qemu-dm-unplug.diff: --- NEW FILE xen-qemu-dm-unplug.diff --- diff --git a/block-raw-posix.c b/block-raw-posix.c index 2364175..085f38f 100644 --- a/block-raw-posix.c +++ b/block-raw-posix.c @@ -55,6 +55,7 @@ #include #include #include +#include #endif #ifdef __FreeBSD__ #include @@ -125,6 +126,10 @@ static int raw_open(BlockDriverState *bs, const char *filename, int flags) return ret; } s->fd = fd; +#ifndef CONFIG_STUBDOM + /* Invalidate buffer cache for this device. */ + ioctl(s->fd, BLKFLSBUF, 0); +#endif return 0; } @@ -505,6 +510,10 @@ static void raw_close(BlockDriverState *bs) { BDRVRawState *s = bs->opaque; if (s->fd >= 0) { +#ifndef CONFIG_STUBDOM + /* Invalidate buffer cache for this device. */ + ioctl(s->fd, BLKFLSBUF, 0); +#endif close(s->fd); s->fd = -1; } diff --git a/hw/ide.c b/hw/ide.c index dae6e7f..235f5f1 100644 --- a/hw/ide.c +++ b/hw/ide.c @@ -484,6 +484,7 @@ typedef struct PCIIDEState { int type; /* see IDE_TYPE_xxx */ } PCIIDEState; +static PCIIDEState *principal_ide_controller; #if defined(__ia64__) #include @@ -2778,6 +2779,47 @@ static void ide_reset(IDEState *s) s->media_changed = 0; } +/* Unplug all of the IDE hard disks, starting at index @start in the + table. */ +static void _ide_unplug_harddisks(int start) +{ + IDEState *s; + int i, j; + + if (!principal_ide_controller) { + fprintf(stderr, "No principal controller?\n"); + return; + } + for (i = start; i < 4; i++) { + s = principal_ide_controller->ide_if + i; + if (!s->bs) + continue; /* drive not present */ + if (s->is_cdrom) + continue; /* cdrom */ + /* Is a hard disk, unplug it. */ + for (j = 0; j < nb_drives; j++) + if (drives_table[j].bdrv == s->bs) + drives_table[j].bdrv = NULL; + bdrv_close(s->bs); + s->bs = NULL; + ide_reset(s); + } +} + +/* Unplug all hard disks except for the primary master (which will + almost always be the boot device). */ +void ide_unplug_aux_harddisks(void) +{ + _ide_unplug_harddisks(1); +} + +/* Unplug all hard disks, including the boot device. */ +void ide_unplug_harddisks(void) +{ + _ide_unplug_harddisks(0); +} + + struct partition { uint8_t boot_ind; /* 0x80 - active */ uint8_t head; /* starting head */ @@ -3290,6 +3332,9 @@ void pci_cmd646_ide_init(PCIBus *bus, BlockDriverState **hd_table, sizeof(PCIIDEState), -1, NULL, NULL); + if (principal_ide_controller) + abort(); + principal_ide_controller = d; d->type = IDE_TYPE_CMD646; pci_conf = d->dev.config; pci_conf[0x00] = 0x95; // CMD646 @@ -3419,6 +3464,9 @@ void pci_piix3_ide_init(PCIBus *bus, BlockDriverState **hd_table, int devfn, sizeof(PCIIDEState), devfn, NULL, NULL); + if (principal_ide_controller) + abort(); + principal_ide_controller = d; d->type = IDE_TYPE_PIIX3; pci_conf = d->dev.config; diff --git a/hw/pc.h b/hw/pc.h index a78e039..3d46046 100644 --- a/hw/pc.h +++ b/hw/pc.h @@ -146,6 +146,8 @@ void pci_piix3_ide_init(PCIBus *bus, BlockDriverState **hd_table, int devfn, qemu_irq *pic); void pci_piix4_ide_init(PCIBus *bus, BlockDriverState **hd_table, int devfn, qemu_irq *pic); +void ide_unplug_harddisks(void); +void ide_unplug_aux_harddisks(void); /* ne2000.c */ diff --git a/hw/pci.c b/hw/pci.c index 1de68fd..aace3a4 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -26,6 +26,9 @@ #include "console.h" #include "net.h" +#include "exec-all.h" +#include "qemu-xen.h" + //#define DEBUG_PCI struct PCIBus { @@ -648,6 +651,46 @@ void pci_nic_init(PCIBus *bus, NICInfo *nd, int devfn) } } +void pci_unplug_netifs(void) +{ + PCIBus *bus; + PCIDevice *dev; + PCIIORegion *region; + int x; + int i; + + /* We only support one PCI bus */ + for (bus = first_bus; bus; bus = NULL) { + for (x = 0; x < 256; x++) { + dev = bus->devices[x]; + if (dev && + dev->config[0xa] == 0 && + dev->config[0xb] == 2) { + /* Found a netif. Remove it from the bus. Note that + we don't free it here, since there could still be + references to it floating around. There are only + ever one or two structures leaked, and it's not + worth finding them all. */ + bus->devices[x] = NULL; + for (i = 0; i < PCI_NUM_REGIONS; i++) { + region = &dev->io_regions[i]; + if (region->addr == (uint32_t)-1 || + region->size == 0) + continue; + fprintf(logfile, "region type %d at [%x,%x).\n", + region->type, region->addr, + region->addr+region->size); + if (region->type == PCI_ADDRESS_SPACE_IO) { + isa_unassign_ioport(region->addr, region->size); + } else if (region->type == PCI_ADDRESS_SPACE_MEM) { + unregister_iomem(region->addr); + } + } + } + } + } +} + typedef struct { PCIDevice dev; PCIBus *bus; diff --git a/hw/xen_platform.c b/hw/xen_platform.c index 430e603..36df8f8 100644 --- a/hw/xen_platform.c +++ b/hw/xen_platform.c @@ -24,12 +24,20 @@ */ #include "hw.h" +#include "pc.h" #include "pci.h" #include "irq.h" +#include "../qemu-xen.h" +#include #include +static int drivers_blacklisted; +static uint16_t driver_product_version; +static int throttling_disabled; extern FILE *logfile; +static char log_buffer[4096]; +static int log_buffer_off; #define PFFLAG_ROM_LOCK 1 /* Sets whether ROM memory area is RW or RO */ @@ -39,6 +47,88 @@ typedef struct PCIXenPlatformState uint8_t platform_flags; } PCIXenPlatformState; +/* We throttle access to dom0 syslog, to avoid DOS attacks. This is + modelled as a token bucket, with one token for every byte of log. + The bucket size is 128KB (->1024 lines of 128 bytes each) and + refills at 256B/s. It starts full. The guest is blocked if no + tokens are available when it tries to generate a log message. */ +#define BUCKET_MAX_SIZE (128*1024) +#define BUCKET_FILL_RATE 256 + +static void throttle(unsigned count) +{ + static unsigned available; + static struct timespec last_refil; + static int started; + static int warned; + + struct timespec waiting_for, now; + double delay; + struct timespec ts; + + if (throttling_disabled) + return; + + if (!started) { + clock_gettime(CLOCK_MONOTONIC, &last_refil); + available = BUCKET_MAX_SIZE; + started = 1; + } + + if (count > BUCKET_MAX_SIZE) { + fprintf(logfile, "tried to get %d tokens, but bucket size is %d\n", + BUCKET_MAX_SIZE, count); + exit(1); + } + + if (available < count) { + /* The bucket is empty. Refil it */ + + /* When will it be full enough to handle this request? */ + delay = (double)(count - available) / BUCKET_FILL_RATE; + waiting_for = last_refil; + waiting_for.tv_sec += delay; + waiting_for.tv_nsec += (delay - (int)delay) * 1e9; + if (waiting_for.tv_nsec >= 1000000000) { + waiting_for.tv_nsec -= 1000000000; + waiting_for.tv_sec++; + } + + /* How long do we have to wait? (might be negative) */ + clock_gettime(CLOCK_MONOTONIC, &now); + ts.tv_sec = waiting_for.tv_sec - now.tv_sec; + ts.tv_nsec = waiting_for.tv_nsec - now.tv_nsec; + if (ts.tv_nsec < 0) { + ts.tv_sec--; + ts.tv_nsec += 1000000000; + } + + /* Wait for it. */ + if (ts.tv_sec > 0 || + (ts.tv_sec == 0 && ts.tv_nsec > 0)) { + if (!warned) { + fprintf(logfile, "throttling guest access to syslog"); + warned = 1; + } + while (nanosleep(&ts, &ts) < 0 && errno == EINTR) + ; + } + + /* Refil */ + clock_gettime(CLOCK_MONOTONIC, &now); + delay = (now.tv_sec - last_refil.tv_sec) + + (now.tv_nsec - last_refil.tv_nsec) * 1.0e-9; + available += BUCKET_FILL_RATE * delay; + if (available > BUCKET_MAX_SIZE) + available = BUCKET_MAX_SIZE; + last_refil = now; + } + + assert(available >= count); + + available -= count; +} + static uint32_t xen_platform_ioport_readb(void *opaque, uint32_t addr) { PCIXenPlatformState *s = opaque; @@ -66,6 +156,19 @@ static void xen_platform_ioport_writeb(void *opaque, uint32_t addr, uint32_t val d->platform_flags = val & PFFLAG_ROM_LOCK; break; } + case 8: + { + if (val == '\n' || log_buffer_off == sizeof(log_buffer) - 1) { + /* Flush buffer */ + log_buffer[log_buffer_off] = 0; + throttle(log_buffer_off); + fprintf(logfile, "%s\n", log_buffer); + log_buffer_off = 0; + break; + } + log_buffer[log_buffer_off++] = val; + } + break; default: break; } @@ -126,6 +229,116 @@ static void platform_mmio_map(PCIDevice *d, int region_num, cpu_register_physical_memory(addr, 0x1000000, mmio_io_addr); } +#define UNPLUG_ALL_IDE_DISKS 1 +#define UNPLUG_ALL_NICS 2 +#define UNPLUG_AUX_IDE_DISKS 4 + +static void platform_fixed_ioport_write2(void *opaque, uint32_t addr, uint32_t val) +{ + switch (addr - 0x10) { + case 0: + /* Unplug devices. Value is a bitmask of which devices to + unplug, with bit 0 the IDE devices, bit 1 the network + devices, and bit 2 the non-primary-master IDE devices. */ + if (val & UNPLUG_ALL_IDE_DISKS) + ide_unplug_harddisks(); + if (val & UNPLUG_ALL_NICS) { + pci_unplug_netifs(); + net_tap_shutdown_all(); + } + if (val & UNPLUG_AUX_IDE_DISKS) { + ide_unplug_aux_harddisks(); + } + break; + case 2: + switch (val) { + case 1: + fprintf(logfile, "Citrix Windows PV drivers loaded in guest\n"); + break; + case 2: + fprintf(logfile, "GPLPV drivers loaded in guest\n"); + break; + case 0: + fprintf(logfile, "Guest claimed to be running PV product 0?\n"); + break; + default: + fprintf(logfile, "Unknown PV product %d loaded in guest\n", val); + break; + } + driver_product_version = val; + break; + } +} + +static void platform_fixed_ioport_write4(void *opaque, uint32_t addr, + uint32_t val) +{ + switch (addr - 0x10) { + case 0: + /* PV driver version */ + if (driver_product_version == 0) { + fprintf(logfile, + "Drivers tried to set their version number (%d) before setting the product number?\n", + val); + return; + } + fprintf(logfile, "PV driver build %d\n", val); + if (xenstore_pv_driver_build_blacklisted(driver_product_version, + val)) { + fprintf(logfile, "Drivers are blacklisted!\n"); + drivers_blacklisted = 1; + } + break; + } +} + + +static void platform_fixed_ioport_write1(void *opaque, uint32_t addr, uint32_t val) +{ + switch (addr - 0x10) { + case 2: + /* Send bytes to syslog */ + if (val == '\n' || log_buffer_off == sizeof(log_buffer) - 1) { + /* Flush buffer */ + log_buffer[log_buffer_off] = 0; + throttle(log_buffer_off); + fprintf(logfile, "%s\n", log_buffer); + log_buffer_off = 0; + break; + } + log_buffer[log_buffer_off++] = val; + break; + } +} + +static uint32_t platform_fixed_ioport_read2(void *opaque, uint32_t addr) +{ + switch (addr - 0x10) { + case 0: + if (drivers_blacklisted) { + /* The drivers will recognise this magic number and refuse + * to do anything. */ + return 0xd249; + } else { + /* Magic value so that you can identify the interface. */ + return 0x49d2; + } + default: + return 0xffff; + } +} + +static uint32_t platform_fixed_ioport_read1(void *opaque, uint32_t addr) +{ + switch (addr - 0x10) { + case 2: + /* Version number */ + return 1; + default: + return 0xff; + } +} + struct pci_config_header { uint16_t vendor_id; uint16_t device_id; @@ -185,6 +398,7 @@ void pci_xen_platform_init(PCIBus *bus) { PCIXenPlatformState *d; struct pci_config_header *pch; + struct stat stbuf; printf("Register xen platform.\n"); d = (PCIXenPlatformState *)pci_register_device( @@ -216,4 +430,13 @@ void pci_xen_platform_init(PCIBus *bus) register_savevm("platform", 0, 2, xen_pci_save, xen_pci_load, d); printf("Done register platform.\n"); + register_ioport_write(0x10, 16, 4, platform_fixed_ioport_write4, NULL); + register_ioport_write(0x10, 16, 2, platform_fixed_ioport_write2, NULL); + register_ioport_write(0x10, 16, 1, platform_fixed_ioport_write1, NULL); + register_ioport_read(0x10, 16, 2, platform_fixed_ioport_read2, NULL); + register_ioport_read(0x10, 16, 1, platform_fixed_ioport_read1, NULL); + + if (stat("/etc/disable-guest-log-throttle", &stbuf) == 0) + throttling_disabled = 1; + } diff --git a/i386-dm/exec-dm.c b/i386-dm/exec-dm.c index d511021..283f225 100644 --- a/i386-dm/exec-dm.c +++ b/i386-dm/exec-dm.c @@ -267,7 +267,7 @@ void cpu_abort(CPUState *env, const char *fmt, ...) /* XXX: Simple implementation. Fix later */ #define MAX_MMIO 32 -struct mmio_space { +static struct mmio_space { target_phys_addr_t start; unsigned long size; unsigned long io_index; @@ -413,6 +413,17 @@ int iomem_index(target_phys_addr_t addr) return 0; } +void unregister_iomem(target_phys_addr_t start) +{ + int index = iomem_index(start); + if (index) { + fprintf(logfile, "squash iomem [%lx, %lx).\n", mmio[index].start, + mmio[index].start + mmio[index].size); + mmio[index].start = mmio[index].size = 0; + } +} + + #if defined(__i386__) || defined(__x86_64__) #define phys_ram_addr(x) (qemu_map_cache(x)) #elif defined(__ia64__) diff --git a/qemu-xen.h b/qemu-xen.h index 06d8ec9..86f646a 100644 --- a/qemu-xen.h +++ b/qemu-xen.h @@ -23,8 +23,11 @@ void timeoffset_get(void); void pci_xen_platform_init(PCIBus *bus); #endif - +void ide_unplug_harddisks(void); +void net_tap_shutdown_all(void); +void pci_unplug_netifs(void); void destroy_hvm_domain(void); +void unregister_iomem(target_phys_addr_t start); #ifdef __ia64__ static inline void xc_domain_shutdown_hook(int xc_handle, uint32_t domid) @@ -69,4 +72,8 @@ int xenstore_unsubscribe_from_hotplug_status(struct xs_handle *handle, int xenstore_vm_write(int domid, char *key, char *val); char *xenstore_vm_read(int domid, char *key, unsigned int *len); +int xenstore_pv_driver_build_blacklisted(uint16_t product_number, + uint32_t build_nr); + + #endif /*QEMU_XEN_H*/ diff --git a/vl.c b/vl.c index 57b88f3..a6c7dff 100644 --- a/vl.c +++ b/vl.c @@ -259,6 +259,20 @@ static int event_pending = 1; #include "xen-vl-extra.c" +typedef struct IOHandlerRecord { + int fd; + IOCanRWHandler *fd_read_poll; + IOHandler *fd_read; + IOHandler *fd_write; + int deleted; + void *opaque; + /* temporary data */ + struct pollfd *ufd; + struct IOHandlerRecord *next; +} IOHandlerRecord; + +static IOHandlerRecord *first_io_handler; + /***********************************************************/ /* x86 ISA bus support */ @@ -4052,6 +4066,7 @@ void do_info_slirp(void) typedef struct TAPState { VLANClientState *vc; int fd; + struct TAPState *next; char down_script[1024]; char script_arg[1024]; } TAPState; @@ -4089,6 +4104,34 @@ static void tap_send(void *opaque) } } +static TAPState *head_net_tap; + +void net_tap_shutdown_all(void) +{ + struct IOHandlerRecord **pioh, *ioh; + + while (head_net_tap) { + pioh = &first_io_handler; + for (;;) { + ioh = *pioh; + if (ioh == NULL) + break; + if (ioh->fd == head_net_tap->fd) { + *pioh = ioh->next; + qemu_free(ioh); + break; + } + pioh = &ioh->next; + } + if (!ioh) + fprintf(stderr, + "warning: can't find iohandler for %d to close it properly.\n", + head_net_tap->fd); + close(head_net_tap->fd); + head_net_tap = head_net_tap->next; + } +} + /* fd support */ static TAPState *net_tap_fd_init(VLANState *vlan, int fd) @@ -4100,6 +4143,8 @@ static TAPState *net_tap_fd_init(VLANState *vlan, int fd) return NULL; s->fd = fd; s->vc = qemu_new_vlan_client(vlan, tap_receive, NULL, s); + s->next = head_net_tap; + head_net_tap = s; qemu_set_fd_handler(s->fd, tap_send, NULL, s); snprintf(s->vc->info_str, sizeof(s->vc->info_str), "tap: fd=%d", fd); return s; @@ -5662,20 +5707,6 @@ static void dumb_display_init(DisplayState *ds) #define MAX_IO_HANDLERS 64 -typedef struct IOHandlerRecord { - int fd; - IOCanRWHandler *fd_read_poll; - IOHandler *fd_read; - IOHandler *fd_write; - int deleted; - void *opaque; - /* temporary data */ - struct pollfd *ufd; - struct IOHandlerRecord *next; -} IOHandlerRecord; - -static IOHandlerRecord *first_io_handler; - /* XXX: fd_read_poll should be suppressed, but an API change is necessary in the character devices to suppress fd_can_read(). */ int qemu_set_fd_handler2(int fd, diff --git a/xenstore.c b/xenstore.c index dd487dd..d76e42b 100644 --- a/xenstore.c +++ b/xenstore.c @@ -626,6 +626,34 @@ void xenstore_record_dm(char *subpath, char *state) free(path); } +int +xenstore_pv_driver_build_blacklisted(uint16_t product_nr, + uint32_t build_nr) +{ + char *buf = NULL; + char *tmp; + const char *product; + + switch (product_nr) { + case 1: + product = "xensource-windows"; + break; + default: + /* Don't know what product this is -> we can't blacklist + * it. */ + return 0; + } + if (asprintf(&buf, "/mh/driver-blacklist/%s/%d", product, build_nr) < 0) + return 0; + tmp = xs_read(xsh, XBT_NULL, buf, NULL); + free(tmp); + free(buf); + if (tmp == NULL) + return 0; + else + return 1; +} + void xenstore_record_dm_state(char *state) { xenstore_record_dm("state", state); xen-xenstored-fix.diff: --- NEW FILE xen-xenstored-fix.diff --- There is a use-after-free bug in xenstored. Problem: Handling requests for one connection can not only zap the connection itself, due to socket disconnects for example. It can also zap *other* connections, due to domain release requests. Especially it can zap the connection we have saved a pointer to in the "next" variable. The attached patch fixes it by adjusting the reference counting. diff -r 8417ddc981b4 tools/xenstore/xenstored_core.c --- a/tools/xenstore/xenstored_core.c Mon Jan 05 11:10:54 2009 +0000 +++ b/tools/xenstore/xenstored_core.c Thu Feb 26 18:22:31 2009 +0100 @@ -1937,14 +1937,17 @@ handle_event(); next = list_entry(connections.next, typeof(*conn), list); + if (&next->list != &connections) + talloc_increase_ref_count(next); while (&next->list != &connections) { conn = next; next = list_entry(conn->list.next, typeof(*conn), list); + if (&next->list != &connections) + talloc_increase_ref_count(next); if (conn->domain) { - talloc_increase_ref_count(conn); if (domain_can_read(conn)) handle_input(conn); if (talloc_free(conn) == 0) @@ -1957,7 +1960,6 @@ if (talloc_free(conn) == 0) continue; } else { - talloc_increase_ref_count(conn); if (FD_ISSET(conn->fd, &inset)) handle_input(conn); if (talloc_free(conn) == 0) Index: xen.spec =================================================================== RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v retrieving revision 1.229 retrieving revision 1.230 diff -u -r1.229 -r1.230 --- xen.spec 24 Feb 2009 14:28:42 -0000 1.229 +++ xen.spec 27 Feb 2009 09:58:07 -0000 1.230 @@ -2,7 +2,7 @@ # Always set these 3 tags %define base_version 3.3.1 -%define base_release 5 +%define base_release 6 # Hypervisor ABI %define hv_abi 3.3 @@ -71,11 +71,14 @@ Patch14: xen-net-disable-bridge-by-default.patch Patch15: xen-net-disable-iptables-on-bridge.patch Patch16: xen-gcc44-buildfix.patch +Patch17: xen-xenstored-fix.diff Patch20: xen-backport-hg18782.patch Patch21: xen-backport-hg19075.patch Patch22: xen-backport-hg19108.patch Patch23: xen-backport-hg19109.patch Patch24: xen-backport-hg19110.patch +Patch30: xen-qemu-dm-unplug.diff + # Patches to modify the default config of xend Patch100: xen-config-dom0-minmem.patch @@ -169,6 +172,7 @@ %patch14 -p1 %patch15 -p1 %patch16 -p1 +%patch17 -p1 %patch20 -p1 %patch21 -p1 @@ -176,6 +180,10 @@ %patch23 -p1 %patch24 -p1 +cd tools/ioemu-qemu-xen +%patch30 -p1 +cd ../../ + # config patches %patch100 -p1 %patch102 -p1 @@ -489,6 +497,10 @@ %{_libdir}/*.a %changelog +* Fri Feb 27 2009 Gerd Hoffmann - 3.3.1-6 +- fix xenstored crash. +- backport qemu-unplug patch. + * Tue Feb 24 2009 Gerd Hoffmann - 3.3.1-5 - fix gcc44 build (broken constrain in inline asm). - fix ExclusiveArch From berrange at fedoraproject.org Fri Feb 27 11:49:41 2009 From: berrange at fedoraproject.org (Daniel P. Berrange) Date: Fri, 27 Feb 2009 11:49:41 +0000 (UTC) Subject: [fedora-virt-maint] rpms/python-virtinst/devel virtinst-0.400.1-fedora11-ostype.patch, NONE, 1.1 python-virtinst.spec, 1.53, 1.54 Message-ID: <20090227114941.CDE127010D@cvs1.fedora.phx.redhat.com> Author: berrange Update of /cvs/pkgs/rpms/python-virtinst/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19731 Modified Files: python-virtinst.spec Added Files: virtinst-0.400.1-fedora11-ostype.patch Log Message: Add Fedora 11 OS type with USB tablet (rhbz #487028) virtinst-0.400.1-fedora11-ostype.patch: --- NEW FILE virtinst-0.400.1-fedora11-ostype.patch --- changeset: 849:65294f71833d user: Cole Robinson date: Mon Feb 23 18:43:11 2009 -0500 files: virtinst/osdict.py description: Add Fedora 11 osdict entry. Default to USB tablet for mouse device. diff -r f5f29867456b -r 65294f71833d virtinst/osdict.py --- a/virtinst/osdict.py Mon Feb 23 18:39:21 2009 -0500 +++ b/virtinst/osdict.py Mon Feb 23 18:43:11 2009 -0500 @@ -100,6 +100,13 @@ OS_TYPES = {\ "disk" : { "bus" : [ (["kvm"], "virtio") ] }, "net" : { "model" : [ (["kvm"], "virtio") ] } }}, + "fedora11": { "label": "Fedora 11", "distro": "fedora", + "devices" : { + "disk" : { "bus" : [ (["kvm"], "virtio") ] }, + "net" : { "model" : [ (["kvm"], "virtio") ] }, + "input" : { "type" : [ (["all"], "tablet") ], + "bus" : [ (["all"], "usb"), ] }, + }}, "sles10": { "label": "Suse Linux Enterprise Server", "distro": "suse" }, "debianetch": { "label": "Debian Etch", "distro": "debian" }, Index: python-virtinst.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-virtinst/devel/python-virtinst.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- python-virtinst.spec 27 Feb 2009 00:06:01 -0000 1.53 +++ python-virtinst.spec 27 Feb 2009 11:49:10 -0000 1.54 @@ -11,9 +11,10 @@ Summary: Python modules and utilities for installing virtual machines Name: python-%{appname} Version: 0.400.1 -Release: 2%{_extra_release} +Release: 3%{_extra_release} Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz Patch1: %{appname}-%{version}-fix-extra-args.patch +Patch2: %{appname}-%{version}-fedora11-ostype.patch License: GPLv2+ Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -43,6 +44,7 @@ %prep %setup -q -n %{appname}-%{version} %patch1 -p1 +%patch2 -p1 %build python setup.py build @@ -76,6 +78,9 @@ %{_bindir}/virt-convert %changelog +* Fri Feb 27 2009 Daniel P. Berrange - 0.400.1-3.fc11 +- Add Fedora 11 OS type with USB tablet (rhbz #487028) + * Thu Feb 26 2009 Fedora Release Engineering - 0.400.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From berrange at fedoraproject.org Fri Feb 27 11:56:11 2009 From: berrange at fedoraproject.org (Daniel P. Berrange) Date: Fri, 27 Feb 2009 11:56:11 +0000 (UTC) Subject: [fedora-virt-maint] rpms/python-virtinst/F-10 virtinst-0.400.0-fedora11-ostype.patch, NONE, 1.1 python-virtinst.spec, 1.49, 1.50 Message-ID: <20090227115611.557BC70110@cvs1.fedora.phx.redhat.com> Author: berrange Update of /cvs/pkgs/rpms/python-virtinst/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20850 Modified Files: python-virtinst.spec Added Files: virtinst-0.400.0-fedora11-ostype.patch Log Message: Add Fedora 11 OS type with USB tablet (rhbz #487028) virtinst-0.400.0-fedora11-ostype.patch: --- NEW FILE virtinst-0.400.0-fedora11-ostype.patch --- diff -rup virtinst-0.400.0.orig/virtinst/FullVirtGuest.py virtinst-0.400.0.new/virtinst/FullVirtGuest.py --- virtinst-0.400.0.orig/virtinst/FullVirtGuest.py 2009-02-27 11:52:32.000000000 +0000 +++ virtinst-0.400.0.new/virtinst/FullVirtGuest.py 2009-02-27 11:53:25.000000000 +0000 @@ -85,6 +85,13 @@ class FullVirtGuest(Guest.XenGuest): "disk" : { "bus" : [ (["kvm"], "virtio") ] }, "net" : { "model" : [ (["kvm"], "virtio") ] } }}, + "fedora11": { "label": "Fedora 11", "distro": "fedora", + "devices" : { + "disk" : { "bus" : [ (["kvm"], "virtio") ] }, + "net" : { "model" : [ (["kvm"], "virtio") ] }, + "input" : { "type" : [ (["all"], "tablet") ], + "bus" : [ (["all"], "usb"), ] }, + }}, "sles10": { "label": "Suse Linux Enterprise Server", "distro": "suse" }, "debianetch": { "label": "Debian Etch", "distro": "debian" }, Index: python-virtinst.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-virtinst/F-10/python-virtinst.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- python-virtinst.spec 2 Dec 2008 15:55:03 -0000 1.49 +++ python-virtinst.spec 27 Feb 2009 11:55:40 -0000 1.50 @@ -11,7 +11,7 @@ Summary: Python modules and utilities for installing virtual machines Name: python-%{appname} Version: 0.400.0 -Release: 5%{_extra_release} +Release: 6%{_extra_release} Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz Patch1: %{appname}-%{version}-qemu-conn-check.patch Patch2: %{appname}-%{version}-virt-convert-dict.patch @@ -25,6 +25,7 @@ Patch10: %{appname}-%{version}-update-translations.patch Patch11: %{appname}-%{version}-undo-pxe-virtio.patch Patch12: %{appname}-%{version}-fix-translated-help.patch +Patch13: %{appname}-%{version}-fedora11-ostype.patch License: GPLv2+ Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -65,6 +66,7 @@ %patch10 -p1 %patch11 -p1 %patch12 -p1 +%patch13 -p1 %build python setup.py build @@ -99,6 +101,9 @@ %{_bindir}/virt-convert %changelog +* Fri Feb 27 2009 Daniel P. Berrange - 0.400.0-6.fc10 +- Add Fedora 11 OS type with USB tablet (rhbz #487028) + * Tue Dec 2 2008 Cole Robinson - 0.400.0-5.fc10 - Fix printing translated help messages - Allow using virtio to pxe boot From spot at fedoraproject.org Fri Feb 27 19:54:05 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Fri, 27 Feb 2009 19:54:05 +0000 (UTC) Subject: [fedora-virt-maint] rpms/xenner/devel xenner.spec,1.38,1.39 Message-ID: <20090227195405.55E247010D@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/xenner/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20900 Modified Files: xenner.spec Log Message: fix ExclusiveArch Index: xenner.spec =================================================================== RCS file: /cvs/pkgs/rpms/xenner/devel/xenner.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- xenner.spec 26 Feb 2009 08:30:26 -0000 1.38 +++ xenner.spec 27 Feb 2009 19:53:34 -0000 1.39 @@ -1,22 +1,22 @@ Name: xenner License: GPLv2+ Version: 0.46 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Xen emulator for kvm Group: Applications/Emulators -Source0: %{name}-%{version}.tar.gz +Source0: http://dl.bytesex.org/releases/%{name}/%{name}-%{version}.tar.gz Patch0: %{name}-noidlestats.diff -URL: http://dl.bytesex.org/releases/%{name}/%{name}-%{version}.tar.gz +URL: http://kraxel.fedorapeople.org/xenner/ Requires: xen-runtime Provides: xen-hypervisor-abi = 3.2 Buildroot: %{_tmppath}/root-%{name}-%{version}-%{release} -ExclusiveArch: i386 i686 x86_64 +ExclusiveArch: %{ix86} x86_64 BuildRequires: xen-devel BuildRequires: e2fsprogs-devel BuildRequires: libaio-devel BuildRequires: zlib-devel BuildRequires: python util-linux-ng -BuildRequires: /usr/include/gnu/stubs-32.h +# BuildRequires: /usr/include/gnu/stubs-32.h %description xenner is a utility which is able to boot xen paravirtualized kernels, @@ -59,6 +59,9 @@ rm -rf %{buildroot} %changelog +* Fri Feb 27 2009 Tom "spot" Callaway - 0.46-5 +- fix ExclusiveArch + * Thu Feb 26 2009 Fedora Release Engineering - 0.46-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From spot at fedoraproject.org Fri Feb 27 20:02:53 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Fri, 27 Feb 2009 20:02:53 +0000 (UTC) Subject: [fedora-virt-maint] rpms/xenner/devel xenner.spec,1.39,1.40 Message-ID: <20090227200253.8EF117010D@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/xenner/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22744 Modified Files: xenner.spec Log Message: fix typo Index: xenner.spec =================================================================== RCS file: /cvs/pkgs/rpms/xenner/devel/xenner.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- xenner.spec 27 Feb 2009 19:53:34 -0000 1.39 +++ xenner.spec 27 Feb 2009 20:02:23 -0000 1.40 @@ -1,7 +1,7 @@ Name: xenner License: GPLv2+ Version: 0.46 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Xen emulator for kvm Group: Applications/Emulators Source0: http://dl.bytesex.org/releases/%{name}/%{name}-%{version}.tar.gz @@ -16,7 +16,7 @@ BuildRequires: libaio-devel BuildRequires: zlib-devel BuildRequires: python util-linux-ng -# BuildRequires: /usr/include/gnu/stubs-32.h +BuildRequires: /usr/include/gnu/stubs-32.h %description xenner is a utility which is able to boot xen paravirtualized kernels, @@ -59,6 +59,9 @@ rm -rf %{buildroot} %changelog +* Fri Feb 27 2009 Tom "spot" Callaway - 0.46-6 +- fix typo + * Fri Feb 27 2009 Tom "spot" Callaway - 0.46-5 - fix ExclusiveArch