virsh-host: Avoid 'vir' prefix for locally declared VIR_ENUM* helpers

Stuff used in virsh should use 'virsh'.

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

diff --git a/tools/virsh-completer-host.c b/tools/virsh-completer-host.c
index d17bc5f5cefd744fee0710117de7e96d3d1f1b46..3795d1fd3ac722d3c03b7c6ad8d34d762ce0503e 100644 (file)
--- a/tools/virsh-completer-host.c
+++ b/tools/virsh-completer-host.c
@@ -183,7 +183,7 @@ virshNodeSuspendTargetCompleter(vshControl *ctl G_GNUC_UNUSED,
     ret = g_new0(char *, VIR_NODE_SUSPEND_TARGET_LAST + 1);
 
     for (i = 0; i < VIR_NODE_SUSPEND_TARGET_LAST; i++)
-        ret[i] = g_strdup(virNodeSuspendTargetTypeToString(i));
+        ret[i] = g_strdup(virshNodeSuspendTargetTypeToString(i));
 
     return ret;
 }

diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 29748b0257e7c900a2342eabe7387ed4778376c5..f59be4e29d37adafd9455be81f160f9fc5453afa 100644 (file)
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -3488,7 +3488,7 @@ cmdDomPMSuspend(vshControl *ctl, const vshCmd *cmd)
     if (vshCommandOptStringReq(ctl, cmd, "target", &target) < 0)
         goto cleanup;
 
-    if ((suspendTarget = virNodeSuspendTargetTypeFromString(target)) < 0) {
+    if ((suspendTarget = virshNodeSuspendTargetTypeFromString(target)) < 0) {
         vshError(ctl, "%s", _("Invalid target"));
         goto cleanup;
     }

diff --git a/tools/virsh-host.c b/tools/virsh-host.c
index f42e995122de45f76c459b00517127a43607d316..7b47b7583d68fb914eadea2d1cf53fe2a375f9db 100644 (file)
--- a/tools/virsh-host.c
+++ b/tools/virsh-host.c
@@ -951,7 +951,7 @@ cmdNodeMemStats(vshControl *ctl, const vshCmd *cmd)
  * "nodesuspend" command
  */
 
-VIR_ENUM_IMPL(virNodeSuspendTarget,
+VIR_ENUM_IMPL(virshNodeSuspendTarget,
               VIR_NODE_SUSPEND_TARGET_LAST,
               "mem",
               "disk",
@@ -998,7 +998,7 @@ cmdNodeSuspend(vshControl *ctl, const vshCmd *cmd)
     if (vshCommandOptLongLong(ctl, cmd, "duration", &duration) < 0)
         return false;
 
-    if ((suspendTarget = virNodeSuspendTargetTypeFromString(target)) < 0) {
+    if ((suspendTarget = virshNodeSuspendTargetTypeFromString(target)) < 0) {
         vshError(ctl, "%s", _("Invalid target"));
         return false;
     }

diff --git a/tools/virsh-host.h b/tools/virsh-host.h
index 840f0b4538176ecfc014da6c6e564112b998c4eb..f12258018dc0de03c7cf6736efe1f3d827f7d6f6 100644 (file)
--- a/tools/virsh-host.h
+++ b/tools/virsh-host.h
@@ -25,4 +25,4 @@
 
 extern const vshCmdDef hostAndHypervisorCmds[];
 
-VIR_ENUM_DECL(virNodeSuspendTarget);
+VIR_ENUM_DECL(virshNodeSuspendTarget);