david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kvm: introduce kvm_mce_in_progress

Browse Source 
Share same error handing, and rename this function after
MCIP (Machine Check In Progress) flag.

Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Signed-off-by: Jin Dongming <jin.dongming@np.css.fujitsu.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
This commit is contained in:
Jin Dongming 2010-12-22 12:24:22 +09:00 committed by Marcelo Tosatti
parent 2bd3e04c3b
commit 6643e2f001
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
target-i386/kvm.c
View File

@ -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 */ /* 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 = { struct kvm_msr_entry msr_mcg_status = {
.index = 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); r = kvm_get_msr(env, &msr_mcg_status, 1);
if (r == -1 || r == 0) { 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); 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 there is an MCE exception being processed, ignore this SRAO MCE */
if ((data->env->mcg_cap & MCG_SER_P) && if ((data->env->mcg_cap & MCG_SER_P) &&
!(data->mce->status & MCI_STATUS_AR)) { !(data->mce->status & MCI_STATUS_AR)) {
r = kvm_mce_in_exception(data->env); if (kvm_mce_in_progress(data->env)) {
if (r == -1) {
fprintf(stderr, "Failed to get MCE status\n");
} else if (r) {
return; 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 * If there is an MCE excpetion being processed, ignore
* this SRAO MCE * this SRAO MCE
*/ */
r = kvm_mce_in_exception(env); if (kvm_mce_in_progress(env)) {
if (r == -1) {
fprintf(stderr, "Failed to get MCE status\n");
} else if (r) {
return 0; return 0;
} }
/* Fake an Intel architectural Memory scrubbing UCR */ /* Fake an Intel architectural Memory scrubbing UCR */