From nobody Mon Feb 9 07:26:52 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 15518604941481012.0978456065257; Wed, 6 Mar 2019 00:21:34 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 77549307CEBD; Wed, 6 Mar 2019 08:21:32 +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 3ED7E6013F; Wed, 6 Mar 2019 08:21:32 +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 F2A913D38C; Wed, 6 Mar 2019 08:21:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x268L7Nh032602 for ; Wed, 6 Mar 2019 03:21:07 -0500 Received: by smtp.corp.redhat.com (Postfix) id 41DAC277B3; Wed, 6 Mar 2019 08:21:07 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id B849C1A267 for ; Wed, 6 Mar 2019 08:21:06 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Wed, 6 Mar 2019 09:20:43 +0100 Message-Id: <9fc7289fb09b161425a10d63316dab55889ac566.1551859940.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 18/23] conf: Avoid formatting empty element 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: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Wed, 06 Mar 2019 08:21:33 +0000 (UTC) Content-Type: text/plain; charset="utf-8" If none of the 'capabilities' features are enabled we'd still format the opening and closing tag for the Reviewed-by: J=C3=A1n Tomko --- src/conf/domain_conf.c | 9 ++++++++- tests/lxcconf2xmldata/lxcconf2xml-blkiotune.xml | 3 +-- tests/lxcconf2xmldata/lxcconf2xml-cpusettune.xml | 3 +-- tests/lxcconf2xmldata/lxcconf2xml-cputune.xml | 3 +-- tests/lxcconf2xmldata/lxcconf2xml-idmap.xml | 3 +-- tests/lxcconf2xmldata/lxcconf2xml-macvlannetwork.xml | 3 +-- tests/lxcconf2xmldata/lxcconf2xml-memtune.xml | 3 +-- tests/lxcconf2xmldata/lxcconf2xml-miscnetwork.xml | 3 +-- tests/lxcconf2xmldata/lxcconf2xml-nonenetwork.xml | 3 +-- tests/lxcconf2xmldata/lxcconf2xml-nonetwork.xml | 3 +-- tests/lxcconf2xmldata/lxcconf2xml-physnetwork.xml | 3 +-- tests/lxcconf2xmldata/lxcconf2xml-vlannetwork.xml | 3 +-- 12 files changed, 19 insertions(+), 23 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b42c63fb4d..90aa02a7ea 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -27933,8 +27933,15 @@ virDomainDefFormatFeatures(virBufferPtr buf, break; } - virBufferAsprintf(buf, "\n", + virBufferAsprintf(buf, "features[i])); + + if (!virDomainDefHasCapabilitiesFeatures(def)) { + virBufferAddLit(buf, "/>\n"); + break; + } else { + virBufferAddLit(buf, ">\n"); + } virBufferAdjustIndent(buf, 2); for (j =3D 0; j < VIR_DOMAIN_CAPS_FEATURE_LAST; j++) { if (def->caps_features[j] !=3D VIR_TRISTATE_SWITCH_ABSENT) diff --git a/tests/lxcconf2xmldata/lxcconf2xml-blkiotune.xml b/tests/lxccon= f2xmldata/lxcconf2xml-blkiotune.xml index 641edb94fa..ab07fb0e80 100644 --- a/tests/lxcconf2xmldata/lxcconf2xml-blkiotune.xml +++ b/tests/lxcconf2xmldata/lxcconf2xml-blkiotune.xml @@ -25,8 +25,7 @@ - - + destroy diff --git a/tests/lxcconf2xmldata/lxcconf2xml-cpusettune.xml b/tests/lxcco= nf2xmldata/lxcconf2xml-cpusettune.xml index bafaa960f8..6df089d00f 100644 --- a/tests/lxcconf2xmldata/lxcconf2xml-cpusettune.xml +++ b/tests/lxcconf2xmldata/lxcconf2xml-cpusettune.xml @@ -13,8 +13,7 @@ - - + destroy diff --git a/tests/lxcconf2xmldata/lxcconf2xml-cputune.xml b/tests/lxcconf2= xmldata/lxcconf2xml-cputune.xml index f7f8041dd6..359c820a2d 100644 --- a/tests/lxcconf2xmldata/lxcconf2xml-cputune.xml +++ b/tests/lxcconf2xmldata/lxcconf2xml-cputune.xml @@ -15,8 +15,7 @@ - - + destroy diff --git a/tests/lxcconf2xmldata/lxcconf2xml-idmap.xml b/tests/lxcconf2xm= ldata/lxcconf2xml-idmap.xml index dd3843d5cb..1efcc131cb 100644 --- a/tests/lxcconf2xmldata/lxcconf2xml-idmap.xml +++ b/tests/lxcconf2xmldata/lxcconf2xml-idmap.xml @@ -14,8 +14,7 @@ - - + destroy diff --git a/tests/lxcconf2xmldata/lxcconf2xml-macvlannetwork.xml b/tests/l= xcconf2xmldata/lxcconf2xml-macvlannetwork.xml index a345e8e019..cced2f25db 100644 --- a/tests/lxcconf2xmldata/lxcconf2xml-macvlannetwork.xml +++ b/tests/lxcconf2xmldata/lxcconf2xml-macvlannetwork.xml @@ -9,8 +9,7 @@ /sbin/init - - + destroy diff --git a/tests/lxcconf2xmldata/lxcconf2xml-memtune.xml b/tests/lxcconf2= xmldata/lxcconf2xml-memtune.xml index 57e751aaba..24af021e49 100644 --- a/tests/lxcconf2xmldata/lxcconf2xml-memtune.xml +++ b/tests/lxcconf2xmldata/lxcconf2xml-memtune.xml @@ -15,8 +15,7 @@ - - + destroy diff --git a/tests/lxcconf2xmldata/lxcconf2xml-miscnetwork.xml b/tests/lxcc= onf2xmldata/lxcconf2xml-miscnetwork.xml index 63189cfaec..9e41e408ee 100644 --- a/tests/lxcconf2xmldata/lxcconf2xml-miscnetwork.xml +++ b/tests/lxcconf2xmldata/lxcconf2xml-miscnetwork.xml @@ -9,8 +9,7 @@ /sbin/init - - + destroy diff --git a/tests/lxcconf2xmldata/lxcconf2xml-nonenetwork.xml b/tests/lxcc= onf2xmldata/lxcconf2xml-nonenetwork.xml index 0122ab05c7..1a8e51bb56 100644 --- a/tests/lxcconf2xmldata/lxcconf2xml-nonenetwork.xml +++ b/tests/lxcconf2xmldata/lxcconf2xml-nonenetwork.xml @@ -9,8 +9,7 @@ /sbin/init - - + destroy diff --git a/tests/lxcconf2xmldata/lxcconf2xml-nonetwork.xml b/tests/lxccon= f2xmldata/lxcconf2xml-nonetwork.xml index 04ea280b3c..3c9f4474e5 100644 --- a/tests/lxcconf2xmldata/lxcconf2xml-nonetwork.xml +++ b/tests/lxcconf2xmldata/lxcconf2xml-nonetwork.xml @@ -10,8 +10,7 @@ - - + destroy diff --git a/tests/lxcconf2xmldata/lxcconf2xml-physnetwork.xml b/tests/lxcc= onf2xmldata/lxcconf2xml-physnetwork.xml index 4fb3f954e0..fa3cf67fc3 100644 --- a/tests/lxcconf2xmldata/lxcconf2xml-physnetwork.xml +++ b/tests/lxcconf2xmldata/lxcconf2xml-physnetwork.xml @@ -9,8 +9,7 @@ /sbin/init - - + destroy diff --git a/tests/lxcconf2xmldata/lxcconf2xml-vlannetwork.xml b/tests/lxcc= onf2xmldata/lxcconf2xml-vlannetwork.xml index 47ed898b0f..08bea62f7f 100644 --- a/tests/lxcconf2xmldata/lxcconf2xml-vlannetwork.xml +++ b/tests/lxcconf2xmldata/lxcconf2xml-vlannetwork.xml @@ -9,8 +9,7 @@ /sbin/init - - + destroy --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list