From 011935457a3b5d911e10dc60c681778e78c8fdf9 Mon Sep 17 00:00:00 2001 From: Kothapally Madhu Pavan Date: Tue, 18 Oct 2016 13:33:11 -0400 Subject: [PATCH] vsh: Using VSH_REQUIRE_OPTION rather than virReportError Correcting the error reporting method by using VSH_REQUIRE_OPTION instead of virReportError Signed-off-by: Kothapally Madhu Pavan --- tools/virsh-domain.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index fe8c45856b..184f64dd59 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -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,