Hello community, here is the log from the commit of package virt-utils for openSUSE:Factory checked in at 2012-05-03 11:01:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-02-16 15:03:00.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.virt-utils.new/virt-utils.changes 2012-05-03 11:01:24.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Apr 24 17:29:24 UTC 2012 - [email protected] + +- update qemu utils to latest stable release: 1.0.1 + For changes see: http://wiki.qemu.org/ChangeLog/1.0 + +------------------------------------------------------------------- Old: ---- qemu-0.15.0.tar.bz2 qemu-img-git-vpc-fix.patch qemu-img-vpc-fixed-disk.patch qemu-img-vpc-roundup-fix.patch New: ---- qemu-1.0.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virt-utils.spec ++++++ --- /var/tmp/diff_new_pack.pvw3AQ/_old 2012-05-03 11:01:26.000000000 +0200 +++ /var/tmp/diff_new_pack.pvw3AQ/_new 2012-05-03 11:01:26.000000000 +0200 @@ -24,18 +24,14 @@ BuildRequires: glib2-devel BuildRequires: python BuildRequires: zlib-devel -Version: 1.1.7 +Version: 1.1.8 Release: 0 Summary: Virtualization Utilities License: GPL-2.0 Group: System/Kernel -# git commit id for following rc0 release: b8095f2 -Source0: qemu-0.15.0.tar.bz2 +Source0: qemu-1.0.1.tar.bz2 Source1: vm-snapshot-disk Patch1: qemu-img-vmdk-scsi.patch -Patch2: qemu-img-git-vpc-fix.patch -Patch3: qemu-img-vpc-fixed-disk.patch -Patch4: qemu-img-vpc-roundup-fix.patch Url: http://www.qemu.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -58,11 +54,8 @@ %prep %if %{?qemu_utils}0 -%setup -q -n qemu-0.15.0 +%setup -q -n qemu-1.0.1 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 %endif %build ++++++ qemu-0.15.0.tar.bz2 -> qemu-1.0.1.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/virt-utils/qemu-0.15.0.tar.bz2 /work/SRC/openSUSE:Factory/.virt-utils.new/qemu-1.0.1.tar.bz2 differ: char 11, line 1 ++++++ qemu-img-vmdk-scsi.patch ++++++ --- /var/tmp/diff_new_pack.pvw3AQ/_old 2012-05-03 11:01:26.000000000 +0200 +++ /var/tmp/diff_new_pack.pvw3AQ/_new 2012-05-03 11:01:26.000000000 +0200 @@ -1,23 +1,23 @@ -From 09686f619707ec98e073bf671b0334a2f65934ad Mon Sep 17 00:00:00 2001 +From dca5711f3a271a3a0f41207e03f7bf5c7c24d08f Mon Sep 17 00:00:00 2001 From: Ulrich Hecht <[email protected]> Date: Tue, 14 Apr 2009 16:37:42 +0200 -Subject: [PATCH 11/17] qemu-img-vmdk-scsi +Subject: [PATCH] qemu-img-vmdk-scsi Support creation of SCSI VMDK images in qemu-img. Signed-off-by: Ulrich Hecht <[email protected]> --- block.c | 5 ++++- - block/vmdk.c | 7 +++++-- + block/vmdk.c | 12 ++++++++++-- block_int.h | 2 ++ qemu-img.c | 8 +++++++- - 4 files changed, 18 insertions(+), 4 deletions(-) + 4 files changed, 23 insertions(+), 4 deletions(-) -Index: qemu-0.15.0/block.c -=================================================================== ---- qemu-0.15.0.orig/block.c -+++ qemu-0.15.0/block.c -@@ -2900,7 +2900,7 @@ int bdrv_img_create(const char *filename +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, 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; -@@ -3010,6 +3010,9 @@ int bdrv_img_create(const char *filename +@@ -3261,6 +3261,9 @@ int bdrv_img_create(const char *filename, const char *fmt, printf("Formatting '%s', fmt=%s ", filename, fmt); print_option_parameters(param); @@ -36,11 +36,11 @@ puts(""); ret = bdrv_create(drv, filename, param); -Index: qemu-0.15.0/block/vmdk.c -=================================================================== ---- qemu-0.15.0.orig/block/vmdk.c -+++ qemu-0.15.0/block/vmdk.c -@@ -1134,7 +1134,7 @@ static int vmdk_create(const char *filen +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) "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; -@@ -1149,6 +1149,8 @@ static int vmdk_create(const char *filen +@@ -1390,6 +1390,8 @@ static int vmdk_create(const char *filename, QEMUOptionParameter *options) 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++; } -@@ -1238,7 +1240,8 @@ static int vmdk_create(const char *filen +@@ -1480,7 +1482,8 @@ static int vmdk_create(const char *filename, QEMUOptionParameter *options) parent_desc_line, ext_desc_lines, (flags & BLOCK_FLAG_COMPAT6 ? 6 : 4), @@ -68,9 +68,9 @@ if (split || flat) { fd = open( filename, -@@ -1336,6 +1339,11 @@ static QEMUOptionParameter vmdk_create_o +@@ -1583,6 +1586,11 @@ static QEMUOptionParameter vmdk_create_options[] = { "VMDK flat extent format, can be one of " - "{monolithicSparse (default) | monolithicFlat | twoGbMaxExtentSparse | twoGbMaxExtentFlat} " + "{monolithicSparse (default) | monolithicFlat | twoGbMaxExtentSparse | twoGbMaxExtentFlat | streamOptimized} " }, + { + .name = BLOCK_OPT_SCSI, @@ -80,11 +80,11 @@ { NULL } }; -Index: qemu-0.15.0/block_int.h -=================================================================== ---- qemu-0.15.0.orig/block_int.h -+++ qemu-0.15.0/block_int.h -@@ -30,10 +30,12 @@ +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 @@ #define BLOCK_FLAG_ENCRYPT 1 #define BLOCK_FLAG_COMPAT6 4 @@ -97,11 +97,11 @@ #define BLOCK_OPT_BACKING_FILE "backing_file" #define BLOCK_OPT_BACKING_FMT "backing_fmt" #define BLOCK_OPT_CLUSTER_SIZE "cluster_size" -Index: qemu-0.15.0/qemu-img.c -=================================================================== ---- qemu-0.15.0.orig/qemu-img.c -+++ qemu-0.15.0/qemu-img.c -@@ -636,7 +636,7 @@ static int img_convert(int argc, char ** +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) const uint8_t *buf1; BlockDriverInfo bdi; QEMUOptionParameter *param = NULL, *create_options = NULL; @@ -110,7 +110,7 @@ char *options = NULL; const char *snapshot_name = NULL; float local_progress; -@@ -802,6 +802,12 @@ static int img_convert(int argc, char ** +@@ -852,6 +852,12 @@ static int img_convert(int argc, char **argv) } } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
