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=1756997818; cv=none; d=zohomail.com; s=zohoarc; b=ZmmXhjeTs3vcf4XzGlp9NDvQ/rORrj52zdZCYCYdjSZ6QwnolGpiYF5XwU8acrU65MV2kSDw/jMQoyr6Xk3QRfpfgrlgvzCCcKvRKFIQB6wGmuR7BsK5buFOI7apbOVQm7lkQRop03+uiMlHCCGh5tiWqHfRiH08gddu/tdiopo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756997818; 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=JJ0rVjIYKoOV8647/9MlFhiWB0/Nnb8m/rep+kh40BE=; b=TdTr5gdKBgyfPjo6Y3vAnDXDhPZWOHjRzHvh3YJDnhiaj9fcam1M9DWQPJnRhTPuEgcwc7e68zk/UpDFrrEU3M4JoM1Bt+bg4470TnFBB1Q5G0JCre1zySUD7sbJfQGj9CM1N1lf4SZLJweIpVrMl3w18vtHfHv2RN8RGNKHsyw= 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 1756997818730665.3444699949578; Thu, 4 Sep 2025 07:56:58 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id A0FE744348; Thu, 4 Sep 2025 10:56:57 -0400 (EDT) Received: from [172.19.199.3] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 5AF7344479; Thu, 4 Sep 2025 10:47:51 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id E1F3A4437D; Thu, 4 Sep 2025 10:47:37 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.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 0BE5A442EA for ; Thu, 4 Sep 2025 10:47:17 -0400 (EDT) Received: from mx-prod-mc-02.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-50-rc3N5eMMMJa1awpwpK3FXw-1; Thu, 04 Sep 2025 10:47:15 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id CEF5319560BC for ; Thu, 4 Sep 2025 14:47:14 +0000 (UTC) Received: from orkuz (unknown [10.43.3.115]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5E95518004A3 for ; Thu, 4 Sep 2025 14:47:14 +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=1756997236; 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=JJ0rVjIYKoOV8647/9MlFhiWB0/Nnb8m/rep+kh40BE=; b=NMmACCHk/HPx9iTMS7q4MketGtYQWQi5RhJj5yZH0DooUXsJi/eCcoQcyZ62EG80QTXJa3 FSo6Uyg/dOcJoQSnp5gro6SXFbh9RC7+HUW1SQc2VKQo/w8ctecSP0+P+86zQsLU66MFEO jnERZPjfUq3tst6TwWpLVaJKn9aMsw8= X-MC-Unique: rc3N5eMMMJa1awpwpK3FXw-1 X-Mimecast-MFC-AGG-ID: rc3N5eMMMJa1awpwpK3FXw_1756997234 To: devel@lists.libvirt.org Subject: [PATCH 04/14] qemu: Generalize filtering in qemuMonitorJSONParsePropsList Date: Thu, 4 Sep 2025 16:46:52 +0200 Message-ID: <02238f71296dd5d1be2c78244850e754d8584107.1756996033.git.jdenemar@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: bEp8vbIp3tHikHoi2JJXykqx0s62M5CpDhCfBX56dGI_1756997234 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 5RRWB6627IGZIS3NRU27GUWACIH2SRQO X-Message-ID-Hash: 5RRWB6627IGZIS3NRU27GUWACIH2SRQO 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: 1756997820596116600 Content-Type: text/plain; charset="utf-8" From: Jiri Denemark qemuMonitorJSONParsePropsList supported filtering based on type. Let's replace it with a callback supplied by the caller to allow for more advanced filtering. Signed-off-by: Jiri Denemark Reviewed-by: Peter Krempa --- src/qemu/qemu_monitor_json.c | 51 +++++++++++++++++++++++++++++------- 1 file changed, 41 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 6402d18d37..0c78115e9d 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -5837,10 +5837,21 @@ int qemuMonitorJSONSetObjectProperty(qemuMonitor *m= on, #undef MAKE_SET_CMD =20 =20 +/* A filter callback for qemuMonitorJSONParsePropsList. + * + * Returns 0 if the property should be included in the list, + * 1 if the property should be ignored, + * -1 on error. + */ +typedef int (*qemuMonitorJSONPropsListFilter)(const char *name, + virJSONValue *propData, + void *data); + static int qemuMonitorJSONParsePropsList(virJSONValue *cmd, virJSONValue *reply, - const char *type, + qemuMonitorJSONPropsListFilter propFilter, + void *filterData, char ***props) { virJSONValue *data; @@ -5859,19 +5870,25 @@ qemuMonitorJSONParsePropsList(virJSONValue *cmd, =20 for (i =3D 0; i < n; i++) { virJSONValue *child =3D virJSONValueArrayGet(data, i); - const char *tmp; + const char *name =3D virJSONValueObjectGetString(child, "name"); =20 - if (type && - STRNEQ_NULLABLE(virJSONValueObjectGetString(child, "type"), ty= pe)) - continue; - - if (!(tmp =3D virJSONValueObjectGetString(child, "name"))) { + if (!name) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("reply data was missing 'name'")); return -1; } =20 - proplist[count++] =3D g_strdup(tmp); + if (propFilter) { + int rc =3D propFilter(name, child, filterData); + + if (rc < 0) + return -1; + + if (rc !=3D 0) + continue; + } + + proplist[count++] =3D g_strdup(name); } =20 *props =3D g_steal_pointer(&proplist); @@ -5954,7 +5971,7 @@ qemuMonitorJSONGetObjectProps(qemuMonitor *mon, if (qemuMonitorJSONHasError(reply, "DeviceNotFound")) return 0; =20 - return qemuMonitorJSONParsePropsList(cmd, reply, NULL, props); + return qemuMonitorJSONParsePropsList(cmd, reply, NULL, NULL, props); } =20 =20 @@ -6578,6 +6595,18 @@ qemuMonitorJSONGetDeviceAliases(qemuMonitor *mon, } =20 =20 +static int +qemuMonitorJSONCPUPropsFilter(const char *name G_GNUC_UNUSED, + virJSONValue *propData, + void *data G_GNUC_UNUSED) +{ + if (STRNEQ_NULLABLE(virJSONValueObjectGetString(propData, "type"), "bo= ol")) + return 1; + + return 0; +} + + static int qemuMonitorJSONGetCPUProperties(qemuMonitor *mon, const char *cpuQOMPath, @@ -6599,7 +6628,9 @@ qemuMonitorJSONGetCPUProperties(qemuMonitor *mon, if (qemuMonitorJSONHasError(reply, "DeviceNotFound")) return 0; =20 - return qemuMonitorJSONParsePropsList(cmd, reply, "bool", props); + return qemuMonitorJSONParsePropsList(cmd, reply, + qemuMonitorJSONCPUPropsFilter, NU= LL, + props); } =20 =20 --=20 2.51.0