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/highbank.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/highbank.c')
| -rw-r--r-- | hw/arm/highbank.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c index f71087860d..fd3429720e 100644 --- a/hw/arm/highbank.c +++ b/hw/arm/highbank.c @@ -297,16 +297,16 @@ static void calxeda_init(MachineState *machine, enum cxmachines machine_id) memory_region_init_ram(sysram, NULL, "highbank.sysram", 0x8000, &error_fatal); memory_region_add_subregion(sysmem, 0xfff88000, sysram); - if (bios_name != NULL) { - sysboot_filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name); + if (machine->firmware != NULL) { + sysboot_filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, machine->firmware); if (sysboot_filename != NULL) { if (load_image_targphys(sysboot_filename, 0xfff88000, 0x8000) < 0) { - error_report("Unable to load %s", bios_name); + error_report("Unable to load %s", machine->firmware); exit(1); } g_free(sysboot_filename); } else { - error_report("Unable to find %s", bios_name); + error_report("Unable to find %s", machine->firmware); exit(1); } } |