From e3980dd1bfe08c0ddc35cc453db55f56d4092b45 Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@fedoraproject.org>
Date: Mar 24 2010 23:47:04 +0000
Subject: Update to version 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/python-virtinst.spec b/python-virtinst.spec
index ba30a04..4755de0 100644
--- a/python-virtinst.spec
+++ b/python-virtinst.spec
@@ -16,15 +16,11 @@
 
 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
 # Enable x2apic for new KVM guests
-Patch3: %{appname}-%{version}-use-x2apic.patch
+Patch1: %{appname}-%{version}-use-x2apic.patch
 
 License: GPLv2+
 Group: Development/Libraries
@@ -53,8 +49,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
 
 %build
 python setup.py build
@@ -90,6 +84,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/virt-convert
 
 %changelog
+* Wed Mar 24 2010 Cole Robinson <crobinso@redhat.com> - 0.500.2-3.fc14
+- Update to version 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.fc14
 - Enable x2apic for new KVM guests
 
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-use-x2apic.patch b/virtinst-0.500.3-use-x2apic.patch
new file mode 100644
index 0000000..86a8d6d
--- /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-03-24 19:44:18.000000000 -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):
+         """