arat is now enabled even if the hardware does not support it.
Signed-off-by: Jiri Denemark <jdenemar@xxxxxxxxxx>
Reviewed-by: John Ferlan <jferlan@xxxxxxxxxx>
---
Notes:
Version 2:
- no change
.../x86_64-cpuid-Core-i7-2600-disabled.xml | 1 -
.../x86_64-cpuid-Core-i7-2600-enabled.xml | 1 +
.../cputestdata/x86_64-cpuid-Core-i7-2600-json.xml | 1 +
tests/cputestdata/x86_64-cpuid-Core-i7-2600.json | 496 +++++++++++++++++++--
tests/cputestdata/x86_64-cpuid-Core-i7-2600.xml | 6 +-
5 files changed, 455 insertions(+), 50 deletions(-)
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-disabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-disabled.xml
index f25d2888eb..510cd97a5b 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-disabled.xml
@@ -1,6 +1,5 @@
<!-- Features disabled by QEMU -->
<cpudata arch='x86'>
<cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0800c1fc' edx='0xb0600000'/>
- <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000004' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
<cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
</cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-enabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-enabled.xml
index df99a21807..1581f800f1 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-enabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-enabled.xml
@@ -1,6 +1,7 @@
<!-- Features enabled by QEMU -->
<cpudata arch='x86'>
<cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x97ba2203' edx='0x0f8bfbff'/>
+ <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000004' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
<cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000002' ecx='0x00000000' edx='0x00000000'/>
<cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000001' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
<cpuid eax_in='0x40000001' ecx_in='0x00' eax='0x010000fa' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-json.xml
index 25c87e164e..c9ae651922 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-json.xml
@@ -5,6 +5,7 @@
<feature policy='require' name='ss'/>
<feature policy='require' name='pcid'/>
<feature policy='require' name='hypervisor'/>
+ <feature policy='require' name='arat'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='xsaveopt'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-2600.json b/tests/cputestdata/x86_64-cpuid-Core-i7-2600.json
index 19c448c10b..c80c89b0d7 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-2600.json
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-2600.json
@@ -9,19 +9,21 @@
"tsc_adjust": true,
"tsc-deadline": true,
"xstore-en": false,
- "tsc-scale": false,
- "sse": true,
- "smap": false,
- "stepping": 7,
+ "cpuid-0xb": true,
+ "abm": false,
+ "ia64": false,
+ "kvm-mmu": false,
+ "xsaveopt": true,
+ "hv-spinlocks": -1,
"tce": false,
+ "realized": false,
"kvm_steal_time": true,
"smep": false,
- "rdpid": false,
+ "fpu": true,
"xcrypt": false,
"sse4_2": true,
- "monitor": false,
+ "clflush": true,
"sse4_1": true,
- "kvm-mmu": false,
"flushbyasid": false,
"kvm-steal-time": true,
"lm": true,
@@ -29,28 +31,32 @@
"adx": false,
"fxsr": true,
"sha-ni": false,
- "tm": false,
+ "decodeassists": false,
+ "hv-relaxed": false,
"pclmuldq": true,
"xgetbv1": false,
"xstore": false,
"vmcb_clean": false,
+ "tsc-adjust": true,
"vme": true,
"vendor": "GenuineIntel",
- "arat": false,
+ "arat": true,
"ffxsr": false,
"de": true,
- "avx512f": false,
+ "aes": true,
"pse": true,
"ds-cpl": false,
+ "fxsr_opt": false,
"tbm": false,
- "ia64": false,
+ "sse": true,
"phe-en": false,
"f16c": false,
"ds": false,
"mpx": false,
- "tsc-adjust": true,
- "aes": true,
+ "vmware-cpuid-freq": true,
+ "avx512f": false,
"avx2": false,
+ "level": 13,
"pbe": false,
"cx16": true,
"ds_cpl": false,
@@ -59,37 +65,41 @@
"nrip_save": false,
"kvm_mmu": false,
"ospke": false,
+ "pmu": false,
"avx512ifma": false,
- "vmx": false,
+ "stepping": 7,
"sep": true,
- "xsaveopt": true,
"sse4a": false,
"avx512dq": false,
+ "core-id": -1,
"i64": true,
"avx512-4vnniw": false,
"xsave": true,
- "erms": false,
+ "pmm": false,
"hle": false,
"nodeid_msr": false,
+ "hv-crash": false,
"est": false,
- "svm_lock": false,
+ "osxsave": false,
"xop": false,
- "model-id": " Intel(R) Core(TM) i7-2600 CPU @ 3.40GHz",
- "abm": false,
+ "smx": false,
+ "tsc-scale": false,
+ "monitor": false,
"avx512er": false,
+ "apic": true,
"sse4.1": true,
"sse4.2": true,
+ "hv-vapic": false,
"pause-filter": false,
"lahf-lm": true,
"kvm-nopiodelay": true,
"cmp_legacy": false,
"acpi": false,
"fma4": false,
- "popcnt": true,
"mmx": true,
- "osxsave": false,
+ "svm_lock": false,
"pcommit": false,
- "avx512pf": false,
+ "mtrr": true,
"clwb": false,
"dca": false,
"pdcm": false,
@@ -97,23 +107,30 @@
"3dnow": false,
"invtsc": false,
"tm2": false,
+ "hv-time": false,
"hypervisor": true,
"kvmclock-stable-bit": true,
- "fxsr-opt": false,
+ "xlevel": 2147483656,
+ "lahf_lm": true,
+ "enforce": false,
"pcid": true,
"sse4-1": true,
- "sse4-2": true,
+ "lbrv": false,
"avx512-vpopcntdq": false,
"avx512-4fmaps": false,
+ "fill-mtrr-mask": true,
"pause_filter": false,
"svm-lock": false,
- "rdrand": false,
+ "popcnt": true,
"nrip-save": false,
"avx512vl": false,
"x2apic": true,
"kvmclock": true,
- "pge": true,
+ "smap": false,
+ "pdpe1gb": false,
"family": 6,
+ "min-level": 13,
+ "xlevel2": 0,
"dtes64": false,
"xd": true,
"kvm_pv_eoi": true,
@@ -122,78 +139,93 @@
"xtpr": false,
"perfctr_nb": false,
"avx512bw": false,
+ "l3-cache": true,
"nx": true,
"lwp": false,
"msr": true,
- "ace2-en": false,
- "decodeassists": false,
+ "syscall": true,
+ "tm": false,
"perfctr-core": false,
+ "memory": "/machine/unattached/system[0]",
+ "pge": true,
"pn": false,
"fma": false,
"nodeid-msr": false,
- "kvm_asyncpf": true,
- "clflush": true,
+ "xsavec": false,
+ "socket-id": -1,
+ "thread-id": -1,
"cx8": true,
"mce": true,
"avx512cd": false,
"cr8legacy": false,
"mca": true,
+ "avx512pf": false,
"pni": true,
+ "hv-vendor-id": "",
"rdseed": false,
- "apic": true,
+ "osvw": false,
"fsgsbase": false,
+ "model-id": " Intel(R) Core(TM) i7-2600 CPU @ 3.40GHz",
"cmp-legacy": false,
"kvm-pv-unhalt": true,
"rdtscp": true,
"mmxext": false,
+ "host-phys-bits": true,
"cid": false,
+ "vmx": false,
"ssse3": true,
"extapic": false,
"pse36": true,
- "mtrr": true,
+ "min-xlevel": 2147483656,
"ibs": false,
"la57": false,
"avx": true,
- "syscall": true,
+ "kvm-no-smi-migration": false,
+ "ace2-en": false,
"umip": false,
"invpcid": false,
- "avx512vbmi": false,
- "kvm-asyncpf": true,
+ "bmi1": false,
+ "bmi2": false,
"vmcb-clean": false,
- "pmm": false,
+ "erms": false,
"cmov": true,
+ "check": true,
"perfctr_core": false,
"misalignsse": false,
"clflushopt": false,
"pat": true,
- "lbrv": false,
+ "sse4-2": true,
"3dnowprefetch": false,
- "fpu": true,
+ "rdpid": false,
+ "full-cpuid-auto-level": true,
"pae": true,
"wdt": false,
"tsc_scale": false,
"skinit": false,
- "fxsr_opt": false,
+ "fxsr-opt": false,
"kvm_nopiodelay": true,
+ "phys-bits": 0,
+ "kvm": true,
"pmm-en": false,
"phe": false,
"3dnowext": false,
- "osvw": false,
+ "lmce": true,
"ht": false,
- "pdpe1gb": false,
+ "tsc-frequency": 0,
"kvm-pv-eoi": true,
"npt": false,
- "xsavec": false,
- "lahf_lm": true,
+ "apic-id": 4294967295,
+ "kvm_asyncpf": true,
+ "min-xlevel2": 0,
"pclmulqdq": true,
"svm": false,
"sse3": true,
"sse2": true,
"ss": true,
"topoext": false,
- "smx": false,
- "bmi1": false,
- "bmi2": false,
+ "rdrand": false,
+ "avx512vbmi": false,
+ "kvm-asyncpf": true,
"xsaves": false,
"model": 42
}
@@ -201,3 +233,375 @@
},
"id": "model-expansion"
}
+
+{
+ "return": [
+ {
+ "typename": "max-x86_64-cpu",
+ "unavailable-features": [],
+ "migration-safe": false,
+ "static": false,
+ "name": "max"
+ },
+ {
+ "typename": "host-x86_64-cpu",
+ "unavailable-features": [],
+ "migration-safe": false,
+ "static": false,
+ "name": "host"
+ },
+ {
+ "typename": "base-x86_64-cpu",
+ "unavailable-features": [],
+ "migration-safe": true,
+ "static": true,
+ "name": "base"
+ },
+ {
+ "typename": "qemu64-x86_64-cpu",
+ "unavailable-features": [],
+ "migration-safe": true,
+ "static": false,
+ "name": "qemu64"
+ },
+ {
+ "typename": "qemu32-x86_64-cpu",
+ "unavailable-features": [],
+ "migration-safe": true,
+ "static": false,
+ "name": "qemu32"
+ },
+ {
+ "typename": "phenom-x86_64-cpu",
+ "unavailable-features": [
+ "mmxext",
+ "fxsr-opt",
+ "pdpe1gb",
+ "3dnowext",
+ "3dnow",
+ "abm",
+ "sse4a",
+ "npt"
+ ],
+ "migration-safe": true,
+ "static": false,
+ "name": "phenom"
+ },
+ {
+ "typename": "pentium3-x86_64-cpu",
+ "unavailable-features": [],
+ "migration-safe": true,
+ "static": false,
+ "name": "pentium3"
+ },
+ {
+ "typename": "pentium2-x86_64-cpu",
+ "unavailable-features": [],
+ "migration-safe": true,
+ "static": false,
+ "name": "pentium2"
+ },
+ {
+ "typename": "pentium-x86_64-cpu",
+ "unavailable-features": [],
+ "migration-safe": true,
+ "static": false,
+ "name": "pentium"
+ },
+ {
+ "typename": "n270-x86_64-cpu",
+ "unavailable-features": [
+ "movbe"
+ ],
+ "migration-safe": true,
+ "static": false,
+ "name": "n270"
+ },
+ {
+ "typename": "kvm64-x86_64-cpu",
+ "unavailable-features": [],
+ "migration-safe": true,
+ "static": false,
+ "name": "kvm64"
+ },
+ {
+ "typename": "kvm32-x86_64-cpu",
+ "unavailable-features": [],
+ "migration-safe": true,
+ "static": false,
+ "name": "kvm32"
+ },
+ {
+ "typename": "cpu64-rhel6-x86_64-cpu",
+ "unavailable-features": [
+ "abm",
+ "sse4a"
+ ],
+ "migration-safe": true,
+ "static": false,
+ "name": "cpu64-rhel6"
+ },
+ {
+ "typename": "coreduo-x86_64-cpu",
+ "unavailable-features": [],
+ "migration-safe": true,
+ "static": false,
+ "name": "coreduo"
+ },
+ {
+ "typename": "core2duo-x86_64-cpu",
+ "unavailable-features": [],
+ "migration-safe": true,
+ "static": false,
+ "name": "core2duo"
+ },
+ {
+ "typename": "athlon-x86_64-cpu",
+ "unavailable-features": [
+ "mmxext",
+ "3dnowext",
+ "3dnow"
+ ],
+ "migration-safe": true,
+ "static": false,
+ "name": "athlon"
+ },
+ {
+ "typename": "Westmere-x86_64-cpu",
+ "unavailable-features": [],
+ "migration-safe": true,
+ "static": false,
+ "name": "Westmere"
+ },
+ {
+ "typename": "Skylake-Client-x86_64-cpu",
+ "unavailable-features": [
+ "fma",
+ "movbe",
+ "f16c",
+ "rdrand",
+ "fsgsbase",
+ "bmi1",
+ "hle",
+ "avx2",
+ "smep",
+ "bmi2",
+ "erms",
+ "invpcid",
+ "rtm",
+ "mpx",
+ "rdseed",
+ "adx",
+ "smap",
+ "abm",
+ "3dnowprefetch",
+ "xsavec",
+ "xgetbv1",
+ "mpx",
+ "mpx"
+ ],
+ "migration-safe": true,
+ "static": false,
+ "name": "Skylake-Client"
+ },
+ {
+ "typename": "SandyBridge-x86_64-cpu",
+ "unavailable-features": [],
+ "migration-safe": true,
+ "static": false,
+ "name": "SandyBridge"
+ },
+ {
+ "typename": "Penryn-x86_64-cpu",
+ "unavailable-features": [],
+ "migration-safe": true,
+ "static": false,
+ "name": "Penryn"
+ },
+ {
+ "typename": "Opteron_G5-x86_64-cpu",
+ "unavailable-features": [
+ "fma",
+ "f16c",
+ "pdpe1gb",
+ "abm",
+ "sse4a",
+ "misalignsse",
+ "3dnowprefetch",
+ "xop",
+ "fma4",
+ "tbm"
+ ],
+ "migration-safe": true,
+ "static": false,
+ "name": "Opteron_G5"
+ },
+ {
+ "typename": "Opteron_G4-x86_64-cpu",
+ "unavailable-features": [
+ "pdpe1gb",
+ "abm",
+ "sse4a",
+ "misalignsse",
+ "3dnowprefetch",
+ "xop",
+ "fma4"
+ ],
+ "migration-safe": true,
+ "static": false,
+ "name": "Opteron_G4"
+ },
+ {
+ "typename": "Opteron_G3-x86_64-cpu",
+ "unavailable-features": [
+ "abm",
+ "sse4a",
+ "misalignsse"
+ ],
+ "migration-safe": true,
+ "static": false,
+ "name": "Opteron_G3"
+ },
+ {
+ "typename": "Opteron_G2-x86_64-cpu",
+ "unavailable-features": [],
+ "migration-safe": true,
+ "static": false,
+ "name": "Opteron_G2"
+ },
+ {
+ "typename": "Opteron_G1-x86_64-cpu",
+ "unavailable-features": [],
+ "migration-safe": true,
+ "static": false,
+ "name": "Opteron_G1"
+ },
+ {
+ "typename": "Nehalem-x86_64-cpu",
+ "unavailable-features": [],
+ "migration-safe": true,
+ "static": false,
+ "name": "Nehalem"
+ },
+ {
+ "typename": "IvyBridge-x86_64-cpu",
+ "unavailable-features": [
+ "f16c",
+ "rdrand",
+ "fsgsbase",
+ "smep",
+ "erms"
+ ],
+ "migration-safe": true,
+ "static": false,
+ "name": "IvyBridge"
+ },
+ {
+ "typename": "Haswell-x86_64-cpu",
+ "unavailable-features": [
+ "fma",
+ "movbe",
+ "f16c",
+ "rdrand",
+ "fsgsbase",
+ "bmi1",
+ "hle",
+ "avx2",
+ "smep",
+ "bmi2",
+ "erms",
+ "invpcid",
+ "rtm",
+ "abm"
+ ],
+ "migration-safe": true,
+ "static": false,
+ "name": "Haswell"
+ },
+ {
+ "typename": "Haswell-noTSX-x86_64-cpu",
+ "unavailable-features": [
+ "fma",
+ "movbe",
+ "f16c",
+ "rdrand",
+ "fsgsbase",
+ "bmi1",
+ "avx2",
+ "smep",
+ "bmi2",
+ "erms",
+ "invpcid",
+ "abm"
+ ],
+ "migration-safe": true,
+ "static": false,
+ "name": "Haswell-noTSX"
+ },
+ {
+ "typename": "Conroe-x86_64-cpu",
+ "unavailable-features": [],
+ "migration-safe": true,
+ "static": false,
+ "name": "Conroe"
+ },
+ {
+ "typename": "Broadwell-x86_64-cpu",
+ "unavailable-features": [
+ "fma",
+ "movbe",
+ "f16c",
+ "rdrand",
+ "fsgsbase",
+ "bmi1",
+ "hle",
+ "avx2",
+ "smep",
+ "bmi2",
+ "erms",
+ "invpcid",
+ "rtm",
+ "rdseed",
+ "adx",
+ "smap",
+ "abm",
+ "3dnowprefetch"
+ ],
+ "migration-safe": true,
+ "static": false,
+ "name": "Broadwell"
+ },
+ {
+ "typename": "Broadwell-noTSX-x86_64-cpu",
+ "unavailable-features": [
+ "fma",
+ "movbe",
+ "f16c",
+ "rdrand",
+ "fsgsbase",
+ "bmi1",
+ "avx2",
+ "smep",
+ "bmi2",
+ "erms",
+ "invpcid",
+ "rdseed",
+ "adx",
+ "smap",
+ "abm",
+ "3dnowprefetch"
+ ],
+ "migration-safe": true,
+ "static": false,
+ "name": "Broadwell-noTSX"
+ },
+ {
+ "typename": "486-x86_64-cpu",
+ "unavailable-features": [],
+ "migration-safe": true,
+ "static": false,
+ "name": "486"
+ }
+ ],
+ "id": "definitions"
+}
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-2600.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-2600.xml
index ad15597d6b..8c0f847fef 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-2600.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-2600.xml
@@ -1,7 +1,7 @@
<!-- Intel(R) Core(TM) i7-2600 CPU @ 3.40GHz -->
<cpudata arch='x86'>
<cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x0000000d' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
- <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x000206a7' ebx='0x05100800' ecx='0x1fbae3ff' edx='0xbfebfbff'/>
+ <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x000206a7' ebx='0x01100800' ecx='0x1fbae3ff' edx='0xbfebfbff'/>
<cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x76035a01' ebx='0x00f0b2ff' ecx='0x00000000' edx='0x00ca0000'/>
<cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
<cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x1c004121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
@@ -14,8 +14,8 @@
<cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
<cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
<cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07300403' ebx='0x00000000' ecx='0x00000000' edx='0x00000603'/>
- <cpuid eax_in='0x0000000b' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000100' edx='0x00000005'/>
- <cpuid eax_in='0x0000000b' ecx_in='0x01' eax='0x00000004' ebx='0x00000008' ecx='0x00000201' edx='0x00000005'/>
+ <cpuid eax_in='0x0000000b' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000100' edx='0x00000001'/>
+ <cpuid eax_in='0x0000000b' ecx_in='0x01' eax='0x00000004' ebx='0x00000008' ecx='0x00000201' edx='0x00000001'/>
<cpuid eax_in='0x0000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
<cpuid eax_in='0x0000000d' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/>
<cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000001' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
--
2.14.2
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list
