rpms/libvirt/F-11 libvirt-0.6.2-enable-qemu-0-10-migration.patch, NONE, 1.1 libvirt.spec, 1.128, 1.129

[Mark McLoughlin]

Author: markmc

Update of /cvs/pkgs/rpms/libvirt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15832

Modified Files:
	libvirt.spec 
Added Files:
	libvirt-0.6.2-enable-qemu-0-10-migration.patch 
Log Message:
* Thu May  7 2009 Mark McLoughlin <markmc at redhat.com> - 0.6.2-7.fc11
- Enable migration for qemu 0.10 (bug #499704)


libvirt-0.6.2-enable-qemu-0-10-migration.patch:

--- NEW FILE libvirt-0.6.2-enable-qemu-0-10-migration.patch ---
From: "Daniel P. Berrange" <berrange at redhat.com>
To: libvir-list at redhat.com
Date: Thu, 30 Apr 2009 15:09:05 +0100
Subject: [libvirt] PATCH: Enable migration with QEMU >= 0.10.0

The KVM migration code was added to QEMU for the 0.10.0 release, so we 
should enable this in libvirt now.

Daniel

diff -r be7993675e07 src/qemu_conf.c
--- a/src/qemu_conf.c	Thu Apr 30 14:49:27 2009 +0100
+++ b/src/qemu_conf.c	Thu Apr 30 15:08:45 2009 +0100
@@ -472,16 +472,13 @@ int qemudExtractVersionInfo(const char *
 
     /*
      * Handling of -incoming arg with varying features
-     *  -incoming tcp    (kvm >= 79)
-     *  -incoming exec   (kvm >= 80)
+     *  -incoming tcp    (kvm >= 79, qemu >= 0.10.0)
+     *  -incoming exec   (kvm >= 80, qemu >= 0.10.0)
      *  -incoming stdio  (all earlier kvm)
      *
      * NB, there was a pre-kvm-79 'tcp' support, but it
      * was broken, because it blocked the monitor console
      * while waiting for data, so pretend it doesn't exist
-     *
-     * XXX when next QEMU release after 0.9.1 arrives,
-     * we'll need to add MIGRATE_QEMU_TCP/EXEC here too
      */
     if (kvm_version >= 79) {
         flags |= QEMUD_CMD_FLAG_MIGRATE_QEMU_TCP;
@@ -489,6 +486,9 @@ int qemudExtractVersionInfo(const char *
             flags |= QEMUD_CMD_FLAG_MIGRATE_QEMU_EXEC;
     } else if (kvm_version > 0) {
         flags |= QEMUD_CMD_FLAG_MIGRATE_KVM_STDIO;
+    } else if (version >= 10000) {
+        flags |= QEMUD_CMD_FLAG_MIGRATE_QEMU_TCP;
+        flags |= QEMUD_CMD_FLAG_MIGRATE_QEMU_EXEC;
     }
 
     if (retversion)


-- 


Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-11/libvirt.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -p -r1.128 -r1.129
--- libvirt.spec	6 May 2009 16:32:34 -0000	1.128
+++ libvirt.spec	7 May 2009 19:08:42 -0000	1.129
@@ -66,7 +66,7 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.6.2
-Release: 6%{?dist}%{?extra_release}
+Release: 7%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
@@ -79,6 +79,8 @@ Patch1: libvirt-0.6.2-shared-readonly-la
 Patch2: libvirt-0.6.3-hostdev-managed.patch
 # Refresh qemu caps when getCapabilities is called (bz 460649)
 Patch3: libvirt-0.6.3-refresh-qemu-caps.patch
+# Enable migration with qemu 0.10
+Patch4: libvirt-0.6.2-enable-qemu-0-10-migration.patch
 
 # Not for upstream. Temporary hack till PulseAudio autostart
 # problems are sorted out when SELinux enforcing
@@ -237,6 +239,7 @@ of recent versions of Linux (and other O
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %patch200 -p0
 
@@ -560,6 +563,9 @@ fi
 %endif
 
 %changelog
+* Thu May  7 2009 Mark McLoughlin <markmc at redhat.com> - 0.6.2-7.fc11
+- Enable migration for qemu 0.10 (bug #499704)
+
 * Wed May  6 2009 Cole Robinson <crobinso at redhat.com> - 0.6.2-6.fc11
 - Refresh qemu caps when getCapabilities is called (bug #460649)