[libvirt PATCH 18/19] cpu: advertise CPU aliases

Jonathon Jongsma <jjongsma@xxxxxxxxxx> · Mon, 6 Nov 2023 16:21:23 -0600

When generating the list of CPU models, include both the official name
and the alias in the list.
---
 src/cpu/cpu_x86.c                             | 20 ++++++++---
 .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml  | 30 ++++++++++++++++
 .../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml  | 30 ++++++++++++++++
 tests/domaincapsdata/qemu_4.2.0.x86_64.xml    | 30 ++++++++++++++++
 .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml  | 32 +++++++++++++++++
 .../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml  | 32 +++++++++++++++++
 tests/domaincapsdata/qemu_5.0.0.x86_64.xml    | 32 +++++++++++++++++
 .../domaincapsdata/qemu_5.1.0-q35.x86_64.xml  | 32 +++++++++++++++++
 .../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml  | 32 +++++++++++++++++
 tests/domaincapsdata/qemu_5.1.0.x86_64.xml    | 32 +++++++++++++++++
 .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml  | 32 +++++++++++++++++
 .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml  | 32 +++++++++++++++++
 tests/domaincapsdata/qemu_5.2.0.x86_64.xml    | 32 +++++++++++++++++
 .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml  | 33 ++++++++++++++++++
 .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml  | 33 ++++++++++++++++++
 tests/domaincapsdata/qemu_6.0.0.x86_64.xml    | 33 ++++++++++++++++++
 .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml  | 33 ++++++++++++++++++
 .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml  | 33 ++++++++++++++++++
 tests/domaincapsdata/qemu_6.1.0.x86_64.xml    | 33 ++++++++++++++++++
 .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml  | 33 ++++++++++++++++++
 .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml  | 33 ++++++++++++++++++
 tests/domaincapsdata/qemu_6.2.0.x86_64.xml    | 33 ++++++++++++++++++
 .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml  | 33 ++++++++++++++++++
 .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml  | 33 ++++++++++++++++++
 tests/domaincapsdata/qemu_7.0.0.x86_64.xml    | 33 ++++++++++++++++++
 .../domaincapsdata/qemu_7.1.0-q35.x86_64.xml  | 33 ++++++++++++++++++
 .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml  | 33 ++++++++++++++++++
 tests/domaincapsdata/qemu_7.1.0.x86_64.xml    | 33 ++++++++++++++++++
 .../domaincapsdata/qemu_7.2.0-q35.x86_64.xml  | 33 ++++++++++++++++++
 .../qemu_7.2.0-tcg.x86_64+hvf.xml             | 33 ++++++++++++++++++
 .../domaincapsdata/qemu_7.2.0-tcg.x86_64.xml  | 33 ++++++++++++++++++
 tests/domaincapsdata/qemu_7.2.0.x86_64.xml    | 33 ++++++++++++++++++
 .../domaincapsdata/qemu_8.0.0-q35.x86_64.xml  | 34 +++++++++++++++++++
 .../domaincapsdata/qemu_8.0.0-tcg.x86_64.xml  | 34 +++++++++++++++++++
 tests/domaincapsdata/qemu_8.0.0.x86_64.xml    | 34 +++++++++++++++++++
 .../domaincapsdata/qemu_8.1.0-q35.x86_64.xml  | 34 +++++++++++++++++++
 .../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml  | 34 +++++++++++++++++++
 tests/domaincapsdata/qemu_8.1.0.x86_64.xml    | 34 +++++++++++++++++++
 .../domaincapsdata/qemu_8.2.0-q35.x86_64.xml  | 34 +++++++++++++++++++
 .../domaincapsdata/qemu_8.2.0-tcg.x86_64.xml  | 34 +++++++++++++++++++
 tests/domaincapsdata/qemu_8.2.0.x86_64.xml    | 34 +++++++++++++++++++
 41 files changed, 1327 insertions(+), 4 deletions(-)

diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
index 4d4f6a8be8..c22db91bf4 100644
--- a/src/cpu/cpu_x86.c
+++ b/src/cpu/cpu_x86.c
@@ -3147,18 +3147,30 @@ virCPUx86GetModels(char ***models)
 {
     virCPUx86Map *map;
     size_t i;
+    size_t n = 0;
 
     if (!(map = virCPUx86GetMap()))
         return -1;
 
+    n = map->nmodels;
+    for (i = 0; i < map->nmodels; i++) {
+        if (map->models[i]->alias)
+            n++;
+    }
+
     if (models) {
-        *models = g_new0(char *, map->nmodels + 1);
+        size_t j = 0;
+        *models = g_new0(char *, n + 1);
 
-        for (i = 0; i < map->nmodels; i++)
-            (*models)[i] = g_strdup(map->models[i]->name);
+        for (i = 0; i < map->nmodels; i++) {
+            (*models)[j++] = g_strdup(map->models[i]->name);
+
+            if (map->models[i]->alias)
+                (*models)[j++] = g_strdup(map->models[i]->alias);
+        }
     }
 
-    return map->nmodels;
+    return n;
 }
 
 
diff --git a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
index 85bb381258..010bf581af 100644
--- a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
@@ -73,16 +73,27 @@
       <model usable='yes' vendor='Intel'>coreduo</model>
       <model usable='yes' vendor='Intel'>core2duo</model>
       <model usable='no' vendor='AMD'>athlon</model>
+      <model usable='yes' vendor='Intel'>Westmere-v2</model>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
       <model usable='yes' vendor='Intel'>Westmere-IBRS</model>
       <model usable='yes' vendor='Intel'>Westmere</model>
       <model usable='no' vendor='Intel'>Snowridge-v2</model>
+      <model usable='no' vendor='Intel'>Snowridge-v1</model>
       <model usable='no' vendor='Intel'>Snowridge</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server</model>
+      <model usable='yes' vendor='Intel'>Skylake-Client-v3</model>
+      <model usable='yes' vendor='Intel'>Skylake-Client-v2</model>
+      <model usable='yes' vendor='Intel'>Skylake-Client-v1</model>
       <model usable='yes' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
       <model usable='yes' vendor='Intel'>Skylake-Client-IBRS</model>
       <model usable='yes' vendor='Intel'>Skylake-Client</model>
+      <model usable='yes' vendor='Intel'>SandyBridge-v2</model>
+      <model usable='yes' vendor='Intel'>SandyBridge-v1</model>
       <model usable='yes' vendor='Intel'>SandyBridge-IBRS</model>
       <model usable='yes' vendor='Intel'>SandyBridge</model>
       <model usable='yes' vendor='Intel'>Penryn</model>
@@ -91,25 +102,44 @@
       <model usable='no' vendor='AMD'>Opteron_G3</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='Intel'>Nehalem-v2</model>
+      <model usable='yes' vendor='Intel'>Nehalem-v1</model>
       <model usable='yes' vendor='Intel'>Nehalem-IBRS</model>
       <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='yes' vendor='Intel'>IvyBridge-v2</model>
+      <model usable='yes' vendor='Intel'>IvyBridge-v1</model>
       <model usable='yes' vendor='Intel'>IvyBridge-IBRS</model>
       <model usable='yes' vendor='Intel'>IvyBridge</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Icelake-Server</model>
       <model usable='no' vendor='Intel'>Icelake-Client-noTSX</model>
       <model usable='no' vendor='Intel'>Icelake-Client</model>
+      <model usable='yes' vendor='Intel'>Haswell-v4</model>
+      <model usable='yes' vendor='Intel'>Haswell-v3</model>
+      <model usable='yes' vendor='Intel'>Haswell-v2</model>
+      <model usable='yes' vendor='Intel'>Haswell-v1</model>
       <model usable='yes' vendor='Intel'>Haswell-noTSX-IBRS</model>
       <model usable='yes' vendor='Intel'>Haswell-noTSX</model>
       <model usable='yes' vendor='Intel'>Haswell-IBRS</model>
       <model usable='yes' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='AMD'>EPYC-v2</model>
+      <model usable='no' vendor='AMD'>EPYC-v1</model>
       <model usable='no' vendor='AMD'>EPYC-IBPB</model>
       <model usable='no' vendor='AMD'>EPYC</model>
+      <model usable='no' vendor='Hygon'>Dhyana-v1</model>
       <model usable='no' vendor='Hygon'>Dhyana</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='yes' vendor='Intel'>Broadwell-v4</model>
+      <model usable='yes' vendor='Intel'>Broadwell-v3</model>
+      <model usable='yes' vendor='Intel'>Broadwell-v2</model>
+      <model usable='yes' vendor='Intel'>Broadwell-v1</model>
       <model usable='yes' vendor='Intel'>Broadwell-noTSX-IBRS</model>
       <model usable='yes' vendor='Intel'>Broadwell-noTSX</model>
       <model usable='yes' vendor='Intel'>Broadwell-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
index 7b499f6950..6f347f9e0c 100644
--- a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
@@ -86,16 +86,27 @@
       <model usable='yes' vendor='Intel'>coreduo</model>
       <model usable='yes' vendor='Intel'>core2duo</model>
       <model usable='yes' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
       <model usable='no' vendor='Intel'>Westmere-IBRS</model>
       <model usable='no' vendor='Intel'>Westmere</model>
       <model usable='no' vendor='Intel'>Snowridge-v2</model>
+      <model usable='no' vendor='Intel'>Snowridge-v1</model>
       <model usable='no' vendor='Intel'>Snowridge</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v1</model>
       <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
       <model usable='no' vendor='Intel'>SandyBridge</model>
       <model usable='yes' vendor='Intel'>Penryn</model>
@@ -104,25 +115,44 @@
       <model usable='no' vendor='AMD'>Opteron_G3</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='no' vendor='Intel'>Nehalem-v2</model>
+      <model usable='yes' vendor='Intel'>Nehalem-v1</model>
       <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
       <model usable='no' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v1</model>
       <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
       <model usable='no' vendor='Intel'>IvyBridge</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Icelake-Server</model>
       <model usable='no' vendor='Intel'>Icelake-Client-noTSX</model>
       <model usable='no' vendor='Intel'>Icelake-Client</model>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX</model>
       <model usable='no' vendor='Intel'>Haswell-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='AMD'>EPYC-v2</model>
+      <model usable='no' vendor='AMD'>EPYC-v1</model>
       <model usable='no' vendor='AMD'>EPYC-IBPB</model>
       <model usable='no' vendor='AMD'>EPYC</model>
+      <model usable='no' vendor='Hygon'>Dhyana-v1</model>
       <model usable='no' vendor='Hygon'>Dhyana</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Broadwell-v4</model>
+      <model usable='no' vendor='Intel'>Broadwell-v3</model>
+      <model usable='no' vendor='Intel'>Broadwell-v2</model>
+      <model usable='no' vendor='Intel'>Broadwell-v1</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
       <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
index ce444975d8..e3b70598cd 100644
--- a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
@@ -72,16 +72,27 @@
       <model usable='yes' vendor='Intel'>coreduo</model>
       <model usable='yes' vendor='Intel'>core2duo</model>
       <model usable='no' vendor='AMD'>athlon</model>
+      <model usable='yes' vendor='Intel'>Westmere-v2</model>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
       <model usable='yes' vendor='Intel'>Westmere-IBRS</model>
       <model usable='yes' vendor='Intel'>Westmere</model>
       <model usable='no' vendor='Intel'>Snowridge-v2</model>
+      <model usable='no' vendor='Intel'>Snowridge-v1</model>
       <model usable='no' vendor='Intel'>Snowridge</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server</model>
+      <model usable='yes' vendor='Intel'>Skylake-Client-v3</model>
+      <model usable='yes' vendor='Intel'>Skylake-Client-v2</model>
+      <model usable='yes' vendor='Intel'>Skylake-Client-v1</model>
       <model usable='yes' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
       <model usable='yes' vendor='Intel'>Skylake-Client-IBRS</model>
       <model usable='yes' vendor='Intel'>Skylake-Client</model>
+      <model usable='yes' vendor='Intel'>SandyBridge-v2</model>
+      <model usable='yes' vendor='Intel'>SandyBridge-v1</model>
       <model usable='yes' vendor='Intel'>SandyBridge-IBRS</model>
       <model usable='yes' vendor='Intel'>SandyBridge</model>
       <model usable='yes' vendor='Intel'>Penryn</model>
@@ -90,25 +101,44 @@
       <model usable='no' vendor='AMD'>Opteron_G3</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='Intel'>Nehalem-v2</model>
+      <model usable='yes' vendor='Intel'>Nehalem-v1</model>
       <model usable='yes' vendor='Intel'>Nehalem-IBRS</model>
       <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='yes' vendor='Intel'>IvyBridge-v2</model>
+      <model usable='yes' vendor='Intel'>IvyBridge-v1</model>
       <model usable='yes' vendor='Intel'>IvyBridge-IBRS</model>
       <model usable='yes' vendor='Intel'>IvyBridge</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Icelake-Server</model>
       <model usable='no' vendor='Intel'>Icelake-Client-noTSX</model>
       <model usable='no' vendor='Intel'>Icelake-Client</model>
+      <model usable='yes' vendor='Intel'>Haswell-v4</model>
+      <model usable='yes' vendor='Intel'>Haswell-v3</model>
+      <model usable='yes' vendor='Intel'>Haswell-v2</model>
+      <model usable='yes' vendor='Intel'>Haswell-v1</model>
       <model usable='yes' vendor='Intel'>Haswell-noTSX-IBRS</model>
       <model usable='yes' vendor='Intel'>Haswell-noTSX</model>
       <model usable='yes' vendor='Intel'>Haswell-IBRS</model>
       <model usable='yes' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='AMD'>EPYC-v2</model>
+      <model usable='no' vendor='AMD'>EPYC-v1</model>
       <model usable='no' vendor='AMD'>EPYC-IBPB</model>
       <model usable='no' vendor='AMD'>EPYC</model>
+      <model usable='no' vendor='Hygon'>Dhyana-v1</model>
       <model usable='no' vendor='Hygon'>Dhyana</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='yes' vendor='Intel'>Broadwell-v4</model>
+      <model usable='yes' vendor='Intel'>Broadwell-v3</model>
+      <model usable='yes' vendor='Intel'>Broadwell-v2</model>
+      <model usable='yes' vendor='Intel'>Broadwell-v1</model>
       <model usable='yes' vendor='Intel'>Broadwell-noTSX-IBRS</model>
       <model usable='yes' vendor='Intel'>Broadwell-noTSX</model>
       <model usable='yes' vendor='Intel'>Broadwell-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
index 88c8b8fa15..578a9c80c6 100644
--- a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
@@ -73,16 +73,27 @@
       <model usable='yes' vendor='Intel'>coreduo</model>
       <model usable='yes' vendor='Intel'>core2duo</model>
       <model usable='no' vendor='AMD'>athlon</model>
+      <model usable='yes' vendor='Intel'>Westmere-v2</model>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
       <model usable='yes' vendor='Intel'>Westmere-IBRS</model>
       <model usable='yes' vendor='Intel'>Westmere</model>
       <model usable='no' vendor='Intel'>Snowridge-v2</model>
+      <model usable='no' vendor='Intel'>Snowridge-v1</model>
       <model usable='no' vendor='Intel'>Snowridge</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server</model>
+      <model usable='yes' vendor='Intel'>Skylake-Client-v3</model>
+      <model usable='yes' vendor='Intel'>Skylake-Client-v2</model>
+      <model usable='yes' vendor='Intel'>Skylake-Client-v1</model>
       <model usable='yes' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
       <model usable='yes' vendor='Intel'>Skylake-Client-IBRS</model>
       <model usable='yes' vendor='Intel'>Skylake-Client</model>
+      <model usable='yes' vendor='Intel'>SandyBridge-v2</model>
+      <model usable='yes' vendor='Intel'>SandyBridge-v1</model>
       <model usable='yes' vendor='Intel'>SandyBridge-IBRS</model>
       <model usable='yes' vendor='Intel'>SandyBridge</model>
       <model usable='yes' vendor='Intel'>Penryn</model>
@@ -91,29 +102,50 @@
       <model usable='no' vendor='AMD'>Opteron_G3</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='Intel'>Nehalem-v2</model>
+      <model usable='yes' vendor='Intel'>Nehalem-v1</model>
       <model usable='yes' vendor='Intel'>Nehalem-IBRS</model>
       <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='yes' vendor='Intel'>IvyBridge-v2</model>
+      <model usable='yes' vendor='Intel'>IvyBridge-v1</model>
       <model usable='yes' vendor='Intel'>IvyBridge-IBRS</model>
       <model usable='yes' vendor='Intel'>IvyBridge</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Icelake-Server</model>
       <model usable='no' vendor='Intel'>Icelake-Client-noTSX</model>
       <model usable='no' vendor='Intel'>Icelake-Client</model>
+      <model usable='yes' vendor='Intel'>Haswell-v4</model>
+      <model usable='yes' vendor='Intel'>Haswell-v3</model>
+      <model usable='yes' vendor='Intel'>Haswell-v2</model>
+      <model usable='yes' vendor='Intel'>Haswell-v1</model>
       <model usable='yes' vendor='Intel'>Haswell-noTSX-IBRS</model>
       <model usable='yes' vendor='Intel'>Haswell-noTSX</model>
       <model usable='yes' vendor='Intel'>Haswell-IBRS</model>
       <model usable='yes' vendor='Intel'>Haswell</model>
       <model usable='no' vendor='AMD'>EPYC-v3</model>
+      <model usable='no' vendor='AMD'>EPYC-v2</model>
+      <model usable='no' vendor='AMD'>EPYC-v1</model>
+      <model usable='no' vendor='AMD'>EPYC-Rome-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Rome</model>
       <model usable='no' vendor='AMD'>EPYC-IBPB</model>
       <model usable='no' vendor='AMD'>EPYC</model>
+      <model usable='no' vendor='Hygon'>Dhyana-v1</model>
       <model usable='no' vendor='Hygon'>Dhyana</model>
+      <model usable='no' vendor='Intel'>Cooperlake-v1</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='yes' vendor='Intel'>Broadwell-v4</model>
+      <model usable='yes' vendor='Intel'>Broadwell-v3</model>
+      <model usable='yes' vendor='Intel'>Broadwell-v2</model>
+      <model usable='yes' vendor='Intel'>Broadwell-v1</model>
       <model usable='yes' vendor='Intel'>Broadwell-noTSX-IBRS</model>
       <model usable='yes' vendor='Intel'>Broadwell-noTSX</model>
       <model usable='yes' vendor='Intel'>Broadwell-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
index 2caae4a70d..98f6c3f764 100644
--- a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
@@ -86,16 +86,27 @@
       <model usable='yes' vendor='Intel'>coreduo</model>
       <model usable='yes' vendor='Intel'>core2duo</model>
       <model usable='yes' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
       <model usable='no' vendor='Intel'>Westmere-IBRS</model>
       <model usable='yes' vendor='Intel'>Westmere</model>
       <model usable='no' vendor='Intel'>Snowridge-v2</model>
+      <model usable='no' vendor='Intel'>Snowridge-v1</model>
       <model usable='no' vendor='Intel'>Snowridge</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v1</model>
       <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
       <model usable='no' vendor='Intel'>SandyBridge</model>
       <model usable='yes' vendor='Intel'>Penryn</model>
@@ -104,29 +115,50 @@
       <model usable='no' vendor='AMD'>Opteron_G3</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='no' vendor='Intel'>Nehalem-v2</model>
+      <model usable='yes' vendor='Intel'>Nehalem-v1</model>
       <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
       <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v1</model>
       <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
       <model usable='no' vendor='Intel'>IvyBridge</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Icelake-Server</model>
       <model usable='no' vendor='Intel'>Icelake-Client-noTSX</model>
       <model usable='no' vendor='Intel'>Icelake-Client</model>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX</model>
       <model usable='no' vendor='Intel'>Haswell-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell</model>
       <model usable='no' vendor='AMD'>EPYC-v3</model>
+      <model usable='no' vendor='AMD'>EPYC-v2</model>
+      <model usable='no' vendor='AMD'>EPYC-v1</model>
+      <model usable='no' vendor='AMD'>EPYC-Rome-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Rome</model>
       <model usable='no' vendor='AMD'>EPYC-IBPB</model>
       <model usable='no' vendor='AMD'>EPYC</model>
+      <model usable='no' vendor='Hygon'>Dhyana-v1</model>
       <model usable='no' vendor='Hygon'>Dhyana</model>
+      <model usable='no' vendor='Intel'>Cooperlake-v1</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Broadwell-v4</model>
+      <model usable='no' vendor='Intel'>Broadwell-v3</model>
+      <model usable='no' vendor='Intel'>Broadwell-v2</model>
+      <model usable='no' vendor='Intel'>Broadwell-v1</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
       <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
index 6c56c5cbb8..9c7e6e1df3 100644
--- a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
@@ -72,16 +72,27 @@
       <model usable='yes' vendor='Intel'>coreduo</model>
       <model usable='yes' vendor='Intel'>core2duo</model>
       <model usable='no' vendor='AMD'>athlon</model>
+      <model usable='yes' vendor='Intel'>Westmere-v2</model>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
       <model usable='yes' vendor='Intel'>Westmere-IBRS</model>
       <model usable='yes' vendor='Intel'>Westmere</model>
       <model usable='no' vendor='Intel'>Snowridge-v2</model>
+      <model usable='no' vendor='Intel'>Snowridge-v1</model>
       <model usable='no' vendor='Intel'>Snowridge</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server</model>
+      <model usable='yes' vendor='Intel'>Skylake-Client-v3</model>
+      <model usable='yes' vendor='Intel'>Skylake-Client-v2</model>
+      <model usable='yes' vendor='Intel'>Skylake-Client-v1</model>
       <model usable='yes' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
       <model usable='yes' vendor='Intel'>Skylake-Client-IBRS</model>
       <model usable='yes' vendor='Intel'>Skylake-Client</model>
+      <model usable='yes' vendor='Intel'>SandyBridge-v2</model>
+      <model usable='yes' vendor='Intel'>SandyBridge-v1</model>
       <model usable='yes' vendor='Intel'>SandyBridge-IBRS</model>
       <model usable='yes' vendor='Intel'>SandyBridge</model>
       <model usable='yes' vendor='Intel'>Penryn</model>
@@ -90,29 +101,50 @@
       <model usable='no' vendor='AMD'>Opteron_G3</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='Intel'>Nehalem-v2</model>
+      <model usable='yes' vendor='Intel'>Nehalem-v1</model>
       <model usable='yes' vendor='Intel'>Nehalem-IBRS</model>
       <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='yes' vendor='Intel'>IvyBridge-v2</model>
+      <model usable='yes' vendor='Intel'>IvyBridge-v1</model>
       <model usable='yes' vendor='Intel'>IvyBridge-IBRS</model>
       <model usable='yes' vendor='Intel'>IvyBridge</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Icelake-Server</model>
       <model usable='no' vendor='Intel'>Icelake-Client-noTSX</model>
       <model usable='no' vendor='Intel'>Icelake-Client</model>
+      <model usable='yes' vendor='Intel'>Haswell-v4</model>
+      <model usable='yes' vendor='Intel'>Haswell-v3</model>
+      <model usable='yes' vendor='Intel'>Haswell-v2</model>
+      <model usable='yes' vendor='Intel'>Haswell-v1</model>
       <model usable='yes' vendor='Intel'>Haswell-noTSX-IBRS</model>
       <model usable='yes' vendor='Intel'>Haswell-noTSX</model>
       <model usable='yes' vendor='Intel'>Haswell-IBRS</model>
       <model usable='yes' vendor='Intel'>Haswell</model>
       <model usable='no' vendor='AMD'>EPYC-v3</model>
+      <model usable='no' vendor='AMD'>EPYC-v2</model>
+      <model usable='no' vendor='AMD'>EPYC-v1</model>
+      <model usable='no' vendor='AMD'>EPYC-Rome-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Rome</model>
       <model usable='no' vendor='AMD'>EPYC-IBPB</model>
       <model usable='no' vendor='AMD'>EPYC</model>
+      <model usable='no' vendor='Hygon'>Dhyana-v1</model>
       <model usable='no' vendor='Hygon'>Dhyana</model>
+      <model usable='no' vendor='Intel'>Cooperlake-v1</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='yes' vendor='Intel'>Broadwell-v4</model>
+      <model usable='yes' vendor='Intel'>Broadwell-v3</model>
+      <model usable='yes' vendor='Intel'>Broadwell-v2</model>
+      <model usable='yes' vendor='Intel'>Broadwell-v1</model>
       <model usable='yes' vendor='Intel'>Broadwell-noTSX-IBRS</model>
       <model usable='yes' vendor='Intel'>Broadwell-noTSX</model>
       <model usable='yes' vendor='Intel'>Broadwell-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
index 31bca158ec..7a7480ab1f 100644
--- a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
@@ -73,17 +73,28 @@
       <model usable='no' vendor='Intel'>coreduo</model>
       <model usable='no' vendor='Intel'>core2duo</model>
       <model usable='no' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
       <model usable='no' vendor='Intel'>Westmere-IBRS</model>
       <model usable='yes' vendor='Intel'>Westmere</model>
       <model usable='no' vendor='Intel'>Snowridge-v2</model>
+      <model usable='no' vendor='Intel'>Snowridge-v1</model>
       <model usable='no' vendor='Intel'>Snowridge</model>
       <model usable='no' vendor='Intel'>Skylake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <model usable='yes' vendor='Intel'>SandyBridge-v1</model>
       <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
       <model usable='yes' vendor='Intel'>SandyBridge</model>
       <model usable='yes' vendor='Intel'>Penryn</model>
@@ -92,31 +103,52 @@
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='no' vendor='Intel'>Nehalem-v2</model>
+      <model usable='yes' vendor='Intel'>Nehalem-v1</model>
       <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
       <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v1</model>
       <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
       <model usable='no' vendor='Intel'>IvyBridge</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v4</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Icelake-Server</model>
       <model usable='no' vendor='Intel'>Icelake-Client-noTSX</model>
       <model usable='no' vendor='Intel'>Icelake-Client</model>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX</model>
       <model usable='no' vendor='Intel'>Haswell-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell</model>
       <model usable='yes' vendor='AMD'>EPYC-v3</model>
+      <model usable='yes' vendor='AMD'>EPYC-v2</model>
+      <model usable='yes' vendor='AMD'>EPYC-v1</model>
+      <model usable='yes' vendor='AMD'>EPYC-Rome-v1</model>
       <model usable='yes' vendor='AMD'>EPYC-Rome</model>
       <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
       <model usable='yes' vendor='AMD'>EPYC</model>
+      <model usable='yes' vendor='Hygon'>Dhyana-v1</model>
       <model usable='yes' vendor='Hygon'>Dhyana</model>
+      <model usable='no' vendor='Intel'>Cooperlake-v1</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Broadwell-v4</model>
+      <model usable='no' vendor='Intel'>Broadwell-v3</model>
+      <model usable='no' vendor='Intel'>Broadwell-v2</model>
+      <model usable='no' vendor='Intel'>Broadwell-v1</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
       <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
index 96e3e9fc0c..7f13877fd8 100644
--- a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
@@ -86,17 +86,28 @@
       <model usable='yes' vendor='Intel'>coreduo</model>
       <model usable='yes' vendor='Intel'>core2duo</model>
       <model usable='yes' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
       <model usable='no' vendor='Intel'>Westmere-IBRS</model>
       <model usable='yes' vendor='Intel'>Westmere</model>
       <model usable='no' vendor='Intel'>Snowridge-v2</model>
+      <model usable='no' vendor='Intel'>Snowridge-v1</model>
       <model usable='no' vendor='Intel'>Snowridge</model>
       <model usable='no' vendor='Intel'>Skylake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v1</model>
       <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
       <model usable='no' vendor='Intel'>SandyBridge</model>
       <model usable='yes' vendor='Intel'>Penryn</model>
@@ -105,31 +116,52 @@
       <model usable='no' vendor='AMD'>Opteron_G3</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='no' vendor='Intel'>Nehalem-v2</model>
+      <model usable='yes' vendor='Intel'>Nehalem-v1</model>
       <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
       <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v1</model>
       <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
       <model usable='no' vendor='Intel'>IvyBridge</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v4</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Icelake-Server</model>
       <model usable='no' vendor='Intel'>Icelake-Client-noTSX</model>
       <model usable='no' vendor='Intel'>Icelake-Client</model>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX</model>
       <model usable='no' vendor='Intel'>Haswell-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell</model>
       <model usable='no' vendor='AMD'>EPYC-v3</model>
+      <model usable='no' vendor='AMD'>EPYC-v2</model>
+      <model usable='no' vendor='AMD'>EPYC-v1</model>
+      <model usable='no' vendor='AMD'>EPYC-Rome-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Rome</model>
       <model usable='no' vendor='AMD'>EPYC-IBPB</model>
       <model usable='no' vendor='AMD'>EPYC</model>
+      <model usable='no' vendor='Hygon'>Dhyana-v1</model>
       <model usable='no' vendor='Hygon'>Dhyana</model>
+      <model usable='no' vendor='Intel'>Cooperlake-v1</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Broadwell-v4</model>
+      <model usable='no' vendor='Intel'>Broadwell-v3</model>
+      <model usable='no' vendor='Intel'>Broadwell-v2</model>
+      <model usable='no' vendor='Intel'>Broadwell-v1</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
       <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
index 3852b881a9..3d26ecf979 100644
--- a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
@@ -72,17 +72,28 @@
       <model usable='no' vendor='Intel'>coreduo</model>
       <model usable='no' vendor='Intel'>core2duo</model>
       <model usable='no' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
       <model usable='no' vendor='Intel'>Westmere-IBRS</model>
       <model usable='yes' vendor='Intel'>Westmere</model>
       <model usable='no' vendor='Intel'>Snowridge-v2</model>
+      <model usable='no' vendor='Intel'>Snowridge-v1</model>
       <model usable='no' vendor='Intel'>Snowridge</model>
       <model usable='no' vendor='Intel'>Skylake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <model usable='yes' vendor='Intel'>SandyBridge-v1</model>
       <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
       <model usable='yes' vendor='Intel'>SandyBridge</model>
       <model usable='yes' vendor='Intel'>Penryn</model>
@@ -91,31 +102,52 @@
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='no' vendor='Intel'>Nehalem-v2</model>
+      <model usable='yes' vendor='Intel'>Nehalem-v1</model>
       <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
       <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v1</model>
       <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
       <model usable='no' vendor='Intel'>IvyBridge</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v4</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Icelake-Server</model>
       <model usable='no' vendor='Intel'>Icelake-Client-noTSX</model>
       <model usable='no' vendor='Intel'>Icelake-Client</model>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX</model>
       <model usable='no' vendor='Intel'>Haswell-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell</model>
       <model usable='yes' vendor='AMD'>EPYC-v3</model>
+      <model usable='yes' vendor='AMD'>EPYC-v2</model>
+      <model usable='yes' vendor='AMD'>EPYC-v1</model>
+      <model usable='yes' vendor='AMD'>EPYC-Rome-v1</model>
       <model usable='yes' vendor='AMD'>EPYC-Rome</model>
       <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
       <model usable='yes' vendor='AMD'>EPYC</model>
+      <model usable='yes' vendor='Hygon'>Dhyana-v1</model>
       <model usable='yes' vendor='Hygon'>Dhyana</model>
+      <model usable='no' vendor='Intel'>Cooperlake-v1</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Broadwell-v4</model>
+      <model usable='no' vendor='Intel'>Broadwell-v3</model>
+      <model usable='no' vendor='Intel'>Broadwell-v2</model>
+      <model usable='no' vendor='Intel'>Broadwell-v1</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
       <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
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 df941c46b1..8464eac863 100644
--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
@@ -73,17 +73,28 @@
       <model usable='no' vendor='Intel'>coreduo</model>
       <model usable='no' vendor='Intel'>core2duo</model>
       <model usable='no' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
       <model usable='no' vendor='Intel'>Westmere-IBRS</model>
       <model usable='yes' vendor='Intel'>Westmere</model>
       <model usable='no' vendor='Intel'>Snowridge-v2</model>
+      <model usable='no' vendor='Intel'>Snowridge-v1</model>
       <model usable='no' vendor='Intel'>Snowridge</model>
       <model usable='no' vendor='Intel'>Skylake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <model usable='yes' vendor='Intel'>SandyBridge-v1</model>
       <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
       <model usable='yes' vendor='Intel'>SandyBridge</model>
       <model usable='yes' vendor='Intel'>Penryn</model>
@@ -92,31 +103,52 @@
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='no' vendor='Intel'>Nehalem-v2</model>
+      <model usable='yes' vendor='Intel'>Nehalem-v1</model>
       <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
       <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v1</model>
       <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
       <model usable='no' vendor='Intel'>IvyBridge</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v4</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Icelake-Server</model>
       <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client-noTSX</model>
       <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX</model>
       <model usable='no' vendor='Intel'>Haswell-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell</model>
       <model usable='yes' vendor='AMD'>EPYC-v3</model>
+      <model usable='yes' vendor='AMD'>EPYC-v2</model>
+      <model usable='yes' vendor='AMD'>EPYC-v1</model>
+      <model usable='yes' vendor='AMD'>EPYC-Rome-v1</model>
       <model usable='yes' vendor='AMD'>EPYC-Rome</model>
       <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
       <model usable='yes' vendor='AMD'>EPYC</model>
+      <model usable='yes' vendor='Hygon'>Dhyana-v1</model>
       <model usable='yes' vendor='Hygon'>Dhyana</model>
+      <model usable='no' vendor='Intel'>Cooperlake-v1</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Broadwell-v4</model>
+      <model usable='no' vendor='Intel'>Broadwell-v3</model>
+      <model usable='no' vendor='Intel'>Broadwell-v2</model>
+      <model usable='no' vendor='Intel'>Broadwell-v1</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
       <model usable='no' vendor='Intel'>Broadwell-IBRS</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 b37b2ea770..b823453183 100644
--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
@@ -86,17 +86,28 @@
       <model usable='yes' vendor='Intel'>coreduo</model>
       <model usable='yes' vendor='Intel'>core2duo</model>
       <model usable='yes' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
       <model usable='no' vendor='Intel'>Westmere-IBRS</model>
       <model usable='yes' vendor='Intel'>Westmere</model>
       <model usable='no' vendor='Intel'>Snowridge-v2</model>
+      <model usable='no' vendor='Intel'>Snowridge-v1</model>
       <model usable='no' vendor='Intel'>Snowridge</model>
       <model usable='no' vendor='Intel'>Skylake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v1</model>
       <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
       <model usable='no' vendor='Intel'>SandyBridge</model>
       <model usable='yes' vendor='Intel'>Penryn</model>
@@ -105,31 +116,52 @@
       <model usable='no' vendor='AMD'>Opteron_G3</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='no' vendor='Intel'>Nehalem-v2</model>
+      <model usable='yes' vendor='Intel'>Nehalem-v1</model>
       <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
       <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v1</model>
       <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
       <model usable='no' vendor='Intel'>IvyBridge</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v4</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Icelake-Server</model>
       <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client-noTSX</model>
       <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX</model>
       <model usable='no' vendor='Intel'>Haswell-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell</model>
       <model usable='no' vendor='AMD'>EPYC-v3</model>
+      <model usable='no' vendor='AMD'>EPYC-v2</model>
+      <model usable='no' vendor='AMD'>EPYC-v1</model>
+      <model usable='no' vendor='AMD'>EPYC-Rome-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Rome</model>
       <model usable='no' vendor='AMD'>EPYC-IBPB</model>
       <model usable='no' vendor='AMD'>EPYC</model>
+      <model usable='no' vendor='Hygon'>Dhyana-v1</model>
       <model usable='no' vendor='Hygon'>Dhyana</model>
+      <model usable='no' vendor='Intel'>Cooperlake-v1</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Broadwell-v4</model>
+      <model usable='no' vendor='Intel'>Broadwell-v3</model>
+      <model usable='no' vendor='Intel'>Broadwell-v2</model>
+      <model usable='no' vendor='Intel'>Broadwell-v1</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
       <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
index 0d49b4b174..ab9a815e95 100644
--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
@@ -72,17 +72,28 @@
       <model usable='no' vendor='Intel'>coreduo</model>
       <model usable='no' vendor='Intel'>core2duo</model>
       <model usable='no' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
       <model usable='no' vendor='Intel'>Westmere-IBRS</model>
       <model usable='yes' vendor='Intel'>Westmere</model>
       <model usable='no' vendor='Intel'>Snowridge-v2</model>
+      <model usable='no' vendor='Intel'>Snowridge-v1</model>
       <model usable='no' vendor='Intel'>Snowridge</model>
       <model usable='no' vendor='Intel'>Skylake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <model usable='yes' vendor='Intel'>SandyBridge-v1</model>
       <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
       <model usable='yes' vendor='Intel'>SandyBridge</model>
       <model usable='yes' vendor='Intel'>Penryn</model>
@@ -91,31 +102,52 @@
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='no' vendor='Intel'>Nehalem-v2</model>
+      <model usable='yes' vendor='Intel'>Nehalem-v1</model>
       <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
       <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v1</model>
       <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
       <model usable='no' vendor='Intel'>IvyBridge</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v4</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Icelake-Server</model>
       <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client-noTSX</model>
       <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX</model>
       <model usable='no' vendor='Intel'>Haswell-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell</model>
       <model usable='yes' vendor='AMD'>EPYC-v3</model>
+      <model usable='yes' vendor='AMD'>EPYC-v2</model>
+      <model usable='yes' vendor='AMD'>EPYC-v1</model>
+      <model usable='yes' vendor='AMD'>EPYC-Rome-v1</model>
       <model usable='yes' vendor='AMD'>EPYC-Rome</model>
       <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
       <model usable='yes' vendor='AMD'>EPYC</model>
+      <model usable='yes' vendor='Hygon'>Dhyana-v1</model>
       <model usable='yes' vendor='Hygon'>Dhyana</model>
+      <model usable='no' vendor='Intel'>Cooperlake-v1</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Broadwell-v4</model>
+      <model usable='no' vendor='Intel'>Broadwell-v3</model>
+      <model usable='no' vendor='Intel'>Broadwell-v2</model>
+      <model usable='no' vendor='Intel'>Broadwell-v1</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
       <model usable='no' vendor='Intel'>Broadwell-IBRS</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 d00b4f63c4..79b8ea91ea 100644
--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
@@ -73,17 +73,28 @@
       <model usable='no' vendor='Intel'>coreduo</model>
       <model usable='no' vendor='Intel'>core2duo</model>
       <model usable='no' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
       <model usable='no' vendor='Intel'>Westmere-IBRS</model>
       <model usable='yes' vendor='Intel'>Westmere</model>
       <model usable='no' vendor='Intel'>Snowridge-v2</model>
+      <model usable='no' vendor='Intel'>Snowridge-v1</model>
       <model usable='no' vendor='Intel'>Snowridge</model>
       <model usable='no' vendor='Intel'>Skylake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <model usable='yes' vendor='Intel'>SandyBridge-v1</model>
       <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
       <model usable='yes' vendor='Intel'>SandyBridge</model>
       <model usable='yes' vendor='Intel'>Penryn</model>
@@ -92,33 +103,55 @@
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='no' vendor='Intel'>Nehalem-v2</model>
+      <model usable='yes' vendor='Intel'>Nehalem-v1</model>
       <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
       <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v1</model>
       <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
       <model usable='no' vendor='Intel'>IvyBridge</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v4</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Icelake-Server</model>
       <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client-noTSX</model>
       <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX</model>
       <model usable='no' vendor='Intel'>Haswell-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell</model>
       <model usable='yes' vendor='AMD'>EPYC-v3</model>
+      <model usable='yes' vendor='AMD'>EPYC-v2</model>
+      <model usable='yes' vendor='AMD'>EPYC-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
+      <model usable='yes' vendor='AMD'>EPYC-Rome-v1</model>
       <model usable='yes' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Milan</model>
       <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
       <model usable='yes' vendor='AMD'>EPYC</model>
+      <model usable='yes' vendor='Hygon'>Dhyana-v1</model>
       <model usable='yes' vendor='Hygon'>Dhyana</model>
+      <model usable='no' vendor='Intel'>Cooperlake-v1</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Broadwell-v4</model>
+      <model usable='no' vendor='Intel'>Broadwell-v3</model>
+      <model usable='no' vendor='Intel'>Broadwell-v2</model>
+      <model usable='no' vendor='Intel'>Broadwell-v1</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
       <model usable='no' vendor='Intel'>Broadwell-IBRS</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 485b5f97d2..11f88e37a6 100644
--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
@@ -87,17 +87,28 @@
       <model usable='yes' vendor='Intel'>coreduo</model>
       <model usable='yes' vendor='Intel'>core2duo</model>
       <model usable='yes' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
       <model usable='no' vendor='Intel'>Westmere-IBRS</model>
       <model usable='yes' vendor='Intel'>Westmere</model>
       <model usable='no' vendor='Intel'>Snowridge-v2</model>
+      <model usable='no' vendor='Intel'>Snowridge-v1</model>
       <model usable='no' vendor='Intel'>Snowridge</model>
       <model usable='no' vendor='Intel'>Skylake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v1</model>
       <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
       <model usable='no' vendor='Intel'>SandyBridge</model>
       <model usable='yes' vendor='Intel'>Penryn</model>
@@ -106,33 +117,55 @@
       <model usable='no' vendor='AMD'>Opteron_G3</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='no' vendor='Intel'>Nehalem-v2</model>
+      <model usable='yes' vendor='Intel'>Nehalem-v1</model>
       <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
       <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v1</model>
       <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
       <model usable='no' vendor='Intel'>IvyBridge</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v4</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Icelake-Server</model>
       <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client-noTSX</model>
       <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX</model>
       <model usable='no' vendor='Intel'>Haswell-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell</model>
       <model usable='no' vendor='AMD'>EPYC-v3</model>
+      <model usable='no' vendor='AMD'>EPYC-v2</model>
+      <model usable='no' vendor='AMD'>EPYC-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
+      <model usable='no' vendor='AMD'>EPYC-Rome-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Milan</model>
       <model usable='no' vendor='AMD'>EPYC-IBPB</model>
       <model usable='no' vendor='AMD'>EPYC</model>
+      <model usable='no' vendor='Hygon'>Dhyana-v1</model>
       <model usable='no' vendor='Hygon'>Dhyana</model>
+      <model usable='no' vendor='Intel'>Cooperlake-v1</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Broadwell-v4</model>
+      <model usable='no' vendor='Intel'>Broadwell-v3</model>
+      <model usable='no' vendor='Intel'>Broadwell-v2</model>
+      <model usable='no' vendor='Intel'>Broadwell-v1</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
       <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
index 8503e76d20..b88155c27b 100644
--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
@@ -72,17 +72,28 @@
       <model usable='no' vendor='Intel'>coreduo</model>
       <model usable='no' vendor='Intel'>core2duo</model>
       <model usable='no' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
       <model usable='no' vendor='Intel'>Westmere-IBRS</model>
       <model usable='yes' vendor='Intel'>Westmere</model>
       <model usable='no' vendor='Intel'>Snowridge-v2</model>
+      <model usable='no' vendor='Intel'>Snowridge-v1</model>
       <model usable='no' vendor='Intel'>Snowridge</model>
       <model usable='no' vendor='Intel'>Skylake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <model usable='yes' vendor='Intel'>SandyBridge-v1</model>
       <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
       <model usable='yes' vendor='Intel'>SandyBridge</model>
       <model usable='yes' vendor='Intel'>Penryn</model>
@@ -91,33 +102,55 @@
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='no' vendor='Intel'>Nehalem-v2</model>
+      <model usable='yes' vendor='Intel'>Nehalem-v1</model>
       <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
       <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v1</model>
       <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
       <model usable='no' vendor='Intel'>IvyBridge</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v4</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Icelake-Server</model>
       <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client-noTSX</model>
       <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX</model>
       <model usable='no' vendor='Intel'>Haswell-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell</model>
       <model usable='yes' vendor='AMD'>EPYC-v3</model>
+      <model usable='yes' vendor='AMD'>EPYC-v2</model>
+      <model usable='yes' vendor='AMD'>EPYC-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
+      <model usable='yes' vendor='AMD'>EPYC-Rome-v1</model>
       <model usable='yes' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Milan</model>
       <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
       <model usable='yes' vendor='AMD'>EPYC</model>
+      <model usable='yes' vendor='Hygon'>Dhyana-v1</model>
       <model usable='yes' vendor='Hygon'>Dhyana</model>
+      <model usable='no' vendor='Intel'>Cooperlake-v1</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Broadwell-v4</model>
+      <model usable='no' vendor='Intel'>Broadwell-v3</model>
+      <model usable='no' vendor='Intel'>Broadwell-v2</model>
+      <model usable='no' vendor='Intel'>Broadwell-v1</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
       <model usable='no' vendor='Intel'>Broadwell-IBRS</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 991c1c69c6..73ba618993 100644
--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
@@ -74,20 +74,31 @@
       <model usable='no' vendor='Intel'>coreduo</model>
       <model usable='no' vendor='Intel'>core2duo</model>
       <model usable='no' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
       <model usable='no' vendor='Intel'>Westmere-IBRS</model>
       <model usable='yes' vendor='Intel'>Westmere</model>
       <model usable='no' vendor='Intel'>Snowridge-v3</model>
       <model usable='no' vendor='Intel'>Snowridge-v2</model>
+      <model usable='no' vendor='Intel'>Snowridge-v1</model>
       <model usable='no' vendor='Intel'>Snowridge</model>
       <model usable='no' vendor='Intel'>Skylake-Server-v5</model>
       <model usable='no' vendor='Intel'>Skylake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server</model>
       <model usable='no' vendor='Intel'>Skylake-Client-v4</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <model usable='yes' vendor='Intel'>SandyBridge-v1</model>
       <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
       <model usable='yes' vendor='Intel'>SandyBridge</model>
       <model usable='yes' vendor='Intel'>Penryn</model>
@@ -96,37 +107,59 @@
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='no' vendor='Intel'>Nehalem-v2</model>
+      <model usable='yes' vendor='Intel'>Nehalem-v1</model>
       <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
       <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v1</model>
       <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
       <model usable='no' vendor='Intel'>IvyBridge</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v5</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v4</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Icelake-Server</model>
       <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client-noTSX</model>
       <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX</model>
       <model usable='no' vendor='Intel'>Haswell-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell</model>
       <model usable='yes' vendor='AMD'>EPYC-v3</model>
+      <model usable='yes' vendor='AMD'>EPYC-v2</model>
+      <model usable='yes' vendor='AMD'>EPYC-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
+      <model usable='yes' vendor='AMD'>EPYC-Rome-v1</model>
       <model usable='yes' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Milan</model>
       <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
       <model usable='yes' vendor='AMD'>EPYC</model>
       <model usable='yes' vendor='Hygon'>Dhyana-v2</model>
+      <model usable='yes' vendor='Hygon'>Dhyana-v1</model>
       <model usable='yes' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake-v2</model>
+      <model usable='no' vendor='Intel'>Cooperlake-v1</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Broadwell-v4</model>
+      <model usable='no' vendor='Intel'>Broadwell-v3</model>
+      <model usable='no' vendor='Intel'>Broadwell-v2</model>
+      <model usable='no' vendor='Intel'>Broadwell-v1</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
       <model usable='no' vendor='Intel'>Broadwell-IBRS</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 b9e671e1f7..0292b4d869 100644
--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
@@ -87,20 +87,31 @@
       <model usable='yes' vendor='Intel'>coreduo</model>
       <model usable='yes' vendor='Intel'>core2duo</model>
       <model usable='yes' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
       <model usable='no' vendor='Intel'>Westmere-IBRS</model>
       <model usable='yes' vendor='Intel'>Westmere</model>
       <model usable='no' vendor='Intel'>Snowridge-v3</model>
       <model usable='no' vendor='Intel'>Snowridge-v2</model>
+      <model usable='no' vendor='Intel'>Snowridge-v1</model>
       <model usable='no' vendor='Intel'>Snowridge</model>
       <model usable='no' vendor='Intel'>Skylake-Server-v5</model>
       <model usable='no' vendor='Intel'>Skylake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server</model>
       <model usable='no' vendor='Intel'>Skylake-Client-v4</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v1</model>
       <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
       <model usable='no' vendor='Intel'>SandyBridge</model>
       <model usable='yes' vendor='Intel'>Penryn</model>
@@ -109,37 +120,59 @@
       <model usable='no' vendor='AMD'>Opteron_G3</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='no' vendor='Intel'>Nehalem-v2</model>
+      <model usable='yes' vendor='Intel'>Nehalem-v1</model>
       <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
       <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v1</model>
       <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
       <model usable='no' vendor='Intel'>IvyBridge</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v5</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v4</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Icelake-Server</model>
       <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client-noTSX</model>
       <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX</model>
       <model usable='no' vendor='Intel'>Haswell-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell</model>
       <model usable='no' vendor='AMD'>EPYC-v3</model>
+      <model usable='no' vendor='AMD'>EPYC-v2</model>
+      <model usable='no' vendor='AMD'>EPYC-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
+      <model usable='no' vendor='AMD'>EPYC-Rome-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Milan</model>
       <model usable='no' vendor='AMD'>EPYC-IBPB</model>
       <model usable='no' vendor='AMD'>EPYC</model>
       <model usable='no' vendor='Hygon'>Dhyana-v2</model>
+      <model usable='no' vendor='Hygon'>Dhyana-v1</model>
       <model usable='no' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake-v2</model>
+      <model usable='no' vendor='Intel'>Cooperlake-v1</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Broadwell-v4</model>
+      <model usable='no' vendor='Intel'>Broadwell-v3</model>
+      <model usable='no' vendor='Intel'>Broadwell-v2</model>
+      <model usable='no' vendor='Intel'>Broadwell-v1</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
       <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
index 1f0b1362d1..837e2fc87d 100644
--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
@@ -73,20 +73,31 @@
       <model usable='no' vendor='Intel'>coreduo</model>
       <model usable='no' vendor='Intel'>core2duo</model>
       <model usable='no' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
       <model usable='no' vendor='Intel'>Westmere-IBRS</model>
       <model usable='yes' vendor='Intel'>Westmere</model>
       <model usable='no' vendor='Intel'>Snowridge-v3</model>
       <model usable='no' vendor='Intel'>Snowridge-v2</model>
+      <model usable='no' vendor='Intel'>Snowridge-v1</model>
       <model usable='no' vendor='Intel'>Snowridge</model>
       <model usable='no' vendor='Intel'>Skylake-Server-v5</model>
       <model usable='no' vendor='Intel'>Skylake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server</model>
       <model usable='no' vendor='Intel'>Skylake-Client-v4</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <model usable='yes' vendor='Intel'>SandyBridge-v1</model>
       <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
       <model usable='yes' vendor='Intel'>SandyBridge</model>
       <model usable='yes' vendor='Intel'>Penryn</model>
@@ -95,37 +106,59 @@
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='no' vendor='Intel'>Nehalem-v2</model>
+      <model usable='yes' vendor='Intel'>Nehalem-v1</model>
       <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
       <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v1</model>
       <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
       <model usable='no' vendor='Intel'>IvyBridge</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v5</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v4</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Icelake-Server</model>
       <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client-noTSX</model>
       <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX</model>
       <model usable='no' vendor='Intel'>Haswell-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell</model>
       <model usable='yes' vendor='AMD'>EPYC-v3</model>
+      <model usable='yes' vendor='AMD'>EPYC-v2</model>
+      <model usable='yes' vendor='AMD'>EPYC-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
+      <model usable='yes' vendor='AMD'>EPYC-Rome-v1</model>
       <model usable='yes' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Milan</model>
       <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
       <model usable='yes' vendor='AMD'>EPYC</model>
       <model usable='yes' vendor='Hygon'>Dhyana-v2</model>
+      <model usable='yes' vendor='Hygon'>Dhyana-v1</model>
       <model usable='yes' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake-v2</model>
+      <model usable='no' vendor='Intel'>Cooperlake-v1</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Broadwell-v4</model>
+      <model usable='no' vendor='Intel'>Broadwell-v3</model>
+      <model usable='no' vendor='Intel'>Broadwell-v2</model>
+      <model usable='no' vendor='Intel'>Broadwell-v1</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
       <model usable='no' vendor='Intel'>Broadwell-IBRS</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 dbbc39ba40..f981096d0a 100644
--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
@@ -74,21 +74,32 @@
       <model usable='no' vendor='Intel'>coreduo</model>
       <model usable='no' vendor='Intel'>core2duo</model>
       <model usable='no' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
       <model usable='no' vendor='Intel'>Westmere-IBRS</model>
       <model usable='yes' vendor='Intel'>Westmere</model>
       <model usable='no' vendor='Intel'>Snowridge-v4</model>
       <model usable='no' vendor='Intel'>Snowridge-v3</model>
       <model usable='no' vendor='Intel'>Snowridge-v2</model>
+      <model usable='no' vendor='Intel'>Snowridge-v1</model>
       <model usable='no' vendor='Intel'>Snowridge</model>
       <model usable='no' vendor='Intel'>Skylake-Server-v5</model>
       <model usable='no' vendor='Intel'>Skylake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server</model>
       <model usable='no' vendor='Intel'>Skylake-Client-v4</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <model usable='yes' vendor='Intel'>SandyBridge-v1</model>
       <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
       <model usable='yes' vendor='Intel'>SandyBridge</model>
       <model usable='yes' vendor='Intel'>Penryn</model>
@@ -97,37 +108,59 @@
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='no' vendor='Intel'>Nehalem-v2</model>
+      <model usable='yes' vendor='Intel'>Nehalem-v1</model>
       <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
       <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v1</model>
       <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
       <model usable='no' vendor='Intel'>IvyBridge</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v5</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v4</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Icelake-Server</model>
       <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client-noTSX</model>
       <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX</model>
       <model usable='no' vendor='Intel'>Haswell-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell</model>
       <model usable='yes' vendor='AMD'>EPYC-v3</model>
+      <model usable='yes' vendor='AMD'>EPYC-v2</model>
+      <model usable='yes' vendor='AMD'>EPYC-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
+      <model usable='yes' vendor='AMD'>EPYC-Rome-v1</model>
       <model usable='yes' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Milan</model>
       <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
       <model usable='yes' vendor='AMD'>EPYC</model>
       <model usable='yes' vendor='Hygon'>Dhyana-v2</model>
+      <model usable='yes' vendor='Hygon'>Dhyana-v1</model>
       <model usable='yes' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake-v2</model>
+      <model usable='no' vendor='Intel'>Cooperlake-v1</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Broadwell-v4</model>
+      <model usable='no' vendor='Intel'>Broadwell-v3</model>
+      <model usable='no' vendor='Intel'>Broadwell-v2</model>
+      <model usable='no' vendor='Intel'>Broadwell-v1</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
       <model usable='no' vendor='Intel'>Broadwell-IBRS</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 7d7034e17f..e01e6036f1 100644
--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
@@ -89,21 +89,32 @@
       <model usable='yes' vendor='Intel'>coreduo</model>
       <model usable='yes' vendor='Intel'>core2duo</model>
       <model usable='yes' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
       <model usable='no' vendor='Intel'>Westmere-IBRS</model>
       <model usable='yes' vendor='Intel'>Westmere</model>
       <model usable='no' vendor='Intel'>Snowridge-v4</model>
       <model usable='no' vendor='Intel'>Snowridge-v3</model>
       <model usable='no' vendor='Intel'>Snowridge-v2</model>
+      <model usable='no' vendor='Intel'>Snowridge-v1</model>
       <model usable='no' vendor='Intel'>Snowridge</model>
       <model usable='no' vendor='Intel'>Skylake-Server-v5</model>
       <model usable='no' vendor='Intel'>Skylake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server</model>
       <model usable='no' vendor='Intel'>Skylake-Client-v4</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v1</model>
       <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
       <model usable='no' vendor='Intel'>SandyBridge</model>
       <model usable='yes' vendor='Intel'>Penryn</model>
@@ -112,37 +123,59 @@
       <model usable='no' vendor='AMD'>Opteron_G3</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='no' vendor='Intel'>Nehalem-v2</model>
+      <model usable='yes' vendor='Intel'>Nehalem-v1</model>
       <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
       <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v1</model>
       <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
       <model usable='no' vendor='Intel'>IvyBridge</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v5</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v4</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Icelake-Server</model>
       <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client-noTSX</model>
       <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX</model>
       <model usable='no' vendor='Intel'>Haswell-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell</model>
       <model usable='no' vendor='AMD'>EPYC-v3</model>
+      <model usable='no' vendor='AMD'>EPYC-v2</model>
+      <model usable='no' vendor='AMD'>EPYC-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
+      <model usable='no' vendor='AMD'>EPYC-Rome-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Milan</model>
       <model usable='no' vendor='AMD'>EPYC-IBPB</model>
       <model usable='no' vendor='AMD'>EPYC</model>
       <model usable='no' vendor='Hygon'>Dhyana-v2</model>
+      <model usable='no' vendor='Hygon'>Dhyana-v1</model>
       <model usable='no' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake-v2</model>
+      <model usable='no' vendor='Intel'>Cooperlake-v1</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Broadwell-v4</model>
+      <model usable='no' vendor='Intel'>Broadwell-v3</model>
+      <model usable='no' vendor='Intel'>Broadwell-v2</model>
+      <model usable='no' vendor='Intel'>Broadwell-v1</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
       <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
index 33636254a2..d1f20fab58 100644
--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
@@ -73,21 +73,32 @@
       <model usable='no' vendor='Intel'>coreduo</model>
       <model usable='no' vendor='Intel'>core2duo</model>
       <model usable='no' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
       <model usable='no' vendor='Intel'>Westmere-IBRS</model>
       <model usable='yes' vendor='Intel'>Westmere</model>
       <model usable='no' vendor='Intel'>Snowridge-v4</model>
       <model usable='no' vendor='Intel'>Snowridge-v3</model>
       <model usable='no' vendor='Intel'>Snowridge-v2</model>
+      <model usable='no' vendor='Intel'>Snowridge-v1</model>
       <model usable='no' vendor='Intel'>Snowridge</model>
       <model usable='no' vendor='Intel'>Skylake-Server-v5</model>
       <model usable='no' vendor='Intel'>Skylake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server</model>
       <model usable='no' vendor='Intel'>Skylake-Client-v4</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <model usable='yes' vendor='Intel'>SandyBridge-v1</model>
       <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
       <model usable='yes' vendor='Intel'>SandyBridge</model>
       <model usable='yes' vendor='Intel'>Penryn</model>
@@ -96,37 +107,59 @@
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='no' vendor='Intel'>Nehalem-v2</model>
+      <model usable='yes' vendor='Intel'>Nehalem-v1</model>
       <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
       <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v1</model>
       <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
       <model usable='no' vendor='Intel'>IvyBridge</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v5</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v4</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Icelake-Server</model>
       <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client-noTSX</model>
       <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX</model>
       <model usable='no' vendor='Intel'>Haswell-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell</model>
       <model usable='yes' vendor='AMD'>EPYC-v3</model>
+      <model usable='yes' vendor='AMD'>EPYC-v2</model>
+      <model usable='yes' vendor='AMD'>EPYC-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
+      <model usable='yes' vendor='AMD'>EPYC-Rome-v1</model>
       <model usable='yes' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Milan</model>
       <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
       <model usable='yes' vendor='AMD'>EPYC</model>
       <model usable='yes' vendor='Hygon'>Dhyana-v2</model>
+      <model usable='yes' vendor='Hygon'>Dhyana-v1</model>
       <model usable='yes' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake-v2</model>
+      <model usable='no' vendor='Intel'>Cooperlake-v1</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Broadwell-v4</model>
+      <model usable='no' vendor='Intel'>Broadwell-v3</model>
+      <model usable='no' vendor='Intel'>Broadwell-v2</model>
+      <model usable='no' vendor='Intel'>Broadwell-v1</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
       <model usable='no' vendor='Intel'>Broadwell-IBRS</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 a576213ecd..c2ffef665f 100644
--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
@@ -75,21 +75,32 @@
       <model usable='no' vendor='Intel'>coreduo</model>
       <model usable='no' vendor='Intel'>core2duo</model>
       <model usable='no' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
       <model usable='no' vendor='Intel'>Westmere-IBRS</model>
       <model usable='yes' vendor='Intel'>Westmere</model>
       <model usable='no' vendor='Intel'>Snowridge-v4</model>
       <model usable='no' vendor='Intel'>Snowridge-v3</model>
       <model usable='no' vendor='Intel'>Snowridge-v2</model>
+      <model usable='no' vendor='Intel'>Snowridge-v1</model>
       <model usable='no' vendor='Intel'>Snowridge</model>
       <model usable='no' vendor='Intel'>Skylake-Server-v5</model>
       <model usable='no' vendor='Intel'>Skylake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server</model>
       <model usable='no' vendor='Intel'>Skylake-Client-v4</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <model usable='yes' vendor='Intel'>SandyBridge-v1</model>
       <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
       <model usable='yes' vendor='Intel'>SandyBridge</model>
       <model usable='yes' vendor='Intel'>Penryn</model>
@@ -98,38 +109,60 @@
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='no' vendor='Intel'>Nehalem-v2</model>
+      <model usable='yes' vendor='Intel'>Nehalem-v1</model>
       <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
       <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v1</model>
       <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
       <model usable='no' vendor='Intel'>IvyBridge</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v6</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v5</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v4</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Icelake-Server</model>
       <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client-noTSX</model>
       <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX</model>
       <model usable='no' vendor='Intel'>Haswell-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell</model>
       <model usable='yes' vendor='AMD'>EPYC-v3</model>
+      <model usable='yes' vendor='AMD'>EPYC-v2</model>
+      <model usable='yes' vendor='AMD'>EPYC-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
+      <model usable='yes' vendor='AMD'>EPYC-Rome-v1</model>
       <model usable='yes' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Milan</model>
       <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
       <model usable='yes' vendor='AMD'>EPYC</model>
       <model usable='yes' vendor='Hygon'>Dhyana-v2</model>
+      <model usable='yes' vendor='Hygon'>Dhyana-v1</model>
       <model usable='yes' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake-v2</model>
+      <model usable='no' vendor='Intel'>Cooperlake-v1</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Broadwell-v4</model>
+      <model usable='no' vendor='Intel'>Broadwell-v3</model>
+      <model usable='no' vendor='Intel'>Broadwell-v2</model>
+      <model usable='no' vendor='Intel'>Broadwell-v1</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
       <model usable='no' vendor='Intel'>Broadwell-IBRS</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 d4ded73fa3..7d6fe9712f 100644
--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
@@ -90,21 +90,32 @@
       <model usable='yes' vendor='Intel'>coreduo</model>
       <model usable='yes' vendor='Intel'>core2duo</model>
       <model usable='yes' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
       <model usable='no' vendor='Intel'>Westmere-IBRS</model>
       <model usable='yes' vendor='Intel'>Westmere</model>
       <model usable='no' vendor='Intel'>Snowridge-v4</model>
       <model usable='no' vendor='Intel'>Snowridge-v3</model>
       <model usable='no' vendor='Intel'>Snowridge-v2</model>
+      <model usable='no' vendor='Intel'>Snowridge-v1</model>
       <model usable='no' vendor='Intel'>Snowridge</model>
       <model usable='no' vendor='Intel'>Skylake-Server-v5</model>
       <model usable='no' vendor='Intel'>Skylake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server</model>
       <model usable='no' vendor='Intel'>Skylake-Client-v4</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v1</model>
       <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
       <model usable='no' vendor='Intel'>SandyBridge</model>
       <model usable='yes' vendor='Intel'>Penryn</model>
@@ -113,38 +124,60 @@
       <model usable='no' vendor='AMD'>Opteron_G3</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='no' vendor='Intel'>Nehalem-v2</model>
+      <model usable='yes' vendor='Intel'>Nehalem-v1</model>
       <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
       <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v1</model>
       <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
       <model usable='no' vendor='Intel'>IvyBridge</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v6</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v5</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v4</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Icelake-Server</model>
       <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client-noTSX</model>
       <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX</model>
       <model usable='no' vendor='Intel'>Haswell-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell</model>
       <model usable='no' vendor='AMD'>EPYC-v3</model>
+      <model usable='no' vendor='AMD'>EPYC-v2</model>
+      <model usable='no' vendor='AMD'>EPYC-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
+      <model usable='no' vendor='AMD'>EPYC-Rome-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Milan</model>
       <model usable='no' vendor='AMD'>EPYC-IBPB</model>
       <model usable='no' vendor='AMD'>EPYC</model>
       <model usable='no' vendor='Hygon'>Dhyana-v2</model>
+      <model usable='no' vendor='Hygon'>Dhyana-v1</model>
       <model usable='no' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake-v2</model>
+      <model usable='no' vendor='Intel'>Cooperlake-v1</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Broadwell-v4</model>
+      <model usable='no' vendor='Intel'>Broadwell-v3</model>
+      <model usable='no' vendor='Intel'>Broadwell-v2</model>
+      <model usable='no' vendor='Intel'>Broadwell-v1</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
       <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
index dc7b6c588b..e8cd945dc7 100644
--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
@@ -74,21 +74,32 @@
       <model usable='no' vendor='Intel'>coreduo</model>
       <model usable='no' vendor='Intel'>core2duo</model>
       <model usable='no' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
       <model usable='no' vendor='Intel'>Westmere-IBRS</model>
       <model usable='yes' vendor='Intel'>Westmere</model>
       <model usable='no' vendor='Intel'>Snowridge-v4</model>
       <model usable='no' vendor='Intel'>Snowridge-v3</model>
       <model usable='no' vendor='Intel'>Snowridge-v2</model>
+      <model usable='no' vendor='Intel'>Snowridge-v1</model>
       <model usable='no' vendor='Intel'>Snowridge</model>
       <model usable='no' vendor='Intel'>Skylake-Server-v5</model>
       <model usable='no' vendor='Intel'>Skylake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server</model>
       <model usable='no' vendor='Intel'>Skylake-Client-v4</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <model usable='yes' vendor='Intel'>SandyBridge-v1</model>
       <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
       <model usable='yes' vendor='Intel'>SandyBridge</model>
       <model usable='yes' vendor='Intel'>Penryn</model>
@@ -97,38 +108,60 @@
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='no' vendor='Intel'>Nehalem-v2</model>
+      <model usable='yes' vendor='Intel'>Nehalem-v1</model>
       <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
       <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v1</model>
       <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
       <model usable='no' vendor='Intel'>IvyBridge</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v6</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v5</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v4</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Icelake-Server</model>
       <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client-noTSX</model>
       <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX</model>
       <model usable='no' vendor='Intel'>Haswell-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell</model>
       <model usable='yes' vendor='AMD'>EPYC-v3</model>
+      <model usable='yes' vendor='AMD'>EPYC-v2</model>
+      <model usable='yes' vendor='AMD'>EPYC-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
+      <model usable='yes' vendor='AMD'>EPYC-Rome-v1</model>
       <model usable='yes' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Milan</model>
       <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
       <model usable='yes' vendor='AMD'>EPYC</model>
       <model usable='yes' vendor='Hygon'>Dhyana-v2</model>
+      <model usable='yes' vendor='Hygon'>Dhyana-v1</model>
       <model usable='yes' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake-v2</model>
+      <model usable='no' vendor='Intel'>Cooperlake-v1</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Broadwell-v4</model>
+      <model usable='no' vendor='Intel'>Broadwell-v3</model>
+      <model usable='no' vendor='Intel'>Broadwell-v2</model>
+      <model usable='no' vendor='Intel'>Broadwell-v1</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
       <model usable='no' vendor='Intel'>Broadwell-IBRS</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 74879fce14..f546d93174 100644
--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
@@ -76,21 +76,32 @@
       <model usable='no' vendor='Intel'>coreduo</model>
       <model usable='no' vendor='Intel'>core2duo</model>
       <model usable='no' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
       <model usable='no' vendor='Intel'>Westmere-IBRS</model>
       <model usable='yes' vendor='Intel'>Westmere</model>
       <model usable='no' vendor='Intel'>Snowridge-v4</model>
       <model usable='no' vendor='Intel'>Snowridge-v3</model>
       <model usable='no' vendor='Intel'>Snowridge-v2</model>
+      <model usable='no' vendor='Intel'>Snowridge-v1</model>
       <model usable='no' vendor='Intel'>Snowridge</model>
       <model usable='no' vendor='Intel'>Skylake-Server-v5</model>
       <model usable='no' vendor='Intel'>Skylake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server</model>
       <model usable='no' vendor='Intel'>Skylake-Client-v4</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <model usable='yes' vendor='Intel'>SandyBridge-v1</model>
       <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
       <model usable='yes' vendor='Intel'>SandyBridge</model>
       <model usable='yes' vendor='Intel'>Penryn</model>
@@ -99,36 +110,58 @@
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='no' vendor='Intel'>Nehalem-v2</model>
+      <model usable='yes' vendor='Intel'>Nehalem-v1</model>
       <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
       <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v1</model>
       <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
       <model usable='no' vendor='Intel'>IvyBridge</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v6</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v5</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v4</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Icelake-Server</model>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX</model>
       <model usable='no' vendor='Intel'>Haswell-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell</model>
       <model usable='yes' vendor='AMD'>EPYC-v3</model>
+      <model usable='yes' vendor='AMD'>EPYC-v2</model>
+      <model usable='yes' vendor='AMD'>EPYC-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
+      <model usable='yes' vendor='AMD'>EPYC-Rome-v1</model>
       <model usable='yes' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Milan</model>
       <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
       <model usable='yes' vendor='AMD'>EPYC</model>
       <model usable='yes' vendor='Hygon'>Dhyana-v2</model>
+      <model usable='yes' vendor='Hygon'>Dhyana-v1</model>
       <model usable='yes' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake-v2</model>
+      <model usable='no' vendor='Intel'>Cooperlake-v1</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Broadwell-v4</model>
+      <model usable='no' vendor='Intel'>Broadwell-v3</model>
+      <model usable='no' vendor='Intel'>Broadwell-v2</model>
+      <model usable='no' vendor='Intel'>Broadwell-v1</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
       <model usable='no' vendor='Intel'>Broadwell-IBRS</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 c0333c2947..f78d25488a 100644
--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
@@ -90,21 +90,32 @@
       <model usable='yes' vendor='Intel'>coreduo</model>
       <model usable='yes' vendor='Intel'>core2duo</model>
       <model usable='yes' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
       <model usable='no' vendor='Intel'>Westmere-IBRS</model>
       <model usable='yes' vendor='Intel'>Westmere</model>
       <model usable='no' vendor='Intel'>Snowridge-v4</model>
       <model usable='no' vendor='Intel'>Snowridge-v3</model>
       <model usable='no' vendor='Intel'>Snowridge-v2</model>
+      <model usable='no' vendor='Intel'>Snowridge-v1</model>
       <model usable='no' vendor='Intel'>Snowridge</model>
       <model usable='no' vendor='Intel'>Skylake-Server-v5</model>
       <model usable='no' vendor='Intel'>Skylake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server</model>
       <model usable='no' vendor='Intel'>Skylake-Client-v4</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v1</model>
       <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
       <model usable='no' vendor='Intel'>SandyBridge</model>
       <model usable='yes' vendor='Intel'>Penryn</model>
@@ -113,36 +124,58 @@
       <model usable='no' vendor='AMD'>Opteron_G3</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='no' vendor='Intel'>Nehalem-v2</model>
+      <model usable='yes' vendor='Intel'>Nehalem-v1</model>
       <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
       <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v1</model>
       <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
       <model usable='no' vendor='Intel'>IvyBridge</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v6</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v5</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v4</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Icelake-Server</model>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX</model>
       <model usable='no' vendor='Intel'>Haswell-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell</model>
       <model usable='no' vendor='AMD'>EPYC-v3</model>
+      <model usable='no' vendor='AMD'>EPYC-v2</model>
+      <model usable='no' vendor='AMD'>EPYC-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
+      <model usable='no' vendor='AMD'>EPYC-Rome-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Milan</model>
       <model usable='no' vendor='AMD'>EPYC-IBPB</model>
       <model usable='no' vendor='AMD'>EPYC</model>
       <model usable='no' vendor='Hygon'>Dhyana-v2</model>
+      <model usable='no' vendor='Hygon'>Dhyana-v1</model>
       <model usable='no' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake-v2</model>
+      <model usable='no' vendor='Intel'>Cooperlake-v1</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Broadwell-v4</model>
+      <model usable='no' vendor='Intel'>Broadwell-v3</model>
+      <model usable='no' vendor='Intel'>Broadwell-v2</model>
+      <model usable='no' vendor='Intel'>Broadwell-v1</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
       <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
index a8eb03a47c..6765cb7600 100644
--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
@@ -75,21 +75,32 @@
       <model usable='no' vendor='Intel'>coreduo</model>
       <model usable='no' vendor='Intel'>core2duo</model>
       <model usable='no' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
       <model usable='no' vendor='Intel'>Westmere-IBRS</model>
       <model usable='yes' vendor='Intel'>Westmere</model>
       <model usable='no' vendor='Intel'>Snowridge-v4</model>
       <model usable='no' vendor='Intel'>Snowridge-v3</model>
       <model usable='no' vendor='Intel'>Snowridge-v2</model>
+      <model usable='no' vendor='Intel'>Snowridge-v1</model>
       <model usable='no' vendor='Intel'>Snowridge</model>
       <model usable='no' vendor='Intel'>Skylake-Server-v5</model>
       <model usable='no' vendor='Intel'>Skylake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server</model>
       <model usable='no' vendor='Intel'>Skylake-Client-v4</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <model usable='yes' vendor='Intel'>SandyBridge-v1</model>
       <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
       <model usable='yes' vendor='Intel'>SandyBridge</model>
       <model usable='yes' vendor='Intel'>Penryn</model>
@@ -98,36 +109,58 @@
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='no' vendor='Intel'>Nehalem-v2</model>
+      <model usable='yes' vendor='Intel'>Nehalem-v1</model>
       <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
       <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v1</model>
       <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
       <model usable='no' vendor='Intel'>IvyBridge</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v6</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v5</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v4</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Icelake-Server</model>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX</model>
       <model usable='no' vendor='Intel'>Haswell-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell</model>
       <model usable='yes' vendor='AMD'>EPYC-v3</model>
+      <model usable='yes' vendor='AMD'>EPYC-v2</model>
+      <model usable='yes' vendor='AMD'>EPYC-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
+      <model usable='yes' vendor='AMD'>EPYC-Rome-v1</model>
       <model usable='yes' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Milan</model>
       <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
       <model usable='yes' vendor='AMD'>EPYC</model>
       <model usable='yes' vendor='Hygon'>Dhyana-v2</model>
+      <model usable='yes' vendor='Hygon'>Dhyana-v1</model>
       <model usable='yes' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake-v2</model>
+      <model usable='no' vendor='Intel'>Cooperlake-v1</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Broadwell-v4</model>
+      <model usable='no' vendor='Intel'>Broadwell-v3</model>
+      <model usable='no' vendor='Intel'>Broadwell-v2</model>
+      <model usable='no' vendor='Intel'>Broadwell-v1</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
       <model usable='no' vendor='Intel'>Broadwell-IBRS</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 8b4ab7516f..37c881315a 100644
--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
@@ -81,21 +81,32 @@
       <model usable='no' vendor='Intel'>coreduo</model>
       <model usable='no' vendor='Intel'>core2duo</model>
       <model usable='no' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
       <model usable='no' vendor='Intel'>Westmere-IBRS</model>
       <model usable='yes' vendor='Intel'>Westmere</model>
       <model usable='no' vendor='Intel'>Snowridge-v4</model>
       <model usable='no' vendor='Intel'>Snowridge-v3</model>
       <model usable='no' vendor='Intel'>Snowridge-v2</model>
+      <model usable='no' vendor='Intel'>Snowridge-v1</model>
       <model usable='no' vendor='Intel'>Snowridge</model>
       <model usable='no' vendor='Intel'>Skylake-Server-v5</model>
       <model usable='no' vendor='Intel'>Skylake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server</model>
       <model usable='no' vendor='Intel'>Skylake-Client-v4</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <model usable='yes' vendor='Intel'>SandyBridge-v1</model>
       <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
       <model usable='yes' vendor='Intel'>SandyBridge</model>
       <model usable='yes' vendor='Intel'>Penryn</model>
@@ -104,36 +115,58 @@
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='no' vendor='Intel'>Nehalem-v2</model>
+      <model usable='yes' vendor='Intel'>Nehalem-v1</model>
       <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
       <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v1</model>
       <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
       <model usable='no' vendor='Intel'>IvyBridge</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v6</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v5</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v4</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Icelake-Server</model>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX</model>
       <model usable='no' vendor='Intel'>Haswell-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell</model>
       <model usable='yes' vendor='AMD'>EPYC-v3</model>
+      <model usable='yes' vendor='AMD'>EPYC-v2</model>
+      <model usable='yes' vendor='AMD'>EPYC-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
+      <model usable='yes' vendor='AMD'>EPYC-Rome-v1</model>
       <model usable='yes' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Milan</model>
       <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
       <model usable='yes' vendor='AMD'>EPYC</model>
       <model usable='yes' vendor='Hygon'>Dhyana-v2</model>
+      <model usable='yes' vendor='Hygon'>Dhyana-v1</model>
       <model usable='yes' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake-v2</model>
+      <model usable='no' vendor='Intel'>Cooperlake-v1</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Broadwell-v4</model>
+      <model usable='no' vendor='Intel'>Broadwell-v3</model>
+      <model usable='no' vendor='Intel'>Broadwell-v2</model>
+      <model usable='no' vendor='Intel'>Broadwell-v1</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
       <model usable='no' vendor='Intel'>Broadwell-IBRS</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 adc9db83f6..97ae481487 100644
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml
@@ -78,21 +78,32 @@
       <model usable='yes' vendor='Intel'>coreduo</model>
       <model usable='yes' vendor='Intel'>core2duo</model>
       <model usable='yes' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
       <model usable='no' vendor='Intel'>Westmere-IBRS</model>
       <model usable='yes' vendor='Intel'>Westmere</model>
       <model usable='no' vendor='Intel'>Snowridge-v4</model>
       <model usable='no' vendor='Intel'>Snowridge-v3</model>
       <model usable='no' vendor='Intel'>Snowridge-v2</model>
+      <model usable='no' vendor='Intel'>Snowridge-v1</model>
       <model usable='no' vendor='Intel'>Snowridge</model>
       <model usable='no' vendor='Intel'>Skylake-Server-v5</model>
       <model usable='no' vendor='Intel'>Skylake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server</model>
       <model usable='no' vendor='Intel'>Skylake-Client-v4</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v1</model>
       <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
       <model usable='no' vendor='Intel'>SandyBridge</model>
       <model usable='yes' vendor='Intel'>Penryn</model>
@@ -101,36 +112,58 @@
       <model usable='no' vendor='AMD'>Opteron_G3</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='no' vendor='Intel'>Nehalem-v2</model>
+      <model usable='yes' vendor='Intel'>Nehalem-v1</model>
       <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
       <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v1</model>
       <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
       <model usable='no' vendor='Intel'>IvyBridge</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v6</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v5</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v4</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Icelake-Server</model>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX</model>
       <model usable='no' vendor='Intel'>Haswell-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell</model>
       <model usable='no' vendor='AMD'>EPYC-v3</model>
+      <model usable='no' vendor='AMD'>EPYC-v2</model>
+      <model usable='no' vendor='AMD'>EPYC-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
+      <model usable='no' vendor='AMD'>EPYC-Rome-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Milan</model>
       <model usable='no' vendor='AMD'>EPYC-IBPB</model>
       <model usable='no' vendor='AMD'>EPYC</model>
       <model usable='no' vendor='Hygon'>Dhyana-v2</model>
+      <model usable='no' vendor='Hygon'>Dhyana-v1</model>
       <model usable='no' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake-v2</model>
+      <model usable='no' vendor='Intel'>Cooperlake-v1</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Broadwell-v4</model>
+      <model usable='no' vendor='Intel'>Broadwell-v3</model>
+      <model usable='no' vendor='Intel'>Broadwell-v2</model>
+      <model usable='no' vendor='Intel'>Broadwell-v1</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
       <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
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 adc9db83f6..97ae481487 100644
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
@@ -78,21 +78,32 @@
       <model usable='yes' vendor='Intel'>coreduo</model>
       <model usable='yes' vendor='Intel'>core2duo</model>
       <model usable='yes' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
       <model usable='no' vendor='Intel'>Westmere-IBRS</model>
       <model usable='yes' vendor='Intel'>Westmere</model>
       <model usable='no' vendor='Intel'>Snowridge-v4</model>
       <model usable='no' vendor='Intel'>Snowridge-v3</model>
       <model usable='no' vendor='Intel'>Snowridge-v2</model>
+      <model usable='no' vendor='Intel'>Snowridge-v1</model>
       <model usable='no' vendor='Intel'>Snowridge</model>
       <model usable='no' vendor='Intel'>Skylake-Server-v5</model>
       <model usable='no' vendor='Intel'>Skylake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server</model>
       <model usable='no' vendor='Intel'>Skylake-Client-v4</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v1</model>
       <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
       <model usable='no' vendor='Intel'>SandyBridge</model>
       <model usable='yes' vendor='Intel'>Penryn</model>
@@ -101,36 +112,58 @@
       <model usable='no' vendor='AMD'>Opteron_G3</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='no' vendor='Intel'>Nehalem-v2</model>
+      <model usable='yes' vendor='Intel'>Nehalem-v1</model>
       <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
       <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v1</model>
       <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
       <model usable='no' vendor='Intel'>IvyBridge</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v6</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v5</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v4</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Icelake-Server</model>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX</model>
       <model usable='no' vendor='Intel'>Haswell-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell</model>
       <model usable='no' vendor='AMD'>EPYC-v3</model>
+      <model usable='no' vendor='AMD'>EPYC-v2</model>
+      <model usable='no' vendor='AMD'>EPYC-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
+      <model usable='no' vendor='AMD'>EPYC-Rome-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Milan</model>
       <model usable='no' vendor='AMD'>EPYC-IBPB</model>
       <model usable='no' vendor='AMD'>EPYC</model>
       <model usable='no' vendor='Hygon'>Dhyana-v2</model>
+      <model usable='no' vendor='Hygon'>Dhyana-v1</model>
       <model usable='no' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake-v2</model>
+      <model usable='no' vendor='Intel'>Cooperlake-v1</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Broadwell-v4</model>
+      <model usable='no' vendor='Intel'>Broadwell-v3</model>
+      <model usable='no' vendor='Intel'>Broadwell-v2</model>
+      <model usable='no' vendor='Intel'>Broadwell-v1</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
       <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
index b611754665..f4d3e42a88 100644
--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
@@ -80,21 +80,32 @@
       <model usable='no' vendor='Intel'>coreduo</model>
       <model usable='no' vendor='Intel'>core2duo</model>
       <model usable='no' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
       <model usable='no' vendor='Intel'>Westmere-IBRS</model>
       <model usable='yes' vendor='Intel'>Westmere</model>
       <model usable='no' vendor='Intel'>Snowridge-v4</model>
       <model usable='no' vendor='Intel'>Snowridge-v3</model>
       <model usable='no' vendor='Intel'>Snowridge-v2</model>
+      <model usable='no' vendor='Intel'>Snowridge-v1</model>
       <model usable='no' vendor='Intel'>Snowridge</model>
       <model usable='no' vendor='Intel'>Skylake-Server-v5</model>
       <model usable='no' vendor='Intel'>Skylake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server</model>
       <model usable='no' vendor='Intel'>Skylake-Client-v4</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <model usable='yes' vendor='Intel'>SandyBridge-v1</model>
       <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
       <model usable='yes' vendor='Intel'>SandyBridge</model>
       <model usable='yes' vendor='Intel'>Penryn</model>
@@ -103,36 +114,58 @@
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='no' vendor='Intel'>Nehalem-v2</model>
+      <model usable='yes' vendor='Intel'>Nehalem-v1</model>
       <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
       <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v1</model>
       <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
       <model usable='no' vendor='Intel'>IvyBridge</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v6</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v5</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v4</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Icelake-Server</model>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX</model>
       <model usable='no' vendor='Intel'>Haswell-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell</model>
       <model usable='yes' vendor='AMD'>EPYC-v3</model>
+      <model usable='yes' vendor='AMD'>EPYC-v2</model>
+      <model usable='yes' vendor='AMD'>EPYC-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
+      <model usable='yes' vendor='AMD'>EPYC-Rome-v1</model>
       <model usable='yes' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Milan</model>
       <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
       <model usable='yes' vendor='AMD'>EPYC</model>
       <model usable='yes' vendor='Hygon'>Dhyana-v2</model>
+      <model usable='yes' vendor='Hygon'>Dhyana-v1</model>
       <model usable='yes' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake-v2</model>
+      <model usable='no' vendor='Intel'>Cooperlake-v1</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Broadwell-v4</model>
+      <model usable='no' vendor='Intel'>Broadwell-v3</model>
+      <model usable='no' vendor='Intel'>Broadwell-v2</model>
+      <model usable='no' vendor='Intel'>Broadwell-v1</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
       <model usable='no' vendor='Intel'>Broadwell-IBRS</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 5f48999b2d..3ba888e8d7 100644
--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
@@ -81,22 +81,34 @@
       <model usable='no' vendor='Intel'>coreduo</model>
       <model usable='no' vendor='Intel'>core2duo</model>
       <model usable='no' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
       <model usable='no' vendor='Intel'>Westmere-IBRS</model>
       <model usable='yes' vendor='Intel'>Westmere</model>
       <model usable='no' vendor='Intel'>Snowridge-v4</model>
       <model usable='no' vendor='Intel'>Snowridge-v3</model>
       <model usable='no' vendor='Intel'>Snowridge-v2</model>
+      <model usable='no' vendor='Intel'>Snowridge-v1</model>
       <model usable='no' vendor='Intel'>Snowridge</model>
       <model usable='no' vendor='Intel'>Skylake-Server-v5</model>
       <model usable='no' vendor='Intel'>Skylake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server</model>
       <model usable='no' vendor='Intel'>Skylake-Client-v4</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>SapphireRapids-v1</model>
       <model usable='no' vendor='Intel'>SapphireRapids</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <model usable='yes' vendor='Intel'>SandyBridge-v1</model>
       <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
       <model usable='yes' vendor='Intel'>SandyBridge</model>
       <model usable='yes' vendor='Intel'>Penryn</model>
@@ -105,36 +117,58 @@
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='no' vendor='Intel'>Nehalem-v2</model>
+      <model usable='yes' vendor='Intel'>Nehalem-v1</model>
       <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
       <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v1</model>
       <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
       <model usable='no' vendor='Intel'>IvyBridge</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v6</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v5</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v4</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Icelake-Server</model>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX</model>
       <model usable='no' vendor='Intel'>Haswell-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell</model>
       <model usable='yes' vendor='AMD'>EPYC-v3</model>
+      <model usable='yes' vendor='AMD'>EPYC-v2</model>
+      <model usable='yes' vendor='AMD'>EPYC-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
+      <model usable='yes' vendor='AMD'>EPYC-Rome-v1</model>
       <model usable='yes' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Milan</model>
       <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
       <model usable='yes' vendor='AMD'>EPYC</model>
       <model usable='yes' vendor='Hygon'>Dhyana-v2</model>
+      <model usable='yes' vendor='Hygon'>Dhyana-v1</model>
       <model usable='yes' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake-v2</model>
+      <model usable='no' vendor='Intel'>Cooperlake-v1</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Broadwell-v4</model>
+      <model usable='no' vendor='Intel'>Broadwell-v3</model>
+      <model usable='no' vendor='Intel'>Broadwell-v2</model>
+      <model usable='no' vendor='Intel'>Broadwell-v1</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
       <model usable='no' vendor='Intel'>Broadwell-IBRS</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 90b9c47864..57d2bdd053 100644
--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
@@ -82,22 +82,34 @@
       <model usable='yes' vendor='Intel'>coreduo</model>
       <model usable='yes' vendor='Intel'>core2duo</model>
       <model usable='yes' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
       <model usable='no' vendor='Intel'>Westmere-IBRS</model>
       <model usable='yes' vendor='Intel'>Westmere</model>
       <model usable='no' vendor='Intel'>Snowridge-v4</model>
       <model usable='no' vendor='Intel'>Snowridge-v3</model>
       <model usable='no' vendor='Intel'>Snowridge-v2</model>
+      <model usable='no' vendor='Intel'>Snowridge-v1</model>
       <model usable='no' vendor='Intel'>Snowridge</model>
       <model usable='no' vendor='Intel'>Skylake-Server-v5</model>
       <model usable='no' vendor='Intel'>Skylake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server</model>
       <model usable='no' vendor='Intel'>Skylake-Client-v4</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>SapphireRapids-v1</model>
       <model usable='no' vendor='Intel'>SapphireRapids</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v1</model>
       <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
       <model usable='no' vendor='Intel'>SandyBridge</model>
       <model usable='yes' vendor='Intel'>Penryn</model>
@@ -106,36 +118,58 @@
       <model usable='no' vendor='AMD'>Opteron_G3</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='no' vendor='Intel'>Nehalem-v2</model>
+      <model usable='yes' vendor='Intel'>Nehalem-v1</model>
       <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
       <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v1</model>
       <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
       <model usable='no' vendor='Intel'>IvyBridge</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v6</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v5</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v4</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Icelake-Server</model>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX</model>
       <model usable='no' vendor='Intel'>Haswell-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell</model>
       <model usable='no' vendor='AMD'>EPYC-v3</model>
+      <model usable='no' vendor='AMD'>EPYC-v2</model>
+      <model usable='no' vendor='AMD'>EPYC-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
+      <model usable='no' vendor='AMD'>EPYC-Rome-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Milan</model>
       <model usable='no' vendor='AMD'>EPYC-IBPB</model>
       <model usable='no' vendor='AMD'>EPYC</model>
       <model usable='no' vendor='Hygon'>Dhyana-v2</model>
+      <model usable='no' vendor='Hygon'>Dhyana-v1</model>
       <model usable='no' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake-v2</model>
+      <model usable='no' vendor='Intel'>Cooperlake-v1</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Broadwell-v4</model>
+      <model usable='no' vendor='Intel'>Broadwell-v3</model>
+      <model usable='no' vendor='Intel'>Broadwell-v2</model>
+      <model usable='no' vendor='Intel'>Broadwell-v1</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
       <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
index 58fc03948c..1bf15a19d3 100644
--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
@@ -80,22 +80,34 @@
       <model usable='no' vendor='Intel'>coreduo</model>
       <model usable='no' vendor='Intel'>core2duo</model>
       <model usable='no' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
       <model usable='no' vendor='Intel'>Westmere-IBRS</model>
       <model usable='yes' vendor='Intel'>Westmere</model>
       <model usable='no' vendor='Intel'>Snowridge-v4</model>
       <model usable='no' vendor='Intel'>Snowridge-v3</model>
       <model usable='no' vendor='Intel'>Snowridge-v2</model>
+      <model usable='no' vendor='Intel'>Snowridge-v1</model>
       <model usable='no' vendor='Intel'>Snowridge</model>
       <model usable='no' vendor='Intel'>Skylake-Server-v5</model>
       <model usable='no' vendor='Intel'>Skylake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server</model>
       <model usable='no' vendor='Intel'>Skylake-Client-v4</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>SapphireRapids-v1</model>
       <model usable='no' vendor='Intel'>SapphireRapids</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <model usable='yes' vendor='Intel'>SandyBridge-v1</model>
       <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
       <model usable='yes' vendor='Intel'>SandyBridge</model>
       <model usable='yes' vendor='Intel'>Penryn</model>
@@ -104,36 +116,58 @@
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='no' vendor='Intel'>Nehalem-v2</model>
+      <model usable='yes' vendor='Intel'>Nehalem-v1</model>
       <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
       <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v1</model>
       <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
       <model usable='no' vendor='Intel'>IvyBridge</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v6</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v5</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v4</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Icelake-Server</model>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX</model>
       <model usable='no' vendor='Intel'>Haswell-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell</model>
       <model usable='yes' vendor='AMD'>EPYC-v3</model>
+      <model usable='yes' vendor='AMD'>EPYC-v2</model>
+      <model usable='yes' vendor='AMD'>EPYC-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
+      <model usable='yes' vendor='AMD'>EPYC-Rome-v1</model>
       <model usable='yes' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Milan</model>
       <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
       <model usable='yes' vendor='AMD'>EPYC</model>
       <model usable='yes' vendor='Hygon'>Dhyana-v2</model>
+      <model usable='yes' vendor='Hygon'>Dhyana-v1</model>
       <model usable='yes' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake-v2</model>
+      <model usable='no' vendor='Intel'>Cooperlake-v1</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Broadwell-v4</model>
+      <model usable='no' vendor='Intel'>Broadwell-v3</model>
+      <model usable='no' vendor='Intel'>Broadwell-v2</model>
+      <model usable='no' vendor='Intel'>Broadwell-v1</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
       <model usable='no' vendor='Intel'>Broadwell-IBRS</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 f4f3e8fa18..672a9d3fbf 100644
--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
@@ -83,23 +83,35 @@
       <model usable='no' vendor='Intel'>coreduo</model>
       <model usable='no' vendor='Intel'>core2duo</model>
       <model usable='no' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
       <model usable='no' vendor='Intel'>Westmere-IBRS</model>
       <model usable='yes' vendor='Intel'>Westmere</model>
       <model usable='no' vendor='Intel'>Snowridge-v4</model>
       <model usable='no' vendor='Intel'>Snowridge-v3</model>
       <model usable='no' vendor='Intel'>Snowridge-v2</model>
+      <model usable='no' vendor='Intel'>Snowridge-v1</model>
       <model usable='no' vendor='Intel'>Snowridge</model>
       <model usable='no' vendor='Intel'>Skylake-Server-v5</model>
       <model usable='no' vendor='Intel'>Skylake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server</model>
       <model usable='no' vendor='Intel'>Skylake-Client-v4</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client</model>
       <model usable='no' vendor='Intel'>SapphireRapids-v2</model>
+      <model usable='no' vendor='Intel'>SapphireRapids-v1</model>
       <model usable='no' vendor='Intel'>SapphireRapids</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <model usable='yes' vendor='Intel'>SandyBridge-v1</model>
       <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
       <model usable='yes' vendor='Intel'>SandyBridge</model>
       <model usable='yes' vendor='Intel'>Penryn</model>
@@ -108,41 +120,63 @@
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='no' vendor='Intel'>Nehalem-v2</model>
+      <model usable='yes' vendor='Intel'>Nehalem-v1</model>
       <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
       <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v1</model>
       <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
       <model usable='no' vendor='Intel'>IvyBridge</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v6</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v5</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v4</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Icelake-Server</model>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX</model>
       <model usable='no' vendor='Intel'>Haswell-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell</model>
       <model usable='no' vendor='AMD'>EPYC-v4</model>
       <model usable='no' vendor='AMD'>EPYC-v3</model>
+      <model usable='yes' vendor='AMD'>EPYC-v2</model>
+      <model usable='yes' vendor='AMD'>EPYC-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Rome-v4</model>
       <model usable='no' vendor='AMD'>EPYC-Rome-v3</model>
       <model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
+      <model usable='no' vendor='AMD'>EPYC-Rome-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Rome</model>
       <model usable='no' vendor='AMD'>EPYC-Milan-v2</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Milan</model>
       <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
       <model usable='no' vendor='AMD'>EPYC-Genoa</model>
       <model usable='yes' vendor='AMD'>EPYC</model>
       <model usable='no' vendor='Hygon'>Dhyana-v2</model>
+      <model usable='yes' vendor='Hygon'>Dhyana-v1</model>
       <model usable='yes' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake-v2</model>
+      <model usable='no' vendor='Intel'>Cooperlake-v1</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Broadwell-v4</model>
+      <model usable='no' vendor='Intel'>Broadwell-v3</model>
+      <model usable='no' vendor='Intel'>Broadwell-v2</model>
+      <model usable='no' vendor='Intel'>Broadwell-v1</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
       <model usable='no' vendor='Intel'>Broadwell-IBRS</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 f8ff2ae2c4..b6f1f63b42 100644
--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
@@ -83,23 +83,35 @@
       <model usable='yes' vendor='Intel'>coreduo</model>
       <model usable='yes' vendor='Intel'>core2duo</model>
       <model usable='yes' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
       <model usable='no' vendor='Intel'>Westmere-IBRS</model>
       <model usable='yes' vendor='Intel'>Westmere</model>
       <model usable='no' vendor='Intel'>Snowridge-v4</model>
       <model usable='no' vendor='Intel'>Snowridge-v3</model>
       <model usable='no' vendor='Intel'>Snowridge-v2</model>
+      <model usable='no' vendor='Intel'>Snowridge-v1</model>
       <model usable='no' vendor='Intel'>Snowridge</model>
       <model usable='no' vendor='Intel'>Skylake-Server-v5</model>
       <model usable='no' vendor='Intel'>Skylake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server</model>
       <model usable='no' vendor='Intel'>Skylake-Client-v4</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client</model>
       <model usable='no' vendor='Intel'>SapphireRapids-v2</model>
+      <model usable='no' vendor='Intel'>SapphireRapids-v1</model>
       <model usable='no' vendor='Intel'>SapphireRapids</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v1</model>
       <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
       <model usable='no' vendor='Intel'>SandyBridge</model>
       <model usable='yes' vendor='Intel'>Penryn</model>
@@ -108,41 +120,63 @@
       <model usable='no' vendor='AMD'>Opteron_G3</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='no' vendor='Intel'>Nehalem-v2</model>
+      <model usable='yes' vendor='Intel'>Nehalem-v1</model>
       <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
       <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v1</model>
       <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
       <model usable='no' vendor='Intel'>IvyBridge</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v6</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v5</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v4</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Icelake-Server</model>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX</model>
       <model usable='no' vendor='Intel'>Haswell-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell</model>
       <model usable='no' vendor='AMD'>EPYC-v4</model>
       <model usable='no' vendor='AMD'>EPYC-v3</model>
+      <model usable='no' vendor='AMD'>EPYC-v2</model>
+      <model usable='no' vendor='AMD'>EPYC-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Rome-v4</model>
       <model usable='no' vendor='AMD'>EPYC-Rome-v3</model>
       <model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
+      <model usable='no' vendor='AMD'>EPYC-Rome-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Rome</model>
       <model usable='no' vendor='AMD'>EPYC-Milan-v2</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Milan</model>
       <model usable='no' vendor='AMD'>EPYC-IBPB</model>
       <model usable='no' vendor='AMD'>EPYC-Genoa</model>
       <model usable='no' vendor='AMD'>EPYC</model>
       <model usable='no' vendor='Hygon'>Dhyana-v2</model>
+      <model usable='no' vendor='Hygon'>Dhyana-v1</model>
       <model usable='no' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake-v2</model>
+      <model usable='no' vendor='Intel'>Cooperlake-v1</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Broadwell-v4</model>
+      <model usable='no' vendor='Intel'>Broadwell-v3</model>
+      <model usable='no' vendor='Intel'>Broadwell-v2</model>
+      <model usable='no' vendor='Intel'>Broadwell-v1</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
       <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
index e935519f9f..e2ca11b515 100644
--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
@@ -82,23 +82,35 @@
       <model usable='no' vendor='Intel'>coreduo</model>
       <model usable='no' vendor='Intel'>core2duo</model>
       <model usable='no' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
       <model usable='no' vendor='Intel'>Westmere-IBRS</model>
       <model usable='yes' vendor='Intel'>Westmere</model>
       <model usable='no' vendor='Intel'>Snowridge-v4</model>
       <model usable='no' vendor='Intel'>Snowridge-v3</model>
       <model usable='no' vendor='Intel'>Snowridge-v2</model>
+      <model usable='no' vendor='Intel'>Snowridge-v1</model>
       <model usable='no' vendor='Intel'>Snowridge</model>
       <model usable='no' vendor='Intel'>Skylake-Server-v5</model>
       <model usable='no' vendor='Intel'>Skylake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server</model>
       <model usable='no' vendor='Intel'>Skylake-Client-v4</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client</model>
       <model usable='no' vendor='Intel'>SapphireRapids-v2</model>
+      <model usable='no' vendor='Intel'>SapphireRapids-v1</model>
       <model usable='no' vendor='Intel'>SapphireRapids</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <model usable='yes' vendor='Intel'>SandyBridge-v1</model>
       <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
       <model usable='yes' vendor='Intel'>SandyBridge</model>
       <model usable='yes' vendor='Intel'>Penryn</model>
@@ -107,41 +119,63 @@
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='no' vendor='Intel'>Nehalem-v2</model>
+      <model usable='yes' vendor='Intel'>Nehalem-v1</model>
       <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
       <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v1</model>
       <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
       <model usable='no' vendor='Intel'>IvyBridge</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v6</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v5</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v4</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Icelake-Server</model>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX</model>
       <model usable='no' vendor='Intel'>Haswell-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell</model>
       <model usable='no' vendor='AMD'>EPYC-v4</model>
       <model usable='no' vendor='AMD'>EPYC-v3</model>
+      <model usable='yes' vendor='AMD'>EPYC-v2</model>
+      <model usable='yes' vendor='AMD'>EPYC-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Rome-v4</model>
       <model usable='no' vendor='AMD'>EPYC-Rome-v3</model>
       <model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
+      <model usable='no' vendor='AMD'>EPYC-Rome-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Rome</model>
       <model usable='no' vendor='AMD'>EPYC-Milan-v2</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Milan</model>
       <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
       <model usable='no' vendor='AMD'>EPYC-Genoa</model>
       <model usable='yes' vendor='AMD'>EPYC</model>
       <model usable='no' vendor='Hygon'>Dhyana-v2</model>
+      <model usable='yes' vendor='Hygon'>Dhyana-v1</model>
       <model usable='yes' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake-v2</model>
+      <model usable='no' vendor='Intel'>Cooperlake-v1</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Broadwell-v4</model>
+      <model usable='no' vendor='Intel'>Broadwell-v3</model>
+      <model usable='no' vendor='Intel'>Broadwell-v2</model>
+      <model usable='no' vendor='Intel'>Broadwell-v1</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
       <model usable='no' vendor='Intel'>Broadwell-IBRS</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 d90651b46c..cf2f7686d6 100644
--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
@@ -83,23 +83,35 @@
       <model usable='no' vendor='Intel'>coreduo</model>
       <model usable='no' vendor='Intel'>core2duo</model>
       <model usable='no' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
       <model usable='no' vendor='Intel'>Westmere-IBRS</model>
       <model usable='yes' vendor='Intel'>Westmere</model>
       <model usable='no' vendor='Intel'>Snowridge-v4</model>
       <model usable='no' vendor='Intel'>Snowridge-v3</model>
       <model usable='no' vendor='Intel'>Snowridge-v2</model>
+      <model usable='no' vendor='Intel'>Snowridge-v1</model>
       <model usable='no' vendor='Intel'>Snowridge</model>
       <model usable='no' vendor='Intel'>Skylake-Server-v5</model>
       <model usable='no' vendor='Intel'>Skylake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server</model>
       <model usable='no' vendor='Intel'>Skylake-Client-v4</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client</model>
       <model usable='no' vendor='Intel'>SapphireRapids-v2</model>
+      <model usable='no' vendor='Intel'>SapphireRapids-v1</model>
       <model usable='no' vendor='Intel'>SapphireRapids</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <model usable='yes' vendor='Intel'>SandyBridge-v1</model>
       <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
       <model usable='yes' vendor='Intel'>SandyBridge</model>
       <model usable='yes' vendor='Intel'>Penryn</model>
@@ -108,41 +120,63 @@
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='no' vendor='Intel'>Nehalem-v2</model>
+      <model usable='yes' vendor='Intel'>Nehalem-v1</model>
       <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
       <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v1</model>
       <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
       <model usable='no' vendor='Intel'>IvyBridge</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v6</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v5</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v4</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Icelake-Server</model>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX</model>
       <model usable='no' vendor='Intel'>Haswell-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell</model>
       <model usable='no' vendor='AMD'>EPYC-v4</model>
       <model usable='no' vendor='AMD'>EPYC-v3</model>
+      <model usable='yes' vendor='AMD'>EPYC-v2</model>
+      <model usable='yes' vendor='AMD'>EPYC-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Rome-v4</model>
       <model usable='no' vendor='AMD'>EPYC-Rome-v3</model>
       <model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
+      <model usable='no' vendor='AMD'>EPYC-Rome-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Rome</model>
       <model usable='no' vendor='AMD'>EPYC-Milan-v2</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Milan</model>
       <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
       <model usable='no' vendor='AMD'>EPYC-Genoa</model>
       <model usable='yes' vendor='AMD'>EPYC</model>
       <model usable='no' vendor='Hygon'>Dhyana-v2</model>
+      <model usable='yes' vendor='Hygon'>Dhyana-v1</model>
       <model usable='yes' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake-v2</model>
+      <model usable='no' vendor='Intel'>Cooperlake-v1</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Broadwell-v4</model>
+      <model usable='no' vendor='Intel'>Broadwell-v3</model>
+      <model usable='no' vendor='Intel'>Broadwell-v2</model>
+      <model usable='no' vendor='Intel'>Broadwell-v1</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
       <model usable='no' vendor='Intel'>Broadwell-IBRS</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 dda5d202a8..c58a5d1abb 100644
--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
@@ -83,23 +83,35 @@
       <model usable='yes' vendor='Intel'>coreduo</model>
       <model usable='yes' vendor='Intel'>core2duo</model>
       <model usable='yes' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
       <model usable='no' vendor='Intel'>Westmere-IBRS</model>
       <model usable='yes' vendor='Intel'>Westmere</model>
       <model usable='no' vendor='Intel'>Snowridge-v4</model>
       <model usable='no' vendor='Intel'>Snowridge-v3</model>
       <model usable='no' vendor='Intel'>Snowridge-v2</model>
+      <model usable='no' vendor='Intel'>Snowridge-v1</model>
       <model usable='no' vendor='Intel'>Snowridge</model>
       <model usable='no' vendor='Intel'>Skylake-Server-v5</model>
       <model usable='no' vendor='Intel'>Skylake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server</model>
       <model usable='no' vendor='Intel'>Skylake-Client-v4</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client</model>
       <model usable='no' vendor='Intel'>SapphireRapids-v2</model>
+      <model usable='no' vendor='Intel'>SapphireRapids-v1</model>
       <model usable='no' vendor='Intel'>SapphireRapids</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v1</model>
       <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
       <model usable='no' vendor='Intel'>SandyBridge</model>
       <model usable='yes' vendor='Intel'>Penryn</model>
@@ -108,41 +120,63 @@
       <model usable='no' vendor='AMD'>Opteron_G3</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='no' vendor='Intel'>Nehalem-v2</model>
+      <model usable='yes' vendor='Intel'>Nehalem-v1</model>
       <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
       <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v1</model>
       <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
       <model usable='no' vendor='Intel'>IvyBridge</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v6</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v5</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v4</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Icelake-Server</model>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX</model>
       <model usable='no' vendor='Intel'>Haswell-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell</model>
       <model usable='no' vendor='AMD'>EPYC-v4</model>
       <model usable='no' vendor='AMD'>EPYC-v3</model>
+      <model usable='no' vendor='AMD'>EPYC-v2</model>
+      <model usable='no' vendor='AMD'>EPYC-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Rome-v4</model>
       <model usable='no' vendor='AMD'>EPYC-Rome-v3</model>
       <model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
+      <model usable='no' vendor='AMD'>EPYC-Rome-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Rome</model>
       <model usable='no' vendor='AMD'>EPYC-Milan-v2</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Milan</model>
       <model usable='no' vendor='AMD'>EPYC-IBPB</model>
       <model usable='no' vendor='AMD'>EPYC-Genoa</model>
       <model usable='no' vendor='AMD'>EPYC</model>
       <model usable='no' vendor='Hygon'>Dhyana-v2</model>
+      <model usable='no' vendor='Hygon'>Dhyana-v1</model>
       <model usable='no' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake-v2</model>
+      <model usable='no' vendor='Intel'>Cooperlake-v1</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Broadwell-v4</model>
+      <model usable='no' vendor='Intel'>Broadwell-v3</model>
+      <model usable='no' vendor='Intel'>Broadwell-v2</model>
+      <model usable='no' vendor='Intel'>Broadwell-v1</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
       <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
index aeb05da1dd..c1fe1d850d 100644
--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
@@ -82,23 +82,35 @@
       <model usable='no' vendor='Intel'>coreduo</model>
       <model usable='no' vendor='Intel'>core2duo</model>
       <model usable='no' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
       <model usable='no' vendor='Intel'>Westmere-IBRS</model>
       <model usable='yes' vendor='Intel'>Westmere</model>
       <model usable='no' vendor='Intel'>Snowridge-v4</model>
       <model usable='no' vendor='Intel'>Snowridge-v3</model>
       <model usable='no' vendor='Intel'>Snowridge-v2</model>
+      <model usable='no' vendor='Intel'>Snowridge-v1</model>
       <model usable='no' vendor='Intel'>Snowridge</model>
       <model usable='no' vendor='Intel'>Skylake-Server-v5</model>
       <model usable='no' vendor='Intel'>Skylake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Server</model>
       <model usable='no' vendor='Intel'>Skylake-Client-v4</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v3</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v2</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-v1</model>
       <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
       <model usable='no' vendor='Intel'>Skylake-Client</model>
       <model usable='no' vendor='Intel'>SapphireRapids-v2</model>
+      <model usable='no' vendor='Intel'>SapphireRapids-v1</model>
       <model usable='no' vendor='Intel'>SapphireRapids</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <model usable='yes' vendor='Intel'>SandyBridge-v1</model>
       <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
       <model usable='yes' vendor='Intel'>SandyBridge</model>
       <model usable='yes' vendor='Intel'>Penryn</model>
@@ -107,41 +119,63 @@
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='no' vendor='Intel'>Nehalem-v2</model>
+      <model usable='yes' vendor='Intel'>Nehalem-v1</model>
       <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
       <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+      <model usable='no' vendor='Intel'>IvyBridge-v1</model>
       <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
       <model usable='no' vendor='Intel'>IvyBridge</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v6</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v5</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v4</model>
       <model usable='no' vendor='Intel'>Icelake-Server-v3</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Icelake-Server</model>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell-noTSX</model>
       <model usable='no' vendor='Intel'>Haswell-IBRS</model>
       <model usable='no' vendor='Intel'>Haswell</model>
       <model usable='no' vendor='AMD'>EPYC-v4</model>
       <model usable='no' vendor='AMD'>EPYC-v3</model>
+      <model usable='yes' vendor='AMD'>EPYC-v2</model>
+      <model usable='yes' vendor='AMD'>EPYC-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Rome-v4</model>
       <model usable='no' vendor='AMD'>EPYC-Rome-v3</model>
       <model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
+      <model usable='no' vendor='AMD'>EPYC-Rome-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Rome</model>
       <model usable='no' vendor='AMD'>EPYC-Milan-v2</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
       <model usable='no' vendor='AMD'>EPYC-Milan</model>
       <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
       <model usable='no' vendor='AMD'>EPYC-Genoa</model>
       <model usable='yes' vendor='AMD'>EPYC</model>
       <model usable='no' vendor='Hygon'>Dhyana-v2</model>
+      <model usable='yes' vendor='Hygon'>Dhyana-v1</model>
       <model usable='yes' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake-v2</model>
+      <model usable='no' vendor='Intel'>Cooperlake-v1</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Broadwell-v4</model>
+      <model usable='no' vendor='Intel'>Broadwell-v3</model>
+      <model usable='no' vendor='Intel'>Broadwell-v2</model>
+      <model usable='no' vendor='Intel'>Broadwell-v1</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
       <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
-- 
2.41.0
_______________________________________________
Devel mailing list -- devel@xxxxxxxxxxxxxxxxx
To unsubscribe send an email to devel-leave@xxxxxxxxxxxxxxxxx







