kvm: x86: Fix merge artifact of f8d926e9 about mp_state Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.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
@@ -718,10 +718,6 @@ if (ret < 0) return ret; - ret = kvm_get_mp_state(env); - if (ret < 0) - return ret; - return 0; } @@ -745,6 +741,10 @@ if (ret < 0) return ret; + ret = kvm_get_mp_state(env); + if (ret < 0) + return ret; + return 0; }