ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Jan Kiszka 2011-03-02 08:56:17 +01:00 committed by Marcelo Tosatti
parent c34d440a72
commit 32a420243c
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
target-i386/kvm.c
View File

@ -187,11 +187,6 @@ static int kvm_get_mce_cap_supported(KVMState *s, uint64_t *mce_cap,
return -ENOSYS; 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) 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 | 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) { && kvm_check_extension(env->kvm_state, KVM_CAP_MCE) > 0) {
uint64_t mcg_cap; uint64_t mcg_cap;
int banks; int banks;
int ret;
if (kvm_get_mce_cap_supported(env->kvm_state, &mcg_cap, &banks)) { if (kvm_get_mce_cap_supported(env->kvm_state, &mcg_cap, &banks)) {
perror("kvm_get_mce_cap_supported FAILED"); perror("kvm_get_mce_cap_supported FAILED");
@ -448,8 +444,9 @@ int kvm_arch_init_vcpu(CPUState *env)
banks = MCE_BANKS_DEF; banks = MCE_BANKS_DEF;
mcg_cap &= MCE_CAP_DEF; mcg_cap &= MCE_CAP_DEF;
mcg_cap |= banks; mcg_cap |= banks;
if (kvm_setup_mce(env, &mcg_cap)) { ret = kvm_vcpu_ioctl(env, KVM_X86_SETUP_MCE, &mcg_cap);
perror("kvm_setup_mce FAILED"); if (ret < 0) {
fprintf(stderr, "KVM_X86_SETUP_MCE: %s", strerror(-ret));
} else { } else {
env->mcg_cap = mcg_cap; env->mcg_cap = mcg_cap;
} }