[Qemu-devel] [PATCH] arm: Fix return code of arm_load_elf

[Qemu-devel] [PATCH] arm: Fix return code of arm_load_elf

[Adam Lackorzynski]

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>
---
 hw/arm/boot.c | 8 ++++----
 1 file 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;
 
 
-- 
2.18.0

Re: [Qemu-devel] [PATCH] arm: Fix return code of arm_load_elf

[Peter Maydell]

On 30 July 2018 at 18:37, Adam Lackorzynski <adam@l4re.org> wrote:
> 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>
> ---
>  hw/arm/boot.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)


Applied to target-arm.for-3.1, thanks.

-- PMM