[libvirt] [PATCH] virsh: For virsh migrate --tunnelled, use the virDomainMigrateToURI3 API.

[Richard W.M. Jones]

Using virsh migrate + the --tunnelled flag causes virsh to use the
wrong API.  This gives the error:

  error: use virDomainMigrateToURI3 for peer-to-peer migration

As the error message is wrong, this patch also corrects the error
message.

https://bugzilla.redhat.com/show_bug.cgi?id=1095924

Signed-off-by: Richard W.M. Jones <rjones at redhat.com>
Cc: Jiri Denemark <jdenemar at redhat.com>
---
 src/libvirt.c        | 2 +-
 tools/virsh-domain.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/libvirt.c b/src/libvirt.c
index 2cd793c..6a361f6 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -5726,7 +5726,7 @@ virDomainMigrate3(virDomainPtr domain,
     if (flags & (VIR_MIGRATE_PEER2PEER | VIR_MIGRATE_TUNNELLED)) {
         virReportInvalidArg(flags, "%s",
                             _("use virDomainMigrateToURI3 for peer-to-peer "
-                              "migration"));
+                              "or tunnelled migration"));
         goto error;
     }
 
diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 3a7c260..5a5ce9d 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -8959,6 +8959,7 @@ doMigrate(void *opaque)
         flags |= VIR_MIGRATE_ABORT_ON_ERROR;
 
     if ((flags & VIR_MIGRATE_PEER2PEER) ||
+        (flags & VIR_MIGRATE_TUNNELLED) ||
         vshCommandOptBool(cmd, "direct")) {
 
         /* migrateuri doesn't make sense for tunnelled migration */
-- 
1.9.0