Prepare for removing bios_name.
Cc: Peter Maydell <peter.mayd...@linaro.org>
Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
---
hw/arm/digic_boards.c | 5 +++--
include/hw/arm/digic.h | 1 +
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/hw/arm/digic_boards.c b/hw/arm/digic_boards.c
index d5524d3e72..d320b54c44 100644
--- a/hw/arm/digic_boards.c
+++ b/hw/arm/digic_boards.c
@@ -55,6 +55,7 @@ static void digic4_board_init(MachineState *machine,
DigicBoard *board)
DigicState *s = DIGIC(object_new(TYPE_DIGIC));
MachineClass *mc = MACHINE_GET_CLASS(machine);
+ s->firmware = machine->firmware;
if (machine->ram_size != mc->default_ram_size) {
char *sz = size_to_str(mc->default_ram_size);
error_report("Invalid RAM size, should be %s", sz);
@@ -91,8 +92,8 @@ static void digic_load_rom(DigicState *s, hwaddr addr,
return;
}
- if (bios_name) {
- filename = bios_name;
+ if (s->firmware) {
+ filename = s->firmware;
} else {
filename = def_filename;
}
diff --git a/include/hw/arm/digic.h b/include/hw/arm/digic.h
index 8f2735c284..421dae937e 100644
--- a/include/hw/arm/digic.h
+++ b/include/hw/arm/digic.h
@@ -36,6 +36,7 @@ struct DigicState {
ARMCPU cpu;
+ const char *firmware;
DigicTimerState timer[DIGIC4_NB_TIMERS];
DigicUartState uart;
};
--
2.26.2
