From patchwork Tue Sep 14 15:52:08 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joerg Roedel X-Patchwork-Id: 64719 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 00C561007E7 for ; Wed, 15 Sep 2010 01:53:10 +1000 (EST) Received: from localhost ([127.0.0.1]:46186 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OvXoh-0001WH-7f for incoming@patchwork.ozlabs.org; Tue, 14 Sep 2010 11:53:07 -0400 Received: from [140.186.70.92] (port=45319 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OvXna-0001UX-7y for qemu-devel@nongnu.org; Tue, 14 Sep 2010 11:51:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OvXnX-00059k-Cw for qemu-devel@nongnu.org; Tue, 14 Sep 2010 11:51:58 -0400 Received: from tx2ehsobe005.messaging.microsoft.com ([65.55.88.15]:6997 helo=TX2EHSOBE010.bigfish.com) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OvXnX-00059H-7d for qemu-devel@nongnu.org; Tue, 14 Sep 2010 11:51:55 -0400 Received: from mail105-tx2-R.bigfish.com (10.9.14.235) by TX2EHSOBE010.bigfish.com (10.9.40.30) with Microsoft SMTP Server id 8.1.340.0; Tue, 14 Sep 2010 15:51:54 +0000 Received: from mail105-tx2 (localhost.localdomain [127.0.0.1]) by mail105-tx2-R.bigfish.com (Postfix) with ESMTP id 67EA5DC84B2; Tue, 14 Sep 2010 15:51:54 +0000 (UTC) X-SpamScore: 1 X-BigFish: VS1(zzzz1202hzz8275bhz32i87h2a8h62h) X-FB-DOMAIN-IP-MATCH: fail Received: from mail105-tx2 (localhost.localdomain [127.0.0.1]) by mail105-tx2 (MessageSwitch) id 1284479513222469_30365; Tue, 14 Sep 2010 15:51:53 +0000 (UTC) Received: from TX2EHSMHS027.bigfish.com (unknown [10.9.14.250]) by mail105-tx2.bigfish.com (Postfix) with ESMTP id 11D0DC80067; Tue, 14 Sep 2010 15:51:53 +0000 (UTC) Received: from ausb3extmailp02.amd.com (163.181.251.22) by TX2EHSMHS027.bigfish.com (10.9.99.127) with Microsoft SMTP Server (TLS) id 14.0.482.44; Tue, 14 Sep 2010 15:51:50 +0000 Received: from ausb3twp01.amd.com (ausb3twp01.amd.com [163.181.250.37]) by ausb3extmailp02.amd.com (Switch-3.2.7/Switch-3.2.7) with SMTP id o8EFsRew004164; Tue, 14 Sep 2010 10:54:40 -0500 X-WSS-ID: 0L8QUPW-01-0DZ-02 X-M-MSG: Received: from sausexhtp02.amd.com (sausexhtp02.amd.com [163.181.3.152]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (No client certificate requested) by ausb3twp01.amd.com (Tumbleweed MailGate 3.7.2) with ESMTP id 2DB851028779; Tue, 14 Sep 2010 10:51:32 -0500 (CDT) Received: from storexhtp01.amd.com (172.24.4.3) by sausexhtp02.amd.com (163.181.3.152) with Microsoft SMTP Server (TLS) id 8.3.83.0; Tue, 14 Sep 2010 10:51:36 -0500 Received: from gwo.osrc.amd.com (165.204.16.204) by storexhtp01.amd.com (172.24.4.3) with Microsoft SMTP Server id 8.3.83.0; Tue, 14 Sep 2010 11:51:35 -0400 Received: from lemmy.osrc.amd.com (lemmy.osrc.amd.com [165.204.15.93]) by gwo.osrc.amd.com (Postfix) with ESMTP id D7C4649C1ED; Tue, 14 Sep 2010 16:51:34 +0100 (BST) Received: by lemmy.osrc.amd.com (Postfix, from userid 1000) id 6B848A024F; Tue, 14 Sep 2010 17:52:17 +0200 (CEST) From: Joerg Roedel To: Avi Kivity , Marcelo Tosatti Date: Tue, 14 Sep 2010 17:52:08 +0200 Message-ID: <1284479530-4748-2-git-send-email-joerg.roedel@amd.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1284479530-4748-1-git-send-email-joerg.roedel@amd.com> References: <1284479530-4748-1-git-send-email-joerg.roedel@amd.com> MIME-Version: 1.0 X-Reverse-DNS: ausb3extmailp02.amd.com X-detected-operating-system: by eggs.gnu.org: Windows 2000 SP4, XP SP1+ Cc: Joerg Roedel , Alexander Graf , kvm@vger.kernel.org, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 1/3] Make kvm64 the default cpu model when kvm_enabled() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org As requested by Alex this patch makes kvm64 the default CPU model when qemu is started with -enable-kvm. Signed-off-by: Joerg Roedel --- hw/pc.c | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index 69b13bf..f531d0d 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -40,6 +40,16 @@ #include "sysbus.h" #include "sysemu.h" #include "blockdev.h" +#include "kvm.h" + + +#ifdef TARGET_X86_64 +#define DEFAULT_KVM_CPU_MODEL "kvm64" +#define DEFAULT_QEMU_CPU_MODEL "qemu64" +#else +#define DEFAULT_KVM_CPU_MODEL "kvm32" +#define DEFAULT_QEMU_CPU_MODEL "qemu32" +#endif /* output Bochs bios info messages */ //#define DEBUG_BIOS @@ -867,11 +877,10 @@ void pc_cpus_init(const char *cpu_model) /* init CPUs */ if (cpu_model == NULL) { -#ifdef TARGET_X86_64 - cpu_model = "qemu64"; -#else - cpu_model = "qemu32"; -#endif + if (kvm_enabled()) + cpu_model = DEFAULT_KVM_CPU_MODEL; + else + cpu_model = DEFAULT_QEMU_CPU_MODEL; } for(i = 0; i < smp_cpus; i++) {