* [Qemu-devel] [PATCH][RESEND] kvm: x86: Fix merge artifact of f8d926e9 about mp_state
@ 2009-11-24 23:31 Jan Kiszka
0 siblings, 0 replies; only message in thread
From: Jan Kiszka @ 2009-11-24 23:31 UTC (permalink / raw)
To: Anthony Liguori; +Cc: qemu-devel
[-- Attachment #1: Type: text/plain, Size: 792 bytes --]
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
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)
--
1.6.0.2
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 257 bytes --]
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2009-11-24 23:31 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-11-24 23:31 [Qemu-devel] [PATCH][RESEND] kvm: x86: Fix merge artifact of f8d926e9 about mp_state Jan Kiszka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).