From nobody Fri Nov 14 21:03:15 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1760449403; cv=none; d=zohomail.com; s=zohoarc; b=FR6R0Y0njGrC05WH6pn+AcUdSinFv6SW51Cl2fms32FF6TGqrQTQ/LXRVvJdbcxfUQomgcbHJimnyC4PTW6Th8GTZEw2mYubCJlXx9FN9VEWyc+pG9IhLlP+OYrpMOGZyEiPmNS1BMgvcprELw7BEGhigyMbk6WSWLDnVsvQTEo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760449403; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=zsMuvNyPFddR1kWpBU6ZgTh6DaoZvqds7yRzYkfuz60=; b=ZRs+HNxLVsfWu07pjLU/kYzPMArsKA7Mw3J7e/qZNutIs8Fj5oxSWCnUYtGKbpo1UpNI5AmaIOd2S96fWcLjEnP0arjAWFAblu6LdgIdEpJa1nKGj9MJQtoihW+lKIx+vojKLRpvgHvpoUgEM00sBhllH3p1oGYSCfeK2iH+0Q0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17604494035081002.9916565987365; Tue, 14 Oct 2025 06:43:23 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v8fEL-0005si-1g; Tue, 14 Oct 2025 09:38:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v8fEC-0005aX-Ib for qemu-devel@nongnu.org; Tue, 14 Oct 2025 09:38:14 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v8fE4-00015J-DC for qemu-devel@nongnu.org; Tue, 14 Oct 2025 09:38:10 -0400 Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-657-WQlcH_d_NRiYqPgtuGH01g-1; Tue, 14 Oct 2025 09:37:58 -0400 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-426d314d0deso2307408f8f.1 for ; Tue, 14 Oct 2025 06:37:58 -0700 (PDT) Received: from [192.168.10.48] ([151.61.22.175]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-426ce5e0e70sm23740164f8f.40.2025.10.14.06.37.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Oct 2025 06:37:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1760449079; 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=zsMuvNyPFddR1kWpBU6ZgTh6DaoZvqds7yRzYkfuz60=; b=LZBU9RxUJbsQBZisW8fjc+bB8l553KoZUXu4S09vH9/CNDNj8CjN147nzcgo/NQehvGjns kEG0CQg8MWcnmScvQLZ68AeLdHyqxvD76wNDetC273Bvz2DcvkO8Yq4/C64BLMV9je2R7c vaDjKF16zN62UoA2YxYprIXOelwDPPM= X-MC-Unique: WQlcH_d_NRiYqPgtuGH01g-1 X-Mimecast-MFC-AGG-ID: WQlcH_d_NRiYqPgtuGH01g_1760449077 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760449076; x=1761053876; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zsMuvNyPFddR1kWpBU6ZgTh6DaoZvqds7yRzYkfuz60=; b=P+6fNZyjidy8VXbLD8sRqmpCBy93gq0BU4U9SppBRcUfntgm9pRc5Y5XJ0NEvd8eMy 2/rLvLqvSScsUJxrsqoor9tNtxoj8IrQ5yzHJjZIKh0Ekdb/NuTQI9Lyz6xWmbyj9iFR A1hOEZurQc9utfHvqMULYpWb1AiRUHeRyb4mqJor6DUnnApUc4u1ABoHHg+GQRSMGih5 ck22DefkdEoE2hMTIpOgNJ54cO6SOpIiR+c9K5F/uotFsMjR01jwe1UljLZ2KvU+z+To 4+jzivU1sccIM5fCKHvs1cjWlC9yCZmkw1dytTlM5umXZ6+rdFtg6A+1WXZYJT7ETCTq XfgQ== X-Gm-Message-State: AOJu0YxdxshAqT70d/EXGYWD0XYfOEBWkSj6v6yVTHAZO9NyQwn4ZnpE 9fqb86HQoxL3PNyS4vON9eeU4al0QPFI86a2+RUhnp3QjllrR3Gw5T3ab9xij8Z2oN2ZPptxZc/ 3GTdcKsMPz8IO9RmYtI/KbaDPwM8HBqBKkRjiGy+CPwKPcK92Zwx0XHK/1AHK4tEua/w1AZiQJy vsUl5v7Soki/oJwsW4a5UTl9kgzdbQrLhc3gIOHJZP X-Gm-Gg: ASbGnctouX4q42b3dlxrgPzhTh8RVSTVKJuhptuJx3fNXnzZNxSIZeI5ATcKmfSzk03 E5BEdKymnZhkxgmXLo5X0EjFgFH7uK6wxOrWr1j1HDekxZ3VeGEBNkm5hiGzlka2R5mfbjNBtuN cwO1J5haLTr/K7TEdVufsVn9Kj1WFxPRs6fBh840Sp76H+eFoofcleGA7eZvRVSTTlBOKYumGm2 B/BonDlv1/2NjIrtE+b3s8Fhyn9oPlX/HAzXsYHZgNUKS0b6/lDO2yvJ7TssrXMLJNl5pq3lzGp CT+koXIlOBeS95FT9sFy0U+skH2vm1dByYjjBZou0ibNN1tm+k7PnyBkm/Z3Nl0xn/AFZjrF4mA fVMyUjYTGm5BQKCchMQLe3LIymFWTKy5ySuVKt6zDpN4= X-Received: by 2002:a5d:5d03:0:b0:3ec:e0d0:60e5 with SMTP id ffacd0b85a97d-42667177bd4mr16027466f8f.15.1760449075785; Tue, 14 Oct 2025 06:37:55 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFqhGgqfSe7PXM5B5eAmw1yMJvFZmH2dwtsJgR80jLk1hjOFFaqvAcaOX129R+RNOG10GJ67Q== X-Received: by 2002:a5d:5d03:0:b0:3ec:e0d0:60e5 with SMTP id ffacd0b85a97d-42667177bd4mr16027439f8f.15.1760449075240; Tue, 14 Oct 2025 06:37:55 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Richard Henderson , Praveen K Paladugu , Magnus Kulke , Markus Armbruster , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PULL 16/28] monitor: generalize query-mshv/"info mshv" to query-accelerators/"info accelerators" Date: Tue, 14 Oct 2025 15:37:01 +0200 Message-ID: <20251014133713.1103695-16-pbonzini@redhat.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251014133540.1103268-1-pbonzini@redhat.com> References: <20251014133540.1103268-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1760449417160158500 The recently-introduced query-mshv command is a duplicate of query-kvm, and neither provides a full view of which accelerators are supported by a particular binary of QEMU and which is in use. KVM was the first accelerator added to QEMU, predating QOM and TYPE_ACCEL, so it got a pass. But now, instead of adding a badly designed copy, solve the problem completely for all accelerators with a command that provides the whole picture: >> {"execute": "query-accelerators"} << {"return": {"enabled": "tcg", "present": ["kvm", "mshv", "qtest", "t= cg", "xen"]}} Cc: Praveen K Paladugu Cc: Magnus Kulke Suggested-by: Markus Armbruster Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Paolo Bonzini --- qapi/accelerator.json | 47 +++++++++++++++++++++++++++++--------- include/monitor/hmp.h | 2 +- hw/core/machine-hmp-cmds.c | 21 +++++++++-------- hw/core/machine-qmp-cmds.c | 20 ++++++++++++---- hmp-commands-info.hx | 15 ++++++++---- 5 files changed, 74 insertions(+), 31 deletions(-) diff --git a/qapi/accelerator.json b/qapi/accelerator.json index 664e0272465..2b920608847 100644 --- a/qapi/accelerator.json +++ b/qapi/accelerator.json @@ -56,30 +56,55 @@ 'features': [ 'unstable' ] } =20 ## -# @MshvInfo: +# @Accelerator: # # Information about support for MSHV acceleration # -# @enabled: true if MSHV acceleration is active +# @hvf: Apple Hypervisor.framework # -# @present: true if MSHV acceleration is built into this executable +# @kvm: KVM +# +# @mshv: Hyper-V +# +# @nvmm: NetBSD NVMM +# +# @qtest: QTest (dummy accelerator) +# +# @tcg: TCG (dynamic translation) +# +# @whpx: Windows Hypervisor Platform +# +# @xen: Xen # # Since: 10.2.0 ## -{ 'struct': 'MshvInfo', 'data': {'enabled': 'bool', 'present': 'bool'} } +{ 'enum': 'Accelerator', 'data': ['hvf', 'kvm', 'mshv', 'nvmm', 'qtest', '= tcg', 'whpx', 'xen'] } =20 ## -# @query-mshv: +# @AcceleratorInfo: # -# Return information about MSHV acceleration +# Information about support for various accelerators # -# Returns: @MshvInfo +# @enabled: the accelerator that is in use # -# Since: 10.0.92 +# @present: the list of accelerators that are built into this executable +# +# Since: 10.2.0 +## +{ 'struct': 'AcceleratorInfo', 'data': {'enabled': 'Accelerator', 'present= ': ['Accelerator']} } + +## +# @query-accelerators: +# +# Return information about accelerators +# +# Returns: @AcceleratorInfo +# +# Since: 10.2.0 # # .. qmp-example:: # -# -> { "execute": "query-mshv" } -# <- { "return": { "enabled": true, "present": true } } +# -> { "execute": "query-accelerators" } +# <- { "return": { "enabled": "mshv", "present": ["kvm", "mshv", "qtes= t", "tcg"] } } ## -{ 'command': 'query-mshv', 'returns': 'MshvInfo' } +{ 'command': 'query-accelerators', 'returns': 'AcceleratorInfo' } diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h index 31bd812e5f4..897dfaa2b6d 100644 --- a/include/monitor/hmp.h +++ b/include/monitor/hmp.h @@ -24,7 +24,7 @@ strList *hmp_split_at_comma(const char *str); void hmp_info_name(Monitor *mon, const QDict *qdict); void hmp_info_version(Monitor *mon, const QDict *qdict); void hmp_info_kvm(Monitor *mon, const QDict *qdict); -void hmp_info_mshv(Monitor *mon, const QDict *qdict); +void hmp_info_accelerators(Monitor *mon, const QDict *qdict); void hmp_info_status(Monitor *mon, const QDict *qdict); void hmp_info_uuid(Monitor *mon, const QDict *qdict); void hmp_info_chardev(Monitor *mon, const QDict *qdict); diff --git a/hw/core/machine-hmp-cmds.c b/hw/core/machine-hmp-cmds.c index 682ed9f49b8..74a56600be8 100644 --- a/hw/core/machine-hmp-cmds.c +++ b/hw/core/machine-hmp-cmds.c @@ -163,19 +163,22 @@ void hmp_info_kvm(Monitor *mon, const QDict *qdict) qapi_free_KvmInfo(info); } =20 -void hmp_info_mshv(Monitor *mon, const QDict *qdict) +void hmp_info_accelerators(Monitor *mon, const QDict *qdict) { - MshvInfo *info; + AcceleratorInfo *info; + AcceleratorList *accel; =20 - info =3D qmp_query_mshv(NULL); - monitor_printf(mon, "mshv support: "); - if (info->present) { - monitor_printf(mon, "%s\n", info->enabled ? "enabled" : "disabled"= ); - } else { - monitor_printf(mon, "not compiled\n"); + info =3D qmp_query_accelerators(NULL); + for (accel =3D info->present; accel; accel =3D accel->next) { + char trail =3D accel->next ? ' ' : '\n'; + if (info->enabled =3D=3D accel->value) { + monitor_printf(mon, "[%s]%c", Accelerator_str(accel->value), t= rail); + } else { + monitor_printf(mon, "%s%c", Accelerator_str(accel->value), tra= il); + } } =20 - qapi_free_MshvInfo(info); + qapi_free_AcceleratorInfo(info); } =20 void hmp_info_uuid(Monitor *mon, const QDict *qdict) diff --git a/hw/core/machine-qmp-cmds.c b/hw/core/machine-qmp-cmds.c index e24bf0d97bf..51d5c230f7e 100644 --- a/hw/core/machine-qmp-cmds.c +++ b/hw/core/machine-qmp-cmds.c @@ -31,15 +31,25 @@ #include =20 /* - * QMP query for MSHV + * QMP query for enabled and present accelerators */ -MshvInfo *qmp_query_mshv(Error **errp) +AcceleratorInfo *qmp_query_accelerators(Error **errp) { - MshvInfo *info =3D g_malloc0(sizeof(*info)); + AcceleratorInfo *info =3D g_malloc0(sizeof(*info)); + AccelClass *current_class =3D ACCEL_GET_CLASS(current_accel()); + int i; =20 - info->enabled =3D mshv_enabled(); - info->present =3D accel_find("mshv"); + for (i =3D ACCELERATOR__MAX; i-- > 0; ) { + const char *s =3D Accelerator_str(i); + AccelClass *this_class =3D accel_find(s); =20 + if (this_class) { + QAPI_LIST_PREPEND(info->present, i); + if (this_class =3D=3D current_class) { + info->enabled =3D i; + } + } + } return info; } =20 diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx index c2aa40056bb..25b4aed51f5 100644 --- a/hmp-commands-info.hx +++ b/hmp-commands-info.hx @@ -308,16 +308,21 @@ SRST ERST =20 { - .name =3D "mshv", + .name =3D "accelerators", .args_type =3D "", .params =3D "", - .help =3D "show MSHV information", - .cmd =3D hmp_info_mshv, + .help =3D "show present and enabled information", + .cmd =3D hmp_info_accelerators, }, =20 SRST - ``info mshv`` - Show MSHV information. + ``info accelerators`` + Show which accelerators are compiled into a QEMU binary, and what acce= lerator + is in use. For example:: + + kvm qtest [tcg] + + indicates that TCG in use, and that KVM and qtest are also available. ERST =20 { --=20 2.51.0