From nobody Mon Feb 9 06:34:04 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=1614259649; cv=none; d=zohomail.com; s=zohoarc; b=D960DirsaV1OS8yvh8XDck/ObVbY1Tvk5c7arxAhadDjJExbn/NlGNkp8sDL3EW1znp5CUroUYhdHqjTAe09FI1aJ+fgJ5d6DteCHQmeiR/J10uXJF+B2qCxNYbQzDtFIpfPpM6t7PeBkoetXr2eKIAD6GL03ORakrvFoxTQf/4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614259649; 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=Kq7vSMVQL2a++nSmOJI5qN8+1dLyFTKRdX0YfWcPMbo=; b=Mz4m8T+n/XABh1GDngrXn4XfsMyel3IUrTNt4beyWi5kTILLyITkxxcDfZo1Y2KzvHDjKzjyAJAn6xc4xC9JP4gNDLGd6v9uJfHmFHsbYXOb9pthNASPXSDAem1ht5t33a8xQ0ulfRM/gvOZrdUxIlUxyQYIyzclDzRRZ7Q1hVk= 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) header.from= 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 1614259649081326.2226698833267; Thu, 25 Feb 2021 05:27:29 -0800 (PST) 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-64-6iCgliulMyynAFHtCFumHw-1; Thu, 25 Feb 2021 08:27:25 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A4A27193578B; Thu, 25 Feb 2021 13:27:19 +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 3401B60C5A; Thu, 25 Feb 2021 13:27:19 +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 EF30D58074; Thu, 25 Feb 2021 13:27:18 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 11PDQSi2012208 for ; Thu, 25 Feb 2021 08:26:28 -0500 Received: by smtp.corp.redhat.com (Postfix) id E87EA5D9D7; Thu, 25 Feb 2021 13:26:28 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4F75D5D9DC for ; Thu, 25 Feb 2021 13:26:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614259648; 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=Kq7vSMVQL2a++nSmOJI5qN8+1dLyFTKRdX0YfWcPMbo=; b=cnMvVEGF8nttGwDQ6dzrydURsqSPHnhF/WusvPGYW+VhYtUzYTwDiI6fdepO2f004e6oXs fjOQiOWBAjD7sO3dxxmk+dYnt9X5fHIZemKf6EvE/pANGZa+Wpqba029hyJhG5LdgsvknA tAkapH/gE6+FG1zHZtyNCbV0uDxktK0= X-MC-Unique: 6iCgliulMyynAFHtCFumHw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 4/4] virStorageVolDefFormat: Don't format empty Date: Thu, 25 Feb 2021 14:26:17 +0100 Message-Id: <5ace8e6d27cdf30ede586f640dbfc3c6e8e980b5.1614259540.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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.13 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) Content-Type: text/plain; charset="utf-8" If there are no source extents the volume XML has an empty element. Remove it if there's nothing in it by using virXMLFormatElement. Signed-off-by: Peter Krempa --- src/conf/storage_conf.c | 10 +++++----- tests/storagevolxml2xmlout/vol-file-backing.xml | 2 -- tests/storagevolxml2xmlout/vol-file-iso.xml | 2 -- tests/storagevolxml2xmlout/vol-file-naming.xml | 2 -- tests/storagevolxml2xmlout/vol-file.xml | 2 -- tests/storagevolxml2xmlout/vol-gluster-dir-neg-uid.xml | 2 -- tests/storagevolxml2xmlout/vol-gluster-dir.xml | 2 -- tests/storagevolxml2xmlout/vol-logical-backing.xml | 2 -- tests/storagevolxml2xmlout/vol-logical.xml | 2 -- tests/storagevolxml2xmlout/vol-luks-cipher.xml | 2 -- tests/storagevolxml2xmlout/vol-luks.xml | 2 -- tests/storagevolxml2xmlout/vol-partition.xml | 2 -- tests/storagevolxml2xmlout/vol-qcow2-0.10-lazy.xml | 2 -- tests/storagevolxml2xmlout/vol-qcow2-1.1.xml | 2 -- tests/storagevolxml2xmlout/vol-qcow2-encryption.xml | 2 -- tests/storagevolxml2xmlout/vol-qcow2-lazy.xml | 2 -- tests/storagevolxml2xmlout/vol-qcow2-luks.xml | 2 -- tests/storagevolxml2xmlout/vol-qcow2-nobacking.xml | 2 -- tests/storagevolxml2xmlout/vol-qcow2-nocapacity.xml | 2 -- tests/storagevolxml2xmlout/vol-qcow2.xml | 2 -- tests/storagevolxml2xmlout/vol-sheepdog.xml | 2 -- 21 files changed, 5 insertions(+), 45 deletions(-) diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 1bc27ff194..c840bc4b4f 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -1677,6 +1677,7 @@ virStorageVolDefFormat(virStoragePoolDefPtr pool, { virStorageVolOptionsPtr options; g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) sourceChildBuf =3D VIR_BUFFER_INITIALIZER; options =3D virStorageVolOptionsForPoolType(pool->type); if (options =3D=3D NULL) @@ -1688,14 +1689,13 @@ virStorageVolDefFormat(virStoragePoolDefPtr pool, virBufferEscapeString(&buf, "%s\n", def->name); virBufferEscapeString(&buf, "%s\n", def->key); - virBufferAddLit(&buf, "\n"); - virBufferAdjustIndent(&buf, 2); + + virBufferSetIndent(&sourceChildBuf, virBufferGetIndent(&buf) + 2); if (def->source.nextent) - virStorageVolDefFormatSourceExtents(&buf, def); + virStorageVolDefFormatSourceExtents(&sourceChildBuf, def); - virBufferAdjustIndent(&buf, -2); - virBufferAddLit(&buf, "\n"); + virXMLFormatElement(&buf, "source", NULL, &sourceChildBuf); virBufferAsprintf(&buf, "%llu\n", def->target.capacity); diff --git a/tests/storagevolxml2xmlout/vol-file-backing.xml b/tests/storag= evolxml2xmlout/vol-file-backing.xml index cd33bee523..e4180a8a00 100644 --- a/tests/storagevolxml2xmlout/vol-file-backing.xml +++ b/tests/storagevolxml2xmlout/vol-file-backing.xml @@ -1,8 +1,6 @@ sparse.img /var/lib/libvirt/images/sparse.img - - 10000000000 0 diff --git a/tests/storagevolxml2xmlout/vol-file-iso.xml b/tests/storagevol= xml2xmlout/vol-file-iso.xml index 9783124b34..955bafd453 100644 --- a/tests/storagevolxml2xmlout/vol-file-iso.xml +++ b/tests/storagevolxml2xmlout/vol-file-iso.xml @@ -1,7 +1,5 @@ test.iso - - 1048576 1048576 diff --git a/tests/storagevolxml2xmlout/vol-file-naming.xml b/tests/storage= volxml2xmlout/vol-file-naming.xml index e515502af1..d1b1c1d2ba 100644 --- a/tests/storagevolxml2xmlout/vol-file-naming.xml +++ b/tests/storagevolxml2xmlout/vol-file-naming.xml @@ -1,7 +1,5 @@ <sparse>.img - - 1099511627776 0 diff --git a/tests/storagevolxml2xmlout/vol-file.xml b/tests/storagevolxml2= xmlout/vol-file.xml index 2923188e65..884cf73797 100644 --- a/tests/storagevolxml2xmlout/vol-file.xml +++ b/tests/storagevolxml2xmlout/vol-file.xml @@ -1,7 +1,5 @@ sparse.img - - 1099511627776 0 diff --git a/tests/storagevolxml2xmlout/vol-gluster-dir-neg-uid.xml b/tests= /storagevolxml2xmlout/vol-gluster-dir-neg-uid.xml index 0af0be179d..8dd0f7472f 100644 --- a/tests/storagevolxml2xmlout/vol-gluster-dir-neg-uid.xml +++ b/tests/storagevolxml2xmlout/vol-gluster-dir-neg-uid.xml @@ -1,8 +1,6 @@ dir vol/dir - - 0 0 diff --git a/tests/storagevolxml2xmlout/vol-gluster-dir.xml b/tests/storage= volxml2xmlout/vol-gluster-dir.xml index d4222489ec..fa01f98938 100644 --- a/tests/storagevolxml2xmlout/vol-gluster-dir.xml +++ b/tests/storagevolxml2xmlout/vol-gluster-dir.xml @@ -1,8 +1,6 @@ dir vol/dir - - 0 0 diff --git a/tests/storagevolxml2xmlout/vol-logical-backing.xml b/tests/sto= ragevolxml2xmlout/vol-logical-backing.xml index 07fe27767d..7200f32f7f 100644 --- a/tests/storagevolxml2xmlout/vol-logical-backing.xml +++ b/tests/storagevolxml2xmlout/vol-logical-backing.xml @@ -1,8 +1,6 @@ Swap r4xkCv-MQhr-WKIT-R66x-Epn2-e8hG-1Z5gY0 - - 2080374784 2080374784 diff --git a/tests/storagevolxml2xmlout/vol-logical.xml b/tests/storagevolx= ml2xmlout/vol-logical.xml index 0df5cc0864..ddaf0e24f5 100644 --- a/tests/storagevolxml2xmlout/vol-logical.xml +++ b/tests/storagevolxml2xmlout/vol-logical.xml @@ -1,8 +1,6 @@ Swap r4xkCv-MQhr-WKIT-R66x-Epn2-e8hG-1Z5gY0 - - 2080374784 2080374784 diff --git a/tests/storagevolxml2xmlout/vol-luks-cipher.xml b/tests/storage= volxml2xmlout/vol-luks-cipher.xml index 2b58850aaf..fd99793612 100644 --- a/tests/storagevolxml2xmlout/vol-luks-cipher.xml +++ b/tests/storagevolxml2xmlout/vol-luks-cipher.xml @@ -1,8 +1,6 @@ LuksDemo.img /var/lib/libvirt/images/LuksDemo.img - - 5368709120 294912 diff --git a/tests/storagevolxml2xmlout/vol-luks.xml b/tests/storagevolxml2= xmlout/vol-luks.xml index 599b3c5c4d..c011d4cc62 100644 --- a/tests/storagevolxml2xmlout/vol-luks.xml +++ b/tests/storagevolxml2xmlout/vol-luks.xml @@ -1,8 +1,6 @@ LuksDemo.img /var/lib/libvirt/images/LuksDemo.img - - 5368709120 294912 diff --git a/tests/storagevolxml2xmlout/vol-partition.xml b/tests/storagevo= lxml2xmlout/vol-partition.xml index 147899edb1..dd9793fbb4 100644 --- a/tests/storagevolxml2xmlout/vol-partition.xml +++ b/tests/storagevolxml2xmlout/vol-partition.xml @@ -1,8 +1,6 @@ sda1 /dev/sda1 - - 106896384 106896384 diff --git a/tests/storagevolxml2xmlout/vol-qcow2-0.10-lazy.xml b/tests/sto= ragevolxml2xmlout/vol-qcow2-0.10-lazy.xml index 9b666ad5bc..afcd330e2d 100644 --- a/tests/storagevolxml2xmlout/vol-qcow2-0.10-lazy.xml +++ b/tests/storagevolxml2xmlout/vol-qcow2-0.10-lazy.xml @@ -1,8 +1,6 @@ OtherDemo.img /var/lib/libvirt/images/OtherDemo.img - - 5368709120 294912 diff --git a/tests/storagevolxml2xmlout/vol-qcow2-1.1.xml b/tests/storagevo= lxml2xmlout/vol-qcow2-1.1.xml index c033f5bd57..634b0a409a 100644 --- a/tests/storagevolxml2xmlout/vol-qcow2-1.1.xml +++ b/tests/storagevolxml2xmlout/vol-qcow2-1.1.xml @@ -1,8 +1,6 @@ OtherDemo.img /var/lib/libvirt/images/OtherDemo.img - - 5368709120 294912 diff --git a/tests/storagevolxml2xmlout/vol-qcow2-encryption.xml b/tests/st= oragevolxml2xmlout/vol-qcow2-encryption.xml index 31dc57873c..837adf41b1 100644 --- a/tests/storagevolxml2xmlout/vol-qcow2-encryption.xml +++ b/tests/storagevolxml2xmlout/vol-qcow2-encryption.xml @@ -1,8 +1,6 @@ OtherDemo.img /var/lib/libvirt/images/OtherDemo.img - - 5368709120 294912 diff --git a/tests/storagevolxml2xmlout/vol-qcow2-lazy.xml b/tests/storagev= olxml2xmlout/vol-qcow2-lazy.xml index ee79e26050..fc6b7542d8 100644 --- a/tests/storagevolxml2xmlout/vol-qcow2-lazy.xml +++ b/tests/storagevolxml2xmlout/vol-qcow2-lazy.xml @@ -1,8 +1,6 @@ OtherDemo.img /var/lib/libvirt/images/OtherDemo.img - - 5368709120 294912 diff --git a/tests/storagevolxml2xmlout/vol-qcow2-luks.xml b/tests/storagev= olxml2xmlout/vol-qcow2-luks.xml index 2e2b7ce125..78edc4239c 100644 --- a/tests/storagevolxml2xmlout/vol-qcow2-luks.xml +++ b/tests/storagevolxml2xmlout/vol-qcow2-luks.xml @@ -1,8 +1,6 @@ OtherDemoLuks.img /var/lib/libvirt/images/OtherDemoLuks.img - - 5368709120 294912 diff --git a/tests/storagevolxml2xmlout/vol-qcow2-nobacking.xml b/tests/sto= ragevolxml2xmlout/vol-qcow2-nobacking.xml index e8281e3b50..7600e25cc1 100644 --- a/tests/storagevolxml2xmlout/vol-qcow2-nobacking.xml +++ b/tests/storagevolxml2xmlout/vol-qcow2-nobacking.xml @@ -1,8 +1,6 @@ OtherDemo.img /var/lib/libvirt/images/OtherDemo.img - - 5368709120 294912 diff --git a/tests/storagevolxml2xmlout/vol-qcow2-nocapacity.xml b/tests/st= oragevolxml2xmlout/vol-qcow2-nocapacity.xml index dbf9003213..a83adb8176 100644 --- a/tests/storagevolxml2xmlout/vol-qcow2-nocapacity.xml +++ b/tests/storagevolxml2xmlout/vol-qcow2-nocapacity.xml @@ -1,8 +1,6 @@ OtherDemo.img /var/lib/libvirt/images/OtherDemo.img - - 0 0 diff --git a/tests/storagevolxml2xmlout/vol-qcow2.xml b/tests/storagevolxml= 2xmlout/vol-qcow2.xml index a7d612135f..8c942d4b78 100644 --- a/tests/storagevolxml2xmlout/vol-qcow2.xml +++ b/tests/storagevolxml2xmlout/vol-qcow2.xml @@ -1,8 +1,6 @@ OtherDemo.img /var/lib/libvirt/images/OtherDemo.img - - 5368709120 294912 diff --git a/tests/storagevolxml2xmlout/vol-sheepdog.xml b/tests/storagevol= xml2xmlout/vol-sheepdog.xml index d6e920bb81..47fb8eb418 100644 --- a/tests/storagevolxml2xmlout/vol-sheepdog.xml +++ b/tests/storagevolxml2xmlout/vol-sheepdog.xml @@ -1,7 +1,5 @@ test2 - - 1024 0 --=20 2.29.2