From nobody Mon Feb 9 09:52:34 2026 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=1615915502; cv=none; d=zohomail.com; s=zohoarc; b=PB72QI47jPWa1utxS6Ype874777JG8RG3lGe7b56u1UviQPHVQ+Vv1y9SKio09toMzmDO2v4Y7nio2fEA+8f2/aJhyQa1VurWLh+IWlyAGiVmG2mbNzj+Zl1WHVvJJUUg8UvB6pWgF7uvmCpTPgNmmdEIDPav4L6OrvplNCNvH4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615915502; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=P9HOtQxBV/bG+GuI8aHNav7iJtNSHx8uTsMF5lguS5k=; b=SkXfOdxEOqkMBcATVH4Uy40oLvw8mZvBCb+3b0AeP6Ca8v1ajtSTWzhTz062QMpFMFYr/hKTUrOAsadF1k/Bm+gVFIeMr9myBOyjK9W0y3CgG7GbmfwtfFDuOeOb0/DxP3jxhM7QMccHpBT6/kPLMOyxBvX/LzW5oZzK9CTh00A= 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 1615915502231835.0454026319001; Tue, 16 Mar 2021 10:25:02 -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-102-oTbM1opZM5WwKBfkFpn58g-1; Tue, 16 Mar 2021 13:24:59 -0400 Received: by mail-wm1-f72.google.com with SMTP id i14so9865052wmq.7 for ; Tue, 16 Mar 2021 10:24:59 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (17.red-88-21-201.staticip.rima-tde.net. [88.21.201.17]) by smtp.gmail.com with ESMTPSA id v18sm24427294wrf.41.2021.03.16.10.24.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Mar 2021 10:24:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615915501; 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=P9HOtQxBV/bG+GuI8aHNav7iJtNSHx8uTsMF5lguS5k=; b=WBieNe5dVqaXS00megdIor8VPZHdJAQpxO6gykqgNANL6Lqp2nRzBHIybbLe8aOahjwGem QoUuPRTu1BMiO83k4MWV279nQvgq2ZSoLBRzJMLc6t3CuiMpE238wWF3409Xim2IIEK+TE BRmR5nyZ3ohpdtvw/jVTZ6imTRaxq14= X-MC-Unique: oTbM1opZM5WwKBfkFpn58g-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=P9HOtQxBV/bG+GuI8aHNav7iJtNSHx8uTsMF5lguS5k=; b=kUHN0WVBSHJu98KZSqCdJe9uB+hhSUfIlc2ixgNGL74FRnPhsRXtY3z3vHgyZYYvHg 8+pxGQaSnW29HOEBLq6XUyAMMWzaACxLb+uMqktXjP2c0Y4pMr0obaciuV/8U0C2cN55 XXvN/OnCix9P1PMmsM8e1HuWmUSSVOcLEcSL7676Xw5yHeupxira+BE4qtJnitp4wrFW vSnvD0wmXIbMMUegF6CK0X5uBLDgwEJKpEo+DLmJoZdnh5qH4ly6jzaoHoml2xNRxupv KQWANnhgA9gOKfu/17iKPub5pwgzOyFEnMULoZ1qhw1T9Xr69yBhlYFjW/PMDnT+jYFU jikg== X-Gm-Message-State: AOAM531WXSNvCpEbAxO8UZQc7lrkocWjpDzd3+J0BEapjzSVGzTnHaRq IJcw9VWa/I+MWhV1CWFBu0r4xM8PQwbaUmip8HKjz1CLxGdZPtertT8D5wiL/QcJDYVJJ/b6+AC 1Cq32xvXKms/Shg== X-Received: by 2002:adf:ea0e:: with SMTP id q14mr43310wrm.389.1615915498291; Tue, 16 Mar 2021 10:24:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzwy2pE4aQj+uWuWtKpHIDCCqqKI5Y0oeAjbejpCBZc34UdnssSi8XP9nUo2qvv89oWJY0SrA== X-Received: by 2002:adf:ea0e:: with SMTP id q14mr43289wrm.389.1615915498087; Tue, 16 Mar 2021 10:24:58 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Igor Mammedov , Laurent Vivier , Marcel Apfelbaum , Claudio Fontana , Thomas Huth , Markus Armbruster , Richard Henderson , qemu-arm@nongnu.org, Andrew Jones , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , "Michael S. Tsirkin" , Eduardo Habkost , Eric Blake , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 1/4] accel: Introduce 'query-accels' QMP command Date: Tue, 16 Mar 2021 18:24:46 +0100 Message-Id: <20210316172449.3148634-2-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210316172449.3148634-1-philmd@redhat.com> References: <20210316172449.3148634-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" } ] } Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Eric Blake --- Since v1: 'type' -> 'name' in comments --- qapi/machine.json | 55 +++++++++++++++++++++++++++++++++++++++++++++++ accel/accel-qmp.c | 49 +++++++++++++++++++++++++++++++++++++++++ accel/meson.build | 2 +- 3 files changed, 105 insertions(+), 1 deletion(-) create mode 100644 accel/accel-qmp.c diff --git a/qapi/machine.json b/qapi/machine.json index 330189efe3d..610252fc25c 100644 --- a/qapi/machine.json +++ b/qapi/machine.json @@ -1471,3 +1471,58 @@ ## { 'event': 'MEM_UNPLUG_ERROR', 'data': { 'device': 'str', 'msg': 'str' } } + +## +# @Accelerator: +# +# An enumeration of accelerator names. +# +# Since: 6.0 +## +{ 'enum': 'Accelerator', + 'data': [ { 'name': 'qtest' }, + { 'name': 'tcg' }, + { 'name': 'kvm' }, + { 'name': 'hax' }, + { 'name': 'hvf' }, + { 'name': 'whpx' }, + { 'name': 'xen' } ] } + +## +# @AcceleratorInfo: +# +# Accelerator information. +# +# @name: The accelerator name. +# +# Since: 6.0 +## +{ 'union': 'AcceleratorInfo', + 'base': {'name': 'Accelerator'}, + 'discriminator': 'name', + 'data': { } } + +## +# @query-accels: +# +# Get a list of AcceleratorInfo for all built-in accelerators. +# +# Returns: a list of @AcceleratorInfo describing each accelerator. +# +# Since: 6.0 +# +# Example: +# +# -> { "execute": "query-accels" } +# <- { "return": [ +# { +# "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.2