Patchwork [RESEND] kvm: x86: Fix merge artifact of f8d926e9 about mp_state

login
register
mail settings
Submitter Jan Kiszka
Date Nov. 24, 2009, 11:31 p.m.
Message ID <4B0C6CB7.6070408@web.de>
Download mbox | patch
Permalink /patch/39254/
State New
Headers show

Comments

Jan Kiszka - Nov. 24, 2009, 11:31 p.m.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>

Patch

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)