virsh: Move 'virshDomainBlockJobToString' to virsh-util

The helper function is used in virshBlockJobInfo and also in the
callbacks of cmdEvent. Upcoming patch is going to move out the event
code into a helper so this needs to be in a shared place.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 33984618ebe8be668292d76a789f5fded607a384..9c304dbf78f40f59ce9407957a2570c42303995c 100644 (file)
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -2614,25 +2614,6 @@ static const vshCmdOptDef opts_blockjob[] = {
     {.name = NULL}
 };
 
-VIR_ENUM_DECL(virshDomainBlockJob);
-VIR_ENUM_IMPL(virshDomainBlockJob,
-              VIR_DOMAIN_BLOCK_JOB_TYPE_LAST,
-              N_("Unknown job"),
-              N_("Block Pull"),
-              N_("Block Copy"),
-              N_("Block Commit"),
-              N_("Active Block Commit"),
-              N_("Backup"),
-);
-
-static const char *
-virshDomainBlockJobToString(int type)
-{
-    const char *str = virshDomainBlockJobTypeToString(type);
-    return str ? _(str) : _("Unknown job");
-}
-
-
 static bool
 virshBlockJobInfo(vshControl *ctl,
                   virDomainPtr dom,

diff --git a/tools/virsh-util.c b/tools/virsh-util.c
index 8fb617fa3c2aabdc8ef3b1d973c002c8efe9d393..dc6ed7a86d2b7df27113dc3b2a3324616a0be787 100644 (file)
--- a/tools/virsh-util.c
+++ b/tools/virsh-util.c
@@ -418,3 +418,22 @@ virshDomainGetXML(vshControl *ctl,
 
     return ret;
 }
+
+
+VIR_ENUM_IMPL(virshDomainBlockJob,
+              VIR_DOMAIN_BLOCK_JOB_TYPE_LAST,
+              N_("Unknown job"),
+              N_("Block Pull"),
+              N_("Block Copy"),
+              N_("Block Commit"),
+              N_("Active Block Commit"),
+              N_("Backup"),
+);
+
+
+const char *
+virshDomainBlockJobToString(int type)
+{
+    const char *str = virshDomainBlockJobTypeToString(type);
+    return str ? _(str) : _("Unknown job");
+}

diff --git a/tools/virsh-util.h b/tools/virsh-util.h
index 838935d5e82413837b5916e88383458f52d3871c..4d4fe6c01eb9448cc222924ad46e58b3cc2801df 100644 (file)
--- a/tools/virsh-util.h
+++ b/tools/virsh-util.h
@@ -151,3 +151,8 @@ virshDomainGetXML(vshControl *ctl,
                   xmlXPathContextPtr *ctxt)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(4)
     ATTRIBUTE_NONNULL(5) G_GNUC_WARN_UNUSED_RESULT;
+
+VIR_ENUM_DECL(virshDomainBlockJob);
+
+const char *
+virshDomainBlockJobToString(int type);