commit 17df768c1e4580f03301d18ea938d3557d441911 load_image_targphys() should enforce the max size
caused some problems with external kernel and specific ram sizes on s390: We load the external kernel with [...] kernel_size = load_image_targphys(kernel_filename, 0, ram_size); [...] Since load_image_targphys is declared as taking an int for max_sz, this will fail for ram sizes > INT_MAX. Lets change the max_sz parameter to a uint64_t. Signed-off-by: Christian Borntraeger <borntrae...@de.ibm.com> --- hw/loader.c | 2 +- hw/loader.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/loader.c b/hw/loader.c index 415cdce..7d64113 100644 --- a/hw/loader.c +++ b/hw/loader.c @@ -103,7 +103,7 @@ ssize_t read_targphys(const char *name, /* return the size or -1 if error */ int load_image_targphys(const char *filename, - target_phys_addr_t addr, int max_sz) + target_phys_addr_t addr, uint64_t max_sz) { int size; diff --git a/hw/loader.h b/hw/loader.h index fbcaba9..5cfa6df 100644 --- a/hw/loader.h +++ b/hw/loader.h @@ -4,7 +4,7 @@ /* 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_image_targphys(const char *filename, target_phys_addr_t, uint64_t); 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, -- 1.7.9.6