46 lines
1.5 KiB
Diff
46 lines
1.5 KiB
Diff
From: "Daniel P. Berrange" <berrange@redhat.com>
|
|
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)
|
|
|
|
|
|
--
|