[libvirt] [PATCH 0/2] virsh: Add coredump format completion to dump
Lin Ma (2): virsh: Use VIR_ENUM_* for --format argument in doDump virsh: Add coredump format completion to dump command tools/virsh-completer-domain.c | 19 +++++++++++++++++++ tools/virsh-completer-domain.h | 5 +++++ tools/virsh-domain.c | 28 ++++++++++++++-------------- tools/virsh-domain.h | 1 + 4 files changed, 39 insertions(+), 14 deletions(-) -- 2.26.2
Signed-off-by: Lin Ma <lma@suse.com> --- tools/virsh-domain.c | 26 ++++++++++++-------------- tools/virsh-domain.h | 1 + 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index e42c4d612d..78276dd847 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -5410,6 +5410,14 @@ static const vshCmdOptDef opts_dump[] = { {.name = NULL} }; +VIR_ENUM_IMPL(virDomainCoreDumpFormat, + VIR_DOMAIN_CORE_DUMP_FORMAT_LAST, + "kdump-zlib", + "kdump-lzo", + "kdump-snappy", + "elf", + "win-dmp"); + static void doDump(void *opaque) { @@ -5421,7 +5429,7 @@ doDump(void *opaque) const char *to = NULL; unsigned int flags = 0; const char *format = NULL; - unsigned int dumpformat = VIR_DOMAIN_CORE_DUMP_FORMAT_RAW; + int dumpformat = VIR_DOMAIN_CORE_DUMP_FORMAT_RAW; #ifndef WIN32 sigset_t sigmask, oldsigmask; @@ -5455,20 +5463,10 @@ doDump(void *opaque) } if (vshCommandOptStringQuiet(ctl, cmd, "format", &format) > 0) { - if (STREQ(format, "kdump-zlib")) { - dumpformat = VIR_DOMAIN_CORE_DUMP_FORMAT_KDUMP_ZLIB; - } else if (STREQ(format, "kdump-lzo")) { - dumpformat = VIR_DOMAIN_CORE_DUMP_FORMAT_KDUMP_LZO; - } else if (STREQ(format, "kdump-snappy")) { - dumpformat = VIR_DOMAIN_CORE_DUMP_FORMAT_KDUMP_SNAPPY; - } else if (STREQ(format, "elf")) { - dumpformat = VIR_DOMAIN_CORE_DUMP_FORMAT_RAW; - } else if (STREQ(format, "win-dmp")) { - dumpformat = VIR_DOMAIN_CORE_DUMP_FORMAT_WIN_DMP; - } else { + if ((dumpformat = virDomainCoreDumpFormatTypeFromString(format)) < 0) { vshError(ctl, _("format '%s' is not supported, expecting " - "'kdump-zlib', 'kdump-lzo', 'kdump-snappy' " - "or 'elf'"), format); + "'kdump-zlib', 'kdump-lzo', 'kdump-snappy', " + "'win-dmp' or 'elf'"), format); goto out; } } diff --git a/tools/virsh-domain.h b/tools/virsh-domain.h index 70e2aba1b1..0c1cc7a630 100644 --- a/tools/virsh-domain.h +++ b/tools/virsh-domain.h @@ -43,3 +43,4 @@ extern const vshCmdDef domManagementCmds[]; VIR_ENUM_DECL(virDomainProcessSignal); VIR_ENUM_DECL(virDomainLifecycle); VIR_ENUM_DECL(virDomainLifecycleAction); +VIR_ENUM_DECL(virDomainCoreDumpFormat); -- 2.26.2
Signed-off-by: Lin Ma <lma@suse.com> --- tools/virsh-completer-domain.c | 19 +++++++++++++++++++ tools/virsh-completer-domain.h | 5 +++++ tools/virsh-domain.c | 2 ++ 3 files changed, 26 insertions(+) diff --git a/tools/virsh-completer-domain.c b/tools/virsh-completer-domain.c index 1f72b856b4..20d503ff09 100644 --- a/tools/virsh-completer-domain.c +++ b/tools/virsh-completer-domain.c @@ -940,3 +940,22 @@ virshDomainFSMountpointsCompleter(vshControl *ctl, virshDomainFree(dom); return ret; } + + +char ** +virshDomainCoreDumpFormatCompleter(vshControl *ctl G_GNUC_UNUSED, + const vshCmd *cmd G_GNUC_UNUSED, + unsigned int flags) +{ + char **ret = NULL; + size_t i; + + virCheckFlags(0, NULL); + + 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)); + + return ret; +} diff --git a/tools/virsh-completer-domain.h b/tools/virsh-completer-domain.h index ef242d0c68..f548f7ba9e 100644 --- a/tools/virsh-completer-domain.h +++ b/tools/virsh-completer-domain.h @@ -122,3 +122,8 @@ char ** virshKeycodeNameCompleter(vshControl *ctl, char ** virshDomainFSMountpointsCompleter(vshControl *ctl, const vshCmd *cmd, unsigned int flags); + +char ** +virshDomainCoreDumpFormatCompleter(vshControl *ctl G_GNUC_UNUSED, + const vshCmd *cmd G_GNUC_UNUSED, + unsigned int flags); diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 78276dd847..ecad3a5e5d 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -5405,6 +5405,8 @@ static const vshCmdOptDef opts_dump[] = { }, {.name = "format", .type = VSH_OT_STRING, + .flags = VSH_OFLAG_NONE, + .completer = virshDomainCoreDumpFormatCompleter, .help = N_("specify the format of memory-only dump") }, {.name = NULL} -- 2.26.2
On 6/7/21 5:14 AM, Lin Ma wrote:
Signed-off-by: Lin Ma <lma@suse.com> --- tools/virsh-completer-domain.c | 19 +++++++++++++++++++ tools/virsh-completer-domain.h | 5 +++++ tools/virsh-domain.c | 2 ++ 3 files changed, 26 insertions(+)
diff --git a/tools/virsh-completer-domain.h b/tools/virsh-completer-domain.h index ef242d0c68..f548f7ba9e 100644 --- a/tools/virsh-completer-domain.h +++ b/tools/virsh-completer-domain.h @@ -122,3 +122,8 @@ char ** virshKeycodeNameCompleter(vshControl *ctl, char ** virshDomainFSMountpointsCompleter(vshControl *ctl, const vshCmd *cmd, unsigned int flags); + +char ** +virshDomainCoreDumpFormatCompleter(vshControl *ctl G_GNUC_UNUSED, + const vshCmd *cmd G_GNUC_UNUSED, + unsigned int flags);
We don't like marking arguments as unused in header files. That's left for corresponding .c file to do. Michal
On 6/7/21 5:14 AM, Lin Ma wrote:
Lin Ma (2): virsh: Use VIR_ENUM_* for --format argument in doDump virsh: Add coredump format completion to dump command
tools/virsh-completer-domain.c | 19 +++++++++++++++++++ tools/virsh-completer-domain.h | 5 +++++ tools/virsh-domain.c | 28 ++++++++++++++-------------- tools/virsh-domain.h | 1 + 4 files changed, 39 insertions(+), 14 deletions(-)
Reviewed-by: Michal Privoznik <mprivozn@redhat.com> and pushed. Michal
participants (2)
-
Lin Ma -
Michal Prívozník