]> Git Repo - qemu.git/commitdiff
kvm: x86: Fix merge artifact of f8d926e9 about mp_state
authorJan Kiszka <[email protected]>
Tue, 24 Nov 2009 23:31:03 +0000 (00:31 +0100)
committerAnthony Liguori <[email protected]>
Thu, 3 Dec 2009 21:25:56 +0000 (15:25 -0600)
Signed-off-by: Jan Kiszka <[email protected]>
Signed-off-by: Anthony Liguori <[email protected]>
target-i386/kvm.c

index d6bc23ae26dcd64d4d133e7b2e754cf45cec4b7b..89fd7a52b5e72f191b903caa327dbba7020222c3 100644 (file)
@@ -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;
 }
 
This page took 0.028214 seconds and 4 git commands to generate.