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 X-Spam-Level: X-Spam-Status: No, score=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 69D22C433B4 for ; Fri, 16 Apr 2021 04:53:27 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id ED147610E7 for ; Fri, 16 Apr 2021 04:53:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org ED147610E7 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=gibson.dropbear.id.au Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:34102 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lXGTu-0007fs-1Q for qemu-devel@archiver.kernel.org; Fri, 16 Apr 2021 00:53:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55040) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lXGTH-00075j-Hk; Fri, 16 Apr 2021 00:52:47 -0400 Received: from ozlabs.org ([203.11.71.1]:51453) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lXGTF-0003sf-H7; Fri, 16 Apr 2021 00:52:47 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 4FM3jg0K8Dz9sVb; Fri, 16 Apr 2021 14:52:38 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1618548759; bh=M5DRCjE7+W1oq12uc54aAKXTf/vzdlt/VNay/318hMY=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=T6AMjwzWtZw+i2G+1ebnCNUb10qPSDcZcBRS/jelrDBK7NqAIhvw3Hrix1VB01NlD w5dRGTgCqWXOunw0GNe/pLYM8vsgDXesdqx+8F4G3Wdcgfvs9uHEs64Q8XRGQLfqY/ KlJJ0f/vlTDiaaBPGSLloyS3waXgiyRrT+fL1thk= Date: Fri, 16 Apr 2021 14:33:12 +1000 From: David Gibson To: Philippe =?iso-8859-1?Q?Mathieu-Daud=E9?= Subject: Re: [PATCH v4 09/12] qtest/migration-test: Skip tests if KVM not builtin on s390x/ppc64 Message-ID: References: <20210415163304.4120052-1-philmd@redhat.com> <20210415163304.4120052-10-philmd@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="M/U5VjhaaYHsyIdB" Content-Disposition: inline In-Reply-To: <20210415163304.4120052-10-philmd@redhat.com> Received-SPF: pass client-ip=203.11.71.1; envelope-from=dgibson@ozlabs.org; helo=ozlabs.org X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.249, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , "Michael S. Tsirkin" , qemu-devel@nongnu.org, Juan Quintela , Markus Armbruster , Halil Pasic , Christian Borntraeger , Claudio Fontana , Thomas Huth , Laurent Vivier , Andrew Jones , Eduardo Habkost , Richard Henderson , Greg Kurz , "Dr. David Alan Gilbert" , qemu-s390x@nongnu.org, qemu-arm@nongnu.org, Igor Mammedov , Daniel P =?iso-8859-1?Q?=2E_Berrang=E9?= , Cornelia Huck , qemu-ppc@nongnu.org, Paolo Bonzini Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" --M/U5VjhaaYHsyIdB Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Apr 15, 2021 at 06:33:01PM +0200, Philippe Mathieu-Daud=E9 wrote: > We might have a s390x/ppc64 QEMU binary built without the KVM > accelerator (configured with --disable-kvm). > Checking for /dev/kvm accessibility isn't enough, also check for the > accelerator in the binary. >=20 > Signed-off-by: Philippe Mathieu-Daud=E9 Reviewed-by: David Gibson > --- > Cc: David Gibson > Cc: Greg Kurz > Cc: Halil Pasic > Cc: Cornelia Huck > Cc: Christian Borntraeger > Cc: qemu-ppc@nongnu.org > Cc: qemu-s390x@nongnu.org > --- > tests/qtest/migration-test.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) >=20 > diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c > index 3a711bb4929..c32a2aa30a2 100644 > --- a/tests/qtest/migration-test.c > +++ b/tests/qtest/migration-test.c > @@ -1408,7 +1408,7 @@ int main(int argc, char **argv) > */ > if (g_str_equal(qtest_get_arch(), "ppc64") && > (access("/sys/module/kvm_hv", F_OK) || > - access("/dev/kvm", R_OK | W_OK))) { > + access("/dev/kvm", R_OK | W_OK) || !qtest_has_accel("kvm"))) { > g_test_message("Skipping test: kvm_hv not available"); > return g_test_run(); > } > @@ -1419,7 +1419,7 @@ int main(int argc, char **argv) > */ > if (g_str_equal(qtest_get_arch(), "s390x")) { > #if defined(HOST_S390X) > - if (access("/dev/kvm", R_OK | W_OK)) { > + if (access("/dev/kvm", R_OK | W_OK) || !qtest_has_accel("kvm")) { > g_test_message("Skipping test: kvm not available"); > return g_test_run(); > } --=20 David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson --M/U5VjhaaYHsyIdB Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEdfRlhq5hpmzETofcbDjKyiDZs5IFAmB5E4gACgkQbDjKyiDZ s5Kdqg//dPzb8NSIKOPBAchx4fQfNNlRvAN0QOVihtWc5shsO3LZL0cuWL9ut0eJ RQm2dzJhT6kOfy+y+9o+5hA56wvI6X2uxY8HULQJqrN9nQJmSxXMhWv5N/UwM43U 4wfEzR2da9SMo8ZpjrO8PcIPGsekU5B7myBV7enxYyIdwMMkOVX41MW3xIh3r5KF YHsqJgWxlTL2B1fwdm+sINce3qZFlJBgDNHyptdduovZ9JDrD7XysNZmBRjD26QK I5Q1VW6BARlls3t35WFkmqgJ3Z6ACMFnqKwAbO09VYIuh8jw3qgUBsXWIanQoZGp VTptfbQZJSrUs7mJ4RFxnDmHUr4QVP2JzE1Hee8xgpQJxyucDpLiW93QSehdgNQG +HDxkLctqvF2NrRjqc+oDRbLh26QX2F3XmlZvOhxHhNanLnaahPnYxIp4pPLJcWR qJ83jf6UswNywT83ttwLx6nZSFRB6+WWVxTFfV3o3S0lXtFMP/dX7TCKTuhhsUJ6 KRlS6zKk6zlfPX92uINMlHocpTZ3f/JL//i+nuomZwat4S0780ZUH0frCpzCLfAY nhSVafRDZCAKvn+7tWIa7NKCVE8gEcf7epOHxh/t1nAWDNLi7AOz6v2VaWwgL/f3 llQiQp5oh6U1pxuVhQGCUfoSHzqJ38thy7zx4dvmq4OsUXsrcuI= =NVHN -----END PGP SIGNATURE----- --M/U5VjhaaYHsyIdB--