From nobody Mon Feb 9 11:07:08 2026 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) 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 170783272792855.8271019092017; Tue, 13 Feb 2024 05:58:47 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id D7DF91B78; Tue, 13 Feb 2024 08:58:46 -0500 (EST) Received: from lists.libvirt.org.85.43.8.in-addr.arpa (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 3D3D71B64; Tue, 13 Feb 2024 08:52:31 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 89F2219DA; Tue, 13 Feb 2024 08:51:54 -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 A30541775 for ; Tue, 13 Feb 2024 08:51:53 -0500 (EST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-425-tm3f3WdBP_6n33GTXw03dQ-1; Tue, 13 Feb 2024 08:51:51 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2C0488A2F54 for ; Tue, 13 Feb 2024 13:51:51 +0000 (UTC) Received: from maggie.brq.redhat.com (unknown [10.43.3.102]) by smtp.corp.redhat.com (Postfix) with ESMTP id C8642C185C4 for ; Tue, 13 Feb 2024 13:51:50 +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=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: tm3f3WdBP_6n33GTXw03dQ-1 From: Michal Privoznik To: devel@lists.libvirt.org Subject: [PATCH 4/4] secret_conf: Modernize XML parsing & formatting Date: Tue, 13 Feb 2024 14:51:30 +0100 Message-ID: <272afe5ed9f98440b948098348c80d5c202cad83.1707832214.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: SLLR2GHNOMOWCKK6DL2QW7I5YGQ4E7H6 X-Message-ID-Hash: SLLR2GHNOMOWCKK6DL2QW7I5YGQ4E7H6 X-MailFrom: mprivozn@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: Content-Type: text/plain; charset="utf-8"; x-default="true" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1707832730040100001 Our virSecret XML is still parsed and formatted using old way (e.g. virXPathString() + virXXXTypeFromString() combo, or formatting elements using plain virBufferAsprintf() instead of virXMLFormatElement()). Modernize the code as it'll make it easier for future expansion. Signed-off-by: Michal Privoznik --- src/conf/secret_conf.c | 47 ++++++++++++++++++------------------------ 1 file changed, 20 insertions(+), 27 deletions(-) diff --git a/src/conf/secret_conf.c b/src/conf/secret_conf.c index c6c8c30ba9..966536599e 100644 --- a/src/conf/secret_conf.c +++ b/src/conf/secret_conf.c @@ -195,39 +195,34 @@ static int virSecretDefFormatUsage(virBuffer *buf, const virSecretDef *def) { - const char *type; + g_auto(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childBuf =3D VIR_BUFFER_INIT_CHILD(buf); + + virBufferAsprintf(&attrBuf, " type=3D'%s'", + virSecretUsageTypeToString(def->usage_type)); =20 - type =3D virSecretUsageTypeToString(def->usage_type); - if (type =3D=3D NULL) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected secret usage type %1$d"), - def->usage_type); - return -1; - } - virBufferAsprintf(buf, "\n", type); - virBufferAdjustIndent(buf, 2); switch (def->usage_type) { case VIR_SECRET_USAGE_TYPE_NONE: break; =20 case VIR_SECRET_USAGE_TYPE_VOLUME: - virBufferEscapeString(buf, "%s\n", def->usage_id); + virBufferEscapeString(&childBuf, "%s\n", def->usa= ge_id); break; =20 case VIR_SECRET_USAGE_TYPE_CEPH: - virBufferEscapeString(buf, "%s\n", def->usage_id); + virBufferEscapeString(&childBuf, "%s\n", def->usage_i= d); break; =20 case VIR_SECRET_USAGE_TYPE_ISCSI: - virBufferEscapeString(buf, "%s\n", def->usage_id); + virBufferEscapeString(&childBuf, "%s\n", def->usa= ge_id); break; =20 case VIR_SECRET_USAGE_TYPE_TLS: - virBufferEscapeString(buf, "%s\n", def->usage_id); + virBufferEscapeString(&childBuf, "%s\n", def->usage_i= d); break; =20 case VIR_SECRET_USAGE_TYPE_VTPM: - virBufferEscapeString(buf, "%s\n", def->usage_id); + virBufferEscapeString(&childBuf, "%s\n", def->usage_i= d); break; =20 default: @@ -235,8 +230,8 @@ virSecretDefFormatUsage(virBuffer *buf, virReportEnumRangeError(virSecretUsageType, def->usage_type); return -1; } - virBufferAdjustIndent(buf, -2); - virBufferAddLit(buf, "\n"); + + virXMLFormatElement(buf, "usage", &attrBuf, &childBuf); =20 return 0; } @@ -245,25 +240,23 @@ char * virSecretDefFormat(const virSecretDef *def) { g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; - const unsigned char *uuid; + g_auto(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childBuf =3D VIR_BUFFER_INIT_CHILD(&buf); char uuidstr[VIR_UUID_STRING_BUFLEN]; =20 - virBufferAsprintf(&buf, "\n", + virBufferAsprintf(&attrBuf, " ephemeral=3D'%s' private=3D'%s'", def->isephemeral ? "yes" : "no", def->isprivate ? "yes" : "no"); =20 - uuid =3D def->uuid; - virUUIDFormat(uuid, uuidstr); - virBufferAdjustIndent(&buf, 2); - virBufferEscapeString(&buf, "%s\n", uuidstr); + virUUIDFormat(def->uuid, uuidstr); + virBufferEscapeString(&childBuf, "%s\n", uuidstr); if (def->description !=3D NULL) - virBufferEscapeString(&buf, "%s\n", + virBufferEscapeString(&childBuf, "%s\n", def->description); if (def->usage_type !=3D VIR_SECRET_USAGE_TYPE_NONE && - virSecretDefFormatUsage(&buf, def) < 0) + virSecretDefFormatUsage(&childBuf, def) < 0) return NULL; - virBufferAdjustIndent(&buf, -2); - virBufferAddLit(&buf, "\n"); =20 + virXMLFormatElement(&buf, "secret", &attrBuf, &childBuf); return virBufferContentAndReset(&buf); } --=20 2.43.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org