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/loader.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'hw/loader.h') diff --git a/hw/loader.h b/hw/loader.h index 031e6adabb..945c662cc4 100644 --- a/hw/loader.h +++ b/hw/loader.h @@ -15,7 +15,8 @@ int load_uimage(const char *filename, target_phys_addr_t *ep, int read_targphys(const char *name, int fd, target_phys_addr_t dst_addr, size_t nbytes); -void pstrcpy_targphys(target_phys_addr_t dest, int buf_size, +void pstrcpy_targphys(const char *name, + target_phys_addr_t dest, int buf_size, const char *source); int rom_add_file(const char *file, @@ -23,6 +24,7 @@ int rom_add_file(const char *file, int rom_add_blob(const char *name, const void *blob, size_t len, target_phys_addr_t min, target_phys_addr_t max, int align); int rom_load_all(void); +void *rom_ptr(target_phys_addr_t addr); void do_info_roms(Monitor *mon); #define rom_add_file_fixed(_f, _a) \ -- cgit v1.2.3