From nobody Mon Sep 8 17:03:34 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1756998331; cv=none; d=zohomail.com; s=zohoarc; b=KbzmJuZ6cKbAw50db82N7XQN4EASHYjqLxV1DKJdTn+eWbCObHbosdlcleUGK0PjzlHGRNGcG6b8aK290jxHFXqGcZCfmi4PBnSQCwrtghXfnC9gXgOgWmyy4MLM4FckqFU+642nm656SkYg9Bv0ne7jGHDL3OhKJZuS8744htA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756998331; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=L9T9KqUuP4jWaj3DqYY5BKcR7fu5JBmjCn7x0S5CUwY=; b=LTT2fxlQCKwpETXzrxFYtyK+Idb3xUMCD5qheZiWo+Z4NJjX1ceMUkforocQN6XNOAf8Bmby231ZhXrdH3hA90YFT13mW27M6FaATpNeWfh+r1GnNipWFuPn6AM4yumv7MU2JqoHNUFozaRO2FL/SCdli831klRSWm/BXcqGek0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1756998331924267.8096188164287; Thu, 4 Sep 2025 08:05:31 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 3518B4440C; Thu, 4 Sep 2025 11:05:30 -0400 (EDT) Received: from [172.19.199.3] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id B079C4454A; Thu, 4 Sep 2025 10:48:58 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id EDC5A44397; Thu, 4 Sep 2025 10:48:39 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 5AB79443A9 for ; Thu, 4 Sep 2025 10:47:28 -0400 (EDT) Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-121-IMeJCnB1P3qcHAEMfxONIA-1; Thu, 04 Sep 2025 10:47:26 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4CA2519560B2 for ; Thu, 4 Sep 2025 14:47:25 +0000 (UTC) Received: from orkuz (unknown [10.43.3.115]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id CE1A019560AB for ; Thu, 4 Sep 2025 14:47:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1756997248; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=L9T9KqUuP4jWaj3DqYY5BKcR7fu5JBmjCn7x0S5CUwY=; b=aRUiDsmG1s+iBzMLQ6vHGX5mo2nWZTq4Ddbwp0dOtikml57O+CadbQG1ITWpIy+P41VTnD Ote01WBiTaOuf92DIy0sjILK5XmPj+WEDUC1BMys888AqVFBYr08jSUoZpkbkgYUH5W484 JHDvWzxWyj17OKpmpgWoLQNLCnE0h4o= X-MC-Unique: IMeJCnB1P3qcHAEMfxONIA-1 X-Mimecast-MFC-AGG-ID: IMeJCnB1P3qcHAEMfxONIA_1756997245 To: devel@lists.libvirt.org Subject: [PATCH 09/14] qemu: Add qemuMonitorJSONCPUDataAddFeatures helper Date: Thu, 4 Sep 2025 16:46:57 +0200 Message-ID: <35cdfefd08a05690d681903becfe5f27adf719de.1756996034.git.jdenemar@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: k6nXP3cWG9ggc-Y_CAjKf42_kd7e4Fl8WUPAwC_vliw_1756997245 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: YH2KP6MMND2KZ3FSYRDRQWLIHMCLEDAV X-Message-ID-Hash: YH2KP6MMND2KZ3FSYRDRQWLIHMCLEDAV X-MailFrom: jdenemar@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Jiri Denemark via Devel Reply-To: Jiri Denemark X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1756998333359124100 Content-Type: text/plain; charset="utf-8" From: Jiri Denemark The function translates a list of CPU feature names retrieved from QEMU and adds them to virCPUData. Signed-off-by: Jiri Denemark Reviewed-by: Peter Krempa --- src/qemu/qemu_monitor_json.c | 43 ++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 8c70279f6d..a831e9e26c 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -6704,18 +6704,12 @@ qemuMonitorJSONGetCPUProperties(qemuMonitor *mon, =20 =20 static int -qemuMonitorJSONGetCPUData(qemuMonitor *mon, - bool qomListGet, - const char *cpuQOMPath, - qemuMonitorCPUFeatureTranslationCallback transla= te, - virCPUData *data) +qemuMonitorJSONCPUDataAddFeatures(virCPUData *data, + GStrv props, + qemuMonitorCPUFeatureTranslationCallback= translate) { - g_auto(GStrv) props =3D NULL; char **p; =20 - if (qemuMonitorJSONGetCPUProperties(mon, qomListGet, cpuQOMPath, &prop= s) < 0) - return -1; - for (p =3D props; p && *p; p++) { const char *name =3D *p; =20 @@ -6730,6 +6724,25 @@ qemuMonitorJSONGetCPUData(qemuMonitor *mon, } =20 =20 +static int +qemuMonitorJSONGetCPUData(qemuMonitor *mon, + bool qomListGet, + const char *cpuQOMPath, + qemuMonitorCPUFeatureTranslationCallback transla= te, + virCPUData *data) +{ + g_auto(GStrv) props =3D NULL; + + if (qemuMonitorJSONGetCPUProperties(mon, qomListGet, cpuQOMPath, &prop= s) < 0) + return -1; + + if (qemuMonitorJSONCPUDataAddFeatures(data, props, translate) < 0) + return -1; + + return 0; +} + + static int qemuMonitorJSONGetCPUDataDisabled(qemuMonitor *mon, const char *cpuQOMPath, @@ -6737,21 +6750,13 @@ qemuMonitorJSONGetCPUDataDisabled(qemuMonitor *mon, virCPUData *data) { g_auto(GStrv) props =3D NULL; - char **p; =20 if (qemuMonitorJSONGetStringListProperty(mon, cpuQOMPath, "unavailable-features", &prop= s) < 0) return -1; =20 - for (p =3D props; p && *p; p++) { - const char *name =3D *p; - - if (translate) - name =3D translate(data->arch, name); - - if (virCPUDataAddFeature(data, name) < 0) - return -1; - } + if (qemuMonitorJSONCPUDataAddFeatures(data, props, translate) < 0) + return -1; =20 return 0; } --=20 2.51.0