mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-22 05:35:25 +00:00
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>
This commit is contained in:
parent
19b088cfb9
commit
cc530c4557
@ -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;
|
||||
}
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -25,4 +25,4 @@
|
||||
|
||||
extern const vshCmdDef hostAndHypervisorCmds[];
|
||||
|
||||
VIR_ENUM_DECL(virNodeSuspendTarget);
|
||||
VIR_ENUM_DECL(virshNodeSuspendTarget);
|
||||
|
Loading…
Reference in New Issue
Block a user