From patchwork Tue Nov 24 23:31:03 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 39254 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id BA6281007D1 for ; Wed, 25 Nov 2009 10:31:49 +1100 (EST) Received: from localhost ([127.0.0.1]:53104 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1ND4rK-0006Az-MZ for incoming@patchwork.ozlabs.org; Tue, 24 Nov 2009 18:31:46 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1ND4qo-0006AE-1N for qemu-devel@nongnu.org; Tue, 24 Nov 2009 18:31:14 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1ND4qj-00069G-LJ for qemu-devel@nongnu.org; Tue, 24 Nov 2009 18:31:13 -0500 Received: from [199.232.76.173] (port=38588 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1ND4qj-000697-Dn for qemu-devel@nongnu.org; Tue, 24 Nov 2009 18:31:09 -0500 Received: from fmmailgate02.web.de ([217.72.192.227]:58903) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1ND4qj-000537-7V for qemu-devel@nongnu.org; Tue, 24 Nov 2009 18:31:09 -0500 Received: from smtp06.web.de (fmsmtp06.dlan.cinetic.de [172.20.5.172]) by fmmailgate02.web.de (Postfix) with ESMTP id 5501F144405EF; Wed, 25 Nov 2009 00:31:08 +0100 (CET) Received: from [88.64.22.121] (helo=[192.168.1.10]) by smtp06.web.de with asmtp (TLSv1:AES256-SHA:256) (WEB.DE 4.110 #314) id 1ND4qi-0002Pf-00; Wed, 25 Nov 2009 00:31:08 +0100 Message-ID: <4B0C6CB7.6070408@web.de> Date: Wed, 25 Nov 2009 00:31:03 +0100 From: Jan Kiszka User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 To: Anthony Liguori X-Enigmail-Version: 0.95.7 X-Sender: jan.kiszka@web.de X-Provags-ID: V01U2FsdGVkX1+cdeBAvqRS3SZi7LQx+eKhpKZyfRZn4DixvQrR 60cLf/CkFbVLn6FTzBqLExFqXrCE8Payvxkl1w5kSIFRDEc50r SXgTYy+xQ= X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.4-2.6 Cc: qemu-devel Subject: [Qemu-devel] [PATCH][RESEND] kvm: x86: Fix merge artifact of f8d926e9 about mp_state X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Jan Kiszka diff --git a/target-i386/kvm.c b/target-i386/kvm.c index d6bc23a..89fd7a5 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -717,12 +717,8 @@ int kvm_arch_put_registers(CPUState *env) ret = kvm_put_mp_state(env); if (ret < 0) return ret; - ret = kvm_get_mp_state(env); - if (ret < 0) - return ret; - return 0; } int kvm_arch_get_registers(CPUState *env) @@ -744,8 +740,12 @@ int kvm_arch_get_registers(CPUState *env) ret = kvm_get_msrs(env); if (ret < 0) return ret; + ret = kvm_get_mp_state(env); + if (ret < 0) + return ret; + return 0; } int kvm_arch_pre_run(CPUState *env, struct kvm_run *run)