From patchwork Tue Oct 13 11:04:03 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: kvm: x86: Fix merge artifact of f8d926e9 about mp_state Date: Tue, 13 Oct 2009 01:04:03 -0000 From: Jan Kiszka X-Patchwork-Id: 35838 Message-Id: <4AD45EA3.5040907@siemens.com> To: qemu-devel 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; }