External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-29 17:33:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enable save/restore/migrate for QEMU >= 0.10.0

Browse Source
This commit is contained in:
Daniel P. Berrange 2009-05-08 10:07:15 +00:00
parent 0fb9066aaf
commit 88e22e4e8c
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Fri May 8 11:07:22 BST 2009 Daniel P. Berrange <berrange@redhat.com>
* 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 <berrange@redhat.com> Fri May 8 11:05:22 BST 2009 Daniel P. Berrange <berrange@redhat.com>
* src/driver.c: Log dlopen related errors at higher log level * src/driver.c: Log dlopen related errors at higher log level

10
src/qemu_conf.c
View File

@ -472,16 +472,13 @@ int qemudExtractVersionInfo(const char *qemu,
/* /*
* Handling of -incoming arg with varying features * Handling of -incoming arg with varying features
* -incoming tcp (kvm >= 79) * -incoming tcp (kvm >= 79, qemu >= 0.10.0)
* -incoming exec (kvm >= 80) * -incoming exec (kvm >= 80, qemu >= 0.10.0)
* -incoming stdio (all earlier kvm) * -incoming stdio (all earlier kvm)
* *
* NB, there was a pre-kvm-79 'tcp' support, but it * NB, there was a pre-kvm-79 'tcp' support, but it
* was broken, because it blocked the monitor console * was broken, because it blocked the monitor console
* while waiting for data, so pretend it doesn't exist * 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) { if (kvm_version >= 79) {
flags |= QEMUD_CMD_FLAG_MIGRATE_QEMU_TCP; flags |= QEMUD_CMD_FLAG_MIGRATE_QEMU_TCP;
@ -489,6 +486,9 @@ int qemudExtractVersionInfo(const char *qemu,
flags |= QEMUD_CMD_FLAG_MIGRATE_QEMU_EXEC; flags |= QEMUD_CMD_FLAG_MIGRATE_QEMU_EXEC;
} else if (kvm_version > 0) { } else if (kvm_version > 0) {
flags |= QEMUD_CMD_FLAG_MIGRATE_KVM_STDIO; 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) if (retversion)