From mboxrd@z Thu Jan  1 00:00:00 1970
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 <jan.kiszka@web.de>) id 1ND4qj-000537-7V
	for qemu-devel@nongnu.org; Tue, 24 Nov 2009 18:31:09 -0500
Message-ID: <4B0C6CB7.6070408@web.de>
Date: Wed, 25 Nov 2009 00:31:03 +0100
From: Jan Kiszka <jan.kiszka@web.de>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="------------enigFA8CE3C5BCBEFB4BBB1F5960"
Sender: jan.kiszka@web.de
Subject: [Qemu-devel] [PATCH][RESEND] kvm: x86: Fix merge artifact of
	f8d926e9 about mp_state
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Anthony Liguori <aliguori@us.ibm.com>
Cc: qemu-devel <qemu-devel@nongnu.org>

This is an OpenPGP/MIME signed message (RFC 2440 and 3156)
--------------enigFA8CE3C5BCBEFB4BBB1F5960
Content-Type: text/plain; charset=ISO-8859-15
Content-Transfer-Encoding: quoted-printable

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>

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 =3D kvm_put_mp_state(env);
     if (ret < 0)
         return ret;
=20
-    ret =3D kvm_get_mp_state(env);
-    if (ret < 0)
-        return ret;
-
     return 0;
 }
=20
 int kvm_arch_get_registers(CPUState *env)
@@ -744,8 +740,12 @@ int kvm_arch_get_registers(CPUState *env)
     ret =3D kvm_get_msrs(env);
     if (ret < 0)
         return ret;
=20
+    ret =3D kvm_get_mp_state(env);
+    if (ret < 0)
+        return ret;
+
     return 0;
 }
=20
 int kvm_arch_pre_run(CPUState *env, struct kvm_run *run)
--=20
1.6.0.2


--------------enigFA8CE3C5BCBEFB4BBB1F5960
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: OpenPGP digital signature
Content-Disposition: attachment; filename="signature.asc"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.9 (GNU/Linux)
Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org

iEYEARECAAYFAksMbLsACgkQitSsb3rl5xSTfQCg6TmNOpFuJSKa9UHEjKm4fbkv
poIAoMKPHoEKKNZM1IyPV5hwSQnDdwxn
=bvry
-----END PGP SIGNATURE-----

--------------enigFA8CE3C5BCBEFB4BBB1F5960--