From: Paolo Bonzini <pbonzini@redhat.com>
Date: Thu, 5 Nov 2009 17:06:31 +0000 (+0100)
Subject: Fix some cut-and-paste error in migration code
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=7d108113121da433e0adc9a1e468eaf7a47de1cd;p=libvirt.git

Fix some cut-and-paste error in migration code

* src/qemu/qemu_driver.c: in qemudDomainMigratePerform call
  doPeer2PeerMigrate for VIR_MIGRATE_PEER2PEER.
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index a6b6e93bb2..9f67ddf09b 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -6794,9 +6794,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)