From: Yoshinori Sato <ysato@users.sourceforge.jp>
To: qemu-devel@nongnu.org
Cc: philmd@redhat.com,
Richard Henderson <richard.henderson@linaro.org>,
Yoshinori Sato <ysato@users.sourceforge.jp>
Subject: [PATCH v29 18/22] hw/rx: Honor -accel qtest
Date: Thu, 23 Jan 2020 22:25:21 +0900 [thread overview]
Message-ID: <20200123132525.80891-19-ysato@users.sourceforge.jp> (raw)
In-Reply-To: <20200123132525.80891-1-ysato@users.sourceforge.jp>
From: Richard Henderson <richard.henderson@linaro.org>
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é <philmd@redhat.com>
Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp>
Message-Id: <20190607091116.49044-16-ysato@users.sourceforge.jp>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
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
next prev parent reply other threads:[~2020-01-23 14:45 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-23 13:25 [PATCH v29 00/22] Add RX archtecture support Yoshinori Sato
2020-01-23 13:25 ` [PATCH v29 01/22] MAINTAINERS: Add RX Yoshinori Sato
2020-01-23 13:25 ` [PATCH v29 02/22] qemu/bitops.h: Add extract8 and extract16 Yoshinori Sato
2020-01-23 13:25 ` [PATCH v29 03/22] hw/registerfields.h: Add 8bit and 16bit register macros Yoshinori Sato
2020-01-23 13:25 ` [PATCH v29 04/22] target/rx: TCG translation Yoshinori Sato
2020-01-23 13:25 ` [PATCH v29 05/22] target/rx: TCG helper Yoshinori Sato
2020-01-23 13:25 ` [PATCH v29 06/22] target/rx: CPU definition Yoshinori Sato
2020-01-23 13:25 ` [PATCH v29 07/22] target/rx: RX disassembler Yoshinori Sato
2020-01-23 13:25 ` [PATCH v29 08/22] target/rx: Disassemble rx_index_addr into a string Yoshinori Sato
2020-01-23 13:25 ` [PATCH v29 09/22] target/rx: Replace operand with prt_ldmi in disassembler Yoshinori Sato
2020-01-23 13:25 ` [PATCH v29 10/22] target/rx: Use prt_ldmi for XCHG_mr disassembly Yoshinori Sato
2020-01-23 13:25 ` [PATCH v29 11/22] target/rx: Emit all disassembly in one prt() Yoshinori Sato
2020-01-23 13:25 ` [PATCH v29 12/22] target/rx: Collect all bytes during disassembly Yoshinori Sato
2020-01-23 13:25 ` [PATCH v29 13/22] target/rx: Dump bytes for each insn " Yoshinori Sato
2020-01-23 13:25 ` [PATCH v29 14/22] hw/intc: RX62N interrupt controller (ICUa) Yoshinori Sato
2020-01-23 13:25 ` [PATCH v29 15/22] hw/timer: RX62N internal timer modules Yoshinori Sato
2020-01-23 13:25 ` [PATCH v29 16/22] hw/char: RX62N serial communication interface (SCI) Yoshinori Sato
2020-01-23 13:25 ` [PATCH v29 17/22] hw/rx: RX Target hardware definition Yoshinori Sato
2020-01-23 13:25 ` Yoshinori Sato [this message]
2020-01-23 13:25 ` [PATCH v29 19/22] hw/rx: Restrict the RX62N microcontroller to the RX62N CPU core Yoshinori Sato
2020-01-23 13:25 ` [PATCH v29 20/22] Add rx-softmmu Yoshinori Sato
2020-01-23 13:25 ` [PATCH v29 21/22] BootLinuxConsoleTest: Test the RX-Virt machine Yoshinori Sato
2020-01-23 13:25 ` [PATCH v29 22/22] qemu-doc.texi: Add RX section Yoshinori Sato
2020-01-23 16:24 ` [PATCH v29 00/22] Add RX archtecture support no-reply
2020-01-24 2:42 ` Yoshinori Sato
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200123132525.80891-19-ysato@users.sourceforge.jp \
--to=ysato@users.sourceforge.jp \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.