[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH rc1 11/15] hw/rx: Honor -accel qtest
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH rc1 11/15] hw/rx: Honor -accel qtest |
Date: |
Wed, 17 Jun 2020 21:15:15 +0200 |
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>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20190531134315.4109-16-richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
hw/rx/rx62n.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/hw/rx/rx62n.c b/hw/rx/rx62n.c
index 85b7770023..d8f0fa4625 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"
/*
@@ -208,7 +210,12 @@ static void rx62n_realize(DeviceState *dev, Error **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.21.3
- [PATCH rc1 00/15] hw: Renesas patches (SH4 and RX), Philippe Mathieu-Daudé, 2020/06/17
- [PATCH rc1 01/15] MAINTAINERS: Cover sh_intc files in the R2D/Shix machine sections, Philippe Mathieu-Daudé, 2020/06/17
- [PATCH rc1 02/15] MAINTAINERS: Add an entry for common Renesas peripherals, Philippe Mathieu-Daudé, 2020/06/17
- [PATCH rc1 03/15] hw/sh4: Use MemoryRegion typedef, Philippe Mathieu-Daudé, 2020/06/17
- [PATCH rc1 05/15] hw/timer/sh_timer: Remove unused 'qemu/timer.h' include, Philippe Mathieu-Daudé, 2020/06/17
- [PATCH rc1 04/15] hw/sh4: Extract timer definitions to 'hw/timer/tmu012.h', Philippe Mathieu-Daudé, 2020/06/17
- [PATCH rc1 06/15] hw/intc: RX62N interrupt controller (ICUa), Philippe Mathieu-Daudé, 2020/06/17
- [PATCH rc1 07/15] hw/timer: RX62N 8-Bit timer (TMR), Philippe Mathieu-Daudé, 2020/06/17
- [PATCH rc1 08/15] hw/timer: RX62N compare match timer (CMT), Philippe Mathieu-Daudé, 2020/06/17
- [PATCH rc1 09/15] hw/char: RX62N serial communication interface (SCI), Philippe Mathieu-Daudé, 2020/06/17
- [PATCH rc1 11/15] hw/rx: Honor -accel qtest,
Philippe Mathieu-Daudé <=
- [PATCH rc1 10/15] hw/rx: RX62N microcontroller (MCU), Philippe Mathieu-Daudé, 2020/06/17
- [PATCH rc1 12/15] hw/rx: Register R5F562N7 and R5F562N8 MCUs, Philippe Mathieu-Daudé, 2020/06/17
- [PATCH rc1 13/15] hw/rx: Add RX GDB simulator, Philippe Mathieu-Daudé, 2020/06/17
- [PATCH rc1 14/15] BootLinuxConsoleTest: Test the RX GDB simulator, Philippe Mathieu-Daudé, 2020/06/17
- [PATCH rc1 15/15] docs: Document the RX target, Philippe Mathieu-Daudé, 2020/06/17
- Re: [PATCH rc1 00/15] hw: Renesas patches (SH4 and RX), no-reply, 2020/06/17