From nobody Sun May 19 03:12:48 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=1619908609; cv=none; d=zohomail.com; s=zohoarc; b=RlASUxPI+WWsZ/3m1G9P0FtRNPbSk2VOvW5f1Hkja7wztqUga6STtDTNV0insm0zxYyWfic+eRecpGCfImrXCgDHFtAAiotFjhjA03SvQNpwCUl7Xab74/nCzF2TpgdSDcd4Uz+0uSDw2Q2fwnkWOB6UR/PHFWwDeXIuJLeRUzU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619908609; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=Q6/hT/PIJKMoFbY2PhDO/rAVfPgYfzeV9gjOhaljcfU=; b=QyyqhQrIuoYUvoSuLh9EEixAVO3+wNnQ8GTK+uyiNF2IB2g1bhFXcbOrvsuSb+AncGASC5JZTC3rGX+KboL5VVkDDO6zzOgpHed3jtwFNioSsocfuA/W+COzZhj2mfEOEQQJHT8GDxUoZuR2nOiSCBlgt4ITO/ruuX4uFdNtX1A= 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 1619908609902451.15302078555635; Sat, 1 May 2021 15:36:49 -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-311-ZwYv5pxnNU2VpOpRqZVx9g-1; Sat, 01 May 2021 18:36:47 -0400 Received: by mail-wr1-f69.google.com with SMTP id t18-20020adfdc120000b02900ffe4432d8bso1305475wri.6 for ; Sat, 01 May 2021 15:36:46 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (anancy-651-1-208-144.w109-217.abo.wanadoo.fr. [109.217.237.144]) by smtp.gmail.com with ESMTPSA id z7sm7154737wrl.11.2021.05.01.15.36.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 May 2021 15:36:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619908608; 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=Q6/hT/PIJKMoFbY2PhDO/rAVfPgYfzeV9gjOhaljcfU=; b=Zy39JdQIqBoZxGXQsfoARkliH8D7S8iE2XufsrJU/trAqScw7HSr42XoZnS6gnYZfrZOtE xHqM5pfVte/uyZwrcxmlE/W23M8EzROg/9Z4PZIg5fXRkZhdtJsVTPk2d/CH/fdM5LbUpe m2gk0BYHsKYnlmcSjmJOnZcB+8uz4mo= X-MC-Unique: ZwYv5pxnNU2VpOpRqZVx9g-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=Q6/hT/PIJKMoFbY2PhDO/rAVfPgYfzeV9gjOhaljcfU=; b=NeI/BGtsZiA1+/jZop2Tad8GFgweAXzxOAZG25/rF1ZT+PKSvcBj6EP43344ikVUrb +soMXcgOry24OIV8MR6gqPTXHh28cnKzfIyL7JK3L7qXEyn3/FHUfIJGO4jqsVjLPVLx K2CycMfCwgJgra5My2+LYC06qONypkhC/BfFOTUNonmw2iRHh3PBp66q6/kl3e+iz+Og 61rgxchoS2UhH4ayKjwRANLrkzEkq+5CJesrjsZLTLWPIx4mT4JY4hXriajowBxyCweH eK2MPw/tSi/Y3Bo3WxbmZLy12Iqp+O2qPbvqLdnfZQ8exJjUPprQkOByjmqNmOJgomIS uQ/w== X-Gm-Message-State: AOAM532JdZyKDvhWAxv2K52fdDkw0wnqOnrWyj5IH9xK7TeWnRSIZ0/B q8nBUTa1gjOqw60M0uZLcV7AShz1yRSMyPs3ZhRbAKefJXQzfzDLd4kpU4XDdVs80/rmr6Btllx QucJHXkuGb0x1NQ== X-Received: by 2002:a1c:5945:: with SMTP id n66mr13739571wmb.139.1619908606097; Sat, 01 May 2021 15:36:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwRtwoaKF09JBQQTEcLGM34cADJCYOJwykKT5bzZk0b65Zgjykd4tZQTMH/+gnxeSogNnFeAA== X-Received: by 2002:a1c:5945:: with SMTP id n66mr13739542wmb.139.1619908605850; Sat, 01 May 2021 15:36:45 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Juan Quintela , "Dr. David Alan Gilbert" , Richard Henderson , Andrew Jones , qemu-arm@nongnu.org, Eric Blake , Paolo Bonzini , Markus Armbruster , Claudio Fontana , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PATCH v5 01/10] MAINTAINERS: Add qtest/arm-cpu-features.c to ARM TCG CPUs section Date: Sun, 2 May 2021 00:36:29 +0200 Message-Id: <20210501223638.510712-2-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210501223638.510712-1-philmd@redhat.com> References: <20210501223638.510712-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 4c05ff8bbab..5f1f59f9b3c 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 Sun May 19 03:12:48 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=1619908616; cv=none; d=zohomail.com; s=zohoarc; b=ayxKa8PemwF0yRt14pZedZ0iNSqeg2j6UEW4zzBO00TkAfm60PQxCiJdzB0vWx+LUP1kZYVPl/CmZIKSlxZdufEVhJ0EEYZMAV1hphulPmEUBk+rxQ7he1FxH2wlKfBEV7NRPf+zwLduNn39yWUkUbm6rDEZxJhs1QZpbY82moE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619908616; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=P/JwIaYRijlIKIuvZy1yv4gicsUV0JiEB0BppIoUwQc=; b=VLRok5HlWYPcpkGSZlA147UKSxeHF0ZbUczcH6AdHXc3pJjfvqyNUuBdHaW/5XEiaKsONVuVNyPH8TESX/NBJ6D+6tR6BIFCO4SBC5QrlYzEhIyYD4iXDC178GhBGSEWc+SctdmsVl18sgcGCF8C/F+4IFotGOhVYVAFRFZ4T8s= 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 1619908616641929.9646995676694; Sat, 1 May 2021 15:36:56 -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-492-FARST2ctNR-mjYwNg0KjfA-1; Sat, 01 May 2021 18:36:52 -0400 Received: by mail-wr1-f72.google.com with SMTP id h60-20020adf90420000b029010418c4cd0cso1285918wrh.12 for ; Sat, 01 May 2021 15:36:51 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (anancy-651-1-208-144.w109-217.abo.wanadoo.fr. [109.217.237.144]) by smtp.gmail.com with ESMTPSA id l14sm6220149wmq.4.2021.05.01.15.36.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 May 2021 15:36:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619908615; 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=E9f5erIzGXkTJ46Vn6eDBUKqpMCO9YHC1/on8sKD08Xmm0AmVtYe4wsFx33EsKcwGlWZsw Bxuz37Ca9vzICmjpqonzZH6b2YVyqxi1FojfbwmpESelkEV7rylBdqXyrDVDAEp4TWHiz6 dugMVDDlf4aN8eFy04eD9k2XPEFZEf8= X-MC-Unique: FARST2ctNR-mjYwNg0KjfA-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=hrnjbeVF6lcGiUmBmhlNpO7qSwFL6EnqptCRZ0RLJfYBH7Ebd/WoTJmaFMINCbYq9s CjV15B4YyFL0A5f1oJMrsKdM2XnRfwMbDuy/utzFyE8CjO9y04vFVc6cdFg05anBimef D6v9QD+7KfK8/3NVdHiXTXiNZmdmlHQm4/sHVQa9FDCOCpXKLdFeDdFoupSZin7KOsks ZlHnhLbO8Kr90LM2xxt/7N3sspkAr+c1dEMgyZ9mEN4uj4ChSSh5ZEeJHVxUcs1m1vpb uWazdRRjWBclbqHsHE3V/7HS0YWMnFNQbD3Y9rkwepK76tmGSKg3muUixgovfu8pxCBT R+ew== X-Gm-Message-State: AOAM532LquYtTc+9/1kk2tAaqu/hYtMVeVlRlPtQB3qWJX4w+FSU69KS o204Ph3IHMpZ/fVdq6siABdAtn/c30Nz5XzzU7Etw4Y1HSconWa+lmgVp3LlBLQBKLIVkrZc0Pe F4MwsG5htGzezag== X-Received: by 2002:adf:e412:: with SMTP id g18mr16077739wrm.205.1619908610995; Sat, 01 May 2021 15:36:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzM4BHt2yyU8i4o9rA/zpuVv9duUDrB5qs1XT5dWGU9kZEph9GZHIhMZGhXT7DqSFr7rZ4t6A== X-Received: by 2002:adf:e412:: with SMTP id g18mr16077724wrm.205.1619908610815; Sat, 01 May 2021 15:36:50 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Juan Quintela , "Dr. David Alan Gilbert" , Richard Henderson , Andrew Jones , qemu-arm@nongnu.org, Eric Blake , Paolo Bonzini , Markus Armbruster , Claudio Fontana , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Eduardo Habkost , Marcel Apfelbaum Subject: [PATCH v5 02/10] accel: Introduce 'query-accels' QMP command Date: Sun, 2 May 2021 00:36:30 +0200 Message-Id: <20210501223638.510712-3-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210501223638.510712-1-philmd@redhat.com> References: <20210501223638.510712-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 --- 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 Sun May 19 03:12:48 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=1619908621; cv=none; d=zohomail.com; s=zohoarc; b=IKDm+Yh0jXIsvOzIw90tJ3bRTNyKfewYaax0G0O1hzjRinv57YARe+TDrrFrBPyJQVg4LMgMHE7IdyUYAEn0tVN1j5wKzgkhtScjfyu8mvEjVCYlCi9+bLGKWqz7uDSDk7OYUG23/M0Weo+L/SpN3vSohRo61smRLrBjku1BJzg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619908621; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=KvNHYhxkAqUqa9h+Qg11UCChxb8z3nuwgPPE3IGPHzY=; b=Ql1XeyvPZ9Ofy8efGpjEqHYqHdMwIVZq9tCiKIs/aZqFSI9OhOv9iD1cPB5nTKZx2Zzb2prBk0eytSXrr4YnEdES1HwL0meFKSAucnrBVA2f9JqKdEcoOeCrxZyL9LJkxODdPvZCX6qJ/YLl1TEKgTacULG7JOZm117Hx5S12kw= 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 1619908621624771.3498940242563; Sat, 1 May 2021 15:37:01 -0700 (PDT) Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-525-CJ-uikvaOjiwSMhUwRSILQ-1; Sat, 01 May 2021 18:36:56 -0400 Received: by mail-wr1-f70.google.com with SMTP id i32-20020adf90a30000b029010d9e6b3833so1278886wri.18 for ; Sat, 01 May 2021 15:36:56 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (anancy-651-1-208-144.w109-217.abo.wanadoo.fr. [109.217.237.144]) by smtp.gmail.com with ESMTPSA id s16sm16600778wmh.11.2021.05.01.15.36.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 May 2021 15:36:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619908620; 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=Y9aW4cdZbDCJQmCNxx2SFwXlTwjAL9ykDOxZ1rxKlchKBvAECKBpY0F32P9l4gj5pVYrey ALYEL9LlDYw/bY972OrNRGJQjVWcSc5tvIzXhGLoH2qQjE1PiiqA2zFRIx6+3zw6dkpsq6 BxEmXLW+atY8ATbhln9nzfk4q4qZUFM= X-MC-Unique: CJ-uikvaOjiwSMhUwRSILQ-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=VldnU8sO9CoSlxy39N1SQi/p8oqkTvs7BEwlIXlVMbLuwUX7dX4fP3H5+NkoG/vvvP jGHBc9pYEk1rbgwSYfaorvl37wrmCqtQeojP9afdwaK3f1IxMMxqSK5cbtjfXdlyD8fq 2jrH1MSp+C7qRjeZtwpyubaehqikYUdl4tbWlMKRQfdQlA412QFl/ovSV3XProrVsPKU v0LZBWlnmJxSEe4b/z0hWQEzbU5q02nX3Ne8W3PBTwn3mo30y6AZVLHMkL4yJ7gu29Rt jLftCl8w8zEnnB80xOK4NPRV9IV1QsGCEvzsBTm1ILTlJoXN7mXnFDxGgegWmcF+p++P nmqg== X-Gm-Message-State: AOAM533A+ZBU/FQCDppba8bGAY05dK0EgBYWrjUkdyX6Jhr0KNCzZ+h/ X+GcKW9Ehv5RLTQ/QjFaQ8ur2madC9KxyR9UlyxaoTZWrYtOGBAMHNJtXU8HAa77tHV36wZODpc xAAIErBG2OFx/2Q== X-Received: by 2002:adf:fd0c:: with SMTP id e12mr3860678wrr.111.1619908615703; Sat, 01 May 2021 15:36:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwn0mNPqpviMBqvwGpey6yvYbioi6rCsf3OxMpCVr2STxoQww3bFfq9mE8/L++4wHSsFlqTfA== X-Received: by 2002:adf:fd0c:: with SMTP id e12mr3860658wrr.111.1619908615597; Sat, 01 May 2021 15:36:55 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Juan Quintela , "Dr. David Alan Gilbert" , Richard Henderson , Andrew Jones , qemu-arm@nongnu.org, Eric Blake , Paolo Bonzini , Markus Armbruster , Claudio Fontana , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Laurent Vivier Subject: [PATCH v5 03/10] tests/qtest: Add qtest_has_accel() method Date: Sun, 2 May 2021 00:36:31 +0200 Message-Id: <20210501223638.510712-4-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210501223638.510712-1-philmd@redhat.com> References: <20210501223638.510712-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 Sun May 19 03:12:48 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=1619908624; cv=none; d=zohomail.com; s=zohoarc; b=NF0jCWFuciYopN1dkHNCAlRkr8f2Iuaab2IiG9PzYu6DEvFeDMojTO8QKBSnWRSFTK8TdIw32bjyA5rt0hpy10FW/ctO2uQ/N75z3f4f54KHTTIns3xmnZyjERqIa1YLIY2dKyDzSeJdWQiGpbvzePYJ8np98xm/TNRBQJ3olPs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619908624; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=MeNb2Atwfh/sX8kxLzvRexJijoqF1JUDJOimaLT3mRk=; b=l6EIi5l2vfdbtmkrXkKicYBK8UPD9bmAWxbaNM+BZUpaklUn1bgRa4k3OI2wcERYRkKuBddbaaKvO/t1yNh4sMAEtCa6LFjoplphCbA3cjdo7CfxGva2qYAZl9pXzbb2RT4OH66ufTT6zgU+rs13lxnvK1hyt1vRmXeJg2Svf0M= 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 1619908624351755.4976845205724; Sat, 1 May 2021 15:37:04 -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-142-h1TE-TUkOXqge1f7RkEObg-1; Sat, 01 May 2021 18:37:01 -0400 Received: by mail-wr1-f71.google.com with SMTP id 4-20020adf91840000b029010d9c088599so1296070wri.10 for ; Sat, 01 May 2021 15:37:01 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (anancy-651-1-208-144.w109-217.abo.wanadoo.fr. [109.217.237.144]) by smtp.gmail.com with ESMTPSA id t206sm6797726wmb.11.2021.05.01.15.36.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 May 2021 15:37:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619908623; 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=XYuomF3RVr2ArVkgFPo682BONif8uR+qP5NkayUoAU+thLb/4lBoABmSzq+KCzXctpxvBx 7qd1y0yJUtc+MVzJRu+AtFrQVDgGjvX/Hlw/aI2jG5EhRzdyuvY+qMpwkEoMaxBjxZ7lLG poEW/DnRxZL5pYuPJh+wVN64Edk5q5s= X-MC-Unique: h1TE-TUkOXqge1f7RkEObg-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=PNY4GoEqUNl3911NouJVgeRl1rpdnKHh0nzpkNVwu5WXBKeaZUjiY6MGWI64DqW8XA WkrAr5HX2PYq5mlVXRSI0KgUZq9wbCoK9drhJyj0UqB65WbMs9VrYApbnbEfMC3w5gC4 hzUAUBFFwLgmaR6H9EsK+f/oeLfESjtF4SqAnDvs0lBEgQ5x9XNdeS5RasH95fLnRSrm vS9sEsajTx6h3iC+6PcaRDGuVKRhHdLfJO31eKHAzQob1MndnIIYhgz3r45hmHM8Rg6x SE8r/rtvitV1JRLR+FgcL0KvdHyrNyJKZmXPw4KNrdEqfygUSLEO54yKckQzHUfHuxG5 Ac5g== X-Gm-Message-State: AOAM5334uUeBltLFHpn5uAO36H7hVbRWMgXCrbg0UA+q3DdrnRrviSiH gitA41ckQqsHSGTGiJ9yGATRT6Fd3PDN+MNkqRnXtL4U1EdOOB2AshItrLMfV8Wppmx0b7rx5zJ xr8goexFa5BLpzg== X-Received: by 2002:a5d:6402:: with SMTP id z2mr15766585wru.7.1619908620731; Sat, 01 May 2021 15:37:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJydHkF1nFsD6v3ghTqvjA382j+7drkcbTObCLa6Zz57LeItnKKqwKxleO0Ej/I7nKecQq1eiQ== X-Received: by 2002:a5d:6402:: with SMTP id z2mr15766570wru.7.1619908620603; Sat, 01 May 2021 15:37:00 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Juan Quintela , "Dr. David Alan Gilbert" , Richard Henderson , Andrew Jones , qemu-arm@nongnu.org, Eric Blake , Paolo Bonzini , Markus Armbruster , Claudio Fontana , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Maydell , Laurent Vivier Subject: [PATCH v5 04/10] qtest/arm-cpu-features: Use generic qtest_has_accel() to check for KVM Date: Sun, 2 May 2021 00:36:32 +0200 Message-Id: <20210501223638.510712-5-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210501223638.510712-1-philmd@redhat.com> References: <20210501223638.510712-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 Sun May 19 03:12:48 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=1619908629; cv=none; d=zohomail.com; s=zohoarc; b=Au0GPjY6mQZxVPCVUcty8XRuv8Apz0/JTYeotAfoGPnZntoqmQ5SbvKfJuGLkcyMLyE7ZlCRiBThlXoD6s/p3SFUi3vcuAXt67fcGvX3PSOcBxXyc8pMmlqEk65SLbLxZVUbqf3C6yLrv1VI9JvanCIsL8fLVeF/jreXHc4Y/6I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619908629; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=YUwsAY7j/ecV1UbnP3UC7xEIyUmH3VJq/XNOQQ4OyUg=; b=KpYn95nI35AjBKL/HfcS9crzo31Gf+DCDwWaDrnhapJukQ1BP8ZqmkURy8hT+ZRCvW+c87KnxQAvuXaHfkexdBkTArHnVWNM55RLAi0h5QuCPpRM5N8lXe+wp+ZjsmoK1rArKuoZ8p10bJsNCVXYJeLOMtD0O5DoVnyuXGQOiqM= 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 1619908629071555.9327469516285; Sat, 1 May 2021 15:37:09 -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-190-F61Yr1yNMFOcajssPOE2og-1; Sat, 01 May 2021 18:37:06 -0400 Received: by mail-wr1-f69.google.com with SMTP id r12-20020adfc10c0000b029010d83323601so1265638wre.22 for ; Sat, 01 May 2021 15:37:06 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (anancy-651-1-208-144.w109-217.abo.wanadoo.fr. [109.217.237.144]) by smtp.gmail.com with ESMTPSA id d5sm7408486wrv.43.2021.05.01.15.37.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 May 2021 15:37:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619908628; 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=eHIAeIWbqj0astnoA60gFDaDFnuwXOxrXGW0Emt5WWW8q4y3qxbl+5FBptTy/RdRDnNL4b fR96/w0OLIdQ8hA4JRiDN8P4//6i+HAxBAfW0Sqq/dGHyMTjSsHTRP+uUR6sTiMo0Sfv5y oUSxxcEJ5sK/QRsuSv0RpORFgmmvW1Q= X-MC-Unique: F61Yr1yNMFOcajssPOE2og-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=g1gE1Qrs3v/VI4sALsS+DuZmRaBmDRn+NSvXGqr3J0d+XlwGgYQdal6ElBAiO+eiAT 2PKoCE0suj+YVmoBpe/in+vfKxKoTvRNa1VqJbvNhAzLyix2jR/wP2lZaCWjhy6asdzI XpHsN6lRg7gRZi+cHtbRp0k5GuWdFqrCfGPYxrzvDa8rwKiXw/IN+j3M6peRI/p1+8Jp QmwG06x1J28uAgjv4ZV/df+bx51d9+0cbxG5LC2YF4eDlhns55Togg1234t61QfU8CMJ XaRN4+/5ODc8UDXTNjqEG+lP6uKUHXw7c5V8x2itPIyxF+Zjuclb0g/yIoMPBweIC9K+ OSKg== X-Gm-Message-State: AOAM533VQEMFjWHMydqd7UhEgUU/46Rg6ysK1zeYFnmDB368La7uYsOc hQK+FIz6ZcZjSzNSqZdhrG6y0j25MJh8J+Ae1zcyryeyZ2PnzyUecxuXCcLoS1IWBwo7Wjmyfab +ez+05xBgYjI84Q== X-Received: by 2002:a05:600c:1907:: with SMTP id j7mr13076071wmq.158.1619908625559; Sat, 01 May 2021 15:37:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwtvJ574OASz8WHsavoBlG4k6JyZrbSbGZFkzQvshH+3tEyGuCJ6yV+mAQOLN9RQAC6Rw8dyQ== X-Received: by 2002:a05:600c:1907:: with SMTP id j7mr13076065wmq.158.1619908625457; Sat, 01 May 2021 15:37:05 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Juan Quintela , "Dr. David Alan Gilbert" , Richard Henderson , Andrew Jones , qemu-arm@nongnu.org, Eric Blake , Paolo Bonzini , Markus Armbruster , Claudio Fontana , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Maydell , Laurent Vivier Subject: [PATCH v5 05/10] qtest/arm-cpu-features: Restrict sve_tests_sve_off_kvm test to KVM Date: Sun, 2 May 2021 00:36:33 +0200 Message-Id: <20210501223638.510712-6-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210501223638.510712-1-philmd@redhat.com> References: <20210501223638.510712-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 Sun May 19 03:12:48 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=1619908634; cv=none; d=zohomail.com; s=zohoarc; b=Fvi+lXvhIUgiB9RdaztoZ1gllVVvvvV73a1ycN14n2MpyDKPRJoA5+pDD4GwdQPtATcbPXJCWkxNf/CFyJOMxmQhGMi/29aEHy2yO1Qjid92nruzwFG763BBhpkfuAaWwEFRj1/26BUj9eC+h/089vFULzH6YpfMIMIw3k4MHbc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619908634; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=cVrcRnyBOkjPEo/icx3S79OKNawcTbdRmhevRRnT37M=; b=K17UF5fJKzZeca0+r+2cgL+eJSoBdsB2mvS8QBf80Eri5xg7sUEzlv7xX3H69B856vdbNGWjbUH98gHQvLd5tpM7IDlR4qbqoCj34hHlF5bKKCT1UsSARr27vnkk2rQAiPzxM1Nfar4bL+tD4af+8srypbU043IM2YEPBNF6nZg= 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 1619908634183701.2985913264879; Sat, 1 May 2021 15:37:14 -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-128-54joTzDHNSypDPMFQPtrjQ-1; Sat, 01 May 2021 18:37:11 -0400 Received: by mail-wm1-f72.google.com with SMTP id m22-20020a05600c4f56b0290145dde0633dso121274wmq.1 for ; Sat, 01 May 2021 15:37:11 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (anancy-651-1-208-144.w109-217.abo.wanadoo.fr. [109.217.237.144]) by smtp.gmail.com with ESMTPSA id c2sm6658948wmr.22.2021.05.01.15.37.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 May 2021 15:37:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619908633; 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=heipv+jjCUKC/pGkJX+IvuEUqOwA2t0cp5r+acuG0vwo0HKmSG7cW/4+YibXth1mccIQqT gyjcF9hMyxDzgL53oh6m4iqYlGUC1XjqcoyD9nkEgNWCgILwKwNbOxGOKFlnAusBUDa57+ Mi2ZMnNzPn9akS/btCZAh4sR19TcEgA= X-MC-Unique: 54joTzDHNSypDPMFQPtrjQ-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=WdcYELlkvz5zOHBjeER4N3DcEjx1KxjdYQ7cbnKRjU4QmGjeLG0J7S7Ya40bLX3lRe S1dnVoY/9RaW4WuMSFW5D3HSldK+uhznAr1EgCEyo4IoBSiE7jAHCbrPBSHrQH14iCdZ 4jqGHNEZqrfksXNW1WI2+O5P5bznt3TU5FzVno4a8Y0UhHbWU++da+mMtoPBaSRJVxIU 46udkXyOqAqskhm8Vc5dt1pkG85grdiwO4hRPB8LPX2PnxtNMwnVomm+3+1EngEi4b7r 3HYUqeM+rPvURlqUWOHludhOnLfokRmfGUz7D2pq2LF4dYg6IbUPMgdOgN0Mtj3Skfob X9GA== X-Gm-Message-State: AOAM530cMcjuwK8aVPVa2SXbX+MASFXj9lRWgeSLfDrwJk6HtuQEqy43 Z0EArorhKgEQ4wxf2FkuCgdnHhQOcC9jNk35l526umK/C4ZAic7qwrj0ZLEkc27chi31JExxQ3a TDe4pXel0qpxnGQ== X-Received: by 2002:a5d:6207:: with SMTP id y7mr14238802wru.39.1619908630343; Sat, 01 May 2021 15:37:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz9v5mswuMzteBCTgaVe2vlEq7AxFtWvYuq70E2LGx7bEUYBWXWPDrDLwZCnIyKLfshUbHP0g== X-Received: by 2002:a5d:6207:: with SMTP id y7mr14238787wru.39.1619908630241; Sat, 01 May 2021 15:37:10 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Juan Quintela , "Dr. David Alan Gilbert" , Richard Henderson , Andrew Jones , qemu-arm@nongnu.org, Eric Blake , Paolo Bonzini , Markus Armbruster , Claudio Fontana , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Maydell , Laurent Vivier Subject: [PATCH v5 06/10] qtest/arm-cpu-features: Remove TCG fallback to KVM specific tests Date: Sun, 2 May 2021 00:36:34 +0200 Message-Id: <20210501223638.510712-7-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210501223638.510712-1-philmd@redhat.com> References: <20210501223638.510712-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 Sun May 19 03:12:48 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=1619908638; cv=none; d=zohomail.com; s=zohoarc; b=Fo+HXXGDKIwwNfZT3JBv+jjwCBaOIxAOGSTXy+8KcT/UwAZjPZOF7TzdH+AtPE97DVuyFXK9CXiEflL2+YkyUK9s3FPDZKNCwxPVJJ58mWdvQDt980FnxDMvWLO6fsPBlAWpmf6I9wn+b61c+LeEGgAzf+mkY6o/8mQGZBtCO/o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619908638; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=JLhAw7XD7qIOrjXaghuSYUyF7i2GShMvrYawRB6AMVs=; b=UC6Jgy9xxiMsaQu+jcPu/I1121yEJc2yL5aR+UekFH6GZ5Wq0iEcagEMZxyJWp1regd2UsVZnn/vUdvk3GNbDtWNeHO6z1JVSp7fDLdV6/AmxZ14H5/xOgntyd1Je4mtOb/KdCed8WdeDPq8ji9cfdDcDrdNayTF4EAp6N0gYD0= 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 1619908638927253.57790307417713; Sat, 1 May 2021 15:37:18 -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-163-6L9xP-WWPbOoYX1RUN603w-1; Sat, 01 May 2021 18:37:16 -0400 Received: by mail-wr1-f69.google.com with SMTP id v2-20020a0560001622b0290106e28f8af8so1287073wrb.9 for ; Sat, 01 May 2021 15:37:16 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (anancy-651-1-208-144.w109-217.abo.wanadoo.fr. [109.217.237.144]) by smtp.gmail.com with ESMTPSA id g10sm15134871wmq.25.2021.05.01.15.37.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 May 2021 15:37:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619908637; 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=Kes9IhcAMri53EjkEFfkJQwONdUrJnm6FUaQ7RrFrhjhh2v1l14jqQTZFcWtkIjCslvA93 GDZypI/Li29kAEM+WuIwOBf0kf2K2CI4y1OLRlKzTNfyd//iAVcZ44Jdbuo+nDLIPAoEpQ JpBCUbukm/gb/kW/GpstByi9mLu3bvc= X-MC-Unique: 6L9xP-WWPbOoYX1RUN603w-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=gtt4VOb0+G8iLPENotq1zIF+BohsQmpOuovCwuYDYbWT/x4RydLJsOHoQnaPygyd7k CEeENkmuuR6MZzPM679IkhYyPQCokIq1C6ZGQ6r3J11ve/Zj9kgPqR8m56AMos8Ii7gU qkhE5cI6i4732RnBvAAvIk8ZtYgUwk5Cd7SLD5MvYKdRdplxIYSSkO2SgkwCNttJ6ZjE 0MYKNpVAY0QKAGvl+rXSiTa8oYt4c7YMWmugvP1tfh8yuAIOa2N96sHfseL65ABm5FbC xs3Mb8xA7M0ciPMLI2WsibehOWoa5k2wiiiFa/5OTRIoYQgpojDEmAq/5HrvKMj9Kf+g jBHQ== X-Gm-Message-State: AOAM53090HbrF4xDD3fZg0ktbwHp7k7H8PuDBEWFdgkz8DYUrfmhAhwe 3oyMvLJgiB06mtxFloOVc99DQtoylPb4V/w2RzRbONvnoz6Z0f3XDkej1QTAm+IzaygnA1foeGm VtMw4PXthCN8NTw== X-Received: by 2002:adf:e0c8:: with SMTP id m8mr16218259wri.349.1619908635176; Sat, 01 May 2021 15:37:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyhEm3Q0zbT6QHH8bk2hsUBj23M3IfMikdiIAJcFHZOA2rqBIb2YrHrBiXxu+a+w/pdk3rR/Q== X-Received: by 2002:adf:e0c8:: with SMTP id m8mr16218244wri.349.1619908635070; Sat, 01 May 2021 15:37:15 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Juan Quintela , "Dr. David Alan Gilbert" , Richard Henderson , Andrew Jones , qemu-arm@nongnu.org, Eric Blake , Paolo Bonzini , Markus Armbruster , Claudio Fontana , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Maydell , Laurent Vivier Subject: [PATCH v5 07/10] qtest/arm-cpu-features: Use generic qtest_has_accel() to check for TCG Date: Sun, 2 May 2021 00:36:35 +0200 Message-Id: <20210501223638.510712-8-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210501223638.510712-1-philmd@redhat.com> References: <20210501223638.510712-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 Sun May 19 03:12:48 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=1619908651; cv=none; d=zohomail.com; s=zohoarc; b=KuQdqp8hihUxd1M1x1LJR8qOJlsHv59yY0P3wzTRcn2cxtAwDoApEWZo7msB502ickDgKwl0GaChC84V/qvS5n9V519u8YqvCLRv3gnVJavSpGMMMKJxfXYoV6EfKEN64bFABjznpDh4Rpqpg3TkPxyMWMa+yeuQXz1fDs127M8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619908651; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=/QexIH/VTNKxOuVblouGzmBuPgjBWLL7wx7SLN7JtrI=; b=GW+1MNmv/iowb7NgEmlwwgfrN8LXeJiwG8rnePcG3NsmHKQoHGbNTDxzmwIpmH50aKGKYktTj0pwLW1yJv8NnmORXZLsx+V4Tu8P61r+OpxEJGmXj4X4kc7k7pLFAX1MHuPQ+YSa7PyzGZJhYKuMZ3CzayIUVzb+93a/xq0iNGE= 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 16199086519831012.1050973367603; Sat, 1 May 2021 15:37:31 -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-64-TVzjipKsNoOOdnMU2pZQnw-1; Sat, 01 May 2021 18:37:21 -0400 Received: by mail-wr1-f71.google.com with SMTP id q18-20020adfc5120000b029010c2bdd72adso1288739wrf.16 for ; Sat, 01 May 2021 15:37:21 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (anancy-651-1-208-144.w109-217.abo.wanadoo.fr. [109.217.237.144]) by smtp.gmail.com with ESMTPSA id t17sm6524586wmq.12.2021.05.01.15.37.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 May 2021 15:37:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619908643; 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=/QexIH/VTNKxOuVblouGzmBuPgjBWLL7wx7SLN7JtrI=; b=fEJm9xbwk11WJCspbwZhXKnnwuhs0gqs+4bMvdZd79flkBL9tcRco/7US992wu60m5ncrf URc2oFzfeslYuqQNdbHvjgducChNkieepdnuriPhR/m1nEl4TRowD1AQVwbJ0eJM3Qp2k3 AL6qjOUPKk0bVUqvdOIjYkqn5MAnLQM= X-MC-Unique: TVzjipKsNoOOdnMU2pZQnw-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=/QexIH/VTNKxOuVblouGzmBuPgjBWLL7wx7SLN7JtrI=; b=SBR8uzbRgcaLYaOmwqfAK/pSFUGaiyow4NuNzNKabJJkkU8mLAiWYPlBYnL9nZb/QL kjeye99l/QaX1Xoo/6W4tqxD091JLYGvOc8rLBZKEAV5GvVxIXJCIYaR5XwJUN/0s4ZJ kciezASzzv2UdBShPBLyKe4H38APYbkJkIdrATmGgSr0FlUR/8fw1BSskls1cQiclSY/ nDPAyQvQZph1xIvKenqFBmV0uXsuX66aSDcAwGsUdcXRL8UHsnxTVx2kK5fJrWRLDjyA hZma9AVkZlwxJbq8z2tuVGn65iGO+E375UXsyHREZk3FdRnj1xmGrmnfR+WU6PiamKPt +TLg== X-Gm-Message-State: AOAM533v+NDpkhyT3vEPuc9O/m2GTQNBr/J3I21KA+NE5+7ALkT49dK3 3Gu0NcMtR+mfj+HONS38DJbLekBxG4RBlZqdYjYu/wRSYqJsDNgNB8p9e7nSvt4YHVug+T0257J gMWqt7aifzqdhGg== X-Received: by 2002:a7b:c382:: with SMTP id s2mr9239111wmj.75.1619908640210; Sat, 01 May 2021 15:37:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzfH+8IfuCWS4C80siMbM4CRyn1o7/pTPOyHVuWmCT4uwbcWqFgSop1wAWwfA2cuLdKdEB3wQ== X-Received: by 2002:a7b:c382:: with SMTP id s2mr9239092wmj.75.1619908640083; Sat, 01 May 2021 15:37:20 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Juan Quintela , "Dr. David Alan Gilbert" , Richard Henderson , Andrew Jones , qemu-arm@nongnu.org, Eric Blake , Paolo Bonzini , Markus Armbruster , Claudio Fontana , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , "Michael S. Tsirkin" , Igor Mammedov Subject: [PATCH v5 08/10] qtest/bios-tables-test: Make test build-independent from accelerator Date: Sun, 2 May 2021 00:36:36 +0200 Message-Id: <20210501223638.510712-9-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210501223638.510712-1-philmd@redhat.com> References: <20210501223638.510712-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, 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: Alex Benn=C3=A9e Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/qtest/bios-tables-test.c | 99 ++++++++++++++++++---------------- 1 file changed, 52 insertions(+), 47 deletions(-) diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index 156d4174aa3..a4c7bddf6f3 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,15 +719,11 @@ 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 */ + assert(!data->tcg_only || tcg_accel_available); =20 args =3D test_acpi_create_args(data, params, use_uefi); data->qts =3D qtest_init(args); + test_acpi_load_tables(data, use_uefi); =20 if (getenv(ACPI_REBUILD_EXPECTED_AML)) { @@ -1504,6 +1501,8 @@ int main(int argc, char *argv[]) const char *arch =3D qtest_get_arch(); int ret; =20 + tcg_accel_available =3D qtest_has_accel("tcg"); + g_test_init(&argc, &argv, NULL); =20 if (strcmp(arch, "i386") =3D=3D 0 || strcmp(arch, "x86_64") =3D=3D 0) { @@ -1512,56 +1511,62 @@ 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/oem-fields", test_acpi_oem_fields_pc); - qtest_add_func("acpi/piix4/bridge", test_acpi_piix4_tcg_bridge); + qtest_add_func("acpi/microvm/oem-fields", test_acpi_oem_fields_mic= rovm); 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/piix4/smm-compat", - test_acpi_piix4_tcg_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); - qtest_add_func("acpi/q35/smm-compat", - test_acpi_q35_tcg_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); - 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= ); + if (tcg_accel_available) { + 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/piix4/bridge", test_acpi_piix4_tcg_bridge= ); + 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_numam= em); + 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/piix4/smm-compat", + test_acpi_piix4_tcg_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); + qtest_add_func("acpi/q35/smm-compat", + test_acpi_q35_tcg_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_hmat); + qtest_add_func("acpi/q35/acpihmat", test_acpi_q35_tcg_acpi_hma= t); + 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_tcg); + if (strcmp(arch, "x86_64") =3D=3D 0) { + 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); + if (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); + qtest_add_func("acpi/virt/pxb", test_acpi_virt_tcg_pxb); + } qtest_add_func("acpi/virt/oem-fields", test_acpi_oem_fields_virt); } ret =3D g_test_run(); --=20 2.26.3 From nobody Sun May 19 03:12:48 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=1619908652; cv=none; d=zohomail.com; s=zohoarc; b=UulLn7IlxVr3ms5aRlhpxgQcBf60QlQRqI5GfVycEpiFq5dJeNQ6B3AqAImgjT0u/aXh2vxQwWnnG+y2mnvjDsVgalRzsFyHB0eaSiLq8cdyIxLT1gZ47lssN/nDmJHfNXkeRmqKs7mCV0f8wPIovVHKU+9eYa71feCo/7FN85Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619908652; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=NSr0ATvoVPT94Kw0PlP2HcPHUZbWsmv1leCf95/HD08=; b=VXZ6Kl0jM8FlHZ10896tijvpW2YhHPTq2YxSYEPDIOa9iGjZMQ8i44gxQrvVMD3yT85p2vQBHlHZdnMxKqt8imFJ111rKsLnNcCDopTw7Ftcx2eRB7umgE0Ynmw5tKhgw/Y6dOzgxkTVCN52l1Qbe+jaTku8CEFCYAIZTFqQl4E= 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 1619908652596366.484261364398; Sat, 1 May 2021 15:37:32 -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-157-zUYGscQ4MVWz1BHyhpOcTQ-1; Sat, 01 May 2021 18:37:26 -0400 Received: by mail-wr1-f71.google.com with SMTP id 88-20020adf95610000b029010758d8d7e2so1266717wrs.19 for ; Sat, 01 May 2021 15:37:26 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (anancy-651-1-208-144.w109-217.abo.wanadoo.fr. [109.217.237.144]) by smtp.gmail.com with ESMTPSA id n2sm8024960wmb.32.2021.05.01.15.37.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 May 2021 15:37:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619908651; 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=KAbpJ3XPCeTHIXwpFR1aiFU/TxjH0iUDN2uNfJT8EAH/mFUhd6wAFQRojJNcD7rN6Yphke 1WaNqRKG0AHGkKbHc1Vmg3+f6IAwjqaxY+llHbjB+AedvRrJ4PQ2br+pqNwJWM7YANGLId xlo/pGheU7x8tLYItUB1Ka9cGUQzPEY= X-MC-Unique: zUYGscQ4MVWz1BHyhpOcTQ-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=oVKfDNCxOloXmik1qfOIl6VGHitm8h/6NzMtpNo7ECvlkNBLKhwK0a1X+OQ9lRqVsq wj6Qm9wIaMkGazv9LDVakvoQX15xBAN9eHy1Ks9fahbxIOVGJiUujz/YvQMndE6ely0u KVrb3SZmNFJh91uLzxSq7sq0+lgaNC0SJrIeKjJR7MJQ6d8CHdacyXBGkEHvI1jRg0ns f6P8t4b6wnskv/2+Gv91scnsYdro5RgBA+luWMfrsZVUeEc6c/LOcXrCoViwXoC1M6E4 sTu5rRSnHc9tG33MRWmeyraeq6myAIgxVG0AdBA3O7ipiDwcDWW5eSOaqJ7X5MF0sHWF WWnA== X-Gm-Message-State: AOAM532KVmMoGdfc15Io29S+Q67aamVJM8Feftd+iTkQQAWZM7njprrn fdTb95QdK1puC/YNv1KP140RE8uqW+Eb48rEyenlEdKfjiYYE6+IBjVadT6urNjAVq2Icn18LCH 9Rr5Anx1UdDeOfw== X-Received: by 2002:a5d:6d48:: with SMTP id k8mr15615918wri.93.1619908645324; Sat, 01 May 2021 15:37:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyHlDmMb/Hu2EcSuWjOkP9gCFn8An4aP1VyRAf3WRmO5rwvrL7se7YiZsfzpfi6wQhgecdN1w== X-Received: by 2002:a5d:6d48:: with SMTP id k8mr15615905wri.93.1619908645226; Sat, 01 May 2021 15:37:25 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Juan Quintela , "Dr. David Alan Gilbert" , Richard Henderson , Andrew Jones , qemu-arm@nongnu.org, Eric Blake , Paolo Bonzini , Markus Armbruster , Claudio Fontana , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Gibson , Greg Kurz , Cornelia Huck , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Laurent Vivier Subject: [PATCH v5 09/10] qtest/migration-test: Skip tests if KVM not builtin on s390x/ppc64 Date: Sun, 2 May 2021 00:36:37 +0200 Message-Id: <20210501223638.510712-10-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210501223638.510712-1-philmd@redhat.com> References: <20210501223638.510712-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 Sun May 19 03:12:48 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=1619908659; cv=none; d=zohomail.com; s=zohoarc; b=idSKPrt6DwN61wPvFALTLgBHdDbfOigvUke4oinfvxtWcOzSWJ0Rq5wUCrr3UUc2Cg1hBaRsJ6nu5QwOVC4lz9OgSK8l3nuIjdMIYOTWnsv6aXryjr7gf1QX2ZdT87obRdeYdXM7/43I6jcPQKa0+Fqh4Gg5p6MPMm3XyJFB2Rc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619908659; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=piFQVJLRgYVAQ8rwlcVYLrCWu2jTvSW2z8Zq+W/DVsE=; b=gH58C7tSx0HbSbx2h9HkQ9rQ3djMYjRXVWDXdI6L8T6dI70ddK7UBr1d24HdjbZUHkE3z69iq2tRRdEY7W2XAOZld4DqwflZJxWoZu92YGnuVX+C55+A1PdEymblqCraptleL3a4I4Kb1FYodYXN038tkaExm0EsWtHXx1wHi0Q= 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 1619908659214708.0567164141154; Sat, 1 May 2021 15:37:39 -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-13-QigfTGlPNkCQTS25Z6osKg-1; Sat, 01 May 2021 18:37:31 -0400 Received: by mail-wr1-f71.google.com with SMTP id t18-20020adfdc120000b02900ffe4432d8bso1306230wri.6 for ; Sat, 01 May 2021 15:37:31 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (anancy-651-1-208-144.w109-217.abo.wanadoo.fr. [109.217.237.144]) by smtp.gmail.com with ESMTPSA id m11sm44785wmq.33.2021.05.01.15.37.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 May 2021 15:37:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619908655; 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=Yb1QH1qSwsdbp2fzuR6iKWMk//t9lRqN75igNtay/69Slpr3WmWuCYFNJAUyyfxF7P6YgX DszwRfLjkOOr81H7HW4OV5Sy9CJHG/SFHy31WRgUSJacPpQWvTXNk7aIeNI59GcpYnvSxy Eq0QgNivuWZFOzS+tGHNG5IEqQUf558= X-MC-Unique: QigfTGlPNkCQTS25Z6osKg-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=pbM13twzFivw3XGIaZi5bmLmbME47XGZ7j8J2jTPqTczGsuDtA6QvjQ/ZVubGQ1w9F FY0CKjd9ba4YIDVn0kvBNPn0M4NKtInqpZvoxfTfPgaXys33am+RseK6O8JBJGSYm/Ht DyS7slMSY+eOnjhj+z0RbPmvUgbFzHiR61YkGldjqPaBAepRd8+ZNiks2XyYsNS6YVKU 6uJO4OGw03Hugo7vEVQ7eQ38HyqioSPWJdzdOVcy4KOUF8mlpBQ/zwKDLBnb/IMPpUli DAKy+GMBTJelI8ZaqPvvQ2ByV9P3PNIcOEornTlrzEUXZ8nbgV0Qchbhbvpb6YloOYBg Y7+Q== X-Gm-Message-State: AOAM532VXad6fyDuQD/GyInwEfBxwDUd/dEf8Dkw84z874gDLNs/aXuw viPKc2UymotbD3uET71ekdQqxZDODNDyHcvgiu/AcPwP+pw+EAt4jagU4R03cVBV2TI6lujCGQt gVucmYPMCXSttqA== X-Received: by 2002:a5d:6b50:: with SMTP id x16mr15538107wrw.379.1619908650257; Sat, 01 May 2021 15:37:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyFwrlaHEA237JOmKCBgcp6IzvH/BdWKY2+dp6D/AQCA6n/m/0lyvqUoX3ovM0rbtoqtFQCVg== X-Received: by 2002:a5d:6b50:: with SMTP id x16mr15538086wrw.379.1619908650140; Sat, 01 May 2021 15:37:30 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Juan Quintela , "Dr. David Alan Gilbert" , Richard Henderson , Andrew Jones , qemu-arm@nongnu.org, Eric Blake , Paolo Bonzini , Markus Armbruster , Claudio Fontana , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Laurent Vivier Subject: [PATCH v5 10/10] qtest: Do not restrict bios-tables-test to Aarch64 hosts anymore Date: Sun, 2 May 2021 00:36:38 +0200 Message-Id: <20210501223638.510712-11-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210501223638.510712-1-philmd@redhat.com> References: <20210501223638.510712-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