From 5a2e3c2e11802215cbb69d6e5ad35b5bdc7d5382 Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Wed, 25 Nov 2009 00:31:03 +0100 Subject: [PATCH] kvm: x86: Fix merge artifact of f8d926e9 about mp_state Signed-off-by: Jan Kiszka Signed-off-by: Anthony Liguori --- target-i386/kvm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/target-i386/kvm.c b/target-i386/kvm.c index d6bc23ae26..89fd7a52b5 100644 --- 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; } -- 2.11.4.GIT