From nobody Wed Nov 19 22:14:35 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1618504442; cv=none; d=zohomail.com; s=zohoarc; b=XTQNOi5O7IU86v5fPB+GQOuLbGVZ88s5wS39Lfv3QekIapSpEl7ZhU9TKa6co/aR+1ajZORtAUBVuiMsH8Fy4s1oGXQw1Nncgt7PaXH2iAiNI40JJ8GawrP82vli70GHEQdusSDLb6uoZDd3tapbs6SH0EhSOYjb/AQ89FL3sfY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618504442; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=0Z4+nmTFRYy19cLHZMOV8ZDTm2cOXzGsPlBiJeSnJ14=; b=g+rGgyz4utvlN6dTfi4Vm/878Uqi+mi+dyWrZ0/CfuqNUooBT7CgqwowSAsqk0A7VGQdN0CoIW3h/Q/9EXW0/DBD95Lj8beGwngYU4HDZPtefohf5CS7GTN3qyd68pCZFijY0wR8srefrV/fdI/bdEEOc4CPVYLIoeh3wrkz4W0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 161850444256811.955453119246954; Thu, 15 Apr 2021 09:34:02 -0700 (PDT) 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-578-MW85Qek0No-iDajNS1TgrA-1; Thu, 15 Apr 2021 12:33:59 -0400 Received: by mail-wr1-f71.google.com with SMTP id s9-20020a5d51090000b02901028ea30da6so2989412wrt.7 for ; Thu, 15 Apr 2021 09:33:59 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (39.red-81-40-121.staticip.rima-tde.net. [81.40.121.39]) by smtp.gmail.com with ESMTPSA id p14sm4199376wrn.49.2021.04.15.09.33.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Apr 2021 09:33:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1618504441; 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=0Z4+nmTFRYy19cLHZMOV8ZDTm2cOXzGsPlBiJeSnJ14=; b=GQkFQUHXkdCy6elNwNk+PvA2O+bYEM0NV7SWP4FNJUZUjvzUOQRO0auaNl62OiACA5o5Ly zHv7zfvYeKlydsimHBIhakkJRkVDGngF9fkzcv8H2HPJDXLZmzRlNH6g22vqE3GC+WUHcL sMwYKqFcRJIKsIgFKNKizp+UAEJOpqE= X-MC-Unique: MW85Qek0No-iDajNS1TgrA-1 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=0Z4+nmTFRYy19cLHZMOV8ZDTm2cOXzGsPlBiJeSnJ14=; b=oDhFCeP1ZOsYCtll4yGxB1MIyT5Rh8Y0lRU3YQOCwGbug7ovToKLbnen11V90npv5H lDWMtRB0KiyOcz5dhwXsT6P9+7HQamFTSQTO3CZNMIDi/d8EKjVWzRM3rxJD/YQEANbo Fdkc9RjDKBYwnqKgGi+XhQF8V/BSvZnjzlGEngg1vkfhcqYMb4qO5M2RDSjsmsxeZ/oe dqdmDQtLwf6jCFXVkQy0CPE5Mah7bXDOPLC3+HKlYtPH8QiJiqFil0hlq+r+v3mzuIve UuTkBnf3EUv+Bu2S5pByFWufqJ5TmBLTpQ8/c27SsN+YQ+tVCHM0hDEPA8dX1FQzx/j8 LmGQ== X-Gm-Message-State: AOAM5328Wbk94uKf3NfkeNBcHZxVXxlExjZa5eNu4LuTIHEUlgo1GOF1 09F5Mt6sQsHsvqS/UNTgFTCiC2nO/i/63qyUZLouo9EqKHJ+Gli9GrkmiJn1cAgCXo6Gz8+VH9j ZI6BHXYxtHOYiiA== X-Received: by 2002:a5d:4a0b:: with SMTP id m11mr4459649wrq.418.1618504438569; Thu, 15 Apr 2021 09:33:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwpuyhglUlPvakTWpHy21mJ0764Sj2G96xf+4G1NOtTlj39STYofLf6NYmV6s9CWnEhM+fUpw== X-Received: by 2002:a5d:4a0b:: with SMTP id m11mr4459620wrq.418.1618504438472; Thu, 15 Apr 2021 09:33:58 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Michael S. Tsirkin" , Claudio Fontana , Igor Mammedov , Eduardo Habkost , qemu-arm@nongnu.org, Paolo Bonzini , Marcel Apfelbaum , Markus Armbruster , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Laurent Vivier , Andrew Jones , Richard Henderson , Juan Quintela , Thomas Huth , Peter Maydell , "Dr. David Alan Gilbert" , Eric Blake , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Gibson , Greg Kurz , Halil Pasic , Cornelia Huck , Christian Borntraeger , qemu-ppc@nongnu.org, qemu-s390x@nongnu.org Subject: [PATCH v4 09/12] qtest/migration-test: Skip tests if KVM not builtin on s390x/ppc64 Date: Thu, 15 Apr 2021 18:33:01 +0200 Message-Id: <20210415163304.4120052-10-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210415163304.4120052-1-philmd@redhat.com> References: <20210415163304.4120052-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: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) 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. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Cornelia Huck Reviewed-by: Greg Kurz --- 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(-) 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 2.26.3