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>
This commit is contained in:
Jan Kiszka
2009-12-03 15:25:56 -06:00
committed by Anthony Liguori
parent dc702288a3
commit 5a2e3c2e11
+4 -4
View File
@@ -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;
}