From nobody Mon Feb 9 12:47:12 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=1762764396; cv=none; d=zohomail.com; s=zohoarc; b=P/8QzW1Ksa8uKWoGBzsyGugx/jbQmaUH1zDLQ+r4ldVT7XidFvsd1HUbkLAcwXZ3CzoxAwQWdF+bWLs7Vl5aKShxWlpMy0QT+/OjGx0EebieBSxB/k49CynIofcQKr2uEz2PFT5M5wLO3orvgQxc5mUk+mI9ndm2DWh37APsSIk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1762764396; 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=dKrU5Gj5zlwKnLF0l/yHu+Iw3MxjHv9wgN7vf5PRfBw=; b=WbOwYrN+fnH7mWKcBXPYkSpVbgojBZM8KlhNAo2cUZZDwmzdelgkihfCDHiKuc93nBJq2E0/IftshjbAjXm/GfPoWYtCM+PffA70CAIfIlpcrHcXyF6eT0Q3476hU0hMVXAlOy+neeaOHsWxfdpQtxyQ6F0PWHcQ/PEoXlhXIj0= 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 1762764396006820.9213733628336; Mon, 10 Nov 2025 00:46:36 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 25B9A3F899; Mon, 10 Nov 2025 03:46:35 -0500 (EST) Received: from [172.19.199.29] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 6BC8044813; Mon, 10 Nov 2025 03:41:23 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 48EEE44272; Mon, 10 Nov 2025 03:41:17 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 7436D4423A for ; Mon, 10 Nov 2025 03:40:11 -0500 (EST) Received: from mx-prod-mc-06.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-139-BInhsiMqMBCTK9htsgfTIg-1; Mon, 10 Nov 2025 03:39:57 -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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id CF7161800250 for ; Mon, 10 Nov 2025 08:39:56 +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 27868180057F for ; Mon, 10 Nov 2025 08:39:55 +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=1762764011; 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=dKrU5Gj5zlwKnLF0l/yHu+Iw3MxjHv9wgN7vf5PRfBw=; b=grSh4WWm6p0QXBB/bg4kbHqMachADoJRjQLUTk8QuVL4b1B+pcid3bFiOFdOlHzUKZhHkY eVZQLTV8SkOZfmbl/e8C350xxliIGTjNW0uIZXVMLjo6XP02/YhnMo06vBmJaWRh9KrDCU UYqr7cPJ+GZe9YQcUfb/L48OQXDGp+M= X-MC-Unique: BInhsiMqMBCTK9htsgfTIg-1 X-Mimecast-MFC-AGG-ID: BInhsiMqMBCTK9htsgfTIg_1762763996 To: devel@lists.libvirt.org Subject: [PATCH 3/5] domain_capabilities: Rework virDomainCapsCPUFormat() Date: Mon, 10 Nov 2025 09:39:48 +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: x8j9XkyaT_vLUc9i4BVMkbQL9NAerZzwd7aoDlEedY0_1762763996 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: V2QZTX3IZOIQHAOJ7J3YJTUEHFUJXBDL X-Message-ID-Hash: V2QZTX3IZOIQHAOJ7J3YJTUEHFUJXBDL 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: 1762764396976158500 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Michal Privoznik Make the virDomainCapsCPUFormat() function use virXMLFormatElement() family of functions. Signed-off-by: Michal Privoznik Reviewed-by: Peter Krempa --- src/conf/domain_capabilities.c | 77 ++++++++++++++++------------------ 1 file changed, 37 insertions(+), 40 deletions(-) diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c index 443e6dcd8e..1c69a05685 100644 --- a/src/conf/domain_capabilities.c +++ b/src/conf/domain_capabilities.c @@ -488,67 +488,64 @@ static void virDomainCapsCPUFormat(virBuffer *buf, const virDomainCapsCPU *cpu) { - virBufferAddLit(buf, "\n"); - virBufferAdjustIndent(buf, 2); + g_auto(virBuffer) childBuf =3D VIR_BUFFER_INIT_CHILD(buf); + g_auto(virBuffer) hostPassModeChildBuf =3D VIR_BUFFER_INIT_CHILD(&chil= dBuf); + g_auto(virBuffer) hostPassModeAttrBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) maxModeChildBuf =3D VIR_BUFFER_INIT_CHILD(&childBuf); + g_auto(virBuffer) maxModeAttrBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) hostModeChildBuf =3D VIR_BUFFER_INIT_CHILD(&childBuf= ); + g_auto(virBuffer) hostModeAttrBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) customModeChildBuf =3D VIR_BUFFER_INIT_CHILD(&childB= uf); + g_auto(virBuffer) customModeAttrBuf =3D VIR_BUFFER_INITIALIZER; =20 - virBufferAsprintf(buf, "hostPassthrough ? "yes" : "no"); =20 if (cpu->hostPassthrough && cpu->hostPassthroughMigratable.report) { - virBufferAddLit(buf, ">\n"); - virBufferAdjustIndent(buf, 2); - ENUM_PROCESS(cpu, hostPassthroughMigratable, - virTristateSwitchTypeToString); - virBufferAdjustIndent(buf, -2); - virBufferAddLit(buf, "\n"); - } else { - virBufferAddLit(buf, "/>\n"); + virDomainCapsEnumFormat(&hostPassModeChildBuf, + &cpu->hostPassthroughMigratable, + "hostPassthroughMigratable", + virTristateSwitchTypeToString); } =20 - virBufferAsprintf(buf, "maximum ? "yes" : "no"); =20 if (cpu->maximum && cpu->maximumMigratable.report) { - virBufferAddLit(buf, ">\n"); - virBufferAdjustIndent(buf, 2); - ENUM_PROCESS(cpu, maximumMigratable, - virTristateSwitchTypeToString); - virBufferAdjustIndent(buf, -2); - virBufferAddLit(buf, "\n"); - } else { - virBufferAddLit(buf, "/>\n"); + virDomainCapsEnumFormat(&maxModeChildBuf, + &cpu->maximumMigratable, + "maximumMigratable", + virTristateSwitchTypeToString); } =20 - virBufferAsprintf(buf, "hostModel ? "yes" : "no"); + if (cpu->hostModel) { - virBufferAddLit(buf, "supported=3D'yes'>\n"); - virBufferAdjustIndent(buf, 2); - - virCPUDefFormatBuf(buf, cpu->hostModel); - - virBufferAdjustIndent(buf, -2); - virBufferAddLit(buf, "\n"); - } else { - virBufferAddLit(buf, "supported=3D'no'/>\n"); + virCPUDefFormatBuf(&hostModeChildBuf, cpu->hostModel); } =20 - virBufferAsprintf(buf, "custom && cpu->custom->nmodels) { - virBufferAddLit(buf, "supported=3D'yes'>\n"); - virBufferAdjustIndent(buf, 2); - virDomainCapsCPUCustomFormat(buf, cpu->custom); - virBufferAdjustIndent(buf, -2); - virBufferAddLit(buf, "\n"); + virBufferAddLit(&customModeAttrBuf, " supported=3D'yes'"); + virDomainCapsCPUCustomFormat(&customModeChildBuf, cpu->custom); } else { - virBufferAddLit(buf, "supported=3D'no'/>\n"); + virBufferAddLit(&customModeAttrBuf, " supported=3D'no'"); } =20 - virBufferAdjustIndent(buf, -2); - virBufferAddLit(buf, "\n"); + virXMLFormatElement(&childBuf, "mode", &customModeAttrBuf, &customMode= ChildBuf); + + virXMLFormatElement(buf, "cpu", NULL, &childBuf); } =20 static void --=20 2.51.0