schema: Fix capability grammar for pagesElem

https://bugzilla.redhat.com/show_bug.cgi?id=1572491

Commit id '02129b7c' added a single pagesElem for slightly
different purposes. One usage was an output for host page size
listing and the other for NUMA supported page sizes. For the
former, only the pages unit and size are formatted, while for
the latter the pages unit, size, and availability data is formatted.

The virt-xml-validate would fail because it expected something
extra in the host page size output. So split up pagesElem a bit
and create pagesHost and pagesNuma for the differences.

Modify some capabilityschemadata output to have the output - even
though the results may not be realistic with respect to the
original incarnation of the data.
Signed-off-by: NJohn Ferlan <jferlan@redhat.com>
ACKed-by Michal Privoznik <mprivozn@redhat.com>

docs/schemas/capability.rng

@@ -129,7 +129,7 @@
       </element>
     </zeroOrMore>
     <zeroOrMore>
-      <ref name='pagesElem'/>
+      <ref name='pagesHost'/>
     </zeroOrMore>
   </define>
 
@@ -203,7 +203,7 @@
       </optional>
 
       <zeroOrMore>
-        <ref name='pagesElem'/>
+        <ref name='pagesNuma'/>
       </zeroOrMore>
 
       <optional>
@@ -484,8 +484,18 @@
     </data>
   </define>
 
-  <define name='pagesElem'>
+  <define name='pagesHost'>
+    <element name='pages'>
+      <ref name='pagesElem'/>
+    </element>
+  </define>
+  <define name='pagesNuma'>
     <element name='pages'>
+      <ref name='pagesElem'/>
+      <ref name='unsignedInt'/>
+    </element>
+  </define>
+  <define name='pagesElem'>
     <optional>
       <attribute name='unit'>
         <ref name='unit'/>
@@ -494,7 +504,5 @@
     <attribute name='size'>
       <ref name='unsignedInt'/>
     </attribute>
-      <ref name='unsignedInt'/>
-    </element>
   </define>
 </grammar>

tests/capabilityschemadata/caps-test2.xml

@@ -24,6 +24,9 @@
       <feature name='acpi'/>
       <feature name='ds'/>
       <feature name='vme'/>
+      <pages unit='KiB' size='4'/>
+      <pages unit='KiB' size='2048'/>
+      <pages unit='KiB' size='1048576'/>
     </cpu>
     <power_management>
       <suspend_mem/>

tests/capabilityschemadata/caps-test3.xml

@@ -28,6 +28,9 @@
       <feature name='acpi'/>
       <feature name='ds'/>
       <feature name='vme'/>
+      <pages unit='KiB' size='4'/>
+      <pages unit='KiB' size='2048'/>
+      <pages unit='KiB' size='1048576'/>
     </cpu>
     <power_management>
       <suspend_disk/>
@@ -42,6 +45,9 @@
       <cells num='2'>
         <cell id='0'>
           <memory unit='KiB'>12572412</memory>
+          <pages unit='KiB' size='4'>4011249</pages>
+          <pages unit='KiB' size='2048'>0</pages>
+          <pages unit='KiB' size='1048576'>0</pages>
           <cpus num='12'>
             <cpu id='0'/>
             <cpu id='2'/>