Skip to contentSkip to conversation

neaten lguest boot code (again)

PATCH In review Rusty Russell 2 participants 2 messages Jun 6, 2007

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 neaten lguest boot code (again)

(This cleanup seems to have gotten lost in rc3-mm1? It was in rc2-mm1 called lguest-the-host-code-update-for-mm-simplify-boot_params.patch)

Andrew patched up lguest after the boot parameters became a proper structure, but in fact it can be considerably neatened.

---
 drivers/lguest/lguest.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

===================================================================

drivers/lguest/lguest.c +1 -2
@@ -444,8 +444,7 @@ __init void lguest_init(void *boot)
 {
 	/* Copy boot parameters first. */
 	memcpy(&boot_params, boot, PARAM_SIZE);
-	memcpy(boot_command_line,
-	       __va(*(unsigned long *)((void *)&boot_params + NEW_CL_POINTER)),
+	memcpy(boot_command_line, __va(boot_params.hdr.cmd_line_ptr),
 	       COMMAND_LINE_SIZE);
 
 	paravirt_ops.name = "lguest";
#1 lore raw
Quoted 15 lines · On Wed, 06 Jun 2007 12:37:39 +1000 Rusty Russell <[email protected]> wrote:

(This cleanup seems to have gotten lost in rc3-mm1? It was in rc2-mm1 called lguest-the-host-code-update-for-mm-simplify-boot_params.patch)

Andrew patched up lguest after the boot parameters became a proper structure, but in fact it can be considerably neatened.

---
 drivers/lguest/lguest.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

===================================================================

drivers/lguest/lguest.c __init void lguest_init(void *boot) · line 450

Quoted 9 lines
drivers/lguest/lguest.c +1 -2
@@ -444,8 +444,7 @@ __init void lguest_init(void *boot)
 {
 	/* Copy boot parameters first. */
 	memcpy(&boot_params, boot, PARAM_SIZE);
-	memcpy(boot_command_line,
-	       __va(*(unsigned long *)((void *)&boot_params + NEW_CL_POINTER)),
+	memcpy(boot_command_line, __va(boot_params.hdr.cmd_line_ptr),
 	       COMMAND_LINE_SIZE);
 
 	paravirt_ops.name = "lguest";

I dropped it because it depended upon mm-simplify-boot_params.patch which for some reason disappeared but now appears to have reappeared.

Shall resurrect.