cpu_x86: Implement virCPUGetVendorForModel

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
index 9fcd6b8add4c1ef21455a9b74b35e3a413a48ee3..4d2379803c448a768328a1331e5b123327db2bfb 100644 (file)
--- a/src/cpu/cpu_x86.c
+++ b/src/cpu/cpu_x86.c
@@ -3137,6 +3137,24 @@ virCPUx86GetModels(char ***models)
 }
 
 
+static const char *
+virCPUx86GetVendorForModel(const char *modelName)
+{
+    virCPUx86Map *map;
+    virCPUx86Model *model;
+
+    if (!(map = virCPUx86GetMap()))
+        return NULL;
+
+    model = x86ModelFind(map, modelName);
+
+    if (!model || !model->vendor)
+        return NULL;
+
+    return model->vendor->name;
+}
+
+
 static int
 virCPUx86Translate(virCPUDef *cpu,
                    virDomainCapsCPUModels *models)
@@ -3539,6 +3557,7 @@ struct cpuArchDriver cpuDriverX86 = {
     .dataFormat = virCPUx86DataFormat,
     .dataParse  = virCPUx86DataParse,
     .getModels  = virCPUx86GetModels,
+    .getVendorForModel = virCPUx86GetVendorForModel,
     .translate  = virCPUx86Translate,
     .expandFeatures = virCPUx86ExpandFeatures,
     .copyMigratable = virCPUx86CopyMigratable,

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 fa865548929355eb1ded2c5d6d307240b0c4e4da..dab12e588807f100dddb3c89f9d5579c8570f00b 100644 (file)
--- a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
@@ -63,55 +63,55 @@
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
       <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='unknown'>phenom</model>
+      <model usable='no' vendor='AMD'>phenom</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium2</model>
       <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='yes' vendor='unknown'>n270</model>
+      <model usable='yes' vendor='Intel'>n270</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='yes' vendor='unknown'>coreduo</model>
-      <model usable='yes' vendor='unknown'>core2duo</model>
-      <model usable='no' vendor='unknown'>athlon</model>
-      <model usable='yes' vendor='unknown'>Westmere-IBRS</model>
-      <model usable='yes' vendor='unknown'>Westmere</model>
-      <model usable='no' vendor='unknown'>Snowridge</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server</model>
-      <model usable='yes' vendor='unknown'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='yes' vendor='unknown'>Skylake-Client-IBRS</model>
-      <model usable='yes' vendor='unknown'>Skylake-Client</model>
-      <model usable='yes' vendor='unknown'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='unknown'>SandyBridge</model>
-      <model usable='yes' vendor='unknown'>Penryn</model>
-      <model usable='no' vendor='unknown'>Opteron_G5</model>
-      <model usable='no' vendor='unknown'>Opteron_G4</model>
-      <model usable='no' vendor='unknown'>Opteron_G3</model>
-      <model usable='yes' vendor='unknown'>Opteron_G2</model>
-      <model usable='yes' vendor='unknown'>Opteron_G1</model>
-      <model usable='yes' vendor='unknown'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='unknown'>Nehalem</model>
-      <model usable='yes' vendor='unknown'>IvyBridge-IBRS</model>
-      <model usable='yes' vendor='unknown'>IvyBridge</model>
-      <model usable='no' vendor='unknown'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Server</model>
-      <model usable='no' vendor='unknown'>Icelake-Client-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Client</model>
-      <model usable='yes' vendor='unknown'>Haswell-noTSX-IBRS</model>
-      <model usable='yes' vendor='unknown'>Haswell-noTSX</model>
-      <model usable='yes' vendor='unknown'>Haswell-IBRS</model>
-      <model usable='yes' vendor='unknown'>Haswell</model>
-      <model usable='no' vendor='unknown'>EPYC-IBPB</model>
-      <model usable='no' vendor='unknown'>EPYC</model>
-      <model usable='no' vendor='unknown'>Dhyana</model>
-      <model usable='yes' vendor='unknown'>Conroe</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server</model>
-      <model usable='yes' vendor='unknown'>Broadwell-noTSX-IBRS</model>
-      <model usable='yes' vendor='unknown'>Broadwell-noTSX</model>
-      <model usable='yes' vendor='unknown'>Broadwell-IBRS</model>
-      <model usable='yes' vendor='unknown'>Broadwell</model>
+      <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-IBRS</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Snowridge</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-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-IBRS</model>
+      <model usable='yes' vendor='Intel'>SandyBridge</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD'>Opteron_G4</model>
+      <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-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='yes' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel'>IvyBridge</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-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-IBPB</model>
+      <model usable='no' vendor='AMD'>EPYC</model>
+      <model usable='no' vendor='Hygon'>Dhyana</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</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>
+      <model usable='yes' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
     </mode>
   </cpu>

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 2909d1fd0a4fdac69fa7837cbbe4a9ccc6ee60bf..6dc6decf1e5312d5f2cf6afd2668531532d9f6aa 100644 (file)
--- a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
@@ -77,55 +77,55 @@
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
       <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='unknown'>phenom</model>
+      <model usable='no' vendor='AMD'>phenom</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium2</model>
       <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='yes' vendor='unknown'>n270</model>
+      <model usable='yes' vendor='Intel'>n270</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='yes' vendor='unknown'>coreduo</model>
-      <model usable='yes' vendor='unknown'>core2duo</model>
-      <model usable='yes' vendor='unknown'>athlon</model>
-      <model usable='no' vendor='unknown'>Westmere-IBRS</model>
-      <model usable='no' vendor='unknown'>Westmere</model>
-      <model usable='no' vendor='unknown'>Snowridge</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client</model>
-      <model usable='no' vendor='unknown'>SandyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>SandyBridge</model>
-      <model usable='yes' vendor='unknown'>Penryn</model>
-      <model usable='no' vendor='unknown'>Opteron_G5</model>
-      <model usable='no' vendor='unknown'>Opteron_G4</model>
-      <model usable='no' vendor='unknown'>Opteron_G3</model>
-      <model usable='yes' vendor='unknown'>Opteron_G2</model>
-      <model usable='yes' vendor='unknown'>Opteron_G1</model>
-      <model usable='no' vendor='unknown'>Nehalem-IBRS</model>
-      <model usable='no' vendor='unknown'>Nehalem</model>
-      <model usable='no' vendor='unknown'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>IvyBridge</model>
-      <model usable='no' vendor='unknown'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Server</model>
-      <model usable='no' vendor='unknown'>Icelake-Client-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Client</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX</model>
-      <model usable='no' vendor='unknown'>Haswell-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell</model>
-      <model usable='no' vendor='unknown'>EPYC-IBPB</model>
-      <model usable='no' vendor='unknown'>EPYC</model>
-      <model usable='no' vendor='unknown'>Dhyana</model>
-      <model usable='yes' vendor='unknown'>Conroe</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX</model>
-      <model usable='no' vendor='unknown'>Broadwell-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell</model>
+      <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-IBRS</model>
+      <model usable='no' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Snowridge</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-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-IBRS</model>
+      <model usable='no' vendor='Intel'>SandyBridge</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD'>Opteron_G4</model>
+      <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-IBRS</model>
+      <model usable='no' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>IvyBridge</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-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-IBPB</model>
+      <model usable='no' vendor='AMD'>EPYC</model>
+      <model usable='no' vendor='Hygon'>Dhyana</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</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>
+      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
     </mode>
   </cpu>

diff --git a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
index 272d36d61bb0820824987eedaea21eec269c85b7..d9c12424c67fe6c78ab9dae178f83642ba914c85 100644 (file)
--- a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
@@ -62,55 +62,55 @@
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
       <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='unknown'>phenom</model>
+      <model usable='no' vendor='AMD'>phenom</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium2</model>
       <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='yes' vendor='unknown'>n270</model>
+      <model usable='yes' vendor='Intel'>n270</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='yes' vendor='unknown'>coreduo</model>
-      <model usable='yes' vendor='unknown'>core2duo</model>
-      <model usable='no' vendor='unknown'>athlon</model>
-      <model usable='yes' vendor='unknown'>Westmere-IBRS</model>
-      <model usable='yes' vendor='unknown'>Westmere</model>
-      <model usable='no' vendor='unknown'>Snowridge</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server</model>
-      <model usable='yes' vendor='unknown'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='yes' vendor='unknown'>Skylake-Client-IBRS</model>
-      <model usable='yes' vendor='unknown'>Skylake-Client</model>
-      <model usable='yes' vendor='unknown'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='unknown'>SandyBridge</model>
-      <model usable='yes' vendor='unknown'>Penryn</model>
-      <model usable='no' vendor='unknown'>Opteron_G5</model>
-      <model usable='no' vendor='unknown'>Opteron_G4</model>
-      <model usable='no' vendor='unknown'>Opteron_G3</model>
-      <model usable='yes' vendor='unknown'>Opteron_G2</model>
-      <model usable='yes' vendor='unknown'>Opteron_G1</model>
-      <model usable='yes' vendor='unknown'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='unknown'>Nehalem</model>
-      <model usable='yes' vendor='unknown'>IvyBridge-IBRS</model>
-      <model usable='yes' vendor='unknown'>IvyBridge</model>
-      <model usable='no' vendor='unknown'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Server</model>
-      <model usable='no' vendor='unknown'>Icelake-Client-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Client</model>
-      <model usable='yes' vendor='unknown'>Haswell-noTSX-IBRS</model>
-      <model usable='yes' vendor='unknown'>Haswell-noTSX</model>
-      <model usable='yes' vendor='unknown'>Haswell-IBRS</model>
-      <model usable='yes' vendor='unknown'>Haswell</model>
-      <model usable='no' vendor='unknown'>EPYC-IBPB</model>
-      <model usable='no' vendor='unknown'>EPYC</model>
-      <model usable='no' vendor='unknown'>Dhyana</model>
-      <model usable='yes' vendor='unknown'>Conroe</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server</model>
-      <model usable='yes' vendor='unknown'>Broadwell-noTSX-IBRS</model>
-      <model usable='yes' vendor='unknown'>Broadwell-noTSX</model>
-      <model usable='yes' vendor='unknown'>Broadwell-IBRS</model>
-      <model usable='yes' vendor='unknown'>Broadwell</model>
+      <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-IBRS</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Snowridge</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-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-IBRS</model>
+      <model usable='yes' vendor='Intel'>SandyBridge</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD'>Opteron_G4</model>
+      <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-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='yes' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel'>IvyBridge</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-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-IBPB</model>
+      <model usable='no' vendor='AMD'>EPYC</model>
+      <model usable='no' vendor='Hygon'>Dhyana</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</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>
+      <model usable='yes' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
     </mode>
   </cpu>

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 3e25bcb048f77bbae2f6ec6474a122b6a6419f8a..52c5d235bbfb0a9d4da60b6d218bfba755aa4ee2 100644 (file)
--- a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
@@ -63,57 +63,57 @@
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
       <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='unknown'>phenom</model>
+      <model usable='no' vendor='AMD'>phenom</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium2</model>
       <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='yes' vendor='unknown'>n270</model>
+      <model usable='yes' vendor='Intel'>n270</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='yes' vendor='unknown'>coreduo</model>
-      <model usable='yes' vendor='unknown'>core2duo</model>
-      <model usable='no' vendor='unknown'>athlon</model>
-      <model usable='yes' vendor='unknown'>Westmere-IBRS</model>
-      <model usable='yes' vendor='unknown'>Westmere</model>
-      <model usable='no' vendor='unknown'>Snowridge</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server</model>
-      <model usable='yes' vendor='unknown'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='yes' vendor='unknown'>Skylake-Client-IBRS</model>
-      <model usable='yes' vendor='unknown'>Skylake-Client</model>
-      <model usable='yes' vendor='unknown'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='unknown'>SandyBridge</model>
-      <model usable='yes' vendor='unknown'>Penryn</model>
-      <model usable='no' vendor='unknown'>Opteron_G5</model>
-      <model usable='no' vendor='unknown'>Opteron_G4</model>
-      <model usable='no' vendor='unknown'>Opteron_G3</model>
-      <model usable='yes' vendor='unknown'>Opteron_G2</model>
-      <model usable='yes' vendor='unknown'>Opteron_G1</model>
-      <model usable='yes' vendor='unknown'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='unknown'>Nehalem</model>
-      <model usable='yes' vendor='unknown'>IvyBridge-IBRS</model>
-      <model usable='yes' vendor='unknown'>IvyBridge</model>
-      <model usable='no' vendor='unknown'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Server</model>
-      <model usable='no' vendor='unknown'>Icelake-Client-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Client</model>
-      <model usable='yes' vendor='unknown'>Haswell-noTSX-IBRS</model>
-      <model usable='yes' vendor='unknown'>Haswell-noTSX</model>
-      <model usable='yes' vendor='unknown'>Haswell-IBRS</model>
-      <model usable='yes' vendor='unknown'>Haswell</model>
-      <model usable='no' vendor='unknown'>EPYC-Rome</model>
-      <model usable='no' vendor='unknown'>EPYC-IBPB</model>
-      <model usable='no' vendor='unknown'>EPYC</model>
-      <model usable='no' vendor='unknown'>Dhyana</model>
-      <model usable='no' vendor='unknown'>Cooperlake</model>
-      <model usable='yes' vendor='unknown'>Conroe</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server</model>
-      <model usable='yes' vendor='unknown'>Broadwell-noTSX-IBRS</model>
-      <model usable='yes' vendor='unknown'>Broadwell-noTSX</model>
-      <model usable='yes' vendor='unknown'>Broadwell-IBRS</model>
-      <model usable='yes' vendor='unknown'>Broadwell</model>
+      <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-IBRS</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Snowridge</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-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-IBRS</model>
+      <model usable='yes' vendor='Intel'>SandyBridge</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD'>Opteron_G4</model>
+      <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-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='yes' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel'>IvyBridge</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-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-Rome</model>
+      <model usable='no' vendor='AMD'>EPYC-IBPB</model>
+      <model usable='no' vendor='AMD'>EPYC</model>
+      <model usable='no' vendor='Hygon'>Dhyana</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</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>
+      <model usable='yes' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
     </mode>
   </cpu>

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 b92d519be6624b39fd629019ad8afcf75f46c9c8..8a0f20b06f77b3b11d2503ac3e3aac26b9eb60fd 100644 (file)
--- a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
@@ -77,57 +77,57 @@
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
       <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='unknown'>phenom</model>
+      <model usable='no' vendor='AMD'>phenom</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium2</model>
       <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='yes' vendor='unknown'>n270</model>
+      <model usable='yes' vendor='Intel'>n270</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='yes' vendor='unknown'>coreduo</model>
-      <model usable='yes' vendor='unknown'>core2duo</model>
-      <model usable='yes' vendor='unknown'>athlon</model>
-      <model usable='no' vendor='unknown'>Westmere-IBRS</model>
-      <model usable='yes' vendor='unknown'>Westmere</model>
-      <model usable='no' vendor='unknown'>Snowridge</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client</model>
-      <model usable='no' vendor='unknown'>SandyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>SandyBridge</model>
-      <model usable='yes' vendor='unknown'>Penryn</model>
-      <model usable='no' vendor='unknown'>Opteron_G5</model>
-      <model usable='no' vendor='unknown'>Opteron_G4</model>
-      <model usable='no' vendor='unknown'>Opteron_G3</model>
-      <model usable='yes' vendor='unknown'>Opteron_G2</model>
-      <model usable='yes' vendor='unknown'>Opteron_G1</model>
-      <model usable='no' vendor='unknown'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='unknown'>Nehalem</model>
-      <model usable='no' vendor='unknown'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>IvyBridge</model>
-      <model usable='no' vendor='unknown'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Server</model>
-      <model usable='no' vendor='unknown'>Icelake-Client-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Client</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX</model>
-      <model usable='no' vendor='unknown'>Haswell-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell</model>
-      <model usable='no' vendor='unknown'>EPYC-Rome</model>
-      <model usable='no' vendor='unknown'>EPYC-IBPB</model>
-      <model usable='no' vendor='unknown'>EPYC</model>
-      <model usable='no' vendor='unknown'>Dhyana</model>
-      <model usable='no' vendor='unknown'>Cooperlake</model>
-      <model usable='yes' vendor='unknown'>Conroe</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX</model>
-      <model usable='no' vendor='unknown'>Broadwell-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell</model>
+      <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-IBRS</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Snowridge</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-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-IBRS</model>
+      <model usable='no' vendor='Intel'>SandyBridge</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD'>Opteron_G4</model>
+      <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-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>IvyBridge</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-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-Rome</model>
+      <model usable='no' vendor='AMD'>EPYC-IBPB</model>
+      <model usable='no' vendor='AMD'>EPYC</model>
+      <model usable='no' vendor='Hygon'>Dhyana</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</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>
+      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
     </mode>
   </cpu>

diff --git a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
index ecbd13fb199d53ce11ca8874320098aeb004f246..d9b7c3144825c412e531162f664943a04f8910e4 100644 (file)
--- a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
@@ -62,57 +62,57 @@
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
       <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='unknown'>phenom</model>
+      <model usable='no' vendor='AMD'>phenom</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium2</model>
       <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='yes' vendor='unknown'>n270</model>
+      <model usable='yes' vendor='Intel'>n270</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='yes' vendor='unknown'>coreduo</model>
-      <model usable='yes' vendor='unknown'>core2duo</model>
-      <model usable='no' vendor='unknown'>athlon</model>
-      <model usable='yes' vendor='unknown'>Westmere-IBRS</model>
-      <model usable='yes' vendor='unknown'>Westmere</model>
-      <model usable='no' vendor='unknown'>Snowridge</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server</model>
-      <model usable='yes' vendor='unknown'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='yes' vendor='unknown'>Skylake-Client-IBRS</model>
-      <model usable='yes' vendor='unknown'>Skylake-Client</model>
-      <model usable='yes' vendor='unknown'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='unknown'>SandyBridge</model>
-      <model usable='yes' vendor='unknown'>Penryn</model>
-      <model usable='no' vendor='unknown'>Opteron_G5</model>
-      <model usable='no' vendor='unknown'>Opteron_G4</model>
-      <model usable='no' vendor='unknown'>Opteron_G3</model>
-      <model usable='yes' vendor='unknown'>Opteron_G2</model>
-      <model usable='yes' vendor='unknown'>Opteron_G1</model>
-      <model usable='yes' vendor='unknown'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='unknown'>Nehalem</model>
-      <model usable='yes' vendor='unknown'>IvyBridge-IBRS</model>
-      <model usable='yes' vendor='unknown'>IvyBridge</model>
-      <model usable='no' vendor='unknown'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Server</model>
-      <model usable='no' vendor='unknown'>Icelake-Client-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Client</model>
-      <model usable='yes' vendor='unknown'>Haswell-noTSX-IBRS</model>
-      <model usable='yes' vendor='unknown'>Haswell-noTSX</model>
-      <model usable='yes' vendor='unknown'>Haswell-IBRS</model>
-      <model usable='yes' vendor='unknown'>Haswell</model>
-      <model usable='no' vendor='unknown'>EPYC-Rome</model>
-      <model usable='no' vendor='unknown'>EPYC-IBPB</model>
-      <model usable='no' vendor='unknown'>EPYC</model>
-      <model usable='no' vendor='unknown'>Dhyana</model>
-      <model usable='no' vendor='unknown'>Cooperlake</model>
-      <model usable='yes' vendor='unknown'>Conroe</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server</model>
-      <model usable='yes' vendor='unknown'>Broadwell-noTSX-IBRS</model>
-      <model usable='yes' vendor='unknown'>Broadwell-noTSX</model>
-      <model usable='yes' vendor='unknown'>Broadwell-IBRS</model>
-      <model usable='yes' vendor='unknown'>Broadwell</model>
+      <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-IBRS</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Snowridge</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-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-IBRS</model>
+      <model usable='yes' vendor='Intel'>SandyBridge</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD'>Opteron_G4</model>
+      <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-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='yes' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel'>IvyBridge</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-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-Rome</model>
+      <model usable='no' vendor='AMD'>EPYC-IBPB</model>
+      <model usable='no' vendor='AMD'>EPYC</model>
+      <model usable='no' vendor='Hygon'>Dhyana</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</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>
+      <model usable='yes' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
     </mode>
   </cpu>

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 d0ceae6d7f2df6fcd50d32c8df49caa7a41a68f3..0917fb3e9480e25398ffdce8e8b38c93a0372961 100644 (file)
--- a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
@@ -64,57 +64,57 @@
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
       <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='unknown'>phenom</model>
+      <model usable='no' vendor='AMD'>phenom</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium2</model>
       <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='no' vendor='unknown'>n270</model>
+      <model usable='no' vendor='Intel'>n270</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='no' vendor='unknown'>coreduo</model>
-      <model usable='no' vendor='unknown'>core2duo</model>
-      <model usable='no' vendor='unknown'>athlon</model>
-      <model usable='no' vendor='unknown'>Westmere-IBRS</model>
-      <model usable='yes' vendor='unknown'>Westmere</model>
-      <model usable='no' vendor='unknown'>Snowridge</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client</model>
-      <model usable='no' vendor='unknown'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='unknown'>SandyBridge</model>
-      <model usable='yes' vendor='unknown'>Penryn</model>
-      <model usable='no' vendor='unknown'>Opteron_G5</model>
-      <model usable='no' vendor='unknown'>Opteron_G4</model>
-      <model usable='yes' vendor='unknown'>Opteron_G3</model>
-      <model usable='yes' vendor='unknown'>Opteron_G2</model>
-      <model usable='yes' vendor='unknown'>Opteron_G1</model>
-      <model usable='no' vendor='unknown'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='unknown'>Nehalem</model>
-      <model usable='no' vendor='unknown'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>IvyBridge</model>
-      <model usable='no' vendor='unknown'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Server</model>
-      <model usable='no' vendor='unknown'>Icelake-Client-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Client</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX</model>
-      <model usable='no' vendor='unknown'>Haswell-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell</model>
-      <model usable='yes' vendor='unknown'>EPYC-Rome</model>
-      <model usable='yes' vendor='unknown'>EPYC-IBPB</model>
-      <model usable='yes' vendor='unknown'>EPYC</model>
-      <model usable='yes' vendor='unknown'>Dhyana</model>
-      <model usable='no' vendor='unknown'>Cooperlake</model>
-      <model usable='yes' vendor='unknown'>Conroe</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX</model>
-      <model usable='no' vendor='unknown'>Broadwell-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell</model>
+      <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-IBRS</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Snowridge</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-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-IBRS</model>
+      <model usable='yes' vendor='Intel'>SandyBridge</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD'>Opteron_G4</model>
+      <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-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>IvyBridge</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-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-Rome</model>
+      <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
+      <model usable='yes' vendor='AMD'>EPYC</model>
+      <model usable='yes' vendor='Hygon'>Dhyana</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</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>
+      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
     </mode>
   </cpu>

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 92560c92ed03ea36b962977b022b6343f29b0b00..b2dc0cecca6ecb970a23c93cc8ff0eb97114f1bd 100644 (file)
--- a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
@@ -77,57 +77,57 @@
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
       <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='unknown'>phenom</model>
+      <model usable='no' vendor='AMD'>phenom</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium2</model>
       <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='yes' vendor='unknown'>n270</model>
+      <model usable='yes' vendor='Intel'>n270</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='yes' vendor='unknown'>coreduo</model>
-      <model usable='yes' vendor='unknown'>core2duo</model>
-      <model usable='yes' vendor='unknown'>athlon</model>
-      <model usable='no' vendor='unknown'>Westmere-IBRS</model>
-      <model usable='yes' vendor='unknown'>Westmere</model>
-      <model usable='no' vendor='unknown'>Snowridge</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client</model>
-      <model usable='no' vendor='unknown'>SandyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>SandyBridge</model>
-      <model usable='yes' vendor='unknown'>Penryn</model>
-      <model usable='no' vendor='unknown'>Opteron_G5</model>
-      <model usable='no' vendor='unknown'>Opteron_G4</model>
-      <model usable='no' vendor='unknown'>Opteron_G3</model>
-      <model usable='yes' vendor='unknown'>Opteron_G2</model>
-      <model usable='yes' vendor='unknown'>Opteron_G1</model>
-      <model usable='no' vendor='unknown'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='unknown'>Nehalem</model>
-      <model usable='no' vendor='unknown'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>IvyBridge</model>
-      <model usable='no' vendor='unknown'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Server</model>
-      <model usable='no' vendor='unknown'>Icelake-Client-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Client</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX</model>
-      <model usable='no' vendor='unknown'>Haswell-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell</model>
-      <model usable='no' vendor='unknown'>EPYC-Rome</model>
-      <model usable='no' vendor='unknown'>EPYC-IBPB</model>
-      <model usable='no' vendor='unknown'>EPYC</model>
-      <model usable='no' vendor='unknown'>Dhyana</model>
-      <model usable='no' vendor='unknown'>Cooperlake</model>
-      <model usable='yes' vendor='unknown'>Conroe</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX</model>
-      <model usable='no' vendor='unknown'>Broadwell-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell</model>
+      <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-IBRS</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Snowridge</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-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-IBRS</model>
+      <model usable='no' vendor='Intel'>SandyBridge</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD'>Opteron_G4</model>
+      <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-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>IvyBridge</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-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-Rome</model>
+      <model usable='no' vendor='AMD'>EPYC-IBPB</model>
+      <model usable='no' vendor='AMD'>EPYC</model>
+      <model usable='no' vendor='Hygon'>Dhyana</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</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>
+      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
     </mode>
   </cpu>

diff --git a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
index 169db1c00ff31a86bbe9544219597f20048a096c..abddcd6e62d7ad0208e2306b12cf308cd484d174 100644 (file)
--- a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
@@ -63,57 +63,57 @@
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
       <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='unknown'>phenom</model>
+      <model usable='no' vendor='AMD'>phenom</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium2</model>
       <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='no' vendor='unknown'>n270</model>
+      <model usable='no' vendor='Intel'>n270</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='no' vendor='unknown'>coreduo</model>
-      <model usable='no' vendor='unknown'>core2duo</model>
-      <model usable='no' vendor='unknown'>athlon</model>
-      <model usable='no' vendor='unknown'>Westmere-IBRS</model>
-      <model usable='yes' vendor='unknown'>Westmere</model>
-      <model usable='no' vendor='unknown'>Snowridge</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client</model>
-      <model usable='no' vendor='unknown'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='unknown'>SandyBridge</model>
-      <model usable='yes' vendor='unknown'>Penryn</model>
-      <model usable='no' vendor='unknown'>Opteron_G5</model>
-      <model usable='no' vendor='unknown'>Opteron_G4</model>
-      <model usable='yes' vendor='unknown'>Opteron_G3</model>
-      <model usable='yes' vendor='unknown'>Opteron_G2</model>
-      <model usable='yes' vendor='unknown'>Opteron_G1</model>
-      <model usable='no' vendor='unknown'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='unknown'>Nehalem</model>
-      <model usable='no' vendor='unknown'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>IvyBridge</model>
-      <model usable='no' vendor='unknown'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Server</model>
-      <model usable='no' vendor='unknown'>Icelake-Client-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Client</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX</model>
-      <model usable='no' vendor='unknown'>Haswell-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell</model>
-      <model usable='yes' vendor='unknown'>EPYC-Rome</model>
-      <model usable='yes' vendor='unknown'>EPYC-IBPB</model>
-      <model usable='yes' vendor='unknown'>EPYC</model>
-      <model usable='yes' vendor='unknown'>Dhyana</model>
-      <model usable='no' vendor='unknown'>Cooperlake</model>
-      <model usable='yes' vendor='unknown'>Conroe</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX</model>
-      <model usable='no' vendor='unknown'>Broadwell-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell</model>
+      <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-IBRS</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Snowridge</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-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-IBRS</model>
+      <model usable='yes' vendor='Intel'>SandyBridge</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD'>Opteron_G4</model>
+      <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-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>IvyBridge</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-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-Rome</model>
+      <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
+      <model usable='yes' vendor='AMD'>EPYC</model>
+      <model usable='yes' vendor='Hygon'>Dhyana</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</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>
+      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
     </mode>
   </cpu>

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 d4922249c0848264081227a98a9948790af5cc64..f441139af28e9cb74f27451640badb3327362efd 100644 (file)
--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
@@ -64,57 +64,57 @@
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
       <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='unknown'>phenom</model>
+      <model usable='no' vendor='AMD'>phenom</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium2</model>
       <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='no' vendor='unknown'>n270</model>
+      <model usable='no' vendor='Intel'>n270</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='no' vendor='unknown'>coreduo</model>
-      <model usable='no' vendor='unknown'>core2duo</model>
-      <model usable='no' vendor='unknown'>athlon</model>
-      <model usable='no' vendor='unknown'>Westmere-IBRS</model>
-      <model usable='yes' vendor='unknown'>Westmere</model>
-      <model usable='no' vendor='unknown'>Snowridge</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client</model>
-      <model usable='no' vendor='unknown'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='unknown'>SandyBridge</model>
-      <model usable='yes' vendor='unknown'>Penryn</model>
-      <model usable='no' vendor='unknown'>Opteron_G5</model>
-      <model usable='no' vendor='unknown'>Opteron_G4</model>
-      <model usable='yes' vendor='unknown'>Opteron_G3</model>
-      <model usable='yes' vendor='unknown'>Opteron_G2</model>
-      <model usable='yes' vendor='unknown'>Opteron_G1</model>
-      <model usable='no' vendor='unknown'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='unknown'>Nehalem</model>
-      <model usable='no' vendor='unknown'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>IvyBridge</model>
-      <model usable='no' vendor='unknown'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Server</model>
-      <model usable='no' deprecated='yes' vendor='unknown'>Icelake-Client-noTSX</model>
-      <model usable='no' deprecated='yes' vendor='unknown'>Icelake-Client</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX</model>
-      <model usable='no' vendor='unknown'>Haswell-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell</model>
-      <model usable='yes' vendor='unknown'>EPYC-Rome</model>
-      <model usable='yes' vendor='unknown'>EPYC-IBPB</model>
-      <model usable='yes' vendor='unknown'>EPYC</model>
-      <model usable='yes' vendor='unknown'>Dhyana</model>
-      <model usable='no' vendor='unknown'>Cooperlake</model>
-      <model usable='yes' vendor='unknown'>Conroe</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX</model>
-      <model usable='no' vendor='unknown'>Broadwell-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell</model>
+      <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-IBRS</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Snowridge</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-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-IBRS</model>
+      <model usable='yes' vendor='Intel'>SandyBridge</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD'>Opteron_G4</model>
+      <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-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>IvyBridge</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-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-Rome</model>
+      <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
+      <model usable='yes' vendor='AMD'>EPYC</model>
+      <model usable='yes' vendor='Hygon'>Dhyana</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</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>
+      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
     </mode>
   </cpu>

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 96d9aabc29c1163ae81f799c34a24448b5097db6..690fba9fc28ccccdb3efd1c196b0f7f920ea07e5 100644 (file)
--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
@@ -77,57 +77,57 @@
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
       <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='unknown'>phenom</model>
+      <model usable='no' vendor='AMD'>phenom</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium2</model>
       <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='yes' vendor='unknown'>n270</model>
+      <model usable='yes' vendor='Intel'>n270</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='yes' vendor='unknown'>coreduo</model>
-      <model usable='yes' vendor='unknown'>core2duo</model>
-      <model usable='yes' vendor='unknown'>athlon</model>
-      <model usable='no' vendor='unknown'>Westmere-IBRS</model>
-      <model usable='yes' vendor='unknown'>Westmere</model>
-      <model usable='no' vendor='unknown'>Snowridge</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client</model>
-      <model usable='no' vendor='unknown'>SandyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>SandyBridge</model>
-      <model usable='yes' vendor='unknown'>Penryn</model>
-      <model usable='no' vendor='unknown'>Opteron_G5</model>
-      <model usable='no' vendor='unknown'>Opteron_G4</model>
-      <model usable='no' vendor='unknown'>Opteron_G3</model>
-      <model usable='yes' vendor='unknown'>Opteron_G2</model>
-      <model usable='yes' vendor='unknown'>Opteron_G1</model>
-      <model usable='no' vendor='unknown'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='unknown'>Nehalem</model>
-      <model usable='no' vendor='unknown'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>IvyBridge</model>
-      <model usable='no' vendor='unknown'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Server</model>
-      <model usable='no' deprecated='yes' vendor='unknown'>Icelake-Client-noTSX</model>
-      <model usable='no' deprecated='yes' vendor='unknown'>Icelake-Client</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX</model>
-      <model usable='no' vendor='unknown'>Haswell-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell</model>
-      <model usable='no' vendor='unknown'>EPYC-Rome</model>
-      <model usable='no' vendor='unknown'>EPYC-IBPB</model>
-      <model usable='no' vendor='unknown'>EPYC</model>
-      <model usable='no' vendor='unknown'>Dhyana</model>
-      <model usable='no' vendor='unknown'>Cooperlake</model>
-      <model usable='yes' vendor='unknown'>Conroe</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX</model>
-      <model usable='no' vendor='unknown'>Broadwell-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell</model>
+      <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-IBRS</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Snowridge</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-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-IBRS</model>
+      <model usable='no' vendor='Intel'>SandyBridge</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD'>Opteron_G4</model>
+      <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-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>IvyBridge</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-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-Rome</model>
+      <model usable='no' vendor='AMD'>EPYC-IBPB</model>
+      <model usable='no' vendor='AMD'>EPYC</model>
+      <model usable='no' vendor='Hygon'>Dhyana</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</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>
+      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
     </mode>
   </cpu>

diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
index cb99bfab9ee633d838df47a82af1dcc78d28e828..27a3af5ba0a6dfb020384725683dabfd2b254a64 100644 (file)
--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
@@ -63,57 +63,57 @@
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
       <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='unknown'>phenom</model>
+      <model usable='no' vendor='AMD'>phenom</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium2</model>
       <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='no' vendor='unknown'>n270</model>
+      <model usable='no' vendor='Intel'>n270</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='no' vendor='unknown'>coreduo</model>
-      <model usable='no' vendor='unknown'>core2duo</model>
-      <model usable='no' vendor='unknown'>athlon</model>
-      <model usable='no' vendor='unknown'>Westmere-IBRS</model>
-      <model usable='yes' vendor='unknown'>Westmere</model>
-      <model usable='no' vendor='unknown'>Snowridge</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client</model>
-      <model usable='no' vendor='unknown'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='unknown'>SandyBridge</model>
-      <model usable='yes' vendor='unknown'>Penryn</model>
-      <model usable='no' vendor='unknown'>Opteron_G5</model>
-      <model usable='no' vendor='unknown'>Opteron_G4</model>
-      <model usable='yes' vendor='unknown'>Opteron_G3</model>
-      <model usable='yes' vendor='unknown'>Opteron_G2</model>
-      <model usable='yes' vendor='unknown'>Opteron_G1</model>
-      <model usable='no' vendor='unknown'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='unknown'>Nehalem</model>
-      <model usable='no' vendor='unknown'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>IvyBridge</model>
-      <model usable='no' vendor='unknown'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Server</model>
-      <model usable='no' deprecated='yes' vendor='unknown'>Icelake-Client-noTSX</model>
-      <model usable='no' deprecated='yes' vendor='unknown'>Icelake-Client</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX</model>
-      <model usable='no' vendor='unknown'>Haswell-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell</model>
-      <model usable='yes' vendor='unknown'>EPYC-Rome</model>
-      <model usable='yes' vendor='unknown'>EPYC-IBPB</model>
-      <model usable='yes' vendor='unknown'>EPYC</model>
-      <model usable='yes' vendor='unknown'>Dhyana</model>
-      <model usable='no' vendor='unknown'>Cooperlake</model>
-      <model usable='yes' vendor='unknown'>Conroe</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX</model>
-      <model usable='no' vendor='unknown'>Broadwell-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell</model>
+      <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-IBRS</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Snowridge</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-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-IBRS</model>
+      <model usable='yes' vendor='Intel'>SandyBridge</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD'>Opteron_G4</model>
+      <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-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>IvyBridge</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-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-Rome</model>
+      <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
+      <model usable='yes' vendor='AMD'>EPYC</model>
+      <model usable='yes' vendor='Hygon'>Dhyana</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</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>
+      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
     </mode>
   </cpu>

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 cc2d6c81353d9c744d3a1618ab765d268cf12b0a..56f2ee8b153b01f2bf72b4483a72d8a03ef6d89a 100644 (file)
--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
@@ -64,58 +64,58 @@
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
       <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='unknown'>phenom</model>
+      <model usable='no' vendor='AMD'>phenom</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium2</model>
       <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='no' vendor='unknown'>n270</model>
+      <model usable='no' vendor='Intel'>n270</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='no' vendor='unknown'>coreduo</model>
-      <model usable='no' vendor='unknown'>core2duo</model>
-      <model usable='no' vendor='unknown'>athlon</model>
-      <model usable='no' vendor='unknown'>Westmere-IBRS</model>
-      <model usable='yes' vendor='unknown'>Westmere</model>
-      <model usable='no' vendor='unknown'>Snowridge</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client</model>
-      <model usable='no' vendor='unknown'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='unknown'>SandyBridge</model>
-      <model usable='yes' vendor='unknown'>Penryn</model>
-      <model usable='no' vendor='unknown'>Opteron_G5</model>
-      <model usable='no' vendor='unknown'>Opteron_G4</model>
-      <model usable='yes' vendor='unknown'>Opteron_G3</model>
-      <model usable='yes' vendor='unknown'>Opteron_G2</model>
-      <model usable='yes' vendor='unknown'>Opteron_G1</model>
-      <model usable='no' vendor='unknown'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='unknown'>Nehalem</model>
-      <model usable='no' vendor='unknown'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>IvyBridge</model>
-      <model usable='no' vendor='unknown'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Server</model>
-      <model usable='no' deprecated='yes' vendor='unknown'>Icelake-Client-noTSX</model>
-      <model usable='no' deprecated='yes' vendor='unknown'>Icelake-Client</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX</model>
-      <model usable='no' vendor='unknown'>Haswell-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell</model>
-      <model usable='yes' vendor='unknown'>EPYC-Rome</model>
-      <model usable='no' vendor='unknown'>EPYC-Milan</model>
-      <model usable='yes' vendor='unknown'>EPYC-IBPB</model>
-      <model usable='yes' vendor='unknown'>EPYC</model>
-      <model usable='yes' vendor='unknown'>Dhyana</model>
-      <model usable='no' vendor='unknown'>Cooperlake</model>
-      <model usable='yes' vendor='unknown'>Conroe</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX</model>
-      <model usable='no' vendor='unknown'>Broadwell-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell</model>
+      <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-IBRS</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Snowridge</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-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-IBRS</model>
+      <model usable='yes' vendor='Intel'>SandyBridge</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD'>Opteron_G4</model>
+      <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-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>IvyBridge</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-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-Rome</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</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</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>
+      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
     </mode>
   </cpu>

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 4910fad0941348fdcd94065ed1b93fb867fcc9dd..dab11a82d6c30674cb80f326ec392ca757b20133 100644 (file)
--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
@@ -77,58 +77,58 @@
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
       <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='unknown'>phenom</model>
+      <model usable='no' vendor='AMD'>phenom</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium2</model>
       <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='yes' vendor='unknown'>n270</model>
+      <model usable='yes' vendor='Intel'>n270</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='yes' vendor='unknown'>coreduo</model>
-      <model usable='yes' vendor='unknown'>core2duo</model>
-      <model usable='yes' vendor='unknown'>athlon</model>
-      <model usable='no' vendor='unknown'>Westmere-IBRS</model>
-      <model usable='yes' vendor='unknown'>Westmere</model>
-      <model usable='no' vendor='unknown'>Snowridge</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client</model>
-      <model usable='no' vendor='unknown'>SandyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>SandyBridge</model>
-      <model usable='yes' vendor='unknown'>Penryn</model>
-      <model usable='no' vendor='unknown'>Opteron_G5</model>
-      <model usable='no' vendor='unknown'>Opteron_G4</model>
-      <model usable='no' vendor='unknown'>Opteron_G3</model>
-      <model usable='yes' vendor='unknown'>Opteron_G2</model>
-      <model usable='yes' vendor='unknown'>Opteron_G1</model>
-      <model usable='no' vendor='unknown'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='unknown'>Nehalem</model>
-      <model usable='no' vendor='unknown'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>IvyBridge</model>
-      <model usable='no' vendor='unknown'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Server</model>
-      <model usable='no' deprecated='yes' vendor='unknown'>Icelake-Client-noTSX</model>
-      <model usable='no' deprecated='yes' vendor='unknown'>Icelake-Client</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX</model>
-      <model usable='no' vendor='unknown'>Haswell-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell</model>
-      <model usable='no' vendor='unknown'>EPYC-Rome</model>
-      <model usable='no' vendor='unknown'>EPYC-Milan</model>
-      <model usable='no' vendor='unknown'>EPYC-IBPB</model>
-      <model usable='no' vendor='unknown'>EPYC</model>
-      <model usable='no' vendor='unknown'>Dhyana</model>
-      <model usable='no' vendor='unknown'>Cooperlake</model>
-      <model usable='yes' vendor='unknown'>Conroe</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX</model>
-      <model usable='no' vendor='unknown'>Broadwell-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell</model>
+      <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-IBRS</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Snowridge</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-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-IBRS</model>
+      <model usable='no' vendor='Intel'>SandyBridge</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD'>Opteron_G4</model>
+      <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-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>IvyBridge</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-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-Rome</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</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</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>
+      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
     </mode>
   </cpu>

diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
index 8433c4b51caa36f6ad7bb552eac0ab4a81f6577a..338a9a749434b9a9c9a1ae91e1cb0e6d71807829 100644 (file)
--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
@@ -63,58 +63,58 @@
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
       <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='unknown'>phenom</model>
+      <model usable='no' vendor='AMD'>phenom</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium2</model>
       <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='no' vendor='unknown'>n270</model>
+      <model usable='no' vendor='Intel'>n270</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='no' vendor='unknown'>coreduo</model>
-      <model usable='no' vendor='unknown'>core2duo</model>
-      <model usable='no' vendor='unknown'>athlon</model>
-      <model usable='no' vendor='unknown'>Westmere-IBRS</model>
-      <model usable='yes' vendor='unknown'>Westmere</model>
-      <model usable='no' vendor='unknown'>Snowridge</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client</model>
-      <model usable='no' vendor='unknown'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='unknown'>SandyBridge</model>
-      <model usable='yes' vendor='unknown'>Penryn</model>
-      <model usable='no' vendor='unknown'>Opteron_G5</model>
-      <model usable='no' vendor='unknown'>Opteron_G4</model>
-      <model usable='yes' vendor='unknown'>Opteron_G3</model>
-      <model usable='yes' vendor='unknown'>Opteron_G2</model>
-      <model usable='yes' vendor='unknown'>Opteron_G1</model>
-      <model usable='no' vendor='unknown'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='unknown'>Nehalem</model>
-      <model usable='no' vendor='unknown'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>IvyBridge</model>
-      <model usable='no' vendor='unknown'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Server</model>
-      <model usable='no' deprecated='yes' vendor='unknown'>Icelake-Client-noTSX</model>
-      <model usable='no' deprecated='yes' vendor='unknown'>Icelake-Client</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX</model>
-      <model usable='no' vendor='unknown'>Haswell-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell</model>
-      <model usable='yes' vendor='unknown'>EPYC-Rome</model>
-      <model usable='no' vendor='unknown'>EPYC-Milan</model>
-      <model usable='yes' vendor='unknown'>EPYC-IBPB</model>
-      <model usable='yes' vendor='unknown'>EPYC</model>
-      <model usable='yes' vendor='unknown'>Dhyana</model>
-      <model usable='no' vendor='unknown'>Cooperlake</model>
-      <model usable='yes' vendor='unknown'>Conroe</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX</model>
-      <model usable='no' vendor='unknown'>Broadwell-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell</model>
+      <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-IBRS</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Snowridge</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-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-IBRS</model>
+      <model usable='yes' vendor='Intel'>SandyBridge</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD'>Opteron_G4</model>
+      <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-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>IvyBridge</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-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-Rome</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</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</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>
+      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
     </mode>
   </cpu>

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 5070e3828bd027a9ac00a8a18170c27ccde8f2da..c023a72dec45d250327943edf00a5514430873c0 100644 (file)
--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
@@ -65,58 +65,58 @@
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
       <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='unknown'>phenom</model>
+      <model usable='no' vendor='AMD'>phenom</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium2</model>
       <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='no' vendor='unknown'>n270</model>
+      <model usable='no' vendor='Intel'>n270</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='no' vendor='unknown'>coreduo</model>
-      <model usable='no' vendor='unknown'>core2duo</model>
-      <model usable='no' vendor='unknown'>athlon</model>
-      <model usable='no' vendor='unknown'>Westmere-IBRS</model>
-      <model usable='yes' vendor='unknown'>Westmere</model>
-      <model usable='no' vendor='unknown'>Snowridge</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client</model>
-      <model usable='no' vendor='unknown'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='unknown'>SandyBridge</model>
-      <model usable='yes' vendor='unknown'>Penryn</model>
-      <model usable='no' vendor='unknown'>Opteron_G5</model>
-      <model usable='no' vendor='unknown'>Opteron_G4</model>
-      <model usable='yes' vendor='unknown'>Opteron_G3</model>
-      <model usable='yes' vendor='unknown'>Opteron_G2</model>
-      <model usable='yes' vendor='unknown'>Opteron_G1</model>
-      <model usable='no' vendor='unknown'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='unknown'>Nehalem</model>
-      <model usable='no' vendor='unknown'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>IvyBridge</model>
-      <model usable='no' vendor='unknown'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Server</model>
-      <model usable='no' deprecated='yes' vendor='unknown'>Icelake-Client-noTSX</model>
-      <model usable='no' deprecated='yes' vendor='unknown'>Icelake-Client</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX</model>
-      <model usable='no' vendor='unknown'>Haswell-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell</model>
-      <model usable='yes' vendor='unknown'>EPYC-Rome</model>
-      <model usable='no' vendor='unknown'>EPYC-Milan</model>
-      <model usable='yes' vendor='unknown'>EPYC-IBPB</model>
-      <model usable='yes' vendor='unknown'>EPYC</model>
-      <model usable='yes' vendor='unknown'>Dhyana</model>
-      <model usable='no' vendor='unknown'>Cooperlake</model>
-      <model usable='yes' vendor='unknown'>Conroe</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX</model>
-      <model usable='no' vendor='unknown'>Broadwell-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell</model>
+      <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-IBRS</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Snowridge</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-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-IBRS</model>
+      <model usable='yes' vendor='Intel'>SandyBridge</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD'>Opteron_G4</model>
+      <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-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>IvyBridge</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-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-Rome</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</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</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>
+      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
     </mode>
   </cpu>

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 d1cc3e88a3161dff396b7cea514c8dcf1977796a..18da71d0a766377c243b537cd1038b681660aac1 100644 (file)
--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
@@ -77,58 +77,58 @@
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
       <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='unknown'>phenom</model>
+      <model usable='no' vendor='AMD'>phenom</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium2</model>
       <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='yes' vendor='unknown'>n270</model>
+      <model usable='yes' vendor='Intel'>n270</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='yes' vendor='unknown'>coreduo</model>
-      <model usable='yes' vendor='unknown'>core2duo</model>
-      <model usable='yes' vendor='unknown'>athlon</model>
-      <model usable='no' vendor='unknown'>Westmere-IBRS</model>
-      <model usable='yes' vendor='unknown'>Westmere</model>
-      <model usable='no' vendor='unknown'>Snowridge</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client</model>
-      <model usable='no' vendor='unknown'>SandyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>SandyBridge</model>
-      <model usable='yes' vendor='unknown'>Penryn</model>
-      <model usable='no' vendor='unknown'>Opteron_G5</model>
-      <model usable='no' vendor='unknown'>Opteron_G4</model>
-      <model usable='no' vendor='unknown'>Opteron_G3</model>
-      <model usable='yes' vendor='unknown'>Opteron_G2</model>
-      <model usable='yes' vendor='unknown'>Opteron_G1</model>
-      <model usable='no' vendor='unknown'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='unknown'>Nehalem</model>
-      <model usable='no' vendor='unknown'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>IvyBridge</model>
-      <model usable='no' vendor='unknown'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Server</model>
-      <model usable='no' deprecated='yes' vendor='unknown'>Icelake-Client-noTSX</model>
-      <model usable='no' deprecated='yes' vendor='unknown'>Icelake-Client</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX</model>
-      <model usable='no' vendor='unknown'>Haswell-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell</model>
-      <model usable='no' vendor='unknown'>EPYC-Rome</model>
-      <model usable='no' vendor='unknown'>EPYC-Milan</model>
-      <model usable='no' vendor='unknown'>EPYC-IBPB</model>
-      <model usable='no' vendor='unknown'>EPYC</model>
-      <model usable='no' vendor='unknown'>Dhyana</model>
-      <model usable='no' vendor='unknown'>Cooperlake</model>
-      <model usable='yes' vendor='unknown'>Conroe</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX</model>
-      <model usable='no' vendor='unknown'>Broadwell-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell</model>
+      <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-IBRS</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Snowridge</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-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-IBRS</model>
+      <model usable='no' vendor='Intel'>SandyBridge</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD'>Opteron_G4</model>
+      <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-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>IvyBridge</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-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-Rome</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</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</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>
+      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
     </mode>
   </cpu>

diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
index a4013faa0e1214104e4d29d35ab6f906b21ab0b8..de17a784f6b8112b3992647a7304b65954dc870f 100644 (file)
--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
@@ -64,58 +64,58 @@
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
       <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='unknown'>phenom</model>
+      <model usable='no' vendor='AMD'>phenom</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium2</model>
       <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='no' vendor='unknown'>n270</model>
+      <model usable='no' vendor='Intel'>n270</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='no' vendor='unknown'>coreduo</model>
-      <model usable='no' vendor='unknown'>core2duo</model>
-      <model usable='no' vendor='unknown'>athlon</model>
-      <model usable='no' vendor='unknown'>Westmere-IBRS</model>
-      <model usable='yes' vendor='unknown'>Westmere</model>
-      <model usable='no' vendor='unknown'>Snowridge</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client</model>
-      <model usable='no' vendor='unknown'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='unknown'>SandyBridge</model>
-      <model usable='yes' vendor='unknown'>Penryn</model>
-      <model usable='no' vendor='unknown'>Opteron_G5</model>
-      <model usable='no' vendor='unknown'>Opteron_G4</model>
-      <model usable='yes' vendor='unknown'>Opteron_G3</model>
-      <model usable='yes' vendor='unknown'>Opteron_G2</model>
-      <model usable='yes' vendor='unknown'>Opteron_G1</model>
-      <model usable='no' vendor='unknown'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='unknown'>Nehalem</model>
-      <model usable='no' vendor='unknown'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>IvyBridge</model>
-      <model usable='no' vendor='unknown'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Server</model>
-      <model usable='no' deprecated='yes' vendor='unknown'>Icelake-Client-noTSX</model>
-      <model usable='no' deprecated='yes' vendor='unknown'>Icelake-Client</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX</model>
-      <model usable='no' vendor='unknown'>Haswell-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell</model>
-      <model usable='yes' vendor='unknown'>EPYC-Rome</model>
-      <model usable='no' vendor='unknown'>EPYC-Milan</model>
-      <model usable='yes' vendor='unknown'>EPYC-IBPB</model>
-      <model usable='yes' vendor='unknown'>EPYC</model>
-      <model usable='yes' vendor='unknown'>Dhyana</model>
-      <model usable='no' vendor='unknown'>Cooperlake</model>
-      <model usable='yes' vendor='unknown'>Conroe</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX</model>
-      <model usable='no' vendor='unknown'>Broadwell-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell</model>
+      <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-IBRS</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Snowridge</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-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-IBRS</model>
+      <model usable='yes' vendor='Intel'>SandyBridge</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD'>Opteron_G4</model>
+      <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-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>IvyBridge</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-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-Rome</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</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</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>
+      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
     </mode>
   </cpu>

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 da3ee2b734b1de2fd75b9ed4a48508740e74818d..f767ded170382c69b30dc459a4e8290d5635a578 100644 (file)
--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
@@ -65,58 +65,58 @@
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
       <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='unknown'>phenom</model>
+      <model usable='no' vendor='AMD'>phenom</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium2</model>
       <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='no' vendor='unknown'>n270</model>
+      <model usable='no' vendor='Intel'>n270</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='no' vendor='unknown'>coreduo</model>
-      <model usable='no' vendor='unknown'>core2duo</model>
-      <model usable='no' vendor='unknown'>athlon</model>
-      <model usable='no' vendor='unknown'>Westmere-IBRS</model>
-      <model usable='yes' vendor='unknown'>Westmere</model>
-      <model usable='no' vendor='unknown'>Snowridge</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client</model>
-      <model usable='no' vendor='unknown'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='unknown'>SandyBridge</model>
-      <model usable='yes' vendor='unknown'>Penryn</model>
-      <model usable='no' vendor='unknown'>Opteron_G5</model>
-      <model usable='no' vendor='unknown'>Opteron_G4</model>
-      <model usable='yes' vendor='unknown'>Opteron_G3</model>
-      <model usable='yes' vendor='unknown'>Opteron_G2</model>
-      <model usable='yes' vendor='unknown'>Opteron_G1</model>
-      <model usable='no' vendor='unknown'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='unknown'>Nehalem</model>
-      <model usable='no' vendor='unknown'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>IvyBridge</model>
-      <model usable='no' vendor='unknown'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Server</model>
-      <model usable='no' deprecated='yes' vendor='unknown'>Icelake-Client-noTSX</model>
-      <model usable='no' deprecated='yes' vendor='unknown'>Icelake-Client</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX</model>
-      <model usable='no' vendor='unknown'>Haswell-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell</model>
-      <model usable='yes' vendor='unknown'>EPYC-Rome</model>
-      <model usable='no' vendor='unknown'>EPYC-Milan</model>
-      <model usable='yes' vendor='unknown'>EPYC-IBPB</model>
-      <model usable='yes' vendor='unknown'>EPYC</model>
-      <model usable='yes' vendor='unknown'>Dhyana</model>
-      <model usable='no' vendor='unknown'>Cooperlake</model>
-      <model usable='yes' vendor='unknown'>Conroe</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX</model>
-      <model usable='no' vendor='unknown'>Broadwell-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell</model>
+      <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-IBRS</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Snowridge</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-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-IBRS</model>
+      <model usable='yes' vendor='Intel'>SandyBridge</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD'>Opteron_G4</model>
+      <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-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>IvyBridge</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-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-Rome</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</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</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>
+      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
     </mode>
   </cpu>

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 e21e6d5de2d74d47b514fd2220691de891503732..5122df541983db2cf7b0f38f33413da70dfc64aa 100644 (file)
--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
@@ -78,58 +78,58 @@
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
       <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='unknown'>phenom</model>
+      <model usable='no' vendor='AMD'>phenom</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium2</model>
       <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='yes' vendor='unknown'>n270</model>
+      <model usable='yes' vendor='Intel'>n270</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='yes' vendor='unknown'>coreduo</model>
-      <model usable='yes' vendor='unknown'>core2duo</model>
-      <model usable='yes' vendor='unknown'>athlon</model>
-      <model usable='no' vendor='unknown'>Westmere-IBRS</model>
-      <model usable='yes' vendor='unknown'>Westmere</model>
-      <model usable='no' vendor='unknown'>Snowridge</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client</model>
-      <model usable='no' vendor='unknown'>SandyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>SandyBridge</model>
-      <model usable='yes' vendor='unknown'>Penryn</model>
-      <model usable='no' vendor='unknown'>Opteron_G5</model>
-      <model usable='no' vendor='unknown'>Opteron_G4</model>
-      <model usable='no' vendor='unknown'>Opteron_G3</model>
-      <model usable='yes' vendor='unknown'>Opteron_G2</model>
-      <model usable='yes' vendor='unknown'>Opteron_G1</model>
-      <model usable='no' vendor='unknown'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='unknown'>Nehalem</model>
-      <model usable='no' vendor='unknown'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>IvyBridge</model>
-      <model usable='no' vendor='unknown'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Server</model>
-      <model usable='no' deprecated='yes' vendor='unknown'>Icelake-Client-noTSX</model>
-      <model usable='no' deprecated='yes' vendor='unknown'>Icelake-Client</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX</model>
-      <model usable='no' vendor='unknown'>Haswell-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell</model>
-      <model usable='no' vendor='unknown'>EPYC-Rome</model>
-      <model usable='no' vendor='unknown'>EPYC-Milan</model>
-      <model usable='no' vendor='unknown'>EPYC-IBPB</model>
-      <model usable='no' vendor='unknown'>EPYC</model>
-      <model usable='no' vendor='unknown'>Dhyana</model>
-      <model usable='no' vendor='unknown'>Cooperlake</model>
-      <model usable='yes' vendor='unknown'>Conroe</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX</model>
-      <model usable='no' vendor='unknown'>Broadwell-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell</model>
+      <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-IBRS</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Snowridge</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-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-IBRS</model>
+      <model usable='no' vendor='Intel'>SandyBridge</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD'>Opteron_G4</model>
+      <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-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>IvyBridge</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-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-Rome</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</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</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>
+      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
     </mode>
   </cpu>

diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
index 6aa7d8636c5077db6b75794813647d7f3b751993..bdce41d4db9215f5daf569de27e96822c6d05cb3 100644 (file)
--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
@@ -64,58 +64,58 @@
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
       <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='unknown'>phenom</model>
+      <model usable='no' vendor='AMD'>phenom</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium2</model>
       <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='no' vendor='unknown'>n270</model>
+      <model usable='no' vendor='Intel'>n270</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='no' vendor='unknown'>coreduo</model>
-      <model usable='no' vendor='unknown'>core2duo</model>
-      <model usable='no' vendor='unknown'>athlon</model>
-      <model usable='no' vendor='unknown'>Westmere-IBRS</model>
-      <model usable='yes' vendor='unknown'>Westmere</model>
-      <model usable='no' vendor='unknown'>Snowridge</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client</model>
-      <model usable='no' vendor='unknown'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='unknown'>SandyBridge</model>
-      <model usable='yes' vendor='unknown'>Penryn</model>
-      <model usable='no' vendor='unknown'>Opteron_G5</model>
-      <model usable='no' vendor='unknown'>Opteron_G4</model>
-      <model usable='yes' vendor='unknown'>Opteron_G3</model>
-      <model usable='yes' vendor='unknown'>Opteron_G2</model>
-      <model usable='yes' vendor='unknown'>Opteron_G1</model>
-      <model usable='no' vendor='unknown'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='unknown'>Nehalem</model>
-      <model usable='no' vendor='unknown'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>IvyBridge</model>
-      <model usable='no' vendor='unknown'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Server</model>
-      <model usable='no' deprecated='yes' vendor='unknown'>Icelake-Client-noTSX</model>
-      <model usable='no' deprecated='yes' vendor='unknown'>Icelake-Client</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX</model>
-      <model usable='no' vendor='unknown'>Haswell-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell</model>
-      <model usable='yes' vendor='unknown'>EPYC-Rome</model>
-      <model usable='no' vendor='unknown'>EPYC-Milan</model>
-      <model usable='yes' vendor='unknown'>EPYC-IBPB</model>
-      <model usable='yes' vendor='unknown'>EPYC</model>
-      <model usable='yes' vendor='unknown'>Dhyana</model>
-      <model usable='no' vendor='unknown'>Cooperlake</model>
-      <model usable='yes' vendor='unknown'>Conroe</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX</model>
-      <model usable='no' vendor='unknown'>Broadwell-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell</model>
+      <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-IBRS</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Snowridge</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-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-IBRS</model>
+      <model usable='yes' vendor='Intel'>SandyBridge</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD'>Opteron_G4</model>
+      <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-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>IvyBridge</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-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-Rome</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</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</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>
+      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
     </mode>
   </cpu>

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 caecac2b8cb3cbdb12fca3f2eba7e89ea866c1ee..e7850eafcfad4b9cd4233e402e98b498f9514cb5 100644 (file)
--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
@@ -66,58 +66,58 @@
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
       <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='unknown'>phenom</model>
+      <model usable='no' vendor='AMD'>phenom</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium2</model>
       <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='no' vendor='unknown'>n270</model>
+      <model usable='no' vendor='Intel'>n270</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='no' vendor='unknown'>coreduo</model>
-      <model usable='no' vendor='unknown'>core2duo</model>
-      <model usable='no' vendor='unknown'>athlon</model>
-      <model usable='no' vendor='unknown'>Westmere-IBRS</model>
-      <model usable='yes' vendor='unknown'>Westmere</model>
-      <model usable='no' vendor='unknown'>Snowridge</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client</model>
-      <model usable='no' vendor='unknown'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='unknown'>SandyBridge</model>
-      <model usable='yes' vendor='unknown'>Penryn</model>
-      <model usable='no' vendor='unknown'>Opteron_G5</model>
-      <model usable='no' vendor='unknown'>Opteron_G4</model>
-      <model usable='yes' vendor='unknown'>Opteron_G3</model>
-      <model usable='yes' vendor='unknown'>Opteron_G2</model>
-      <model usable='yes' vendor='unknown'>Opteron_G1</model>
-      <model usable='no' vendor='unknown'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='unknown'>Nehalem</model>
-      <model usable='no' vendor='unknown'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>IvyBridge</model>
-      <model usable='no' vendor='unknown'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Server</model>
-      <model usable='no' deprecated='yes' vendor='unknown'>Icelake-Client-noTSX</model>
-      <model usable='no' deprecated='yes' vendor='unknown'>Icelake-Client</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX</model>
-      <model usable='no' vendor='unknown'>Haswell-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell</model>
-      <model usable='yes' vendor='unknown'>EPYC-Rome</model>
-      <model usable='no' vendor='unknown'>EPYC-Milan</model>
-      <model usable='yes' vendor='unknown'>EPYC-IBPB</model>
-      <model usable='yes' vendor='unknown'>EPYC</model>
-      <model usable='yes' vendor='unknown'>Dhyana</model>
-      <model usable='no' vendor='unknown'>Cooperlake</model>
-      <model usable='yes' vendor='unknown'>Conroe</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX</model>
-      <model usable='no' vendor='unknown'>Broadwell-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell</model>
+      <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-IBRS</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Snowridge</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-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-IBRS</model>
+      <model usable='yes' vendor='Intel'>SandyBridge</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD'>Opteron_G4</model>
+      <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-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>IvyBridge</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-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-Rome</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</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</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>
+      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
     </mode>
   </cpu>

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 980c0e0bd9d5c440ea5645d6f931b8ba9ec5e915..53b0de03e72334e46da15b7edd443b792631a4a8 100644 (file)
--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
@@ -79,58 +79,58 @@
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
       <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='unknown'>phenom</model>
+      <model usable='no' vendor='AMD'>phenom</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium2</model>
       <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='yes' vendor='unknown'>n270</model>
+      <model usable='yes' vendor='Intel'>n270</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='yes' vendor='unknown'>coreduo</model>
-      <model usable='yes' vendor='unknown'>core2duo</model>
-      <model usable='yes' vendor='unknown'>athlon</model>
-      <model usable='no' vendor='unknown'>Westmere-IBRS</model>
-      <model usable='yes' vendor='unknown'>Westmere</model>
-      <model usable='no' vendor='unknown'>Snowridge</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client</model>
-      <model usable='no' vendor='unknown'>SandyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>SandyBridge</model>
-      <model usable='yes' vendor='unknown'>Penryn</model>
-      <model usable='no' vendor='unknown'>Opteron_G5</model>
-      <model usable='no' vendor='unknown'>Opteron_G4</model>
-      <model usable='no' vendor='unknown'>Opteron_G3</model>
-      <model usable='yes' vendor='unknown'>Opteron_G2</model>
-      <model usable='yes' vendor='unknown'>Opteron_G1</model>
-      <model usable='no' vendor='unknown'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='unknown'>Nehalem</model>
-      <model usable='no' vendor='unknown'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>IvyBridge</model>
-      <model usable='no' vendor='unknown'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Server</model>
-      <model usable='no' deprecated='yes' vendor='unknown'>Icelake-Client-noTSX</model>
-      <model usable='no' deprecated='yes' vendor='unknown'>Icelake-Client</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX</model>
-      <model usable='no' vendor='unknown'>Haswell-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell</model>
-      <model usable='no' vendor='unknown'>EPYC-Rome</model>
-      <model usable='no' vendor='unknown'>EPYC-Milan</model>
-      <model usable='no' vendor='unknown'>EPYC-IBPB</model>
-      <model usable='no' vendor='unknown'>EPYC</model>
-      <model usable='no' vendor='unknown'>Dhyana</model>
-      <model usable='no' vendor='unknown'>Cooperlake</model>
-      <model usable='yes' vendor='unknown'>Conroe</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX</model>
-      <model usable='no' vendor='unknown'>Broadwell-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell</model>
+      <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-IBRS</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Snowridge</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-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-IBRS</model>
+      <model usable='no' vendor='Intel'>SandyBridge</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD'>Opteron_G4</model>
+      <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-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>IvyBridge</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-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-Rome</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</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</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>
+      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
     </mode>
   </cpu>

diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
index 5359f66dcbdc7c16544df43fdf8f6508d84e3bea..ccee94df7ab42574efb944bb35a56ab677ef95ba 100644 (file)
--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
@@ -65,58 +65,58 @@
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
       <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='unknown'>phenom</model>
+      <model usable='no' vendor='AMD'>phenom</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium2</model>
       <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='no' vendor='unknown'>n270</model>
+      <model usable='no' vendor='Intel'>n270</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='no' vendor='unknown'>coreduo</model>
-      <model usable='no' vendor='unknown'>core2duo</model>
-      <model usable='no' vendor='unknown'>athlon</model>
-      <model usable='no' vendor='unknown'>Westmere-IBRS</model>
-      <model usable='yes' vendor='unknown'>Westmere</model>
-      <model usable='no' vendor='unknown'>Snowridge</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client</model>
-      <model usable='no' vendor='unknown'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='unknown'>SandyBridge</model>
-      <model usable='yes' vendor='unknown'>Penryn</model>
-      <model usable='no' vendor='unknown'>Opteron_G5</model>
-      <model usable='no' vendor='unknown'>Opteron_G4</model>
-      <model usable='yes' vendor='unknown'>Opteron_G3</model>
-      <model usable='yes' vendor='unknown'>Opteron_G2</model>
-      <model usable='yes' vendor='unknown'>Opteron_G1</model>
-      <model usable='no' vendor='unknown'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='unknown'>Nehalem</model>
-      <model usable='no' vendor='unknown'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>IvyBridge</model>
-      <model usable='no' vendor='unknown'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Server</model>
-      <model usable='no' deprecated='yes' vendor='unknown'>Icelake-Client-noTSX</model>
-      <model usable='no' deprecated='yes' vendor='unknown'>Icelake-Client</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX</model>
-      <model usable='no' vendor='unknown'>Haswell-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell</model>
-      <model usable='yes' vendor='unknown'>EPYC-Rome</model>
-      <model usable='no' vendor='unknown'>EPYC-Milan</model>
-      <model usable='yes' vendor='unknown'>EPYC-IBPB</model>
-      <model usable='yes' vendor='unknown'>EPYC</model>
-      <model usable='yes' vendor='unknown'>Dhyana</model>
-      <model usable='no' vendor='unknown'>Cooperlake</model>
-      <model usable='yes' vendor='unknown'>Conroe</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX</model>
-      <model usable='no' vendor='unknown'>Broadwell-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell</model>
+      <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-IBRS</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Snowridge</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-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-IBRS</model>
+      <model usable='yes' vendor='Intel'>SandyBridge</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD'>Opteron_G4</model>
+      <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-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>IvyBridge</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-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-Rome</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</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</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>
+      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
     </mode>
   </cpu>

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 5168c62266d9c257e3eafa5e9204c447c3026dad..6e3df1e24b7768da294ad64d588eb91c6b365dc2 100644 (file)
--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
@@ -67,56 +67,56 @@
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
       <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='unknown'>phenom</model>
+      <model usable='no' vendor='AMD'>phenom</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium2</model>
       <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='no' vendor='unknown'>n270</model>
+      <model usable='no' vendor='Intel'>n270</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='no' vendor='unknown'>coreduo</model>
-      <model usable='no' vendor='unknown'>core2duo</model>
-      <model usable='no' vendor='unknown'>athlon</model>
-      <model usable='no' vendor='unknown'>Westmere-IBRS</model>
-      <model usable='yes' vendor='unknown'>Westmere</model>
-      <model usable='no' vendor='unknown'>Snowridge</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client</model>
-      <model usable='no' vendor='unknown'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='unknown'>SandyBridge</model>
-      <model usable='yes' vendor='unknown'>Penryn</model>
-      <model usable='no' vendor='unknown'>Opteron_G5</model>
-      <model usable='no' vendor='unknown'>Opteron_G4</model>
-      <model usable='yes' vendor='unknown'>Opteron_G3</model>
-      <model usable='yes' vendor='unknown'>Opteron_G2</model>
-      <model usable='yes' vendor='unknown'>Opteron_G1</model>
-      <model usable='no' vendor='unknown'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='unknown'>Nehalem</model>
-      <model usable='no' vendor='unknown'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>IvyBridge</model>
-      <model usable='no' vendor='unknown'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Server</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX</model>
-      <model usable='no' vendor='unknown'>Haswell-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell</model>
-      <model usable='yes' vendor='unknown'>EPYC-Rome</model>
-      <model usable='no' vendor='unknown'>EPYC-Milan</model>
-      <model usable='yes' vendor='unknown'>EPYC-IBPB</model>
-      <model usable='yes' vendor='unknown'>EPYC</model>
-      <model usable='yes' vendor='unknown'>Dhyana</model>
-      <model usable='no' vendor='unknown'>Cooperlake</model>
-      <model usable='yes' vendor='unknown'>Conroe</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX</model>
-      <model usable='no' vendor='unknown'>Broadwell-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell</model>
+      <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-IBRS</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Snowridge</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-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-IBRS</model>
+      <model usable='yes' vendor='Intel'>SandyBridge</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD'>Opteron_G4</model>
+      <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-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>IvyBridge</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>Icelake-Server</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-Rome</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</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</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>
+      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
     </mode>
   </cpu>

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 98b1d14ec12886738fb5e3161455646b4d130981..61aa2697415f520c86b87b4ff47d45a1e8901d38 100644 (file)
--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
@@ -79,56 +79,56 @@
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
       <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='unknown'>phenom</model>
+      <model usable='no' vendor='AMD'>phenom</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium2</model>
       <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='yes' vendor='unknown'>n270</model>
+      <model usable='yes' vendor='Intel'>n270</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='yes' vendor='unknown'>coreduo</model>
-      <model usable='yes' vendor='unknown'>core2duo</model>
-      <model usable='yes' vendor='unknown'>athlon</model>
-      <model usable='no' vendor='unknown'>Westmere-IBRS</model>
-      <model usable='yes' vendor='unknown'>Westmere</model>
-      <model usable='no' vendor='unknown'>Snowridge</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client</model>
-      <model usable='no' vendor='unknown'>SandyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>SandyBridge</model>
-      <model usable='yes' vendor='unknown'>Penryn</model>
-      <model usable='no' vendor='unknown'>Opteron_G5</model>
-      <model usable='no' vendor='unknown'>Opteron_G4</model>
-      <model usable='no' vendor='unknown'>Opteron_G3</model>
-      <model usable='yes' vendor='unknown'>Opteron_G2</model>
-      <model usable='yes' vendor='unknown'>Opteron_G1</model>
-      <model usable='no' vendor='unknown'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='unknown'>Nehalem</model>
-      <model usable='no' vendor='unknown'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>IvyBridge</model>
-      <model usable='no' vendor='unknown'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Server</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX</model>
-      <model usable='no' vendor='unknown'>Haswell-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell</model>
-      <model usable='no' vendor='unknown'>EPYC-Rome</model>
-      <model usable='no' vendor='unknown'>EPYC-Milan</model>
-      <model usable='no' vendor='unknown'>EPYC-IBPB</model>
-      <model usable='no' vendor='unknown'>EPYC</model>
-      <model usable='no' vendor='unknown'>Dhyana</model>
-      <model usable='no' vendor='unknown'>Cooperlake</model>
-      <model usable='yes' vendor='unknown'>Conroe</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX</model>
-      <model usable='no' vendor='unknown'>Broadwell-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell</model>
+      <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-IBRS</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Snowridge</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-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-IBRS</model>
+      <model usable='no' vendor='Intel'>SandyBridge</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD'>Opteron_G4</model>
+      <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-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>IvyBridge</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>Icelake-Server</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-Rome</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</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</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>
+      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
     </mode>
   </cpu>

diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
index ec982b16aef348e652432a7d2dff44f98e140731..e1218e3f163784efdbd370a220510f7c2c8bfdeb 100644 (file)
--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
@@ -66,56 +66,56 @@
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
       <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='unknown'>phenom</model>
+      <model usable='no' vendor='AMD'>phenom</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium2</model>
       <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='no' vendor='unknown'>n270</model>
+      <model usable='no' vendor='Intel'>n270</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='no' vendor='unknown'>coreduo</model>
-      <model usable='no' vendor='unknown'>core2duo</model>
-      <model usable='no' vendor='unknown'>athlon</model>
-      <model usable='no' vendor='unknown'>Westmere-IBRS</model>
-      <model usable='yes' vendor='unknown'>Westmere</model>
-      <model usable='no' vendor='unknown'>Snowridge</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client</model>
-      <model usable='no' vendor='unknown'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='unknown'>SandyBridge</model>
-      <model usable='yes' vendor='unknown'>Penryn</model>
-      <model usable='no' vendor='unknown'>Opteron_G5</model>
-      <model usable='no' vendor='unknown'>Opteron_G4</model>
-      <model usable='yes' vendor='unknown'>Opteron_G3</model>
-      <model usable='yes' vendor='unknown'>Opteron_G2</model>
-      <model usable='yes' vendor='unknown'>Opteron_G1</model>
-      <model usable='no' vendor='unknown'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='unknown'>Nehalem</model>
-      <model usable='no' vendor='unknown'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>IvyBridge</model>
-      <model usable='no' vendor='unknown'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Server</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX</model>
-      <model usable='no' vendor='unknown'>Haswell-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell</model>
-      <model usable='yes' vendor='unknown'>EPYC-Rome</model>
-      <model usable='no' vendor='unknown'>EPYC-Milan</model>
-      <model usable='yes' vendor='unknown'>EPYC-IBPB</model>
-      <model usable='yes' vendor='unknown'>EPYC</model>
-      <model usable='yes' vendor='unknown'>Dhyana</model>
-      <model usable='no' vendor='unknown'>Cooperlake</model>
-      <model usable='yes' vendor='unknown'>Conroe</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX</model>
-      <model usable='no' vendor='unknown'>Broadwell-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell</model>
+      <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-IBRS</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Snowridge</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-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-IBRS</model>
+      <model usable='yes' vendor='Intel'>SandyBridge</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD'>Opteron_G4</model>
+      <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-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>IvyBridge</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>Icelake-Server</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-Rome</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</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</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>
+      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
     </mode>
   </cpu>