diff options
| author | Haozhong Zhang | 2016-06-22 08:56:23 +0200 |
|---|---|---|
| committer | Eduardo Habkost | 2016-07-07 20:25:40 +0200 |
| commit | 40bfe48f1c78bb7905d58d8d603ca27063566bc9 (patch) | |
| tree | 937025851411b9f8572ee9a5d599b583eb51b0d9 | |
| parent | target-i386: Publish advised value of MSR_IA32_FEATURE_CONTROL via fw_cfg (diff) | |
| download | qemu-40bfe48f1c78bb7905d58d8d603ca27063566bc9.tar.gz qemu-40bfe48f1c78bb7905d58d8d603ca27063566bc9.tar.xz qemu-40bfe48f1c78bb7905d58d8d603ca27063566bc9.zip | |
target-i386: Enable LMCE for '-cpu host' if supported by host
If -cpu host is used, LMCE will be automatically enabled when it's
supported by host.
Signed-off-by: Haozhong Zhang <haozhong.zhang@intel.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
| -rw-r--r-- | target-i386/cpu.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 5bc7ce5d37..fc209ee1cb 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1547,6 +1547,17 @@ static uint32_t x86_cpu_get_supported_feature_word(FeatureWord w, #ifdef CONFIG_KVM +static bool lmce_supported(void) +{ + uint64_t mce_cap; + + if (kvm_ioctl(kvm_state, KVM_X86_GET_MCE_CAP_SUPPORTED, &mce_cap) < 0) { + return false; + } + + return !!(mce_cap & MCG_LMCE_P); +} + static int cpu_x86_fill_model_id(char *str) { uint32_t eax = 0, ebx = 0, ecx = 0, edx = 0; @@ -1619,6 +1630,10 @@ static void host_x86_cpu_initfn(Object *obj) env->cpuid_level = kvm_arch_get_supported_cpuid(s, 0x0, 0, R_EAX); env->cpuid_xlevel = kvm_arch_get_supported_cpuid(s, 0x80000000, 0, R_EAX); env->cpuid_xlevel2 = kvm_arch_get_supported_cpuid(s, 0xC0000000, 0, R_EAX); + + if (lmce_supported()) { + object_property_set_bool(OBJECT(cpu), true, "lmce", &error_abort); + } } object_property_set_bool(OBJECT(cpu), true, "pmu", &error_abort); |