Message ID | 1255268921-5403-1-git-send-email-adam@os.inf.tu-dresden.de |
---|---|
State | Under Review |
Headers | show |
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>
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);