summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Kiszka <jan.kiszka@web.de>2009-11-25 00:31:03 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2009-12-03 15:25:56 -0600
commit5a2e3c2e11802215cbb69d6e5ad35b5bdc7d5382 (patch)
treeab55e1c3f765bdabd86edea0f65d5cce47109405 /target-i386
parenttarge-ppc: Sync CPU state for KVM (diff)
downloadqemu-kvm-5a2e3c2e11802215cbb69d6e5ad35b5bdc7d5382.tar.gz
qemu-kvm-5a2e3c2e11802215cbb69d6e5ad35b5bdc7d5382.tar.bz2
qemu-kvm-5a2e3c2e11802215cbb69d6e5ad35b5bdc7d5382.zip
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>
Diffstat (limited to 'target-i386')
-rw-r--r--target-i386/kvm.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index d6bc23ae2..89fd7a52b 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;
}