From: Adam Lackorzynski <adam@os.inf.tu-dresden.de>
Date: Sun, 11 Oct 2009 13:48:40 +0000 (+0200)
Subject: multiboot: Fix cmdline of modules
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3f3d583efdb10e7c98a9bb501e11ccfb0fc638fa;p=qemu.git

multiboot: Fix cmdline of modules

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

Patchworks-ID: 35699
Signed-off-by: Adam Lackorzynski <adam@os.inf.tu-dresden.de>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

diff --git a/hw/pc.c b/hw/pc.c
index 240161a902..47afaa5f6e 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);