From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7DF73C433EF for ; Mon, 17 Jan 2022 07:01:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235045AbiAQHBq (ORCPT ); Mon, 17 Jan 2022 02:01:46 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:32409 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235059AbiAQHBp (ORCPT ); Mon, 17 Jan 2022 02:01:45 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1642402905; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZInfsJu7ErgNvQcctk0yVymFu8hQlMDYYqOyuF8tNVM=; b=MpaUwyCx5RMJrgkOr5KOUwx8k5hTuMA2IkYXJb/2e5frUfTV3yRTTLuCYEZhhclwx1ugXW UZ6T6nexHUkWcrHHGhxLwd3cjRB9k+5SclvEeQrty68WofMWy8MKpP2dQbamJWfoUMkbYt mLM8LLtpts9Qb4HpPwEtVnYUBIax8SU= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-643-MEe1tkOgP8qJkJFk1IFN9Q-1; Mon, 17 Jan 2022 02:01:43 -0500 X-MC-Unique: MEe1tkOgP8qJkJFk1IFN9Q-1 Received: by mail-wm1-f70.google.com with SMTP id bg16-20020a05600c3c9000b0034bea12c043so3939232wmb.7 for ; Sun, 16 Jan 2022 23:01:43 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=ZInfsJu7ErgNvQcctk0yVymFu8hQlMDYYqOyuF8tNVM=; b=hoMI8rh8r5hObMhePrxEXSWPGLk4HEu5y2bImujtK5sT2O3ih20PuXKU+6ARX5qofq MrsxC3jbTDMPOubkMbDu0/8qsqZ+i3B7T3lJoF0gJTj3UirfMnW3XFuFM4jEHGrkfFvc Ohwa0Po14osiA0evCv5l6+85MJBKzB3d0VlPXhCMlfGW2EBGSBC8M//ws4i6bHPWO0Uk iTQgJG0tEK30C1IVVy7Vk0oaBnQPpZ4L/WKN7TNeORCuy1XvJOhoRVG1bTY5Huo8yOgR 9v7+Q4qDqX4ov7cJxRALM3dtd+5YthTQoorrRFeTyDqsJObsysUmZDW04KPGRtrMiqDk xprQ== X-Gm-Message-State: AOAM533ragbACm6oyYBkfOhvBXLZrERzG6YBm1Uu+GHsl/9TlJrfjJ00 ztdWQQYR6oa3zj6dg4fw896dkOib98xcLyVoQ2WIual10ODMYYrIvrse8G0VoEV9bojq0Wyp75Z eSBjrkAP9uwqXbIwWEjjFDA== X-Received: by 2002:a05:6000:2c2:: with SMTP id o2mr9989378wry.660.1642402902425; Sun, 16 Jan 2022 23:01:42 -0800 (PST) X-Google-Smtp-Source: ABdhPJw7sVxoy5PbUdoRvkQMmy3TI09E04uzw+Rzmzzc7mhJn+tLE06QBaym/a4ilbrhWaYgX0C1Rw== X-Received: by 2002:a05:6000:2c2:: with SMTP id o2mr9989359wry.660.1642402902220; Sun, 16 Jan 2022 23:01:42 -0800 (PST) Received: from [192.168.8.100] (tmo-098-68.customers.d1-online.com. [80.187.98.68]) by smtp.gmail.com with ESMTPSA id v8sm12897381wrt.116.2022.01.16.23.01.40 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 16 Jan 2022 23:01:41 -0800 (PST) Message-ID: <80006dc9-039c-d729-f84c-af964314442f@redhat.com> Date: Mon, 17 Jan 2022 08:01:39 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.4.0 Subject: Re: [kvm-unit-tests PATCH 2/5] s390x: css: Skip if we're not run by qemu Content-Language: en-US To: Janosch Frank , kvm@vger.kernel.org Cc: linux-s390@vger.kernel.org, imbrenda@linux.ibm.com, david@redhat.com, cohuck@redhat.com, nrb@linux.ibm.com References: <20220114100245.8643-1-frankja@linux.ibm.com> <20220114100245.8643-3-frankja@linux.ibm.com> From: Thomas Huth In-Reply-To: <20220114100245.8643-3-frankja@linux.ibm.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-s390@vger.kernel.org On 14/01/2022 11.02, Janosch Frank 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 > --- > s390x/css.c | 10 +++++++++- > 1 file changed, 9 insertions(+), 1 deletion(-) > > diff --git a/s390x/css.c b/s390x/css.c > index 881206ba..c24119b4 100644 > --- a/s390x/css.c > +++ b/s390x/css.c > @@ -15,6 +15,7 @@ > #include > #include > #include > +#include > > #include > #include > @@ -350,6 +351,12 @@ int main(int argc, char *argv[]) > { > int i; > > + /* There's no guarantee where our devices are without qemu */ > + if (!vm_is_kvm() && !vm_is_tcg()) { > + report_skip("Not running under QEMU"); > + goto done; > + } You've added the check before the report_prefix_push() ... > report_prefix_push("Channel Subsystem"); > enable_io_isc(0x80 >> IO_SCH_ISC); > for (i = 0; tests[i].name; i++) { > @@ -357,7 +364,8 @@ int main(int argc, char *argv[]) > tests[i].func(); > report_prefix_pop(); > } > - report_prefix_pop(); > > +done: > + report_prefix_pop(); ... but in case of the goto you now do the pop without the push. I think you have to drop the second hunk. Thomas > return report_summary(); > }