From: Philippe Mathieu-Daudé <philmd@linaro.org>
Date: Mon, 27 Jan 2025 07:23:37 +0000 (+0100)
Subject: hw/avr/boot: Replace load_elf_ram_sym() -> load_elf_as()
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=29c7bd8eaf0384ec0752779ca71fdbb1d6f5d961;p=users%2Fdwmw2%2Fqemu.git

hw/avr/boot: Replace load_elf_ram_sym() -> load_elf_as()

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>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20250127113824.50177-2-philmd@linaro.org>
---

diff --git a/hw/avr/boot.c b/hw/avr/boot.c
index 617f3a144c..6a91dcd12d 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);