From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a19:e20e:0:0:0:0:0 with SMTP id z14csp3007181lfg; Mon, 3 May 2021 14:11:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxGN8/6QGRJiSQMLtEtv+fe1f5j9eVewxZ767hGlthuS61nm7xFqAlhfhYH+Y8WCQBzHqdz X-Received: by 2002:a17:906:32ce:: with SMTP id k14mr19335302ejk.27.1620076287525; Mon, 03 May 2021 14:11:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620076287; cv=none; d=google.com; s=arc-20160816; b=WkgqfklO+O9czUS7bBZ7c8AU8rNWf/EbG/GEKcdYzSkOkN09C78ZPTd4ZmMdzMd1OR qMPiIAwupZxGf7DNou47QTTDtd/bnpoEYIMVbxscbIfPNFwtkvF52uJ4VW/JU5bCXNMb HShwRDzeJ80oJU4q0tgDAi0gt2GEbNe1V98NFuJws+5K76r1bvOIgDvu7Hf8o2ehyDLr 9ASzotY834MXAXKtA8kM+6cj3z6f+3a+AkOqQYg0M0yVJLBFlNzoer9KOFuk0OUbauG8 qm+qU81HS4E4vWX89ZNCJ00++qr4tOUvwx9pkgyXH/foKiGw7iCtyn1r/p9LW9lmy2dr A6/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=NSr0ATvoVPT94Kw0PlP2HcPHUZbWsmv1leCf95/HD08=; b=kNlogy7sLpTV3zFl5fs4BArHLm7NGmPQ5971PDARvhurVN8icMEJ9W1Tp3qUvPxpu3 iMnJe2jNGBQZCmy31a4SSHMpkQt47VUorukaXS1HdLvcdlebmnKykoZMWNc+Asmd6WNI W6I/IDYcnPnoT7YmQTPmruTE/lzZz+XVruTx4sNq8z6Ll4UohkpRcT34oN4VJfHYbJJu hwM5hszWa2gfQE2+X72+maj2zzQJNLymqZ2OakFdHqcemr7IS8GZ6j36xVA2Hq6bSFXx Re06+Hfcnd/9WkOEAiEy0jrSxU0nVq/hChvtcKK9UW1Co+kV3bzJhE5IMjKH2DxUnDKd E70g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=JePQfIz0; spf=pass (google.com: domain of philmd@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com. [170.10.133.124]) by mx.google.com with ESMTPS id n26si10289555edr.190.2021.05.03.14.11.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 May 2021 14:11:27 -0700 (PDT) Received-SPF: pass (google.com: domain of philmd@redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=JePQfIz0; spf=pass (google.com: domain of philmd@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620076286; 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=NSr0ATvoVPT94Kw0PlP2HcPHUZbWsmv1leCf95/HD08=; b=JePQfIz0Fd1Pnn4d7E5+Jfk/U86q+Cr39BMaNNSNWt7D1MLXrDzlfwTdsm8MmfQ7DiEkt1 JLuxrQPa2fv2B8Ksn284wil6eQ1KkipoPF26f/bmKk9Cs1N8CvaBNRjuMmCy8hLVQd2/cR zI2H8I8KovmX0f1CDz3TAxmWB1gmz5U= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-46-83tXDavdM_qezXTbjchPGA-1; Mon, 03 May 2021 17:11:04 -0400 X-MC-Unique: 83tXDavdM_qezXTbjchPGA-1 Received: by mail-wr1-f71.google.com with SMTP id l2-20020adf9f020000b029010d6bb7f1cbso4645534wrf.7 for ; Mon, 03 May 2021 14:11:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NSr0ATvoVPT94Kw0PlP2HcPHUZbWsmv1leCf95/HD08=; b=Ux3Sts3FjEfnrUKzxmC+26t6KMXqOeEnmogIoJ8w9ynwrFHohBzWq7/tUAhQmsiIvz EVLDfBPFEj7yvAqAzGTjegqg9jMWTfSbLVSRjkS9JTHQweHimO6QZbK//qCbV9WGgQm4 0OKKxqgx3FTJDhBGZVTvU5nxND+azUpAvc+YHcaFbOMJM/GtOS0aBZk5dLk3JLRowjCJ ikVaf2OpG4IW8+sy/LTRrgkZvxrUw9R/pdGR1wjkFcqWLeVqsvVLkl+GP0CGnJD/84dM Mvwjp3okorgbt5kTlFZiPIrg7E9PEoqY6sOaQTgHRZ6rsaaOvOYhQICzYju70rtKk7p9 9KdA== X-Gm-Message-State: AOAM5329ZxikfOnrgjAi4i4DTe/zOC1+4/TdP/Z7cBRFh1D84Kwkw18G ewiAoeW9/B1P1qnmFf3jcIuoYBMCnegdRtq0hBB9O9OGIeAg8OXfBZ4vl94r3Dl7JYdJD6XM+WB 19LFLvFE/vWMEqnAm X-Received: by 2002:a5d:694c:: with SMTP id r12mr19922312wrw.224.1620076263875; Mon, 03 May 2021 14:11:03 -0700 (PDT) X-Received: by 2002:a5d:694c:: with SMTP id r12mr19922293wrw.224.1620076263712; Mon, 03 May 2021 14:11:03 -0700 (PDT) Return-Path: Received: from x1w.redhat.com (anancy-651-1-208-144.w109-217.abo.wanadoo.fr. [109.217.237.144]) by smtp.gmail.com with ESMTPSA id f18sm549071wmg.26.2021.05.03.14.11.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 May 2021 14:11:03 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Michael S. Tsirkin" , Thomas Huth , Markus Armbruster , Eric Blake , Paolo Bonzini , qemu-arm@nongnu.org, Igor Mammedov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Gibson , Greg Kurz , Cornelia Huck , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Juan Quintela , "Dr. David Alan Gilbert" , Laurent Vivier Subject: [PATCH v6 08/12] qtest/migration-test: Skip tests if KVM not builtin on s390x/ppc64 Date: Mon, 3 May 2021 23:10:16 +0200 Message-Id: <20210503211020.894589-9-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210503211020.894589-1-philmd@redhat.com> References: <20210503211020.894589-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-TUID: bbao+78/XQ/N 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. Reviewed-by: David Gibson Reviewed-by: Greg Kurz Reviewed-by: Cornelia Huck Reviewed-by: Alex Bennée Signed-off-by: Philippe Mathieu-Daudé --- tests/qtest/migration-test.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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(); } -- 2.26.3 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=-16.5 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,URIBL_BLOCKED,USER_AGENT_GIT 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 B1810C433ED for ; Mon, 3 May 2021 21:19:24 +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 5A9B461185 for ; Mon, 3 May 2021 21:19:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5A9B461185 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:52742 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldfyN-0006nu-D6 for qemu-devel@archiver.kernel.org; Mon, 03 May 2021 17:19:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40522) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldfqR-0005GT-1W for qemu-devel@nongnu.org; Mon, 03 May 2021 17:11:11 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:27700) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldfqP-0007Of-4k for qemu-devel@nongnu.org; Mon, 03 May 2021 17:11:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620076268; 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=NSr0ATvoVPT94Kw0PlP2HcPHUZbWsmv1leCf95/HD08=; b=LVDWjrr6M4pA70l3kcvK3B7VbJ5ynwrgYg32551vVSlI4z7TOy/Z0YgcWoxpq9AAOuR4Ck XWRpTWKJXVqsIRx9kHJjFRdNU0aML+CWv5jmSPFfKmdQ3Ff0zDBAaaSv5hl6RwnBpS/YD7 oGNaU5JSoEEp5BQmfqhRcjCCGruqI0U= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-214-0aAWhiazOtacL3yKxaoVGQ-1; Mon, 03 May 2021 17:11:05 -0400 X-MC-Unique: 0aAWhiazOtacL3yKxaoVGQ-1 Received: by mail-wr1-f69.google.com with SMTP id u5-20020adf9e050000b029010df603f280so1704835wre.18 for ; Mon, 03 May 2021 14:11:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NSr0ATvoVPT94Kw0PlP2HcPHUZbWsmv1leCf95/HD08=; b=A5Gelpj+NYSM4yVLmYnd+ox3RYGv16hirr6hlLoCD2D8Rct+7AWyK/DizquPH4TDWd Pcz5fMk0RMAJgCVD/6XwOjMLqP0lpIacMIFN6J93j5SyKlyuBvOwGih5c8MuB6cR9wjG 0sah8oNPpEQVZ9oaPEhYGeOXVZ+Qd3kJBiyu/IWaeCEQ/LZKW/3Gc8E+wb0GLXfru6et yjUCDry6DixAq4jJRhMApPLqEthnx6NsLTE6+Vhedf+JPGWnV8t5l6Vsbu3pIyOJ9Exf 5hDecJkrI8ZrlXECLYqNBPqt5Vsclt1z/jyhSSI3d3mUZXiQd6GeYllAm529kvmHjds6 EB4g== X-Gm-Message-State: AOAM531cATnpCht+wMKNSrOnydZQo2ieZZ17Dnlqw5yyd0+3oNcsPLAG 8fu/MxBEg+bmaop+4/YyxdTgJK9P/XlKpn4MsWOFWhADU1/1OwjHlKVqLkliHsoZROrM3duDBFO wGUmMf6pijGkJ1EEcouHsHuT+HwuSdZT+u2cuKYnQwL0bJLckHG+l+IALiY1jrF/b X-Received: by 2002:a5d:694c:: with SMTP id r12mr19922325wrw.224.1620076263908; Mon, 03 May 2021 14:11:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxXk4Rp8nF47WJi79SR59M5qxQEDP2BRMqT6EjyDdtaDzjU4XNikQMnT5N9foAzrLq4441Ueg== X-Received: by 2002:a5d:694c:: with SMTP id r12mr19922293wrw.224.1620076263712; Mon, 03 May 2021 14:11:03 -0700 (PDT) Received: from x1w.redhat.com (anancy-651-1-208-144.w109-217.abo.wanadoo.fr. [109.217.237.144]) by smtp.gmail.com with ESMTPSA id f18sm549071wmg.26.2021.05.03.14.11.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 May 2021 14:11:03 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v6 08/12] qtest/migration-test: Skip tests if KVM not builtin on s390x/ppc64 Date: Mon, 3 May 2021 23:10:16 +0200 Message-Id: <20210503211020.894589-9-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210503211020.894589-1-philmd@redhat.com> References: <20210503211020.894589-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.698, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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: Laurent Vivier , Thomas Huth , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cornelia Huck , Markus Armbruster , Greg Kurz , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Juan Quintela , qemu-arm@nongnu.org, Igor Mammedov , Paolo Bonzini , "Dr. David Alan Gilbert" , David Gibson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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. Reviewed-by: David Gibson Reviewed-by: Greg Kurz Reviewed-by: Cornelia Huck Reviewed-by: Alex Bennée Signed-off-by: Philippe Mathieu-Daudé --- tests/qtest/migration-test.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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(); } -- 2.26.3