]> xenbits.xensource.com Git - libvirt.git/commitdiff
vsh: Using VSH_REQUIRE_OPTION rather than virReportError
authorKothapally Madhu Pavan <kmp@linux.vnet.ibm.com>
Tue, 18 Oct 2016 17:33:11 +0000 (13:33 -0400)
committerJohn Ferlan <jferlan@redhat.com>
Fri, 28 Oct 2016 18:19:41 +0000 (14:19 -0400)
Correcting the error reporting method by using VSH_REQUIRE_OPTION
instead of virReportError

Signed-off-by: Kothapally Madhu Pavan <kmp@linux.vnet.ibm.com>
tools/virsh-domain.c

index fe8c45856bdb5b4c3ecdf71a202bfe879b4b0a5c..184f64dd599ef5f66ccb4d812f1a59adb79a9aab 100644 (file)
@@ -10419,6 +10419,7 @@ cmdMigrate(vshControl *ctl, const vshCmd *cmd)
 
     VSH_EXCLUSIVE_OPTIONS("live", "offline");
     VSH_EXCLUSIVE_OPTIONS("timeout-suspend", "timeout-postcopy");
+    VSH_REQUIRE_OPTION("postcopy-after-precopy", "postcopy");
 
     if (!(dom = virshCommandOptDomain(ctl, cmd, NULL)))
         return false;
@@ -10450,12 +10451,6 @@ cmdMigrate(vshControl *ctl, const vshCmd *cmd)
     }
 
     if (vshCommandOptBool(cmd, "postcopy-after-precopy")) {
-        if (!vshCommandOptBool(cmd, "postcopy")) {
-            virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s",
-                          _("--postcopy-after-precopy can only be used with "
-                            "--postcopy"));
-            goto cleanup;
-        }
         iterEvent = virConnectDomainEventRegisterAny(
                             priv->conn, dom,
                             VIR_DOMAIN_EVENT_ID_MIGRATION_ITERATION,