diff options
author | Aditya Gupta <adityag@linux.ibm.com> | 2023-11-16 14:11:37 +0530 |
---|---|---|
committer | Simon Horman <horms@kernel.org> | 2023-11-16 11:32:00 +0000 |
commit | 44e7b73c331f557fb1e6cddada11205a7a96de46 (patch) | |
tree | f666a13e96511ae6a17588c24071490133c9d43d | |
parent | 74d66d405f30fb247da9684f6e29bbef8a4f56cf (diff) | |
download | kexec-tools-44e7b73c331f557fb1e6cddada11205a7a96de46.tar.gz |
kexec: ppc64: print help to stdout instead of stderr
Currently 'kexec --help' on powerpc64 prints the generic help/usage to
stdout, and the powerpc64 specific options to stderr
That is, if the stdout of 'kexec --help' is redirected to some file,
some of the help options will not be redirected, and instead printed on
the terminal/stderr:
[root@machine kexec-tools]# kexec --help > /tmp/out
--command-line=<Command line> command line to append.
--append=<Command line> same as --command-line.
--ramdisk=<filename> Initial RAM disk.
--initrd=<filename> same as --ramdisk.
--devicetreeblob=<filename> Specify device tree blob file.
Not applicable while using
--kexec-file-syscall.
--dtb=<filename> same as --devicetreeblob.
elf support is still broken
--elf64-core-headers Prepare core headers in ELF64 format
--dt-no-old-root Do not reuse old kernel root= param.
while creating flatten device tree.
Fix this inconsistency by writing powerpc64 specific options to stdout,
similar to the generic 'kexec --help'
With the proposed changes, it is like this (nothing printed to stderr):
[root@machine kexec-tools]# ./build/sbin/kexec --help > /tmp/out
Reported-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Signed-off-by: Aditya Gupta <adityag@linux.ibm.com>
Signed-off-by: Simon Horman <horms@kernel.org>
-rw-r--r-- | kexec/arch/ppc64/kexec-elf-ppc64.c | 22 | ||||
-rw-r--r-- | kexec/arch/ppc64/kexec-ppc64.c | 6 | ||||
-rw-r--r-- | kexec/arch/ppc64/kexec-zImage-ppc64.c | 2 |
3 files changed, 15 insertions, 15 deletions
diff --git a/kexec/arch/ppc64/kexec-elf-ppc64.c b/kexec/arch/ppc64/kexec-elf-ppc64.c index 01d045fc..bdcfd206 100644 --- a/kexec/arch/ppc64/kexec-elf-ppc64.c +++ b/kexec/arch/ppc64/kexec-elf-ppc64.c @@ -482,15 +482,15 @@ int elf_ppc64_load(int argc, char **argv, const char *buf, off_t len, void elf_ppc64_usage(void) { - fprintf(stderr, " --command-line=<Command line> command line to append.\n"); - fprintf(stderr, " --append=<Command line> same as --command-line.\n"); - fprintf(stderr, " --ramdisk=<filename> Initial RAM disk.\n"); - fprintf(stderr, " --initrd=<filename> same as --ramdisk.\n"); - fprintf(stderr, " --devicetreeblob=<filename> Specify device tree blob file.\n"); - fprintf(stderr, " "); - fprintf(stderr, "Not applicable while using --kexec-file-syscall.\n"); - fprintf(stderr, " --reuse-cmdline Use kernel command line from running system.\n"); - fprintf(stderr, " --dtb=<filename> same as --devicetreeblob.\n"); - - fprintf(stderr, "elf support is still broken\n"); + printf(" --command-line=<Command line> command line to append.\n"); + printf(" --append=<Command line> same as --command-line.\n"); + printf(" --ramdisk=<filename> Initial RAM disk.\n"); + printf(" --initrd=<filename> same as --ramdisk.\n"); + printf(" --devicetreeblob=<filename> Specify device tree blob file.\n"); + printf(" "); + printf("Not applicable while using --kexec-file-syscall.\n"); + printf(" --reuse-cmdline Use kernel command line from running system.\n"); + printf(" --dtb=<filename> same as --devicetreeblob.\n"); + + printf("elf support is still broken\n"); } diff --git a/kexec/arch/ppc64/kexec-ppc64.c b/kexec/arch/ppc64/kexec-ppc64.c index 611809f3..bd5274c4 100644 --- a/kexec/arch/ppc64/kexec-ppc64.c +++ b/kexec/arch/ppc64/kexec-ppc64.c @@ -910,9 +910,9 @@ int file_types = sizeof(file_type) / sizeof(file_type[0]); void arch_usage(void) { - fprintf(stderr, " --elf64-core-headers Prepare core headers in ELF64 format\n"); - fprintf(stderr, " --dt-no-old-root Do not reuse old kernel root= param.\n" \ - " while creating flatten device tree.\n"); + printf(" --elf64-core-headers Prepare core headers in ELF64 format\n"); + printf(" --dt-no-old-root Do not reuse old kernel root= param.\n" + " while creating flatten device tree.\n"); } struct arch_options_t arch_options = { diff --git a/kexec/arch/ppc64/kexec-zImage-ppc64.c b/kexec/arch/ppc64/kexec-zImage-ppc64.c index e9462051..7f457516 100644 --- a/kexec/arch/ppc64/kexec-zImage-ppc64.c +++ b/kexec/arch/ppc64/kexec-zImage-ppc64.c @@ -180,5 +180,5 @@ int zImage_ppc64_load(FILE *file, int UNUSED(argc), char **UNUSED(argv), void zImage_ppc64_usage(void) { - fprintf(stderr, "zImage support is still broken\n"); + printf("zImage support is still broken\n"); } |