From: Jiri Denemark <jdenemar@redhat.com>
Date: Fri, 12 Sep 2014 08:05:32 +0000 (+0200)
Subject: virsh: Move --completed from resume to domjobinfo
X-Git-Tag: CVE-2014-3633~75
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58252332eb365b93ba1d1067b3e162668eb2f1aa;p=thirdparty%2Flibvirt.git

virsh: Move --completed from resume to domjobinfo

Because of similar contexts, git rebase I did just before pushing the
series which added --completed option patched the wrong command.
---

diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index cc1e5546fd..30b3fa9742 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -5114,10 +5114,6 @@ static const vshCmdOptDef opts_resume[] = {
      .flags = VSH_OFLAG_REQ,
      .help = N_("domain name, id or uuid")
     },
-    {.name = "completed",
-     .type = VSH_OT_BOOL,
-     .help = N_("return statistics of a recently completed job")
-    },
     {.name = NULL}
 };
 
@@ -5377,6 +5373,10 @@ static const vshCmdOptDef opts_domjobinfo[] = {
      .flags = VSH_OFLAG_REQ,
      .help = N_("domain name, id or uuid")
     },
+    {.name = "completed",
+     .type = VSH_OT_BOOL,
+     .help = N_("return statistics of a recently completed job")
+    },
     {.name = NULL}
 };