projects
/
sdk
/
emulator
/
qemu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2c0e642
)
kvm: x86: Fix merge artifact of f8d926e9 about mp_state
author
Jan Kiszka
<jan.kiszka@web.de>
Tue, 24 Nov 2009 23:31:03 +0000
(
00:31
+0100)
committer
Anthony Liguori
<aliguori@us.ibm.com>
Thu, 3 Dec 2009 21:25:56 +0000
(15:25 -0600)
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
target-i386/kvm.c
patch
|
blob
|
history
diff --git
a/target-i386/kvm.c
b/target-i386/kvm.c
index
d6bc23a
..
89fd7a5
100644
(file)
--- 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;
}