openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

niagara: fail if a firmware file is missing 

fail if a firmware file is missing and not qtest_enabled(),
the later is necessary to allow some basic tests if
firmware is not available

Suggested-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Artyom Tarasenko <atar4qemu@gmail.com>
This commit is contained in:
Artyom Tarasenko 2017-01-23 21:18:13 +01:00
parent a951316b8a
commit 5e3a549498
No known key found for this signature in database
GPG Key ID: 3360C3F7411A125F
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
hw/sparc64/niagara.c
View File

@ -35,6 +35,8 @@
#include "hw/timer/sun4v-rtc.h" #include "hw/timer/sun4v-rtc.h"
#include "exec/address-spaces.h" #include "exec/address-spaces.h"
#include "sysemu/block-backend.h" #include "sysemu/block-backend.h"
#include "qemu/error-report.h"
#include "sysemu/qtest.h"
typedef struct NiagaraBoardState { typedef struct NiagaraBoardState {
@ -85,6 +87,17 @@ typedef struct NiagaraBoardState {
#define NIAGARA_OBP_OFFSET 0x80000ULL #define NIAGARA_OBP_OFFSET 0x80000ULL
#define PROM_SIZE_MAX (4 * 1024 * 1024) #define PROM_SIZE_MAX (4 * 1024 * 1024)
static void add_rom_or_fail(const char *file, const hwaddr addr)
{
/* XXX remove qtest_enabled() check once firmware files are
* in the qemu tree
*/
if (!qtest_enabled() && rom_add_file_fixed(file, addr, -1)) {
error_report("Unable to load a firmware for -M niagara");
exit(1);
}
}
/* Niagara hardware initialisation */ /* Niagara hardware initialisation */
static void niagara_init(MachineState *machine) static void niagara_init(MachineState *machine)
{ {
@ -119,14 +132,13 @@ static void niagara_init(MachineState *machine)
"sun4v.prom", PROM_SIZE_MAX); "sun4v.prom", PROM_SIZE_MAX);
memory_region_add_subregion(sysmem, NIAGARA_PROM_BASE, &s->prom); memory_region_add_subregion(sysmem, NIAGARA_PROM_BASE, &s->prom);
rom_add_file_fixed("nvram1", NIAGARA_NVRAM_BASE, -1); add_rom_or_fail("nvram1", NIAGARA_NVRAM_BASE);
rom_add_file_fixed("1up-md.bin", NIAGARA_MD_ROM_BASE, -1); add_rom_or_fail("1up-md.bin", NIAGARA_MD_ROM_BASE);
rom_add_file_fixed("1up-hv.bin", NIAGARA_HV_ROM_BASE, -1); add_rom_or_fail("1up-hv.bin", NIAGARA_HV_ROM_BASE);
rom_add_file_fixed("reset.bin", NIAGARA_PROM_BASE, -1); add_rom_or_fail("reset.bin", NIAGARA_PROM_BASE);
rom_add_file_fixed("q.bin", NIAGARA_PROM_BASE + NIAGARA_Q_OFFSET, -1); add_rom_or_fail("q.bin", NIAGARA_PROM_BASE + NIAGARA_Q_OFFSET);
rom_add_file_fixed("openboot.bin", NIAGARA_PROM_BASE + NIAGARA_OBP_OFFSET, add_rom_or_fail("openboot.bin", NIAGARA_PROM_BASE + NIAGARA_OBP_OFFSET);
-1);
/* the virtual ramdisk is kind of initrd, but it resides /* the virtual ramdisk is kind of initrd, but it resides
outside of the partition RAM */ outside of the partition RAM */