From: Eric Blake <eblake@redhat.com>
Date: Tue, 19 Jul 2011 13:14:43 +0000 (-0600)
Subject: Revert "virsh: make migrate --tunnelled imply --p2p"
X-Git-Tag: v0.9.4-rc1~134
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74594c57f104db064bfa63ebce7a1f3654d4b717;p=thirdparty%2Flibvirt.git

Revert "virsh: make migrate --tunnelled imply --p2p"

This reverts commit 40143fb697c3cb042197632c0286e7dadf40afd4.

The patch prevents future compatibility if migration ever learns
how to do tunnelled without p2p.
---

diff --git a/tools/virsh.c b/tools/virsh.c
index c71683527f..a6803d89cb 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -4468,7 +4468,7 @@ doMigrate (void *opaque)
     if (vshCommandOptBool (cmd, "p2p"))
         flags |= VIR_MIGRATE_PEER2PEER;
     if (vshCommandOptBool (cmd, "tunnelled"))
-        flags |= VIR_MIGRATE_TUNNELLED | VIR_MIGRATE_PEER2PEER;
+        flags |= VIR_MIGRATE_TUNNELLED;
 
     if (vshCommandOptBool (cmd, "persistent"))
         flags |= VIR_MIGRATE_PERSIST_DEST;
diff --git a/tools/virsh.pod b/tools/virsh.pod
index 6392bc76a2..af762caa4a 100644
--- a/tools/virsh.pod
+++ b/tools/virsh.pod
@@ -528,15 +528,14 @@ Provide the maximum number of virtual CPUs supported for a guest VM on
 this connection.  If provided, the I<type> parameter must be a valid
 type attribute for the <domain> element of XML.
 
-=item B<migrate> [I<--live>] [I<--direct>] [I<--p2p>] [I<--tunnelled>]
+=item B<migrate> [I<--live>] [I<--direct>] [I<--p2p> [I<--tunnelled>]]
 [I<--persistent>] [I<--undefinesource>] [I<--suspend>] [I<--copy-storage-all>]
 [I<--copy-storage-inc>] [I<--verbose>] I<domain-id> I<desturi> [I<migrateuri>]
 [I<dname>] [I<--timeout> B<seconds>]
 
 Migrate domain to another host.  Add I<--live> for live migration; I<--p2p>
 for peer-2-peer migration; I<--direct> for direct migration; or I<--tunnelled>
-for tunnelled migration (I<--tunnelled> implies I<--p2p>).  I<--persistent>
-leaves the domain persistent on
+for tunnelled migration.  I<--persistent> leaves the domain persistent on
 destination host, I<--undefinesource> undefines the domain on the source host,
 and I<--suspend> leaves the domain paused on the destination host.
 I<--copy-storage-all> indicates migration with non-shared storage with full