aboutsummaryrefslogtreecommitdiff
path: root/target-i386
diff options
context:
space:
mode:
authorEduardo Habkost <ehabkost@redhat.com>2015-11-25 18:19:14 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2015-11-26 16:48:07 +0100
commit49b69cbfcd6e32e2178d6ff7e5d60689c3f79c6e (patch)
treee39c6cb19968f106fb350974227c3d1740748e4f /target-i386
parent3e32e8a96e6995cde3d8a13d68e31226ee83f290 (diff)
target-i386: kvm: Abort if MCE bank count is not supported by host
Instead of silently changing the number of banks in mcg_cap based on kvm_get_mce_cap_supported(), abort initialization if the host doesn't support MCE_BANKS_DEF banks. Note that MCE_BANKS_DEF was always 10 since it was introduced in QEMU, and Linux always returned 32 at KVM_CAP_MCE since KVM_CAP_MCE was introduced, so no behavior is being changed and the error can't be triggered by any Linux version. The point of the new check is to ensure we won't silently change the bank count if we change MCE_BANKS_DEF or make the bank count configurable in the future. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> [Avoid Yoda condition and \n at end of error_report. - Paolo] Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Message-Id: <1448471956-66873-8-git-send-email-pbonzini@redhat.com>
Diffstat (limited to 'target-i386')
-rw-r--r--target-i386/kvm.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 2a9953b2d4..93d1f5eb6b 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -784,11 +784,14 @@ int kvm_arch_init_vcpu(CPUState *cs)
return ret;
}
- if (banks > MCE_BANKS_DEF) {
- banks = MCE_BANKS_DEF;
+ if (banks < MCE_BANKS_DEF) {
+ error_report("kvm: Unsupported MCE bank count (QEMU = %d, KVM = %d)",
+ MCE_BANKS_DEF, banks);
+ return -ENOTSUP;
}
+
mcg_cap &= MCE_CAP_DEF;
- mcg_cap |= banks;
+ mcg_cap |= MCE_BANKS_DEF;
ret = kvm_vcpu_ioctl(cs, KVM_X86_SETUP_MCE, &mcg_cap);
if (ret < 0) {
fprintf(stderr, "KVM_X86_SETUP_MCE: %s", strerror(-ret));