diff --git a/.gitignore b/.gitignore index 2608d5d..5b3147c 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ virtinst-0.500.3.tar.gz /virtinst-0.500.6.tar.gz /virtinst-0.600.0.tar.gz /virtinst-0.600.1.tar.gz +/virtinst-0.600.2.tar.gz diff --git a/python-virtinst.spec b/python-virtinst.spec index a844f12..e4c34bb 100644 --- a/python-virtinst.spec +++ b/python-virtinst.spec @@ -1,7 +1,7 @@ # -*- rpm-spec -*- -%define _version 0.600.1 -%define _release 2 +%define _version 0.600.2 +%define _release 1 %define with_rhel6_defaults 0 %define with_selinux 1 @@ -32,10 +32,6 @@ Name: python-%{appname} Version: %{_version} Release: %{_release}%{_extra_release} Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz -# Add F17 to OS list (bz 825758) -Patch1: %{appname}-add-f17.patch -# virt-clone: Fix cloning guest with qcow2 image (bz 795400) -Patch2: %{appname}-clone-copy-format.patch License: GPLv2+ Group: Development/Libraries @@ -62,8 +58,6 @@ and install new VMs) and virt-clone (clone an existing virtual machine). %prep %setup -q -n %{appname}-%{version} -%patch1 -p1 -%patch2 -p1 %build %if %{with_rhel6_defaults} @@ -101,6 +95,12 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/virt-convert %changelog +* Mon Jul 09 2012 Cole Robinson - 0.600.2-1 +- Rebased to version 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 + * Wed Jun 06 2012 Cole Robinson - 0.600.1-2 - Add F17 to OS list (bz 825758) - virt-clone: Fix cloning guest with qcow2 image (bz 795400) diff --git a/sources b/sources index 9333c11..43dc02d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7b25d24545c556945689e3191442867e virtinst-0.600.1.tar.gz +32902986192d055760632f874a4ab81f virtinst-0.600.2.tar.gz diff --git a/virtinst-add-f17.patch b/virtinst-add-f17.patch deleted file mode 100644 index f412aea..0000000 --- a/virtinst-add-f17.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -rup virtinst-0.600.1/virtinst/osdict.py foo/virtinst/osdict.py ---- virtinst-0.600.1/virtinst/osdict.py 2012-01-31 12:24:06.000000000 -0500 -+++ foo/virtinst/osdict.py 2012-06-06 16:18:53.305894022 -0400 -@@ -336,7 +336,6 @@ OS_TYPES = { - "fedora14": { - "label": "Fedora 14", - "distro": "fedora", -- "supported": True, - "devices" : { - DISK : VIRTIO_DISK, - NET : VIRTIO_NET, -@@ -363,6 +362,16 @@ OS_TYPES = { - INPUT: USB_TABLET, - } - }, -+ "fedora17": { -+ "label": "Fedora 17", -+ "distro": "fedora", -+ "supported": True, -+ "devices" : { -+ DISK : VIRTIO_DISK, -+ NET : VIRTIO_NET, -+ INPUT: USB_TABLET, -+ } -+ }, - - "opensuse11": { - "label": "openSuse 11", -@@ -405,7 +414,6 @@ OS_TYPES = { - "mandriva2010": { - "label": "Mandriva Linux 2010 and later", - "distro": "mandriva", -- "supported": True, - "devices" : { - DISK : VIRTIO_DISK, - NET : VIRTIO_NET, diff --git a/virtinst-clone-copy-format.patch b/virtinst-clone-copy-format.patch deleted file mode 100644 index f7dcbcc..0000000 --- a/virtinst-clone-copy-format.patch +++ /dev/null @@ -1,126 +0,0 @@ -commit f0195e95d57deda83daed5231582ca86bde519ae -Author: Cole Robinson -Date: Thu Mar 1 17:31:40 2012 -0500 - - virt-clone: fix guest booting when cloning a qcow2 image - - We weren't syncing the driver type value in the XML - -diff --git a/tests/cli-test-xml/compare/clone-auto1.xml b/tests/cli-test-xml/compare/clone-auto1.xml -index 328856c..133e8ce 100644 ---- a/tests/cli-test-xml/compare/clone-auto1.xml -+++ b/tests/cli-test-xml/compare/clone-auto1.xml -@@ -23,6 +23,7 @@ - - -
-+ - - - -@@ -35,6 +36,12 @@ - -
- -+ -+ -+ -+
-+ -+ - - - -diff --git a/tests/clitest.py b/tests/clitest.py -index 90a423d..abeabbe 100644 ---- a/tests/clitest.py -+++ b/tests/clitest.py -@@ -926,7 +926,7 @@ args_dict = { - ], - - "compare" : [ -- ("-o test-for-clone --auto-clone --clone-running", "clone-auto1"), -+ ("--connect %(KVMURI)s -o test-for-clone --auto-clone --clone-running", "clone-auto1"), - ("-o test-clone-simple --name newvm --auto-clone --clone-running", - "clone-auto2"), - ], -diff --git a/tests/testdriver.xml b/tests/testdriver.xml -index 8f877b5..59cdf9e 100644 ---- a/tests/testdriver.xml -+++ b/tests/testdriver.xml -@@ -94,6 +94,11 @@ - - - -+ -+ -+ -+ -+ - - - -diff --git a/virtinst/CloneManager.py b/virtinst/CloneManager.py -index f4af695..aa5e3f5 100644 ---- a/virtinst/CloneManager.py -+++ b/virtinst/CloneManager.py -@@ -473,11 +473,6 @@ class CloneDesign(object): - _("Clone onto existing storage volume is not " - "supported: '%s'") % clone_disk.path) - -- # Change the XML -- xmldisk.path = None -- xmldisk.type = clone_disk.type -- xmldisk.path = clone_disk.path -- - # Sync 'size' between the two - if orig_disk.size: - clone_disk.size = orig_disk.size -@@ -500,6 +495,12 @@ class CloneDesign(object): - elif not self.preserve_dest_disks: - clone_disk.clone_path = orig_disk.path - -+ # Change the XML -+ xmldisk.path = None -+ xmldisk.type = clone_disk.type -+ xmldisk.path = clone_disk.path -+ xmldisk.driver_type = clone_disk.driver_type -+ - # Save altered clone xml - self._clone_xml = self._guest.get_xml_config() - -commit c9ae2ac4668213c03614842d92327737a25cf9ec -Author: Wanlong Gao -Date: Thu Mar 29 10:58:15 2012 -0400 - - virt-clone: further fix guest booting when cloning a qcow2 image - - commit f0195e95d5 didn't fix the problem completely, - we should get the orig_disk's driver_type when setup - cloning. - - Signed-off-by: Wanlong Gao - -diff --git a/virtinst/CloneManager.py b/virtinst/CloneManager.py -index 88e4209..24bbb50 100644 ---- a/virtinst/CloneManager.py -+++ b/virtinst/CloneManager.py -@@ -499,7 +499,7 @@ class CloneDesign(object): - xmldisk.path = None - xmldisk.type = clone_disk.type - xmldisk.path = clone_disk.path -- xmldisk.driver_type = clone_disk.driver_type -+ xmldisk.driver_type = orig_disk.driver_type - - # Save altered clone xml - self._clone_xml = self._guest.get_xml_config() -@@ -551,7 +551,8 @@ class CloneDesign(object): - device = VirtualDisk.DEVICE_CDROM - - d = VirtualDisk(disk.path, conn=self._hyper_conn, -- device=device, validate=validate) -+ device=device, driverType=disk.driver_type, -+ validate=validate) - d.target = disk.target - except Exception, e: - logging.debug("", exc_info=True)