[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH] fix cut-and-paste error



Seems like a bad merge conflict.

* src/qemu/qemu_driver.c (qemudDomainMigratePerform): Do call
doPeer2PeerMigrate for VIR_MIGRATE_PEER2PEER.
---
	Note: untested beyond compiling.

 src/qemu/qemu_driver.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 0ed2136..635d787 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -6792,9 +6792,9 @@ qemudDomainMigratePerform (virDomainPtr dom,
         event = NULL;
     }
 
-    if ((flags & VIR_MIGRATE_TUNNELLED)) {
+    if ((flags & (VIR_MIGRATE_TUNNELLED | VIR_MIGRATE_PEER2PEER))) {
         if (doPeer2PeerMigrate(dom, vm, uri, flags, dname, resource) < 0)
-            /* doTunnelMigrate already set the error, so just get out */
+            /* doPeer2PeerMigrate already set the error, so just get out */
             goto cleanup;
     } else {
         if (doNativeMigrate(dom, vm, uri, flags, dname, resource) < 0)
-- 
1.6.2.5


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]