cpu_map: Add Opteron_G2-v1 CPU model

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
index 4cf884e778cd9070f08b43d008346888bdaf665e..0070796dee5278dac8e9eb0e0d4df4e3bb75aa4f 100644 (file)
--- a/src/cpu_map/index.xml
+++ b/src/cpu_map/index.xml
@@ -139,6 +139,7 @@
       <include filename='x86_Opteron_G1.xml'/>
       <include filename='x86_Opteron_G1-v1.xml'/>
       <include filename='x86_Opteron_G2.xml'/>
+      <include filename='x86_Opteron_G2-v1.xml'/>
       <include filename='x86_Opteron_G3.xml'/>
       <include filename='x86_Opteron_G4.xml'/>
       <include filename='x86_Opteron_G5.xml'/>

diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
index 8385c89552e6c83bc7db627818efc26968dcad17..fb6494a14a73b924ec615e6f305128833d4a8f3d 100644 (file)
--- a/src/cpu_map/meson.build
+++ b/src/cpu_map/meson.build
@@ -114,6 +114,7 @@ cpumap_data = [
   'x86_Nehalem.xml',
   'x86_Opteron_G1-v1.xml',
   'x86_Opteron_G1.xml',
+  'x86_Opteron_G2-v1.xml',
   'x86_Opteron_G2.xml',
   'x86_Opteron_G3.xml',
   'x86_Opteron_G4.xml',

diff --git a/src/cpu_map/x86_Opteron_G2-v1.xml b/src/cpu_map/x86_Opteron_G2-v1.xml
new file mode 100644 (file)
index 0000000..8f0a05f
--- /dev/null
+++ b/src/cpu_map/x86_Opteron_G2-v1.xml
@@ -0,0 +1,6 @@
+<cpus>
+  <model name='Opteron_G2-v1'>
+    <decode host='on' guest='off'/>
+    <model name='Opteron_G2'/>
+  </model>
+</cpus>

diff --git a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
index d12aa0d569356b94d9a54256f5290a60a71414b8..8f0b9b3bff839e24a238f42b453c009edfe66247 100644 (file)
--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
@@ -574,7 +574,8 @@
       </blockers>
       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>

diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
index 2aabe77417561040b185c9fe56571029c83ef02e..b4f2c700f9fe98c1c793b4571919028905fcc141 100644 (file)
--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
@@ -1069,7 +1069,8 @@
       </blockers>
       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='no' vendor='AMD'>Opteron_G3</model>
       <blockers model='Opteron_G3'>
         <feature name='misalignsse'/>

diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
index 743262e1a06dab52f713cce7e5d98b6ae79b1322..bd3095fec9bf21d2e9a992d53138e7b20fbb3a78 100644 (file)
--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
@@ -573,7 +573,8 @@
       </blockers>
       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>

diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
index b15ba4ebb69124f4faf4c9d760ca36b232ac159a..b426bd1e63c3de58ae0f5c6b414aad9df4f554b1 100644 (file)
--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
@@ -596,7 +596,8 @@
       </blockers>
       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>

diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
index 38b2861714b1addb463742a9df7f6116bfff4b0d..d89a9b2c325a0397b2163bea3cf099556ba62858 100644 (file)
--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
@@ -1159,7 +1159,8 @@
       </blockers>
       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='no' vendor='AMD'>Opteron_G3</model>
       <blockers model='Opteron_G3'>
         <feature name='misalignsse'/>

diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
index 01a0eb2f47056311236b2326dd6c8b144499e9dd..a8773fb4f732ea692745f796e70116dc2162fc0f 100644 (file)
--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
@@ -595,7 +595,8 @@
       </blockers>
       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>

diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
index ac184c50757454e80cb21da3dd2a95dbbd65f480..de1f78b335b6e02e3469d3252d139b1436e3cfd5 100644 (file)
--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
@@ -666,7 +666,8 @@
       </blockers>
       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>

diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
index 02b362c722ed46bbcdcb6ef0add7626b58bc8c9b..581afc86a09d31856b32dda5b8719347f082d848 100644 (file)
--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
@@ -1299,7 +1299,8 @@
       </blockers>
       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='no' vendor='AMD'>Opteron_G3</model>
       <blockers model='Opteron_G3'>
         <feature name='misalignsse'/>

diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
index 00b61e43803ecec5b5b2f094d4c6dd01e9bc344a..53d83980a634e1de83c7d5f8f65afeeee034ad37 100644 (file)
--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
@@ -665,7 +665,8 @@
       </blockers>
       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>

diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
index dc82ce2aa9b424aa0f05767b4df7d27906f0e71f..77eab8aa95a6a79c74c01b7fd58dfc0fcf2da826 100644 (file)
--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
@@ -663,7 +663,8 @@
       </blockers>
       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>

diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
index 1a016f73793b83a9700b0008cad9ef38fc9998eb..710866e495816314f3e7ced041d9ca91d800d63a 100644 (file)
--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
@@ -1296,7 +1296,8 @@
       </blockers>
       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='no' vendor='AMD'>Opteron_G3</model>
       <blockers model='Opteron_G3'>
         <feature name='misalignsse'/>

diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
index b5389e8a3f5e3fed2b6c718fe1251c7c0870cb0e..99fe26dc766c9df124a38a17e429c3b5dc7d42f1 100644 (file)
--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
@@ -662,7 +662,8 @@
       </blockers>
       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>

diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
index ccb8bb7f7be2e2f3ceac6e1498d1fb8fa20ee724..eab56f9a7c8f7dca78f7fac72f355e66d9d826a6 100644 (file)
--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
@@ -690,7 +690,8 @@
       </blockers>
       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>

diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
index e0e53e543d0d6bace4d864c2cb3b4e97d50267d3..e5b4cff7c62bf3c05b8f4cfab672a3284ae73adb 100644 (file)
--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
@@ -1325,7 +1325,8 @@
       </blockers>
       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='no' vendor='AMD'>Opteron_G3</model>
       <blockers model='Opteron_G3'>
         <feature name='misalignsse'/>

diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
index 980c296c18651c17db221c608ee14389b3438d05..6ec56068bd6836d688e50900cfffd900b5f391e8 100644 (file)
--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
@@ -689,7 +689,8 @@
       </blockers>
       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>

diff --git a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
index 10d31b60079dc18b105ed56e6ed24b3096ba6bfd..0e27b3400c157fe6511e08673d3b159dffd7c3bc 100644 (file)
--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
@@ -657,7 +657,8 @@
       </blockers>
       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>

diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
index e916f523ac9b243ea43ee02df253d055aeacec6d..e588593d914b3521e854a3e105298d8f636e57c0 100644 (file)
--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
@@ -1273,7 +1273,8 @@
       </blockers>
       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='no' vendor='AMD'>Opteron_G3</model>
       <blockers model='Opteron_G3'>
         <feature name='misalignsse'/>

diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
index 434fa7bd9546a09b48ca23a594ea4f8f999a5d62..7cb9663805e1cf7837c1bee4f4ba9bf355cd3e5a 100644 (file)
--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
@@ -656,7 +656,8 @@
       </blockers>
       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>

diff --git a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
index 80497c5125a3b6e484e3d4837f6c53c2fb455f4b..c66731ceac53af76c5b00674b7449325a60af5c8 100644 (file)
--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
@@ -662,7 +662,8 @@
       </blockers>
       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>

diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml
index e67ae9b280d162e8707f61bf61ecd2810900d1e4..ec61c328c96a81cdc735b893a620633db1ac8a47 100644 (file)
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml
@@ -1050,7 +1050,8 @@
       </blockers>
       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='no' vendor='AMD'>Opteron_G3</model>
       <blockers model='Opteron_G3'>
         <feature name='misalignsse'/>

diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
index e67ae9b280d162e8707f61bf61ecd2810900d1e4..ec61c328c96a81cdc735b893a620633db1ac8a47 100644 (file)
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
@@ -1050,7 +1050,8 @@
       </blockers>
       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='no' vendor='AMD'>Opteron_G3</model>
       <blockers model='Opteron_G3'>
         <feature name='misalignsse'/>

diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
index e0a1209ceac965873c49177bccdd2ec31c4cb744..8fd837d2c409d1dba022a11157791e28684c9c93 100644 (file)
--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
@@ -661,7 +661,8 @@
       </blockers>
       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>

diff --git a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
index 03c40996e13241d5bd654077990679f3610bf231..2a78fe6926af54577cf4c3db3d5e9b1a463f3961 100644 (file)
--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
@@ -662,7 +662,8 @@
       </blockers>
       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>

diff --git a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
index 3d52b5fda07834863582450c162a3e2975716520..cb7bb1513ce0e7b90622628aac43906e3b94a66c 100644 (file)
--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
@@ -1049,7 +1049,8 @@
       </blockers>
       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='no' vendor='AMD'>Opteron_G3</model>
       <blockers model='Opteron_G3'>
         <feature name='misalignsse'/>

diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
index 8c84a54239056a1673ddf2ee6b9f771c389638d3..7c66d893aebe2ef0141862cf810dbd7640fbdca2 100644 (file)
--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
@@ -661,7 +661,8 @@
       </blockers>
       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>

diff --git a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
index dcce5a827f8c96002de0e5036be47e0461390858..1d23c2519648edea30901635c77c155e4cb0abc7 100644 (file)
--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
@@ -840,7 +840,8 @@
       </blockers>
       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>

diff --git a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
index d086460c7db1f336003311997c9a556dfd36b697..768769a4ef29e9b66b34172e6fc98b4f6c8148d3 100644 (file)
--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
@@ -1057,7 +1057,8 @@
       </blockers>
       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='no' vendor='AMD'>Opteron_G3</model>
       <blockers model='Opteron_G3'>
         <feature name='misalignsse'/>

diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
index 19ff721d0956d2492a31081114eaa94f2084c259..95106cfeabf9e806729a8082dad68245e9fa49ac 100644 (file)
--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
@@ -839,7 +839,8 @@
       </blockers>
       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>

diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
index c09f4c56bfbdff4efcbc42ec3e4a55f4058970e0..5b777b730be5926f4e4e86122bfbdeff21a9d4de 100644 (file)
--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
@@ -841,7 +841,8 @@
       </blockers>
       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>

diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
index 13c2cc543998d76fe5706ac8c20dc69db7886d93..0ea4c2cdb85e476a045596d4a7db7f7d5dd19a82 100644 (file)
--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
@@ -1032,7 +1032,8 @@
       </blockers>
       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='no' vendor='AMD'>Opteron_G3</model>
       <blockers model='Opteron_G3'>
         <feature name='misalignsse'/>

diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
index bd6c173c04964d14de297ef2aac9c0c596f35347..506b9492252ea05ae980c473af78180191ce1b54 100644 (file)
--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
@@ -840,7 +840,8 @@
       </blockers>
       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>

diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
index f644b1ac5cf02ff91d500816fc386c828b1e1676..d84324eac6879c3412d2f9627ae0f55db716efe8 100644 (file)
--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
@@ -841,7 +841,8 @@
       </blockers>
       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>

diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
index 2107e5b7beba65ce054c46272dc82a7df6f33597..cccf48aafb343e43f8265953d79951795e14d3da 100644 (file)
--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
@@ -988,7 +988,8 @@
       </blockers>
       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='no' vendor='AMD'>Opteron_G3</model>
       <blockers model='Opteron_G3'>
         <feature name='misalignsse'/>

diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
index 5cf479694e61ff0609d4e31595b13f0c2188fd82..05c06c9b25355bb4d95ca648bf991fe40188b232 100644 (file)
--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
@@ -840,7 +840,8 @@
       </blockers>
       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>

diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
index 5c52c08ee74a1344c37956826b12fcc155acf633..e295c808d787cd6c63aceb68e5ba8aa89ced2254 100644 (file)
--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
@@ -874,7 +874,8 @@
       </blockers>
       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>

diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
index 1d41d3ef8cffaf43f0195a52298a9a8d7321e17a..8b338c75befb8e11ef40a2df9b4225f977563868 100644 (file)
--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
@@ -1013,7 +1013,8 @@
       </blockers>
       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='no' vendor='AMD'>Opteron_G3</model>
       <blockers model='Opteron_G3'>
         <feature name='misalignsse'/>

diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
index dfb6f741c4738701d628ca0f3ca3d0d387e18bc4..6b2c1f15b5b76f7c7e4f52d004252f0b7c8b64dc 100644 (file)
--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
@@ -873,7 +873,8 @@
       </blockers>
       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>

diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
index c711064a04aca1c873867c499596fe624d1adbb3..ab82a874b174b1d0f6f96566ee1d1bed5b3b3624 100644 (file)
--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
@@ -874,7 +874,8 @@
       </blockers>
       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>

diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
index caf86d2c2b2702ed2543a5611b1da3a36fe3008b..bf20e3d536228863b710b205793f98e15f407995 100644 (file)
--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
@@ -1013,7 +1013,8 @@
       </blockers>
       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='no' vendor='AMD'>Opteron_G3</model>
       <blockers model='Opteron_G3'>
         <feature name='misalignsse'/>

diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
index 16a34ed04281b5b3004cd9ff48e1e8d33bb79c6b..d28d4c1f1430ba501a051b4baa041a274412fcd5 100644 (file)
--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
@@ -873,7 +873,8 @@
       </blockers>
       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>