Signed-off-by: Jiri Denemark <jdenemar@xxxxxxxxxx> --- Notes: Generated from Eduardo's work/x86-query-cpu-expansion-full branch rebased on current QEMU master. Version 3: - regenerated with a rebased QEMU to avoid conflicts with existing caps_2.9.0.x86_64.replies file - summary changed from "qemucapstest: Add test data for QEMU 2.9.0" Version 2: - no change .../qemucapabilitiesdata/caps_2.9.0.x86_64.replies | 224 ++++++++++++++++++++- tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 170 +++++++++++++++- 2 files changed, 391 insertions(+), 3 deletions(-) diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies index fe9fe7d5b..c000f8cf9 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies @@ -6,7 +6,7 @@ "minor": 8, "major": 2 }, - "package": " (v2.8.0-1321-gad584d3)" + "package": " (v2.8.0-1428-g1b1a68c602)" }, "capabilities": [ ] @@ -26,7 +26,7 @@ "minor": 8, "major": 2 }, - "package": " (v2.8.0-1321-gad584d3)" + "package": " (v2.8.0-1428-g1b1a68c602)" }, "id": "libvirt-2" } @@ -215,6 +215,9 @@ "name": "query-cpus" }, { + "name": "query-cpu-model-expansion" + }, + { "name": "query-cpu-definitions" }, { @@ -677,6 +680,9 @@ "name": "floppy-bus" }, { + "name": "base-x86_64-cpu" + }, + { "name": "isa-parallel" }, { @@ -1406,6 +1412,9 @@ "name": "pc-i440fx-1.7-machine" }, { + "name": "max-x86_64-cpu" + }, + { "name": "virtio-serial-device" }, { @@ -3996,6 +4005,14 @@ { "return": [ { + "name": "max", + "typename": "max-x86_64-cpu", + "unavailable-features": [ + ], + "static": false, + "migration-safe": false + }, + { "name": "host", "typename": "host-x86_64-cpu", "unavailable-features": [ @@ -4004,6 +4021,14 @@ "migration-safe": false }, { + "name": "base", + "typename": "base-x86_64-cpu", + "unavailable-features": [ + ], + "static": true, + "migration-safe": true + }, + { "name": "qemu64", "typename": "qemu64-x86_64-cpu", "unavailable-features": [ @@ -14337,6 +14362,185 @@ { "return": { + "model": { + "name": "base", + "props": { + "cmov": true, + "ia64": false, + "aes": true, + "mmx": true, + "rdpid": false, + "arat": true, + "pause-filter": false, + "xsavec": true, + "osxsave": false, + "kvm-asyncpf": true, + "perfctr-core": false, + "mpx": true, + "pbe": false, + "avx512cd": false, + "decodeassists": false, + "sse4.1": true, + "family": 6, + "avx512f": false, + "msr": true, + "mce": true, + "mca": true, + "xcrypt": false, + "min-level": 13, + "xgetbv1": true, + "cid": false, + "ds": false, + "fxsr": true, + "xsaveopt": true, + "xtpr": false, + "avx512vl": false, + "avx512-vpopcntdq": false, + "phe": false, + "extapic": false, + "3dnowprefetch": true, + "cr8legacy": false, + "xcrypt-en": false, + "pn": false, + "dca": false, + "vendor": "GenuineIntel", + "pku": false, + "smx": false, + "cmp-legacy": false, + "avx512-4fmaps": false, + "vmcb-clean": false, + "hle": true, + "3dnowext": false, + "npt": false, + "clwb": false, + "lbrv": false, + "adx": true, + "ss": true, + "pni": true, + "svm-lock": false, + "smep": true, + "smap": true, + "pfthreshold": false, + "x2apic": true, + "avx512vbmi": false, + "flushbyasid": false, + "f16c": true, + "ace2-en": false, + "pae": true, + "pat": true, + "sse": true, + "phe-en": false, + "kvm-nopiodelay": true, + "tm": false, + "kvmclock-stable-bit": true, + "hypervisor": true, + "pcommit": false, + "syscall": true, + "avx512dq": false, + "svm": false, + "invtsc": false, + "sse2": true, + "est": false, + "avx512ifma": false, + "tm2": false, + "kvm-pv-eoi": true, + "cx8": true, + "kvm-mmu": false, + "sse4.2": true, + "pge": true, + "pdcm": false, + "model": 94, + "movbe": true, + "nrip-save": false, + "ssse3": true, + "sse4a": false, + "invpcid": true, + "pdpe1gb": true, + "tsc-deadline": true, + "fma": true, + "cx16": true, + "de": true, + "stepping": 3, + "xsave": true, + "clflush": true, + "skinit": false, + "tsc": true, + "tce": false, + "fpu": true, + "ds-cpl": false, + "ibs": false, + "fma4": false, + "la57": false, + "osvw": false, + "apic": true, + "pmm": false, + "tsc-adjust": true, + "kvm-steal-time": true, + "kvmclock": true, + "lwp": false, + "xop": false, + "avx": true, + "ospke": false, + "acpi": false, + "avx512bw": false, + "ace2": false, + "fsgsbase": true, + "ht": false, + "nx": true, + "pclmulqdq": true, + "mmxext": false, + "popcnt": true, + "xsaves": true, + "lm": true, + "umip": false, + "pse": true, + "avx2": true, + "sep": true, + "nodeid-msr": false, + "misalignsse": false, + "min-xlevel": 2147483656, + "bmi1": true, + "bmi2": true, + "kvm-pv-unhalt": true, + "tsc-scale": false, + "topoext": false, + "clflushopt": true, + "monitor": false, + "avx512er": false, + "pmm-en": false, + "pcid": true, + "3dnow": false, + "erms": true, + "lahf-lm": true, + "fxsr-opt": false, + "xstore": false, + "rtm": true, + "lmce": true, + "perfctr-nb": false, + "rdrand": true, + "rdseed": true, + "avx512-4vnniw": false, + "vme": true, + "vmx": true, + "dtes64": false, + "mtrr": true, + "rdtscp": true, + "pse36": true, + "tbm": false, + "wdt": false, + "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz", + "sha-ni": false, + "abm": true, + "avx512pf": false, + "xstore-en": false + } + } + }, + "id": "libvirt-48" +} + +{ + "return": { }, "id": "libvirt-1" } @@ -14344,6 +14548,14 @@ { "return": [ { + "name": "max", + "typename": "max-x86_64-cpu", + "unavailable-features": [ + ], + "static": false, + "migration-safe": false + }, + { "name": "host", "typename": "host-x86_64-cpu", "unavailable-features": [ @@ -14353,6 +14565,14 @@ "migration-safe": false }, { + "name": "base", + "typename": "base-x86_64-cpu", + "unavailable-features": [ + ], + "static": true, + "migration-safe": true + }, + { "name": "qemu64", "typename": "qemu64-x86_64-cpu", "unavailable-features": [ diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml index dcdc0e621..369e18ee1 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -201,12 +201,178 @@ <flag name='gluster.debug_level'/> <flag name='vhost-scsi'/> <flag name='drive-iotune-group'/> + <flag name='query-cpu-model-expansion'/> <flag name='virtio-net.host_mtu'/> <version>2008050</version> <kvmVersion>0</kvmVersion> - <package> (v2.8.0-1321-gad584d3)</package> + <package> (v2.8.0-1428-g1b1a68c602)</package> <arch>x86_64</arch> + <hostCPU model='base'> + <feature name='cmov' supported='yes'/> + <feature name='ia64' supported='no'/> + <feature name='aes' supported='yes'/> + <feature name='mmx' supported='yes'/> + <feature name='rdpid' supported='no'/> + <feature name='arat' supported='yes'/> + <feature name='pause-filter' supported='no'/> + <feature name='xsavec' supported='yes'/> + <feature name='osxsave' supported='no'/> + <feature name='kvm-asyncpf' supported='yes'/> + <feature name='perfctr-core' supported='no'/> + <feature name='mpx' supported='yes'/> + <feature name='pbe' supported='no'/> + <feature name='avx512cd' supported='no'/> + <feature name='decodeassists' supported='no'/> + <feature name='sse4.1' supported='yes'/> + <feature name='avx512f' supported='no'/> + <feature name='msr' supported='yes'/> + <feature name='mce' supported='yes'/> + <feature name='mca' supported='yes'/> + <feature name='xcrypt' supported='no'/> + <feature name='xgetbv1' supported='yes'/> + <feature name='cid' supported='no'/> + <feature name='ds' supported='no'/> + <feature name='fxsr' supported='yes'/> + <feature name='xsaveopt' supported='yes'/> + <feature name='xtpr' supported='no'/> + <feature name='avx512vl' supported='no'/> + <feature name='avx512-vpopcntdq' supported='no'/> + <feature name='phe' supported='no'/> + <feature name='extapic' supported='no'/> + <feature name='3dnowprefetch' supported='yes'/> + <feature name='cr8legacy' supported='no'/> + <feature name='xcrypt-en' supported='no'/> + <feature name='pn' supported='no'/> + <feature name='dca' supported='no'/> + <feature name='pku' supported='no'/> + <feature name='smx' supported='no'/> + <feature name='cmp-legacy' supported='no'/> + <feature name='avx512-4fmaps' supported='no'/> + <feature name='vmcb-clean' supported='no'/> + <feature name='hle' supported='yes'/> + <feature name='3dnowext' supported='no'/> + <feature name='npt' supported='no'/> + <feature name='clwb' supported='no'/> + <feature name='lbrv' supported='no'/> + <feature name='adx' supported='yes'/> + <feature name='ss' supported='yes'/> + <feature name='pni' supported='yes'/> + <feature name='svm-lock' supported='no'/> + <feature name='smep' supported='yes'/> + <feature name='smap' supported='yes'/> + <feature name='pfthreshold' supported='no'/> + <feature name='x2apic' supported='yes'/> + <feature name='avx512vbmi' supported='no'/> + <feature name='flushbyasid' supported='no'/> + <feature name='f16c' supported='yes'/> + <feature name='ace2-en' supported='no'/> + <feature name='pae' supported='yes'/> + <feature name='pat' supported='yes'/> + <feature name='sse' supported='yes'/> + <feature name='phe-en' supported='no'/> + <feature name='kvm-nopiodelay' supported='yes'/> + <feature name='tm' supported='no'/> + <feature name='kvmclock-stable-bit' supported='yes'/> + <feature name='hypervisor' supported='yes'/> + <feature name='pcommit' supported='no'/> + <feature name='syscall' supported='yes'/> + <feature name='avx512dq' supported='no'/> + <feature name='svm' supported='no'/> + <feature name='invtsc' supported='no'/> + <feature name='sse2' supported='yes'/> + <feature name='est' supported='no'/> + <feature name='avx512ifma' supported='no'/> + <feature name='tm2' supported='no'/> + <feature name='kvm-pv-eoi' supported='yes'/> + <feature name='cx8' supported='yes'/> + <feature name='kvm-mmu' supported='no'/> + <feature name='sse4.2' supported='yes'/> + <feature name='pge' supported='yes'/> + <feature name='pdcm' supported='no'/> + <feature name='movbe' supported='yes'/> + <feature name='nrip-save' supported='no'/> + <feature name='ssse3' supported='yes'/> + <feature name='sse4a' supported='no'/> + <feature name='invpcid' supported='yes'/> + <feature name='pdpe1gb' supported='yes'/> + <feature name='tsc-deadline' supported='yes'/> + <feature name='fma' supported='yes'/> + <feature name='cx16' supported='yes'/> + <feature name='de' supported='yes'/> + <feature name='xsave' supported='yes'/> + <feature name='clflush' supported='yes'/> + <feature name='skinit' supported='no'/> + <feature name='tsc' supported='yes'/> + <feature name='tce' supported='no'/> + <feature name='fpu' supported='yes'/> + <feature name='ds-cpl' supported='no'/> + <feature name='ibs' supported='no'/> + <feature name='fma4' supported='no'/> + <feature name='la57' supported='no'/> + <feature name='osvw' supported='no'/> + <feature name='apic' supported='yes'/> + <feature name='pmm' supported='no'/> + <feature name='tsc-adjust' supported='yes'/> + <feature name='kvm-steal-time' supported='yes'/> + <feature name='kvmclock' supported='yes'/> + <feature name='lwp' supported='no'/> + <feature name='xop' supported='no'/> + <feature name='avx' supported='yes'/> + <feature name='ospke' supported='no'/> + <feature name='acpi' supported='no'/> + <feature name='avx512bw' supported='no'/> + <feature name='ace2' supported='no'/> + <feature name='fsgsbase' supported='yes'/> + <feature name='ht' supported='no'/> + <feature name='nx' supported='yes'/> + <feature name='pclmulqdq' supported='yes'/> + <feature name='mmxext' supported='no'/> + <feature name='popcnt' supported='yes'/> + <feature name='xsaves' supported='yes'/> + <feature name='lm' supported='yes'/> + <feature name='umip' supported='no'/> + <feature name='pse' supported='yes'/> + <feature name='avx2' supported='yes'/> + <feature name='sep' supported='yes'/> + <feature name='nodeid-msr' supported='no'/> + <feature name='misalignsse' supported='no'/> + <feature name='bmi1' supported='yes'/> + <feature name='bmi2' supported='yes'/> + <feature name='kvm-pv-unhalt' supported='yes'/> + <feature name='tsc-scale' supported='no'/> + <feature name='topoext' supported='no'/> + <feature name='clflushopt' supported='yes'/> + <feature name='monitor' supported='no'/> + <feature name='avx512er' supported='no'/> + <feature name='pmm-en' supported='no'/> + <feature name='pcid' supported='yes'/> + <feature name='3dnow' supported='no'/> + <feature name='erms' supported='yes'/> + <feature name='lahf-lm' supported='yes'/> + <feature name='fxsr-opt' supported='no'/> + <feature name='xstore' supported='no'/> + <feature name='rtm' supported='yes'/> + <feature name='lmce' supported='yes'/> + <feature name='perfctr-nb' supported='no'/> + <feature name='rdrand' supported='yes'/> + <feature name='rdseed' supported='yes'/> + <feature name='avx512-4vnniw' supported='no'/> + <feature name='vme' supported='yes'/> + <feature name='vmx' supported='yes'/> + <feature name='dtes64' supported='no'/> + <feature name='mtrr' supported='yes'/> + <feature name='rdtscp' supported='yes'/> + <feature name='pse36' supported='yes'/> + <feature name='tbm' supported='no'/> + <feature name='wdt' supported='no'/> + <feature name='sha-ni' supported='no'/> + <feature name='abm' supported='yes'/> + <feature name='avx512pf' supported='no'/> + <feature name='xstore-en' supported='no'/> + </hostCPU> + <cpu type='kvm' name='max' usable='yes'/> <cpu type='kvm' name='host' usable='yes'/> + <cpu type='kvm' name='base' usable='yes'/> <cpu type='kvm' name='qemu64' usable='yes'/> <cpu type='kvm' name='qemu32' usable='yes'/> <cpu type='kvm' name='phenom' usable='no'/> @@ -236,7 +402,9 @@ <cpu type='kvm' name='Broadwell' usable='yes'/> <cpu type='kvm' name='Broadwell-noTSX' usable='yes'/> <cpu type='kvm' name='486' usable='yes'/> + <cpu type='tcg' name='max' usable='yes'/> <cpu type='tcg' name='host' usable='no'/> + <cpu type='tcg' name='base' usable='yes'/> <cpu type='tcg' name='qemu64' usable='yes'/> <cpu type='tcg' name='qemu32' usable='yes'/> <cpu type='tcg' name='phenom' usable='no'/> -- 2.11.1 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list