Patchwork kvm: x86: Fix merge artifact of f8d926e9 about mp_state

login
register
mail settings
Submitter Jan Kiszka
Date Oct. 13, 2009, 11:04 a.m.
Message ID <4AD45EA3.5040907@siemens.com>
Download mbox | patch
Permalink /patch/35838/
State New
Headers show

Comments

Jan Kiszka - Oct. 13, 2009, 11:04 a.m.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---

 target-i386/kvm.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

Patch

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;
 }