diff options
| author | Jan Kiszka <jan.kiszka@siemens.com> | 2011-03-02 08:56:17 +0100 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2011-03-15 01:19:06 -0300 |
| commit | 32a420243cd1d6d83bd3a248eebeb9a5ebb5101e (patch) | |
| tree | c84707cd92e3c700bb211ed8a5220f9b5368c65f /target-i386 | |
| parent | c34d440a728fd3b5099d11dec122d440ef092c23 (diff) | |
kvm: x86: Clean up kvm_setup_mce
There is nothing to abstract here. Fold kvm_setup_mce into its caller
and fix up the error reporting (return code of kvm_vcpu_ioctl holds the
error value).
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 | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 4974fa42d2..9d71b20b80 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -187,11 +187,6 @@ static int kvm_get_mce_cap_supported(KVMState *s, uint64_t *mce_cap, return -ENOSYS; } -static int kvm_setup_mce(CPUState *env, uint64_t *mcg_cap) -{ - return kvm_vcpu_ioctl(env, KVM_X86_SETUP_MCE, mcg_cap); -} - static void kvm_mce_inject(CPUState *env, target_phys_addr_t paddr, int code) { uint64_t status = MCI_STATUS_VAL | MCI_STATUS_UC | MCI_STATUS_EN | @@ -440,6 +435,7 @@ int kvm_arch_init_vcpu(CPUState *env) && kvm_check_extension(env->kvm_state, KVM_CAP_MCE) > 0) { uint64_t mcg_cap; int banks; + int ret; if (kvm_get_mce_cap_supported(env->kvm_state, &mcg_cap, &banks)) { perror("kvm_get_mce_cap_supported FAILED"); @@ -448,8 +444,9 @@ int kvm_arch_init_vcpu(CPUState *env) banks = MCE_BANKS_DEF; mcg_cap &= MCE_CAP_DEF; mcg_cap |= banks; - if (kvm_setup_mce(env, &mcg_cap)) { - perror("kvm_setup_mce FAILED"); + 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; } |