From glommer at fedoraproject.org Sun Apr 5 18:23:50 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Sun, 5 Apr 2009 18:23:50 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/devel qemu-fix-qcow2-2TB.patch, NONE, 1.1 qemu.spec, 1.75, 1.76 Message-ID: <20090405182350.908787011F@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28751 Modified Files: qemu.spec Added Files: qemu-fix-qcow2-2TB.patch Log Message: Fixed qcow2 segfault creating disks over 2TB. #491943 qemu-fix-qcow2-2TB.patch: --- NEW FILE qemu-fix-qcow2-2TB.patch --- >From 2d2431f03fc78b532f3a1c5f858cf78859d50fc3 Mon Sep 17 00:00:00 2001 From: aliguori Date: Sun, 5 Apr 2009 17:40:58 +0000 Subject: [PATCH] qcow2: fix image creation for large, > ~2TB, images (Chris Wright) When creating large disk images w/ qcow2 format, qcow2_create is hard coded to creating a single refcount block. This is insufficient for large images, and will cause qemu-img to segfault as it walks off the end of the refcount block. Keep track of the space needed during image create and create proper number of refcount blocks accordingly. https://bugzilla.redhat.com/show_bug.cgi?id=491943 Signed-off-by: Chris Wright Signed-off-by: Anthony Liguori git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk at 6982 c046a42c-6fe2-441c-8c8c-71466251a162 --- block-qcow2.c | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) Index: qemu-kvm-0.10/qemu/block-qcow2.c =================================================================== --- qemu-kvm-0.10.orig/qemu/block-qcow2.c +++ qemu-kvm-0.10/qemu/block-qcow2.c @@ -1458,6 +1458,7 @@ static int qcow_create(const char *filen const char *backing_file, int flags) { int fd, header_size, backing_filename_len, l1_size, i, shift, l2_bits; + int ref_clusters = 0; QCowHeader header; uint64_t tmp, offset; QCowCreateState s1, *s = &s1; @@ -1498,22 +1499,28 @@ static int qcow_create(const char *filen offset += align_offset(l1_size * sizeof(uint64_t), s->cluster_size); s->refcount_table = qemu_mallocz(s->cluster_size); - s->refcount_block = qemu_mallocz(s->cluster_size); s->refcount_table_offset = offset; header.refcount_table_offset = cpu_to_be64(offset); header.refcount_table_clusters = cpu_to_be32(1); offset += s->cluster_size; - - s->refcount_table[0] = cpu_to_be64(offset); s->refcount_block_offset = offset; - offset += s->cluster_size; + + /* count how many refcount blocks needed */ + tmp = offset >> s->cluster_bits; + ref_clusters = (tmp >> (s->cluster_bits - REFCOUNT_SHIFT)) + 1; + for (i=0; i < ref_clusters; i++) { + s->refcount_table[i] = cpu_to_be64(offset); + offset += s->cluster_size; + } + + s->refcount_block = qemu_mallocz(ref_clusters * s->cluster_size); /* update refcounts */ create_refcount_update(s, 0, header_size); create_refcount_update(s, s->l1_table_offset, l1_size * sizeof(uint64_t)); create_refcount_update(s, s->refcount_table_offset, s->cluster_size); - create_refcount_update(s, s->refcount_block_offset, s->cluster_size); + create_refcount_update(s, s->refcount_block_offset, ref_clusters * s->cluster_size); /* write all the data */ write(fd, &header, sizeof(header)); @@ -1529,7 +1536,7 @@ static int qcow_create(const char *filen write(fd, s->refcount_table, s->cluster_size); lseek(fd, s->refcount_block_offset, SEEK_SET); - write(fd, s->refcount_block, s->cluster_size); + write(fd, s->refcount_block, ref_clusters * s->cluster_size); qemu_free(s->refcount_table); qemu_free(s->refcount_block); Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- qemu.spec 3 Apr 2009 17:09:43 -0000 1.75 +++ qemu.spec 5 Apr 2009 18:23:20 -0000 1.76 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.10 -Release: 5%{?dist} +Release: 6%{?dist} # I have mistakenly thought the revision name would be 1.0. # So 0.10 series get Epoch = 1 Epoch: 2 @@ -36,6 +36,7 @@ Patch12: qemu-roms-more-room.patch Patch13: qemu-bios-bigger-roms.patch Patch14: qemu-fix-display-breakage.patch +Patch15: qemu-fix-qcow2-2TB.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel @@ -214,6 +215,7 @@ %patch12 -p1 %patch13 -p1 %patch14 -p1 +%patch15 -p1 %build # systems like rhel build system does not have a recent enough linker so @@ -455,6 +457,9 @@ %{_mandir}/man1/qemu-img.1* %changelog +* Sun Apr 5 2009 Glauber Costa - 2:0.10-6 +- Fixed qcow2 segfault creating disks over 2TB. #491943 + * Fri Apr 3 2009 Mark McLoughlin - 2:0.10-5 - Fix vga segfault under kvm-autotest (#494002) - Kill kernelrelease hack; it's not needed From markmc at fedoraproject.org Thu Apr 9 15:08:34 2009 From: markmc at fedoraproject.org (Mark McLoughlin) Date: Thu, 9 Apr 2009 15:08:34 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/devel qemu-fix-display-breakage.patch, 1.1, 1.2 qemu.spec, 1.76, 1.77 Message-ID: <20090409150834.CB6A57001C@cvs1.fedora.phx.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7245 Modified Files: qemu-fix-display-breakage.patch qemu.spec Log Message: * Thu Apr 9 2009 Mark McLoughlin - 2:0.10-7 - Add a much cleaner fix for vga segfault (#494002) qemu-fix-display-breakage.patch: Index: qemu-fix-display-breakage.patch =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-fix-display-breakage.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qemu-fix-display-breakage.patch 3 Apr 2009 17:09:43 -0000 1.1 +++ qemu-fix-display-breakage.patch 9 Apr 2009 15:08:34 -0000 1.2 @@ -1,543 +1,35 @@ -From 8ad63a93a482d5c3354b97463633394456a157d5 Mon Sep 17 00:00:00 2001 -From: Avi Kivity -Date: Thu, 2 Apr 2009 22:17:50 +0300 -Subject: [PATCH 1/1] kvm: qemu: Fix display breakage when resizing the screen +From 9d1b494a2d5dd2c129994edcf4eb7630bb554964 Mon Sep 17 00:00:00 2001 +From: aliguori +Date: Tue, 7 Apr 2009 20:55:58 +0000 +Subject: [PATCH 1/1] Fix crash on resolution change -> screen dump -> vga redraw (Avi Kivity) -When the vga resolution changes, a new display surface is not allocated -immediately; instead that is deferred until the next update. However, -if we're running without a display client attached, that won't happen -and the next bitblt is likely to cause a segfault by overflowing the -display surface. +The vga screen dump function updates last_width and last_height, +but does not change the DisplaySurface that these variables describe. +A consequent vga_draw_graphic() will therefore fail to resize the +surface and crash. -Fix by reallocating the display immediately when the resolution changes. +Fix by invalidating the display state after a screen dump, forcing +vga_draw_graphic() to reallocate the DisplaySurface. Signed-off-by: Avi Kivity +Signed-off-by: Anthony Liguori + + +git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk at 7026 c046a42c-6fe2-441c-8c8c-71466251a162 --- - qemu/hw/cirrus_vga.c | 10 ++- - qemu/hw/vga.c | 205 +++++++++++++++++++++++++++++-------------------- - qemu/hw/vga_int.h | 4 + - 3 files changed, 134 insertions(+), 85 deletions(-) + qemu/hw/vga.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) -diff --git a/qemu/hw/cirrus_vga.c b/qemu/hw/cirrus_vga.c -index 0ab0f14..7bd0482 100644 ---- a/qemu/hw/cirrus_vga.c -+++ b/qemu/hw/cirrus_vga.c -@@ -1399,6 +1399,8 @@ cirrus_hook_write_sr(CirrusVGAState * s, unsigned reg_index, int reg_value) - break; - } - -+ vga_update_resolution((VGAState *)s); -+ - return CIRRUS_HOOK_HANDLED; - } - -@@ -1426,6 +1428,7 @@ static void cirrus_write_hidden_dac(CirrusVGAState * s, int reg_value) - #endif - } - s->cirrus_hidden_dac_lockindex = 0; -+ vga_update_resolution((VGAState *)s); - } - - /*************************************** -@@ -1712,6 +1715,8 @@ cirrus_hook_write_cr(CirrusVGAState * s, unsigned reg_index, int reg_value) - break; - } - -+ vga_update_resolution((VGAState *)s); -+ - return CIRRUS_HOOK_HANDLED; - } - -@@ -2839,6 +2844,7 @@ static void vga_ioport_write(void *opaque, uint32_t addr, uint32_t val) - if (s->ar_flip_flop == 0) { - val &= 0x3f; - s->ar_index = val; -+ vga_update_resolution((VGAState *)s); - } else { - index = s->ar_index & 0x1f; - switch (index) { -@@ -2932,6 +2938,7 @@ static void vga_ioport_write(void *opaque, uint32_t addr, uint32_t val) - /* can always write bit 4 of CR7 */ - if (s->cr_index == 7) - s->cr[7] = (s->cr[7] & ~0x10) | (val & 0x10); -+ vga_update_resolution((VGAState *)s); - return; - } - switch (s->cr_index) { -@@ -3166,7 +3173,8 @@ static int cirrus_vga_load(QEMUFile *f, void *opaque, int version_id) - - cirrus_update_memory_access(s); - /* force refresh */ -- s->graphic_mode = -1; -+ vga_update_resolution((VGAState *)s); -+ s->want_full_update = 1; - cirrus_update_bank_ptr(s, 0); - cirrus_update_bank_ptr(s, 1); - return 0; diff --git a/qemu/hw/vga.c b/qemu/hw/vga.c -index d4fddf9..9a950d3 100644 +index b1e4373..4d1049b 100644 --- a/qemu/hw/vga.c +++ b/qemu/hw/vga.c -@@ -37,6 +37,10 @@ - - //#define DEBUG_BOCHS_VBE - -+#define GMODE_TEXT 0 -+#define GMODE_GRAPH 1 -+#define GMODE_BLANK 2 -+ - /* force some bits to zero */ - const uint8_t sr_mask[8] = { - (uint8_t)~0xfc, -@@ -394,6 +398,7 @@ static void vga_ioport_write(void *opaque, uint32_t addr, uint32_t val) - if (s->ar_flip_flop == 0) { - val &= 0x3f; - s->ar_index = val; -+ vga_update_resolution(s); - } else { - index = s->ar_index & 0x1f; - switch(index) { -@@ -434,6 +439,7 @@ static void vga_ioport_write(void *opaque, uint32_t addr, uint32_t val) - #endif - s->sr[s->sr_index] = val & sr_mask[s->sr_index]; - if (s->sr_index == 1) s->update_retrace_info(s); -+ vga_update_resolution(s); - break; - case 0x3c7: - s->dac_read_index = val; -@@ -461,6 +467,7 @@ static void vga_ioport_write(void *opaque, uint32_t addr, uint32_t val) - printf("vga: write GR%x = 0x%02x\n", s->gr_index, val); - #endif - s->gr[s->gr_index] = val & gr_mask[s->gr_index]; -+ vga_update_resolution(s); - break; - case 0x3b4: - case 0x3d4: -@@ -476,6 +483,7 @@ static void vga_ioport_write(void *opaque, uint32_t addr, uint32_t val) - /* can always write bit 4 of CR7 */ - if (s->cr_index == 7) - s->cr[7] = (s->cr[7] & ~0x10) | (val & 0x10); -+ vga_update_resolution(s); - return; - } - switch(s->cr_index) { -@@ -503,6 +511,7 @@ static void vga_ioport_write(void *opaque, uint32_t addr, uint32_t val) - s->update_retrace_info(s); - break; - } -+ vga_update_resolution(s); - break; - case 0x3ba: - case 0x3da: -@@ -582,11 +591,13 @@ static void vbe_ioport_write_data(void *opaque, uint32_t addr, uint32_t val) - if ((val <= VBE_DISPI_MAX_XRES) && ((val & 7) == 0)) { - s->vbe_regs[s->vbe_index] = val; - } -+ vga_update_resolution(s); - break; - case VBE_DISPI_INDEX_YRES: - if (val <= VBE_DISPI_MAX_YRES) { - s->vbe_regs[s->vbe_index] = val; - } -+ vga_update_resolution(s); - break; - case VBE_DISPI_INDEX_BPP: - if (val == 0) -@@ -595,6 +606,7 @@ static void vbe_ioport_write_data(void *opaque, uint32_t addr, uint32_t val) - val == 16 || val == 24 || val == 32) { - s->vbe_regs[s->vbe_index] = val; - } -+ vga_update_resolution(s); - break; - case VBE_DISPI_INDEX_BANK: - if (s->vbe_regs[VBE_DISPI_INDEX_BPP] == 4) { -@@ -663,6 +675,7 @@ static void vbe_ioport_write_data(void *opaque, uint32_t addr, uint32_t val) - } - s->dac_8bit = (val & VBE_DISPI_8BIT_DAC) > 0; - s->vbe_regs[s->vbe_index] = val; -+ vga_update_resolution(s); - break; - case VBE_DISPI_INDEX_VIRT_WIDTH: - { -@@ -683,6 +696,7 @@ static void vbe_ioport_write_data(void *opaque, uint32_t addr, uint32_t val) - s->vbe_regs[VBE_DISPI_INDEX_VIRT_HEIGHT] = h; - s->vbe_line_offset = line_offset; - } -+ vga_update_resolution(s); - break; - case VBE_DISPI_INDEX_X_OFFSET: - case VBE_DISPI_INDEX_Y_OFFSET: -@@ -697,6 +711,7 @@ static void vbe_ioport_write_data(void *opaque, uint32_t addr, uint32_t val) - s->vbe_start_addr += x * ((s->vbe_regs[VBE_DISPI_INDEX_BPP] + 7) >> 3); - s->vbe_start_addr >>= 2; - } -+ vga_update_resolution(s); - break; - default: - break; -@@ -1300,7 +1315,6 @@ static void vga_draw_text(VGAState *s, int full_update) - s->plane_updated = 0; - full_update = 1; - } -- full_update |= update_basic_params(s); - - line_offset = s->line_offset; - s1 = s->vram_ptr + (s->start_addr * 4); -@@ -1312,18 +1326,6 @@ static void vga_draw_text(VGAState *s, int full_update) - return; - } - -- if (width != s->last_width || height != s->last_height || -- cw != s->last_cw || cheight != s->last_ch || s->last_depth) { -- s->last_scr_width = width * cw; -- s->last_scr_height = height * cheight; -- qemu_console_resize(s->ds, s->last_scr_width, s->last_scr_height); -- s->last_depth = 0; -- s->last_width = width; -- s->last_height = height; -- s->last_ch = cheight; -- s->last_cw = cw; -- full_update = 1; -- } - s->rgb_to_pixel = - rgb_to_pixel_dup_table[get_depth_index(s->ds)]; - full_update |= update_palette16(s); -@@ -1580,40 +1582,20 @@ static void vga_sync_dirty_bitmap(VGAState *s) - vga_dirty_log_start(s); - } - --/* -- * graphic modes -- */ --static void vga_draw_graphic(VGAState *s, int full_update) -+static void vga_update_resolution_graphics(VGAState *s) - { -- int y1, y, update, linesize, y_start, double_scan, mask, depth; -- int width, height, shift_control, line_offset, bwidth, bits; -+ int depth = s->get_bpp(s); -+ int width, height, shift_control, double_scan; - int disp_width, multi_scan, multi_run; -- uint8_t *d; -- uint32_t v, addr1, addr; -- long page0, page1, page_min, page_max; -- vga_draw_line_func *vga_draw_line; -- -- full_update |= update_basic_params(s); -- -- if (!full_update) -- vga_sync_dirty_bitmap(s); - - s->get_resolution(s, &width, &height); -- disp_width = width; - - shift_control = (s->gr[0x05] >> 5) & 3; - double_scan = (s->cr[0x09] >> 7); -- if (shift_control != 1) { -- multi_scan = (((s->cr[0x09] & 0x1f) + 1) << double_scan) - 1; -- } else { -- /* in CGA modes, multi_scan is ignored */ -- /* XXX: is it correct ? */ -- multi_scan = double_scan; -- } -- multi_run = multi_scan; -+ - if (shift_control != s->shift_control || - double_scan != s->double_scan) { -- full_update = 1; -+ s->want_full_update = 1; - s->shift_control = shift_control; - s->double_scan = double_scan; - } -@@ -1627,12 +1609,25 @@ static void vga_draw_graphic(VGAState *s, int full_update) - disp_width <<= 1; - } - } -+ disp_width = width; -+ -+ if (shift_control != 1) { -+ multi_scan = (((s->cr[0x09] & 0x1f) + 1) << double_scan) - 1; -+ } else { -+ /* in CGA modes, multi_scan is ignored */ -+ /* XXX: is it correct ? */ -+ multi_scan = double_scan; -+ } -+ -+ multi_run = multi_scan; - -- depth = s->get_bpp(s); - if (s->line_offset != s->last_line_offset || - disp_width != s->last_width || - height != s->last_height || -- s->last_depth != depth) { -+ s->last_depth != depth || -+ s->multi_run != multi_run || -+ s->multi_scan != multi_scan || -+ s->want_full_update) { - #if defined(WORDS_BIGENDIAN) == defined(TARGET_WORDS_BIGENDIAN) - if (depth == 16 || depth == 32) { - #else -@@ -1659,8 +1654,74 @@ static void vga_draw_graphic(VGAState *s, int full_update) - s->last_height = height; - s->last_line_offset = s->line_offset; - s->last_depth = depth; -- full_update = 1; -- } else if (is_graphic_console() && is_buffer_shared(s->ds->surface) && -+ s->multi_run = multi_run; -+ s->multi_scan = multi_scan; -+ s->want_full_update = 1; -+ } -+} -+ -+static void vga_update_resolution_text(VGAState *s) -+{ -+ int width, height, cw, cheight; -+ -+ vga_get_text_resolution(s, &width, &height, &cw, &cheight); -+ if (width != s->last_width || height != s->last_height || -+ cw != s->last_cw || cheight != s->last_ch || s->last_depth) { -+ s->last_scr_width = width * cw; -+ s->last_scr_height = height * cheight; -+ qemu_console_resize(s->ds, s->last_scr_width, s->last_scr_height); -+ s->last_depth = 0; -+ s->last_width = width; -+ s->last_height = height; -+ s->last_ch = cheight; -+ s->last_cw = cw; -+ s->want_full_update = 1; -+ } -+} -+ -+void vga_update_resolution(VGAState *s) -+{ -+ int graphic_mode; -+ -+ if (!(s->ar_index & 0x20)) { -+ graphic_mode = GMODE_BLANK; -+ } else { -+ graphic_mode = s->gr[6] & 1; -+ } -+ if (graphic_mode != s->graphic_mode) { -+ s->graphic_mode = graphic_mode; -+ s->want_full_update = 1; -+ } -+ s->want_full_update |= update_basic_params(s); -+ switch (graphic_mode) { -+ case GMODE_TEXT: -+ vga_update_resolution_text(s); -+ break; -+ case GMODE_GRAPH: -+ vga_update_resolution_graphics(s); -+ break; -+ } -+} -+ -+/* -+ * graphic modes -+ */ -+static void vga_draw_graphic(VGAState *s, int full_update) -+{ -+ int y1, y, update, linesize, y_start, mask; -+ int width, height, line_offset, bwidth, bits; -+ int multi_run; -+ uint8_t *d; -+ uint32_t v, addr1, addr; -+ long page0, page1, page_min, page_max; -+ vga_draw_line_func *vga_draw_line; -+ -+ if (!full_update) -+ vga_sync_dirty_bitmap(s); -+ -+ s->get_resolution(s, &width, &height); -+ multi_run = s->multi_run; -+ if (is_graphic_console() && is_buffer_shared(s->ds->surface) && - (full_update || s->ds->surface->data != s->vram_ptr + (s->start_addr * 4))) { - s->ds->surface->data = s->vram_ptr + (s->start_addr * 4); - dpy_setdata(s->ds); -@@ -1669,7 +1730,7 @@ static void vga_draw_graphic(VGAState *s, int full_update) - s->rgb_to_pixel = - rgb_to_pixel_dup_table[get_depth_index(s->ds)]; - -- if (shift_control == 0) { -+ if (s->shift_control == 0) { - full_update |= update_palette16(s); - if (s->sr[0x01] & 8) { - v = VGA_DRAW_LINE4D2; -@@ -1677,7 +1738,7 @@ static void vga_draw_graphic(VGAState *s, int full_update) - v = VGA_DRAW_LINE4; - } - bits = 4; -- } else if (shift_control == 1) { -+ } else if (s->shift_control == 1) { - full_update |= update_palette16(s); - if (s->sr[0x01] & 8) { - v = VGA_DRAW_LINE2D2; -@@ -1773,7 +1834,7 @@ static void vga_draw_graphic(VGAState *s, int full_update) - if (y_start >= 0) { - /* flush to display */ - dpy_update(s->ds, 0, y_start, -- disp_width, y - y_start); -+ s->last_width, y - y_start); - y_start = -1; - } - } -@@ -1782,7 +1843,7 @@ static void vga_draw_graphic(VGAState *s, int full_update) - if ((y1 & mask) == mask) - addr1 += line_offset; - y1++; -- multi_run = multi_scan; -+ multi_run = s->multi_scan; - } else { - multi_run--; - } -@@ -1794,7 +1855,7 @@ static void vga_draw_graphic(VGAState *s, int full_update) - if (y_start >= 0) { - /* flush to display */ - dpy_update(s->ds, 0, y_start, -- disp_width, y - y_start); -+ s->last_width, y - y_start); - } - /* reset modified pages */ - if (page_max != -1) { -@@ -1831,29 +1892,17 @@ static void vga_draw_blank(VGAState *s, int full_update) - s->last_scr_width, s->last_scr_height); - } - --#define GMODE_TEXT 0 --#define GMODE_GRAPH 1 --#define GMODE_BLANK 2 -- - static void vga_update_display(void *opaque) - { - VGAState *s = (VGAState *)opaque; -- int full_update, graphic_mode; -+ int full_update; - - if (ds_get_bits_per_pixel(s->ds) == 0) { - /* nothing to do */ - } else { -- full_update = 0; -- if (!(s->ar_index & 0x20)) { -- graphic_mode = GMODE_BLANK; -- } else { -- graphic_mode = s->gr[6] & 1; -- } -- if (graphic_mode != s->graphic_mode) { -- s->graphic_mode = graphic_mode; -- full_update = 1; -- } -- switch(graphic_mode) { -+ full_update = s->want_full_update; -+ s->want_full_update = 0; -+ switch(s->graphic_mode) { - case GMODE_TEXT: - vga_draw_text(s, full_update); - break; -@@ -1876,8 +1925,8 @@ static void vga_invalidate_display(void *opaque) - { - VGAState *s = (VGAState *)opaque; - -- s->last_width = -1; -- s->last_height = -1; -+ vga_update_resolution(s); -+ s->want_full_update = 1; - } - - void vga_reset(void *opaque) -@@ -1921,7 +1970,6 @@ void vga_reset(void *opaque) - s->vbe_bank_mask = (s->vram_size >> 16) - 1; - #endif - memset(s->font_offsets, '\0', sizeof(s->font_offsets)); -- s->graphic_mode = -1; /* force full update */ - s->shift_control = 0; - s->double_scan = 0; - s->line_offset = 0; -@@ -1947,6 +1995,7 @@ void vga_reset(void *opaque) - memset(&s->retrace_info, 0, sizeof (s->retrace_info)); - break; - } -+ vga_update_resolution(s); - } - - #define TEXTMODE_X(x) ((x) % width) -@@ -1965,24 +2014,9 @@ static void vga_update_text(void *opaque, console_ch_t *chardata) - char msg_buffer[80]; - int full_update = 0; - -- if (!(s->ar_index & 0x20)) { -- graphic_mode = GMODE_BLANK; -- } else { -- graphic_mode = s->gr[6] & 1; -- } -- if (graphic_mode != s->graphic_mode) { -- s->graphic_mode = graphic_mode; -- full_update = 1; -- } -- if (s->last_width == -1) { -- s->last_width = 0; -- full_update = 1; -- } -- - switch (graphic_mode) { - case GMODE_TEXT: - /* TODO: update palette */ -- full_update |= update_basic_params(s); - - /* total width & height */ - cheight = (s->cr[9] & 0x1f) + 1; -@@ -2224,7 +2258,8 @@ static int vga_load(QEMUFile *f, void *opaque, int version_id) - #endif - - /* force refresh */ -- s->graphic_mode = -1; -+ vga_update_resolution(s); -+ s->want_full_update = 1; - return 0; - } - -@@ -2418,7 +2453,8 @@ void vga_bios_init(VGAState *s) - memcpy(s->palette, palette_model, 192); - - s->bank_offset = 0; -- s->graphic_mode = -1; -+ vga_update_resolution(s); -+ s->want_full_update = 1; - - /* TODO: add vbe support if enabled */ +@@ -2678,4 +2678,5 @@ static void vga_screen_dump(void *opaque, const char *filename) + vga_screen_dump_graphic(s, filename); + else + vga_screen_dump_text(s, filename); ++ vga_invalidate_display(s); } -@@ -2803,7 +2839,8 @@ static void vga_screen_dump_common(VGAState *s, const char *filename, - ds->surface = qemu_create_displaysurface(w, h, 32, 4 * w); - - s->ds = ds; -- s->graphic_mode = -1; -+ vga_update_resolution(s); -+ s->want_full_update = 1; - vga_update_display(s); - - ppm_save(filename, ds->surface); -diff --git a/qemu/hw/vga_int.h b/qemu/hw/vga_int.h -index 8ba8a60..71ffeb5 100644 ---- a/qemu/hw/vga_int.h -+++ b/qemu/hw/vga_int.h -@@ -147,8 +147,11 @@ typedef void (* vga_update_retrace_info_fn)(struct VGAState *s); - DisplayState *ds; \ - uint32_t font_offsets[2]; \ - int graphic_mode; \ -+ int want_full_update; \ - uint8_t shift_control; \ - uint8_t double_scan; \ -+ uint8_t multi_run; \ -+ uint8_t multi_scan; \ - uint32_t line_offset; \ - uint32_t line_compare; \ - uint32_t start_addr; \ -@@ -195,6 +198,7 @@ void vga_common_init(VGAState *s, uint8_t *vga_ram_base, - ram_addr_t vga_ram_offset, int vga_ram_size); - void vga_init(VGAState *s); - void vga_reset(void *s); -+void vga_update_resolution(VGAState *s); - - void vga_dirty_log_start(VGAState *s); - void vga_dirty_log_stop(VGAState *s); -- 1.6.0.6 Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- qemu.spec 5 Apr 2009 18:23:20 -0000 1.76 +++ qemu.spec 9 Apr 2009 15:08:34 -0000 1.77 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.10 -Release: 6%{?dist} +Release: 7%{?dist} # I have mistakenly thought the revision name would be 1.0. # So 0.10 series get Epoch = 1 Epoch: 2 @@ -457,6 +457,9 @@ %{_mandir}/man1/qemu-img.1* %changelog +* Thu Apr 9 2009 Mark McLoughlin - 2:0.10-7 +- Add a much cleaner fix for vga segfault (#494002) + * Sun Apr 5 2009 Glauber Costa - 2:0.10-6 - Fixed qcow2 segfault creating disks over 2TB. #491943 From crobinso at fedoraproject.org Thu Apr 9 15:12:25 2009 From: crobinso at fedoraproject.org (Cole Robinson) Date: Thu, 9 Apr 2009 15:12:25 +0000 (UTC) Subject: [fedora-virt-maint] rpms/python-virtinst/devel virtinst-0.400.3-fix-floppy-dev.patch, NONE, 1.1 virtinst-0.400.3-no-default-keymap.patch, NONE, 1.1 virtinst-0.400.3-updated-trans.patch, NONE, 1.1 python-virtinst.spec, 1.63, 1.64 virtinst-0.400.3-selinux-context.patch, 1.2, 1.3 Message-ID: <20090409151225.CA13D7001C@cvs1.fedora.phx.redhat.com> Author: crobinso Update of /cvs/pkgs/rpms/python-virtinst/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8069 Modified Files: python-virtinst.spec virtinst-0.400.3-selinux-context.patch Added Files: virtinst-0.400.3-fix-floppy-dev.patch virtinst-0.400.3-no-default-keymap.patch virtinst-0.400.3-updated-trans.patch Log Message: Don't set a keymap if user doesn't specify one (bz 487737) Fix adding floppy devices (bz 493408) Updated translations (bz 493944, bz 494358) virtinst-0.400.3-fix-floppy-dev.patch: --- NEW FILE virtinst-0.400.3-fix-floppy-dev.patch --- # HG changeset patch # User Cole Robinson # Date 1237498550 14400 # Node ID fd4baa6410d841f137ea89290c1a8da33c00c3c9 # Parent a55347f926f5cfdcfd9b5234b945ec279190c513 Fix specifying --disk device=floppy diff -r a55347f926f5 -r fd4baa6410d8 virtinst/FullVirtGuest.py --- a/virtinst/FullVirtGuest.py Thu Mar 19 17:35:27 2009 -0400 +++ b/virtinst/FullVirtGuest.py Thu Mar 19 17:35:50 2009 -0400 @@ -113,7 +113,10 @@ used_targets = [] for disk in self._install_disks: if not disk.bus: - disk.bus = "ide" + if disk.device == disk.DEVICE_FLOPPY: + disk.bus = "fdc" + else: + disk.bus = "ide" used_targets.append(disk.generate_target(used_targets)) for d in self._install_disks: diff -r a55347f926f5 -r fd4baa6410d8 virtinst/VirtualDisk.py --- a/virtinst/VirtualDisk.py Thu Mar 19 17:35:27 2009 -0400 +++ b/virtinst/VirtualDisk.py Thu Mar 19 17:35:50 2009 -0400 @@ -813,10 +813,10 @@ return ("sd", 16) elif self.bus == "xen": return ("xvd", 16) + elif self.bus == "fdc" or self.device == self.DEVICE_FLOPPY: + return ("fd", 2) elif self.bus == "ide": return ("hd", 4) - elif self.bus == "floppy" or self.device == self.DEVICE_FLOPPY: - return ("fd", 2) else: return (None, None) virtinst-0.400.3-no-default-keymap.patch: --- NEW FILE virtinst-0.400.3-no-default-keymap.patch --- diff -r 712276328f75 virtinst/VirtualGraphics.py --- a/virtinst/VirtualGraphics.py Wed Apr 08 10:27:20 2009 -0400 +++ b/virtinst/VirtualGraphics.py Thu Apr 09 09:48:36 2009 -0400 @@ -55,8 +55,9 @@ def get_keymap(self): return self._keymap def set_keymap(self, val): - if not val: - val = _util.default_keymap() + if val == None: + self._keymap = val + return if not val or type(val) != type("string"): raise ValueError, _("Keymap must be a string") if len(val) > 16: virtinst-0.400.3-updated-trans.patch: --- NEW FILE virtinst-0.400.3-updated-trans.patch --- diff -rup virtinst-0.400.3/po/es.po new/po/es.po --- virtinst-0.400.3/po/es.po 2009-04-09 10:38:31.403059000 -0400 +++ new/po/es.po 2009-04-09 10:38:56.365058000 -0400 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Fedora Spanish Translation of virtinst\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-10 14:00-0400\n" +"POT-Creation-Date: 2009-04-09 10:38-0400\n" "PO-Revision-Date: 2009-01-20 13:06-0300\n" "Last-Translator: h??ctor daniel cabrera \n" "Language-Team: Fedora Spanish \n" @@ -15,1419 +15,2136 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: virt-clone:45 -msgid "What is the name for the cloned virtual machine?" -msgstr "??Cu??l es el nombre de la m??quina virtual clonada?" +#: virtinst/CapabilitiesParser.py:172 +#, fuzzy, python-format +msgid "No domains available for virt type '%(type)s', arch %(arch)s." +msgstr "No existen dominios disponibles para este hu??sped." -#: virt-clone:50 -#: virt-clone:60 -#: virt-clone:89 -#: virtinst/cli.py:175 -msgid "ERROR: " -msgstr "ERROR:" +#: virtinst/CapabilitiesParser.py:412 +#, python-format +msgid "for arch '%s'" +msgstr "para arq '%s'" -#: virt-clone:55 -msgid "What is the name or uuid of the original virtual machine?" -msgstr "??Cu??l es el nombre o el uuid de la m??quina virtual original?" +#: virtinst/CapabilitiesParser.py:416 +#, fuzzy, python-format +msgid "virtualization type '%s'" +msgstr "Tipo de virtualizaci??n '%s' no soportada" -#: virt-clone:83 -msgid "What would you like to use as the cloned disk (file path)?" -msgstr "??Qu?? (ruta de archivo) le gustar??a utilizar para el disco clonado?" +#: virtinst/CapabilitiesParser.py:418 +#, fuzzy +msgid "any virtualization options" +msgstr "Opciones del Tipo de Virtualizaci??n" -#: virt-clone:94 +#: virtinst/CapabilitiesParser.py:420 #, python-format -msgid "This will overwrite the existing path '%s'!\n" -msgstr "Esto sobrescribir?? las rutas existentes '%s'!\n" - -#: virt-clone:96 -msgid "Do you really want to use this disk (yes or no)?" -msgstr "??Realmente quiere utilizar este disco (si o no)?" +msgid "Host does not support %(virttype)s %(arch)s" +msgstr "" -#: virt-clone:102 -#: virt-install:202 +#: virtinst/CapabilitiesParser.py:433 #, python-format -msgid "Disk %s is already in use by another guest!\n" -msgstr "??El disco %s ya est?? siendo utilizado por otro hu??sped!\n" +msgid "" +"Host does not support domain type '%(domain)s' for virtualization type '%" +"(virttype)s' arch '%(arch)s'" +msgstr "" -#: virt-clone:103 -#: virt-install:203 -msgid "Do you really want to use the disk (yes or no)? " -msgstr "??Realmente quiere utilizar el disco (si o no)?" +#: virtinst/cli.py:117 +msgid "Exiting at user request." +msgstr "Saliendo a pedido del usuario." -#: virt-clone:132 -msgid "Name or uuid for the original guest; The status must be shut off" -msgstr "Nombre o uuid del hu??sped original; el status debe ser apagado" +#: virtinst/cli.py:122 +msgid "Must be root to create Xen guests" +msgstr "Debe ser root para poder crear un hu??sped Xen" -#: virt-clone:136 -msgid "Name for the new guest" -msgstr "Nombre para el nuevo hu??sped" +#: virtinst/cli.py:124 +msgid "Could not find usable default libvirt connection." +msgstr "" +"No se ha podido encontrar una conexi??n por defecto libvirt que sea " +"utilizable. " -#: virt-clone:141 -msgid "New UUID for the clone guest; Default is a randomly generated UUID" -msgstr "Nuevo UUID para el hu??sped clonado; por defecto se genera en forma aleatoria una UUID" +#: virtinst/cli.py:146 +#, python-format +msgid "Force flag is set but input was required. Prompt was: %s" +msgstr "" +"Se ha establecido una se??al forzada, pero se necesita una entrada. Se pide: %" +"s " -#: virt-clone:146 -msgid "New fixed MAC address for the clone guest. Default is a randomly generated MAC" -msgstr "Nueva direcci??n MAC adecuada para el hu??sped clonado. Por defecto se genera en forma aleatoria una MAC " +#: virtinst/cli.py:149 +#, python-format +msgid "Prompting disabled, but input was requested. Prompt was: %s" +msgstr "" +"Las peticiones est??n deshabilitadas, pero se solicita una entrada. Se pide: %" +"s " -#: virt-clone:151 -msgid "New file to use as the disk image for the new guest" -msgstr "Nuevo archivo para ser usado como imagen de disco para el nuevo hu??sped" +#: virtinst/cli.py:169 +#, python-format +msgid "" +"Prompting disabled, but yes/no was requested. Try --force to force 'yes' for " +"such prompts. Prompt was: %s" +msgstr "" +"Las peticiones est??n deshabilitadas, pero se ha solicitado un si/no. Intente " +"--force para forzar un \"si\" para este tipo de peticiones. Se pide: %s" -#: virt-clone:155 -#: virt-image:128 -#: virt-install:317 -msgid "Connect to hypervisor with URI" -msgstr "Conectar al hipervisor con URI" +#: virtinst/cli.py:179 virt-clone:48 virt-clone:69 virt-clone:108 +msgid "ERROR: " +msgstr "ERROR:" -#: virt-clone:161 -msgid "Force to copy devices (eg, if 'hdc' is a readonly cdrom device, --force-copy=hdc)" -msgstr "Copiando dispositivos de manera forzada (por ejemplo, si \"hdc\" es un dispositivo cdrom s??lo de lectura, --force-copy=hdc)" +#: virtinst/cli.py:189 +msgid "A name is required for the virtual machine." +msgstr "Se requiere un nombre para la m??quina virtual." -#: virt-clone:166 -msgid "Do not use a sparse file for the clone's disk image" -msgstr "No utilice un archivo separado para la imagen del disco de lo clonado" +#: virtinst/cli.py:197 +msgid "Memory amount is required for the virtual machine." +msgstr "Se requiere una cantidad de memoria para la m??quina virtual." -#: virt-clone:171 -msgid "Preserve a new file to use as the disk image for the new guest" -msgstr "Preserve un archivo nuevo para utilizarlo como la imagen del disco del nuevo hu??sped " +#: virtinst/cli.py:199 +#, python-format +msgid "Installs currently require %d megs of RAM." +msgstr "La instalaci??n actualmente requiere %d megas de RAM." -#: virt-clone:175 -#: virt-image:137 -#: virt-install:447 -#: virt-pack:109 -msgid "Print debugging information" -msgstr "Mostrar informaci??n de depuraci??n" +#: virtinst/cli.py:219 +#, python-format +msgid "" +"You have asked for more virtual CPUs (%d) than there are physical CPUs (%d) " +"on the host. This will work, but performance will be poor. Are you sure? " +"(yes or no)" +msgstr "" +"Ha pedido m??s CPUs virtuales (%d) que los CPUs f??sicos (%d) en el anfitri??n. " +"Esto podr??a funcionar, pero el desempe??o ser?? pobre. ??Esta seguro? (si o no)" -#: virt-clone:177 -#: virt-image:143 -msgid "Do not prompt for input. Answers yes where applicable, terminates for all other prompts" -msgstr "No solicite entrada. Una respuesta positiva, cuando se aplique, finaliza cualquier otra entrada" +#: virtinst/cli.py:276 +msgid "Unknown network type " +msgstr "Tipo de red desconocido" -#: virt-clone:194 -msgid "Must be root to clone Xen guests" -msgstr "Debe ser root para poder clonar hu??spedes Xen" +#: virtinst/cli.py:293 +msgid "Cannot mix both --bridge and --network arguments" +msgstr "No se pueden mezclar los argumentos de --bridge y de --network" -#: virt-clone:229 -#: virt-image:242 -#: virt-install:697 -msgid "Installation aborted at user request" -msgstr "Instalaci??n abortada a pedido del usuario" +#: virtinst/cli.py:310 +msgid "Need to pass equal numbers of networks & mac addresses" [...14182 lines suppressed...] "\n" @@ -1868,7 +1834,7 @@ msgstr "" "\n" "????????????......" -#: virt-install:682 virt-install.orig:682 +#: virt-install:682 #, python-format msgid "" "Domain installation does not appear to have been\n" @@ -1881,7 +1847,7 @@ msgstr "" "??????????????????????????????\n" "??????????????????" -#: virt-install:693 virt-install.orig:693 +#: virt-install:693 #, python-format msgid "" "Guest installation complete... you can restart your domain\n" @@ -1890,16 +1856,15 @@ msgstr "" "?????????????????????......???????????????\n" " 'virsh start %s' ???????????????" -#: virt-install:697 virt-install.orig:697 +#: virt-install:697 msgid "Guest installation complete... restarting guest." msgstr "?????????????????????......???????????????" -#: virt-install:703 virt-install.orig:703 -#, fuzzy +#: virt-install:703 msgid "Guest install interrupted." -msgstr "?????????????????????" +msgstr "?????????????????????" -#: virt-install:710 virt-install.orig:710 +#: virt-install:710 #, python-format msgid "" "Domain installation may not have been\n" @@ -1912,144 +1877,39 @@ msgstr "" "??????????????????????????????\n" "??????????????????" -#: virt-install:736 virt-install.orig:736 -#, fuzzy +#: virt-install:736 msgid "Guest installation failed." -msgstr "?????????????????????" +msgstr "?????????????????????" -#: virt-install:746 virt-install.orig:746 -#, fuzzy, python-format +#: virt-install:746 +#, python-format msgid "%d minutes " -msgstr " %d ??????" +msgstr "%d ??????" -#: virt-install:748 virt-install.orig:748 -#, fuzzy, python-format +#: virt-install:748 +#, python-format msgid "" "Domain installation still in progress. Waiting %sfor domain to complete " "installation." -msgstr "" -"?????????????????????????????????????????????\n" -"???????????????????????????????????????" +msgstr "????????????????????????????????? %s ??????????????????" -#: virt-install:754 virt-install.orig:754 +#: virt-install:754 msgid "Domain has shutdown. Continuing." msgstr "???????????????????????????......" -#: virt-install:761 virt-install.orig:761 -#, fuzzy, python-format +#: virt-install:761 +#, python-format msgid "Could not lookup domain after install: %s" -msgstr "????????????????????????%s" +msgstr "???????????????????????????%s" -#: virt-install:768 virt-install.orig:768 -#, fuzzy +#: virt-install:768 msgid "Installation has exceeded specified time limit. Exiting application." -msgstr "??????????????????????????????????????????????????????" +msgstr "?????????????????????????????????????????????????????????" -#: virt-install:772 virt-install.orig:772 +#: virt-install:772 msgid "" "Domain installation still in progress. You can reconnect to \n" "the console to complete the installation process." msgstr "" "?????????????????????????????????????????????\n" "???????????????????????????????????????" - -#~ msgid "Name or UUID of guest to clone is required" -#~ msgstr "?????????????????????????????????????????? UUID" - -#~ msgid "A valid name or UUID of guest to clone is required" -#~ msgstr "???????????????????????????????????????????????? UUID" - -#~ msgid "New file to use for disk image is required" -#~ msgstr "????????????????????????????????????" - -#~ msgid "Domain status must be SHUTOFF" -#~ msgstr "?????????????????? SHUTOFF" - -#~ msgid "Domain %s already exists" -#~ msgstr "??? %s ?????????" - -#, fuzzy -#~ msgid "Cloning from %(src)s to %(dst)s..." -#~ msgstr "??? %(src)s ????????? %(dst)s" - -#~ msgid "Invalid file location given: " -#~ msgstr "??????????????????????????????" - -#, fuzzy -#~ msgid "Invalid file location given: %s: %s" -#~ msgstr "??????????????????????????????" - -#~ msgid "Connection does not support HVM virtualisation, cannot boot live CD" -#~ msgstr "??????????????? HVM ???????????????????????? live CD???" - -#~ msgid "Storage object name must be a string " -#~ msgstr "??????????????????????????????????????????" - -#~ msgid "Storage object name can not be only " -#~ msgstr "??????????????????????????????" - -#~ msgid "Storage object name can only contain " -#~ msgstr "??????????????????????????????" - -#~ msgid "'%s' is not managed on remote host: %s" -#~ msgstr "???????????????????????? '%s'???%s" - -#~ msgid "Cannot parse capabilities" -#~ msgstr "??????????????????" - -#~ msgid "Only one of --pxe, --location and --cdrom can be used" -#~ msgstr "???????????? --pxe???--location ??? --cdrom ??????" - -#~ msgid "location must be specified for paravirtualized guests." -#~ msgstr "??????????????????????????????????????????" - -#~ msgid "Domain installation still in progress. Waiting" -#~ msgstr "?????????????????????????????????" - -#~ msgid "" -#~ "UUID for the guest; if none is given a random UUID will be generated. If " -#~ "you specify UUID, you should use a 32-digit hexadecimal number." -#~ msgstr "" -#~ "???????????? UUID??????????????????????????????????????? UUID??????????????? UUID?????????????????? " -#~ "32 ????????????????????????" - -#~ msgid "" -#~ "Total time to wait for VM to shutdown if console not present. Time less " -#~ "than 0 waits indefinitely." -#~ msgstr "?????????????????????????????? VM ??????????????????????????????????????? 0 ?????????????????????" - -#~ msgid "The image name and version must be present" -#~ msgstr "??????????????????????????????" - -#~ msgid "Scratch disk %s does not have a size attribute" -#~ msgstr "????????? %s ??????????????????" - -#~ msgid "Disk file %s could not be found" -#~ msgstr "???????????????????????? %s" - -#~ msgid "Writing %s" -#~ msgstr "?????? %s" - -#~ msgid "Directory in which packaged file will be put" -#~ msgstr "???????????????????????????" - -#~ msgid "The image descriptor must contain name and version" -#~ msgstr "??????????????????????????????????????????" - -#~ msgid "Validation failed: %s" -#~ msgstr "???????????????%s" - -#~ msgid "Packaging failed: %s" -#~ msgstr "???????????????%s" - -#~ msgid "Cloning domain..." -#~ msgstr "?????????......" - -#~ msgid "NFS installations are only supported as root" -#~ msgstr "???????????????????????? NFS ??????" - -#~ msgid "Verifying install location..." -#~ msgstr "??????????????????......" - -#~ msgid "Unsupported virtualization type" -#~ msgstr "???????????????????????????" Index: python-virtinst.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-virtinst/devel/python-virtinst.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- python-virtinst.spec 3 Apr 2009 18:24:57 -0000 1.63 +++ python-virtinst.spec 9 Apr 2009 15:11:55 -0000 1.64 @@ -23,6 +23,12 @@ Patch2: %{appname}-%{version}-hostdev-libvirt-calls.patch Patch3: %{appname}-%{version}-spanish-trans.patch Patch4: %{appname}-%{version}-selinux-context.patch +# Rawhide/F11 can auto detect keymapping (bz 487735) +Patch5: %{appname}-%{version}-no-default-keymap.patch +# Fix generating device name for floppy device (bz 493408) +Patch6: %{appname}-%{version}-fix-floppy-dev.patch +# F11 Translations (bz 493944 and bz 494358) +Patch7: %{appname}-%{version}-updated-trans.patch License: GPLv2+ Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -37,6 +43,7 @@ Requires: urlgrabber Requires: libxml2-python Requires: python-urlgrabber +Requires: libselinux-python BuildRequires: gettext BuildRequires: python-devel @@ -52,6 +59,9 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 %build python setup.py build @@ -87,10 +97,15 @@ %{_bindir}/virt-convert %changelog -* Fri Apr 3 2009 Daniel P. Berrange - 0.400.4-fc11 +* Thu Apr 9 2009 Cole Robinson - 0.400.3-5.fc11 +- Don't set a keymap if user doesn't specify one (bz 487737) +- Fix adding floppy devices (bz 493408) +- Updated translations (bz 493944, bz 494358) + +* Fri Apr 3 2009 Daniel P. Berrange - 0.400.3-4.fc11 - Attempt to fix SELinux labelling on CDROM ISOs used for installation -* Fri Apr 3 2009 Daniel P. Berrange - 0.400.3-fc11 +* Fri Apr 3 2009 Daniel P. Berrange - 0.400.3-3.fc11 - Set SELinux context on $HOME/.virtinst to make kernel/initrd boot work (rhbz #491052) * Mon Mar 23 2009 Cole Robinson - 0.400.3-2.fc11 virtinst-0.400.3-selinux-context.patch: Index: virtinst-0.400.3-selinux-context.patch =================================================================== RCS file: /cvs/pkgs/rpms/python-virtinst/devel/virtinst-0.400.3-selinux-context.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- virtinst-0.400.3-selinux-context.patch 3 Apr 2009 18:24:57 -0000 1.2 +++ virtinst-0.400.3-selinux-context.patch 9 Apr 2009 15:11:55 -0000 1.3 @@ -32,11 +32,11 @@ + self.parseXML(node) + + def parseXML(self, node): -+ child = node.children -+ if child.name == "model": -+ self.model = child.content -+ elif cihld.name == "doi": -+ self.doi == child.content ++ for child in node.children or []: ++ if child.name == "model": ++ self.model = child.content ++ elif child.name == "doi": ++ self.doi = child.content + class Capabilities(object): def __init__(self, node = None): @@ -116,8 +116,8 @@ + if self.device != VirtualDisk.DEVICE_CDROM: + return + -+ caps = parseCapabilities(self.conn.getCapabilities()) -+ if caps.host.secmodel is None: ++ caps = self._caps ++ if not caps or caps.host.secmodel is None: + logging.info("No security model active") + return + if caps.host.secmodel.model != "selinux": @@ -134,7 +134,7 @@ + logging.info("Labelling is correct") + return + -+ if _util.is_uri_remote(self.conn.getURI()): ++ if self._is_remote(): + raise ValueError, _("Install volume %s has incorrect SELinux label %s, expecting %s" % + (self.path, label, wantLabel)) + else: @@ -147,7 +147,7 @@ + logging.info("Labelling is correct") + return + -+ if _util.is_remote_uri(self.conn.URI()): ++ if self._is_remote(): + raise ValueError, _("Install volume %s has incorrect SELinux label %s, expecting %s" % + (self.path, label, wantLabel)) + else: From crobinso at fedoraproject.org Thu Apr 9 15:14:29 2009 From: crobinso at fedoraproject.org (Cole Robinson) Date: Thu, 9 Apr 2009 15:14:29 +0000 (UTC) Subject: [fedora-virt-maint] rpms/python-virtinst/devel python-virtinst.spec, 1.64, 1.65 Message-ID: <20090409151429.12CDC7001C@cvs1.fedora.phx.redhat.com> Author: crobinso Update of /cvs/pkgs/rpms/python-virtinst/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8716 Modified Files: python-virtinst.spec Log Message: Bump spec Index: python-virtinst.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-virtinst/devel/python-virtinst.spec,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- python-virtinst.spec 9 Apr 2009 15:11:55 -0000 1.64 +++ python-virtinst.spec 9 Apr 2009 15:13:58 -0000 1.65 @@ -17,7 +17,7 @@ Summary: Python modules and utilities for installing virtual machines Name: python-%{appname} Version: 0.400.3 -Release: 4%{_extra_release} +Release: 5%{_extra_release} Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz Patch1: %{appname}-%{version}-fix-virtimage-scratch.patch Patch2: %{appname}-%{version}-hostdev-libvirt-calls.patch From crobinso at fedoraproject.org Thu Apr 9 15:45:47 2009 From: crobinso at fedoraproject.org (Cole Robinson) Date: Thu, 9 Apr 2009 15:45:47 +0000 (UTC) Subject: [fedora-virt-maint] rpms/python-virtinst/F-10 virtinst-0.400.3-fix-floppy-dev.patch, NONE, 1.1 virtinst-0.400.3-updated-trans.patch, NONE, 1.1 python-virtinst.spec, 1.54, 1.55 Message-ID: <20090409154547.DF1CC7001C@cvs1.fedora.phx.redhat.com> Author: crobinso Update of /cvs/pkgs/rpms/python-virtinst/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19136 Modified Files: python-virtinst.spec Added Files: virtinst-0.400.3-fix-floppy-dev.patch virtinst-0.400.3-updated-trans.patch Log Message: Fix adding floppy devices (bz 493408) Updated translations (bz 493944, bz 494358) virtinst-0.400.3-fix-floppy-dev.patch: --- NEW FILE virtinst-0.400.3-fix-floppy-dev.patch --- # HG changeset patch # User Cole Robinson # Date 1237498550 14400 # Node ID fd4baa6410d841f137ea89290c1a8da33c00c3c9 # Parent a55347f926f5cfdcfd9b5234b945ec279190c513 Fix specifying --disk device=floppy diff -r a55347f926f5 -r fd4baa6410d8 virtinst/FullVirtGuest.py --- a/virtinst/FullVirtGuest.py Thu Mar 19 17:35:27 2009 -0400 +++ b/virtinst/FullVirtGuest.py Thu Mar 19 17:35:50 2009 -0400 @@ -113,7 +113,10 @@ used_targets = [] for disk in self._install_disks: if not disk.bus: - disk.bus = "ide" + if disk.device == disk.DEVICE_FLOPPY: + disk.bus = "fdc" + else: + disk.bus = "ide" used_targets.append(disk.generate_target(used_targets)) for d in self._install_disks: diff -r a55347f926f5 -r fd4baa6410d8 virtinst/VirtualDisk.py --- a/virtinst/VirtualDisk.py Thu Mar 19 17:35:27 2009 -0400 +++ b/virtinst/VirtualDisk.py Thu Mar 19 17:35:50 2009 -0400 @@ -813,10 +813,10 @@ return ("sd", 16) elif self.bus == "xen": return ("xvd", 16) + elif self.bus == "fdc" or self.device == self.DEVICE_FLOPPY: + return ("fd", 2) elif self.bus == "ide": return ("hd", 4) - elif self.bus == "floppy" or self.device == self.DEVICE_FLOPPY: - return ("fd", 2) else: return (None, None) virtinst-0.400.3-updated-trans.patch: --- NEW FILE virtinst-0.400.3-updated-trans.patch --- diff -rup virtinst-0.400.3/po/es.po new/po/es.po --- virtinst-0.400.3/po/es.po 2009-04-09 10:38:31.403059000 -0400 +++ new/po/es.po 2009-04-09 10:38:56.365058000 -0400 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Fedora Spanish Translation of virtinst\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-10 14:00-0400\n" +"POT-Creation-Date: 2009-04-09 10:38-0400\n" "PO-Revision-Date: 2009-01-20 13:06-0300\n" "Last-Translator: h??ctor daniel cabrera \n" "Language-Team: Fedora Spanish \n" @@ -15,1419 +15,2136 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: virt-clone:45 -msgid "What is the name for the cloned virtual machine?" -msgstr "??Cu??l es el nombre de la m??quina virtual clonada?" +#: virtinst/CapabilitiesParser.py:172 +#, fuzzy, python-format +msgid "No domains available for virt type '%(type)s', arch %(arch)s." +msgstr "No existen dominios disponibles para este hu??sped." -#: virt-clone:50 -#: virt-clone:60 -#: virt-clone:89 -#: virtinst/cli.py:175 -msgid "ERROR: " -msgstr "ERROR:" +#: virtinst/CapabilitiesParser.py:412 +#, python-format +msgid "for arch '%s'" +msgstr "para arq '%s'" -#: virt-clone:55 -msgid "What is the name or uuid of the original virtual machine?" -msgstr "??Cu??l es el nombre o el uuid de la m??quina virtual original?" +#: virtinst/CapabilitiesParser.py:416 +#, fuzzy, python-format +msgid "virtualization type '%s'" +msgstr "Tipo de virtualizaci??n '%s' no soportada" -#: virt-clone:83 -msgid "What would you like to use as the cloned disk (file path)?" -msgstr "??Qu?? (ruta de archivo) le gustar??a utilizar para el disco clonado?" +#: virtinst/CapabilitiesParser.py:418 +#, fuzzy +msgid "any virtualization options" +msgstr "Opciones del Tipo de Virtualizaci??n" -#: virt-clone:94 +#: virtinst/CapabilitiesParser.py:420 #, python-format -msgid "This will overwrite the existing path '%s'!\n" -msgstr "Esto sobrescribir?? las rutas existentes '%s'!\n" - -#: virt-clone:96 -msgid "Do you really want to use this disk (yes or no)?" -msgstr "??Realmente quiere utilizar este disco (si o no)?" +msgid "Host does not support %(virttype)s %(arch)s" +msgstr "" -#: virt-clone:102 -#: virt-install:202 +#: virtinst/CapabilitiesParser.py:433 #, python-format -msgid "Disk %s is already in use by another guest!\n" -msgstr "??El disco %s ya est?? siendo utilizado por otro hu??sped!\n" +msgid "" +"Host does not support domain type '%(domain)s' for virtualization type '%" +"(virttype)s' arch '%(arch)s'" +msgstr "" -#: virt-clone:103 -#: virt-install:203 -msgid "Do you really want to use the disk (yes or no)? " -msgstr "??Realmente quiere utilizar el disco (si o no)?" +#: virtinst/cli.py:117 +msgid "Exiting at user request." +msgstr "Saliendo a pedido del usuario." -#: virt-clone:132 -msgid "Name or uuid for the original guest; The status must be shut off" -msgstr "Nombre o uuid del hu??sped original; el status debe ser apagado" +#: virtinst/cli.py:122 +msgid "Must be root to create Xen guests" +msgstr "Debe ser root para poder crear un hu??sped Xen" -#: virt-clone:136 -msgid "Name for the new guest" -msgstr "Nombre para el nuevo hu??sped" +#: virtinst/cli.py:124 +msgid "Could not find usable default libvirt connection." +msgstr "" +"No se ha podido encontrar una conexi??n por defecto libvirt que sea " +"utilizable. " -#: virt-clone:141 -msgid "New UUID for the clone guest; Default is a randomly generated UUID" -msgstr "Nuevo UUID para el hu??sped clonado; por defecto se genera en forma aleatoria una UUID" +#: virtinst/cli.py:146 +#, python-format +msgid "Force flag is set but input was required. Prompt was: %s" +msgstr "" +"Se ha establecido una se??al forzada, pero se necesita una entrada. Se pide: %" +"s " -#: virt-clone:146 -msgid "New fixed MAC address for the clone guest. Default is a randomly generated MAC" -msgstr "Nueva direcci??n MAC adecuada para el hu??sped clonado. Por defecto se genera en forma aleatoria una MAC " +#: virtinst/cli.py:149 +#, python-format +msgid "Prompting disabled, but input was requested. Prompt was: %s" +msgstr "" +"Las peticiones est??n deshabilitadas, pero se solicita una entrada. Se pide: %" +"s " -#: virt-clone:151 -msgid "New file to use as the disk image for the new guest" -msgstr "Nuevo archivo para ser usado como imagen de disco para el nuevo hu??sped" +#: virtinst/cli.py:169 +#, python-format +msgid "" +"Prompting disabled, but yes/no was requested. Try --force to force 'yes' for " +"such prompts. Prompt was: %s" +msgstr "" +"Las peticiones est??n deshabilitadas, pero se ha solicitado un si/no. Intente " +"--force para forzar un \"si\" para este tipo de peticiones. Se pide: %s" -#: virt-clone:155 -#: virt-image:128 -#: virt-install:317 -msgid "Connect to hypervisor with URI" -msgstr "Conectar al hipervisor con URI" +#: virtinst/cli.py:179 virt-clone:48 virt-clone:69 virt-clone:108 +msgid "ERROR: " +msgstr "ERROR:" -#: virt-clone:161 -msgid "Force to copy devices (eg, if 'hdc' is a readonly cdrom device, --force-copy=hdc)" -msgstr "Copiando dispositivos de manera forzada (por ejemplo, si \"hdc\" es un dispositivo cdrom s??lo de lectura, --force-copy=hdc)" +#: virtinst/cli.py:189 +msgid "A name is required for the virtual machine." +msgstr "Se requiere un nombre para la m??quina virtual." -#: virt-clone:166 -msgid "Do not use a sparse file for the clone's disk image" -msgstr "No utilice un archivo separado para la imagen del disco de lo clonado" +#: virtinst/cli.py:197 +msgid "Memory amount is required for the virtual machine." +msgstr "Se requiere una cantidad de memoria para la m??quina virtual." -#: virt-clone:171 -msgid "Preserve a new file to use as the disk image for the new guest" -msgstr "Preserve un archivo nuevo para utilizarlo como la imagen del disco del nuevo hu??sped " +#: virtinst/cli.py:199 +#, python-format +msgid "Installs currently require %d megs of RAM." +msgstr "La instalaci??n actualmente requiere %d megas de RAM." -#: virt-clone:175 -#: virt-image:137 -#: virt-install:447 -#: virt-pack:109 -msgid "Print debugging information" -msgstr "Mostrar informaci??n de depuraci??n" +#: virtinst/cli.py:219 +#, python-format +msgid "" +"You have asked for more virtual CPUs (%d) than there are physical CPUs (%d) " +"on the host. This will work, but performance will be poor. Are you sure? " +"(yes or no)" +msgstr "" +"Ha pedido m??s CPUs virtuales (%d) que los CPUs f??sicos (%d) en el anfitri??n. " +"Esto podr??a funcionar, pero el desempe??o ser?? pobre. ??Esta seguro? (si o no)" -#: virt-clone:177 -#: virt-image:143 -msgid "Do not prompt for input. Answers yes where applicable, terminates for all other prompts" -msgstr "No solicite entrada. Una respuesta positiva, cuando se aplique, finaliza cualquier otra entrada" +#: virtinst/cli.py:276 +msgid "Unknown network type " +msgstr "Tipo de red desconocido" -#: virt-clone:194 -msgid "Must be root to clone Xen guests" -msgstr "Debe ser root para poder clonar hu??spedes Xen" +#: virtinst/cli.py:293 +msgid "Cannot mix both --bridge and --network arguments" +msgstr "No se pueden mezclar los argumentos de --bridge y de --network" -#: virt-clone:229 -#: virt-image:242 -#: virt-install:697 -msgid "Installation aborted at user request" -msgstr "Instalaci??n abortada a pedido del usuario" +#: virtinst/cli.py:310 +msgid "Need to pass equal numbers of networks & mac addresses" [...14182 lines suppressed...] "\n" @@ -1868,7 +1834,7 @@ msgstr "" "\n" "????????????......" -#: virt-install:682 virt-install.orig:682 +#: virt-install:682 #, python-format msgid "" "Domain installation does not appear to have been\n" @@ -1881,7 +1847,7 @@ msgstr "" "??????????????????????????????\n" "??????????????????" -#: virt-install:693 virt-install.orig:693 +#: virt-install:693 #, python-format msgid "" "Guest installation complete... you can restart your domain\n" @@ -1890,16 +1856,15 @@ msgstr "" "?????????????????????......???????????????\n" " 'virsh start %s' ???????????????" -#: virt-install:697 virt-install.orig:697 +#: virt-install:697 msgid "Guest installation complete... restarting guest." msgstr "?????????????????????......???????????????" -#: virt-install:703 virt-install.orig:703 -#, fuzzy +#: virt-install:703 msgid "Guest install interrupted." -msgstr "?????????????????????" +msgstr "?????????????????????" -#: virt-install:710 virt-install.orig:710 +#: virt-install:710 #, python-format msgid "" "Domain installation may not have been\n" @@ -1912,144 +1877,39 @@ msgstr "" "??????????????????????????????\n" "??????????????????" -#: virt-install:736 virt-install.orig:736 -#, fuzzy +#: virt-install:736 msgid "Guest installation failed." -msgstr "?????????????????????" +msgstr "?????????????????????" -#: virt-install:746 virt-install.orig:746 -#, fuzzy, python-format +#: virt-install:746 +#, python-format msgid "%d minutes " -msgstr " %d ??????" +msgstr "%d ??????" -#: virt-install:748 virt-install.orig:748 -#, fuzzy, python-format +#: virt-install:748 +#, python-format msgid "" "Domain installation still in progress. Waiting %sfor domain to complete " "installation." -msgstr "" -"?????????????????????????????????????????????\n" -"???????????????????????????????????????" +msgstr "????????????????????????????????? %s ??????????????????" -#: virt-install:754 virt-install.orig:754 +#: virt-install:754 msgid "Domain has shutdown. Continuing." msgstr "???????????????????????????......" -#: virt-install:761 virt-install.orig:761 -#, fuzzy, python-format +#: virt-install:761 +#, python-format msgid "Could not lookup domain after install: %s" -msgstr "????????????????????????%s" +msgstr "???????????????????????????%s" -#: virt-install:768 virt-install.orig:768 -#, fuzzy +#: virt-install:768 msgid "Installation has exceeded specified time limit. Exiting application." -msgstr "??????????????????????????????????????????????????????" +msgstr "?????????????????????????????????????????????????????????" -#: virt-install:772 virt-install.orig:772 +#: virt-install:772 msgid "" "Domain installation still in progress. You can reconnect to \n" "the console to complete the installation process." msgstr "" "?????????????????????????????????????????????\n" "???????????????????????????????????????" - -#~ msgid "Name or UUID of guest to clone is required" -#~ msgstr "?????????????????????????????????????????? UUID" - -#~ msgid "A valid name or UUID of guest to clone is required" -#~ msgstr "???????????????????????????????????????????????? UUID" - -#~ msgid "New file to use for disk image is required" -#~ msgstr "????????????????????????????????????" - -#~ msgid "Domain status must be SHUTOFF" -#~ msgstr "?????????????????? SHUTOFF" - -#~ msgid "Domain %s already exists" -#~ msgstr "??? %s ?????????" - -#, fuzzy -#~ msgid "Cloning from %(src)s to %(dst)s..." -#~ msgstr "??? %(src)s ????????? %(dst)s" - -#~ msgid "Invalid file location given: " -#~ msgstr "??????????????????????????????" - -#, fuzzy -#~ msgid "Invalid file location given: %s: %s" -#~ msgstr "??????????????????????????????" - -#~ msgid "Connection does not support HVM virtualisation, cannot boot live CD" -#~ msgstr "??????????????? HVM ???????????????????????? live CD???" - -#~ msgid "Storage object name must be a string " -#~ msgstr "??????????????????????????????????????????" - -#~ msgid "Storage object name can not be only " -#~ msgstr "??????????????????????????????" - -#~ msgid "Storage object name can only contain " -#~ msgstr "??????????????????????????????" - -#~ msgid "'%s' is not managed on remote host: %s" -#~ msgstr "???????????????????????? '%s'???%s" - -#~ msgid "Cannot parse capabilities" -#~ msgstr "??????????????????" - -#~ msgid "Only one of --pxe, --location and --cdrom can be used" -#~ msgstr "???????????? --pxe???--location ??? --cdrom ??????" - -#~ msgid "location must be specified for paravirtualized guests." -#~ msgstr "??????????????????????????????????????????" - -#~ msgid "Domain installation still in progress. Waiting" -#~ msgstr "?????????????????????????????????" - -#~ msgid "" -#~ "UUID for the guest; if none is given a random UUID will be generated. If " -#~ "you specify UUID, you should use a 32-digit hexadecimal number." -#~ msgstr "" -#~ "???????????? UUID??????????????????????????????????????? UUID??????????????? UUID?????????????????? " -#~ "32 ????????????????????????" - -#~ msgid "" -#~ "Total time to wait for VM to shutdown if console not present. Time less " -#~ "than 0 waits indefinitely." -#~ msgstr "?????????????????????????????? VM ??????????????????????????????????????? 0 ?????????????????????" - -#~ msgid "The image name and version must be present" -#~ msgstr "??????????????????????????????" - -#~ msgid "Scratch disk %s does not have a size attribute" -#~ msgstr "????????? %s ??????????????????" - -#~ msgid "Disk file %s could not be found" -#~ msgstr "???????????????????????? %s" - -#~ msgid "Writing %s" -#~ msgstr "?????? %s" - -#~ msgid "Directory in which packaged file will be put" -#~ msgstr "???????????????????????????" - -#~ msgid "The image descriptor must contain name and version" -#~ msgstr "??????????????????????????????????????????" - -#~ msgid "Validation failed: %s" -#~ msgstr "???????????????%s" - -#~ msgid "Packaging failed: %s" -#~ msgstr "???????????????%s" - -#~ msgid "Cloning domain..." -#~ msgstr "?????????......" - -#~ msgid "NFS installations are only supported as root" -#~ msgstr "???????????????????????? NFS ??????" - -#~ msgid "Verifying install location..." -#~ msgstr "??????????????????......" - -#~ msgid "Unsupported virtualization type" -#~ msgstr "???????????????????????????" Index: python-virtinst.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-virtinst/F-10/python-virtinst.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- python-virtinst.spec 23 Mar 2009 21:12:56 -0000 1.54 +++ python-virtinst.spec 9 Apr 2009 15:45:17 -0000 1.55 @@ -11,11 +11,13 @@ Summary: Python modules and utilities for installing virtual machines Name: python-%{appname} Version: 0.400.3 -Release: 2%{_extra_release} +Release: 3%{_extra_release} Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz Patch1: %{appname}-%{version}-fix-virtimage-scratch.patch Patch2: %{appname}-%{version}-hostdev-libvirt-calls.patch Patch3: %{appname}-%{version}-spanish-trans.patch +Patch4: %{appname}-%{version}-fix-floppy-dev.patch +Patch5: %{appname}-%{version}-updated-trans.patch License: GPLv2+ Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -44,6 +46,8 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 +%patch5 -p1 %build python setup.py build @@ -77,6 +81,10 @@ %{_bindir}/virt-convert %changelog +* Thu Apr 9 2009 Cole Robinson - 0.400.3-3.fc10 +- Fix adding floppy devices (bz 493408) +- Updated translations (bz 493944, bz 494358) + * Mon Mar 23 2009 Cole Robinson - 0.400.3-2.fc10 - Add spanish translation (bz 480816) - Fix calls to libvirt host device detach/reset From crobinso at fedoraproject.org Thu Apr 9 15:46:19 2009 From: crobinso at fedoraproject.org (Cole Robinson) Date: Thu, 9 Apr 2009 15:46:19 +0000 (UTC) Subject: [fedora-virt-maint] rpms/python-virtinst/F-9 virtinst-0.400.3-fix-floppy-dev.patch, NONE, 1.1 virtinst-0.400.3-updated-trans.patch, NONE, 1.1 python-virtinst.spec, 1.49, 1.50 Message-ID: <20090409154619.A98F07001C@cvs1.fedora.phx.redhat.com> Author: crobinso Update of /cvs/pkgs/rpms/python-virtinst/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19345 Modified Files: python-virtinst.spec Added Files: virtinst-0.400.3-fix-floppy-dev.patch virtinst-0.400.3-updated-trans.patch Log Message: Fix adding floppy devices (bz 493408) Updated translations (bz 493944, bz 494358) virtinst-0.400.3-fix-floppy-dev.patch: --- NEW FILE virtinst-0.400.3-fix-floppy-dev.patch --- # HG changeset patch # User Cole Robinson # Date 1237498550 14400 # Node ID fd4baa6410d841f137ea89290c1a8da33c00c3c9 # Parent a55347f926f5cfdcfd9b5234b945ec279190c513 Fix specifying --disk device=floppy diff -r a55347f926f5 -r fd4baa6410d8 virtinst/FullVirtGuest.py --- a/virtinst/FullVirtGuest.py Thu Mar 19 17:35:27 2009 -0400 +++ b/virtinst/FullVirtGuest.py Thu Mar 19 17:35:50 2009 -0400 @@ -113,7 +113,10 @@ used_targets = [] for disk in self._install_disks: if not disk.bus: - disk.bus = "ide" + if disk.device == disk.DEVICE_FLOPPY: + disk.bus = "fdc" + else: + disk.bus = "ide" used_targets.append(disk.generate_target(used_targets)) for d in self._install_disks: diff -r a55347f926f5 -r fd4baa6410d8 virtinst/VirtualDisk.py --- a/virtinst/VirtualDisk.py Thu Mar 19 17:35:27 2009 -0400 +++ b/virtinst/VirtualDisk.py Thu Mar 19 17:35:50 2009 -0400 @@ -813,10 +813,10 @@ return ("sd", 16) elif self.bus == "xen": return ("xvd", 16) + elif self.bus == "fdc" or self.device == self.DEVICE_FLOPPY: + return ("fd", 2) elif self.bus == "ide": return ("hd", 4) - elif self.bus == "floppy" or self.device == self.DEVICE_FLOPPY: - return ("fd", 2) else: return (None, None) virtinst-0.400.3-updated-trans.patch: --- NEW FILE virtinst-0.400.3-updated-trans.patch --- diff -rup virtinst-0.400.3/po/es.po new/po/es.po --- virtinst-0.400.3/po/es.po 2009-04-09 10:38:31.403059000 -0400 +++ new/po/es.po 2009-04-09 10:38:56.365058000 -0400 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Fedora Spanish Translation of virtinst\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-10 14:00-0400\n" +"POT-Creation-Date: 2009-04-09 10:38-0400\n" "PO-Revision-Date: 2009-01-20 13:06-0300\n" "Last-Translator: h??ctor daniel cabrera \n" "Language-Team: Fedora Spanish \n" @@ -15,1419 +15,2136 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: virt-clone:45 -msgid "What is the name for the cloned virtual machine?" -msgstr "??Cu??l es el nombre de la m??quina virtual clonada?" +#: virtinst/CapabilitiesParser.py:172 +#, fuzzy, python-format +msgid "No domains available for virt type '%(type)s', arch %(arch)s." +msgstr "No existen dominios disponibles para este hu??sped." -#: virt-clone:50 -#: virt-clone:60 -#: virt-clone:89 -#: virtinst/cli.py:175 -msgid "ERROR: " -msgstr "ERROR:" +#: virtinst/CapabilitiesParser.py:412 +#, python-format +msgid "for arch '%s'" +msgstr "para arq '%s'" -#: virt-clone:55 -msgid "What is the name or uuid of the original virtual machine?" -msgstr "??Cu??l es el nombre o el uuid de la m??quina virtual original?" +#: virtinst/CapabilitiesParser.py:416 +#, fuzzy, python-format +msgid "virtualization type '%s'" +msgstr "Tipo de virtualizaci??n '%s' no soportada" -#: virt-clone:83 -msgid "What would you like to use as the cloned disk (file path)?" -msgstr "??Qu?? (ruta de archivo) le gustar??a utilizar para el disco clonado?" +#: virtinst/CapabilitiesParser.py:418 +#, fuzzy +msgid "any virtualization options" +msgstr "Opciones del Tipo de Virtualizaci??n" -#: virt-clone:94 +#: virtinst/CapabilitiesParser.py:420 #, python-format -msgid "This will overwrite the existing path '%s'!\n" -msgstr "Esto sobrescribir?? las rutas existentes '%s'!\n" - -#: virt-clone:96 -msgid "Do you really want to use this disk (yes or no)?" -msgstr "??Realmente quiere utilizar este disco (si o no)?" +msgid "Host does not support %(virttype)s %(arch)s" +msgstr "" -#: virt-clone:102 -#: virt-install:202 +#: virtinst/CapabilitiesParser.py:433 #, python-format -msgid "Disk %s is already in use by another guest!\n" -msgstr "??El disco %s ya est?? siendo utilizado por otro hu??sped!\n" +msgid "" +"Host does not support domain type '%(domain)s' for virtualization type '%" +"(virttype)s' arch '%(arch)s'" +msgstr "" -#: virt-clone:103 -#: virt-install:203 -msgid "Do you really want to use the disk (yes or no)? " -msgstr "??Realmente quiere utilizar el disco (si o no)?" +#: virtinst/cli.py:117 +msgid "Exiting at user request." +msgstr "Saliendo a pedido del usuario." -#: virt-clone:132 -msgid "Name or uuid for the original guest; The status must be shut off" -msgstr "Nombre o uuid del hu??sped original; el status debe ser apagado" +#: virtinst/cli.py:122 +msgid "Must be root to create Xen guests" +msgstr "Debe ser root para poder crear un hu??sped Xen" -#: virt-clone:136 -msgid "Name for the new guest" -msgstr "Nombre para el nuevo hu??sped" +#: virtinst/cli.py:124 +msgid "Could not find usable default libvirt connection." +msgstr "" +"No se ha podido encontrar una conexi??n por defecto libvirt que sea " +"utilizable. " -#: virt-clone:141 -msgid "New UUID for the clone guest; Default is a randomly generated UUID" -msgstr "Nuevo UUID para el hu??sped clonado; por defecto se genera en forma aleatoria una UUID" +#: virtinst/cli.py:146 +#, python-format +msgid "Force flag is set but input was required. Prompt was: %s" +msgstr "" +"Se ha establecido una se??al forzada, pero se necesita una entrada. Se pide: %" +"s " -#: virt-clone:146 -msgid "New fixed MAC address for the clone guest. Default is a randomly generated MAC" -msgstr "Nueva direcci??n MAC adecuada para el hu??sped clonado. Por defecto se genera en forma aleatoria una MAC " +#: virtinst/cli.py:149 +#, python-format +msgid "Prompting disabled, but input was requested. Prompt was: %s" +msgstr "" +"Las peticiones est??n deshabilitadas, pero se solicita una entrada. Se pide: %" +"s " -#: virt-clone:151 -msgid "New file to use as the disk image for the new guest" -msgstr "Nuevo archivo para ser usado como imagen de disco para el nuevo hu??sped" +#: virtinst/cli.py:169 +#, python-format +msgid "" +"Prompting disabled, but yes/no was requested. Try --force to force 'yes' for " +"such prompts. Prompt was: %s" +msgstr "" +"Las peticiones est??n deshabilitadas, pero se ha solicitado un si/no. Intente " +"--force para forzar un \"si\" para este tipo de peticiones. Se pide: %s" -#: virt-clone:155 -#: virt-image:128 -#: virt-install:317 -msgid "Connect to hypervisor with URI" -msgstr "Conectar al hipervisor con URI" +#: virtinst/cli.py:179 virt-clone:48 virt-clone:69 virt-clone:108 +msgid "ERROR: " +msgstr "ERROR:" -#: virt-clone:161 -msgid "Force to copy devices (eg, if 'hdc' is a readonly cdrom device, --force-copy=hdc)" -msgstr "Copiando dispositivos de manera forzada (por ejemplo, si \"hdc\" es un dispositivo cdrom s??lo de lectura, --force-copy=hdc)" +#: virtinst/cli.py:189 +msgid "A name is required for the virtual machine." +msgstr "Se requiere un nombre para la m??quina virtual." -#: virt-clone:166 -msgid "Do not use a sparse file for the clone's disk image" -msgstr "No utilice un archivo separado para la imagen del disco de lo clonado" +#: virtinst/cli.py:197 +msgid "Memory amount is required for the virtual machine." +msgstr "Se requiere una cantidad de memoria para la m??quina virtual." -#: virt-clone:171 -msgid "Preserve a new file to use as the disk image for the new guest" -msgstr "Preserve un archivo nuevo para utilizarlo como la imagen del disco del nuevo hu??sped " +#: virtinst/cli.py:199 +#, python-format +msgid "Installs currently require %d megs of RAM." +msgstr "La instalaci??n actualmente requiere %d megas de RAM." -#: virt-clone:175 -#: virt-image:137 -#: virt-install:447 -#: virt-pack:109 -msgid "Print debugging information" -msgstr "Mostrar informaci??n de depuraci??n" +#: virtinst/cli.py:219 +#, python-format +msgid "" +"You have asked for more virtual CPUs (%d) than there are physical CPUs (%d) " +"on the host. This will work, but performance will be poor. Are you sure? " +"(yes or no)" +msgstr "" +"Ha pedido m??s CPUs virtuales (%d) que los CPUs f??sicos (%d) en el anfitri??n. " +"Esto podr??a funcionar, pero el desempe??o ser?? pobre. ??Esta seguro? (si o no)" -#: virt-clone:177 -#: virt-image:143 -msgid "Do not prompt for input. Answers yes where applicable, terminates for all other prompts" -msgstr "No solicite entrada. Una respuesta positiva, cuando se aplique, finaliza cualquier otra entrada" +#: virtinst/cli.py:276 +msgid "Unknown network type " +msgstr "Tipo de red desconocido" -#: virt-clone:194 -msgid "Must be root to clone Xen guests" -msgstr "Debe ser root para poder clonar hu??spedes Xen" +#: virtinst/cli.py:293 +msgid "Cannot mix both --bridge and --network arguments" +msgstr "No se pueden mezclar los argumentos de --bridge y de --network" -#: virt-clone:229 -#: virt-image:242 -#: virt-install:697 -msgid "Installation aborted at user request" -msgstr "Instalaci??n abortada a pedido del usuario" +#: virtinst/cli.py:310 +msgid "Need to pass equal numbers of networks & mac addresses" [...14182 lines suppressed...] "\n" @@ -1868,7 +1834,7 @@ msgstr "" "\n" "????????????......" -#: virt-install:682 virt-install.orig:682 +#: virt-install:682 #, python-format msgid "" "Domain installation does not appear to have been\n" @@ -1881,7 +1847,7 @@ msgstr "" "??????????????????????????????\n" "??????????????????" -#: virt-install:693 virt-install.orig:693 +#: virt-install:693 #, python-format msgid "" "Guest installation complete... you can restart your domain\n" @@ -1890,16 +1856,15 @@ msgstr "" "?????????????????????......???????????????\n" " 'virsh start %s' ???????????????" -#: virt-install:697 virt-install.orig:697 +#: virt-install:697 msgid "Guest installation complete... restarting guest." msgstr "?????????????????????......???????????????" -#: virt-install:703 virt-install.orig:703 -#, fuzzy +#: virt-install:703 msgid "Guest install interrupted." -msgstr "?????????????????????" +msgstr "?????????????????????" -#: virt-install:710 virt-install.orig:710 +#: virt-install:710 #, python-format msgid "" "Domain installation may not have been\n" @@ -1912,144 +1877,39 @@ msgstr "" "??????????????????????????????\n" "??????????????????" -#: virt-install:736 virt-install.orig:736 -#, fuzzy +#: virt-install:736 msgid "Guest installation failed." -msgstr "?????????????????????" +msgstr "?????????????????????" -#: virt-install:746 virt-install.orig:746 -#, fuzzy, python-format +#: virt-install:746 +#, python-format msgid "%d minutes " -msgstr " %d ??????" +msgstr "%d ??????" -#: virt-install:748 virt-install.orig:748 -#, fuzzy, python-format +#: virt-install:748 +#, python-format msgid "" "Domain installation still in progress. Waiting %sfor domain to complete " "installation." -msgstr "" -"?????????????????????????????????????????????\n" -"???????????????????????????????????????" +msgstr "????????????????????????????????? %s ??????????????????" -#: virt-install:754 virt-install.orig:754 +#: virt-install:754 msgid "Domain has shutdown. Continuing." msgstr "???????????????????????????......" -#: virt-install:761 virt-install.orig:761 -#, fuzzy, python-format +#: virt-install:761 +#, python-format msgid "Could not lookup domain after install: %s" -msgstr "????????????????????????%s" +msgstr "???????????????????????????%s" -#: virt-install:768 virt-install.orig:768 -#, fuzzy +#: virt-install:768 msgid "Installation has exceeded specified time limit. Exiting application." -msgstr "??????????????????????????????????????????????????????" +msgstr "?????????????????????????????????????????????????????????" -#: virt-install:772 virt-install.orig:772 +#: virt-install:772 msgid "" "Domain installation still in progress. You can reconnect to \n" "the console to complete the installation process." msgstr "" "?????????????????????????????????????????????\n" "???????????????????????????????????????" - -#~ msgid "Name or UUID of guest to clone is required" -#~ msgstr "?????????????????????????????????????????? UUID" - -#~ msgid "A valid name or UUID of guest to clone is required" -#~ msgstr "???????????????????????????????????????????????? UUID" - -#~ msgid "New file to use for disk image is required" -#~ msgstr "????????????????????????????????????" - -#~ msgid "Domain status must be SHUTOFF" -#~ msgstr "?????????????????? SHUTOFF" - -#~ msgid "Domain %s already exists" -#~ msgstr "??? %s ?????????" - -#, fuzzy -#~ msgid "Cloning from %(src)s to %(dst)s..." -#~ msgstr "??? %(src)s ????????? %(dst)s" - -#~ msgid "Invalid file location given: " -#~ msgstr "??????????????????????????????" - -#, fuzzy -#~ msgid "Invalid file location given: %s: %s" -#~ msgstr "??????????????????????????????" - -#~ msgid "Connection does not support HVM virtualisation, cannot boot live CD" -#~ msgstr "??????????????? HVM ???????????????????????? live CD???" - -#~ msgid "Storage object name must be a string " -#~ msgstr "??????????????????????????????????????????" - -#~ msgid "Storage object name can not be only " -#~ msgstr "??????????????????????????????" - -#~ msgid "Storage object name can only contain " -#~ msgstr "??????????????????????????????" - -#~ msgid "'%s' is not managed on remote host: %s" -#~ msgstr "???????????????????????? '%s'???%s" - -#~ msgid "Cannot parse capabilities" -#~ msgstr "??????????????????" - -#~ msgid "Only one of --pxe, --location and --cdrom can be used" -#~ msgstr "???????????? --pxe???--location ??? --cdrom ??????" - -#~ msgid "location must be specified for paravirtualized guests." -#~ msgstr "??????????????????????????????????????????" - -#~ msgid "Domain installation still in progress. Waiting" -#~ msgstr "?????????????????????????????????" - -#~ msgid "" -#~ "UUID for the guest; if none is given a random UUID will be generated. If " -#~ "you specify UUID, you should use a 32-digit hexadecimal number." -#~ msgstr "" -#~ "???????????? UUID??????????????????????????????????????? UUID??????????????? UUID?????????????????? " -#~ "32 ????????????????????????" - -#~ msgid "" -#~ "Total time to wait for VM to shutdown if console not present. Time less " -#~ "than 0 waits indefinitely." -#~ msgstr "?????????????????????????????? VM ??????????????????????????????????????? 0 ?????????????????????" - -#~ msgid "The image name and version must be present" -#~ msgstr "??????????????????????????????" - -#~ msgid "Scratch disk %s does not have a size attribute" -#~ msgstr "????????? %s ??????????????????" - -#~ msgid "Disk file %s could not be found" -#~ msgstr "???????????????????????? %s" - -#~ msgid "Writing %s" -#~ msgstr "?????? %s" - -#~ msgid "Directory in which packaged file will be put" -#~ msgstr "???????????????????????????" - -#~ msgid "The image descriptor must contain name and version" -#~ msgstr "??????????????????????????????????????????" - -#~ msgid "Validation failed: %s" -#~ msgstr "???????????????%s" - -#~ msgid "Packaging failed: %s" -#~ msgstr "???????????????%s" - -#~ msgid "Cloning domain..." -#~ msgstr "?????????......" - -#~ msgid "NFS installations are only supported as root" -#~ msgstr "???????????????????????? NFS ??????" - -#~ msgid "Verifying install location..." -#~ msgstr "??????????????????......" - -#~ msgid "Unsupported virtualization type" -#~ msgstr "???????????????????????????" Index: python-virtinst.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-virtinst/F-9/python-virtinst.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- python-virtinst.spec 23 Mar 2009 21:13:30 -0000 1.49 +++ python-virtinst.spec 9 Apr 2009 15:45:49 -0000 1.50 @@ -11,11 +11,13 @@ Summary: Python modules and utilities for installing virtual machines Name: python-%{appname} Version: 0.400.3 -Release: 2%{_extra_release} +Release: 3%{_extra_release} Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz Patch1: %{appname}-%{version}-fix-virtimage-scratch.patch Patch2: %{appname}-%{version}-hostdev-libvirt-calls.patch Patch3: %{appname}-%{version}-spanish-trans.patch +Patch4: %{appname}-%{version}-fix-floppy-dev.patch +Patch5: %{appname}-%{version}-updated-trans.patch License: GPLv2+ Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -44,6 +46,8 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 +%patch5 -p1 %build python setup.py build @@ -77,6 +81,10 @@ %{_bindir}/virt-convert %changelog +* Thu Apr 9 2009 Cole Robinson - 0.400.3-3.fc9 +- Fix adding floppy devices (bz 493408) +- Updated translations (bz 493944, bz 494358) + * Mon Mar 23 2009 Cole Robinson - 0.400.3-2.fc9 - Add spanish translation (bz 480816) - Fix calls to libvirt host device detach/reset From markmc at fedoraproject.org Thu Apr 9 15:55:20 2009 From: markmc at fedoraproject.org (Mark McLoughlin) Date: Thu, 9 Apr 2009 15:55:20 +0000 (UTC) Subject: [fedora-virt-maint] rpms/openbios/devel openbios.spec,1.1,1.2 Message-ID: <20090409155520.E23F77001C@cvs1.fedora.phx.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/openbios/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22221 Modified Files: openbios.spec Log Message: Fix svn URL Index: openbios.spec =================================================================== RCS file: /cvs/pkgs/rpms/openbios/devel/openbios.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- openbios.spec 5 Mar 2009 19:35:01 -0000 1.1 +++ openbios.spec 9 Apr 2009 15:54:50 -0000 1.2 @@ -6,7 +6,7 @@ License: GPLv2 URL: http://www.openfirmware.info/OpenBIOS # Getting openbios tarball: -# svn export -r463 svn://openbios.org/openbios/openbios-devel openbios-1.0 +# svn export -r463 svn://openbios.org/openbios/trunk/openbios-devel openbios-1.0 # tar czvf openbios-1.0.tar.gz openbios-1.0 Source0: %{name}/%{name}-%{version}.tar.gz Patch0: openbios-noerror.patch From crobinso at fedoraproject.org Thu Apr 9 19:19:07 2009 From: crobinso at fedoraproject.org (Cole Robinson) Date: Thu, 9 Apr 2009 19:19:07 +0000 (UTC) Subject: [fedora-virt-maint] rpms/virt-manager/devel virt-manager-0.7.0-delete-dup-conn.patch, NONE, 1.1 virt-manager-0.7.0-fix-button-ordering.patch, NONE, 1.1 virt-manager-0.7.0-fix-vcpu-cap.patch, NONE, 1.1 virt-manager-0.7.0-update-translations.patch, NONE, 1.1 virt-manager.spec, 1.49, 1.50 Message-ID: <20090409191907.75BE07001C@cvs1.fedora.phx.redhat.com> Author: crobinso Update of /cvs/pkgs/rpms/virt-manager/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22644 Modified Files: virt-manager.spec Added Files: virt-manager-0.7.0-delete-dup-conn.patch virt-manager-0.7.0-fix-button-ordering.patch virt-manager-0.7.0-fix-vcpu-cap.patch virt-manager-0.7.0-update-translations.patch Log Message: Fix incorrect max vcpu setting in New VM wizard (bz 490466) Fix some OK/Cancel button ordering issues (bz 490207) Use openAuth when duplicating a connection when deleting a VM Updated translations (bz 493795) virt-manager-0.7.0-delete-dup-conn.patch: --- NEW FILE virt-manager-0.7.0-delete-dup-conn.patch --- # HG changeset patch # User Cole Robinson # Date 1238782522 14400 # Node ID 218ecc7495319b70960c5e3685e8597700c29bfb # Parent 5abfbc44b41efc4fae9b154bb515044c32ffc0f4 Use dup_conn in delete dialog. diff -r 5abfbc44b41e -r 218ecc749531 src/virtManager/delete.py --- a/src/virtManager/delete.py Fri Apr 03 14:15:15 2009 -0400 +++ b/src/virtManager/delete.py Fri Apr 03 14:15:22 2009 -0400 @@ -25,9 +25,9 @@ import traceback import logging -import libvirt import virtinst +from virtManager import util from virtManager.error import vmmErrorDialog from virtManager.asyncjob import vmmAsyncJob from virtManager.createmeter import vmmCreateMeter @@ -159,11 +159,7 @@ try: # Open a seperate connection to install on since this is async logging.debug("Threading off connection to delete vol.") - #newconn = vmmConnection(self.config, self.conn.get_uri(), - # self.conn.is_read_only()) - #newconn.open() - #newconn.connectThreadEvent.wait() - newconn = libvirt.open(self.conn.get_uri()) + newconn = util.dup_conn(self.config, self.conn) meter = vmmCreateMeter(asyncjob) for path in paths: virt-manager-0.7.0-fix-button-ordering.patch: --- NEW FILE virt-manager-0.7.0-fix-button-ordering.patch --- # HG changeset patch # User Cole Robinson # Date 1238787321 14400 # Node ID 71d9208d322631118bbdc110388c333bd1f784eb # Parent 9b4b6eb8de8d9e7b0e906715fb503a0b1ab0f30d Reorder buttons in the delete dialog. diff -r 9b4b6eb8de8d -r 71d9208d3226 src/vmm-delete.glade --- a/src/vmm-delete.glade Fri Apr 03 14:58:51 2009 -0400 +++ b/src/vmm-delete.glade Fri Apr 03 15:35:21 2009 -0400 @@ -1,6 +1,6 @@ - + 500 @@ -115,6 +115,17 @@ True GTK_BUTTONBOX_END + + True + True + True + gtk-cancel + True + 0 + + + + True True @@ -124,17 +135,6 @@ 0 - - - - True - True - True - gtk-cancel - True - 0 - - 1 # HG changeset patch # User Cole Robinson # Date 1238787521 14400 # Node ID 6f0170f9d551ff54dcedca188bbf84313c551a30 # Parent 71d9208d322631118bbdc110388c333bd1f784eb Change 'choose cd' button ordering. diff -r 71d9208d3226 -r 6f0170f9d551 src/vmm-choose-cd.glade --- a/src/vmm-choose-cd.glade Fri Apr 03 15:35:21 2009 -0400 +++ b/src/vmm-choose-cd.glade Fri Apr 03 15:38:41 2009 -0400 @@ -40,97 +40,19 @@ - - True - - - True - 5 - _Path to install media: - True - cd-path - - - False - False - - - - - True - - - - 1 - - - - - 1 - 3 - 3 - 4 - - - - + True 0 0 - - True - True - _ISO Image Location: - True - 0 - True - physical-media - - + - 3 - GTK_FILL - GTK_FILL - - - - - True - True - _CD-ROM or DVD: - True - 0 - True - True - - - - 3 - 2 - 3 - GTK_FILL - GTK_FILL - - - - - True - 1 - ISO _Location: - True - iso-path - - - 1 - 2 1 2 GTK_FILL - - 3 + GTK_FILL @@ -168,21 +90,99 @@ - + + True + 1 + ISO _Location: + True + iso-path + + + 1 + 2 + 1 + 2 + GTK_FILL + + 3 + + + + + True + True + _CD-ROM or DVD: + True + 0 + True + True + + + + 3 + 2 + 3 + GTK_FILL + GTK_FILL + + + + True 0 0 - + + True + True + _ISO Image Location: + True + 0 + True + physical-media + + - 1 - 2 + 3 GTK_FILL GTK_FILL + + + True + + + True + 5 + _Path to install media: + True + cd-path + + + False + False + + + + + True + + + + 1 + + + + + 1 + 3 + 3 + 4 + + @@ -209,6 +209,17 @@ True GTK_BUTTONBOX_END + + True + True + True + gtk-cancel + True + -6 + + + + True True @@ -218,17 +229,6 @@ -5 - - - - True - True - True - gtk-cancel - True - -6 - - 1 virt-manager-0.7.0-fix-vcpu-cap.patch: --- NEW FILE virt-manager-0.7.0-fix-vcpu-cap.patch --- # HG changeset patch # User Cole Robinson # Date 1239034964 14400 # Node ID c5489151e2e6bd37c41b543efb79186739fb1b3c # Parent 3cfb5918b1a80b9eea3282244a27f512f566eb2e Fix incorrect vcpu capping in create wizard. Cap was always 10 less than we intended. Apparently spinbutton page_size != 0 is deprecated, yet is the default set by glade3? Schweet. diff -r 3cfb5918b1a8 -r c5489151e2e6 src/vmm-create.glade --- a/src/vmm-create.glade Mon Apr 06 11:33:46 2009 -0400 +++ b/src/vmm-create.glade Mon Apr 06 12:22:44 2009 -0400 @@ -826,7 +826,7 @@ True True 1 - 0 0 8096 1 10 10 + 0 0 8096 1 10 0 1 @@ -841,7 +841,7 @@ True True 1 - 0 0 128 1 10 10 + 0 0 128 1 10 0 1 @@ -1025,7 +1025,7 @@ True True 1 - 2 0 1000000 0.10000000000000001 10 10 + 2 0 1000000 0.10000000000000001 10 0 1 1 virt-manager-0.7.0-update-translations.patch: --- NEW FILE virt-manager-0.7.0-update-translations.patch --- diff -rup --new-file virt-manager-0.7.0/po/as.po new/po/as.po --- virt-manager-0.7.0/po/as.po 1969-12-31 19:00:00.000000000 -0500 +++ new/po/as.po 2009-04-09 12:27:48.195275000 -0400 @@ -0,0 +1,3575 @@ +# translation of virt-manager.tip.po to Assamese +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Amitakhya Phukan , 2008, 2009. +msgid "" +msgstr "" +"Project-Id-Version: virt-manager.tip\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-03-09 20:26-0400\n" +"PO-Revision-Date: 2009-04-06 14:07+0530\n" +"Last-Translator: Amitakhya Phukan \n" +"Language-Team: Assamese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Lokalize 0.3\n" +"Plural-Forms: nplurals=2; plural=(n!=1)\n" + +#: ../src/virt-manager.desktop.in.in.h:1 +msgid "Manage virtual machines" +msgstr "??????????????????????????? ????????????????????? ???????????????????????? ?????????" + +#: ../src/virt-manager.desktop.in.in.h:2 ../src/vmm-manager.glade.h:17 +msgid "Virtual Machine Manager" +msgstr "??????????????????????????? ?????????????????? ?????????????????????" + +#: ../src/virt-manager.py.in:55 +msgid "Error starting Virtual Machine Manager" +msgstr "??????????????????????????? ?????????????????? ????????????????????? ??????????????? ?????????????????? ??????????????????" + +#. ...the risk is we catch too much though +#. Damned if we do, damned if we dont :-)( +#: ../src/virt-manager.py.in:284, python-format +msgid "Unable to initialize GTK: %s" +msgstr "GTK ??????????????? ?????????????????? ??????????????????: %s" + +#: ../src/virt-manager.schemas.in.h:1 +msgid "Install sound device for local VM" +msgstr "????????????????????? VM ??? ??????????????? ?????????????????? ???????????????????????? ?????????" + +#: ../src/virt-manager.schemas.in.h:2 +msgid "Install sound device for remote VM" +msgstr "???????????????????????? ??????????????????????????? ????????????????????? ???????????? ??????????????? ?????????????????? ???????????????????????? ?????????" + +#: ../src/virt-manager.schemas.in.h:3 +msgid "Poll cpu stats" +msgstr "cpu stats ??????????????????" + +#: ../src/virt-manager.schemas.in.h:4 +msgid "Poll disk i/o stats" +msgstr "disk i/o stats ??????????????????" + +#: ../src/virt-manager.schemas.in.h:5 +msgid "Poll memory usage stats" +msgstr "memory usage stats ??????????????????" + +#: ../src/virt-manager.schemas.in.h:6 +msgid "Poll net i/o stats" +msgstr "net i/o stats ??????????????????" + +#: ../src/virt-manager.schemas.in.h:7 +msgid "Show VCPU count in summary" +msgstr "????????????????????? VCPU ??? ?????????????????? ???????????????????????? ????????? ???'???" + +#: ../src/virt-manager.schemas.in.h:8 +msgid "Show cpu usage in summary" +msgstr "????????????????????? cpu ???????????????????????? ???????????? ???????????????????????? ????????? ???'???" + +#: ../src/virt-manager.schemas.in.h:9 +msgid "Show disk I/O in summary" +msgstr "????????????????????? ??????????????? I/O ???????????? ???????????????????????? ????????? ???'???" + +#: ../src/virt-manager.schemas.in.h:10 +msgid "Show domain id in summary" +msgstr "????????????????????? ?????????????????? id ???????????????????????? ????????? ???'???" + +#: ../src/virt-manager.schemas.in.h:11 +msgid "Show memory usage in summary" +msgstr "????????????????????? ???????????????????????????????????? ????????????????????? ???????????????????????? ????????? ???'???" + +#: ../src/virt-manager.schemas.in.h:12 +msgid "Show network I/O in summary" +msgstr "??????'?????????????????? I/O ??? ??????????????????????????? ??????????????? ???????????????????????? ????????? ???'???" + +#: ../src/virt-manager.schemas.in.h:13 +msgid "Show run state in summary" +msgstr "????????????????????? ???????????????????????? ?????????????????? ???????????????????????? ????????? ???'???" + +#: ../src/virt-manager.schemas.in.h:14 +msgid "Show the cpu usage field in the domain list summary view" +msgstr "?????????????????? ????????????????????? ??????????????????????????? ??????????????????????????? cpu ???????????????????????? ????????????????????? ???????????????????????? ????????? ???'???" + +#: ../src/virt-manager.schemas.in.h:15 +msgid "Show the disk I/O field in the domain list summary view" +msgstr "?????????????????? ????????????????????? ??????????????????????????? ??????????????????????????? ??????????????? I/O ????????????????????? ???????????????????????? ????????? ???'???" + +#: ../src/virt-manager.schemas.in.h:16 +msgid "Show the domain id field in the domain list summary view" +msgstr "?????????????????? ????????????????????? ??????????????????????????? ??????????????????????????? ?????????????????? id ??? ????????????????????? ???????????????????????? ????????? ???'???" + +#: ../src/virt-manager.schemas.in.h:17 +msgid "Show the memory usage field in the domain list summary view" +msgstr "?????????????????? ????????????????????? ??????????????????????????? ??????????????????????????? ????????????????????????????????? ???????????????????????? ????????????????????? ???????????????????????? ????????? ???'???" + +#: ../src/virt-manager.schemas.in.h:18 +msgid "Show the network I/O field in the domain list summary view" +msgstr "?????????????????? ????????????????????? ??????????????????????????? ??????????????????????????? ??????'??????????????? ????????????????????? ????????????????????? ???????????????????????? ????????? ???'???" + +#: ../src/virt-manager.schemas.in.h:19 +msgid "Show the run state field in the domain list summary view" +msgstr "?????????????????? ????????????????????? ??????????????????????????? ??????????????????????????? ???????????????????????? ?????????????????? ??????????????????????????? ????????????????????? ???????????????????????? ????????? ???'???" + +#: ../src/virt-manager.schemas.in.h:20 +msgid "Show the virtual CPU count field in the domain list summary view" +msgstr "?????????????????? ????????????????????? ??????????????????????????? ??????????????????????????? ??????????????????????????? CPU-??? ????????????????????? ????????????????????? ???????????????????????? ????????? ???'???" + +#: ../src/virt-manager.schemas.in.h:21 +msgid "The length of the list of URLs" +msgstr "URL ????????????????????? ?????????????????????" + +#: ../src/virt-manager.schemas.in.h:22 +msgid "The number of samples to keep in the statistics history" +msgstr "?????????????????????????????? ????????????????????? ??????????????? ????????? ?????????????????? ??????????????????" + +#: ../src/virt-manager.schemas.in.h:23 +msgid "The number of urls to keep in the history for the install media address page." +msgstr "???????????????????????? ????????????????????? ?????????????????? ????????????????????? ?????????????????????????????? ??????????????? ???????????? ???????????????????????? url ??? ??????????????????" + +#: ../src/virt-manager.schemas.in.h:24 +msgid "The statistics history length" +msgstr "?????????????????????????????? ?????????????????????????????? ??????????????? ?????????" + +#: ../src/virt-manager.schemas.in.h:25 +msgid "The statistics update interval" +msgstr "??????????????????????????? ??????????????? ???????????? ?????????????????????" + +#: ../src/virt-manager.schemas.in.h:26 +msgid "The statistics update interval in seconds" +msgstr "???????????????????????? ?????????????????????????????? ???????????????????????? ??????????????????" + +#: ../src/virt-manager.schemas.in.h:27 +msgid "When to grab keyboard input for the console" +msgstr "????????????????????? ???????????? ??????????????? ???????????? ???????????? ????????? ??????????????? ??????????????? ????????? ???'???" + +#: ../src/virt-manager.schemas.in.h:28 +msgid "When to pop up a console for a guest" +msgstr "??????????????? ???????????????????????????????????????????????? ???????????? ??????????????? ?????????????????? ???'???-?????? ????????? ???'???" + +#: ../src/virt-manager.schemas.in.h:29 +msgid "When to scale the VM graphical console" +msgstr "VM ????????????????????????????????? ???'??????????????? ?????????????????? ??????????????? ???????????? ????????????" + +#: ../src/virt-manager.schemas.in.h:30 +msgid "" +"When to scale the VM graphical console. 0 = never, 1 = only when in full " +"screen mode, 2 = Always" +msgstr "" +"VM ????????????????????????????????? ?????????????????? ?????????????????? ??????????????? ???????????? ???????????? ??? 0 = ???????????? ?????????, 1 = ????????? ???????????????????????? ???????????????????????? " +"???????????????????????? ????????? ????????????, 2 = ????????????" + +#: ../src/virt-manager.schemas.in.h:31 +msgid "Whether or not the app will poll VM disk i/o statistics" +msgstr "?????????????????????????????? VM ??????????????? i/o ??????????????????????????? ????????????????????? ?????? ?????????" + +#: ../src/virt-manager.schemas.in.h:32 +msgid "Whether or not the app will poll VM network i/o statistics" +msgstr "?????????????????????????????? VM ??????'??????????????? i/o ??????????????????????????? ????????????????????? ?????? ?????????" + +#: ../src/virt-manager.schemas.in.h:33 +msgid "Whether or not the app will poll connection and VM cpu usage statistics" +msgstr "?????????????????????????????? ??????????????? ????????? VM cpu ???????????????????????? ??????????????????????????? ????????????????????? ?????? ?????????" + +#: ../src/virt-manager.schemas.in.h:34 +msgid "Whether or not the app will poll connection and VM memory usage statistics" +msgstr "?????????????????????????????? ??????????????? ????????? VM ????????????????????????????????? ???????????????????????? ??????????????????????????? ????????????????????? ?????? ?????????" + +#: ../src/virt-manager.schemas.in.h:35 +msgid "" +"Whether to grab keyboard input for a guest console. 0 = never, 1 = only when " +"in full screen mode, 2 = when mouse is over console" +msgstr "" +"??????????????? ????????????????????? ???????????? ???????????? ???????????? ??????????????? ??????????????? ????????? ???'??? ?????? ????????? ??? 0 = ???????????? ?????????, 1 = " +"????????? ???????????????????????? ???????????????????????? ???????????????????????? ????????? ????????????, 2 = ????????????????????? ???????????? ???????????? ????????????????????? ??????????????????" + +#: ../src/virt-manager.schemas.in.h:36 +msgid "Whether to install a sound device for local VMs or not" +msgstr "????????????????????? ??????????????????????????? ????????????????????? ???????????? ??????????????? ?????????????????? ???????????????????????? ????????? ???'??? ?????? ?????????" + +#: ../src/virt-manager.schemas.in.h:37 +msgid "Whether to install a sound device for remote VMs or not" +msgstr "???????????????????????? ??????????????????????????? ????????????????????? ???????????? ??????????????? ?????????????????? ???????????????????????? ????????? ???'??? ?????? ?????????" + +#: ../src/virt-manager.schemas.in.h:38 +msgid "" [...122222 lines suppressed...] + +#~ msgid "Kickstart Field" +#~ msgstr "Kickstart ??????" + +#~ msgid "Kickstart source:" +#~ msgstr "Kickstart ?????????" + +#, fuzzy +#~ msgid "" +#~ "Lightweight method of virtualizing machines. Limits operating system " +#~ "choices because the OS must be specially modified to support " +#~ "paravirtualization, but performs better than fully virtualized." +#~ msgstr "" +#~ "???????????????????????????????????????????????????????????????????????????????????????????????????????????????" +#~ "????????????????????????????????????????????????????????????" + +#~ msgid "Logical host CPUs:" +#~ msgstr "?????????????????????" + +#~ msgid "MAC Field" +#~ msgstr "MAC ??????" + +#~ msgid "Machine name:" +#~ msgstr "???????????????" + +#~ msgid "Max Mem Select" +#~ msgstr "?????????????????????" + +#~ msgid "Maximum memory:" +#~ msgstr "??????????????????" + +#, fuzzy +#~ msgid "Maximum virtual CPUs:" +#~ msgstr "??????????????????" + +#~ msgid "Media Path Select" +#~ msgstr "??????????????????" + +#~ msgid "Name Field" +#~ msgstr "????????????" + +#~ msgid "Network Select" +#~ msgstr "????????????" + +#~ msgid "OS _Variant:" +#~ msgstr "??????????????????(_V)???" + +#~ msgid "Partition Field" +#~ msgstr "???????????????" + +#, fuzzy +#~ msgid "Please choose a name for your virtual machine:" +#~ msgstr "???????????????????????????????????????" + +#, fuzzy +#~ msgid "" +#~ "Please choose the operating system you will be installing on the virtual " +#~ "machine:" +#~ msgstr "?????????????????????????????????????????????????????????" + +#, fuzzy +#~ msgid "" +#~ "Please enter the memory configuration for this virtual machine. You can " +#~ "specify the maximum amount of memory the virtual machine should be able " +#~ "to use, and optionally a lower amount to grab on startup. Warning: " +#~ "setting virtual machine memory too high will cause out-of-memory errors " +#~ "in your host domain!" +#~ msgstr "" +#~ "????????????????????????????????????????????????????????????????????????????????????????????????????????????" +#~ "???????????????????????????????????????????????????????????????????????? VM ?????????????????????????????????" +#~ "?????????????????????????????????????????????????????????" + +#, fuzzy +#~ msgid "" +#~ "Please enter the number of virtual CPUs this virtual machine should start " +#~ "up with." +#~ msgstr "????????????????????????????????????????????????????????????" + +#, fuzzy +#~ msgid "" +#~ "Please indicate how you'd like to assign space from the host for your new " +#~ "virtual machine. This space will be used to install the virtual machine's " +#~ "operating system." +#~ msgstr "" +#~ "???????????????????????????????????????????????????????????????????????????????????????????????????????????????" +#~ "?????????????????????????????????" + +#, fuzzy +#~ msgid "" +#~ "Please indicate how you'd like to connect your new virtual machine to the " +#~ "host network." +#~ msgstr "?????????????????????????????????????????????????????????????????????" + +#, fuzzy +#~ msgid "" +#~ "Please indicate where installation media is available for the operating " +#~ "system you would like to install on this virtual machine. Optionally you " +#~ "can provide the URL for a kickstart file:" +#~ msgstr "" +#~ "???????????????????????????????????????????????????????????????????????????????????????????????????????????????" +#~ "???????????????????????? kickstart ???????????????" + +#, fuzzy +#~ msgid "" +#~ "Please indicate where installation media is available for the operating " +#~ "system you would like to install on this virtual machine:" +#~ msgstr "???????????????????????????????????????????????????????????????????????????????????????" + +#, fuzzy +#~ msgid "Set fixed MAC _address for your virtual machine?" +#~ msgstr "????????????????????????????????????????????? MAC ??????(_a)???" + +#~ msgid "Startup Mem Select" +#~ msgstr "?????????????????????" + +#, fuzzy +#~ msgid "" +#~ "The location of the files necessary for installing an operating " +#~ "system on the virtual machine" +#~ msgstr "???????????????????????????????????????????????????????????????" + +#, fuzzy +#~ msgid "" +#~ "This assistant will guide you through creating a new virtual machine. You " +#~ "will be asked for some information about the virtual machine you'd like " +#~ "to create, such as:" +#~ msgstr "" +#~ "???????????????????????????????????????????????????????????????????????????????????????????????????????????????" +#~ "?????????????????????????????????" + +#~ msgid "Virtual CPUs:" +#~ msgstr "??????????????????" + +#~ msgid "Virtualization method:" +#~ msgstr "??????????????????" + +#, fuzzy +#~ msgid "" +#~ "Whether the virtual machine will be fully virtualized or para-" +#~ "virtualized" +#~ msgstr "????????????????????????????????????" + +#, fuzzy +#~ msgid "" +#~ "You will need to choose a virtualization method for your new virtual " +#~ "machine:" +#~ msgstr "??????????????????????????????????????????" + +#, fuzzy +#~ msgid "_ISO image location:" +#~ msgstr "_ISO ?????????????????????" + +#, fuzzy +#~ msgid "_Name:" +#~ msgstr "?????????" + +#~ msgid "_Paravirtualized:" +#~ msgstr "????????????(_P)???" + +#, fuzzy +#~ msgid "_Startup memory (MB):" +#~ msgstr "?????????????????????????????????MB???(_S)???" + +#, fuzzy +#~ msgid "_Virtual CPUs:" +#~ msgstr "??????????????????" + #~ msgid "20 bits/sec" #~ msgstr "20 bits/sec" @@ -3549,9 +3888,6 @@ msgstr "???" #~ msgid "Create a new virtual system" #~ msgstr "????????????????????????" -#~ msgid "Install type" -#~ msgstr "????????????" - #~ msgid "Local inst" #~ msgstr "????????????" @@ -3600,9 +3936,6 @@ msgstr "???" #~ msgid "History Samples" #~ msgstr "????????????" -#~ msgid "Local VM" -#~ msgstr "?????? VM" - #~ msgid "Remote VM" #~ msgstr "?????? VM" @@ -3642,9 +3975,6 @@ msgstr "???" #~ msgid "Error restoring domain '%s'. Is the domain already running?" #~ msgstr "?????????%s????????????????????????????????????????????????" -#~ msgid "This will permanently delete the connection \"%s\", are you sure?" -#~ msgstr "??????????????????%s?????????????????????????????????????????????" - #~ msgid "This will permanently delete the vm \"%s,\" are you sure?" #~ msgstr "????????? vm???%s?????????????????????????????????????????????" Index: virt-manager.spec =================================================================== RCS file: /cvs/pkgs/rpms/virt-manager/devel/virt-manager.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- virt-manager.spec 23 Mar 2009 22:05:58 -0000 1.49 +++ virt-manager.spec 9 Apr 2009 19:19:07 -0000 1.50 @@ -8,7 +8,7 @@ Name: virt-manager Version: 0.7.0 -Release: 2%{_extra_release} +Release: 3%{_extra_release} Summary: Virtual Machine Manager Group: Applications/Emulators @@ -17,6 +17,10 @@ Source0: http://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.gz Patch1: %{name}-%{version}-old-xen-compat.patch Patch2: %{name}-%{version}-vm-migrate-list.patch +Patch3: %{name}-%{version}-fix-button-ordering.patch +Patch4: %{name}-%{version}-fix-vcpu-cap.patch +Patch5: %{name}-%{version}-delete-dup-conn.patch +Patch6: %{name}-%{version}-update-translations.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # These two are just the oldest version tested @@ -91,6 +95,10 @@ %setup -q %patch1 -p1 %patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 %build %configure @@ -168,6 +176,12 @@ %{_datadir}/dbus-1/services/%{name}.service %changelog +* Thu Apr 09 2009 Cole Robinson - 0.7.0-3.fc11 +- Fix incorrect max vcpu setting in New VM wizard (bz 490466) +- Fix some OK/Cancel button ordering issues (bz 490207) +- Use openAuth when duplicating a connection when deleting a VM +- Updated translations (bz 493795) + * Mon Mar 23 2009 Cole Robinson - 0.7.0-2.fc11 - Back compat fixes for connecting to older xen installations (bz 489885) - Don't show harmless NoneType error when launching new VM details window From glommer at fedoraproject.org Tue Apr 14 13:59:34 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Tue, 14 Apr 2009 13:59:34 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/devel qemu.spec,1.77,1.78 Message-ID: <20090414135934.D577C700B2@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31993 Modified Files: qemu.spec Log Message: provide qemu-kvm. This will be useful to avoid installing ppc packages on x86 via comp groups. Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- qemu.spec 9 Apr 2009 15:08:34 -0000 1.77 +++ qemu.spec 14 Apr 2009 13:59:03 -0000 1.78 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.10 -Release: 7%{?dist} +Release: 8%{?dist} # I have mistakenly thought the revision name would be 1.0. # So 0.10 series get Epoch = 1 Epoch: 2 @@ -108,6 +108,9 @@ Requires: bochs-bios >= 2.3.8-0.5 Provides: kvm = 85 Obsoletes: kvm < 85 +%ifarch %{ix86} x86_64 +Provides: qemu-kvm = %{epoch}:%{version}-%{release} +%endif %description system-x86 QEMU is a generic and open source processor emulator which achieves a good @@ -122,6 +125,9 @@ Group: Development/Tools Requires: %{name}-common = %{epoch}:%{version}-%{release} Requires: openbios-ppc +%ifarch ppc ppc64 +Provides: qemu-kvm = %{epoch}:%{version}-%{release} +%endif %description system-ppc QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation. @@ -457,6 +463,9 @@ %{_mandir}/man1/qemu-img.1* %changelog +* Tue Apr 14 2009 Glauber Costa - 2:0.10-8 +- Provide qemu-kvm conditional on the architecture. + * Thu Apr 9 2009 Mark McLoughlin - 2:0.10-7 - Add a much cleaner fix for vga segfault (#494002) From glommer at fedoraproject.org Tue Apr 14 17:25:03 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Tue, 14 Apr 2009 17:25:03 +0000 (UTC) Subject: [fedora-virt-maint] rpms/openbios/devel openbios-ppc-nographic.patch, NONE, 1.1 openbios.spec, 1.2, 1.3 Message-ID: <20090414172503.2691B700B2@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/openbios/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17223 Modified Files: openbios.spec Added Files: openbios-ppc-nographic.patch Log Message: applied bugfix for 494075 openbios-ppc-nographic.patch: --- NEW FILE openbios-ppc-nographic.patch --- Index: /trunk/openbios-devel/drivers/pci.c =================================================================== --- /trunk/openbios-devel/drivers/pci.c (revision 449) +++ /trunk/openbios-devel/drivers/pci.c (revision 481) @@ -37,5 +37,6 @@ /* DECLARE data structures for the nodes. */ -DECLARE_UNNAMED_NODE( ob_pci_node, INSTALL_OPEN, 2*sizeof(int) ); +DECLARE_UNNAMED_NODE( ob_pci_bus_node, INSTALL_OPEN, 2*sizeof(int) ); +DECLARE_UNNAMED_NODE( ob_pci_simple_node, INSTALL_OPEN, 2*sizeof(int) ); const pci_arch_t *arch; @@ -157,5 +158,5 @@ } -NODE_METHODS(ob_pci_node) = { +NODE_METHODS(ob_pci_bus_node) = { { NULL, ob_pci_initialize }, { "open", ob_pci_open }, @@ -163,4 +164,10 @@ { "decode-unit", ob_pci_decode_unit }, { "encode-unit", ob_pci_encode_unit }, +}; + +NODE_METHODS(ob_pci_simple_node) = { + { NULL, ob_pci_initialize }, + { "open", ob_pci_open }, + { "close", ob_pci_close }, }; @@ -738,5 +745,10 @@ config.dev = addr & 0x00FFFFFF; - REGISTER_NAMED_NODE(ob_pci_node, config.path); + if (class == PCI_BASE_CLASS_BRIDGE && + (subclass == PCI_SUBCLASS_BRIDGE_HOST || + subclass == PCI_SUBCLASS_BRIDGE_PCI)) + REGISTER_NAMED_NODE(ob_pci_bus_node, config.path); + else + REGISTER_NAMED_NODE(ob_pci_simple_node, config.path); activate_device(config.path); Index: openbios.spec =================================================================== RCS file: /cvs/pkgs/rpms/openbios/devel/openbios.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- openbios.spec 9 Apr 2009 15:54:50 -0000 1.2 +++ openbios.spec 14 Apr 2009 17:24:32 -0000 1.3 @@ -1,6 +1,6 @@ Name: openbios Version: 1.0 -Release: 0.5.svn463%{?dist} +Release: 0.6.svn463%{?dist} Summary: OpenBios implementation of IEEE 1275-1994 Group: Applications/Emulators License: GPLv2 @@ -10,6 +10,7 @@ # tar czvf openbios-1.0.tar.gz openbios-1.0 Source0: %{name}/%{name}-%{version}.tar.gz Patch0: openbios-noerror.patch +Patch1: openbios-ppc-nographic.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libxslt @@ -91,6 +92,8 @@ %setup -q %patch0 -p1 +# -p3, so we don't need to even touch upstream patch +%patch1 -p3 %build @@ -153,6 +156,9 @@ %changelog +* Tue Apr 14 2009 Glauber Costa - 1.0.0.6 +- Applied bugfix for #494075 + * Wed Mar 04 2009 Glauber Costa - 1.0.0.5 - created openbios-common instead of openbios-doc. It owns the directories and everybody depends on it. From crobinso at fedoraproject.org Tue Apr 14 21:07:30 2009 From: crobinso at fedoraproject.org (Cole Robinson) Date: Tue, 14 Apr 2009 21:07:30 +0000 (UTC) Subject: [fedora-virt-maint] rpms/python-virtinst/devel python-virtinst.spec, 1.65, 1.66 virtinst-0.400.3-updated-trans.patch, 1.1, 1.2 Message-ID: <20090414210730.D56C5700B2@cvs1.fedora.phx.redhat.com> Author: crobinso Update of /cvs/pkgs/rpms/python-virtinst/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28315 Modified Files: python-virtinst.spec virtinst-0.400.3-updated-trans.patch Log Message: More translation updates. Index: python-virtinst.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-virtinst/devel/python-virtinst.spec,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- python-virtinst.spec 9 Apr 2009 15:13:58 -0000 1.65 +++ python-virtinst.spec 14 Apr 2009 21:06:59 -0000 1.66 @@ -17,7 +17,7 @@ Summary: Python modules and utilities for installing virtual machines Name: python-%{appname} Version: 0.400.3 -Release: 5%{_extra_release} +Release: 6%{_extra_release} Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz Patch1: %{appname}-%{version}-fix-virtimage-scratch.patch Patch2: %{appname}-%{version}-hostdev-libvirt-calls.patch @@ -97,6 +97,9 @@ %{_bindir}/virt-convert %changelog +* Tue Apr 14 2009 Cole Robinson - 0.400.3-6.fc11 +- More translation updates + * Thu Apr 9 2009 Cole Robinson - 0.400.3-5.fc11 - Don't set a keymap if user doesn't specify one (bz 487737) - Fix adding floppy devices (bz 493408) virtinst-0.400.3-updated-trans.patch: Index: virtinst-0.400.3-updated-trans.patch =================================================================== RCS file: /cvs/pkgs/rpms/python-virtinst/devel/virtinst-0.400.3-updated-trans.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- virtinst-0.400.3-updated-trans.patch 9 Apr 2009 15:11:55 -0000 1.1 +++ virtinst-0.400.3-updated-trans.patch 14 Apr 2009 21:06:59 -0000 1.2 @@ -14579,3 +14579,213 @@ - -#~ msgid "Unsupported virtualization type" -#~ msgstr "???????????????????????????" +--- virtinst-0.400.3/po/pl.po 2009-04-14 17:00:38.516111000 -0400 ++++ test/po/pl.po 2009-04-14 17:02:55.650014000 -0400 +@@ -5,8 +5,8 @@ msgid "" + msgstr "" + "Project-Id-Version: pl\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2009-04-09 10:38-0400\n" +-"PO-Revision-Date: 2009-03-25 22:57+0100\n" ++"POT-Creation-Date: 2009-04-14 17:02-0400\n" ++"PO-Revision-Date: 2009-04-13 16:30+0200\n" + "Last-Translator: Piotr Dr??g \n" + "Language-Team: Polish \n" + "MIME-Version: 1.0\n" +@@ -63,12 +63,12 @@ msgstr "Nie mo??na znale???? u??ywalnego + #: virtinst/cli.py:146 + #, python-format + msgid "Force flag is set but input was required. Prompt was: %s" +-msgstr "Flaga wymuszenia jest ustawiona, ale pro??ba by??a wymagana. By??o to: %s" ++msgstr "" + + #: virtinst/cli.py:149 + #, python-format + msgid "Prompting disabled, but input was requested. Prompt was: %s" +-msgstr "Wy????czono pro??by, ale jedna by??a wymagana. By??a to: %s" ++msgstr "" + + #: virtinst/cli.py:169 + #, python-format +@@ -76,12 +76,10 @@ msgid "" + "Prompting disabled, but yes/no was requested. Try --force to force 'yes' for " + "such prompts. Prompt was: %s" + msgstr "" +-"Wy????czono pro??by, ale pytanie tak/nie zosta??o za????dane. Spr??buj --force, aby " +-"wymusi?? \"tak\" dla takich pr????b. Pro??ba to: %s" + + #: virtinst/cli.py:179 virt-clone:48 virt-clone:69 virt-clone:108 + msgid "ERROR: " +-msgstr "B????D: " ++msgstr "" + + #: virtinst/cli.py:189 + msgid "A name is required for the virtual machine." +@@ -94,10 +92,10 @@ msgstr "Ilo???? pami??ci dla maszyny wir + #: virtinst/cli.py:199 + #, python-format + msgid "Installs currently require %d megs of RAM." +-msgstr "Instalacja obecnie wymaga %d megabajt??w RAM-u." ++msgstr "Instalacja obecnie wymaga %d megabajt??w pami??ci RAM." + + #: virtinst/cli.py:219 +-#, python-format ++#, fuzzy, python-format + msgid "" + "You have asked for more virtual CPUs (%d) than there are physical CPUs (%d) " + "on the host. This will work, but performance will be poor. Are you sure? " +@@ -105,7 +103,6 @@ msgid "" + msgstr "" + "Poprosi??e?? o wi??cej procesor??w wirtualnych (%d) ni?? jest procesor??w " + "fizycznych (%d) na ho??cie. To b??dzie dzia??a??o, ale wydajno???? b??dzie s??aba. " +-"Jeste?? pewny? (\"yes\" lub \"no\")" + + #: virtinst/cli.py:276 + msgid "Unknown network type " +@@ -323,7 +320,7 @@ msgstr "Nieznany wariant systemu operacy + + #: virtinst/Guest.py:291 + msgid "Must specify whether graphics are enabled" +-msgstr "Musisz okre??li??, czy grafika ma by?? w????czona" ++msgstr "Musisz okre??li??, czy grafika ma zosta?? w????czona" + + #: virtinst/Guest.py:314 + msgid "Graphics enabled must be True or False" +@@ -331,7 +328,7 @@ msgstr "W????czenie grafiki musi by?? \" + + #: virtinst/Guest.py:373 + msgid "You must specify a valid ISO or CD-ROM location for the installation" +-msgstr "Musisz poda?? prawid??owe po??o??enie ISO lub CD-ROM-u dla instalacji" ++msgstr "Musisz poda?? prawid??owe po??o??enie ISO lub CD-ROM dla instalacji" + + #: virtinst/Guest.py:376 + msgid "The specified media path does not exist." +@@ -588,9 +585,9 @@ msgid "OpenSolaris PV kernel not found a + msgstr "Nie znaleziono j??dra PV OpenSolarisa w %s" + + #: virtinst/OSDistro.py:1066 +-#, python-format ++#, fuzzy, python-format + msgid "OpenSolaris microroot not found at %s" +-msgstr "Nie znaleziono microroota OpenSolarisa w %s" ++msgstr "Nie znaleziono miniroota Solarisa w %s" + + #: virtinst/Storage.py:85 + #, python-format +@@ -1253,8 +1250,9 @@ msgid "This will overwrite the existing + msgstr "To zast??pi istniej??c?? ??cie??k?? \"%s\"!\n" + + #: virt-clone:115 ++#, fuzzy + msgid "Do you really want to use this disk (yes or no)?" +-msgstr "Na pewno chcesz u??y?? tego dysku (\"yes\" lub \"no\")?" ++msgstr "Na pewno chcesz u??y?? tego dysku (\"yes\" lub \"no\")" + + #: virt-clone:120 virt-install:206 + #, python-format +@@ -1262,8 +1260,9 @@ msgid "Disk %s is already in use by anot + msgstr "Dysk %s jest ju?? u??ywany przez innego go??cia!\n" + + #: virt-clone:121 virt-install:207 ++#, fuzzy + msgid "Do you really want to use the disk (yes or no)? " +-msgstr "Na pewno chcesz u??y?? dysku (\"yes\" lub \"no\")? " ++msgstr "Na pewno chcesz u??y?? tego dysku (\"yes\" lub \"no\")" + + #: virt-clone:148 virt-image:88 virt-install:334 + msgid "Connect to hypervisor with URI" +@@ -1703,12 +1702,14 @@ msgid "Error with storage parameters: %s + msgstr "B????d parametr??w pami??ci masowej: %s" + + #: virt-install:214 ++#, fuzzy + msgid " Do you really want to use the disk (yes or no)?" +-msgstr " Na pewno chcesz u??y?? tego dysku (\"yes\" lub \"no\")?" ++msgstr "Na pewno chcesz u??y?? tego dysku (\"yes\" lub \"no\")" + + #: virt-install:222 ++#, fuzzy + msgid "Cannot use --file, --size, or --disk with --nodisks" +-msgstr "Nie mo??na u??ywa?? --file, --size lub --disk z --nodisks" ++msgstr "Nie mo??na u??ywa?? --file, --file-size lub --disk z --nodisks" + + #: virt-install:225 + msgid "" +@@ -1872,12 +1873,12 @@ msgstr "" + "pro??bach" + + #: virt-install:483 ++#, fuzzy + msgid "" + "Request user input for ambiguous situations. Default is false, so will " + "terminate if a prompt would typically be fired. " + msgstr "" +-"Popro?? u??ytkownika w niejasnych sytuacjach. Domy??lnie \"fa??sz\", wi??c b??dzie " +-"zamykane, je??li zajdzie potrzeba poproszenia. " ++"Popro?? u??ytkownika w niejasnych sytuacjach lub je??li wymagane s?? opcje." + + #: virt-install:503 + msgid "" +@@ -1991,3 +1992,62 @@ msgid "" + msgstr "" + "Trwa instalacja domeny. Mo??esz ponownie po????czy?? si?? z \n" + "konsol??, aby zako??czy?? proces instalacji." ++ ++#~ msgid "(use --prompt to run interactively)" ++#~ msgstr "(u??yj --prompt, aby uruchomi?? interaktywnie)" ++ ++#~ msgid " (Use --prompt or --force to override)" ++#~ msgstr " (U??yj --prompt lub --force, aby zast??pi??)" ++ ++#~ msgid "A disk path must be specified." ++#~ msgstr "??cie??ka dysku musi zosta?? podana." ++ ++#~ msgid "What would you like to use as the disk (file path)?" ++#~ msgstr "Co chcesz u??y?? jako dysk (??cie??ka do pliku)?" ++ ++#~ msgid "" ++#~ "Please enter the path to the file you would like to use for storage. It " ++#~ "will have size %sGB." ++#~ msgstr "" ++#~ "Podaj ??cie??k?? do pliku, kt??rego chcesz u??y?? dla pami??ci masowej. B??dzie " ++#~ "mia?? rozmiar %sGB." ++ ++#~ msgid "A size must be specified for non-existent disks." ++#~ msgstr "Rozmiar musi zosta?? podany dla nieistniej??cych dysk??w." ++ ++#~ msgid "How large would you like the disk (%s) to be (in gigabytes)?" ++#~ msgstr "Jak du??y ma by?? dysk %s (w gigabajtach)?" ++ ++#~ msgid "What is the name of your virtual machine?" ++#~ msgstr "Jaka jest nazwa maszyny wirtualnej?" ++ ++#~ msgid "How much RAM should be allocated (in megabytes)?" ++#~ msgstr "Ile pami??ci RAM powinno zosta?? przydzielonych (w megabajtach)?" ++ ++#~ msgid "Are you sure? (yes or no)" ++#~ msgstr "Jeste?? pewny? (\"yes\" lub \"no\")" ++ ++#~ msgid "Didn't match keymap '%s' in keytable!" ++#~ msgstr "Nie pasuje do mapy klawiszy \"%s\" w tablicy klawiszy!" ++ ++#~ msgid "A name is required for the new virtual machine." ++#~ msgstr "Nazwa nowej maszyny wirtualnej jest wymagana." ++ ++#~ msgid "An original machine name or xml file is required." ++#~ msgstr "Oryginalna nazwa maszyny lub plik XML s?? wymagane." ++ ++#~ msgid "" ++#~ "Would you like a fully virtualized guest (yes or no)? This will allow you " ++#~ "to run unmodified operating systems." ++#~ msgstr "" ++#~ "Czy chcesz pe??n?? wirtualizacj?? go??cia (\"yes\" lub \"no\")? Umo??liwi to " ++#~ "uruchomienie niezmodyfikowanych system??w operacyjnych." ++ ++#~ msgid "Would you like to use %s acceleration? (yes or no)" ++#~ msgstr "Na pewno chcesz u??y?? akceleracji %s? (\"yes\" lub \"no\")" ++ ++#~ msgid "What is the install CD-ROM/ISO or URL?" ++#~ msgstr "Jaki jest CD-ROM/ISO lub adres URL instalacji?" ++ ++#~ msgid "What is the install URL?" ++#~ msgstr "Jaki jest adres URL instalacji?" From crobinso at fedoraproject.org Tue Apr 14 21:12:31 2009 From: crobinso at fedoraproject.org (Cole Robinson) Date: Tue, 14 Apr 2009 21:12:31 +0000 (UTC) Subject: [fedora-virt-maint] rpms/virt-manager/devel virt-manager-0.7.0-update-translations.patch, 1.1, 1.2 virt-manager.spec, 1.50, 1.51 Message-ID: <20090414211231.91BD9700B2@cvs1.fedora.phx.redhat.com> Author: crobinso Update of /cvs/pkgs/rpms/virt-manager/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29789 Modified Files: virt-manager-0.7.0-update-translations.patch virt-manager.spec Log Message: More translation updates. virt-manager-0.7.0-update-translations.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 virt-manager-0.7.0-update-translations.patch Index: virt-manager-0.7.0-update-translations.patch =================================================================== RCS file: /cvs/pkgs/rpms/virt-manager/devel/virt-manager-0.7.0-update-translations.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- virt-manager-0.7.0-update-translations.patch 9 Apr 2009 19:19:06 -0000 1.1 +++ virt-manager-0.7.0-update-translations.patch 14 Apr 2009 21:12:29 -0000 1.2 @@ -122619,3 +122619,9025 @@ #~ msgid "This will permanently delete the vm \"%s,\" are you sure?" #~ msgstr "????????? vm???%s?????????????????????????????????????????????" +--- virt-manager-0.7.0/po/es.po 2009-04-14 17:00:09.340462000 -0400 ++++ test/po/es.po 2009-04-14 17:07:29.045902000 -0400 +@@ -1,5 +1,5 @@ + # translation of es.po to Spanish +-# SOME DESCRIPTIVE TITLE HERE. ++# Spanish translation of virt-manager. + # This file is distributed under the same license as the PACKAGE package. + # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER. + # Manuel Ospina , 2006. +@@ -8,19 +8,19 @@ msgid "" + msgstr "" + "Project-Id-Version: es\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2009-04-09 12:36-0400\n" +-"PO-Revision-Date: 2007-06-22 11:34-0300\n" +-"Last-Translator: Domingo Becker \n" +-"Language-Team: Spanish \n" ++"POT-Creation-Date: 2009-04-14 17:07-0400\n" ++"PO-Revision-Date: 2009-04-12 12:09-0600\n" ++"Last-Translator: Izaac Zavaleta \n" ++"Language-Team: fedora spanish \n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" +-"X-Generator: KBabel 1.9.1\n" ++"X-Poedit-Language: Spanish\n" + + #: ../src/virt-manager.desktop.in.in.h:1 + #, fuzzy + msgid "Manage virtual machines" +-msgstr "Guardando M??quina Virtual" ++msgstr "Administra M??quinas Virtuales" + + #: ../src/virt-manager.desktop.in.in.h:2 ../src/vmm-manager.glade.h:17 + msgid "Virtual Machine Manager" +@@ -29,196 +29,243 @@ msgstr "Administrador de M??quina Virtua + #: ../src/virt-manager.py.in:55 + #, fuzzy + msgid "Error starting Virtual Machine Manager" +-msgstr "Administrador de M??quina Virtual" ++msgstr "Error iniciando Administrador de M??quina Virtual" + + #. ...the risk is we catch too much though + #. Damned if we do, damned if we dont :-)( + #: ../src/virt-manager.py.in:284 + #, fuzzy, python-format + msgid "Unable to initialize GTK: %s" +-msgstr "No se pudo iniciar GTK:" ++msgstr "No se pudo iniciar GTK: %s" + + #: ../src/virt-manager.schemas.in.h:1 ++#, fuzzy + msgid "Install sound device for local VM" +-msgstr "" ++msgstr "Instalar dispositivo de sonido para M??quina Virtual local" + + #: ../src/virt-manager.schemas.in.h:2 + msgid "Install sound device for remote VM" +-msgstr "" ++msgstr "Instalar dispositivo de sonido para M??quina Virtual remota" + + #: ../src/virt-manager.schemas.in.h:3 ++#, fuzzy + msgid "Poll cpu stats" +-msgstr "" ++msgstr "Muestrea estad??sticas de cpu" + + #: ../src/virt-manager.schemas.in.h:4 ++#, fuzzy + msgid "Poll disk i/o stats" +-msgstr "" ++msgstr "Muestrea estad??sticas de e/s de disco" + + #: ../src/virt-manager.schemas.in.h:5 + #, fuzzy + msgid "Poll memory usage stats" +-msgstr "Uso de Memoria" ++msgstr "Muestrea estad??sticas de Uso de Memoria" + + #: ../src/virt-manager.schemas.in.h:6 ++#, fuzzy + msgid "Poll net i/o stats" +-msgstr "" ++msgstr "Muestrea estad??sticas de e/s de red" + + #: ../src/virt-manager.schemas.in.h:7 + msgid "Show VCPU count in summary" +-msgstr "" ++msgstr "Muestra conteo VCPU en resumen" + + #: ../src/virt-manager.schemas.in.h:8 + msgid "Show cpu usage in summary" +-msgstr "" ++msgstr "Muestra uso de cpu en resumen" + + #: ../src/virt-manager.schemas.in.h:9 + #, fuzzy + msgid "Show disk I/O in summary" +-msgstr "Tr??fico de Red" ++msgstr "Muestra resumen E/S de disco" + + #: ../src/virt-manager.schemas.in.h:10 + msgid "Show domain id in summary" +-msgstr "" ++msgstr "Muestra id de dominio en resumen" + + #: ../src/virt-manager.schemas.in.h:11 + msgid "Show memory usage in summary" +-msgstr "" ++msgstr "Muestra uso de memoria en resumen" + + #: ../src/virt-manager.schemas.in.h:12 + #, fuzzy + msgid "Show network I/O in summary" +-msgstr "Tr??fico de Red" ++msgstr "Muestra E/S de red en resumen" + + #: ../src/virt-manager.schemas.in.h:13 + msgid "Show run state in summary" +-msgstr "" ++msgstr "Muestra estado de ejecuci??n en resumen" + + #: ../src/virt-manager.schemas.in.h:14 ++#, fuzzy + msgid "Show the cpu usage field in the domain list summary view" +-msgstr "" ++msgstr "Muestra el campo de uso de cpu en la vista de resumen lista de dominio" + + #: ../src/virt-manager.schemas.in.h:15 ++#, fuzzy + msgid "Show the disk I/O field in the domain list summary view" + msgstr "" ++"Muestra el campo de E/S de disco en la lista de dominio en vista de resumen" + + #: ../src/virt-manager.schemas.in.h:16 ++#, fuzzy + msgid "Show the domain id field in the domain list summary view" + msgstr "" ++"Muestra el campo id de dominio en la lista de dominio en vista de resumen" + + #: ../src/virt-manager.schemas.in.h:17 ++#, fuzzy + msgid "Show the memory usage field in the domain list summary view" + msgstr "" ++"Muestra el campo de uso de memoria en la lista de dominio en vista de resumen" + + #: ../src/virt-manager.schemas.in.h:18 ++#, fuzzy + msgid "Show the network I/O field in the domain list summary view" +-msgstr "" ++msgstr "Muestra el campo E/S de red en la lista de dominio en vista de resumen" + + #: ../src/virt-manager.schemas.in.h:19 ++#, fuzzy + msgid "Show the run state field in the domain list summary view" + msgstr "" ++"Muestra el campo estado de ejecuci??n en la lista de dominio en vista de " ++"resumen" + + #: ../src/virt-manager.schemas.in.h:20 ++#, fuzzy + msgid "Show the virtual CPU count field in the domain list summary view" + msgstr "" ++"Muestra el campo de conteo de VCPU en la lista de dominio en vista de resumen" + + #: ../src/virt-manager.schemas.in.h:21 + msgid "The length of the list of URLs" +-msgstr "" ++msgstr "El tama??o de la lista de URLs" + + #: ../src/virt-manager.schemas.in.h:22 + msgid "The number of samples to keep in the statistics history" +-msgstr "" ++msgstr "El numero de muestras a conservar en el historial de estad??sticas" + + #: ../src/virt-manager.schemas.in.h:23 ++#, fuzzy + msgid "" + "The number of urls to keep in the history for the install media address page." + msgstr "" ++"El numero de urls a conservar en el historial la p??gina de medio de " ++"instalaci??n." + + #: ../src/virt-manager.schemas.in.h:24 + msgid "The statistics history length" +-msgstr "" ++msgstr "Tama??o de historial de estad??sticas" + [...8634 lines suppressed...] +- +-#~ msgid "File Size Select" +-#~ msgstr "Wyb??r rozmiaru pliku" +- +-#~ msgid "ISO Location Field" +-#~ msgstr "Pole po??o??enia pliku ISO" +- +-#~ msgid "ISO _location:" +-#~ msgstr "_Po??o??enie pliku ISO:" +- +-#~ msgid "Initial memory:" +-#~ msgstr "Pami???? pocz??tkowa:" +- +-#~ msgid "Install URL Field" +-#~ msgstr "Pole URL instalacji" +- +-#~ msgid "Installation media _URL:" +-#~ msgstr "_URL no??nika instalacji:" +- +-#~ msgid "Installation source:" +-#~ msgstr "??r??d??o instalacji:" +- +-#~ msgid "" +-#~ "Involves hardware simulation, allowing for a greater range of virtual " +-#~ "devices and operating systems (does not require OS modification)." +-#~ msgstr "" +-#~ "U??ywa symulacji sprz??towej, pozwala na u??ywanie wi??kszej ilo??ci urz??dze?? " +-#~ "wirtualnych i system??w operacyjnych (nie wymaga modyfikacji systemu " +-#~ "operacyjnego)." +- +-#~ msgid "Kernel arguments:" +-#~ msgstr "Parametry j??dra:" +- +-#~ msgid "Kickstart Field" +-#~ msgstr "Pole kickstart" +- +-#~ msgid "Kickstart source:" +-#~ msgstr "??r??d??o kickstart:" +- +-#~ msgid "" +-#~ "Lightweight method of virtualizing machines. Limits operating system " +-#~ "choices because the OS must be specially modified to support " +-#~ "paravirtualization, but performs better than fully virtualized." +-#~ msgstr "" +-#~ "Lekka metoda wirtualizowania maszyn. Ogranicza wyb??r system??w " +-#~ "operacyjnych, poniewa?? system musi by?? odpowiednio zmodyfikowany, aby " +-#~ "obs??ugiwa?? parawirtualizacj??. Jest bardziej wydajne ni?? systemy w pe??ni " +-#~ "wirtualizowane." +- +-#~ msgid "Logical host CPUs:" +-#~ msgstr "Logiczne procesory hosta:" +- +-#~ msgid "MAC Field" +-#~ msgstr "Pole MAC" +- +-#~ msgid "Machine name:" +-#~ msgstr "Nazwa maszyny:" +- +-#~ msgid "Max Mem Select" +-#~ msgstr "Wyb??r maksymalnej ilo??ci pami??ci" +- +-#~ msgid "Maximum memory:" +-#~ msgstr "Maksymalna pami????:" +- +-#~ msgid "Maximum virtual CPUs:" +-#~ msgstr "Maksymalna liczba wirtualnych procesor??w:" +- +-#~ msgid "Media Path Select" +-#~ msgstr "Wyb??r ??cie??ki do no??nika" +- +-#~ msgid "Method" +-#~ msgstr "Metoda" +- +-#~ msgid "Name Field" +-#~ msgstr "Pole nazwy" +- +-#~ msgid "Network Select" +-#~ msgstr "Wyb??r sieci" +- +-#~ msgid "OS _Variant:" +-#~ msgstr "_Wariant systemu operacyjnego:" +- +-#~ msgid "Partition Field" +-#~ msgstr "Pole partycji" +- +-#~ msgid "Please choose a name for your virtual machine:" +-#~ msgstr "Wybierz nazw?? maszyny wirtualnej:" +- +-#~ msgid "" +-#~ "Please choose the operating system you will be installing on the virtual " +-#~ "machine:" +-#~ msgstr "" +-#~ "Wybierz typ systemu operacyjnego, kt??ry b??dziesz instalowa?? na maszynie " +-#~ "wirtualnej:" +- +-#~ msgid "" +-#~ "Please enter the memory configuration for this virtual machine. You can " +-#~ "specify the maximum amount of memory the virtual machine should be able " +-#~ "to use, and optionally a lower amount to grab on startup. Warning: " +-#~ "setting virtual machine memory too high will cause out-of-memory errors " +-#~ "in your host domain!" +-#~ msgstr "" +-#~ "Podaj konfiguracj?? pami??ci dla tej maszyny wirtualnej. Mo??na poda?? " +-#~ "maksymaln?? ilo???? pami??ci, kt??r?? maszyna wirtualna mo??e u??ywa?? oraz " +-#~ "opcjonalnie mniejsz?? ilo???? do przechwycenia podczas uruchomienia. " +-#~ "Ostrze??enie: ustawienie za du??ej pami??ci maszyny wirtualnej spowoduje " +-#~ "b????dy braku pami??ci w domenie hosta!" +- +-#~ msgid "" +-#~ "Please enter the number of virtual CPUs this virtual machine should start " +-#~ "up with." +-#~ msgstr "" +-#~ "Podaj liczb?? wirtualnych procesor??w, z kt??r?? ta maszyna wirtualna powinna " +-#~ "by?? uruchamiana." +- +-#~ msgid "" +-#~ "Please indicate how you'd like to assign space from the host for your new " +-#~ "virtual machine. This space will be used to install the virtual machine's " +-#~ "operating system." +-#~ msgstr "" +-#~ "Wska??, jak chcesz przydzieli?? przestrze?? z hosta dla nowej maszyny " +-#~ "wirtualnej. Ta przestrze?? zostanie u??yta do zainstalowania systemu " +-#~ "operacyjnego w maszynie wirtualnej." +- +-#~ msgid "" +-#~ "Please indicate how you'd like to connect your new virtual machine to the " +-#~ "host network." +-#~ msgstr "Wska??, jak chcesz po????czy?? now?? maszyn?? wirtualn?? do sieci hosta." +- +-#~ msgid "" +-#~ "Please indicate where installation media is available for the operating " +-#~ "system you would like to install on this virtual machine. Optionally you " +-#~ "can provide the URL for a kickstart file:" +-#~ msgstr "" +-#~ "Wska??, gdzie jest dost??pny no??nik instalacyjny systemu operacyjnego, " +-#~ "kt??ry chcesz zainstalowa?? na tej maszynie wirtualnej. Opcjonalnie mo??na " +-#~ "poda?? adres URL do pliku kickstart:" +- +-#~ msgid "" +-#~ "Please indicate where installation media is available for the operating " +-#~ "system you would like to install on this virtual machine:" +-#~ msgstr "" +-#~ "Wska??, gdzie jest dost??pny no??nik instalacyjny systemu operacyjnego, " +-#~ "kt??ry chcesz zainstalowa?? na tej maszynie wirtualnej:" +- +-#~ msgid "Set fixed MAC _address for your virtual machine?" +-#~ msgstr "Ustawi?? sta??y _adres MAC dla maszyny wirtualnej?" +- +-#~ msgid "Startup Mem Select" +-#~ msgstr "Wyb??r pami??ci pocz??tkowej" +- +-#~ msgid "" +-#~ "The location of the files necessary for installing an operating " +-#~ "system on the virtual machine" +-#~ msgstr "" +-#~ "Po??o??enie plik??w wymagane do zainstalowania systemu operacyjnego " +-#~ "na maszynie wirtualnej" +- +-#~ msgid "" +-#~ "This assistant will guide you through creating a new virtual machine. You " +-#~ "will be asked for some information about the virtual machine you'd like " +-#~ "to create, such as:" +-#~ msgstr "" +-#~ "Ten asystent przeprowadzi ci?? przez tworzenie nowej maszyny wirtualnej. " +-#~ "Zastaniesz poproszony o kilka informacji o maszynie wirtualnej, kt??r?? " +-#~ "chcesz utworzy??, takich jak:" +- +-#~ msgid "Virtual CPUs:" +-#~ msgstr "Wirtualne procesory:" +- +-#~ msgid "Virtualization method:" +-#~ msgstr "Metoda wirtualizacji:" +- +-#~ msgid "" +-#~ "Whether the virtual machine will be fully virtualized or para-" +-#~ "virtualized" +-#~ msgstr "" +-#~ "Czy maszyna wirtualna b??dzie w pe??ni wirtualizowana, czy " +-#~ "parawirtualizowana" +- +-#~ msgid "" +-#~ "You will need to choose a virtualization method for your new virtual " +-#~ "machine:" +-#~ msgstr "Musisz wybra?? metod?? wirtualizacji dla nowej maszyny wirtualnej:" +- +-#~ msgid "_ISO image location:" +-#~ msgstr "Po??o??enie obrazu _ISO:" +- +-#~ msgid "_Name:" +-#~ msgstr "_Nazwa:" +- +-#~ msgid "_Paravirtualized:" +-#~ msgstr "_Parawirtualizacja:" +- +-#~ msgid "_Startup memory (MB):" +-#~ msgstr "_Pami???? pocz??tkowa (MB):" +- +-#~ msgid "_Virtual CPUs:" +-#~ msgstr "_Wirtualne procesory:" ++#~ "Migrowanie maszyny wirtualnej \"%s\" z %s do %s. To mo??e chwil?? zaj????." Index: virt-manager.spec =================================================================== RCS file: /cvs/pkgs/rpms/virt-manager/devel/virt-manager.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- virt-manager.spec 9 Apr 2009 19:19:07 -0000 1.50 +++ virt-manager.spec 14 Apr 2009 21:12:30 -0000 1.51 @@ -8,7 +8,7 @@ Name: virt-manager Version: 0.7.0 -Release: 3%{_extra_release} +Release: 4%{_extra_release} Summary: Virtual Machine Manager Group: Applications/Emulators @@ -176,6 +176,9 @@ %{_datadir}/dbus-1/services/%{name}.service %changelog +* Tue Apr 14 2009 Cole Robinson - 0.7.0-4.fc11 +- More translation updates + * Thu Apr 09 2009 Cole Robinson - 0.7.0-3.fc11 - Fix incorrect max vcpu setting in New VM wizard (bz 490466) - Fix some OK/Cancel button ordering issues (bz 490207) From karsten at fedoraproject.org Thu Apr 16 09:06:39 2009 From: karsten at fedoraproject.org (Karsten Hopp) Date: Thu, 16 Apr 2009 09:06:39 +0000 (UTC) Subject: [fedora-virt-maint] rpms/ocaml-libvirt/devel ocaml-libvirt.spec, 1.28, 1.29 Message-ID: <20090416090639.DCB8770127@cvs1.fedora.phx.redhat.com> Author: karsten Update of /cvs/extras/rpms/ocaml-libvirt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocaml-libvirt/devel Modified Files: ocaml-libvirt.spec Log Message: - ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs (added sparc64 per request from the sparc maintainer) Index: ocaml-libvirt.spec =================================================================== RCS file: /cvs/extras/rpms/ocaml-libvirt/devel/ocaml-libvirt.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- ocaml-libvirt.spec 10 Mar 2009 10:42:17 -0000 1.28 +++ ocaml-libvirt.spec 16 Apr 2009 09:06:09 -0000 1.29 @@ -14,6 +14,7 @@ URL: http://libvirt.org/ocaml/ Source0: http://libvirt.org/sources/ocaml/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +ExcludeArch: sparc64 s390 s390x BuildRequires: ocaml >= 3.10.0 BuildRequires: ocaml-ocamldoc @@ -123,6 +124,10 @@ %changelog +* Thu Apr 16 2009 S390x secondary arch maintainer +- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs + (added sparc64 per request from the sparc maintainer) + * Tue Mar 10 2009 Richard W.M. Jones - 0.6.1.0-1 - New upstream release 0.6.1.0. From karsten at fedoraproject.org Thu Apr 16 09:26:44 2009 From: karsten at fedoraproject.org (Karsten Hopp) Date: Thu, 16 Apr 2009 09:26:44 +0000 (UTC) Subject: [fedora-virt-maint] rpms/virt-df/devel virt-df.spec,1.10,1.11 Message-ID: <20090416092644.8242770127@cvs1.fedora.phx.redhat.com> Author: karsten Update of /cvs/extras/rpms/virt-df/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12785/virt-df/devel Modified Files: virt-df.spec Log Message: - ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs (added sparc64 per request from the sparc maintainer) Index: virt-df.spec =================================================================== RCS file: /cvs/extras/rpms/virt-df/devel/virt-df.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- virt-df.spec 10 Mar 2009 11:20:53 -0000 1.10 +++ virt-df.spec 16 Apr 2009 09:26:14 -0000 1.11 @@ -12,6 +12,7 @@ URL: http://et.redhat.com/~rjones/virt-df/ Source0: http://et.redhat.com/~rjones/virt-df/files/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +ExcludeArch: sparc64 s390 s390x Patch0: virt-df-2.1.4-bogus-zh_CN-plurals.patch @@ -98,6 +99,10 @@ %changelog +* Thu Apr 16 2009 S390x secondary arch maintainer +- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs + (added sparc64 per request from the sparc maintainer) + * Tue Mar 10 2009 Richard W.M. Jones - 2.1.5-1 - New upstream version 2.1.5. - Remove patch for camlp4, since it's now upstream. From karsten at fedoraproject.org Thu Apr 16 09:26:44 2009 From: karsten at fedoraproject.org (Karsten Hopp) Date: Thu, 16 Apr 2009 09:26:44 +0000 (UTC) Subject: [fedora-virt-maint] rpms/virt-mem/devel virt-mem.spec,1.8,1.9 Message-ID: <20090416092644.C945970127@cvs1.fedora.phx.redhat.com> Author: karsten Update of /cvs/extras/rpms/virt-mem/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12785/virt-mem/devel Modified Files: virt-mem.spec Log Message: - ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs (added sparc64 per request from the sparc maintainer) Index: virt-mem.spec =================================================================== RCS file: /cvs/extras/rpms/virt-mem/devel/virt-mem.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- virt-mem.spec 26 Feb 2009 00:33:26 -0000 1.8 +++ virt-mem.spec 16 Apr 2009 09:26:14 -0000 1.9 @@ -11,6 +11,7 @@ URL: http://et.redhat.com/~rjones/virt-mem/ Source0: http://et.redhat.com/~rjones/virt-mem/files/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +ExcludeArch: sparc64 s390 s390x Patch0: virt-mem-0.3.1-bitstring2.patch Patch1: virt-mem-0.3.1-dynlink.patch @@ -112,6 +113,10 @@ %changelog +* Thu Apr 16 2009 S390x secondary arch maintainer +- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs + (added sparc64 per request from the sparc maintainer) + * Wed Feb 25 2009 Fedora Release Engineering - 0.3.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From karsten at fedoraproject.org Thu Apr 16 09:26:45 2009 From: karsten at fedoraproject.org (Karsten Hopp) Date: Thu, 16 Apr 2009 09:26:45 +0000 (UTC) Subject: [fedora-virt-maint] rpms/virt-top/devel virt-top.spec,1.5,1.6 Message-ID: <20090416092645.18C2C70127@cvs1.fedora.phx.redhat.com> Author: karsten Update of /cvs/extras/rpms/virt-top/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12785/virt-top/devel Modified Files: virt-top.spec Log Message: - ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs (added sparc64 per request from the sparc maintainer) Index: virt-top.spec =================================================================== RCS file: /cvs/extras/rpms/virt-top/devel/virt-top.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- virt-top.spec 26 Feb 2009 00:35:02 -0000 1.5 +++ virt-top.spec 16 Apr 2009 09:26:14 -0000 1.6 @@ -11,6 +11,7 @@ URL: http://et.redhat.com/~rjones/virt-top/ Source0: http://et.redhat.com/~rjones/virt-top/files/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +ExcludeArch: sparc64 s390 s390x Patch0: virt-top-1.0.3-bogus-zh_CN-plurals.patch @@ -98,6 +99,10 @@ %changelog +* Thu Apr 16 2009 S390x secondary arch maintainer +- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs + (added sparc64 per request from the sparc maintainer) + * Wed Feb 25 2009 Fedora Release Engineering - 1.0.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From markmc at fedoraproject.org Thu Apr 16 15:25:59 2009 From: markmc at fedoraproject.org (Mark McLoughlin) Date: Thu, 16 Apr 2009 15:25:59 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libvirt/devel libvirt-0.6.2-qemu-drive-format.patch, NONE, 1.1 libvirt.spec, 1.123, 1.124 Message-ID: <20090416152559.2148D7013C@cvs1.fedora.phx.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/libvirt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12877 Modified Files: libvirt.spec Added Files: libvirt-0.6.2-qemu-drive-format.patch Log Message: * Thu Apr 16 2009 Mark McLoughlin - 0.6.2-2.fc12 - Fix qemu drive format specification (#496092) libvirt-0.6.2-qemu-drive-format.patch: --- NEW FILE libvirt-0.6.2-qemu-drive-format.patch --- >From 0ae4c67ff5f1d24698c5cfc8a9719d333c892644 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Thu, 16 Apr 2009 11:23:55 +0100 Subject: [PATCH 1/3] qemu -drive takes format= not fmt= Seems like a simple typo - it has been "format=" since the flag was introduced, but we added it as "fmt=". Signed-off-by: Mark McLoughlin --- src/qemu_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu_conf.c b/src/qemu_conf.c index f36c927..6f9e610 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -1135,7 +1135,7 @@ int qemudBuildCommandLine(virConnectPtr conn, disk->device == VIR_DOMAIN_DISK_DEVICE_DISK) virBufferAddLit(&opt, ",boot=on"); if (disk->driverType) - virBufferVSprintf(&opt, ",fmt=%s", disk->driverType); + virBufferVSprintf(&opt, ",format=%s", disk->driverType); if (disk->cachemode) { const char *mode = Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v retrieving revision 1.123 retrieving revision 1.124 diff -u -r1.123 -r1.124 --- libvirt.spec 3 Apr 2009 15:52:11 -0000 1.123 +++ libvirt.spec 16 Apr 2009 15:25:28 -0000 1.124 @@ -66,11 +66,14 @@ Summary: Library providing a simple API virtualization Name: libvirt Version: 0.6.2 -Release: 1%{?dist}%{?extra_release} +Release: 2%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries Source: libvirt-%{version}.tar.gz +# Patches cherry-picked from upstream +Patch0: libvirt-0.6.2-qemu-drive-format.patch + # Not for upstream. Temporary hack till PulseAudio autostart # problems are sorted out when SELinux enforcing Patch200: libvirt-0.6.2-svirt-sound.patch @@ -224,6 +227,8 @@ %prep %setup -q +%patch0 -p1 + %patch200 -p0 mv NEWS NEWS.old @@ -542,6 +547,9 @@ %endif %changelog +* Thu Apr 16 2009 Mark McLoughlin - 0.6.2-2.fc12 +- Fix qemu drive format specification (#496092) + * Fri Apr 3 2009 Daniel Veillard - 0.6.2-1.fc11 - release of 0.6.2 - memory ballooning in QEMU From markmc at fedoraproject.org Thu Apr 16 15:27:15 2009 From: markmc at fedoraproject.org (Mark McLoughlin) Date: Thu, 16 Apr 2009 15:27:15 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libvirt/F-11 libvirt-0.6.2-qemu-drive-format.patch, NONE, 1.1 libvirt.spec, 1.123, 1.124 Message-ID: <20090416152715.7AA7770127@cvs1.fedora.phx.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/libvirt/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13667 Modified Files: libvirt.spec Added Files: libvirt-0.6.2-qemu-drive-format.patch Log Message: * Thu Apr 16 2009 Mark McLoughlin - 0.6.2-2.fc11 - Fix qemu drive format specification (#496092) libvirt-0.6.2-qemu-drive-format.patch: --- NEW FILE libvirt-0.6.2-qemu-drive-format.patch --- >From 0ae4c67ff5f1d24698c5cfc8a9719d333c892644 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Thu, 16 Apr 2009 11:23:55 +0100 Subject: [PATCH 1/3] qemu -drive takes format= not fmt= Seems like a simple typo - it has been "format=" since the flag was introduced, but we added it as "fmt=". Signed-off-by: Mark McLoughlin --- src/qemu_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu_conf.c b/src/qemu_conf.c index f36c927..6f9e610 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -1135,7 +1135,7 @@ int qemudBuildCommandLine(virConnectPtr conn, disk->device == VIR_DOMAIN_DISK_DEVICE_DISK) virBufferAddLit(&opt, ",boot=on"); if (disk->driverType) - virBufferVSprintf(&opt, ",fmt=%s", disk->driverType); + virBufferVSprintf(&opt, ",format=%s", disk->driverType); if (disk->cachemode) { const char *mode = Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/F-11/libvirt.spec,v retrieving revision 1.123 retrieving revision 1.124 diff -u -r1.123 -r1.124 --- libvirt.spec 3 Apr 2009 15:52:11 -0000 1.123 +++ libvirt.spec 16 Apr 2009 15:26:45 -0000 1.124 @@ -66,11 +66,14 @@ Summary: Library providing a simple API virtualization Name: libvirt Version: 0.6.2 -Release: 1%{?dist}%{?extra_release} +Release: 2%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries Source: libvirt-%{version}.tar.gz +# Patches cherry-picked from upstream +Patch0: libvirt-0.6.2-qemu-drive-format.patch + # Not for upstream. Temporary hack till PulseAudio autostart # problems are sorted out when SELinux enforcing Patch200: libvirt-0.6.2-svirt-sound.patch @@ -224,6 +227,8 @@ %prep %setup -q +%patch0 -p1 + %patch200 -p0 mv NEWS NEWS.old @@ -542,6 +547,9 @@ %endif %changelog +* Thu Apr 16 2009 Mark McLoughlin - 0.6.2-2.fc11 +- Fix qemu drive format specification (#496092) + * Fri Apr 3 2009 Daniel Veillard - 0.6.2-1.fc11 - release of 0.6.2 - memory ballooning in QEMU From rel-eng at fedoraproject.org Thu Apr 16 15:50:23 2009 From: rel-eng at fedoraproject.org (Fedora Release Engineering) Date: Thu, 16 Apr 2009 15:50:23 -0000 Subject: [fedora-virt-maint] #1486: Please tag libvirt-0.6.2-2.fc11 for F11 Message-ID: <049.efb5a443b4439e16c009d828af1753dc@fedoraproject.org> #1486: Please tag libvirt-0.6.2-2.fc11 for F11 -----------------------------+---------------------------------------------- Reporter: markmc | Owner: rel-eng at lists.fedoraproject.org Type: task | Status: new Milestone: Fedora 11 Final | Component: koji Keywords: | -----------------------------+---------------------------------------------- libvirt-0.6.2-2.fc11 fixes a problem whereby we were using the wrong qemu command line syntax to specify the image file format. https://bugzilla.redhat.com/496092 Without the fix, you cannot specify a format for a disk image. It is considered a security flaw not to explicitly specify the format. See e.g. http://git.kernel.org/?p=virt/qemu/qemu.git;a=commitdiff;h=1e72d3b7 The fix is a simple one-liner, already committed upstream. -- Ticket URL: Fedora Release Engineering Release Engineering for the Fedora Project From rel-eng at fedoraproject.org Thu Apr 16 16:01:46 2009 From: rel-eng at fedoraproject.org (Fedora Release Engineering) Date: Thu, 16 Apr 2009 16:01:46 -0000 Subject: [fedora-virt-maint] Re: #1486: Please tag libvirt-0.6.2-2.fc11 for F11 In-Reply-To: <049.efb5a443b4439e16c009d828af1753dc@fedoraproject.org> References: <049.efb5a443b4439e16c009d828af1753dc@fedoraproject.org> Message-ID: <058.38b459ccb0cb0afe1b4927096dca744f@fedoraproject.org> #1486: Please tag libvirt-0.6.2-2.fc11 for F11 ------------------------------+--------------------------------------------- Reporter: markmc | Owner: rel-eng at lists.fedoraproject.org Type: task | Status: new Milestone: Fedora 11 Final | Component: koji Resolution: | Keywords: ------------------------------+--------------------------------------------- Comment (by jwboyer): +1 -- Ticket URL: Fedora Release Engineering Release Engineering for the Fedora Project From rel-eng at fedoraproject.org Thu Apr 16 16:11:33 2009 From: rel-eng at fedoraproject.org (Fedora Release Engineering) Date: Thu, 16 Apr 2009 16:11:33 -0000 Subject: [fedora-virt-maint] Re: #1486: Please tag libvirt-0.6.2-2.fc11 for F11 In-Reply-To: <049.efb5a443b4439e16c009d828af1753dc@fedoraproject.org> References: <049.efb5a443b4439e16c009d828af1753dc@fedoraproject.org> Message-ID: <058.dc0878caccbffe708d7fa3599c633685@fedoraproject.org> #1486: Please tag libvirt-0.6.2-2.fc11 for F11 ------------------------------+--------------------------------------------- Reporter: markmc | Owner: rel-eng at lists.fedoraproject.org Type: task | Status: closed Milestone: Fedora 11 Final | Component: koji Resolution: fixed | Keywords: ------------------------------+--------------------------------------------- Changes (by wtogami): * status: new => closed * resolution: => fixed Comment: tagged -- Ticket URL: Fedora Release Engineering Release Engineering for the Fedora Project From markmc at fedoraproject.org Thu Apr 16 17:54:43 2009 From: markmc at fedoraproject.org (Mark McLoughlin) Date: Thu, 16 Apr 2009 17:54:43 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libvirt/F-10 libvirt-0.5.1-read-only-checks.patch, 1.2, 1.3 .cvsignore, 1.33, 1.34 libvirt.spec, 1.110, 1.111 sources, 1.39, 1.40 Message-ID: <20090416175443.D086370127@cvs1.fedora.phx.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/libvirt/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16308 Modified Files: .cvsignore libvirt.spec sources Added Files: libvirt-0.5.1-read-only-checks.patch Log Message: 0.6.1 has been unpushed from update-testing Revert to libvirt-0_5_1-2_fc10 tag libvirt-0.5.1-read-only-checks.patch: Index: libvirt-0.5.1-read-only-checks.patch =================================================================== RCS file: libvirt-0.5.1-read-only-checks.patch diff -N libvirt-0.5.1-read-only-checks.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ libvirt-0.5.1-read-only-checks.patch 16 Apr 2009 17:54:43 -0000 1.3 @@ -0,0 +1,152 @@ +diff --git a/src/libvirt.c b/src/libvirt.c +--- a/src/libvirt.c ++++ b/src/libvirt.c +@@ -2296,6 +2296,16 @@ virDomainMigrate (virDomainPtr domain, + conn = domain->conn; /* Source connection. */ + if (!VIR_IS_CONNECT (dconn)) { + virLibConnError (conn, VIR_ERR_INVALID_CONN, __FUNCTION__); ++ return NULL; ++ } ++ ++ if (domain->conn->flags & VIR_CONNECT_RO) { ++ virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); ++ return NULL; ++ } ++ if (dconn->flags & VIR_CONNECT_RO) { ++ /* NB, delibrately report error against source object, not dest here */ ++ virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + return NULL; + } + +@@ -2426,6 +2436,11 @@ virDomainMigratePrepare (virConnectPtr d + return -1; + } + ++ if (dconn->flags & VIR_CONNECT_RO) { ++ virLibConnError(dconn, VIR_ERR_OPERATION_DENIED, __FUNCTION__); ++ return -1; ++ } ++ + if (dconn->driver->domainMigratePrepare) + return dconn->driver->domainMigratePrepare (dconn, cookie, cookielen, + uri_in, uri_out, +@@ -2457,6 +2472,11 @@ virDomainMigratePerform (virDomainPtr do + } + conn = domain->conn; + ++ if (domain->conn->flags & VIR_CONNECT_RO) { ++ virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); ++ return -1; ++ } ++ + if (conn->driver->domainMigratePerform) + return conn->driver->domainMigratePerform (domain, cookie, cookielen, + uri, +@@ -2482,6 +2502,11 @@ virDomainMigrateFinish (virConnectPtr dc + + if (!VIR_IS_CONNECT (dconn)) { + virLibConnError (NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); ++ return NULL; ++ } ++ ++ if (dconn->flags & VIR_CONNECT_RO) { ++ virLibConnError(dconn, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + return NULL; + } + +@@ -2517,6 +2542,11 @@ virDomainMigratePrepare2 (virConnectPtr + return -1; + } + ++ if (dconn->flags & VIR_CONNECT_RO) { ++ virLibConnError(dconn, VIR_ERR_OPERATION_DENIED, __FUNCTION__); ++ return -1; ++ } ++ + if (dconn->driver->domainMigratePrepare2) + return dconn->driver->domainMigratePrepare2 (dconn, cookie, cookielen, + uri_in, uri_out, +@@ -2547,6 +2577,11 @@ virDomainMigrateFinish2 (virConnectPtr d + return NULL; + } + ++ if (dconn->flags & VIR_CONNECT_RO) { ++ virLibConnError(dconn, VIR_ERR_OPERATION_DENIED, __FUNCTION__); ++ return NULL; ++ } ++ + if (dconn->driver->domainMigrateFinish2) + return dconn->driver->domainMigrateFinish2 (dconn, dname, + cookie, cookielen, +@@ -2905,6 +2940,11 @@ virDomainBlockPeek (virDomainPtr dom, + } + conn = dom->conn; + ++ if (dom->conn->flags & VIR_CONNECT_RO) { ++ virLibDomainError(dom, VIR_ERR_OPERATION_DENIED, __FUNCTION__); ++ return (-1); ++ } ++ + if (!path) { + virLibDomainError (dom, VIR_ERR_INVALID_ARG, + _("path is NULL")); +@@ -2980,6 +3020,11 @@ virDomainMemoryPeek (virDomainPtr dom, + } + conn = dom->conn; + ++ if (dom->conn->flags & VIR_CONNECT_RO) { ++ virLibDomainError(dom, VIR_ERR_OPERATION_DENIED, __FUNCTION__); ++ return (-1); ++ } ++ + /* Flags must be VIR_MEMORY_VIRTUAL at the moment. + * + * Note on access to physical memory: A VIR_MEMORY_PHYSICAL flag is +@@ -3246,6 +3291,11 @@ virDomainSetAutostart(virDomainPtr domai + } + + conn = domain->conn; ++ ++ if (domain->conn->flags & VIR_CONNECT_RO) { ++ virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); ++ return (-1); ++ } + + if (conn->driver->domainSetAutostart) + return conn->driver->domainSetAutostart (domain, autostart); +@@ -4197,6 +4247,11 @@ virNetworkSetAutostart(virNetworkPtr net + return (-1); + } + ++ if (network->conn->flags & VIR_CONNECT_RO) { ++ virLibNetworkError(network, VIR_ERR_OPERATION_DENIED, __FUNCTION__); ++ return (-1); ++ } ++ + conn = network->conn; + + if (conn->networkDriver && conn->networkDriver->networkSetAutostart) +@@ -4395,6 +4450,11 @@ virConnectFindStoragePoolSources(virConn + return NULL; + } + ++ if (conn->flags & VIR_CONNECT_RO) { ++ virLibConnError(conn, VIR_ERR_OPERATION_DENIED, __FUNCTION__); ++ return NULL; ++ } ++ + if (conn->storageDriver && conn->storageDriver->findPoolSources) + return conn->storageDriver->findPoolSources(conn, type, srcSpec, flags); + +@@ -5068,6 +5128,11 @@ virStoragePoolSetAutostart(virStoragePoo + return (-1); + } + ++ if (pool->conn->flags & VIR_CONNECT_RO) { ++ virLibStoragePoolError(pool, VIR_ERR_OPERATION_DENIED, __FUNCTION__); ++ return (-1); ++ } ++ + conn = pool->conn; + + if (conn->storageDriver && conn->storageDriver->poolSetAutostart) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/F-10/.cvsignore,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- .cvsignore 23 Sep 2008 21:25:17 -0000 1.33 +++ .cvsignore 16 Apr 2009 17:54:43 -0000 1.34 @@ -3,4 +3,3 @@ i686 x86_64 libvirt-*.tar.gz -libvirt-0.4.6.tar.gz Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/F-10/libvirt.spec,v retrieving revision 1.110 retrieving revision 1.111 diff -u -r1.110 -r1.111 --- libvirt.spec 4 Mar 2009 15:24:26 -0000 1.110 +++ libvirt.spec 16 Apr 2009 17:54:43 -0000 1.111 @@ -11,7 +11,6 @@ %define with_python 0%{!?_without_python:1} %define with_libvirtd 0%{!?_without_libvirtd:1} %define with_uml 0%{!?_without_uml:1} -%define with_network 0%{!?_without_network:1} # Xen is available only on i386 x86_64 ia64 %ifnarch i386 i686 x86_64 ia64 @@ -33,25 +32,15 @@ %define with_xen_proxy 0 %endif -# -# If building on RHEL switch on the specific support -# for the specific Xen version -# -%if 0%{?fedora} -%define with_rhel5 0 -%else -%define with_rhel5 1 -%endif - - Summary: Library providing a simple API virtualization Name: libvirt -Version: 0.6.1 -Release: 1%{?dist}%{?extra_release} +Version: 0.5.1 +Release: 2%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries Source: libvirt-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +Patch0: libvirt-0.5.1-read-only-checks.patch URL: http://libvirt.org/ BuildRequires: python python-devel Requires: libxml2 @@ -136,8 +125,6 @@ BuildRequires: iscsi-initiator-utils # For disk driver BuildRequires: parted-devel -# For QEMU/LXC numa info -BuildRequires: numactl-devel Obsoletes: libvir # Fedora build root suckage @@ -177,6 +164,7 @@ %prep %setup -q +%patch0 -p1 %build %if ! %{with_xen} @@ -219,14 +207,6 @@ %define _without_uml --without-uml %endif -%if %{with_rhel5} -%define _with_rhel5_api --with-rhel5-api -%endif - -%if ! %{with_network} -%define _without_network --without-network -%endif - %configure %{?_without_xen} \ %{?_without_qemu} \ %{?_without_openvz} \ @@ -237,8 +217,6 @@ %{?_without_python} \ %{?_without_libvirtd} \ %{?_without_uml} \ - %{?_without_network} \ - %{?_with_rhel5_api} \ --with-init-script=redhat \ --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid \ --with-remote-file=%{_localstatedir}/run/libvirtd.pid @@ -249,10 +227,7 @@ %makeinstall (cd docs/examples ; make clean ; rm -rf .deps Makefile Makefile.in) -(cd docs/examples/python ; rm -rf .deps Makefile Makefile.in) -(cd examples/hellolibvirt ; make clean ; rm -rf .deps .libs Makefile Makefile.in) -(cd examples/domain-events/events-c ; make clean ;rm -rf .deps .libs Makefile Makefile.in) - +(cd docs/examples/python ; rm -f Makefile Makefile.in) rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/*.la @@ -302,7 +277,7 @@ # or on the first upgrade from a non-network aware libvirt only. # We check this by looking to see if the daemon is already installed /sbin/chkconfig --list libvirtd 1>/dev/null 2>&1 -if [ $? != 0 -a ! -f %{_sysconfdir}/libvirt/qemu/networks/default.xml ] +if [ $? != 0 ] then UUID=`/usr/bin/uuidgen` sed -e "s,,\n $UUID," \ @@ -345,7 +320,6 @@ %{_sysconfdir}/rc.d/init.d/libvirtd %config(noreplace) %{_sysconfdir}/sysconfig/libvirtd %config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf -%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd %endif %if %{with_qemu} @@ -362,43 +336,12 @@ %{_datadir}/libvirt/networks/default.xml %endif -%dir %{_datadir}/libvirt/ -%dir %{_datadir}/libvirt/schemas/ - -%{_datadir}/libvirt/schemas/domain.rng -%{_datadir}/libvirt/schemas/network.rng -%{_datadir}/libvirt/schemas/storagepool.rng -%{_datadir}/libvirt/schemas/storagevol.rng -%{_datadir}/libvirt/schemas/nodedev.rng -%{_datadir}/libvirt/schemas/capability.rng - %dir %{_localstatedir}/run/libvirt/ - %dir %{_localstatedir}/lib/libvirt/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/images/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/boot/ %if %{with_qemu} -%dir %{_localstatedir}/run/libvirt/qemu/ -%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/qemu/ -%endif -%if %{with_lxc} -%dir %{_localstatedir}/run/libvirt/lxc/ -%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/lxc/ -%endif -%if %{with_uml} -%dir %{_localstatedir}/run/libvirt/uml/ -%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/uml/ -%endif -%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 - -%if %{with_qemu} %{_datadir}/augeas/lenses/libvirtd_qemu.aug %{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug %endif @@ -412,7 +355,6 @@ %{_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 @@ -430,6 +372,7 @@ %attr(0755, root, root) %{_sbindir}/libvirtd %endif +%doc docs/*.rng %doc docs/*.xml %files devel @@ -447,7 +390,6 @@ %doc docs/*.html docs/html docs/*.gif %doc docs/examples %doc docs/libvirt-api.xml -%doc examples %if %{with_python} %files python @@ -463,31 +405,6 @@ %endif %changelog -* Wed Mar 4 2009 Daniel Veillard - 0.6.1-1.fc10 -- upstream release 0.6.1 -- support for node device detach reattach and reset -- sVirt mandatory access control support -- many bug fixes and small improvements - -* 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) -- 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 -- allow QEmu/KVM domains to survive daemon restart -- extended logging capabilities -- support copy on write storage volumes for QEmu/KVM -- support of storage cache control options for QEmu/KVM -- a lot of bug fixes - * Wed Dec 17 2008 Daniel Veillard - 0.5.1-2.fc10 - fix missing read-only access checks, fixes CVE-2008-5086 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/F-10/sources,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- sources 4 Mar 2009 15:24:26 -0000 1.39 +++ sources 16 Apr 2009 17:54:43 -0000 1.40 @@ -1 +1 @@ -3154ea9d4a0778497dfdf58cb98127c0 libvirt-0.6.1.tar.gz +abc697978e9c66cbc8d8db4fa3f1c1b6 libvirt-0.5.1.tar.gz From markmc at fedoraproject.org Thu Apr 16 17:57:40 2009 From: markmc at fedoraproject.org (Mark McLoughlin) Date: Thu, 16 Apr 2009 17:57:40 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libvirt/F-9 libvirt-0.5.1-read-only-checks.patch, 1.2, 1.3 libvirt.spec, 1.101, 1.102 sources, 1.38, 1.39 Message-ID: <20090416175741.0A06E70127@cvs1.fedora.phx.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/libvirt/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17285 Modified Files: libvirt.spec sources Added Files: libvirt-0.5.1-read-only-checks.patch Log Message: 0.6.1 has been unpushed from updates-testing Revert to libvirt-0_5_1-2_fc9 tag libvirt-0.5.1-read-only-checks.patch: Index: libvirt-0.5.1-read-only-checks.patch =================================================================== RCS file: libvirt-0.5.1-read-only-checks.patch diff -N libvirt-0.5.1-read-only-checks.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ libvirt-0.5.1-read-only-checks.patch 16 Apr 2009 17:57:40 -0000 1.3 @@ -0,0 +1,152 @@ +diff --git a/src/libvirt.c b/src/libvirt.c +--- a/src/libvirt.c ++++ b/src/libvirt.c +@@ -2296,6 +2296,16 @@ virDomainMigrate (virDomainPtr domain, + conn = domain->conn; /* Source connection. */ + if (!VIR_IS_CONNECT (dconn)) { + virLibConnError (conn, VIR_ERR_INVALID_CONN, __FUNCTION__); ++ return NULL; ++ } ++ ++ if (domain->conn->flags & VIR_CONNECT_RO) { ++ virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); ++ return NULL; ++ } ++ if (dconn->flags & VIR_CONNECT_RO) { ++ /* NB, delibrately report error against source object, not dest here */ ++ virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + return NULL; + } + +@@ -2426,6 +2436,11 @@ virDomainMigratePrepare (virConnectPtr d + return -1; + } + ++ if (dconn->flags & VIR_CONNECT_RO) { ++ virLibConnError(dconn, VIR_ERR_OPERATION_DENIED, __FUNCTION__); ++ return -1; ++ } ++ + if (dconn->driver->domainMigratePrepare) + return dconn->driver->domainMigratePrepare (dconn, cookie, cookielen, + uri_in, uri_out, +@@ -2457,6 +2472,11 @@ virDomainMigratePerform (virDomainPtr do + } + conn = domain->conn; + ++ if (domain->conn->flags & VIR_CONNECT_RO) { ++ virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); ++ return -1; ++ } ++ + if (conn->driver->domainMigratePerform) + return conn->driver->domainMigratePerform (domain, cookie, cookielen, + uri, +@@ -2482,6 +2502,11 @@ virDomainMigrateFinish (virConnectPtr dc + + if (!VIR_IS_CONNECT (dconn)) { + virLibConnError (NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); ++ return NULL; ++ } ++ ++ if (dconn->flags & VIR_CONNECT_RO) { ++ virLibConnError(dconn, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + return NULL; + } + +@@ -2517,6 +2542,11 @@ virDomainMigratePrepare2 (virConnectPtr + return -1; + } + ++ if (dconn->flags & VIR_CONNECT_RO) { ++ virLibConnError(dconn, VIR_ERR_OPERATION_DENIED, __FUNCTION__); ++ return -1; ++ } ++ + if (dconn->driver->domainMigratePrepare2) + return dconn->driver->domainMigratePrepare2 (dconn, cookie, cookielen, + uri_in, uri_out, +@@ -2547,6 +2577,11 @@ virDomainMigrateFinish2 (virConnectPtr d + return NULL; + } + ++ if (dconn->flags & VIR_CONNECT_RO) { ++ virLibConnError(dconn, VIR_ERR_OPERATION_DENIED, __FUNCTION__); ++ return NULL; ++ } ++ + if (dconn->driver->domainMigrateFinish2) + return dconn->driver->domainMigrateFinish2 (dconn, dname, + cookie, cookielen, +@@ -2905,6 +2940,11 @@ virDomainBlockPeek (virDomainPtr dom, + } + conn = dom->conn; + ++ if (dom->conn->flags & VIR_CONNECT_RO) { ++ virLibDomainError(dom, VIR_ERR_OPERATION_DENIED, __FUNCTION__); ++ return (-1); ++ } ++ + if (!path) { + virLibDomainError (dom, VIR_ERR_INVALID_ARG, + _("path is NULL")); +@@ -2980,6 +3020,11 @@ virDomainMemoryPeek (virDomainPtr dom, + } + conn = dom->conn; + ++ if (dom->conn->flags & VIR_CONNECT_RO) { ++ virLibDomainError(dom, VIR_ERR_OPERATION_DENIED, __FUNCTION__); ++ return (-1); ++ } ++ + /* Flags must be VIR_MEMORY_VIRTUAL at the moment. + * + * Note on access to physical memory: A VIR_MEMORY_PHYSICAL flag is +@@ -3246,6 +3291,11 @@ virDomainSetAutostart(virDomainPtr domai + } + + conn = domain->conn; ++ ++ if (domain->conn->flags & VIR_CONNECT_RO) { ++ virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); ++ return (-1); ++ } + + if (conn->driver->domainSetAutostart) + return conn->driver->domainSetAutostart (domain, autostart); +@@ -4197,6 +4247,11 @@ virNetworkSetAutostart(virNetworkPtr net + return (-1); + } + ++ if (network->conn->flags & VIR_CONNECT_RO) { ++ virLibNetworkError(network, VIR_ERR_OPERATION_DENIED, __FUNCTION__); ++ return (-1); ++ } ++ + conn = network->conn; + + if (conn->networkDriver && conn->networkDriver->networkSetAutostart) +@@ -4395,6 +4450,11 @@ virConnectFindStoragePoolSources(virConn + return NULL; + } + ++ if (conn->flags & VIR_CONNECT_RO) { ++ virLibConnError(conn, VIR_ERR_OPERATION_DENIED, __FUNCTION__); ++ return NULL; ++ } ++ + if (conn->storageDriver && conn->storageDriver->findPoolSources) + return conn->storageDriver->findPoolSources(conn, type, srcSpec, flags); + +@@ -5068,6 +5128,11 @@ virStoragePoolSetAutostart(virStoragePoo + return (-1); + } + ++ if (pool->conn->flags & VIR_CONNECT_RO) { ++ virLibStoragePoolError(pool, VIR_ERR_OPERATION_DENIED, __FUNCTION__); ++ return (-1); ++ } ++ + conn = pool->conn; + + if (conn->storageDriver && conn->storageDriver->poolSetAutostart) Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/F-9/libvirt.spec,v retrieving revision 1.101 retrieving revision 1.102 diff -u -r1.101 -r1.102 --- libvirt.spec 5 Mar 2009 10:04:24 -0000 1.101 +++ libvirt.spec 16 Apr 2009 17:57:40 -0000 1.102 @@ -11,7 +11,6 @@ %define with_python 0%{!?_without_python:1} %define with_libvirtd 0%{!?_without_libvirtd:1} %define with_uml 0%{!?_without_uml:1} -%define with_network 0%{!?_without_network:1} # Xen is available only on i386 x86_64 ia64 %ifnarch i386 i686 x86_64 ia64 @@ -33,25 +32,15 @@ %define with_xen_proxy 0 %endif -# -# If building on RHEL switch on the specific support -# for the specific Xen version -# -%if 0%{?fedora} -%define with_rhel5 0 -%else -%define with_rhel5 1 -%endif - - Summary: Library providing a simple API virtualization Name: libvirt -Version: 0.6.1 -Release: 1%{?dist}%{?extra_release} +Version: 0.5.1 +Release: 2%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries Source: libvirt-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +Patch0: libvirt-0.5.1-read-only-checks.patch URL: http://libvirt.org/ BuildRequires: python python-devel Requires: libxml2 @@ -136,8 +125,6 @@ BuildRequires: iscsi-initiator-utils # For disk driver BuildRequires: parted-devel -# For QEMU/LXC numa info -BuildRequires: numactl-devel Obsoletes: libvir # Fedora build root suckage @@ -177,6 +164,7 @@ %prep %setup -q +%patch0 -p1 %build %if ! %{with_xen} @@ -219,14 +207,6 @@ %define _without_uml --without-uml %endif -%if %{with_rhel5} -%define _with_rhel5_api --with-rhel5-api -%endif - -%if ! %{with_network} -%define _without_network --without-network -%endif - %configure %{?_without_xen} \ %{?_without_qemu} \ %{?_without_openvz} \ @@ -237,8 +217,6 @@ %{?_without_python} \ %{?_without_libvirtd} \ %{?_without_uml} \ - %{?_without_network} \ - %{?_with_rhel5_api} \ --with-init-script=redhat \ --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid \ --with-remote-file=%{_localstatedir}/run/libvirtd.pid @@ -249,9 +227,7 @@ %makeinstall (cd docs/examples ; make clean ; rm -rf .deps Makefile Makefile.in) -(cd docs/examples/python ; rm -rf .deps Makefile Makefile.in) -(cd examples/hellolibvirt ; make clean ; rm -rf .deps .libs Makefile Makefile.in) -(cd examples/domain-events/events-c ; make clean ;rm -rf .deps .libs Makefile Makefile.in) +(cd docs/examples/python ; rm -f Makefile Makefile.in) rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/*.la @@ -301,7 +277,7 @@ # or on the first upgrade from a non-network aware libvirt only. # We check this by looking to see if the daemon is already installed /sbin/chkconfig --list libvirtd 1>/dev/null 2>&1 -if [ $? != 0 -a ! -f %{_sysconfdir}/libvirt/qemu/networks/default.xml ] +if [ $? != 0 ] then UUID=`/usr/bin/uuidgen` sed -e "s,,\n $UUID," \ @@ -344,7 +320,6 @@ %{_sysconfdir}/rc.d/init.d/libvirtd %config(noreplace) %{_sysconfdir}/sysconfig/libvirtd %config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf -%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd %endif %if %{with_qemu} @@ -361,43 +336,12 @@ %{_datadir}/libvirt/networks/default.xml %endif -%dir %{_datadir}/libvirt/ -%dir %{_datadir}/libvirt/schemas/ - -%{_datadir}/libvirt/schemas/domain.rng -%{_datadir}/libvirt/schemas/network.rng -%{_datadir}/libvirt/schemas/storagepool.rng -%{_datadir}/libvirt/schemas/storagevol.rng -%{_datadir}/libvirt/schemas/nodedev.rng -%{_datadir}/libvirt/schemas/capability.rng - %dir %{_localstatedir}/run/libvirt/ - %dir %{_localstatedir}/lib/libvirt/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/images/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/boot/ %if %{with_qemu} -%dir %{_localstatedir}/run/libvirt/qemu/ -%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/qemu/ -%endif -%if %{with_lxc} -%dir %{_localstatedir}/run/libvirt/lxc/ -%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/lxc/ -%endif -%if %{with_uml} -%dir %{_localstatedir}/run/libvirt/uml/ -%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/uml/ -%endif -%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 - -%if %{with_qemu} %{_datadir}/augeas/lenses/libvirtd_qemu.aug %{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug %endif @@ -411,7 +355,6 @@ %{_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 @@ -429,6 +372,7 @@ %attr(0755, root, root) %{_sbindir}/libvirtd %endif +%doc docs/*.rng %doc docs/*.xml %files devel @@ -446,7 +390,6 @@ %doc docs/*.html docs/html docs/*.gif %doc docs/examples %doc docs/libvirt-api.xml -%doc examples %if %{with_python} %files python @@ -462,31 +405,6 @@ %endif %changelog -* Wed Mar 4 2009 Daniel Veillard - 0.6.1-1.fc9 -- upstream release 0.6.1 -- support for node device detach reattach and reset -- sVirt mandatory access control support -- many bug fixes and small improvements - -* 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) -- 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 -- allow QEmu/KVM domains to survive daemon restart -- extended logging capabilities -- support copy on write storage volumes for QEmu/KVM -- support of storage cache control options for QEmu/KVM -- a lot of bug fixes - * Wed Dec 17 2008 Daniel Veillard - 0.5.1-2.fc9 - fix missing read-only access checks, fixes CVE-2008-5086 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/F-9/sources,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- sources 5 Mar 2009 10:04:24 -0000 1.38 +++ sources 16 Apr 2009 17:57:40 -0000 1.39 @@ -1 +1 @@ -3154ea9d4a0778497dfdf58cb98127c0 libvirt-0.6.1.tar.gz +abc697978e9c66cbc8d8db4fa3f1c1b6 libvirt-0.5.1.tar.gz From markmc at fedoraproject.org Sun Apr 19 11:00:31 2009 From: markmc at fedoraproject.org (Mark McLoughlin) Date: Sun, 19 Apr 2009 11:00:31 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/devel qemu-roms-more-room-fix-vga-align.patch, NONE, 1.1 qemu.spec, 1.78, 1.79 Message-ID: <20090419110031.6EB98700F9@cvs1.fedora.phx.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17889 Modified Files: qemu.spec Added Files: qemu-roms-more-room-fix-vga-align.patch Log Message: * Sun Apr 19 2009 Mark McLoughlin - 2:0.10-9 - Align VGA ROM to 4k boundary - fixes 'qemu-kvm -std vga' (#494376) qemu-roms-more-room-fix-vga-align.patch: --- NEW FILE qemu-roms-more-room-fix-vga-align.patch --- From: Glauber Costa Subject: [PATCH] align vga rom to 4k boundary. Instead of aligning to 2k boundary, as required by the bios, align to 4k boundary, as required by kvm memory functions. Without this patch, starting kvm with -vga std option fails with: create_userspace_phys_mem: Invalid argument kvm_cpu_register_physical_memory: failed as described by: https://bugzilla.redhat.com/494376 It does not fail with cirrus vga, because it is naturally aligned. This problem does not seem to affect upstream qemu. Signed-off-by: Glauber Costa --- qemu/hw/pc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/qemu/hw/pc.c b/qemu/hw/pc.c index cc84772..680d4a2 100644 --- a/qemu/hw/pc.c +++ b/qemu/hw/pc.c @@ -919,7 +919,7 @@ vga_bios_error: exit(1); } /* Round up vga bios size to the next 2k boundary */ - vga_bios_size = (vga_bios_size + 2047) & ~2047; + vga_bios_size = (vga_bios_size + 4095) & ~4095; option_rom_start = 0xc0000 + vga_bios_size; /* setup basic memory access */ -- 1.5.6.6 Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- qemu.spec 14 Apr 2009 13:59:03 -0000 1.78 +++ qemu.spec 19 Apr 2009 10:59:59 -0000 1.79 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.10 -Release: 8%{?dist} +Release: 9%{?dist} # I have mistakenly thought the revision name would be 1.0. # So 0.10 series get Epoch = 1 Epoch: 2 @@ -34,9 +34,10 @@ Patch10: qemu-fix-debuginfo.patch Patch11: qemu-fix-gcc.patch Patch12: qemu-roms-more-room.patch -Patch13: qemu-bios-bigger-roms.patch -Patch14: qemu-fix-display-breakage.patch -Patch15: qemu-fix-qcow2-2TB.patch +Patch13: qemu-roms-more-room-fix-vga-align.patch +Patch14: qemu-bios-bigger-roms.patch +Patch15: qemu-fix-display-breakage.patch +Patch16: qemu-fix-qcow2-2TB.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel @@ -222,6 +223,7 @@ %patch13 -p1 %patch14 -p1 %patch15 -p1 +%patch16 -p1 %build # systems like rhel build system does not have a recent enough linker so @@ -463,6 +465,9 @@ %{_mandir}/man1/qemu-img.1* %changelog +* Sun Apr 19 2009 Mark McLoughlin - 2:0.10-9 +- Align VGA ROM to 4k boundary - fixes 'qemu-kvm -std vga' (#494376) + * Tue Apr 14 2009 Glauber Costa - 2:0.10-8 - Provide qemu-kvm conditional on the architecture. From markmc at fedoraproject.org Sun Apr 19 11:01:53 2009 From: markmc at fedoraproject.org (Mark McLoughlin) Date: Sun, 19 Apr 2009 11:01:53 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/F-11 qemu.spec,1.78,1.79 Message-ID: <20090419110153.78582700F9@cvs1.fedora.phx.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/qemu/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18314 Modified Files: qemu.spec Log Message: * Sun Apr 19 2009 Mark McLoughlin - 2:0.10-9 - Align VGA ROM to 4k boundary - fixes 'qemu-kvm -std vga' (#494376) Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/F-11/qemu.spec,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- qemu.spec 14 Apr 2009 13:59:03 -0000 1.78 +++ qemu.spec 19 Apr 2009 11:01:22 -0000 1.79 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.10 -Release: 8%{?dist} +Release: 9%{?dist} # I have mistakenly thought the revision name would be 1.0. # So 0.10 series get Epoch = 1 Epoch: 2 @@ -34,9 +34,10 @@ Patch10: qemu-fix-debuginfo.patch Patch11: qemu-fix-gcc.patch Patch12: qemu-roms-more-room.patch -Patch13: qemu-bios-bigger-roms.patch -Patch14: qemu-fix-display-breakage.patch -Patch15: qemu-fix-qcow2-2TB.patch +Patch13: qemu-roms-more-room-fix-vga-align.patch +Patch14: qemu-bios-bigger-roms.patch +Patch15: qemu-fix-display-breakage.patch +Patch16: qemu-fix-qcow2-2TB.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel @@ -222,6 +223,7 @@ %patch13 -p1 %patch14 -p1 %patch15 -p1 +%patch16 -p1 %build # systems like rhel build system does not have a recent enough linker so @@ -463,6 +465,9 @@ %{_mandir}/man1/qemu-img.1* %changelog +* Sun Apr 19 2009 Mark McLoughlin - 2:0.10-9 +- Align VGA ROM to 4k boundary - fixes 'qemu-kvm -std vga' (#494376) + * Tue Apr 14 2009 Glauber Costa - 2:0.10-8 - Provide qemu-kvm conditional on the architecture. From markmc at fedoraproject.org Sun Apr 19 11:02:17 2009 From: markmc at fedoraproject.org (Mark McLoughlin) Date: Sun, 19 Apr 2009 11:02:17 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/F-11 qemu-roms-more-room-fix-vga-align.patch, NONE, 1.1 Message-ID: <20090419110217.B9861700F9@cvs1.fedora.phx.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/qemu/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18540 Added Files: qemu-roms-more-room-fix-vga-align.patch Log Message: * Sun Apr 19 2009 Mark McLoughlin - 2:0.10-9 - Align VGA ROM to 4k boundary - fixes 'qemu-kvm -std vga' (#494376) qemu-roms-more-room-fix-vga-align.patch: --- NEW FILE qemu-roms-more-room-fix-vga-align.patch --- From: Glauber Costa Subject: [PATCH] align vga rom to 4k boundary. Instead of aligning to 2k boundary, as required by the bios, align to 4k boundary, as required by kvm memory functions. Without this patch, starting kvm with -vga std option fails with: create_userspace_phys_mem: Invalid argument kvm_cpu_register_physical_memory: failed as described by: https://bugzilla.redhat.com/494376 It does not fail with cirrus vga, because it is naturally aligned. This problem does not seem to affect upstream qemu. Signed-off-by: Glauber Costa --- qemu/hw/pc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/qemu/hw/pc.c b/qemu/hw/pc.c index cc84772..680d4a2 100644 --- a/qemu/hw/pc.c +++ b/qemu/hw/pc.c @@ -919,7 +919,7 @@ vga_bios_error: exit(1); } /* Round up vga bios size to the next 2k boundary */ - vga_bios_size = (vga_bios_size + 2047) & ~2047; + vga_bios_size = (vga_bios_size + 4095) & ~4095; option_rom_start = 0xc0000 + vga_bios_size; /* setup basic memory access */ -- 1.5.6.6 From markmc at fedoraproject.org Sun Apr 19 15:35:08 2009 From: markmc at fedoraproject.org (Mark McLoughlin) Date: Sun, 19 Apr 2009 15:35:08 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/devel qemu.spec,1.79,1.80 Message-ID: <20090419153508.8AC29700F9@cvs1.fedora.phx.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4825 Modified Files: qemu.spec Log Message: * Sun Apr 19 2009 Mark McLoughlin - 2:0.10-10 - Run sysconfig.modules from %post on x86_64 too (#494739) Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v retrieving revision 1.79 retrieving revision 1.80 diff -u -r1.79 -r1.80 --- qemu.spec 19 Apr 2009 10:59:59 -0000 1.79 +++ qemu.spec 19 Apr 2009 15:34:37 -0000 1.80 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.10 -Release: 9%{?dist} +Release: 10%{?dist} # I have mistakenly thought the revision name would be 1.0. # So 0.10 series get Epoch = 1 Epoch: 2 @@ -344,7 +344,7 @@ rm -rf $RPM_BUILD_ROOT %post system-x86 -%ifarch %{ix86} +%ifarch %{ix86} x86_64 # load kvm modules now, so we can make sure no reboot is needed. # If there's already a kvm module installed, we don't mess with it sh /%{_sysconfdir}/sysconfig/modules/kvm.modules @@ -465,6 +465,9 @@ %{_mandir}/man1/qemu-img.1* %changelog +* Sun Apr 19 2009 Mark McLoughlin - 2:0.10-10 +- Run sysconfig.modules from %post on x86_64 too (#494739) + * Sun Apr 19 2009 Mark McLoughlin - 2:0.10-9 - Align VGA ROM to 4k boundary - fixes 'qemu-kvm -std vga' (#494376) From markmc at fedoraproject.org Sun Apr 19 15:35:34 2009 From: markmc at fedoraproject.org (Mark McLoughlin) Date: Sun, 19 Apr 2009 15:35:34 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/F-11 qemu.spec,1.79,1.80 Message-ID: <20090419153534.628C4700F9@cvs1.fedora.phx.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/qemu/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4974 Modified Files: qemu.spec Log Message: * Sun Apr 19 2009 Mark McLoughlin - 2:0.10-10 - Run sysconfig.modules from %post on x86_64 too (#494739) Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/F-11/qemu.spec,v retrieving revision 1.79 retrieving revision 1.80 diff -u -r1.79 -r1.80 --- qemu.spec 19 Apr 2009 11:01:22 -0000 1.79 +++ qemu.spec 19 Apr 2009 15:35:03 -0000 1.80 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.10 -Release: 9%{?dist} +Release: 10%{?dist} # I have mistakenly thought the revision name would be 1.0. # So 0.10 series get Epoch = 1 Epoch: 2 @@ -344,7 +344,7 @@ rm -rf $RPM_BUILD_ROOT %post system-x86 -%ifarch %{ix86} +%ifarch %{ix86} x86_64 # load kvm modules now, so we can make sure no reboot is needed. # If there's already a kvm module installed, we don't mess with it sh /%{_sysconfdir}/sysconfig/modules/kvm.modules @@ -465,6 +465,9 @@ %{_mandir}/man1/qemu-img.1* %changelog +* Sun Apr 19 2009 Mark McLoughlin - 2:0.10-10 +- Run sysconfig.modules from %post on x86_64 too (#494739) + * Sun Apr 19 2009 Mark McLoughlin - 2:0.10-9 - Align VGA ROM to 4k boundary - fixes 'qemu-kvm -std vga' (#494376) From markmc at fedoraproject.org Mon Apr 20 13:52:06 2009 From: markmc at fedoraproject.org (Mark McLoughlin) Date: Mon, 20 Apr 2009 13:52:06 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/devel qemu-fix-qcow2-corruption.patch, NONE, 1.1 qemu.spec, 1.80, 1.81 Message-ID: <20090420135206.4B5F070102@cvs1.fedora.phx.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32597 Modified Files: qemu.spec Added Files: qemu-fix-qcow2-corruption.patch Log Message: * Mon Apr 20 2009 Mark McLoughlin - 2:0.10-11 - Fix qcow2 image corruption (#496642) qemu-fix-qcow2-corruption.patch: --- NEW FILE qemu-fix-qcow2-corruption.patch --- From: Kevin Wolf To: qemu-devel at nongnu.org Subject: [Qemu-devel] [PATCH] qcow2 corruption: Fix alloc_cluster_link_l2 This patch fixes a qcow2 corruption bug introduced in SVN Rev 5861. L2 tables are big endian, so entries must be converted before being passed to functions. This bug is easy to trigger. The following script will create and destroy a qcow2 image (the header is gone after three loop iterations): #!/bin/bash qemu-img create -f qcow2 test.qcow 1M for i in $(seq 1 10); do qemu-system-x86_64 -hda test.qcow -monitor stdio > /dev/null 2>&1 < --- block-qcow2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff -up qemu-kvm-0.10/qemu/block-qcow2.c.qcow2-corruption qemu-kvm-0.10/qemu/block-qcow2.c --- qemu-kvm-0.10/qemu/block-qcow2.c.qcow2-corruption 2009-04-20 14:41:22.000000000 +0100 +++ qemu-kvm-0.10/qemu/block-qcow2.c 2009-04-20 14:41:54.000000000 +0100 @@ -912,7 +912,7 @@ static int alloc_cluster_link_l2(BlockDr goto err; for (i = 0; i < j; i++) - free_any_clusters(bs, old_cluster[i], 1); + free_any_clusters(bs, be64_to_cpu(old_cluster[i]), 1); ret = 0; err: Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- qemu.spec 19 Apr 2009 15:34:37 -0000 1.80 +++ qemu.spec 20 Apr 2009 13:51:35 -0000 1.81 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.10 -Release: 10%{?dist} +Release: 11%{?dist} # I have mistakenly thought the revision name would be 1.0. # So 0.10 series get Epoch = 1 Epoch: 2 @@ -38,6 +38,7 @@ Patch14: qemu-bios-bigger-roms.patch Patch15: qemu-fix-display-breakage.patch Patch16: qemu-fix-qcow2-2TB.patch +Patch17: qemu-fix-qcow2-corruption.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel @@ -224,6 +225,7 @@ %patch14 -p1 %patch15 -p1 %patch16 -p1 +%patch17 -p1 %build # systems like rhel build system does not have a recent enough linker so @@ -465,6 +467,9 @@ %{_mandir}/man1/qemu-img.1* %changelog +* Mon Apr 20 2009 Mark McLoughlin - 2:0.10-11 +- Fix qcow2 image corruption (#496642) + * Sun Apr 19 2009 Mark McLoughlin - 2:0.10-10 - Run sysconfig.modules from %post on x86_64 too (#494739) From markmc at fedoraproject.org Mon Apr 20 13:52:58 2009 From: markmc at fedoraproject.org (Mark McLoughlin) Date: Mon, 20 Apr 2009 13:52:58 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/F-11 qemu-fix-qcow2-corruption.patch, NONE, 1.1 qemu.spec, 1.80, 1.81 Message-ID: <20090420135258.C9AB970102@cvs1.fedora.phx.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/qemu/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv436 Modified Files: qemu.spec Added Files: qemu-fix-qcow2-corruption.patch Log Message: * Mon Apr 20 2009 Mark McLoughlin - 2:0.10-11 - Fix qcow2 image corruption (#496642) qemu-fix-qcow2-corruption.patch: --- NEW FILE qemu-fix-qcow2-corruption.patch --- From: Kevin Wolf To: qemu-devel at nongnu.org Subject: [Qemu-devel] [PATCH] qcow2 corruption: Fix alloc_cluster_link_l2 This patch fixes a qcow2 corruption bug introduced in SVN Rev 5861. L2 tables are big endian, so entries must be converted before being passed to functions. This bug is easy to trigger. The following script will create and destroy a qcow2 image (the header is gone after three loop iterations): #!/bin/bash qemu-img create -f qcow2 test.qcow 1M for i in $(seq 1 10); do qemu-system-x86_64 -hda test.qcow -monitor stdio > /dev/null 2>&1 < --- block-qcow2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff -up qemu-kvm-0.10/qemu/block-qcow2.c.qcow2-corruption qemu-kvm-0.10/qemu/block-qcow2.c --- qemu-kvm-0.10/qemu/block-qcow2.c.qcow2-corruption 2009-04-20 14:41:22.000000000 +0100 +++ qemu-kvm-0.10/qemu/block-qcow2.c 2009-04-20 14:41:54.000000000 +0100 @@ -912,7 +912,7 @@ static int alloc_cluster_link_l2(BlockDr goto err; for (i = 0; i < j; i++) - free_any_clusters(bs, old_cluster[i], 1); + free_any_clusters(bs, be64_to_cpu(old_cluster[i]), 1); ret = 0; err: Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/F-11/qemu.spec,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- qemu.spec 19 Apr 2009 15:35:03 -0000 1.80 +++ qemu.spec 20 Apr 2009 13:52:28 -0000 1.81 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.10 -Release: 10%{?dist} +Release: 11%{?dist} # I have mistakenly thought the revision name would be 1.0. # So 0.10 series get Epoch = 1 Epoch: 2 @@ -38,6 +38,7 @@ Patch14: qemu-bios-bigger-roms.patch Patch15: qemu-fix-display-breakage.patch Patch16: qemu-fix-qcow2-2TB.patch +Patch17: qemu-fix-qcow2-corruption.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel @@ -224,6 +225,7 @@ %patch14 -p1 %patch15 -p1 %patch16 -p1 +%patch17 -p1 %build # systems like rhel build system does not have a recent enough linker so @@ -465,6 +467,9 @@ %{_mandir}/man1/qemu-img.1* %changelog +* Mon Apr 20 2009 Mark McLoughlin - 2:0.10-11 +- Fix qcow2 image corruption (#496642) + * Sun Apr 19 2009 Mark McLoughlin - 2:0.10-10 - Run sysconfig.modules from %post on x86_64 too (#494739) From rel-eng at fedoraproject.org Mon Apr 20 14:38:53 2009 From: rel-eng at fedoraproject.org (Fedora Release Engineering) Date: Mon, 20 Apr 2009 14:38:53 -0000 Subject: [fedora-virt-maint] #1550: Please tag qemu-0.10-11.fc11 Message-ID: <049.b7932a14e2cbb9fd1f4086397fce071f@fedoraproject.org> #1550: Please tag qemu-0.10-11.fc11 -----------------------------+---------------------------------------------- Reporter: markmc | Owner: rel-eng at lists.fedoraproject.org Type: task | Status: new Milestone: Fedora 11 Final | Component: koji Keywords: | -----------------------------+---------------------------------------------- Fixes since -8 currently in dist-f11: * Mon Apr 20 2009 Mark McLoughlin - 2:0.10-11 - Fix qcow2 image corruption (#496642) * Sun Apr 19 2009 Mark McLoughlin - 2:0.10-10 - Run sysconfig.modules from %post on x86_64 too (#494739) * Sun Apr 19 2009 Mark McLoughlin - 2:0.10-9 - Align VGA ROM to 4k boundary - fixes 'qemu-kvm -std vga' (#494376) Each are small fixes for serious bugs -- Ticket URL: Fedora Release Engineering Release Engineering for the Fedora Project From rel-eng at fedoraproject.org Mon Apr 20 14:48:46 2009 From: rel-eng at fedoraproject.org (Fedora Release Engineering) Date: Mon, 20 Apr 2009 14:48:46 -0000 Subject: [fedora-virt-maint] Re: #1550: Please tag qemu-0.10-11.fc11 In-Reply-To: <049.b7932a14e2cbb9fd1f4086397fce071f@fedoraproject.org> References: <049.b7932a14e2cbb9fd1f4086397fce071f@fedoraproject.org> Message-ID: <058.16d9a69ec7e80f880747670d04411e2c@fedoraproject.org> #1550: Please tag qemu-0.10-11.fc11 ------------------------------+--------------------------------------------- Reporter: markmc | Owner: rel-eng at lists.fedoraproject.org Type: task | Status: new Milestone: Fedora 11 Final | Component: koji Resolution: | Keywords: ------------------------------+--------------------------------------------- Comment (by spot): +1 -- Ticket URL: Fedora Release Engineering Release Engineering for the Fedora Project From rel-eng at fedoraproject.org Mon Apr 20 17:42:19 2009 From: rel-eng at fedoraproject.org (Fedora Release Engineering) Date: Mon, 20 Apr 2009 17:42:19 -0000 Subject: [fedora-virt-maint] Re: #1550: Please tag qemu-0.10-11.fc11 In-Reply-To: <049.b7932a14e2cbb9fd1f4086397fce071f@fedoraproject.org> References: <049.b7932a14e2cbb9fd1f4086397fce071f@fedoraproject.org> Message-ID: <058.626a429a2f1d3889bb195b8409bdce91@fedoraproject.org> #1550: Please tag qemu-0.10-11.fc11 ------------------------------+--------------------------------------------- Reporter: markmc | Owner: rel-eng at lists.fedoraproject.org Type: task | Status: closed Milestone: Fedora 11 Final | Component: koji Resolution: fixed | Keywords: ------------------------------+--------------------------------------------- Changes (by jkeating): * status: new => closed * resolution: => fixed Comment: MOving. -- Ticket URL: Fedora Release Engineering Release Engineering for the Fedora Project From markmc at fedoraproject.org Tue Apr 21 09:03:44 2009 From: markmc at fedoraproject.org (Mark McLoughlin) Date: Tue, 21 Apr 2009 09:03:44 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/devel qemu-fix-qcow2-corruption.patch, 1.1, 1.2 qemu.spec, 1.81, 1.82 Message-ID: <20090421090344.42359700D6@cvs1.fedora.phx.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9459 Modified Files: qemu-fix-qcow2-corruption.patch qemu.spec Log Message: * Tue Apr 21 2009 Mark McLoughlin - 2:0.10-12 - Another qcow2 image corruption fix (#496642) qemu-fix-qcow2-corruption.patch: Index: qemu-fix-qcow2-corruption.patch =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-fix-qcow2-corruption.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qemu-fix-qcow2-corruption.patch 20 Apr 2009 13:51:35 -0000 1.1 +++ qemu-fix-qcow2-corruption.patch 21 Apr 2009 09:03:39 -0000 1.2 @@ -1,6 +1,28 @@ +From: Nolan Leake sigbus.net> +Subject: [PATCH] Fix (at least one cause of) qcow2 corruption. + +qcow2's get_cluster_offset() scans forward in the l2 table to find other +clusters that have the same allocation status as the first cluster. +This is used by (among others) qcow_is_allocated(). + +Unfortunately, it was not checking to be sure that it didn't fall off +the end of the l2 table. This patch adds that check. + +The symptom that motivated me to look into this was that +bdrv_is_allocated() was returning false when there was in fact data +there. This is one of many ways this bug could lead to data corruption. + +I checked the other place that scans for consecutive unallocated blocks +(alloc_cluster_offset()) and it appears to be OK: + nb_clusters = MIN(nb_clusters, s->l2_size - l2_index); +appears to prevent the same problem from occurring. + +Signed-off-by: Nolan Leake sigbus.net> + +--- + From: Kevin Wolf -To: qemu-devel at nongnu.org -Subject: [Qemu-devel] [PATCH] qcow2 corruption: Fix alloc_cluster_link_l2 +Subject: [PATCH] qcow2 corruption: Fix alloc_cluster_link_l2 This patch fixes a qcow2 corruption bug introduced in SVN Rev 5861. L2 tables are big endian, so entries must be converted before being passed to functions. @@ -18,14 +40,23 @@ done Signed-off-by: Kevin Wolf ---- - block-qcow2.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) diff -up qemu-kvm-0.10/qemu/block-qcow2.c.qcow2-corruption qemu-kvm-0.10/qemu/block-qcow2.c ---- qemu-kvm-0.10/qemu/block-qcow2.c.qcow2-corruption 2009-04-20 14:41:22.000000000 +0100 -+++ qemu-kvm-0.10/qemu/block-qcow2.c 2009-04-20 14:41:54.000000000 +0100 -@@ -912,7 +912,7 @@ static int alloc_cluster_link_l2(BlockDr +diff -up qemu-kvm-0.10/qemu/block-qcow2.c.qcow2-corruption qemu-kvm-0.10/qemu/block-qcow2.c +--- qemu-kvm-0.10/qemu/block-qcow2.c.qcow2-corruption 2009-04-21 09:57:21.000000000 +0100 ++++ qemu-kvm-0.10/qemu/block-qcow2.c 2009-04-21 09:58:27.000000000 +0100 +@@ -670,6 +670,10 @@ static uint64_t get_cluster_offset(Block + + nb_available = (nb_available >> 9) + index_in_cluster; + ++ if (nb_needed > nb_available) { ++ nb_needed = nb_available; ++ } ++ + cluster_offset = 0; + + /* seek the the l2 offset in the l1 table */ +@@ -912,7 +916,7 @@ static int alloc_cluster_link_l2(BlockDr goto err; for (i = 0; i < j; i++) Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- qemu.spec 20 Apr 2009 13:51:35 -0000 1.81 +++ qemu.spec 21 Apr 2009 09:03:40 -0000 1.82 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.10 -Release: 11%{?dist} +Release: 12%{?dist} # I have mistakenly thought the revision name would be 1.0. # So 0.10 series get Epoch = 1 Epoch: 2 @@ -467,6 +467,9 @@ %{_mandir}/man1/qemu-img.1* %changelog +* Tue Apr 21 2009 Mark McLoughlin - 2:0.10-12 +- Another qcow2 image corruption fix (#496642) + * Mon Apr 20 2009 Mark McLoughlin - 2:0.10-11 - Fix qcow2 image corruption (#496642) From markmc at fedoraproject.org Tue Apr 21 09:04:26 2009 From: markmc at fedoraproject.org (Mark McLoughlin) Date: Tue, 21 Apr 2009 09:04:26 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/F-11 qemu-fix-qcow2-corruption.patch, 1.1, 1.2 qemu.spec, 1.81, 1.82 Message-ID: <20090421090426.45ECA700D6@cvs1.fedora.phx.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/qemu/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9855 Modified Files: qemu-fix-qcow2-corruption.patch qemu.spec Log Message: * Tue Apr 21 2009 Mark McLoughlin - 2:0.10-12 - Another qcow2 image corruption fix (#496642) qemu-fix-qcow2-corruption.patch: Index: qemu-fix-qcow2-corruption.patch =================================================================== RCS file: /cvs/pkgs/rpms/qemu/F-11/qemu-fix-qcow2-corruption.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qemu-fix-qcow2-corruption.patch 20 Apr 2009 13:52:28 -0000 1.1 +++ qemu-fix-qcow2-corruption.patch 21 Apr 2009 09:04:20 -0000 1.2 @@ -1,6 +1,28 @@ +From: Nolan Leake sigbus.net> +Subject: [PATCH] Fix (at least one cause of) qcow2 corruption. + +qcow2's get_cluster_offset() scans forward in the l2 table to find other +clusters that have the same allocation status as the first cluster. +This is used by (among others) qcow_is_allocated(). + +Unfortunately, it was not checking to be sure that it didn't fall off +the end of the l2 table. This patch adds that check. + +The symptom that motivated me to look into this was that +bdrv_is_allocated() was returning false when there was in fact data +there. This is one of many ways this bug could lead to data corruption. + +I checked the other place that scans for consecutive unallocated blocks +(alloc_cluster_offset()) and it appears to be OK: + nb_clusters = MIN(nb_clusters, s->l2_size - l2_index); +appears to prevent the same problem from occurring. + +Signed-off-by: Nolan Leake sigbus.net> + +--- + From: Kevin Wolf -To: qemu-devel at nongnu.org -Subject: [Qemu-devel] [PATCH] qcow2 corruption: Fix alloc_cluster_link_l2 +Subject: [PATCH] qcow2 corruption: Fix alloc_cluster_link_l2 This patch fixes a qcow2 corruption bug introduced in SVN Rev 5861. L2 tables are big endian, so entries must be converted before being passed to functions. @@ -18,14 +40,23 @@ done Signed-off-by: Kevin Wolf ---- - block-qcow2.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) diff -up qemu-kvm-0.10/qemu/block-qcow2.c.qcow2-corruption qemu-kvm-0.10/qemu/block-qcow2.c ---- qemu-kvm-0.10/qemu/block-qcow2.c.qcow2-corruption 2009-04-20 14:41:22.000000000 +0100 -+++ qemu-kvm-0.10/qemu/block-qcow2.c 2009-04-20 14:41:54.000000000 +0100 -@@ -912,7 +912,7 @@ static int alloc_cluster_link_l2(BlockDr +diff -up qemu-kvm-0.10/qemu/block-qcow2.c.qcow2-corruption qemu-kvm-0.10/qemu/block-qcow2.c +--- qemu-kvm-0.10/qemu/block-qcow2.c.qcow2-corruption 2009-04-21 09:57:21.000000000 +0100 ++++ qemu-kvm-0.10/qemu/block-qcow2.c 2009-04-21 09:58:27.000000000 +0100 +@@ -670,6 +670,10 @@ static uint64_t get_cluster_offset(Block + + nb_available = (nb_available >> 9) + index_in_cluster; + ++ if (nb_needed > nb_available) { ++ nb_needed = nb_available; ++ } ++ + cluster_offset = 0; + + /* seek the the l2 offset in the l1 table */ +@@ -912,7 +916,7 @@ static int alloc_cluster_link_l2(BlockDr goto err; for (i = 0; i < j; i++) Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/F-11/qemu.spec,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- qemu.spec 20 Apr 2009 13:52:28 -0000 1.81 +++ qemu.spec 21 Apr 2009 09:04:20 -0000 1.82 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.10 -Release: 11%{?dist} +Release: 12%{?dist} # I have mistakenly thought the revision name would be 1.0. # So 0.10 series get Epoch = 1 Epoch: 2 @@ -467,6 +467,9 @@ %{_mandir}/man1/qemu-img.1* %changelog +* Tue Apr 21 2009 Mark McLoughlin - 2:0.10-12 +- Another qcow2 image corruption fix (#496642) + * Mon Apr 20 2009 Mark McLoughlin - 2:0.10-11 - Fix qcow2 image corruption (#496642) From markmc at fedoraproject.org Tue Apr 21 13:54:06 2009 From: markmc at fedoraproject.org (Mark McLoughlin) Date: Tue, 21 Apr 2009 13:54:06 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/devel qemu.spec,1.82,1.83 Message-ID: <20090421135407.23B57700D6@cvs1.fedora.phx.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4522 Modified Files: qemu.spec Log Message: * Tue Apr 21 2009 Mark McLoughlin - 2:0.10-13 - Enable pulseaudio driver to fix qemu lockup at shutdown (#495964) Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- qemu.spec 21 Apr 2009 09:03:40 -0000 1.82 +++ qemu.spec 21 Apr 2009 13:53:59 -0000 1.83 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.10 -Release: 12%{?dist} +Release: 13%{?dist} # I have mistakenly thought the revision name would be 1.0. # So 0.10 series get Epoch = 1 Epoch: 2 @@ -44,6 +44,7 @@ BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel BuildRequires: rsync dev86 iasl BuildRequires: pciutils-devel +BuildRequires: pulseaudio-libs-devel Requires: %{name}-user = %{epoch}:%{version}-%{release} Requires: %{name}-system-x86 = %{epoch}:%{version}-%{release} Requires: %{name}-system-sparc = %{epoch}:%{version}-%{release} @@ -245,12 +246,12 @@ fi %ifarch %{ix86} x86_64 -# sdl outputs to alsa or pulseaudio directly depending on what the system has configured +# sdl outputs to alsa or pulseaudio depending on system config, but it's broken (#495964) # alsa works, but causes huge CPU load due to bugs # oss works, but is very problematic because it grabs exclusive control of the device causing other apps to go haywire ./configure --target-list=x86_64-softmmu \ --kerneldir=$(pwd)/kernel --prefix=%{_prefix} \ - --audio-drv-list=sdl,alsa,oss \ + --audio-drv-list=pa,sdl,alsa,oss \ --with-patched-kernel \ --disable-strip \ --qemu-ldflags=$extraldflags \ @@ -280,7 +281,7 @@ --disable-strip \ --disable-kvm \ --extra-ldflags=$extraldflags \ - --audio-drv-list=sdl,alsa,oss \ + --audio-drv-list=pa,sdl,alsa,oss \ --extra-cflags="$RPM_OPT_FLAGS" @@ -467,6 +468,9 @@ %{_mandir}/man1/qemu-img.1* %changelog +* Tue Apr 21 2009 Mark McLoughlin - 2:0.10-13 +- Enable pulseaudio driver to fix qemu lockup at shutdown (#495964) + * Tue Apr 21 2009 Mark McLoughlin - 2:0.10-12 - Another qcow2 image corruption fix (#496642) From crobinso at fedoraproject.org Tue Apr 21 16:19:28 2009 From: crobinso at fedoraproject.org (Cole Robinson) Date: Tue, 21 Apr 2009 16:19:28 +0000 (UTC) Subject: [fedora-virt-maint] rpms/python-virtinst/devel virtinst-0.400.3-selinux-warn.patch, NONE, 1.1 python-virtinst.spec, 1.66, 1.67 Message-ID: <20090421161928.887507013C@cvs1.fedora.phx.redhat.com> Author: crobinso Update of /cvs/pkgs/rpms/python-virtinst/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18309 Modified Files: python-virtinst.spec Added Files: virtinst-0.400.3-selinux-warn.patch Log Message: Only warn if selinux labeling appears to be wrong (bz 496340) virtinst-0.400.3-selinux-warn.patch: --- NEW FILE virtinst-0.400.3-selinux-warn.patch --- diff -rup virtinst-0.400.3/virtinst/VirtualDisk.py new/virtinst/VirtualDisk.py --- virtinst-0.400.3/virtinst/VirtualDisk.py 2009-04-20 13:09:36.000000000 -0400 +++ new/virtinst/VirtualDisk.py 2009-04-20 13:59:00.000000000 -0400 @@ -678,8 +678,9 @@ class VirtualDisk(VirtualDevice): return if self._is_remote(): - raise ValueError, _("Install volume %s has incorrect SELinux label %s, expecting %s" % - (self.path, label, wantLabel)) + logging.warn(_("Install volume %s has incorrect SELinux " + "label %s, expecting %s") % + (self.path, label, wantLabel)) else: changeLabel = True elif self.path: @@ -691,8 +692,9 @@ class VirtualDisk(VirtualDevice): return if self._is_remote(): - raise ValueError, _("Install volume %s has incorrect SELinux label %s, expecting %s" % - (self.path, label, wantLabel)) + logging.warn(_("Install volume %s has incorrect SELinux " + "label %s, expecting %s") % + (self.path, label, wantLabel)) else: if self.path[0:4] == "/dev": logging.info("Not changing context on physical device") @@ -707,8 +709,10 @@ class VirtualDisk(VirtualDevice): selinux.setfilecon(self.path, wantLabel) logging.info("Changed SELinux label to %s" % wantLabel) except Exception, e: - raise ValueError, _(("Unable to fix install volume SELinux labelling: %s\n" % str(e)) + - ("Please run 'chcon %s %s' manually and retry installation" % (wantLabel, self.path))) + logging.warn(_(("Unable to fix install volume SELinux " + "labelling: %s\n") % str(e)+ "Please run " + "'chcon %s %s' manually and retry " + "installation" % (wantLabel, self.path))) def get_xml_config(self, disknode=None): Index: python-virtinst.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-virtinst/devel/python-virtinst.spec,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- python-virtinst.spec 14 Apr 2009 21:06:59 -0000 1.66 +++ python-virtinst.spec 21 Apr 2009 16:19:26 -0000 1.67 @@ -17,7 +17,7 @@ Summary: Python modules and utilities for installing virtual machines Name: python-%{appname} Version: 0.400.3 -Release: 6%{_extra_release} +Release: 7%{_extra_release} Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz Patch1: %{appname}-%{version}-fix-virtimage-scratch.patch Patch2: %{appname}-%{version}-hostdev-libvirt-calls.patch @@ -29,6 +29,8 @@ Patch6: %{appname}-%{version}-fix-floppy-dev.patch # F11 Translations (bz 493944 and bz 494358) Patch7: %{appname}-%{version}-updated-trans.patch +# Only throw warnings if we fail to relabel install media (bz 496340) +Patch8: %{appname}-%{version}-selinux-warn.patch License: GPLv2+ Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -62,6 +64,7 @@ %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 %build python setup.py build @@ -97,6 +100,9 @@ %{_bindir}/virt-convert %changelog +* Tue Apr 21 2009 Cole Robinson - 0.400.3-7.fc11 +- Only warn if selinux labeling appears to be wrong (bz 496340) + * Tue Apr 14 2009 Cole Robinson - 0.400.3-6.fc11 - More translation updates From rel-eng at fedoraproject.org Tue Apr 21 14:20:52 2009 From: rel-eng at fedoraproject.org (Fedora Release Engineering) Date: Tue, 21 Apr 2009 14:20:52 -0000 Subject: [fedora-virt-maint] #1571: Please tag qemu-0.10-12.fc11 Message-ID: <049.25470b1da011a4a8170487a142252ed0@fedoraproject.org> #1571: Please tag qemu-0.10-12.fc11 -----------------------------+---------------------------------------------- Reporter: markmc | Owner: rel-eng at lists.fedoraproject.org Type: task | Status: new Milestone: Fedora 11 Final | Component: koji Keywords: | -----------------------------+---------------------------------------------- It turns out that there was another qcow2 image corruption fix upstream recently, so we've included that along with the one we built yesterday * Tue Apr 21 2009 Mark McLoughlin - 2:0.10-12 - Another qcow2 image corruption fix (#496642) -- Ticket URL: Fedora Release Engineering Release Engineering for the Fedora Project From rel-eng at fedoraproject.org Tue Apr 21 14:35:23 2009 From: rel-eng at fedoraproject.org (Fedora Release Engineering) Date: Tue, 21 Apr 2009 14:35:23 -0000 Subject: [fedora-virt-maint] Re: #1571: Please tag qemu-0.10-12.fc11 In-Reply-To: <049.25470b1da011a4a8170487a142252ed0@fedoraproject.org> References: <049.25470b1da011a4a8170487a142252ed0@fedoraproject.org> Message-ID: <058.97a8e3fbd8e382b373924e6f78ba71a8@fedoraproject.org> #1571: Please tag qemu-0.10-12.fc11 ------------------------------+--------------------------------------------- Reporter: markmc | Owner: rel-eng at lists.fedoraproject.org Type: task | Status: new Milestone: Fedora 11 Final | Component: koji Resolution: | Keywords: ------------------------------+--------------------------------------------- Comment (by spot): +1 -- Ticket URL: Fedora Release Engineering Release Engineering for the Fedora Project From rel-eng at fedoraproject.org Tue Apr 21 16:35:13 2009 From: rel-eng at fedoraproject.org (Fedora Release Engineering) Date: Tue, 21 Apr 2009 16:35:13 -0000 Subject: [fedora-virt-maint] Re: #1571: Please tag qemu-0.10-12.fc11 In-Reply-To: <049.25470b1da011a4a8170487a142252ed0@fedoraproject.org> References: <049.25470b1da011a4a8170487a142252ed0@fedoraproject.org> Message-ID: <058.789122643c9d0531483dc8083e56f5a1@fedoraproject.org> #1571: Please tag qemu-0.10-12.fc11 ------------------------------+--------------------------------------------- Reporter: markmc | Owner: rel-eng at lists.fedoraproject.org Type: task | Status: closed Milestone: Fedora 11 Final | Component: koji Resolution: fixed | Keywords: ------------------------------+--------------------------------------------- Changes (by jkeating): * status: new => closed * resolution: => fixed Comment: Moving -- Ticket URL: Fedora Release Engineering Release Engineering for the Fedora Project From crobinso at fedoraproject.org Tue Apr 21 17:19:05 2009 From: crobinso at fedoraproject.org (Cole Robinson) Date: Tue, 21 Apr 2009 17:19:05 +0000 (UTC) Subject: [fedora-virt-maint] rpms/python-virtinst/F-11 virtinst-0.400.3-selinux-warn.patch, NONE, 1.1 python-virtinst.spec, 1.66, 1.67 Message-ID: <20090421171905.E7D30700D6@cvs1.fedora.phx.redhat.com> Author: crobinso Update of /cvs/pkgs/rpms/python-virtinst/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6308 Modified Files: python-virtinst.spec Added Files: virtinst-0.400.3-selinux-warn.patch Log Message: Only warn if selinux labeling appears to be wrong (bz 496340) virtinst-0.400.3-selinux-warn.patch: --- NEW FILE virtinst-0.400.3-selinux-warn.patch --- diff -rup virtinst-0.400.3/virtinst/VirtualDisk.py new/virtinst/VirtualDisk.py --- virtinst-0.400.3/virtinst/VirtualDisk.py 2009-04-20 13:09:36.000000000 -0400 +++ new/virtinst/VirtualDisk.py 2009-04-20 13:59:00.000000000 -0400 @@ -678,8 +678,9 @@ class VirtualDisk(VirtualDevice): return if self._is_remote(): - raise ValueError, _("Install volume %s has incorrect SELinux label %s, expecting %s" % - (self.path, label, wantLabel)) + logging.warn(_("Install volume %s has incorrect SELinux " + "label %s, expecting %s") % + (self.path, label, wantLabel)) else: changeLabel = True elif self.path: @@ -691,8 +692,9 @@ class VirtualDisk(VirtualDevice): return if self._is_remote(): - raise ValueError, _("Install volume %s has incorrect SELinux label %s, expecting %s" % - (self.path, label, wantLabel)) + logging.warn(_("Install volume %s has incorrect SELinux " + "label %s, expecting %s") % + (self.path, label, wantLabel)) else: if self.path[0:4] == "/dev": logging.info("Not changing context on physical device") @@ -707,8 +709,10 @@ class VirtualDisk(VirtualDevice): selinux.setfilecon(self.path, wantLabel) logging.info("Changed SELinux label to %s" % wantLabel) except Exception, e: - raise ValueError, _(("Unable to fix install volume SELinux labelling: %s\n" % str(e)) + - ("Please run 'chcon %s %s' manually and retry installation" % (wantLabel, self.path))) + logging.warn(_(("Unable to fix install volume SELinux " + "labelling: %s\n") % str(e)+ "Please run " + "'chcon %s %s' manually and retry " + "installation" % (wantLabel, self.path))) def get_xml_config(self, disknode=None): Index: python-virtinst.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-virtinst/F-11/python-virtinst.spec,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- python-virtinst.spec 14 Apr 2009 21:06:59 -0000 1.66 +++ python-virtinst.spec 21 Apr 2009 17:19:02 -0000 1.67 @@ -17,7 +17,7 @@ Summary: Python modules and utilities for installing virtual machines Name: python-%{appname} Version: 0.400.3 -Release: 6%{_extra_release} +Release: 7%{_extra_release} Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz Patch1: %{appname}-%{version}-fix-virtimage-scratch.patch Patch2: %{appname}-%{version}-hostdev-libvirt-calls.patch @@ -29,6 +29,8 @@ Patch6: %{appname}-%{version}-fix-floppy-dev.patch # F11 Translations (bz 493944 and bz 494358) Patch7: %{appname}-%{version}-updated-trans.patch +# Only throw warnings if we fail to relabel install media (bz 496340) +Patch8: %{appname}-%{version}-selinux-warn.patch License: GPLv2+ Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -62,6 +64,7 @@ %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 %build python setup.py build @@ -97,6 +100,9 @@ %{_bindir}/virt-convert %changelog +* Tue Apr 21 2009 Cole Robinson - 0.400.3-7.fc11 +- Only warn if selinux labeling appears to be wrong (bz 496340) + * Tue Apr 14 2009 Cole Robinson - 0.400.3-6.fc11 - More translation updates From markmc at fedoraproject.org Thu Apr 23 10:12:22 2009 From: markmc at fedoraproject.org (Mark McLoughlin) Date: Thu, 23 Apr 2009 10:12:22 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/devel make-release, NONE, 1.1 qemu.spec, 1.83, 1.84 Message-ID: <20090423101222.72CA670104@cvs1.fedora.phx.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23561 Modified Files: qemu.spec Added Files: make-release Log Message: * Thu Apr 23 2009 Mark McLoughlin - 2:0.10-14 - Improve instructions for generating the tarball --- NEW FILE make-release --- #!/bin/bash -e # Based on avi's scripts/make-release from kvm-userspace.git usage() { echo "usage: make-release name kernel-dir kernel-commit user-dir user-commit" exit 1 } [ $# -eq 5 ] || usage name="$1" kdir="$2" kcommit="$3" udir="$4" ucommit="$5" archs=(x86 ia64) release_dir=$(mktemp -d) tarball="$(pwd)/$name.tar.gz" cd "${release_dir}" (cd "$udir"; git archive --format=tar --prefix="$name"/ "$ucommit") | tar x cd "$name" cat < SOURCES kernel: $(cd "$kdir"; git rev-parse "$kcommit") userspace: $(cd "$udir"; git rev-parse "$ucommit") EOF paths=(drivers/kvm virt/kvm) files=(kvm.h kvm_host.h kvm_para.h kvm_types.h kvm_x86_emulate.h virtext.h svm.h vmx.h) for file in "${files[@]}"; do for arch in "${archs[@]}"; do for variant in include/asm-"$arch" arch/"$arch"/include/asm; do paths+=("$variant"/"$file") done done paths+=(include/linux/"$file") done for arch in "${archs[@]}"; do paths+=(arch/"$arch"/kvm) done (cd "$kdir"; git archive --format=tar --prefix=linux/ "$kcommit" "${paths[@]}") | tar x touch kernel/config.kbuild echo ARCH=ia64 > config.mak make -C kernel sync LINUX=../linux version="$name" >/dev/null echo ARCH=x86_64 > config.mak make -C kernel sync LINUX=../linux version="$name" >/dev/null rm -rf config.mak linux kernel/config.kbuild #rm -rf kernel/include/asm kernel/include-compat/asm sed -i "s/kvm-devel/$name/" qemu/configure cd .. tar czf "$tarball" "$name" cd $(dirname "$tarball") md5sum $(basename "$tarball") rm -rf "${release_dir}" Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- qemu.spec 21 Apr 2009 13:53:59 -0000 1.83 +++ qemu.spec 23 Apr 2009 10:11:52 -0000 1.84 @@ -1,26 +1,24 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.10 -Release: 13%{?dist} +Release: 14%{?dist} # I have mistakenly thought the revision name would be 1.0. # So 0.10 series get Epoch = 1 Epoch: 2 License: GPLv2+ and LGPLv2+ and BSD Group: Development/Tools URL: http://www.qemu.org/ -#Source0: http://www.qemu.org/%{name}-%{version}.tar.gz -# git clone git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git -# git clone git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm-userspace.git -# echo "kdir=$(pwd)/kvm" > ~/.kvm-release-config -# cd kvm-userspace -# mkdir $(HOME)/sf-releases -# ./scripts/make-release kvm-85rc-1.git-snapshot-date +%Y%m%d HEAD HEAD +# To re-create the tarball below: +# $> git clone git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git +# $> git clone git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm-userspace.git +# $> make-release qemu-kvm-%{version}.tar.gz $(pwd)/kvm v2.6.29-6998-g1d0cdf1 \ +# $(pwd)/kvm-userspace kvm-84-196-ga01bd3f Source0: qemu-kvm-%{version}.tar.gz + Source1: qemu.init Source2: kvm.modules - Patch1: 01-tls-handshake-fix.patch Patch2: 02-vnc-monitor-info.patch Patch3: 03-display-keymaps.patch @@ -468,6 +466,9 @@ %{_mandir}/man1/qemu-img.1* %changelog +* Thu Apr 23 2009 Mark McLoughlin - 2:0.10-14 +- Improve instructions for generating the tarball + * Tue Apr 21 2009 Mark McLoughlin - 2:0.10-13 - Enable pulseaudio driver to fix qemu lockup at shutdown (#495964) From markmc at fedoraproject.org Thu Apr 23 10:14:49 2009 From: markmc at fedoraproject.org (Mark McLoughlin) Date: Thu, 23 Apr 2009 10:14:49 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/F-11 qemu.spec,1.82,1.83 Message-ID: <20090423101449.5D8CE70104@cvs1.fedora.phx.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/qemu/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24008 Modified Files: qemu.spec Log Message: * Thu Apr 23 2009 Mark McLoughlin - 2:0.10-13 - Improve instructions for generating the tarball Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/F-11/qemu.spec,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- qemu.spec 21 Apr 2009 09:04:20 -0000 1.82 +++ qemu.spec 23 Apr 2009 10:14:18 -0000 1.83 @@ -1,26 +1,24 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.10 -Release: 12%{?dist} +Release: 13%{?dist} # I have mistakenly thought the revision name would be 1.0. # So 0.10 series get Epoch = 1 Epoch: 2 License: GPLv2+ and LGPLv2+ and BSD Group: Development/Tools URL: http://www.qemu.org/ -#Source0: http://www.qemu.org/%{name}-%{version}.tar.gz -# git clone git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git -# git clone git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm-userspace.git -# echo "kdir=$(pwd)/kvm" > ~/.kvm-release-config -# cd kvm-userspace -# mkdir $(HOME)/sf-releases -# ./scripts/make-release kvm-85rc-1.git-snapshot-date +%Y%m%d HEAD HEAD +# To re-create the tarball below: +# $> git clone git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git +# $> git clone git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm-userspace.git +# $> make-release qemu-kvm-%{version}.tar.gz $(pwd)/kvm v2.6.29-6998-g1d0cdf1 \ +# $(pwd)/kvm-userspace kvm-84-196-ga01bd3f Source0: qemu-kvm-%{version}.tar.gz + Source1: qemu.init Source2: kvm.modules - Patch1: 01-tls-handshake-fix.patch Patch2: 02-vnc-monitor-info.patch Patch3: 03-display-keymaps.patch @@ -467,6 +465,9 @@ %{_mandir}/man1/qemu-img.1* %changelog +* Thu Apr 23 2009 Mark McLoughlin - 2:0.10-13 +- Improve instructions for generating the tarball + * Tue Apr 21 2009 Mark McLoughlin - 2:0.10-12 - Another qcow2 image corruption fix (#496642) From markmc at fedoraproject.org Thu Apr 23 10:23:26 2009 From: markmc at fedoraproject.org (Mark McLoughlin) Date: Thu, 23 Apr 2009 10:23:26 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/F-11 qemu.spec,1.83,1.84 Message-ID: <20090423102326.A0F4270104@cvs1.fedora.phx.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/qemu/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25669 Modified Files: qemu.spec Log Message: Include the make-release script in the src.rpm Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/F-11/qemu.spec,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- qemu.spec 23 Apr 2009 10:14:18 -0000 1.83 +++ qemu.spec 23 Apr 2009 10:22:54 -0000 1.84 @@ -15,9 +15,9 @@ # $> make-release qemu-kvm-%{version}.tar.gz $(pwd)/kvm v2.6.29-6998-g1d0cdf1 \ # $(pwd)/kvm-userspace kvm-84-196-ga01bd3f Source0: qemu-kvm-%{version}.tar.gz - -Source1: qemu.init -Source2: kvm.modules +Source1: make-release +Source2: qemu.init +Source3: kvm.modules Patch1: 01-tls-handshake-fix.patch Patch2: 02-vnc-monitor-info.patch From markmc at fedoraproject.org Thu Apr 23 10:23:39 2009 From: markmc at fedoraproject.org (Mark McLoughlin) Date: Thu, 23 Apr 2009 10:23:39 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/devel qemu.spec,1.84,1.85 Message-ID: <20090423102339.3A61870104@cvs1.fedora.phx.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25736 Modified Files: qemu.spec Log Message: Include the make-release script in the src.rpm Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- qemu.spec 23 Apr 2009 10:11:52 -0000 1.84 +++ qemu.spec 23 Apr 2009 10:23:08 -0000 1.85 @@ -15,9 +15,9 @@ # $> make-release qemu-kvm-%{version}.tar.gz $(pwd)/kvm v2.6.29-6998-g1d0cdf1 \ # $(pwd)/kvm-userspace kvm-84-196-ga01bd3f Source0: qemu-kvm-%{version}.tar.gz - -Source1: qemu.init -Source2: kvm.modules +Source1: make-release +Source2: qemu.init +Source3: kvm.modules Patch1: 01-tls-handshake-fix.patch Patch2: 02-vnc-monitor-info.patch From markmc at fedoraproject.org Thu Apr 23 10:29:46 2009 From: markmc at fedoraproject.org (Mark McLoughlin) Date: Thu, 23 Apr 2009 10:29:46 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/F-11 make-release,NONE,1.1 Message-ID: <20090423102946.4E9FF70104@cvs1.fedora.phx.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/qemu/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27359 Added Files: make-release Log Message: Add forgotten file --- NEW FILE make-release --- #!/bin/bash -e # Based on avi's scripts/make-release from kvm-userspace.git usage() { echo "usage: make-release name kernel-dir kernel-commit user-dir user-commit" exit 1 } [ $# -eq 5 ] || usage name="$1" kdir="$2" kcommit="$3" udir="$4" ucommit="$5" archs=(x86 ia64) release_dir=$(mktemp -d) tarball="$(pwd)/$name.tar.gz" cd "${release_dir}" (cd "$udir"; git archive --format=tar --prefix="$name"/ "$ucommit") | tar x cd "$name" cat < SOURCES kernel: $(cd "$kdir"; git rev-parse "$kcommit") userspace: $(cd "$udir"; git rev-parse "$ucommit") EOF paths=(drivers/kvm virt/kvm) files=(kvm.h kvm_host.h kvm_para.h kvm_types.h kvm_x86_emulate.h virtext.h svm.h vmx.h) for file in "${files[@]}"; do for arch in "${archs[@]}"; do for variant in include/asm-"$arch" arch/"$arch"/include/asm; do paths+=("$variant"/"$file") done done paths+=(include/linux/"$file") done for arch in "${archs[@]}"; do paths+=(arch/"$arch"/kvm) done (cd "$kdir"; git archive --format=tar --prefix=linux/ "$kcommit" "${paths[@]}") | tar x touch kernel/config.kbuild echo ARCH=ia64 > config.mak make -C kernel sync LINUX=../linux version="$name" >/dev/null echo ARCH=x86_64 > config.mak make -C kernel sync LINUX=../linux version="$name" >/dev/null rm -rf config.mak linux kernel/config.kbuild #rm -rf kernel/include/asm kernel/include-compat/asm sed -i "s/kvm-devel/$name/" qemu/configure cd .. tar czf "$tarball" "$name" cd $(dirname "$tarball") md5sum $(basename "$tarball") rm -rf "${release_dir}" From veillard at fedoraproject.org Fri Apr 24 14:57:51 2009 From: veillard at fedoraproject.org (Daniel Veillard) Date: Fri, 24 Apr 2009 14:57:51 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libvirt/devel libvirt-0.6.3-svirt-sound.patch, NONE, 1.1 .cvsignore, 1.39, 1.40 libvirt.spec, 1.124, 1.125 sources, 1.40, 1.41 libvirt-0.6.2-qemu-drive-format.patch, 1.1, NONE libvirt-0.6.2-svirt-sound.patch, 1.1, NONE Message-ID: <20090424145752.021CD70106@cvs1.fedora.phx.redhat.com> Author: veillard Update of /cvs/pkgs/rpms/libvirt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28775 Modified Files: .cvsignore libvirt.spec sources Added Files: libvirt-0.6.3-svirt-sound.patch Removed Files: libvirt-0.6.2-qemu-drive-format.patch libvirt-0.6.2-svirt-sound.patch Log Message: Upstream release, 0.6.3, Daniel libvirt-0.6.3-svirt-sound.patch: --- NEW FILE libvirt-0.6.3-svirt-sound.patch --- --- src/qemu_conf.c.orig 2009-04-02 11:50:10.000000000 +0200 +++ src/qemu_conf.c 2009-04-03 17:46:59.000000000 +0200 @@ -779,6 +779,20 @@ int qemudBuildCommandLine(virConnectPtr char domid[50]; char *pidfile; const char *cpu = NULL; + int skipSound = 0; + + if (driver->securityDriver && + driver->securityDriver->name && + STREQ(driver->securityDriver->name, "selinux") && + getuid() == 0) { + static int soundWarned = 0; + skipSound = 1; + if (def->nsounds && + !soundWarned) { + soundWarned = 1; + VIR_WARN0("Sound cards for VMs are disabled while SELinux security model is active"); + } + } uname_normalize(&ut); @@ -1425,7 +1439,8 @@ int qemudBuildCommandLine(virConnectPtr } /* Add sound hardware */ - if (def->nsounds) { + if (def->nsounds && + !skipSound) { int size = 100; char *modstr; if (VIR_ALLOC_N(modstr, size+1) < 0) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/devel/.cvsignore,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- .cvsignore 3 Apr 2009 15:52:11 -0000 1.39 +++ .cvsignore 24 Apr 2009 14:57:21 -0000 1.40 @@ -6,3 +6,4 @@ libvirt-0.6.0.tar.gz libvirt-0.6.1.tar.gz libvirt-0.6.2.tar.gz +libvirt-0.6.3.tar.gz Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v retrieving revision 1.124 retrieving revision 1.125 diff -u -r1.124 -r1.125 --- libvirt.spec 16 Apr 2009 15:25:28 -0000 1.124 +++ libvirt.spec 24 Apr 2009 14:57:21 -0000 1.125 @@ -1,26 +1,14 @@ # -*- rpm-spec -*- -%define with_xen 0%{!?_without_xen:1} -%define with_xen_proxy 0%{!?_without_xen_proxy:1} -%define with_qemu 0%{!?_without_qemu:1} -%define with_openvz 0%{!?_without_openvz:1} -%define with_lxc 0%{!?_without_lxc:1} -%define with_sasl 0%{!?_without_sasl:1} -%define with_avahi 0%{!?_without_avahi:1} -%define with_polkit 0%{!?_without_polkit:0} -%define with_python 0%{!?_without_python:1} -%define with_libvirtd 0%{!?_without_libvirtd:1} -%define with_uml 0%{!?_without_uml:1} -%define with_network 0%{!?_without_network:1} - %define with_xen 0%{!?_without_xen:1} %define with_xen_proxy 0%{!?_without_xen_proxy:1} %define with_qemu 0%{!?_without_qemu:1} %define with_openvz 0%{!?_without_openvz:1} %define with_lxc 0%{!?_without_lxc:1} +%define with_vbox 0%{!?_without_vbox:1} %define with_sasl 0%{!?_without_sasl:1} %define with_avahi 0%{!?_without_avahi:1} -%define with_polkit 0%{!?_without_polkit:0} +%define with_polkit 0%{!?_without_polkit:1} %define with_python 0%{!?_without_python:1} %define with_libvirtd 0%{!?_without_libvirtd:1} %define with_uml 0%{!?_without_uml:1} @@ -60,23 +48,24 @@ %define with_rhel5 0 %else %define with_rhel5 1 +%define with_polkit 0 %endif Summary: Library providing a simple API virtualization Name: libvirt -Version: 0.6.2 -Release: 2%{?dist}%{?extra_release} +Version: 0.6.3 +Release: 1%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries Source: libvirt-%{version}.tar.gz # Patches cherry-picked from upstream -Patch0: libvirt-0.6.2-qemu-drive-format.patch +# N/A # Not for upstream. Temporary hack till PulseAudio autostart # problems are sorted out when SELinux enforcing -Patch200: libvirt-0.6.2-svirt-sound.patch +Patch200: libvirt-0.6.3-svirt-sound.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root URL: http://libvirt.org/ @@ -227,8 +216,6 @@ %prep %setup -q -%patch0 -p1 - %patch200 -p0 mv NEWS NEWS.old @@ -251,6 +238,10 @@ %define _without_lxc --without-lxc %endif +%if ! %{with_vbox} +%define _without_vbox --without-vbox +%endif + %if ! %{with_sasl} %define _without_sasl --without-sasl %endif @@ -307,6 +298,7 @@ %{?_without_qemu} \ %{?_without_openvz} \ %{?_without_lxc} \ + %{?_without_vbox} \ %{?_without_sasl} \ %{?_without_avahi} \ %{?_without_polkit} \ @@ -341,7 +333,7 @@ install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/run/libvirt/ # Default dir for disk images defined in SELinux policy install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/lib/libvirt/images/ -# Default dir for kernel+initrd images defnied in SELinux policy +# Default dir for kernel+initrd images defined in SELinux policy install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/lib/libvirt/boot/ %if %{with_qemu} @@ -414,8 +406,10 @@ %defattr(-, root, root) %doc AUTHORS ChangeLog NEWS README COPYING.LIB TODO -%doc %{_mandir}/man1/virsh.1* +%{_mandir}/man1/virsh.1* +%{_mandir}/man1/virt-xml-validate.1* %{_bindir}/virsh +%{_bindir}/virt-xml-validate %{_libdir}/lib*.so.* %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/ @@ -547,6 +541,12 @@ %endif %changelog +* Fri Apr 24 2009 Daniel Veillard - 0.6.3-1.fc12 +- release of 0.6.3 +- VirtualBox driver +- new virt-xml-validate command +- assorted bug fixes + * Thu Apr 16 2009 Mark McLoughlin - 0.6.2-2.fc12 - Fix qemu drive format specification (#496092) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/devel/sources,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- sources 3 Apr 2009 15:52:11 -0000 1.40 +++ sources 24 Apr 2009 14:57:21 -0000 1.41 @@ -1 +1 @@ -3035b484861516a1cd425acef1e760e3 libvirt-0.6.2.tar.gz +dd618bf0943a0be853ccc08308c7f427 libvirt-0.6.3.tar.gz --- libvirt-0.6.2-qemu-drive-format.patch DELETED --- --- libvirt-0.6.2-svirt-sound.patch DELETED --- From markmc at fedoraproject.org Fri Apr 24 17:09:39 2009 From: markmc at fedoraproject.org (Mark McLoughlin) Date: Fri, 24 Apr 2009 17:09:39 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/devel qemu.spec,1.85,1.86 Message-ID: <20090424170939.EDD2270106@cvs1.fedora.phx.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23485 Modified Files: qemu.spec Log Message: * Fri Apr 24 2009 Mark McLoughlin - 2:0.10-15 - Fix source numbering typos caused by make-release addition Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- qemu.spec 23 Apr 2009 10:23:08 -0000 1.85 +++ qemu.spec 24 Apr 2009 17:09:09 -0000 1.86 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.10 -Release: 14%{?dist} +Release: 15%{?dist} # I have mistakenly thought the revision name would be 1.0. # So 0.10 series get Epoch = 1 Epoch: 2 @@ -292,7 +292,7 @@ mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules mkdir -p $RPM_BUILD_ROOT%{_bindir}/ -install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules/kvm.modules +install -m 0755 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules/kvm.modules install -m 0755 kvmtrace $RPM_BUILD_ROOT%{_bindir}/ install -m 0755 kvmtrace_format $RPM_BUILD_ROOT%{_bindir}/ install -m 0755 kvm_stat $RPM_BUILD_ROOT%{_bindir}/ @@ -308,7 +308,7 @@ docdir="${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}" \ datadir="${RPM_BUILD_ROOT}%{_prefix}/share/qemu" install chmod -x ${RPM_BUILD_ROOT}%{_mandir}/man1/* -install -D -p -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/qemu +install -D -p -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/qemu install -D -p -m 0644 -t ${RPM_BUILD_ROOT}/%{qemudocdir} Changelog README TODO COPYING COPYING.LIB LICENSE install -D -p -m 0644 qemu.sasl $RPM_BUILD_ROOT%{_sysconfdir}/sasl2/qemu.conf @@ -466,6 +466,9 @@ %{_mandir}/man1/qemu-img.1* %changelog +* Fri Apr 24 2009 Mark McLoughlin - 2:0.10-15 +- Fix source numbering typos caused by make-release addition + * Thu Apr 23 2009 Mark McLoughlin - 2:0.10-14 - Improve instructions for generating the tarball From markmc at fedoraproject.org Fri Apr 24 17:12:07 2009 From: markmc at fedoraproject.org (Mark McLoughlin) Date: Fri, 24 Apr 2009 17:12:07 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/F-11 qemu.spec,1.84,1.85 Message-ID: <20090424171207.1FF1670106@cvs1.fedora.phx.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/qemu/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23829 Modified Files: qemu.spec Log Message: * Fri Apr 24 2009 Mark McLoughlin - 2:0.10-14 - Fix source numbering typos caused by make-release addition Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/F-11/qemu.spec,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- qemu.spec 23 Apr 2009 10:22:54 -0000 1.84 +++ qemu.spec 24 Apr 2009 17:11:36 -0000 1.85 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.10 -Release: 13%{?dist} +Release: 14%{?dist} # I have mistakenly thought the revision name would be 1.0. # So 0.10 series get Epoch = 1 Epoch: 2 @@ -291,7 +291,7 @@ mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules mkdir -p $RPM_BUILD_ROOT%{_bindir}/ -install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules/kvm.modules +install -m 0755 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules/kvm.modules install -m 0755 kvmtrace $RPM_BUILD_ROOT%{_bindir}/ install -m 0755 kvmtrace_format $RPM_BUILD_ROOT%{_bindir}/ install -m 0755 kvm_stat $RPM_BUILD_ROOT%{_bindir}/ @@ -307,7 +307,7 @@ docdir="${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}" \ datadir="${RPM_BUILD_ROOT}%{_prefix}/share/qemu" install chmod -x ${RPM_BUILD_ROOT}%{_mandir}/man1/* -install -D -p -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/qemu +install -D -p -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/qemu install -D -p -m 0644 -t ${RPM_BUILD_ROOT}/%{qemudocdir} Changelog README TODO COPYING COPYING.LIB LICENSE install -D -p -m 0644 qemu.sasl $RPM_BUILD_ROOT%{_sysconfdir}/sasl2/qemu.conf @@ -465,6 +465,9 @@ %{_mandir}/man1/qemu-img.1* %changelog +* Fri Apr 24 2009 Mark McLoughlin - 2:0.10-14 +- Fix source numbering typos caused by make-release addition + * Thu Apr 23 2009 Mark McLoughlin - 2:0.10-13 - Improve instructions for generating the tarball From markmc at fedoraproject.org Mon Apr 27 14:26:24 2009 From: markmc at fedoraproject.org (Mark McLoughlin) Date: Mon, 27 Apr 2009 14:26:24 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/devel qemu-disable-preadv.patch, NONE, 1.1 qemu-fix-arm-framebuffer-build.patch, NONE, 1.1 qemu-virtio-blk-boot-on.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 qemu-fix-qcow2-corruption.patch, 1.2, 1.3 qemu.spec, 1.86, 1.87 sources, 1.14, 1.15 01-tls-handshake-fix.patch, 1.1, NONE 02-vnc-monitor-info.patch, 1.1, NONE 03-display-keymaps.patch, 1.1, NONE 04-vnc-struct.patch, 1.1, NONE 05-vnc-tls-vencrypt.patch, 1.1, NONE 06-vnc-sasl.patch, 1.1, NONE 07-vnc-monitor-authinfo.patch, 1.1, NONE 08-vnc-acl-mgmt.patch, 1.1, NONE make-release, 1.1, NONE qemu-fix-debuginfo.patch, 1.1, NONE qemu-fix-display-breakage.patch, 1.2, NONE qemu-fix-gcc.patch, 1.1, NONE qemu-fix-qcow2-2TB.patch, 1.1, NONE qemu-roms-more-room.patch, 1.1, NONE Message-ID: <20090427142624.84E6870110@cvs1.fedora.phx.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20399 Modified Files: .cvsignore qemu-fix-qcow2-corruption.patch qemu.spec sources Added Files: qemu-disable-preadv.patch qemu-fix-arm-framebuffer-build.patch qemu-virtio-blk-boot-on.patch Removed Files: 01-tls-handshake-fix.patch 02-vnc-monitor-info.patch 03-display-keymaps.patch 04-vnc-struct.patch 05-vnc-tls-vencrypt.patch 06-vnc-sasl.patch 07-vnc-monitor-authinfo.patch 08-vnc-acl-mgmt.patch make-release qemu-fix-debuginfo.patch qemu-fix-display-breakage.patch qemu-fix-gcc.patch qemu-fix-qcow2-2TB.patch qemu-roms-more-room.patch Log Message: * Mon Apr 27 2009 Mark McLoughlin - 2:0.10.50-1.kvm85 - Update to qemu-kvm-devel-85 - kvm-85 is based on qemu development branch, currently version 0.10.50 - Include new qemu-io utility in qemu-img package - Re-instate -help string for boot=on to fix virtio booting with libvirt - Drop upstreamed patches - Fix missing kernel/include/asm symlink in upstream tarball - Fix target-arm build - Disable preadv()/pwritev() until bug #497429 is fixed - Kill more .kernelrelease uselessness - Make non-kvm qemu build verbose qemu-disable-preadv.patch: --- NEW FILE qemu-disable-preadv.patch --- diff -up qemu-kvm-devel-85/qemu/configure.disable-preadv qemu-kvm-devel-85/qemu/configure --- qemu-kvm-devel-85/qemu/configure.disable-preadv 2009-04-27 16:09:05.000000000 +0100 +++ qemu-kvm-devel-85/qemu/configure 2009-04-27 16:09:36.000000000 +0100 @@ -1189,9 +1189,9 @@ cat > $TMPC < /dev/null 2> /dev/null ; then - preadv=yes -fi +#if $cc $ARCH_CFLAGS -o $TMPE $TMPC > /dev/null 2> /dev/null ; then +# preadv=yes +#fi ########################################## # fdt probe qemu-fix-arm-framebuffer-build.patch: --- NEW FILE qemu-fix-arm-framebuffer-build.patch --- From: Mark McLoughlin Date: Mon, 27 Apr 2009 10:18:14 +0100 Subject: [PATCH] kvm: qemu: framebuffer: build fix for target-arm Include qemu-kvm.h for non-KVM_UPSTREAM building and surround the kvm code with USE_KVM guards. Fixes target-arm: qemu/hw/framebuffer.c: In function 'framebuffer_update_display': qemu/hw/framebuffer.c:53: warning: implicit declaration of function 'kvm_enabled' qemu/hw/framebuffer.c:54: warning: implicit declaration of function 'kvm_physical_sync_dirty_bitmap' Signed-off-by: Mark McLoughlin --- qemu/hw/framebuffer.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/qemu/hw/framebuffer.c b/qemu/hw/framebuffer.c index 1086ba9..e2d7604 100644 --- a/qemu/hw/framebuffer.c +++ b/qemu/hw/framebuffer.c @@ -18,6 +18,7 @@ #include "console.h" #include "framebuffer.h" #include "kvm.h" +#include "qemu-kvm.h" /* Render an image from a shared memory framebuffer. */ @@ -50,9 +51,11 @@ void framebuffer_update_display( *first_row = -1; src_len = src_width * rows; +#ifdef USE_KVM if (kvm_enabled()) { kvm_physical_sync_dirty_bitmap(base, src_len); } +#endif pd = cpu_get_physical_page_desc(base); pd2 = cpu_get_physical_page_desc(base + src_len - 1); /* We should reall check that this is a continuous ram region. -- 1.6.0.6 qemu-virtio-blk-boot-on.patch: --- NEW FILE qemu-virtio-blk-boot-on.patch --- From: Pauline Middelink To: kvm at vger.kernel.org Subject: kvm-85 won't boot guests with virtio block device Hi, To follow up on the issues with kvm-85 and libvirt I discovered the following issue: libvirt detects from the help of qemu which options it can give to qemu. (in this case obviously /usr/kvm/bin/qemu-system-x86_64 -help) If you look carefully to the output of the -help of qemu from kvm-84 and kvm-85, you will notice the boot flag to the -drive option has disappeared! Hence letting libvirt believe it isnt allowed to use it, hence the unable to boot error. A small patch which fixes the problem for me, is attached. Met vriendelijke groet, Pauline Middelink diff -ur kvm-85/qemu/qemu-options.hx kvm-85a/qemu/qemu-options.hx --- kvm-85/qemu/qemu-options.hx 2009-04-21 11:57:31.000000000 +0200 +++ kvm-85a/qemu/qemu-options.hx 2009-04-24 19:04:50.000000000 +0200 @@ -77,6 +77,7 @@ "-drive [file=file][,if=type][,bus=n][,unit=m][,media=d][,index=i]\n" " [,cyls=c,heads=h,secs=s[,trans=t]][,snapshot=on|off]\n" " [,cache=writethrough|writeback|none][,format=f][,serial=s]\n" + " [,boot=on|off]\n" " use 'file' as a drive image\n") STEXI @item -drive @var{option}[, at var{option}[, at var{option}[,...]]] Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 2 Apr 2009 01:07:39 -0000 1.14 +++ .cvsignore 27 Apr 2009 14:25:53 -0000 1.15 @@ -1 +1 @@ -qemu-kvm-0.10.tar.gz +qemu-kvm-*.tar.gz qemu-fix-qcow2-corruption.patch: Index: qemu-fix-qcow2-corruption.patch =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-fix-qcow2-corruption.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- qemu-fix-qcow2-corruption.patch 21 Apr 2009 09:03:39 -0000 1.2 +++ qemu-fix-qcow2-corruption.patch 27 Apr 2009 14:25:53 -0000 1.3 @@ -1,26 +1,3 @@ -From: Nolan Leake sigbus.net> -Subject: [PATCH] Fix (at least one cause of) qcow2 corruption. - -qcow2's get_cluster_offset() scans forward in the l2 table to find other -clusters that have the same allocation status as the first cluster. -This is used by (among others) qcow_is_allocated(). - -Unfortunately, it was not checking to be sure that it didn't fall off -the end of the l2 table. This patch adds that check. - -The symptom that motivated me to look into this was that -bdrv_is_allocated() was returning false when there was in fact data -there. This is one of many ways this bug could lead to data corruption. - -I checked the other place that scans for consecutive unallocated blocks -(alloc_cluster_offset()) and it appears to be OK: - nb_clusters = MIN(nb_clusters, s->l2_size - l2_index); -appears to prevent the same problem from occurring. - -Signed-off-by: Nolan Leake sigbus.net> - ---- - From: Kevin Wolf Subject: [PATCH] qcow2 corruption: Fix alloc_cluster_link_l2 @@ -41,22 +18,10 @@ Signed-off-by: Kevin Wolf -diff -up qemu-kvm-0.10/qemu/block-qcow2.c.qcow2-corruption qemu-kvm-0.10/qemu/block-qcow2.c -diff -up qemu-kvm-0.10/qemu/block-qcow2.c.qcow2-corruption qemu-kvm-0.10/qemu/block-qcow2.c ---- qemu-kvm-0.10/qemu/block-qcow2.c.qcow2-corruption 2009-04-21 09:57:21.000000000 +0100 -+++ qemu-kvm-0.10/qemu/block-qcow2.c 2009-04-21 09:58:27.000000000 +0100 -@@ -670,6 +670,10 @@ static uint64_t get_cluster_offset(Block - - nb_available = (nb_available >> 9) + index_in_cluster; - -+ if (nb_needed > nb_available) { -+ nb_needed = nb_available; -+ } -+ - cluster_offset = 0; - - /* seek the the l2 offset in the l1 table */ -@@ -912,7 +916,7 @@ static int alloc_cluster_link_l2(BlockDr +diff -up qemu-kvm-devel-85/qemu/block-qcow2.c.qcow2-corruption qemu-kvm-devel-85/qemu/block-qcow2.c +--- qemu-kvm-devel-85/qemu/block-qcow2.c.qcow2-corruption 2009-04-21 10:57:31.000000000 +0100 ++++ qemu-kvm-devel-85/qemu/block-qcow2.c 2009-04-24 19:29:44.000000000 +0100 +@@ -1007,7 +1007,7 @@ static int alloc_cluster_link_l2(BlockDr goto err; for (i = 0; i < j; i++) Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v retrieving revision 1.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- qemu.spec 24 Apr 2009 17:09:09 -0000 1.86 +++ qemu.spec 27 Apr 2009 14:25:54 -0000 1.87 @@ -1,42 +1,41 @@ +%define kvmvernum 85 +%define kvmvertag kvm%{kvmvernum} +%define kvmverfull kvm-devel-%{kvmvernum} + Summary: QEMU is a FAST! processor emulator Name: qemu -Version: 0.10 -Release: 15%{?dist} -# I have mistakenly thought the revision name would be 1.0. -# So 0.10 series get Epoch = 1 +Version: 0.10.50 +Release: 1.%{kvmvertag}%{?dist} +# Epoch because we pushed a qemu-1.0 package Epoch: 2 License: GPLv2+ and LGPLv2+ and BSD Group: Development/Tools URL: http://www.qemu.org/ -# To re-create the tarball below: -# $> git clone git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git -# $> git clone git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm-userspace.git -# $> make-release qemu-kvm-%{version}.tar.gz $(pwd)/kvm v2.6.29-6998-g1d0cdf1 \ -# $(pwd)/kvm-userspace kvm-84-196-ga01bd3f -Source0: qemu-kvm-%{version}.tar.gz -Source1: make-release -Source2: qemu.init -Source3: kvm.modules - -Patch1: 01-tls-handshake-fix.patch -Patch2: 02-vnc-monitor-info.patch -Patch3: 03-display-keymaps.patch -Patch4: 04-vnc-struct.patch -Patch5: 05-vnc-tls-vencrypt.patch -Patch6: 06-vnc-sasl.patch -Patch7: 07-vnc-monitor-authinfo.patch -Patch8: 08-vnc-acl-mgmt.patch - -Patch9: kvm-upstream-ppc.patch -Patch10: qemu-fix-debuginfo.patch -Patch11: qemu-fix-gcc.patch -Patch12: qemu-roms-more-room.patch -Patch13: qemu-roms-more-room-fix-vga-align.patch -Patch14: qemu-bios-bigger-roms.patch -Patch15: qemu-fix-display-breakage.patch -Patch16: qemu-fix-qcow2-2TB.patch -Patch17: qemu-fix-qcow2-corruption.patch +Source0: http://download.sourceforge.net/sourceforge/kvm/qemu-%{kvmverfull}.tar.gz +Source1: qemu.init +Source2: kvm.modules + +# Hack until merge happens upstream +Patch01: kvm-upstream-ppc.patch + +# Not upstream, why? +Patch02: qemu-bios-bigger-roms.patch + +# Fixed upstream by f753ff1638 +Patch03: qemu-roms-more-room-fix-vga-align.patch + +# Fixed upstream by 641636d19e +Patch04: qemu-fix-qcow2-corruption.patch + +# Seen on kvm list +Patch05: qemu-virtio-blk-boot-on.patch + +# kvm-85 build fix, submitted upstream +Patch06: qemu-fix-arm-framebuffer-build.patch + +# Disable preadv()/pwritev() until bug #497429 is fixed +Patch07: qemu-disable-preadv.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel @@ -206,25 +205,20 @@ %endif %prep -%setup -q -n qemu-kvm-%{version} +%setup -q -n qemu-%{kvmverfull} -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 -%patch15 -p1 -%patch16 -p1 -%patch17 -p1 +# +# Hack - kvm-85 missing kernel/include/asm symlink +# +(cd kernel/include && ln -s asm-x86 asm) + +%patch01 -p1 -b .kvm-upstream-ppc +%patch02 -p1 -b .bios-bigger-roms +%patch03 -p1 -b .roms-more-room-fix-vga-align +%patch04 -p1 -b .fix-qcow2-corruption +%patch05 -p1 -b .virtio-blk-boot-on +%patch06 -p1 -b .framebuffer-build-fix +%patch07 -p1 -b .disable-preadv %build # systems like rhel build system does not have a recent enough linker so @@ -262,7 +256,6 @@ make clean %endif -echo "%{name}-%{version}" > $(pwd)/kernel/.kernelrelease cd qemu ./configure \ --target-list="i386-softmmu x86_64-softmmu arm-softmmu cris-softmmu m68k-softmmu \ @@ -282,8 +275,7 @@ --audio-drv-list=pa,sdl,alsa,oss \ --extra-cflags="$RPM_OPT_FLAGS" - -make %{?_smp_mflags} $buildldflags +make V=1 %{?_smp_mflags} $buildldflags %install rm -rf $RPM_BUILD_ROOT @@ -292,7 +284,7 @@ mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules mkdir -p $RPM_BUILD_ROOT%{_bindir}/ -install -m 0755 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules/kvm.modules +install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules/kvm.modules install -m 0755 kvmtrace $RPM_BUILD_ROOT%{_bindir}/ install -m 0755 kvmtrace_format $RPM_BUILD_ROOT%{_bindir}/ install -m 0755 kvm_stat $RPM_BUILD_ROOT%{_bindir}/ @@ -308,7 +300,7 @@ docdir="${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}" \ datadir="${RPM_BUILD_ROOT}%{_prefix}/share/qemu" install chmod -x ${RPM_BUILD_ROOT}%{_mandir}/man1/* -install -D -p -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/qemu +install -D -p -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/qemu install -D -p -m 0644 -t ${RPM_BUILD_ROOT}/%{qemudocdir} Changelog README TODO COPYING COPYING.LIB LICENSE install -D -p -m 0644 qemu.sasl $RPM_BUILD_ROOT%{_sysconfdir}/sasl2/qemu.conf @@ -339,8 +331,6 @@ ln -s ../openbios/openbios-sparc32 %{buildroot}/%{_prefix}/share/qemu/openbios-sparc32 ln -s ../openbios/openbios-sparc64 %{buildroot}/%{_prefix}/share/qemu/openbios-sparc64 - - %clean rm -rf $RPM_BUILD_ROOT @@ -463,9 +453,22 @@ %files img %defattr(-,root,root) %{_bindir}/qemu-img +%{_bindir}/qemu-io %{_mandir}/man1/qemu-img.1* %changelog +* Mon Apr 27 2009 Mark McLoughlin - 2:0.10.50-1.kvm85 +- Update to qemu-kvm-devel-85 +- kvm-85 is based on qemu development branch, currently version 0.10.50 +- Include new qemu-io utility in qemu-img package +- Re-instate -help string for boot=on to fix virtio booting with libvirt +- Drop upstreamed patches +- Fix missing kernel/include/asm symlink in upstream tarball +- Fix target-arm build +- Disable preadv()/pwritev() until bug #497429 is fixed +- Kill more .kernelrelease uselessness +- Make non-kvm qemu build verbose + * Fri Apr 24 2009 Mark McLoughlin - 2:0.10-15 - Fix source numbering typos caused by make-release addition Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 2 Apr 2009 01:07:39 -0000 1.14 +++ sources 27 Apr 2009 14:25:54 -0000 1.15 @@ -1 +1 @@ -04c32fb43c722f180654f53e04ad17dd qemu-kvm-0.10.tar.gz +3b671f64b66e7e6e571516193c184653 qemu-kvm-devel-85.tar.gz --- 01-tls-handshake-fix.patch DELETED --- --- 02-vnc-monitor-info.patch DELETED --- --- 03-display-keymaps.patch DELETED --- --- 04-vnc-struct.patch DELETED --- --- 05-vnc-tls-vencrypt.patch DELETED --- --- 06-vnc-sasl.patch DELETED --- --- 07-vnc-monitor-authinfo.patch DELETED --- --- 08-vnc-acl-mgmt.patch DELETED --- --- make-release DELETED --- --- qemu-fix-debuginfo.patch DELETED --- --- qemu-fix-display-breakage.patch DELETED --- --- qemu-fix-gcc.patch DELETED --- --- qemu-fix-qcow2-2TB.patch DELETED --- --- qemu-roms-more-room.patch DELETED --- From markmc at fedoraproject.org Mon Apr 27 14:57:07 2009 From: markmc at fedoraproject.org (Mark McLoughlin) Date: Mon, 27 Apr 2009 14:57:07 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/devel qemu-add-cache-utils-to-block-objs.patch, NONE, 1.1 qemu.spec, 1.87, 1.88 Message-ID: <20090427145707.0D9B570110@cvs1.fedora.phx.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26576 Modified Files: qemu.spec Added Files: qemu-add-cache-utils-to-block-objs.patch Log Message: Fix build on ppc qemu-add-cache-utils-to-block-objs.patch: --- NEW FILE qemu-add-cache-utils-to-block-objs.patch --- diff -up ./qemu-kvm-devel-85/qemu/Makefile.add-cache-utils-to-block-objs ./qemu-kvm-devel-85/qemu/Makefile --- ./qemu-kvm-devel-85/qemu/Makefile.add-cache-utils-to-block-objs 2009-04-27 15:54:16.000000000 +0100 +++ ./qemu-kvm-devel-85/qemu/Makefile 2009-04-27 15:53:51.000000000 +0100 @@ -49,7 +49,7 @@ recurse-all: $(SUBDIR_RULES) ####################################################################### # BLOCK_OBJS is code used by both qemu system emulation and qemu-img -BLOCK_OBJS=cutils.o qemu-malloc.o +BLOCK_OBJS=cutils.o cache-utils.o qemu-malloc.o BLOCK_OBJS+=block-cow.o block-qcow.o aes.o block-vmdk.o block-cloop.o BLOCK_OBJS+=block-dmg.o block-bochs.o block-vpc.o block-vvfat.o BLOCK_OBJS+=block-qcow2.o block-parallels.o block-nbd.o Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v retrieving revision 1.87 retrieving revision 1.88 diff -u -r1.87 -r1.88 --- qemu.spec 27 Apr 2009 14:25:54 -0000 1.87 +++ qemu.spec 27 Apr 2009 14:56:36 -0000 1.88 @@ -37,6 +37,9 @@ # Disable preadv()/pwritev() until bug #497429 is fixed Patch07: qemu-disable-preadv.patch +# Fix build on ppc; cutils.c needs cache-utils.c +Patch08: qemu-add-cache-utils-to-block-objs.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel BuildRequires: rsync dev86 iasl @@ -219,6 +222,7 @@ %patch05 -p1 -b .virtio-blk-boot-on %patch06 -p1 -b .framebuffer-build-fix %patch07 -p1 -b .disable-preadv +%patch08 -p1 -b .add-cache-utils-to-block-objs %build # systems like rhel build system does not have a recent enough linker so @@ -465,6 +469,7 @@ - Drop upstreamed patches - Fix missing kernel/include/asm symlink in upstream tarball - Fix target-arm build +- Fix build on ppc - Disable preadv()/pwritev() until bug #497429 is fixed - Kill more .kernelrelease uselessness - Make non-kvm qemu build verbose From markmc at fedoraproject.org Mon Apr 27 15:09:37 2009 From: markmc at fedoraproject.org (Mark McLoughlin) Date: Mon, 27 Apr 2009 15:09:37 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/devel qemu-add-cache-utils-to-block-objs.patch, 1.1, 1.2 Message-ID: <20090427150937.7F07170110@cvs1.fedora.phx.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29185 Modified Files: qemu-add-cache-utils-to-block-objs.patch Log Message: Fix patch strip level qemu-add-cache-utils-to-block-objs.patch: Index: qemu-add-cache-utils-to-block-objs.patch =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-add-cache-utils-to-block-objs.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qemu-add-cache-utils-to-block-objs.patch 27 Apr 2009 14:56:36 -0000 1.1 +++ qemu-add-cache-utils-to-block-objs.patch 27 Apr 2009 15:09:35 -0000 1.2 @@ -1,6 +1,6 @@ -diff -up ./qemu-kvm-devel-85/qemu/Makefile.add-cache-utils-to-block-objs ./qemu-kvm-devel-85/qemu/Makefile ---- ./qemu-kvm-devel-85/qemu/Makefile.add-cache-utils-to-block-objs 2009-04-27 15:54:16.000000000 +0100 -+++ ./qemu-kvm-devel-85/qemu/Makefile 2009-04-27 15:53:51.000000000 +0100 +diff -up qemu-kvm-devel-85/qemu/Makefile.add-cache-utils-to-block-objs qemu-kvm-devel-85/qemu/Makefile +--- qemu-kvm-devel-85/qemu/Makefile.add-cache-utils-to-block-objs 2009-04-27 15:54:16.000000000 +0100 ++++ qemu-kvm-devel-85/qemu/Makefile 2009-04-27 15:53:51.000000000 +0100 @@ -49,7 +49,7 @@ recurse-all: $(SUBDIR_RULES) ####################################################################### # BLOCK_OBJS is code used by both qemu system emulation and qemu-img From glommer at fedoraproject.org Tue Apr 28 00:37:41 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Tue, 28 Apr 2009 00:37:41 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/F-11 qemu.spec,1.85,1.86 Message-ID: <20090428003741.A91A870132@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/qemu/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13353 Modified Files: qemu.spec Log Message: qemu-kvm metapackage Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/F-11/qemu.spec,v retrieving revision 1.85 retrieving revision 1.86 diff -u -p -r1.85 -r1.86 --- qemu.spec 24 Apr 2009 17:11:36 -0000 1.85 +++ qemu.spec 28 Apr 2009 00:37:11 -0000 1.86 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.10 -Release: 14%{?dist} +Release: 15%{?dist} # I have mistakenly thought the revision name would be 1.0. # So 0.10 series get Epoch = 1 Epoch: 2 @@ -68,6 +68,22 @@ emulation speed by using dynamic transla As QEMU requires no host kernel patches to run, it is safe and easy to use. +%package kvm +Summary: QEMU metapackage for KVM support +Group: Development/Tools +%ifarch %{ix86} x86_64 +Requires: qemu-system-x86 = %{epoch}:%{version}-%{release} +%endif +%ifarch ppc ppc64 +Requires: qemu-system-ppc = %{epoch}:%{version}-%{release} +%endif + +%description kvm +This is a meta-package that provides a qemu-system- package for native +architectures where kvm can be enabled. For example, in an x86 system, this +will install qemu-system-x86 + + %package img Summary: QEMU command line tool for manipulating disk images Group: Development/Tools @@ -108,9 +124,6 @@ Requires: vgabios Requires: bochs-bios >= 2.3.8-0.5 Provides: kvm = 85 Obsoletes: kvm < 85 -%ifarch %{ix86} x86_64 -Provides: qemu-kvm = %{epoch}:%{version}-%{release} -%endif %description system-x86 QEMU is a generic and open source processor emulator which achieves a good @@ -125,9 +138,6 @@ Summary: QEMU system emulator for ppc Group: Development/Tools Requires: %{name}-common = %{epoch}:%{version}-%{release} Requires: openbios-ppc -%ifarch ppc ppc64 -Provides: qemu-kvm = %{epoch}:%{version}-%{release} -%endif %description system-ppc QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation. @@ -465,6 +475,9 @@ fi %{_mandir}/man1/qemu-img.1* %changelog +* Fri Apr 27 2009 Glauber Costa - 2:0.10-15 +- provide qemu-kvm as a metapackage + * Fri Apr 24 2009 Mark McLoughlin - 2:0.10-14 - Fix source numbering typos caused by make-release addition From markmc at fedoraproject.org Tue Apr 28 06:33:30 2009 From: markmc at fedoraproject.org (Mark McLoughlin) Date: Tue, 28 Apr 2009 06:33:30 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/devel qemu.spec,1.88,1.89 Message-ID: <20090428063330.9EE8970129@cvs1.fedora.phx.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22111 Modified Files: qemu.spec Log Message: * Tue Apr 28 2009 Mark McLoughlin - 2:0.10.50-2.kvm85 - Provide qemu-kvm as a metapackage for comps Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v retrieving revision 1.88 retrieving revision 1.89 diff -u -p -r1.88 -r1.89 --- qemu.spec 27 Apr 2009 14:56:36 -0000 1.88 +++ qemu.spec 28 Apr 2009 06:33:00 -0000 1.89 @@ -5,7 +5,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.10.50 -Release: 1.%{kvmvertag}%{?dist} +Release: 2.%{kvmvertag}%{?dist} # Epoch because we pushed a qemu-1.0 package Epoch: 2 License: GPLv2+ and LGPLv2+ and BSD @@ -71,6 +71,22 @@ emulation speed by using dynamic transla As QEMU requires no host kernel patches to run, it is safe and easy to use. +%package kvm +Summary: QEMU metapackage for KVM support +Group: Development/Tools +%ifarch %{ix86} x86_64 +Requires: qemu-system-x86 = %{epoch}:%{version}-%{release} +%endif +%ifarch ppc ppc64 +Requires: qemu-system-ppc = %{epoch}:%{version}-%{release} +%endif + +%description kvm +This is a meta-package that provides a qemu-system- package for native +architectures where kvm can be enabled. For example, in an x86 system, this +will install qemu-system-x86 + + %package img Summary: QEMU command line tool for manipulating disk images Group: Development/Tools @@ -111,9 +127,6 @@ Requires: vgabios Requires: bochs-bios >= 2.3.8-0.5 Provides: kvm = 85 Obsoletes: kvm < 85 -%ifarch %{ix86} x86_64 -Provides: qemu-kvm = %{epoch}:%{version}-%{release} -%endif %description system-x86 QEMU is a generic and open source processor emulator which achieves a good @@ -128,9 +141,6 @@ Summary: QEMU system emulator for ppc Group: Development/Tools Requires: %{name}-common = %{epoch}:%{version}-%{release} Requires: openbios-ppc -%ifarch ppc ppc64 -Provides: qemu-kvm = %{epoch}:%{version}-%{release} -%endif %description system-ppc QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation. @@ -461,6 +471,9 @@ fi %{_mandir}/man1/qemu-img.1* %changelog +* Tue Apr 28 2009 Mark McLoughlin - 2:0.10.50-2.kvm85 +- Provide qemu-kvm as a metapackage for comps + * Mon Apr 27 2009 Mark McLoughlin - 2:0.10.50-1.kvm85 - Update to qemu-kvm-devel-85 - kvm-85 is based on qemu development branch, currently version 0.10.50 From rel-eng at fedoraproject.org Tue Apr 28 06:49:39 2009 From: rel-eng at fedoraproject.org (Fedora Release Engineering) Date: Tue, 28 Apr 2009 06:49:39 -0000 Subject: [fedora-virt-maint] #1666: Please tag qemu-0.10-15.fc11 Message-ID: <049.c48ee75e870d75d2af8cd827d198bf49@fedoraproject.org> #1666: Please tag qemu-0.10-15.fc11 -----------------------------+---------------------------------------------- Reporter: markmc | Owner: rel-eng at lists.fedoraproject.org Type: task | Status: new Milestone: Fedora 11 Final | Component: koji Keywords: | -----------------------------+---------------------------------------------- Two changes since qemu-0.10-15.fc11: 1) Improved instructions on how to generate the tarball from which the RPM is build, including the script used. (We're shipping a snapshot of the stable branch of qemu-kvm until upstream cuts a release from it) 2) Change qemu-kvm from a Provides to a meta-package so that it works for comps; see the discussion on fedora-devel-list The latter is certainly important for F11 - without it, kvm isn't installed if you install the Virtualization group. The former is also important because it greatly clarifies where the tarball came from. -- Ticket URL: Fedora Release Engineering Release Engineering for the Fedora Project From veillard at fedoraproject.org Tue Apr 28 09:19:06 2009 From: veillard at fedoraproject.org (Daniel Veillard) Date: Tue, 28 Apr 2009 09:19:06 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libvirt/devel libvirt.spec,1.125,1.126 Message-ID: <20090428091906.7797270129@cvs1.fedora.phx.redhat.com> Author: veillard Update of /cvs/pkgs/rpms/libvirt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19049 Modified Files: libvirt.spec Log Message: - fix packaging bug #496945 libvirt should own /var/cache/libvirt Daniel Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v retrieving revision 1.125 retrieving revision 1.126 diff -u -p -r1.125 -r1.126 --- libvirt.spec 24 Apr 2009 14:57:21 -0000 1.125 +++ libvirt.spec 28 Apr 2009 09:18:35 -0000 1.126 @@ -55,7 +55,7 @@ Summary: Library providing a simple API virtualization Name: libvirt Version: 0.6.3 -Release: 1%{?dist}%{?extra_release} +Release: 2%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries Source: libvirt-%{version}.tar.gz @@ -335,6 +335,8 @@ install -d -m 0755 $RPM_BUILD_ROOT%{_loc install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/lib/libvirt/images/ # Default dir for kernel+initrd images defined in SELinux policy install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/lib/libvirt/boot/ +# used for virDomainMemoryPeek +install -d -m 0700 $RPM_BUILD_ROOT%{_localstatedir}/cache/libvirt/ %if %{with_qemu} # We don't want to install /etc/libvirt/qemu/networks in the main %files list @@ -455,6 +457,7 @@ fi %dir %{_localstatedir}/lib/libvirt/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/images/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/boot/ +%dir %attr(0700, root, root) %{_localstatedir}/cache/libvirt/ %if %{with_qemu} %dir %{_localstatedir}/run/libvirt/qemu/ @@ -541,6 +544,9 @@ fi %endif %changelog +* Tue Apr 28 2009 Daniel Veillard - 0.6.3-2.fc12 +- fix packaging bug #496945 libvirt should own /var/cache/libvirt + * Fri Apr 24 2009 Daniel Veillard - 0.6.3-1.fc12 - release of 0.6.3 - VirtualBox driver From veillard at fedoraproject.org Tue Apr 28 10:53:54 2009 From: veillard at fedoraproject.org (Daniel Veillard) Date: Tue, 28 Apr 2009 10:53:54 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libvirt/devel libvirt.spec,1.126,1.127 Message-ID: <20090428105354.862C070129@cvs1.fedora.phx.redhat.com> Author: veillard Update of /cvs/pkgs/rpms/libvirt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11208 Modified Files: libvirt.spec Log Message: was also missing /usr/share/gtk-doc/html/libvirt in -devel Daniel Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v retrieving revision 1.126 retrieving revision 1.127 diff -u -p -r1.126 -r1.127 --- libvirt.spec 28 Apr 2009 09:18:35 -0000 1.126 +++ libvirt.spec 28 Apr 2009 10:53:22 -0000 1.127 @@ -55,7 +55,7 @@ Summary: Library providing a simple API virtualization Name: libvirt Version: 0.6.3 -Release: 2%{?dist}%{?extra_release} +Release: 3%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries Source: libvirt-%{version}.tar.gz @@ -520,6 +520,7 @@ fi %dir %{_includedir}/libvirt %{_includedir}/libvirt/*.h %{_libdir}/pkgconfig/libvirt.pc +%dir %{_datadir}/gtk-doc/html/libvirt %doc %{_datadir}/gtk-doc/html/libvirt/*.devhelp %doc %{_datadir}/gtk-doc/html/libvirt/*.html %doc %{_datadir}/gtk-doc/html/libvirt/*.png @@ -544,6 +545,9 @@ fi %endif %changelog +* Tue Apr 28 2009 Daniel Veillard - 0.6.3-3.fc12 +- was also missing /usr/share/gtk-doc/html/libvirt in -devel + * Tue Apr 28 2009 Daniel Veillard - 0.6.3-2.fc12 - fix packaging bug #496945 libvirt should own /var/cache/libvirt From veillard at fedoraproject.org Tue Apr 28 10:58:29 2009 From: veillard at fedoraproject.org (Daniel Veillard) Date: Tue, 28 Apr 2009 10:58:29 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libvirt/F-11 libvirt.spec,1.124,1.125 Message-ID: <20090428105829.DD84B70129@cvs1.fedora.phx.redhat.com> Author: veillard Update of /cvs/pkgs/rpms/libvirt/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12559 Modified Files: libvirt.spec Log Message: - Fix missing directories in spec (#496945 and gtk-doc) Daniel Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/F-11/libvirt.spec,v retrieving revision 1.124 retrieving revision 1.125 diff -u -p -r1.124 -r1.125 --- libvirt.spec 16 Apr 2009 15:26:45 -0000 1.124 +++ libvirt.spec 28 Apr 2009 10:57:59 -0000 1.125 @@ -66,7 +66,7 @@ Summary: Library providing a simple API virtualization Name: libvirt Version: 0.6.2 -Release: 2%{?dist}%{?extra_release} +Release: 3%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries Source: libvirt-%{version}.tar.gz @@ -343,6 +343,8 @@ install -d -m 0755 $RPM_BUILD_ROOT%{_loc install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/lib/libvirt/images/ # Default dir for kernel+initrd images defnied in SELinux policy install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/lib/libvirt/boot/ +# used for virDomainMemoryPeek +install -d -m 0700 $RPM_BUILD_ROOT%{_localstatedir}/cache/libvirt/ %if %{with_qemu} # We don't want to install /etc/libvirt/qemu/networks in the main %files list @@ -461,6 +463,7 @@ fi %dir %{_localstatedir}/lib/libvirt/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/images/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/boot/ +%dir %attr(0700, root, root) %{_localstatedir}/cache/libvirt/ %if %{with_qemu} %dir %{_localstatedir}/run/libvirt/qemu/ @@ -523,6 +526,7 @@ fi %dir %{_includedir}/libvirt %{_includedir}/libvirt/*.h %{_libdir}/pkgconfig/libvirt.pc +%dir %{_datadir}/gtk-doc/html/libvirt %doc %{_datadir}/gtk-doc/html/libvirt/*.devhelp %doc %{_datadir}/gtk-doc/html/libvirt/*.html %doc %{_datadir}/gtk-doc/html/libvirt/*.png @@ -547,6 +551,9 @@ fi %endif %changelog +* Tue Apr 28 2009 Daniel Veillard - 0.6.2-3.fc11 +- Fix missing directories in spec (#496945 and gtk-doc) + * Thu Apr 16 2009 Mark McLoughlin - 0.6.2-2.fc11 - Fix qemu drive format specification (#496092) From rel-eng at fedoraproject.org Tue Apr 28 11:07:14 2009 From: rel-eng at fedoraproject.org (Fedora Release Engineering) Date: Tue, 28 Apr 2009 11:07:14 -0000 Subject: [fedora-virt-maint] Re: #1666: Please tag qemu-0.10-15.fc11 In-Reply-To: <049.c48ee75e870d75d2af8cd827d198bf49@fedoraproject.org> References: <049.c48ee75e870d75d2af8cd827d198bf49@fedoraproject.org> Message-ID: <058.6d83d24904c0d1605c8745706e949744@fedoraproject.org> #1666: Please tag qemu-0.10-15.fc11 ------------------------------+--------------------------------------------- Reporter: markmc | Owner: rel-eng at lists.fedoraproject.org Type: task | Status: new Milestone: Fedora 11 Final | Component: koji Resolution: | Keywords: ------------------------------+--------------------------------------------- Comment (by jwboyer): +1 -- Ticket URL: Fedora Release Engineering Release Engineering for the Fedora Project From rel-eng at fedoraproject.org Tue Apr 28 14:09:22 2009 From: rel-eng at fedoraproject.org (Fedora Release Engineering) Date: Tue, 28 Apr 2009 14:09:22 -0000 Subject: [fedora-virt-maint] Re: #1666: Please tag qemu-0.10-15.fc11 In-Reply-To: <049.c48ee75e870d75d2af8cd827d198bf49@fedoraproject.org> References: <049.c48ee75e870d75d2af8cd827d198bf49@fedoraproject.org> Message-ID: <058.c9cac973c7a336b79ac47c017ab74a08@fedoraproject.org> #1666: Please tag qemu-0.10-15.fc11 ------------------------------+--------------------------------------------- Reporter: markmc | Owner: rel-eng at lists.fedoraproject.org Type: task | Status: new Milestone: Fedora 11 Final | Component: koji Resolution: | Keywords: ------------------------------+--------------------------------------------- Comment (by markmc): bz on the comps issue: https://bugzilla.redhat.com/497602 -- Ticket URL: Fedora Release Engineering Release Engineering for the Fedora Project From rel-eng at fedoraproject.org Tue Apr 28 14:15:02 2009 From: rel-eng at fedoraproject.org (Fedora Release Engineering) Date: Tue, 28 Apr 2009 14:15:02 -0000 Subject: [fedora-virt-maint] #1673: Please tag libvirt-0.6.2-3.fc11 Message-ID: <049.2fed3145f1c2f0a31a5813cb023ea125@fedoraproject.org> #1673: Please tag libvirt-0.6.2-3.fc11 -----------------------------+---------------------------------------------- Reporter: markmc | Owner: rel-eng at lists.fedoraproject.org Type: task | Status: new Milestone: Fedora 11 Final | Component: koji Keywords: | -----------------------------+---------------------------------------------- The only change re libvirt-0.6.2-2.fc11 is that the RPM now creates and owns /var/cache/libvirt/ so that it is correctly labelled by SELinux. Without this, some libvirt features that use the cache dir breaks See https://bugzilla.redhat.com/496945 -- Ticket URL: Fedora Release Engineering Release Engineering for the Fedora Project From rel-eng at fedoraproject.org Tue Apr 28 14:22:30 2009 From: rel-eng at fedoraproject.org (Fedora Release Engineering) Date: Tue, 28 Apr 2009 14:22:30 -0000 Subject: [fedora-virt-maint] Re: #1673: Please tag libvirt-0.6.2-3.fc11 In-Reply-To: <049.2fed3145f1c2f0a31a5813cb023ea125@fedoraproject.org> References: <049.2fed3145f1c2f0a31a5813cb023ea125@fedoraproject.org> Message-ID: <058.94989f0307ea5f9d4b05564777b895e4@fedoraproject.org> #1673: Please tag libvirt-0.6.2-3.fc11 ------------------------------+--------------------------------------------- Reporter: markmc | Owner: rel-eng at lists.fedoraproject.org Type: task | Status: new Milestone: Fedora 11 Final | Component: koji Resolution: | Keywords: ------------------------------+--------------------------------------------- Comment (by spot): +1 -- Ticket URL: Fedora Release Engineering Release Engineering for the Fedora Project From rel-eng at fedoraproject.org Tue Apr 28 15:10:00 2009 From: rel-eng at fedoraproject.org (Fedora Release Engineering) Date: Tue, 28 Apr 2009 15:10:00 -0000 Subject: [fedora-virt-maint] Re: #1666: Please tag qemu-0.10-15.fc11 In-Reply-To: <049.c48ee75e870d75d2af8cd827d198bf49@fedoraproject.org> References: <049.c48ee75e870d75d2af8cd827d198bf49@fedoraproject.org> Message-ID: <058.7f0090c2a8bde8c5363dd16df0a06353@fedoraproject.org> #1666: Please tag qemu-0.10-15.fc11 ------------------------------+--------------------------------------------- Reporter: markmc | Owner: rel-eng at lists.fedoraproject.org Type: task | Status: closed Milestone: Fedora 11 Final | Component: koji Resolution: fixed | Keywords: ------------------------------+--------------------------------------------- Changes (by notting): * status: new => closed * resolution: => fixed Comment: +1, moved. -- Ticket URL: Fedora Release Engineering Release Engineering for the Fedora Project From rel-eng at fedoraproject.org Tue Apr 28 15:11:30 2009 From: rel-eng at fedoraproject.org (Fedora Release Engineering) Date: Tue, 28 Apr 2009 15:11:30 -0000 Subject: [fedora-virt-maint] Re: #1673: Please tag libvirt-0.6.2-3.fc11 In-Reply-To: <049.2fed3145f1c2f0a31a5813cb023ea125@fedoraproject.org> References: <049.2fed3145f1c2f0a31a5813cb023ea125@fedoraproject.org> Message-ID: <058.c5ade2d23fec8e3132342d2a3a461867@fedoraproject.org> #1673: Please tag libvirt-0.6.2-3.fc11 ------------------------------+--------------------------------------------- Reporter: markmc | Owner: rel-eng at lists.fedoraproject.org Type: task | Status: closed Milestone: Fedora 11 Final | Component: koji Resolution: fixed | Keywords: ------------------------------+--------------------------------------------- Changes (by notting): * status: new => closed * resolution: => fixed Comment: +1, moved. -- Ticket URL: Fedora Release Engineering Release Engineering for the Fedora Project