[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 9/9] target-i386: kvm: Print warning when clearing mc
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 9/9] target-i386: kvm: Print warning when clearing mcg_cap bits |
Date: |
Thu, 26 Nov 2015 16:52:17 +0100 |
From: Eduardo Habkost <address@hidden>
Instead of silently clearing mcg_cap bits when the host doesn't
support them, print a warning when doing that.
Signed-off-by: Eduardo Habkost <address@hidden>
[Avoid \n at end of error_report. - Paolo]
Signed-off-by: Paolo Bonzini <address@hidden>
Message-Id: <address@hidden>
---
target-i386/kvm.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 90bd447..6dc9846 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -774,7 +774,7 @@ int kvm_arch_init_vcpu(CPUState *cs)
&& (env->features[FEAT_1_EDX] & (CPUID_MCE | CPUID_MCA)) ==
(CPUID_MCE | CPUID_MCA)
&& kvm_check_extension(cs->kvm_state, KVM_CAP_MCE) > 0) {
- uint64_t mcg_cap;
+ uint64_t mcg_cap, unsupported_caps;
int banks;
int ret;
@@ -790,6 +790,12 @@ int kvm_arch_init_vcpu(CPUState *cs)
return -ENOTSUP;
}
+ unsupported_caps = env->mcg_cap & ~(mcg_cap | MCG_CAP_BANKS_MASK);
+ if (unsupported_caps) {
+ error_report("warning: Unsupported MCG_CAP bits: 0x%" PRIx64,
+ unsupported_caps);
+ }
+
env->mcg_cap &= mcg_cap | MCG_CAP_BANKS_MASK;
ret = kvm_vcpu_ioctl(cs, KVM_X86_SETUP_MCE, &env->mcg_cap);
if (ret < 0) {
--
2.5.0
- [Qemu-devel] [PULL v2 0/9] Misc patches for QEMU 2.5-rc2, Paolo Bonzini, 2015/11/26
- [Qemu-devel] [PULL 2/9] call bdrv_drain_all() even if the vm is stopped, Paolo Bonzini, 2015/11/26
- [Qemu-devel] [PULL 1/9] MAINTAINERS: Update TCG CPU cores section, Paolo Bonzini, 2015/11/26
- [Qemu-devel] [PULL 4/9] exec: remove warning about mempath and hugetlbfs, Paolo Bonzini, 2015/11/26
- [Qemu-devel] [PULL 5/9] target-sparc: fix 32-bit truncation in fpackfix, Paolo Bonzini, 2015/11/26
- [Qemu-devel] [PULL 3/9] Revert "exec: silence hugetlbfs warning under qtest", Paolo Bonzini, 2015/11/26
- [Qemu-devel] [PULL 6/9] virtio-scsi: don't crash without a valid device, Paolo Bonzini, 2015/11/26
- [Qemu-devel] [PULL 7/9] target-i386: kvm: Abort if MCE bank count is not supported by host, Paolo Bonzini, 2015/11/26
- [Qemu-devel] [PULL 9/9] target-i386: kvm: Print warning when clearing mcg_cap bits,
Paolo Bonzini <=
- [Qemu-devel] [PULL 8/9] target-i386: kvm: Use env->mcg_cap when setting up MCE, Paolo Bonzini, 2015/11/26
- Re: [Qemu-devel] [PULL v2 0/9] Misc patches for QEMU 2.5-rc2, Peter Maydell, 2015/11/26