From: Jan Kiszka <jan.kiszka@web.de>
To: Anthony Liguori <aliguori@us.ibm.com>
Cc: qemu-devel <qemu-devel@nongnu.org>
Subject: [Qemu-devel] [PATCH][RESEND] kvm: x86: Fix merge artifact of f8d926e9 about mp_state
Date: Wed, 25 Nov 2009 00:31:03 +0100 [thread overview]
Message-ID: <4B0C6CB7.6070408@web.de> (raw)
[-- 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 --]
reply other threads:[~2009-11-24 23:31 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4B0C6CB7.6070408@web.de \
--to=jan.kiszka@web.de \
--cc=aliguori@us.ibm.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).