6:47 a.m.
Stuff used in virsh should use 'virsh'.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tools/virsh-completer-domain.c | 8 ++++----
tools/virsh-domain.c | 16 ++++++++--------
tools/virsh-domain.h | 8 ++++----
3 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/tools/virsh-completer-domain.c b/tools/virsh-completer-domain.c
index 14e4d95ec3..0df11807e1 100644
--- a/tools/virsh-completer-domain.c
+++ b/tools/virsh-completer-domain.c
@@ -762,7 +762,7 @@ virshDomainSignalCompleter(vshControl *ctl G_GNUC_UNUSED,
tmp = g_new0(char *, VIR_DOMAIN_PROCESS_SIGNAL_LAST + 1);
for (i = 0; i < VIR_DOMAIN_PROCESS_SIGNAL_LAST; i++) {
- const char *name = virDomainProcessSignalTypeToString(i);
+ const char *name = virshDomainProcessSignalTypeToString(i);
tmp[i] = g_strdup(name);
}
@@ -783,7 +783,7 @@ virshDomainLifecycleCompleter(vshControl *ctl G_GNUC_UNUSED,
tmp = g_new0(char *, VIR_DOMAIN_LIFECYCLE_LAST + 1);
for (i = 0; i < VIR_DOMAIN_LIFECYCLE_LAST; i++) {
- const char *name = virDomainLifecycleTypeToString(i);
+ const char *name = virshDomainLifecycleTypeToString(i);
tmp[i] = g_strdup(name);
}
@@ -804,7 +804,7 @@ virshDomainLifecycleActionCompleter(vshControl *ctl G_GNUC_UNUSED,
tmp = g_new0(char *, VIR_DOMAIN_LIFECYCLE_ACTION_LAST + 1);
for (i = 0; i < VIR_DOMAIN_LIFECYCLE_ACTION_LAST; i++) {
- const char *action = virDomainLifecycleActionTypeToString(i);
+ const char *action = virshDomainLifecycleActionTypeToString(i);
tmp[i] = g_strdup(action);
}
@@ -956,7 +956,7 @@ virshDomainCoreDumpFormatCompleter(vshControl *ctl G_GNUC_UNUSED,
ret = g_new0(char *, VIR_DOMAIN_CORE_DUMP_FORMAT_LAST + 1);
for (i = 0; i < VIR_DOMAIN_CORE_DUMP_FORMAT_LAST; i++)
- ret[i] = g_strdup(virDomainCoreDumpFormatTypeToString(i));
+ ret[i] = g_strdup(virshDomainCoreDumpFormatTypeToString(i));
return ret;
}
diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index f59be4e29d..6fb057736b 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -5410,7 +5410,7 @@ static const vshCmdOptDef opts_dump[] = {
{.name = NULL}
};
-VIR_ENUM_IMPL(virDomainCoreDumpFormat,
+VIR_ENUM_IMPL(virshDomainCoreDumpFormat,
VIR_DOMAIN_CORE_DUMP_FORMAT_LAST,
"elf",
"kdump-zlib",
@@ -5463,7 +5463,7 @@ doDump(void *opaque)
}
if (vshCommandOptStringQuiet(ctl, cmd, "format", &format) > 0)
{
- if ((dumpformat = virDomainCoreDumpFormatTypeFromString(format)) < 0) {
+ if ((dumpformat = virshDomainCoreDumpFormatTypeFromString(format)) < 0) {
vshError(ctl, _("format '%s' is not supported, expecting
"
"'kdump-zlib', 'kdump-lzo',
'kdump-snappy', "
"'win-dmp' or 'elf'"),
format);
@@ -5711,13 +5711,13 @@ static const vshCmdOptDef opts_setLifecycleAction[] = {
{.name = NULL}
};
-VIR_ENUM_IMPL(virDomainLifecycle,
+VIR_ENUM_IMPL(virshDomainLifecycle,
VIR_DOMAIN_LIFECYCLE_LAST,
"poweroff",
"reboot",
"crash");
-VIR_ENUM_IMPL(virDomainLifecycleAction,
+VIR_ENUM_IMPL(virshDomainLifecycleAction,
VIR_DOMAIN_LIFECYCLE_ACTION_LAST,
"destroy",
"restart",
@@ -5754,13 +5754,13 @@ cmdSetLifecycleAction(vshControl *ctl, const vshCmd *cmd)
return false;
}
- if ((tmpVal = virDomainLifecycleTypeFromString(typeStr)) < 0) {
+ if ((tmpVal = virshDomainLifecycleTypeFromString(typeStr)) < 0) {
vshError(ctl, _("Invalid lifecycle type '%s'."), typeStr);
return false;
}
type = tmpVal;
- if ((tmpVal = virDomainLifecycleActionTypeFromString(actionStr)) < 0) {
+ if ((tmpVal = virshDomainLifecycleActionTypeFromString(actionStr)) < 0) {
vshError(ctl, _("Invalid lifecycle action '%s'."), actionStr);
return false;
}
@@ -8894,7 +8894,7 @@ static const vshCmdOptDef opts_send_process_signal[] = {
{.name = NULL}
};
-VIR_ENUM_IMPL(virDomainProcessSignal,
+VIR_ENUM_IMPL(virshDomainProcessSignal,
VIR_DOMAIN_PROCESS_SIGNAL_LAST,
"nop", "hup", "int", "quit",
"ill", /* 0-4 */
"trap", "abrt", "bus", "fpe",
"kill", /* 5-9 */
@@ -8928,7 +8928,7 @@ static int getSignalNumber(const char *signame)
else if (STRPREFIX(p, "sig"))
p += 3;
- return virDomainProcessSignalTypeFromString(p);
+ return virshDomainProcessSignalTypeFromString(p);
}
static bool
diff --git a/tools/virsh-domain.h b/tools/virsh-domain.h
index 0c1cc7a630..a1ac1cf1d4 100644
--- a/tools/virsh-domain.h
+++ b/tools/virsh-domain.h
@@ -40,7 +40,7 @@ VIR_ENUM_DECL(virshDomainHostnameSource);
extern const vshCmdDef domManagementCmds[];
-VIR_ENUM_DECL(virDomainProcessSignal);
-VIR_ENUM_DECL(virDomainLifecycle);
-VIR_ENUM_DECL(virDomainLifecycleAction);
-VIR_ENUM_DECL(virDomainCoreDumpFormat);
+VIR_ENUM_DECL(virshDomainProcessSignal);
+VIR_ENUM_DECL(virshDomainLifecycle);
+VIR_ENUM_DECL(virshDomainLifecycleAction);
+VIR_ENUM_DECL(virshDomainCoreDumpFormat);
--
2.31.1