[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/35] kvm: introduce kvm_mce_in_progress
From: |
Marcelo Tosatti |
Subject: |
[Qemu-devel] [PATCH 06/35] kvm: introduce kvm_mce_in_progress |
Date: |
Thu, 6 Jan 2011 15:56:12 -0200 |
From: Jin Dongming <address@hidden>
Share same error handing, and rename this function after
MCIP (Machine Check In Progress) flag.
Signed-off-by: Hidetoshi Seto <address@hidden>
Signed-off-by: Jin Dongming <address@hidden>
Signed-off-by: Marcelo Tosatti <address@hidden>
---
target-i386/kvm.c | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 2115a58..5a699fc 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -219,7 +219,7 @@ static int kvm_get_msr(CPUState *env, struct kvm_msr_entry
*msrs, int n)
}
/* FIXME: kill this and kvm_get_msr, use env->mcg_status instead */
-static int kvm_mce_in_exception(CPUState *env)
+static int kvm_mce_in_progress(CPUState *env)
{
struct kvm_msr_entry msr_mcg_status = {
.index = MSR_MCG_STATUS,
@@ -228,7 +228,8 @@ static int kvm_mce_in_exception(CPUState *env)
r = kvm_get_msr(env, &msr_mcg_status, 1);
if (r == -1 || r == 0) {
- return -1;
+ fprintf(stderr, "Failed to get MCE status\n");
+ return 0;
}
return !!(msr_mcg_status.data & MCG_STATUS_MCIP);
}
@@ -248,10 +249,7 @@ static void kvm_do_inject_x86_mce(void *_data)
/* If there is an MCE exception being processed, ignore this SRAO MCE */
if ((data->env->mcg_cap & MCG_SER_P) &&
!(data->mce->status & MCI_STATUS_AR)) {
- r = kvm_mce_in_exception(data->env);
- if (r == -1) {
- fprintf(stderr, "Failed to get MCE status\n");
- } else if (r) {
+ if (kvm_mce_in_progress(data->env)) {
return;
}
}
@@ -1752,10 +1750,7 @@ int kvm_on_sigbus_vcpu(CPUState *env, int code, void
*addr)
* If there is an MCE excpetion being processed, ignore
* this SRAO MCE
*/
- r = kvm_mce_in_exception(env);
- if (r == -1) {
- fprintf(stderr, "Failed to get MCE status\n");
- } else if (r) {
+ if (kvm_mce_in_progress(env)) {
return 0;
}
/* Fake an Intel architectural Memory scrubbing UCR */
--
1.7.2.3
- [Qemu-devel] [PATCH 17/35] x86: Optionally dump code bytes on cpu_dump_state, (continued)
- [Qemu-devel] [PATCH 17/35] x86: Optionally dump code bytes on cpu_dump_state, Marcelo Tosatti, 2011/01/06
- [Qemu-devel] [PATCH 33/35] kvm: Do not use qemu_fair_mutex, Marcelo Tosatti, 2011/01/06
- [Qemu-devel] [PATCH 15/35] kvm: Stop on all fatal exit reasons, Marcelo Tosatti, 2011/01/06
- [Qemu-devel] [PATCH 16/35] kvm: Improve reporting of fatal errors, Marcelo Tosatti, 2011/01/06
- [Qemu-devel] [PATCH 05/35] Add function for checking mca broadcast of CPU, Marcelo Tosatti, 2011/01/06
- [Qemu-devel] [PATCH 07/35] kvm: kvm_mce_inj_* subroutines for templated error injections, Marcelo Tosatti, 2011/01/06
- [Qemu-devel] [PATCH 04/35] Add "broadcast" option for mce command, Marcelo Tosatti, 2011/01/06
- [Qemu-devel] [PATCH 18/35] kvm: x86: Align kvm_arch_put_registers code with comment, Marcelo Tosatti, 2011/01/06
- [Qemu-devel] [PATCH 06/35] kvm: introduce kvm_mce_in_progress,
Marcelo Tosatti <=
- [Qemu-devel] [PATCH 21/35] kvm: x86: Fix xcr0 reset mismerge, Marcelo Tosatti, 2011/01/06
- [Qemu-devel] [PATCH 31/35] kvm: x86: Rework identity map and TSS setup for larger BIOS sizes, Marcelo Tosatti, 2011/01/06
- [Qemu-devel] [PATCH 28/35] kvm: x86: Introduce kvmclock device to save/restore its state, Marcelo Tosatti, 2011/01/06