[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 1/2] niagara: fail if a firmware file is missing
From: |
Artyom Tarasenko |
Subject: |
[Qemu-devel] [PULL 1/2] niagara: fail if a firmware file is missing |
Date: |
Sun, 26 Feb 2017 23:29:15 +0100 |
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 <address@hidden>
Signed-off-by: Artyom Tarasenko <address@hidden>
---
hw/sparc64/niagara.c | 26 +++++++++++++++++++-------
1 file changed, 19 insertions(+), 7 deletions(-)
diff --git a/hw/sparc64/niagara.c b/hw/sparc64/niagara.c
index b55d4bb..edde86e 100644
--- a/hw/sparc64/niagara.c
+++ b/hw/sparc64/niagara.c
@@ -35,6 +35,8 @@
#include "hw/timer/sun4v-rtc.h"
#include "exec/address-spaces.h"
#include "sysemu/block-backend.h"
+#include "qemu/error-report.h"
+#include "sysemu/qtest.h"
typedef struct NiagaraBoardState {
@@ -85,6 +87,17 @@ typedef struct NiagaraBoardState {
#define NIAGARA_OBP_OFFSET 0x80000ULL
#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 */
static void niagara_init(MachineState *machine)
{
@@ -119,14 +132,13 @@ static void niagara_init(MachineState *machine)
"sun4v.prom", PROM_SIZE_MAX);
memory_region_add_subregion(sysmem, NIAGARA_PROM_BASE, &s->prom);
- rom_add_file_fixed("nvram1", NIAGARA_NVRAM_BASE, -1);
- rom_add_file_fixed("1up-md.bin", NIAGARA_MD_ROM_BASE, -1);
- rom_add_file_fixed("1up-hv.bin", NIAGARA_HV_ROM_BASE, -1);
+ add_rom_or_fail("nvram1", NIAGARA_NVRAM_BASE);
+ add_rom_or_fail("1up-md.bin", NIAGARA_MD_ROM_BASE);
+ add_rom_or_fail("1up-hv.bin", NIAGARA_HV_ROM_BASE);
- rom_add_file_fixed("reset.bin", NIAGARA_PROM_BASE, -1);
- rom_add_file_fixed("q.bin", NIAGARA_PROM_BASE + NIAGARA_Q_OFFSET, -1);
- rom_add_file_fixed("openboot.bin", NIAGARA_PROM_BASE + NIAGARA_OBP_OFFSET,
- -1);
+ add_rom_or_fail("reset.bin", NIAGARA_PROM_BASE);
+ add_rom_or_fail("q.bin", NIAGARA_PROM_BASE + NIAGARA_Q_OFFSET);
+ add_rom_or_fail("openboot.bin", NIAGARA_PROM_BASE + NIAGARA_OBP_OFFSET);
/* the virtual ramdisk is kind of initrd, but it resides
outside of the partition RAM */
--
2.7.2