[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/13] kvm: x86: Fail kvm_arch_init_vcpu if MCE init
From: |
Jan Kiszka |
Subject: |
[Qemu-devel] [PATCH 11/13] kvm: x86: Fail kvm_arch_init_vcpu if MCE initialization fails |
Date: |
Tue, 15 Feb 2011 09:23:35 +0100 |
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 <address@hidden>
CC: Huang Ying <address@hidden>
CC: Hidetoshi Seto <address@hidden>
CC: Jin Dongming <address@hidden>
---
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 7cdff65..8eda78b 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -443,20 +443,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
--
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, 2011/02/15
- [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 <=
- [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
[Qemu-devel] [PATCH 13/13] KVM, MCE, unpoison memory address across reboot, Jan Kiszka, 2011/02/15