capabilities: Format <domain/> properly

The <domain/> element under /capabilities/guest/arch/ can have no
child elements. If that's the case we format:

        <domain type='xen'>
        </domain>

instead of simpler:

        <domain type='xen'/>

This commit fixes that.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c
index 37d19c1482419a6c5583ab82ff8037d7de4780c6..6c11a7f54accb0636d084d479f3f14c78333c27c 100644 (file)
--- a/src/conf/capabilities.c
+++ b/src/conf/capabilities.c
@@ -969,8 +969,15 @@ virCapabilitiesFormatXML(virCapsPtr caps)
         }
 
         for (j = 0; j < caps->guests[i]->arch.ndomains; j++) {
-            virBufferAsprintf(&buf, "<domain type='%s'>\n",
+            virBufferAsprintf(&buf, "<domain type='%s'",
                                   caps->guests[i]->arch.domains[j]->type);
+            if (!caps->guests[i]->arch.domains[j]->info.emulator &&
+                !caps->guests[i]->arch.domains[j]->info.loader &&
+                !caps->guests[i]->arch.domains[j]->info.nmachines) {
+                virBufferAddLit(&buf, "/>\n");
+                continue;
+            }
+            virBufferAddLit(&buf, ">\n");
             virBufferAdjustIndent(&buf, 2);
             if (caps->guests[i]->arch.domains[j]->info.emulator)
                 virBufferAsprintf(&buf, "<emulator>%s</emulator>\n",

diff --git a/tests/capabilityschemadata/caps-qemu-kvm.xml b/tests/capabilityschemadata/caps-qemu-kvm.xml
index 55faa16b2d3a1efdc5ce8e9ef12c062e921501c2..7055c7a812d3272a0fc9acfa8247109c1265d87d 100644 (file)
--- a/tests/capabilityschemadata/caps-qemu-kvm.xml
+++ b/tests/capabilityschemadata/caps-qemu-kvm.xml
@@ -39,8 +39,7 @@
       <machine canonical='pc-0.11' maxCpus='255'>pc</machine>
       <machine maxCpus='255'>pc-0.10</machine>
       <machine maxCpus='1'>isapc</machine>
-      <domain type='qemu'>
-      </domain>
+      <domain type='qemu'/>
       <domain type='kvm'>
         <emulator>/usr/bin/qemu-kvm</emulator>
         <machine maxCpus='255'>pc-0.11</machine>
@@ -66,8 +65,7 @@
       <machine canonical='pc-0.11'>pc</machine>
       <machine>pc-0.10</machine>
       <machine>isapc</machine>
-      <domain type='qemu'>
-      </domain>
+      <domain type='qemu'/>
       <domain type='kvm'>
         <emulator>/usr/bin/qemu-kvm</emulator>
         <machine>pc-0.11</machine>
@@ -108,8 +106,7 @@
       <machine>realview</machine>
       <machine>versatilepb</machine>
       <machine>versatileab</machine>
-      <domain type='qemu'>
-      </domain>
+      <domain type='qemu'/>
     </arch>
   </guest>
 
@@ -119,8 +116,7 @@
       <wordsize>64</wordsize>
       <emulator>/usr/bin/qemu-system-aarch64</emulator>
       <machine>machvirt</machine>
-      <domain type='qemu'>
-      </domain>
+      <domain type='qemu'/>
     </arch>
   </guest>
 
@@ -131,8 +127,7 @@
       <emulator>/usr/bin/qemu-system-microblaze</emulator>
       <machine>petalogix-s3adsp1800</machine>
       <machine>microblaze-fdt</machine>
-      <domain type='qemu'>
-      </domain>
+      <domain type='qemu'/>
     </arch>
   </guest>
 
@@ -143,8 +138,7 @@
       <emulator>/usr/bin/qemu-system-microblazeel</emulator>
       <machine>petalogix-s3adsp1800</machine>
       <machine>microblaze-fdt</machine>
-      <domain type='qemu'>
-      </domain>
+      <domain type='qemu'/>
     </arch>
   </guest>
 
@@ -158,8 +152,7 @@
       <machine>magnum</machine>
       <machine>pica61</machine>
       <machine>mips</machine>
-      <domain type='qemu'>
-      </domain>
+      <domain type='qemu'/>
     </arch>
   </guest>
 
@@ -173,8 +166,7 @@
       <machine>magnum</machine>
       <machine>pica61</machine>
       <machine>mips</machine>
-      <domain type='qemu'>
-      </domain>
+      <domain type='qemu'/>
     </arch>
   </guest>
 
@@ -195,8 +187,7 @@
       <machine>SS-1000</machine>
       <machine>SS-2000</machine>
       <machine>SS-2</machine>
-      <domain type='qemu'>
-      </domain>
+      <domain type='qemu'/>
     </arch>
   </guest>
 
@@ -212,8 +203,7 @@
       <machine>taihu</machine>
       <machine>mac99</machine>
       <machine>prep</machine>
-      <domain type='qemu'>
-      </domain>
+      <domain type='qemu'/>
     </arch>
   </guest>
 
@@ -223,8 +213,7 @@
       <wordsize>32</wordsize>
       <emulator>/usr/bin/xenner</emulator>
       <machine>xenner</machine>
-      <domain type='kvm'>
-      </domain>
+      <domain type='kvm'/>
     </arch>
     <features>
       <pae/>
@@ -240,8 +229,7 @@
       <wordsize>64</wordsize>
       <emulator>/usr/bin/xenner</emulator>
       <machine>xenner</machine>
-      <domain type='kvm'>
-      </domain>
+      <domain type='kvm'/>
     </arch>
     <features>
       <acpi default='on' toggle='yes'/>

diff --git a/tests/capabilityschemadata/caps-test.xml b/tests/capabilityschemadata/caps-test.xml
index 64f9bb648ea4fbcdf7678a127242db848a9be3fa..da199611ea52f3e4f0b65d3b672d7a30b45163d7 100644 (file)
--- a/tests/capabilityschemadata/caps-test.xml
+++ b/tests/capabilityschemadata/caps-test.xml
@@ -43,8 +43,7 @@
     <arch name='i686'>
       <wordsize>32</wordsize>
       <emulator>/usr/bin/test-hv</emulator>
-      <domain type='test'>
-      </domain>
+      <domain type='test'/>
     </arch>
     <features>
       <pae/>
@@ -57,8 +56,7 @@
     <arch name='i686'>
       <wordsize>32</wordsize>
       <emulator>/usr/bin/test-hv</emulator>
-      <domain type='test'>
-      </domain>
+      <domain type='test'/>
     </arch>
     <features>
       <pae/>

diff --git a/tests/capabilityschemadata/caps-test2.xml b/tests/capabilityschemadata/caps-test2.xml
index a99c1b8eb49dae141f22a74ba7c953719316e8f5..e6763959166b5aa7c0d44dbbf7a6300ccd370803 100644 (file)
--- a/tests/capabilityschemadata/caps-test2.xml
+++ b/tests/capabilityschemadata/caps-test2.xml
@@ -51,8 +51,7 @@
       <machine>pc-0.11</machine>
       <machine>pc-0.10</machine>
       <machine>isapc</machine>
-      <domain type='qemu'>
-      </domain>
+      <domain type='qemu'/>
       <domain type='kvm'>
         <emulator>/usr/libexec/qemu-kvm</emulator>
         <machine>pc-1.2</machine>
@@ -94,8 +93,7 @@
       <machine>pc-0.11</machine>
       <machine>pc-0.10</machine>
       <machine>isapc</machine>
-      <domain type='qemu'>
-      </domain>
+      <domain type='qemu'/>
       <domain type='kvm'>
         <emulator>/usr/libexec/qemu-kvm</emulator>
         <machine>pc-1.2</machine>

diff --git a/tests/xencapsdata/xen-i686-pae-hvm.xml b/tests/xencapsdata/xen-i686-pae-hvm.xml
index 872e5f6698b26f58b90a52b4556ef43f8de74603..cf6a1de6e1e062fccf3d9d09da18fcaaa4080507 100644 (file)
--- a/tests/xencapsdata/xen-i686-pae-hvm.xml
+++ b/tests/xencapsdata/xen-i686-pae-hvm.xml
@@ -22,8 +22,7 @@
       <wordsize>32</wordsize>
       <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
       <machine>xenpv</machine>
-      <domain type='xen'>
-      </domain>
+      <domain type='xen'/>
     </arch>
     <features>
       <pae/>
@@ -37,8 +36,7 @@
       <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
       <loader>/usr/lib/xen/boot/hvmloader</loader>
       <machine>xenfv</machine>
-      <domain type='xen'>
-      </domain>
+      <domain type='xen'/>
     </arch>
     <features>
       <pae/>

diff --git a/tests/xencapsdata/xen-i686-pae.xml b/tests/xencapsdata/xen-i686-pae.xml
index 3dba6ebbcf6d28c35f31054c7d861fc6477711ee..c917fbe728be16d5b5264a80c44c310e14843988 100644 (file)
--- a/tests/xencapsdata/xen-i686-pae.xml
+++ b/tests/xencapsdata/xen-i686-pae.xml
@@ -22,8 +22,7 @@
       <wordsize>32</wordsize>
       <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
       <machine>xenpv</machine>
-      <domain type='xen'>
-      </domain>
+      <domain type='xen'/>
     </arch>
     <features>
       <pae/>

diff --git a/tests/xencapsdata/xen-i686.xml b/tests/xencapsdata/xen-i686.xml
index 22d7685fcdf3ec1f07751cd2e83867c99bae5694..5771e2bcf160c9135a98100ff3134911ab5fb9f1 100644 (file)
--- a/tests/xencapsdata/xen-i686.xml
+++ b/tests/xencapsdata/xen-i686.xml
@@ -19,8 +19,7 @@
       <wordsize>32</wordsize>
       <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
       <machine>xenpv</machine>
-      <domain type='xen'>
-      </domain>
+      <domain type='xen'/>
     </arch>
     <features>
       <nonpae/>

diff --git a/tests/xencapsdata/xen-ia64-be-hvm.xml b/tests/xencapsdata/xen-ia64-be-hvm.xml
index 222de1dadb0bfb80be9074174eed1ea33ddf3534..19d23e940ed6b036ffc65c8009720dcd56e50292 100644 (file)
--- a/tests/xencapsdata/xen-ia64-be-hvm.xml
+++ b/tests/xencapsdata/xen-ia64-be-hvm.xml
@@ -19,8 +19,7 @@
       <wordsize>64</wordsize>
       <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
       <machine>xenpv</machine>
-      <domain type='xen'>
-      </domain>
+      <domain type='xen'/>
     </arch>
     <features>
       <ia64_be/>
@@ -34,8 +33,7 @@
       <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
       <loader>/usr/lib/xen/boot/hvmloader</loader>
       <machine>xenfv</machine>
-      <domain type='xen'>
-      </domain>
+      <domain type='xen'/>
     </arch>
     <features>
       <ia64_be/>

diff --git a/tests/xencapsdata/xen-ia64-be.xml b/tests/xencapsdata/xen-ia64-be.xml
index 017816c4db758a45a894575f871adad71e1af4a5..78fa77e693fc0caf6a869f82ea2c06ec8a40eb43 100644 (file)
--- a/tests/xencapsdata/xen-ia64-be.xml
+++ b/tests/xencapsdata/xen-ia64-be.xml
@@ -19,8 +19,7 @@
       <wordsize>64</wordsize>
       <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
       <machine>xenpv</machine>
-      <domain type='xen'>
-      </domain>
+      <domain type='xen'/>
     </arch>
     <features>
       <ia64_be/>

diff --git a/tests/xencapsdata/xen-ia64-hvm.xml b/tests/xencapsdata/xen-ia64-hvm.xml
index 33c49469c4ed1281efef35773a28597cbacdd576..6e22372171ab05d5e468333edeee78da5f43ebe7 100644 (file)
--- a/tests/xencapsdata/xen-ia64-hvm.xml
+++ b/tests/xencapsdata/xen-ia64-hvm.xml
@@ -19,8 +19,7 @@
       <wordsize>64</wordsize>
       <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
       <machine>xenpv</machine>
-      <domain type='xen'>
-      </domain>
+      <domain type='xen'/>
     </arch>
   </guest>
 
@@ -31,8 +30,7 @@
       <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
       <loader>/usr/lib/xen/boot/hvmloader</loader>
       <machine>xenfv</machine>
-      <domain type='xen'>
-      </domain>
+      <domain type='xen'/>
     </arch>
     <features>
       <acpi default='on' toggle='yes'/>

diff --git a/tests/xencapsdata/xen-ia64.xml b/tests/xencapsdata/xen-ia64.xml
index 82ce9656254025fdfa182fcb07d5666e6c35d47c..9e3eaf4356bdbb3c33e35b7585be5e39d2f76385 100644 (file)
--- a/tests/xencapsdata/xen-ia64.xml
+++ b/tests/xencapsdata/xen-ia64.xml
@@ -19,8 +19,7 @@
       <wordsize>64</wordsize>
       <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
       <machine>xenpv</machine>
-      <domain type='xen'>
-      </domain>
+      <domain type='xen'/>
     </arch>
   </guest>
 

diff --git a/tests/xencapsdata/xen-ppc64.xml b/tests/xencapsdata/xen-ppc64.xml
index 91401b938771436564280de1b477444c13addca8..0132c459c8c41c816f31aeadc4d26d8fdcec4242 100644 (file)
--- a/tests/xencapsdata/xen-ppc64.xml
+++ b/tests/xencapsdata/xen-ppc64.xml
@@ -19,8 +19,7 @@
       <wordsize>64</wordsize>
       <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
       <machine>xenpv</machine>
-      <domain type='xen'>
-      </domain>
+      <domain type='xen'/>
     </arch>
   </guest>
 

diff --git a/tests/xencapsdata/xen-x86_64-hvm.xml b/tests/xencapsdata/xen-x86_64-hvm.xml
index 8de8cf446826d89275e6778eeec97acd8c4ad18d..7458f0b5374c2c2ffa60c7adf98c092ceb2872c9 100644 (file)
--- a/tests/xencapsdata/xen-x86_64-hvm.xml
+++ b/tests/xencapsdata/xen-x86_64-hvm.xml
@@ -22,8 +22,7 @@
       <wordsize>64</wordsize>
       <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
       <machine>xenpv</machine>
-      <domain type='xen'>
-      </domain>
+      <domain type='xen'/>
     </arch>
   </guest>
 
@@ -34,8 +33,7 @@
       <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
       <loader>/usr/lib/xen/boot/hvmloader</loader>
       <machine>xenfv</machine>
-      <domain type='xen'>
-      </domain>
+      <domain type='xen'/>
     </arch>
     <features>
       <pae/>
@@ -52,8 +50,7 @@
       <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
       <loader>/usr/lib/xen/boot/hvmloader</loader>
       <machine>xenfv</machine>
-      <domain type='xen'>
-      </domain>
+      <domain type='xen'/>
     </arch>
     <features>
       <acpi default='on' toggle='yes'/>

diff --git a/tests/xencapsdata/xen-x86_64.xml b/tests/xencapsdata/xen-x86_64.xml
index 0c3279bb244197d561bd7413599813a5f4323eda..b6864320b9e748de3c776fe79d26f773077bfb80 100644 (file)
--- a/tests/xencapsdata/xen-x86_64.xml
+++ b/tests/xencapsdata/xen-x86_64.xml
@@ -22,8 +22,7 @@
       <wordsize>64</wordsize>
       <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
       <machine>xenpv</machine>
-      <domain type='xen'>
-      </domain>
+      <domain type='xen'/>
     </arch>
   </guest>