kexec: use dbgprintf instead of #if 0 for debug printing
Subsystems (2)
PATCH 1/1 kexec: use dbgprintf instead of #if 0 for debug printing
Signed-off-by Zhang Yanfei <[email protected]>
--- kexec/arch/i386/kexec-x86-common.c | 28 ++++++++++------------------ kexec/kexec.c | 18 +++++++++--------- 2 files changed, 19 insertions(+), 27 deletions(-)
kexec/arch/i386/kexec-x86-common.c +10 -18
@@ -88,10 +88,9 @@ static int get_memory_ranges_proc_iomem(struct memory_range **range, int *rangescontinue ; str = line + consumed; end = end +1 ; -#if 0 -printf ("%016Lx-%016Lx : %s" , - start, end, str); -#endif + +dbgprintf ("%016Lx-%016Lx : %s" , start, end, str); +if (memcmp (str,"System RAM\n" ,11 ) ==0 ) { type =RANGE_RAM ; }
@@ -110,10 +109,9 @@ static int get_memory_ranges_proc_iomem(struct memory_range **range, int *ranges memory_range[memory_ranges].start = start; memory_range[memory_ranges].end = end; memory_range[memory_ranges].type = type; -#if 0 -printf ("%016Lx-%016Lx : %x\n" , - start, end, type); -#endif + +dbgprintf ("%016Lx-%016Lx : %x\n" , start, end, type); + memory_ranges++; }fclose (fp);
@@ -479,17 +477,11 @@ int get_memory_ranges(struct memory_range **range, int *ranges, mem_max = end; } -/* just set 0 to 1 to enable printing for debugging */ -#if 0 - { -int i; -printf ("MEMORY RANGES\n" ); -for (i =0 ; i < *ranges; i++) { -printf ("%016Lx-%016Lx (%d)\n" , (*range)[i].start, - (*range)[i].end, (*range)[i].type); - } +dbgprintf ("MEMORY RANGES\n" ); +for (i =0 ; i < *ranges; i++) { +dbgprintf ("%016Lx-%016Lx (%d)\n" , (*range)[i].start, + (*range)[i].end, (*range)[i].type); } -#endif return ret; }
kexec/kexec.c +9 -9
@@ -669,10 +669,9 @@ static int my_load(const char *type, int fileind, int argc, char **argv, kernel = argv[fileind];/* slurp in the input kernel */ kernel_buf =slurp_decompress_file (kernel, &kernel_size); -#if 0 -fprintf (stderr,"kernel: %p kernel_size: %lx\n" , - kernel_buf, kernel_size); -#endif + +dbgprintf ("kernel: %p kernel_size: %lx\n" , + kernel_buf, kernel_size);if (get_memory_ranges (&info.memory_range, &info.memory_ranges, info.kexec_flags) <0 ) {
@@ -759,11 +758,12 @@ static int my_load(const char *type, int fileind, int argc, char **argv,update_purgatory (&info);if (entry) info.entry = entry; -#if 0 -fprintf (stderr,"kexec_load: entry = %p flags = %lx\n" , - info.entry, info.kexec_flags); -print_segments (stderr, &info); -#endif + +dbgprintf ("kexec_load: entry = %p flags = %lx\n" , + info.entry, info.kexec_flags); +if (kexec_debug) +print_segments (stderr, &info); + result =kexec_load ( info.entry, info.nr_segments, info.segment, info.kexec_flags);if (result !=0 ) {
Signature · 6 lines
1.7.1 _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
Simon Horman
AppliedQuoted 5 lines · Zhang Yanfei
Signed-off-by Zhang Yanfei <[email protected]>--- kexec/arch/i386/kexec-x86-common.c | 28 ++++++++++------------------ kexec/kexec.c | 18 +++++++++--------- 2 files changed, 19 insertions(+), 27 deletions(-)
Thanks, applied.
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec