From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MxfAt-0001uF-2T for qemu-devel@nongnu.org; Tue, 13 Oct 2009 07:04:15 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MxfAn-0001oH-8d for qemu-devel@nongnu.org; Tue, 13 Oct 2009 07:04:13 -0400 Received: from [199.232.76.173] (port=39431 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MxfAn-0001oE-3u for qemu-devel@nongnu.org; Tue, 13 Oct 2009 07:04:09 -0400 Received: from goliath.siemens.de ([192.35.17.28]:19263) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MxfAm-0002Jq-8D for qemu-devel@nongnu.org; Tue, 13 Oct 2009 07:04:08 -0400 Received: from mail2.siemens.de (localhost [127.0.0.1]) by goliath.siemens.de (8.12.11.20060308/8.12.11) with ESMTP id n9DB43tU031644 for ; Tue, 13 Oct 2009 13:04:03 +0200 Received: from [139.25.109.167] (mchn012c.mchp.siemens.de [139.25.109.167] (may be forged)) by mail2.siemens.de (8.12.11.20060308/8.12.11) with ESMTP id n9DB43Op019301 for ; Tue, 13 Oct 2009 13:04:03 +0200 Message-ID: <4AD45EA3.5040907@siemens.com> Date: Tue, 13 Oct 2009 13:04:03 +0200 From: Jan Kiszka MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH] kvm: x86: Fix merge artifact of f8d926e9 about mp_state List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel Signed-off-by: Jan Kiszka --- target-i386/kvm.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 7010999..aa90eff 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -683,10 +683,6 @@ int kvm_arch_put_registers(CPUState *env) if (ret < 0) return ret; - ret = kvm_get_mp_state(env); - if (ret < 0) - return ret; - return 0; } @@ -710,6 +706,10 @@ int kvm_arch_get_registers(CPUState *env) if (ret < 0) return ret; + ret = kvm_get_mp_state(env); + if (ret < 0) + return ret; + return 0; }