Mailinglist Archive: opensuse-commit (1023 mails)
| < Previous | Next > |
commit virt-utils for openSUSE:Factory
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Fri, 05 Nov 2010 16:04:13 +0100
- Message-id: <20101105150414.12C2720238@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package virt-utils for openSUSE:Factory
checked in at Fri Nov 5 16:04:13 CET 2010.
--------
--- virt-utils/virt-utils.changes 2010-08-24 06:25:52.000000000 +0200
+++ virt-utils/virt-utils.changes 2010-11-04 18:49:29.000000000 +0100
@@ -1,0 +2,5 @@
+Thu Nov 4 17:28:55 UTC 2010 - brogers@xxxxxxxxxx
+
+- Update to qemu-0.13.0
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
qemu-0.12.3.tar.bz2
qemu-img-read-only-image-issue.patch
qemu-img-rebase_1.patch
qemu-img-rebase_2.patch
qemu-img-rebase_3.patch
qemu-img-segfault-during-rebase.patch
qemu-overflow.patch
New:
----
qemu-0.13.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ virt-utils.spec ++++++
--- /var/tmp/diff_new_pack.NmCKqu/_old 2010-11-05 16:03:02.000000000 +0100
+++ /var/tmp/diff_new_pack.NmCKqu/_new 2010-11-05 16:03:02.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package virt-utils (Version 1.1.3)
+# spec file for package virt-utils (Version 1.1.4)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -23,20 +23,14 @@
Name: virt-utils
BuildRequires: zlib-devel
-Version: 1.1.3
+Version: 1.1.4
Release: 1
License: GPLv2
Group: System/Kernel
Summary: Virtualization Utilities
-Source0: qemu-0.12.3.tar.bz2
+Source0: qemu-0.13.0.tar.bz2
Source1: vm-snapshot-disk
Patch1: qemu-img-vmdk-scsi.patch
-Patch2: qemu-img-rebase_1.patch
-Patch3: qemu-img-rebase_2.patch
-Patch4: qemu-img-rebase_3.patch
-Patch5: qemu-img-segfault-during-rebase.patch
-Patch6: qemu-img-read-only-image-issue.patch
-Patch7: qemu-overflow.patch
Url: http://www.qemu.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -59,14 +53,8 @@
%prep
%if %{?qemu_utils}0
-%setup -q -n qemu-0.12.3
+%setup -q -n qemu-0.13.0
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
%endif
%build
++++++ qemu-0.12.3.tar.bz2 -> qemu-0.13.0.tar.bz2 ++++++
++++ 198139 lines of diff (skipped)
++++++ qemu-img-vmdk-scsi.patch ++++++
--- /var/tmp/diff_new_pack.NmCKqu/_old 2010-11-05 16:03:04.000000000 +0100
+++ /var/tmp/diff_new_pack.NmCKqu/_new 2010-11-05 16:03:04.000000000 +0100
@@ -13,11 +13,11 @@
qemu-img.c | 15 +++++++++++++--
4 files changed, 21 insertions(+), 8 deletions(-)
-Index: qemu-kvm-0.12.3/block/vmdk.c
+Index: qemu-0.13.0/block/vmdk.c
===================================================================
---- qemu-kvm-0.12.3.orig/block/vmdk.c
-+++ qemu-kvm-0.12.3/block/vmdk.c
-@@ -710,7 +710,7 @@ static int vmdk_create(const char *filen
+--- qemu-0.13.0.orig/block/vmdk.c
++++ qemu-0.13.0/block/vmdk.c
+@@ -686,7 +686,7 @@ static int vmdk_create(const char *filen
"ddb.geometry.cylinders = \"%" PRId64 "\"\n"
"ddb.geometry.heads = \"16\"\n"
"ddb.geometry.sectors = \"63\"\n"
@@ -26,7 +26,7 @@
char desc[1024];
const char *real_filename, *temp_str;
int64_t total_size = 0;
-@@ -725,6 +725,8 @@ static int vmdk_create(const char *filen
+@@ -702,6 +702,8 @@ static int vmdk_create(const char *filen
backing_file = options->value.s;
} else if (!strcmp(options->name, BLOCK_OPT_COMPAT6)) {
flags |= options->value.n ? BLOCK_FLAG_COMPAT6: 0;
@@ -35,7 +35,7 @@
}
options++;
}
-@@ -800,7 +802,8 @@ static int vmdk_create(const char *filen
+@@ -799,7 +801,8 @@ static int vmdk_create(const char *filen
snprintf(desc, sizeof(desc), desc_template, (unsigned int)time(NULL),
total_size, real_filename,
(flags & BLOCK_FLAG_COMPAT6 ? 6 : 4),
@@ -45,7 +45,7 @@
/* write the descriptor */
lseek(fd, le64_to_cpu(header.desc_offset) << 9, SEEK_SET);
-@@ -844,6 +847,11 @@ static QEMUOptionParameter vmdk_create_o
+@@ -845,6 +848,11 @@ static QEMUOptionParameter vmdk_create_o
.type = OPT_FLAG,
.help = "VMDK version 6 image"
},
@@ -57,11 +57,11 @@
{ NULL }
};
-Index: qemu-kvm-0.12.3/block_int.h
+Index: qemu-0.13.0/block_int.h
===================================================================
---- qemu-kvm-0.12.3.orig/block_int.h
-+++ qemu-kvm-0.12.3/block_int.h
-@@ -30,10 +30,12 @@
+--- qemu-0.13.0.orig/block_int.h
++++ qemu-0.13.0/block_int.h
+@@ -31,10 +31,12 @@
#define BLOCK_FLAG_ENCRYPT 1
#define BLOCK_FLAG_COMPRESS 2
#define BLOCK_FLAG_COMPAT6 4
@@ -74,10 +74,10 @@
#define BLOCK_OPT_BACKING_FILE "backing_file"
#define BLOCK_OPT_BACKING_FMT "backing_fmt"
#define BLOCK_OPT_CLUSTER_SIZE "cluster_size"
-Index: qemu-kvm-0.12.3/qemu-img-cmds.hx
+Index: qemu-0.13.0/qemu-img-cmds.hx
===================================================================
---- qemu-kvm-0.12.3.orig/qemu-img-cmds.hx
-+++ qemu-kvm-0.12.3/qemu-img-cmds.hx
+--- qemu-0.13.0.orig/qemu-img-cmds.hx
++++ qemu-0.13.0/qemu-img-cmds.hx
@@ -16,9 +16,9 @@ STEXI
ETEXI
@@ -102,12 +102,12 @@
ETEXI
DEF("info", img_info,
-Index: qemu-kvm-0.12.3/qemu-img.c
+Index: qemu-0.13.0/qemu-img.c
===================================================================
---- qemu-kvm-0.12.3.orig/qemu-img.c
-+++ qemu-kvm-0.12.3/qemu-img.c
-@@ -227,6 +227,11 @@ static void add_old_style_options(const
- error("VMDK version 6 not supported for file format '%s'", fmt);
+--- qemu-0.13.0.orig/qemu-img.c
++++ qemu-0.13.0/qemu-img.c
+@@ -247,6 +247,11 @@ static int add_old_style_options(const c
+ return -1;
}
}
+ if (flags & BLOCK_FLAG_SCSI) {
@@ -118,7 +118,7 @@
if (base_filename) {
if (set_option_parameter(list, BLOCK_OPT_BACKING_FILE,
base_filename)) {
-@@ -253,7 +258,7 @@ static int img_create(int argc, char **a
+@@ -276,7 +281,7 @@ static int img_create(int argc, char **a
flags = 0;
for(;;) {
@@ -127,7 +127,7 @@
if (c == -1)
break;
switch(c) {
-@@ -272,6 +277,9 @@ static int img_create(int argc, char **a
+@@ -295,6 +300,9 @@ static int img_create(int argc, char **a
case 'e':
flags |= BLOCK_FLAG_ENCRYPT;
break;
@@ -137,7 +137,7 @@
case '6':
flags |= BLOCK_FLAG_COMPAT6;
break;
-@@ -354,6 +362,8 @@ static int img_create(int argc, char **a
+@@ -403,6 +411,8 @@ static int img_create(int argc, char **a
printf("Formatting '%s', fmt=%s ", filename, fmt);
print_option_parameters(param);
@@ -146,7 +146,7 @@
puts("");
ret = bdrv_create(drv, filename, param);
-@@ -548,7 +558,7 @@ static int img_convert(int argc, char **
+@@ -652,7 +662,7 @@ static int img_convert(int argc, char **
out_baseimg = NULL;
flags = 0;
for(;;) {
@@ -155,7 +155,7 @@
if (c == -1)
break;
switch(c) {
-@@ -570,6 +580,9 @@ static int img_convert(int argc, char **
+@@ -674,6 +684,9 @@ static int img_convert(int argc, char **
case 'e':
flags |= BLOCK_FLAG_ENCRYPT;
break;
@@ -165,7 +165,7 @@
case '6':
flags |= BLOCK_FLAG_COMPAT6;
break;
-@@ -637,6 +650,9 @@ static int img_convert(int argc, char **
+@@ -770,6 +783,9 @@ static int img_convert(int argc, char **
}
}
@@ -174,4 +174,4 @@
+
/* Create the new image */
ret = bdrv_create(drv, out_filename, param);
- free_option_parameters(param);
+ if (ret < 0) {
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |