From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46516) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a1dj7-0003Vy-Ha for qemu-devel@nongnu.org; Wed, 25 Nov 2015 12:19:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a1dj6-0007Zg-JK for qemu-devel@nongnu.org; Wed, 25 Nov 2015 12:19:29 -0500 Received: from mail-wm0-x229.google.com ([2a00:1450:400c:c09::229]:38169) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a1dj6-0007ZF-DJ for qemu-devel@nongnu.org; Wed, 25 Nov 2015 12:19:28 -0500 Received: by wmec201 with SMTP id c201so79326260wme.1 for ; Wed, 25 Nov 2015 09:19:27 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 25 Nov 2015 18:19:15 +0100 Message-Id: <1448471956-66873-9-git-send-email-pbonzini@redhat.com> In-Reply-To: <1448471956-66873-1-git-send-email-pbonzini@redhat.com> References: <1448471956-66873-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 8/9] target-i386: kvm: Use env->mcg_cap when setting up MCE List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Eduardo Habkost From: Eduardo Habkost When setting up MCE, instead of using the MCE_*_DEF macros directly, just filter the existing env->mcg_cap value. As env->mcg_cap is already initialized as MCE_CAP_DEF|MCE_BANKS_DEF at target-i386/cpu.c:mce_init(), this doesn't change any behavior. But it will allow us to change mce_init() in the future, to implement different defaults depending on CPU model, machine-type or command-line parameters. Signed-off-by: Eduardo Habkost Signed-off-by: Paolo Bonzini --- target-i386/cpu.h | 2 ++ target-i386/kvm.c | 11 ++++------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/target-i386/cpu.h b/target-i386/cpu.h index fc4a605..84edfd0 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -286,6 +286,8 @@ #define MCE_CAP_DEF (MCG_CTL_P|MCG_SER_P) #define MCE_BANKS_DEF 10 +#define MCG_CAP_BANKS_MASK 0xff + #define MCG_STATUS_RIPV (1ULL<<0) /* restart ip valid */ #define MCG_STATUS_EIPV (1ULL<<1) /* ip points to correct instruction */ #define MCG_STATUS_MCIP (1ULL<<2) /* machine check in progress */ diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 93d1f5e..90bd447 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -784,21 +784,18 @@ int kvm_arch_init_vcpu(CPUState *cs) return ret; } - if (banks < MCE_BANKS_DEF) { + if (banks < (env->mcg_cap & MCG_CAP_BANKS_MASK)) { error_report("kvm: Unsupported MCE bank count (QEMU = %d, KVM = %d)", - MCE_BANKS_DEF, banks); + (int)(env->mcg_cap & MCG_CAP_BANKS_MASK), banks); return -ENOTSUP; } - mcg_cap &= MCE_CAP_DEF; - mcg_cap |= MCE_BANKS_DEF; - ret = kvm_vcpu_ioctl(cs, KVM_X86_SETUP_MCE, &mcg_cap); + env->mcg_cap &= mcg_cap | MCG_CAP_BANKS_MASK; + ret = kvm_vcpu_ioctl(cs, KVM_X86_SETUP_MCE, &env->mcg_cap); if (ret < 0) { fprintf(stderr, "KVM_X86_SETUP_MCE: %s", strerror(-ret)); return ret; } - - env->mcg_cap = mcg_cap; } qemu_add_vm_change_state_handler(cpu_update_state, env); -- 1.8.3.1