diff options
| author | Paolo Bonzini | 2020-10-26 15:30:16 +0100 |
|---|---|---|
| committer | Paolo Bonzini | 2020-12-10 18:15:04 +0100 |
| commit | 0ad3b5d3ee312e893d92be2de4b7123e03e6119d (patch) | |
| tree | 6311432e6184f5d42b80f258d1967922e2778a70 /hw/arm/npcm7xx_boards.c | |
| parent | alpha: remove bios_name (diff) | |
| download | qemu-0ad3b5d3ee312e893d92be2de4b7123e03e6119d.tar.gz qemu-0ad3b5d3ee312e893d92be2de4b7123e03e6119d.tar.xz qemu-0ad3b5d3ee312e893d92be2de4b7123e03e6119d.zip | |
arm: remove bios_name
Get the firmware name from the MachineState object.
Cc: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20201026143028.3034018-4-pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/arm/npcm7xx_boards.c')
| -rw-r--r-- | hw/arm/npcm7xx_boards.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/hw/arm/npcm7xx_boards.c b/hw/arm/npcm7xx_boards.c index 79e2e2744c..9821013bc6 100644 --- a/hw/arm/npcm7xx_boards.c +++ b/hw/arm/npcm7xx_boards.c @@ -33,13 +33,10 @@ static const char npcm7xx_default_bootrom[] = "npcm7xx_bootrom.bin"; static void npcm7xx_load_bootrom(MachineState *machine, NPCM7xxState *soc) { + const char *bios_name = machine->firmware ?: npcm7xx_default_bootrom; g_autofree char *filename = NULL; int ret; - if (!bios_name) { - bios_name = npcm7xx_default_bootrom; - } - filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name); if (!filename) { error_report("Could not find ROM image '%s'", bios_name); |