* [PATCH 0/6] hw/loader: Pass ELFDATA endian order argument to load_elf()
@ 2025-01-27 11:38 Philippe Mathieu-Daudé
2025-01-27 11:38 ` [PATCH 1/6] hw/avr/boot: Replace load_elf_ram_sym() -> load_elf_as() Philippe Mathieu-Daudé
` (6 more replies)
0 siblings, 7 replies; 18+ messages in thread
From: Philippe Mathieu-Daudé @ 2025-01-27 11:38 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-riscv, qemu-ppc, Richard Henderson, qemu-s390x, qemu-arm,
Peter Maydell, Philippe Mathieu-Daudé
Hi,
The goal of this series is to be able to use the generic loader
on heterogeneous binary. In order to do that we need to remove
its target_words_bigendian() call. This series replace the
'bool is_big_endian' (~equivalent) argument of load_elf*() API
by ELFDATA (which can be LSB / MSB or NONE), updating all the
call sites.
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()
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()
include/hw/loader.h | 22 ++++------------
hw/core/loader.c | 48 +++++++++++-----------------------
hw/alpha/dp264.c | 4 +--
hw/arm/armv7m.c | 2 +-
hw/arm/boot.c | 16 ++++++------
hw/avr/boot.c | 8 +++---
hw/core/generic-loader.c | 6 +----
hw/hppa/machine.c | 4 +--
hw/i386/multiboot.c | 4 +--
hw/i386/x86-common.c | 4 +--
hw/loongarch/boot.c | 2 +-
hw/m68k/an5206.c | 2 +-
hw/m68k/mcf5208.c | 2 +-
hw/m68k/q800.c | 2 +-
hw/m68k/virt.c | 2 +-
hw/microblaze/boot.c | 6 +++--
hw/mips/boston.c | 2 +-
hw/mips/fuloong2e.c | 2 +-
hw/mips/loongson3_virt.c | 2 +-
hw/mips/malta.c | 5 ++--
hw/mips/mipssim.c | 3 ++-
hw/openrisc/boot.c | 2 +-
hw/pci-host/raven.c | 4 +--
hw/ppc/e500.c | 2 +-
hw/ppc/mac_newworld.c | 5 ++--
hw/ppc/mac_oldworld.c | 4 +--
hw/ppc/pegasos2.c | 8 +++---
hw/ppc/ppc405_boards.c | 2 +-
hw/ppc/ppc440_bamboo.c | 3 ++-
hw/ppc/sam460ex.c | 2 +-
hw/ppc/spapr.c | 8 +++---
hw/ppc/virtex_ml507.c | 4 +--
hw/riscv/boot.c | 3 ++-
hw/s390x/ipl.c | 6 ++---
hw/sparc/leon3.c | 2 +-
hw/sparc/sun4m.c | 5 ++--
hw/sparc64/sun4u.c | 6 ++---
hw/tricore/triboard.c | 2 +-
hw/tricore/tricore_testboard.c | 2 +-
hw/xtensa/sim.c | 3 ++-
hw/xtensa/xtfpga.c | 3 ++-
41 files changed, 99 insertions(+), 125 deletions(-)
--
2.47.1
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 1/6] hw/avr/boot: Replace load_elf_ram_sym() -> load_elf_as()
2025-01-27 11:38 [PATCH 0/6] hw/loader: Pass ELFDATA endian order argument to load_elf() Philippe Mathieu-Daudé
@ 2025-01-27 11:38 ` Philippe Mathieu-Daudé
2025-01-27 21:11 ` Richard Henderson
2025-01-27 11:38 ` [PATCH 2/6] hw/loader: Remove unused load_elf_ram() Philippe Mathieu-Daudé
` (5 subsequent siblings)
6 siblings, 1 reply; 18+ messages in thread
From: Philippe Mathieu-Daudé @ 2025-01-27 11:38 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-riscv, qemu-ppc, Richard Henderson, qemu-s390x, qemu-arm,
Peter Maydell, Philippe Mathieu-Daudé
load_elf_ram_sym() with load_rom=true, sym_cb=NULL is
equivalent to load_elf_as(). Replace by the latter to
simplify.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/avr/boot.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/hw/avr/boot.c b/hw/avr/boot.c
index 617f3a144c8..6a91dcd12d0 100644
--- a/hw/avr/boot.c
+++ b/hw/avr/boot.c
@@ -71,11 +71,9 @@ bool avr_load_firmware(AVRCPU *cpu, MachineState *ms,
return false;
}
- bytes_loaded = load_elf_ram_sym(filename,
- NULL, NULL, NULL,
- &entry, NULL, NULL,
- &e_flags, 0, EM_AVR, 0, 0,
- NULL, true, NULL);
+ bytes_loaded = load_elf_as(filename, NULL, NULL, NULL,
+ &entry, NULL, NULL,
+ &e_flags, 0, EM_AVR, 0, 0, NULL);
if (bytes_loaded >= 0) {
/* If ELF file is provided, determine CPU type reading ELF e_flags. */
const char *elf_cpu = avr_elf_e_flags_to_cpu_type(e_flags);
--
2.47.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 2/6] hw/loader: Remove unused load_elf_ram()
2025-01-27 11:38 [PATCH 0/6] hw/loader: Pass ELFDATA endian order argument to load_elf() Philippe Mathieu-Daudé
2025-01-27 11:38 ` [PATCH 1/6] hw/avr/boot: Replace load_elf_ram_sym() -> load_elf_as() Philippe Mathieu-Daudé
@ 2025-01-27 11:38 ` Philippe Mathieu-Daudé
2025-01-27 21:12 ` Richard Henderson
2025-01-28 2:14 ` Alistair Francis
2025-01-27 11:38 ` [PATCH 3/6] hw/loader: Clarify local variable name in load_elf_ram_sym() Philippe Mathieu-Daudé
` (4 subsequent siblings)
6 siblings, 2 replies; 18+ messages in thread
From: Philippe Mathieu-Daudé @ 2025-01-27 11:38 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-riscv, qemu-ppc, Richard Henderson, qemu-s390x, qemu-arm,
Peter Maydell, Philippe Mathieu-Daudé
Last use of load_elf_ram() was removed in commit 188e255bf8e
("hw/s390x: Remove the possibility to load the s390-netboot.img
binary"), remove it.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
include/hw/loader.h | 14 +-------------
hw/core/loader.c | 16 +---------------
2 files changed, 2 insertions(+), 28 deletions(-)
diff --git a/include/hw/loader.h b/include/hw/loader.h
index 8985046be40..9bb34e6f062 100644
--- a/include/hw/loader.h
+++ b/include/hw/loader.h
@@ -155,20 +155,8 @@ ssize_t load_elf_ram_sym(const char *filename,
int clear_lsb, int data_swab,
AddressSpace *as, bool load_rom, symbol_fn_t sym_cb);
-/** load_elf_ram:
- * Same as load_elf_ram_sym(), but doesn't allow the caller to specify a
- * symbol callback function
- */
-ssize_t load_elf_ram(const char *filename,
- uint64_t (*elf_note_fn)(void *, void *, bool),
- uint64_t (*translate_fn)(void *, uint64_t),
- void *translate_opaque, uint64_t *pentry,
- uint64_t *lowaddr, uint64_t *highaddr, uint32_t *pflags,
- int big_endian, int elf_machine, int clear_lsb,
- int data_swab, AddressSpace *as, bool load_rom);
-
/** load_elf_as:
- * Same as load_elf_ram(), but always loads the elf as ROM
+ * Same as load_elf_ram_sym(), but always loads the elf as ROM
*/
ssize_t load_elf_as(const char *filename,
uint64_t (*elf_note_fn)(void *, void *, bool),
diff --git a/hw/core/loader.c b/hw/core/loader.c
index 4dfdb027eee..ead10fb6cb5 100644
--- a/hw/core/loader.c
+++ b/hw/core/loader.c
@@ -425,26 +425,12 @@ ssize_t load_elf_as(const char *filename,
uint64_t *highaddr, uint32_t *pflags, int big_endian,
int elf_machine, int clear_lsb, int data_swab,
AddressSpace *as)
-{
- return load_elf_ram(filename, elf_note_fn, translate_fn, translate_opaque,
- pentry, lowaddr, highaddr, pflags, big_endian,
- elf_machine, clear_lsb, data_swab, as, true);
-}
-
-/* return < 0 if error, otherwise the number of bytes loaded in memory */
-ssize_t load_elf_ram(const char *filename,
- uint64_t (*elf_note_fn)(void *, void *, bool),
- uint64_t (*translate_fn)(void *, uint64_t),
- void *translate_opaque, uint64_t *pentry,
- uint64_t *lowaddr, uint64_t *highaddr, uint32_t *pflags,
- int big_endian, int elf_machine, int clear_lsb,
- int data_swab, AddressSpace *as, bool load_rom)
{
return load_elf_ram_sym(filename, elf_note_fn,
translate_fn, translate_opaque,
pentry, lowaddr, highaddr, pflags, big_endian,
elf_machine, clear_lsb, data_swab, as,
- load_rom, NULL);
+ true, NULL);
}
/* return < 0 if error, otherwise the number of bytes loaded in memory */
--
2.47.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 3/6] hw/loader: Clarify local variable name in load_elf_ram_sym()
2025-01-27 11:38 [PATCH 0/6] hw/loader: Pass ELFDATA endian order argument to load_elf() Philippe Mathieu-Daudé
2025-01-27 11:38 ` [PATCH 1/6] hw/avr/boot: Replace load_elf_ram_sym() -> load_elf_as() Philippe Mathieu-Daudé
2025-01-27 11:38 ` [PATCH 2/6] hw/loader: Remove unused load_elf_ram() Philippe Mathieu-Daudé
@ 2025-01-27 11:38 ` Philippe Mathieu-Daudé
2025-01-27 13:00 ` BALATON Zoltan
` (2 more replies)
2025-01-27 11:38 ` [PATCH 4/6] hw/loader: Pass ELFDATA endian order argument to load_elf_ram_sym() Philippe Mathieu-Daudé
` (3 subsequent siblings)
6 siblings, 3 replies; 18+ messages in thread
From: Philippe Mathieu-Daudé @ 2025-01-27 11:38 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-riscv, qemu-ppc, Richard Henderson, qemu-s390x, qemu-arm,
Peter Maydell, Philippe Mathieu-Daudé
load_elf_ram_sym() compares target_data_order versus
host data_order. Rename 'data_order' -> 'host_data_order'
to ease code review.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/core/loader.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/core/loader.c b/hw/core/loader.c
index ead10fb6cb5..fc2e8f91267 100644
--- a/hw/core/loader.c
+++ b/hw/core/loader.c
@@ -443,7 +443,7 @@ ssize_t load_elf_ram_sym(const char *filename,
int clear_lsb, int data_swab,
AddressSpace *as, bool load_rom, symbol_fn_t sym_cb)
{
- int fd, data_order, target_data_order, must_swab;
+ int fd, host_data_order, target_data_order, must_swab;
ssize_t ret = ELF_LOAD_FAILED;
uint8_t e_ident[EI_NIDENT];
@@ -462,11 +462,11 @@ ssize_t load_elf_ram_sym(const char *filename,
goto fail;
}
#if HOST_BIG_ENDIAN
- data_order = ELFDATA2MSB;
+ host_data_order = ELFDATA2MSB;
#else
- data_order = ELFDATA2LSB;
+ host_data_order = ELFDATA2LSB;
#endif
- must_swab = data_order != e_ident[EI_DATA];
+ must_swab = host_data_order != e_ident[EI_DATA];
if (big_endian) {
target_data_order = ELFDATA2MSB;
} else {
--
2.47.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 4/6] hw/loader: Pass ELFDATA endian order argument to load_elf_ram_sym()
2025-01-27 11:38 [PATCH 0/6] hw/loader: Pass ELFDATA endian order argument to load_elf() Philippe Mathieu-Daudé
` (2 preceding siblings ...)
2025-01-27 11:38 ` [PATCH 3/6] hw/loader: Clarify local variable name in load_elf_ram_sym() Philippe Mathieu-Daudé
@ 2025-01-27 11:38 ` Philippe Mathieu-Daudé
2025-01-27 21:22 ` Richard Henderson
2025-01-27 11:38 ` [PATCH 5/6] hw/loader: Pass ELFDATA endian order argument to load_elf_as() Philippe Mathieu-Daudé
` (2 subsequent siblings)
6 siblings, 1 reply; 18+ messages in thread
From: Philippe Mathieu-Daudé @ 2025-01-27 11:38 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-riscv, qemu-ppc, Richard Henderson, qemu-s390x, qemu-arm,
Peter Maydell, Philippe Mathieu-Daudé
Rather than passing a boolean 'is_big_endian' argument,
directly pass the ELFDATA, which can be unspecified using
the ELFDATANONE value.
Update the call sites:
0 -> ELFDATA2LSB
Suggested-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
include/hw/loader.h | 4 ++--
hw/core/loader.c | 23 ++++++++++-------------
hw/riscv/boot.c | 3 ++-
3 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/include/hw/loader.h b/include/hw/loader.h
index 9bb34e6f062..8202c376043 100644
--- a/include/hw/loader.h
+++ b/include/hw/loader.h
@@ -120,7 +120,7 @@ const char *load_elf_strerror(ssize_t error);
* @lowaddr: Populated with lowest loaded address. Ignored if NULL.
* @highaddr: Populated with highest loaded address. Ignored if NULL.
* @pflags: Populated with ELF processor-specific flags. Ignore if NULL.
- * @bigendian: Expected ELF endianness. 0 for LE otherwise BE
+ * @elf_data_order: Expected ELF endianness (ELFDATA2LSB or ELFDATA2MSB).
* @elf_machine: Expected ELF machine type
* @clear_lsb: Set to mask off LSB of addresses (Some architectures use
* this for non-address data)
@@ -151,7 +151,7 @@ ssize_t load_elf_ram_sym(const char *filename,
uint64_t (*translate_fn)(void *, uint64_t),
void *translate_opaque, uint64_t *pentry,
uint64_t *lowaddr, uint64_t *highaddr,
- uint32_t *pflags, int big_endian, int elf_machine,
+ uint32_t *pflags, int elf_data_order, int elf_machine,
int clear_lsb, int data_swab,
AddressSpace *as, bool load_rom, symbol_fn_t sym_cb);
diff --git a/hw/core/loader.c b/hw/core/loader.c
index fc2e8f91267..0cd34425e9c 100644
--- a/hw/core/loader.c
+++ b/hw/core/loader.c
@@ -428,7 +428,8 @@ ssize_t load_elf_as(const char *filename,
{
return load_elf_ram_sym(filename, elf_note_fn,
translate_fn, translate_opaque,
- pentry, lowaddr, highaddr, pflags, big_endian,
+ pentry, lowaddr, highaddr, pflags,
+ big_endian ? ELFDATA2MSB : ELFDATA2LSB,
elf_machine, clear_lsb, data_swab, as,
true, NULL);
}
@@ -439,11 +440,11 @@ ssize_t load_elf_ram_sym(const char *filename,
uint64_t (*translate_fn)(void *, uint64_t),
void *translate_opaque, uint64_t *pentry,
uint64_t *lowaddr, uint64_t *highaddr,
- uint32_t *pflags, int big_endian, int elf_machine,
+ uint32_t *pflags, int elf_data_order, int elf_machine,
int clear_lsb, int data_swab,
AddressSpace *as, bool load_rom, symbol_fn_t sym_cb)
{
- int fd, host_data_order, target_data_order, must_swab;
+ int fd, host_data_order, must_swab;
ssize_t ret = ELF_LOAD_FAILED;
uint8_t e_ident[EI_NIDENT];
@@ -461,22 +462,18 @@ ssize_t load_elf_ram_sym(const char *filename,
ret = ELF_LOAD_NOT_ELF;
goto fail;
}
+
+ if (elf_data_order != ELFDATANONE && elf_data_order != e_ident[EI_DATA]) {
+ ret = ELF_LOAD_WRONG_ENDIAN;
+ goto fail;
+ }
+
#if HOST_BIG_ENDIAN
host_data_order = ELFDATA2MSB;
#else
host_data_order = ELFDATA2LSB;
#endif
must_swab = host_data_order != e_ident[EI_DATA];
- if (big_endian) {
- target_data_order = ELFDATA2MSB;
- } else {
- target_data_order = ELFDATA2LSB;
- }
-
- if (target_data_order != e_ident[EI_DATA]) {
- ret = ELF_LOAD_WRONG_ENDIAN;
- goto fail;
- }
lseek(fd, 0, SEEK_SET);
if (e_ident[EI_CLASS] == ELFCLASS64) {
diff --git a/hw/riscv/boot.c b/hw/riscv/boot.c
index 90e75c69a04..c309441b7d8 100644
--- a/hw/riscv/boot.c
+++ b/hw/riscv/boot.c
@@ -246,7 +246,8 @@ void riscv_load_kernel(MachineState *machine,
*/
kernel_size = load_elf_ram_sym(kernel_filename, NULL, NULL, NULL, NULL,
&info->image_low_addr, &info->image_high_addr,
- NULL, 0, EM_RISCV, 1, 0, NULL, true, sym_cb);
+ NULL, ELFDATA2LSB, EM_RISCV,
+ 1, 0, NULL, true, sym_cb);
if (kernel_size > 0) {
info->kernel_size = kernel_size;
goto out;
--
2.47.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 5/6] hw/loader: Pass ELFDATA endian order argument to load_elf_as()
2025-01-27 11:38 [PATCH 0/6] hw/loader: Pass ELFDATA endian order argument to load_elf() Philippe Mathieu-Daudé
` (3 preceding siblings ...)
2025-01-27 11:38 ` [PATCH 4/6] hw/loader: Pass ELFDATA endian order argument to load_elf_ram_sym() Philippe Mathieu-Daudé
@ 2025-01-27 11:38 ` Philippe Mathieu-Daudé
2025-01-27 21:26 ` Richard Henderson
2025-01-27 11:38 ` [PATCH 6/6] hw/loader: Pass ELFDATA endian order argument to load_elf() Philippe Mathieu-Daudé
2025-01-30 21:40 ` [PATCH 0/6] " Philippe Mathieu-Daudé
6 siblings, 1 reply; 18+ messages in thread
From: Philippe Mathieu-Daudé @ 2025-01-27 11:38 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-riscv, qemu-ppc, Richard Henderson, qemu-s390x, qemu-arm,
Peter Maydell, Philippe Mathieu-Daudé
Rather than passing a boolean 'is_big_endian' argument,
directly pass the ELFDATA, which can be unspecified using
the ELFDATANONE value.
Update the call sites:
0 -> ELFDATA2LSB
1 -> ELFDATA2MSB
Note, this allow removing the target_words_bigendian() call
in the GENERIC_LOADER device, where we pass ELFDATANONE.
Suggested-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
include/hw/loader.h | 2 +-
hw/core/loader.c | 8 ++++----
hw/arm/armv7m.c | 2 +-
hw/arm/boot.c | 16 ++++++++--------
hw/avr/boot.c | 2 +-
hw/core/generic-loader.c | 6 +-----
6 files changed, 16 insertions(+), 20 deletions(-)
diff --git a/include/hw/loader.h b/include/hw/loader.h
index 8202c376043..84737c05b8d 100644
--- a/include/hw/loader.h
+++ b/include/hw/loader.h
@@ -162,7 +162,7 @@ ssize_t load_elf_as(const char *filename,
uint64_t (*elf_note_fn)(void *, void *, bool),
uint64_t (*translate_fn)(void *, uint64_t),
void *translate_opaque, uint64_t *pentry, uint64_t *lowaddr,
- uint64_t *highaddr, uint32_t *pflags, int big_endian,
+ uint64_t *highaddr, uint32_t *pflags, int elf_data_order,
int elf_machine, int clear_lsb, int data_swab,
AddressSpace *as);
diff --git a/hw/core/loader.c b/hw/core/loader.c
index 0cd34425e9c..84c7f7987ec 100644
--- a/hw/core/loader.c
+++ b/hw/core/loader.c
@@ -413,7 +413,8 @@ ssize_t load_elf(const char *filename,
int elf_machine, int clear_lsb, int data_swab)
{
return load_elf_as(filename, elf_note_fn, translate_fn, translate_opaque,
- pentry, lowaddr, highaddr, pflags, big_endian,
+ pentry, lowaddr, highaddr, pflags,
+ big_endian ? ELFDATA2MSB : ELFDATA2LSB,
elf_machine, clear_lsb, data_swab, NULL);
}
@@ -422,14 +423,13 @@ ssize_t load_elf_as(const char *filename,
uint64_t (*elf_note_fn)(void *, void *, bool),
uint64_t (*translate_fn)(void *, uint64_t),
void *translate_opaque, uint64_t *pentry, uint64_t *lowaddr,
- uint64_t *highaddr, uint32_t *pflags, int big_endian,
+ uint64_t *highaddr, uint32_t *pflags, int elf_data_order,
int elf_machine, int clear_lsb, int data_swab,
AddressSpace *as)
{
return load_elf_ram_sym(filename, elf_note_fn,
translate_fn, translate_opaque,
- pentry, lowaddr, highaddr, pflags,
- big_endian ? ELFDATA2MSB : ELFDATA2LSB,
+ pentry, lowaddr, highaddr, pflags, elf_data_order,
elf_machine, clear_lsb, data_swab, as,
true, NULL);
}
diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c
index a67a890a33e..98a69846119 100644
--- a/hw/arm/armv7m.c
+++ b/hw/arm/armv7m.c
@@ -608,7 +608,7 @@ void armv7m_load_kernel(ARMCPU *cpu, const char *kernel_filename,
if (kernel_filename) {
image_size = load_elf_as(kernel_filename, NULL, NULL, NULL,
&entry, NULL, NULL,
- NULL, 0, EM_ARM, 1, 0, as);
+ NULL, ELFDATA2LSB, EM_ARM, 1, 0, as);
if (image_size < 0) {
image_size = load_image_targphys_as(kernel_filename, mem_base,
mem_size, as);
diff --git a/hw/arm/boot.c b/hw/arm/boot.c
index b44bea8a821..cbc24356fc1 100644
--- a/hw/arm/boot.c
+++ b/hw/arm/boot.c
@@ -798,7 +798,7 @@ static ssize_t arm_load_elf(struct arm_boot_info *info, uint64_t *pentry,
Elf64_Ehdr h64;
} elf_header;
int data_swab = 0;
- bool big_endian;
+ int elf_data_order;
ssize_t ret;
Error *err = NULL;
@@ -814,12 +814,12 @@ static ssize_t arm_load_elf(struct arm_boot_info *info, uint64_t *pentry,
}
if (elf_is64) {
- big_endian = elf_header.h64.e_ident[EI_DATA] == ELFDATA2MSB;
- info->endianness = big_endian ? ARM_ENDIANNESS_BE8
- : ARM_ENDIANNESS_LE;
+ elf_data_order = elf_header.h64.e_ident[EI_DATA];
+ info->endianness = elf_data_order == ELFDATA2MSB ? ARM_ENDIANNESS_BE8
+ : ARM_ENDIANNESS_LE;
} else {
- big_endian = elf_header.h32.e_ident[EI_DATA] == ELFDATA2MSB;
- if (big_endian) {
+ elf_data_order = elf_header.h32.e_ident[EI_DATA];
+ if (elf_data_order == ELFDATA2MSB) {
if (bswap32(elf_header.h32.e_flags) & EF_ARM_BE8) {
info->endianness = ARM_ENDIANNESS_BE8;
} else {
@@ -839,8 +839,8 @@ static ssize_t arm_load_elf(struct arm_boot_info *info, uint64_t *pentry,
}
ret = load_elf_as(info->kernel_filename, NULL, NULL, NULL,
- pentry, lowaddr, highaddr, NULL, big_endian, elf_machine,
- 1, data_swab, as);
+ pentry, lowaddr, highaddr, NULL, elf_data_order,
+ elf_machine, 1, data_swab, as);
if (ret <= 0) {
/* The header loaded but the image didn't */
error_report("Couldn't load elf '%s': %s",
diff --git a/hw/avr/boot.c b/hw/avr/boot.c
index 6a91dcd12d0..e5a29c7218e 100644
--- a/hw/avr/boot.c
+++ b/hw/avr/boot.c
@@ -73,7 +73,7 @@ bool avr_load_firmware(AVRCPU *cpu, MachineState *ms,
bytes_loaded = load_elf_as(filename, NULL, NULL, NULL,
&entry, NULL, NULL,
- &e_flags, 0, EM_AVR, 0, 0, NULL);
+ &e_flags, ELFDATA2LSB, EM_AVR, 0, 0, NULL);
if (bytes_loaded >= 0) {
/* If ELF file is provided, determine CPU type reading ELF e_flags. */
const char *elf_cpu = avr_elf_e_flags_to_cpu_type(e_flags);
diff --git a/hw/core/generic-loader.c b/hw/core/generic-loader.c
index 0ddb3a359a2..5fdbc3f3be2 100644
--- a/hw/core/generic-loader.c
+++ b/hw/core/generic-loader.c
@@ -31,7 +31,6 @@
*/
#include "qemu/osdep.h"
-#include "exec/tswap.h"
#include "system/dma.h"
#include "system/reset.h"
#include "hw/boards.h"
@@ -63,7 +62,6 @@ static void generic_loader_realize(DeviceState *dev, Error **errp)
{
GenericLoaderState *s = GENERIC_LOADER(dev);
hwaddr entry;
- int big_endian;
ssize_t size = 0;
s->set_pc = false;
@@ -131,14 +129,12 @@ static void generic_loader_realize(DeviceState *dev, Error **errp)
s->cpu = first_cpu;
}
- big_endian = target_words_bigendian();
-
if (s->file) {
AddressSpace *as = s->cpu ? s->cpu->as : NULL;
if (!s->force_raw) {
size = load_elf_as(s->file, NULL, NULL, NULL, &entry, NULL, NULL,
- NULL, big_endian, 0, 0, 0, as);
+ NULL, ELFDATANONE, 0, 0, 0, as);
if (size < 0) {
size = load_uimage_as(s->file, &entry, NULL, NULL, NULL, NULL,
--
2.47.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 6/6] hw/loader: Pass ELFDATA endian order argument to load_elf()
2025-01-27 11:38 [PATCH 0/6] hw/loader: Pass ELFDATA endian order argument to load_elf() Philippe Mathieu-Daudé
` (4 preceding siblings ...)
2025-01-27 11:38 ` [PATCH 5/6] hw/loader: Pass ELFDATA endian order argument to load_elf_as() Philippe Mathieu-Daudé
@ 2025-01-27 11:38 ` Philippe Mathieu-Daudé
2025-01-27 13:23 ` BALATON Zoltan
2025-01-27 21:34 ` Richard Henderson
2025-01-30 21:40 ` [PATCH 0/6] " Philippe Mathieu-Daudé
6 siblings, 2 replies; 18+ messages in thread
From: Philippe Mathieu-Daudé @ 2025-01-27 11:38 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-riscv, qemu-ppc, Richard Henderson, qemu-s390x, qemu-arm,
Peter Maydell, Philippe Mathieu-Daudé
Rather than passing a boolean 'is_big_endian' argument,
directly pass the ELFDATA, which can be unspecified using
the ELFDATANONE value.
Update the call sites:
0 -> ELFDATA2LSB
1 -> ELFDATA2MSB
TARGET_BIG_ENDIAN -> TARGET_BIG_ENDIAN ? ELFDATA2MSB : ELFDATA2LSB
Suggested-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
Sorry, couldn't find good ways to split this patch...
---
include/hw/loader.h | 2 +-
hw/core/loader.c | 5 ++---
hw/alpha/dp264.c | 4 ++--
hw/hppa/machine.c | 4 ++--
hw/i386/multiboot.c | 4 ++--
hw/i386/x86-common.c | 4 ++--
hw/loongarch/boot.c | 2 +-
hw/m68k/an5206.c | 2 +-
hw/m68k/mcf5208.c | 2 +-
hw/m68k/q800.c | 2 +-
hw/m68k/virt.c | 2 +-
hw/microblaze/boot.c | 6 ++++--
hw/mips/boston.c | 2 +-
hw/mips/fuloong2e.c | 2 +-
hw/mips/loongson3_virt.c | 2 +-
hw/mips/malta.c | 5 +++--
hw/mips/mipssim.c | 3 ++-
hw/openrisc/boot.c | 2 +-
hw/pci-host/raven.c | 4 ++--
hw/ppc/e500.c | 2 +-
hw/ppc/mac_newworld.c | 5 +++--
hw/ppc/mac_oldworld.c | 4 ++--
hw/ppc/pegasos2.c | 8 ++++----
hw/ppc/ppc405_boards.c | 2 +-
hw/ppc/ppc440_bamboo.c | 3 ++-
hw/ppc/sam460ex.c | 2 +-
hw/ppc/spapr.c | 8 ++++----
hw/ppc/virtex_ml507.c | 4 ++--
hw/s390x/ipl.c | 6 +++---
hw/sparc/leon3.c | 2 +-
hw/sparc/sun4m.c | 5 +++--
hw/sparc64/sun4u.c | 6 +++---
hw/tricore/triboard.c | 2 +-
hw/tricore/tricore_testboard.c | 2 +-
hw/xtensa/sim.c | 3 ++-
hw/xtensa/xtfpga.c | 3 ++-
36 files changed, 67 insertions(+), 59 deletions(-)
diff --git a/include/hw/loader.h b/include/hw/loader.h
index 84737c05b8d..784a93d6c17 100644
--- a/include/hw/loader.h
+++ b/include/hw/loader.h
@@ -174,7 +174,7 @@ ssize_t load_elf(const char *filename,
uint64_t (*elf_note_fn)(void *, void *, bool),
uint64_t (*translate_fn)(void *, uint64_t),
void *translate_opaque, uint64_t *pentry, uint64_t *lowaddr,
- uint64_t *highaddr, uint32_t *pflags, int big_endian,
+ uint64_t *highaddr, uint32_t *pflags, int elf_data_order,
int elf_machine, int clear_lsb, int data_swab);
/** load_elf_hdr:
diff --git a/hw/core/loader.c b/hw/core/loader.c
index 84c7f7987ec..8afb2d6cf35 100644
--- a/hw/core/loader.c
+++ b/hw/core/loader.c
@@ -409,12 +409,11 @@ ssize_t load_elf(const char *filename,
uint64_t (*elf_note_fn)(void *, void *, bool),
uint64_t (*translate_fn)(void *, uint64_t),
void *translate_opaque, uint64_t *pentry, uint64_t *lowaddr,
- uint64_t *highaddr, uint32_t *pflags, int big_endian,
+ uint64_t *highaddr, uint32_t *pflags, int elf_data_order,
int elf_machine, int clear_lsb, int data_swab)
{
return load_elf_as(filename, elf_note_fn, translate_fn, translate_opaque,
- pentry, lowaddr, highaddr, pflags,
- big_endian ? ELFDATA2MSB : ELFDATA2LSB,
+ pentry, lowaddr, highaddr, pflags, elf_data_order,
elf_machine, clear_lsb, data_swab, NULL);
}
diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c
index 52a1fa310b9..570ea9edf24 100644
--- a/hw/alpha/dp264.c
+++ b/hw/alpha/dp264.c
@@ -144,7 +144,7 @@ static void clipper_init(MachineState *machine)
}
size = load_elf(palcode_filename, NULL, cpu_alpha_superpage_to_phys,
NULL, &palcode_entry, NULL, NULL, NULL,
- 0, EM_ALPHA, 0, 0);
+ ELFDATA2LSB, EM_ALPHA, 0, 0);
if (size < 0) {
error_report("could not load palcode '%s'", palcode_filename);
exit(1);
@@ -163,7 +163,7 @@ static void clipper_init(MachineState *machine)
size = load_elf(kernel_filename, NULL, cpu_alpha_superpage_to_phys,
NULL, &kernel_entry, &kernel_low, NULL, NULL,
- 0, EM_ALPHA, 0, 0);
+ ELFDATA2LSB, EM_ALPHA, 0, 0);
if (size < 0) {
error_report("could not load kernel '%s'", kernel_filename);
exit(1);
diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c
index 8230f43e41c..b062f5eec95 100644
--- a/hw/hppa/machine.c
+++ b/hw/hppa/machine.c
@@ -429,7 +429,7 @@ static void machine_HP_common_init_tail(MachineState *machine, PCIBus *pci_bus,
size = load_elf(firmware_filename, NULL, translate, NULL,
&firmware_entry, &firmware_low, &firmware_high, NULL,
- true, EM_PARISC, 0, 0);
+ ELFDATA2MSB, EM_PARISC, 0, 0);
if (size < 0) {
error_report("could not load firmware '%s'", firmware_filename);
@@ -456,7 +456,7 @@ static void machine_HP_common_init_tail(MachineState *machine, PCIBus *pci_bus,
if (kernel_filename) {
size = load_elf(kernel_filename, NULL, linux_kernel_virt_to_phys,
NULL, &kernel_entry, &kernel_low, &kernel_high, NULL,
- true, EM_PARISC, 0, 0);
+ ELFDATA2MSB, EM_PARISC, 0, 0);
kernel_entry = linux_kernel_virt_to_phys(NULL, kernel_entry);
diff --git a/hw/i386/multiboot.c b/hw/i386/multiboot.c
index 1d66ca3204a..cd07a058614 100644
--- a/hw/i386/multiboot.c
+++ b/hw/i386/multiboot.c
@@ -202,8 +202,8 @@ int load_multiboot(X86MachineState *x86ms,
}
kernel_size = load_elf(kernel_filename, NULL, NULL, NULL, &elf_entry,
- &elf_low, &elf_high, NULL, 0, I386_ELF_MACHINE,
- 0, 0);
+ &elf_low, &elf_high, NULL,
+ ELFDATA2LSB, I386_ELF_MACHINE, 0, 0);
if (kernel_size < 0) {
error_report("Error while loading elf kernel");
exit(1);
diff --git a/hw/i386/x86-common.c b/hw/i386/x86-common.c
index 008496b5b85..1b0671c5239 100644
--- a/hw/i386/x86-common.c
+++ b/hw/i386/x86-common.c
@@ -608,8 +608,8 @@ static bool load_elfboot(const char *kernel_filename,
uint64_t elf_note_type = XEN_ELFNOTE_PHYS32_ENTRY;
kernel_size = load_elf(kernel_filename, read_pvh_start_addr,
NULL, &elf_note_type, &elf_entry,
- &elf_low, &elf_high, NULL, 0, I386_ELF_MACHINE,
- 0, 0);
+ &elf_low, &elf_high, NULL,
+ ELFDATA2LSB, I386_ELF_MACHINE, 0, 0);
if (kernel_size < 0) {
error_report("Error while loading elf kernel");
diff --git a/hw/loongarch/boot.c b/hw/loongarch/boot.c
index bd8763c61c3..354cf458c81 100644
--- a/hw/loongarch/boot.c
+++ b/hw/loongarch/boot.c
@@ -243,7 +243,7 @@ static int64_t load_kernel_info(struct loongarch_boot_info *info)
kernel_size = load_elf(info->kernel_filename, NULL,
cpu_loongarch_virt_to_phys, NULL,
&kernel_entry, &kernel_low,
- &kernel_high, NULL, 0,
+ &kernel_high, NULL, ELFDATA2LSB,
EM_LOONGARCH, 1, 0);
if (kernel_size < 0) {
kernel_size = load_loongarch_linux_image(info->kernel_filename,
diff --git a/hw/m68k/an5206.c b/hw/m68k/an5206.c
index 7b8210475ec..d97399b882b 100644
--- a/hw/m68k/an5206.c
+++ b/hw/m68k/an5206.c
@@ -74,7 +74,7 @@ static void an5206_init(MachineState *machine)
}
kernel_size = load_elf(kernel_filename, NULL, NULL, NULL, &elf_entry,
- NULL, NULL, NULL, 1, EM_68K, 0, 0);
+ NULL, NULL, NULL, ELFDATA2MSB, EM_68K, 0, 0);
entry = elf_entry;
if (kernel_size < 0) {
kernel_size = load_uimage(kernel_filename, &entry, NULL, NULL,
diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c
index 409bb72574c..75cc076f787 100644
--- a/hw/m68k/mcf5208.c
+++ b/hw/m68k/mcf5208.c
@@ -372,7 +372,7 @@ static void mcf5208evb_init(MachineState *machine)
}
kernel_size = load_elf(kernel_filename, NULL, NULL, NULL, &elf_entry,
- NULL, NULL, NULL, 1, EM_68K, 0, 0);
+ NULL, NULL, NULL, ELFDATA2MSB, EM_68K, 0, 0);
entry = elf_entry;
if (kernel_size < 0) {
kernel_size = load_uimage(kernel_filename, &entry, NULL, NULL,
diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c
index ca3adb9a8ae..aeed4c8ddb8 100644
--- a/hw/m68k/q800.c
+++ b/hw/m68k/q800.c
@@ -585,7 +585,7 @@ static void q800_machine_init(MachineState *machine)
}
kernel_size = load_elf(kernel_filename, NULL, NULL, NULL,
- &elf_entry, NULL, &high, NULL, 1,
+ &elf_entry, NULL, &high, NULL, ELFDATA2MSB,
EM_68K, 0, 0);
if (kernel_size < 0) {
error_report("could not load kernel '%s'", kernel_filename);
diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c
index 87ec39eeae1..d967bdd7438 100644
--- a/hw/m68k/virt.c
+++ b/hw/m68k/virt.c
@@ -228,7 +228,7 @@ static void virt_init(MachineState *machine)
}
kernel_size = load_elf(kernel_filename, NULL, NULL, NULL,
- &elf_entry, NULL, &high, NULL, 1,
+ &elf_entry, NULL, &high, NULL, ELFDATA2MSB,
EM_68K, 0, 0);
if (kernel_size < 0) {
error_report("could not load kernel '%s'", kernel_filename);
diff --git a/hw/microblaze/boot.c b/hw/microblaze/boot.c
index 3854bc2291b..60b4ef0abe7 100644
--- a/hw/microblaze/boot.c
+++ b/hw/microblaze/boot.c
@@ -144,13 +144,15 @@ void microblaze_load_kernel(MicroBlazeCPU *cpu, bool is_little_endian,
/* Boots a kernel elf binary. */
kernel_size = load_elf(kernel_filename, NULL, NULL, NULL,
&entry, NULL, &high, NULL,
- !is_little_endian, EM_MICROBLAZE, 0, 0);
+ is_little_endian ? ELFDATA2LSB : ELFDATA2MSB,
+ EM_MICROBLAZE, 0, 0);
base32 = entry;
if (base32 == 0xc0000000) {
kernel_size = load_elf(kernel_filename, NULL,
translate_kernel_address, NULL,
&entry, NULL, NULL, NULL,
- !is_little_endian, EM_MICROBLAZE, 0, 0);
+ is_little_endian ? ELFDATA2LSB : ELFDATA2MSB,
+ EM_MICROBLAZE, 0, 0);
}
/* Always boot into physical ram. */
boot_info.bootstrap_pc = (uint32_t)entry;
diff --git a/hw/mips/boston.c b/hw/mips/boston.c
index 67044af962a..364c328032a 100644
--- a/hw/mips/boston.c
+++ b/hw/mips/boston.c
@@ -792,7 +792,7 @@ static void boston_mach_init(MachineState *machine)
kernel_size = load_elf(machine->kernel_filename, NULL,
cpu_mips_kseg0_to_phys, NULL,
&kernel_entry, NULL, &kernel_high,
- NULL, 0, EM_MIPS, 1, 0);
+ NULL, ELFDATA2LSB, EM_MIPS, 1, 0);
if (kernel_size > 0) {
int dt_size;
diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c
index 16b6a5129e7..646044e2749 100644
--- a/hw/mips/fuloong2e.c
+++ b/hw/mips/fuloong2e.c
@@ -106,7 +106,7 @@ static uint64_t load_kernel(MIPSCPU *cpu)
cpu_mips_kseg0_to_phys, NULL,
&kernel_entry, NULL,
&kernel_high, NULL,
- 0, EM_MIPS, 1, 0);
+ ELFDATA2LSB, EM_MIPS, 1, 0);
if (kernel_size < 0) {
error_report("could not load kernel '%s': %s",
loaderparams.kernel_filename,
diff --git a/hw/mips/loongson3_virt.c b/hw/mips/loongson3_virt.c
index f3cc7a8376f..2ec2394cfaf 100644
--- a/hw/mips/loongson3_virt.c
+++ b/hw/mips/loongson3_virt.c
@@ -358,7 +358,7 @@ static uint64_t load_kernel(CPUMIPSState *env)
cpu_mips_kseg0_to_phys, NULL,
&kernel_entry,
&kernel_low, &kernel_high,
- NULL, 0, EM_MIPS, 1, 0);
+ NULL, ELFDATA2LSB, EM_MIPS, 1, 0);
if (kernel_size < 0) {
error_report("could not load kernel '%s': %s",
loaderparams.kernel_filename,
diff --git a/hw/mips/malta.c b/hw/mips/malta.c
index 4e9cccaa347..8e9cea70b13 100644
--- a/hw/mips/malta.c
+++ b/hw/mips/malta.c
@@ -880,8 +880,9 @@ static uint64_t load_kernel(void)
kernel_size = load_elf(loaderparams.kernel_filename, NULL,
cpu_mips_kseg0_to_phys, NULL,
&kernel_entry, NULL,
- &kernel_high, NULL, TARGET_BIG_ENDIAN, EM_MIPS,
- 1, 0);
+ &kernel_high, NULL,
+ TARGET_BIG_ENDIAN ? ELFDATA2MSB : ELFDATA2LSB,
+ EM_MIPS, 1, 0);
if (kernel_size < 0) {
error_report("could not load kernel '%s': %s",
loaderparams.kernel_filename,
diff --git a/hw/mips/mipssim.c b/hw/mips/mipssim.c
index a294779a82b..c530688e769 100644
--- a/hw/mips/mipssim.c
+++ b/hw/mips/mipssim.c
@@ -73,7 +73,8 @@ static uint64_t load_kernel(void)
kernel_size = load_elf(loaderparams.kernel_filename, NULL,
cpu_mips_kseg0_to_phys, NULL,
&entry, NULL,
- &kernel_high, NULL, TARGET_BIG_ENDIAN,
+ &kernel_high, NULL,
+ TARGET_BIG_ENDIAN ? ELFDATA2MSB : ELFDATA2LSB,
EM_MIPS, 1, 0);
if (kernel_size < 0) {
error_report("could not load kernel '%s': %s",
diff --git a/hw/openrisc/boot.c b/hw/openrisc/boot.c
index 83c1fc6705e..0f08df812dc 100644
--- a/hw/openrisc/boot.c
+++ b/hw/openrisc/boot.c
@@ -32,7 +32,7 @@ hwaddr openrisc_load_kernel(ram_addr_t ram_size,
if (kernel_filename && !qtest_enabled()) {
kernel_size = load_elf(kernel_filename, NULL, NULL, NULL,
- &elf_entry, NULL, &high_addr, NULL, 1,
+ &elf_entry, NULL, &high_addr, NULL, ELFDATA2MSB,
EM_OPENRISC, 1, 0);
entry = elf_entry;
if (kernel_size < 0) {
diff --git a/hw/pci-host/raven.c b/hw/pci-host/raven.c
index 918a3237a9e..e3d8d206b73 100644
--- a/hw/pci-host/raven.c
+++ b/hw/pci-host/raven.c
@@ -357,8 +357,8 @@ static void raven_realize(PCIDevice *d, Error **errp)
if (filename) {
if (s->elf_machine != EM_NONE) {
bios_size = load_elf(filename, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, 1, s->elf_machine,
- 0, 0);
+ NULL, NULL, NULL,
+ ELFDATA2MSB, s->elf_machine, 0, 0);
}
if (bios_size < 0) {
bios_size = get_image_size(filename);
diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
index 4551157c011..26933e0457e 100644
--- a/hw/ppc/e500.c
+++ b/hw/ppc/e500.c
@@ -1194,7 +1194,7 @@ void ppce500_init(MachineState *machine)
payload_size = load_elf(filename, NULL, NULL, NULL,
&bios_entry, &loadaddr, NULL, NULL,
- 1, PPC_ELF_MACHINE, 0, 0);
+ ELFDATA2MSB, PPC_ELF_MACHINE, 0, 0);
if (payload_size < 0) {
/*
* Hrm. No ELF image? Try a uImage, maybe someone is giving us an
diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
index 6369961f78a..cb3dc3ab482 100644
--- a/hw/ppc/mac_newworld.c
+++ b/hw/ppc/mac_newworld.c
@@ -182,7 +182,8 @@ static void ppc_core99_init(MachineState *machine)
if (filename) {
/* Load OpenBIOS (ELF) */
bios_size = load_elf(filename, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, 1, PPC_ELF_MACHINE, 0, 0);
+ NULL, NULL, NULL,
+ ELFDATA2MSB, PPC_ELF_MACHINE, 0, 0);
if (bios_size <= 0) {
/* or load binary ROM image */
@@ -204,7 +205,7 @@ static void ppc_core99_init(MachineState *machine)
kernel_base = KERNEL_LOAD_ADDR;
kernel_size = load_elf(machine->kernel_filename, NULL,
translate_kernel_address, NULL, NULL, NULL,
- NULL, NULL, 1, PPC_ELF_MACHINE, 0, 0);
+ NULL, NULL, ELFDATA2MSB, PPC_ELF_MACHINE, 0, 0);
if (kernel_size < 0) {
kernel_size = load_aout(machine->kernel_filename, kernel_base,
machine->ram_size - kernel_base,
diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c
index 59653e174b8..0dbcea035c3 100644
--- a/hw/ppc/mac_oldworld.c
+++ b/hw/ppc/mac_oldworld.c
@@ -136,7 +136,7 @@ static void ppc_heathrow_init(MachineState *machine)
if (filename) {
/* Load OpenBIOS (ELF) */
bios_size = load_elf(filename, NULL, NULL, NULL, NULL, &bios_addr,
- NULL, NULL, 1, PPC_ELF_MACHINE, 0, 0);
+ NULL, NULL, ELFDATA2MSB, PPC_ELF_MACHINE, 0, 0);
/* Unfortunately, load_elf sign-extends reading elf32 */
bios_addr = (uint32_t)bios_addr;
@@ -161,7 +161,7 @@ static void ppc_heathrow_init(MachineState *machine)
kernel_base = KERNEL_LOAD_ADDR;
kernel_size = load_elf(machine->kernel_filename, NULL,
translate_kernel_address, NULL, NULL, NULL,
- NULL, NULL, 1, PPC_ELF_MACHINE, 0, 0);
+ NULL, NULL, ELFDATA2MSB, PPC_ELF_MACHINE, 0, 0);
if (kernel_size < 0) {
kernel_size = load_aout(machine->kernel_filename, kernel_base,
machine->ram_size - kernel_base,
diff --git a/hw/ppc/pegasos2.c b/hw/ppc/pegasos2.c
index b3c21bdc57c..0364243f4fe 100644
--- a/hw/ppc/pegasos2.c
+++ b/hw/ppc/pegasos2.c
@@ -160,8 +160,8 @@ static void pegasos2_init(MachineState *machine)
}
memory_region_init_rom(rom, NULL, "pegasos2.rom", PROM_SIZE, &error_fatal);
memory_region_add_subregion(get_system_memory(), PROM_ADDR, rom);
- sz = load_elf(filename, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1,
- PPC_ELF_MACHINE, 0, 0);
+ sz = load_elf(filename, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+ ELFDATA2MSB, PPC_ELF_MACHINE, 0, 0);
if (sz <= 0) {
sz = load_image_targphys(filename, pm->vof ? 0 : PROM_ADDR, PROM_SIZE);
}
@@ -239,8 +239,8 @@ static void pegasos2_init(MachineState *machine)
if (machine->kernel_filename) {
sz = load_elf(machine->kernel_filename, NULL, NULL, NULL,
- &pm->kernel_entry, &pm->kernel_addr, NULL, NULL, 1,
- PPC_ELF_MACHINE, 0, 0);
+ &pm->kernel_entry, &pm->kernel_addr, NULL, NULL,
+ ELFDATA2MSB, PPC_ELF_MACHINE, 0, 0);
if (sz <= 0) {
error_report("Could not load kernel '%s'",
machine->kernel_filename);
diff --git a/hw/ppc/ppc405_boards.c b/hw/ppc/ppc405_boards.c
index e9f65fab70d..969cac345ac 100644
--- a/hw/ppc/ppc405_boards.c
+++ b/hw/ppc/ppc405_boards.c
@@ -232,7 +232,7 @@ static void boot_from_kernel(MachineState *machine, PowerPCCPU *cpu)
kernel_size = load_elf(machine->kernel_filename, NULL, NULL, NULL,
&boot_entry, &kernel_base, NULL, NULL,
- 1, PPC_ELF_MACHINE, 0, 0);
+ ELFDATA2MSB, PPC_ELF_MACHINE, 0, 0);
if (kernel_size < 0) {
error_report("Could not load kernel '%s' : %s",
machine->kernel_filename, load_elf_strerror(kernel_size));
diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c
index 45c5b8678d9..099fda39092 100644
--- a/hw/ppc/ppc440_bamboo.c
+++ b/hw/ppc/ppc440_bamboo.c
@@ -228,7 +228,8 @@ static void bamboo_init(MachineState *machine)
if (success < 0) {
uint64_t elf_entry;
success = load_elf(kernel_filename, NULL, NULL, NULL, &elf_entry,
- NULL, NULL, NULL, 1, PPC_ELF_MACHINE, 0, 0);
+ NULL, NULL, NULL,
+ ELFDATA2MSB, PPC_ELF_MACHINE, 0, 0);
entry = elf_entry;
}
/* XXX try again as binary */
diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c
index e74642a3b71..3ecae6a9504 100644
--- a/hw/ppc/sam460ex.c
+++ b/hw/ppc/sam460ex.c
@@ -479,7 +479,7 @@ static void sam460ex_init(MachineState *machine)
success = load_elf(machine->kernel_filename, NULL, NULL, NULL,
&elf_entry, NULL, NULL, NULL,
- 1, PPC_ELF_MACHINE, 0, 0);
+ ELFDATA2MSB, PPC_ELF_MACHINE, 0, 0);
entry = elf_entry;
}
/* XXX try again as binary */
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 623842f8064..f3a4b4235d4 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -3022,13 +3022,13 @@ static void spapr_machine_init(MachineState *machine)
spapr->kernel_size = load_elf(kernel_filename, NULL,
translate_kernel_address, spapr,
- NULL, &loaded_addr, NULL, NULL, 1,
- PPC_ELF_MACHINE, 0, 0);
+ NULL, &loaded_addr, NULL, NULL,
+ ELFDATA2MSB, PPC_ELF_MACHINE, 0, 0);
if (spapr->kernel_size == ELF_LOAD_WRONG_ENDIAN) {
spapr->kernel_size = load_elf(kernel_filename, NULL,
translate_kernel_address, spapr,
- NULL, &loaded_addr, NULL, NULL, 0,
- PPC_ELF_MACHINE, 0, 0);
+ NULL, &loaded_addr, NULL, NULL,
+ ELFDATA2LSB, PPC_ELF_MACHINE, 0, 0);
spapr->kernel_le = spapr->kernel_size > 0;
}
if (spapr->kernel_size < 0) {
diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c
index ea7ab8a5694..23238119273 100644
--- a/hw/ppc/virtex_ml507.c
+++ b/hw/ppc/virtex_ml507.c
@@ -242,8 +242,8 @@ static void virtex_init(MachineState *machine)
/* Boots a kernel elf binary. */
kernel_size = load_elf(kernel_filename, NULL, NULL, NULL,
- &entry, NULL, &high, NULL, 1, PPC_ELF_MACHINE,
- 0, 0);
+ &entry, NULL, &high, NULL,
+ ELFDATA2MSB, PPC_ELF_MACHINE, 0, 0);
boot_info.bootstrap_pc = entry & 0x00ffffff;
if (kernel_size < 0) {
diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c
index 4aa21c91fca..ce6f6078d74 100644
--- a/hw/s390x/ipl.c
+++ b/hw/s390x/ipl.c
@@ -162,8 +162,8 @@ static void s390_ipl_realize(DeviceState *dev, Error **errp)
bios_size = load_elf(bios_filename, NULL,
bios_translate_addr, &fwbase,
- &ipl->bios_start_addr, NULL, NULL, NULL, 1,
- EM_S390, 0, 0);
+ &ipl->bios_start_addr, NULL, NULL, NULL,
+ ELFDATA2MSB, EM_S390, 0, 0);
if (bios_size > 0) {
/* Adjust ELF start address to final location */
ipl->bios_start_addr += fwbase;
@@ -187,7 +187,7 @@ static void s390_ipl_realize(DeviceState *dev, Error **errp)
if (ipl->kernel) {
kernel_size = load_elf(ipl->kernel, NULL, NULL, NULL,
&pentry, NULL,
- NULL, NULL, 1, EM_S390, 0, 0);
+ NULL, NULL, ELFDATA2MSB, EM_S390, 0, 0);
if (kernel_size < 0) {
kernel_size = load_image_targphys(ipl->kernel, 0, ms->ram_size);
if (kernel_size < 0) {
diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c
index 84381254ad0..0aeaad3becc 100644
--- a/hw/sparc/leon3.c
+++ b/hw/sparc/leon3.c
@@ -380,7 +380,7 @@ static void leon3_generic_hw_init(MachineState *machine)
kernel_size = load_elf(kernel_filename, NULL, NULL, NULL,
&entry, NULL, NULL, NULL,
- 1 /* big endian */, EM_SPARC, 0, 0);
+ ELFDATA2MSB, EM_SPARC, 0, 0);
if (kernel_size < 0) {
kernel_size = load_uimage(kernel_filename, NULL, &entry,
NULL, NULL, NULL);
diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
index e070360a2c7..a48d3622c5a 100644
--- a/hw/sparc/sun4m.c
+++ b/hw/sparc/sun4m.c
@@ -242,7 +242,8 @@ static unsigned long sun4m_load_kernel(const char *kernel_filename,
#endif
kernel_size = load_elf(kernel_filename, NULL,
translate_kernel_address, NULL,
- NULL, NULL, NULL, NULL, 1, EM_SPARC, 0, 0);
+ NULL, NULL, NULL, NULL,
+ ELFDATA2MSB, EM_SPARC, 0, 0);
if (kernel_size < 0)
kernel_size = load_aout(kernel_filename, KERNEL_LOAD_ADDR,
RAM_size - KERNEL_LOAD_ADDR, bswap_needed,
@@ -703,7 +704,7 @@ static void prom_init(hwaddr addr, const char *bios_name)
if (filename) {
ret = load_elf(filename, NULL,
translate_prom_address, &addr, NULL,
- NULL, NULL, NULL, 1, EM_SPARC, 0, 0);
+ NULL, NULL, NULL, ELFDATA2MSB, EM_SPARC, 0, 0);
if (ret < 0 || ret > PROM_SIZE_MAX) {
ret = load_image_targphys(filename, addr, PROM_SIZE_MAX);
}
diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c
index 0980b446593..8ab5cf0461f 100644
--- a/hw/sparc64/sun4u.c
+++ b/hw/sparc64/sun4u.c
@@ -176,8 +176,8 @@ static uint64_t sun4u_load_kernel(const char *kernel_filename,
bswap_needed = 0;
#endif
kernel_size = load_elf(kernel_filename, NULL, NULL, NULL, kernel_entry,
- kernel_addr, &kernel_top, NULL, 1, EM_SPARCV9, 0,
- 0);
+ kernel_addr, &kernel_top, NULL,
+ ELFDATA2MSB, EM_SPARCV9, 0, 0);
if (kernel_size < 0) {
*kernel_addr = KERNEL_LOAD_ADDR;
*kernel_entry = KERNEL_LOAD_ADDR;
@@ -441,7 +441,7 @@ static void prom_init(hwaddr addr, const char *bios_name)
filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
if (filename) {
ret = load_elf(filename, NULL, translate_prom_address, &addr,
- NULL, NULL, NULL, NULL, 1, EM_SPARCV9, 0, 0);
+ NULL, NULL, NULL, NULL, ELFDATA2MSB, EM_SPARCV9, 0, 0);
if (ret < 0 || ret > PROM_SIZE_MAX) {
ret = load_image_targphys(filename, addr, PROM_SIZE_MAX);
}
diff --git a/hw/tricore/triboard.c b/hw/tricore/triboard.c
index 9cc8d282ff2..f5baa8ccbb3 100644
--- a/hw/tricore/triboard.c
+++ b/hw/tricore/triboard.c
@@ -39,7 +39,7 @@ static void tricore_load_kernel(TriCoreCPU *cpu, const char *kernel_filename)
kernel_size = load_elf(kernel_filename, NULL,
NULL, NULL, &entry, NULL,
- NULL, NULL, 0,
+ NULL, NULL, ELFDATA2LSB,
EM_TRICORE, 1, 0);
if (kernel_size <= 0) {
error_report("no kernel file '%s'", kernel_filename);
diff --git a/hw/tricore/tricore_testboard.c b/hw/tricore/tricore_testboard.c
index c29db8b451c..3facfdfd611 100644
--- a/hw/tricore/tricore_testboard.c
+++ b/hw/tricore/tricore_testboard.c
@@ -42,7 +42,7 @@ static void tricore_load_kernel(CPUTriCoreState *env)
kernel_size = load_elf(tricoretb_binfo.kernel_filename, NULL,
NULL, NULL, &entry, NULL,
- NULL, NULL, 0,
+ NULL, NULL, ELFDATA2LSB,
EM_TRICORE, 1, 0);
if (kernel_size <= 0) {
error_report("no kernel file '%s'",
diff --git a/hw/xtensa/sim.c b/hw/xtensa/sim.c
index 0a1fd900376..1cea29c66d4 100644
--- a/hw/xtensa/sim.c
+++ b/hw/xtensa/sim.c
@@ -100,7 +100,8 @@ void xtensa_sim_load_kernel(XtensaCPU *cpu, MachineState *machine)
if (kernel_filename) {
uint64_t elf_entry;
int success = load_elf(kernel_filename, NULL, translate_phys_addr, cpu,
- &elf_entry, NULL, NULL, NULL, TARGET_BIG_ENDIAN,
+ &elf_entry, NULL, NULL, NULL,
+ TARGET_BIG_ENDIAN ? ELFDATA2MSB : ELFDATA2LSB,
EM_XTENSA, 0, 0);
if (success > 0) {
diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c
index 9efe91933f9..3f3677f1c9a 100644
--- a/hw/xtensa/xtfpga.c
+++ b/hw/xtensa/xtfpga.c
@@ -398,7 +398,8 @@ static void xtfpga_init(const XtfpgaBoardDesc *board, MachineState *machine)
uint64_t elf_entry;
int success = load_elf(kernel_filename, NULL, translate_phys_addr, cpu,
- &elf_entry, NULL, NULL, NULL, TARGET_BIG_ENDIAN,
+ &elf_entry, NULL, NULL, NULL,
+ TARGET_BIG_ENDIAN ? ELFDATA2MSB : ELFDATA2LSB,
EM_XTENSA, 0, 0);
if (success > 0) {
entry_point = elf_entry;
--
2.47.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* Re: [PATCH 3/6] hw/loader: Clarify local variable name in load_elf_ram_sym()
2025-01-27 11:38 ` [PATCH 3/6] hw/loader: Clarify local variable name in load_elf_ram_sym() Philippe Mathieu-Daudé
@ 2025-01-27 13:00 ` BALATON Zoltan
2025-01-27 21:13 ` Richard Henderson
2025-01-27 21:16 ` Richard Henderson
2 siblings, 0 replies; 18+ messages in thread
From: BALATON Zoltan @ 2025-01-27 13:00 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: qemu-devel, qemu-riscv, qemu-ppc, Richard Henderson, qemu-s390x,
qemu-arm, Peter Maydell
[-- Attachment #1: Type: text/plain, Size: 1408 bytes --]
On Mon, 27 Jan 2025, Philippe Mathieu-Daudé wrote:
> load_elf_ram_sym() compares target_data_order versus
> host data_order. Rename 'data_order' -> 'host_data_order'
> to ease code review.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: BALATON Zoltan <balaton@eik.bme.hu>
> ---
> hw/core/loader.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/hw/core/loader.c b/hw/core/loader.c
> index ead10fb6cb5..fc2e8f91267 100644
> --- a/hw/core/loader.c
> +++ b/hw/core/loader.c
> @@ -443,7 +443,7 @@ ssize_t load_elf_ram_sym(const char *filename,
> int clear_lsb, int data_swab,
> AddressSpace *as, bool load_rom, symbol_fn_t sym_cb)
> {
> - int fd, data_order, target_data_order, must_swab;
> + int fd, host_data_order, target_data_order, must_swab;
> ssize_t ret = ELF_LOAD_FAILED;
> uint8_t e_ident[EI_NIDENT];
>
> @@ -462,11 +462,11 @@ ssize_t load_elf_ram_sym(const char *filename,
> goto fail;
> }
> #if HOST_BIG_ENDIAN
> - data_order = ELFDATA2MSB;
> + host_data_order = ELFDATA2MSB;
> #else
> - data_order = ELFDATA2LSB;
> + host_data_order = ELFDATA2LSB;
> #endif
> - must_swab = data_order != e_ident[EI_DATA];
> + must_swab = host_data_order != e_ident[EI_DATA];
> if (big_endian) {
> target_data_order = ELFDATA2MSB;
> } else {
>
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 6/6] hw/loader: Pass ELFDATA endian order argument to load_elf()
2025-01-27 11:38 ` [PATCH 6/6] hw/loader: Pass ELFDATA endian order argument to load_elf() Philippe Mathieu-Daudé
@ 2025-01-27 13:23 ` BALATON Zoltan
2025-01-27 21:34 ` Richard Henderson
1 sibling, 0 replies; 18+ messages in thread
From: BALATON Zoltan @ 2025-01-27 13:23 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: qemu-devel, qemu-riscv, qemu-ppc, Richard Henderson, qemu-s390x,
qemu-arm, Peter Maydell
[-- Attachment #1: Type: text/plain, Size: 2158 bytes --]
On Mon, 27 Jan 2025, Philippe Mathieu-Daudé wrote:
> Rather than passing a boolean 'is_big_endian' argument,
> directly pass the ELFDATA, which can be unspecified using
> the ELFDATANONE value.
>
> Update the call sites:
> 0 -> ELFDATA2LSB
> 1 -> ELFDATA2MSB
> TARGET_BIG_ENDIAN -> TARGET_BIG_ENDIAN ? ELFDATA2MSB : ELFDATA2LSB
>
> Suggested-by: Richard Henderson <richard.henderson@linaro.org>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: BALATON Zoltan <balaton@eik.bme.hu>
> ---
> Sorry, couldn't find good ways to split this patch...
> ---
> include/hw/loader.h | 2 +-
> hw/core/loader.c | 5 ++---
> hw/alpha/dp264.c | 4 ++--
> hw/hppa/machine.c | 4 ++--
> hw/i386/multiboot.c | 4 ++--
> hw/i386/x86-common.c | 4 ++--
> hw/loongarch/boot.c | 2 +-
> hw/m68k/an5206.c | 2 +-
> hw/m68k/mcf5208.c | 2 +-
> hw/m68k/q800.c | 2 +-
> hw/m68k/virt.c | 2 +-
> hw/microblaze/boot.c | 6 ++++--
> hw/mips/boston.c | 2 +-
> hw/mips/fuloong2e.c | 2 +-
> hw/mips/loongson3_virt.c | 2 +-
> hw/mips/malta.c | 5 +++--
> hw/mips/mipssim.c | 3 ++-
> hw/openrisc/boot.c | 2 +-
> hw/pci-host/raven.c | 4 ++--
> hw/ppc/e500.c | 2 +-
> hw/ppc/mac_newworld.c | 5 +++--
> hw/ppc/mac_oldworld.c | 4 ++--
> hw/ppc/pegasos2.c | 8 ++++----
> hw/ppc/ppc405_boards.c | 2 +-
> hw/ppc/ppc440_bamboo.c | 3 ++-
> hw/ppc/sam460ex.c | 2 +-
> hw/ppc/spapr.c | 8 ++++----
> hw/ppc/virtex_ml507.c | 4 ++--
> hw/s390x/ipl.c | 6 +++---
> hw/sparc/leon3.c | 2 +-
> hw/sparc/sun4m.c | 5 +++--
> hw/sparc64/sun4u.c | 6 +++---
> hw/tricore/triboard.c | 2 +-
> hw/tricore/tricore_testboard.c | 2 +-
> hw/xtensa/sim.c | 3 ++-
> hw/xtensa/xtfpga.c | 3 ++-
> 36 files changed, 67 insertions(+), 59 deletions(-)
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 1/6] hw/avr/boot: Replace load_elf_ram_sym() -> load_elf_as()
2025-01-27 11:38 ` [PATCH 1/6] hw/avr/boot: Replace load_elf_ram_sym() -> load_elf_as() Philippe Mathieu-Daudé
@ 2025-01-27 21:11 ` Richard Henderson
0 siblings, 0 replies; 18+ messages in thread
From: Richard Henderson @ 2025-01-27 21:11 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: qemu-riscv, qemu-ppc, qemu-s390x, qemu-arm, Peter Maydell
On 1/27/25 03:38, Philippe Mathieu-Daudé wrote:
> load_elf_ram_sym() with load_rom=true, sym_cb=NULL is
> equivalent to load_elf_as(). Replace by the latter to
> simplify.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
> hw/avr/boot.c | 8 +++-----
> 1 file changed, 3 insertions(+), 5 deletions(-)
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
r~
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 2/6] hw/loader: Remove unused load_elf_ram()
2025-01-27 11:38 ` [PATCH 2/6] hw/loader: Remove unused load_elf_ram() Philippe Mathieu-Daudé
@ 2025-01-27 21:12 ` Richard Henderson
2025-01-28 2:14 ` Alistair Francis
1 sibling, 0 replies; 18+ messages in thread
From: Richard Henderson @ 2025-01-27 21:12 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: qemu-riscv, qemu-ppc, qemu-s390x, qemu-arm, Peter Maydell
On 1/27/25 03:38, Philippe Mathieu-Daudé wrote:
> Last use of load_elf_ram() was removed in commit 188e255bf8e
> ("hw/s390x: Remove the possibility to load the s390-netboot.img
> binary"), remove it.
>
> Signed-off-by: Philippe Mathieu-Daudé<philmd@linaro.org>
> ---
> include/hw/loader.h | 14 +-------------
> hw/core/loader.c | 16 +---------------
> 2 files changed, 2 insertions(+), 28 deletions(-)
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
r~
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 3/6] hw/loader: Clarify local variable name in load_elf_ram_sym()
2025-01-27 11:38 ` [PATCH 3/6] hw/loader: Clarify local variable name in load_elf_ram_sym() Philippe Mathieu-Daudé
2025-01-27 13:00 ` BALATON Zoltan
@ 2025-01-27 21:13 ` Richard Henderson
2025-01-27 21:16 ` Richard Henderson
2 siblings, 0 replies; 18+ messages in thread
From: Richard Henderson @ 2025-01-27 21:13 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: qemu-riscv, qemu-ppc, qemu-s390x, qemu-arm, Peter Maydell
On 1/27/25 03:38, Philippe Mathieu-Daudé wrote:
> load_elf_ram_sym() compares target_data_order versus
> host data_order. Rename 'data_order' -> 'host_data_order'
> to ease code review.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
> hw/core/loader.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
r~
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 3/6] hw/loader: Clarify local variable name in load_elf_ram_sym()
2025-01-27 11:38 ` [PATCH 3/6] hw/loader: Clarify local variable name in load_elf_ram_sym() Philippe Mathieu-Daudé
2025-01-27 13:00 ` BALATON Zoltan
2025-01-27 21:13 ` Richard Henderson
@ 2025-01-27 21:16 ` Richard Henderson
2 siblings, 0 replies; 18+ messages in thread
From: Richard Henderson @ 2025-01-27 21:16 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: qemu-riscv, qemu-ppc, qemu-s390x, qemu-arm, Peter Maydell
On 1/27/25 03:38, Philippe Mathieu-Daudé wrote:
> #if HOST_BIG_ENDIAN
> - data_order = ELFDATA2MSB;
> + host_data_order = ELFDATA2MSB;
> #else
> - data_order = ELFDATA2LSB;
> + host_data_order = ELFDATA2LSB;
> #endif
Worth squashing
host_data_order = HOST_BIG_ENDIAN ? ELFDATA2MSB : ELFDATA2LSB;
?
r~
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 4/6] hw/loader: Pass ELFDATA endian order argument to load_elf_ram_sym()
2025-01-27 11:38 ` [PATCH 4/6] hw/loader: Pass ELFDATA endian order argument to load_elf_ram_sym() Philippe Mathieu-Daudé
@ 2025-01-27 21:22 ` Richard Henderson
0 siblings, 0 replies; 18+ messages in thread
From: Richard Henderson @ 2025-01-27 21:22 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: qemu-riscv, qemu-ppc, qemu-s390x, qemu-arm, Peter Maydell
On 1/27/25 03:38, Philippe Mathieu-Daudé wrote:
> Rather than passing a boolean 'is_big_endian' argument,
> directly pass the ELFDATA, which can be unspecified using
> the ELFDATANONE value.
>
> Update the call sites:
> 0 -> ELFDATA2LSB
>
> Suggested-by: Richard Henderson<richard.henderson@linaro.org>
> Signed-off-by: Philippe Mathieu-Daudé<philmd@linaro.org>
> ---
> include/hw/loader.h | 4 ++--
> hw/core/loader.c | 23 ++++++++++-------------
> hw/riscv/boot.c | 3 ++-
> 3 files changed, 14 insertions(+), 16 deletions(-)
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
r~
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 5/6] hw/loader: Pass ELFDATA endian order argument to load_elf_as()
2025-01-27 11:38 ` [PATCH 5/6] hw/loader: Pass ELFDATA endian order argument to load_elf_as() Philippe Mathieu-Daudé
@ 2025-01-27 21:26 ` Richard Henderson
0 siblings, 0 replies; 18+ messages in thread
From: Richard Henderson @ 2025-01-27 21:26 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: qemu-riscv, qemu-ppc, qemu-s390x, qemu-arm, Peter Maydell
On 1/27/25 03:38, Philippe Mathieu-Daudé wrote:
> Rather than passing a boolean 'is_big_endian' argument,
> directly pass the ELFDATA, which can be unspecified using
> the ELFDATANONE value.
>
> Update the call sites:
> 0 -> ELFDATA2LSB
> 1 -> ELFDATA2MSB
>
> Note, this allow removing the target_words_bigendian() call
> in the GENERIC_LOADER device, where we pass ELFDATANONE.
>
> Suggested-by: Richard Henderson<richard.henderson@linaro.org>
> Signed-off-by: Philippe Mathieu-Daudé<philmd@linaro.org>
> ---
> include/hw/loader.h | 2 +-
> hw/core/loader.c | 8 ++++----
> hw/arm/armv7m.c | 2 +-
> hw/arm/boot.c | 16 ++++++++--------
> hw/avr/boot.c | 2 +-
> hw/core/generic-loader.c | 6 +-----
> 6 files changed, 16 insertions(+), 20 deletions(-)
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
r~
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 6/6] hw/loader: Pass ELFDATA endian order argument to load_elf()
2025-01-27 11:38 ` [PATCH 6/6] hw/loader: Pass ELFDATA endian order argument to load_elf() Philippe Mathieu-Daudé
2025-01-27 13:23 ` BALATON Zoltan
@ 2025-01-27 21:34 ` Richard Henderson
1 sibling, 0 replies; 18+ messages in thread
From: Richard Henderson @ 2025-01-27 21:34 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: qemu-riscv, qemu-ppc, qemu-s390x, qemu-arm, Peter Maydell
On 1/27/25 03:38, Philippe Mathieu-Daudé wrote:
> Rather than passing a boolean 'is_big_endian' argument,
> directly pass the ELFDATA, which can be unspecified using
> the ELFDATANONE value.
>
> Update the call sites:
> 0 -> ELFDATA2LSB
> 1 -> ELFDATA2MSB
> TARGET_BIG_ENDIAN -> TARGET_BIG_ENDIAN ? ELFDATA2MSB : ELFDATA2LSB
>
> Suggested-by: Richard Henderson<richard.henderson@linaro.org>
> Signed-off-by: Philippe Mathieu-Daudé<philmd@linaro.org>
> ---
> Sorry, couldn't find good ways to split this patch...
> ---
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
r~
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 2/6] hw/loader: Remove unused load_elf_ram()
2025-01-27 11:38 ` [PATCH 2/6] hw/loader: Remove unused load_elf_ram() Philippe Mathieu-Daudé
2025-01-27 21:12 ` Richard Henderson
@ 2025-01-28 2:14 ` Alistair Francis
1 sibling, 0 replies; 18+ messages in thread
From: Alistair Francis @ 2025-01-28 2:14 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: qemu-devel, qemu-riscv, qemu-ppc, Richard Henderson, qemu-s390x,
qemu-arm, Peter Maydell
On Mon, Jan 27, 2025 at 9:39 PM Philippe Mathieu-Daudé
<philmd@linaro.org> wrote:
>
> Last use of load_elf_ram() was removed in commit 188e255bf8e
> ("hw/s390x: Remove the possibility to load the s390-netboot.img
> binary"), remove it.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Alistair
> ---
> include/hw/loader.h | 14 +-------------
> hw/core/loader.c | 16 +---------------
> 2 files changed, 2 insertions(+), 28 deletions(-)
>
> diff --git a/include/hw/loader.h b/include/hw/loader.h
> index 8985046be40..9bb34e6f062 100644
> --- a/include/hw/loader.h
> +++ b/include/hw/loader.h
> @@ -155,20 +155,8 @@ ssize_t load_elf_ram_sym(const char *filename,
> int clear_lsb, int data_swab,
> AddressSpace *as, bool load_rom, symbol_fn_t sym_cb);
>
> -/** load_elf_ram:
> - * Same as load_elf_ram_sym(), but doesn't allow the caller to specify a
> - * symbol callback function
> - */
> -ssize_t load_elf_ram(const char *filename,
> - uint64_t (*elf_note_fn)(void *, void *, bool),
> - uint64_t (*translate_fn)(void *, uint64_t),
> - void *translate_opaque, uint64_t *pentry,
> - uint64_t *lowaddr, uint64_t *highaddr, uint32_t *pflags,
> - int big_endian, int elf_machine, int clear_lsb,
> - int data_swab, AddressSpace *as, bool load_rom);
> -
> /** load_elf_as:
> - * Same as load_elf_ram(), but always loads the elf as ROM
> + * Same as load_elf_ram_sym(), but always loads the elf as ROM
> */
> ssize_t load_elf_as(const char *filename,
> uint64_t (*elf_note_fn)(void *, void *, bool),
> diff --git a/hw/core/loader.c b/hw/core/loader.c
> index 4dfdb027eee..ead10fb6cb5 100644
> --- a/hw/core/loader.c
> +++ b/hw/core/loader.c
> @@ -425,26 +425,12 @@ ssize_t load_elf_as(const char *filename,
> uint64_t *highaddr, uint32_t *pflags, int big_endian,
> int elf_machine, int clear_lsb, int data_swab,
> AddressSpace *as)
> -{
> - return load_elf_ram(filename, elf_note_fn, translate_fn, translate_opaque,
> - pentry, lowaddr, highaddr, pflags, big_endian,
> - elf_machine, clear_lsb, data_swab, as, true);
> -}
> -
> -/* return < 0 if error, otherwise the number of bytes loaded in memory */
> -ssize_t load_elf_ram(const char *filename,
> - uint64_t (*elf_note_fn)(void *, void *, bool),
> - uint64_t (*translate_fn)(void *, uint64_t),
> - void *translate_opaque, uint64_t *pentry,
> - uint64_t *lowaddr, uint64_t *highaddr, uint32_t *pflags,
> - int big_endian, int elf_machine, int clear_lsb,
> - int data_swab, AddressSpace *as, bool load_rom)
> {
> return load_elf_ram_sym(filename, elf_note_fn,
> translate_fn, translate_opaque,
> pentry, lowaddr, highaddr, pflags, big_endian,
> elf_machine, clear_lsb, data_swab, as,
> - load_rom, NULL);
> + true, NULL);
> }
>
> /* return < 0 if error, otherwise the number of bytes loaded in memory */
> --
> 2.47.1
>
>
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 0/6] hw/loader: Pass ELFDATA endian order argument to load_elf()
2025-01-27 11:38 [PATCH 0/6] hw/loader: Pass ELFDATA endian order argument to load_elf() Philippe Mathieu-Daudé
` (5 preceding siblings ...)
2025-01-27 11:38 ` [PATCH 6/6] hw/loader: Pass ELFDATA endian order argument to load_elf() Philippe Mathieu-Daudé
@ 2025-01-30 21:40 ` Philippe Mathieu-Daudé
6 siblings, 0 replies; 18+ messages in thread
From: Philippe Mathieu-Daudé @ 2025-01-30 21:40 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-riscv, qemu-ppc, Richard Henderson, qemu-s390x, qemu-arm,
Peter Maydell
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()
^ permalink raw reply related [flat|nested] 18+ messages in thread
end of thread, other threads:[~2025-01-30 21:41 UTC | newest]
Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-01-27 11:38 [PATCH 0/6] hw/loader: Pass ELFDATA endian order argument to load_elf() Philippe Mathieu-Daudé
2025-01-27 11:38 ` [PATCH 1/6] hw/avr/boot: Replace load_elf_ram_sym() -> load_elf_as() Philippe Mathieu-Daudé
2025-01-27 21:11 ` Richard Henderson
2025-01-27 11:38 ` [PATCH 2/6] hw/loader: Remove unused load_elf_ram() Philippe Mathieu-Daudé
2025-01-27 21:12 ` Richard Henderson
2025-01-28 2:14 ` Alistair Francis
2025-01-27 11:38 ` [PATCH 3/6] hw/loader: Clarify local variable name in load_elf_ram_sym() Philippe Mathieu-Daudé
2025-01-27 13:00 ` BALATON Zoltan
2025-01-27 21:13 ` Richard Henderson
2025-01-27 21:16 ` Richard Henderson
2025-01-27 11:38 ` [PATCH 4/6] hw/loader: Pass ELFDATA endian order argument to load_elf_ram_sym() Philippe Mathieu-Daudé
2025-01-27 21:22 ` Richard Henderson
2025-01-27 11:38 ` [PATCH 5/6] hw/loader: Pass ELFDATA endian order argument to load_elf_as() Philippe Mathieu-Daudé
2025-01-27 21:26 ` Richard Henderson
2025-01-27 11:38 ` [PATCH 6/6] hw/loader: Pass ELFDATA endian order argument to load_elf() Philippe Mathieu-Daudé
2025-01-27 13:23 ` BALATON Zoltan
2025-01-27 21:34 ` Richard Henderson
2025-01-30 21:40 ` [PATCH 0/6] " Philippe Mathieu-Daudé
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).