cpu_map: Add Opteron_G1-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 74b315c661a30371454aca5e5a151d23aba1a7f2..4cf884e778cd9070f08b43d008346888bdaf665e 100644 (file)
--- a/src/cpu_map/index.xml
+++ b/src/cpu_map/index.xml
@@ -137,6 +137,7 @@
       <include filename='x86_phenom.xml'/>
       <include filename='x86_phenom-v1.xml'/>
       <include filename='x86_Opteron_G1.xml'/>
+      <include filename='x86_Opteron_G1-v1.xml'/>
       <include filename='x86_Opteron_G2.xml'/>
       <include filename='x86_Opteron_G3.xml'/>
       <include filename='x86_Opteron_G4.xml'/>

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

diff --git a/src/cpu_map/x86_Opteron_G1-v1.xml b/src/cpu_map/x86_Opteron_G1-v1.xml
new file mode 100644 (file)
index 0000000..b040da4
--- /dev/null
+++ b/src/cpu_map/x86_Opteron_G1-v1.xml
@@ -0,0 +1,6 @@
+<cpus>
+  <model name='Opteron_G1-v1'>
+    <decode host='on' guest='off'/>
+    <model name='Opteron_G1'/>
+  </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 27d36feccfc91b23d32ec0e1218fc9fc623637f9..d12aa0d569356b94d9a54256f5290a60a71414b8 100644 (file)
--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
@@ -572,7 +572,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <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'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>

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 b06febb82139203af4f0b43954dd508e619d3520..2aabe77417561040b185c9fe56571029c83ef02e 100644 (file)
--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
@@ -1067,7 +1067,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <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='no' vendor='AMD'>Opteron_G3</model>
       <blockers model='Opteron_G3'>

diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
index 21b4ab8c5ce70e5b4a0fd682fe895191d648109e..743262e1a06dab52f713cce7e5d98b6ae79b1322 100644 (file)
--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
@@ -571,7 +571,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <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'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>

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 83bb914c7dd0b0af25bd1d570692a3330bff667a..b15ba4ebb69124f4faf4c9d760ca36b232ac159a 100644 (file)
--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
@@ -594,7 +594,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <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'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>

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 47ab7240fbe68ab0834387d14c05fc32cd241a6e..38b2861714b1addb463742a9df7f6116bfff4b0d 100644 (file)
--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
@@ -1157,7 +1157,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <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='no' vendor='AMD'>Opteron_G3</model>
       <blockers model='Opteron_G3'>

diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
index cc212722f5d5779d35134ba52d798a31d51e15c7..01a0eb2f47056311236b2326dd6c8b144499e9dd 100644 (file)
--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
@@ -593,7 +593,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <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'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>

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 ec7abc3903fe49f9548e43adf2092505b5b66aeb..ac184c50757454e80cb21da3dd2a95dbbd65f480 100644 (file)
--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
@@ -664,7 +664,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <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'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>

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 87fe22edd79eb7b30987bb722361af1af2edfd01..02b362c722ed46bbcdcb6ef0add7626b58bc8c9b 100644 (file)
--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
@@ -1297,7 +1297,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <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='no' vendor='AMD'>Opteron_G3</model>
       <blockers model='Opteron_G3'>

diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
index 35bba8403332eb47148da61fe1ceb321dd682577..00b61e43803ecec5b5b2f094d4c6dd01e9bc344a 100644 (file)
--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
@@ -663,7 +663,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <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'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>

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 b448d7bdb81b20f5c79d5f465c83d6c5101a8bbe..dc82ce2aa9b424aa0f05767b4df7d27906f0e71f 100644 (file)
--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
@@ -661,7 +661,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <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'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>

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 a8a96f2bb4ef61066a111b7ba1ed6610a4b9d9cf..1a016f73793b83a9700b0008cad9ef38fc9998eb 100644 (file)
--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
@@ -1294,7 +1294,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <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='no' vendor='AMD'>Opteron_G3</model>
       <blockers model='Opteron_G3'>

diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
index 303b714aa7a326d80e9ca88d7c5a12bb79aaf09b..b5389e8a3f5e3fed2b6c718fe1251c7c0870cb0e 100644 (file)
--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
@@ -660,7 +660,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <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'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>

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 9da8e156e2508528fc7a21362e9f62750e5c62df..ccb8bb7f7be2e2f3ceac6e1498d1fb8fa20ee724 100644 (file)
--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
@@ -688,7 +688,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <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'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>

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 a5b9edaeb63984496e38a63ac85202baddaaa59e..e0e53e543d0d6bace4d864c2cb3b4e97d50267d3 100644 (file)
--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
@@ -1323,7 +1323,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <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='no' vendor='AMD'>Opteron_G3</model>
       <blockers model='Opteron_G3'>

diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
index 3029403bac04891813733da14fe2a073b04ff6df..980c296c18651c17db221c608ee14389b3438d05 100644 (file)
--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
@@ -687,7 +687,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <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'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>

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 259613d7fed735f8f70e70190be6b41cf018e0b5..10d31b60079dc18b105ed56e6ed24b3096ba6bfd 100644 (file)
--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
@@ -655,7 +655,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <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'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>

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 d3ecad143cd1553d95fd04b89f7c97a2cf53ee0c..e916f523ac9b243ea43ee02df253d055aeacec6d 100644 (file)
--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
@@ -1271,7 +1271,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <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='no' vendor='AMD'>Opteron_G3</model>
       <blockers model='Opteron_G3'>

diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
index 7f08dd995d4f9804bd91d114a8fcb9b04a44bca7..434fa7bd9546a09b48ca23a594ea4f8f999a5d62 100644 (file)
--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
@@ -654,7 +654,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <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'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>

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 1057fc58d384c4538f09f73e1a48592aad0d8123..80497c5125a3b6e484e3d4837f6c53c2fb455f4b 100644 (file)
--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
@@ -660,7 +660,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <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'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>

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 fa4e9cfb8cb47ae13e322d729a5afcdc63bb39b8..e67ae9b280d162e8707f61bf61ecd2810900d1e4 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
@@ -1048,7 +1048,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <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='no' vendor='AMD'>Opteron_G3</model>
       <blockers model='Opteron_G3'>

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 fa4e9cfb8cb47ae13e322d729a5afcdc63bb39b8..e67ae9b280d162e8707f61bf61ecd2810900d1e4 100644 (file)
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
@@ -1048,7 +1048,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <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='no' vendor='AMD'>Opteron_G3</model>
       <blockers model='Opteron_G3'>

diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
index 0c0f363d2bb3b299d37caad96bb29659b4450a3a..e0a1209ceac965873c49177bccdd2ec31c4cb744 100644 (file)
--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
@@ -659,7 +659,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <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'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>

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 b1de96faddfeb224e55fea75f920785ef0b7a0a6..03c40996e13241d5bd654077990679f3610bf231 100644 (file)
--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
@@ -660,7 +660,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <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'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>

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 c83819435d111db73dfa2048efbd60229d1db6ab..3d52b5fda07834863582450c162a3e2975716520 100644 (file)
--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
@@ -1047,7 +1047,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <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='no' vendor='AMD'>Opteron_G3</model>
       <blockers model='Opteron_G3'>

diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
index 8f195f0e3942e3de36242f627a44fb60bad61723..8c84a54239056a1673ddf2ee6b9f771c389638d3 100644 (file)
--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
@@ -659,7 +659,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <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'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>

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 5495883fe955ef4830387f6b5c055a4e1f3af538..dcce5a827f8c96002de0e5036be47e0461390858 100644 (file)
--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
@@ -838,7 +838,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <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'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>

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 87fc57da661c2695211e45a0af41f6f9a6a15efd..d086460c7db1f336003311997c9a556dfd36b697 100644 (file)
--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
@@ -1055,7 +1055,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <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='no' vendor='AMD'>Opteron_G3</model>
       <blockers model='Opteron_G3'>

diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
index 43703fefab2c66889ab00962219a0adf3e4adfe2..19ff721d0956d2492a31081114eaa94f2084c259 100644 (file)
--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
@@ -837,7 +837,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <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'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>

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 2eab4e49b13e4515b310a1e8577b07ea74d8704c..c09f4c56bfbdff4efcbc42ec3e4a55f4058970e0 100644 (file)
--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
@@ -839,7 +839,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <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'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>

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 08b45ba90b2255d5ef1acd1962587dfb8339dd31..13c2cc543998d76fe5706ac8c20dc69db7886d93 100644 (file)
--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
@@ -1030,7 +1030,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <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='no' vendor='AMD'>Opteron_G3</model>
       <blockers model='Opteron_G3'>

diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
index 28b233d35d7a6d152351369c5dfc9c219318ba5d..bd6c173c04964d14de297ef2aac9c0c596f35347 100644 (file)
--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
@@ -838,7 +838,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <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'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>

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 16a3cdacb5180f917919c6cd02326db468ccb687..f644b1ac5cf02ff91d500816fc386c828b1e1676 100644 (file)
--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
@@ -839,7 +839,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <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'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>

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 549e21c27327cc72c9087441b9bca880850ebc16..2107e5b7beba65ce054c46272dc82a7df6f33597 100644 (file)
--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
@@ -986,7 +986,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <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='no' vendor='AMD'>Opteron_G3</model>
       <blockers model='Opteron_G3'>

diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
index 16e0d61c5116e7a41a2ba9f78826e030d834e06a..5cf479694e61ff0609d4e31595b13f0c2188fd82 100644 (file)
--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
@@ -838,7 +838,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <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'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>

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 2b33304882f0febbac79f48d6ca23cc4d20f5c3b..5c52c08ee74a1344c37956826b12fcc155acf633 100644 (file)
--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
@@ -872,7 +872,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <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'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>

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 f91fcdd4e5e519ddc0ee880b8f5e98348f922412..1d41d3ef8cffaf43f0195a52298a9a8d7321e17a 100644 (file)
--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
@@ -1011,7 +1011,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <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='no' vendor='AMD'>Opteron_G3</model>
       <blockers model='Opteron_G3'>

diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
index 82fe2b3b1a25a1b8c40ad25ac3a388b76ce27588..dfb6f741c4738701d628ca0f3ca3d0d387e18bc4 100644 (file)
--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
@@ -871,7 +871,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <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'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>

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 0c896766cb00b809a790d3f48ec4a99e2cce1bea..c711064a04aca1c873867c499596fe624d1adbb3 100644 (file)
--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
@@ -872,7 +872,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <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'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>

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 94c691476735c2ecc6b12d3417ff860ee5691cbc..caf86d2c2b2702ed2543a5611b1da3a36fe3008b 100644 (file)
--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
@@ -1011,7 +1011,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <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='no' vendor='AMD'>Opteron_G3</model>
       <blockers model='Opteron_G3'>

diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
index 1f73e3903ce3ba9cf667f5bba533d797b5ca0bb8..16a34ed04281b5b3004cd9ff48e1e8d33bb79c6b 100644 (file)
--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
@@ -871,7 +871,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <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'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>