From 9b41d6550b6bf8d4450bb5b86550eb605cc1fd91 Mon Sep 17 00:00:00 2001 From: Daniel P. Berrange Date: Fri, 8 May 2009 10:07:15 +0000 Subject: [PATCH] Enable save/restore/migrate for QEMU >= 0.10.0 (cherry picked from commit 88e22e4e8cb7fc7e1fa1d132778aa1994f4b55b6) Fedora-patch: libvirt-0.6.2-enable-qemu-0-10-migration.patch --- src/qemu_conf.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/qemu_conf.c b/src/qemu_conf.c index 6f9e610..929fe00 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -472,16 +472,13 @@ int qemudExtractVersionInfo(const char *qemu, /* * 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 *qemu, 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) -- 1.6.2.5