And restruct this block to call kvm_mce_in_exception() only when it is required. Signed-off-by: Hidetoshi Seto <seto.hidetoshi@xxxxxxxxxxxxxx> Tested-by: Jin Dongming <jin.dongming@xxxxxxxxxxxxxxxxxx> --- qemu-kvm.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/qemu-kvm.c b/qemu-kvm.c index e78d850..6f62973 100644 --- a/qemu-kvm.c +++ b/qemu-kvm.c @@ -1903,12 +1903,15 @@ static void kvm_do_inject_x86_mce(void *_data) struct kvm_x86_mce_data *data = _data; int r; - /* If there is an MCE excpetion being processed, ignore this SRAO MCE */ - r = kvm_mce_in_exception(data->env); - if (r == -1) { - fprintf(stderr, "Failed to get MCE status\n"); - } else if (r && !(data->mce->status & MCI_STATUS_AR)) { - return; + /* 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) { + return; + } } r = kvm_set_mce(data->env, data->mce); if (r < 0) { -- 1.7.1.1 -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html