Hello community,
here is the log from the commit of package virt-utils for openSUSE:11.4
checked in at Mon Feb 21 16:15:41 CET 2011.
--------
--- old-versions/11.4/all/virt-utils/virt-utils.changes 2010-11-04 18:49:29.000000000 +0100
+++ 11.4/virt-utils/virt-utils.changes 2011-02-21 12:10:06.000000000 +0100
@@ -1,0 +2,7 @@
+Mon Feb 21 01:48:02 UTC 2011 - brogers@novell.com
+
+- Update to qemu-0.14.0
+ See http://wiki.qemu.org/Changelog/0.14 for changes in 0.14
+- vmdk scsi support now done through -o scsi=on
+
+-------------------------------------------------------------------
calling whatdependson for 11.4-i586
Old:
----
qemu-0.13.0.tar.bz2
New:
----
qemu-0.14.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ virt-utils.spec ++++++
--- /var/tmp/diff_new_pack.rjngzl/_old 2011-02-21 16:15:37.000000000 +0100
+++ /var/tmp/diff_new_pack.rjngzl/_new 2011-02-21 16:15:37.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package virt-utils (Version 1.1.4)
+# spec file for package virt-utils
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -23,12 +23,12 @@
Name: virt-utils
BuildRequires: zlib-devel
-Version: 1.1.4
-Release: 1
+Version: 1.1.5
+Release: 1.<RELEASE2>
License: GPLv2
Group: System/Kernel
Summary: Virtualization Utilities
-Source0: qemu-0.13.0.tar.bz2
+Source0: qemu-0.14.0.tar.bz2
Source1: vm-snapshot-disk
Patch1: qemu-img-vmdk-scsi.patch
Url: http://www.qemu.org/
@@ -53,7 +53,7 @@
%prep
%if %{?qemu_utils}0
-%setup -q -n qemu-0.13.0
+%setup -q -n qemu-0.14.0
%patch1 -p1
%endif
++++++ qemu-0.13.0.tar.bz2 -> qemu-0.14.0.tar.bz2 ++++++
++++ 108911 lines of diff (skipped)
++++++ qemu-img-vmdk-scsi.patch ++++++
--- /var/tmp/diff_new_pack.rjngzl/_old 2011-02-21 16:15:40.000000000 +0100
+++ /var/tmp/diff_new_pack.rjngzl/_new 2011-02-21 16:15:40.000000000 +0100
@@ -1,23 +1,46 @@
-From 75e8da1c5ca1b61a9a97fcc385eb5c6b9f83130f Mon Sep 17 00:00:00 2001
+From 09686f619707ec98e073bf671b0334a2f65934ad Mon Sep 17 00:00:00 2001
From: Ulrich Hecht
Date: Tue, 14 Apr 2009 16:37:42 +0200
-Subject: [PATCH 13/33] qemu-img-vmdk-scsi
+Subject: [PATCH 11/17] qemu-img-vmdk-scsi
Support creation of SCSI VMDK images in qemu-img.
Signed-off-by: Ulrich Hecht
---
- block/vmdk.c | 5 +++--
- block_int.h | 1 +
- qemu-img-cmds.hx | 8 ++++----
- qemu-img.c | 15 +++++++++++++--
- 4 files changed, 21 insertions(+), 8 deletions(-)
+ block.c | 5 ++++-
+ block/vmdk.c | 7 +++++--
+ block_int.h | 2 ++
+ qemu-img.c | 8 +++++++-
+ 4 files changed, 18 insertions(+), 4 deletions(-)
-Index: qemu-0.13.0/block/vmdk.c
+Index: qemu-kvm-0.14.0/block.c
===================================================================
---- 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
+--- qemu-kvm-0.14.0.orig/block.c
++++ qemu-kvm-0.14.0/block.c
+@@ -2792,7 +2792,7 @@ int bdrv_img_create(const char *filename
+ char *options, uint64_t img_size, int flags)
+ {
+ QEMUOptionParameter *param = NULL, *create_options = NULL;
+- QEMUOptionParameter *backing_fmt, *backing_file;
++ QEMUOptionParameter *backing_fmt, *backing_file, *scsi;
+ BlockDriverState *bs = NULL;
+ BlockDriver *drv, *proto_drv;
+ BlockDriver *backing_drv = NULL;
+@@ -2901,6 +2901,9 @@ int bdrv_img_create(const char *filename
+
+ printf("Formatting '%s', fmt=%s ", filename, fmt);
+ print_option_parameters(param);
++ scsi = get_option_parameter(param, BLOCK_OPT_SCSI);
++ if (scsi && scsi->value.n)
++ printf(", SCSI");
+ puts("");
+
+ ret = bdrv_create(drv, filename, param);
+Index: qemu-kvm-0.14.0/block/vmdk.c
+===================================================================
+--- qemu-kvm-0.14.0.orig/block/vmdk.c
++++ qemu-kvm-0.14.0/block/vmdk.c
+@@ -685,7 +685,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 +49,7 @@
char desc[1024];
const char *real_filename, *temp_str;
int64_t total_size = 0;
-@@ -702,6 +702,8 @@ static int vmdk_create(const char *filen
+@@ -701,6 +701,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 +58,7 @@
}
options++;
}
-@@ -799,7 +801,8 @@ static int vmdk_create(const char *filen
+@@ -798,7 +800,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 +68,7 @@
/* write the descriptor */
lseek(fd, le64_to_cpu(header.desc_offset) << 9, SEEK_SET);
-@@ -845,6 +848,11 @@ static QEMUOptionParameter vmdk_create_o
+@@ -844,6 +847,11 @@ static QEMUOptionParameter vmdk_create_o
.type = OPT_FLAG,
.help = "VMDK version 6 image"
},
@@ -57,13 +80,13 @@
{ NULL }
};
-Index: qemu-0.13.0/block_int.h
+Index: qemu-kvm-0.14.0/block_int.h
===================================================================
---- qemu-0.13.0.orig/block_int.h
-+++ qemu-0.13.0/block_int.h
-@@ -31,10 +31,12 @@
+--- qemu-kvm-0.14.0.orig/block_int.h
++++ qemu-kvm-0.14.0/block_int.h
+@@ -30,10 +30,12 @@
+
#define BLOCK_FLAG_ENCRYPT 1
- #define BLOCK_FLAG_COMPRESS 2
#define BLOCK_FLAG_COMPAT6 4
+#define BLOCK_FLAG_SCSI 8
@@ -74,103 +97,28 @@
#define BLOCK_OPT_BACKING_FILE "backing_file"
#define BLOCK_OPT_BACKING_FMT "backing_fmt"
#define BLOCK_OPT_CLUSTER_SIZE "cluster_size"
-Index: qemu-0.13.0/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
-
- DEF("create", img_create,
-- "create [-f fmt] [-o options] filename [size]")
-+ "create [-s] [-f fmt] [-o options] filename [size]")
- STEXI
--@item create [-f @var{fmt}] [-o @var{options}] @var{filename} [@var{size}]
-+@item create [-s] [-f @var{fmt}] [-o @var{options}] @var{filename} [@var{size}]
- ETEXI
-
- DEF("commit", img_commit,
-@@ -28,9 +28,9 @@ STEXI
- ETEXI
-
- DEF("convert", img_convert,
-- "convert [-c] [-f fmt] [-O output_fmt] [-o options] filename [filename2 [...]] output_filename")
-+ "convert [-c] [-s] [-f fmt] [-O output_fmt] [-o options] filename [filename2 [...]] output_filename")
- STEXI
--@item convert [-c] [-f @var{fmt}] [-O @var{output_fmt}] [-o @var{options}] @var{filename} [@var{filename2} [...]] @var{output_filename}
-+@item convert [-c] [-s] [-f @var{fmt}] [-O @var{output_fmt}] [-o @var{options}] @var{filename} [@var{filename2} [...]] @var{output_filename}
- ETEXI
-
- DEF("info", img_info,
-Index: qemu-0.13.0/qemu-img.c
+Index: qemu-kvm-0.14.0/qemu-img.c
===================================================================
---- 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) {
-+ if (set_option_parameter(list, BLOCK_OPT_SCSI, "on")) {
-+ error("SCSI not supported for file format '%s'", fmt);
-+ }
-+ }
+--- qemu-kvm-0.14.0.orig/qemu-img.c
++++ qemu-kvm-0.14.0/qemu-img.c
+@@ -576,7 +576,7 @@ static int img_convert(int argc, char **
+ const uint8_t *buf1;
+ BlockDriverInfo bdi;
+ QEMUOptionParameter *param = NULL, *create_options = NULL;
+- QEMUOptionParameter *out_baseimg_param;
++ QEMUOptionParameter *out_baseimg_param, *scsi;
+ char *options = NULL;
+ const char *snapshot_name = NULL;
- if (base_filename) {
- if (set_option_parameter(list, BLOCK_OPT_BACKING_FILE, base_filename)) {
-@@ -276,7 +281,7 @@ static int img_create(int argc, char **a
-
- flags = 0;
- for(;;) {
-- c = getopt(argc, argv, "F:b:f:he6o:");
-+ c = getopt(argc, argv, "F:b:f:hes6o:");
- if (c == -1)
- break;
- switch(c) {
-@@ -295,6 +300,9 @@ static int img_create(int argc, char **a
- case 'e':
- flags |= BLOCK_FLAG_ENCRYPT;
- break;
-+ case 's':
-+ flags |= BLOCK_FLAG_SCSI;
-+ break;
- case '6':
- flags |= BLOCK_FLAG_COMPAT6;
- break;
-@@ -403,6 +411,8 @@ static int img_create(int argc, char **a
-
- printf("Formatting '%s', fmt=%s ", filename, fmt);
- print_option_parameters(param);
-+ if (flags & BLOCK_FLAG_SCSI)
-+ printf(", SCSI");
- puts("");
-
- ret = bdrv_create(drv, filename, param);
-@@ -652,7 +662,7 @@ static int img_convert(int argc, char **
- out_baseimg = NULL;
- flags = 0;
- for(;;) {
-- c = getopt(argc, argv, "f:O:B:hce6o:");
-+ c = getopt(argc, argv, "f:O:B:hces6o:");
- if (c == -1)
- break;
- switch(c) {
-@@ -674,6 +684,9 @@ static int img_convert(int argc, char **
- case 'e':
- flags |= BLOCK_FLAG_ENCRYPT;
- break;
-+ case 's':
-+ flags |= BLOCK_FLAG_SCSI;
-+ break;
- case '6':
- flags |= BLOCK_FLAG_COMPAT6;
- break;
-@@ -770,6 +783,9 @@ static int img_convert(int argc, char **
+@@ -731,6 +731,12 @@ static int img_convert(int argc, char **
}
}
-+ if (flags & BLOCK_FLAG_SCSI && strcmp(drv->format_name, "vmdk"))
-+ error("SCSI devices not supported for this file format");
++ if ((scsi = get_option_parameter(param, BLOCK_OPT_SCSI)) && scsi->value.n && strcmp(drv->format_name, "vmdk")) {
++ error_report("SCSI devices not supported for this file format");
++ ret = -1;
++ goto out;
++ }
+
/* Create the new image */
ret = bdrv_create(drv, out_filename, param);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org