diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2020-10-26 10:30:26 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-12-10 12:15:06 -0500 |
| commit | 2893cad6b987fd4564b5793fee31c907c3638fa6 (patch) | |
| tree | 8eca7f71d94ccee202237cf8525d13aaeebb8a6d /hw | |
| parent | f03443954b5bab576880e373de8bd221a0818b02 (diff) | |
| download | qemu-2893cad6b987fd4564b5793fee31c907c3638fa6.zip qemu-2893cad6b987fd4564b5793fee31c907c3638fa6.tar.gz qemu-2893cad6b987fd4564b5793fee31c907c3638fa6.tar.bz2 | |
sh4: remove bios_name
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20201026143028.3034018-14-pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/sh4/shix.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/hw/sh4/shix.c b/hw/sh4/shix.c index f410c08..d9a9fcb 100644 --- a/hw/sh4/shix.c +++ b/hw/sh4/shix.c @@ -49,6 +49,7 @@ static void shix_init(MachineState *machine) MemoryRegion *sysmem = get_system_memory(); MemoryRegion *rom = g_new(MemoryRegion, 1); MemoryRegion *sdram = g_new(MemoryRegion, 2); + const char *bios_name = machine->firmware ?: BIOS_FILENAME; cpu = SUPERH_CPU(cpu_create(machine->cpu_type)); @@ -63,8 +64,6 @@ static void shix_init(MachineState *machine) memory_region_add_subregion(sysmem, 0x0c000000, &sdram[1]); /* Load BIOS in 0 (and access it through P2, 0xA0000000) */ - if (bios_name == NULL) - bios_name = BIOS_FILENAME; ret = load_image_targphys(bios_name, 0, 0x4000); if (ret < 0 && !qtest_enabled()) { error_report("Could not load SHIX bios '%s'", bios_name); |