From 9da8999147962cf28f945cad81e65707ed86a164 Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@fedoraproject.org>
Date: May 27 2010 20:24:54 +0000
Subject: - Rebase to 0.500.3

- virt-install: New --watchdog option: configure a virtual watchdog device
- virt-install: New --soundhw option: More flexible sound configuration
    deprecates --sound, though back compat is maintained
- virt-install: New --security option: configure VM security driver
    settings
- virt-install: New --description option: set a human readable description
- Better OS defaults: Use <video> VGA and <sound> AC97 if supported

---

diff --git a/.cvsignore b/.cvsignore
index e2b9e2a..a49e33b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-virtinst-0.500.0.tar.gz
+virtinst-0.500.3.tar.gz
diff --git a/python-virtinst.spec b/python-virtinst.spec
index 8b119ca..d19e7b0 100644
--- a/python-virtinst.spec
+++ b/python-virtinst.spec
@@ -16,15 +16,17 @@
 
 Summary: Python modules and utilities for installing virtual machines
 Name: python-%{appname}
-Version: 0.500.2
-Release: 3%{_extra_release}
+Version: 0.500.3
+Release: 1%{_extra_release}
 Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz
-# Improve clone progress reporting (bz 550870)
-Patch1: %{appname}-%{version}-improve-clone-progress.patch
-# virt-install: Fix windows installs
-Patch2: %{appname}-%{version}-fix-windows-installs.patch
+# Fix --cdrom with media manually added to pool (bz 574973)
+Patch1: %{appname}-%{version}-virtualdisk-refresh.patch
+# Handle commas in security labels (bz 581473)
+Patch2: %{appname}-%{version}-seclabel-comma.patch
+# virt-install: Fix --location dvd.iso (bz 587679)
+Patch3: %{appname}-%{version}-location-cdrom.patch
 # Enable x2apic for new KVM guests
-Patch3: %{appname}-%{version}-use-x2apic.patch
+Patch4: %{appname}-%{version}-use-x2apic.patch
 
 License: GPLv2+
 Group: Development/Libraries
@@ -54,7 +56,8 @@ and install new VMs) and virt-clone (clone an existing virtual machine).
 %setup -q -n %{appname}-%{version}
 %patch1 -p1
 %patch2 -p1
-#%patch3 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 python setup.py build
@@ -90,6 +93,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/virt-convert
 
 %changelog
+* Wed May 27 2010 Cole Robinson <crobinso@redhat.com> - 0.500.3-1.fc13
+- Rebase to 0.500.3
+- virt-install: New --watchdog option: configure a virtual watchdog device
+- virt-install: New --soundhw option: More flexible sound configuration
+                deprecates --sound, though back compat is maintained
+- virt-install: New --security option: configure VM security driver settings
+- virt-install: New --description option: set a human readable description
+- Better OS defaults: Use <video> VGA and <sound> AC97 if supported
+
 * Mon Mar 22 2010 Cole Robinson <crobinso@redhat.com> - 0.500.2-3.fc13
 - Enable x2apic for new KVM guests
 
diff --git a/sources b/sources
index e75cba9..1de6eec 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8259de5523ba01b6398343b7c4545977  virtinst-0.500.2.tar.gz
+3af83445c645ea7e83c47069087ba23c  virtinst-0.500.3.tar.gz
diff --git a/virtinst-0.500.2-fix-windows-installs.patch b/virtinst-0.500.2-fix-windows-installs.patch
deleted file mode 100644
index d494f0e..0000000
--- a/virtinst-0.500.2-fix-windows-installs.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-# HG changeset patch
-# User Cole Robinson <crobinso@redhat.com>
-# Date 1269010523 14400
-# Node ID 241a387c9bc7cfb0144cdbf94db824372896c505
-# Parent  1206822d2ef332c57cde10bce5010c3028be7bb1
-Fix windows installs, add a test to prevent regression
-
-diff -r 1206822d2ef3 -r 241a387c9bc7 virtinst/Guest.py
---- a/virtinst/Guest.py	Wed Mar 17 12:01:32 2010 -0400
-+++ b/virtinst/Guest.py	Fri Mar 19 10:55:23 2010 -0400
-@@ -797,6 +797,9 @@
-         @type disk_boot: C{bool}
-         """
- 
-+        # Set device defaults so we can validly generate XML
-+        self._set_defaults(self.get_devices)
-+
-         if install:
-             action = "destroy"
-         else:
diff --git a/virtinst-0.500.2-improve-clone-progress.patch b/virtinst-0.500.2-improve-clone-progress.patch
deleted file mode 100644
index 1ee9e1a..0000000
--- a/virtinst-0.500.2-improve-clone-progress.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-# HG changeset patch
-# User Cole Robinson <crobinso@redhat.com>
-# Date 1267236785 18000
-# Node ID cb28868d921336410bd70d47da74e4c064a6311a
-# Parent  aaa7c90ac60063f1b717b53db6739851396f2d60
-clone: Show storage progress capped at capacity, rather than allocation.
-
-diff -r aaa7c90ac600 -r cb28868d9213 virtinst/Storage.py
---- a/virtinst/Storage.py	Fri Feb 26 18:43:49 2010 -0500
-+++ b/virtinst/Storage.py	Fri Feb 26 21:13:05 2010 -0500
-@@ -1146,7 +1146,7 @@
-                 self._install_finished = False
-                 t.start()
-                 if meter:
--                    meter.start(size=self.allocation,
-+                    meter.start(size=self.capacity,
-                                 text=_("Allocating '%s'") % self.name)
- 
-                 if self.input_vol:
-@@ -1155,7 +1155,7 @@
-                     vol = self.pool.createXML(xml, 0)
- 
-                 if meter:
--                    meter.end(self.allocation)
-+                    meter.end(self.capacity)
-                 logging.debug("Storage volume '%s' install complete." %
-                               self.name)
-                 return vol
diff --git a/virtinst-0.500.3-location-cdrom.patch b/virtinst-0.500.3-location-cdrom.patch
new file mode 100644
index 0000000..7a6b89d
--- /dev/null
+++ b/virtinst-0.500.3-location-cdrom.patch
@@ -0,0 +1,22 @@
+# HG changeset patch
+# User Cole Robinson <crobinso@redhat.com>
+# Date 1273170531 14400
+# Node ID 666e8b658272b5897dc49765f643932b6b97465f
+# Parent  dea9100e5bf2f6c4dd543054f906f0709064fef4
+Fix virt-install --location dvd.iso
+
+diff -r dea9100e5bf2 -r 666e8b658272 virtinst/DistroInstaller.py
+--- a/virtinst/DistroInstaller.py	Wed May 12 10:21:24 2010 -0400
++++ b/virtinst/DistroInstaller.py	Thu May 06 14:28:51 2010 -0400
+@@ -274,7 +274,10 @@
+     # General Installer methods
+ 
+     def scratchdir_required(self):
+-        return bool(not self._location_is_path)
++        is_url = not self._location_is_path
++        mount_dvd = self._location_is_path and not self.cdrom
++
++        return bool(is_url or mount_dvd)
+ 
+     def prepare(self, guest, meter, distro = None):
+         self.cleanup()
diff --git a/virtinst-0.500.3-seclabel-comma.patch b/virtinst-0.500.3-seclabel-comma.patch
new file mode 100644
index 0000000..45de6a1
--- /dev/null
+++ b/virtinst-0.500.3-seclabel-comma.patch
@@ -0,0 +1,64 @@
+# HG changeset patch
+# User Cole Robinson <crobinso@redhat.com>
+# Date 1273774398 14400
+# Node ID 0911564fd0b623dc6a578926ef89dcfb6bec1de7
+# Parent  1075df76aa63c1f319eb20a58386284fca276a82
+virt-install: Handle commas in security labels
+
+diff -r 1075df76aa63 -r 0911564fd0b6 tests/clitest.py
+--- a/tests/clitest.py	Wed May 12 17:34:46 2010 -0400
++++ b/tests/clitest.py	Thu May 13 14:13:18 2010 -0400
+@@ -372,6 +372,10 @@
+         "--hvm --nodisks --pxe --security type=dynamic",
+         # --security implicit static
+         "--hvm --nodisks --pxe --security label=foobar.label",
++        # --security static with commas 1
++        "--hvm --nodisks --pxe --security label=foobar.label,a1,z2,b3,type=static",
++        # --security static with commas 2
++        "--hvm --nodisks --pxe --security label=foobar.label,a1,z2,b3",
+       ],
+ 
+       "invalid": [
+diff -r 1075df76aa63 -r 0911564fd0b6 virt-install
+--- a/virt-install	Wed May 12 17:34:46 2010 -0400
++++ b/virt-install	Thu May 13 14:13:18 2010 -0400
+@@ -185,6 +185,7 @@
+ 
+     # Parse security opts
+     opts = cli.parse_optstr(secopts)
++    arglist = secopts.split(",")
+     secmodel = virtinst.Seclabel(guest.conn)
+ 
+     def get_and_clear(dictname):
+@@ -192,11 +193,31 @@
+         if opts.has_key(dictname):
+             val = opts[dictname]
+             del(opts[dictname])
++
+         return val
+ 
++    # Beware, adding boolean options here could upset label comma handling
+     mode = get_and_clear("type")
+     label = get_and_clear("label")
+ 
++    # Try to fix up label if it contained commas
++    if label:
++        tmparglist = arglist[:]
++        for idx in range(len(tmparglist)):
++            arg = tmparglist[idx]
++            if not arg.split("=")[0] == "label":
++                continue
++
++            for arg in tmparglist[idx+1:]:
++                if arg.count("="):
++                    break
++
++                if arg:
++                    label += "," + arg
++                    del(opts[arg])
++
++            break
++
+     if label:
+         secmodel.label = label
+         if not mode:
diff --git a/virtinst-0.500.3-use-x2apic.patch b/virtinst-0.500.3-use-x2apic.patch
new file mode 100644
index 0000000..3868c2b
--- /dev/null
+++ b/virtinst-0.500.3-use-x2apic.patch
@@ -0,0 +1,23 @@
+diff -rup virtinst-0.500.3/virtinst/Guest.py new/virtinst/Guest.py
+--- virtinst-0.500.3/virtinst/Guest.py	2010-03-23 16:57:08.000000000 -0400
++++ new/virtinst/Guest.py	2010-05-27 16:13:40.115795000 -0400
+@@ -720,8 +720,17 @@ class Guest(object):
+         """
+         Return <cpu> XML
+         """
+-        # Just a stub for now
+-        return ""
++        xml = ""
++        is_kvm = self.type == "kvm"
++        model = self._caps.host.cpu.model
++
++        if is_kvm and model:
++            xml += "  <cpu match='exact'>\n"
++            xml += "    <model>%s</model>\n" % model
++            xml += "    <feature policy='force' name='x2apic'/>\n"
++            xml += "  </cpu>"
++
++        return xml
+ 
+     def _get_clock_xml(self):
+         """
diff --git a/virtinst-0.500.3-virtualdisk-refresh.patch b/virtinst-0.500.3-virtualdisk-refresh.patch
new file mode 100644
index 0000000..49c3ae7
--- /dev/null
+++ b/virtinst-0.500.3-virtualdisk-refresh.patch
@@ -0,0 +1,62 @@
+# HG changeset patch
+# User Cole Robinson <crobinso@redhat.com>
+# Date 1272988095 14400
+# Node ID 1d3ad914004f6620f78098236fcaaadb83b2a942
+# Parent  74bc3757b2471ded2eea38d64f73d8cd3cd51eeb
+VirtualDisk: Refresh parent pool if we don't find requested volume
+
+diff -r 74bc3757b247 -r 1d3ad914004f virtinst/VirtualDisk.py
+--- a/virtinst/VirtualDisk.py	Mon Apr 26 12:02:36 2010 -0400
++++ b/virtinst/VirtualDisk.py	Tue May 04 11:48:15 2010 -0400
+@@ -797,13 +797,15 @@
+ 
+         def lookup_vol_by_path():
+             try:
+-                return self.conn.storageVolLookupByPath(self.path)
+-            except:
+-                return None
++                vol = self.conn.storageVolLookupByPath(self.path)
++                vol.info()
++                return vol, None
++            except Exception, e:
++                return None, e
+ 
+         pool = _util.lookup_pool_by_path(self.conn,
+                                          os.path.dirname(self.path))
+-        vol = lookup_vol_by_path()
++        vol = lookup_vol_by_path()[0]
+ 
+ 
+         # Is pool running?
+@@ -811,24 +813,17 @@
+             pool = None
+ 
+         # Attempt to lookup path as a storage volume
+-        try:
+-            if vol:
+-                vol.info()
+-        except:
++        if pool and not vol:
+             try:
+-                try:
+-                    # Pool may need to be refreshed, but if it errors,
+-                    # invalidate it
+-                    if pool:
+-                        pool.refresh(0)
+-                except:
+-                    pool = None
+-                    raise
++                # Pool may need to be refreshed, but if it errors,
++                # invalidate it
++                if pool:
++                    pool.refresh(0)
+ 
+-                vol = self.conn.storageVolLookupByPath(self.path)
+-                vol.info()
++                vol, verr = lookup_vol_by_path()
+             except Exception, e:
+                 vol = None
++                pool = None
+                 verr = str(e)
+ 
+         if vol: