conf: Avoid formatting empty <capabilities> element

If none of the 'capabilities' features are enabled we'd still format the
opening and closing tag for the <capabilities element.

The implementation is suboptimal but will be refactored for a better
approach. This is done prior to the refactor to show that tests are not
impacted.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index b42c63fb4d5a5427f11a5bfe9af7224e05c44402..90aa02a7eab33ae7f9146721be956950df32a67a 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -27933,8 +27933,15 @@ virDomainDefFormatFeatures(virBufferPtr buf,
                 break;
             }
 
-            virBufferAsprintf(buf, "<capabilities policy='%s'>\n",
+            virBufferAsprintf(buf, "<capabilities policy='%s'",
                               virDomainCapabilitiesPolicyTypeToString(def->features[i]));
+
+            if (!virDomainDefHasCapabilitiesFeatures(def)) {
+                virBufferAddLit(buf, "/>\n");
+                break;
+            } else {
+                virBufferAddLit(buf, ">\n");
+            }
             virBufferAdjustIndent(buf, 2);
             for (j = 0; j < VIR_DOMAIN_CAPS_FEATURE_LAST; j++) {
                 if (def->caps_features[j] != VIR_TRISTATE_SWITCH_ABSENT)

diff --git a/tests/lxcconf2xmldata/lxcconf2xml-blkiotune.xml b/tests/lxcconf2xmldata/lxcconf2xml-blkiotune.xml
index 641edb94fab66777eb7189cb75fd0334876ae449..ab07fb0e80c8f6bc5d710150781b36784168ce7e 100644 (file)
--- a/tests/lxcconf2xmldata/lxcconf2xml-blkiotune.xml
+++ b/tests/lxcconf2xmldata/lxcconf2xml-blkiotune.xml
@@ -25,8 +25,7 @@
   </os>
   <features>
     <privnet/>
-    <capabilities policy='allow'>
-    </capabilities>
+    <capabilities policy='allow'/>
   </features>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>

diff --git a/tests/lxcconf2xmldata/lxcconf2xml-cpusettune.xml b/tests/lxcconf2xmldata/lxcconf2xml-cpusettune.xml
index bafaa960f8839f7ae3f4ffb8e3578bdbf440ad0d..6df089d00f77bcc258666239ce90497760273375 100644 (file)
--- a/tests/lxcconf2xmldata/lxcconf2xml-cpusettune.xml
+++ b/tests/lxcconf2xmldata/lxcconf2xml-cpusettune.xml
@@ -13,8 +13,7 @@
   </os>
   <features>
     <privnet/>
-    <capabilities policy='allow'>
-    </capabilities>
+    <capabilities policy='allow'/>
   </features>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>

diff --git a/tests/lxcconf2xmldata/lxcconf2xml-cputune.xml b/tests/lxcconf2xmldata/lxcconf2xml-cputune.xml
index f7f8041dd6d2667676824ae1e183383440aaa74f..359c820a2d8fa51b62febbcddf5d37d4062cc04c 100644 (file)
--- a/tests/lxcconf2xmldata/lxcconf2xml-cputune.xml
+++ b/tests/lxcconf2xmldata/lxcconf2xml-cputune.xml
@@ -15,8 +15,7 @@
   </os>
   <features>
     <privnet/>
-    <capabilities policy='allow'>
-    </capabilities>
+    <capabilities policy='allow'/>
   </features>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>

diff --git a/tests/lxcconf2xmldata/lxcconf2xml-idmap.xml b/tests/lxcconf2xmldata/lxcconf2xml-idmap.xml
index dd3843d5cbdd594635e98455a17fe44e1148f384..1efcc131cba7ba75a6c1d39f897345a091640350 100644 (file)
--- a/tests/lxcconf2xmldata/lxcconf2xml-idmap.xml
+++ b/tests/lxcconf2xmldata/lxcconf2xml-idmap.xml
@@ -14,8 +14,7 @@
   </idmap>
   <features>
     <privnet/>
-    <capabilities policy='allow'>
-    </capabilities>
+    <capabilities policy='allow'/>
   </features>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>

diff --git a/tests/lxcconf2xmldata/lxcconf2xml-macvlannetwork.xml b/tests/lxcconf2xmldata/lxcconf2xml-macvlannetwork.xml
index a345e8e019e2436a68fdb18be4c527a5795e7474..cced2f25db6c64bd5d40e1746937d1e8e3bd0a30 100644 (file)
--- a/tests/lxcconf2xmldata/lxcconf2xml-macvlannetwork.xml
+++ b/tests/lxcconf2xmldata/lxcconf2xml-macvlannetwork.xml
@@ -9,8 +9,7 @@
     <init>/sbin/init</init>
   </os>
   <features>
-    <capabilities policy='allow'>
-    </capabilities>
+    <capabilities policy='allow'/>
   </features>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>

diff --git a/tests/lxcconf2xmldata/lxcconf2xml-memtune.xml b/tests/lxcconf2xmldata/lxcconf2xml-memtune.xml
index 57e751aabab88de5ab6da73175cfcdc02081ef2d..24af021e494aee0cedda35f53e643494fbde372b 100644 (file)
--- a/tests/lxcconf2xmldata/lxcconf2xml-memtune.xml
+++ b/tests/lxcconf2xmldata/lxcconf2xml-memtune.xml
@@ -15,8 +15,7 @@
   </os>
   <features>
     <privnet/>
-    <capabilities policy='allow'>
-    </capabilities>
+    <capabilities policy='allow'/>
   </features>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>

diff --git a/tests/lxcconf2xmldata/lxcconf2xml-miscnetwork.xml b/tests/lxcconf2xmldata/lxcconf2xml-miscnetwork.xml
index 63189cfaecc75c2a592b0c8e33f65a05ee0e3552..9e41e408ee60ff7343400472528240a28049571a 100644 (file)
--- a/tests/lxcconf2xmldata/lxcconf2xml-miscnetwork.xml
+++ b/tests/lxcconf2xmldata/lxcconf2xml-miscnetwork.xml
@@ -9,8 +9,7 @@
     <init>/sbin/init</init>
   </os>
   <features>
-    <capabilities policy='allow'>
-    </capabilities>
+    <capabilities policy='allow'/>
   </features>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>

diff --git a/tests/lxcconf2xmldata/lxcconf2xml-nonenetwork.xml b/tests/lxcconf2xmldata/lxcconf2xml-nonenetwork.xml
index 0122ab05c7a059a9f95aa5d111e8be7c2276fc2f..1a8e51bb5645d9092270f97f9d44cbd036f22f9c 100644 (file)
--- a/tests/lxcconf2xmldata/lxcconf2xml-nonenetwork.xml
+++ b/tests/lxcconf2xmldata/lxcconf2xml-nonenetwork.xml
@@ -9,8 +9,7 @@
     <init>/sbin/init</init>
   </os>
   <features>
-    <capabilities policy='allow'>
-    </capabilities>
+    <capabilities policy='allow'/>
   </features>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>

diff --git a/tests/lxcconf2xmldata/lxcconf2xml-nonetwork.xml b/tests/lxcconf2xmldata/lxcconf2xml-nonetwork.xml
index 04ea280b3c3adbee02c60b7c4018a5e3394f9895..3c9f4474e5f966d27088726cec215fb950070e26 100644 (file)
--- a/tests/lxcconf2xmldata/lxcconf2xml-nonetwork.xml
+++ b/tests/lxcconf2xmldata/lxcconf2xml-nonetwork.xml
@@ -10,8 +10,7 @@
   </os>
   <features>
     <privnet/>
-    <capabilities policy='allow'>
-    </capabilities>
+    <capabilities policy='allow'/>
   </features>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>

diff --git a/tests/lxcconf2xmldata/lxcconf2xml-physnetwork.xml b/tests/lxcconf2xmldata/lxcconf2xml-physnetwork.xml
index 4fb3f954e02c03638656922e589300dd3101ff3c..fa3cf67fc3781fa47853e542800737e25db58957 100644 (file)
--- a/tests/lxcconf2xmldata/lxcconf2xml-physnetwork.xml
+++ b/tests/lxcconf2xmldata/lxcconf2xml-physnetwork.xml
@@ -9,8 +9,7 @@
     <init>/sbin/init</init>
   </os>
   <features>
-    <capabilities policy='allow'>
-    </capabilities>
+    <capabilities policy='allow'/>
   </features>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>

diff --git a/tests/lxcconf2xmldata/lxcconf2xml-vlannetwork.xml b/tests/lxcconf2xmldata/lxcconf2xml-vlannetwork.xml
index 47ed898b0f1ad2b81d049dc826947231048ae6d6..08bea62f7f62f490721be6dfedece697afff96fe 100644 (file)
--- a/tests/lxcconf2xmldata/lxcconf2xml-vlannetwork.xml
+++ b/tests/lxcconf2xmldata/lxcconf2xml-vlannetwork.xml
@@ -9,8 +9,7 @@
     <init>/sbin/init</init>
   </os>
   <features>
-    <capabilities policy='allow'>
-    </capabilities>
+    <capabilities policy='allow'/>
   </features>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>