From patchwork Fri Jun 4 15:51:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 454061 Delivered-To: patch@linaro.org Received: by 2002:a02:735a:0:0:0:0:0 with SMTP id a26csp541876jae; Fri, 4 Jun 2021 09:02:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyExPqBwmXRogW9c+SJSuIi9QPP77QOGUQ18EdgdTsp8n9npj95//fF6teZjRPVn9jnvBih X-Received: by 2002:a2e:b4c3:: with SMTP id r3mr3820521ljm.138.1622822529796; Fri, 04 Jun 2021 09:02:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622822529; cv=none; d=google.com; s=arc-20160816; b=pUqr5KseXg1vl305/iNnLZrQhsNNP74uRTuja/s+uhpLOqlzoLf/bx2hudrZYHYJ5n 4ipsH36M/lPxBsyKlK7EU9aLaX8pRNCCbl58A59M7oI8R86mlBfASSkojogRvXjH38aW XK90PGsuNFPohiSiKyT5P7DZlfrloXG/CXwRo+CWHE85w0jTidBoHUYz4MUK2VqMRTbm gGDyyEUfV72uDkYHWuezdZ3zeNOaKQ9u/aXCLp2m+O6yBNfcXHhS3VxmIIAlzJ5bfltP rom436CSMlkLGFjdx6asDmyUg6l21zWJWdl4XPcf7X+NZYQvywdTrVmnAa1ig5jFbwum b/nQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=ZW7hi0DfYBrqOjPk2iwpg84qtf2Zw2XIPeU/d/sNq6A=; b=l47kF5Rlrlc6BdMod/vUhCGbBcUvLeljJRomrVNI9aX07opZELpH91AXgPrEeAt8mm r2iaxVjDNL7l/r25bADPj6kB5W7Cu6nc94If7lz0ZkYkmwi0smdbSN5TlXP72K35qXfV Iiz3m520bSfCehrQNBFKiBpjb4KbPVlw2I0yitp1CN1XE83JomOGklfBpCrnk+U+JI2I jmiT3vMq6eAOsNBCD/lUvzpdyQWNg/HHfIgZwbfXCB7fcv5GETfb1RBMSZVbV65zKmW2 iO5rukHDC6/Kk/D8VcgoAVxy+uimoIPUZRl2c5HkMA+gFAXPbp/24UuWdh7eE74oy1Pl lEyg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=kMSlM8i+; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id v16si6892164ljh.187.2021.06.04.09.02.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 04 Jun 2021 09:02:08 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=kMSlM8i+; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:43662 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lpCGt-0004xE-Ld for patch@linaro.org; Fri, 04 Jun 2021 12:02:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44356) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lpC8T-0002TJ-Sr for qemu-devel@nongnu.org; Fri, 04 Jun 2021 11:53:25 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:37597) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lpC8R-0008Rv-9p for qemu-devel@nongnu.org; Fri, 04 Jun 2021 11:53:25 -0400 Received: by mail-wr1-x431.google.com with SMTP id i94so4753997wri.4 for ; Fri, 04 Jun 2021 08:53:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ZW7hi0DfYBrqOjPk2iwpg84qtf2Zw2XIPeU/d/sNq6A=; b=kMSlM8i+xPJ54AVpBAAaZTwcB0JEwBVVmLNzpVQl6rNdMmHeKcvvIH548K9xi/zJ5J Q+aPyx+yYPnKjAulG6recWcT52MwqoPVt3t/DC+M934wqBsNhIYiziyxcezyaVpdu6PY ZGJedqsC6Plzhh0CdFgUQi9QgM2HBkVrltwPEaNpgnVHvQmcN7uO6wzL5ATpEMeYwEQe ZZiSe4MAul5npTnLgwOTsGe67H5/P2rsyKVY36WncbAwXJQhMesMZ6hhPdvWEGKyw7dT jq3oxc27BsoUfg2GgX/pWg1gGNiJ9ysRsC7F9aX/nwzf+82RN9LrcKChyrRHQDh1+Mjh h79g== 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=ZW7hi0DfYBrqOjPk2iwpg84qtf2Zw2XIPeU/d/sNq6A=; b=HYFfBpEWPDlrlhZv6npwbSX8qBwrOkPEWEb2hfUG8QQ9d/XxjaZTsOmaKRdXHyj9Mc IToHqQmSrJxCBTztbsFquIIZkV7YY9E4D2vWNHwbvEEW9EWofH18ieZFkWh+2GP/gVTc MfGqsbJUQztS0yZDwybEh4wXrASivoa/FpXgSU7bj2u0EvFuo3dFM+O6RTZgEO2+ltQl MyEsvqTkzbekSmxAgUHubdrp1MhEBVz6QpBsFoGHA0pXbVXKyyCK2QuQACZ3+Z9Mk2tN D3uUJ7CDOktQx5NHbKVlBZo6uhwBW+JFvJkrOH+RoK8HsxQSIiy0z5qYoKEer91SePUI Rtqw== X-Gm-Message-State: AOAM533PVcIMpciTihHbYdlOg456RShD61VXFFEiQhYp0DfRlVAp6hl7 F2CbKvRDfrEKIpi5Dm9sCFCI1g== X-Received: by 2002:adf:dcc3:: with SMTP id x3mr4441419wrm.177.1622822001785; Fri, 04 Jun 2021 08:53:21 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id n8sm5892201wmi.16.2021.06.04.08.53.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Jun 2021 08:53:17 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1C6171FF96; Fri, 4 Jun 2021 16:53:13 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v16 08/99] qtest/migration-test: Skip tests if KVM not builtin on s390x/ppc64 Date: Fri, 4 Jun 2021 16:51:41 +0100 Message-Id: <20210604155312.15902-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210604155312.15902-1-alex.bennee@linaro.org> References: <20210604155312.15902-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x431.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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 , Juan Quintela , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , Cornelia Huck , Greg Kurz , "Dr. David Alan Gilbert" , qemu-arm@nongnu.org, Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , David Gibson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé 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é Signed-off-by: Alex Bennée Message-Id: <20210505125806.1263441-9-philmd@redhat.com> --- tests/qtest/migration-test.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.20.1 Reviewed-by: Thomas Huth diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c index 2b028df687..102bc36b91 100644 --- a/tests/qtest/migration-test.c +++ b/tests/qtest/migration-test.c @@ -1387,7 +1387,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(); } @@ -1398,7 +1398,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(); }