Commit 75d49497 authored by Jan Kiszka's avatar Jan Kiszka Committed by Marcelo Tosatti
Browse files

kvm: x86: Fail kvm_arch_init_vcpu if MCE initialization fails 



There is no reason to continue if the kernel claims to support MCE but
then fails to process our request.

Signed-off-by: default avatarJan Kiszka <jan.kiszka@siemens.com>
CC: Huang Ying <ying.huang@intel.com>
CC: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
CC: Jin Dongming <jin.dongming@np.css.fujitsu.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent 32a42024

target-i386/kvm.c

+17 −13
Original line number Diff line number Diff line
@@ -437,20 +437,24 @@ int kvm_arch_init_vcpu(CPUState *env) 
        int banks;

        int ret;



        if (kvm_get_mce_cap_supported(env->kvm_state, &mcg_cap, &banks)) {

            perror("kvm_get_mce_cap_supported FAILED");

        } else {

            if (banks > MCE_BANKS_DEF)

        ret = kvm_get_mce_cap_supported(env->kvm_state, &mcg_cap, &banks);

        if (ret < 0) {

            fprintf(stderr, "kvm_get_mce_cap_supported: %s", strerror(-ret));

            return ret;

        }



        if (banks > MCE_BANKS_DEF) {

            banks = MCE_BANKS_DEF;

        }

        mcg_cap &= MCE_CAP_DEF;

        mcg_cap |= banks;

        ret = kvm_vcpu_ioctl(env, KVM_X86_SETUP_MCE, &mcg_cap);

        if (ret < 0) {

            fprintf(stderr, "KVM_X86_SETUP_MCE: %s", strerror(-ret));

            } else {

                env->mcg_cap = mcg_cap;

            }

            return ret;

        }



        env->mcg_cap = mcg_cap;

    }

#endif