[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v16 15/23] hw/rx: Honor -accel qtest
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH v16 15/23] hw/rx: Honor -accel qtest |
Date: |
Fri, 31 May 2019 08:43:07 -0500 |
Issue an error if no kernel, no bios, and not qtest'ing.
Fixes make check-qtest-rx: test/qom-test.
Signed-off-by: Richard Henderson <address@hidden>
---
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 3a8fe7b0bf..e55257c622 100644
--- a/hw/rx/rx62n.c
+++ b/hw/rx/rx62n.c
@@ -21,11 +21,13 @@
#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 "sysemu/sysemu.h"
+#include "sysemu/qtest.h"
#include "cpu.h"
/*
@@ -190,8 +192,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);
+ }
}
object_initialize_child(OBJECT(s), "cpu", &s->cpu,
--
2.17.1
- [Qemu-devel] [PATCH v16 03/23] target/rx: CPU definition, (continued)
- [Qemu-devel] [PATCH v16 03/23] target/rx: CPU definition, Richard Henderson, 2019/05/31
- [Qemu-devel] [PATCH v16 05/23] hw/intc: RX62N interrupt controller (ICUa), Richard Henderson, 2019/05/31
- [Qemu-devel] [PATCH v16 04/23] target/rx: RX disassembler, Richard Henderson, 2019/05/31
- [Qemu-devel] [PATCH v16 07/23] hw/char: RX62N serial communication interface (SCI), Richard Henderson, 2019/05/31
- [Qemu-devel] [PATCH v16 06/23] hw/timer: RX62N internal timer modules, Richard Henderson, 2019/05/31
- [Qemu-devel] [PATCH v16 09/23] qemu/bitops.h: Add extract8 and extract16, Richard Henderson, 2019/05/31
- [Qemu-devel] [PATCH v16 01/23] target/rx: TCG translation, Richard Henderson, 2019/05/31
- [Qemu-devel] [PATCH v16 13/23] target/rx: Fix cpu types and names, Richard Henderson, 2019/05/31
- [Qemu-devel] [PATCH v16 10/23] hw/registerfields.h: Add 8bit and 16bit register macros, Richard Henderson, 2019/05/31
- [Qemu-devel] [PATCH v16 08/23] hw/rx: RX Target hardware definition, Richard Henderson, 2019/05/31
- [Qemu-devel] [PATCH v16 15/23] hw/rx: Honor -accel qtest,
Richard Henderson <=
- [Qemu-devel] [PATCH v16 12/23] target/rx: Add RX to SysEmuTarget, Richard Henderson, 2019/05/31
- [Qemu-devel] [PATCH v16 16/23] Add rx-softmmu, Richard Henderson, 2019/05/31
- [Qemu-devel] [PATCH v16 14/23] tests: Add rx to machine-none-test.c, Richard Henderson, 2019/05/31
- [Qemu-devel] [PATCH v16 11/23] target/rx: Convert to CPUClass::tlb_fill, Richard Henderson, 2019/05/31
- [Qemu-devel] [PATCH v16 17/23] MAINTAINERS: Add RX, Richard Henderson, 2019/05/31
- [Qemu-devel] [PATCH v16 18/23] target/rx: Disassemble rx_index_addr into a string, Richard Henderson, 2019/05/31
- [Qemu-devel] [PATCH v16 20/23] target/rx: Use prt_ldmi for XCHG_mr disassembly, Richard Henderson, 2019/05/31
- [Qemu-devel] [PATCH v16 19/23] target/rx: Replace operand with prt_ldmi in disassembler, Richard Henderson, 2019/05/31
- [Qemu-devel] [PATCH v16 21/23] target/rx: Emit all disassembly in one prt(), Richard Henderson, 2019/05/31
- [Qemu-devel] [PATCH v16 23/23] target/rx: Dump bytes for each insn during disassembly, Richard Henderson, 2019/05/31