From 3f397d9786accf62144b548fc66ce768db46e16c Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Thu, 7 May 2009 19:09:00 +0000 Subject: [PATCH] * Thu May 7 2009 Mark McLoughlin - 0.6.3-7.fc12 - Enable migration for qemu 0.10 (bug #499704) --- ...irt-0.6.3-enable-qemu-0-10-migration.patch | 45 +++++++++++++++++++ libvirt.spec | 8 +++- 2 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 libvirt-0.6.3-enable-qemu-0-10-migration.patch diff --git a/libvirt-0.6.3-enable-qemu-0-10-migration.patch b/libvirt-0.6.3-enable-qemu-0-10-migration.patch new file mode 100644 index 0000000..98db412 --- /dev/null +++ b/libvirt-0.6.3-enable-qemu-0-10-migration.patch @@ -0,0 +1,45 @@ +From: "Daniel P. Berrange" +To: libvir-list@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 +@@ -473,16 +473,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; +@@ -490,6 +487,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) + + +-- diff --git a/libvirt.spec b/libvirt.spec index 1abb74c..cd40274 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -55,7 +55,7 @@ Summary: Library providing a simple API virtualization Name: libvirt Version: 0.6.3 -Release: 6%{?dist}%{?extra_release} +Release: 7%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries Source: libvirt-%{version}.tar.gz @@ -65,6 +65,8 @@ Patch1: libvirt-0.6.3-shared-readonly-label.patch 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.3-enable-qemu-0-10-migration.patch # Not for upstream. Temporary hack till PulseAudio autostart # problems are sorted out when SELinux enforcing @@ -221,6 +223,7 @@ of recent versions of Linux (and other OSes). %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %patch200 -p0 @@ -551,6 +554,9 @@ fi %endif %changelog +* Thu May 7 2009 Mark McLoughlin - 0.6.3-7.fc12 +- Enable migration for qemu 0.10 (bug #499704) + * Wed May 6 2009 Cole Robinson - 0.6.3-6.fc12 - Refresh qemu caps when getCapabilities is called (bug #460649)