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>
		
			
				
	
	
		
			47 lines
		
	
	
		
			1.9 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			47 lines
		
	
	
		
			1.9 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
#ifndef LOADER_H
 | 
						|
#define LOADER_H
 | 
						|
 | 
						|
/* loader.c */
 | 
						|
int get_image_size(const char *filename);
 | 
						|
int load_image(const char *filename, uint8_t *addr); /* deprecated */
 | 
						|
int load_image_targphys(const char *filename, target_phys_addr_t, int max_sz);
 | 
						|
int load_elf(const char *filename, int64_t address_offset,
 | 
						|
             uint64_t *pentry, uint64_t *lowaddr, uint64_t *highaddr,
 | 
						|
             int big_endian, int elf_machine, int clear_lsb);
 | 
						|
int load_aout(const char *filename, target_phys_addr_t addr, int max_sz,
 | 
						|
              int bswap_needed, target_phys_addr_t target_page_size);
 | 
						|
int load_uimage(const char *filename, target_phys_addr_t *ep,
 | 
						|
                target_phys_addr_t *loadaddr, int *is_linux);
 | 
						|
 | 
						|
int read_targphys(const char *name,
 | 
						|
                  int fd, target_phys_addr_t dst_addr, size_t nbytes);
 | 
						|
void pstrcpy_targphys(const char *name,
 | 
						|
                      target_phys_addr_t dest, int buf_size,
 | 
						|
                      const char *source);
 | 
						|
 | 
						|
int rom_add_file(const char *file,
 | 
						|
                 target_phys_addr_t min, target_phys_addr_t max, int align);
 | 
						|
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)              \
 | 
						|
    rom_add_file(_f, _a, 0, 0)
 | 
						|
#define rom_add_blob_fixed(_f, _b, _l, _a)      \
 | 
						|
    rom_add_blob(_f, _b, _l, _a, 0, 0)
 | 
						|
 | 
						|
#define PC_ROM_MIN_VGA     0xc0000
 | 
						|
#define PC_ROM_MIN_OPTION  0xc8000
 | 
						|
#define PC_ROM_MAX         0xe0000
 | 
						|
#define PC_ROM_ALIGN       0x800
 | 
						|
#define PC_ROM_SIZE        (PC_ROM_MAX - PC_ROM_MIN_VGA)
 | 
						|
 | 
						|
#define rom_add_vga(_f)                                                 \
 | 
						|
    rom_add_file(_f, PC_ROM_MIN_VGA,    PC_ROM_MAX, PC_ROM_ALIGN)
 | 
						|
#define rom_add_option(_f)                                              \
 | 
						|
    rom_add_file(_f, PC_ROM_MIN_OPTION, PC_ROM_MAX, PC_ROM_ALIGN)
 | 
						|
 | 
						|
#endif
 |