[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v24 18/22] hw/rx: Honor -accel qtest
From: |
Yoshinori Sato |
Subject: |
[Qemu-devel] [PATCH v24 18/22] hw/rx: Honor -accel qtest |
Date: |
Thu, 12 Sep 2019 15:06:57 +0900 |
From: Richard Henderson <address@hidden>
Issue an error if no kernel, no bios, and not qtest'ing.
Fixes make check-qtest-rx: test/qom-test.
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Yoshinori Sato <address@hidden>
Message-Id: <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
---
We could squash this with the previous patch
---
hw/rx/rx62n.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/hw/rx/rx62n.c b/hw/rx/rx62n.c
index ac47f2a397..a0986fd15e 100644
--- a/hw/rx/rx62n.c
+++ b/hw/rx/rx62n.c
@@ -21,12 +21,14 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
+#include "qemu/error-report.h"
#include "hw/hw.h"
#include "hw/rx/rx62n.h"
#include "hw/loader.h"
#include "hw/sysbus.h"
#include "hw/qdev-properties.h"
#include "sysemu/sysemu.h"
+#include "sysemu/qtest.h"
#include "cpu.h"
/*
@@ -191,8 +193,14 @@ static void rx62n_realize(DeviceState *dev, Error **errp)
memory_region_init_rom(&s->c_flash, NULL, "codeflash",
RX62N_CFLASH_SIZE, errp);
memory_region_add_subregion(s->sysmem, RX62N_CFLASH_BASE, &s->c_flash);
+
if (!s->kernel) {
- rom_add_file_fixed(bios_name, RX62N_CFLASH_BASE, 0);
+ if (bios_name) {
+ rom_add_file_fixed(bios_name, RX62N_CFLASH_BASE, 0);
+ } else if (!qtest_enabled()) {
+ error_report("No bios or kernel specified");
+ exit(1);
+ }
}
/* Initialize CPU */
--
2.20.1
- [Qemu-devel] [PATCH v24 00/22] Add RX archtecture support, Yoshinori Sato, 2019/09/12
- [Qemu-devel] [PATCH v24 01/22] MAINTAINERS: Add RX, Yoshinori Sato, 2019/09/12
- [Qemu-devel] [PATCH v24 18/22] hw/rx: Honor -accel qtest,
Yoshinori Sato <=
- [Qemu-devel] [PATCH v24 10/22] target/rx: Use prt_ldmi for XCHG_mr disassembly, Yoshinori Sato, 2019/09/12
- [Qemu-devel] [PATCH v24 13/22] target/rx: Dump bytes for each insn during disassembly, Yoshinori Sato, 2019/09/12
- [Qemu-devel] [PATCH v24 03/22] hw/registerfields.h: Add 8bit and 16bit register macros, Yoshinori Sato, 2019/09/12
- [Qemu-devel] [PATCH v24 02/22] qemu/bitops.h: Add extract8 and extract16, Yoshinori Sato, 2019/09/12
- [Qemu-devel] [PATCH v24 22/22] qapi/machine.json: Add RX cpu., Yoshinori Sato, 2019/09/12
- [Qemu-devel] [PATCH v24 11/22] target/rx: Emit all disassembly in one prt(), Yoshinori Sato, 2019/09/12
- [Qemu-devel] [PATCH v24 19/22] hw/rx: Restrict the RX62N microcontroller to the RX62N CPU core, Yoshinori Sato, 2019/09/12
- [Qemu-devel] [PATCH v24 09/22] target/rx: Replace operand with prt_ldmi in disassembler, Yoshinori Sato, 2019/09/12
- [Qemu-devel] [PATCH v24 21/22] BootLinuxConsoleTest: Test the RX-Virt machine, Yoshinori Sato, 2019/09/12