CPU: Convert to new style XML props

6 files changed, 36 insertions, 36 deletions

diff --git a/tests/cli-test-xml/compare/kvm-f14-url.xml b/tests/cli-test-xml/compare/kvm-f14-url.xml
index 3410e5e7..5e3f8b2c 100644
--- a/tests/cli-test-xml/compare/kvm-f14-url.xml
+++ b/tests/cli-test-xml/compare/kvm-f14-url.xml
@@ -16,19 +16,19 @@
   <cpu mode="custom" match="exact">
     <model>core2duo</model>
     <vendor>Intel</vendor>
-    <feature policy="require" name="pbe"/>
-    <feature policy="require" name="tm2"/>
-    <feature policy="require" name="est"/>
-    <feature policy="require" name="ss"/>
-    <feature policy="require" name="ht"/>
-    <feature policy="require" name="ds"/>
-    <feature policy="require" name="lahf_lm"/>
-    <feature policy="require" name="tm"/>
-    <feature policy="require" name="cx16"/>
-    <feature policy="require" name="vmx"/>
-    <feature policy="require" name="ds_cpl"/>
-    <feature policy="require" name="xtpr"/>
-    <feature policy="require" name="acpi"/>
+    <feature name="pbe" policy="require"/>
+    <feature name="tm2" policy="require"/>
+    <feature name="est" policy="require"/>
+    <feature name="ss" policy="require"/>
+    <feature name="ht" policy="require"/>
+    <feature name="ds" policy="require"/>
+    <feature name="lahf_lm" policy="require"/>
+    <feature name="tm" policy="require"/>
+    <feature name="cx16" policy="require"/>
+    <feature name="vmx" policy="require"/>
+    <feature name="ds_cpl" policy="require"/>
+    <feature name="xtpr" policy="require"/>
+    <feature name="acpi" policy="require"/>
   </cpu>
   <clock offset="utc"/>
   <on_poweroff>destroy</on_poweroff>
@@ -70,19 +70,19 @@
   <cpu mode="custom" match="exact">
     <model>core2duo</model>
     <vendor>Intel</vendor>
-    <feature policy="require" name="pbe"/>
-    <feature policy="require" name="tm2"/>
-    <feature policy="require" name="est"/>
-    <feature policy="require" name="ss"/>
-    <feature policy="require" name="ht"/>
-    <feature policy="require" name="ds"/>
-    <feature policy="require" name="lahf_lm"/>
-    <feature policy="require" name="tm"/>
-    <feature policy="require" name="cx16"/>
-    <feature policy="require" name="vmx"/>
-    <feature policy="require" name="ds_cpl"/>
-    <feature policy="require" name="xtpr"/>
-    <feature policy="require" name="acpi"/>
+    <feature name="pbe" policy="require"/>
+    <feature name="tm2" policy="require"/>
+    <feature name="est" policy="require"/>
+    <feature name="ss" policy="require"/>
+    <feature name="ht" policy="require"/>
+    <feature name="ds" policy="require"/>
+    <feature name="lahf_lm" policy="require"/>
+    <feature name="tm" policy="require"/>
+    <feature name="cx16" policy="require"/>
+    <feature name="vmx" policy="require"/>
+    <feature name="ds_cpl" policy="require"/>
+    <feature name="xtpr" policy="require"/>
+    <feature name="acpi" policy="require"/>
   </cpu>
   <clock offset="utc"/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/cli-test-xml/compare/w2k3-cdrom.xml b/tests/cli-test-xml/compare/w2k3-cdrom.xml
index a4a896d4..ea04f878 100644
--- a/tests/cli-test-xml/compare/w2k3-cdrom.xml
+++ b/tests/cli-test-xml/compare/w2k3-cdrom.xml
@@ -12,7 +12,7 @@
   <features>
     <acpi/><apic/><pae/>
   </features>
-  <cpu mode="custom">
+  <cpu>
     <topology sockets="1" cores="4" threads="1"/>
   </cpu>
   <clock offset="localtime"/>
@@ -50,7 +50,7 @@
   <features>
     <acpi/><apic/><pae/>
   </features>
-  <cpu mode="custom">
+  <cpu>
     <topology sockets="1" cores="4" threads="1"/>
   </cpu>
   <clock offset="localtime"/>
@@ -88,7 +88,7 @@
   <features>
     <acpi/><apic/><pae/>
   </features>
-  <cpu mode="custom">
+  <cpu>
     <topology sockets="1" cores="4" threads="1"/>
   </cpu>
   <clock offset="localtime"/>
diff --git a/tests/xmlconfig-xml/boot-cpuset.xml b/tests/xmlconfig-xml/boot-cpuset.xml
index 3fb10dbd..0e119b7a 100644
--- a/tests/xmlconfig-xml/boot-cpuset.xml
+++ b/tests/xmlconfig-xml/boot-cpuset.xml
@@ -12,12 +12,12 @@
   <features>
     <acpi/><apic/>
   </features>
-  <cpu mode="custom" match="minimum">
+  <cpu match="minimum" mode="custom">
     <model>footest</model>
     <vendor>Intel</vendor>
     <topology sockets="4" cores="5" threads="2"/>
-    <feature policy="force" name="x2apic"/>
-    <feature policy="forbid" name="lahf_lm"/>
+    <feature name="x2apic" policy="force"/>
+    <feature name="lahf_lm" policy="forbid"/>
   </cpu>
   <clock offset="utc"/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/xmlparse-xml/change-guest-out.xml b/tests/xmlparse-xml/change-guest-out.xml
index 322311b7..3b4df2e3 100644
--- a/tests/xmlparse-xml/change-guest-out.xml
+++ b/tests/xmlparse-xml/change-guest-out.xml
@@ -20,8 +20,8 @@
     <model>qemu64</model>
     <vendor>qemuvendor</vendor>
     <topology sockets="4" cores="3" threads="1"/>
-    <feature policy="disable" name="foofeat"/>
-    <feature policy="require" name="addfeature"/>
+    <feature policy="disable" name="x2apic"/>
+    <feature name="addfeature" policy="require"/>
   </cpu>
   <clock offset="localtime"/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/xmlparse-xml/change-minimal-guest-out.xml b/tests/xmlparse-xml/change-minimal-guest-out.xml
index c9df30ab..1821aaa9 100644
--- a/tests/xmlparse-xml/change-minimal-guest-out.xml
+++ b/tests/xmlparse-xml/change-minimal-guest-out.xml
@@ -25,6 +25,6 @@
   <cpu mode="custom" match="exact">
     <model>foobar</model>
     <topology cores="4" sockets="1" threads="1"/>
-    <feature policy="forbid" name="x2apic"/>
+    <feature name="x2apic" policy="forbid"/>
   </cpu>
 </domain>
diff --git a/tests/xmlparse.py b/tests/xmlparse.py
index 02a306ad..387e1ac3 100644
--- a/tests/xmlparse.py
+++ b/tests/xmlparse.py
@@ -161,7 +161,7 @@ class XMLParseTest(unittest.TestCase):
         check("sockets", 4, 4)
 
         check = self._make_checker(guest.cpu.features[0])
-        check("name", "x2apic", "foofeat")
+        check("name", "x2apic")
         check("policy", "force", "disable")
         guest.cpu.remove_feature(guest.cpu.features[1])
         guest.cpu.add_feature("addfeature")