> On 09-Oct-2023, at 3:17 PM, Philippe Mathieu-Daudé <[email protected]> wrote:
>
> Fix:
>
> hw/core/loader.c:1073:27: error: declaration shadows a variable in the
> global scope [-Werror,-Wshadow]
> bool option_rom, MemoryRegion *mr,
> ^
> include/sysemu/sysemu.h:57:22: note: previous declaration is here
> extern QEMUOptionRom option_rom[MAX_OPTION_ROMS];
> ^
>
> Signed-off-by: Philippe Mathieu-Daudé <[email protected]>
> ---
> include/hw/loader.h | 2 +-
> hw/core/loader.c | 4 ++--
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/include/hw/loader.h b/include/hw/loader.h
> index c4c14170ea..8685e27334 100644
> --- a/include/hw/loader.h
> +++ b/include/hw/loader.h
> @@ -272,7 +272,7 @@ void pstrcpy_targphys(const char *name,
>
> ssize_t rom_add_file(const char *file, const char *fw_dir,
> hwaddr addr, int32_t bootindex,
> - bool option_rom, MemoryRegion *mr, AddressSpace *as);
> + bool has_option_rom, MemoryRegion *mr, AddressSpace
> *as);
Should this be “no_option_rom” instead looking at this conditional
if ((!option_rom || mc->option_rom_has_mr) && mc->rom_file_has_mr) {
data = rom_set_mr(rom, OBJECT(fw_cfg), devpath, true);
} else {
data = rom->data;
}
> MemoryRegion *rom_add_blob(const char *name, const void *blob, size_t len,
> size_t max_len, hwaddr addr,
> const char *fw_file_name,
> diff --git a/hw/core/loader.c b/hw/core/loader.c
> index 4dd5a71fb7..7f0cbfb214 100644
> --- a/hw/core/loader.c
> +++ b/hw/core/loader.c
> @@ -1070,7 +1070,7 @@ static void *rom_set_mr(Rom *rom, Object *owner, const
> char *name, bool ro)
>
> ssize_t rom_add_file(const char *file, const char *fw_dir,
> hwaddr addr, int32_t bootindex,
> - bool option_rom, MemoryRegion *mr,
> + bool has_option_rom, MemoryRegion *mr,
> AddressSpace *as)
> {
> MachineClass *mc = MACHINE_GET_CLASS(qdev_get_machine());
> @@ -1139,7 +1139,7 @@ ssize_t rom_add_file(const char *file, const char
> *fw_dir,
> basename);
> snprintf(devpath, sizeof(devpath), "/rom@%s", fw_file_name);
>
> - if ((!option_rom || mc->option_rom_has_mr) && mc->rom_file_has_mr) {
> + if ((!has_option_rom || mc->option_rom_has_mr) &&
> mc->rom_file_has_mr) {
> data = rom_set_mr(rom, OBJECT(fw_cfg), devpath, true);
> } else {
> data = rom->data;
> --
> 2.41.0
>
