From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59944) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X4uHl-0005o6-P9 for qemu-devel@nongnu.org; Wed, 09 Jul 2014 12:00:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X4uHd-0006ix-LE for qemu-devel@nongnu.org; Wed, 09 Jul 2014 11:59:57 -0400 Received: from mail-wi0-x229.google.com ([2a00:1450:400c:c05::229]:36517) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X4uHd-0006hp-Dc for qemu-devel@nongnu.org; Wed, 09 Jul 2014 11:59:49 -0400 Received: by mail-wi0-f169.google.com with SMTP id hi2so3049113wib.4 for ; Wed, 09 Jul 2014 08:59:48 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 9 Jul 2014 17:59:29 +0200 Message-Id: <1404921577-1461-3-git-send-email-pbonzini@redhat.com> In-Reply-To: <1404921577-1461-1-git-send-email-pbonzini@redhat.com> References: <1404921577-1461-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 02/10] mips_malta: Change default KVM cpu to 24Kc (no FP) List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: James Hogan , Aurelien Jarno From: James Hogan 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. Cc: Aurelien Jarno Cc: Paolo Bonzini Signed-off-by: James Hogan Reviewed-by: Aurelien Jarno Signed-off-by: Paolo Bonzini --- 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 2868ee5..c084199 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.8.3.1