Hello community, here is the log from the commit of package python-virtinst for openSUSE:12.2 checked in at 2012-07-23 12:09:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/python-virtinst (Old) and /work/SRC/openSUSE:12.2/.python-virtinst.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-virtinst", Maintainer is "CARNOLD@suse.com" Changes: -------- New Changes file: --- /dev/null 2012-07-06 19:40:38.919402255 +0200 +++ /work/SRC/openSUSE:12.2/.python-virtinst.new/python-virtinst.changes 2012-07-23 12:09:59.000000000 +0200 @@ -0,0 +1,81 @@ +------------------------------------------------------------------- +Fri Jul 13 12:08:17 MDT 2012 - carnold@novell.com + +- Update to virtinst 0.600.2 + * virt-install: New --memballoon option (Eiichi Tsukata) + * virt-install: Improved qemu/kvm pseries support (Li Zhang, Qing Lin) + * virt-install: Support setting BIOS path using -boot loader=PATH + * Various bug fixes and improvements + +------------------------------------------------------------------- +Sun May 6 11:46:48 UTC 2012 - vmiklos@suse.com + +- Backport patch from git: + * virt-install: fix cloning of qcow2 disks + +------------------------------------------------------------------- +Wed Mar 14 10:19:58 MDT 2012 - carnold@novell.com + +- bnc#752138 - python-virtinst causes virt-manager uninstall + python-virtinst.spec +- SUSE URL installs want install= rather than method= + virtinst-git-suse-url.diff + +------------------------------------------------------------------- +Wed Feb 29 15:02:02 MST 2012 - carnold@novell.com + +- KVM: Add cache mode support for directsync and unsafe + +------------------------------------------------------------------- +Fri Feb 3 08:37:05 MST 2012 - carnold@novell.com + +- Update to virtinst 0.600.1 + * virt-install: --redir option for usb redirection (Marc-André Lureau) + * virt-install: Advanced --controller support for usb2 (Marc-André Lureau) + * Many bug fixes and minor improvments. + +------------------------------------------------------------------- +Thu Jan 5 17:06:07 MST 2012 - carnold@novell.com + +- Include patches from the virtinst contained in the virt-manager + package. + +------------------------------------------------------------------- +Mon Nov 28 16:14:18 MST 2011 - carnold@novell.com + +- Update to upstream git version for various bug fixes + virtinst: 15d4901a3c8b855838931976e023158b8cda1c37 +- Compatibility update to virtinst 0.600.0 for virt-manager in os12.1 + * virt-install: Various improvements to enable LXC/container guests: + * New --filesystem option for <filesystem> devices + * New --init option for container <init> path + * New --container option (similar to --paravirt or --hvm) + * virt-install: Make --location remotely (with latest libvirt) + * virt-install: New --smartcard option for <smartcard> devices + * (Marc-André Lureau) + * virt-install: New --numatune option for building guest <numatune> XML + * virt-install: option to set --disk error_policy= + * virt-install: option to set --disk serial= + +------------------------------------------------------------------- +Sat Apr 16 19:03:44 CEST 2011 - berendt@b1-systems.de + +- push to version 0.500.6 + - --graphics spice now enables spicevmc and qxl + - New --disk parameter io=native|threads + +------------------------------------------------------------------- +Tue Feb 15 17:50:17 CET 2011 - ug@suse.de + +- spec file cleanup + +------------------------------------------------------------------- +Fri Dec 10 16:33:42 CET 2010 - ug@suse.de + +- removed obsolete patch + +------------------------------------------------------------------- +Thu Dec 9 14:19:53 CET 2010 - mc@suse.de + +- initial release + Old: ---- _link New: ---- python-virtinst.changes python-virtinst.spec virtinst-0.600.2.tar.bz2 virtinst-add-cache-modes.diff virtinst-cdrom.diff virtinst-qed.diff virtinst-storage-ocfs2.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-virtinst.spec ++++++ # # spec file for package python-virtinst # # Copyright (c) 2012 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} # This macro is used for the continuous automated builds. It just # allows an extra fragment based on the timestamp to be appended # to the release. This distinguishes automated builds, from formal # Fedora RPM builds %define _extra_release %{?dist:%{dist}}%{!?dist:%{?extra_release:%{extra_release}}} %define appname virtinst %if 0%{?fedora} >= 9 || 0%{suse_version} %define with_egg 1 %else %define with_egg 0 %endif Summary: Python modules and tools for creating virtual machines with libvirt License: GPL-2.0+ Group: System/Monitoring Name: python-%{appname} Version: 0.600.2 Release: 0 Source0: %{appname}-%{version}.tar.bz2 Patch10: virtinst-cdrom.diff Patch12: virtinst-storage-ocfs2.diff Patch13: virtinst-qed.diff Patch14: virtinst-add-cache-modes.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build #BuildArch: noarch Url: http://virt-manager.org Provides: virt-clone Provides: virt-convert Provides: virt-image Provides: virt-install Provides: virt-pack Requires: libvirt-python >= 0.4.5 Requires: libxml2-python Requires: python-urlgrabber %if 0%{suse_version} == 0 Requires: libselinux-python Requires: urlgrabber %endif BuildRequires: gettext BuildRequires: python-devel Conflicts: virt-manager <= 0.9.0 %description pyhon-virtinst contains python modules and tools (virt-install, virt-clone and virt-image) for installing and cloning virtual machines using libvirt. It supports both paravirtulized guest and guests fully virtualized guests. Supported hypervisors are Xen, qemu (QEMU) and kvm (KVM). %prep %setup -q -n %{appname}-%{version} %patch10 -p1 %patch12 -p1 %patch13 -p1 %patch14 -p1 %build python setup.py build %install python setup.py install --root=$RPM_BUILD_ROOT --prefix=%{_prefix} # Back compat in case people hardcoded old /usr/sbin/virt-install location mkdir -p $RPM_BUILD_ROOT/%{_sbindir} ln -s ../bin/virt-install $RPM_BUILD_ROOT/%{_sbindir}/virt-install %find_lang %{appname} || echo 0 echo "sitelib: "%{python_sitelib} %clean rm -rf $RPM_BUILD_ROOT %files -f %{appname}.lang %defattr(-,root,root) %doc README COPYING AUTHORS ChangeLog NEWS doc/image.rng doc/example1.xml %dir %{python_sitelib}/%{appname} %dir %{python_sitelib}/virtconv %{python_sitelib}/%{appname}/* %{python_sitelib}/virtconv/* %if %{with_egg} %{python_sitelib}/%{appname}-*.egg-info %endif %{_mandir}/man1/* %{_mandir}/man5/* %{_sbindir}/virt-install %{_bindir}/virt-install %{_bindir}/virt-clone %{_bindir}/virt-image %{_bindir}/virt-convert %changelog ++++++ virtinst-add-cache-modes.diff ++++++ Index: virtinst-0.600.2/virtinst/VirtualDisk.py =================================================================== --- virtinst-0.600.2.orig/virtinst/VirtualDisk.py +++ virtinst-0.600.2/virtinst/VirtualDisk.py @@ -301,10 +301,13 @@ class VirtualDisk(VirtualDevice): driver_types = [DRIVER_TAP_RAW, DRIVER_TAP_QCOW, DRIVER_TAP_QED, DRIVER_TAP_VMDK, DRIVER_TAP_VDISK] + CACHE_MODE_DIRECTSYNC = "directsync" CACHE_MODE_NONE = "none" + CACHE_MODE_UNSAFE = "unsafe" CACHE_MODE_WRITETHROUGH = "writethrough" CACHE_MODE_WRITEBACK = "writeback" - cache_types = [CACHE_MODE_NONE, CACHE_MODE_WRITETHROUGH, + cache_types = [CACHE_MODE_DIRECTSYNC, CACHE_MODE_NONE, + CACHE_MODE_UNSAFE, CACHE_MODE_WRITETHROUGH, CACHE_MODE_WRITEBACK] DEVICE_DISK = "disk" @@ -585,7 +588,7 @@ class VirtualDisk(VirtualDevice): @type bus: C{str} @param shareable: If disk can be shared among VMs @type shareable: C{bool} - @param driverCache: Disk cache mode (none, writethrough, writeback) + @param driverCache: Disk cache mode (none, directsync, unsafe, writethrough, writeback) @type driverCache: member of cache_types @param selinuxLabel: Used for labelling new or relabel existing storage @type selinuxLabel: C{str} ++++++ virtinst-cdrom.diff ++++++ Index: virtinst-0.600.2/virtinst/VirtualDisk.py =================================================================== --- virtinst-0.600.2.orig/virtinst/VirtualDisk.py +++ virtinst-0.600.2/virtinst/VirtualDisk.py @@ -1735,7 +1735,7 @@ class VirtualDisk(VirtualDevice): if maxnode > (26 * 26 * 26): raise RuntimeError("maxnode value is too high") - # Regular scanning + # Start cdrom at 'c' and skip 'c' for non-cdrom for i in range(1, maxnode + 1): gen_t = prefix @@ -1761,8 +1761,14 @@ class VirtualDisk(VirtualDevice): if gen_t in except_targets: continue if gen_t not in skip_targets: - self.target = gen_t - return self.target + if self.device != self.DEVICE_CDROM: + if i != ord('c') - ord('a'): + self.target = gen_t + return self.target + else: + if i >= ord('c') - ord('a'): + self.target = gen_t + return self.target # Check except_targets for any options for t in except_targets: ++++++ virtinst-qed.diff ++++++ Index: virtinst-0.600.2/virtinst/VirtualDisk.py =================================================================== --- virtinst-0.600.2.orig/virtinst/VirtualDisk.py +++ virtinst-0.600.2/virtinst/VirtualDisk.py @@ -295,10 +295,11 @@ class VirtualDisk(VirtualDevice): DRIVER_TAP_RAW = "aio" DRIVER_TAP_QCOW = "qcow" + DRIVER_TAP_QED = "qed" DRIVER_TAP_VMDK = "vmdk" DRIVER_TAP_VDISK = "vdisk" driver_types = [DRIVER_TAP_RAW, DRIVER_TAP_QCOW, - DRIVER_TAP_VMDK, DRIVER_TAP_VDISK] + DRIVER_TAP_QED, DRIVER_TAP_VMDK, DRIVER_TAP_VDISK] CACHE_MODE_NONE = "none" CACHE_MODE_WRITETHROUGH = "writethrough" Index: virtinst-0.600.2/virtinst/ImageParser.py =================================================================== --- virtinst-0.600.2.orig/virtinst/ImageParser.py +++ virtinst-0.600.2/virtinst/ImageParser.py @@ -200,6 +200,7 @@ class Disk: FORMAT_ISO = "iso" FORMAT_QCOW = "qcow" FORMAT_QCOW2 = "qcow2" + FORMAT_QED = "qed" FORMAT_VMDK = "vmdk" USE_SYSTEM = "system" @@ -227,7 +228,7 @@ class Disk: csumtype = xpathString(d, "@type") csumvalue = xpathString(d, "") self.csum[csumtype] = csumvalue - formats = [Disk.FORMAT_RAW, Disk.FORMAT_QCOW, Disk.FORMAT_QCOW2, Disk.FORMAT_VMDK, Disk.FORMAT_ISO] + formats = [Disk.FORMAT_RAW, Disk.FORMAT_QCOW, Disk.FORMAT_QCOW2, Disk.FORMAT_QED, Disk.FORMAT_VMDK, Disk.FORMAT_ISO] validate(formats.count(self.format) > 0, _("The format for disk %s must be one of %s") % (self.file, ",".join(formats))) Index: virtinst-0.600.2/virtconv/diskcfg.py =================================================================== --- virtinst-0.600.2.orig/virtconv/diskcfg.py +++ virtinst-0.600.2/virtconv/diskcfg.py @@ -35,6 +35,7 @@ DISK_FORMAT_VDISK = 3 DISK_FORMAT_QCOW = 4 DISK_FORMAT_QCOW2 = 5 DISK_FORMAT_COW = 6 +DISK_FORMAT_QED = 7 DISK_TYPE_DISK = 0 DISK_TYPE_CDROM = 1 @@ -50,6 +51,7 @@ disk_suffixes = { DISK_FORMAT_QCOW: ".qcow", DISK_FORMAT_QCOW2: ".qcow2", DISK_FORMAT_COW: ".cow", + DISK_FORMAT_QED: ".qed", } qemu_formats = { @@ -59,6 +61,7 @@ qemu_formats = { DISK_FORMAT_QCOW: "qcow", DISK_FORMAT_QCOW2: "qcow2", DISK_FORMAT_COW: "cow", + DISK_FORMAT_QED: "qed", } disk_format_names = { @@ -69,6 +72,7 @@ disk_format_names = { "qcow": DISK_FORMAT_QCOW, "qcow2": DISK_FORMAT_QCOW2, "cow": DISK_FORMAT_COW, + "qed": DISK_FORMAT_QED, } checksum_types = { @@ -260,7 +264,8 @@ class disk(object): out_format == DISK_FORMAT_VMDK or out_format == DISK_FORMAT_QCOW or out_format == DISK_FORMAT_QCOW2 or - out_format == DISK_FORMAT_COW): + out_format == DISK_FORMAT_COW or + out_format == DISK_FORMAT_QED): raise NotImplementedError(_("Cannot convert to disk format %s") % output_format) Index: virtinst-0.600.2/virtconv/parsers/virtimage.py =================================================================== --- virtinst-0.600.2.orig/virtconv/parsers/virtimage.py +++ virtinst-0.600.2/virtconv/parsers/virtimage.py @@ -246,6 +246,7 @@ class virtimage_parser(formats.parser): ImageParser.Disk.FORMAT_VMDK: diskcfg.DISK_FORMAT_VMDK, ImageParser.Disk.FORMAT_QCOW: diskcfg.DISK_FORMAT_QCOW, ImageParser.Disk.FORMAT_QCOW2: diskcfg.DISK_FORMAT_QCOW2, + ImageParser.Disk.FORMAT_QED: diskcfg.DISK_FORMAT_QED, } fmt = None ++++++ virtinst-storage-ocfs2.diff ++++++ Index: virtinst-0.600.2/virtinst/Storage.py =================================================================== --- virtinst-0.600.2.orig/virtinst/Storage.py +++ virtinst-0.600.2/virtinst/Storage.py @@ -534,7 +534,7 @@ class FilesystemPool(StoragePool): get_volume_class = staticmethod(get_volume_class) formats = [ "auto", "ext2", "ext3", "ext4", "ufs", "iso9660", "udf", - "gfs", "gfs2", "vfat", "hfs+", "xfs" ] + "gfs", "gfs2", "vfat", "hfs+", "xfs", "ocfs2" ] # Register applicable property methods from parent class perms = property(StorageObject.get_perms, StorageObject.set_perms) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org