commit virt-utils for openSUSE:Factory
Hello community, here is the log from the commit of package virt-utils for openSUSE:Factory checked in at Sun Jan 3 12:37:38 CET 2010. -------- --- virt-utils/virt-utils.changes 2009-11-19 04:21:34.000000000 +0100 +++ /mounts/work_src_done/STABLE/virt-utils/virt-utils.changes 2009-12-31 20:45:27.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Dec 31 19:42:00 UTC 2009 - brogers@novell.com + +- Update qemu tools to 0.12.1 +- Include qemu package patch to allow creation of SCSI VMDK images + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- qemu-xen-unstable.tar.bz2 New: ---- qemu-0.12.1.tar.bz2 qemu-img-vmdk-scsi.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virt-utils.spec ++++++ --- /var/tmp/diff_new_pack.vUCMNo/_old 2010-01-03 12:36:27.000000000 +0100 +++ /var/tmp/diff_new_pack.vUCMNo/_new 2010-01-03 12:36:27.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package virt-utils (Version 1.0.0) +# spec file for package virt-utils (Version 1.1.0) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -19,18 +19,20 @@ %define qemu_utils 1 %define internal_utils 1 +%define provide_duplicated_binaries 0 Name: virt-utils ExclusiveArch: %ix86 x86_64 BuildRequires: zlib-devel -Version: 1.0.0 +Version: 1.1.0 Release: 1 License: GPLv2 Group: System/Kernel Summary: Virtualization Utilities -Source0: qemu-xen-unstable.tar.bz2 +Source0: qemu-0.12.1.tar.bz2 Source1: vm-snapshot-disk -Url: http://www.cl.cam.ac.uk/Research/SRG/netos/xen/ +Patch1: qemu-img-vmdk-scsi.patch +Url: http://www.qemu.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -41,53 +43,61 @@ Authors: -------- Fabrice Bellard <fabrice@bellard.org> - Ian Pratt <ian.pratt@cl.cam.ac.uk> - Keir Fraser <Keir.Fraser@cl.cam.ac.uk> - Christian Limpach <Christian.Limpach@cl.cam.ac.uk> - Mark Williamson <mark.williamson@cl.cam.ac.uk> - Ewan Mellor <ewan@xensource.com> - ... + Ron Terry <roncterry@gmail.com> %prep %if %{?qemu_utils}0 -%setup -q -n qemu-xen-unstable +%setup -q -n qemu-0.12.1 +%patch1 -p1 %endif %build %if %{?qemu_utils}0 -./configure --disable-sdl --disable-gfx-check --disable-slirp +./configure --prefix=%{_prefix} \ + --extra-cflags="%{optflags}" make qemu-img make qemu-nbd +make qemu-img.1 +make qemu-nbd.8 %endif %install %if %{?qemu_utils}0 mkdir -p %{buildroot}%{_bindir} -install -m 755 qemu-img %{buildroot}%_bindir/qemu-img -ln -s %{buildroot}%_bindir/qemu-img qemu-img-xen -install -m 755 qemu-nbd %{buildroot}%_bindir/qemu-nbd -ln -s %{buildroot}%_bindir/qemu-img qemu-nbd-xen +install -s -m 755 qemu-img %{buildroot}%_bindir/qemu-img +install -s -m 755 qemu-nbd %{buildroot}%_bindir/qemu-nbd +%if %{provide_duplicated_binaries}0 +ln -s qemu-img %{buildroot}%_bindir/qemu-img-xen +ln -s qemu-img %{buildroot}%_bindir/qemu-img-kvm +ln -s qemu-nbd %{buildroot}%_bindir/qemu-nbd-xen +%endif +mkdir -p %{buildroot}%{_mandir}/man1 +mkdir -p %{buildroot}%{_mandir}/man8 +install -m644 qemu-img.1 %{buildroot}%_mandir/man1/qemu-img.1 +install -m644 qemu-nbd.8 %{buildroot}%_mandir/man8/qemu-nbd.8 %endif %if %{?internal_utils}0 install -m 755 %SOURCE1 $RPM_BUILD_ROOT/usr/bin %endif +%clean +rm -rf ${RPM_BUILD_ROOT} + %files %defattr(-, root, root) %if %{?qemu_utils}0 /usr/bin/qemu-img /usr/bin/qemu-nbd +%if %{provide_duplicated_binaries}0 +/usr/bin/qemu-img-xen +/usr/bin/qemu-img-kvm +/usr/bin/qemu-nbd-xen +%endif +%{_mandir}/man1/qemu-img.1.gz +%{_mandir}/man8/qemu-nbd.8.gz %endif %if %{?internal_utils}0 /usr/bin/vm-snapshot-disk %endif -%post - -%preun - -%postun - -%clean - %changelog ++++++ qemu-xen-unstable.tar.bz2 -> qemu-0.12.1.tar.bz2 ++++++ ++++ 305882 lines of diff (skipped) ++++++ qemu-img-vmdk-scsi.patch ++++++
From 75e8da1c5ca1b61a9a97fcc385eb5c6b9f83130f Mon Sep 17 00:00:00 2001 From: Ulrich Hecht <uli@suse.de> Date: Tue, 14 Apr 2009 16:37:42 +0200 Subject: [PATCH 13/33] qemu-img-vmdk-scsi
Support creation of SCSI VMDK images in qemu-img. Signed-off-by: Ulrich Hecht <uli@suse.de> --- block/vmdk.c | 5 +++-- block_int.h | 1 + qemu-img-cmds.hx | 8 ++++---- qemu-img.c | 15 +++++++++++++-- 4 files changed, 21 insertions(+), 8 deletions(-) diff --git a/block/vmdk.c b/block/vmdk.c index 4e48622..b7a15c7 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -710,7 +710,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" - "ddb.adapterType = "ide"\n"; + "ddb.adapterType = "%s"\n"; char desc[1024]; const char *real_filename, *temp_str; int64_t total_size = 0; @@ -800,7 +800,8 @@ static int vmdk_create(const char *filename, QEMUOptionParameter *options) snprintf(desc, sizeof(desc), desc_template, (unsigned int)time(NULL), total_size, real_filename, (flags & BLOCK_FLAG_COMPAT6 ? 6 : 4), - total_size / (int64_t)(63 * 16)); + total_size / (int64_t)(63 * 16), + flags & BLOCK_FLAG_SCSI ? "lsilogic" : "ide"); /* write the descriptor */ lseek(fd, le64_to_cpu(header.desc_offset) << 9, SEEK_SET); diff --git a/block_int.h b/block_int.h index 8898d91..d482050 100644 --- a/block_int.h +++ b/block_int.h @@ -30,6 +30,7 @@ #define BLOCK_FLAG_ENCRYPT 1 #define BLOCK_FLAG_COMPRESS 2 #define BLOCK_FLAG_COMPAT6 4 +#define BLOCK_FLAG_SCSI 8 #define BLOCK_OPT_SIZE "size" #define BLOCK_OPT_ENCRYPT "encryption" diff --git a/qemu-img-cmds.hx b/qemu-img-cmds.hx index ddb86f0..be94d22 100644 --- a/qemu-img-cmds.hx +++ b/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, diff --git a/qemu-img.c b/qemu-img.c index 070fe2e..2adeb56 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -259,7 +259,7 @@ static int img_create(int argc, char **argv) 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) { @@ -278,6 +278,9 @@ static int img_create(int argc, char **argv) case 'e': flags |= BLOCK_FLAG_ENCRYPT; break; + case 's': + flags |= BLOCK_FLAG_SCSI; + break; case '6': flags |= BLOCK_FLAG_COMPAT6; break; @@ -357,6 +360,8 @@ static int img_create(int argc, char **argv) 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); @@ -551,7 +556,7 @@ static int img_convert(int argc, char **argv) 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) { @@ -573,6 +578,9 @@ static int img_convert(int argc, char **argv) case 'e': flags |= BLOCK_FLAG_ENCRYPT; break; + case 's': + flags |= BLOCK_FLAG_SCSI; + break; case '6': flags |= BLOCK_FLAG_COMPAT6; break; @@ -639,6 +647,9 @@ static int img_convert(int argc, char **argv) } } + if (flags & BLOCK_FLAG_SCSI && strcmp(drv->format_name, "vmdk")) + error("SCSI devices not supported for this file format"); + /* Create the new image */ ret = bdrv_create(drv, out_filename, param); free_option_parameters(param); -- 1.6.2.1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de