diff mbox series

[v17,15/24] hw/rx: Honor -accel qtest

Message ID 20190607091116.49044-16-ysato@users.sourceforge.jp
State Superseded
Headers show
Series None | expand

Commit Message

Yoshinori Sato June 7, 2019, 9:11 a.m. UTC 
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.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp>

---
 hw/rx/rx62n.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

-- 
2.11.0

Comments

Philippe Mathieu-Daudé June 7, 2019, 1:40 p.m. UTC | #1 
On 6/7/19 11:11 AM, Yoshinori Sato wrote:
> 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.

> 

> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

> Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp>


Again:
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>


> ---

>  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,

>
diff mbox series

Patch

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,