[PATCH] kexec: Replace printf() with die() to error out to stderr

[PATCH] kexec: Replace printf() with die() to error out to stderr

[WANG Chao]

Error messages are mixed stderr with stdout when we use die() along with
printf(). So use die() to keep error out consistent.

Signed-off-by: WANG Chao <chaowang@redhat.com>
---
 kexec/kexec.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/kexec/kexec.c b/kexec/kexec.c
index 53d6edc..911c0f6 100644
--- a/kexec/kexec.c
+++ b/kexec/kexec.c
@@ -1176,17 +1176,17 @@ int main(int argc, char *argv[])
 	}
 
 	if ((kexec_flags & KEXEC_ON_CRASH) && !is_crashkernel_mem_reserved()) {
-		printf("Memory for crashkernel is not reserved\n");
-		printf("Please reserve memory by passing ");
-		printf("\"crashkernel=X@Y\" parameter to the kernel\n");
-		die("Then try loading kdump kernel\n");
+		die("Memory for crashkernel is not reserved\n"
+		    "Please reserve memory by passing"
+		    "\"crashkernel=X@Y\" parameter to kernel\n"
+		    "Then try to loading kdump kernel\n");
 	}
 
 	if (do_load && (kexec_flags & KEXEC_PRESERVE_CONTEXT) &&
 	    mem_max == ULONG_MAX) {
-		printf("Please specify memory range used by kexeced kernel\n");
-		printf("to preserve the context of original kernel with \n");
-		die("\"--mem-max\" parameter\n");
+		die("Please specify memory range used by kexeced kernel\n"
+		    "to preserve the context of original kernel with \n"
+		    "\"--mem-max\" parameter\n");
 	}
 
 	fileind = optind;
-- 
1.8.2.1


_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

Re: [PATCH] kexec: Replace printf() with die() to error out to stderr

[Zhang Yanfei]

于 2013年05月14日 11:56, WANG Chao 写道:
> Error messages are mixed stderr with stdout when we use die() along with
> printf(). So use die() to keep error out consistent.

Looks good to me.

Acked-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com>

> 
> Signed-off-by: WANG Chao <chaowang@redhat.com>
> ---
>  kexec/kexec.c | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/kexec/kexec.c b/kexec/kexec.c
> index 53d6edc..911c0f6 100644
> --- a/kexec/kexec.c
> +++ b/kexec/kexec.c
> @@ -1176,17 +1176,17 @@ int main(int argc, char *argv[])
>  	}
>  
>  	if ((kexec_flags & KEXEC_ON_CRASH) && !is_crashkernel_mem_reserved()) {
> -		printf("Memory for crashkernel is not reserved\n");
> -		printf("Please reserve memory by passing ");
> -		printf("\"crashkernel=X@Y\" parameter to the kernel\n");
> -		die("Then try loading kdump kernel\n");
> +		die("Memory for crashkernel is not reserved\n"
> +		    "Please reserve memory by passing"
> +		    "\"crashkernel=X@Y\" parameter to kernel\n"
> +		    "Then try to loading kdump kernel\n");
>  	}
>  
>  	if (do_load && (kexec_flags & KEXEC_PRESERVE_CONTEXT) &&
>  	    mem_max == ULONG_MAX) {
> -		printf("Please specify memory range used by kexeced kernel\n");
> -		printf("to preserve the context of original kernel with \n");
> -		die("\"--mem-max\" parameter\n");
> +		die("Please specify memory range used by kexeced kernel\n"
> +		    "to preserve the context of original kernel with \n"
> +		    "\"--mem-max\" parameter\n");
>  	}
>  
>  	fileind = optind;


_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

Re: [PATCH] kexec: Replace printf() with die() to error out to stderr

[Simon Horman]

On Tue, May 14, 2013 at 11:56:48AM +0800, WANG Chao wrote:
> Error messages are mixed stderr with stdout when we use die() along with
> printf(). So use die() to keep error out consistent.
> 
> Signed-off-by: WANG Chao <chaowang@redhat.com>

Thanks, applied.

_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec