Re: [PATH 0/1] Kexec jump - v2 - the first step to kexec based hibernation

[Pavel Machek <pavel@ucw.cz>]

Hi!


> Index: kexec-tools-1.101/kexec/arch/i386/crashdump-x86.c
> ===================================================================
> --- kexec-tools-1.101.orig/kexec/arch/i386/crashdump-x86.c	2007-07-08 23:00:25.000000000 +0800
> +++ kexec-tools-1.101/kexec/arch/i386/crashdump-x86.c	2007-07-14 17:06:45.000000000 +0800
> @@ -428,6 +428,29 @@
>  	return 0;
>  }
>  
> +/* Adds the kexec_backup= command line parameter to command line. */
> +static int cmdline_add_backup(char *cmdline, unsigned long addr)
> +{
> +	int cmdlen, len, align = 1024;
> +	char str[30], *ptr;
> +
> +	/* Passing in kexec_backup=xxxK format. Saves space required
> +	 * in cmdline. Ensure 1K alignment*/
> +	if (addr%align)
> +		return -1;
> +	addr = addr/align;
> +	ptr = str;
> +	strcpy(str, " kexec_backup=");
> +	ptr += strlen(str);
> +	ultoa(addr, ptr);
> +	strcat(str, "K");
> +	len = strlen(str);
> +	cmdlen = strlen(cmdline) + len;
> +	if (cmdlen > (COMMAND_LINE_SIZE - 1))
> +		die("Command line overflow\n");
> +	strcat(cmdline, str);
> +	return 0;
> +}

This part did not apply for me -- it seems crashdump related and I did
not have that applied. Is it critical?

> Index: kexec-tools-1.101/kexec/kexec.c
> ===================================================================
> --- kexec-tools-1.101.orig/kexec/kexec.c	2007-07-14 16:57:26.000000000 +0800
> +++ kexec-tools-1.101/kexec/kexec.c	2007-07-14 21:04:51.000000000 +0800
> @@ -660,6 +660,17 @@
>  	return -1;
>  }
>  
> +/*
> + *	Jump to the new kernel
> + */
> +static int my_jump(void)
> +{
> +	int result;
> +
> +	result = kexec_jump();
> +	return result;
> +}
> +
>  static void version(void)
>  {
>  	printf("kexec " VERSION " released " RELEASE_DATE "\n");
> @@ -683,6 +694,7 @@
>  		" -p, --load-panic     Load the new kernel for use on panic.\n"
>  		" -u, --unload         Unload the current kexec target kernel.\n"
>  		" -e, --exec           Execute a currently loaded kernel.\n"
> +		" -j, --jump           Jump to a currently loaded kernel or jump back to the previous kernel.\n"
>  		" -t, --type=TYPE      Specify the new kernel is of this type.\n"
>  		"     --mem-min=<addr> Specify the lowest memory addres to load code into.\n"
>  		"     --mem-max=<addr> Specify the highest memory addres to load code into.\n"
> @@ -715,6 +727,7 @@
>  {
>  	int do_load = 1;
>  	int do_exec = 0;
> +	int do_jump = 0;
>  	int do_shutdown = 1;
>  	int do_sync = 1;
>  	int do_ifdown = 0;
> @@ -768,6 +781,14 @@
>  			do_ifdown = 1;
>  			do_exec = 1;
>  			break;
> +		case OPT_JUMP:
> +			do_load = 0;
> +			do_shutdown = 0;
> +			do_sync = 1;
> +			do_ifdown = 0;
> +			do_exec = 0;
> +			do_jump = 1;
> +			break;
>  		case OPT_TYPE:
>  			type = optarg;
>  			break;
> @@ -833,6 +854,9 @@
>  	if ((result == 0) && do_exec) {
>  		result = my_exec();
>  	}
> +	if ((result == 0) && do_jump) {
> +		result = my_jump();
> +	}
>  

Well, it may be nice to print something to the user he. kexec
-j does nothing, and does not print error message in case something is
wrong...
									Pavel
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html