815 lines
38 KiB
Diff
815 lines
38 KiB
Diff
|
From 65d6734cfd183ba58a113e00f81b99a4a45ae8b9 Mon Sep 17 00:00:00 2001
|
||
|
Message-ID: <65d6734cfd183ba58a113e00f81b99a4a45ae8b9.1734429553.git.jdenemar@redhat.com>
|
||
|
From: Jiri Denemark <jdenemar@redhat.com>
|
||
|
Date: Thu, 5 Dec 2024 15:30:57 +0100
|
||
|
Subject: [PATCH] cpu_map: Add coreduo-v1 CPU model
|
||
|
|
||
|
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
||
|
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
|
||
|
(cherry picked from commit ae14b20aaa11f506977b2e88b3c6050ad50ec33d)
|
||
|
|
||
|
https://issues.redhat.com/browse/RHEL-70129
|
||
|
|
||
|
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
||
|
---
|
||
|
src/cpu_map/index.xml | 1 +
|
||
|
src/cpu_map/meson.build | 1 +
|
||
|
src/cpu_map/x86_coreduo-v1.xml | 6 ++++++
|
||
|
tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 6 +++++-
|
||
|
tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 3 ++-
|
||
|
tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 6 +++++-
|
||
|
tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 6 +++++-
|
||
|
tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 3 ++-
|
||
|
tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 6 +++++-
|
||
|
tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 6 +++++-
|
||
|
tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 3 ++-
|
||
|
tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 6 +++++-
|
||
|
tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 6 +++++-
|
||
|
tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 3 ++-
|
||
|
tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 6 +++++-
|
||
|
tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 6 +++++-
|
||
|
tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 3 ++-
|
||
|
tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 6 +++++-
|
||
|
tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 6 +++++-
|
||
|
tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 3 ++-
|
||
|
tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 6 +++++-
|
||
|
tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 6 +++++-
|
||
|
tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml | 3 ++-
|
||
|
tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 3 ++-
|
||
|
tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 6 +++++-
|
||
|
tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 6 +++++-
|
||
|
tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 3 ++-
|
||
|
tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 6 +++++-
|
||
|
tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 6 +++++-
|
||
|
tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 3 ++-
|
||
|
tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 6 +++++-
|
||
|
tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 6 +++++-
|
||
|
tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 3 ++-
|
||
|
tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 6 +++++-
|
||
|
tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml | 6 +++++-
|
||
|
tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml | 3 ++-
|
||
|
tests/domaincapsdata/qemu_9.0.0.x86_64.xml | 6 +++++-
|
||
|
tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml | 6 +++++-
|
||
|
tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml | 3 ++-
|
||
|
tests/domaincapsdata/qemu_9.1.0.x86_64.xml | 6 +++++-
|
||
|
tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml | 6 +++++-
|
||
|
tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml | 3 ++-
|
||
|
tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 6 +++++-
|
||
|
43 files changed, 166 insertions(+), 40 deletions(-)
|
||
|
create mode 100644 src/cpu_map/x86_coreduo-v1.xml
|
||
|
|
||
|
diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
|
||
|
index 87cc4f61ed..d8df3b214d 100644
|
||
|
--- a/src/cpu_map/index.xml
|
||
|
+++ b/src/cpu_map/index.xml
|
||
|
@@ -17,6 +17,7 @@
|
||
|
<include filename='x86_pentium3-v1.xml'/>
|
||
|
<include filename='x86_pentiumpro.xml'/>
|
||
|
<include filename='x86_coreduo.xml'/>
|
||
|
+ <include filename='x86_coreduo-v1.xml'/>
|
||
|
<include filename='x86_n270.xml'/>
|
||
|
<include filename='x86_core2duo.xml'/>
|
||
|
</group>
|
||
|
diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
|
||
|
index 6645786736..1213f6929c 100644
|
||
|
--- a/src/cpu_map/meson.build
|
||
|
+++ b/src/cpu_map/meson.build
|
||
|
@@ -45,6 +45,7 @@ cpumap_data = [
|
||
|
'x86_Cooperlake-v2.xml',
|
||
|
'x86_Cooperlake.xml',
|
||
|
'x86_core2duo.xml',
|
||
|
+ 'x86_coreduo-v1.xml',
|
||
|
'x86_coreduo.xml',
|
||
|
'x86_cpu64-rhel5.xml',
|
||
|
'x86_cpu64-rhel6.xml',
|
||
|
diff --git a/src/cpu_map/x86_coreduo-v1.xml b/src/cpu_map/x86_coreduo-v1.xml
|
||
|
new file mode 100644
|
||
|
index 0000000000..c32be47485
|
||
|
--- /dev/null
|
||
|
+++ b/src/cpu_map/x86_coreduo-v1.xml
|
||
|
@@ -0,0 +1,6 @@
|
||
|
+<cpus>
|
||
|
+ <model name='coreduo-v1'>
|
||
|
+ <decode host='on' guest='off'/>
|
||
|
+ <model name='coreduo'/>
|
||
|
+ </model>
|
||
|
+</cpus>
|
||
|
diff --git a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
|
||
|
index f887be4468..cb6db8f83c 100644
|
||
|
--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
|
||
|
+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
|
||
|
@@ -783,10 +783,14 @@
|
||
|
<blockers model='core2duo'>
|
||
|
<feature name='ss'/>
|
||
|
</blockers>
|
||
|
- <model usable='no' vendor='Intel'>coreduo</model>
|
||
|
+ <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
|
||
|
<blockers model='coreduo'>
|
||
|
<feature name='ss'/>
|
||
|
</blockers>
|
||
|
+ <model usable='no' vendor='Intel'>coreduo-v1</model>
|
||
|
+ <blockers model='coreduo-v1'>
|
||
|
+ <feature name='ss'/>
|
||
|
+ </blockers>
|
||
|
<model usable='yes' vendor='unknown'>kvm32</model>
|
||
|
<model usable='yes' vendor='unknown'>kvm64</model>
|
||
|
<model usable='no' vendor='Intel'>n270</model>
|
||
|
diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
|
||
|
index 0c5a3a81f8..36625a07b3 100644
|
||
|
--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
|
||
|
+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
|
||
|
@@ -1413,7 +1413,8 @@
|
||
|
</blockers>
|
||
|
<model usable='yes' vendor='AMD'>athlon</model>
|
||
|
<model usable='yes' vendor='Intel'>core2duo</model>
|
||
|
- <model usable='yes' vendor='Intel'>coreduo</model>
|
||
|
+ <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
|
||
|
+ <model usable='yes' vendor='Intel'>coreduo-v1</model>
|
||
|
<model usable='yes' vendor='unknown'>kvm32</model>
|
||
|
<model usable='yes' vendor='unknown'>kvm64</model>
|
||
|
<model usable='yes' vendor='Intel'>n270</model>
|
||
|
diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
|
||
|
index 7591b2efe9..fcd76f9bc8 100644
|
||
|
--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
|
||
|
+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
|
||
|
@@ -782,10 +782,14 @@
|
||
|
<blockers model='core2duo'>
|
||
|
<feature name='ss'/>
|
||
|
</blockers>
|
||
|
- <model usable='no' vendor='Intel'>coreduo</model>
|
||
|
+ <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
|
||
|
<blockers model='coreduo'>
|
||
|
<feature name='ss'/>
|
||
|
</blockers>
|
||
|
+ <model usable='no' vendor='Intel'>coreduo-v1</model>
|
||
|
+ <blockers model='coreduo-v1'>
|
||
|
+ <feature name='ss'/>
|
||
|
+ </blockers>
|
||
|
<model usable='yes' vendor='unknown'>kvm32</model>
|
||
|
<model usable='yes' vendor='unknown'>kvm64</model>
|
||
|
<model usable='no' vendor='Intel'>n270</model>
|
||
|
diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
|
||
|
index a7b325fd61..4b2d94b281 100644
|
||
|
--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
|
||
|
+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
|
||
|
@@ -805,10 +805,14 @@
|
||
|
<blockers model='core2duo'>
|
||
|
<feature name='ss'/>
|
||
|
</blockers>
|
||
|
- <model usable='no' vendor='Intel'>coreduo</model>
|
||
|
+ <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
|
||
|
<blockers model='coreduo'>
|
||
|
<feature name='ss'/>
|
||
|
</blockers>
|
||
|
+ <model usable='no' vendor='Intel'>coreduo-v1</model>
|
||
|
+ <blockers model='coreduo-v1'>
|
||
|
+ <feature name='ss'/>
|
||
|
+ </blockers>
|
||
|
<model usable='yes' vendor='unknown'>kvm32</model>
|
||
|
<model usable='yes' vendor='unknown'>kvm64</model>
|
||
|
<model usable='no' vendor='Intel'>n270</model>
|
||
|
diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
|
||
|
index 63c1ff9b4a..b20dbe72c1 100644
|
||
|
--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
|
||
|
+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
|
||
|
@@ -1503,7 +1503,8 @@
|
||
|
</blockers>
|
||
|
<model usable='yes' vendor='AMD'>athlon</model>
|
||
|
<model usable='yes' vendor='Intel'>core2duo</model>
|
||
|
- <model usable='yes' vendor='Intel'>coreduo</model>
|
||
|
+ <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
|
||
|
+ <model usable='yes' vendor='Intel'>coreduo-v1</model>
|
||
|
<model usable='yes' vendor='unknown'>kvm32</model>
|
||
|
<model usable='yes' vendor='unknown'>kvm64</model>
|
||
|
<model usable='yes' vendor='Intel'>n270</model>
|
||
|
diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
|
||
|
index 3d6ff5657e..ad3be21085 100644
|
||
|
--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
|
||
|
+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
|
||
|
@@ -804,10 +804,14 @@
|
||
|
<blockers model='core2duo'>
|
||
|
<feature name='ss'/>
|
||
|
</blockers>
|
||
|
- <model usable='no' vendor='Intel'>coreduo</model>
|
||
|
+ <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
|
||
|
<blockers model='coreduo'>
|
||
|
<feature name='ss'/>
|
||
|
</blockers>
|
||
|
+ <model usable='no' vendor='Intel'>coreduo-v1</model>
|
||
|
+ <blockers model='coreduo-v1'>
|
||
|
+ <feature name='ss'/>
|
||
|
+ </blockers>
|
||
|
<model usable='yes' vendor='unknown'>kvm32</model>
|
||
|
<model usable='yes' vendor='unknown'>kvm64</model>
|
||
|
<model usable='no' vendor='Intel'>n270</model>
|
||
|
diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
|
||
|
index e475c264ee..a76f03f910 100644
|
||
|
--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
|
||
|
+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
|
||
|
@@ -906,10 +906,14 @@
|
||
|
<blockers model='core2duo'>
|
||
|
<feature name='ss'/>
|
||
|
</blockers>
|
||
|
- <model usable='no' vendor='Intel'>coreduo</model>
|
||
|
+ <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
|
||
|
<blockers model='coreduo'>
|
||
|
<feature name='ss'/>
|
||
|
</blockers>
|
||
|
+ <model usable='no' vendor='Intel'>coreduo-v1</model>
|
||
|
+ <blockers model='coreduo-v1'>
|
||
|
+ <feature name='ss'/>
|
||
|
+ </blockers>
|
||
|
<model usable='yes' vendor='unknown'>kvm32</model>
|
||
|
<model usable='yes' vendor='unknown'>kvm64</model>
|
||
|
<model usable='no' vendor='Intel'>n270</model>
|
||
|
diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
|
||
|
index 5deb101fe3..da44554a73 100644
|
||
|
--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
|
||
|
+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
|
||
|
@@ -1700,7 +1700,8 @@
|
||
|
</blockers>
|
||
|
<model usable='yes' vendor='AMD'>athlon</model>
|
||
|
<model usable='yes' vendor='Intel'>core2duo</model>
|
||
|
- <model usable='yes' vendor='Intel'>coreduo</model>
|
||
|
+ <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
|
||
|
+ <model usable='yes' vendor='Intel'>coreduo-v1</model>
|
||
|
<model usable='yes' vendor='unknown'>kvm32</model>
|
||
|
<model usable='yes' vendor='unknown'>kvm64</model>
|
||
|
<model usable='yes' vendor='Intel'>n270</model>
|
||
|
diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
|
||
|
index f4542588e8..4369595b2e 100644
|
||
|
--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
|
||
|
+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
|
||
|
@@ -905,10 +905,14 @@
|
||
|
<blockers model='core2duo'>
|
||
|
<feature name='ss'/>
|
||
|
</blockers>
|
||
|
- <model usable='no' vendor='Intel'>coreduo</model>
|
||
|
+ <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
|
||
|
<blockers model='coreduo'>
|
||
|
<feature name='ss'/>
|
||
|
</blockers>
|
||
|
+ <model usable='no' vendor='Intel'>coreduo-v1</model>
|
||
|
+ <blockers model='coreduo-v1'>
|
||
|
+ <feature name='ss'/>
|
||
|
+ </blockers>
|
||
|
<model usable='yes' vendor='unknown'>kvm32</model>
|
||
|
<model usable='yes' vendor='unknown'>kvm64</model>
|
||
|
<model usable='no' vendor='Intel'>n270</model>
|
||
|
diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
|
||
|
index c388b7919a..dc6dd2f743 100644
|
||
|
--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
|
||
|
+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
|
||
|
@@ -912,10 +912,14 @@
|
||
|
<blockers model='core2duo'>
|
||
|
<feature name='ss'/>
|
||
|
</blockers>
|
||
|
- <model usable='no' vendor='Intel'>coreduo</model>
|
||
|
+ <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
|
||
|
<blockers model='coreduo'>
|
||
|
<feature name='ss'/>
|
||
|
</blockers>
|
||
|
+ <model usable='no' vendor='Intel'>coreduo-v1</model>
|
||
|
+ <blockers model='coreduo-v1'>
|
||
|
+ <feature name='ss'/>
|
||
|
+ </blockers>
|
||
|
<model usable='yes' vendor='unknown'>kvm32</model>
|
||
|
<model usable='yes' vendor='unknown'>kvm64</model>
|
||
|
<model usable='no' vendor='Intel'>n270</model>
|
||
|
diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
|
||
|
index bae374c05b..d8bb03fbfd 100644
|
||
|
--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
|
||
|
+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
|
||
|
@@ -1715,7 +1715,8 @@
|
||
|
</blockers>
|
||
|
<model usable='yes' vendor='AMD'>athlon</model>
|
||
|
<model usable='yes' vendor='Intel'>core2duo</model>
|
||
|
- <model usable='yes' vendor='Intel'>coreduo</model>
|
||
|
+ <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
|
||
|
+ <model usable='yes' vendor='Intel'>coreduo-v1</model>
|
||
|
<model usable='yes' vendor='unknown'>kvm32</model>
|
||
|
<model usable='yes' vendor='unknown'>kvm64</model>
|
||
|
<model usable='yes' vendor='Intel'>n270</model>
|
||
|
diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
|
||
|
index 43d1a8d3a2..69afbc55f0 100644
|
||
|
--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
|
||
|
+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
|
||
|
@@ -911,10 +911,14 @@
|
||
|
<blockers model='core2duo'>
|
||
|
<feature name='ss'/>
|
||
|
</blockers>
|
||
|
- <model usable='no' vendor='Intel'>coreduo</model>
|
||
|
+ <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
|
||
|
<blockers model='coreduo'>
|
||
|
<feature name='ss'/>
|
||
|
</blockers>
|
||
|
+ <model usable='no' vendor='Intel'>coreduo-v1</model>
|
||
|
+ <blockers model='coreduo-v1'>
|
||
|
+ <feature name='ss'/>
|
||
|
+ </blockers>
|
||
|
<model usable='yes' vendor='unknown'>kvm32</model>
|
||
|
<model usable='yes' vendor='unknown'>kvm64</model>
|
||
|
<model usable='no' vendor='Intel'>n270</model>
|
||
|
diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
|
||
|
index b882feace0..0798ee74de 100644
|
||
|
--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
|
||
|
+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
|
||
|
@@ -939,10 +939,14 @@
|
||
|
<blockers model='core2duo'>
|
||
|
<feature name='ss'/>
|
||
|
</blockers>
|
||
|
- <model usable='no' vendor='Intel'>coreduo</model>
|
||
|
+ <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
|
||
|
<blockers model='coreduo'>
|
||
|
<feature name='ss'/>
|
||
|
</blockers>
|
||
|
+ <model usable='no' vendor='Intel'>coreduo-v1</model>
|
||
|
+ <blockers model='coreduo-v1'>
|
||
|
+ <feature name='ss'/>
|
||
|
+ </blockers>
|
||
|
<model usable='yes' vendor='unknown'>kvm32</model>
|
||
|
<model usable='yes' vendor='unknown'>kvm64</model>
|
||
|
<model usable='no' vendor='Intel'>n270</model>
|
||
|
diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
|
||
|
index dcdad93bc4..07bbd505fa 100644
|
||
|
--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
|
||
|
+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
|
||
|
@@ -1739,7 +1739,8 @@
|
||
|
</blockers>
|
||
|
<model usable='yes' vendor='AMD'>athlon</model>
|
||
|
<model usable='yes' vendor='Intel'>core2duo</model>
|
||
|
- <model usable='yes' vendor='Intel'>coreduo</model>
|
||
|
+ <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
|
||
|
+ <model usable='yes' vendor='Intel'>coreduo-v1</model>
|
||
|
<model usable='yes' vendor='unknown'>kvm32</model>
|
||
|
<model usable='yes' vendor='unknown'>kvm64</model>
|
||
|
<model usable='yes' vendor='Intel'>n270</model>
|
||
|
diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
|
||
|
index f825365d4e..bf07fa3f51 100644
|
||
|
--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
|
||
|
+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
|
||
|
@@ -938,10 +938,14 @@
|
||
|
<blockers model='core2duo'>
|
||
|
<feature name='ss'/>
|
||
|
</blockers>
|
||
|
- <model usable='no' vendor='Intel'>coreduo</model>
|
||
|
+ <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
|
||
|
<blockers model='coreduo'>
|
||
|
<feature name='ss'/>
|
||
|
</blockers>
|
||
|
+ <model usable='no' vendor='Intel'>coreduo-v1</model>
|
||
|
+ <blockers model='coreduo-v1'>
|
||
|
+ <feature name='ss'/>
|
||
|
+ </blockers>
|
||
|
<model usable='yes' vendor='unknown'>kvm32</model>
|
||
|
<model usable='yes' vendor='unknown'>kvm64</model>
|
||
|
<model usable='no' vendor='Intel'>n270</model>
|
||
|
diff --git a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
|
||
|
index f8ac31d143..694561221f 100644
|
||
|
--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
|
||
|
+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
|
||
|
@@ -906,10 +906,14 @@
|
||
|
<blockers model='core2duo'>
|
||
|
<feature name='ss'/>
|
||
|
</blockers>
|
||
|
- <model usable='no' vendor='Intel'>coreduo</model>
|
||
|
+ <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
|
||
|
<blockers model='coreduo'>
|
||
|
<feature name='ss'/>
|
||
|
</blockers>
|
||
|
+ <model usable='no' vendor='Intel'>coreduo-v1</model>
|
||
|
+ <blockers model='coreduo-v1'>
|
||
|
+ <feature name='ss'/>
|
||
|
+ </blockers>
|
||
|
<model usable='yes' vendor='unknown'>kvm32</model>
|
||
|
<model usable='yes' vendor='unknown'>kvm64</model>
|
||
|
<model usable='no' vendor='Intel'>n270</model>
|
||
|
diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
|
||
|
index c4a159a3da..d98b895940 100644
|
||
|
--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
|
||
|
+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
|
||
|
@@ -1687,7 +1687,8 @@
|
||
|
</blockers>
|
||
|
<model usable='yes' vendor='AMD'>athlon</model>
|
||
|
<model usable='yes' vendor='Intel'>core2duo</model>
|
||
|
- <model usable='yes' vendor='Intel'>coreduo</model>
|
||
|
+ <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
|
||
|
+ <model usable='yes' vendor='Intel'>coreduo-v1</model>
|
||
|
<model usable='yes' vendor='unknown'>kvm32</model>
|
||
|
<model usable='yes' vendor='unknown'>kvm64</model>
|
||
|
<model usable='yes' vendor='Intel'>n270</model>
|
||
|
diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
|
||
|
index 5efd8d499f..e02f39bdf5 100644
|
||
|
--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
|
||
|
+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
|
||
|
@@ -905,10 +905,14 @@
|
||
|
<blockers model='core2duo'>
|
||
|
<feature name='ss'/>
|
||
|
</blockers>
|
||
|
- <model usable='no' vendor='Intel'>coreduo</model>
|
||
|
+ <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
|
||
|
<blockers model='coreduo'>
|
||
|
<feature name='ss'/>
|
||
|
</blockers>
|
||
|
+ <model usable='no' vendor='Intel'>coreduo-v1</model>
|
||
|
+ <blockers model='coreduo-v1'>
|
||
|
+ <feature name='ss'/>
|
||
|
+ </blockers>
|
||
|
<model usable='yes' vendor='unknown'>kvm32</model>
|
||
|
<model usable='yes' vendor='unknown'>kvm64</model>
|
||
|
<model usable='no' vendor='Intel'>n270</model>
|
||
|
diff --git a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
|
||
|
index a0f10ca42d..faa838ee4b 100644
|
||
|
--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
|
||
|
+++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
|
||
|
@@ -911,10 +911,14 @@
|
||
|
<blockers model='core2duo'>
|
||
|
<feature name='ss'/>
|
||
|
</blockers>
|
||
|
- <model usable='no' vendor='Intel'>coreduo</model>
|
||
|
+ <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
|
||
|
<blockers model='coreduo'>
|
||
|
<feature name='ss'/>
|
||
|
</blockers>
|
||
|
+ <model usable='no' vendor='Intel'>coreduo-v1</model>
|
||
|
+ <blockers model='coreduo-v1'>
|
||
|
+ <feature name='ss'/>
|
||
|
+ </blockers>
|
||
|
<model usable='yes' vendor='unknown'>kvm32</model>
|
||
|
<model usable='yes' vendor='unknown'>kvm64</model>
|
||
|
<model usable='no' vendor='Intel'>n270</model>
|
||
|
diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml
|
||
|
index 26e716e0e8..c65ffc40bb 100644
|
||
|
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml
|
||
|
+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml
|
||
|
@@ -1400,7 +1400,8 @@
|
||
|
</blockers>
|
||
|
<model usable='yes' vendor='AMD'>athlon</model>
|
||
|
<model usable='yes' vendor='Intel'>core2duo</model>
|
||
|
- <model usable='yes' vendor='Intel'>coreduo</model>
|
||
|
+ <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
|
||
|
+ <model usable='yes' vendor='Intel'>coreduo-v1</model>
|
||
|
<model usable='yes' vendor='unknown'>kvm32</model>
|
||
|
<model usable='yes' vendor='unknown'>kvm64</model>
|
||
|
<model usable='yes' vendor='Intel'>n270</model>
|
||
|
diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
|
||
|
index 26e716e0e8..c65ffc40bb 100644
|
||
|
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
|
||
|
+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
|
||
|
@@ -1400,7 +1400,8 @@
|
||
|
</blockers>
|
||
|
<model usable='yes' vendor='AMD'>athlon</model>
|
||
|
<model usable='yes' vendor='Intel'>core2duo</model>
|
||
|
- <model usable='yes' vendor='Intel'>coreduo</model>
|
||
|
+ <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
|
||
|
+ <model usable='yes' vendor='Intel'>coreduo-v1</model>
|
||
|
<model usable='yes' vendor='unknown'>kvm32</model>
|
||
|
<model usable='yes' vendor='unknown'>kvm64</model>
|
||
|
<model usable='yes' vendor='Intel'>n270</model>
|
||
|
diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
|
||
|
index 871949d74f..0a88511093 100644
|
||
|
--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
|
||
|
+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
|
||
|
@@ -910,10 +910,14 @@
|
||
|
<blockers model='core2duo'>
|
||
|
<feature name='ss'/>
|
||
|
</blockers>
|
||
|
- <model usable='no' vendor='Intel'>coreduo</model>
|
||
|
+ <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
|
||
|
<blockers model='coreduo'>
|
||
|
<feature name='ss'/>
|
||
|
</blockers>
|
||
|
+ <model usable='no' vendor='Intel'>coreduo-v1</model>
|
||
|
+ <blockers model='coreduo-v1'>
|
||
|
+ <feature name='ss'/>
|
||
|
+ </blockers>
|
||
|
<model usable='yes' vendor='unknown'>kvm32</model>
|
||
|
<model usable='yes' vendor='unknown'>kvm64</model>
|
||
|
<model usable='no' vendor='Intel'>n270</model>
|
||
|
diff --git a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
|
||
|
index 9fb5e0a823..e931d7445d 100644
|
||
|
--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
|
||
|
+++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
|
||
|
@@ -993,10 +993,14 @@
|
||
|
<blockers model='core2duo'>
|
||
|
<feature name='ss'/>
|
||
|
</blockers>
|
||
|
- <model usable='no' vendor='Intel'>coreduo</model>
|
||
|
+ <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
|
||
|
<blockers model='coreduo'>
|
||
|
<feature name='ss'/>
|
||
|
</blockers>
|
||
|
+ <model usable='no' vendor='Intel'>coreduo-v1</model>
|
||
|
+ <blockers model='coreduo-v1'>
|
||
|
+ <feature name='ss'/>
|
||
|
+ </blockers>
|
||
|
<model usable='yes' vendor='unknown'>kvm32</model>
|
||
|
<model usable='yes' vendor='unknown'>kvm64</model>
|
||
|
<model usable='no' vendor='Intel'>n270</model>
|
||
|
diff --git a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
|
||
|
index d7aeb43b83..c0cc453fd1 100644
|
||
|
--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
|
||
|
+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
|
||
|
@@ -1495,7 +1495,8 @@
|
||
|
</blockers>
|
||
|
<model usable='yes' vendor='AMD'>athlon</model>
|
||
|
<model usable='yes' vendor='Intel'>core2duo</model>
|
||
|
- <model usable='yes' vendor='Intel'>coreduo</model>
|
||
|
+ <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
|
||
|
+ <model usable='yes' vendor='Intel'>coreduo-v1</model>
|
||
|
<model usable='yes' vendor='unknown'>kvm32</model>
|
||
|
<model usable='yes' vendor='unknown'>kvm64</model>
|
||
|
<model usable='yes' vendor='Intel'>n270</model>
|
||
|
diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
|
||
|
index 8e226ee237..59c36bfa49 100644
|
||
|
--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
|
||
|
+++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
|
||
|
@@ -992,10 +992,14 @@
|
||
|
<blockers model='core2duo'>
|
||
|
<feature name='ss'/>
|
||
|
</blockers>
|
||
|
- <model usable='no' vendor='Intel'>coreduo</model>
|
||
|
+ <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
|
||
|
<blockers model='coreduo'>
|
||
|
<feature name='ss'/>
|
||
|
</blockers>
|
||
|
+ <model usable='no' vendor='Intel'>coreduo-v1</model>
|
||
|
+ <blockers model='coreduo-v1'>
|
||
|
+ <feature name='ss'/>
|
||
|
+ </blockers>
|
||
|
<model usable='yes' vendor='unknown'>kvm32</model>
|
||
|
<model usable='yes' vendor='unknown'>kvm64</model>
|
||
|
<model usable='no' vendor='Intel'>n270</model>
|
||
|
diff --git a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
|
||
|
index 27fddae9f5..f822c040de 100644
|
||
|
--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
|
||
|
+++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
|
||
|
@@ -1222,10 +1222,14 @@
|
||
|
<blockers model='core2duo'>
|
||
|
<feature name='ss'/>
|
||
|
</blockers>
|
||
|
- <model usable='no' vendor='Intel'>coreduo</model>
|
||
|
+ <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
|
||
|
<blockers model='coreduo'>
|
||
|
<feature name='ss'/>
|
||
|
</blockers>
|
||
|
+ <model usable='no' vendor='Intel'>coreduo-v1</model>
|
||
|
+ <blockers model='coreduo-v1'>
|
||
|
+ <feature name='ss'/>
|
||
|
+ </blockers>
|
||
|
<model usable='yes' vendor='unknown'>kvm32</model>
|
||
|
<model usable='yes' vendor='unknown'>kvm64</model>
|
||
|
<model usable='no' vendor='Intel'>n270</model>
|
||
|
diff --git a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
|
||
|
index 30169a55e4..7ea876c1fc 100644
|
||
|
--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
|
||
|
+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
|
||
|
@@ -1481,7 +1481,8 @@
|
||
|
</blockers>
|
||
|
<model usable='yes' vendor='AMD'>athlon</model>
|
||
|
<model usable='yes' vendor='Intel'>core2duo</model>
|
||
|
- <model usable='yes' vendor='Intel'>coreduo</model>
|
||
|
+ <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
|
||
|
+ <model usable='yes' vendor='Intel'>coreduo-v1</model>
|
||
|
<model usable='yes' vendor='unknown'>kvm32</model>
|
||
|
<model usable='yes' vendor='unknown'>kvm64</model>
|
||
|
<model usable='yes' vendor='Intel'>n270</model>
|
||
|
diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
|
||
|
index c91b05f312..56a57665f1 100644
|
||
|
--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
|
||
|
+++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
|
||
|
@@ -1221,10 +1221,14 @@
|
||
|
<blockers model='core2duo'>
|
||
|
<feature name='ss'/>
|
||
|
</blockers>
|
||
|
- <model usable='no' vendor='Intel'>coreduo</model>
|
||
|
+ <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
|
||
|
<blockers model='coreduo'>
|
||
|
<feature name='ss'/>
|
||
|
</blockers>
|
||
|
+ <model usable='no' vendor='Intel'>coreduo-v1</model>
|
||
|
+ <blockers model='coreduo-v1'>
|
||
|
+ <feature name='ss'/>
|
||
|
+ </blockers>
|
||
|
<model usable='yes' vendor='unknown'>kvm32</model>
|
||
|
<model usable='yes' vendor='unknown'>kvm64</model>
|
||
|
<model usable='no' vendor='Intel'>n270</model>
|
||
|
diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
|
||
|
index 76d9f80936..d2e14fcaab 100644
|
||
|
--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
|
||
|
+++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
|
||
|
@@ -1223,10 +1223,14 @@
|
||
|
<blockers model='core2duo'>
|
||
|
<feature name='ss'/>
|
||
|
</blockers>
|
||
|
- <model usable='no' vendor='Intel'>coreduo</model>
|
||
|
+ <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
|
||
|
<blockers model='coreduo'>
|
||
|
<feature name='ss'/>
|
||
|
</blockers>
|
||
|
+ <model usable='no' vendor='Intel'>coreduo-v1</model>
|
||
|
+ <blockers model='coreduo-v1'>
|
||
|
+ <feature name='ss'/>
|
||
|
+ </blockers>
|
||
|
<model usable='yes' vendor='unknown'>kvm32</model>
|
||
|
<model usable='yes' vendor='unknown'>kvm64</model>
|
||
|
<model usable='no' vendor='Intel'>n270</model>
|
||
|
diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
|
||
|
index 7f08733452..25fe5a3f48 100644
|
||
|
--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
|
||
|
+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
|
||
|
@@ -1448,7 +1448,8 @@
|
||
|
</blockers>
|
||
|
<model usable='yes' vendor='AMD'>athlon</model>
|
||
|
<model usable='yes' vendor='Intel'>core2duo</model>
|
||
|
- <model usable='yes' vendor='Intel'>coreduo</model>
|
||
|
+ <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
|
||
|
+ <model usable='yes' vendor='Intel'>coreduo-v1</model>
|
||
|
<model usable='yes' vendor='unknown'>kvm32</model>
|
||
|
<model usable='yes' vendor='unknown'>kvm64</model>
|
||
|
<model usable='yes' vendor='Intel'>n270</model>
|
||
|
diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
|
||
|
index 4bf5988cf3..dfcbcf2477 100644
|
||
|
--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
|
||
|
+++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
|
||
|
@@ -1222,10 +1222,14 @@
|
||
|
<blockers model='core2duo'>
|
||
|
<feature name='ss'/>
|
||
|
</blockers>
|
||
|
- <model usable='no' vendor='Intel'>coreduo</model>
|
||
|
+ <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
|
||
|
<blockers model='coreduo'>
|
||
|
<feature name='ss'/>
|
||
|
</blockers>
|
||
|
+ <model usable='no' vendor='Intel'>coreduo-v1</model>
|
||
|
+ <blockers model='coreduo-v1'>
|
||
|
+ <feature name='ss'/>
|
||
|
+ </blockers>
|
||
|
<model usable='yes' vendor='unknown'>kvm32</model>
|
||
|
<model usable='yes' vendor='unknown'>kvm64</model>
|
||
|
<model usable='no' vendor='Intel'>n270</model>
|
||
|
diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
|
||
|
index 8e2d2a636e..7b20023b19 100644
|
||
|
--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
|
||
|
+++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
|
||
|
@@ -1223,10 +1223,14 @@
|
||
|
<blockers model='core2duo'>
|
||
|
<feature name='ss'/>
|
||
|
</blockers>
|
||
|
- <model usable='no' vendor='Intel'>coreduo</model>
|
||
|
+ <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
|
||
|
<blockers model='coreduo'>
|
||
|
<feature name='ss'/>
|
||
|
</blockers>
|
||
|
+ <model usable='no' vendor='Intel'>coreduo-v1</model>
|
||
|
+ <blockers model='coreduo-v1'>
|
||
|
+ <feature name='ss'/>
|
||
|
+ </blockers>
|
||
|
<model usable='yes' vendor='unknown'>kvm32</model>
|
||
|
<model usable='yes' vendor='unknown'>kvm64</model>
|
||
|
<model usable='no' vendor='Intel'>n270</model>
|
||
|
diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
|
||
|
index 0b488faa07..ee58ddff1d 100644
|
||
|
--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
|
||
|
+++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
|
||
|
@@ -1378,7 +1378,8 @@
|
||
|
</blockers>
|
||
|
<model usable='yes' vendor='AMD'>athlon</model>
|
||
|
<model usable='yes' vendor='Intel'>core2duo</model>
|
||
|
- <model usable='yes' vendor='Intel'>coreduo</model>
|
||
|
+ <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
|
||
|
+ <model usable='yes' vendor='Intel'>coreduo-v1</model>
|
||
|
<model usable='yes' vendor='unknown'>kvm32</model>
|
||
|
<model usable='yes' vendor='unknown'>kvm64</model>
|
||
|
<model usable='yes' vendor='Intel'>n270</model>
|
||
|
diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
|
||
|
index 9b41cc5fcc..d2f19183f0 100644
|
||
|
--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
|
||
|
+++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
|
||
|
@@ -1222,10 +1222,14 @@
|
||
|
<blockers model='core2duo'>
|
||
|
<feature name='ss'/>
|
||
|
</blockers>
|
||
|
- <model usable='no' vendor='Intel'>coreduo</model>
|
||
|
+ <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
|
||
|
<blockers model='coreduo'>
|
||
|
<feature name='ss'/>
|
||
|
</blockers>
|
||
|
+ <model usable='no' vendor='Intel'>coreduo-v1</model>
|
||
|
+ <blockers model='coreduo-v1'>
|
||
|
+ <feature name='ss'/>
|
||
|
+ </blockers>
|
||
|
<model usable='yes' vendor='unknown'>kvm32</model>
|
||
|
<model usable='yes' vendor='unknown'>kvm64</model>
|
||
|
<model usable='no' vendor='Intel'>n270</model>
|
||
|
diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
|
||
|
index 996a269525..3e3bd2b5e1 100644
|
||
|
--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
|
||
|
+++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
|
||
|
@@ -1359,10 +1359,14 @@
|
||
|
<blockers model='core2duo'>
|
||
|
<feature name='ss'/>
|
||
|
</blockers>
|
||
|
- <model usable='no' vendor='Intel'>coreduo</model>
|
||
|
+ <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
|
||
|
<blockers model='coreduo'>
|
||
|
<feature name='ss'/>
|
||
|
</blockers>
|
||
|
+ <model usable='no' vendor='Intel'>coreduo-v1</model>
|
||
|
+ <blockers model='coreduo-v1'>
|
||
|
+ <feature name='ss'/>
|
||
|
+ </blockers>
|
||
|
<model usable='yes' vendor='unknown'>kvm32</model>
|
||
|
<model usable='yes' vendor='unknown'>kvm64</model>
|
||
|
<model usable='no' vendor='Intel'>n270</model>
|
||
|
diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
|
||
|
index 5d914aa62c..f4e8163256 100644
|
||
|
--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
|
||
|
+++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
|
||
|
@@ -1483,7 +1483,8 @@
|
||
|
</blockers>
|
||
|
<model usable='yes' vendor='AMD'>athlon</model>
|
||
|
<model usable='yes' vendor='Intel'>core2duo</model>
|
||
|
- <model usable='yes' vendor='Intel'>coreduo</model>
|
||
|
+ <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
|
||
|
+ <model usable='yes' vendor='Intel'>coreduo-v1</model>
|
||
|
<model usable='yes' vendor='unknown'>kvm32</model>
|
||
|
<model usable='yes' vendor='unknown'>kvm64</model>
|
||
|
<model usable='yes' vendor='Intel'>n270</model>
|
||
|
diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
|
||
|
index 094ec28df0..54d5323f71 100644
|
||
|
--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
|
||
|
+++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
|
||
|
@@ -1358,10 +1358,14 @@
|
||
|
<blockers model='core2duo'>
|
||
|
<feature name='ss'/>
|
||
|
</blockers>
|
||
|
- <model usable='no' vendor='Intel'>coreduo</model>
|
||
|
+ <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
|
||
|
<blockers model='coreduo'>
|
||
|
<feature name='ss'/>
|
||
|
</blockers>
|
||
|
+ <model usable='no' vendor='Intel'>coreduo-v1</model>
|
||
|
+ <blockers model='coreduo-v1'>
|
||
|
+ <feature name='ss'/>
|
||
|
+ </blockers>
|
||
|
<model usable='yes' vendor='unknown'>kvm32</model>
|
||
|
<model usable='yes' vendor='unknown'>kvm64</model>
|
||
|
<model usable='no' vendor='Intel'>n270</model>
|
||
|
diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
|
||
|
index 0e9a63cf4e..b9697229d9 100644
|
||
|
--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
|
||
|
+++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
|
||
|
@@ -1359,10 +1359,14 @@
|
||
|
<blockers model='core2duo'>
|
||
|
<feature name='ss'/>
|
||
|
</blockers>
|
||
|
- <model usable='no' vendor='Intel'>coreduo</model>
|
||
|
+ <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
|
||
|
<blockers model='coreduo'>
|
||
|
<feature name='ss'/>
|
||
|
</blockers>
|
||
|
+ <model usable='no' vendor='Intel'>coreduo-v1</model>
|
||
|
+ <blockers model='coreduo-v1'>
|
||
|
+ <feature name='ss'/>
|
||
|
+ </blockers>
|
||
|
<model usable='yes' vendor='unknown'>kvm32</model>
|
||
|
<model usable='yes' vendor='unknown'>kvm64</model>
|
||
|
<model usable='no' vendor='Intel'>n270</model>
|
||
|
diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
|
||
|
index 9fb8cb4e4a..cc672be9a1 100644
|
||
|
--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
|
||
|
+++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
|
||
|
@@ -1483,7 +1483,8 @@
|
||
|
</blockers>
|
||
|
<model usable='yes' vendor='AMD'>athlon</model>
|
||
|
<model usable='yes' vendor='Intel'>core2duo</model>
|
||
|
- <model usable='yes' vendor='Intel'>coreduo</model>
|
||
|
+ <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
|
||
|
+ <model usable='yes' vendor='Intel'>coreduo-v1</model>
|
||
|
<model usable='yes' vendor='unknown'>kvm32</model>
|
||
|
<model usable='yes' vendor='unknown'>kvm64</model>
|
||
|
<model usable='yes' vendor='Intel'>n270</model>
|
||
|
diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
|
||
|
index d99a66ecfe..c29d1e99bc 100644
|
||
|
--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
|
||
|
+++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
|
||
|
@@ -1358,10 +1358,14 @@
|
||
|
<blockers model='core2duo'>
|
||
|
<feature name='ss'/>
|
||
|
</blockers>
|
||
|
- <model usable='no' vendor='Intel'>coreduo</model>
|
||
|
+ <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
|
||
|
<blockers model='coreduo'>
|
||
|
<feature name='ss'/>
|
||
|
</blockers>
|
||
|
+ <model usable='no' vendor='Intel'>coreduo-v1</model>
|
||
|
+ <blockers model='coreduo-v1'>
|
||
|
+ <feature name='ss'/>
|
||
|
+ </blockers>
|
||
|
<model usable='yes' vendor='unknown'>kvm32</model>
|
||
|
<model usable='yes' vendor='unknown'>kvm64</model>
|
||
|
<model usable='no' vendor='Intel'>n270</model>
|
||
|
--
|
||
|
2.47.1
|