From nobody Sun May 19 01:15:25 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1615504461; cv=none; d=zohomail.com; s=zohoarc; b=T5T1l4ASQVBob0xdrSXrl6ulCKgme5973X9eiRBfC8NyhZstHL0Ff8B6jmvta7QTaPQy3Bhtq2Rz144azMFR9I2VpGe7XgcyS5ajX7wMTvdit7JwEUoRMjYf00BOMO2CwOHuyUI6zfPG3fFjlN6RWwxu4GlxqScRGsK85ddwdqM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615504461; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+9/A/riDh/u3/RZyU2QEb9TC3+IuIFZua1rs0ajVdzA=; b=h+JEp4ZUBGDmlRMMqeqgZFae2UzIDjGKHRvyPXGFS0aNp56czGLlaEWpTD9jk+pzxL5oDbOKkaErk8t3Hc1MzawyC+ilFYNTCqiGq/oOPs4CMMbf/F7qLKxGaqluriBsDtxXH2MLMmp7cmUiHFT/J7BmuuiHHlqF5Tc72tPHZUs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1615504461442223.0961766957239; Thu, 11 Mar 2021 15:14:21 -0800 (PST) Received: from localhost ([::1]:45778 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lKUVY-0003r6-Ec for importer@patchew.org; Thu, 11 Mar 2021 18:14:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49652) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lKUTf-0001h7-FE for qemu-devel@nongnu.org; Thu, 11 Mar 2021 18:12:23 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:59918) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lKUTW-00050E-5O for qemu-devel@nongnu.org; Thu, 11 Mar 2021 18:12:23 -0500 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-357-P-uEKJD3OcmfMa_I6DdHUw-1; Thu, 11 Mar 2021 18:12:12 -0500 Received: by mail-wm1-f72.google.com with SMTP id i14so4626956wmq.7 for ; Thu, 11 Mar 2021 15:12:11 -0800 (PST) Received: from localhost.localdomain (17.red-88-21-201.staticip.rima-tde.net. [88.21.201.17]) by smtp.gmail.com with ESMTPSA id s11sm276284wme.22.2021.03.11.15.12.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Mar 2021 15:12:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615504333; 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=+9/A/riDh/u3/RZyU2QEb9TC3+IuIFZua1rs0ajVdzA=; b=DD33atTyxk3olUJb8ZaRTKYkt/4RdaHFpJQMxREvp5q+90qKiaQW0N7O7Fu4HlIj46m7Z2 K1lmkg0UWMZT7nHIhnw7kmpSTeKkkALQRqR6GX5o02FW++QuG3Btcc8b4a5/DECLwuoi3g Ain15R5SzYfW04PXLxDx2nZAudK+M18= X-MC-Unique: P-uEKJD3OcmfMa_I6DdHUw-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=+9/A/riDh/u3/RZyU2QEb9TC3+IuIFZua1rs0ajVdzA=; b=hinh1+cYq65qZaWcO0QsX7NczGj+sjipzCOvI0czwIxf/sgzgv4zvL4tGEXmgRzb7y 9IjRS1GxZli1Lts6z28J8VFEleOG6lBTPocGsVa6F+9UuzsGiKXwrKBWdalSuyRbkKZw rqHOTcKDSP3tDit/AIOQ9GhWqWx0wFGKU/Aq+jFND11hiyxTuDGBkFuhSZ1bA4xNg+P/ fhrt/17XTCkcNbP4saB/FI+wrx/rQpkXklE3bt7XxnONyt6HU3gAlUFzBqRsKszUla3L qZ5kQTLSZ1R/TJfsUpbIr6VedbB6b1YEYJsoBbtsahE5LyPdLAOfy3VBT+pcVg74AitA JAiA== X-Gm-Message-State: AOAM533qhK29iQq0026j1Z3xQ8UxuR+77nwS+/OpEpCFhwYfxKN+GKeq +qam5J/IPRcRumfbKiIFCnVi2EcWFY4UpWe+ThHWZVeK5N1Wfnl6mZdsutc/Ss7JWiMjmotM8i9 2x89WOX+rFNMKUU1PGm664xv2OOJN66JgjnNlDZ8NKE1kPzBC0Ofy3SEQVFVd4iF4 X-Received: by 2002:a5d:6406:: with SMTP id z6mr11075620wru.264.1615504330842; Thu, 11 Mar 2021 15:12:10 -0800 (PST) X-Google-Smtp-Source: ABdhPJysXdqtJRmtotqOQgLz0vsf4bgNft74C9mKospRLq0C1t3KX6BCpSTwxs3d3bCiESNuhn56Uw== X-Received: by 2002:a5d:6406:: with SMTP id z6mr11075596wru.264.1615504330632; Thu, 11 Mar 2021 15:12:10 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Claudio Fontana Subject: [PATCH 1/6] accel: Introduce 'query-accels' QMP command Date: Fri, 12 Mar 2021 00:11:57 +0100 Message-Id: <20210311231202.1536040-2-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210311231202.1536040-1-philmd@redhat.com> References: <20210311231202.1536040-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 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.25, 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_H3=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 , Andrew Jones , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Eduardo Habkost , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Thomas Huth , Markus Armbruster , qemu-arm@nongnu.org, Paolo Bonzini , Igor Mammedov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Introduce the 'query-accels' QMP command which returns a list of built-in accelerators names. - Accelerator is an QAPI enum of all existing accelerators, - AcceleratorInfo is a QAPI structure providing accelerator specific information. Currently the common structure base provides the name of the accelerator, while the specific part is empty, but each accelerator can expand it. - 'query-accels' QMP command returns a list of @AcceleratorInfo For example on a KVM-only build we get: { "execute": "query-accels" } { "return": [ { "type": "qtest" }, { "type": "kvm" } ] } Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- qapi/machine.json | 55 +++++++++++++++++++++++++++++++++++++++++++++++ accel/accel-qmp.c | 47 ++++++++++++++++++++++++++++++++++++++++ accel/meson.build | 2 +- 3 files changed, 103 insertions(+), 1 deletion(-) create mode 100644 accel/accel-qmp.c diff --git a/qapi/machine.json b/qapi/machine.json index 330189efe3d..ffbf28e5d50 100644 --- a/qapi/machine.json +++ b/qapi/machine.json @@ -1471,3 +1471,58 @@ ## { 'event': 'MEM_UNPLUG_ERROR', 'data': { 'device': 'str', 'msg': 'str' } } + +## +# @Accelerator: +# +# An enumeration of accelerator names. +# +# Since: 6.0 +## +{ 'enum': 'Accelerator', + 'data': [ { 'name': 'qtest' }, + { 'name': 'tcg' }, + { 'name': 'kvm' }, + { 'name': 'hax' }, + { 'name': 'hvf' }, + { 'name': 'whpx' }, + { 'name': 'xen' } ] } + +## +# @AcceleratorInfo: +# +# Accelerator information. +# +# @name: The accelerator name. +# +# Since: 6.0 +## +{ 'union': 'AcceleratorInfo', + 'base': {'name': 'Accelerator'}, + 'discriminator': 'name', + 'data': { } } + +## +# @query-accels: +# +# Get a list of AcceleratorInfo for all built-in accelerators. +# +# Returns: a list of @AcceleratorInfo describing each accelerator. +# +# Since: 6.0 +# +# Example: +# +# -> { "execute": "query-accels" } +# <- { "return": [ +# { +# "type": "qtest" +# }, +# { +# "type": "kvm" +# } +# ] } +# +## +{ 'command': 'query-accels', + 'returns': ['AcceleratorInfo'] } diff --git a/accel/accel-qmp.c b/accel/accel-qmp.c new file mode 100644 index 00000000000..f16e49b8956 --- /dev/null +++ b/accel/accel-qmp.c @@ -0,0 +1,47 @@ +/* + * QEMU accelerators, QMP commands + * + * Copyright (c) 2021 Red Hat Inc. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "qapi/qapi-commands-machine.h" + +static const Accelerator accel_list[] =3D { + ACCELERATOR_QTEST, +#ifdef CONFIG_TCG + ACCELERATOR_TCG, +#endif +#ifdef CONFIG_KVM + ACCELERATOR_KVM, +#endif +#ifdef CONFIG_HAX + ACCELERATOR_HAX, +#endif +#ifdef CONFIG_HVF + ACCELERATOR_HVF, +#endif +#ifdef CONFIG_WHPX + ACCELERATOR_WHPX, +#endif +#ifdef CONFIG_XEN_BACKEND + ACCELERATOR_XEN, +#endif +}; + +AcceleratorInfoList *qmp_query_accels(Error **errp) +{ + AcceleratorInfoList *list =3D NULL, **tail =3D &list; + + for (unsigned i =3D 0; i < ARRAY_SIZE(accel_list); i++) { + AcceleratorInfo *info =3D g_new0(AcceleratorInfo, 1); + + info->name =3D accel_list[i]; + + QAPI_LIST_APPEND(tail, info); + } + + return list; +} diff --git a/accel/meson.build b/accel/meson.build index b44ba30c864..7a48f6d568d 100644 --- a/accel/meson.build +++ b/accel/meson.build @@ -1,4 +1,4 @@ -specific_ss.add(files('accel-common.c')) +specific_ss.add(files('accel-common.c', 'accel-qmp.c')) softmmu_ss.add(files('accel-softmmu.c')) user_ss.add(files('accel-user.c')) =20 --=20 2.26.2 From nobody Sun May 19 01:15:25 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1615504453; cv=none; d=zohomail.com; s=zohoarc; b=JlHxtHuhVdjJmrqYEY/ysimD9QnW12QThmU9sYhe5O+kwR8DMoAnzcmrY3tCHBNaqNoujt8XP6kW9abF21oWTW+B1ELfU/6O8GpFwEGgSVUkllD0Ye72V22WJ93C5umWfEGosrzVaAFQZR6aOo3XXY6s+qjEN/Gl83xaPqAT5B8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615504453; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=IiEzCG+Hf3rSrZ1O/fDyPl0nPuZdX/n6VTk+3584BFs=; b=U3YHa42PbJEQdWHNboSN3nM4hMO9AXQdzdced9CG+PeuTfTCHlBGn+pyuNq23mPvy6BTEHplJFUJEc188N4gZkG/AHgF8Ir+7LWV+kKnSBQb6tZoL4FZyxKvX4qVItkz+uUmSxenmhvLctX+usEfZMwx2EuEtZZ7kP/JVOfX9HI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1615504453836806.027712052598; Thu, 11 Mar 2021 15:14:13 -0800 (PST) Received: from localhost ([::1]:44922 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lKUVQ-0003Vz-MF for importer@patchew.org; Thu, 11 Mar 2021 18:14:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49756) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lKUTr-0001kw-8l for qemu-devel@nongnu.org; Thu, 11 Mar 2021 18:12:35 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:53972) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lKUTb-00051s-Ei for qemu-devel@nongnu.org; Thu, 11 Mar 2021 18:12:33 -0500 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-145-H8bw_UezOEK7lqSmkwTMEw-1; Thu, 11 Mar 2021 18:12:17 -0500 Received: by mail-wm1-f69.google.com with SMTP id v5so4636290wml.9 for ; Thu, 11 Mar 2021 15:12:17 -0800 (PST) Received: from localhost.localdomain (17.red-88-21-201.staticip.rima-tde.net. [88.21.201.17]) by smtp.gmail.com with ESMTPSA id 75sm288962wma.23.2021.03.11.15.12.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Mar 2021 15:12:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615504338; 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=IiEzCG+Hf3rSrZ1O/fDyPl0nPuZdX/n6VTk+3584BFs=; b=OZKCWGKXT0fpcGVeFBpSyildN78/jiFNspjfjAmveUYqfHCHQsyjdPiUWiunwjjkALkE8V A7W12GTkQV6AusDBYCVbMBXjyePEdkwnUFU15LYuDOV1k8pJmAzxa1/7711aXAxB1mShrj mratCyVpixjJZaiJs3M/vYbYwHR7HvA= X-MC-Unique: H8bw_UezOEK7lqSmkwTMEw-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=IiEzCG+Hf3rSrZ1O/fDyPl0nPuZdX/n6VTk+3584BFs=; b=DRFYI5n9iuRWLiEwtWgKZSVS6sZrFLySX1ellkuNhJ8LIH+/OPIlTuMWmheF+9f5lH dRVIZsDhbPOKtw72gWxFGyKnSgiMQKZQ7vhFFS//n3Zks6wJiLP5N26ia2IFVgKz/jX2 lDV0NFL8Qfc53krliWNaHhmWhodGVvN3vD/kQafk1zurGqi1Sm+i0XW0c/jLpJ5EJfL7 uq1LWQph1G59AuOsBu5kiHmJ83ojo1DuayaGjGucReB9URsRfQesRQC9B/JgjdzAtjlh kCXr+hhypVBPBeBKlWKIxBtvwTgrOmdJ/FPecqA/x1QxNpaLysfa+L9z/RuJVnHkCJx/ LGUQ== X-Gm-Message-State: AOAM532fKnjYukCnrUh/2stXuPv9MTiXk8eQnxqrECntzg6dNRHonahO VYHkRDO0lULhJ8hFjXGNpntzQJfMzVpv4afoCWZH1SJMRa3NpXC9JenocJvjEUX/lqJzfA0i69O H1K5GcGLIqRRuxmoikjup3hgEGuo+Z8u+rjMpSr+HA2nDYN2qLaaZOkCU6aez0esV X-Received: by 2002:a7b:cbc1:: with SMTP id n1mr10495969wmi.30.1615504336102; Thu, 11 Mar 2021 15:12:16 -0800 (PST) X-Google-Smtp-Source: ABdhPJzb8NpJrjL9P9hQv7nyN4GfbO8u7FsaCkrKFjhXVT6GBZzi1fU+sszoxZdNK8ke3w24qRafUQ== X-Received: by 2002:a7b:cbc1:: with SMTP id n1mr10495946wmi.30.1615504335894; Thu, 11 Mar 2021 15:12:15 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Claudio Fontana Subject: [PATCH 2/6] tests/qtest: Add qtest_probe_accel() method Date: Fri, 12 Mar 2021 00:11:58 +0100 Message-Id: <20210311231202.1536040-3-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210311231202.1536040-1-philmd@redhat.com> References: <20210311231202.1536040-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 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.25, 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_H3=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 , Andrew Jones , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Eduardo Habkost , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Thomas Huth , Markus Armbruster , qemu-arm@nongnu.org, Paolo Bonzini , Igor Mammedov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Introduce the qtest_probe_accel() method which allows to query at runtime if a QEMU instance has an accelerator built-in. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/qtest/libqos/libqtest.h | 9 +++++++++ tests/qtest/libqtest.c | 24 ++++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/tests/qtest/libqos/libqtest.h b/tests/qtest/libqos/libqtest.h index a68dcd79d44..ebedb82ec98 100644 --- a/tests/qtest/libqos/libqtest.h +++ b/tests/qtest/libqos/libqtest.h @@ -763,6 +763,15 @@ void qmp_expect_error_and_unref(QDict *rsp, const char= *class); */ bool qtest_probe_child(QTestState *s); =20 +/** + * qtest_probe_accel: + * @s: QTestState instance to operate on. + * @name: Accelerator name to check for. + * + * Returns: true if the accelerator is built in. + */ +bool qtest_probe_accel(QTestState *s, const char *name); + /** * qtest_set_expected_status: * @s: QTestState instance to operate on. diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c index 71e359efcd3..57e7e55b9cc 100644 --- a/tests/qtest/libqtest.c +++ b/tests/qtest/libqtest.c @@ -872,6 +872,30 @@ void qtest_qmp_eventwait(QTestState *s, const char *ev= ent) qobject_unref(response); } =20 +bool qtest_probe_accel(QTestState *s, const char *name) +{ + bool has_accel =3D false; + QDict *response; + QList *accels; + QListEntry *accel; + + response =3D qtest_qmp(s, "{'execute': 'query-accels'}"); + accels =3D qdict_get_qlist(response, "return"); + + QLIST_FOREACH_ENTRY(accels, accel) { + QDict *accel_dict =3D qobject_to(QDict, qlist_entry_obj(accel)); + const char *accel_name =3D qdict_get_str(accel_dict, "name"); + + if (!strcmp(name, accel_name)) { + has_accel =3D true; + break; + } + } + qobject_unref(response); + + return has_accel; +} + char *qtest_vhmp(QTestState *s, const char *fmt, va_list ap) { char *cmd; --=20 2.26.2 From nobody Sun May 19 01:15:25 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1615504588; cv=none; d=zohomail.com; s=zohoarc; b=IQ3+y4a8flEdzjbTlIMirHgAwyGJq29SlFrcp1Q/durkKxY6bVmEvDFZZNarlpS3yqwKGY6M7G8K1XSc+XAxKLh6DLIB3P5zq26q8z311w2aqfHyjV2G6b3rhuQ5Wb12M5WhWiVsOJy0KFHL/N680OPgDPyFf4NTaLPm4YqC3pM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615504588; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=nCMOis7blvx2AGe7FC9c1Tgf4rXmZrQipdbYJNU+L/o=; b=HB1vKUgXU3+5/qGP+7j+1Rhe0alB0zAh370svjUO6jgxmvS3dnba8eagBEEMiqlYkoI6Tbd6lgPihISkstEHlNHXG1iujm7W3gOOS/34WSAHoSMApDVucSYXT1WRvL8iP1RycuU9djcF8p4tErx3nqqFVqYC41dcBuFto//h81Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1615504588214115.37069150942705; Thu, 11 Mar 2021 15:16:28 -0800 (PST) Received: from localhost ([::1]:54294 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lKUXb-0007UB-8K for importer@patchew.org; Thu, 11 Mar 2021 18:16:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49786) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lKUTv-0001n3-Sb for qemu-devel@nongnu.org; Thu, 11 Mar 2021 18:12:44 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:34191) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lKUTj-000533-1q for qemu-devel@nongnu.org; Thu, 11 Mar 2021 18:12:39 -0500 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-542-swLpa81BPMahMiAisMIafQ-1; Thu, 11 Mar 2021 18:12:22 -0500 Received: by mail-wr1-f69.google.com with SMTP id p12so7652773wrn.18 for ; Thu, 11 Mar 2021 15:12:22 -0800 (PST) Received: from localhost.localdomain (17.red-88-21-201.staticip.rima-tde.net. [88.21.201.17]) by smtp.gmail.com with ESMTPSA id b15sm291253wmd.41.2021.03.11.15.12.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Mar 2021 15:12:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615504344; 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=nCMOis7blvx2AGe7FC9c1Tgf4rXmZrQipdbYJNU+L/o=; b=bkMEq8IK9Wnm9f1tJ2hKI7jZAsQbzD/BExQ/XfsRwazQj6F3895AlBpIE3TD3CEoUvcR6D JdFq12VU0IHwkFcst48tYSJsJGSkQf/nrfi5obCoHzV/Hr311v2FgFfdVguVSI1UM4WypL Sq+xKiRfFd56/foxuSa71EcwOPBiJxI= X-MC-Unique: swLpa81BPMahMiAisMIafQ-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=nCMOis7blvx2AGe7FC9c1Tgf4rXmZrQipdbYJNU+L/o=; b=e3BbFM6wGQkS4d8ocXkEEHAPU66eYU4J3+8nzGqP3rQ+G2i9eCjBm9ARB2gqLliKbf 2AfFSbsYGh8ON/tVnt0TeqicA5MdEtf4qvA7oVx1HiHCFomhw7cfXjO5tqX92h5xi+B9 nzfEkuxDbH/KRrShjtMFSwO8w3S81zgAxx3UlsUCogwoIlZtOj2tXrT3NLS68l9LJ4xo kL93ksEL0FeS9tOAFDBUg9Nxds7UasC3A3JUOt3y+iTxk2mvZ29t/NGy+01uvYuQ5BXw W3CUsIdhujT7VhUiwvwJwynO0sreufDdRaBgK+L18NoOwUD6gTYUpEKso3JKo6DiHwCW MEnQ== X-Gm-Message-State: AOAM532M2dhu3ejjj5DMnc24V6d2RknGBZWahQtGhNQhGAXSmelsPG9B Mz8zhJud5IDmGBUsPivol7PLI3wOVwTg7FSNLfrSTTdMkCYecqHm9QT9Gmp1gE+bkiqbFcVYpSC EoEk3VfvChMuxjNjBV9U9mIl/gOw7UisXGZqgXLSHmR2H9yFVv8JFKG9uwkFY9pd5 X-Received: by 2002:a5d:68cd:: with SMTP id p13mr11500912wrw.247.1615504341270; Thu, 11 Mar 2021 15:12:21 -0800 (PST) X-Google-Smtp-Source: ABdhPJwInFVUV84B5PdSKhdE4HdFLGcMnxRBKBeaYszUKaj2EuY4HlNV4vKnqyVTihuG1/DAFujTqw== X-Received: by 2002:a5d:68cd:: with SMTP id p13mr11500890wrw.247.1615504341101; Thu, 11 Mar 2021 15:12:21 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Claudio Fontana Subject: [PATCH 3/6] qtest/bios-tables-test: Make test build-independent from accelerator Date: Fri, 12 Mar 2021 00:11:59 +0100 Message-Id: <20210311231202.1536040-4-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210311231202.1536040-1-philmd@redhat.com> References: <20210311231202.1536040-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 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.25, 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 , Andrew Jones , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Eduardo Habkost , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Thomas Huth , Markus Armbruster , qemu-arm@nongnu.org, Paolo Bonzini , Igor Mammedov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Now than we can probe if the TCG accelerator is available at runtime with a QMP command, we can remove the #ifdef'ry. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/qtest/bios-tables-test.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index e020c83d2a5..73378f9da94 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -718,15 +718,13 @@ static void test_acpi_one(const char *params, test_da= ta *data) char *args; bool use_uefi =3D data->uefi_fl1 && data->uefi_fl2; =20 -#ifndef CONFIG_TCG - if (data->tcg_only) { - g_test_skip("TCG disabled, skipping ACPI tcg_only test"); - return; - } -#endif /* CONFIG_TCG */ - args =3D test_acpi_create_args(data, params, use_uefi); data->qts =3D qtest_init(args); + if (data->tcg_only && !qtest_probe_accel(data->qts, "tcg")) { + g_test_skip("TCG not available, skipping test"); + goto done; + } + test_acpi_load_tables(data, use_uefi); =20 if (getenv(ACPI_REBUILD_EXPECTED_AML)) { @@ -745,6 +743,7 @@ static void test_acpi_one(const char *params, test_data= *data) test_smbios_structs(data); } =20 +done: qtest_quit(data->qts); g_free(args); } --=20 2.26.2 From nobody Sun May 19 01:15:25 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1615504682; cv=none; d=zohomail.com; s=zohoarc; b=T8gGQYaGiXugZD7GWgcwslJN3Ak3UEnRYimGxggONnVSK7eK2SUw6B1adOqtkErVFu6yLu29JD7zvPNQgZnchLu+jzz/1e/OG4I8FN+Bxw576tL3X97Nw7LiD3KdqNU/z8D7y70tv8Rpm9Kfc/GSHz6eDfLgvAr0cJtFpFeyzTo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615504682; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=HdOBjBLcdbMXP51scg5DrlFZj8mW1XPQm5WfkP9UVng=; b=P9Rio21/RGpbxZPQ1DpQS/8pyO4CkYavDBNk8OEazEEAWUkvSRgWnTjZbEdRpMO7WZbgQlO2w5WRZQ0wySjCSfQYQvPx7if4PXttGZAArl/p3MH1Tgn9IUz69TkiCpQ37s8kfehQNi4rT117O9Bu2++yngwZECDkwuELmSm8B24= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1615504682251698.5095037505786; Thu, 11 Mar 2021 15:18:02 -0800 (PST) Received: from localhost ([::1]:57166 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lKUZ7-0000Km-8o for importer@patchew.org; Thu, 11 Mar 2021 18:18:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49826) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lKUU1-0001oQ-FZ for qemu-devel@nongnu.org; Thu, 11 Mar 2021 18:12:49 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:40129) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lKUTo-00056O-J8 for qemu-devel@nongnu.org; Thu, 11 Mar 2021 18:12:44 -0500 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-56-s9zCKpiyNS6-r-Ta12dBYg-1; Thu, 11 Mar 2021 18:12:28 -0500 Received: by mail-wm1-f70.google.com with SMTP id c7so4641952wml.8 for ; Thu, 11 Mar 2021 15:12:28 -0800 (PST) Received: from localhost.localdomain (17.red-88-21-201.staticip.rima-tde.net. [88.21.201.17]) by smtp.gmail.com with ESMTPSA id s23sm255991wmc.35.2021.03.11.15.12.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Mar 2021 15:12:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615504350; 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=HdOBjBLcdbMXP51scg5DrlFZj8mW1XPQm5WfkP9UVng=; b=MkNnYem2Lb7HW81MmLrkVHzTDPe/3R1NbySdrLUVHgxfogEn3+WXonAnrwV/8jsXl1sSOD VORk5eW8a2vWAxcUUWQdjxwVYQ7RItwre6+l46AzTeE+gLfWtaAZzv9ygqTtbhrWD6n7ND AkmgvnaPadGkN4xS7sZ6uAkAC+a4z6o= X-MC-Unique: s9zCKpiyNS6-r-Ta12dBYg-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=HdOBjBLcdbMXP51scg5DrlFZj8mW1XPQm5WfkP9UVng=; b=UAtrC3il/gKoS08iSz8NxyX9TxuUjuSKcIjUDuClAPCzD3nV/dGWHsPc2y44z1q2wK Uam4cyoDm5N0qCz+Gtkv/Z248C35urnhGCUxdpgkJAQkz7ZyF3xHvyu+N2OhE2277x3r 4eIAw+HbDiso5Wa/nTrkEpBOUTdL0wplgF7Ah+0lpYICHBFyry77j+JBvlN5v27wgPzT PguFfwF8Apkwvp2lcg4ccgpt50IvWtwgU5p+L9rnJfE9RU6XvNGB8iwsdgXY5vKwIHou RcFW2Zzi35/McVWi2ly0bdFoshku0d3wL5xdCVFMhgPxDL++jiiVMQjCPUh9+Uym+vGG 0uXg== X-Gm-Message-State: AOAM530m9Q5CepgeDbP++86P0lNDc0YTR8aGru0SCWx+oIHgcM6037r+ y1zaXHh7LCysgrhapGvFveStJHalOn9HJjU5E8dLg9QlhuOQK84UDJlMvl8NoVzG3J2j+JkcF4h KZDZ4hhwf2KQv6xSp04Ty6oCCZn0ptAuayaNIysfPkxnwAikQzroouG4xkS2ucV4R X-Received: by 2002:adf:e5c4:: with SMTP id a4mr10992793wrn.174.1615504346609; Thu, 11 Mar 2021 15:12:26 -0800 (PST) X-Google-Smtp-Source: ABdhPJxNLcz8VoON0vxaqyOVtbiqmCdBWPfk5PvjWnFcoWLBjEfFWyJmi8qYRwdZSaKQEGQYK1R38w== X-Received: by 2002:adf:e5c4:: with SMTP id a4mr10992771wrn.174.1615504346467; Thu, 11 Mar 2021 15:12:26 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Claudio Fontana Subject: [PATCH 4/6] qtest/arm-cpu-features: Check KVM availability at runtime Date: Fri, 12 Mar 2021 00:12:00 +0100 Message-Id: <20210311231202.1536040-5-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210311231202.1536040-1-philmd@redhat.com> References: <20210311231202.1536040-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 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.25, 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 , Andrew Jones , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Eduardo Habkost , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Thomas Huth , Markus Armbruster , qemu-arm@nongnu.org, Paolo Bonzini , Igor Mammedov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) sve_tests_sve_off_kvm() and test_query_cpu_model_expansion_kvm() are KVM specific tests. Skip them if KVM is not built-in. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/qtest/arm-cpu-features.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/tests/qtest/arm-cpu-features.c b/tests/qtest/arm-cpu-features.c index 8252b85bb85..2b70104515d 100644 --- a/tests/qtest/arm-cpu-features.c +++ b/tests/qtest/arm-cpu-features.c @@ -21,7 +21,7 @@ #define SVE_MAX_VQ 16 =20 #define MACHINE "-machine virt,gic-version=3Dmax -accel tcg " -#define MACHINE_KVM "-machine virt,gic-version=3Dmax -accel kvm -accel tcg= " +#define MACHINE_KVM "-machine virt,gic-version=3Dmax -accel kvm " #define QUERY_HEAD "{ 'execute': 'query-cpu-model-expansion', " \ " 'arguments': { 'type': 'full', " #define QUERY_TAIL "}}" @@ -413,6 +413,10 @@ static void sve_tests_sve_off_kvm(const void *data) QTestState *qts; =20 qts =3D qtest_init(MACHINE_KVM "-cpu max,sve=3Doff"); + if (!qtest_probe_accel(qts, "kvm")) { + g_test_skip("KVM not available, skipping test"); + goto done; + } =20 /* * We don't know if this host supports SVE so we don't @@ -424,6 +428,7 @@ static void sve_tests_sve_off_kvm(const void *data) assert_sve_vls(qts, "max", 0, NULL); assert_sve_vls(qts, "max", 0, "{ 'sve128': false }"); =20 +done: qtest_quit(qts); } =20 @@ -492,6 +497,10 @@ static void test_query_cpu_model_expansion_kvm(const v= oid *data) QTestState *qts; =20 qts =3D qtest_init(MACHINE_KVM "-cpu max"); + if (!qtest_probe_accel(qts, "kvm")) { + g_test_skip("KVM not available, skipping test"); + goto done; + } =20 /* * These tests target the 'host' CPU type, so KVM must be enabled. @@ -609,6 +618,7 @@ static void test_query_cpu_model_expansion_kvm(const vo= id *data) assert_has_not_feature(qts, "host", "kvm-steal-time"); } =20 +done: qtest_quit(qts); } =20 --=20 2.26.2 From nobody Sun May 19 01:15:25 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1615504568; cv=none; d=zohomail.com; s=zohoarc; b=kGEFPoPZH4YhxHbUkVN06urDCqOKAaI1+owsLwWSWHmu3JUd3IlBXWlm2Bc7ANPmJOhV3l3fD7NtltufGUHJoTIgk+XMaL9p3vonPEvM8/5l9yl6pT94ULdV8K/BW7/8x1R2+VOaDgH+aunRBVnZ4AQrII5F4APf+omjQrULnfE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615504568; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=RFAPWPzF+QVyifcBwUCcpdXWMGqVbGgf494aIhQQBM4=; b=Jjmx8yfOy23SsHWuX14RqS0junl8pw3T6FRLbwh75LO4/CC0zZ+QIpPtSvcwMHjsd6uP2NhU0Y3o37yagafLYtcKuzuT2qapzXtBJRsfkAxuDNgYDl/+JRrbMAK6Ic3yLmYeq2HN9tpwt3pBJeXhLUmdsCFf+cXtASQKnaMusvQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1615504568078468.9227202975193; Thu, 11 Mar 2021 15:16:08 -0800 (PST) Received: from localhost ([::1]:53052 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lKUXH-0006vR-2e for importer@patchew.org; Thu, 11 Mar 2021 18:16:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49830) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lKUU1-0001oS-HT for qemu-devel@nongnu.org; Thu, 11 Mar 2021 18:12:49 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:46945) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lKUTr-00056i-Dj for qemu-devel@nongnu.org; Thu, 11 Mar 2021 18:12:45 -0500 Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-378-4Wqt5vycOwu2FOk61MCbDw-1; Thu, 11 Mar 2021 18:12:33 -0500 Received: by mail-wr1-f72.google.com with SMTP id m23so5228623wrh.7 for ; Thu, 11 Mar 2021 15:12:33 -0800 (PST) Received: from localhost.localdomain (17.red-88-21-201.staticip.rima-tde.net. [88.21.201.17]) by smtp.gmail.com with ESMTPSA id d13sm6037274wro.23.2021.03.11.15.12.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Mar 2021 15:12:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615504354; 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=RFAPWPzF+QVyifcBwUCcpdXWMGqVbGgf494aIhQQBM4=; b=Fj5KZ8A9mzB/XasUNwnzUuKqdtmWaFuJgXQvNa9YGUwq8HAlvasCYH6Ts1nlY48+vRL4U0 AjxULgU6TqKvR334RCqh8hLTsgNwC3l9xN+J39I2voL8TnM3vUxAExCbv9GXnE0EjEO4jr CmuBRrn4i8+EiVSmeLHdK1e2ycxfkKk= X-MC-Unique: 4Wqt5vycOwu2FOk61MCbDw-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=RFAPWPzF+QVyifcBwUCcpdXWMGqVbGgf494aIhQQBM4=; b=p3DumM+m6RalYurbad7lrvYtA+oyb1NB3oUCyNuXnleisTsUKv7ZKIQHR0bjKdCtdk 5qAAtmqZ04YkRH2Dsy9he/mG86LPMv9sKe6tU4/4a9JHnlbBUwuriTuRTwXA+yfclsLm NgZDc+UWzXhtCuUeLJ2zWyveClRyLR7+MKfVSCnbyjrfLKSfZhihRXlV1oB7DAvIOt2E RwdhtBdDMvuPihfLU967gES6115pLS0cORFpogBTJJ9WExwF/WMuD7+OYVfR1wc6Ssd4 ThPpObp5AYcRESAKu16hU1aZFjIy876d9/6MZY8wWKOghONW116OEhqj8w1UwORzmN/Z BaYw== X-Gm-Message-State: AOAM530TmxLSKbiPoBa9qy8XDSA62LmPVo6sVrSK+fFgVl3F9JdEnB4c pQ+qr7lp07xMCCDcKqd6vc1c1JQSQY7LP5eK8zm6DewLJ5R1WpRTmcRuf2Pia85/KvMBSfcWWNq CZgWWNB9rQrQlDw5qV8EBw+KY5fCwSXPFK89mbJ1gq/aYDzwaQraWfPnA4hbjoP8G X-Received: by 2002:adf:a2cf:: with SMTP id t15mr11421892wra.250.1615504351838; Thu, 11 Mar 2021 15:12:31 -0800 (PST) X-Google-Smtp-Source: ABdhPJyQHPfYI7RPFM7ojwKpQ4LZ+KuOHHkUYjLR4IZIvh+wazRrJ+xdJwFFOJ/N6jrFtTYp33EOEw== X-Received: by 2002:adf:a2cf:: with SMTP id t15mr11421869wra.250.1615504351689; Thu, 11 Mar 2021 15:12:31 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Claudio Fontana Subject: [PATCH 5/6] qtest/arm-cpu-features: Check TCG availability at runtime Date: Fri, 12 Mar 2021 00:12:01 +0100 Message-Id: <20210311231202.1536040-6-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210311231202.1536040-1-philmd@redhat.com> References: <20210311231202.1536040-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 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.25, 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 , Andrew Jones , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Eduardo Habkost , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Thomas Huth , Markus Armbruster , qemu-arm@nongnu.org, Paolo Bonzini , Igor Mammedov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Now than we can probe if the TCG accelerator is available at runtime with a QMP command, skip these TCG specific tests when TCG is not built into the QEMU binary. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/qtest/arm-cpu-features.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/tests/qtest/arm-cpu-features.c b/tests/qtest/arm-cpu-features.c index 2b70104515d..7acdccd10ef 100644 --- a/tests/qtest/arm-cpu-features.c +++ b/tests/qtest/arm-cpu-features.c @@ -20,7 +20,7 @@ */ #define SVE_MAX_VQ 16 =20 -#define MACHINE "-machine virt,gic-version=3Dmax -accel tcg " +#define MACHINE_TCG "-machine virt,gic-version=3Dmax -accel tcg " #define MACHINE_KVM "-machine virt,gic-version=3Dmax -accel kvm " #define QUERY_HEAD "{ 'execute': 'query-cpu-model-expansion', " \ " 'arguments': { 'type': 'full', " @@ -352,7 +352,11 @@ static void sve_tests_sve_max_vq_8(const void *data) { QTestState *qts; =20 - qts =3D qtest_init(MACHINE "-cpu max,sve-max-vq=3D8"); + qts =3D qtest_init(MACHINE_TCG "-cpu max,sve-max-vq=3D8"); + if (!qtest_probe_accel(qts, "tcg")) { + g_test_skip("TCG not available, skipping test"); + goto done; + } =20 assert_sve_vls(qts, "max", BIT_ULL(8) - 1, NULL); =20 @@ -380,6 +384,7 @@ static void sve_tests_sve_max_vq_8(const void *data) assert_sve_vls(qts, "max", 0xff, "{ 'sve256': true }"); assert_error(qts, "max", "cannot disable sve256", "{ 'sve256': false }= "); =20 +done: qtest_quit(qts); } =20 @@ -387,7 +392,11 @@ static void sve_tests_sve_off(const void *data) { QTestState *qts; =20 - qts =3D qtest_init(MACHINE "-cpu max,sve=3Doff"); + qts =3D qtest_init(MACHINE_TCG "-cpu max,sve=3Doff"); + if (!qtest_probe_accel(qts, "tcg")) { + g_test_skip("TCG not available, skipping test"); + goto done; + } =20 /* SVE is off, so the map should be empty. */ assert_sve_vls(qts, "max", 0, NULL); @@ -405,6 +414,7 @@ static void sve_tests_sve_off(const void *data) assert_sve_vls(qts, "max", 0x3, "{ 'sve': true, 'sve128': true, 'sve256': true }"); =20 +done: qtest_quit(qts); } =20 @@ -448,7 +458,11 @@ static void test_query_cpu_model_expansion(const void = *data) { QTestState *qts; =20 - qts =3D qtest_init(MACHINE "-cpu max"); + qts =3D qtest_init(MACHINE_TCG "-cpu max"); + if (!qtest_probe_accel(qts, "tcg")) { + g_test_skip("TCG not available, skipping test"); + goto done; + } =20 /* Test common query-cpu-model-expansion input validation */ assert_type_full(qts); @@ -489,6 +503,7 @@ static void test_query_cpu_model_expansion(const void *= data) "{ 'aarch64': false }"); } =20 +done: qtest_quit(qts); } =20 --=20 2.26.2 From nobody Sun May 19 01:15:25 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1615504363; cv=none; d=zohomail.com; s=zohoarc; b=js7B+NaqpHFGgixsoYyYWPBKnGZOMmM3wLZZ3AN7VYKNWmUUIvsqHYgolOEhbvE+fZECaxOnYNcKVqcfB8AQf7ypcbzZCN2Gr4/BkYSmKmLxO+CfQwOW5prlFxSZVxkVtwhRNpBZ3+f0B1pHlDG26UniimPsLY8Ol/PlTa9R2+I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615504363; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=r8j0KxZ86bkS8FC5cXOopVHnXZnokYuiGFfUmvAy3qc=; b=dCd8Mod4wdEGUBbSvDlUENTCKfT+zuEu/BEsodpgLMlAm4ja0bHSNh9ASM/Hp1Nkj6PihFLaZXivWbd+IFIA1SxFrL8U7NX9Z86mwojRAh23IJRSGqqhfl97y0we1br8sOlpoayym6YT/zzSXt8o0966PSuToD+Ry1zyYpzOIRM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1615504363187690.6897366797797; Thu, 11 Mar 2021 15:12:43 -0800 (PST) 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-269-yDiSVriOPcOJsa-9f6Oa3Q-1; Thu, 11 Mar 2021 18:12:38 -0500 Received: by mail-wr1-f71.google.com with SMTP id x9so10146952wro.9 for ; Thu, 11 Mar 2021 15:12:38 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (17.red-88-21-201.staticip.rima-tde.net. [88.21.201.17]) by smtp.gmail.com with ESMTPSA id b186sm252054wmc.44.2021.03.11.15.12.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Mar 2021 15:12:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615504362; 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=r8j0KxZ86bkS8FC5cXOopVHnXZnokYuiGFfUmvAy3qc=; b=PcAlyXmzyPkiClVSiixpdDG+jmVV6W1CW6YvYXgb3z6TgIHCKZzbQjKRAyHils6bCYvRIG R2Aj+PT5UD43qSSgdJnVipJajXdlaoweZDuBGhh0BlY4D15T/5FmK1a7ffPR4tVyBq3y1d 0JryJIN74RUYYTaTArMF4/k2m/xXwqU= X-MC-Unique: yDiSVriOPcOJsa-9f6Oa3Q-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=r8j0KxZ86bkS8FC5cXOopVHnXZnokYuiGFfUmvAy3qc=; b=A9vUQys2Ak4h+xs6IfNRoG44KMq6LQN33xYZ2K70WRx3UUsN7pVFzVo/yQJ85sANEC qTNqRLR4SbDzzViTulXY0YuWxG4EWN9mUqkQtAtzCbdqDdYOCQdChJkGkJldBTq8YGtD 5jXhSk98UKMvnlgsRXNkvsCBpBDk/OxdNTTXoKesBU9UJrExSTYFuRiw9ShKgY0daBZS cYC5XZ/9aDXrl8qY+hsqsUfBnv2CpDnNy0jiezbt1xZkre+hqVG1e13UoiV4yw1RpLcb KGkxrWx6bVSVcAz84vW8M9y4fknBINKd1W5dqZwFM6GGEI1Zy3N4Rqtb9ZeN1i8X/Hdq Y6Ow== X-Gm-Message-State: AOAM532vez/41LMZvInrvmA32e7g27D7jnwxZWW0klLerAPS/V+xmnAO U2g5XJP+NTQ4Z46D3dLlA9xr/NfHFsB1dlM2Wt0154953ZIcS27DW39g52Zls/QV3a14Yg956yV UO3D9ppyPHeHZSA== X-Received: by 2002:a7b:c084:: with SMTP id r4mr10314895wmh.166.1615504357064; Thu, 11 Mar 2021 15:12:37 -0800 (PST) X-Google-Smtp-Source: ABdhPJyEvNU0cHRZNnfw0bnFjP0LSx3yZhNs4ohRSO5mg95G0xDrXPpy25VZBQxKHw9KoYheJMrzbw== X-Received: by 2002:a7b:c084:: with SMTP id r4mr10314884wmh.166.1615504356954; Thu, 11 Mar 2021 15:12:36 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Claudio Fontana Cc: Eduardo Habkost , Igor Mammedov , Laurent Vivier , Andrew Jones , Richard Henderson , qemu-arm@nongnu.org, Thomas Huth , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Eric Blake , "Michael S. Tsirkin" , Paolo Bonzini , Marcel Apfelbaum , Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 6/6] tests/qtest: Do not restrict bios-tables-test to Aarch64 hosts anymore Date: Fri, 12 Mar 2021 00:12:02 +0100 Message-Id: <20210311231202.1536040-7-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210311231202.1536040-1-philmd@redhat.com> References: <20210311231202.1536040-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) Since commit 82bf7ae84ce ("target/arm: Remove KVM support for 32-bit Arm hosts") we can remove the comment / check added in commit ab6b6a77774 and directly run the bios-tables-test. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/qtest/meson.build | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index 2688e1bfad7..405ae7a5602 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -170,14 +170,13 @@ 'boot-serial-test', 'hexloader-test'] =20 -# TODO: once aarch64 TCG is fixed on ARM 32 bit host, make bios-tables-tes= t unconditional qtests_aarch64 =3D \ - (cpu !=3D 'arm' ? ['bios-tables-test'] : []) + = \ (config_all_devices.has_key('CONFIG_TPM_TIS_SYSBUS') ? ['tpm-tis-device-= test'] : []) + \ (config_all_devices.has_key('CONFIG_TPM_TIS_SYSBUS') ? ['tpm-tis-device-= swtpm-test'] : []) + \ ['arm-cpu-features', 'numa-test', 'boot-serial-test', + 'bios-tables-test', 'xlnx-can-test', 'migration-test'] =20 --=20 2.26.2