From patchwork Fri Nov 6 18:39:23 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [1/5] kvm: x86: Fix merge artifact of f8d926e9 about mp_state Date: Fri, 06 Nov 2009 08:39:23 -0000 From: Jan Kiszka X-Patchwork-Id: 37888 Message-Id: <20091106183923.11700.18550.stgit@mchn012c.ww002.siemens.net> To: Anthony Liguori Cc: Marcelo Tosatti , qemu-devel@nongnu.org, Avi Kivity Signed-off-by: Jan Kiszka --- target-i386/kvm.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 7010999..aa90eff 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -683,10 +683,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; } @@ -710,6 +706,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; }