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.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,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 2EE0EC47082 for ; Wed, 26 May 2021 17:08:52 +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 E02EF61184 for ; Wed, 26 May 2021 17:08:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E02EF61184 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]:59310 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1llx1X-0001XO-1L for qemu-devel@archiver.kernel.org; Wed, 26 May 2021 13:08:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44334) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llwyE-0006tg-7k for qemu-devel@nongnu.org; Wed, 26 May 2021 13:05:26 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:34637) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llwyC-0004E5-1k for qemu-devel@nongnu.org; Wed, 26 May 2021 13:05:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622048723; 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=MeNb2Atwfh/sX8kxLzvRexJijoqF1JUDJOimaLT3mRk=; b=ZIx32Pgp+eCTQoO+41QFbTxbyJ5bFt4tf0x57tb4y9HpzHlld02azomfUm2sxdLe6a+9ux 8XHFLEqrqyjZ/B67RWCIbKxHP2r1OBNyDN0xZ98JlrABVRwISr4n4Y2QFqEnpmNr91PTv9 SXiR0H4YynSGlgmRyLsp84uuc9wf7ic= 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-466-yAKXDNTSMnCL8MVoK-6JFw-1; Wed, 26 May 2021 13:05:21 -0400 X-MC-Unique: yAKXDNTSMnCL8MVoK-6JFw-1 Received: by mail-wr1-f69.google.com with SMTP id j33-20020adf91240000b029010e4009d2ffso629572wrj.0 for ; Wed, 26 May 2021 10:05:21 -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=MeNb2Atwfh/sX8kxLzvRexJijoqF1JUDJOimaLT3mRk=; b=IDT/TX7zb5A8UHOqdcXwYSQp65jR6poH0VtjKZmkwIDHRoSH1r7V1h7guRWBl6V7ov QMHls1MtVnTMm31ejKCTdH1QdivKrfkRH5nDldHaBoOyOEN0eIqNFgK9EuXPjLziOk0b VYaXOeG2E57thdJkPL5Dbfual8MW7VDUL/uw5DoQQtWJCVq1v1V0mzNC0dxQx7FEzZs/ SwcLckO0TVzC5MI9I4Had9g9izc15yGEQqHaO1BdCJQd8vNa67q47wB1aoZ/VjwrcwMd Qid9J+L0bTjHhMzptBEBlCgzju6gxS+qJskzKtYVAJL9yg7G87duz2toi+idtBT2KhJf XXxg== X-Gm-Message-State: AOAM530pQry1ujE3me/tiICN7E5GxbELLf+VPtBnekH2cylYeoocT51A gC8hHrdqtM0ymLi2+4UbjD6fHE8Fic1c5bKMV/1Z1O9K15AjxZxOkQOO92j1+VczHVXF6gC1a9q imFhyNqy6xd9CkCvA5nxoDyPXuccyuiywKhH2KuB1EjiPX/sVKfZz9NZLHKReJsjS X-Received: by 2002:a5d:59a4:: with SMTP id p4mr35039645wrr.248.1622048720228; Wed, 26 May 2021 10:05:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxae93qVMDwIUT5mL++yA99Wuz3sl1Pc1mHn7RTJgcPR9zNZyYvI9WXW24TycHPczc6T41tLQ== X-Received: by 2002:a5d:59a4:: with SMTP id p4mr35039606wrr.248.1622048719923; Wed, 26 May 2021 10:05:19 -0700 (PDT) Received: from localhost.localdomain (64.red-88-10-103.dynamicip.rima-tde.net. [88.10.103.64]) by smtp.gmail.com with ESMTPSA id y3sm20531104wrh.28.2021.05.26.10.05.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 May 2021 10:05:19 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v8 04/12] qtest/arm-cpu-features: Use generic qtest_has_accel() to check for KVM Date: Wed, 26 May 2021 19:04:24 +0200 Message-Id: <20210526170432.343588-5-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210526170432.343588-1-philmd@redhat.com> References: <20210526170432.343588-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: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.371, 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=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 , Peter Maydell , Andrew Jones , Eduardo Habkost , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Markus Armbruster , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-arm@nongnu.org, Claudio Fontana , Thomas Huth , Paolo Bonzini Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Use the recently added generic qtest_has_accel() method to check if KVM is available. Suggested-by: Claudio Fontana Reviewed-by: Andrew Jones Reviewed-by: Alex Bennée Signed-off-by: Philippe Mathieu-Daudé --- tests/qtest/arm-cpu-features.c | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/tests/qtest/arm-cpu-features.c b/tests/qtest/arm-cpu-features.c index 8252b85bb85..7f4b2521277 100644 --- a/tests/qtest/arm-cpu-features.c +++ b/tests/qtest/arm-cpu-features.c @@ -26,21 +26,6 @@ " 'arguments': { 'type': 'full', " #define QUERY_TAIL "}}" -static bool kvm_enabled(QTestState *qts) -{ - QDict *resp, *qdict; - bool enabled; - - resp = qtest_qmp(qts, "{ 'execute': 'query-kvm' }"); - g_assert(qdict_haskey(resp, "return")); - qdict = qdict_get_qdict(resp, "return"); - g_assert(qdict_haskey(qdict, "enabled")); - enabled = qdict_get_bool(qdict, "enabled"); - qobject_unref(resp); - - return enabled; -} - static QDict *do_query_no_props(QTestState *qts, const char *cpu_type) { return qtest_qmp(qts, QUERY_HEAD "'model': { 'name': %s }" @@ -493,14 +478,6 @@ static void test_query_cpu_model_expansion_kvm(const void *data) qts = qtest_init(MACHINE_KVM "-cpu max"); - /* - * These tests target the 'host' CPU type, so KVM must be enabled. - */ - if (!kvm_enabled(qts)) { - qtest_quit(qts); - return; - } - /* Enabling and disabling kvm-no-adjvtime should always work. */ assert_has_feature_disabled(qts, "host", "kvm-no-adjvtime"); assert_set_feature(qts, "host", "kvm-no-adjvtime", true); @@ -624,7 +601,7 @@ int main(int argc, char **argv) * order avoid attempting to run an AArch32 QEMU with KVM on * AArch64 hosts. That won't work and isn't easy to detect. */ - if (g_str_equal(qtest_get_arch(), "aarch64")) { + if (g_str_equal(qtest_get_arch(), "aarch64") && qtest_has_accel("kvm")) { qtest_add_data_func("/arm/kvm/query-cpu-model-expansion", NULL, test_query_cpu_model_expansion_kvm); } -- 2.26.3