diff options
author | Avi Kivity <avi@redhat.com> | 2009-09-21 15:29:34 +0300 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2009-09-21 15:29:34 +0300 |
commit | c32737279900631fdf475351a8109b34236fc94e (patch) | |
tree | 447e92b211ccef437df6910ef1a714f2b754c0a5 /sysemu.h | |
parent | Merge commit '5f6b9e8fd5b9516170e582d9b6c27c98519a8031' into upstream-merge (diff) | |
parent | Compile loader only once (diff) | |
download | qemu-kvm-c32737279900631fdf475351a8109b34236fc94e.tar.gz qemu-kvm-c32737279900631fdf475351a8109b34236fc94e.tar.bz2 qemu-kvm-c32737279900631fdf475351a8109b34236fc94e.zip |
Merge commit 'ca20cf32ab3d945155141ef737f5d08ebb373e1d' into upstream-merge
* commit 'ca20cf32ab3d945155141ef737f5d08ebb373e1d':
Compile loader only once
Compile qemu-config only once
Compile wdt_i6300esb only once
Fix mingw32 compile
Conflicts:
hw/pc.c
hw/ppc440_bamboo.c
hw/ppce500_mpc8544ds.c
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'sysemu.h')
-rw-r--r-- | sysemu.h | 18 |
1 files changed, 0 insertions, 18 deletions
@@ -241,24 +241,6 @@ extern CharDriverState *virtcon_hds[MAX_VIRTIO_CONSOLES]; #define TFR(expr) do { if ((expr) != -1) break; } while (errno == EINTR) -#ifdef NEED_CPU_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 load_aout(const char *filename, target_phys_addr_t addr, int max_sz); -int load_uimage(const char *filename, target_ulong *ep, target_ulong *loadaddr, - int *is_linux); - -int fread_targphys(target_phys_addr_t dst_addr, size_t nbytes, FILE *f); -int fread_targphys_ok(target_phys_addr_t dst_addr, size_t nbytes, FILE *f); -int read_targphys(int fd, target_phys_addr_t dst_addr, size_t nbytes); -void pstrcpy_targphys(target_phys_addr_t dest, int buf_size, - const char *source); -#endif - #ifdef HAS_AUDIO struct soundhw { const char *name; |