From nobody Wed Mar 12 17:57:55 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 --- 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