diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-11-21 14:36:55 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-11-21 14:36:55 -0600 |
| commit | 1571b6cba25df6d000b2539b8ba399839d15f9b6 (patch) | |
| tree | a9b92e81d01e08e76477127d1e3dae07eaeca212 /hw/loader.h | |
| parent | 54dcd0b37e3e4e9fb25cb4e9965d6ba45eb0d2b4 (diff) | |
| parent | bc4268998d154b9b3cc86a7b6bd932cc974591c9 (diff) | |
| download | qemu-1571b6cba25df6d000b2539b8ba399839d15f9b6.zip qemu-1571b6cba25df6d000b2539b8ba399839d15f9b6.tar.gz qemu-1571b6cba25df6d000b2539b8ba399839d15f9b6.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into staging
Diffstat (limited to 'hw/loader.h')
| -rw-r--r-- | hw/loader.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/loader.h b/hw/loader.h index fc6bdff..fbcaba9 100644 --- a/hw/loader.h +++ b/hw/loader.h @@ -14,8 +14,8 @@ int load_aout(const char *filename, target_phys_addr_t addr, int max_sz, 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); +ssize_t 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); |