diff --git a/.gitignore b/.gitignore index 97431f8..6c281be 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ virtinst-0.500.3.tar.gz /virtinst-0.600.1.tar.gz /virtinst-0.600.2.tar.gz /virtinst-0.600.3.tar.gz +/virtinst-0.600.4.tar.gz diff --git a/0001-VirtualDisk-Ignore-path-None-for-permissions-check.patch b/0001-VirtualDisk-Ignore-path-None-for-permissions-check.patch deleted file mode 100644 index c283add..0000000 --- a/0001-VirtualDisk-Ignore-path-None-for-permissions-check.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 6f270688ba7384e530fbe132216f19af91d95d45 Mon Sep 17 00:00:00 2001 -Message-Id: <6f270688ba7384e530fbe132216f19af91d95d45.1351034763.git.crobinso@redhat.com> -From: Cole Robinson -Date: Sat, 13 Oct 2012 22:37:36 -0400 -Subject: [PATCH 1/4] VirtualDisk: Ignore path=None for permissions check - -Breaks qemu + adding empty CDROM in virt-manager: -https://bugzilla.redhat.com/show_bug.cgi?id=859344 -(cherry picked from commit 31d817c42771afb3e9974d099379986b838c233a) ---- - virtinst/VirtualDisk.py | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/virtinst/VirtualDisk.py b/virtinst/VirtualDisk.py -index e763125..8323073 100644 ---- a/virtinst/VirtualDisk.py -+++ b/virtinst/VirtualDisk.py -@@ -383,6 +383,8 @@ class VirtualDisk(VirtualDevice): - @return: List of the directories the user cannot search, or empty list - @rtype : C{list} - """ -+ if path is None: -+ return [] - if _util.is_uri_remote(conn.getURI(), conn=conn): - return [] - --- -1.7.11.7 - diff --git a/0002-added-parameter-passed-from-StorageVolume.find_free_.patch b/0002-added-parameter-passed-from-StorageVolume.find_free_.patch deleted file mode 100644 index c7f1232..0000000 --- a/0002-added-parameter-passed-from-StorageVolume.find_free_.patch +++ /dev/null @@ -1,97 +0,0 @@ -From beddc5c267b37501187257c605e155f0f77baa17 Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: <6f270688ba7384e530fbe132216f19af91d95d45.1351034763.git.crobinso@redhat.com> -References: <6f270688ba7384e530fbe132216f19af91d95d45.1351034763.git.crobinso@redhat.com> -From: Satoru SATOH -Date: Thu, 13 Sep 2012 12:35:09 +0900 -Subject: [PATCH 2/4] added parameter passed from StorageVolume.find_free_name - to _utils.generate_name and made it incremented by - itertools.count - -(crobinso: add a test case, small cleanups, add Satoru to AUTHORS) -(cherry picked from commit 22700df585ced12049e2c40d8effe76735a9be29) - -Conflicts: - AUTHORS ---- - tests/clitest.py | 4 ++-- - virtinst/Storage.py | 5 +++-- - virtinst/cli.py | 10 +++++++--- - 3 files changed, 12 insertions(+), 7 deletions(-) - -diff --git a/tests/clitest.py b/tests/clitest.py -index 1575619..21c6bdc 100644 ---- a/tests/clitest.py -+++ b/tests/clitest.py -@@ -219,8 +219,8 @@ args_dict = { - "--disk path=%(EXISTIMG1)s,device=floppy", - # Existing disk, no extra options - "--disk path=%(EXISTIMG1)s", -- # Create volume in a pool -- "--disk pool=%(POOL)s,size=.0001", -+ # Create 2 volumes in a pool -+ "--disk pool=%(POOL)s,size=.0001 --disk pool=%(POOL)s,size=.0001", - # Existing volume - "--disk vol=%(POOL)s/%(VOL)s", - # 3 IDE and CD -diff --git a/virtinst/Storage.py b/virtinst/Storage.py -index 0397899..9bb0266 100644 ---- a/virtinst/Storage.py -+++ b/virtinst/Storage.py -@@ -1008,7 +1008,7 @@ class StorageVolume(StorageObject): - get_volume_for_pool = staticmethod(get_volume_for_pool) - - def find_free_name(name, pool_object=None, pool_name=None, conn=None, -- suffix="", collidelist=None): -+ suffix="", collidelist=None, start_num=0): - """ - Finds a name similar (or equal) to passed 'name' that is not in use - by another pool -@@ -1034,7 +1034,8 @@ class StorageVolume(StorageObject): - pool_object.refresh(0) - - return _util.generate_name(name, pool_object.storageVolLookupByName, -- suffix, collidelist=collidelist) -+ suffix, collidelist=collidelist, -+ start_num=start_num) - find_free_name = staticmethod(find_free_name) - - def lookup_pool_by_name(pool_object=None, pool_name=None, conn=None): -diff --git a/virtinst/cli.py b/virtinst/cli.py -index 580eefd..410e92d 100644 ---- a/virtinst/cli.py -+++ b/virtinst/cli.py -@@ -30,6 +30,7 @@ import difflib - import tempfile - import optparse - import shlex -+import itertools - - import libvirt - -@@ -1477,6 +1478,8 @@ def parse_security(guest, security): - # --disk parsing # - ################## - -+_disk_counter = itertools.count() -+ - def _parse_disk_source(guest, path, pool, vol, size, fmt, sparse): - abspath = None - volinst = None -@@ -1499,9 +1502,10 @@ def _parse_disk_source(guest, path, pool, vol, size, fmt, sparse): - vc = virtinst.Storage.StorageVolume.get_volume_for_pool(pool_name=pool, - conn=guest.conn) - vname = virtinst.Storage.StorageVolume.find_free_name(conn=guest.conn, -- pool_name=pool, -- name=guest.name, -- suffix=".img") -+ pool_name=pool, -+ name=guest.name, -+ suffix=".img", -+ start_num=_disk_counter.next()) - volinst = vc(pool_name=pool, name=vname, conn=guest.conn, - allocation=0, capacity=(size and - size * 1024 * 1024 * 1024)) --- -1.7.11.7 - diff --git a/0003-osdict-Add-Fedora-18.patch b/0003-osdict-Add-Fedora-18.patch deleted file mode 100644 index 9fe90ae..0000000 --- a/0003-osdict-Add-Fedora-18.patch +++ /dev/null @@ -1,37 +0,0 @@ -From b5b0f1004ccbec3829d141057ccd4d03ad967fb9 Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: <6f270688ba7384e530fbe132216f19af91d95d45.1351034763.git.crobinso@redhat.com> -References: <6f270688ba7384e530fbe132216f19af91d95d45.1351034763.git.crobinso@redhat.com> -From: Cole Robinson -Date: Sun, 14 Oct 2012 16:17:37 -0400 -Subject: [PATCH 3/4] osdict: Add Fedora 18 (cherry picked from commit - e5cc1b8e20d790ea309b37ad21ce395c30c5abfb) - ---- - virtinst/osdict.py | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/virtinst/osdict.py b/virtinst/osdict.py -index 7fd9a1c..728afeb 100644 ---- a/virtinst/osdict.py -+++ b/virtinst/osdict.py -@@ -382,6 +382,16 @@ OS_TYPES = { - INPUT: USB_TABLET, - } - }, -+ "fedora18": { -+ "label": "Fedora 18", -+ "distro": "fedora", -+ "supported": True, -+ "devices" : { -+ DISK : VIRTIO_DISK, -+ NET : VIRTIO_NET, -+ INPUT: USB_TABLET, -+ } -+ }, - - "opensuse11": { - "label": "openSuse 11", --- -1.7.11.7 - diff --git a/0004-virt-install-Fix-disk-.sparse.patch b/0004-virt-install-Fix-disk-.sparse.patch deleted file mode 100644 index 521401d..0000000 --- a/0004-virt-install-Fix-disk-.sparse.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 378ef493e1b8b0bdfc975f2231f516a078a6124f Mon Sep 17 00:00:00 2001 -Message-Id: <378ef493e1b8b0bdfc975f2231f516a078a6124f.1351034763.git.crobinso@redhat.com> -In-Reply-To: <6f270688ba7384e530fbe132216f19af91d95d45.1351034763.git.crobinso@redhat.com> -References: <6f270688ba7384e530fbe132216f19af91d95d45.1351034763.git.crobinso@redhat.com> -From: Cole Robinson -Date: Sat, 20 Oct 2012 13:37:24 -0400 -Subject: [PATCH 4/4] virt-install: Fix --disk,...sparse= (cherry picked from - commit 90db614d107c3e62d4601fa5890f7577a00540f9) - ---- - virtinst/cli.py | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/virtinst/cli.py b/virtinst/cli.py -index 410e92d..5da9fc4 100644 ---- a/virtinst/cli.py -+++ b/virtinst/cli.py -@@ -1609,6 +1609,7 @@ def parse_disk(guest, optstr, dev=None): - volInstall=volinst, - size=size, - readOnly=ro, -+ sparse=sparse, - shareable=shared, - device=device, - format=fmt) --- -1.7.11.7 - diff --git a/python-virtinst.spec b/python-virtinst.spec index ea3ff2b..d4b294a 100644 --- a/python-virtinst.spec +++ b/python-virtinst.spec @@ -1,7 +1,7 @@ # -*- rpm-spec -*- -%define _version 0.600.3 -%define _release 2 +%define _version 0.600.4 +%define _release 1 %define with_rhel6_defaults 0 %define with_selinux 1 @@ -30,16 +30,8 @@ Summary: Python modules and utilities for installing virtual machines Name: python-%{appname} Version: %{_version} -Release: %{_release}%{_extra_release}.1 +Release: %{_release}%{_extra_release} Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz -# Fix adding empty cdrom device in virt-manager (bz 859344) -Patch1: 0001-VirtualDisk-Ignore-path-None-for-permissions-check.patch -# virt-install: Fix naming of multiple volumes via --disk (bz 857424) -Patch2: 0002-added-parameter-passed-from-StorageVolume.find_free_.patch -# Add Fedora 18 OS option -Patch3: 0003-osdict-Add-Fedora-18.patch -# virt-install: Fix --disk sparse=false -Patch4: 0004-virt-install-Fix-disk-.sparse.patch License: GPLv2+ Group: Development/Libraries @@ -57,6 +49,7 @@ Requires: python-urlgrabber Requires: libselinux-python BuildRequires: gettext BuildRequires: python +BuildRequires: /usr/bin/pod2man %description virtinst is a module that helps build and install libvirt based virtual @@ -66,10 +59,6 @@ and install new VMs) and virt-clone (clone an existing virtual machine). %prep %setup -q -n %{appname}-%{version} -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 %build %if %{with_rhel6_defaults} @@ -107,6 +96,12 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/virt-convert %changelog +* Mon Apr 01 2013 Cole Robinson - 0.600.4-1 +- Rebased to version 0.600.4 +- virt-install: New convenience option --controller usb2 +- API support for disk iotune properties (David Shane Holden) +- Bug fixes and minor improvements + * Thu Feb 14 2013 Fedora Release Engineering - 0.600.3-2.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild diff --git a/sources b/sources index 06a1791..f9e3725 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -13c06b16c0f9fa23e7cb2534950b4575 virtinst-0.600.3.tar.gz +0be36b08bb8b61eb9d75f0885eacc173 virtinst-0.600.4.tar.gz