[PATCH v2 04/25] cpu_map: Add 486-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_486-v1.xml | 6 ++++++ tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 3 ++- 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 | 3 ++- tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_9.0.0.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_9.1.0.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 3 ++- 43 files changed, 88 insertions(+), 40 deletions(-) create mode 100644 src/cpu_map/x86_486-v1.xml diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml index 287cd7395e..e9fb278fd3 100644 --- a/src/cpu_map/index.xml +++ b/src/cpu_map/index.xml @@ -5,6 +5,7 @@ <group name='generic'> <include filename='x86_486.xml'/> + <include filename='x86_486-v1.xml'/> </group> <group name='Intel-based QEMU generic CPU models'> diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build index f659ef230e..b335278b08 100644 --- a/src/cpu_map/meson.build +++ b/src/cpu_map/meson.build @@ -22,6 +22,7 @@ cpumap_data = [ 'ppc64_POWERPC_e5500.xml', 'ppc64_POWERPC_e6500.xml', 'ppc64_vendors.xml', + 'x86_486-v1.xml', 'x86_486.xml', 'x86_athlon.xml', 'x86_Broadwell-IBRS.xml', diff --git a/src/cpu_map/x86_486-v1.xml b/src/cpu_map/x86_486-v1.xml new file mode 100644 index 0000000000..33f7ee09b5 --- /dev/null +++ b/src/cpu_map/x86_486-v1.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='486-v1'> + <decode host='on' guest='off'/> + <model name='486'/> + </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 5fa2d07976..46f1bd7d4f 100644 --- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml @@ -62,7 +62,8 @@ <feature policy='require' name='pschange-mc-no'/> </mode> <mode name='custom' supported='yes'> - <model usable='yes' vendor='unknown'>486</model> + <model usable='yes' vendor='unknown' canonical='486-v1'>486</model> + <model usable='yes' vendor='unknown'>486-v1</model> <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> 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 0348a65589..7153fe3925 100644 --- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml @@ -74,7 +74,8 @@ <feature policy='disable' name='misalignsse'/> </mode> <mode name='custom' supported='yes'> - <model usable='yes' vendor='unknown'>486</model> + <model usable='yes' vendor='unknown' canonical='486-v1'>486</model> + <model usable='yes' vendor='unknown'>486-v1</model> <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml index 49a18cd333..93df9af8f6 100644 --- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml @@ -61,7 +61,8 @@ <feature policy='require' name='pschange-mc-no'/> </mode> <mode name='custom' supported='yes'> - <model usable='yes' vendor='unknown'>486</model> + <model usable='yes' vendor='unknown' canonical='486-v1'>486</model> + <model usable='yes' vendor='unknown'>486-v1</model> <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> 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 b990a2d597..25b16b34bb 100644 --- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml @@ -62,7 +62,8 @@ <feature policy='require' name='pschange-mc-no'/> </mode> <mode name='custom' supported='yes'> - <model usable='yes' vendor='unknown'>486</model> + <model usable='yes' vendor='unknown' canonical='486-v1'>486</model> + <model usable='yes' vendor='unknown'>486-v1</model> <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> 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 6746479be5..c9a124cda2 100644 --- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml @@ -75,7 +75,8 @@ <feature policy='disable' name='misalignsse'/> </mode> <mode name='custom' supported='yes'> - <model usable='yes' vendor='unknown'>486</model> + <model usable='yes' vendor='unknown' canonical='486-v1'>486</model> + <model usable='yes' vendor='unknown'>486-v1</model> <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml index 81c9bb1444..a99c89e98b 100644 --- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml @@ -61,7 +61,8 @@ <feature policy='require' name='pschange-mc-no'/> </mode> <mode name='custom' supported='yes'> - <model usable='yes' vendor='unknown'>486</model> + <model usable='yes' vendor='unknown' canonical='486-v1'>486</model> + <model usable='yes' vendor='unknown'>486-v1</model> <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> 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 0cd73ee54f..c4f95a282b 100644 --- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml @@ -63,7 +63,8 @@ <feature policy='require' name='pschange-mc-no'/> </mode> <mode name='custom' supported='yes'> - <model usable='yes' vendor='unknown'>486</model> + <model usable='yes' vendor='unknown' canonical='486-v1'>486</model> + <model usable='yes' vendor='unknown'>486-v1</model> <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> 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 8a09c53177..b6f01ffbce 100644 --- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml @@ -75,7 +75,8 @@ <feature policy='disable' name='misalignsse'/> </mode> <mode name='custom' supported='yes'> - <model usable='yes' vendor='unknown'>486</model> + <model usable='yes' vendor='unknown' canonical='486-v1'>486</model> + <model usable='yes' vendor='unknown'>486-v1</model> <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml index 5a23dfee52..5d3c1ab1aa 100644 --- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml @@ -62,7 +62,8 @@ <feature policy='require' name='pschange-mc-no'/> </mode> <mode name='custom' supported='yes'> - <model usable='yes' vendor='unknown'>486</model> + <model usable='yes' vendor='unknown' canonical='486-v1'>486</model> + <model usable='yes' vendor='unknown'>486-v1</model> <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> 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 84e783f739..c24b88f412 100644 --- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml @@ -63,7 +63,8 @@ <feature policy='require' name='pschange-mc-no'/> </mode> <mode name='custom' supported='yes'> - <model usable='yes' vendor='unknown'>486</model> + <model usable='yes' vendor='unknown' canonical='486-v1'>486</model> + <model usable='yes' vendor='unknown'>486-v1</model> <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> 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 4d7ed1eea8..eb8f5e3f22 100644 --- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml @@ -77,7 +77,8 @@ <feature policy='disable' name='misalignsse'/> </mode> <mode name='custom' supported='yes'> - <model usable='yes' vendor='unknown'>486</model> + <model usable='yes' vendor='unknown' canonical='486-v1'>486</model> + <model usable='yes' vendor='unknown'>486-v1</model> <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml index 0446dff4fb..b1f198d62b 100644 --- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml @@ -62,7 +62,8 @@ <feature policy='require' name='pschange-mc-no'/> </mode> <mode name='custom' supported='yes'> - <model usable='yes' vendor='unknown'>486</model> + <model usable='yes' vendor='unknown' canonical='486-v1'>486</model> + <model usable='yes' vendor='unknown'>486-v1</model> <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> 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 e5718bc50c..7a4830b126 100644 --- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml @@ -64,7 +64,8 @@ <feature policy='require' name='pschange-mc-no'/> </mode> <mode name='custom' supported='yes'> - <model usable='yes' vendor='unknown'>486</model> + <model usable='yes' vendor='unknown' canonical='486-v1'>486</model> + <model usable='yes' vendor='unknown'>486-v1</model> <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> 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 c3a93369e4..d624842aab 100644 --- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml @@ -78,7 +78,8 @@ <feature policy='disable' name='misalignsse'/> </mode> <mode name='custom' supported='yes'> - <model usable='yes' vendor='unknown'>486</model> + <model usable='yes' vendor='unknown' canonical='486-v1'>486</model> + <model usable='yes' vendor='unknown'>486-v1</model> <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml index 7415bda6bf..43bcca9b52 100644 --- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml @@ -63,7 +63,8 @@ <feature policy='require' name='pschange-mc-no'/> </mode> <mode name='custom' supported='yes'> - <model usable='yes' vendor='unknown'>486</model> + <model usable='yes' vendor='unknown' canonical='486-v1'>486</model> + <model usable='yes' vendor='unknown'>486-v1</model> <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> 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 720387e9db..275ce525fe 100644 --- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml @@ -65,7 +65,8 @@ <feature policy='require' name='pschange-mc-no'/> </mode> <mode name='custom' supported='yes'> - <model usable='yes' vendor='unknown'>486</model> + <model usable='yes' vendor='unknown' canonical='486-v1'>486</model> + <model usable='yes' vendor='unknown'>486-v1</model> <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> 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 3000d11487..6500ceac17 100644 --- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml @@ -78,7 +78,8 @@ <feature policy='disable' name='misalignsse'/> </mode> <mode name='custom' supported='yes'> - <model usable='yes' vendor='unknown'>486</model> + <model usable='yes' vendor='unknown' canonical='486-v1'>486</model> + <model usable='yes' vendor='unknown'>486-v1</model> <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml index 31fe652a9f..1e54981f3c 100644 --- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml @@ -64,7 +64,8 @@ <feature policy='require' name='pschange-mc-no'/> </mode> <mode name='custom' supported='yes'> - <model usable='yes' vendor='unknown'>486</model> + <model usable='yes' vendor='unknown' canonical='486-v1'>486</model> + <model usable='yes' vendor='unknown'>486-v1</model> <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> 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 88db1c659e..5b1bb3ad55 100644 --- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml @@ -70,7 +70,8 @@ <feature policy='require' name='pschange-mc-no'/> </mode> <mode name='custom' supported='yes'> - <model usable='yes' vendor='unknown'>486</model> + <model usable='yes' vendor='unknown' canonical='486-v1'>486</model> + <model usable='yes' vendor='unknown'>486-v1</model> <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> 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 3392f2b42f..339c622684 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 @@ -67,7 +67,8 @@ <feature policy='disable' name='nrip-save'/> </mode> <mode name='custom' supported='yes'> - <model usable='yes' vendor='unknown'>486</model> + <model usable='yes' vendor='unknown' canonical='486-v1'>486</model> + <model usable='yes' vendor='unknown'>486-v1</model> <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='3dnowprefetch'/> 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 3392f2b42f..339c622684 100644 --- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml @@ -67,7 +67,8 @@ <feature policy='disable' name='nrip-save'/> </mode> <mode name='custom' supported='yes'> - <model usable='yes' vendor='unknown'>486</model> + <model usable='yes' vendor='unknown' canonical='486-v1'>486</model> + <model usable='yes' vendor='unknown'>486-v1</model> <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml index 5223dbb2e2..a016f77b09 100644 --- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml @@ -69,7 +69,8 @@ <feature policy='require' name='pschange-mc-no'/> </mode> <mode name='custom' supported='yes'> - <model usable='yes' vendor='unknown'>486</model> + <model usable='yes' vendor='unknown' canonical='486-v1'>486</model> + <model usable='yes' vendor='unknown'>486-v1</model> <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> 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 e43c6710e9..9a42375791 100644 --- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml @@ -70,7 +70,8 @@ <feature policy='require' name='pschange-mc-no'/> </mode> <mode name='custom' supported='yes'> - <model usable='yes' vendor='unknown'>486</model> + <model usable='yes' vendor='unknown' canonical='486-v1'>486</model> + <model usable='yes' vendor='unknown'>486-v1</model> <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> 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 3d5c15fdf1..677ebbf2e6 100644 --- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml @@ -71,7 +71,8 @@ <feature policy='disable' name='nrip-save'/> </mode> <mode name='custom' supported='yes'> - <model usable='yes' vendor='unknown'>486</model> + <model usable='yes' vendor='unknown' canonical='486-v1'>486</model> + <model usable='yes' vendor='unknown'>486-v1</model> <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml index 420dae738f..1eb4af3fdc 100644 --- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml @@ -69,7 +69,8 @@ <feature policy='require' name='pschange-mc-no'/> </mode> <mode name='custom' supported='yes'> - <model usable='yes' vendor='unknown'>486</model> + <model usable='yes' vendor='unknown' canonical='486-v1'>486</model> + <model usable='yes' vendor='unknown'>486-v1</model> <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> 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 e5853535ce..e2fa9da460 100644 --- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml @@ -72,7 +72,8 @@ <feature policy='disable' name='xsaves'/> </mode> <mode name='custom' supported='yes'> - <model usable='yes' vendor='unknown'>486</model> + <model usable='yes' vendor='unknown' canonical='486-v1'>486</model> + <model usable='yes' vendor='unknown'>486-v1</model> <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> 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 22c40afdb1..787fc9d870 100644 --- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml @@ -72,7 +72,8 @@ <feature policy='disable' name='nrip-save'/> </mode> <mode name='custom' supported='yes'> - <model usable='yes' vendor='unknown'>486</model> + <model usable='yes' vendor='unknown' canonical='486-v1'>486</model> + <model usable='yes' vendor='unknown'>486-v1</model> <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='hle'/> diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml index c40cbb8a73..3fa195c6aa 100644 --- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml @@ -71,7 +71,8 @@ <feature policy='disable' name='xsaves'/> </mode> <mode name='custom' supported='yes'> - <model usable='yes' vendor='unknown'>486</model> + <model usable='yes' vendor='unknown' canonical='486-v1'>486</model> + <model usable='yes' vendor='unknown'>486-v1</model> <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> 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 cfc4b3e301..5fe9ab775c 100644 --- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml @@ -73,7 +73,8 @@ <feature policy='disable' name='xsaves'/> </mode> <mode name='custom' supported='yes'> - <model usable='yes' vendor='unknown'>486</model> + <model usable='yes' vendor='unknown' canonical='486-v1'>486</model> + <model usable='yes' vendor='unknown'>486-v1</model> <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> 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 4383050d3c..5c9f1c92a5 100644 --- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml @@ -71,7 +71,8 @@ <feature policy='disable' name='nrip-save'/> </mode> <mode name='custom' supported='yes'> - <model usable='yes' vendor='unknown'>486</model> + <model usable='yes' vendor='unknown' canonical='486-v1'>486</model> + <model usable='yes' vendor='unknown'>486-v1</model> <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='hle'/> diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml index 062d91ba9a..73f129706d 100644 --- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml @@ -72,7 +72,8 @@ <feature policy='disable' name='xsaves'/> </mode> <mode name='custom' supported='yes'> - <model usable='yes' vendor='unknown'>486</model> + <model usable='yes' vendor='unknown' canonical='486-v1'>486</model> + <model usable='yes' vendor='unknown'>486-v1</model> <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> 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 e8053efc99..2315bda338 100644 --- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml @@ -73,7 +73,8 @@ <feature policy='disable' name='xsaves'/> </mode> <mode name='custom' supported='yes'> - <model usable='yes' vendor='unknown'>486</model> + <model usable='yes' vendor='unknown' canonical='486-v1'>486</model> + <model usable='yes' vendor='unknown'>486-v1</model> <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> 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 8f3357be6f..90c9862321 100644 --- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml @@ -73,7 +73,8 @@ <feature policy='disable' name='nrip-save'/> </mode> <mode name='custom' supported='yes'> - <model usable='yes' vendor='unknown'>486</model> + <model usable='yes' vendor='unknown' canonical='486-v1'>486</model> + <model usable='yes' vendor='unknown'>486-v1</model> <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='hle'/> diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml index db12bd81e3..983597be92 100644 --- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml @@ -72,7 +72,8 @@ <feature policy='disable' name='xsaves'/> </mode> <mode name='custom' supported='yes'> - <model usable='yes' vendor='unknown'>486</model> + <model usable='yes' vendor='unknown' canonical='486-v1'>486</model> + <model usable='yes' vendor='unknown'>486-v1</model> <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> 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 c3a7aff766..578dea23a5 100644 --- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml @@ -77,7 +77,8 @@ <feature policy='disable' name='xsaves'/> </mode> <mode name='custom' supported='yes'> - <model usable='yes' vendor='unknown'>486</model> + <model usable='yes' vendor='unknown' canonical='486-v1'>486</model> + <model usable='yes' vendor='unknown'>486-v1</model> <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> 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 a18ce928a5..2009920390 100644 --- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml @@ -72,7 +72,8 @@ <feature policy='disable' name='nrip-save'/> </mode> <mode name='custom' supported='yes'> - <model usable='yes' vendor='unknown'>486</model> + <model usable='yes' vendor='unknown' canonical='486-v1'>486</model> + <model usable='yes' vendor='unknown'>486-v1</model> <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='hle'/> diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml index 5019918b9b..505ea9978f 100644 --- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml @@ -76,7 +76,8 @@ <feature policy='disable' name='xsaves'/> </mode> <mode name='custom' supported='yes'> - <model usable='yes' vendor='unknown'>486</model> + <model usable='yes' vendor='unknown' canonical='486-v1'>486</model> + <model usable='yes' vendor='unknown'>486-v1</model> <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> 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 5cd872831b..e78f6a9dd3 100644 --- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml @@ -77,7 +77,8 @@ <feature policy='disable' name='xsaves'/> </mode> <mode name='custom' supported='yes'> - <model usable='yes' vendor='unknown'>486</model> + <model usable='yes' vendor='unknown' canonical='486-v1'>486</model> + <model usable='yes' vendor='unknown'>486-v1</model> <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> 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 7afc9e3d69..da9f2a1193 100644 --- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml @@ -72,7 +72,8 @@ <feature policy='disable' name='nrip-save'/> </mode> <mode name='custom' supported='yes'> - <model usable='yes' vendor='unknown'>486</model> + <model usable='yes' vendor='unknown' canonical='486-v1'>486</model> + <model usable='yes' vendor='unknown'>486-v1</model> <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='hle'/> diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml index 11cfc7863d..74d1094511 100644 --- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml @@ -76,7 +76,8 @@ <feature policy='disable' name='xsaves'/> </mode> <mode name='custom' supported='yes'> - <model usable='yes' vendor='unknown'>486</model> + <model usable='yes' vendor='unknown' canonical='486-v1'>486</model> + <model usable='yes' vendor='unknown'>486-v1</model> <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> -- 2.47.0