virsh: Don't check migrate parameters

Just pass anything a user specified to the appropriate API. It's the API
or libvirtd that should be responsible for checking its parameters.

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

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>

diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 861766f540f03d8316bb9f70989de64a0bc13955..14e1e35924df1c152da9df37d0c597e85eb88937 100644 (file)
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -9894,18 +9894,7 @@ doMigrate(void *opaque)
     if (vshCommandOptBool(cmd, "abort-on-error"))
         flags |= VIR_MIGRATE_ABORT_ON_ERROR;
 
-    if ((flags & VIR_MIGRATE_PEER2PEER) ||
-        vshCommandOptBool(cmd, "direct")) {
-
-        /* migrateuri doesn't make sense for tunnelled migration */
-        if (flags & VIR_MIGRATE_TUNNELLED &&
-            virTypedParamsGetString(params, nparams,
-                                    VIR_MIGRATE_PARAM_URI, NULL) == 1) {
-            vshError(ctl, "%s", _("migrate: Unexpected migrateuri for "
-                                  "peer2peer/direct migration"));
-            goto out;
-        }
-
+    if (flags & VIR_MIGRATE_PEER2PEER || vshCommandOptBool(cmd, "direct")) {
         if (virDomainMigrateToURI3(dom, desturi, params, nparams, flags) == 0)
             ret = '0';
     } else {