From 3c178e72e065b88436fed7d89bd75635d84df36c Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Wed, 7 Oct 2009 13:37:06 +0200 Subject: rom loader: fix sparc -kernel boot. Changes: (1) register pstrcpy_targphys() in rom list, it is used for kernel command lines by a number of architectures. (2) add rom_ptr() function to get a pointer for applying changes to loaded images. Needed for example to tell the linux kernel where it finds the initrd image by updating the header. (3) make sparc use rom_ptr for initrd setup. booting sparc-test works now, and 'info roms' shows this: (qemu) info roms addr=0000000000000000 size=0x2a3828 mem=ram name="phdr #0: vmlinux-2.6.11+tcx" addr=00000000007ff000 size=0x00000e mem=ram name="cmdline" addr=0000000000800000 size=0x400000 mem=ram name="/root/qemu-test/sparc-test/linux.img" addr=0000000070000000 size=0x0e4000 mem=rom name="phdr #0: /home/kraxel/projects/qemu/build-zfull/pc-bios/openbios-sparc32" reboot via 'system_reset' works too. Patchworks-ID: 35262 Signed-off-by: Gerd Hoffmann Signed-off-by: Anthony Liguori --- hw/mips_r4k.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'hw/mips_r4k.c') diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c index d7b301a9cc..d525c63b58 100644 --- a/hw/mips_r4k.c +++ b/hw/mips_r4k.c @@ -130,7 +130,7 @@ static void load_kernel (CPUState *env) } else { ret = 0; } - pstrcpy_targphys((16 << 20) - 256 + ret, 256, + pstrcpy_targphys("cmdline", (16 << 20) - 256 + ret, 256, loaderparams.kernel_cmdline); stl_phys((16 << 20) - 260, 0x12345678); -- cgit 1.4.1