target_phys_addr_t is unwieldly, violates the C standard (_t suffixes are
reserved) and its purpose doesn't match the name (most target_phys_addr_t
addresses are not target specific).  Replace it with a finger-friendly,
standards conformant hwaddr.
Outstanding patchsets can be fixed up with the command
  git rebase -i --exec 'find -name "*.[ch]"
                        | xargs s/target_phys_addr_t/hwaddr/g' origin
Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
		
	
			
		
			
				
	
	
		
			50 lines
		
	
	
		
			1.8 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			50 lines
		
	
	
		
			1.8 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, hwaddr,
 | 
						|
                        uint64_t max_sz);
 | 
						|
int load_elf(const char *filename, uint64_t (*translate_fn)(void *, uint64_t),
 | 
						|
             void *translate_opaque, uint64_t *pentry, uint64_t *lowaddr,
 | 
						|
             uint64_t *highaddr, int big_endian, int elf_machine,
 | 
						|
             int clear_lsb);
 | 
						|
int load_aout(const char *filename, hwaddr addr, int max_sz,
 | 
						|
              int bswap_needed, hwaddr target_page_size);
 | 
						|
int load_uimage(const char *filename, hwaddr *ep,
 | 
						|
                hwaddr *loadaddr, int *is_linux);
 | 
						|
 | 
						|
ssize_t read_targphys(const char *name,
 | 
						|
                      int fd, hwaddr dst_addr, size_t nbytes);
 | 
						|
void pstrcpy_targphys(const char *name,
 | 
						|
                      hwaddr dest, int buf_size,
 | 
						|
                      const char *source);
 | 
						|
 | 
						|
 | 
						|
int rom_add_file(const char *file, const char *fw_dir,
 | 
						|
                 hwaddr addr, int32_t bootindex);
 | 
						|
int rom_add_blob(const char *name, const void *blob, size_t len,
 | 
						|
                 hwaddr addr);
 | 
						|
int rom_load_all(void);
 | 
						|
void rom_set_fw(void *f);
 | 
						|
int rom_copy(uint8_t *dest, hwaddr addr, size_t size);
 | 
						|
void *rom_ptr(hwaddr addr);
 | 
						|
void do_info_roms(Monitor *mon);
 | 
						|
 | 
						|
#define rom_add_file_fixed(_f, _a, _i)          \
 | 
						|
    rom_add_file(_f, NULL, _a, _i)
 | 
						|
#define rom_add_blob_fixed(_f, _b, _l, _a)      \
 | 
						|
    rom_add_blob(_f, _b, _l, _a)
 | 
						|
 | 
						|
#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)
 | 
						|
 | 
						|
int rom_add_vga(const char *file);
 | 
						|
int rom_add_option(const char *file, int32_t bootindex);
 | 
						|
 | 
						|
#endif
 |