Commit 2590f15b authored by Eduardo Habkost's avatar Eduardo Habkost Committed by Paolo Bonzini
Browse files

target-i386: kvm: Use env->mcg_cap when setting up MCE 



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: default avatarEduardo Habkost <ehabkost@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Message-Id: <1448471956-66873-9-git-send-email-pbonzini@redhat.com>
parent 49b69cbf

target-i386/cpu.h

+2 −0
Original line number Diff line number Diff line
@@ -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 */

target-i386/kvm.c

+4 −7
Original line number Diff line number Diff line
@@ -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);