qemuxml2argvtest: Reorder CPU features

The x86 CPU driver translated each CPU definition from domain XML into
CPUID data and then back to CPU definition. This effectively sorted the
list of CPU features according to their CPUID values. Since this is
going to change, we need to reorder CPU features in a few test files to
make sure the generated QEMU command lines will not change.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell2.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell2.xml
index 0d4efa14ff092ae144ffc028ce46d3b4e81d13ac..6a6722d6e5eb7fe97b1a4408c93dd30915364063 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell2.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell2.xml
@@ -10,8 +10,8 @@
   </os>
   <cpu mode='custom' match='exact'>
     <model fallback='forbid'>Haswell</model>
-    <feature policy='disable' name='rtm'/>
     <feature policy='disable' name='hle'/>
+    <feature policy='disable' name='rtm'/>
   </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.xml
index 1d1e81571c00fd8198e4985bebf67326ef737ea0..ebf5830c885698b42e0ee1be1943ca6db864eda3 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.xml
@@ -10,13 +10,13 @@
   </os>
   <cpu match='exact'>
     <model fallback='allow'>qemu64</model>
-    <feature policy='disable' name='svm'/>
-    <feature policy='disable' name='lm'/>
-    <feature policy='disable' name='nx'/>
-    <feature policy='disable' name='syscall'/>
-    <feature policy='disable' name='clflush'/>
-    <feature policy='disable' name='pse36'/>
     <feature policy='disable' name='mca'/>
+    <feature policy='disable' name='pse36'/>
+    <feature policy='disable' name='clflush'/>
+    <feature policy='disable' name='syscall'/>
+    <feature policy='disable' name='nx'/>
+    <feature policy='disable' name='lm'/>
+    <feature policy='disable' name='svm'/>
   </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2-nofallback.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2-nofallback.xml
index 6b9b7d4c6445c91e45ff5de0969561b61a26ccb0..f51f9edfbbd76235f88210c16bfd470abc06589d 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2-nofallback.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2-nofallback.xml
@@ -10,18 +10,18 @@
   </os>
   <cpu match='exact'>
     <model fallback='forbid'>core2duo</model>
-    <feature name='lahf_lm' policy='require'/>
+    <feature name='ds' policy='require'/>
+    <feature name='ht' policy='require'/>
+    <feature name='tm' policy='optional'/>
+    <feature name='ds_cpl' policy='require'/>
     <feature name='xtpr' policy='require'/>
+    <feature name='3dnowext' policy='force'/>
+    <feature name='lahf_lm' policy='require'/>
+    <feature name='nx' policy='disable'/>
     <feature name='cx16' policy='disable'/>
     <feature name='tm2' policy='disable'/>
-    <feature name='ds_cpl' policy='require'/>
     <feature name='pbe' policy='disable'/>
-    <feature name='tm' policy='optional'/>
-    <feature name='ht' policy='require'/>
     <feature name='ss' policy='disable'/>
-    <feature name='ds' policy='require'/>
-    <feature name='nx' policy='disable'/>
-    <feature name='3dnowext' policy='force'/>
     <feature name='sse4a' policy='optional'/>
     <feature name='wdt' policy='forbid'/>
   </cpu>

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.xml
index eaea564f60daec7aaa0b83da8396cfee5a6c81d1..7fa77c56b16514e37d2363f478369784c5f07a5d 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.xml
@@ -10,18 +10,18 @@
   </os>
   <cpu match='exact'>
     <model>core2duo</model>
-    <feature name='lahf_lm' policy='require'/>
+    <feature name='ds' policy='require'/>
+    <feature name='ht' policy='require'/>
+    <feature name='tm' policy='optional'/>
+    <feature name='ds_cpl' policy='require'/>
     <feature name='xtpr' policy='require'/>
+    <feature name='3dnowext' policy='force'/>
+    <feature name='lahf_lm' policy='require'/>
+    <feature name='nx' policy='disable'/>
     <feature name='cx16' policy='disable'/>
     <feature name='tm2' policy='disable'/>
-    <feature name='ds_cpl' policy='require'/>
     <feature name='pbe' policy='disable'/>
-    <feature name='tm' policy='optional'/>
-    <feature name='ht' policy='require'/>
     <feature name='ss' policy='disable'/>
-    <feature name='ds' policy='require'/>
-    <feature name='nx' policy='disable'/>
-    <feature name='3dnowext' policy='force'/>
     <feature name='sse4a' policy='optional'/>
     <feature name='wdt' policy='forbid'/>
   </cpu>

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.xml
index b8bbf25acbbac6fcbe8f48b343d41912729741e0..fe6739c282bfbaa9cdbdf52db772e6ed9ace8756 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.xml
@@ -10,10 +10,10 @@
   </os>
   <cpu match='minimum'>
     <model>qemu64</model>
-    <feature policy='disable' name='svm'/>
-    <feature policy='disable' name='lm'/>
-    <feature policy='disable' name='nx'/>
     <feature policy='disable' name='syscall'/>
+    <feature policy='disable' name='nx'/>
+    <feature policy='disable' name='lm'/>
+    <feature policy='disable' name='svm'/>
   </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.xml
index a9fc9c5291ecd53bde1e5020f8e6e542520ec09e..84c77eac145315ff62787ae10a1fd781e803784f 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.xml
@@ -10,21 +10,21 @@
   </os>
   <cpu match='strict'>
     <model>core2duo</model>
-    <feature name='lahf_lm' policy='require'/>
+    <feature name='ds' policy='require'/>
+    <feature name='acpi' policy='optional'/>
+    <feature name='ht' policy='require'/>
+    <feature name='tm' policy='optional'/>
+    <feature name='ds_cpl' policy='require'/>
+    <feature name='vmx' policy='optional'/>
+    <feature name='est' policy='optional'/>
     <feature name='xtpr' policy='require'/>
+    <feature name='3dnowext' policy='force'/>
+    <feature name='lahf_lm' policy='require'/>
+    <feature name='nx' policy='disable'/>
     <feature name='cx16' policy='disable'/>
     <feature name='tm2' policy='disable'/>
-    <feature name='est' policy='optional'/>
-    <feature name='vmx' policy='optional'/>
-    <feature name='ds_cpl' policy='require'/>
     <feature name='pbe' policy='disable'/>
-    <feature name='tm' policy='optional'/>
-    <feature name='ht' policy='require'/>
     <feature name='ss' policy='disable'/>
-    <feature name='acpi' policy='optional'/>
-    <feature name='ds' policy='require'/>
-    <feature name='nx' policy='disable'/>
-    <feature name='3dnowext' policy='force'/>
     <feature name='sse4a' policy='optional'/>
     <feature name='wdt' policy='forbid'/>
   </cpu>

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.xml
index bfb189cd999445293cb298ffaaeb4bc249b06d71..b00a8b743ea71278f48db2e889ad6d388f57614f 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.xml
@@ -19,19 +19,19 @@
     <model>core2duo</model>
     <vendor>Intel</vendor>
     <topology sockets='1' cores='2' threads='1'/>
-    <feature policy='require' name='lahf_lm'/>
-    <feature policy='require' name='xtpr'/>
-    <feature policy='require' name='cx16'/>
-    <feature policy='require' name='tm2'/>
-    <feature policy='require' name='est'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='ds_cpl'/>
-    <feature policy='require' name='pbe'/>
-    <feature policy='require' name='tm'/>
-    <feature policy='require' name='ht'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='acpi'/>
     <feature policy='require' name='ds'/>
+    <feature policy='require' name='acpi'/>
+    <feature policy='require' name='ss'/>
+    <feature policy='require' name='ht'/>
+    <feature policy='require' name='tm'/>
+    <feature policy='require' name='pbe'/>
+    <feature policy='require' name='ds_cpl'/>
+    <feature policy='require' name='vmx'/>
+    <feature policy='require' name='est'/>
+    <feature policy='require' name='tm2'/>
+    <feature policy='require' name='cx16'/>
+    <feature policy='require' name='xtpr'/>
+    <feature policy='require' name='lahf_lm'/>
   </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>

diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-timeout.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-timeout.xml
index 912b542843b398dc5a5689dfb0c6042c5e29220d..5f881f1fbb68b6453be1bd0d23defb8a31063531 100644 (file)
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-timeout.xml
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-timeout.xml
@@ -19,19 +19,19 @@
     <model fallback='allow'>core2duo</model>
     <vendor>Intel</vendor>
     <topology sockets='1' cores='2' threads='1'/>
-    <feature policy='require' name='lahf_lm'/>
-    <feature policy='require' name='xtpr'/>
-    <feature policy='require' name='cx16'/>
-    <feature policy='require' name='tm2'/>
-    <feature policy='require' name='est'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='ds_cpl'/>
-    <feature policy='require' name='pbe'/>
-    <feature policy='require' name='tm'/>
-    <feature policy='require' name='ht'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='acpi'/>
     <feature policy='require' name='ds'/>
+    <feature policy='require' name='acpi'/>
+    <feature policy='require' name='ss'/>
+    <feature policy='require' name='ht'/>
+    <feature policy='require' name='tm'/>
+    <feature policy='require' name='pbe'/>
+    <feature policy='require' name='ds_cpl'/>
+    <feature policy='require' name='vmx'/>
+    <feature policy='require' name='est'/>
+    <feature policy='require' name='tm2'/>
+    <feature policy='require' name='cx16'/>
+    <feature policy='require' name='xtpr'/>
+    <feature policy='require' name='lahf_lm'/>
   </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>

diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index f59746a4d96c54bccc6217ee0ac4e50ac86652c7..8c2c8b462482763bec3804fedafe46144a93e56c 100644 (file)
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -19,19 +19,19 @@ virCPUDefPtr cpuHaswell;
 virCPUDefPtr cpuPower8;
 
 static virCPUFeatureDef cpuDefaultFeatures[] = {
-    { (char *) "lahf_lm",   -1 },
-    { (char *) "xtpr",      -1 },
-    { (char *) "cx16",      -1 },
-    { (char *) "tm2",       -1 },
-    { (char *) "est",       -1 },
-    { (char *) "vmx",       -1 },
-    { (char *) "ds_cpl",    -1 },
-    { (char *) "pbe",       -1 },
-    { (char *) "tm",        -1 },
-    { (char *) "ht",        -1 },
-    { (char *) "ss",        -1 },
+    { (char *) "ds",        -1 },
     { (char *) "acpi",      -1 },
-    { (char *) "ds",        -1 }
+    { (char *) "ss",        -1 },
+    { (char *) "ht",        -1 },
+    { (char *) "tm",        -1 },
+    { (char *) "pbe",       -1 },
+    { (char *) "ds_cpl",    -1 },
+    { (char *) "vmx",       -1 },
+    { (char *) "est",       -1 },
+    { (char *) "tm2",       -1 },
+    { (char *) "cx16",      -1 },
+    { (char *) "xtpr",      -1 },
+    { (char *) "lahf_lm",   -1 },
 };
 static virCPUDef cpuDefaultData = {
     VIR_CPU_TYPE_HOST,      /* type */
@@ -51,30 +51,30 @@ static virCPUDef cpuDefaultData = {
 };
 
 static virCPUFeatureDef cpuHaswellFeatures[] = {
-    { (char *) "lahf_lm",   -1 },
-    { (char *) "invtsc",    -1 },
-    { (char *) "abm",       -1 },
-    { (char *) "pdpe1gb",   -1 },
-    { (char *) "cmt",       -1 },
-    { (char *) "rdrand",    -1 },
-    { (char *) "f16c",      -1 },
-    { (char *) "osxsave",   -1 },
-    { (char *) "pdcm",      -1 },
-    { (char *) "xtpr",      -1 },
-    { (char *) "tm2",       -1 },
-    { (char *) "est",       -1 },
-    { (char *) "smx",       -1 },
-    { (char *) "vmx",       -1 },
-    { (char *) "ds_cpl",    -1 },
-    { (char *) "monitor",   -1 },
-    { (char *) "dtes64",    -1 },
-    { (char *) "pbe",       -1 },
-    { (char *) "tm",        -1 },
-    { (char *) "ht",        -1 },
-    { (char *) "ss",        -1 },
-    { (char *) "acpi",      -1 },
-    { (char *) "ds",        -1 },
     { (char *) "vme",       -1 },
+    { (char *) "ds",        -1 },
+    { (char *) "acpi",      -1 },
+    { (char *) "ss",        -1 },
+    { (char *) "ht",        -1 },
+    { (char *) "tm",        -1 },
+    { (char *) "pbe",       -1 },
+    { (char *) "dtes64",    -1 },
+    { (char *) "monitor",   -1 },
+    { (char *) "ds_cpl",    -1 },
+    { (char *) "vmx",       -1 },
+    { (char *) "smx",       -1 },
+    { (char *) "est",       -1 },
+    { (char *) "tm2",       -1 },
+    { (char *) "xtpr",      -1 },
+    { (char *) "pdcm",      -1 },
+    { (char *) "osxsave",   -1 },
+    { (char *) "f16c",      -1 },
+    { (char *) "rdrand",    -1 },
+    { (char *) "cmt",       -1 },
+    { (char *) "pdpe1gb",   -1 },
+    { (char *) "abm",       -1 },
+    { (char *) "invtsc",    -1 },
+    { (char *) "lahf_lm",   -1 },
 };
 static virCPUDef cpuHaswellData = {
     VIR_CPU_TYPE_HOST,      /* type */