Backport
commit 6f3e75a558ed50d6ff0b42e3f61c099b2005b7bb Author: Julien Thierry jthierry@redhat.com Date: Tue Nov 24 10:45:25 2020 +0000
[PATCH 2/2] Add shorthand --show-stats option to show report stats
Provide shorthand --show-stats option to enable report messages without needing to set a particular value for message-level.
Signed-off-by: Julien Thierry jthierry@redhat.com Signed-off-by: Kazuhito Hagio k-hagio-ab@nec.com
Signed-off-by: Tao Liu ltao@redhat.com --- ...file-Add-shorthand-show-stats-option.patch | 107 ++++++++++++++++++ kexec-tools.spec | 2 + 2 files changed, 109 insertions(+) create mode 100644 kexec-tools-2.0.21-makedumpfile-Add-shorthand-show-stats-option.patch
diff --git a/kexec-tools-2.0.21-makedumpfile-Add-shorthand-show-stats-option.patch b/kexec-tools-2.0.21-makedumpfile-Add-shorthand-show-stats-option.patch new file mode 100644 index 0000000..4f259ab --- /dev/null +++ b/kexec-tools-2.0.21-makedumpfile-Add-shorthand-show-stats-option.patch @@ -0,0 +1,107 @@ +From 6f3e75a558ed50d6ff0b42e3f61c099b2005b7bb Mon Sep 17 00:00:00 2001 +From: Julien Thierry jthierry@redhat.com +Date: Tue, 24 Nov 2020 10:45:25 +0000 +Subject: [PATCH 03/12] [PATCH 2/2] Add shorthand --show-stats option to show + report stats + +Provide shorthand --show-stats option to enable report messages +without needing to set a particular value for message-level. + +Signed-off-by: Julien Thierry jthierry@redhat.com +Signed-off-by: Kazuhito Hagio k-hagio-ab@nec.com +--- + makedumpfile.8 | 5 +++++ + makedumpfile.c | 9 ++++++++- + makedumpfile.h | 1 + + print_info.c | 7 ++++++- + 4 files changed, 20 insertions(+), 2 deletions(-) + +diff --git a/makedumpfile-1.6.8/makedumpfile.8 b/makedumpfile-1.6.8/makedumpfile.8 +index 5e902cd..dcca2dd 100644 +--- a/makedumpfile-1.6.8/makedumpfile.8 ++++ b/makedumpfile-1.6.8/makedumpfile.8 +@@ -643,6 +643,11 @@ Do not write the output dump file while still performing operations specified + by other options. + This option cannot be used with the --dump-dmesg, --reassemble and -g options. + ++.TP ++\fB--show-stats\fR ++Display report messages. This is an alternative to enabling bit 4 in the level ++provided to --message-level. ++ + .SH ENVIRONMENT VARIABLES + + .TP 8 +diff --git a/makedumpfile-1.6.8/makedumpfile.c b/makedumpfile-1.6.8/makedumpfile.c +index 8c80c49..ba0003a 100644 +--- a/makedumpfile-1.6.8/makedumpfile.c ++++ b/makedumpfile-1.6.8/makedumpfile.c +@@ -11540,13 +11540,14 @@ static struct option longopts[] = { + {"num-threads", required_argument, NULL, OPT_NUM_THREADS}, + {"check-params", no_argument, NULL, OPT_CHECK_PARAMS}, + {"dry-run", no_argument, NULL, OPT_DRY_RUN}, ++ {"show-stats", no_argument, NULL, OPT_SHOW_STATS}, + {0, 0, 0, 0} + }; + + int + main(int argc, char *argv[]) + { +- int i, opt, flag_debug = FALSE; ++ int i, opt, flag_debug = FALSE, flag_show_stats = FALSE; + + if ((info = calloc(1, sizeof(struct DumpInfo))) == NULL) { + ERRMSG("Can't allocate memory for the pagedesc cache. %s.\n", +@@ -11709,6 +11710,9 @@ main(int argc, char *argv[]) + case OPT_DRY_RUN: + info->flag_dry_run = TRUE; + break; ++ case OPT_SHOW_STATS: ++ flag_show_stats = TRUE; ++ break; + case '?': + MSG("Commandline parameter is invalid.\n"); + MSG("Try `makedumpfile --help' for more information.\n"); +@@ -11718,6 +11722,9 @@ main(int argc, char *argv[]) + if (flag_debug) + message_level |= ML_PRINT_DEBUG_MSG; + ++ if (flag_show_stats) ++ message_level |= ML_PRINT_REPORT_MSG; ++ + if (info->flag_check_params) + /* suppress debugging messages */ + message_level = DEFAULT_MSG_LEVEL; +diff --git a/makedumpfile-1.6.8/makedumpfile.h b/makedumpfile-1.6.8/makedumpfile.h +index 4c4222c..2fcb62e 100644 +--- a/makedumpfile-1.6.8/makedumpfile.h ++++ b/makedumpfile-1.6.8/makedumpfile.h +@@ -2427,6 +2427,7 @@ struct elf_prstatus { + #define OPT_PARTIAL_DMESG OPT_START+17 + #define OPT_CHECK_PARAMS OPT_START+18 + #define OPT_DRY_RUN OPT_START+19 ++#define OPT_SHOW_STATS OPT_START+20 + + /* + * Function Prototype. +diff --git a/makedumpfile-1.6.8/print_info.c b/makedumpfile-1.6.8/print_info.c +index d2b0cb7..ad4184e 100644 +--- a/makedumpfile-1.6.8/print_info.c ++++ b/makedumpfile-1.6.8/print_info.c +@@ -309,7 +309,12 @@ print_usage(void) + MSG(" vmcoreinfo. So currently /proc/kcore need be specified explicitly.\n"); + MSG("\n"); + MSG(" [--dry-run]:\n"); +- MSG(" This option runs makedumpfile without writting output dump file.\n"); ++ MSG(" Do not write the output dump file while still performing operations specified\n"); ++ MSG(" by other options. This option cannot be used with --dump-dmesg, --reassemble\n"); ++ MSG(" and -g options.\n"); ++ MSG("\n"); ++ MSG(" [--show-stats]:\n"); ++ MSG(" Set message-level to print report messages\n"); + MSG("\n"); + MSG(" [-D]:\n"); + MSG(" Print debugging message.\n"); +-- +2.29.2 + diff --git a/kexec-tools.spec b/kexec-tools.spec index 52c9932..4efcb79 100644 --- a/kexec-tools.spec +++ b/kexec-tools.spec @@ -106,6 +106,7 @@ Patch603: ./kexec-tools-2.0.20-makedumpfile-printk-add-support-for-lockless-ring Patch604: ./kexec-tools-2.0.20-makedumpfile-printk-use-committed-finalized-state-value.patch Patch605: ./kexec-tools-2.0.21-makedumpfile-make-use-of-uts_namespace.name-offset-in-VMCOR.patch Patch606: ./kexec-tools-2.0.21-makedumpfile-Add-dry-run-option.patch +Patch607: ./kexec-tools-2.0.21-makedumpfile-Add-shorthand-show-stats-option.patch
%description kexec-tools provides /sbin/kexec binary that facilitates a new @@ -126,6 +127,7 @@ tar -z -x -v -f %{SOURCE19} %patch604 -p1 %patch605 -p1 %patch606 -p1 +%patch607 -p1
%ifarch ppc %define archdef ARCH=ppc