kvm: x86: Fix merge artifact of f8d926e9 about mp_state
PATCH 1/1 kvm: x86: Fix merge artifact of f8d926e9 about mp_state
Signed-off-by Jan Kiszka <[email protected]>
---
target-i386/kvm.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
target-i386/kvm.c +4 -4
@@ -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 ; }