From: Yoshinori Sato <ysato@users.sourceforge.jp>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, imammedo@redhat.com,
Richard Henderson <richard.henderson@linaro.org>,
Yoshinori Sato <ysato@users.sourceforge.jp>,
philmd@redhat.com
Subject: [Qemu-devel] [PATCH v24 18/22] hw/rx: Honor -accel qtest
Date: Thu, 12 Sep 2019 15:06:57 +0900 [thread overview]
Message-ID: <20190912060701.4642-19-ysato@users.sourceforge.jp> (raw)
In-Reply-To: <20190912060701.4642-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:[~2019-09-12 6:09 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-12 6:06 [Qemu-devel] [PATCH v24 00/22] Add RX archtecture support Yoshinori Sato
2019-09-12 6:06 ` [Qemu-devel] [PATCH v24 01/22] MAINTAINERS: Add RX Yoshinori Sato
2019-09-12 6:06 ` [Qemu-devel] [PATCH v24 02/22] qemu/bitops.h: Add extract8 and extract16 Yoshinori Sato
2019-09-12 6:06 ` [Qemu-devel] [PATCH v24 03/22] hw/registerfields.h: Add 8bit and 16bit register macros Yoshinori Sato
2019-09-12 6:06 ` [Qemu-devel] [PATCH v24 04/22] target/rx: TCG translation Yoshinori Sato
2019-09-12 6:06 ` [Qemu-devel] [PATCH v24 05/22] target/rx: TCG helper Yoshinori Sato
2019-09-12 6:06 ` [Qemu-devel] [PATCH v24 06/22] target/rx: CPU definition Yoshinori Sato
2019-09-23 15:49 ` Philippe Mathieu-Daudé
2019-09-12 6:06 ` [Qemu-devel] [PATCH v24 07/22] target/rx: RX disassembler Yoshinori Sato
2019-09-12 6:06 ` [Qemu-devel] [PATCH v24 08/22] target/rx: Disassemble rx_index_addr into a string Yoshinori Sato
2019-09-12 6:06 ` [Qemu-devel] [PATCH v24 09/22] target/rx: Replace operand with prt_ldmi in disassembler Yoshinori Sato
2019-09-12 6:06 ` [Qemu-devel] [PATCH v24 10/22] target/rx: Use prt_ldmi for XCHG_mr disassembly Yoshinori Sato
2019-09-12 6:06 ` [Qemu-devel] [PATCH v24 11/22] target/rx: Emit all disassembly in one prt() Yoshinori Sato
2019-09-12 6:06 ` [Qemu-devel] [PATCH v24 12/22] target/rx: Collect all bytes during disassembly Yoshinori Sato
2019-09-12 6:06 ` [Qemu-devel] [PATCH v24 13/22] target/rx: Dump bytes for each insn " Yoshinori Sato
2019-09-12 6:06 ` [Qemu-devel] [PATCH v24 14/22] hw/intc: RX62N interrupt controller (ICUa) Yoshinori Sato
2019-09-12 6:06 ` [Qemu-devel] [PATCH v24 15/22] hw/timer: RX62N internal timer modules Yoshinori Sato
2019-09-12 6:06 ` [Qemu-devel] [PATCH v24 16/22] hw/char: RX62N serial communication interface (SCI) Yoshinori Sato
2019-09-12 6:06 ` [Qemu-devel] [PATCH v24 17/22] hw/rx: RX Target hardware definition Yoshinori Sato
2019-09-12 6:06 ` Yoshinori Sato [this message]
2019-09-12 6:06 ` [Qemu-devel] [PATCH v24 19/22] hw/rx: Restrict the RX62N microcontroller to the RX62N CPU core Yoshinori Sato
2019-09-12 6:06 ` [Qemu-devel] [PATCH v24 20/22] Add rx-softmmu Yoshinori Sato
2019-09-12 6:07 ` [Qemu-devel] [PATCH v24 21/22] BootLinuxConsoleTest: Test the RX-Virt machine Yoshinori Sato
2019-09-12 6:07 ` [Qemu-devel] [PATCH v24 22/22] qapi/machine.json: Add RX cpu Yoshinori Sato
2019-09-20 12:39 ` Eric Blake
2019-09-12 6:39 ` [Qemu-devel] [PATCH v24 00/22] Add RX archtecture support no-reply
2019-09-12 7:47 ` no-reply
2019-09-12 9:18 ` no-reply
2019-09-12 9:40 ` no-reply
2019-09-12 10:30 ` no-reply
2019-09-12 11:09 ` no-reply
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=20190912060701.4642-19-ysato@users.sourceforge.jp \
--to=ysato@users.sourceforge.jp \
--cc=imammedo@redhat.com \
--cc=peter.maydell@linaro.org \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).