tests: testQemuCapsIterate: Pass prefix and version to callback

Right now we're passing a "base" string that contains both,
separated by an underscore. Some changes that we're going to
introduce later will require us to have the version number on its
own, and instead of delegating the task of splitting the two apart
to the callback it make more sense to perform it upfront.

This change results in quite a bit of churn because we're now
using the version number only, without the prefix, to calculate
the dummy microcodeVersion.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>

diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
index 780d75a513e6b54d8c703e433dfe1b7b34d65b46..8b573070d53450874a04cb5652238ed783ff0158 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
@@ -85,7 +85,7 @@
   <flag name='mch'/>
   <version>1005003</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>43100763</microcodeVersion>
+  <microcodeVersion>43100245</microcodeVersion>
   <package></package>
   <arch>x86_64</arch>
   <cpu type='kvm' name='Opteron_G5'/>

diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
index 90a8873cd6facbf086bb0add05ee8e2e66beec7f..743b0a3dd7874668b76cf40b502ac68b170aefab 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
@@ -90,7 +90,7 @@
   <flag name='mch'/>
   <version>1006000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>43100761</microcodeVersion>
+  <microcodeVersion>43100243</microcodeVersion>
   <package></package>
   <arch>x86_64</arch>
   <cpu type='kvm' name='Opteron_G5'/>

diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
index c3d26c61cb123c21a9a0401defce18f7a9968ff3..a23d1c62061d9facf1677a33eb0cb77670704cce 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
@@ -92,7 +92,7 @@
   <flag name='mch'/>
   <version>1007000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>43100762</microcodeVersion>
+  <microcodeVersion>43100244</microcodeVersion>
   <package></package>
   <arch>x86_64</arch>
   <cpu type='kvm' name='Opteron_G5'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
index f416071149fa2e1e79baff7a17ef6a7d9d71e390..75d5371d3fd5991e7fc71aafd623ad2e25e5cdd1 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
@@ -108,7 +108,7 @@
   <flag name='mch'/>
   <version>2001001</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>43100758</microcodeVersion>
+  <microcodeVersion>43100240</microcodeVersion>
   <package></package>
   <arch>x86_64</arch>
   <cpu type='kvm' name='Opteron_G5'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
index 9404e66144fc15426c3803a98addf92b3f6cba4d..f0bf0035289efc7c7eed8cd92685803208ec97d6 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
@@ -141,7 +141,7 @@
   <flag name='iothread.poll-max-ns'/>
   <version>2010000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>61700805</microcodeVersion>
+  <microcodeVersion>61700287</microcodeVersion>
   <package> (v2.10.0)</package>
   <arch>aarch64</arch>
   <cpu type='kvm' name='pxa262'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
index 162fb1f035484f6c85eda7a2e1a6607212fc99fe..93c2103b65e5acbbf5349f3324fb3340bf28ce62 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
@@ -140,7 +140,7 @@
   <flag name='iothread.poll-max-ns'/>
   <version>2010000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>42900805</microcodeVersion>
+  <microcodeVersion>42900287</microcodeVersion>
   <package> (v2.10.0)</package>
   <arch>ppc64</arch>
   <cpu type='kvm' name='default'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
index 058eb32c463847dd42099e5e0a7e00ca03c9a830..61acfa3260a5e507cee8390fbbcc11968acbeb5f 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
@@ -107,7 +107,7 @@
   <flag name='query-cpu-model-comparison'/>
   <version>2010000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>39100805</microcodeVersion>
+  <microcodeVersion>39100287</microcodeVersion>
   <package></package>
   <arch>s390x</arch>
   <hostCPU type='kvm' model='z14-base' migratability='no'>

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
index 2788fd9afe4ba735a95e1b74492d14ffd4ac6ede..875ec5f615badda21fd039c351a4b6af53173c08 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
@@ -183,7 +183,7 @@
   <flag name='x86-max-cpu'/>
   <version>2010000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>43100805</microcodeVersion>
+  <microcodeVersion>43100287</microcodeVersion>
   <package> (v2.10.0)</package>
   <arch>x86_64</arch>
   <hostCPU type='kvm' model='base' migratability='yes'>

diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
index 425613104aa6d12643a08b9cc92f2193ede9c4b8..f37d12c8ae817b3c3bba2e1ddec25f7f9fd11ba3 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@@ -114,7 +114,7 @@
   <flag name='query-cpu-model-comparison'/>
   <version>2011000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>39100806</microcodeVersion>
+  <microcodeVersion>39100288</microcodeVersion>
   <package></package>
   <arch>s390x</arch>
   <hostCPU type='kvm' model='z14-base' migratability='no'>

diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
index 69f7fc2e4a7e61dcb7970c286ed5f8a58e40cf47..a69b632917c7ad7f61eaff1b5a0dc64983ad5da3 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
@@ -189,7 +189,7 @@
   <flag name='x86-max-cpu'/>
   <version>2011000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>43100806</microcodeVersion>
+  <microcodeVersion>43100288</microcodeVersion>
   <package> (v2.11.0)</package>
   <arch>x86_64</arch>
   <hostCPU type='kvm' model='base' migratability='yes'>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
index 614fd14fb13c9ec7d6a79cc7ee8b4fa258a87ced..178724811084d1e4cb0ee13633112a62229fbb72 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@@ -155,7 +155,7 @@
   <flag name='memory-backend-file.align'/>
   <version>2012000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>61700807</microcodeVersion>
+  <microcodeVersion>61700289</microcodeVersion>
   <package>v2.12.0</package>
   <arch>aarch64</arch>
   <cpu type='kvm' name='pxa262'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
index ede28439cd9f37405690ff29fa0188c6753e4d6e..5f4d657170ff03c1c29ed42edda1a306ad0d018e 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@@ -153,7 +153,7 @@
   <flag name='memory-backend-file.align'/>
   <version>2011090</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>42900807</microcodeVersion>
+  <microcodeVersion>42900289</microcodeVersion>
   <package>v2.12.0-rc0</package>
   <arch>ppc64</arch>
   <cpu type='kvm' name='default'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
index 48be96d69c5621527571dfb53d69f77c70295614..4ac074101898b105bb2deb92b64da590bee70fe2 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@@ -125,7 +125,7 @@
   <flag name='query-cpu-model-comparison'/>
   <version>2012000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>39100807</microcodeVersion>
+  <microcodeVersion>39100289</microcodeVersion>
   <package></package>
   <arch>s390x</arch>
   <hostCPU type='kvm' model='z14-base' migratability='no'>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
index 61b3602c4825c05a929a5c1735cff8e1ce7c269e..2952b5a799194876f7df366187cf88500083e6f0 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@@ -197,7 +197,7 @@
   <flag name='x86-max-cpu'/>
   <version>2011090</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>43100807</microcodeVersion>
+  <microcodeVersion>43100289</microcodeVersion>
   <package>v2.12.0-rc0</package>
   <arch>x86_64</arch>
   <hostCPU type='kvm' model='base' migratability='yes'>

diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
index 8760c5ceb81bd03cf023d8bdd6d9c7eb185ed6bd..31d7f172eee78f5beee5d68aa0d9d387785e6525 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
@@ -134,7 +134,7 @@
   <flag name='mch'/>
   <version>2004000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>43100760</microcodeVersion>
+  <microcodeVersion>43100242</microcodeVersion>
   <package></package>
   <arch>x86_64</arch>
   <cpu type='kvm' name='Opteron_G5'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
index c4e6a614d00fe90c37c41e328661cbd8039c6342..0cc922c0a20a93afe06983bfd8b03f81609e7548 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
@@ -140,7 +140,7 @@
   <flag name='mch'/>
   <version>2005000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>43100761</microcodeVersion>
+  <microcodeVersion>43100243</microcodeVersion>
   <package></package>
   <arch>x86_64</arch>
   <cpu type='kvm' name='Opteron_G5'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
index 3c72072b64f2a18ce4dae0a3f62fd2f625b9215b..a77258215203ed9f4f38e3b4a479700d1ba63478 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
@@ -124,7 +124,7 @@
   <flag name='hda-output'/>
   <version>2006000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>61700762</microcodeVersion>
+  <microcodeVersion>61700244</microcodeVersion>
   <package></package>
   <arch>aarch64</arch>
   <cpu type='kvm' name='pxa262'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
index 64c2e6eadc9e017607039643a0e05bf215c234b0..2961c2552fbfef887297107d37f81c226699169d 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
@@ -119,7 +119,7 @@
   <flag name='hda-output'/>
   <version>2006000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>42900762</microcodeVersion>
+  <microcodeVersion>42900244</microcodeVersion>
   <package></package>
   <arch>ppc64</arch>
   <cpu type='kvm' name='default'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
index 2f27b8b27e15d83991cc4ff8c33de00511a4bb25..633444de95c349a9a94918fcfc7fe6b9ed9062a0 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
@@ -152,7 +152,7 @@
   <flag name='mch'/>
   <version>2006000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>43100762</microcodeVersion>
+  <microcodeVersion>43100244</microcodeVersion>
   <package></package>
   <arch>x86_64</arch>
   <cpu type='kvm' name='Opteron_G5'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
index 0701ce24bfd9a49a72b5208d67c7487c6118263c..e9fc059065ba3efa2ef6761c83ac1d20bc734c6d 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
@@ -91,7 +91,7 @@
   <flag name='zpci'/>
   <version>2007000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>39100763</microcodeVersion>
+  <microcodeVersion>39100245</microcodeVersion>
   <package></package>
   <arch>s390x</arch>
   <cpu type='kvm' name='host'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
index d8a6b618b9716fa694d9bae39f5d7aa09f0622d8..ffb5c59491c66d497ded594146c6580f2f276ba1 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
@@ -157,7 +157,7 @@
   <flag name='mch'/>
   <version>2007000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>43100763</microcodeVersion>
+  <microcodeVersion>43100245</microcodeVersion>
   <package> (v2.7.0)</package>
   <arch>x86_64</arch>
   <cpu type='kvm' name='Opteron_G5'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
index 5b0441686775c3add4360c9d8525332c0a8cef9c..75b4fbdc49358c37cc91bebe1352ea4c99fc8189 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
@@ -96,7 +96,7 @@
   <flag name='query-cpu-model-comparison'/>
   <version>2007093</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>39100764</microcodeVersion>
+  <microcodeVersion>39100246</microcodeVersion>
   <package></package>
   <arch>s390x</arch>
   <hostCPU type='kvm' model='zEC12.2-base' migratability='no'>

diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
index 5c3eaa82fe5013e60652e9027afebee97b977c55..7ee52a95e7c3c1604e01b333ddece75fb385ebe0 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
@@ -160,7 +160,7 @@
   <flag name='mch'/>
   <version>2008000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>43100764</microcodeVersion>
+  <microcodeVersion>43100246</microcodeVersion>
   <package> (v2.8.0)</package>
   <arch>x86_64</arch>
   <cpu type='kvm' name='host' usable='yes'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
index 17c2c8e12ee4e6699d66263e2383dba8d49398d6..b1ade837a9456edb3bf54c450e0993f3f3bfdb15 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
@@ -132,7 +132,7 @@
   <flag name='iothread.poll-max-ns'/>
   <version>2009000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>42900765</microcodeVersion>
+  <microcodeVersion>42900247</microcodeVersion>
   <package> (v2.9.0)</package>
   <arch>ppc64</arch>
   <cpu type='kvm' name='default'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
index d5feb7bca489e1bd1ac156e3249df4239e507a54..9d1d015e9b989e71e51a5a25e4d78a90ef19e396 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
@@ -101,7 +101,7 @@
   <flag name='query-cpu-model-comparison'/>
   <version>2009000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>39100765</microcodeVersion>
+  <microcodeVersion>39100247</microcodeVersion>
   <package></package>
   <arch>s390x</arch>
   <hostCPU type='kvm' model='z13.2-base' migratability='no'>

diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
index 0c2586e0e5d4ef10adeaffc5e9403f092919e114..0e749b069f6ac06a85942d35653650fd83f9388f 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
@@ -177,7 +177,7 @@
   <flag name='x86-max-cpu'/>
   <version>2009000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>43100765</microcodeVersion>
+  <microcodeVersion>43100247</microcodeVersion>
   <package> (v2.9.0)</package>
   <arch>x86_64</arch>
   <hostCPU type='kvm' model='base' migratability='yes'>

diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
index 147e0dcbd6191fb4080c95a4e9b8888630b72e4d..6ff4254461879e99c6a212b604b8af60144b1898 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
@@ -155,7 +155,7 @@
   <flag name='ramfb'/>
   <version>2012050</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>42900757</microcodeVersion>
+  <microcodeVersion>42900239</microcodeVersion>
   <package>v2.12.0-1689-g518d23a</package>
   <arch>ppc64</arch>
   <cpu type='kvm' name='default'/>

diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
index cad53abfd05b6e6fd0d54dec81d8da23f2891422..38f3864444182fec27c1ff9d8028bf42ea9d4a60 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
@@ -128,7 +128,7 @@
   <flag name='ramfb'/>
   <version>3000000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>39100757</microcodeVersion>
+  <microcodeVersion>39100239</microcodeVersion>
   <package></package>
   <arch>s390x</arch>
   <hostCPU type='kvm' model='z14-base' migratability='no'>

diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
index 8dcab37d7cba52745dc34cfa5b19d44c40f2a009..dce80e9ba0772517492042c787a057ce2325dbe7 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
@@ -202,7 +202,7 @@
   <flag name='ramfb'/>
   <version>3000000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>43100757</microcodeVersion>
+  <microcodeVersion>43100239</microcodeVersion>
   <package>v3.0.0</package>
   <arch>x86_64</arch>
   <hostCPU type='kvm' model='base' migratability='yes'>

diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
index 468508194571e31d744a6dca96175baa0d6deba4..1ce578de005d05e5e5d6d3aabe0f6828c9677696 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
@@ -159,7 +159,7 @@
   <flag name='bochs-display'/>
   <version>3000091</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>42900758</microcodeVersion>
+  <microcodeVersion>42900240</microcodeVersion>
   <package>v3.1.0-rc1-74-g3c035a41dc</package>
   <arch>ppc64</arch>
   <cpu type='kvm' name='default'/>

diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
index b5561aed2c495ea67980a8676371347e41a364cc..dac2fdc54df31b2f4e8f9d0b997644bd003ec14d 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
@@ -205,7 +205,7 @@
   <flag name='ramfb'/>
   <version>3000092</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>43100758</microcodeVersion>
+  <microcodeVersion>43100240</microcodeVersion>
   <package>v3.1.0-rc2-48-g039d4e3df0</package>
   <arch>x86_64</arch>
   <hostCPU type='kvm' model='base' migratability='yes'>

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
index 8bc373da531b31462db86f59f148144e74b5db1b..66e3ca92053dcb6e56384ecd3eb070da7ff36927 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
@@ -168,7 +168,7 @@
   <flag name='ramfb'/>
   <version>4000000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>61700758</microcodeVersion>
+  <microcodeVersion>61700240</microcodeVersion>
   <package>v4.0.0</package>
   <arch>aarch64</arch>
   <cpu type='kvm' name='pxa262'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
index b99abd69de44f9885a165180c183978e3415bb6b..1a4c357308985b2e287f3d5577e88d3dac9bec1e 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
@@ -173,7 +173,7 @@
   <flag name='machine.pseries.cap-ccf-assist'/>
   <version>4000000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>42900758</microcodeVersion>
+  <microcodeVersion>42900240</microcodeVersion>
   <package>v4.0.0</package>
   <arch>ppc64</arch>
   <cpu type='kvm' name='default'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
index d26cb3388c3d56d7255d17476e539eaa285c7cad..e65040fbb081a4978224a8402648c852bde01f9d 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
@@ -136,7 +136,7 @@
   <flag name='query-cpu-model-comparison'/>
   <version>4000000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>39100758</microcodeVersion>
+  <microcodeVersion>39100240</microcodeVersion>
   <package>v4.0.0</package>
   <arch>s390x</arch>
   <hostCPU type='kvm' model='z14.2-base' migratability='no'>

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
index 6d44cffb9c86a07fe429c90b1e802cb4ebfb498b..e16d4af5a90078ba735f89f413628ea2adb2b4b0 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
@@ -210,7 +210,7 @@
   <flag name='ramfb'/>
   <version>4000000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>43100758</microcodeVersion>
+  <microcodeVersion>43100240</microcodeVersion>
   <package>v4.0.0</package>
   <arch>x86_64</arch>
   <hostCPU type='kvm' model='base' migratability='yes'>

diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
index fcae11b6efe34e75999d937ba2b4d631903a4344..36b07579b2d197615c6427b2fbcd79486a0810cf 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
@@ -214,7 +214,7 @@
   <flag name='ramfb'/>
   <version>4001000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>43100759</microcodeVersion>
+  <microcodeVersion>43100241</microcodeVersion>
   <package>v4.1.0</package>
   <arch>x86_64</arch>
   <hostCPU type='kvm' model='base' migratability='yes'>

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
index e75b39ff16aef0f7178e94eca4aea212726d85ae..7b13da4dcac95389ac53829f5d46f651a88555ef 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -169,7 +169,7 @@
   <flag name='ramfb'/>
   <version>4001050</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>61700760</microcodeVersion>
+  <microcodeVersion>61700242</microcodeVersion>
   <package>v4.1.0-1378-g98b2e3c9ab</package>
   <arch>aarch64</arch>
   <cpu type='kvm' name='pxa262'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
index 4a4031e5094d89420c1ff3ce7559774fce02659b..561d95524759a82f607491a0c372e510c4bb938c 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@@ -175,7 +175,7 @@
   <flag name='machine.pseries.cap-ccf-assist'/>
   <version>4001050</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>42900760</microcodeVersion>
+  <microcodeVersion>42900242</microcodeVersion>
   <package>v4.1.0-1378-g98b2e3c9ab</package>
   <arch>ppc64</arch>
   <cpu type='kvm' name='default'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index ab884239fe8905445a63574c07f4ac00b8a8ec10..963afbbc9edeafdd55caa4776a75ec66e5253ec7 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -214,7 +214,7 @@
   <flag name='ramfb'/>
   <version>4001050</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>43100760</microcodeVersion>
+  <microcodeVersion>43100242</microcodeVersion>
   <package>v4.1.0-1138-geb13d1cf4a</package>
   <arch>x86_64</arch>
   <hostCPU type='kvm' model='base' migratability='yes'>

diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c
index cc2242df50497651ed159041bed2c9f4aa450a7d..8fa4104f206b9d3ae1bcdae9dd81cffcab2d5c2e 100644 (file)
--- a/tests/qemucapabilitiestest.c
+++ b/tests/qemucapabilitiestest.c
@@ -37,9 +37,10 @@ struct _testQemuData {
     virQEMUDriver driver;
     const char *inputDir;
     const char *outputDir;
+    const char *prefix;
+    const char *version;
     const char *archName;
     const char *suffix;
-    const char *base;
     int ret;
 };
 
@@ -78,11 +79,12 @@ testQemuCaps(const void *opaque)
     unsigned int fakeMicrocodeVersion = 0;
     const char *p;
 
-    if (virAsprintf(&repliesFile, "%s/%s.%s.%s",
-                    data->inputDir, data->base,
+    if (virAsprintf(&repliesFile, "%s/%s_%s.%s.%s",
+                    data->inputDir, data->prefix, data->version,
                     data->archName, data->suffix) < 0 ||
-        virAsprintf(&capsFile, "%s/%s.%s.xml",
-                    data->outputDir, data->base, data->archName) < 0)
+        virAsprintf(&capsFile, "%s/%s_%s.%s.xml",
+                    data->outputDir, data->prefix, data->version,
+                    data->archName) < 0)
         goto cleanup;
 
     if (!(mon = qemuMonitorTestNewFromFileFull(repliesFile, &data->driver, NULL,
@@ -114,7 +116,7 @@ testQemuCaps(const void *opaque)
 
         fakeMicrocodeVersion *= 100000;
 
-        for (p = data->base; *p; p++)
+        for (p = data->version; *p; p++)
             fakeMicrocodeVersion += *p;
 
         virQEMUCapsSetMicrocodeVersion(capsActual, fakeMicrocodeVersion);
@@ -148,8 +150,9 @@ testQemuCapsCopy(const void *opaque)
     virQEMUCapsPtr copy = NULL;
     char *actual = NULL;
 
-    if (virAsprintf(&capsFile, "%s/%s.%s.xml",
-                    data->outputDir, data->base, data->archName) < 0)
+    if (virAsprintf(&capsFile, "%s/%s_%s.%s.xml",
+                    data->outputDir, data->prefix, data->version,
+                    data->archName) < 0)
         goto cleanup;
 
     if (!(caps = virCapabilitiesNew(virArchFromString(data->archName),
@@ -182,7 +185,8 @@ testQemuCapsCopy(const void *opaque)
 
 static int
 doCapsTest(const char *inputDir,
-           const char *base,
+           const char *prefix,
+           const char *version,
            const char *archName,
            const char *suffix,
            void *opaque)
@@ -191,13 +195,14 @@ doCapsTest(const char *inputDir,
     g_autofree char *title = NULL;
     g_autofree char *copyTitle = NULL;
 
-    if (virAsprintf(&title, "%s (%s)", base, archName) < 0 ||
-        virAsprintf(&copyTitle, "copy %s (%s)", base, archName) < 0) {
+    if (virAsprintf(&title, "%s (%s)", version, archName) < 0 ||
+        virAsprintf(&copyTitle, "copy %s (%s)", version, archName) < 0) {
         return -1;
     }
 
     data->inputDir = inputDir;
-    data->base = base;
+    data->prefix = prefix;
+    data->version = version;
     data->archName = archName;
     data->suffix = suffix;
 

diff --git a/tests/qemucaps2xmltest.c b/tests/qemucaps2xmltest.c
index 7a41e9cdd3e679d9adbae4dd45ddcfdcee57469e..365efbe4b191c493493a818e766cb742ebc68a90 100644 (file)
--- a/tests/qemucaps2xmltest.c
+++ b/tests/qemucaps2xmltest.c
@@ -31,7 +31,8 @@ typedef testQemuData *testQemuDataPtr;
 struct _testQemuData {
     const char *inputDir;
     const char *outputDir;
-    const char *base;
+    const char *prefix;
+    const char *version;
     const char *archName;
     const char *suffix;
     int ret;
@@ -146,8 +147,8 @@ testQemuCapsXML(const void *opaque)
                     data->outputDir, data->archName) < 0)
         goto cleanup;
 
-    if (virAsprintf(&capsFile, "%s/%s.%s.%s",
-                    data->inputDir, data->base,
+    if (virAsprintf(&capsFile, "%s/%s_%s.%s.%s",
+                    data->inputDir, data->prefix, data->version,
                     data->archName, data->suffix) < 0)
         goto cleanup;
 
@@ -176,7 +177,8 @@ testQemuCapsXML(const void *opaque)
 
 static int
 doCapsTest(const char *inputDir,
-           const char *base,
+           const char *prefix,
+           const char *version,
            const char *archName,
            const char *suffix,
            void *opaque)
@@ -184,11 +186,12 @@ doCapsTest(const char *inputDir,
     testQemuDataPtr data = (testQemuDataPtr) opaque;
     g_autofree char *title = NULL;
 
-    if (virAsprintf(&title, "%s (%s)", base, archName) < 0)
+    if (virAsprintf(&title, "%s (%s)", version, archName) < 0)
         return -1;
 
     data->inputDir = inputDir;
-    data->base = base;
+    data->prefix = prefix;
+    data->version = version;
     data->archName = archName;
     data->suffix = suffix;
 

diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index 1f0270f488fc187fa83736cbb84e0ff133e3de9e..54d6b1a0ac6d758893b24d2289276dd0619a5887 100644 (file)
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -917,22 +917,28 @@ testQemuCapsIterate(const char *suffix,
 
     while ((rc = virDirRead(dir, &ent, TEST_QEMU_CAPS_PATH)) > 0) {
         g_autofree char *tmp = g_strdup(ent->d_name);
-        char *base = NULL;
+        char *version = NULL;
         char *archName = NULL;
 
         /* Strip the trailing suffix, moving on if it's not present */
         if (!virStringStripSuffix(tmp, suffix))
             continue;
 
+        /* Strip the leading prefix */
+        if (!(version = STRSKIP(tmp, "caps_"))) {
+            VIR_TEST_VERBOSE("malformed file name '%s'", ent->d_name);
+            goto cleanup;
+        }
+
         /* Find the last dot */
         if (!(archName = strrchr(tmp, '.'))) {
             VIR_TEST_VERBOSE("malformed file name '%s'", ent->d_name);
             goto cleanup;
         }
 
-        /* The base name is everything before the last dot, and
-         * the architecture name everything after it */
-        base = tmp;
+        /* The version number and the architecture name are separated by
+         * a dot: overwriting that dot with \0 results in both being usable
+         * as independent, null-terminated strings */
         archName[0] = '\0';
         archName++;
 
@@ -942,7 +948,7 @@ testQemuCapsIterate(const char *suffix,
          * to make it nicer to rebuild the original file name from inside
          * the callback.
          */
-        if (callback(TEST_QEMU_CAPS_PATH, base,
+        if (callback(TEST_QEMU_CAPS_PATH, "caps", version,
                      archName, suffix + 1, opaque) < 0) {
             goto cleanup;
         }

diff --git a/tests/testutilsqemu.h b/tests/testutilsqemu.h
index 2c8c4960e97831ac29e6fee6cfa5e705498d86f7..714a95bb7aafbdf5864687a728654fbf4b5cea8d 100644 (file)
--- a/tests/testutilsqemu.h
+++ b/tests/testutilsqemu.h
@@ -97,7 +97,8 @@ char *testQemuGetLatestCapsForArch(const char *arch,
 virHashTablePtr testQemuGetLatestCaps(void);
 
 typedef int (*testQemuCapsIterateCallback)(const char *inputDir,
-                                           const char *base,
+                                           const char *prefix,
+                                           const char *version,
                                            const char *archName,
                                            const char *suffix,
                                            void *opaque);