From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=43817 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P81ZC-0000Ac-TB for qemu-devel@nongnu.org; Mon, 18 Oct 2010 22:04:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1P81ZB-0008BM-QG for qemu-devel@nongnu.org; Mon, 18 Oct 2010 22:04:42 -0400 Received: from fgwmail5.fujitsu.co.jp ([192.51.44.35]:50880) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1P81ZB-00089c-58 for qemu-devel@nongnu.org; Mon, 18 Oct 2010 22:04:41 -0400 Received: from m2.gw.fujitsu.co.jp ([10.0.50.72]) by fgwmail5.fujitsu.co.jp (Fujitsu Gateway) with ESMTP id o9J24caE032646 for (envelope-from seto.hidetoshi@jp.fujitsu.com); Tue, 19 Oct 2010 11:04:38 +0900 Received: from smail (m2 [127.0.0.1]) by outgoing.m2.gw.fujitsu.co.jp (Postfix) with ESMTP id 00A7645DE4E for ; Tue, 19 Oct 2010 11:04:38 +0900 (JST) Received: from s2.gw.fujitsu.co.jp (s2.gw.fujitsu.co.jp [10.0.50.92]) by m2.gw.fujitsu.co.jp (Postfix) with ESMTP id D35A645DE61 for ; Tue, 19 Oct 2010 11:04:37 +0900 (JST) Received: from s2.gw.fujitsu.co.jp (localhost.localdomain [127.0.0.1]) by s2.gw.fujitsu.co.jp (Postfix) with ESMTP id B39B51DB8042 for ; Tue, 19 Oct 2010 11:04:37 +0900 (JST) Received: from m108.s.css.fujitsu.com (m108.s.css.fujitsu.com [10.249.87.108]) by s2.gw.fujitsu.co.jp (Postfix) with ESMTP id 5FC4D1DB803C for ; Tue, 19 Oct 2010 11:04:37 +0900 (JST) Message-ID: <4CBCFCA4.60307@jp.fujitsu.com> Date: Tue, 19 Oct 2010 11:04:20 +0900 From: Hidetoshi Seto MIME-Version: 1.0 References: <4CB6C580.1090804@np.css.fujitsu.com> <20101015010649.GB32272@amt.cnet> <4CB7B3C5.7070102@jp.fujitsu.com> <20101015133012.GA16246@amt.cnet> <4CBCFB71.3070103@jp.fujitsu.com> In-Reply-To: <4CBCFB71.3070103@jp.fujitsu.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH uq/master 1/2] kvm, x86: ignore SRAO only when MCG_SER_P is available List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Marcelo Tosatti Cc: KVM list , Dean Nelson , "qemu-devel@nongnu.org" , Avi Kivity , Huang Ying , Jin Dongming 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 d940175..98a0505 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) { -- 1.7.3.1