From nobody Wed Nov 19 22:14:36 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1618504416; cv=none; d=zohomail.com; s=zohoarc; b=SluESzQmwfM47gkUETx6nBsS4t8Je8cnqlGhgwuDuC+7sZ8JHGpIDBngAHxBWGHMoS+QM/nAhJo69sSVjplJFg2IUarO0PXyCBT6zm9isYI2p3Wu5ytqKPuOP2bavlYebljDPIOkr4Ssc3I1qUpNqWkAn6+7oXNpBu7V83i96y0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618504416; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=guk+TFRH4H8npjA92ucehbcfrQY0sqYaSCHgw+fxV9U=; b=Sx6fUl4ENNMTpeorUx6ist2jwKjEcx6IhRDti8mIvc9sa1hBf6q5lPNiwvZWNf3baen0qqDH4+aK7ZQiQaMlNPlSqC3aiG+zh17V8mrvH6hW0cVDyJ/E6zU9cMQYRzg4LrvkqrD630Cvcy5Nr2aHej+sJ5QkaBvW073HvyQiC14= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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 [170.10.133.124]) by mx.zohomail.com with SMTPS id 1618504416043318.59905758951913; Thu, 15 Apr 2021 09:33:36 -0700 (PDT) Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-410-qAMoHJaxMyy10N7DPc48Vg-1; Thu, 15 Apr 2021 12:33:33 -0400 Received: by mail-wm1-f72.google.com with SMTP id x20-20020a7bc2140000b029012bb4d2b5d6so3064110wmi.1 for ; Thu, 15 Apr 2021 09:33:33 -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 c16sm4237175wrt.83.2021.04.15.09.33.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Apr 2021 09:33:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1618504415; 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=guk+TFRH4H8npjA92ucehbcfrQY0sqYaSCHgw+fxV9U=; b=Vo4iMg6NJU8uetz4dDUge4u0XtPvgiFpk4g1w6ugv++u7i/O8prFjcjJB5Q915vRvYJJoG 4DOIcKptYQ9bW82N43h7GOnJC9w8jfpDEhZswN2OXd+3lnT+nAA4qe+CLIRxGAae6uA6hT +gpRuxFP2LfESlPjDKhEZ5PgHyUAQ84= X-MC-Unique: qAMoHJaxMyy10N7DPc48Vg-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=guk+TFRH4H8npjA92ucehbcfrQY0sqYaSCHgw+fxV9U=; b=LhCzlHThFPX4VWhtmMmQiUx05ahtZD3M2Rx7cuXtaQTCMqavOvSmdM83n98Y/38KFf zMJG5TROfS3PNMicYxJTKD+6m2AYOT3uzALj1szWWM6kbWWImSRy1k8710xXMCRUar+P 02Qk1OFWKANQ7+pESV5xd8p3sAp9wSh4xbkwtIghKXSSqJYet0TvOcNN2a6Dy1ovItrR EmDDT1EbEE3bLJHAToD97zEr3nNbvP3qkYodYEA8DmLXsSR2aPa0vmopvJIBwwVJpJ8z Mvpc45R8/ElUS94FAt/Ftz0KkNTOahTT2jllCf85lHyZO8d8LSNmIzfr1FomOjwuaFeE UAZA== X-Gm-Message-State: AOAM531tupu/6vjX8uQlHomnRP/eFjNj/MnR27wgr3zIHq0v3nNK2Nax 9ujI6rCL/GTUh2MY3jQbczbXyb3Ex9fw5AIxUXhauARGh2ZVWM4TgD8VmxdtH/oX+dAGcRTaUmQ Loo+ievLIu2Yycw== X-Received: by 2002:a05:6000:1371:: with SMTP id q17mr4470098wrz.326.1618504412585; Thu, 15 Apr 2021 09:33:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz37+TLiJ4JQ19VHyKVirevCnsB+vlTF+blZaCqp9kKRqtQnTtaB5LclLfiGkLP9dSG5P/+ag== X-Received: by 2002:a05:6000:1371:: with SMTP id q17mr4470067wrz.326.1618504412456; Thu, 15 Apr 2021 09:33:32 -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?= Subject: [PATCH v4 04/12] qtest/arm-cpu-features: Use generic qtest_has_accel() to check for KVM Date: Thu, 15 Apr 2021 18:32:56 +0200 Message-Id: <20210415163304.4120052-5-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) Use the recently added generic qtest_has_accel() method to check if KVM is available. Suggested-by: Claudio Fontana Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Andrew Jones --- 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 "}}" =20 -static bool kvm_enabled(QTestState *qts) -{ - QDict *resp, *qdict; - bool enabled; - - resp =3D qtest_qmp(qts, "{ 'execute': 'query-kvm' }"); - g_assert(qdict_haskey(resp, "return")); - qdict =3D qdict_get_qdict(resp, "return"); - g_assert(qdict_haskey(qdict, "enabled")); - enabled =3D 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 v= oid *data) =20 qts =3D qtest_init(MACHINE_KVM "-cpu max"); =20 - /* - * 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); } --=20 2.26.3