aboutsummaryrefslogtreecommitdiff
path: root/hw/mips_malta.c
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2009-10-07 13:37:06 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2009-10-12 09:42:31 -0500
commit3c178e72e065b88436fed7d89bd75635d84df36c (patch)
tree1b061a3da7b69089de1822efa9f15c66cfba8880 /hw/mips_malta.c
parentd549db5a732ef2ec145b84c5008a7585cf17cf67 (diff)
downloadqemu-3c178e72e065b88436fed7d89bd75635d84df36c.zip
qemu-3c178e72e065b88436fed7d89bd75635d84df36c.tar.gz
qemu-3c178e72e065b88436fed7d89bd75635d84df36c.tar.bz2
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 <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/mips_malta.c')
-rw-r--r--hw/mips_malta.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/mips_malta.c b/hw/mips_malta.c
index b26bbee..30fa6b8 100644
--- a/hw/mips_malta.c
+++ b/hw/mips_malta.c
@@ -679,7 +679,7 @@ static void prom_set(int index, const char *string, ...)
va_start(ap, string);
vsnprintf(buf, ENVP_ENTRY_SIZE, string, ap);
va_end(ap);
- pstrcpy_targphys(table_addr + VIRT_TO_PHYS_ADDEND, ENVP_ENTRY_SIZE, buf);
+ pstrcpy_targphys("prom", table_addr + VIRT_TO_PHYS_ADDEND, ENVP_ENTRY_SIZE, buf);
}
/* Kernel */