• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
Aucun tag

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

Commit MetaInfo

Révisione0e706bff19e0d355a3a2d4f7d4967e5b251d88d (tree)
l'heure2019-06-16 22:31:41
AuteurRichard Henderson <richard.henderson@lina...>
CommiterYoshinori Sato

Message de Log

hw/rx: Honor -accel qtest

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

Change Summary

Modification

--- a/hw/rx/rx62n.c
+++ b/hw/rx/rx62n.c
@@ -21,11 +21,13 @@
2121
2222 #include "qemu/osdep.h"
2323 #include "qapi/error.h"
24+#include "qemu/error-report.h"
2425 #include "hw/hw.h"
2526 #include "hw/rx/rx62n.h"
2627 #include "hw/loader.h"
2728 #include "hw/sysbus.h"
2829 #include "sysemu/sysemu.h"
30+#include "sysemu/qtest.h"
2931 #include "cpu.h"
3032
3133 /*
@@ -190,8 +192,14 @@ static void rx62n_realize(DeviceState *dev, Error **errp)
190192 memory_region_init_rom(&s->c_flash, NULL, "codeflash",
191193 RX62N_CFLASH_SIZE, errp);
192194 memory_region_add_subregion(s->sysmem, RX62N_CFLASH_BASE, &s->c_flash);
195+
193196 if (!s->kernel) {
194- rom_add_file_fixed(bios_name, RX62N_CFLASH_BASE, 0);
197+ if (bios_name) {
198+ rom_add_file_fixed(bios_name, RX62N_CFLASH_BASE, 0);
199+ } else if (!qtest_enabled()) {
200+ error_report("No bios or kernel specified");
201+ exit(1);
202+ }
195203 }
196204
197205 /* Initialize CPU */