diff options
| author | Adam Lackorzynski <adam@l4re.org> | 2018-08-14 17:17:21 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-08-14 17:17:21 +0100 |
| commit | a3f0ecfd4e98d22e1c24e7baa924d99250a5799f (patch) | |
| tree | 08ecc1d5f01546f28b21864ce340cc28e58696b6 /hw/arm/boot.c | |
| parent | 55ef3233586ab7acc3bbd970d4324bee8cc95112 (diff) | |
| download | focaccia-qemu-a3f0ecfd4e98d22e1c24e7baa924d99250a5799f.tar.gz focaccia-qemu-a3f0ecfd4e98d22e1c24e7baa924d99250a5799f.zip | |
arm: Fix return code of arm_load_elf
Use an int64_t as a return type to restore the negative check for arm_load_as. Signed-off-by: Adam Lackorzynski <adam@l4re.org> Message-id: 20180730173712.GG4987@os.inf.tu-dresden.de Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/arm/boot.c')
| -rw-r--r-- | hw/arm/boot.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/arm/boot.c b/hw/arm/boot.c index e09201cc97..ca9467e583 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -818,9 +818,9 @@ static int do_arm_linux_init(Object *obj, void *opaque) return 0; } -static uint64_t arm_load_elf(struct arm_boot_info *info, uint64_t *pentry, - uint64_t *lowaddr, uint64_t *highaddr, - int elf_machine, AddressSpace *as) +static int64_t arm_load_elf(struct arm_boot_info *info, uint64_t *pentry, + uint64_t *lowaddr, uint64_t *highaddr, + int elf_machine, AddressSpace *as) { bool elf_is64; union { @@ -829,7 +829,7 @@ static uint64_t arm_load_elf(struct arm_boot_info *info, uint64_t *pentry, } elf_header; int data_swab = 0; bool big_endian; - uint64_t ret = -1; + int64_t ret = -1; Error *err = NULL; |