Change the default Malta CPU model for when KVM is enabled to 24Kc which doesn't have floating point support compared to the 24Kf. The resulting incorrect Config CP0 register value doesn't get passed to KVM yet as KVM doesn't expose it, however we should ensure it is set correctly now to reduce the risk of breaking migration/loadvm to a future version of QEMU/Linux that does support them. Signed-off-by: James Hogan <james.hogan@xxxxxxxxxx> Cc: Aurelien Jarno <aurelien@xxxxxxxxxxx> Cc: Paolo Bonzini <pbonzini@xxxxxxxxxx> --- hw/mips/mips_malta.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index 2868ee5b0307..c0841991f4e9 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -949,7 +949,12 @@ void mips_malta_init(MachineState *machine) #ifdef TARGET_MIPS64 cpu_model = "20Kc"; #else - cpu_model = "24Kf"; + if (kvm_enabled()) { + /* Don't enable FPU on KVM yet */ + cpu_model = "24Kc"; + } else { + cpu_model = "24Kf"; + } #endif } -- 1.9.3 -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html