mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-10-22 14:09:22 +00:00
Revert "virsh: make migrate --tunnelled imply --p2p"
This reverts commit 40143fb697
.
The patch prevents future compatibility if migration ever learns
how to do tunnelled without p2p.
This commit is contained in:
parent
07b39a9418
commit
74594c57f1
@ -4468,7 +4468,7 @@ doMigrate (void *opaque)
|
|||||||
if (vshCommandOptBool (cmd, "p2p"))
|
if (vshCommandOptBool (cmd, "p2p"))
|
||||||
flags |= VIR_MIGRATE_PEER2PEER;
|
flags |= VIR_MIGRATE_PEER2PEER;
|
||||||
if (vshCommandOptBool (cmd, "tunnelled"))
|
if (vshCommandOptBool (cmd, "tunnelled"))
|
||||||
flags |= VIR_MIGRATE_TUNNELLED | VIR_MIGRATE_PEER2PEER;
|
flags |= VIR_MIGRATE_TUNNELLED;
|
||||||
|
|
||||||
if (vshCommandOptBool (cmd, "persistent"))
|
if (vshCommandOptBool (cmd, "persistent"))
|
||||||
flags |= VIR_MIGRATE_PERSIST_DEST;
|
flags |= VIR_MIGRATE_PERSIST_DEST;
|
||||||
|
@ -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
|
this connection. If provided, the I<type> parameter must be a valid
|
||||||
type attribute for the <domain> element of XML.
|
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<--persistent>] [I<--undefinesource>] [I<--suspend>] [I<--copy-storage-all>]
|
||||||
[I<--copy-storage-inc>] [I<--verbose>] I<domain-id> I<desturi> [I<migrateuri>]
|
[I<--copy-storage-inc>] [I<--verbose>] I<domain-id> I<desturi> [I<migrateuri>]
|
||||||
[I<dname>] [I<--timeout> B<seconds>]
|
[I<dname>] [I<--timeout> B<seconds>]
|
||||||
|
|
||||||
Migrate domain to another host. Add I<--live> for live migration; I<--p2p>
|
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 peer-2-peer migration; I<--direct> for direct migration; or I<--tunnelled>
|
||||||
for tunnelled migration (I<--tunnelled> implies I<--p2p>). I<--persistent>
|
for tunnelled migration. I<--persistent> leaves the domain persistent on
|
||||||
leaves the domain persistent on
|
|
||||||
destination host, I<--undefinesource> undefines the domain on the source host,
|
destination host, I<--undefinesource> undefines the domain on the source host,
|
||||||
and I<--suspend> leaves the domain paused on the destination host.
|
and I<--suspend> leaves the domain paused on the destination host.
|
||||||
I<--copy-storage-all> indicates migration with non-shared storage with full
|
I<--copy-storage-all> indicates migration with non-shared storage with full
|
||||||
|
Loading…
Reference in New Issue
Block a user