[PATCH v2 7/8] makedumpfile: Add erased information in compressed kdump file

[Ken'ichi Ohmichi]

Hi Mahesh,

Thank you for the patch.

On Tue, 6 Sep 2011 21:14:52 +0530
Mahesh J Salgaonkar <mahesh at linux.vnet.ibm.com> wrote:
> 
> makedumpfile: Use the same format as erase commands for eraseinfo data.
> 
> From: Mahesh Salgaonkar <mahesh at linux.vnet.ibm.com>
> 
> The format of eraseinfo data differs from that of erase commands. This patch
> makes sure eraseinfo data format is same as erase commands.
> 
> Signed-off-by: Mahesh Salgaonkar <mahesh at linux.vnet.ibm.com>

Acked-by: Ken'ichi Ohmichi <oomichi at mxs.nes.nec.co.jp>


Thanks
Ken'ichi Ohmichi

> ---
>  IMPLEMENTATION |    4 ++--
>  makedumpfile.c |    4 ++--
>  makedumpfile.h |    2 +-
>  3 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/IMPLEMENTATION b/IMPLEMENTATION
> index c11bd36..f0f3135 100644
> --- a/IMPLEMENTATION
> +++ b/IMPLEMENTATION
> @@ -26,9 +26,9 @@
>      |                        :                 |
>      |         page data (pfn Z)                |
>      +------------------------------------------+ offset_eraseinfo
> -    | erase mystruct2.mystruct1.var 4          |
> +    | erase mystruct2.mystruct1.var size 4     |
>      | erase mystruct2.mystruct1.ptr nullify    |
> -    | erase mystruct2.mystruct.array 100       |
> +    | erase mystruct2.mystruct.array size 100  |
>      +------------------------------------------+
>  
>  
> diff --git a/makedumpfile.c b/makedumpfile.c
> index 1a88171..2c49bbe 100644
> --- a/makedumpfile.c
> +++ b/makedumpfile.c
> @@ -3949,7 +3949,7 @@ write_elf_header(struct cache_data *cd_header)
>  		if (fl_info->nullify)
>  			sprintf(size_str, "nullify\n");
>  		else
> -			sprintf(size_str, "%ld\n", fl_info->size);
> +			sprintf(size_str, "size %ld\n", fl_info->size);
>  
>  		size_eraseinfo += strlen("erase ") +
>  				strlen(ei->symbol_expr) + 1 +
> @@ -4799,7 +4799,7 @@ write_eraseinfo(struct cache_data *cd_page, unsigned long *size_out)
>  			continue;
>  		for (j = 0; j < erase_info[i].num_sizes; j++) {
>  			if (erase_info[i].sizes[j] > 0)
> -				sprintf(size_str, "%ld\n",
> +				sprintf(size_str, "size %ld\n",
>  						erase_info[i].sizes[j]);
>  			else if (erase_info[i].sizes[j] == -1)
>  				sprintf(size_str, "nullify\n");
> diff --git a/makedumpfile.h b/makedumpfile.h
> index 8b1bd4f..2741903 100644
> --- a/makedumpfile.h
> +++ b/makedumpfile.h
> @@ -411,7 +411,7 @@ do { \
>  
>  #define SIZE_XEN_CRASH_INFO_V2	(sizeof(unsigned long) * 10)
>  
> -#define MAX_SIZE_STR_LEN (21)
> +#define MAX_SIZE_STR_LEN (26)	/* strlen("size ") + 21 */
>  
>  /*
>   * The value of dependence on machine
>