From patchwork Wed Mar  2 07:56:18 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Jan Kiszka <jan.kiszka@siemens.com>
X-Patchwork-Id: 602241
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p227vnIj008596
	for <patchwork-kvm@patchwork.kernel.org>; Wed, 2 Mar 2011 07:57:49 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1755784Ab1CBH5i (ORCPT
	<rfc822;patchwork-kvm@patchwork.kernel.org>);
	Wed, 2 Mar 2011 02:57:38 -0500
Received: from david.siemens.de ([192.35.17.14]:22840 "EHLO david.siemens.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1755673Ab1CBH4u (ORCPT <rfc822;kvm@vger.kernel.org>);
	Wed, 2 Mar 2011 02:56:50 -0500
Received: from mail1.siemens.de (localhost [127.0.0.1])
	by david.siemens.de (8.13.6/8.13.6) with ESMTP id p227uXvk011259;
	Wed, 2 Mar 2011 08:56:33 +0100
Received: from mchn199C.mchp.siemens.de ([146.254.217.97])
	by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id p227uKnT031204;
	Wed, 2 Mar 2011 08:56:32 +0100
From: Jan Kiszka <jan.kiszka@siemens.com>
To: Avi Kivity <avi@redhat.com>, Marcelo Tosatti <mtosatti@redhat.com>
Cc: kvm@vger.kernel.org, qemu-devel@nongnu.org,
	Huang Ying <ying.huang@intel.com>,
	Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>,
	Jin Dongming <jin.dongming@np.css.fujitsu.com>
Subject: [PATCH v3 15/17] kvm: x86: Fail kvm_arch_init_vcpu if MCE
	initialization fails
Date: Wed,  2 Mar 2011 08:56:18 +0100
Message-Id: 
 <f29f651236cff84a5351c88319f700cf8534743f.1299052578.git.jan.kiszka@siemens.com>
X-Mailer: git-send-email 1.7.1
In-Reply-To: <cover.1299052578.git.jan.kiszka@siemens.com>
References: <cover.1299052578.git.jan.kiszka@siemens.com>
In-Reply-To: <cover.1299052578.git.jan.kiszka@siemens.com>
References: <cover.1299052578.git.jan.kiszka@siemens.com>
Sender: kvm-owner@vger.kernel.org
Precedence: bulk
List-ID: <kvm.vger.kernel.org>
X-Mailing-List: kvm@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]);
	Wed, 02 Mar 2011 07:57:49 +0000 (UTC)


diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 486efb9..44e5504 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -437,20 +437,24 @@ int kvm_arch_init_vcpu(CPUState *env)
         int banks;
         int ret;
 
-        if (kvm_get_mce_cap_supported(env->kvm_state, &mcg_cap, &banks)) {
-            perror("kvm_get_mce_cap_supported FAILED");
-        } else {
-            if (banks > MCE_BANKS_DEF)
-                banks = MCE_BANKS_DEF;
-            mcg_cap &= MCE_CAP_DEF;
-            mcg_cap |= banks;
-            ret = kvm_vcpu_ioctl(env, KVM_X86_SETUP_MCE, &mcg_cap);
-            if (ret < 0) {
-                fprintf(stderr, "KVM_X86_SETUP_MCE: %s", strerror(-ret));
-            } else {
-                env->mcg_cap = mcg_cap;
-            }
+        ret = kvm_get_mce_cap_supported(env->kvm_state, &mcg_cap, &banks);
+        if (ret < 0) {
+            fprintf(stderr, "kvm_get_mce_cap_supported: %s", strerror(-ret));
+            return ret;
         }
+
+        if (banks > MCE_BANKS_DEF) {
+            banks = MCE_BANKS_DEF;
+        }
+        mcg_cap &= MCE_CAP_DEF;
+        mcg_cap |= banks;
+        ret = kvm_vcpu_ioctl(env, KVM_X86_SETUP_MCE, &mcg_cap);
+        if (ret < 0) {
+            fprintf(stderr, "KVM_X86_SETUP_MCE: %s", strerror(-ret));
+            return ret;
+        }
+
+        env->mcg_cap = mcg_cap;
     }
 #endif