From nobody Wed Mar 12 12:42:31 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1741283937598306.86357594899766; Thu, 6 Mar 2025 09:58:57 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 7A9E819F7; Thu, 6 Mar 2025 12:58:56 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 2C44D19BA; Thu, 6 Mar 2025 12:58:19 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 37A3E1925; Thu, 6 Mar 2025 12:58:16 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id B48111410 for ; Thu, 6 Mar 2025 12:58:15 -0500 (EST) Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-392-NK_RKw58OBqw47YznvCoZw-1; Thu, 06 Mar 2025 12:58:14 -0500 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 310D01801A12 for ; Thu, 6 Mar 2025 17:58:13 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.44.33.191]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 6B051180174E for ; Thu, 6 Mar 2025 17:58:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741283895; 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=cjlK46XjYhed5yF5L6pzQoRavWZnvOiJzNUbg+diw/0=; b=U0aunbilwkieKbrKMDXkOOds/hLVYSuj9pI2HTvhFxKwCtoDvh4BK8SEOMRqZUMmGu2faP XwdFrZm7xZR2zkGjMUl5c7knIY+UWf3T+RZ+cNOTDkz4qZ/RdafTFe4p4GDSO3AuzDnx8j VM9BA/b3JkFMcniwXH9ZTMqHQLYsfdA= X-MC-Unique: NK_RKw58OBqw47YznvCoZw-1 X-Mimecast-MFC-AGG-ID: NK_RKw58OBqw47YznvCoZw_1741283893 From: Pavel Hrdina To: devel@lists.libvirt.org Subject: [libvirt PATCH 1/4] util: virxml: introduce virXMLFormatElementDirect Date: Thu, 6 Mar 2025 18:58:06 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: lqSPSHR68lbrVyi7HZQP-TdVus36VrlAUCUqkhXQYb4_1741283893 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 453KYZOOOFHKASPGU4LY7NUY7DEBU6M6 X-Message-ID-Hash: 453KYZOOOFHKASPGU4LY7NUY7DEBU6M6 X-MailFrom: phrdina@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1741283939568019100 Content-Type: text/plain; charset="utf-8"; x-default="true" This can be used to format XML where the element has direct value instead of any subelement. For example: 1524288 Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko --- src/libvirt_private.syms | 1 + src/util/virxml.c | 14 ++++++++++++++ src/util/virxml.h | 6 ++++++ 3 files changed, 21 insertions(+) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 30a9f806f0..e9ddef6453 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -3779,6 +3779,7 @@ virXMLBufferCreate; virXMLCheckIllegalChars; virXMLExtractNamespaceXML; virXMLFormatElement; +virXMLFormatElementDirect; virXMLFormatElementEmpty; virXMLFormatElementInternal; virXMLFormatMetadata; diff --git a/src/util/virxml.c b/src/util/virxml.c index 670cace4ab..1295945472 100644 --- a/src/util/virxml.c +++ b/src/util/virxml.c @@ -1767,6 +1767,20 @@ virXMLFormatElementEmpty(virBuffer *buf, } =20 =20 +/** + * Same as virXMLFormatElement but the child is direct value without + * subelements. + */ +void +virXMLFormatElementDirect(virBuffer *buf, + const char *name, + virBuffer *attrBuf, + virBuffer *childBuf) +{ + virXMLFormatElementInternal(buf, name, attrBuf, childBuf, false, false= ); +} + + /** * virXMLFormatElement * @buf: the parent buffer where the element will be placed diff --git a/src/util/virxml.h b/src/util/virxml.h index 06ba324df0..4284a8ffce 100644 --- a/src/util/virxml.h +++ b/src/util/virxml.h @@ -351,6 +351,12 @@ virXMLFormatElementEmpty(virBuffer *buf, virBuffer *attrBuf, virBuffer *childBuf); =20 +void +virXMLFormatElementDirect(virBuffer *buf, + const char *name, + virBuffer *attrBuf, + virBuffer *childBuf); + int virXMLFormatMetadata(virBuffer *buf, xmlNodePtr metadata); --=20 2.48.1 From nobody Wed Mar 12 12:42:31 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1741283994541614.0570245223314; Thu, 6 Mar 2025 09:59:54 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 888971991; Thu, 6 Mar 2025 12:59:53 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id E0A1D1A78; Thu, 6 Mar 2025 12:58:40 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id DEDE6199A; Thu, 6 Mar 2025 12:58:35 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 96C5B1A0A for ; Thu, 6 Mar 2025 12:58:26 -0500 (EST) Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-456-1kIRFsroNPabgVAp87W20Q-1; Thu, 06 Mar 2025 12:58:15 -0500 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 3B30C18007E1 for ; Thu, 6 Mar 2025 17:58:14 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.44.33.191]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 8A64018009BC for ; Thu, 6 Mar 2025 17:58:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741283906; 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=3OU/TTRIp3Dl0eH5HXQMH+AZeeUlshFxt1ITCIXoKoE=; b=P0RJqe4L63RmQzKP+CXMtiu28MAc+UTAb1ajkTIuP0ObjtwD8PQUfZx4C6v8fU/tf1UA6G vFtsumIDtk4BrNWtWBkDzaJ+yjF2nmfZMuZtBWFR9InNFiTift4uHmN9kJdWWZZ/bEjOIh Zd18sDhwCs45+vlLg5C2CnEKYelBrHY= X-MC-Unique: 1kIRFsroNPabgVAp87W20Q-1 X-Mimecast-MFC-AGG-ID: 1kIRFsroNPabgVAp87W20Q_1741283894 From: Pavel Hrdina To: devel@lists.libvirt.org Subject: [libvirt PATCH 2/4] conf: use virXMLFormatElementDirect Date: Thu, 6 Mar 2025 18:58:07 +0100 Message-ID: <07c513ac85565a5bdd4ec952bfacff74470ec902.1741282487.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 2bqbJ2gf25ODjIb2WHsKRcEG9-97dZ4mb1p0jjRPhtM_1741283894 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 3WTQ3WUFI3MX5NLNGULRBALBT6RLS247 X-Message-ID-Hash: 3WTQ3WUFI3MX5NLNGULRBALBT6RLS247 X-MailFrom: phrdina@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1741283995683019100 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko --- src/conf/domain_conf.c | 4 ++-- src/conf/node_device_conf.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index f42b7075ad..94f456a362 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -27053,7 +27053,7 @@ virDomainLoaderDefFormat(virBuffer *buf, =20 virBufferEscapeString(&loaderChildBuf, "%s", loader->path); =20 - virXMLFormatElementInternal(buf, "loader", &loaderAttrBuf, &loaderChil= dBuf, false, false); + virXMLFormatElementDirect(buf, "loader", &loaderAttrBuf, &loaderChildB= uf); =20 if (virDomainLoaderDefFormatNvram(buf, loader, xmlopt, flags) < 0) return -1; @@ -28304,7 +28304,7 @@ virDomainDefFormatInternalSetRootName(virDomainDef = *def, virBufferAddLit(&attrBuf, " unit=3D'KiB'"); virBufferAsprintf(&contentBuf, "%llu", def->mem.max_memory); =20 - virXMLFormatElementInternal(buf, "maxMemory", &attrBuf, &contentBu= f, false, false); + virXMLFormatElementDirect(buf, "maxMemory", &attrBuf, &contentBuf); } =20 virBufferAddLit(buf, "idx); virBufferEscapeString(&content, "%s", field->value); =20 - virXMLFormatElementInternal(buf, fieldtype, &attrBuf, &content, false,= false); + virXMLFormatElementDirect(buf, fieldtype, &attrBuf, &content); } =20 static void --=20 2.48.1 From nobody Wed Mar 12 12:42:31 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1741283956581179.6129964356137; Thu, 6 Mar 2025 09:59:16 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 6F6DC1A41; Thu, 6 Mar 2025 12:59:15 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id C626419C3; Thu, 6 Mar 2025 12:58:22 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 26DAB195D; Thu, 6 Mar 2025 12:58:18 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 9E8AD1916 for ; Thu, 6 Mar 2025 12:58:17 -0500 (EST) Received: from mx-prod-mc-01.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-568-ODBbWCMcP4mzjUodfVDMyA-1; Thu, 06 Mar 2025 12:58:16 -0500 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 54AFA19560B2 for ; Thu, 6 Mar 2025 17:58:15 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.44.33.191]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id A3A241801747 for ; Thu, 6 Mar 2025 17:58:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741283897; 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=sAd89ajMvnrAF/Vt9W2XqZLvFgGtEPx6SVBGkO/p1Z8=; b=P8RN5lGEv9sVPAtRapvGJWk1ofOMkU0u/rCouF+0wtd/uWI3hBM8jMInPJTzh6hM10dyt+ dgA1Ay2sqTCW1B76adwktTJVYFVLIqbi42MPg62NTyOpug2vHfnVcDcpAyoPlyXTfoC8Tn anRYnLdunw/QTSDcdZvFTuunGTQ/ZpA= X-MC-Unique: ODBbWCMcP4mzjUodfVDMyA-1 X-Mimecast-MFC-AGG-ID: ODBbWCMcP4mzjUodfVDMyA_1741283895 From: Pavel Hrdina To: devel@lists.libvirt.org Subject: [libvirt PATCH 3/4] domain_conf: refactor virDomainLoaderDefFormatNvram Date: Thu, 6 Mar 2025 18:58:08 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: AkuVrduq_Ph0Om-jZ9OWB1JOlZW8JzbWv4TZujULuPc_1741283895 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: L7GRFFSB6UDHFYOFACL5VQMEVRGIBZJC X-Message-ID-Hash: L7GRFFSB6UDHFYOFACL5VQMEVRGIBZJC X-MailFrom: phrdina@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1741283957732019100 Content-Type: text/plain; charset="utf-8"; x-default="true" Use the new virXMLFormatDirect in order to remove usage of virXMLFormatInternal. Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko --- src/conf/domain_conf.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 94f456a362..0bcbf32bb4 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -26980,10 +26980,8 @@ virDomainLoaderDefFormatNvram(virBuffer *buf, unsigned int flags) { g_auto(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; - g_auto(virBuffer) childBufDirect =3D VIR_BUFFER_INITIALIZER; - g_auto(virBuffer) childBufChild =3D VIR_BUFFER_INIT_CHILD(buf); - virBuffer *childBuf =3D &childBufDirect; - bool childNewline =3D false; + g_auto(virBuffer) directBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childBuf =3D VIR_BUFFER_INIT_CHILD(buf); =20 virBufferEscapeString(&attrBuf, " template=3D'%s'", loader->nvramTempl= ate); =20 @@ -26996,14 +26994,11 @@ virDomainLoaderDefFormatNvram(virBuffer *buf, virStorageSource *src =3D loader->nvram; =20 if (!loader->newStyleNVRAM) { - virBufferEscapeString(&childBufDirect, "%s", src->path); + virBufferEscapeString(&directBuf, "%s", src->path); } else { - childNewline =3D true; - childBuf =3D &childBufChild; - virBufferAsprintf(&attrBuf, " type=3D'%s'", virStorageTypeToSt= ring(src->type)); =20 - if (virDomainDiskSourceFormat(&childBufChild, src, "source", 0, + if (virDomainDiskSourceFormat(&childBuf, src, "source", 0, false, flags, false, false, xmlo= pt) < 0) return -1; } @@ -27014,7 +27009,10 @@ virDomainLoaderDefFormatNvram(virBuffer *buf, } } =20 - virXMLFormatElementInternal(buf, "nvram", &attrBuf, childBuf, false, c= hildNewline); + if (virBufferUse(&directBuf) > 0) + virXMLFormatElementDirect(buf, "nvram", &attrBuf, &directBuf); + else + virXMLFormatElement(buf, "nvram", &attrBuf, &childBuf); =20 return 0; } --=20 2.48.1 From nobody Wed Mar 12 12:42:31 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 17412839777261001.7961368193203; Thu, 6 Mar 2025 09:59:37 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id AD35F1A22; Thu, 6 Mar 2025 12:59:36 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 3EC441A60; Thu, 6 Mar 2025 12:58:28 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id A461919A7; Thu, 6 Mar 2025 12:58:23 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id D79731998 for ; Thu, 6 Mar 2025 12:58:18 -0500 (EST) Received: from mx-prod-mc-03.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-539-Rg5g3kWdNoaN7hQpD9rMuw-1; Thu, 06 Mar 2025 12:58:17 -0500 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 742F31954B31 for ; Thu, 6 Mar 2025 17:58:16 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.44.33.191]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C309818009BC for ; Thu, 6 Mar 2025 17:58:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741283898; 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=4ABfxxugddG5TjCgUy+ozETBRw+frvEKZXJPBTxcgFE=; b=CpLcPFjRSptD/y/2JlW9b278I/hF81I6HTA9YouYE4mFFuACS27Fk9fwhpj88jw1X2sG8+ 4uwTlzpVOyURNB7X4gRz9MJzUx9/g5/yLhwifWXTcUzc+Kv7VCoZatzdpxcP/qwjg5t5GN itn0oB9lXdBxaElx/mtz7M/u203FJOs= X-MC-Unique: Rg5g3kWdNoaN7hQpD9rMuw-1 X-Mimecast-MFC-AGG-ID: Rg5g3kWdNoaN7hQpD9rMuw_1741283896 From: Pavel Hrdina To: devel@lists.libvirt.org Subject: [libvirt PATCH 4/4] util: virxml: unexport virXMLFormatElementInternal Date: Thu, 6 Mar 2025 18:58:09 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 9q-iSkh8koA0diT_HFVbjWMtT4ZQsnbhsiy4WmMy0Ig_1741283896 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: PPDN2QBAU4NDDZR45KUKNK7NRIWNSH6N X-Message-ID-Hash: PPDN2QBAU4NDDZR45KUKNK7NRIWNSH6N X-MailFrom: phrdina@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1741283979915019100 Content-Type: text/plain; charset="utf-8"; x-default="true" It is no longer used anywhere else. Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko --- src/libvirt_private.syms | 1 - src/util/virxml.c | 2 +- src/util/virxml.h | 7 ------- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index e9ddef6453..82b0974b94 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -3781,7 +3781,6 @@ virXMLExtractNamespaceXML; virXMLFormatElement; virXMLFormatElementDirect; virXMLFormatElementEmpty; -virXMLFormatElementInternal; virXMLFormatMetadata; virXMLNewNode; virXMLNodeContentString; diff --git a/src/util/virxml.c b/src/util/virxml.c index 1295945472..06e698cdf8 100644 --- a/src/util/virxml.c +++ b/src/util/virxml.c @@ -1721,7 +1721,7 @@ virXMLValidatorFree(virXMLValidator *validator) * * Both passed buffers are always consumed and freed. */ -void +static void virXMLFormatElementInternal(virBuffer *buf, const char *name, virBuffer *attrBuf, diff --git a/src/util/virxml.h b/src/util/virxml.h index 4284a8ffce..7cc3f47913 100644 --- a/src/util/virxml.h +++ b/src/util/virxml.h @@ -332,13 +332,6 @@ void virXMLValidatorFree(virXMLValidator *validator); G_DEFINE_AUTOPTR_CLEANUP_FUNC(virXMLValidator, virXMLValidatorFree); =20 -void -virXMLFormatElementInternal(virBuffer *buf, - const char *name, - virBuffer *attrBuf, - virBuffer *childBuf, - bool allowEmpty, - bool childNewline); void virXMLFormatElement(virBuffer *buf, const char *name, --=20 2.48.1