On Thu, 7 Apr 2022 08:44:14 +0000
Janosch Frank <frankja@xxxxxxxxxxxxx> wrote:
> There's no guarantee that we even find a device at the address we're
> testing for if we're not running under QEMU.
>
> Signed-off-by: Janosch Frank <frankja@xxxxxxxxxxxxx>
Reviewed-by: Claudio Imbrenda <imbrenda@xxxxxxxxxxxxx>
> ---
> s390x/css.c | 11 ++++++++++-
> 1 file changed, 10 insertions(+), 1 deletion(-)
>
> diff --git a/s390x/css.c b/s390x/css.c
> index a333e55a..13a1509f 100644
> --- a/s390x/css.c
> +++ b/s390x/css.c
> @@ -15,6 +15,7 @@
> #include <interrupt.h>
> #include <asm/arch_def.h>
> #include <alloc_page.h>
> +#include <hardware.h>
>
> #include <malloc_io.h>
> #include <css.h>
> @@ -642,13 +643,21 @@ int main(int argc, char *argv[])
> int i;
>
> report_prefix_push("Channel Subsystem");
> +
> + /* There's no guarantee where our devices are without qemu */
> + if (!host_is_qemu()) {
> + report_skip("Not running under QEMU");
> + goto done;
> + }
> +
> enable_io_isc(0x80 >> IO_SCH_ISC);
> for (i = 0; tests[i].name; i++) {
> report_prefix_push(tests[i].name);
> tests[i].func();
> report_prefix_pop();
> }
> - report_prefix_pop();
>
> +done:
> + report_prefix_pop();
> return report_summary();
> }
