From nobody Tue May 7 18:52:51 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=1620219497; cv=none; d=zohomail.com; s=zohoarc; b=g+v0lkXN4V2H70BHttHQbmdHSv5YWaEE0BZ5c6jqaIVkRlbCpQxv6NvO7Vc4uScfzwtnXG0iymJBwc3kSPhctqw2vRr3nIsN+nwa5AwW0wXUBQ5BuNpyd6Zibi7EQgr0CGOIexn8ymxebsgqjRalhgaFLaHIe8XD6Pi1fM1s5fs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620219497; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=De1zNt8H2UUyBTh6D8k0brVA+tYPsHcMOj4zokKdIAU=; b=MQUTkQvVnL3xUFlyuCCwBDzgH3WIdCvFxqkEKjfFaVq15M8KghDqv83Cltv1USAJUlyvzK5WbjBaffCHoywMGUZDnDZuCxykPcUc9vfUUY3SCKz7E6B5+Q3jAKsqQeqWk1xlAH9DlwDNfgiehHF0IqKwGbPGZ9awrb6la5CcmcI= 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 1620219497119491.48266996791267; Wed, 5 May 2021 05:58:17 -0700 (PDT) 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-343-7CI6gzR2OmKioW-sFQITQA-1; Wed, 05 May 2021 08:58:14 -0400 Received: by mail-wm1-f69.google.com with SMTP id r10-20020a05600c2c4ab029014b601975e1so1400772wmg.0 for ; Wed, 05 May 2021 05:58:14 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (astrasbourg-653-1-188-220.w90-13.abo.wanadoo.fr. [90.13.127.220]) by smtp.gmail.com with ESMTPSA id a2sm16493076wrn.13.2021.05.05.05.58.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 May 2021 05:58:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620219496; 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=De1zNt8H2UUyBTh6D8k0brVA+tYPsHcMOj4zokKdIAU=; b=fc9JPwRE7EIDoTaAYGDYbFCJhBZiBV1gvk7GqFsvhEY/kvnyH1mPhZMj+ZFn6tvmc+vYIm kJZ4zNi2bt7+WjyrmELV0Q16aQUDClYA/RdJGPux4uZ2Inzu0jS/mdRSPFyZWvqn10zci1 KyUbfpg0CcfSh4yOMsMdxdEy4joMbGI= X-MC-Unique: 7CI6gzR2OmKioW-sFQITQA-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=De1zNt8H2UUyBTh6D8k0brVA+tYPsHcMOj4zokKdIAU=; b=T8KQ+iJR+c6t8IIJCvR5j3iDk6hve+gWCYF4RAySwRPjb1vczBPG/HinToLj1V44aU ChdoiiXX7V4cDLEJyWKoDlak64Y0LmOjVS73J7Pnf/KYFnu1RVoyDK9sBQZKvfsrz982 VJtBAb5FYq/737sR7sz/tCsiA/e6JLfM/s9dxGs60KnOKMP4Djq68O3PmUEhEUhWd1A6 OA82Uw9FIK7faQ7gBlZrXu4qhjLA/gT7JV8RaxleCoIsUtLokJ7rqTxcruIIHLLDW4tP Ii8IuKfCaRzdbLM9jf2lUF4q5Gfmcor98/IIsD9WAByFeHS2wMRa3BHrdyf6l5yU1sht Yhhg== X-Gm-Message-State: AOAM530U5bBUD3zFGHkrmSSqzqNqDnTmUTw9+/0AjQ4Oq/8be3ui/Zzy /H5OkVrxnAnyyNLvjUskvkuKoatkY7rh75Ib07G5oQkeV3RtN4MVw3muEb5474gpWG4awwptY3e Hi8CpCPX42BNHXw== X-Received: by 2002:a1c:7315:: with SMTP id d21mr33489804wmb.155.1620219493192; Wed, 05 May 2021 05:58:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzEZlWX4x/bJogMeFb0uPmSbBBi2YOvtb81vSYBU+2RaGY9OakUDotcJDquRckQTNvbUCp0WA== X-Received: by 2002:a1c:7315:: with SMTP id d21mr33489792wmb.155.1620219493076; Wed, 05 May 2021 05:58:13 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Andrew Jones , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PATCH v7 01/12] MAINTAINERS: Add qtest/arm-cpu-features.c to ARM TCG CPUs section Date: Wed, 5 May 2021 14:57:55 +0200 Message-Id: <20210505125806.1263441-2-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210505125806.1263441-1-philmd@redhat.com> References: <20210505125806.1263441-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 want the ARM maintainers and the qemu-arm@ list to be notified when this file is modified. Add an entry to the 'ARM TCG CPUs' section in the MAINTAINERS file. Acked-by: Andrew Jones Reviewed-by: Thomas Huth Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 8e4e3298104..61b58a4b7aa 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -156,6 +156,7 @@ S: Maintained F: target/arm/ F: tests/tcg/arm/ F: tests/tcg/aarch64/ +F: tests/qtest/arm-cpu-features.c F: hw/arm/ F: hw/cpu/a*mpcore.c F: include/hw/cpu/a*mpcore.h --=20 2.26.3 From nobody Tue May 7 18:52:51 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=1620219502; cv=none; d=zohomail.com; s=zohoarc; b=jQmK534+AG1wXhKvYx4o+pZyODx1VQSr6Xqa0nz/XU+C1RgmZdEJYuxRbiic90Liu7syqXpO8lDo7EB0Nx8I8tc6O4bALRxPHwpJPWlsm5X9sEU6lHour3jS6MjHDxI3I0OblMRjhVABycF4YIzOC+vXhcxcZ89iZ/8ezwJZkiE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620219502; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=P/JwIaYRijlIKIuvZy1yv4gicsUV0JiEB0BppIoUwQc=; b=DB+cHifsSkR7L4y4Dt050Zvrd0uwME4bE+Da9BLIqF1KLLoDLsNyA4copLxk0AV03ATUPxEWjPyw0k8Z2mQLBUe3WxMPr6F8oGqOrRqtTXmd+DwBV7DWOyfDazAnmeGammJNJeD1ZmLfVXxT/IVn1LJQDHMRcOJiBSmTfiBQU8Q= 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 1620219502694278.38194161469005; Wed, 5 May 2021 05:58:22 -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-373-ms9SwhyjNIWtWWcIWDCy9A-1; Wed, 05 May 2021 08:58:20 -0400 Received: by mail-wm1-f72.google.com with SMTP id j3-20020a1c55030000b029012e7c06101aso528154wmb.5 for ; Wed, 05 May 2021 05:58:20 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (astrasbourg-653-1-188-220.w90-13.abo.wanadoo.fr. [90.13.127.220]) by smtp.gmail.com with ESMTPSA id t17sm5549551wmq.12.2021.05.05.05.58.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 May 2021 05:58:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620219501; 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=P/JwIaYRijlIKIuvZy1yv4gicsUV0JiEB0BppIoUwQc=; b=XdgX0DvgxnIZHb17f66z7lpSIXCnVjT5OZFyuaSAqcwzHotnEZJqPeM9VFVOP46j9auZCS kwhusZI68Ay0yOUWKqG5uGGFXYMt2xtRgdWlzAysIve42aXLDsbU8WERjIC2rrD2SR20M/ yOmL7aMWbi8vqZeX9+tB0WCv/9qr4pQ= X-MC-Unique: ms9SwhyjNIWtWWcIWDCy9A-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=P/JwIaYRijlIKIuvZy1yv4gicsUV0JiEB0BppIoUwQc=; b=lU9vYk7aRRQ9MVMLzAKxDlanFw+QJdQvS7Y+nQtH4tig9hTNRclgaLLI7to7rdzNWY 4jZRc3cwWAKsw4JTJi7DXUg6/opwJ8z/K5Zt1ntE+XKLNN2lg6F+Yf52hltL/aQM0OsM H5SzFfwn1WRKn622hn9Xu6fNQ+I5HNrL1rVZfFEibU9mcc2F1sUTpI+vTtcP/H9LY6aF kW04JLHQIIRqbNvY0Is0nHEuB1Rrz2/ZBbwMN/xGr7+S7DCFBvhtkVHwW8yx+X9N+7zO GzBDe8jEpX3vyCzu629zRHbfElimp4o1I0N+z8j+5abLFNaUQnaPcDYf4eImk3/5c8y2 jv4Q== X-Gm-Message-State: AOAM531ZNyHewZm1lDPcDVpnuYibmR0TPLduvCl7+es7LztgJx1IXrjB A3dzJTCjsLwlmXhWW+LMILPW1U1e4RMl1WlEbrbuBrRXVU3NCorQOSracRFlLPGGbIQcZc7dIO5 2jimKytT/Hd11gg== X-Received: by 2002:a05:6000:2c5:: with SMTP id o5mr38823969wry.4.1620219499168; Wed, 05 May 2021 05:58:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxzfddUMR/7z6FhH2bRdBOJX1s/rBoxMBhZ2IIPKhNYmKXmoGjz5jCbDeKoHnchOnQLjBhKkw== X-Received: by 2002:a05:6000:2c5:: with SMTP id o5mr38823858wry.4.1620219498035; Wed, 05 May 2021 05:58:18 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eric Blake , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Eduardo Habkost , Marcel Apfelbaum , Markus Armbruster Subject: [PATCH v7 02/12] accel: Introduce 'query-accels' QMP command Date: Wed, 5 May 2021 14:57:56 +0200 Message-Id: <20210505125806.1263441-3-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210505125806.1263441-1-philmd@redhat.com> References: <20210505125806.1263441-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) Introduce the 'query-accels' QMP command which returns a list of built-in accelerator names. - Accelerator is a 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": [ { "name": "qtest" }, { "name": "kvm" } ] } Note that we can't make the enum values or union branches conditional because of target-specific poisoning of accelerator definitions. Reviewed-by: Eric Blake Reviewed-by: Alex Benn=C3=A9e Tested-by: Alex Benn=C3=A9e Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Eduardo Habkost --- qapi/machine.json | 47 +++++++++++++++++++++++++++++++++++++++++++++ accel/accel-qmp.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++ accel/meson.build | 2 +- 3 files changed, 97 insertions(+), 1 deletion(-) create mode 100644 accel/accel-qmp.c diff --git a/qapi/machine.json b/qapi/machine.json index 6e90d463fc9..6dd3b765248 100644 --- a/qapi/machine.json +++ b/qapi/machine.json @@ -1274,3 +1274,50 @@ ## { 'event': 'MEM_UNPLUG_ERROR', 'data': { 'device': 'str', 'msg': 'str' } } + +## +# @Accelerator: +# +# An enumeration of accelerator names. +# +# Since: 6.1 +## +{ 'enum': 'Accelerator', + 'data': [ 'hax', 'hvf', 'kvm', 'qtest', 'tcg', 'whpx', 'xen' ] } + +## +# @AcceleratorInfo: +# +# Accelerator information. +# +# @name: The accelerator name. +# +# Since: 6.1 +## +{ 'struct': 'AcceleratorInfo', + 'data': { 'name': 'Accelerator' } } + +## +# @query-accels: +# +# Get a list of AcceleratorInfo for all built-in accelerators. +# +# Returns: a list of @AcceleratorInfo describing each accelerator. +# +# Since: 6.1 +# +# Example: +# +# -> { "execute": "query-accels" } +# <- { "return": [ +# { +# "name": "qtest" +# }, +# { +# "name": "kvm" +# } +# ] } +# +## +{ 'command': 'query-accels', + 'returns': ['AcceleratorInfo'] } diff --git a/accel/accel-qmp.c b/accel/accel-qmp.c new file mode 100644 index 00000000000..426737b3f9a --- /dev/null +++ b/accel/accel-qmp.c @@ -0,0 +1,49 @@ +/* + * 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 bool accel_builtin_list[ACCELERATOR__MAX] =3D { + [ACCELERATOR_QTEST] =3D true, +#ifdef CONFIG_TCG + [ACCELERATOR_TCG] =3D true, +#endif +#ifdef CONFIG_KVM + [ACCELERATOR_KVM] =3D true, +#endif +#ifdef CONFIG_HAX + [ACCELERATOR_HAX] =3D true, +#endif +#ifdef CONFIG_HVF + [ACCELERATOR_HVF] =3D true, +#endif +#ifdef CONFIG_WHPX + [ACCELERATOR_WHPX] =3D true, +#endif +#ifdef CONFIG_XEN_BACKEND + [ACCELERATOR_XEN] =3D true, +#endif +}; + +AcceleratorInfoList *qmp_query_accels(Error **errp) +{ + AcceleratorInfoList *list =3D NULL, **tail =3D &list; + + for (Accelerator accel =3D 0; accel < ACCELERATOR__MAX; accel++) { + if (accel_builtin_list[accel]) { + AcceleratorInfo *info =3D g_new0(AcceleratorInfo, 1); + + info->name =3D accel; + + 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.3 From nobody Tue May 7 18:52:51 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=1620219506; cv=none; d=zohomail.com; s=zohoarc; b=QN5YOz92HBC/WpXfMQc+hZpwc9pJtqNf9cVbkw11rAySqg2ftBYnanQxV8igYH1U0695XzUDjE/8+IFCipjgQ61GP8cKEitvx0D2jzJtgDonnIeXzgcqC1Y9xWYzeX0bhCSz2dXkmZ+A83hS3pIWl4nJHGA/A8xy1Ya3LJJ2ZY8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620219506; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=KvNHYhxkAqUqa9h+Qg11UCChxb8z3nuwgPPE3IGPHzY=; b=CTLreFTaHgZI9SJKQEMHtKmreS7wZa8YOutKVJf9eGPG3pVEe1r0BE7/i9ARxhcjLLZZTUfNP1mWKyXeshhjo4g84924HRn9sSh9INoOWI0c+d9+6+82n8AUt2u5NxCw2K12Z8AowurZjQVr3TaidU8aaGqAMPcXFtz33DDFVeY= 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 1620219506542548.0482937872349; Wed, 5 May 2021 05:58:26 -0700 (PDT) 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-487-38gnma4hONKm59wurAnqTQ-1; Wed, 05 May 2021 08:58:23 -0400 Received: by mail-wr1-f69.google.com with SMTP id x10-20020adfc18a0000b029010d83c83f2aso672579wre.8 for ; Wed, 05 May 2021 05:58:23 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (astrasbourg-653-1-188-220.w90-13.abo.wanadoo.fr. [90.13.127.220]) by smtp.gmail.com with ESMTPSA id m18sm19402579wrn.69.2021.05.05.05.58.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 May 2021 05:58:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620219505; 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=KvNHYhxkAqUqa9h+Qg11UCChxb8z3nuwgPPE3IGPHzY=; b=M50zQExdI5z6pjmc9weBAtq99Zye3QYcml8OgkFIQ+jiaNNt81uTYNMI+zCYH9yAtLwBtA 8yGmUfrH4OyQRiUHZzm1589k1pWgTrSDpS9TxYc5ahwb26cqsVdOEgyWTdeWgjlY6jdfj2 UYljISgH830oIIJTNDGUvEs/i436T5c= X-MC-Unique: 38gnma4hONKm59wurAnqTQ-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=KvNHYhxkAqUqa9h+Qg11UCChxb8z3nuwgPPE3IGPHzY=; b=rF+40tsohp4yQwHmdi+w7D4gA3ZAIlnZd3nVbJYAIPgIaUv/5x2XYKRWSNOwP+q68c Bepj27XUwQmWD2rWxzwYnkW7Et5h+ZI2ZuGMbCZOI2lxrPlm/PE332LrS3P/HelvSoPn ti1jRoKkZDZO4Au+pFbGL4sY6HGJnMJhCqEnUsLYm+M7qWyrQXtpkVZTisZHvi7B1iAu W7SB9VnkKhKzSLVWfs9q6K5UxyNgbAXBOua7lztpVvHTCDCG7E4EcvV6u0H9OztRIHKb Zj8PnQK2vQEiO8B4pvRfNhfatx5M/nAGK5cZ+6vWzEL3YjlVHgfPwIO26dNUJ0MsSx53 tg9A== X-Gm-Message-State: AOAM5328xE7mhSwR+ZvH5+hk457RJib2vdRy7NOLTlA3CuAgNeEjwpN/ EVdO1q4mqkwv6LEQpXIvgAomxXUqJanIeO1VSC2SfsviALLTuiwiEzw3PKIVxI0lzjH2p5tPlF7 2E5LEFbnfjQj/Aw== X-Received: by 2002:adf:ed45:: with SMTP id u5mr15829976wro.199.1620219502816; Wed, 05 May 2021 05:58:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxNo2D6PZILA0Vq7wMbOkg2iDt7DfReg4mZ/bqMRnkvskJr+2GGSYypqiaUTWJko9PE3n/uNQ== X-Received: by 2002:adf:ed45:: with SMTP id u5mr15829959wro.199.1620219502615; Wed, 05 May 2021 05:58:22 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eric Blake , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , Laurent Vivier Subject: [PATCH v7 03/12] qtest: Add qtest_has_accel() method Date: Wed, 5 May 2021 14:57:57 +0200 Message-Id: <20210505125806.1263441-4-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210505125806.1263441-1-philmd@redhat.com> References: <20210505125806.1263441-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) Introduce the qtest_has_accel() method which allows a runtime query on whether a QEMU instance has an accelerator built-in. Reviewed-by: Eric Blake Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/qtest/libqos/libqtest.h | 8 ++++++++ tests/qtest/libqtest.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/tests/qtest/libqos/libqtest.h b/tests/qtest/libqos/libqtest.h index a68dcd79d44..d80c618c18d 100644 --- a/tests/qtest/libqos/libqtest.h +++ b/tests/qtest/libqos/libqtest.h @@ -763,6 +763,14 @@ void qmp_expect_error_and_unref(QDict *rsp, const char= *class); */ bool qtest_probe_child(QTestState *s); =20 +/** + * qtest_has_accel: + * @accel_name: Accelerator name to check for. + * + * Returns: true if the accelerator is built in. + */ +bool qtest_has_accel(const char *accel_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..2156b7e3972 100644 --- a/tests/qtest/libqtest.c +++ b/tests/qtest/libqtest.c @@ -393,6 +393,35 @@ QTestState *qtest_init_with_serial(const char *extra_a= rgs, int *sock_fd) return qts; } =20 +bool qtest_has_accel(const char *accel_name) +{ + bool has_accel =3D false; + QDict *response; + QList *accels; + QListEntry *accel; + QTestState *qts; + + qts =3D qtest_initf("-accel qtest -machine none"); + response =3D qtest_qmp(qts, "{'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 *name =3D qdict_get_str(accel_dict, "name"); + + if (g_str_equal(name, accel_name)) { + has_accel =3D true; + break; + } + } + qobject_unref(response); + + qtest_quit(qts); + + return has_accel; +} + + void qtest_quit(QTestState *s) { qtest_remove_abrt_handler(s); --=20 2.26.3 From nobody Tue May 7 18:52:51 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=1620219513; cv=none; d=zohomail.com; s=zohoarc; b=I5QENSjt7XJ1QAtWCH5c3JwhYOxFfVD2VhLGlwNE7VADqkyJgJRdTVTag0i0ayKf+4tRbBwSH6X6BC75SJQ3FPwjiFjMmN3ZDZAlQd3/5qhYnKOePVI96HyA3OsvGLiYLWbrLPpqeG29mJBRnoY5Wp7HSOeXraGzjE4nNuNbi5k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620219513; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=MeNb2Atwfh/sX8kxLzvRexJijoqF1JUDJOimaLT3mRk=; b=fxqjHJXI5meAFuVsLq4BcusakZ5K3VanWtO/rgc1hMqGLYFhXcjrx2rsfryxyZSMDL7cCB0vgO8C21LbsOrlMwFcILsQXcAGK1Q4rCf7QZ5hU05YiTnFK+OBRcN5TY3l9p5+2MPmU/UzNg7rjZdXflJBKTM1XfCA1IzoNEgKDn0= 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 1620219513120523.4391610595004; Wed, 5 May 2021 05:58:33 -0700 (PDT) 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-537-hC5xxXZENzuyIs7vWurMgA-1; Wed, 05 May 2021 08:58:28 -0400 Received: by mail-wm1-f69.google.com with SMTP id o126-20020a1c28840000b0290149b8f27c99so536457wmo.2 for ; Wed, 05 May 2021 05:58:28 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (astrasbourg-653-1-188-220.w90-13.abo.wanadoo.fr. [90.13.127.220]) by smtp.gmail.com with ESMTPSA id s6sm5774653wms.0.2021.05.05.05.58.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 May 2021 05:58:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620219512; 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=MGVjSmFaReSYZGpO0VbdZCU6c2Wc9D2yfhRfxs7F++QPtAsdMsKr0SCtHqsTn0ShPZpcB1 N6sR+IFAj+K7qvzgWosrHVhRN/ngI7StgubDhrnByGX0TMMI89OTgosOtGCc3eO8ZBwSTu YkXfxvPSz3ebBCAnAxkiJ0xrVPaUvkY= X-MC-Unique: hC5xxXZENzuyIs7vWurMgA-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=MeNb2Atwfh/sX8kxLzvRexJijoqF1JUDJOimaLT3mRk=; b=EbsexmnKCJhYW6y94oGH0ltdzefSxP0ZiXUPpPfQ0Zej+K0drI4cnOKEnFlyYSel5r bPecQIwqS03KtBFPw69ixdQfMgXYJFWGg3V1ss2zP7lP7Zzdye8o4N/WDQbX7jo429xb dPQ2enTiQ02GdMIe9Z94x4M05V8eYu+tlw/IG16tkKO+MZb1Ckr9MOu/OoMBSQhBYGBc v+FNgA4t29UDoD+wMOisvfBq2Q74S8L/aiZy2m6wTkzKd23hmQGJv2GaXbtl0xespqgH tsX+hcTBOF6CBVyG0Qb5zpwyvjc4PAm+nPEi8TeyGwGOfvRODXUkSNOMuTjqXeKDq1MW 9k0g== X-Gm-Message-State: AOAM531vYiBZAGanAv16l8eCsXPUFiKVRRuhn77lPcwYUjzq+E059Irx vabzgAIY/OnZrdWUtD9l+BJkSj2uD2VPunDmfQIvAqrDJFWJzdvd3Mv3Kcy0xS2oSksQstFIeke C5afxW7zMHCVlTw== X-Received: by 2002:adf:a116:: with SMTP id o22mr37998933wro.397.1620219507622; Wed, 05 May 2021 05:58:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyge0h/wiymcVXjJXd3QBty/x8vuP8k4DCj0Zye558z4zmLGVpjcqA6r95tFIn+sD0l+a2+kw== X-Received: by 2002:adf:a116:: with SMTP id o22mr37998915wro.397.1620219507504; Wed, 05 May 2021 05:58:27 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Claudio Fontana , Andrew Jones , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Maydell , Thomas Huth , Laurent Vivier , qemu-arm@nongnu.org (open list:ARM TCG CPUs) Subject: [PATCH v7 04/12] qtest/arm-cpu-features: Use generic qtest_has_accel() to check for KVM Date: Wed, 5 May 2021 14:57:58 +0200 Message-Id: <20210505125806.1263441-5-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210505125806.1263441-1-philmd@redhat.com> References: <20210505125806.1263441-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 Reviewed-by: Andrew Jones Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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 From nobody Tue May 7 18:52:51 2024 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=1620219516; cv=none; d=zohomail.com; s=zohoarc; b=mFdueF3JgY/izrK+tjijQEKE4L1rExN7eLb/H9PrjGhm+IbFCbPNPXoaB2ZGP7oDukdI1ZJMOVXEihjWriTR+Q/ZO84f8piVXW85I84y3tUL9KzO62FQwfByOh4xc138VzsN7AtaU3lor7YZ/nHgTpIBxZ0tAjxUuRoOKe76i/Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620219516; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=YUwsAY7j/ecV1UbnP3UC7xEIyUmH3VJq/XNOQQ4OyUg=; b=kKSTlsYvYeRjWBZo7J1sheW3t83+e1j9AW4oynywMRJug1VlOJu8eOKa0BfNAIv0a/DXpjEtdgrgE/IKaNsEK8S2tQO/nON0wV2zC29iUpsYJNLJB8eTPX7nI3XzRornovRhRtrQ09z68Hvjdm5nYuu7StVg/kNXgncs/Qo8AjA= 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 1620219516121213.3191239500453; Wed, 5 May 2021 05:58:36 -0700 (PDT) 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-252-yAyTqssPMJGDvhmpv-GYpQ-1; Wed, 05 May 2021 08:58:33 -0400 Received: by mail-wm1-f69.google.com with SMTP id d9-20020a1cb4090000b02901494f55f719so523257wmf.9 for ; Wed, 05 May 2021 05:58:33 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (astrasbourg-653-1-188-220.w90-13.abo.wanadoo.fr. [90.13.127.220]) by smtp.gmail.com with ESMTPSA id b6sm5296646wmj.2.2021.05.05.05.58.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 May 2021 05:58:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620219515; 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=YUwsAY7j/ecV1UbnP3UC7xEIyUmH3VJq/XNOQQ4OyUg=; b=i6UblkPR7VJgCSNDx7M+cb0zD9PhoceLfwEz9+j7MkG/yOWNeQy8PyVd1KifyScrsZItfb I3vALcm9oZ+QhTFY4qybr26uhe7rrhY5g0GnO1hhhQLQ3/RNQQ3pllCOXUOker46zlG8jK KDXiDiSli+UX8vqtatPHk/P3Ewhvmxs= X-MC-Unique: yAyTqssPMJGDvhmpv-GYpQ-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=YUwsAY7j/ecV1UbnP3UC7xEIyUmH3VJq/XNOQQ4OyUg=; b=BDjfKpJQ5BZzla+Q0h2ZzyYHbZrBcKejj6pPMd1HW9rSGpvA31cka6+2L0Tmf21Mt8 sJXwXv3awlwE6L2kxUIJSb1L9S/0ua51UYOtxXX3YyHE10AKVf7WExzG2QBOVhJhNh+u yrnTATmY6fsd82oHaDtL9iy2YUUcauTDiF3eKau4K5NZ1i5+TFuQn/pfrGGBSNMVdoRI iLTGzVHolRgeg0U9Znk2EPjk8t+Z4fjXtR12B8fUAjwmXq/fgwiG68um3ZBjkNUzpmiA CUgp9uMdU1W4XrptJ5XwdUMRzk+magalZh+RCB0lYhhVjY/o0823QmBiCvDS4AWdJk89 GY3A== X-Gm-Message-State: AOAM530ukoiURzBJ9u+z5Lj8dJDdOQGAtlJMtxqu30w9vPTXF0b2v/x/ VCiCF+f2wrrDhrnZ4Rnbpy5LCd44ExLjV3FJl+v2dvy8p8QqJJzSw5HFc9/l9NTTtGm59ABDj8M jYVDrS1PH194niA== X-Received: by 2002:a5d:4412:: with SMTP id z18mr37885718wrq.103.1620219512549; Wed, 05 May 2021 05:58:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyL52Ime6rCjsxt0GX0VJCfOUBOXUFj+c/2ykJ5szKoiXAE5gAz5Y8gFs3dc5bD54SGn1PioQ== X-Received: by 2002:a5d:4412:: with SMTP id z18mr37885692wrq.103.1620219512393; Wed, 05 May 2021 05:58:32 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Andrew Jones , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Maydell , Thomas Huth , Laurent Vivier , qemu-arm@nongnu.org (open list:ARM TCG CPUs) Subject: [PATCH v7 05/12] qtest/arm-cpu-features: Restrict sve_tests_sve_off_kvm test to KVM Date: Wed, 5 May 2021 14:57:59 +0200 Message-Id: <20210505125806.1263441-6-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210505125806.1263441-1-philmd@redhat.com> References: <20210505125806.1263441-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) The sve_tests_sve_off_kvm() test is KVM specific. Only run it if KVM is available. Suggested-by: Andrew Jones Reviewed-by: Andrew Jones Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/qtest/arm-cpu-features.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/qtest/arm-cpu-features.c b/tests/qtest/arm-cpu-features.c index 7f4b2521277..66300c3bc20 100644 --- a/tests/qtest/arm-cpu-features.c +++ b/tests/qtest/arm-cpu-features.c @@ -604,6 +604,8 @@ int main(int argc, char **argv) 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); + qtest_add_data_func("/arm/kvm/query-cpu-model-expansion/sve-off", + NULL, sve_tests_sve_off_kvm); } =20 if (g_str_equal(qtest_get_arch(), "aarch64")) { @@ -611,8 +613,6 @@ int main(int argc, char **argv) NULL, sve_tests_sve_max_vq_8); qtest_add_data_func("/arm/max/query-cpu-model-expansion/sve-off", NULL, sve_tests_sve_off); - qtest_add_data_func("/arm/kvm/query-cpu-model-expansion/sve-off", - NULL, sve_tests_sve_off_kvm); } =20 return g_test_run(); --=20 2.26.3 From nobody Tue May 7 18:52:51 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=1620219520; cv=none; d=zohomail.com; s=zohoarc; b=gx6nCxHKx+fUnl47QVGBasopU3mu7/RDCYVYXMm66t1AeHUv4Bx3spyALMgtaAjv/UXLWxpmU7ErO/1YgogZSVsVG8nbQwY2+Gpm8uAx9j/mnO0E/21Sj7Tghcu64TtSF88RYA4N/MdwJyhnwbbHmQ3AlClPa06Ok7dZwG+NM0U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620219520; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=cVrcRnyBOkjPEo/icx3S79OKNawcTbdRmhevRRnT37M=; b=IR9siXwY1MWkThfbGsTSFHhUqGHC2IsK8bn2YdvuBzU7YHjITP9DtcvhLIgD7jy528dGT616CWs1+D2frZWpY1t7aTHJ82S2u+h9KoYL9XQHqxc8QXiKeskFSvqBaJXAHYZvqu2u2e+peoL0VUmG5wla4VZ8sKPlfinsSB3Vr2o= 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 1620219520805261.33854764506225; Wed, 5 May 2021 05:58:40 -0700 (PDT) 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-505-vTWjBYftPG2xglD8GQx3rQ-1; Wed, 05 May 2021 08:58:38 -0400 Received: by mail-wm1-f69.google.com with SMTP id o10-20020a05600c4fcab029014ae7fdec90so328371wmq.5 for ; Wed, 05 May 2021 05:58:38 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (astrasbourg-653-1-188-220.w90-13.abo.wanadoo.fr. [90.13.127.220]) by smtp.gmail.com with ESMTPSA id x65sm6912160wmg.36.2021.05.05.05.58.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 May 2021 05:58:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620219519; 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=cVrcRnyBOkjPEo/icx3S79OKNawcTbdRmhevRRnT37M=; b=VYTAsihG6w13TQ4/ssG4GMamEpqfL8v+KJ53+4gHs62FliA4orm2OwTJZ7ZVgBu/m7xK+0 SK7qI/+gQ+GkcZfHD6d+LLv8YjOGkhFbNtKeoJL1Ir6lMaOHsaxOT7pXB3CN5ginXnftOO uj+UjqJKuBa3tr0j3Zlsb2kMqtyzRv8= X-MC-Unique: vTWjBYftPG2xglD8GQx3rQ-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=cVrcRnyBOkjPEo/icx3S79OKNawcTbdRmhevRRnT37M=; b=YTxd11mkVnCOVTBbxl6ssH+Yt1PSa2FhHUu5LxxSsyshomcgNO2VrzkpG2axH/biBs 8j2a0DKiXnne3TKoEXFAD3T9E4JDAWl/UBq+MkH46lfO61o+QcFRxlvfiBpYrMNzlwl0 GVKCqOzz/P0li96kY0VLZzwHJPdfefoZzxbYV3YrpMO+SYqjeRZIl9wmvHTk6qa+jGAt i4uj0dq7ylK5DB2EfZ3wK06wnWewMxD09ls4w43D0X9WF+pqY+3PoafOsahMX8dXeFKj 6ft7zzXow/jEUJT9Yu1JESAjhZXz4Ja4tazcHLsT/eq+J+EqVhxsGTE00Pd6RUGJP2C6 436A== X-Gm-Message-State: AOAM533N7X+tcBFm36fKzNqj0Has4p6NI2MDFkwb1pbV86a3dcPPbPRv QjcLU4kjCod16IyF801vfpryM4Bs30NDu1EhSkqRFoaksD+/0V0Irf7BBZhwsNJt39J4hhxIXc8 t6ViSbT2KhQ4DoQ== X-Received: by 2002:adf:f205:: with SMTP id p5mr29122736wro.170.1620219517316; Wed, 05 May 2021 05:58:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJydIyZbAlCm6JgUKNFGJf4ccPoehxO33muhY70E5ZpTlJqwvDimAu+HkeBqA2p6cYgwOSSFMA== X-Received: by 2002:adf:f205:: with SMTP id p5mr29122720wro.170.1620219517193; Wed, 05 May 2021 05:58:37 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Andrew Jones , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Maydell , Thomas Huth , Laurent Vivier , qemu-arm@nongnu.org (open list:ARM TCG CPUs) Subject: [PATCH v7 06/12] qtest/arm-cpu-features: Remove TCG fallback to KVM specific tests Date: Wed, 5 May 2021 14:58:00 +0200 Message-Id: <20210505125806.1263441-7-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210505125806.1263441-1-philmd@redhat.com> References: <20210505125806.1263441-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) sve_tests_sve_off_kvm() and test_query_cpu_model_expansion_kvm() tests are now only being run if KVM is available. Drop the TCG fallback. Suggested-by: Andrew Jones Reviewed-by: Andrew Jones Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/qtest/arm-cpu-features.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qtest/arm-cpu-features.c b/tests/qtest/arm-cpu-features.c index 66300c3bc20..b1d406542f7 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 "}}" --=20 2.26.3 From nobody Tue May 7 18:52:51 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=1620219527; cv=none; d=zohomail.com; s=zohoarc; b=QjJNz74Ti2lkmBYUDaqMvy84oBnCFSKtI35wyijYwEf1PFe7ydCMW30RnNAgrsZoZ8yurOWXdWly8zsL4OAh6vURsrBPMP/0c5AwDV5lMtceoX1dW57Z6p0G6SSS+n36KjRx0lzq4kp2YE1Ta8BVvTS51hsofy71t8jiNuqd3G0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620219527; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=JLhAw7XD7qIOrjXaghuSYUyF7i2GShMvrYawRB6AMVs=; b=l0psG2Jt9EQaP0IeDcFWSI0ukU5p938xuJHH+08T+oXb/m9b6JP4tVzvYq7bfuZV7epZe+KtPwM3BY31FDm3A13sAjaKEC2ZxcCwPni+bNE9wzzEQ585hF3DxUh5hLiirsEmC08+00F5QgHTOqSC2tqzpkRNe3xUe0AzTqnC2bs= 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 162021952758162.773689612586054; Wed, 5 May 2021 05:58:47 -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-229-2p6-xCuBMVqUN28cMc25NQ-1; Wed, 05 May 2021 08:58:43 -0400 Received: by mail-wr1-f71.google.com with SMTP id a7-20020adfc4470000b029010d875c66edso653001wrg.23 for ; Wed, 05 May 2021 05:58:43 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (astrasbourg-653-1-188-220.w90-13.abo.wanadoo.fr. [90.13.127.220]) by smtp.gmail.com with ESMTPSA id b8sm20053235wrx.15.2021.05.05.05.58.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 May 2021 05:58:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620219526; 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=JLhAw7XD7qIOrjXaghuSYUyF7i2GShMvrYawRB6AMVs=; b=WgZ4SSE+9D2kXGZ+BU97wJza84HyjnpzGKgSTwnZWYnLu6trIOF1I8QEnfzUWYmmU32Xhn CCmSF/nW5It6Q3BxWRj4PV1GO/X3UthQmQVL16H512rP5UCWxZzMfeuWd6PGuRxpiGkRze aMqrhhTQjjqqkidQ0J5QufVNu2GyxTE= X-MC-Unique: 2p6-xCuBMVqUN28cMc25NQ-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=JLhAw7XD7qIOrjXaghuSYUyF7i2GShMvrYawRB6AMVs=; b=BHXz6sYjLO6eisxLMBKnl1pbzCfN9APqRKNbnRWshNzT8ne7GzvLUsURcmLroHywPT XzaB683RPvasXlJFvPgIPwtBFNXi9flEhsm42NWbFDLKjssf7rDT3q5Hjgpme3qGY9Nd GjDNN3cpclmxBQwgz+Gdd6xSDCoFPCgjtsDq5Cq9MtHNSTAJFiJgfR6QqHKUgbXsXZzn mdJlPp5lzPTY0im4ZtyyHUs37FJmMM4Ypat3wOu47dOagKndQQqj80gZRq2cTJm2h3Bu EYWPyF97tqP7Tz5rEDdrYkGc3hfyAI1Ia/T77ar7SAueP9GcZOHJj1eG5sZKJkPGMjJ6 OL6g== X-Gm-Message-State: AOAM530DbXTnsqjJRhIhKj73w+tvENEWbvmb5RcN7Gg1A4FQUJiskNtx EYLk0vOOT7GD//lpEt2mXxD9103n4pBQ1/Lsiwoeh/J/aufi1hvBcAfJq1aU2+ZNWKxgDbZXUCN KLvQ20zMA9l4k9g== X-Received: by 2002:adf:d215:: with SMTP id j21mr39288715wrh.251.1620219522107; Wed, 05 May 2021 05:58:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy9hjisKNeCuPYpd6jymyhVYMLdeGguTG09aIqsY4w6QD4/OlmTTHpWvr9iyG1tGOychlV7nA== X-Received: by 2002:adf:d215:: with SMTP id j21mr39288699wrh.251.1620219521951; Wed, 05 May 2021 05:58:41 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Andrew Jones , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Maydell , Thomas Huth , Laurent Vivier , qemu-arm@nongnu.org (open list:ARM TCG CPUs) Subject: [PATCH v7 07/12] qtest/arm-cpu-features: Use generic qtest_has_accel() to check for TCG Date: Wed, 5 May 2021 14:58:01 +0200 Message-Id: <20210505125806.1263441-8-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210505125806.1263441-1-philmd@redhat.com> References: <20210505125806.1263441-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) Now than we can probe if the TCG accelerator is available at runtime with a QMP command, only run these tests if TCG is built into the QEMU binary. Suggested-by: Andrew Jones Reviewed-by: Andrew Jones Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/qtest/arm-cpu-features.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/tests/qtest/arm-cpu-features.c b/tests/qtest/arm-cpu-features.c index b1d406542f7..0d9145dd168 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', " @@ -337,7 +337,7 @@ 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"); =20 assert_sve_vls(qts, "max", BIT_ULL(8) - 1, NULL); =20 @@ -372,7 +372,7 @@ 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"); =20 /* SVE is off, so the map should be empty. */ assert_sve_vls(qts, "max", 0, NULL); @@ -428,7 +428,7 @@ 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"); =20 /* Test common query-cpu-model-expansion input validation */ assert_type_full(qts); @@ -593,8 +593,10 @@ int main(int argc, char **argv) { g_test_init(&argc, &argv, NULL); =20 - qtest_add_data_func("/arm/query-cpu-model-expansion", - NULL, test_query_cpu_model_expansion); + if (qtest_has_accel("tcg")) { + qtest_add_data_func("/arm/query-cpu-model-expansion", + NULL, test_query_cpu_model_expansion); + } =20 /* * For now we only run KVM specific tests with AArch64 QEMU in @@ -608,7 +610,7 @@ int main(int argc, char **argv) NULL, sve_tests_sve_off_kvm); } =20 - if (g_str_equal(qtest_get_arch(), "aarch64")) { + if (g_str_equal(qtest_get_arch(), "aarch64") && qtest_has_accel("tcg")= ) { qtest_add_data_func("/arm/max/query-cpu-model-expansion/sve-max-vq= -8", NULL, sve_tests_sve_max_vq_8); qtest_add_data_func("/arm/max/query-cpu-model-expansion/sve-off", --=20 2.26.3 From nobody Tue May 7 18:52:51 2024 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=1620219531; cv=none; d=zohomail.com; s=zohoarc; b=kqUi3D8UAJAL5iROXCrX0egTVwtVF8qphuSLeZkOWG710PiGRBQjPJyKd/GSr0PqhlP5tYIhht/uFrRXdBX7RNkddoLDRDKoukYZK68YDhhui9jt0OwRXRTyLMESjsLkEHC866znY79rmCEU+p/b88YRP/+2UMh+UldVq3NTG9g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620219531; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=NSr0ATvoVPT94Kw0PlP2HcPHUZbWsmv1leCf95/HD08=; b=nvyO2FsoGXeoPQjjqud2KYU1/9WwDYdcR0NJe9M20m/oiBA4IHHuaOdLIjQ8lNCmTUPlIbzTXIpp/q3iQkOTNUXTVWsQdCkJHJ1cj2NfzyPkAsKVoFb3tOJo9i/sX52RzsBst+wEQuZv1FKmrlFXhv7XRlr/ffmxkC0twVfvJsM= 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 1620219531365843.4210067088719; Wed, 5 May 2021 05:58:51 -0700 (PDT) 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-500-hkfn3AL0NqW62v0aCZT0AA-1; Wed, 05 May 2021 08:58:48 -0400 Received: by mail-wr1-f69.google.com with SMTP id l2-20020adf9f020000b029010d6bb7f1cbso670621wrf.7 for ; Wed, 05 May 2021 05:58:47 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (astrasbourg-653-1-188-220.w90-13.abo.wanadoo.fr. [90.13.127.220]) by smtp.gmail.com with ESMTPSA id q10sm5767584wmc.31.2021.05.05.05.58.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 May 2021 05:58:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620219530; 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=NSr0ATvoVPT94Kw0PlP2HcPHUZbWsmv1leCf95/HD08=; b=QnDJYMqQhJ+181dge2o6o/cbq/cJ9QWFoPa7mGw/yhlUGnv3zfigp4J9hedBqiSSNST2jc gn1Mne67kYEthmoz24Zgl0RW7nM4c2I9geyIh7ZzQ9keXlreBqWtguw1LDn+xMrz/TO6ZB qyAxpMb2t/36tE+7/M43auwAn7ocayA= X-MC-Unique: hkfn3AL0NqW62v0aCZT0AA-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=NSr0ATvoVPT94Kw0PlP2HcPHUZbWsmv1leCf95/HD08=; b=LvaBF5s8dC3+/XxF6T8qmtxc5+jbK9moqvsn8GP1bBapk6Iw5H/TNyE4g4QigkGDYP C0rOSi+THYdHq9rf2NgMrpPAQYTJvQ7hd6tp9jVbsAffZEt7vePB5/zHYm1IyckPjzHQ lLpiS9gwAqeyFcWk730AG2Mv3lq1IDI25R9Ebcmvk7LFWOWpzyIW9uCrbQA4G9qHuEfR 5N8RKtzNznW1TuDcxv38QH08T35Y7PEm4OsGDcX9bFONcf7jLGCQ5ztQE+HCYcg0RBoQ OF+ssU28UmbFTCN7nJBRQI8mDTIOph4i8ieF33vJivq0AS8+LS+PCABShs1UEDj6xQ1T BpPA== X-Gm-Message-State: AOAM531PfoItdWRu0JcTluDTKjJhyD3h3kmEGrvaeCKlZSiapeKMdXtr JmjFzdPGw2mb+UJ/tNqV1GC5SyB1cX7ZocdGYLg++3UjZ+8J1sJUv6ZN86OhoqfFutubO1Bn1Nk BsiUMsXcGDxK79w== X-Received: by 2002:a05:6000:1541:: with SMTP id 1mr28655004wry.364.1620219526920; Wed, 05 May 2021 05:58:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwHXii+RrJP9dv/V7ffUnivzxS+CN4t4Ydboamkb417/bhUtJSFJXBPF0ltegkqxUBv5lu4bg== X-Received: by 2002:a05:6000:1541:: with SMTP id 1mr28654987wry.364.1620219526801; Wed, 05 May 2021 05:58:46 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Gibson , Greg Kurz , Cornelia Huck , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Juan Quintela , "Dr. David Alan Gilbert" , Thomas Huth , Laurent Vivier Subject: [PATCH v7 08/12] qtest/migration-test: Skip tests if KVM not builtin on s390x/ppc64 Date: Wed, 5 May 2021 14:58:02 +0200 Message-Id: <20210505125806.1263441-9-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210505125806.1263441-1-philmd@redhat.com> References: <20210505125806.1263441-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. Reviewed-by: David Gibson Reviewed-by: Greg Kurz Reviewed-by: Cornelia Huck Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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 From nobody Tue May 7 18:52:51 2024 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=1620219536; cv=none; d=zohomail.com; s=zohoarc; b=nzRFm8dUvUl4DFgbZyCYhzKLGokd0vzARXFH3HspHq2rjIWESMU6HbpirNOX1SoFJdh/SeZUYbf0bUi0jKzBDD41Lf72wNYLWGJAGXEFO5jwt827lO6W3CkZlRqWATUauQ1iO9RsLL1cwuEplebZqYQLeXEbWauDDxHcCEGXgdo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620219536; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=KOTyr/GPtp/0gjIOd5U6W6CXxFx7PEMuxtPRZj/UCuE=; b=Eg85vlcgIPbIdtQbtLf/rlNaqkkZmTXmu8I/q5dDMkTckIq9kr5ZfpALOundise5e9XdJ91NIKIm1MKKIeflfY99Y40hRb88KULevYy7csxhLl8E82S8BQHfv/BHKafJWQUS2onkHLZt7Oynh7piOkcYVzFGmTx5LY4sLCjhtlg= 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 1620219536324358.1348465047562; Wed, 5 May 2021 05:58:56 -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-288-z6hre0VcMSe_1EgXGRibKw-1; Wed, 05 May 2021 08:58:52 -0400 Received: by mail-wr1-f71.google.com with SMTP id d20-20020adfc3d40000b029010e1a640bbfso655757wrg.21 for ; Wed, 05 May 2021 05:58:52 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (astrasbourg-653-1-188-220.w90-13.abo.wanadoo.fr. [90.13.127.220]) by smtp.gmail.com with ESMTPSA id 6sm7292655wmg.9.2021.05.05.05.58.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 May 2021 05:58:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620219534; 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=KOTyr/GPtp/0gjIOd5U6W6CXxFx7PEMuxtPRZj/UCuE=; b=DJ5Tm13eibxe6Ma2LTGCnTQ1nRfgIGMkLdIgdUJIrt7HeS5lptQuF/sVO5BeYo+e8yCmsk zi1Ez3By2IJlEN0H6NBrjZF42RCTvENs1ovZyXxxnv1+A8YMO6tE6IEIr41TanqrnoTOmv A6jL0WICW3YskJriF/OxG35jk6m/jnM= X-MC-Unique: z6hre0VcMSe_1EgXGRibKw-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=KOTyr/GPtp/0gjIOd5U6W6CXxFx7PEMuxtPRZj/UCuE=; b=I0Fou6Ro8NM0Hhpi3qGbKkpPCh2x9ZciE+tbU+YMuNI5Y7pZTy7zT6xUfevJRrKxs4 ++cw4UST7LuqbC7PBp0Bf1VDL6DgbFkXpcrLPZiL7Hcy3w4Ia9f1DKHrrc2cdJFomwy9 ZjvVf6VEaY2kzGNlBN+vslWAorlcXPYE9o/WtWaoxvC28bVT+sddYN1d/4Bh5SOJsXDr 6ZMnvu+4UyHMm4/Ijvkh+yS/MzVkwLq92RnXWNLgzilgMKEBNn2k4Ylvhc5vzJq0P3X6 WkF0eNbvkeKJpAblvV2fnO1Dc6mgXE5o4UrtZ2oEq88SYP/e9CFL34jW17igN4mFxcAq ybEQ== X-Gm-Message-State: AOAM533ji7aeI3YfsqpjMMft8eVqDsjVPX7lcd18YVeaNJoanCVetjEP aoAfWqw5xyIJ03Z87mw9TTlxtKDpWvyIzF96rFhch4TFQhWQq6vRgsicm6EwI4/b0OUT3vuxwpg vCaiZJH6knHzHOA== X-Received: by 2002:adf:e811:: with SMTP id o17mr21788700wrm.71.1620219531703; Wed, 05 May 2021 05:58:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz/MIDPfgt1XlnCQKN/PRsDeR9qiAfmLX4DqWn7/hrkLxJv5CrTKsDAg49FhPpOwsMhCCb2hQ== X-Received: by 2002:adf:e811:: with SMTP id o17mr21788686wrm.71.1620219531487; Wed, 05 May 2021 05:58:51 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Igor Mammedov , "Michael S. Tsirkin" Subject: [PATCH v7 09/12] qtest/bios-tables-test: Rename tests not TCG specific Date: Wed, 5 May 2021 14:58:03 +0200 Message-Id: <20210505125806.1263441-10-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210505125806.1263441-1-philmd@redhat.com> References: <20210505125806.1263441-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) Various tests don't require TCG, but have '_tcg' in their name. As this is misleading, remove 'tcg' from their name. Reported-by: Igor Mammedov Reviewed-by: Igor Mammedov Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/qtest/bios-tables-test.c | 142 ++++++++++++++++----------------- 1 file changed, 71 insertions(+), 71 deletions(-) diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index 156d4174aa3..ce498b3ff48 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -753,7 +753,7 @@ static uint8_t base_required_struct_types[] =3D { 0, 1, 3, 4, 16, 17, 19, 32, 127 }; =20 -static void test_acpi_piix4_tcg(void) +static void test_acpi_piix4(void) { test_data data; =20 @@ -768,7 +768,7 @@ static void test_acpi_piix4_tcg(void) free_test_data(&data); } =20 -static void test_acpi_piix4_tcg_bridge(void) +static void test_acpi_piix4_bridge(void) { test_data data; =20 @@ -824,7 +824,7 @@ static void test_acpi_piix4_no_acpi_pci_hotplug(void) free_test_data(&data); } =20 -static void test_acpi_q35_tcg(void) +static void test_acpi_q35(void) { test_data data; =20 @@ -841,7 +841,7 @@ static void test_acpi_q35_tcg(void) free_test_data(&data); } =20 -static void test_acpi_q35_tcg_bridge(void) +static void test_acpi_q35_bridge(void) { test_data data; =20 @@ -855,7 +855,7 @@ static void test_acpi_q35_tcg_bridge(void) free_test_data(&data); } =20 -static void test_acpi_q35_tcg_mmio64(void) +static void test_acpi_q35_mmio64(void) { test_data data =3D { .machine =3D MACHINE_Q35, @@ -872,7 +872,7 @@ static void test_acpi_q35_tcg_mmio64(void) free_test_data(&data); } =20 -static void test_acpi_piix4_tcg_cphp(void) +static void test_acpi_piix4_cphp(void) { test_data data; =20 @@ -888,7 +888,7 @@ static void test_acpi_piix4_tcg_cphp(void) free_test_data(&data); } =20 -static void test_acpi_q35_tcg_cphp(void) +static void test_acpi_q35_cphp(void) { test_data data; =20 @@ -908,7 +908,7 @@ static uint8_t ipmi_required_struct_types[] =3D { 0, 1, 3, 4, 16, 17, 19, 32, 38, 127 }; =20 -static void test_acpi_q35_tcg_ipmi(void) +static void test_acpi_q35_ipmi(void) { test_data data; =20 @@ -923,7 +923,7 @@ static void test_acpi_q35_tcg_ipmi(void) free_test_data(&data); } =20 -static void test_acpi_piix4_tcg_ipmi(void) +static void test_acpi_piix4_ipmi(void) { test_data data; =20 @@ -941,7 +941,7 @@ static void test_acpi_piix4_tcg_ipmi(void) free_test_data(&data); } =20 -static void test_acpi_q35_tcg_memhp(void) +static void test_acpi_q35_memhp(void) { test_data data; =20 @@ -957,7 +957,7 @@ static void test_acpi_q35_tcg_memhp(void) free_test_data(&data); } =20 -static void test_acpi_piix4_tcg_memhp(void) +static void test_acpi_piix4_memhp(void) { test_data data; =20 @@ -973,7 +973,7 @@ static void test_acpi_piix4_tcg_memhp(void) free_test_data(&data); } =20 -static void test_acpi_piix4_tcg_nosmm(void) +static void test_acpi_piix4_nosmm(void) { test_data data; =20 @@ -984,7 +984,7 @@ static void test_acpi_piix4_tcg_nosmm(void) free_test_data(&data); } =20 -static void test_acpi_piix4_tcg_smm_compat(void) +static void test_acpi_piix4_smm_compat(void) { test_data data; =20 @@ -995,7 +995,7 @@ static void test_acpi_piix4_tcg_smm_compat(void) free_test_data(&data); } =20 -static void test_acpi_piix4_tcg_smm_compat_nosmm(void) +static void test_acpi_piix4_smm_compat_nosmm(void) { test_data data; =20 @@ -1006,7 +1006,7 @@ static void test_acpi_piix4_tcg_smm_compat_nosmm(void) free_test_data(&data); } =20 -static void test_acpi_piix4_tcg_nohpet(void) +static void test_acpi_piix4_nohpet(void) { test_data data; =20 @@ -1017,7 +1017,7 @@ static void test_acpi_piix4_tcg_nohpet(void) free_test_data(&data); } =20 -static void test_acpi_q35_tcg_numamem(void) +static void test_acpi_q35_numamem(void) { test_data data; =20 @@ -1029,7 +1029,7 @@ static void test_acpi_q35_tcg_numamem(void) free_test_data(&data); } =20 -static void test_acpi_q35_tcg_nosmm(void) +static void test_acpi_q35_nosmm(void) { test_data data; =20 @@ -1040,7 +1040,7 @@ static void test_acpi_q35_tcg_nosmm(void) free_test_data(&data); } =20 -static void test_acpi_q35_tcg_smm_compat(void) +static void test_acpi_q35_smm_compat(void) { test_data data; =20 @@ -1051,7 +1051,7 @@ static void test_acpi_q35_tcg_smm_compat(void) free_test_data(&data); } =20 -static void test_acpi_q35_tcg_smm_compat_nosmm(void) +static void test_acpi_q35_smm_compat_nosmm(void) { test_data data; =20 @@ -1062,7 +1062,7 @@ static void test_acpi_q35_tcg_smm_compat_nosmm(void) free_test_data(&data); } =20 -static void test_acpi_q35_tcg_nohpet(void) +static void test_acpi_q35_nohpet(void) { test_data data; =20 @@ -1073,7 +1073,7 @@ static void test_acpi_q35_tcg_nohpet(void) free_test_data(&data); } =20 -static void test_acpi_piix4_tcg_numamem(void) +static void test_acpi_piix4_numamem(void) { test_data data; =20 @@ -1087,11 +1087,11 @@ static void test_acpi_piix4_tcg_numamem(void) =20 uint64_t tpm_tis_base_addr; =20 -static void test_acpi_tcg_tpm(const char *machine, const char *tpm_if, +static void test_acpi_tpm(const char *machine, const char *tpm_if, uint64_t base) { #ifdef CONFIG_TPM - gchar *tmp_dir_name =3D g_strdup_printf("qemu-test_acpi_%s_tcg_%s.XXXX= XX", + gchar *tmp_dir_name =3D g_strdup_printf("qemu-test_acpi_%s_%s.XXXXXX", machine, tpm_if); char *tmp_path =3D g_dir_make_tmp(tmp_dir_name, NULL); TestState test; @@ -1139,12 +1139,12 @@ static void test_acpi_tcg_tpm(const char *machine, = const char *tpm_if, #endif } =20 -static void test_acpi_q35_tcg_tpm_tis(void) +static void test_acpi_q35_tpm_tis(void) { - test_acpi_tcg_tpm("q35", "tis", 0xFED40000); + test_acpi_tpm("q35", "tis", 0xFED40000); } =20 -static void test_acpi_tcg_dimm_pxm(const char *machine) +static void test_acpi_dimm_pxm(const char *machine) { test_data data; =20 @@ -1174,14 +1174,14 @@ static void test_acpi_tcg_dimm_pxm(const char *mach= ine) free_test_data(&data); } =20 -static void test_acpi_q35_tcg_dimm_pxm(void) +static void test_acpi_q35_dimm_pxm(void) { - test_acpi_tcg_dimm_pxm(MACHINE_Q35); + test_acpi_dimm_pxm(MACHINE_Q35); } =20 -static void test_acpi_piix4_tcg_dimm_pxm(void) +static void test_acpi_piix4_dimm_pxm(void) { - test_acpi_tcg_dimm_pxm(MACHINE_PC); + test_acpi_dimm_pxm(MACHINE_PC); } =20 static void test_acpi_virt_tcg_memhp(void) @@ -1223,7 +1223,7 @@ static void test_acpi_microvm_prepare(test_data *data) data->blkdev =3D "virtio-blk-device"; } =20 -static void test_acpi_microvm_tcg(void) +static void test_acpi_microvm(void) { test_data data; =20 @@ -1233,7 +1233,7 @@ static void test_acpi_microvm_tcg(void) free_test_data(&data); } =20 -static void test_acpi_microvm_usb_tcg(void) +static void test_acpi_microvm_usb(void) { test_data data; =20 @@ -1244,7 +1244,7 @@ static void test_acpi_microvm_usb_tcg(void) free_test_data(&data); } =20 -static void test_acpi_microvm_rtc_tcg(void) +static void test_acpi_microvm_rtc(void) { test_data data; =20 @@ -1255,7 +1255,7 @@ static void test_acpi_microvm_rtc_tcg(void) free_test_data(&data); } =20 -static void test_acpi_microvm_pcie_tcg(void) +static void test_acpi_microvm_pcie(void) { test_data data; =20 @@ -1267,7 +1267,7 @@ static void test_acpi_microvm_pcie_tcg(void) free_test_data(&data); } =20 -static void test_acpi_microvm_ioapic2_tcg(void) +static void test_acpi_microvm_ioapic2(void) { test_data data; =20 @@ -1332,7 +1332,7 @@ static void test_acpi_virt_tcg_pxb(void) free_test_data(&data); } =20 -static void test_acpi_tcg_acpi_hmat(const char *machine) +static void test_acpi_acpi_hmat(const char *machine) { test_data data; =20 @@ -1364,14 +1364,14 @@ static void test_acpi_tcg_acpi_hmat(const char *mac= hine) free_test_data(&data); } =20 -static void test_acpi_q35_tcg_acpi_hmat(void) +static void test_acpi_q35_acpi_hmat(void) { - test_acpi_tcg_acpi_hmat(MACHINE_Q35); + test_acpi_acpi_hmat(MACHINE_Q35); } =20 -static void test_acpi_piix4_tcg_acpi_hmat(void) +static void test_acpi_piix4_acpi_hmat(void) { - test_acpi_tcg_acpi_hmat(MACHINE_PC); + test_acpi_acpi_hmat(MACHINE_PC); } =20 static void test_acpi_virt_tcg(void) @@ -1512,50 +1512,50 @@ int main(int argc, char *argv[]) return ret; } qtest_add_func("acpi/q35/oem-fields", test_acpi_oem_fields_q35); - qtest_add_func("acpi/q35/tpm-tis", test_acpi_q35_tcg_tpm_tis); - qtest_add_func("acpi/piix4", test_acpi_piix4_tcg); + qtest_add_func("acpi/q35/tpm-tis", test_acpi_q35_tpm_tis); + qtest_add_func("acpi/piix4", test_acpi_piix4); qtest_add_func("acpi/oem-fields", test_acpi_oem_fields_pc); - qtest_add_func("acpi/piix4/bridge", test_acpi_piix4_tcg_bridge); + qtest_add_func("acpi/piix4/bridge", test_acpi_piix4_bridge); qtest_add_func("acpi/piix4/pci-hotplug/no_root_hotplug", test_acpi_piix4_no_root_hotplug); qtest_add_func("acpi/piix4/pci-hotplug/no_bridge_hotplug", test_acpi_piix4_no_bridge_hotplug); qtest_add_func("acpi/piix4/pci-hotplug/off", test_acpi_piix4_no_acpi_pci_hotplug); - qtest_add_func("acpi/q35", test_acpi_q35_tcg); - qtest_add_func("acpi/q35/bridge", test_acpi_q35_tcg_bridge); - qtest_add_func("acpi/q35/mmio64", test_acpi_q35_tcg_mmio64); - qtest_add_func("acpi/piix4/ipmi", test_acpi_piix4_tcg_ipmi); - qtest_add_func("acpi/q35/ipmi", test_acpi_q35_tcg_ipmi); - qtest_add_func("acpi/piix4/cpuhp", test_acpi_piix4_tcg_cphp); - qtest_add_func("acpi/q35/cpuhp", test_acpi_q35_tcg_cphp); - qtest_add_func("acpi/piix4/memhp", test_acpi_piix4_tcg_memhp); - qtest_add_func("acpi/q35/memhp", test_acpi_q35_tcg_memhp); - qtest_add_func("acpi/piix4/numamem", test_acpi_piix4_tcg_numamem); - qtest_add_func("acpi/q35/numamem", test_acpi_q35_tcg_numamem); - qtest_add_func("acpi/piix4/nosmm", test_acpi_piix4_tcg_nosmm); + qtest_add_func("acpi/q35", test_acpi_q35); + qtest_add_func("acpi/q35/bridge", test_acpi_q35_bridge); + qtest_add_func("acpi/q35/mmio64", test_acpi_q35_mmio64); + qtest_add_func("acpi/piix4/ipmi", test_acpi_piix4_ipmi); + qtest_add_func("acpi/q35/ipmi", test_acpi_q35_ipmi); + qtest_add_func("acpi/piix4/cpuhp", test_acpi_piix4_cphp); + qtest_add_func("acpi/q35/cpuhp", test_acpi_q35_cphp); + qtest_add_func("acpi/piix4/memhp", test_acpi_piix4_memhp); + qtest_add_func("acpi/q35/memhp", test_acpi_q35_memhp); + qtest_add_func("acpi/piix4/numamem", test_acpi_piix4_numamem); + qtest_add_func("acpi/q35/numamem", test_acpi_q35_numamem); + qtest_add_func("acpi/piix4/nosmm", test_acpi_piix4_nosmm); qtest_add_func("acpi/piix4/smm-compat", - test_acpi_piix4_tcg_smm_compat); + test_acpi_piix4_smm_compat); qtest_add_func("acpi/piix4/smm-compat-nosmm", - test_acpi_piix4_tcg_smm_compat_nosmm); - qtest_add_func("acpi/piix4/nohpet", test_acpi_piix4_tcg_nohpet); - qtest_add_func("acpi/q35/nosmm", test_acpi_q35_tcg_nosmm); + test_acpi_piix4_smm_compat_nosmm); + qtest_add_func("acpi/piix4/nohpet", test_acpi_piix4_nohpet); + qtest_add_func("acpi/q35/nosmm", test_acpi_q35_nosmm); qtest_add_func("acpi/q35/smm-compat", - test_acpi_q35_tcg_smm_compat); + test_acpi_q35_smm_compat); qtest_add_func("acpi/q35/smm-compat-nosmm", - test_acpi_q35_tcg_smm_compat_nosmm); - qtest_add_func("acpi/q35/nohpet", test_acpi_q35_tcg_nohpet); - qtest_add_func("acpi/piix4/dimmpxm", test_acpi_piix4_tcg_dimm_pxm); - qtest_add_func("acpi/q35/dimmpxm", test_acpi_q35_tcg_dimm_pxm); - qtest_add_func("acpi/piix4/acpihmat", test_acpi_piix4_tcg_acpi_hma= t); - qtest_add_func("acpi/q35/acpihmat", test_acpi_q35_tcg_acpi_hmat); - qtest_add_func("acpi/microvm", test_acpi_microvm_tcg); - qtest_add_func("acpi/microvm/usb", test_acpi_microvm_usb_tcg); - qtest_add_func("acpi/microvm/rtc", test_acpi_microvm_rtc_tcg); - qtest_add_func("acpi/microvm/ioapic2", test_acpi_microvm_ioapic2_t= cg); + test_acpi_q35_smm_compat_nosmm); + qtest_add_func("acpi/q35/nohpet", test_acpi_q35_nohpet); + qtest_add_func("acpi/piix4/dimmpxm", test_acpi_piix4_dimm_pxm); + qtest_add_func("acpi/q35/dimmpxm", test_acpi_q35_dimm_pxm); + qtest_add_func("acpi/piix4/acpihmat", test_acpi_piix4_acpi_hmat); + qtest_add_func("acpi/q35/acpihmat", test_acpi_q35_acpi_hmat); + qtest_add_func("acpi/microvm", test_acpi_microvm); + qtest_add_func("acpi/microvm/usb", test_acpi_microvm_usb); + qtest_add_func("acpi/microvm/rtc", test_acpi_microvm_rtc); + qtest_add_func("acpi/microvm/ioapic2", test_acpi_microvm_ioapic2); qtest_add_func("acpi/microvm/oem-fields", test_acpi_oem_fields_mic= rovm); if (strcmp(arch, "x86_64") =3D=3D 0) { - qtest_add_func("acpi/microvm/pcie", test_acpi_microvm_pcie_tcg= ); + qtest_add_func("acpi/microvm/pcie", test_acpi_microvm_pcie); } } else if (strcmp(arch, "aarch64") =3D=3D 0) { qtest_add_func("acpi/virt", test_acpi_virt_tcg); --=20 2.26.3 From nobody Tue May 7 18:52:51 2024 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=1620219540; cv=none; d=zohomail.com; s=zohoarc; b=ceBqal45Cj+dQPT8bIHKbOPP2axk7hN3HWun6ygX/44g8ZxAfPll3FOtcdO6zyv8HI8952puHCt6VNn5An5HpD+XFsevVGKFA2ZAUfjtNprj5LJ6v41LUjyh5M8HNto0O9IDQtoben9UzBD8S8vhjH9wo5nzo7AuLBrTpn/sX6U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620219540; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=LyoTXCrKRxOQ6HWYt6T0AZz1kzEWAAnmXRDjoh7Y70k=; b=GunP270HDgqb77l8Mwi+gqPmPkEr8khKke1l0wy72kd01sRL0wYvx4KMp6Ul9ro/5DskKWETI4fC/+UK21bDsTV2Tb/VX/w/pqXxhYEvjUe6XZ9AnmDF4b2RtwQaLqf1V5+itwEPIfYVBaeyYHIhPu9CDEG6F1ZkY2ouT6kgt7E= 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 1620219540220408.44694935609914; Wed, 5 May 2021 05:59:00 -0700 (PDT) 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-454-mk19FqkDNoe6EL5VqF_TiQ-1; Wed, 05 May 2021 08:58:57 -0400 Received: by mail-wr1-f72.google.com with SMTP id 4-20020adf80040000b029010cab735fdeso664127wrk.14 for ; Wed, 05 May 2021 05:58:57 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (astrasbourg-653-1-188-220.w90-13.abo.wanadoo.fr. [90.13.127.220]) by smtp.gmail.com with ESMTPSA id c5sm5740453wml.2.2021.05.05.05.58.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 May 2021 05:58:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620219539; 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=LyoTXCrKRxOQ6HWYt6T0AZz1kzEWAAnmXRDjoh7Y70k=; b=csv/6lzZX8xGJNfbM6zl3q2GeB6Ev/xufewNZYpf4Y/IAHzVJ3rF+7bBRTcY66XJRXwhOw KMJMvojo48bpcMugzU+/fZ8wzRf4WfSn/A/ntXJ15IioKFDmI16G2VYzHl4OCNxAD7HBqW eDUmlByrDpdbTHCbZzIpBNKaLljoycs= X-MC-Unique: mk19FqkDNoe6EL5VqF_TiQ-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=LyoTXCrKRxOQ6HWYt6T0AZz1kzEWAAnmXRDjoh7Y70k=; b=Fu1KTLBmkaeP6jZ+7GcfjpM6bxr/ZU1f58kzqYlS/Temq7O+1aU7+0OWASMTlsuG2u qpMLVwbKXZOgwMXXFeg6x78+PeMW5bPJ3THJsh3R4LmQpH0ORld37Pk1Y1Sv9sMVcZ6K HMyymvn788qJfLZrhCEruB3ZaXLfvMkFFlvuAluU/NNzjA43T930302H8riaqAaQ3iee 2ibclVn44E7+zSHFUftkB7kj58FW3Sao4dVEwjJvTlGD4nulnxviYZLGJBj/wuHf8WZN FeEiE4QNX6RVSWS2Dwn3OrG/4d59zIoRTiMo1AzUGl31YvnBBB8tl9SlIq3ZRpRMcuvo dpvw== X-Gm-Message-State: AOAM532KjmcFzicKTo/fAZDzt32L5kTg0P9sQelUbPN/pa32hAh771n2 yOiXFdEft2n+LZXSYD/niNiWnuoqo+QC+DLu/pryzyA4SoEVixmzA9UzdwMVKrZlqXsvjisF4jb ynV4ePA2maj40Yg== X-Received: by 2002:a1c:a78b:: with SMTP id q133mr33790579wme.68.1620219536385; Wed, 05 May 2021 05:58:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw7c9O310nBdDuwOH0hPIkQMrelHuusATPUD5zr1bizc7RGyVjUpcFvu5X3S98ZA1TfmjJwCg== X-Received: by 2002:a1c:a78b:: with SMTP id q133mr33790569wme.68.1620219536206; Wed, 05 May 2021 05:58:56 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Igor Mammedov , "Michael S. Tsirkin" Subject: [PATCH v7 10/12] qtest/bios-tables-test: Rename TCG specific tests Date: Wed, 5 May 2021 14:58:04 +0200 Message-Id: <20210505125806.1263441-11-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210505125806.1263441-1-philmd@redhat.com> References: <20210505125806.1263441-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) Some tests require TCG, but don't have '_tcg' in their name, while others do. Unify the test names by adding 'tcg' to the TCG specific tests. Reported-by: Igor Mammedov Reviewed-by: Igor Mammedov Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/qtest/bios-tables-test.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index ce498b3ff48..ad877baeb1b 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -1255,7 +1255,7 @@ static void test_acpi_microvm_rtc(void) free_test_data(&data); } =20 -static void test_acpi_microvm_pcie(void) +static void test_acpi_microvm_pcie_tcg(void) { test_data data; =20 @@ -1475,7 +1475,7 @@ static void test_acpi_oem_fields_microvm(void) g_free(args); } =20 -static void test_acpi_oem_fields_virt(void) +static void test_acpi_oem_fields_virt_tcg(void) { test_data data =3D { .machine =3D "virt", @@ -1555,14 +1555,14 @@ int main(int argc, char *argv[]) qtest_add_func("acpi/microvm/ioapic2", test_acpi_microvm_ioapic2); qtest_add_func("acpi/microvm/oem-fields", test_acpi_oem_fields_mic= rovm); if (strcmp(arch, "x86_64") =3D=3D 0) { - qtest_add_func("acpi/microvm/pcie", test_acpi_microvm_pcie); + qtest_add_func("acpi/microvm/pcie", test_acpi_microvm_pcie_tcg= ); } } else if (strcmp(arch, "aarch64") =3D=3D 0) { qtest_add_func("acpi/virt", test_acpi_virt_tcg); qtest_add_func("acpi/virt/numamem", test_acpi_virt_tcg_numamem); qtest_add_func("acpi/virt/memhp", test_acpi_virt_tcg_memhp); qtest_add_func("acpi/virt/pxb", test_acpi_virt_tcg_pxb); - qtest_add_func("acpi/virt/oem-fields", test_acpi_oem_fields_virt); + qtest_add_func("acpi/virt/oem-fields", test_acpi_oem_fields_virt_t= cg); } ret =3D g_test_run(); boot_sector_cleanup(disk); --=20 2.26.3 From nobody Tue May 7 18:52:51 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=1620219550; cv=none; d=zohomail.com; s=zohoarc; b=hSStHj0qDgHHGaSGoi8V86q20MVoI3TdkQD2/AgDr5C1iXk0M/SWvgre/3GoEKpvlwL9Ibs9JgzRfuLHngAbRqxUWmS4bdsIZqGr+mgT2HTXyxUg3I67NO1nvA95Tb14mlWTt0uwlzKQ465I3yjit2UBehTsrWQ6eHbK2KlRuzU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620219550; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=NrRlnxcfy5rfyxKOgrn4KzLZv/0uqhFPtkaZ4qrEJ9Q=; b=e35rSQ/LMSK5CL38axgplkzH2pmSLRvr60deExXav7qoW1OUK2R5Yy/zquosqunw/NgDMRxeigX/+nMVWMq/wJKcQe7tXcDe/ZN00wX2VzAwg2XLCB4AdtsetaoFPKGi3iClKEQqpQ80P9UHkzxItXG8pYL+Wq2U4jwd8ouCsd8= 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 1620219550092553.6321713442671; Wed, 5 May 2021 05:59:10 -0700 (PDT) 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-415-NsqGgxWcN_OIJt0b2RigQg-1; Wed, 05 May 2021 08:59:02 -0400 Received: by mail-wr1-f72.google.com with SMTP id x10-20020adfc18a0000b029010d83c83f2aso673302wre.8 for ; Wed, 05 May 2021 05:59:01 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (astrasbourg-653-1-188-220.w90-13.abo.wanadoo.fr. [90.13.127.220]) by smtp.gmail.com with ESMTPSA id z2sm21450346wrg.6.2021.05.05.05.59.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 May 2021 05:59:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620219549; 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=NrRlnxcfy5rfyxKOgrn4KzLZv/0uqhFPtkaZ4qrEJ9Q=; b=ZYBKExx0hqRJFISiOpKtWMIJyWcV/wKG3Q3TDNqSlK+wmN9nMO1PwmK171gYlC0/q+jSw4 OpXTM8/Syg/GBpvW7jgJGTQmzot9yhzRylF2Lxn+RMma2ORfghEzg5E9GyxTvJlnBx3KX7 c4Ck9+BaoPMib6YCP9ocwZXlkT7Pm9Y= X-MC-Unique: NsqGgxWcN_OIJt0b2RigQg-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=NrRlnxcfy5rfyxKOgrn4KzLZv/0uqhFPtkaZ4qrEJ9Q=; b=WmU0LeWMrbVMDc+hB9LdzmhEWOmEWyjlWC3SR4Bv8EXcL24sRDaSbOQZcGemIayprs 8zI7tM/uKQ0Q6Rn4oPiCJZjpqxxPFgQrEc3bB32INhl1e7piAbty+iFzTSH52DYRo1xP fXsqptrV15x4t9e/vZI2qgU2lKg/vz+mKjtmLfZGG1CT9mB8bXE2yjeBWq4wZMNz+Ctf N071tmcxecTA5YzP+bEii92/ePxhA8nTKoFOvtNOi7I552LHKeyj7OCN1GKIIhYhpCRJ jB208w9DOdjoRbK+BBagy0NO/M3gnu0Fz0UUMmVQ2YQJdHpzK/A5+0JDs4kO41vqpyVK Zw0Q== X-Gm-Message-State: AOAM533sDq83JU67s029O90z372zMHUvvM8Xg6DBfiPnc4qIJ9E5LPu9 BKIqwm+I1Z5VlGvyx9KU2Hmnwscg6vBv6dUmtHdK1VxCwM1CIFOGpnBm+7m+cb0CIYySf4CJkXj iFNUGvF4jPhhvgg== X-Received: by 2002:a05:600c:4f96:: with SMTP id n22mr10004771wmq.117.1620219541014; Wed, 05 May 2021 05:59:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxlB1TotUYG8y+Lqpew5ljjsVF7MwbsMdq/wWf0PXdkHKCNifjwJLE6ZgWT5InkNlOTtByYLw== X-Received: by 2002:a05:600c:4f96:: with SMTP id n22mr10004759wmq.117.1620219540885; Wed, 05 May 2021 05:59:00 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eric Blake , Igor Mammedov , "Michael S. Tsirkin" Subject: [PATCH v7 11/12] qtest/bios-tables-test: Make test build-independent from accelerator Date: Wed, 5 May 2021 14:58:05 +0200 Message-Id: <20210505125806.1263441-12-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210505125806.1263441-1-philmd@redhat.com> References: <20210505125806.1263441-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) Now that we can probe if the TCG accelerator is available at runtime with a QMP command, do it once at the beginning and only register the tests we can run. We can then replace the #ifdef'ry by an assertion. Reviewed-by: Eric Blake Reviewed-by: Igor Mammedov Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/qtest/bios-tables-test.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index ad877baeb1b..762d154b340 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -97,6 +97,7 @@ typedef struct { QTestState *qts; } test_data; =20 +static bool tcg_accel_available; static char disk[] =3D "tests/acpi-test-disk-XXXXXX"; static const char *data_dir =3D "tests/data/acpi"; #ifdef CONFIG_IASL @@ -718,12 +719,7 @@ static void test_acpi_one(const char *params, test_dat= a *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 */ + assert(!data->tcg_only || tcg_accel_available); =20 args =3D test_acpi_create_args(data, params, use_uefi); data->qts =3D qtest_init(args); @@ -1506,6 +1502,8 @@ int main(int argc, char *argv[]) =20 g_test_init(&argc, &argv, NULL); =20 + tcg_accel_available =3D qtest_has_accel("tcg"); + if (strcmp(arch, "i386") =3D=3D 0 || strcmp(arch, "x86_64") =3D=3D 0) { ret =3D boot_sector_init(disk); if (ret) { @@ -1554,10 +1552,10 @@ int main(int argc, char *argv[]) qtest_add_func("acpi/microvm/rtc", test_acpi_microvm_rtc); qtest_add_func("acpi/microvm/ioapic2", test_acpi_microvm_ioapic2); qtest_add_func("acpi/microvm/oem-fields", test_acpi_oem_fields_mic= rovm); - if (strcmp(arch, "x86_64") =3D=3D 0) { + if (strcmp(arch, "x86_64") =3D=3D 0 && tcg_accel_available) { qtest_add_func("acpi/microvm/pcie", test_acpi_microvm_pcie_tcg= ); } - } else if (strcmp(arch, "aarch64") =3D=3D 0) { + } else if (strcmp(arch, "aarch64") =3D=3D 0 && tcg_accel_available) { qtest_add_func("acpi/virt", test_acpi_virt_tcg); qtest_add_func("acpi/virt/numamem", test_acpi_virt_tcg_numamem); qtest_add_func("acpi/virt/memhp", test_acpi_virt_tcg_memhp); --=20 2.26.3 From nobody Tue May 7 18:52:51 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=1620219549; cv=none; d=zohomail.com; s=zohoarc; b=djPOffdu0EqFs361FX/uvUCFKplwHqXwYzHB7W/fvTYYae5rUCwTQeRCJ8u9Uc34js8SJZ6ZXbtaNWdrDueOk0scB7ez+y6LSyJbsmhlfBiyMtAV5MyvX+nP67ReL/qth1Ce9c0nNLvnSnYDYSI1+VEA8uCC2l6i0L18x/zbhvM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620219549; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=piFQVJLRgYVAQ8rwlcVYLrCWu2jTvSW2z8Zq+W/DVsE=; b=Ak81DEarkGC02dhW7qm7bTA3819CY2wlkLIDLTRJR1zzAR8N0k5sQTKZoGKsfU4ucA72YvtOx/Zdl15yrLQzYV9xaQ0wxeffDxhE5+UHz4xMqVOb8zCv3L4G3rv5dYTUZzQneK0CCCZuy0szDWSa2Q60W+L2nKULnMteTabSWLU= 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 1620219549181596.3548390549154; Wed, 5 May 2021 05:59:09 -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-205-Zu5N10TjMTuQ5BFgRN4PRg-1; Wed, 05 May 2021 08:59:06 -0400 Received: by mail-wr1-f71.google.com with SMTP id 91-20020adf94640000b029010b019075afso658659wrq.17 for ; Wed, 05 May 2021 05:59:06 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (astrasbourg-653-1-188-220.w90-13.abo.wanadoo.fr. [90.13.127.220]) by smtp.gmail.com with ESMTPSA id z19sm5504923wmf.47.2021.05.05.05.59.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 May 2021 05:59:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620219548; 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=piFQVJLRgYVAQ8rwlcVYLrCWu2jTvSW2z8Zq+W/DVsE=; b=C0p4L4Y7rp1elabGXDJDThsWknP3NdD7/kvA49gjyKShAJ1eHt2uY+/v02hJqDbmVBehmU 4rmDKvjMJXKl6r4xR8/xnRu6dm2rIKkDvTcizDyNTW04tMIPhOX29/m3IVpy6lg3tnxgw9 051eGOLnjEgnsDhG4iRGO1mXDLJeDEY= X-MC-Unique: Zu5N10TjMTuQ5BFgRN4PRg-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=piFQVJLRgYVAQ8rwlcVYLrCWu2jTvSW2z8Zq+W/DVsE=; b=KoFEFbmeVRovdtbt6h08aQEWEqhKTUn4qM64dd5BL7Vgn9xwvJxNUzFlD+75uPrfHp st2emlnbA1F8AIME389yuKpA69PepGPx4frx0jU5SO2dTz5gRMjp7zuDsuYCXAgKy4gp JEaW2gsWmMbXntS/V83dHjIpEWOgzrWZsqkHh1s+GHWI9ssE4EvUcMKor2xNLVh2btxn NDt+UttvP5mLHQBrlkp0ROYGhz0eapEq+vNoUjb5fTyQWQ0D3nB32o2LIRF4fcIZU1X2 08Ecq3w7TjyuIc2Dla4ZgKVcqCV2iuR8DgC5u6jp6x4xJI0uIANgHig/yhlqPvwsuUAk hThg== X-Gm-Message-State: AOAM532w9vENGh1bNbTwhm+qqUdWOz550UzlGj4eps2NAwhP0Vdn49+u pcAPU4YLTML12CGdJGmL0anPqO1O0Cud7XSPmiSj1m4+eOOLUgAI4h6xNDvJSMaDHh/u1Tobo6m bvmaATFmaUukluw== X-Received: by 2002:a05:6000:1811:: with SMTP id m17mr16798926wrh.318.1620219545743; Wed, 05 May 2021 05:59:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz+WBIKg9rFUUUOy5o2J6lfMJzGmmi05JUj5mSpRaRYKXLFpJZ/d8eTjISyA0G4QGOGYIn+DA== X-Received: by 2002:a05:6000:1811:: with SMTP id m17mr16798913wrh.318.1620219545631; Wed, 05 May 2021 05:59:05 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eric Blake , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , Laurent Vivier Subject: [PATCH v7 12/12] qtest: Do not restrict bios-tables-test to Aarch64 hosts anymore Date: Wed, 5 May 2021 14:58:06 +0200 Message-Id: <20210505125806.1263441-13-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210505125806.1263441-1-philmd@redhat.com> References: <20210505125806.1263441-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. Reviewed-by: Eric Blake Reviewed-by: Alex Benn=C3=A9e Tested-by: Alex Benn=C3=A9e 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 0c767389217..46de073d155 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -175,14 +175,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.3