[PATCH v2 13/25] cpu_map: Add qemu64-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_qemu64-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_qemu64-v1.xml diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml index 81d77e4dba..8077da260d 100644 --- a/src/cpu_map/index.xml +++ b/src/cpu_map/index.xml @@ -32,6 +32,7 @@ <include filename='x86_cpu64-rhel5.xml'/> <include filename='x86_cpu64-rhel6.xml'/> <include filename='x86_qemu64.xml'/> + <include filename='x86_qemu64-v1.xml'/> <include filename='x86_kvm64.xml'/> </group> diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build index d73a1b4feb..799a72df47 100644 --- a/src/cpu_map/meson.build +++ b/src/cpu_map/meson.build @@ -124,6 +124,7 @@ cpumap_data = [ 'x86_phenom.xml', 'x86_qemu32-v1.xml', 'x86_qemu32.xml', + 'x86_qemu64-v1.xml', 'x86_qemu64.xml', 'x86_SandyBridge-IBRS.xml', 'x86_SandyBridge-v1.xml', diff --git a/src/cpu_map/x86_qemu64-v1.xml b/src/cpu_map/x86_qemu64-v1.xml new file mode 100644 index 0000000000..1ed9da14a7 --- /dev/null +++ b/src/cpu_map/x86_qemu64-v1.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='qemu64-v1'> + <decode host='on' guest='off'/> + <model name='qemu64'/> + </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 da05a9358f..e6c0863d54 100644 --- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml @@ -819,7 +819,8 @@ </blockers> <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model> <model usable='yes' vendor='unknown'>qemu32-v1</model> - <model usable='yes' vendor='unknown'>qemu64</model> + <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model> + <model usable='yes' vendor='unknown'>qemu64-v1</model> </mode> </cpu> <memoryBacking supported='yes'> 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 296f4bce12..7f68ca79c7 100644 --- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml @@ -1433,7 +1433,8 @@ </blockers> <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model> <model usable='yes' vendor='unknown'>qemu32-v1</model> - <model usable='yes' vendor='unknown'>qemu64</model> + <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model> + <model usable='yes' vendor='unknown'>qemu64-v1</model> </mode> </cpu> <memoryBacking supported='yes'> diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml index dd5df8de0d..13aef737e2 100644 --- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml @@ -818,7 +818,8 @@ </blockers> <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model> <model usable='yes' vendor='unknown'>qemu32-v1</model> - <model usable='yes' vendor='unknown'>qemu64</model> + <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model> + <model usable='yes' vendor='unknown'>qemu64-v1</model> </mode> </cpu> <memoryBacking supported='yes'> 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 4330afb33a..734d1f3bb2 100644 --- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml @@ -841,7 +841,8 @@ </blockers> <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model> <model usable='yes' vendor='unknown'>qemu32-v1</model> - <model usable='yes' vendor='unknown'>qemu64</model> + <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model> + <model usable='yes' vendor='unknown'>qemu64-v1</model> </mode> </cpu> <memoryBacking supported='yes'> 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 873d4b7b1f..39f1aaf3f8 100644 --- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml @@ -1523,7 +1523,8 @@ </blockers> <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model> <model usable='yes' vendor='unknown'>qemu32-v1</model> - <model usable='yes' vendor='unknown'>qemu64</model> + <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model> + <model usable='yes' vendor='unknown'>qemu64-v1</model> </mode> </cpu> <memoryBacking supported='yes'> diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml index f1f8362f52..3db605a87b 100644 --- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml @@ -840,7 +840,8 @@ </blockers> <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model> <model usable='yes' vendor='unknown'>qemu32-v1</model> - <model usable='yes' vendor='unknown'>qemu64</model> + <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model> + <model usable='yes' vendor='unknown'>qemu64-v1</model> </mode> </cpu> <memoryBacking supported='yes'> 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 7e0ed073a2..c77b05c257 100644 --- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml @@ -942,7 +942,8 @@ </blockers> <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model> <model usable='yes' vendor='unknown'>qemu32-v1</model> - <model usable='yes' vendor='unknown'>qemu64</model> + <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model> + <model usable='yes' vendor='unknown'>qemu64-v1</model> </mode> </cpu> <memoryBacking supported='yes'> 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 b93e3ca9ac..67b5a9f3d8 100644 --- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml @@ -1720,7 +1720,8 @@ </blockers> <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model> <model usable='yes' vendor='unknown'>qemu32-v1</model> - <model usable='yes' vendor='unknown'>qemu64</model> + <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model> + <model usable='yes' vendor='unknown'>qemu64-v1</model> </mode> </cpu> <memoryBacking supported='yes'> diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml index 8c538a6568..daafd91079 100644 --- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml @@ -941,7 +941,8 @@ </blockers> <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model> <model usable='yes' vendor='unknown'>qemu32-v1</model> - <model usable='yes' vendor='unknown'>qemu64</model> + <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model> + <model usable='yes' vendor='unknown'>qemu64-v1</model> </mode> </cpu> <memoryBacking supported='yes'> 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 dc8fd0539b..6c15cae03d 100644 --- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml @@ -948,7 +948,8 @@ </blockers> <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model> <model usable='yes' vendor='unknown'>qemu32-v1</model> - <model usable='yes' vendor='unknown'>qemu64</model> + <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model> + <model usable='yes' vendor='unknown'>qemu64-v1</model> </mode> </cpu> <memoryBacking supported='yes'> 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 e075cc7dca..2480513c4b 100644 --- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml @@ -1735,7 +1735,8 @@ </blockers> <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model> <model usable='yes' vendor='unknown'>qemu32-v1</model> - <model usable='yes' vendor='unknown'>qemu64</model> + <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model> + <model usable='yes' vendor='unknown'>qemu64-v1</model> </mode> </cpu> <memoryBacking supported='yes'> diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml index d0955a30f2..914f011071 100644 --- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml @@ -947,7 +947,8 @@ </blockers> <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model> <model usable='yes' vendor='unknown'>qemu32-v1</model> - <model usable='yes' vendor='unknown'>qemu64</model> + <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model> + <model usable='yes' vendor='unknown'>qemu64-v1</model> </mode> </cpu> <memoryBacking supported='yes'> 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 4f2d2a272d..f368716de9 100644 --- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml @@ -975,7 +975,8 @@ </blockers> <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model> <model usable='yes' vendor='unknown'>qemu32-v1</model> - <model usable='yes' vendor='unknown'>qemu64</model> + <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model> + <model usable='yes' vendor='unknown'>qemu64-v1</model> </mode> </cpu> <memoryBacking supported='yes'> 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 fcb175557c..c3dba8ccd7 100644 --- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml @@ -1759,7 +1759,8 @@ </blockers> <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model> <model usable='yes' vendor='unknown'>qemu32-v1</model> - <model usable='yes' vendor='unknown'>qemu64</model> + <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model> + <model usable='yes' vendor='unknown'>qemu64-v1</model> </mode> </cpu> <memoryBacking supported='yes'> diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml index 07fa015c26..4592e03dc4 100644 --- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml @@ -974,7 +974,8 @@ </blockers> <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model> <model usable='yes' vendor='unknown'>qemu32-v1</model> - <model usable='yes' vendor='unknown'>qemu64</model> + <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model> + <model usable='yes' vendor='unknown'>qemu64-v1</model> </mode> </cpu> <memoryBacking supported='yes'> 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 7880718caf..39535a73ad 100644 --- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml @@ -942,7 +942,8 @@ </blockers> <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model> <model usable='yes' vendor='unknown'>qemu32-v1</model> - <model usable='yes' vendor='unknown'>qemu64</model> + <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model> + <model usable='yes' vendor='unknown'>qemu64-v1</model> </mode> </cpu> <memoryBacking supported='yes'> 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 e34444f915..0694b5426e 100644 --- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml @@ -1707,7 +1707,8 @@ </blockers> <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model> <model usable='yes' vendor='unknown'>qemu32-v1</model> - <model usable='yes' vendor='unknown'>qemu64</model> + <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model> + <model usable='yes' vendor='unknown'>qemu64-v1</model> </mode> </cpu> <memoryBacking supported='yes'> diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml index dd045555db..c36ebcf7fd 100644 --- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml @@ -941,7 +941,8 @@ </blockers> <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model> <model usable='yes' vendor='unknown'>qemu32-v1</model> - <model usable='yes' vendor='unknown'>qemu64</model> + <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model> + <model usable='yes' vendor='unknown'>qemu64-v1</model> </mode> </cpu> <memoryBacking supported='yes'> 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 34527a0fc0..3d15c7dca5 100644 --- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml @@ -947,7 +947,8 @@ </blockers> <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model> <model usable='yes' vendor='unknown'>qemu32-v1</model> - <model usable='yes' vendor='unknown'>qemu64</model> + <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model> + <model usable='yes' vendor='unknown'>qemu64-v1</model> </mode> </cpu> <memoryBacking supported='yes'> 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 14f0bc7f87..bfb94bc389 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 @@ -1420,7 +1420,8 @@ </blockers> <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model> <model usable='yes' vendor='unknown'>qemu32-v1</model> - <model usable='yes' vendor='unknown'>qemu64</model> + <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model> + <model usable='yes' vendor='unknown'>qemu64-v1</model> </mode> </cpu> <memoryBacking supported='yes'> 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 14f0bc7f87..bfb94bc389 100644 --- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml @@ -1420,7 +1420,8 @@ </blockers> <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model> <model usable='yes' vendor='unknown'>qemu32-v1</model> - <model usable='yes' vendor='unknown'>qemu64</model> + <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model> + <model usable='yes' vendor='unknown'>qemu64-v1</model> </mode> </cpu> <memoryBacking supported='yes'> diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml index de7e039b84..2c3bca4a76 100644 --- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml @@ -946,7 +946,8 @@ </blockers> <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model> <model usable='yes' vendor='unknown'>qemu32-v1</model> - <model usable='yes' vendor='unknown'>qemu64</model> + <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model> + <model usable='yes' vendor='unknown'>qemu64-v1</model> </mode> </cpu> <memoryBacking supported='yes'> 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 eeee7b926c..bf2c489691 100644 --- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml @@ -1029,7 +1029,8 @@ </blockers> <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model> <model usable='yes' vendor='unknown'>qemu32-v1</model> - <model usable='yes' vendor='unknown'>qemu64</model> + <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model> + <model usable='yes' vendor='unknown'>qemu64-v1</model> </mode> </cpu> <memoryBacking supported='yes'> 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 882ef3ed4d..345f8177f2 100644 --- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml @@ -1515,7 +1515,8 @@ </blockers> <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model> <model usable='yes' vendor='unknown'>qemu32-v1</model> - <model usable='yes' vendor='unknown'>qemu64</model> + <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model> + <model usable='yes' vendor='unknown'>qemu64-v1</model> </mode> </cpu> <memoryBacking supported='yes'> diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml index dee27a40c4..758ce18d38 100644 --- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml @@ -1028,7 +1028,8 @@ </blockers> <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model> <model usable='yes' vendor='unknown'>qemu32-v1</model> - <model usable='yes' vendor='unknown'>qemu64</model> + <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model> + <model usable='yes' vendor='unknown'>qemu64-v1</model> </mode> </cpu> <memoryBacking supported='yes'> 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 14f9d0a3a5..4a478b678f 100644 --- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml @@ -1258,7 +1258,8 @@ </blockers> <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model> <model usable='yes' vendor='unknown'>qemu32-v1</model> - <model usable='yes' vendor='unknown'>qemu64</model> + <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model> + <model usable='yes' vendor='unknown'>qemu64-v1</model> </mode> </cpu> <memoryBacking supported='yes'> 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 1347de2c5b..e3dda5ff74 100644 --- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml @@ -1501,7 +1501,8 @@ </blockers> <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model> <model usable='yes' vendor='unknown'>qemu32-v1</model> - <model usable='yes' vendor='unknown'>qemu64</model> + <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model> + <model usable='yes' vendor='unknown'>qemu64-v1</model> </mode> </cpu> <memoryBacking supported='yes'> diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml index 6855f75ba4..aa94c97499 100644 --- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml @@ -1257,7 +1257,8 @@ </blockers> <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model> <model usable='yes' vendor='unknown'>qemu32-v1</model> - <model usable='yes' vendor='unknown'>qemu64</model> + <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model> + <model usable='yes' vendor='unknown'>qemu64-v1</model> </mode> </cpu> <memoryBacking supported='yes'> 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 63bce83ba5..f3ad13ff40 100644 --- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml @@ -1259,7 +1259,8 @@ </blockers> <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model> <model usable='yes' vendor='unknown'>qemu32-v1</model> - <model usable='yes' vendor='unknown'>qemu64</model> + <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model> + <model usable='yes' vendor='unknown'>qemu64-v1</model> </mode> </cpu> <memoryBacking supported='yes'> 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 6b4db43077..4aa6ddca4f 100644 --- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml @@ -1468,7 +1468,8 @@ </blockers> <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model> <model usable='yes' vendor='unknown'>qemu32-v1</model> - <model usable='yes' vendor='unknown'>qemu64</model> + <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model> + <model usable='yes' vendor='unknown'>qemu64-v1</model> </mode> </cpu> <memoryBacking supported='yes'> diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml index b9449120d3..8ad3499c67 100644 --- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml @@ -1258,7 +1258,8 @@ </blockers> <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model> <model usable='yes' vendor='unknown'>qemu32-v1</model> - <model usable='yes' vendor='unknown'>qemu64</model> + <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model> + <model usable='yes' vendor='unknown'>qemu64-v1</model> </mode> </cpu> <memoryBacking supported='yes'> 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 5b0f2f84be..b3325f4e36 100644 --- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml @@ -1259,7 +1259,8 @@ </blockers> <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model> <model usable='yes' vendor='unknown'>qemu32-v1</model> - <model usable='yes' vendor='unknown'>qemu64</model> + <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model> + <model usable='yes' vendor='unknown'>qemu64-v1</model> </mode> </cpu> <memoryBacking supported='yes'> 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 04049d17af..90a785ed55 100644 --- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml @@ -1398,7 +1398,8 @@ </blockers> <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model> <model usable='yes' vendor='unknown'>qemu32-v1</model> - <model usable='yes' vendor='unknown'>qemu64</model> + <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model> + <model usable='yes' vendor='unknown'>qemu64-v1</model> </mode> </cpu> <memoryBacking supported='yes'> diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml index 4ec2b2e96d..9bac49c553 100644 --- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml @@ -1258,7 +1258,8 @@ </blockers> <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model> <model usable='yes' vendor='unknown'>qemu32-v1</model> - <model usable='yes' vendor='unknown'>qemu64</model> + <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model> + <model usable='yes' vendor='unknown'>qemu64-v1</model> </mode> </cpu> <memoryBacking supported='yes'> 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 9e152d5b55..986c3936c0 100644 --- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml @@ -1395,7 +1395,8 @@ </blockers> <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model> <model usable='yes' vendor='unknown'>qemu32-v1</model> - <model usable='yes' vendor='unknown'>qemu64</model> + <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model> + <model usable='yes' vendor='unknown'>qemu64-v1</model> </mode> </cpu> <memoryBacking supported='yes'> 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 1c79f73ae2..9f4d2d8af8 100644 --- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml @@ -1503,7 +1503,8 @@ </blockers> <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model> <model usable='yes' vendor='unknown'>qemu32-v1</model> - <model usable='yes' vendor='unknown'>qemu64</model> + <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model> + <model usable='yes' vendor='unknown'>qemu64-v1</model> </mode> </cpu> <memoryBacking supported='yes'> diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml index 0af8a79cb4..e8b70c7e0f 100644 --- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml @@ -1394,7 +1394,8 @@ </blockers> <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model> <model usable='yes' vendor='unknown'>qemu32-v1</model> - <model usable='yes' vendor='unknown'>qemu64</model> + <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model> + <model usable='yes' vendor='unknown'>qemu64-v1</model> </mode> </cpu> <memoryBacking supported='yes'> 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 4cb0a22a9b..4ac90bad0d 100644 --- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml @@ -1395,7 +1395,8 @@ </blockers> <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model> <model usable='yes' vendor='unknown'>qemu32-v1</model> - <model usable='yes' vendor='unknown'>qemu64</model> + <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model> + <model usable='yes' vendor='unknown'>qemu64-v1</model> </mode> </cpu> <memoryBacking supported='yes'> 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 99858a0b91..94d866a5f0 100644 --- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml @@ -1503,7 +1503,8 @@ </blockers> <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model> <model usable='yes' vendor='unknown'>qemu32-v1</model> - <model usable='yes' vendor='unknown'>qemu64</model> + <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model> + <model usable='yes' vendor='unknown'>qemu64-v1</model> </mode> </cpu> <memoryBacking supported='yes'> diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml index cfedba3e8e..84303bee0b 100644 --- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml @@ -1394,7 +1394,8 @@ </blockers> <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model> <model usable='yes' vendor='unknown'>qemu32-v1</model> - <model usable='yes' vendor='unknown'>qemu64</model> + <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model> + <model usable='yes' vendor='unknown'>qemu64-v1</model> </mode> </cpu> <memoryBacking supported='yes'> -- 2.47.0