Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com&gt; --- src/cpu_map/x86_features.xml | 3 +++ tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 1 + tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 1 + tests/qemuxml2argvdata/cpu-host-model.x86_64-latest.args | 2 +- 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml index 5845a2331b..d136d78368 100644 --- a/src/cpu_map/x86_features.xml +++ b/src/cpu_map/x86_features.xml @@ -775,6 +775,9 @@ <feature name='pbrsb-no'> <msr index='0x10a' edx='0x00000000' eax='0x01000000'/> </feature> + <feature name='gds-no'> + <msr index='0x10a' edx='0x00000000' eax='0x04000000'/> + </feature> <!-- IA32_CORE_CAPABILITIES features --> <feature name='split-lock-detect'> 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 bb3578d5d7..f711a51044 100644 --- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml @@ -69,6 +69,7 @@ <feature policy='require' name='skip-l1dfl-vmentry'/> <feature policy='require' name='mds-no'/> <feature policy='require' name='pschange-mc-no'/> + <feature policy='require' name='gds-no'/> <feature policy='disable' name='xsaves'/> </mode> <mode name='custom' 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 1be5ff2c93..bc060e21b6 100644 --- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml @@ -68,6 +68,7 @@ <feature policy='require' name='skip-l1dfl-vmentry'/> <feature policy='require' name='mds-no'/> <feature policy='require' name='pschange-mc-no'/> + <feature policy='require' name='gds-no'/> <feature policy='disable' name='xsaves'/> </mode> <mode name='custom' supported='yes'> diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-host-model.x86_64-latest.args index dba1d9b65a..a9b8f5a7d4 100644 --- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine q35,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ --cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,cmp-legacy=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,xsaves=off \ +-cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,cmp-legacy=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,gds-no=on,xsaves=off \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -- 2.39.2

Some guest OSes require cpu features from the vmx-* family, e.g. vmx-xsaves. Up to now, libvirt ignored these features as they were not required yet. qemu does not automatically enable e.g. "vmx-xsaves" when requesting "xsaves": qmp="qemu-kvm -machine accel=kvm -nodefaults -nographic -qmp stdio" $(qmp) <<-EOF | jq | grep "xsaves" { "execute": "qmp_capabilities" } { "execute": "query-cpu-model-expansion", "arguments": { "type": "full", "model": { "name": "Skylake-Client-v1", "props": { "xsaves": true } `# set to "true" or "false"` } } } { "execute": "quit" } EOF with xsaves "false": "xsaves": false, "vmx-xsaves": false, with xsaves "true": "xsaves": true, "vmx-xsaves": false, Stop ignoring vmx-* features and begin adding them to libvirt's database. Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com&gt; --- src/cpu_map/sync_qemu_features_i386.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cpu_map/sync_qemu_features_i386.py b/src/cpu_map/sync_qemu_features_i386.py index 9e77d44bae..dcd58cd590 100755 --- a/src/cpu_map/sync_qemu_features_i386.py +++ b/src/cpu_map/sync_qemu_features_i386.py @@ -99,7 +99,7 @@ def ignore_feature(feature): name = feature["name"] - if name.startswith("x-") or name.startswith("vmx-"): + if name.startswith("x-"): return True if name in ignored_features: -- 2.39.2

Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com&gt; --- src/cpu_map/x86_features.xml | 19 +++++++++++++++++++ .../x86_64-cpuid-Atom-P5362-enabled.xml | 1 + .../x86_64-cpuid-Atom-P5362-json.xml | 3 +++ .../x86_64-cpuid-Cooperlake-enabled.xml | 1 + .../x86_64-cpuid-Cooperlake-json.xml | 3 +++ .../x86_64-cpuid-Core-i7-8550U-enabled.xml | 1 + .../x86_64-cpuid-Core-i7-8550U-json.xml | 3 +++ ...86_64-cpuid-Xeon-Platinum-9242-enabled.xml | 1 + .../x86_64-cpuid-Xeon-Platinum-9242-json.xml | 3 +++ ...-cpuid-baseline-Cooperlake+Cascadelake.xml | 3 +++ .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 3 +++ tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 3 +++ .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 3 +++ tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 3 +++ .../cpu-host-model.x86_64-4.2.0.args | 2 +- .../cpu-host-model.x86_64-5.0.0.args | 2 +- 16 files changed, 52 insertions(+), 2 deletions(-) diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml index 407cf65acc..c17a76aeb8 100644 --- a/src/cpu_map/x86_features.xml +++ b/src/cpu_map/x86_features.xml @@ -796,4 +796,23 @@ <feature name='vmx-any-errcode'> <msr index='0x480' edx='0x01000000' eax='0x00000000'/> </feature> + + <feature name='vmx-store-lma'> + <msr index='0x485' edx='0x00000000' eax='0x00000020'/> + </feature> + <feature name='vmx-activity-hlt'> + <msr index='0x485' edx='0x00000000' eax='0x00000040'/> + </feature> + <feature name='vmx-activity-shutdown'> + <msr index='0x485' edx='0x00000000' eax='0x00000080'/> + </feature> + <feature name='vmx-activity-wait-sipi'> + <msr index='0x485' edx='0x00000000' eax='0x00000100'/> + </feature> + <feature name='vmx-vmwrite-vmexit-fields'> + <msr index='0x485' edx='0x00000000' eax='0x20000000'/> + </feature> + <feature name='vmx-zero-len-inject'> + <msr index='0x485' edx='0x00000000' eax='0x40000000'/> + </feature> </cpus> diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-enabled.xml b/tests/cputestdata/x86_64-cpuid-Atom-P5362-enabled.xml index d294f3bc85..2508e56694 100644 --- a/tests/cputestdata/x86_64-cpuid-Atom-P5362-enabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-enabled.xml @@ -8,4 +8,5 @@ <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00000000' ebx='0x01009000' ecx='0x00000000' edx='0x00000000'/> <msr index='0x10a' edx='0x00000000' eax='0x0000006b'/> <msr index='0x480' edx='0x00c00000' eax='0x00000000'/> + <msr index='0x485' edx='0x00000000' eax='0x20000060'/> </cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml b/tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml index 717ef008d4..2c5a1e3dfe 100644 --- a/tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml +++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml @@ -20,6 +20,9 @@ <feature policy='require' name='pschange-mc-no'/> <feature policy='require' name='vmx-ins-outs'/> <feature policy='require' name='vmx-true-ctls'/> + <feature policy='require' name='vmx-store-lma'/> + <feature policy='require' name='vmx-activity-hlt'/> + <feature policy='require' name='vmx-vmwrite-vmexit-fields'/> <feature policy='disable' name='mpx'/> <feature policy='disable' name='core-capability'/> <feature policy='disable' name='pdpe1gb'/> diff --git a/tests/cputestdata/x86_64-cpuid-Cooperlake-enabled.xml b/tests/cputestdata/x86_64-cpuid-Cooperlake-enabled.xml index adfb882881..1e56a64fef 100644 --- a/tests/cputestdata/x86_64-cpuid-Cooperlake-enabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Cooperlake-enabled.xml @@ -9,4 +9,5 @@ <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00000000' ebx='0x01009000' ecx='0x00000000' edx='0x00000000'/> <msr index='0x10a' edx='0x00000000' eax='0x000001eb'/> <msr index='0x480' edx='0x00c00000' eax='0x00000000'/> + <msr index='0x485' edx='0x00000000' eax='0x20000060'/> </cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml b/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml index 8dd5ebbc05..082c526606 100644 --- a/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml +++ b/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml @@ -15,4 +15,7 @@ <feature policy='require' name='tsx-ctrl'/> <feature policy='require' name='vmx-ins-outs'/> <feature policy='require' name='vmx-true-ctls'/> + <feature policy='require' name='vmx-store-lma'/> + <feature policy='require' name='vmx-activity-hlt'/> + <feature policy='require' name='vmx-vmwrite-vmexit-fields'/> </cpu> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-enabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-enabled.xml index 9e0de97f63..db7f67163a 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-enabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-enabled.xml @@ -7,4 +7,5 @@ <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000121' edx='0x2c100800'/> <msr index='0x10a' edx='0x00000000' eax='0x00000048'/> <msr index='0x480' edx='0x00c00000' eax='0x00000000'/> + <msr index='0x485' edx='0x00000000' eax='0x20000060'/> </cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml index 4056f4bcac..748817c533 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml @@ -17,6 +17,9 @@ <feature policy='require' name='pschange-mc-no'/> <feature policy='require' name='vmx-ins-outs'/> <feature policy='require' name='vmx-true-ctls'/> + <feature policy='require' name='vmx-store-lma'/> + <feature policy='require' name='vmx-activity-hlt'/> + <feature policy='require' name='vmx-vmwrite-vmexit-fields'/> <feature policy='disable' name='hle'/> <feature policy='disable' name='rtm'/> </cpu> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-enabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-enabled.xml index 4b1c06e18f..d404229290 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-enabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-enabled.xml @@ -8,4 +8,5 @@ <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00000000' ebx='0x01001000' ecx='0x00000000' edx='0x00000000'/> <msr index='0x10a' edx='0x00000000' eax='0x000000eb'/> <msr index='0x480' edx='0x00c00000' eax='0x00000000'/> + <msr index='0x485' edx='0x00000000' eax='0x20000060'/> </cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml index 1593e37302..3c46045396 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml @@ -21,4 +21,7 @@ <feature policy='require' name='tsx-ctrl'/> <feature policy='require' name='vmx-ins-outs'/> <feature policy='require' name='vmx-true-ctls'/> + <feature policy='require' name='vmx-store-lma'/> + <feature policy='require' name='vmx-activity-hlt'/> + <feature policy='require' name='vmx-vmwrite-vmexit-fields'/> </cpu> diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml b/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml index 63fcf0cf43..afd525ada0 100644 --- a/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml +++ b/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml @@ -21,4 +21,7 @@ <feature policy='require' name='tsx-ctrl'/> <feature policy='require' name='vmx-ins-outs'/> <feature policy='require' name='vmx-true-ctls'/> + <feature policy='require' name='vmx-store-lma'/> + <feature policy='require' name='vmx-activity-hlt'/> + <feature policy='require' name='vmx-vmwrite-vmexit-fields'/> </cpu> diff --git a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml index 03df6677e1..bf65363e24 100644 --- a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml @@ -61,6 +61,9 @@ <feature policy='require' name='pschange-mc-no'/> <feature policy='require' name='vmx-ins-outs'/> <feature policy='require' name='vmx-true-ctls'/> + <feature policy='require' name='vmx-store-lma'/> + <feature policy='require' name='vmx-activity-hlt'/> + <feature policy='require' name='vmx-vmwrite-vmexit-fields'/> </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>qemu64</model> diff --git a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml index a4230b2465..e5b0a97a90 100644 --- a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml @@ -60,6 +60,9 @@ <feature policy='require' name='pschange-mc-no'/> <feature policy='require' name='vmx-ins-outs'/> <feature policy='require' name='vmx-true-ctls'/> + <feature policy='require' name='vmx-store-lma'/> + <feature policy='require' name='vmx-activity-hlt'/> + <feature policy='require' name='vmx-vmwrite-vmexit-fields'/> </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>qemu64</model> diff --git a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml index ce1a0a9cfe..e6aea45834 100644 --- a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml @@ -61,6 +61,9 @@ <feature policy='require' name='pschange-mc-no'/> <feature policy='require' name='vmx-ins-outs'/> <feature policy='require' name='vmx-true-ctls'/> + <feature policy='require' name='vmx-store-lma'/> + <feature policy='require' name='vmx-activity-hlt'/> + <feature policy='require' name='vmx-vmwrite-vmexit-fields'/> </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>qemu64</model> diff --git a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml index 0f21fb43c9..b3cd733217 100644 --- a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml @@ -60,6 +60,9 @@ <feature policy='require' name='pschange-mc-no'/> <feature policy='require' name='vmx-ins-outs'/> <feature policy='require' name='vmx-true-ctls'/> + <feature policy='require' name='vmx-store-lma'/> + <feature policy='require' name='vmx-activity-hlt'/> + <feature policy='require' name='vmx-vmwrite-vmexit-fields'/> </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>qemu64</model> diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.2.0.args b/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.2.0.args index 8caaa1872d..dd5d3fdeb8 100644 --- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.2.0.args +++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.2.0.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ -machine pc-q35-4.2,usb=off,dump-guest-core=off \ -accel kvm \ --cpu Skylake-Client-IBRS,ss=on,vmx=on,hypervisor=on,tsc-adjust=on,clflushopt=on,umip=on,md-clear=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,pdpe1gb=on,skip-l1dfl-vmentry=on,pschange-mc-no=on,vmx-ins-outs=on,vmx-true-ctls=on \ +-cpu Skylake-Client-IBRS,ss=on,vmx=on,hypervisor=on,tsc-adjust=on,clflushopt=on,umip=on,md-clear=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,pdpe1gb=on,skip-l1dfl-vmentry=on,pschange-mc-no=on,vmx-ins-outs=on,vmx-true-ctls=on,vmx-store-lma=on,vmx-activity-hlt=on,vmx-vmwrite-vmexit-fields=on \ -m size=219136k \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.0.0.args b/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.0.0.args index 930336672c..472d1f70ef 100644 --- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.0.0.args +++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.0.0.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ -machine pc-q35-5.0,usb=off,dump-guest-core=off \ -accel kvm \ --cpu Skylake-Client-IBRS,ss=on,vmx=on,hypervisor=on,tsc-adjust=on,clflushopt=on,umip=on,md-clear=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,pdpe1gb=on,skip-l1dfl-vmentry=on,pschange-mc-no=on,vmx-ins-outs=on,vmx-true-ctls=on \ +-cpu Skylake-Client-IBRS,ss=on,vmx=on,hypervisor=on,tsc-adjust=on,clflushopt=on,umip=on,md-clear=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,pdpe1gb=on,skip-l1dfl-vmentry=on,pschange-mc-no=on,vmx-ins-outs=on,vmx-true-ctls=on,vmx-store-lma=on,vmx-activity-hlt=on,vmx-vmwrite-vmexit-fields=on \ -m size=219136k \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -- 2.39.2

Differences from qemu: * "vmx-ept-uc" (bit 8) and "vmx-ept-wb" (bit 14) are not added to qemu's list of named features yet, but used in several qemu cpu models never the less. Add to libvirt regardless. * "vmx-invvpid-single-context" (bit 41) is erroneously called "vmx-invept-single-context" in qemu. This is the name of the feature associated with bit 25 in both libvirt and qemu. * "vmx-invvpid-single-context-noglobals" (bit 43) is erroneously called "vmx-invept-single-context-noglobals". Use the correct name. Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com&gt; --- src/cpu_map/x86_features.xml | 53 +++++++++++++++++++ .../x86_64-cpuid-Atom-P5362-enabled.xml | 1 + .../x86_64-cpuid-Atom-P5362-json.xml | 11 ++++ .../x86_64-cpuid-Cooperlake-enabled.xml | 1 + .../x86_64-cpuid-Cooperlake-json.xml | 11 ++++ .../x86_64-cpuid-Core-i7-8550U-enabled.xml | 1 + .../x86_64-cpuid-Core-i7-8550U-json.xml | 11 ++++ ...86_64-cpuid-Xeon-Platinum-9242-enabled.xml | 1 + .../x86_64-cpuid-Xeon-Platinum-9242-json.xml | 11 ++++ ...-cpuid-baseline-Cooperlake+Cascadelake.xml | 11 ++++ .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 11 ++++ tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 11 ++++ .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 11 ++++ tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 11 ++++ .../cpu-host-model.x86_64-4.2.0.args | 2 +- .../cpu-host-model.x86_64-5.0.0.args | 2 +- 16 files changed, 158 insertions(+), 2 deletions(-) diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml index 7b6ff44c20..f37b817013 100644 --- a/src/cpu_map/x86_features.xml +++ b/src/cpu_map/x86_features.xml @@ -879,4 +879,57 @@ <feature name='vmx-enable-user-wait-pause'> <msr index='0x48b' edx='0x00000000' eax='0x04000000'/> </feature> + + <feature name='vmx-invvpid'> + <msr index='0x48c' edx='0x00000001' eax='0x00000000'/> + </feature> + <feature name='vmx-invvpid-single-addr'> + <msr index='0x48c' edx='0x00000100' eax='0x00000000'/> + </feature> + <feature name='vmx-invvpid-single-context'> + <msr index='0x48c' edx='0x00000200' eax='0x00000000'/> + </feature> + <feature name='vmx-invvpid-all-context'> + <msr index='0x48c' edx='0x00000400' eax='0x00000000'/> + </feature> + <feature name='vmx-invvpid-single-context-noglobals'> + <alias name='vmx-invept-single-context-noglobals' source='qemu'/> + <msr index='0x48c' edx='0x00000800' eax='0x00000000'/> + </feature> + <feature name='vmx-ept-execonly'> + <msr index='0x48c' edx='0x00000000' eax='0x00000001'/> + </feature> + <feature name='vmx-page-walk-4'> + <msr index='0x48c' edx='0x00000000' eax='0x00000040'/> + </feature> + <feature name='vmx-page-walk-5'> + <msr index='0x48c' edx='0x00000000' eax='0x00000080'/> + </feature> + <feature name='vmx-ept-uc'> + <msr index='0x48c' edx='0x00000000' eax='0x00000100'/> + </feature> + <feature name='vmx-ept-wb'> + <msr index='0x48c' edx='0x00000000' eax='0x00004000'/> + </feature> + <feature name='vmx-ept-2mb'> + <msr index='0x48c' edx='0x00000000' eax='0x00010000'/> + </feature> + <feature name='vmx-ept-1gb'> + <msr index='0x48c' edx='0x00000000' eax='0x00020000'/> + </feature> + <feature name='vmx-invept'> + <msr index='0x48c' edx='0x00000000' eax='0x00100000'/> + </feature> + <feature name='vmx-eptad'> + <msr index='0x48c' edx='0x00000000' eax='0x00200000'/> + </feature> + <feature name='vmx-ept-advanced-exitinfo'> + <msr index='0x48c' edx='0x00000000' eax='0x00400000'/> + </feature> + <feature name='vmx-invept-single-context'> + <msr index='0x48c' edx='0x00000000' eax='0x02000000'/> + </feature> + <feature name='vmx-invept-all-context'> + <msr index='0x48c' edx='0x00000000' eax='0x04000000'/> + </feature> </cpus> diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-enabled.xml b/tests/cputestdata/x86_64-cpuid-Atom-P5362-enabled.xml index 7a1f047382..195bf88765 100644 --- a/tests/cputestdata/x86_64-cpuid-Atom-P5362-enabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-enabled.xml @@ -10,4 +10,5 @@ <msr index='0x480' edx='0x00c00000' eax='0x00000000'/> <msr index='0x485' edx='0x00000000' eax='0x20000060'/> <msr index='0x48b' edx='0x00000000' eax='0x00136bff'/> + <msr index='0x48c' edx='0x00000501' eax='0x06330041'/> </cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml b/tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml index bb4259058a..d7d8d89d42 100644 --- a/tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml +++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml @@ -39,6 +39,17 @@ <feature policy='require' name='vmx-rdseed-exit'/> <feature policy='require' name='vmx-pml'/> <feature policy='require' name='vmx-xsaves'/> + <feature policy='require' name='vmx-invvpid'/> + <feature policy='require' name='vmx-invvpid-single-addr'/> + <feature policy='require' name='vmx-invvpid-all-context'/> + <feature policy='require' name='vmx-ept-execonly'/> + <feature policy='require' name='vmx-page-walk-4'/> + <feature policy='require' name='vmx-ept-2mb'/> + <feature policy='require' name='vmx-ept-1gb'/> + <feature policy='require' name='vmx-invept'/> + <feature policy='require' name='vmx-eptad'/> + <feature policy='require' name='vmx-invept-single-context'/> + <feature policy='require' name='vmx-invept-all-context'/> <feature policy='disable' name='mpx'/> <feature policy='disable' name='core-capability'/> <feature policy='disable' name='pdpe1gb'/> diff --git a/tests/cputestdata/x86_64-cpuid-Cooperlake-enabled.xml b/tests/cputestdata/x86_64-cpuid-Cooperlake-enabled.xml index 01d81a64a6..7acddcae81 100644 --- a/tests/cputestdata/x86_64-cpuid-Cooperlake-enabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Cooperlake-enabled.xml @@ -11,4 +11,5 @@ <msr index='0x480' edx='0x00c00000' eax='0x00000000'/> <msr index='0x485' edx='0x00000000' eax='0x20000060'/> <msr index='0x48b' edx='0x00000000' eax='0x00137bff'/> + <msr index='0x48c' edx='0x00000501' eax='0x06330041'/> </cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml b/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml index bb1d2f628c..1dee592f23 100644 --- a/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml +++ b/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml @@ -35,4 +35,15 @@ <feature policy='require' name='vmx-rdseed-exit'/> <feature policy='require' name='vmx-pml'/> <feature policy='require' name='vmx-xsaves'/> + <feature policy='require' name='vmx-invvpid'/> + <feature policy='require' name='vmx-invvpid-single-addr'/> + <feature policy='require' name='vmx-invvpid-all-context'/> + <feature policy='require' name='vmx-ept-execonly'/> + <feature policy='require' name='vmx-page-walk-4'/> + <feature policy='require' name='vmx-ept-2mb'/> + <feature policy='require' name='vmx-ept-1gb'/> + <feature policy='require' name='vmx-invept'/> + <feature policy='require' name='vmx-eptad'/> + <feature policy='require' name='vmx-invept-single-context'/> + <feature policy='require' name='vmx-invept-all-context'/> </cpu> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-enabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-enabled.xml index 1bf7882b2e..1309da972b 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-enabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-enabled.xml @@ -9,4 +9,5 @@ <msr index='0x480' edx='0x00c00000' eax='0x00000000'/> <msr index='0x485' edx='0x00000000' eax='0x20000060'/> <msr index='0x48b' edx='0x00000000' eax='0x001378ff'/> + <msr index='0x48c' edx='0x00000501' eax='0x06330041'/> </cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml index e150ef4004..8e590da2c9 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml @@ -35,6 +35,17 @@ <feature policy='require' name='vmx-rdseed-exit'/> <feature policy='require' name='vmx-pml'/> <feature policy='require' name='vmx-xsaves'/> + <feature policy='require' name='vmx-invvpid'/> + <feature policy='require' name='vmx-invvpid-single-addr'/> + <feature policy='require' name='vmx-invvpid-all-context'/> + <feature policy='require' name='vmx-ept-execonly'/> + <feature policy='require' name='vmx-page-walk-4'/> + <feature policy='require' name='vmx-ept-2mb'/> + <feature policy='require' name='vmx-ept-1gb'/> + <feature policy='require' name='vmx-invept'/> + <feature policy='require' name='vmx-eptad'/> + <feature policy='require' name='vmx-invept-single-context'/> + <feature policy='require' name='vmx-invept-all-context'/> <feature policy='disable' name='hle'/> <feature policy='disable' name='rtm'/> </cpu> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-enabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-enabled.xml index b7ffbb2708..a9bf08018a 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-enabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-enabled.xml @@ -10,4 +10,5 @@ <msr index='0x480' edx='0x00c00000' eax='0x00000000'/> <msr index='0x485' edx='0x00000000' eax='0x20000060'/> <msr index='0x48b' edx='0x00000000' eax='0x00137bff'/> + <msr index='0x48c' edx='0x00000501' eax='0x06330041'/> </cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml index 2813c72012..edb4dfbb5c 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml @@ -41,4 +41,15 @@ <feature policy='require' name='vmx-rdseed-exit'/> <feature policy='require' name='vmx-pml'/> <feature policy='require' name='vmx-xsaves'/> + <feature policy='require' name='vmx-invvpid'/> + <feature policy='require' name='vmx-invvpid-single-addr'/> + <feature policy='require' name='vmx-invvpid-all-context'/> + <feature policy='require' name='vmx-ept-execonly'/> + <feature policy='require' name='vmx-page-walk-4'/> + <feature policy='require' name='vmx-ept-2mb'/> + <feature policy='require' name='vmx-ept-1gb'/> + <feature policy='require' name='vmx-invept'/> + <feature policy='require' name='vmx-eptad'/> + <feature policy='require' name='vmx-invept-single-context'/> + <feature policy='require' name='vmx-invept-all-context'/> </cpu> diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml b/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml index ca6387e390..0918fc96cb 100644 --- a/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml +++ b/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml @@ -41,4 +41,15 @@ <feature policy='require' name='vmx-rdseed-exit'/> <feature policy='require' name='vmx-pml'/> <feature policy='require' name='vmx-xsaves'/> + <feature policy='require' name='vmx-invvpid'/> + <feature policy='require' name='vmx-invvpid-single-addr'/> + <feature policy='require' name='vmx-invvpid-all-context'/> + <feature policy='require' name='vmx-ept-execonly'/> + <feature policy='require' name='vmx-page-walk-4'/> + <feature policy='require' name='vmx-ept-2mb'/> + <feature policy='require' name='vmx-ept-1gb'/> + <feature policy='require' name='vmx-invept'/> + <feature policy='require' name='vmx-eptad'/> + <feature policy='require' name='vmx-invept-single-context'/> + <feature policy='require' name='vmx-invept-all-context'/> </cpu> diff --git a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml index 398a027e92..563c2cbd24 100644 --- a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml @@ -79,6 +79,17 @@ <feature policy='require' name='vmx-rdseed-exit'/> <feature policy='require' name='vmx-pml'/> <feature policy='require' name='vmx-xsaves'/> + <feature policy='require' name='vmx-invvpid'/> + <feature policy='require' name='vmx-invvpid-single-addr'/> + <feature policy='require' name='vmx-invvpid-all-context'/> + <feature policy='require' name='vmx-ept-execonly'/> + <feature policy='require' name='vmx-page-walk-4'/> + <feature policy='require' name='vmx-ept-2mb'/> + <feature policy='require' name='vmx-ept-1gb'/> + <feature policy='require' name='vmx-invept'/> + <feature policy='require' name='vmx-eptad'/> + <feature policy='require' name='vmx-invept-single-context'/> + <feature policy='require' name='vmx-invept-all-context'/> </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>qemu64</model> diff --git a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml index 446bf915a5..2ee9422dd3 100644 --- a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml @@ -78,6 +78,17 @@ <feature policy='require' name='vmx-rdseed-exit'/> <feature policy='require' name='vmx-pml'/> <feature policy='require' name='vmx-xsaves'/> + <feature policy='require' name='vmx-invvpid'/> + <feature policy='require' name='vmx-invvpid-single-addr'/> + <feature policy='require' name='vmx-invvpid-all-context'/> + <feature policy='require' name='vmx-ept-execonly'/> + <feature policy='require' name='vmx-page-walk-4'/> + <feature policy='require' name='vmx-ept-2mb'/> + <feature policy='require' name='vmx-ept-1gb'/> + <feature policy='require' name='vmx-invept'/> + <feature policy='require' name='vmx-eptad'/> + <feature policy='require' name='vmx-invept-single-context'/> + <feature policy='require' name='vmx-invept-all-context'/> </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>qemu64</model> diff --git a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml index c1dd623709..fbb7549ef5 100644 --- a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml @@ -79,6 +79,17 @@ <feature policy='require' name='vmx-rdseed-exit'/> <feature policy='require' name='vmx-pml'/> <feature policy='require' name='vmx-xsaves'/> + <feature policy='require' name='vmx-invvpid'/> + <feature policy='require' name='vmx-invvpid-single-addr'/> + <feature policy='require' name='vmx-invvpid-all-context'/> + <feature policy='require' name='vmx-ept-execonly'/> + <feature policy='require' name='vmx-page-walk-4'/> + <feature policy='require' name='vmx-ept-2mb'/> + <feature policy='require' name='vmx-ept-1gb'/> + <feature policy='require' name='vmx-invept'/> + <feature policy='require' name='vmx-eptad'/> + <feature policy='require' name='vmx-invept-single-context'/> + <feature policy='require' name='vmx-invept-all-context'/> </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>qemu64</model> diff --git a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml index 4618fd24e4..e8cd88a755 100644 --- a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml @@ -78,6 +78,17 @@ <feature policy='require' name='vmx-rdseed-exit'/> <feature policy='require' name='vmx-pml'/> <feature policy='require' name='vmx-xsaves'/> + <feature policy='require' name='vmx-invvpid'/> + <feature policy='require' name='vmx-invvpid-single-addr'/> + <feature policy='require' name='vmx-invvpid-all-context'/> + <feature policy='require' name='vmx-ept-execonly'/> + <feature policy='require' name='vmx-page-walk-4'/> + <feature policy='require' name='vmx-ept-2mb'/> + <feature policy='require' name='vmx-ept-1gb'/> + <feature policy='require' name='vmx-invept'/> + <feature policy='require' name='vmx-eptad'/> + <feature policy='require' name='vmx-invept-single-context'/> + <feature policy='require' name='vmx-invept-all-context'/> </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>qemu64</model> diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.2.0.args b/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.2.0.args index 22e4023886..7f06d6c410 100644 --- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.2.0.args +++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.2.0.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ -machine pc-q35-4.2,usb=off,dump-guest-core=off \ -accel kvm \ --cpu Skylake-Client-IBRS,ss=on,vmx=on,hypervisor=on,tsc-adjust=on,clflushopt=on,umip=on,md-clear=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,pdpe1gb=on,skip-l1dfl-vmentry=on,pschange-mc-no=on,vmx-ins-outs=on,vmx-true-ctls=on,vmx-store-lma=on,vmx-activity-hlt=on,vmx-vmwrite-vmexit-fields=on,vmx-apicv-xapic=on,vmx-ept=on,vmx-desc-exit=on,vmx-rdtscp-exit=on,vmx-apicv-x2apic=on,vmx-vpid=on,vmx-wbinvd-exit=on,vmx-unrestricted-guest=on,vmx-rdrand-exit=on,vmx-invpcid-exit=on,vmx-vmfunc=on,vmx-shadow-vmcs=on,vmx-rdseed-exit=on,vmx-pml=on,vmx-xsaves=on \ +-cpu Skylake-Client-IBRS,ss=on,vmx=on,hypervisor=on,tsc-adjust=on,clflushopt=on,umip=on,md-clear=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,pdpe1gb=on,skip-l1dfl-vmentry=on,pschange-mc-no=on,vmx-ins-outs=on,vmx-true-ctls=on,vmx-store-lma=on,vmx-activity-hlt=on,vmx-vmwrite-vmexit-fields=on,vmx-apicv-xapic=on,vmx-ept=on,vmx-desc-exit=on,vmx-rdtscp-exit=on,vmx-apicv-x2apic=on,vmx-vpid=on,vmx-wbinvd-exit=on,vmx-unrestricted-guest=on,vmx-rdrand-exit=on,vmx-invpcid-exit=on,vmx-vmfunc=on,vmx-shadow-vmcs=on,vmx-rdseed-exit=on,vmx-pml=on,vmx-xsaves=on,vmx-invvpid=on,vmx-invvpid-single-addr=on,vmx-invvpid-all-context=on,vmx-ept-execonly=on,vmx-page-walk-4=on,vmx-ept-2mb=on,vmx-ept-1gb=on,vmx-invept=on,vmx-eptad=on,vmx-invept-single-context=on,vmx-invept-all-context=on \ -m size=219136k \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.0.0.args b/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.0.0.args index df890b9f89..030d129e66 100644 --- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.0.0.args +++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.0.0.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ -machine pc-q35-5.0,usb=off,dump-guest-core=off \ -accel kvm \ --cpu Skylake-Client-IBRS,ss=on,vmx=on,hypervisor=on,tsc-adjust=on,clflushopt=on,umip=on,md-clear=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,pdpe1gb=on,skip-l1dfl-vmentry=on,pschange-mc-no=on,vmx-ins-outs=on,vmx-true-ctls=on,vmx-store-lma=on,vmx-activity-hlt=on,vmx-vmwrite-vmexit-fields=on,vmx-apicv-xapic=on,vmx-ept=on,vmx-desc-exit=on,vmx-rdtscp-exit=on,vmx-apicv-x2apic=on,vmx-vpid=on,vmx-wbinvd-exit=on,vmx-unrestricted-guest=on,vmx-rdrand-exit=on,vmx-invpcid-exit=on,vmx-vmfunc=on,vmx-shadow-vmcs=on,vmx-rdseed-exit=on,vmx-pml=on,vmx-xsaves=on \ +-cpu Skylake-Client-IBRS,ss=on,vmx=on,hypervisor=on,tsc-adjust=on,clflushopt=on,umip=on,md-clear=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,pdpe1gb=on,skip-l1dfl-vmentry=on,pschange-mc-no=on,vmx-ins-outs=on,vmx-true-ctls=on,vmx-store-lma=on,vmx-activity-hlt=on,vmx-vmwrite-vmexit-fields=on,vmx-apicv-xapic=on,vmx-ept=on,vmx-desc-exit=on,vmx-rdtscp-exit=on,vmx-apicv-x2apic=on,vmx-vpid=on,vmx-wbinvd-exit=on,vmx-unrestricted-guest=on,vmx-rdrand-exit=on,vmx-invpcid-exit=on,vmx-vmfunc=on,vmx-shadow-vmcs=on,vmx-rdseed-exit=on,vmx-pml=on,vmx-xsaves=on,vmx-invvpid=on,vmx-invvpid-single-addr=on,vmx-invvpid-all-context=on,vmx-ept-execonly=on,vmx-page-walk-4=on,vmx-ept-2mb=on,vmx-ept-1gb=on,vmx-invept=on,vmx-eptad=on,vmx-invept-single-context=on,vmx-invept-all-context=on \ -m size=219136k \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -- 2.39.2

Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com&gt; --- src/cpu_map/x86_features.xml | 64 +++++++++++++++++++ .../x86_64-cpuid-Atom-P5362-enabled.xml | 1 + .../x86_64-cpuid-Atom-P5362-json.xml | 21 ++++++ .../x86_64-cpuid-Cooperlake-enabled.xml | 1 + .../x86_64-cpuid-Cooperlake-json.xml | 21 ++++++ .../x86_64-cpuid-Core-i7-8550U-enabled.xml | 1 + .../x86_64-cpuid-Core-i7-8550U-json.xml | 21 ++++++ ...86_64-cpuid-Xeon-Platinum-9242-enabled.xml | 1 + .../x86_64-cpuid-Xeon-Platinum-9242-json.xml | 21 ++++++ ...-cpuid-baseline-Cooperlake+Cascadelake.xml | 21 ++++++ .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 21 ++++++ tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 21 ++++++ .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 21 ++++++ tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 21 ++++++ .../cpu-host-model.x86_64-4.2.0.args | 2 +- .../cpu-host-model.x86_64-5.0.0.args | 2 +- 16 files changed, 259 insertions(+), 2 deletions(-) diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml index 6e427c3998..2583f1c825 100644 --- a/src/cpu_map/x86_features.xml +++ b/src/cpu_map/x86_features.xml @@ -948,4 +948,68 @@ <feature name='vmx-posted-intr'> <msr index='0x48d' edx='0x00000000' eax='0x00000080'/> </feature> + + <feature name='vmx-vintr-pending'> + <msr index='0x48e' edx='0x00000000' eax='0x00000004'/> + </feature> + <feature name='vmx-tsc-offset'> + <msr index='0x48e' edx='0x00000000' eax='0x00000008'/> + </feature> + <feature name='vmx-hlt-exit'> + <msr index='0x48e' edx='0x00000000' eax='0x00000080'/> + </feature> + <feature name='vmx-invlpg-exit'> + <msr index='0x48e' edx='0x00000000' eax='0x00000200'/> + </feature> + <feature name='vmx-mwait-exit'> + <msr index='0x48e' edx='0x00000000' eax='0x00000400'/> + </feature> + <feature name='vmx-rdpmc-exit'> + <msr index='0x48e' edx='0x00000000' eax='0x00000800'/> + </feature> + <feature name='vmx-rdtsc-exit'> + <msr index='0x48e' edx='0x00000000' eax='0x00001000'/> + </feature> + <feature name='vmx-cr3-load-noexit'> + <msr index='0x48e' edx='0x00000000' eax='0x00008000'/> + </feature> + <feature name='vmx-cr3-store-noexit'> + <msr index='0x48e' edx='0x00000000' eax='0x00010000'/> + </feature> + <feature name='vmx-cr8-load-exit'> + <msr index='0x48e' edx='0x00000000' eax='0x00080000'/> + </feature> + <feature name='vmx-cr8-store-exit'> + <msr index='0x48e' edx='0x00000000' eax='0x00100000'/> + </feature> + <feature name='vmx-flexpriority'> + <msr index='0x48e' edx='0x00000000' eax='0x00200000'/> + </feature> + <feature name='vmx-vnmi-pending'> + <msr index='0x48e' edx='0x00000000' eax='0x00400000'/> + </feature> + <feature name='vmx-movdr-exit'> + <msr index='0x48e' edx='0x00000000' eax='0x00800000'/> + </feature> + <feature name='vmx-io-exit'> + <msr index='0x48e' edx='0x00000000' eax='0x01000000'/> + </feature> + <feature name='vmx-io-bitmap'> + <msr index='0x48e' edx='0x00000000' eax='0x02000000'/> + </feature> + <feature name='vmx-mtf'> + <msr index='0x48e' edx='0x00000000' eax='0x08000000'/> + </feature> + <feature name='vmx-msr-bitmap'> + <msr index='0x48e' edx='0x00000000' eax='0x10000000'/> + </feature> + <feature name='vmx-monitor-exit'> + <msr index='0x48e' edx='0x00000000' eax='0x20000000'/> + </feature> + <feature name='vmx-pause-exit'> + <msr index='0x48e' edx='0x00000000' eax='0x40000000'/> + </feature> + <feature name='vmx-secondary-ctls'> + <msr index='0x48e' edx='0x00000000' eax='0x80000000'/> + </feature> </cpus> diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-enabled.xml b/tests/cputestdata/x86_64-cpuid-Atom-P5362-enabled.xml index 52c23315b3..b8dc58f048 100644 --- a/tests/cputestdata/x86_64-cpuid-Atom-P5362-enabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-enabled.xml @@ -12,4 +12,5 @@ <msr index='0x48b' edx='0x00000000' eax='0x00136bff'/> <msr index='0x48c' edx='0x00000501' eax='0x06330041'/> <msr index='0x48d' edx='0x00000000' eax='0x000000e9'/> + <msr index='0x48e' edx='0x00000000' eax='0xfbf99e8c'/> </cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml b/tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml index 4583c000b7..9c115e2bfc 100644 --- a/tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml +++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml @@ -55,6 +55,27 @@ <feature policy='require' name='vmx-vnmi'/> <feature policy='require' name='vmx-preemption-timer'/> <feature policy='require' name='vmx-posted-intr'/> + <feature policy='require' name='vmx-vintr-pending'/> + <feature policy='require' name='vmx-tsc-offset'/> + <feature policy='require' name='vmx-hlt-exit'/> + <feature policy='require' name='vmx-invlpg-exit'/> + <feature policy='require' name='vmx-mwait-exit'/> + <feature policy='require' name='vmx-rdpmc-exit'/> + <feature policy='require' name='vmx-rdtsc-exit'/> + <feature policy='require' name='vmx-cr3-load-noexit'/> + <feature policy='require' name='vmx-cr3-store-noexit'/> + <feature policy='require' name='vmx-cr8-load-exit'/> + <feature policy='require' name='vmx-cr8-store-exit'/> + <feature policy='require' name='vmx-flexpriority'/> + <feature policy='require' name='vmx-vnmi-pending'/> + <feature policy='require' name='vmx-movdr-exit'/> + <feature policy='require' name='vmx-io-exit'/> + <feature policy='require' name='vmx-io-bitmap'/> + <feature policy='require' name='vmx-mtf'/> + <feature policy='require' name='vmx-msr-bitmap'/> + <feature policy='require' name='vmx-monitor-exit'/> + <feature policy='require' name='vmx-pause-exit'/> + <feature policy='require' name='vmx-secondary-ctls'/> <feature policy='disable' name='mpx'/> <feature policy='disable' name='core-capability'/> <feature policy='disable' name='pdpe1gb'/> diff --git a/tests/cputestdata/x86_64-cpuid-Cooperlake-enabled.xml b/tests/cputestdata/x86_64-cpuid-Cooperlake-enabled.xml index 0720cfa332..c1dc3191ae 100644 --- a/tests/cputestdata/x86_64-cpuid-Cooperlake-enabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Cooperlake-enabled.xml @@ -13,4 +13,5 @@ <msr index='0x48b' edx='0x00000000' eax='0x00137bff'/> <msr index='0x48c' edx='0x00000501' eax='0x06330041'/> <msr index='0x48d' edx='0x00000000' eax='0x000000e9'/> + <msr index='0x48e' edx='0x00000000' eax='0xfbf99e8c'/> </cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml b/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml index d6f4317d69..da24c5f06e 100644 --- a/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml +++ b/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml @@ -51,4 +51,25 @@ <feature policy='require' name='vmx-vnmi'/> <feature policy='require' name='vmx-preemption-timer'/> <feature policy='require' name='vmx-posted-intr'/> + <feature policy='require' name='vmx-vintr-pending'/> + <feature policy='require' name='vmx-tsc-offset'/> + <feature policy='require' name='vmx-hlt-exit'/> + <feature policy='require' name='vmx-invlpg-exit'/> + <feature policy='require' name='vmx-mwait-exit'/> + <feature policy='require' name='vmx-rdpmc-exit'/> + <feature policy='require' name='vmx-rdtsc-exit'/> + <feature policy='require' name='vmx-cr3-load-noexit'/> + <feature policy='require' name='vmx-cr3-store-noexit'/> + <feature policy='require' name='vmx-cr8-load-exit'/> + <feature policy='require' name='vmx-cr8-store-exit'/> + <feature policy='require' name='vmx-flexpriority'/> + <feature policy='require' name='vmx-vnmi-pending'/> + <feature policy='require' name='vmx-movdr-exit'/> + <feature policy='require' name='vmx-io-exit'/> + <feature policy='require' name='vmx-io-bitmap'/> + <feature policy='require' name='vmx-mtf'/> + <feature policy='require' name='vmx-msr-bitmap'/> + <feature policy='require' name='vmx-monitor-exit'/> + <feature policy='require' name='vmx-pause-exit'/> + <feature policy='require' name='vmx-secondary-ctls'/> </cpu> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-enabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-enabled.xml index 8cdc42a401..e37e437d37 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-enabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-enabled.xml @@ -11,4 +11,5 @@ <msr index='0x48b' edx='0x00000000' eax='0x001378ff'/> <msr index='0x48c' edx='0x00000501' eax='0x06330041'/> <msr index='0x48d' edx='0x00000000' eax='0x00000069'/> + <msr index='0x48e' edx='0x00000000' eax='0xfbf99e8c'/> </cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml index 9c2014affc..247dbaa4cd 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml @@ -50,6 +50,27 @@ <feature policy='require' name='vmx-nmi-exit'/> <feature policy='require' name='vmx-vnmi'/> <feature policy='require' name='vmx-preemption-timer'/> + <feature policy='require' name='vmx-vintr-pending'/> + <feature policy='require' name='vmx-tsc-offset'/> + <feature policy='require' name='vmx-hlt-exit'/> + <feature policy='require' name='vmx-invlpg-exit'/> + <feature policy='require' name='vmx-mwait-exit'/> + <feature policy='require' name='vmx-rdpmc-exit'/> + <feature policy='require' name='vmx-rdtsc-exit'/> + <feature policy='require' name='vmx-cr3-load-noexit'/> + <feature policy='require' name='vmx-cr3-store-noexit'/> + <feature policy='require' name='vmx-cr8-load-exit'/> + <feature policy='require' name='vmx-cr8-store-exit'/> + <feature policy='require' name='vmx-flexpriority'/> + <feature policy='require' name='vmx-vnmi-pending'/> + <feature policy='require' name='vmx-movdr-exit'/> + <feature policy='require' name='vmx-io-exit'/> + <feature policy='require' name='vmx-io-bitmap'/> + <feature policy='require' name='vmx-mtf'/> + <feature policy='require' name='vmx-msr-bitmap'/> + <feature policy='require' name='vmx-monitor-exit'/> + <feature policy='require' name='vmx-pause-exit'/> + <feature policy='require' name='vmx-secondary-ctls'/> <feature policy='disable' name='hle'/> <feature policy='disable' name='rtm'/> </cpu> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-enabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-enabled.xml index dabcd6c793..52763c7ddb 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-enabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-enabled.xml @@ -12,4 +12,5 @@ <msr index='0x48b' edx='0x00000000' eax='0x00137bff'/> <msr index='0x48c' edx='0x00000501' eax='0x06330041'/> <msr index='0x48d' edx='0x00000000' eax='0x000000e9'/> + <msr index='0x48e' edx='0x00000000' eax='0xfbf99e8c'/> </cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml index 5128582940..f38ff7de22 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml @@ -57,4 +57,25 @@ <feature policy='require' name='vmx-vnmi'/> <feature policy='require' name='vmx-preemption-timer'/> <feature policy='require' name='vmx-posted-intr'/> + <feature policy='require' name='vmx-vintr-pending'/> + <feature policy='require' name='vmx-tsc-offset'/> + <feature policy='require' name='vmx-hlt-exit'/> + <feature policy='require' name='vmx-invlpg-exit'/> + <feature policy='require' name='vmx-mwait-exit'/> + <feature policy='require' name='vmx-rdpmc-exit'/> + <feature policy='require' name='vmx-rdtsc-exit'/> + <feature policy='require' name='vmx-cr3-load-noexit'/> + <feature policy='require' name='vmx-cr3-store-noexit'/> + <feature policy='require' name='vmx-cr8-load-exit'/> + <feature policy='require' name='vmx-cr8-store-exit'/> + <feature policy='require' name='vmx-flexpriority'/> + <feature policy='require' name='vmx-vnmi-pending'/> + <feature policy='require' name='vmx-movdr-exit'/> + <feature policy='require' name='vmx-io-exit'/> + <feature policy='require' name='vmx-io-bitmap'/> + <feature policy='require' name='vmx-mtf'/> + <feature policy='require' name='vmx-msr-bitmap'/> + <feature policy='require' name='vmx-monitor-exit'/> + <feature policy='require' name='vmx-pause-exit'/> + <feature policy='require' name='vmx-secondary-ctls'/> </cpu> diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml b/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml index 36db05d0a1..66327d5abb 100644 --- a/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml +++ b/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml @@ -57,4 +57,25 @@ <feature policy='require' name='vmx-vnmi'/> <feature policy='require' name='vmx-preemption-timer'/> <feature policy='require' name='vmx-posted-intr'/> + <feature policy='require' name='vmx-vintr-pending'/> + <feature policy='require' name='vmx-tsc-offset'/> + <feature policy='require' name='vmx-hlt-exit'/> + <feature policy='require' name='vmx-invlpg-exit'/> + <feature policy='require' name='vmx-mwait-exit'/> + <feature policy='require' name='vmx-rdpmc-exit'/> + <feature policy='require' name='vmx-rdtsc-exit'/> + <feature policy='require' name='vmx-cr3-load-noexit'/> + <feature policy='require' name='vmx-cr3-store-noexit'/> + <feature policy='require' name='vmx-cr8-load-exit'/> + <feature policy='require' name='vmx-cr8-store-exit'/> + <feature policy='require' name='vmx-flexpriority'/> + <feature policy='require' name='vmx-vnmi-pending'/> + <feature policy='require' name='vmx-movdr-exit'/> + <feature policy='require' name='vmx-io-exit'/> + <feature policy='require' name='vmx-io-bitmap'/> + <feature policy='require' name='vmx-mtf'/> + <feature policy='require' name='vmx-msr-bitmap'/> + <feature policy='require' name='vmx-monitor-exit'/> + <feature policy='require' name='vmx-pause-exit'/> + <feature policy='require' name='vmx-secondary-ctls'/> </cpu> diff --git a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml index 5d1e1ef6c3..713ecbcb08 100644 --- a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml @@ -94,6 +94,27 @@ <feature policy='require' name='vmx-nmi-exit'/> <feature policy='require' name='vmx-vnmi'/> <feature policy='require' name='vmx-preemption-timer'/> + <feature policy='require' name='vmx-vintr-pending'/> + <feature policy='require' name='vmx-tsc-offset'/> + <feature policy='require' name='vmx-hlt-exit'/> + <feature policy='require' name='vmx-invlpg-exit'/> + <feature policy='require' name='vmx-mwait-exit'/> + <feature policy='require' name='vmx-rdpmc-exit'/> + <feature policy='require' name='vmx-rdtsc-exit'/> + <feature policy='require' name='vmx-cr3-load-noexit'/> + <feature policy='require' name='vmx-cr3-store-noexit'/> + <feature policy='require' name='vmx-cr8-load-exit'/> + <feature policy='require' name='vmx-cr8-store-exit'/> + <feature policy='require' name='vmx-flexpriority'/> + <feature policy='require' name='vmx-vnmi-pending'/> + <feature policy='require' name='vmx-movdr-exit'/> + <feature policy='require' name='vmx-io-exit'/> + <feature policy='require' name='vmx-io-bitmap'/> + <feature policy='require' name='vmx-mtf'/> + <feature policy='require' name='vmx-msr-bitmap'/> + <feature policy='require' name='vmx-monitor-exit'/> + <feature policy='require' name='vmx-pause-exit'/> + <feature policy='require' name='vmx-secondary-ctls'/> </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>qemu64</model> diff --git a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml index 00687b8a5e..0aef295df2 100644 --- a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml @@ -93,6 +93,27 @@ <feature policy='require' name='vmx-nmi-exit'/> <feature policy='require' name='vmx-vnmi'/> <feature policy='require' name='vmx-preemption-timer'/> + <feature policy='require' name='vmx-vintr-pending'/> + <feature policy='require' name='vmx-tsc-offset'/> + <feature policy='require' name='vmx-hlt-exit'/> + <feature policy='require' name='vmx-invlpg-exit'/> + <feature policy='require' name='vmx-mwait-exit'/> + <feature policy='require' name='vmx-rdpmc-exit'/> + <feature policy='require' name='vmx-rdtsc-exit'/> + <feature policy='require' name='vmx-cr3-load-noexit'/> + <feature policy='require' name='vmx-cr3-store-noexit'/> + <feature policy='require' name='vmx-cr8-load-exit'/> + <feature policy='require' name='vmx-cr8-store-exit'/> + <feature policy='require' name='vmx-flexpriority'/> + <feature policy='require' name='vmx-vnmi-pending'/> + <feature policy='require' name='vmx-movdr-exit'/> + <feature policy='require' name='vmx-io-exit'/> + <feature policy='require' name='vmx-io-bitmap'/> + <feature policy='require' name='vmx-mtf'/> + <feature policy='require' name='vmx-msr-bitmap'/> + <feature policy='require' name='vmx-monitor-exit'/> + <feature policy='require' name='vmx-pause-exit'/> + <feature policy='require' name='vmx-secondary-ctls'/> </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>qemu64</model> diff --git a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml index 83beaad6ac..e3dd4a82d0 100644 --- a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml @@ -94,6 +94,27 @@ <feature policy='require' name='vmx-nmi-exit'/> <feature policy='require' name='vmx-vnmi'/> <feature policy='require' name='vmx-preemption-timer'/> + <feature policy='require' name='vmx-vintr-pending'/> + <feature policy='require' name='vmx-tsc-offset'/> + <feature policy='require' name='vmx-hlt-exit'/> + <feature policy='require' name='vmx-invlpg-exit'/> + <feature policy='require' name='vmx-mwait-exit'/> + <feature policy='require' name='vmx-rdpmc-exit'/> + <feature policy='require' name='vmx-rdtsc-exit'/> + <feature policy='require' name='vmx-cr3-load-noexit'/> + <feature policy='require' name='vmx-cr3-store-noexit'/> + <feature policy='require' name='vmx-cr8-load-exit'/> + <feature policy='require' name='vmx-cr8-store-exit'/> + <feature policy='require' name='vmx-flexpriority'/> + <feature policy='require' name='vmx-vnmi-pending'/> + <feature policy='require' name='vmx-movdr-exit'/> + <feature policy='require' name='vmx-io-exit'/> + <feature policy='require' name='vmx-io-bitmap'/> + <feature policy='require' name='vmx-mtf'/> + <feature policy='require' name='vmx-msr-bitmap'/> + <feature policy='require' name='vmx-monitor-exit'/> + <feature policy='require' name='vmx-pause-exit'/> + <feature policy='require' name='vmx-secondary-ctls'/> </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>qemu64</model> diff --git a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml index 1fe5c0196f..54edcf4632 100644 --- a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml @@ -93,6 +93,27 @@ <feature policy='require' name='vmx-nmi-exit'/> <feature policy='require' name='vmx-vnmi'/> <feature policy='require' name='vmx-preemption-timer'/> + <feature policy='require' name='vmx-vintr-pending'/> + <feature policy='require' name='vmx-tsc-offset'/> + <feature policy='require' name='vmx-hlt-exit'/> + <feature policy='require' name='vmx-invlpg-exit'/> + <feature policy='require' name='vmx-mwait-exit'/> + <feature policy='require' name='vmx-rdpmc-exit'/> + <feature policy='require' name='vmx-rdtsc-exit'/> + <feature policy='require' name='vmx-cr3-load-noexit'/> + <feature policy='require' name='vmx-cr3-store-noexit'/> + <feature policy='require' name='vmx-cr8-load-exit'/> + <feature policy='require' name='vmx-cr8-store-exit'/> + <feature policy='require' name='vmx-flexpriority'/> + <feature policy='require' name='vmx-vnmi-pending'/> + <feature policy='require' name='vmx-movdr-exit'/> + <feature policy='require' name='vmx-io-exit'/> + <feature policy='require' name='vmx-io-bitmap'/> + <feature policy='require' name='vmx-mtf'/> + <feature policy='require' name='vmx-msr-bitmap'/> + <feature policy='require' name='vmx-monitor-exit'/> + <feature policy='require' name='vmx-pause-exit'/> + <feature policy='require' name='vmx-secondary-ctls'/> </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>qemu64</model> diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.2.0.args b/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.2.0.args index 2611cf3265..d7d30c733c 100644 --- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.2.0.args +++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.2.0.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ -machine pc-q35-4.2,usb=off,dump-guest-core=off \ -accel kvm \ --cpu Skylake-Client-IBRS,ss=on,vmx=on,hypervisor=on,tsc-adjust=on,clflushopt=on,umip=on,md-clear=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,pdpe1gb=on,skip-l1dfl-vmentry=on,pschange-mc-no=on,vmx-ins-outs=on,vmx-true-ctls=on,vmx-store-lma=on,vmx-activity-hlt=on,vmx-vmwrite-vmexit-fields=on,vmx-apicv-xapic=on,vmx-ept=on,vmx-desc-exit=on,vmx-rdtscp-exit=on,vmx-apicv-x2apic=on,vmx-vpid=on,vmx-wbinvd-exit=on,vmx-unrestricted-guest=on,vmx-rdrand-exit=on,vmx-invpcid-exit=on,vmx-vmfunc=on,vmx-shadow-vmcs=on,vmx-rdseed-exit=on,vmx-pml=on,vmx-xsaves=on,vmx-invvpid=on,vmx-invvpid-single-addr=on,vmx-invvpid-all-context=on,vmx-ept-execonly=on,vmx-page-walk-4=on,vmx-ept-2mb=on,vmx-ept-1gb=on,vmx-invept=on,vmx-eptad=on,vmx-invept-single-context=on,vmx-invept-all-context=on,vmx-intr-exit=on,vmx-nmi-exit=on,vmx-vnmi=on,vmx-preemption-timer=on \ +-cpu Skylake-Client-IBRS,ss=on,vmx=on,hypervisor=on,tsc-adjust=on,clflushopt=on,umip=on,md-clear=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,pdpe1gb=on,skip-l1dfl-vmentry=on,pschange-mc-no=on,vmx-ins-outs=on,vmx-true-ctls=on,vmx-store-lma=on,vmx-activity-hlt=on,vmx-vmwrite-vmexit-fields=on,vmx-apicv-xapic=on,vmx-ept=on,vmx-desc-exit=on,vmx-rdtscp-exit=on,vmx-apicv-x2apic=on,vmx-vpid=on,vmx-wbinvd-exit=on,vmx-unrestricted-guest=on,vmx-rdrand-exit=on,vmx-invpcid-exit=on,vmx-vmfunc=on,vmx-shadow-vmcs=on,vmx-rdseed-exit=on,vmx-pml=on,vmx-xsaves=on,vmx-invvpid=on,vmx-invvpid-single-addr=on,vmx-invvpid-all-context=on,vmx-ept-execonly=on,vmx-page-walk-4=on,vmx-ept-2mb=on,vmx-ept-1gb=on,vmx-invept=on,vmx-eptad=on,vmx-invept-single-context=on,vmx-invept-all-context=on,vmx-intr-exit=on,vmx-nmi-exit=on,vmx-vnmi=on,vmx-preemption-timer=on,vmx-vintr-pending=on,vmx-tsc-offset=on,vmx-hlt-exit=on,vmx-invlpg-exit=on,vmx-mwait-exit=on,vmx-rdpmc-exit=on,vmx-rdtsc-exit=on,vmx-cr3-load-noexit=on,vmx-cr3-store-noexit=on,vmx-cr8-load-exit=on,vmx-cr8-store-exit=on,vmx-flexpriority=on,vmx-vnmi-pending=on,vmx-movdr-exit=on,vmx-io-exit=on,vmx-io-bitmap=on,vmx-mtf=on,vmx-msr-bitmap=on,vmx-monitor-exit=on,vmx-pause-exit=on,vmx-secondary-ctls=on \ -m size=219136k \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.0.0.args b/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.0.0.args index 02baa07418..707749596f 100644 --- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.0.0.args +++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.0.0.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ -machine pc-q35-5.0,usb=off,dump-guest-core=off \ -accel kvm \ --cpu Skylake-Client-IBRS,ss=on,vmx=on,hypervisor=on,tsc-adjust=on,clflushopt=on,umip=on,md-clear=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,pdpe1gb=on,skip-l1dfl-vmentry=on,pschange-mc-no=on,vmx-ins-outs=on,vmx-true-ctls=on,vmx-store-lma=on,vmx-activity-hlt=on,vmx-vmwrite-vmexit-fields=on,vmx-apicv-xapic=on,vmx-ept=on,vmx-desc-exit=on,vmx-rdtscp-exit=on,vmx-apicv-x2apic=on,vmx-vpid=on,vmx-wbinvd-exit=on,vmx-unrestricted-guest=on,vmx-rdrand-exit=on,vmx-invpcid-exit=on,vmx-vmfunc=on,vmx-shadow-vmcs=on,vmx-rdseed-exit=on,vmx-pml=on,vmx-xsaves=on,vmx-invvpid=on,vmx-invvpid-single-addr=on,vmx-invvpid-all-context=on,vmx-ept-execonly=on,vmx-page-walk-4=on,vmx-ept-2mb=on,vmx-ept-1gb=on,vmx-invept=on,vmx-eptad=on,vmx-invept-single-context=on,vmx-invept-all-context=on,vmx-intr-exit=on,vmx-nmi-exit=on,vmx-vnmi=on,vmx-preemption-timer=on \ +-cpu Skylake-Client-IBRS,ss=on,vmx=on,hypervisor=on,tsc-adjust=on,clflushopt=on,umip=on,md-clear=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,pdpe1gb=on,skip-l1dfl-vmentry=on,pschange-mc-no=on,vmx-ins-outs=on,vmx-true-ctls=on,vmx-store-lma=on,vmx-activity-hlt=on,vmx-vmwrite-vmexit-fields=on,vmx-apicv-xapic=on,vmx-ept=on,vmx-desc-exit=on,vmx-rdtscp-exit=on,vmx-apicv-x2apic=on,vmx-vpid=on,vmx-wbinvd-exit=on,vmx-unrestricted-guest=on,vmx-rdrand-exit=on,vmx-invpcid-exit=on,vmx-vmfunc=on,vmx-shadow-vmcs=on,vmx-rdseed-exit=on,vmx-pml=on,vmx-xsaves=on,vmx-invvpid=on,vmx-invvpid-single-addr=on,vmx-invvpid-all-context=on,vmx-ept-execonly=on,vmx-page-walk-4=on,vmx-ept-2mb=on,vmx-ept-1gb=on,vmx-invept=on,vmx-eptad=on,vmx-invept-single-context=on,vmx-invept-all-context=on,vmx-intr-exit=on,vmx-nmi-exit=on,vmx-vnmi=on,vmx-preemption-timer=on,vmx-vintr-pending=on,vmx-tsc-offset=on,vmx-hlt-exit=on,vmx-invlpg-exit=on,vmx-mwait-exit=on,vmx-rdpmc-exit=on,vmx-rdtsc-exit=on,vmx-cr3-load-noexit=on,vmx-cr3-store-noexit=on,vmx-cr8-load-exit=on,vmx-cr8-store-exit=on,vmx-flexpriority=on,vmx-vnmi-pending=on,vmx-movdr-exit=on,vmx-io-exit=on,vmx-io-bitmap=on,vmx-mtf=on,vmx-msr-bitmap=on,vmx-monitor-exit=on,vmx-pause-exit=on,vmx-secondary-ctls=on \ -m size=219136k \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -- 2.39.2

Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com&gt; --- src/cpu_map/x86_features.xml | 25 +++++++++++++++++++ .../x86_64-cpuid-Atom-P5362-enabled.xml | 1 + .../x86_64-cpuid-Atom-P5362-json.xml | 4 +++ .../x86_64-cpuid-Cooperlake-enabled.xml | 1 + .../x86_64-cpuid-Cooperlake-json.xml | 4 +++ .../x86_64-cpuid-Core-i7-8550U-enabled.xml | 1 + .../x86_64-cpuid-Core-i7-8550U-json.xml | 4 +++ ...86_64-cpuid-Xeon-Platinum-9242-enabled.xml | 1 + .../x86_64-cpuid-Xeon-Platinum-9242-json.xml | 4 +++ ...-cpuid-baseline-Cooperlake+Cascadelake.xml | 4 +++ .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 4 +++ tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 4 +++ .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 4 +++ tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 4 +++ .../cpu-host-model.x86_64-4.2.0.args | 2 +- .../cpu-host-model.x86_64-5.0.0.args | 2 +- 16 files changed, 67 insertions(+), 2 deletions(-) diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml index 396f081974..6769ef1cca 100644 --- a/src/cpu_map/x86_features.xml +++ b/src/cpu_map/x86_features.xml @@ -1046,4 +1046,29 @@ <feature name='vmx-exit-load-pkrs'> <msr index='0x48f' edx='0x00000000' eax='0x20000000'/> </feature> + + <feature name='vmx-entry-noload-debugctl'> + <msr index='0x490' edx='0x00000000' eax='0x00000004'/> + </feature> + <feature name='vmx-entry-ia32e-mode'> + <msr index='0x490' edx='0x00000000' eax='0x00000200'/> + </feature> + <feature name='vmx-entry-load-perf-global-ctrl'> + <msr index='0x490' edx='0x00000000' eax='0x00002000'/> + </feature> + <feature name='vmx-entry-load-pat'> + <msr index='0x490' edx='0x00000000' eax='0x00004000'/> + </feature> + <feature name='vmx-entry-load-efer'> + <msr index='0x490' edx='0x00000000' eax='0x00008000'/> + </feature> + <feature name='vmx-entry-load-bndcfgs'> + <msr index='0x490' edx='0x00000000' eax='0x00010000'/> + </feature> + <feature name='vmx-entry-load-rtit-ctl'> + <msr index='0x490' edx='0x00000000' eax='0x00040000'/> + </feature> + <feature name='vmx-entry-load-pkrs'> + <msr index='0x490' edx='0x00000000' eax='0x00400000'/> + </feature> </cpus> diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-enabled.xml b/tests/cputestdata/x86_64-cpuid-Atom-P5362-enabled.xml index f0118636a1..d957d2a155 100644 --- a/tests/cputestdata/x86_64-cpuid-Atom-P5362-enabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-enabled.xml @@ -14,4 +14,5 @@ <msr index='0x48d' edx='0x00000000' eax='0x000000e9'/> <msr index='0x48e' edx='0x00000000' eax='0xfbf99e8c'/> <msr index='0x48f' edx='0x00000000' eax='0x007c8004'/> + <msr index='0x490' edx='0x00000000' eax='0x0000c204'/> </cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml b/tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml index 11c0861f77..b867dbd449 100644 --- a/tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml +++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml @@ -83,6 +83,10 @@ <feature policy='require' name='vmx-exit-save-efer'/> <feature policy='require' name='vmx-exit-load-efer'/> <feature policy='require' name='vmx-exit-save-preemption-timer'/> + <feature policy='require' name='vmx-entry-noload-debugctl'/> + <feature policy='require' name='vmx-entry-ia32e-mode'/> + <feature policy='require' name='vmx-entry-load-pat'/> + <feature policy='require' name='vmx-entry-load-efer'/> <feature policy='disable' name='mpx'/> <feature policy='disable' name='core-capability'/> <feature policy='disable' name='pdpe1gb'/> diff --git a/tests/cputestdata/x86_64-cpuid-Cooperlake-enabled.xml b/tests/cputestdata/x86_64-cpuid-Cooperlake-enabled.xml index 11a028e719..3ca004ac7d 100644 --- a/tests/cputestdata/x86_64-cpuid-Cooperlake-enabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Cooperlake-enabled.xml @@ -15,4 +15,5 @@ <msr index='0x48d' edx='0x00000000' eax='0x000000e9'/> <msr index='0x48e' edx='0x00000000' eax='0xfbf99e8c'/> <msr index='0x48f' edx='0x00000000' eax='0x007c8004'/> + <msr index='0x490' edx='0x00000000' eax='0x0000c204'/> </cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml b/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml index 3e605edf38..2fcca6a12e 100644 --- a/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml +++ b/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml @@ -79,4 +79,8 @@ <feature policy='require' name='vmx-exit-save-efer'/> <feature policy='require' name='vmx-exit-load-efer'/> <feature policy='require' name='vmx-exit-save-preemption-timer'/> + <feature policy='require' name='vmx-entry-noload-debugctl'/> + <feature policy='require' name='vmx-entry-ia32e-mode'/> + <feature policy='require' name='vmx-entry-load-pat'/> + <feature policy='require' name='vmx-entry-load-efer'/> </cpu> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-enabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-enabled.xml index 3e0f72a109..a1b9fc286c 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-enabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-enabled.xml @@ -13,4 +13,5 @@ <msr index='0x48d' edx='0x00000000' eax='0x00000069'/> <msr index='0x48e' edx='0x00000000' eax='0xfbf99e8c'/> <msr index='0x48f' edx='0x00000000' eax='0x007c8004'/> + <msr index='0x490' edx='0x00000000' eax='0x0000c204'/> </cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml index 763587169e..4b4dcd5e70 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml @@ -78,6 +78,10 @@ <feature policy='require' name='vmx-exit-save-efer'/> <feature policy='require' name='vmx-exit-load-efer'/> <feature policy='require' name='vmx-exit-save-preemption-timer'/> + <feature policy='require' name='vmx-entry-noload-debugctl'/> + <feature policy='require' name='vmx-entry-ia32e-mode'/> + <feature policy='require' name='vmx-entry-load-pat'/> + <feature policy='require' name='vmx-entry-load-efer'/> <feature policy='disable' name='hle'/> <feature policy='disable' name='rtm'/> </cpu> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-enabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-enabled.xml index 44aec843bf..3f49dfb594 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-enabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-enabled.xml @@ -14,4 +14,5 @@ <msr index='0x48d' edx='0x00000000' eax='0x000000e9'/> <msr index='0x48e' edx='0x00000000' eax='0xfbf99e8c'/> <msr index='0x48f' edx='0x00000000' eax='0x007c8004'/> + <msr index='0x490' edx='0x00000000' eax='0x0000c204'/> </cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml index 763c99b009..935efce2d8 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml @@ -85,4 +85,8 @@ <feature policy='require' name='vmx-exit-save-efer'/> <feature policy='require' name='vmx-exit-load-efer'/> <feature policy='require' name='vmx-exit-save-preemption-timer'/> + <feature policy='require' name='vmx-entry-noload-debugctl'/> + <feature policy='require' name='vmx-entry-ia32e-mode'/> + <feature policy='require' name='vmx-entry-load-pat'/> + <feature policy='require' name='vmx-entry-load-efer'/> </cpu> diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml b/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml index 1949f2e496..53d3d4209a 100644 --- a/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml +++ b/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml @@ -85,4 +85,8 @@ <feature policy='require' name='vmx-exit-save-efer'/> <feature policy='require' name='vmx-exit-load-efer'/> <feature policy='require' name='vmx-exit-save-preemption-timer'/> + <feature policy='require' name='vmx-entry-noload-debugctl'/> + <feature policy='require' name='vmx-entry-ia32e-mode'/> + <feature policy='require' name='vmx-entry-load-pat'/> + <feature policy='require' name='vmx-entry-load-efer'/> </cpu> diff --git a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml index 6d99e9c076..f272b33bb4 100644 --- a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml @@ -122,6 +122,10 @@ <feature policy='require' name='vmx-exit-save-efer'/> <feature policy='require' name='vmx-exit-load-efer'/> <feature policy='require' name='vmx-exit-save-preemption-timer'/> + <feature policy='require' name='vmx-entry-noload-debugctl'/> + <feature policy='require' name='vmx-entry-ia32e-mode'/> + <feature policy='require' name='vmx-entry-load-pat'/> + <feature policy='require' name='vmx-entry-load-efer'/> </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>qemu64</model> diff --git a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml index 5d48e3d573..41d5181222 100644 --- a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml @@ -121,6 +121,10 @@ <feature policy='require' name='vmx-exit-save-efer'/> <feature policy='require' name='vmx-exit-load-efer'/> <feature policy='require' name='vmx-exit-save-preemption-timer'/> + <feature policy='require' name='vmx-entry-noload-debugctl'/> + <feature policy='require' name='vmx-entry-ia32e-mode'/> + <feature policy='require' name='vmx-entry-load-pat'/> + <feature policy='require' name='vmx-entry-load-efer'/> </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>qemu64</model> diff --git a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml index 1424d5832f..317b7ff1f7 100644 --- a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml @@ -122,6 +122,10 @@ <feature policy='require' name='vmx-exit-save-efer'/> <feature policy='require' name='vmx-exit-load-efer'/> <feature policy='require' name='vmx-exit-save-preemption-timer'/> + <feature policy='require' name='vmx-entry-noload-debugctl'/> + <feature policy='require' name='vmx-entry-ia32e-mode'/> + <feature policy='require' name='vmx-entry-load-pat'/> + <feature policy='require' name='vmx-entry-load-efer'/> </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>qemu64</model> diff --git a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml index ab7aac7304..90cb0ce36c 100644 --- a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml @@ -121,6 +121,10 @@ <feature policy='require' name='vmx-exit-save-efer'/> <feature policy='require' name='vmx-exit-load-efer'/> <feature policy='require' name='vmx-exit-save-preemption-timer'/> + <feature policy='require' name='vmx-entry-noload-debugctl'/> + <feature policy='require' name='vmx-entry-ia32e-mode'/> + <feature policy='require' name='vmx-entry-load-pat'/> + <feature policy='require' name='vmx-entry-load-efer'/> </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>qemu64</model> diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.2.0.args b/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.2.0.args index 0bfcf26b34..0658650d82 100644 --- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.2.0.args +++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.2.0.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ -machine pc-q35-4.2,usb=off,dump-guest-core=off \ -accel kvm \ --cpu Skylake-Client-IBRS,ss=on,vmx=on,hypervisor=on,tsc-adjust=on,clflushopt=on,umip=on,md-clear=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,pdpe1gb=on,skip-l1dfl-vmentry=on,pschange-mc-no=on,vmx-ins-outs=on,vmx-true-ctls=on,vmx-store-lma=on,vmx-activity-hlt=on,vmx-vmwrite-vmexit-fields=on,vmx-apicv-xapic=on,vmx-ept=on,vmx-desc-exit=on,vmx-rdtscp-exit=on,vmx-apicv-x2apic=on,vmx-vpid=on,vmx-wbinvd-exit=on,vmx-unrestricted-guest=on,vmx-rdrand-exit=on,vmx-invpcid-exit=on,vmx-vmfunc=on,vmx-shadow-vmcs=on,vmx-rdseed-exit=on,vmx-pml=on,vmx-xsaves=on,vmx-invvpid=on,vmx-invvpid-single-addr=on,vmx-invvpid-all-context=on,vmx-ept-execonly=on,vmx-page-walk-4=on,vmx-ept-2mb=on,vmx-ept-1gb=on,vmx-invept=on,vmx-eptad=on,vmx-invept-single-context=on,vmx-invept-all-context=on,vmx-intr-exit=on,vmx-nmi-exit=on,vmx-vnmi=on,vmx-preemption-timer=on,vmx-vintr-pending=on,vmx-tsc-offset=on,vmx-hlt-exit=on,vmx-invlpg-exit=on,vmx-mwait-exit=on,vmx-rdpmc-exit=on,vmx-rdtsc-exit=on,vmx-cr3-load-noexit=on,vmx-cr3-store-noexit=on,vmx-cr8-load-exit=on,vmx-cr8-store-exit=on,vmx-flexpriority=on,vmx-vnmi-pending=on,vmx-movdr-exit=on,vmx-io-exit=on,vmx-io-bitmap=on,vmx-mtf=on,vmx-msr-bitmap=on,vmx-monitor-exit=on,vmx-pause-exit=on,vmx-secondary-ctls=on,vmx-exit-nosave-debugctl=on,vmx-exit-ack-intr=on,vmx-exit-save-pat=on,vmx-exit-load-pat=on,vmx-exit-save-efer=on,vmx-exit-load-efer=on,vmx-exit-save-preemption-timer=on \ +-cpu Skylake-Client-IBRS,ss=on,vmx=on,hypervisor=on,tsc-adjust=on,clflushopt=on,umip=on,md-clear=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,pdpe1gb=on,skip-l1dfl-vmentry=on,pschange-mc-no=on,vmx-ins-outs=on,vmx-true-ctls=on,vmx-store-lma=on,vmx-activity-hlt=on,vmx-vmwrite-vmexit-fields=on,vmx-apicv-xapic=on,vmx-ept=on,vmx-desc-exit=on,vmx-rdtscp-exit=on,vmx-apicv-x2apic=on,vmx-vpid=on,vmx-wbinvd-exit=on,vmx-unrestricted-guest=on,vmx-rdrand-exit=on,vmx-invpcid-exit=on,vmx-vmfunc=on,vmx-shadow-vmcs=on,vmx-rdseed-exit=on,vmx-pml=on,vmx-xsaves=on,vmx-invvpid=on,vmx-invvpid-single-addr=on,vmx-invvpid-all-context=on,vmx-ept-execonly=on,vmx-page-walk-4=on,vmx-ept-2mb=on,vmx-ept-1gb=on,vmx-invept=on,vmx-eptad=on,vmx-invept-single-context=on,vmx-invept-all-context=on,vmx-intr-exit=on,vmx-nmi-exit=on,vmx-vnmi=on,vmx-preemption-timer=on,vmx-vintr-pending=on,vmx-tsc-offset=on,vmx-hlt-exit=on,vmx-invlpg-exit=on,vmx-mwait-exit=on,vmx-rdpmc-exit=on,vmx-rdtsc-exit=on,vmx-cr3-load-noexit=on,vmx-cr3-store-noexit=on,vmx-cr8-load-exit=on,vmx-cr8-store-exit=on,vmx-flexpriority=on,vmx-vnmi-pending=on,vmx-movdr-exit=on,vmx-io-exit=on,vmx-io-bitmap=on,vmx-mtf=on,vmx-msr-bitmap=on,vmx-monitor-exit=on,vmx-pause-exit=on,vmx-secondary-ctls=on,vmx-exit-nosave-debugctl=on,vmx-exit-ack-intr=on,vmx-exit-save-pat=on,vmx-exit-load-pat=on,vmx-exit-save-efer=on,vmx-exit-load-efer=on,vmx-exit-save-preemption-timer=on,vmx-entry-noload-debugctl=on,vmx-entry-ia32e-mode=on,vmx-entry-load-pat=on,vmx-entry-load-efer=on \ -m size=219136k \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.0.0.args b/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.0.0.args index bae9a211f3..a5013ed2f9 100644 --- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.0.0.args +++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.0.0.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ -machine pc-q35-5.0,usb=off,dump-guest-core=off \ -accel kvm \ --cpu Skylake-Client-IBRS,ss=on,vmx=on,hypervisor=on,tsc-adjust=on,clflushopt=on,umip=on,md-clear=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,pdpe1gb=on,skip-l1dfl-vmentry=on,pschange-mc-no=on,vmx-ins-outs=on,vmx-true-ctls=on,vmx-store-lma=on,vmx-activity-hlt=on,vmx-vmwrite-vmexit-fields=on,vmx-apicv-xapic=on,vmx-ept=on,vmx-desc-exit=on,vmx-rdtscp-exit=on,vmx-apicv-x2apic=on,vmx-vpid=on,vmx-wbinvd-exit=on,vmx-unrestricted-guest=on,vmx-rdrand-exit=on,vmx-invpcid-exit=on,vmx-vmfunc=on,vmx-shadow-vmcs=on,vmx-rdseed-exit=on,vmx-pml=on,vmx-xsaves=on,vmx-invvpid=on,vmx-invvpid-single-addr=on,vmx-invvpid-all-context=on,vmx-ept-execonly=on,vmx-page-walk-4=on,vmx-ept-2mb=on,vmx-ept-1gb=on,vmx-invept=on,vmx-eptad=on,vmx-invept-single-context=on,vmx-invept-all-context=on,vmx-intr-exit=on,vmx-nmi-exit=on,vmx-vnmi=on,vmx-preemption-timer=on,vmx-vintr-pending=on,vmx-tsc-offset=on,vmx-hlt-exit=on,vmx-invlpg-exit=on,vmx-mwait-exit=on,vmx-rdpmc-exit=on,vmx-rdtsc-exit=on,vmx-cr3-load-noexit=on,vmx-cr3-store-noexit=on,vmx-cr8-load-exit=on,vmx-cr8-store-exit=on,vmx-flexpriority=on,vmx-vnmi-pending=on,vmx-movdr-exit=on,vmx-io-exit=on,vmx-io-bitmap=on,vmx-mtf=on,vmx-msr-bitmap=on,vmx-monitor-exit=on,vmx-pause-exit=on,vmx-secondary-ctls=on,vmx-exit-nosave-debugctl=on,vmx-exit-ack-intr=on,vmx-exit-save-pat=on,vmx-exit-load-pat=on,vmx-exit-save-efer=on,vmx-exit-load-efer=on,vmx-exit-save-preemption-timer=on \ +-cpu Skylake-Client-IBRS,ss=on,vmx=on,hypervisor=on,tsc-adjust=on,clflushopt=on,umip=on,md-clear=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,pdpe1gb=on,skip-l1dfl-vmentry=on,pschange-mc-no=on,vmx-ins-outs=on,vmx-true-ctls=on,vmx-store-lma=on,vmx-activity-hlt=on,vmx-vmwrite-vmexit-fields=on,vmx-apicv-xapic=on,vmx-ept=on,vmx-desc-exit=on,vmx-rdtscp-exit=on,vmx-apicv-x2apic=on,vmx-vpid=on,vmx-wbinvd-exit=on,vmx-unrestricted-guest=on,vmx-rdrand-exit=on,vmx-invpcid-exit=on,vmx-vmfunc=on,vmx-shadow-vmcs=on,vmx-rdseed-exit=on,vmx-pml=on,vmx-xsaves=on,vmx-invvpid=on,vmx-invvpid-single-addr=on,vmx-invvpid-all-context=on,vmx-ept-execonly=on,vmx-page-walk-4=on,vmx-ept-2mb=on,vmx-ept-1gb=on,vmx-invept=on,vmx-eptad=on,vmx-invept-single-context=on,vmx-invept-all-context=on,vmx-intr-exit=on,vmx-nmi-exit=on,vmx-vnmi=on,vmx-preemption-timer=on,vmx-vintr-pending=on,vmx-tsc-offset=on,vmx-hlt-exit=on,vmx-invlpg-exit=on,vmx-mwait-exit=on,vmx-rdpmc-exit=on,vmx-rdtsc-exit=on,vmx-cr3-load-noexit=on,vmx-cr3-store-noexit=on,vmx-cr8-load-exit=on,vmx-cr8-store-exit=on,vmx-flexpriority=on,vmx-vnmi-pending=on,vmx-movdr-exit=on,vmx-io-exit=on,vmx-io-bitmap=on,vmx-mtf=on,vmx-msr-bitmap=on,vmx-monitor-exit=on,vmx-pause-exit=on,vmx-secondary-ctls=on,vmx-exit-nosave-debugctl=on,vmx-exit-ack-intr=on,vmx-exit-save-pat=on,vmx-exit-load-pat=on,vmx-exit-save-efer=on,vmx-exit-load-efer=on,vmx-exit-save-preemption-timer=on,vmx-entry-noload-debugctl=on,vmx-entry-ia32e-mode=on,vmx-entry-load-pat=on,vmx-entry-load-efer=on \ -m size=219136k \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -- 2.39.2