[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/13] kvm: x86: Clean up kvm_setup_mce
From: |
Jan Kiszka |
Subject: |
[Qemu-devel] [PATCH 10/13] kvm: x86: Clean up kvm_setup_mce |
Date: |
Tue, 15 Feb 2011 09:23:34 +0100 |
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 <address@hidden>
CC: Huang Ying <address@hidden>
CC: Hidetoshi Seto <address@hidden>
CC: Jin Dongming <address@hidden>
---
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 8be093b..7cdff65 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 |
@@ -446,6 +441,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");
@@ -454,8 +450,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;
}
--
1.7.1
- [Qemu-devel] [PATCH 00/13] [uq/master] Patch queue, part IV (MCE edition), Jan Kiszka, 2011/02/15
- [Qemu-devel] [PATCH 06/13] Synchronize VCPU states before reset, Jan Kiszka, 2011/02/15
- [Qemu-devel] [PATCH 10/13] kvm: x86: Clean up kvm_setup_mce,
Jan Kiszka <=
- [Qemu-devel] [PATCH 01/13] x86: Account for MCE in cpu_has_work, Jan Kiszka, 2011/02/15
- [Qemu-devel] [PATCH 02/13] x86: Perform implicit mcg_status reset, Jan Kiszka, 2011/02/15
- [Qemu-devel] [PATCH 07/13] kvm: x86: Move MCE functions together, Jan Kiszka, 2011/02/15
- [Qemu-devel] [PATCH 11/13] kvm: x86: Fail kvm_arch_init_vcpu if MCE initialization fails, Jan Kiszka, 2011/02/15
- [Qemu-devel] [PATCH 03/13] x86: Small cleanups of MCE helpers, Jan Kiszka, 2011/02/15
- [Qemu-devel] [PATCH 12/13] Add qemu_ram_remap, Jan Kiszka, 2011/02/15
- [Qemu-devel] [PATCH 05/13] x86: Optionally avoid injecting AO MCEs while others are pending, Jan Kiszka, 2011/02/15
- [Qemu-devel] [PATCH 08/13] kvm: x86: Inject pending MCE events on state writeback, Jan Kiszka, 2011/02/15