From patchwork Thu Oct 21 08:46:49 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: x86, mce: ignore SRAO only when MCG_SER_P is available Date: Wed, 20 Oct 2010 22:46:49 -0000 From: Hidetoshi Seto X-Patchwork-Id: 68552 Message-Id: <4CBFFDF9.2080200@jp.fujitsu.com> To: qemu-devel@nongnu.org Cc: Jin Dongming , Dean Nelson , Marcelo Tosatti , "kvm@vger.kernel.org" , Huang Ying And restruct this block to call kvm_mce_in_exception() only when it is required. Signed-off-by: Hidetoshi Seto --- target-i386/kvm.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 786eeeb..a0d0603 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -239,12 +239,16 @@ 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) {