From nobody Sat Feb 7 06:30:53 2026 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=1762764170; cv=none; d=zohomail.com; s=zohoarc; b=VZ0W9s8E4W8bE6oHb3SzGNNJmY8g7WdlPr6ZQebsbr8KiXi194VlUT1spcZP25r7ul4MMxwGbN9NdRDbzuouF3Z4Bf+SUalFugt6d42lca4aIGlm2SthH3kRfS5gbepZGT/NyEObZKQ3OzkP0eINiMbIESzD4erA6enbYGGaofI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1762764170; 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=ykv++oCF8DvYed7Y0hua9uuSWTl2le4FDAHeP/1AHLo=; b=kQnYRvodNTi+uhNc68NbIVy7XC6s6Eulb09Jn6lxSIv+RBj1J/15bDoFGvYtONEAsBOWfiiXv5hkclcIIrennmVf4e7uYbVM1OVaUEai49gLHgDknV4j0F1v7Ur9Ok6scSMNcaoYF+zDYnjGl6sD731oLrDpVMsBr3qa4HWIVCc= 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 1762764170370375.2027102099538; Mon, 10 Nov 2025 00:42:50 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 4EB27442E3; Mon, 10 Nov 2025 03:42:49 -0500 (EST) Received: from [172.19.199.29] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 94DB7448D8; Mon, 10 Nov 2025 03:40:18 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 05173440C0; Mon, 10 Nov 2025 03:39:59 -0500 (EST) 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 5867544216 for ; Mon, 10 Nov 2025 03:39:59 -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-402-drRbAc3yNwesnKlkjSvdXg-1; Mon, 10 Nov 2025 03:39:56 -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 9EC6A1956061 for ; Mon, 10 Nov 2025 08:39:55 +0000 (UTC) Received: from moe (unknown [10.43.3.236]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id EAB7A1800451 for ; Mon, 10 Nov 2025 08:39:54 +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=-5.0 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, 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=1762763999; 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=ykv++oCF8DvYed7Y0hua9uuSWTl2le4FDAHeP/1AHLo=; b=FHcdy0In3aOUDE03pWRzPGKS6qGWr7pnKIKwukStEbpsQ8K1qX1uGGFxQ2lSzR8jGjRDTW DDaqPJeCu3sTGxuu/eyfMyX+OCcuSNBJ4sSlGxDZ0c1CJnauHNfQT3t3HI8HqDhknMZm6A kqMBtNu8kxtjZ1ZWN8ZjcPFTFIAjGGs= X-MC-Unique: drRbAc3yNwesnKlkjSvdXg-1 X-Mimecast-MFC-AGG-ID: drRbAc3yNwesnKlkjSvdXg_1762763995 To: devel@lists.libvirt.org Subject: [PATCH 2/5] domain_capabilities: Rework virDomainCapsCPUCustomFormat() Date: Mon, 10 Nov 2025 09:39:47 +0100 Message-ID: <8df13d740ed9f130ff8c45f459688ea75b6adbee.1762763958.git.mprivozn@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: F7ZOgRj_-pNdYhi9Y1eKczMqfs2sjIxv1tOKDIyr0bU_1762763995 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: DKUVKMRVQNPUJ6ZTRAEKQ25C2TW6KOQQ X-Message-ID-Hash: DKUVKMRVQNPUJ6ZTRAEKQ25C2TW6KOQQ X-MailFrom: mprivozn@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: Michal Privoznik via Devel Reply-To: Michal Privoznik X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1762764171195158500 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Michal Privoznik Make the virDomainCapsCPUCustomFormat() function use virXMLFormatElement() family of functions. Signed-off-by: Michal Privoznik Reviewed-by: Peter Krempa --- src/conf/domain_capabilities.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c index 5a94edf9bc..443e6dcd8e 100644 --- a/src/conf/domain_capabilities.c +++ b/src/conf/domain_capabilities.c @@ -447,35 +447,39 @@ virDomainCapsCPUCustomFormat(virBuffer *buf, size_t i; =20 for (i =3D 0; i < custom->nmodels; i++) { + g_auto(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER; virDomainCapsCPUModel *model =3D custom->models + i; =20 - virBufferAsprintf(buf, "usable= )); =20 if (model->deprecated) - virBufferAddLit(buf, " deprecated=3D'yes'"); + virBufferAddLit(&attrBuf, " deprecated=3D'yes'"); =20 if (model->vendor) - virBufferAsprintf(buf, " vendor=3D'%s'", model->vendor); + virBufferAsprintf(&attrBuf, " vendor=3D'%s'", model->vendor); else - virBufferAddLit(buf, " vendor=3D'unknown'"); + virBufferAddLit(&attrBuf, " vendor=3D'unknown'"); =20 if (model->canonical) - virBufferAsprintf(buf, " canonical=3D'%s'", model->canonical); + virBufferAsprintf(&attrBuf, " canonical=3D'%s'", model->canoni= cal); =20 - virBufferAsprintf(buf, ">%s\n", model->name); + virBufferAddStr(&childBuf, model->name); + + virXMLFormatElementDirect(buf, "model", &attrBuf, &childBuf); =20 if (model->blockers) { + g_auto(virBuffer) blockerAttrBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) blockerChildBuf =3D VIR_BUFFER_INIT_CHILD(bu= f); char **blocker; =20 - virBufferAsprintf(buf, "\n", model->nam= e); - virBufferAdjustIndent(buf, 2); + virBufferAsprintf(&blockerAttrBuf, " model=3D'%s'", model->nam= e); =20 for (blocker =3D model->blockers; *blocker; blocker++) - virBufferAsprintf(buf, "\n", *blocke= r); + virBufferAsprintf(&blockerChildBuf, "\n", *blocker); =20 - virBufferAdjustIndent(buf, -2); - virBufferAddLit(buf, "\n"); + virXMLFormatElement(buf, "blockers", &blockerAttrBuf, &blocker= ChildBuf); } } } --=20 2.51.0