[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH 01/32] tests: qemucaps: Make fake 'microcodeVersion' depend on filename instead of length



To avoid changes to the filled in microcode in case we change the caps
replies file for any reason make the number depend on the filename.

Signed-off-by: Peter Krempa <pkrempa redhat com>
---
 .../qemucapabilitiesdata/caps_1.5.3.x86_64.xml  |  2 +-
 .../qemucapabilitiesdata/caps_1.6.0.x86_64.xml  |  2 +-
 .../qemucapabilitiesdata/caps_1.7.0.x86_64.xml  |  2 +-
 .../qemucapabilitiesdata/caps_2.1.1.x86_64.xml  |  2 +-
 .../caps_2.10.0.aarch64.xml                     |  2 +-
 .../qemucapabilitiesdata/caps_2.10.0.ppc64.xml  |  2 +-
 .../qemucapabilitiesdata/caps_2.10.0.s390x.xml  |  2 +-
 .../qemucapabilitiesdata/caps_2.10.0.x86_64.xml |  2 +-
 .../qemucapabilitiesdata/caps_2.11.0.s390x.xml  |  2 +-
 .../qemucapabilitiesdata/caps_2.11.0.x86_64.xml |  2 +-
 .../caps_2.12.0.aarch64.xml                     |  2 +-
 .../qemucapabilitiesdata/caps_2.12.0.ppc64.xml  |  2 +-
 .../qemucapabilitiesdata/caps_2.12.0.s390x.xml  |  2 +-
 .../qemucapabilitiesdata/caps_2.12.0.x86_64.xml |  2 +-
 .../qemucapabilitiesdata/caps_2.4.0.x86_64.xml  |  2 +-
 .../qemucapabilitiesdata/caps_2.5.0.x86_64.xml  |  2 +-
 .../qemucapabilitiesdata/caps_2.6.0.aarch64.xml |  2 +-
 tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml |  2 +-
 .../qemucapabilitiesdata/caps_2.6.0.x86_64.xml  |  2 +-
 tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml |  2 +-
 .../qemucapabilitiesdata/caps_2.7.0.x86_64.xml  |  2 +-
 tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml |  2 +-
 .../qemucapabilitiesdata/caps_2.8.0.x86_64.xml  |  2 +-
 tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml |  2 +-
 tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml |  2 +-
 .../qemucapabilitiesdata/caps_2.9.0.x86_64.xml  |  2 +-
 tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml |  2 +-
 tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml |  2 +-
 .../qemucapabilitiesdata/caps_3.0.0.x86_64.xml  |  2 +-
 tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml |  2 +-
 .../qemucapabilitiesdata/caps_3.1.0.x86_64.xml  |  2 +-
 .../qemucapabilitiesdata/caps_4.0.0.x86_64.xml  |  2 +-
 tests/qemucapabilitiestest.c                    | 17 +++++++++++++----
 33 files changed, 45 insertions(+), 36 deletions(-)

diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
index fc0bc6e10c..3c9a474b5b 100644
--- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
@@ -98,7 +98,7 @@
   <flag name='mch'/>
   <version>1005003</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>48498</microcodeVersion>
+  <microcodeVersion>43100763</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 c939cec5e8..528af43a6d 100644
--- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
@@ -103,7 +103,7 @@
   <flag name='mch'/>
   <version>1006000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>46667</microcodeVersion>
+  <microcodeVersion>43100761</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 509d6ca098..ddc06959ca 100644
--- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
@@ -105,7 +105,7 @@
   <flag name='mch'/>
   <version>1007000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>52111</microcodeVersion>
+  <microcodeVersion>43100762</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 426c4654fb..7c65353ba5 100644
--- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
@@ -121,7 +121,7 @@
   <flag name='mch'/>
   <version>2001001</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>60857</microcodeVersion>
+  <microcodeVersion>43100758</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 7061ba8f7e..9f6676a2b8 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
@@ -154,7 +154,7 @@
   <flag name='iothread.poll-max-ns'/>
   <version>2010000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>305067</microcodeVersion>
+  <microcodeVersion>61700805</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 2a48b63efe..d4cc446d0b 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
@@ -153,7 +153,7 @@
   <flag name='iothread.poll-max-ns'/>
   <version>2010000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>384412</microcodeVersion>
+  <microcodeVersion>42900805</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 180a688ba2..9c88b919a4 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
@@ -117,7 +117,7 @@
   <flag name='iothread.poll-max-ns'/>
   <version>2010000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>306247</microcodeVersion>
+  <microcodeVersion>39100805</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 8ced5f301d..2941743f94 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
@@ -195,7 +195,7 @@
   <flag name='iothread.poll-max-ns'/>
   <version>2010000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>364616</microcodeVersion>
+  <microcodeVersion>43100805</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 7dc643d9a3..60d902f1ac 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@@ -124,7 +124,7 @@
   <flag name='iothread.poll-max-ns'/>
   <version>2011000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>345099</microcodeVersion>
+  <microcodeVersion>39100806</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 0a9eeecb76..e1584f99d4 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
@@ -201,7 +201,7 @@
   <flag name='iothread.poll-max-ns'/>
   <version>2011000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>369105</microcodeVersion>
+  <microcodeVersion>43100806</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 186a6ccfeb..f58979716d 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@@ -168,7 +168,7 @@
   <flag name='memory-backend-file.align'/>
   <version>2011090</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>345725</microcodeVersion>
+  <microcodeVersion>61700807</microcodeVersion>
   <package>v2.12.0-rc0</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 c47ebd77ad..e58df048c4 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@@ -166,7 +166,7 @@
   <flag name='memory-backend-file.align'/>
   <version>2011090</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>426509</microcodeVersion>
+  <microcodeVersion>42900807</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 49249f5adf..60385cc505 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@@ -135,7 +135,7 @@
   <flag name='memory-backend-file.align'/>
   <version>2012000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>375102</microcodeVersion>
+  <microcodeVersion>39100807</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 b35206efea..3d12aba2e8 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@@ -209,7 +209,7 @@
   <flag name='memory-backend-file.align'/>
   <version>2011090</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>414601</microcodeVersion>
+  <microcodeVersion>43100807</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 10133a1e7e..c95f34559b 100644
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
@@ -147,7 +147,7 @@
   <flag name='mch'/>
   <version>2004000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>77219</microcodeVersion>
+  <microcodeVersion>43100760</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 9be7d8924b..240abd299c 100644
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
@@ -153,7 +153,7 @@
   <flag name='mch'/>
   <version>2005000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>218187</microcodeVersion>
+  <microcodeVersion>43100761</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 381d050115..801a2e62ad 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
@@ -137,7 +137,7 @@
   <flag name='hda-output'/>
   <version>2006000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>229858</microcodeVersion>
+  <microcodeVersion>61700762</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 f81c73dd03..949f9305c3 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
@@ -132,7 +132,7 @@
   <flag name='hda-output'/>
   <version>2006000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>264684</microcodeVersion>
+  <microcodeVersion>42900762</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 b711da555f..f5bca878be 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
@@ -165,7 +165,7 @@
   <flag name='mch'/>
   <version>2006000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>229221</microcodeVersion>
+  <microcodeVersion>43100762</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 de87692857..a667aa7673 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
@@ -103,7 +103,7 @@
   <flag name='zpci'/>
   <version>2007000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>219140</microcodeVersion>
+  <microcodeVersion>39100763</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 443de40de7..5d8ba4ee68 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
@@ -170,7 +170,7 @@
   <flag name='mch'/>
   <version>2007000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>240727</microcodeVersion>
+  <microcodeVersion>43100763</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 f3a32ad376..00c3ff5133 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
@@ -106,7 +106,7 @@
   <flag name='zpci'/>
   <version>2007093</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>244554</microcodeVersion>
+  <microcodeVersion>39100764</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 174678ffec..5a6e26cba1 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
@@ -173,7 +173,7 @@
   <flag name='mch'/>
   <version>2008000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>257382</microcodeVersion>
+  <microcodeVersion>43100764</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 d9ca8f3d2b..87f24e2e41 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
@@ -145,7 +145,7 @@
   <flag name='iothread.poll-max-ns'/>
   <version>2009000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>349056</microcodeVersion>
+  <microcodeVersion>42900765</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 4bb61f09f0..e197848e4e 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
@@ -111,7 +111,7 @@
   <flag name='iothread.poll-max-ns'/>
   <version>2009000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>267973</microcodeVersion>
+  <microcodeVersion>39100765</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 7f9e88fbee..871018364f 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
@@ -189,7 +189,7 @@
   <flag name='iothread.poll-max-ns'/>
   <version>2009000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>340605</microcodeVersion>
+  <microcodeVersion>43100765</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 24a3c2b716..971c0665be 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
@@ -166,7 +166,7 @@
   <flag name='memory-backend-file.align'/>
   <version>2012050</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>444946</microcodeVersion>
+  <microcodeVersion>42900757</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 8569de6538..bf889145a0 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
@@ -137,7 +137,7 @@
   <flag name='memory-backend-file.align'/>
   <version>3000000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>388416</microcodeVersion>
+  <microcodeVersion>39100757</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 77d1f2770d..b787bd9acd 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
@@ -212,7 +212,7 @@
   <flag name='nvdimm.unarmed'/>
   <version>3000000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>426554</microcodeVersion>
+  <microcodeVersion>43100757</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 175233aa09..d55eb5d981 100644
--- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
@@ -170,7 +170,7 @@
   <flag name='memory-backend-file.pmem'/>
   <version>3000091</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>437731</microcodeVersion>
+  <microcodeVersion>42900758</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 58395cff2f..db72e873c5 100644
--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
@@ -214,7 +214,7 @@
   <flag name='nvdimm.unarmed'/>
   <version>3000092</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>440976</microcodeVersion>
+  <microcodeVersion>43100758</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.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
index c2db392e83..b8da376b2c 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
@@ -214,7 +214,7 @@
   <flag name='nvdimm.unarmed'/>
   <version>3001050</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>446361</microcodeVersion>
+  <microcodeVersion>43100758</microcodeVersion>
   <package>v3.1.0-759-g15bede5541</package>
   <arch>x86_64</arch>
   <hostCPU type='kvm' model='base' migratability='yes'>
diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c
index 00137bb415..867df291f7 100644
--- a/tests/qemucapabilitiestest.c
+++ b/tests/qemucapabilitiestest.c
@@ -48,6 +48,8 @@ testQemuCaps(const void *opaque)
     qemuMonitorTestPtr mon = NULL;
     virQEMUCapsPtr capsActual = NULL;
     char *actual = NULL;
+    unsigned int fakeMicrocodeVersion = 0;
+    const char *p;

     if (virAsprintf(&repliesFile, "%s/qemucapabilitiesdata/%s.%s.replies",
                     abs_srcdir, data->base, data->archName) < 0 ||
@@ -69,10 +71,17 @@ testQemuCaps(const void *opaque)
                                          qemuMonitorTestGetMonitor(mon)) < 0)
             goto cleanup;

-        /* Fill microcodeVersion with a "random" value which is the file
-         * length to provide a reproducible number for testing.
-         */
-        virQEMUCapsSetMicrocodeVersion(capsActual, virFileLength(repliesFile, -1));
+        /* calculate fake microcode version based on filename for a reproducible
+         * number for testing which does not change with the contents */
+        for (p = data->archName; *p; p++)
+            fakeMicrocodeVersion += *p;
+
+        fakeMicrocodeVersion *= 100000;
+
+        for (p = data->base; *p; p++)
+            fakeMicrocodeVersion += *p;
+
+        virQEMUCapsSetMicrocodeVersion(capsActual, fakeMicrocodeVersion);
     }

     if (!(actual = virQEMUCapsFormatCache(capsActual)))
-- 
2.20.1


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]