Patchwork [1/2] multiboot: Fix cmdline of modules

login
register
mail settings
Submitter Adam Lackorzynski
Date Oct. 11, 2009, 1:48 p.m.
Message ID <1255268921-5403-1-git-send-email-adam@os.inf.tu-dresden.de>
Download mbox | patch
Permalink /patch/35699/
State Under Review
Headers show

Comments

Adam Lackorzynski - Oct. 11, 2009, 1:48 p.m.
From: Adam Lackorzynski <adam@os.inf.tu-dresden.de>

Fix address specified for cmdline value of module in multiboot structure.

Signed-off-by: Adam Lackorzynski <adam@os.inf.tu-dresden.de>
---
 hw/pc.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Kevin Wolf - Oct. 12, 2009, 10:28 a.m.
Am 11.10.2009 15:48, schrieb adam@os.inf.tu-dresden.de:
> From: Adam Lackorzynski <adam@os.inf.tu-dresden.de>
> 
> Fix address specified for cmdline value of module in multiboot structure.
> 
> Signed-off-by: Adam Lackorzynski <adam@os.inf.tu-dresden.de>

Looks right and fixes my test case.

Acked-by: Kevin Wolf <kwolf@redhat.com>

Patch

diff --git a/hw/pc.c b/hw/pc.c
index 19bef49..e34ad9c 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -710,7 +710,7 @@  static int load_multiboot(void *fw_cfg,
             pstrcpy((char*)bootinfo + mb_mod_cmdline,
                     sizeof(bootinfo) - mb_mod_cmdline,
                     initrd_filename);
-            stl_p(bootinfo + mb_mod_info + 8, mb_mod_cmdline); /* string */
+            stl_p(bootinfo + mb_mod_info + 8, mb_bootinfo + mb_mod_cmdline); /* string */
             mb_mod_cmdline += strlen(initrd_filename) + 1;
             if (mb_mod_cmdline > sizeof(bootinfo))
                 mb_mod_cmdline = sizeof(bootinfo);