diff options
| author | Jan Kiszka <jan.kiszka@siemens.com> | 2011-03-02 08:56:18 +0100 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2011-03-15 01:19:06 -0300 |
| commit | 75d49497332361a574d9ed1f546d36de385d238f (patch) | |
| tree | 7903d95340b1e7787840f6ba1468baafa58eed3b /target-i386 | |
| parent | 32a420243cd1d6d83bd3a248eebeb9a5ebb5101e (diff) | |
| download | qemu-75d49497332361a574d9ed1f546d36de385d238f.zip qemu-75d49497332361a574d9ed1f546d36de385d238f.tar.gz qemu-75d49497332361a574d9ed1f546d36de385d238f.tar.bz2 | |
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: Jan 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: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'target-i386')
| -rw-r--r-- | target-i386/kvm.c | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 9d71b20..1574186 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -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) - 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; - } + 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)); + return ret; + } + + env->mcg_cap = mcg_cap; } #endif |