From nobody Sun Feb 8 08:36:47 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1629196917; cv=none; d=zohomail.com; s=zohoarc; b=hlhBRf765iClVTEN4lWV6fmJPF1P0TMZlHxZ0ZgyKcqufuTnB2Kl3+cadVpLRtCTIxwbbve1d8nezBAv7S/QBkV8K4KIxw0nfWrC4/OXJmAzF5IUyCGGdYhr+HYL2ZZkYDxtPBZPqhUDH01EEB3HsmFxpSy3zXA4nFYFvHpHM80= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629196917; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=gmfw8rHLo5aAUVCfvmAh0dqiseuVhoVrL5Aw/CHyZ3c=; b=GGFUXt5jWDbND7hES+L3Fq9TTadIufo1dzZeEzx2oBDemnSNQsZiTAolr5Z7eAXbyQyMgnTigQnZ8H+cIb/0VTMdUA2LdE7kteVJVc1tr3TNeLUYfKdoJBEog9TxNAo4aNIkNcutmm2ZIiidjbNx10r15tJnTWi0xTcf/hvj8v8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1629196917921170.50331164055376; Tue, 17 Aug 2021 03:41:57 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-480-Fb5aPwWYPMKyrkSErpnRLQ-1; Tue, 17 Aug 2021 06:41:54 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1D3901082927; Tue, 17 Aug 2021 10:41:50 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F14F060C81; Tue, 17 Aug 2021 10:41:49 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id C16FF4A7C9; Tue, 17 Aug 2021 10:41:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 17HAcIsB002729 for ; Tue, 17 Aug 2021 06:38:18 -0400 Received: by smtp.corp.redhat.com (Postfix) id C17035C232; Tue, 17 Aug 2021 10:38:18 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.222]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4115A5C1D5 for ; Tue, 17 Aug 2021 10:38:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629196916; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=gmfw8rHLo5aAUVCfvmAh0dqiseuVhoVrL5Aw/CHyZ3c=; b=D5CuDGk70FxSI72Mf1WnrfUxRe4D58f7zLrXbpTnHxgkdTG4M7TeBmLFz1kdhBRULXMRoh METGY3JuJ7rz6KaKl2C9pPPmW/9HwEIngZNcM9A8prNind3oxO9GPv3EFlLtz24TTK+Azd QhHjx3GLijlZoQXoFxKIejRqJl2PBpg= X-MC-Unique: Fb5aPwWYPMKyrkSErpnRLQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH v4 3/5] conf: refactor virDomainResourceDefFormat Date: Tue, 17 Aug 2021 12:38:08 +0200 Message-Id: <9ea9f7dab2bcedd16c88437955b7a39b41e1f390.1629196554.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1629196919490100001 Content-Type: text/plain; charset="utf-8" Prepare the function for additional sub-elements where all of the sub-elements are optional. Signed-off-by: Pavel Hrdina Reviewed-by: Martin Kletzander --- src/conf/domain_conf.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 7dff6c8beb..571650bfd3 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -26761,11 +26761,15 @@ static void virDomainResourceDefFormat(virBuffer *buf, virDomainResourceDef *def) { - virBufferAddLit(buf, "\n"); - virBufferAdjustIndent(buf, 2); - virBufferEscapeString(buf, "%s\n", def->partiti= on); - virBufferAdjustIndent(buf, -2); - virBufferAddLit(buf, "\n"); + g_auto(virBuffer) childBuf =3D VIR_BUFFER_INIT_CHILD(buf); + + if (!def) + return; + + if (def->partition) + virBufferEscapeString(&childBuf, "%s\n", de= f->partition); + + virXMLFormatElement(buf, "resource", NULL, &childBuf); } =20 =20 @@ -27918,8 +27922,7 @@ virDomainDefFormatInternalSetRootName(virDomainDef = *def, if (virDomainNumatuneFormatXML(buf, def->numa) < 0) return -1; =20 - if (def->resource) - virDomainResourceDefFormat(buf, def->resource); + virDomainResourceDefFormat(buf, def->resource); =20 for (i =3D 0; i < def->nsysinfo; i++) { if (virSysinfoFormat(buf, def->sysinfo[i]) < 0) --=20 2.31.1