diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2019-05-31 08:43:07 -0500 |
|---|---|---|
| committer | Philippe Mathieu-Daudé <f4bug@amsat.org> | 2020-06-22 18:37:12 +0200 |
| commit | 7d272cb43d64e44d476e83c89dc61f5b54a658e9 (patch) | |
| tree | 796eea9bc9425768ef14acb1c5e9eaebf48a5c0f /hw | |
| parent | 0c80f50f1e047535f76cffcf9629ebf6d4542c4d (diff) | |
| download | qemu-7d272cb43d64e44d476e83c89dc61f5b54a658e9.zip qemu-7d272cb43d64e44d476e83c89dc61f5b54a658e9.tar.gz qemu-7d272cb43d64e44d476e83c89dc61f5b54a658e9.tar.bz2 | |
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>
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>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/rx/rx62n.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/hw/rx/rx62n.c b/hw/rx/rx62n.c index 85b7770..d8f0fa4 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 */ |