| Message ID | 20190531134315.4109-16-richard.henderson@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | Add RX architecture | expand |
On 5/31/19 3:43 PM, Richard Henderson wrote: > Issue an error if no kernel, no bios, and not qtest'ing. > Fixes make check-qtest-rx: test/qom-test. > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > --- > 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 3a8fe7b0bf..e55257c622 100644 > --- a/hw/rx/rx62n.c > +++ b/hw/rx/rx62n.c > @@ -21,11 +21,13 @@ > > #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 "sysemu/sysemu.h" > +#include "sysemu/qtest.h" > #include "cpu.h" > > /* > @@ -190,8 +192,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); > + } > } > > object_initialize_child(OBJECT(s), "cpu", &s->cpu, > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
diff --git a/hw/rx/rx62n.c b/hw/rx/rx62n.c index 3a8fe7b0bf..e55257c622 100644 --- a/hw/rx/rx62n.c +++ b/hw/rx/rx62n.c @@ -21,11 +21,13 @@ #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 "sysemu/sysemu.h" +#include "sysemu/qtest.h" #include "cpu.h" /* @@ -190,8 +192,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); + } } object_initialize_child(OBJECT(s), "cpu", &s->cpu,
Issue an error if no kernel, no bios, and not qtest'ing. Fixes make check-qtest-rx: test/qom-test. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- hw/rx/rx62n.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) -- 2.17.1