kvm: x86: Fix merge artifact of f8d926e9 about mp_state
PATCH RESEND 1/1 kvm: x86: Fix merge artifact of f8d926e9 about mp_state
Signed-off-by Jan Kiszka <[email protected]>
target-i386/kvm.c +4 -4
@@ -717,12 +717,8 @@ int kvm_arch_put_registers(CPUState *env) ret =kvm_put_mp_state (env);if (ret <0 )return ret; - ret =kvm_get_mp_state (env); -if (ret <0 ) -return ret; -return 0 ; }int kvm_arch_get_registers (CPUState *env)
@@ -744,8 +740,12 @@ int kvm_arch_get_registers(CPUState *env) ret =kvm_get_msrs (env);if (ret <0 )return ret; + ret =kvm_get_mp_state (env); +if (ret <0 ) +return ret; +return 0 ; }int kvm_arch_pre_run (CPUState *env,struct kvm_run *run)
Signature · 1 line
1.6.0.2