summary refs log tree commit diff stats
path: root/hw/pc.c
diff options
context:
space:
mode:
authorAdam Lackorzynski <adam@os.inf.tu-dresden.de>2009-10-11 15:48:40 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2009-10-15 09:32:04 -0500
commit3f3d583efdb10e7c98a9bb501e11ccfb0fc638fa (patch)
tree4f8075c3cba2807c9c74287daef8cadfbd874a5e /hw/pc.c
parentccb167e9d7d460a7cd09fdabd848efd3606dd27e (diff)
downloadfocaccia-qemu-3f3d583efdb10e7c98a9bb501e11ccfb0fc638fa.tar.gz
focaccia-qemu-3f3d583efdb10e7c98a9bb501e11ccfb0fc638fa.zip
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>
Diffstat (limited to 'hw/pc.c')
-rw-r--r--hw/pc.c2
1 files changed, 1 insertions, 1 deletions
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);