Add formal internal capabilities API and update drivers to use it

10 files changed, 93 insertions, 65 deletions

diff --git a/tests/xencapsdata/xen-i686-pae-hvm.xml b/tests/xencapsdata/xen-i686-pae-hvm.xml
index 8bff3bd56..42b099c9b 100644
--- a/tests/xencapsdata/xen-i686-pae-hvm.xml
+++ b/tests/xencapsdata/xen-i686-pae-hvm.xml
@@ -1,4 +1,5 @@
 <capabilities>
+
   <host>
     <cpu>
       <arch>i686</arch>
@@ -16,9 +17,12 @@
 
   <guest>
     <os_type>xen</os_type>
-    <arch name="i686">
+    <arch name='i686'>
       <wordsize>32</wordsize>
-      <domain type="xen"></domain>
+      <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+      <machine>xenpv</machine>
+      <domain type='xen'>
+      </domain>
     </arch>
     <features>
       <pae/>
@@ -27,13 +31,13 @@
 
   <guest>
     <os_type>hvm</os_type>
-    <arch name="i686">
+    <arch name='i686'>
       <wordsize>32</wordsize>
-      <domain type="xen"></domain>
       <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-      <machine>pc</machine>
-      <machine>isapc</machine>
       <loader>/usr/lib/xen/boot/hvmloader</loader>
+      <machine>xenfv</machine>
+      <domain type='xen'>
+      </domain>
     </arch>
     <features>
       <pae/>
@@ -42,4 +46,5 @@
       <apic default='on' toggle='yes'/>
     </features>
   </guest>
+
 </capabilities>
diff --git a/tests/xencapsdata/xen-i686-pae.xml b/tests/xencapsdata/xen-i686-pae.xml
index 03deb989a..a6cec8a61 100644
--- a/tests/xencapsdata/xen-i686-pae.xml
+++ b/tests/xencapsdata/xen-i686-pae.xml
@@ -1,4 +1,5 @@
 <capabilities>
+
   <host>
     <cpu>
       <arch>i686</arch>
@@ -16,12 +17,16 @@
 
   <guest>
     <os_type>xen</os_type>
-    <arch name="i686">
+    <arch name='i686'>
       <wordsize>32</wordsize>
-      <domain type="xen"></domain>
+      <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+      <machine>xenpv</machine>
+      <domain type='xen'>
+      </domain>
     </arch>
     <features>
       <pae/>
     </features>
   </guest>
+
 </capabilities>
diff --git a/tests/xencapsdata/xen-i686.xml b/tests/xencapsdata/xen-i686.xml
index 6f25a1d35..907121215 100644
--- a/tests/xencapsdata/xen-i686.xml
+++ b/tests/xencapsdata/xen-i686.xml
@@ -1,9 +1,8 @@
 <capabilities>
+
   <host>
     <cpu>
       <arch>i686</arch>
-      <features>
-      </features>
     </cpu>
     <migration_features>
       <live/>
@@ -15,12 +14,16 @@
 
   <guest>
     <os_type>xen</os_type>
-    <arch name="i686">
+    <arch name='i686'>
       <wordsize>32</wordsize>
-      <domain type="xen"></domain>
+      <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+      <machine>xenpv</machine>
+      <domain type='xen'>
+      </domain>
     </arch>
     <features>
       <nonpae/>
     </features>
   </guest>
+
 </capabilities>
diff --git a/tests/xencapsdata/xen-ia64-be-hvm.xml b/tests/xencapsdata/xen-ia64-be-hvm.xml
index 426ccfac5..732b69372 100644
--- a/tests/xencapsdata/xen-ia64-be-hvm.xml
+++ b/tests/xencapsdata/xen-ia64-be-hvm.xml
@@ -1,9 +1,8 @@
 <capabilities>
+
   <host>
     <cpu>
       <arch>ia64</arch>
-      <features>
-      </features>
     </cpu>
     <migration_features>
       <live/>
@@ -15,9 +14,12 @@
 
   <guest>
     <os_type>xen</os_type>
-    <arch name="ia64">
+    <arch name='ia64'>
       <wordsize>64</wordsize>
-      <domain type="xen"></domain>
+      <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+      <machine>xenpv</machine>
+      <domain type='xen'>
+      </domain>
     </arch>
     <features>
       <ia64_be/>
@@ -26,13 +28,13 @@
 
   <guest>
     <os_type>hvm</os_type>
-    <arch name="ia64">
+    <arch name='ia64'>
       <wordsize>64</wordsize>
-      <domain type="xen"></domain>
-      <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
-      <machine>pc</machine>
-      <machine>isapc</machine>
+      <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
       <loader>/usr/lib/xen/boot/hvmloader</loader>
+      <machine>xenfv</machine>
+      <domain type='xen'>
+      </domain>
     </arch>
     <features>
       <ia64_be/>
@@ -40,4 +42,5 @@
       <apic default='on' toggle='yes'/>
     </features>
   </guest>
+
 </capabilities>
diff --git a/tests/xencapsdata/xen-ia64-be.xml b/tests/xencapsdata/xen-ia64-be.xml
index 125448a0c..4f133ec60 100644
--- a/tests/xencapsdata/xen-ia64-be.xml
+++ b/tests/xencapsdata/xen-ia64-be.xml
@@ -1,9 +1,8 @@
 <capabilities>
+
   <host>
     <cpu>
       <arch>ia64</arch>
-      <features>
-      </features>
     </cpu>
     <migration_features>
       <live/>
@@ -15,12 +14,16 @@
 
   <guest>
     <os_type>xen</os_type>
-    <arch name="ia64">
+    <arch name='ia64'>
       <wordsize>64</wordsize>
-      <domain type="xen"></domain>
+      <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+      <machine>xenpv</machine>
+      <domain type='xen'>
+      </domain>
     </arch>
     <features>
       <ia64_be/>
     </features>
   </guest>
+
 </capabilities>
diff --git a/tests/xencapsdata/xen-ia64-hvm.xml b/tests/xencapsdata/xen-ia64-hvm.xml
index 730db4b0c..ef48a95e3 100644
--- a/tests/xencapsdata/xen-ia64-hvm.xml
+++ b/tests/xencapsdata/xen-ia64-hvm.xml
@@ -1,9 +1,8 @@
 <capabilities>
+
   <host>
     <cpu>
       <arch>ia64</arch>
-      <features>
-      </features>
     </cpu>
     <migration_features>
       <live/>
@@ -15,27 +14,29 @@
 
   <guest>
     <os_type>xen</os_type>
-    <arch name="ia64">
+    <arch name='ia64'>
       <wordsize>64</wordsize>
-      <domain type="xen"></domain>
+      <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+      <machine>xenpv</machine>
+      <domain type='xen'>
+      </domain>
     </arch>
-    <features>
-    </features>
   </guest>
 
   <guest>
     <os_type>hvm</os_type>
-    <arch name="ia64">
+    <arch name='ia64'>
       <wordsize>64</wordsize>
-      <domain type="xen"></domain>
-      <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
-      <machine>pc</machine>
-      <machine>isapc</machine>
+      <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
       <loader>/usr/lib/xen/boot/hvmloader</loader>
+      <machine>xenfv</machine>
+      <domain type='xen'>
+      </domain>
     </arch>
     <features>
       <acpi default='on' toggle='yes'/>
       <apic default='on' toggle='yes'/>
     </features>
   </guest>
+
 </capabilities>
diff --git a/tests/xencapsdata/xen-ia64.xml b/tests/xencapsdata/xen-ia64.xml
index 12266dd3b..5570f4dfd 100644
--- a/tests/xencapsdata/xen-ia64.xml
+++ b/tests/xencapsdata/xen-ia64.xml
@@ -1,9 +1,8 @@
 <capabilities>
+
   <host>
     <cpu>
       <arch>ia64</arch>
-      <features>
-      </features>
     </cpu>
     <migration_features>
       <live/>
@@ -15,11 +14,13 @@
 
   <guest>
     <os_type>xen</os_type>
-    <arch name="ia64">
+    <arch name='ia64'>
       <wordsize>64</wordsize>
-      <domain type="xen"></domain>
+      <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+      <machine>xenpv</machine>
+      <domain type='xen'>
+      </domain>
     </arch>
-    <features>
-    </features>
   </guest>
+
 </capabilities>
diff --git a/tests/xencapsdata/xen-ppc64.xml b/tests/xencapsdata/xen-ppc64.xml
index 96e566fc8..627d79c14 100644
--- a/tests/xencapsdata/xen-ppc64.xml
+++ b/tests/xencapsdata/xen-ppc64.xml
@@ -1,9 +1,8 @@
 <capabilities>
+
   <host>
     <cpu>
       <arch>ppc64</arch>
-      <features>
-      </features>
     </cpu>
     <migration_features>
       <live/>
@@ -15,11 +14,13 @@
 
   <guest>
     <os_type>xen</os_type>
-    <arch name="ppc64">
+    <arch name='ppc64'>
       <wordsize>64</wordsize>
-      <domain type="xen"></domain>
+      <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+      <machine>xenpv</machine>
+      <domain type='xen'>
+      </domain>
     </arch>
-    <features>
-    </features>
   </guest>
+
 </capabilities>
diff --git a/tests/xencapsdata/xen-x86_64-hvm.xml b/tests/xencapsdata/xen-x86_64-hvm.xml
index c7fa802f2..52c12c616 100644
--- a/tests/xencapsdata/xen-x86_64-hvm.xml
+++ b/tests/xencapsdata/xen-x86_64-hvm.xml
@@ -1,4 +1,5 @@
 <capabilities>
+
   <host>
     <cpu>
       <arch>x86_64</arch>
@@ -16,23 +17,24 @@
 
   <guest>
     <os_type>xen</os_type>
-    <arch name="x86_64">
+    <arch name='x86_64'>
       <wordsize>64</wordsize>
-      <domain type="xen"></domain>
+      <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
+      <machine>xenpv</machine>
+      <domain type='xen'>
+      </domain>
     </arch>
-    <features>
-    </features>
   </guest>
 
   <guest>
     <os_type>hvm</os_type>
-    <arch name="i686">
+    <arch name='i686'>
       <wordsize>32</wordsize>
-      <domain type="xen"></domain>
-      <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-      <machine>pc</machine>
-      <machine>isapc</machine>
+      <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
       <loader>/usr/lib/xen/boot/hvmloader</loader>
+      <machine>xenfv</machine>
+      <domain type='xen'>
+      </domain>
     </arch>
     <features>
       <pae/>
@@ -44,17 +46,18 @@
 
   <guest>
     <os_type>hvm</os_type>
-    <arch name="x86_64">
+    <arch name='x86_64'>
       <wordsize>64</wordsize>
-      <domain type="xen"></domain>
       <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
-      <machine>pc</machine>
-      <machine>isapc</machine>
       <loader>/usr/lib/xen/boot/hvmloader</loader>
+      <machine>xenfv</machine>
+      <domain type='xen'>
+      </domain>
     </arch>
     <features>
       <acpi default='on' toggle='yes'/>
       <apic default='on' toggle='yes'/>
     </features>
   </guest>
+
 </capabilities>
diff --git a/tests/xencapsdata/xen-x86_64.xml b/tests/xencapsdata/xen-x86_64.xml
index 7c73d0ece..0faa43c79 100644
--- a/tests/xencapsdata/xen-x86_64.xml
+++ b/tests/xencapsdata/xen-x86_64.xml
@@ -1,4 +1,5 @@
 <capabilities>
+
   <host>
     <cpu>
       <arch>x86_64</arch>
@@ -16,11 +17,13 @@
 
   <guest>
     <os_type>xen</os_type>
-    <arch name="x86_64">
+    <arch name='x86_64'>
       <wordsize>64</wordsize>
-      <domain type="xen"></domain>
+      <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
+      <machine>xenpv</machine>
+      <domain type='xen'>
+      </domain>
     </arch>
-    <features>
-    </features>
   </guest>
+
 </capabilities>