[PATCH v2 18/25] cpu_map: Add athlon-v1 CPU model

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- src/cpu_map/index.xml | 1 + src/cpu_map/meson.build | 1 + src/cpu_map/x86_athlon-v1.xml | 6 ++++++ tests/cputestdata/x86_64-cpuid-Phenom-B95-host.xml | 2 +- tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 7 ++++++- tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 7 ++++++- tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 7 ++++++- tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 7 ++++++- tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 7 ++++++- tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 7 ++++++- tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 7 ++++++- tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 7 ++++++- tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 7 ++++++- tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 7 ++++++- tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 7 ++++++- tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 7 ++++++- tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 7 ++++++- 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 | 7 ++++++- tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 7 ++++++- tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 7 ++++++- tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 7 ++++++- tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 7 ++++++- tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 7 ++++++- tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 7 ++++++- tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml | 7 ++++++- tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_9.0.0.x86_64.xml | 7 ++++++- tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml | 7 ++++++- tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_9.1.0.x86_64.xml | 7 ++++++- tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml | 7 ++++++- tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 7 ++++++- 44 files changed, 193 insertions(+), 41 deletions(-) create mode 100644 src/cpu_map/x86_athlon-v1.xml diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml index a0aa677dee..5f42fdc7fd 100644 --- a/src/cpu_map/index.xml +++ b/src/cpu_map/index.xml @@ -133,6 +133,7 @@ <group name='AMD CPU models'> <include filename='x86_athlon.xml'/> + <include filename='x86_athlon-v1.xml'/> <include filename='x86_phenom.xml'/> <include filename='x86_Opteron_G1.xml'/> <include filename='x86_Opteron_G2.xml'/> diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build index 70c7d2091b..8d45feee00 100644 --- a/src/cpu_map/meson.build +++ b/src/cpu_map/meson.build @@ -24,6 +24,7 @@ cpumap_data = [ 'ppc64_vendors.xml', 'x86_486-v1.xml', 'x86_486.xml', + 'x86_athlon-v1.xml', 'x86_athlon.xml', 'x86_Broadwell-IBRS.xml', 'x86_Broadwell-noTSX-IBRS.xml', diff --git a/src/cpu_map/x86_athlon-v1.xml b/src/cpu_map/x86_athlon-v1.xml new file mode 100644 index 0000000000..cefe282c51 --- /dev/null +++ b/src/cpu_map/x86_athlon-v1.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='athlon-v1'> + <decode host='on' guest='off'/> + <model name='athlon'/> + </model> +</cpus> diff --git a/tests/cputestdata/x86_64-cpuid-Phenom-B95-host.xml b/tests/cputestdata/x86_64-cpuid-Phenom-B95-host.xml index 6a4196b735..b337947d3e 100644 --- a/tests/cputestdata/x86_64-cpuid-Phenom-B95-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Phenom-B95-host.xml @@ -1,6 +1,6 @@ <cpu> <arch>x86_64</arch> - <model>athlon</model> + <model>athlon-v1</model> <vendor>AMD</vendor> <signature family='16' model='4' stepping='2'/> <feature name='pni'/> 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 43e1ca8861..c71286deb2 100644 --- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml @@ -788,11 +788,16 @@ <blockers model='Westmere-v2'> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='AMD'>athlon</model> + <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model> <blockers model='athlon'> <feature name='3dnow'/> <feature name='3dnowext'/> </blockers> + <model usable='no' vendor='AMD'>athlon-v1</model> + <blockers model='athlon-v1'> + <feature name='3dnow'/> + <feature name='3dnowext'/> + </blockers> <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model> <blockers model='core2duo'> <feature name='ss'/> 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 0718de04f7..26f3eed92b 100644 --- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml @@ -1431,7 +1431,8 @@ <blockers model='Westmere-v2'> <feature name='spec-ctrl'/> </blockers> - <model usable='yes' vendor='AMD'>athlon</model> + <model usable='yes' vendor='AMD' canonical='athlon-v1'>athlon</model> + <model usable='yes' vendor='AMD'>athlon-v1</model> <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model> <model usable='yes' vendor='Intel'>core2duo-v1</model> <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model> diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml index 6eb78e68f0..6e67479e25 100644 --- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml @@ -787,11 +787,16 @@ <blockers model='Westmere-v2'> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='AMD'>athlon</model> + <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model> <blockers model='athlon'> <feature name='3dnow'/> <feature name='3dnowext'/> </blockers> + <model usable='no' vendor='AMD'>athlon-v1</model> + <blockers model='athlon-v1'> + <feature name='3dnow'/> + <feature name='3dnowext'/> + </blockers> <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model> <blockers model='core2duo'> <feature name='ss'/> 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 3b716faf00..d5b703e09a 100644 --- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml @@ -810,11 +810,16 @@ <blockers model='Westmere-v2'> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='AMD'>athlon</model> + <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model> <blockers model='athlon'> <feature name='3dnow'/> <feature name='3dnowext'/> </blockers> + <model usable='no' vendor='AMD'>athlon-v1</model> + <blockers model='athlon-v1'> + <feature name='3dnow'/> + <feature name='3dnowext'/> + </blockers> <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model> <blockers model='core2duo'> <feature name='ss'/> 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 bd8c0a086c..5928a72da9 100644 --- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml @@ -1521,7 +1521,8 @@ <blockers model='Westmere-v2'> <feature name='spec-ctrl'/> </blockers> - <model usable='yes' vendor='AMD'>athlon</model> + <model usable='yes' vendor='AMD' canonical='athlon-v1'>athlon</model> + <model usable='yes' vendor='AMD'>athlon-v1</model> <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model> <model usable='yes' vendor='Intel'>core2duo-v1</model> <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model> diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml index b6ec55cf0c..69c1eb816f 100644 --- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml @@ -809,11 +809,16 @@ <blockers model='Westmere-v2'> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='AMD'>athlon</model> + <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model> <blockers model='athlon'> <feature name='3dnow'/> <feature name='3dnowext'/> </blockers> + <model usable='no' vendor='AMD'>athlon-v1</model> + <blockers model='athlon-v1'> + <feature name='3dnow'/> + <feature name='3dnowext'/> + </blockers> <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model> <blockers model='core2duo'> <feature name='ss'/> 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 e6615316f7..c65db67a41 100644 --- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml @@ -911,11 +911,16 @@ <blockers model='Westmere-v2'> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='AMD'>athlon</model> + <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model> <blockers model='athlon'> <feature name='3dnow'/> <feature name='3dnowext'/> </blockers> + <model usable='no' vendor='AMD'>athlon-v1</model> + <blockers model='athlon-v1'> + <feature name='3dnow'/> + <feature name='3dnowext'/> + </blockers> <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model> <blockers model='core2duo'> <feature name='ss'/> 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 50d6395d7f..e85937b36d 100644 --- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml @@ -1718,7 +1718,8 @@ <blockers model='Westmere-v2'> <feature name='spec-ctrl'/> </blockers> - <model usable='yes' vendor='AMD'>athlon</model> + <model usable='yes' vendor='AMD' canonical='athlon-v1'>athlon</model> + <model usable='yes' vendor='AMD'>athlon-v1</model> <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model> <model usable='yes' vendor='Intel'>core2duo-v1</model> <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model> diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml index 974346f980..b1b76ad6fd 100644 --- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml @@ -910,11 +910,16 @@ <blockers model='Westmere-v2'> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='AMD'>athlon</model> + <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model> <blockers model='athlon'> <feature name='3dnow'/> <feature name='3dnowext'/> </blockers> + <model usable='no' vendor='AMD'>athlon-v1</model> + <blockers model='athlon-v1'> + <feature name='3dnow'/> + <feature name='3dnowext'/> + </blockers> <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model> <blockers model='core2duo'> <feature name='ss'/> 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 812ebd5e0a..fa27ff520a 100644 --- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml @@ -917,11 +917,16 @@ <blockers model='Westmere-v2'> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='AMD'>athlon</model> + <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model> <blockers model='athlon'> <feature name='3dnow'/> <feature name='3dnowext'/> </blockers> + <model usable='no' vendor='AMD'>athlon-v1</model> + <blockers model='athlon-v1'> + <feature name='3dnow'/> + <feature name='3dnowext'/> + </blockers> <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model> <blockers model='core2duo'> <feature name='ss'/> 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 24f22dd53f..33ff630126 100644 --- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml @@ -1733,7 +1733,8 @@ <blockers model='Westmere-v2'> <feature name='spec-ctrl'/> </blockers> - <model usable='yes' vendor='AMD'>athlon</model> + <model usable='yes' vendor='AMD' canonical='athlon-v1'>athlon</model> + <model usable='yes' vendor='AMD'>athlon-v1</model> <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model> <model usable='yes' vendor='Intel'>core2duo-v1</model> <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model> diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml index 9af219d59d..0cf8733f1e 100644 --- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml @@ -916,11 +916,16 @@ <blockers model='Westmere-v2'> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='AMD'>athlon</model> + <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model> <blockers model='athlon'> <feature name='3dnow'/> <feature name='3dnowext'/> </blockers> + <model usable='no' vendor='AMD'>athlon-v1</model> + <blockers model='athlon-v1'> + <feature name='3dnow'/> + <feature name='3dnowext'/> + </blockers> <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model> <blockers model='core2duo'> <feature name='ss'/> 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 439f609233..ba3669f4b2 100644 --- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml @@ -944,11 +944,16 @@ <blockers model='Westmere-v2'> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='AMD'>athlon</model> + <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model> <blockers model='athlon'> <feature name='3dnow'/> <feature name='3dnowext'/> </blockers> + <model usable='no' vendor='AMD'>athlon-v1</model> + <blockers model='athlon-v1'> + <feature name='3dnow'/> + <feature name='3dnowext'/> + </blockers> <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model> <blockers model='core2duo'> <feature name='ss'/> 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 53c114699c..43b6a68e24 100644 --- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml @@ -1757,7 +1757,8 @@ <blockers model='Westmere-v2'> <feature name='spec-ctrl'/> </blockers> - <model usable='yes' vendor='AMD'>athlon</model> + <model usable='yes' vendor='AMD' canonical='athlon-v1'>athlon</model> + <model usable='yes' vendor='AMD'>athlon-v1</model> <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model> <model usable='yes' vendor='Intel'>core2duo-v1</model> <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model> diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml index 6d91c4ac75..a7d454b330 100644 --- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml @@ -943,11 +943,16 @@ <blockers model='Westmere-v2'> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='AMD'>athlon</model> + <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model> <blockers model='athlon'> <feature name='3dnow'/> <feature name='3dnowext'/> </blockers> + <model usable='no' vendor='AMD'>athlon-v1</model> + <blockers model='athlon-v1'> + <feature name='3dnow'/> + <feature name='3dnowext'/> + </blockers> <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model> <blockers model='core2duo'> <feature name='ss'/> 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 d61b339dd9..08c27dbab8 100644 --- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml @@ -911,11 +911,16 @@ <blockers model='Westmere-v2'> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='AMD'>athlon</model> + <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model> <blockers model='athlon'> <feature name='3dnow'/> <feature name='3dnowext'/> </blockers> + <model usable='no' vendor='AMD'>athlon-v1</model> + <blockers model='athlon-v1'> + <feature name='3dnow'/> + <feature name='3dnowext'/> + </blockers> <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model> <blockers model='core2duo'> <feature name='ss'/> 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 a758fbabc5..8e974ebfde 100644 --- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml @@ -1705,7 +1705,8 @@ <blockers model='Westmere-v2'> <feature name='spec-ctrl'/> </blockers> - <model usable='yes' vendor='AMD'>athlon</model> + <model usable='yes' vendor='AMD' canonical='athlon-v1'>athlon</model> + <model usable='yes' vendor='AMD'>athlon-v1</model> <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model> <model usable='yes' vendor='Intel'>core2duo-v1</model> <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model> diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml index 48e8299c23..71cb90d172 100644 --- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml @@ -910,11 +910,16 @@ <blockers model='Westmere-v2'> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='AMD'>athlon</model> + <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model> <blockers model='athlon'> <feature name='3dnow'/> <feature name='3dnowext'/> </blockers> + <model usable='no' vendor='AMD'>athlon-v1</model> + <blockers model='athlon-v1'> + <feature name='3dnow'/> + <feature name='3dnowext'/> + </blockers> <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model> <blockers model='core2duo'> <feature name='ss'/> 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 6a15994158..2d346b5a15 100644 --- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml @@ -916,11 +916,16 @@ <blockers model='Westmere-v2'> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='AMD'>athlon</model> + <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model> <blockers model='athlon'> <feature name='3dnow'/> <feature name='3dnowext'/> </blockers> + <model usable='no' vendor='AMD'>athlon-v1</model> + <blockers model='athlon-v1'> + <feature name='3dnow'/> + <feature name='3dnowext'/> + </blockers> <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model> <blockers model='core2duo'> <feature name='ss'/> 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 4d0def8fc7..31a774af8a 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 @@ -1414,7 +1414,8 @@ <blockers model='Westmere-v2'> <feature name='spec-ctrl'/> </blockers> - <model usable='yes' vendor='AMD'>athlon</model> + <model usable='yes' vendor='AMD' canonical='athlon-v1'>athlon</model> + <model usable='yes' vendor='AMD'>athlon-v1</model> <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model> <model usable='yes' vendor='Intel'>core2duo-v1</model> <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</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 4d0def8fc7..31a774af8a 100644 --- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml @@ -1414,7 +1414,8 @@ <blockers model='Westmere-v2'> <feature name='spec-ctrl'/> </blockers> - <model usable='yes' vendor='AMD'>athlon</model> + <model usable='yes' vendor='AMD' canonical='athlon-v1'>athlon</model> + <model usable='yes' vendor='AMD'>athlon-v1</model> <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model> <model usable='yes' vendor='Intel'>core2duo-v1</model> <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model> diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml index ead8df9815..46b0e223c7 100644 --- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml @@ -915,11 +915,16 @@ <blockers model='Westmere-v2'> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='AMD'>athlon</model> + <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model> <blockers model='athlon'> <feature name='3dnow'/> <feature name='3dnowext'/> </blockers> + <model usable='no' vendor='AMD'>athlon-v1</model> + <blockers model='athlon-v1'> + <feature name='3dnow'/> + <feature name='3dnowext'/> + </blockers> <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model> <blockers model='core2duo'> <feature name='ss'/> 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 1936c89c70..95d809d412 100644 --- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml @@ -998,11 +998,16 @@ <blockers model='Westmere-v2'> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='AMD'>athlon</model> + <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model> <blockers model='athlon'> <feature name='3dnow'/> <feature name='3dnowext'/> </blockers> + <model usable='no' vendor='AMD'>athlon-v1</model> + <blockers model='athlon-v1'> + <feature name='3dnow'/> + <feature name='3dnowext'/> + </blockers> <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model> <blockers model='core2duo'> <feature name='ss'/> 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 d72b0c93d3..95c413a22f 100644 --- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml @@ -1509,7 +1509,8 @@ <blockers model='Westmere-v2'> <feature name='spec-ctrl'/> </blockers> - <model usable='yes' vendor='AMD'>athlon</model> + <model usable='yes' vendor='AMD' canonical='athlon-v1'>athlon</model> + <model usable='yes' vendor='AMD'>athlon-v1</model> <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model> <model usable='yes' vendor='Intel'>core2duo-v1</model> <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model> diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml index 4adb6402ae..4cd5d8e640 100644 --- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml @@ -997,11 +997,16 @@ <blockers model='Westmere-v2'> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='AMD'>athlon</model> + <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model> <blockers model='athlon'> <feature name='3dnow'/> <feature name='3dnowext'/> </blockers> + <model usable='no' vendor='AMD'>athlon-v1</model> + <blockers model='athlon-v1'> + <feature name='3dnow'/> + <feature name='3dnowext'/> + </blockers> <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model> <blockers model='core2duo'> <feature name='ss'/> 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 c9f53064ff..94def05942 100644 --- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml @@ -1227,11 +1227,16 @@ <blockers model='Westmere-v2'> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='AMD'>athlon</model> + <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model> <blockers model='athlon'> <feature name='3dnow'/> <feature name='3dnowext'/> </blockers> + <model usable='no' vendor='AMD'>athlon-v1</model> + <blockers model='athlon-v1'> + <feature name='3dnow'/> + <feature name='3dnowext'/> + </blockers> <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model> <blockers model='core2duo'> <feature name='ss'/> 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 b2e2c3264b..958b250336 100644 --- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml @@ -1493,7 +1493,8 @@ <blockers model='Westmere-v2'> <feature name='spec-ctrl'/> </blockers> - <model usable='yes' vendor='AMD'>athlon</model> + <model usable='yes' vendor='AMD' canonical='athlon-v1'>athlon</model> + <model usable='yes' vendor='AMD'>athlon-v1</model> <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model> <model usable='yes' vendor='Intel'>core2duo-v1</model> <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model> diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml index c630356571..4480ff39cd 100644 --- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml @@ -1226,11 +1226,16 @@ <blockers model='Westmere-v2'> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='AMD'>athlon</model> + <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model> <blockers model='athlon'> <feature name='3dnow'/> <feature name='3dnowext'/> </blockers> + <model usable='no' vendor='AMD'>athlon-v1</model> + <blockers model='athlon-v1'> + <feature name='3dnow'/> + <feature name='3dnowext'/> + </blockers> <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model> <blockers model='core2duo'> <feature name='ss'/> 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 17f4f6c4f0..9f91f9ef93 100644 --- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml @@ -1228,11 +1228,16 @@ <blockers model='Westmere-v2'> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='AMD'>athlon</model> + <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model> <blockers model='athlon'> <feature name='3dnow'/> <feature name='3dnowext'/> </blockers> + <model usable='no' vendor='AMD'>athlon-v1</model> + <blockers model='athlon-v1'> + <feature name='3dnow'/> + <feature name='3dnowext'/> + </blockers> <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model> <blockers model='core2duo'> <feature name='ss'/> 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 3ea2911762..cf6ce11821 100644 --- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml @@ -1460,7 +1460,8 @@ <blockers model='Westmere-v2'> <feature name='spec-ctrl'/> </blockers> - <model usable='yes' vendor='AMD'>athlon</model> + <model usable='yes' vendor='AMD' canonical='athlon-v1'>athlon</model> + <model usable='yes' vendor='AMD'>athlon-v1</model> <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model> <model usable='yes' vendor='Intel'>core2duo-v1</model> <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model> diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml index 77286e9aef..07034ee9a7 100644 --- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml @@ -1227,11 +1227,16 @@ <blockers model='Westmere-v2'> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='AMD'>athlon</model> + <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model> <blockers model='athlon'> <feature name='3dnow'/> <feature name='3dnowext'/> </blockers> + <model usable='no' vendor='AMD'>athlon-v1</model> + <blockers model='athlon-v1'> + <feature name='3dnow'/> + <feature name='3dnowext'/> + </blockers> <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model> <blockers model='core2duo'> <feature name='ss'/> 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 d304fbd62b..020ad5bdba 100644 --- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml @@ -1228,11 +1228,16 @@ <blockers model='Westmere-v2'> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='AMD'>athlon</model> + <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model> <blockers model='athlon'> <feature name='3dnow'/> <feature name='3dnowext'/> </blockers> + <model usable='no' vendor='AMD'>athlon-v1</model> + <blockers model='athlon-v1'> + <feature name='3dnow'/> + <feature name='3dnowext'/> + </blockers> <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model> <blockers model='core2duo'> <feature name='ss'/> 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 3e6cc25529..b0a25f5ea6 100644 --- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml @@ -1389,7 +1389,8 @@ <blockers model='Westmere-v2'> <feature name='spec-ctrl'/> </blockers> - <model usable='yes' vendor='AMD'>athlon</model> + <model usable='yes' vendor='AMD' canonical='athlon-v1'>athlon</model> + <model usable='yes' vendor='AMD'>athlon-v1</model> <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model> <model usable='yes' vendor='Intel'>core2duo-v1</model> <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model> diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml index a6fae9e3f1..f6e47f704a 100644 --- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml @@ -1227,11 +1227,16 @@ <blockers model='Westmere-v2'> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='AMD'>athlon</model> + <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model> <blockers model='athlon'> <feature name='3dnow'/> <feature name='3dnowext'/> </blockers> + <model usable='no' vendor='AMD'>athlon-v1</model> + <blockers model='athlon-v1'> + <feature name='3dnow'/> + <feature name='3dnowext'/> + </blockers> <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model> <blockers model='core2duo'> <feature name='ss'/> 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 060d96ab09..b501544f11 100644 --- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml @@ -1364,11 +1364,16 @@ <blockers model='Westmere-v2'> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='AMD'>athlon</model> + <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model> <blockers model='athlon'> <feature name='3dnow'/> <feature name='3dnowext'/> </blockers> + <model usable='no' vendor='AMD'>athlon-v1</model> + <blockers model='athlon-v1'> + <feature name='3dnow'/> + <feature name='3dnowext'/> + </blockers> <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model> <blockers model='core2duo'> <feature name='ss'/> 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 75f83cb376..1704b3b265 100644 --- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml @@ -1494,7 +1494,8 @@ <blockers model='Westmere-v2'> <feature name='spec-ctrl'/> </blockers> - <model usable='yes' vendor='AMD'>athlon</model> + <model usable='yes' vendor='AMD' canonical='athlon-v1'>athlon</model> + <model usable='yes' vendor='AMD'>athlon-v1</model> <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model> <model usable='yes' vendor='Intel'>core2duo-v1</model> <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model> diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml index 66dcb81fe6..3a1642af94 100644 --- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml @@ -1363,11 +1363,16 @@ <blockers model='Westmere-v2'> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='AMD'>athlon</model> + <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model> <blockers model='athlon'> <feature name='3dnow'/> <feature name='3dnowext'/> </blockers> + <model usable='no' vendor='AMD'>athlon-v1</model> + <blockers model='athlon-v1'> + <feature name='3dnow'/> + <feature name='3dnowext'/> + </blockers> <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model> <blockers model='core2duo'> <feature name='ss'/> 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 72df5e5e7d..91eab35039 100644 --- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml @@ -1364,11 +1364,16 @@ <blockers model='Westmere-v2'> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='AMD'>athlon</model> + <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model> <blockers model='athlon'> <feature name='3dnow'/> <feature name='3dnowext'/> </blockers> + <model usable='no' vendor='AMD'>athlon-v1</model> + <blockers model='athlon-v1'> + <feature name='3dnow'/> + <feature name='3dnowext'/> + </blockers> <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model> <blockers model='core2duo'> <feature name='ss'/> 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 6a756782cd..e807b965f6 100644 --- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml @@ -1494,7 +1494,8 @@ <blockers model='Westmere-v2'> <feature name='spec-ctrl'/> </blockers> - <model usable='yes' vendor='AMD'>athlon</model> + <model usable='yes' vendor='AMD' canonical='athlon-v1'>athlon</model> + <model usable='yes' vendor='AMD'>athlon-v1</model> <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model> <model usable='yes' vendor='Intel'>core2duo-v1</model> <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model> diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml index ef7b2bb67b..a876e7b98f 100644 --- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml @@ -1363,11 +1363,16 @@ <blockers model='Westmere-v2'> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='AMD'>athlon</model> + <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model> <blockers model='athlon'> <feature name='3dnow'/> <feature name='3dnowext'/> </blockers> + <model usable='no' vendor='AMD'>athlon-v1</model> + <blockers model='athlon-v1'> + <feature name='3dnow'/> + <feature name='3dnowext'/> + </blockers> <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model> <blockers model='core2duo'> <feature name='ss'/> -- 2.47.0