diff --git a/ChangeLog b/ChangeLog index 04ecc8c384..a9bba46bd4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri May 8 11:07:22 BST 2009 Daniel P. Berrange + + * src/qemu_conf.c: Enable migrate/save/restore for QEMU + 0.10.0 or later releases + Fri May 8 11:05:22 BST 2009 Daniel P. Berrange * src/driver.c: Log dlopen related errors at higher log level diff --git a/src/qemu_conf.c b/src/qemu_conf.c index 07c7c44cd0..2be4d949c2 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)