From: Jiri Denemark <jdenemar@redhat.com> Signed-off-by: Jiri Denemark <jdenemar@redhat.com> --- src/cpu_map/index.xml | 1 + src/cpu_map/meson.build | 1 + src/cpu_map/x86_YongFeng-v3.xml | 158 ++++++++++++++++++ .../domaincapsdata/qemu_10.1.0-q35.x86_64.xml | 19 +++ .../domaincapsdata/qemu_10.1.0-tcg.x86_64.xml | 18 ++ tests/domaincapsdata/qemu_10.1.0.x86_64.xml | 19 +++ .../domaincapsdata/qemu_10.2.0-q35.x86_64.xml | 15 ++ .../domaincapsdata/qemu_10.2.0-tcg.x86_64.xml | 18 ++ tests/domaincapsdata/qemu_10.2.0.x86_64.xml | 15 ++ 9 files changed, 264 insertions(+) create mode 100644 src/cpu_map/x86_YongFeng-v3.xml diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml index 74bf5350da..57a28d1d1d 100644 --- a/src/cpu_map/index.xml +++ b/src/cpu_map/index.xml @@ -187,6 +187,7 @@ <include filename='x86_YongFeng.xml'/> <include filename='x86_YongFeng-v1.xml'/> <include filename='x86_YongFeng-v2.xml'/> + <include filename='x86_YongFeng-v3.xml'/> </group> </arch> diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build index fbd9b78ffd..2b6b1bf3ea 100644 --- a/src/cpu_map/meson.build +++ b/src/cpu_map/meson.build @@ -191,6 +191,7 @@ cpumap_data = [ 'x86_Westmere.xml', 'x86_YongFeng-v1.xml', 'x86_YongFeng-v2.xml', + 'x86_YongFeng-v3.xml', 'x86_YongFeng.xml', ] diff --git a/src/cpu_map/x86_YongFeng-v3.xml b/src/cpu_map/x86_YongFeng-v3.xml new file mode 100644 index 0000000000..b1f411c1a2 --- /dev/null +++ b/src/cpu_map/x86_YongFeng-v3.xml @@ -0,0 +1,158 @@ +<cpus> + <model name='YongFeng-v3'> + <decode host='on' guest='off'/> + <signature family='7' model='11'/> + <vendor name='Zhaoxin CentaurHauls'/> + <feature name='3dnowprefetch'/> + <feature name='abm'/> + <feature name='ace2'/> + <feature name='acpi'/> + <feature name='adx'/> + <feature name='aes'/> + <feature name='apic'/> + <feature name='arch-capabilities'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='bmi1'/> + <feature name='bmi2'/> + <feature name='clflush'/> + <feature name='cmov'/> + <feature name='cx16'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='fpu'/> + <feature name='fsgsbase'/> + <feature name='fxsr'/> + <feature name='invpcid'/> + <feature name='invtsc'/> + <feature name='lahf_lm'/> + <feature name='lm'/> + <feature name='mca'/> + <feature name='mce'/> + <feature name='mds-no'/> + <feature name='mmx'/> + <feature name='movbe'/> + <feature name='msr'/> + <feature name='mtrr'/> + <feature name='nx'/> + <feature name='pae'/> + <feature name='pat'/> + <feature name='pcid'/> + <feature name='pclmuldq'/> + <feature name='pdpe1gb'/> + <feature name='pge'/> + <feature name='phe'/> + <feature name='phe-en'/> + <feature name='pku'/> + <feature name='pmm'/> + <feature name='pmm-en'/> + <feature name='pni'/> + <feature name='popcnt'/> + <feature name='pschange-mc-no'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='rdctl-no'/> + <feature name='rdpid'/> + <feature name='rdrand'/> + <feature name='rdseed'/> + <feature name='rdtscp'/> + <feature name='sep'/> + <feature name='sha-ni'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='smap'/> + <feature name='smep'/> + <feature name='spec-ctrl'/> + <feature name='ss'/> + <feature name='ssb-no'/> + <feature name='sse'/> + <feature name='sse2'/> + <feature name='sse4.1'/> + <feature name='sse4.2'/> + <feature name='ssse3'/> + <feature name='syscall'/> + <feature name='tsc'/> + <feature name='tsc-deadline'/> + <feature name='umip'/> + <feature name='vme'/> + <feature name='vmx-activity-hlt'/> + <feature name='vmx-apicv-register'/> + <feature name='vmx-apicv-vid'/> + <feature name='vmx-apicv-x2apic'/> + <feature name='vmx-apicv-xapic'/> + <feature name='vmx-cr3-load-noexit'/> + <feature name='vmx-cr3-store-noexit'/> + <feature name='vmx-cr8-load-exit'/> + <feature name='vmx-cr8-store-exit'/> + <feature name='vmx-desc-exit'/> + <feature name='vmx-entry-ia32e-mode'/> + <feature name='vmx-entry-load-efer'/> + <feature name='vmx-entry-load-pat'/> + <feature name='vmx-entry-load-perf-global-ctrl'/> + <feature name='vmx-entry-noload-debugctl'/> + <feature name='vmx-ept'/> + <feature name='vmx-ept-1gb'/> + <feature name='vmx-ept-2mb'/> + <feature name='vmx-ept-execonly'/> + <feature name='vmx-eptad'/> + <feature name='vmx-eptp-switching'/> + <feature name='vmx-exit-ack-intr'/> + <feature name='vmx-exit-load-efer'/> + <feature name='vmx-exit-load-pat'/> + <feature name='vmx-exit-load-perf-global-ctrl'/> + <feature name='vmx-exit-nosave-debugctl'/> + <feature name='vmx-exit-save-efer'/> + <feature name='vmx-exit-save-pat'/> + <feature name='vmx-exit-save-preemption-timer'/> + <feature name='vmx-flexpriority'/> + <feature name='vmx-hlt-exit'/> + <feature name='vmx-ins-outs'/> + <feature name='vmx-intr-exit'/> + <feature name='vmx-invept'/> + <feature name='vmx-invept-all-context'/> + <feature name='vmx-invept-single-context'/> + <feature name='vmx-invlpg-exit'/> + <feature name='vmx-invpcid-exit'/> + <feature name='vmx-invvpid-all-context'/> + <feature name='vmx-invvpid-single-addr'/> + <feature name='vmx-invvpid-single-context-noglobals'/> + <feature name='vmx-io-bitmap'/> + <feature name='vmx-io-exit'/> + <feature name='vmx-monitor-exit'/> + <feature name='vmx-movdr-exit'/> + <feature name='vmx-msr-bitmap'/> + <feature name='vmx-mtf'/> + <feature name='vmx-mwait-exit'/> + <feature name='vmx-nmi-exit'/> + <feature name='vmx-page-walk-4'/> + <feature name='vmx-pause-exit'/> + <feature name='vmx-pml'/> + <feature name='vmx-posted-intr'/> + <feature name='vmx-preemption-timer'/> + <feature name='vmx-rdpmc-exit'/> + <feature name='vmx-rdrand-exit'/> + <feature name='vmx-rdtsc-exit'/> + <feature name='vmx-rdtscp-exit'/> + <feature name='vmx-secondary-ctls'/> + <feature name='vmx-shadow-vmcs'/> + <feature name='vmx-store-lma'/> + <feature name='vmx-true-ctls'/> + <feature name='vmx-tsc-offset'/> + <feature name='vmx-unrestricted-guest'/> + <feature name='vmx-vintr-pending'/> + <feature name='vmx-vmfunc'/> + <feature name='vmx-vmwrite-vmexit-fields'/> + <feature name='vmx-vnmi'/> + <feature name='vmx-vnmi-pending'/> + <feature name='vmx-vpid'/> + <feature name='vmx-wbinvd-exit'/> + <feature name='x2apic'/> + <feature name='xcrypt'/> + <feature name='xcrypt-en'/> + <feature name='xsave'/> + <feature name='xsaveopt'/> + <feature name='xstore'/> + <feature name='xstore-en'/> + </model> +</cpus> diff --git a/tests/domaincapsdata/qemu_10.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_10.1.0-q35.x86_64.xml index 72cf3d46b6..01ddd4ba43 100644 --- a/tests/domaincapsdata/qemu_10.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_10.1.0-q35.x86_64.xml @@ -1950,6 +1950,25 @@ <feature name='xstore'/> <feature name='xstore-en'/> </blockers> + <model usable='no' vendor='Zhaoxin CentaurHauls'>YongFeng-v3</model> + <blockers model='YongFeng-v3'> + <feature name='ace2'/> + <feature name='arch-capabilities'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='phe'/> + <feature name='phe-en'/> + <feature name='pku'/> + <feature name='pmm'/> + <feature name='pmm-en'/> + <feature name='spec-ctrl'/> + <feature name='ss'/> + <feature name='ssb-no'/> + <feature name='xcrypt'/> + <feature name='xcrypt-en'/> + <feature name='xstore'/> + <feature name='xstore-en'/> + </blockers> <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model> <blockers model='athlon'> <feature name='3dnow'/> diff --git a/tests/domaincapsdata/qemu_10.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_10.1.0-tcg.x86_64.xml index f827e19b99..cbbe141e3d 100644 --- a/tests/domaincapsdata/qemu_10.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_10.1.0-tcg.x86_64.xml @@ -2104,6 +2104,24 @@ <feature name='xstore'/> <feature name='xstore-en'/> </blockers> + <model usable='no' vendor='Zhaoxin CentaurHauls'>YongFeng-v3</model> + <blockers model='YongFeng-v3'> + <feature name='ace2'/> + <feature name='arch-capabilities'/> + <feature name='invpcid'/> + <feature name='invtsc'/> + <feature name='pcid'/> + <feature name='phe'/> + <feature name='phe-en'/> + <feature name='pmm'/> + <feature name='pmm-en'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='xcrypt'/> + <feature name='xcrypt-en'/> + <feature name='xstore'/> + <feature name='xstore-en'/> + </blockers> <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> diff --git a/tests/domaincapsdata/qemu_10.1.0.x86_64.xml b/tests/domaincapsdata/qemu_10.1.0.x86_64.xml index 03d0c71642..1b8347b1f6 100644 --- a/tests/domaincapsdata/qemu_10.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_10.1.0.x86_64.xml @@ -1949,6 +1949,25 @@ <feature name='xstore'/> <feature name='xstore-en'/> </blockers> + <model usable='no' vendor='Zhaoxin CentaurHauls'>YongFeng-v3</model> + <blockers model='YongFeng-v3'> + <feature name='ace2'/> + <feature name='arch-capabilities'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='phe'/> + <feature name='phe-en'/> + <feature name='pku'/> + <feature name='pmm'/> + <feature name='pmm-en'/> + <feature name='spec-ctrl'/> + <feature name='ss'/> + <feature name='ssb-no'/> + <feature name='xcrypt'/> + <feature name='xcrypt-en'/> + <feature name='xstore'/> + <feature name='xstore-en'/> + </blockers> <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model> <blockers model='athlon'> <feature name='3dnow'/> diff --git a/tests/domaincapsdata/qemu_10.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_10.2.0-q35.x86_64.xml index 02f07af448..5ee32dc86a 100644 --- a/tests/domaincapsdata/qemu_10.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_10.2.0-q35.x86_64.xml @@ -926,6 +926,21 @@ <feature name='xstore'/> <feature name='xstore-en'/> </blockers> + <model usable='no' vendor='Zhaoxin CentaurHauls'>YongFeng-v3</model> + <blockers model='YongFeng-v3'> + <feature name='ace2'/> + <feature name='pcid'/> + <feature name='phe'/> + <feature name='phe-en'/> + <feature name='pmm'/> + <feature name='pmm-en'/> + <feature name='ss'/> + <feature name='ssb-no'/> + <feature name='xcrypt'/> + <feature name='xcrypt-en'/> + <feature name='xstore'/> + <feature name='xstore-en'/> + </blockers> <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model> <blockers model='athlon'> <feature name='3dnow'/> diff --git a/tests/domaincapsdata/qemu_10.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_10.2.0-tcg.x86_64.xml index 2f9ff4f939..2f2835e080 100644 --- a/tests/domaincapsdata/qemu_10.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_10.2.0-tcg.x86_64.xml @@ -2104,6 +2104,24 @@ <feature name='xstore'/> <feature name='xstore-en'/> </blockers> + <model usable='no' vendor='Zhaoxin CentaurHauls'>YongFeng-v3</model> + <blockers model='YongFeng-v3'> + <feature name='ace2'/> + <feature name='arch-capabilities'/> + <feature name='invpcid'/> + <feature name='invtsc'/> + <feature name='pcid'/> + <feature name='phe'/> + <feature name='phe-en'/> + <feature name='pmm'/> + <feature name='pmm-en'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='xcrypt'/> + <feature name='xcrypt-en'/> + <feature name='xstore'/> + <feature name='xstore-en'/> + </blockers> <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> diff --git a/tests/domaincapsdata/qemu_10.2.0.x86_64.xml b/tests/domaincapsdata/qemu_10.2.0.x86_64.xml index 8388dde021..c33226c2c2 100644 --- a/tests/domaincapsdata/qemu_10.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_10.2.0.x86_64.xml @@ -925,6 +925,21 @@ <feature name='xstore'/> <feature name='xstore-en'/> </blockers> + <model usable='no' vendor='Zhaoxin CentaurHauls'>YongFeng-v3</model> + <blockers model='YongFeng-v3'> + <feature name='ace2'/> + <feature name='pcid'/> + <feature name='phe'/> + <feature name='phe-en'/> + <feature name='pmm'/> + <feature name='pmm-en'/> + <feature name='ss'/> + <feature name='ssb-no'/> + <feature name='xcrypt'/> + <feature name='xcrypt-en'/> + <feature name='xstore'/> + <feature name='xstore-en'/> + </blockers> <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model> <blockers model='athlon'> <feature name='3dnow'/> -- 2.51.0