From: Jan Kiszka <jan.kiszka@web.de>
Date: Tue, 24 Nov 2009 23:31:03 +0000 (+0100)
Subject: kvm: x86: Fix merge artifact of f8d926e9 about mp_state
X-Git-Tag: v0.12.0-rc0~39
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5a2e3c2e11802215cbb69d6e5ad35b5bdc7d5382;p=thirdparty%2Fqemu.git

kvm: x86: Fix merge artifact of f8d926e9 about mp_state

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index d6bc23ae26d..89fd7a52b5e 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -718,10 +718,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;
 }
 
@@ -745,6 +741,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;
 }