* Wed Aug 19 2009 Mark McLoughlin <markmc@redhat.com> - 0.6.2-17

- Fix migration completion with newer versions of qemu (#516187)
- Fix dumpxml segfault with newer versions of Xen (#518091)

libvirt-0.6.2-svirt-sound.patch

@@ -1,4 +1,4 @@
-From e76837af35d692cb947db3a47058bcfbbf77b46a Mon Sep 17 00:00:00 2001
+From 0d72b6fb7d4aa5e55294eb3222e7156d3d75a9e7 Mon Sep 17 00:00:00 2001
 From: Daniel P. Berrange <berrange@redhat.com>
 Date: Mon, 17 Aug 2009 08:52:30 +0100
 Subject: [PATCH] Disable sound cards when running sVirt

libvirt-fix-migration-completion-with-newer-qemu.patch

@@ -0,0 +1,45 @@
+From 21ef933dfdd64c754d184d41d87ecd94eaddf697 Mon Sep 17 00:00:00 2001
+From: Chris Lalancette <clalance@redhat.com>
+Date: Wed, 5 Aug 2009 13:42:07 +0200
+Subject: [PATCH] Run 'cont' on successful migration finish.
+
+https://bugzilla.redhat.com/516187
+
+As of qemu 0.10.6, qemu now honors the -S flag on incoming migration.
+That means that when the migration completes, we have to issue a
+'cont' command to get the VM running again.  We do it unconditionally
+since it won't hurt on older qemu.
+
+(cherry picked from commit d1ec4d7a5a4f50c9492137eaab4f021caa075f95)
+
+Fedora-patch: libvirt-fix-migration-completion-with-newer-qemu.patch
+---
+ src/qemu_driver.c |   11 +++++++++++
+ 1 files changed, 11 insertions(+), 0 deletions(-)
+
+diff --git a/src/qemu_driver.c b/src/qemu_driver.c
+index 7dbf4a2..ff56f61 100644
+--- a/src/qemu_driver.c
++++ b/src/qemu_driver.c
+@@ -5162,7 +5162,18 @@ qemudDomainMigrateFinish2 (virConnectPtr dconn,
+      */
+     if (retcode == 0) {
+         dom = virGetDomain (dconn, vm->def->name, vm->def->uuid);
++
++        /* run 'cont' on the destination, which allows migration on qemu
++         * >= 0.10.6 to work properly.  This isn't strictly necessary on
++         * older qemu's, but it also doesn't hurt anything there
++         */
++        if (qemudMonitorCommand(vm, "cont", &info) < 0) {
++            qemudReportError(dconn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
++                             "%s", _("resume operation failed"));
++            goto cleanup;
++        }
+         VIR_FREE(info);
++
+         vm->state = VIR_DOMAIN_RUNNING;
+         event = virDomainEventNewFromObj(vm,
+                                          VIR_DOMAIN_EVENT_RESUMED,
+-- 
+1.6.2.5
+

libvirt-fix-xen-driver-segfault-with-newer-xen.patch

@@ -0,0 +1,38 @@
+From 0878a15ad937449b5dfc4cf49888cc7753473e33 Mon Sep 17 00:00:00 2001
+From: Daniel Veillard <veillard@redhat.com>
+Date: Fri, 26 Jun 2009 18:14:16 +0000
+Subject: [PATCH] Fix xen driver segfault with newer Xen
+
+https://bugzilla.redhat.com/518091
+
+(cherry picked from commit 14435163a086c0bcdff04308077fa46a5fa08bb0)
+
+Fedora-patch: libvirt-fix-xen-driver-segfault-with-newer-xen.patch
+---
+ src/xend_internal.c |   10 +++++++++-
+ 1 files changed, 9 insertions(+), 1 deletions(-)
+
+diff --git a/src/xend_internal.c b/src/xend_internal.c
+index 2e2fd21..c3a9836 100644
+--- a/src/xend_internal.c
++++ b/src/xend_internal.c
+@@ -2077,7 +2077,15 @@ xenDaemonParseSxprGraphicsNew(virConnectPtr conn,
+         if (sexpr_lookup(node, "device/vfb")) {
+             /* New style graphics config for PV guests in >= 3.0.4,
+              * or for HVM guests in >= 3.0.5 */
+-            tmp = sexpr_node(node, "device/vfb/type");
++            if (sexpr_node(node, "device/vfb/type")) {
++                tmp = sexpr_node(node, "device/vfb/type");
++            } else if (sexpr_node(node, "device/vfb/vnc")) {
++                tmp = "vnc";
++            } else if (sexpr_node(node, "device/vfb/sdl")) {
++                tmp = "sdl";
++            } else {
++                tmp = "unknown";
++            }
+ 
+             if (VIR_ALLOC(graphics) < 0)
+                 goto no_memory;
+-- 
+1.6.2.5
+

libvirt.spec

@@ -66,7 +66,7 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.6.2
-Release: 16%{?dist}%{?extra_release}
+Release: 17%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
@@ -130,6 +130,10 @@ Patch27: libvirt-allow-pm-reset-on-multi-function-pci-devices.patch
 Patch28: libvirt-improve-pci-hostdev-reset-error-message.patch
 # Allow PCI bus reset to reset other devices (#499678)
 Patch29: libvirt-allow-pci-hostdev-reset-to-reset-other-devices.patch
+# Fix migration completion with newer versions of qemu (#516187)
+Patch30: libvirt-fix-migration-completion-with-newer-qemu.patch
+# Fix dumpxml segfault with newer versions of Xen (#518091)
+Patch31: libvirt-fix-xen-driver-segfault-with-newer-xen.patch
 
 # Not for upstream. Temporary hack till PulseAudio autostart
 # problems are sorted out when SELinux enforcing
@@ -311,6 +315,8 @@ of recent versions of Linux (and other OSes).
 %patch27 -p1
 %patch28 -p1
 %patch29 -p1
+%patch30 -p1
+%patch31 -p1
 
 %patch200 -p1
 
@@ -634,6 +640,10 @@ fi
 %endif
 
 %changelog
+* Wed Aug 19 2009 Mark McLoughlin <markmc@redhat.com> - 0.6.2-17
+- Fix migration completion with newer versions of qemu (#516187)
+- Fix dumpxml segfault with newer versions of Xen (#518091)
+
 * Wed Aug 19 2009 Mark McLoughlin <markmc@redhat.com> - 0.6.2-16.fc11
 - Allow PCI bus reset to reset other devices (#499678)
 - Fix stupid PCI reset error message (bug #499678)