Re: [PATCH 0/6] hw/loader: Pass ELFDATA endian order argument to load_elf()

[Philippe Mathieu-Daudé]

On 27/1/25 12:38, Philippe Mathieu-Daudé wrote:

Philippe Mathieu-Daudé (6):
   hw/avr/boot: Replace load_elf_ram_sym() -> load_elf_as()
   hw/loader: Remove unused load_elf_ram()
   hw/loader: Clarify local variable name in load_elf_ram_sym()

Thanks, series queued squashing:

-- >8--

diff --git a/hw/core/loader.c b/hw/core/loader.c
index 8afb2d6cf35..fd25c5e01bd 100644
--- a/hw/core/loader.c
+++ b/hw/core/loader.c
@@ -445,3 +445,4 @@ ssize_t load_elf_ram_sym(const char *filename,
 {
-    int fd, host_data_order, must_swab;
+    const int host_data_order = HOST_BIG_ENDIAN ? ELFDATA2MSB : 
ELFDATA2LSB;
+    int fd, must_swab;
     ssize_t ret = ELF_LOAD_FAILED;
@@ -469,7 +470,2 @@ ssize_t load_elf_ram_sym(const char *filename,

-#if HOST_BIG_ENDIAN
-    host_data_order = ELFDATA2MSB;
-#else
-    host_data_order = ELFDATA2LSB;
-#endif
     must_swab = host_data_order != e_ident[EI_DATA];
---

   hw/loader: Pass ELFDATA endian order argument to load_elf_ram_sym()
   hw/loader: Pass ELFDATA endian order argument to load_elf_as()
   hw/loader: Pass ELFDATA endian order argument to load_elf()