Hello community, here is the log from the commit of package virt-utils for openSUSE:Factory checked in at 2012-06-10 23:02:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/virt-utils (Old) and /work/SRC/openSUSE:Factory/.virt-utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "virt-utils", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/virt-utils/virt-utils.changes 2012-05-03 11:01:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.virt-utils.new/virt-utils.changes 2012-06-10 23:05:00.000000000 +0200 @@ -1,0 +2,12 @@ +Fri Jun 8 20:48:37 UTC 2012 - [email protected] + +- update qemu utils to latest stable release: 1.1.0 + For changes see: http://wiki.qemu.org/ChangeLog/1.1 + +------------------------------------------------------------------- +Thu May 10 16:14:47 MDT 2012 - [email protected] + +- bnc#761684 - qemu-img segfaults + qemu-img-progress-segfault.patch + +------------------------------------------------------------------- Old: ---- qemu-1.0.1.tar.bz2 New: ---- qemu-1.1.0-1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virt-utils.spec ++++++ --- /var/tmp/diff_new_pack.nYd17A/_old 2012-06-10 23:05:02.000000000 +0200 +++ /var/tmp/diff_new_pack.nYd17A/_new 2012-06-10 23:05:02.000000000 +0200 @@ -24,12 +24,12 @@ BuildRequires: glib2-devel BuildRequires: python BuildRequires: zlib-devel -Version: 1.1.8 +Version: 1.1.9 Release: 0 Summary: Virtualization Utilities License: GPL-2.0 Group: System/Kernel -Source0: qemu-1.0.1.tar.bz2 +Source0: qemu-1.1.0-1.tar.bz2 Source1: vm-snapshot-disk Patch1: qemu-img-vmdk-scsi.patch Url: http://www.qemu.org/ @@ -54,14 +54,16 @@ %prep %if %{?qemu_utils}0 -%setup -q -n qemu-1.0.1 +%setup -q -n qemu-1.1.0 %patch1 -p1 %endif %build %if %{?qemu_utils}0 ./configure --prefix=%{_prefix} \ - --extra-cflags="%{optflags}" + --enable-debug \ + --disable-strip \ + --extra-cflags="-g %{optflags}" make qemu-img make qemu-nbd make qemu-img.1 ++++++ qemu-img-vmdk-scsi.patch ++++++ --- /var/tmp/diff_new_pack.nYd17A/_old 2012-06-10 23:05:02.000000000 +0200 +++ /var/tmp/diff_new_pack.nYd17A/_new 2012-06-10 23:05:02.000000000 +0200 @@ -13,11 +13,11 @@ qemu-img.c | 8 +++++++- 4 files changed, 23 insertions(+), 4 deletions(-) -diff --git a/block.c b/block.c -index d015887..4b9f81d 100644 ---- a/block.c -+++ b/block.c -@@ -3151,7 +3151,7 @@ int bdrv_img_create(const char *filename, const char *fmt, +Index: qemu-1.1.0/block.c +=================================================================== +--- qemu-1.1.0.orig/block.c ++++ qemu-1.1.0/block.c +@@ -4039,7 +4039,7 @@ int bdrv_img_create(const char *filename char *options, uint64_t img_size, int flags) { QEMUOptionParameter *param = NULL, *create_options = NULL; @@ -26,7 +26,7 @@ BlockDriverState *bs = NULL; BlockDriver *drv, *proto_drv; BlockDriver *backing_drv = NULL; -@@ -3261,6 +3261,9 @@ int bdrv_img_create(const char *filename, const char *fmt, +@@ -4154,6 +4154,9 @@ int bdrv_img_create(const char *filename printf("Formatting '%s', fmt=%s ", filename, fmt); print_option_parameters(param); @@ -36,11 +36,11 @@ puts(""); ret = bdrv_create(drv, filename, param); -diff --git a/block/vmdk.c b/block/vmdk.c -index f544159..2b9531d 100644 ---- a/block/vmdk.c -+++ b/block/vmdk.c -@@ -1375,7 +1375,7 @@ static int vmdk_create(const char *filename, QEMUOptionParameter *options) +Index: qemu-1.1.0/block/vmdk.c +=================================================================== +--- qemu-1.1.0.orig/block/vmdk.c ++++ qemu-1.1.0/block/vmdk.c +@@ -1377,7 +1377,7 @@ static int vmdk_create(const char *filen "ddb.geometry.cylinders = \"%" PRId64 "\"\n" "ddb.geometry.heads = \"16\"\n" "ddb.geometry.sectors = \"63\"\n" @@ -49,7 +49,7 @@ if (filename_decompose(filename, path, prefix, postfix, PATH_MAX)) { return -EINVAL; -@@ -1390,6 +1390,8 @@ static int vmdk_create(const char *filename, QEMUOptionParameter *options) +@@ -1392,6 +1392,8 @@ static int vmdk_create(const char *filen flags |= options->value.n ? BLOCK_FLAG_COMPAT6 : 0; } else if (!strcmp(options->name, BLOCK_OPT_SUBFMT)) { fmt = options->value.s; @@ -58,7 +58,7 @@ } options++; } -@@ -1480,7 +1482,8 @@ static int vmdk_create(const char *filename, QEMUOptionParameter *options) +@@ -1482,7 +1484,8 @@ static int vmdk_create(const char *filen parent_desc_line, ext_desc_lines, (flags & BLOCK_FLAG_COMPAT6 ? 6 : 4), @@ -68,7 +68,7 @@ if (split || flat) { fd = open( filename, -@@ -1583,6 +1586,11 @@ static QEMUOptionParameter vmdk_create_options[] = { +@@ -1585,6 +1588,11 @@ static QEMUOptionParameter vmdk_create_o "VMDK flat extent format, can be one of " "{monolithicSparse (default) | monolithicFlat | twoGbMaxExtentSparse | twoGbMaxExtentFlat | streamOptimized} " }, @@ -80,16 +80,19 @@ { NULL } }; -diff --git a/block_int.h b/block_int.h -index 77c0187..b79ab4b 100644 ---- a/block_int.h -+++ b/block_int.h -@@ -33,10 +33,12 @@ +Index: qemu-1.1.0/block_int.h +=================================================================== +--- qemu-1.1.0.orig/block_int.h ++++ qemu-1.1.0/block_int.h +@@ -33,6 +33,7 @@ #define BLOCK_FLAG_ENCRYPT 1 #define BLOCK_FLAG_COMPAT6 4 -+#define BLOCK_FLAG_SCSI 8 ++#define BLOCK_FLAG_SCSI 8 + #define BLOCK_IO_LIMIT_READ 0 + #define BLOCK_IO_LIMIT_WRITE 1 +@@ -44,6 +45,7 @@ #define BLOCK_OPT_SIZE "size" #define BLOCK_OPT_ENCRYPT "encryption" #define BLOCK_OPT_COMPAT6 "compat6" @@ -97,11 +100,11 @@ #define BLOCK_OPT_BACKING_FILE "backing_file" #define BLOCK_OPT_BACKING_FMT "backing_fmt" #define BLOCK_OPT_CLUSTER_SIZE "cluster_size" -diff --git a/qemu-img.c b/qemu-img.c -index 01cc0d3..21f3544 100644 ---- a/qemu-img.c -+++ b/qemu-img.c -@@ -661,7 +661,7 @@ static int img_convert(int argc, char **argv) +Index: qemu-1.1.0/qemu-img.c +=================================================================== +--- qemu-1.1.0.orig/qemu-img.c ++++ qemu-1.1.0/qemu-img.c +@@ -636,7 +636,7 @@ static int img_convert(int argc, char ** const uint8_t *buf1; BlockDriverInfo bdi; QEMUOptionParameter *param = NULL, *create_options = NULL; @@ -110,7 +113,7 @@ char *options = NULL; const char *snapshot_name = NULL; float local_progress; -@@ -852,6 +852,12 @@ static int img_convert(int argc, char **argv) +@@ -829,6 +829,12 @@ static int img_convert(int argc, char ** } } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
