From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alexander Graf Subject: Re: [PATCH 1/3] Make kvm64 the default cpu model when kvm_enabled() Date: Tue, 14 Sep 2010 17:58:03 +0200 Message-ID: <4C8F9B8B.9060205@suse.de> References: <1284479530-4748-1-git-send-email-joerg.roedel@amd.com> <1284479530-4748-2-git-send-email-joerg.roedel@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: Avi Kivity , Marcelo Tosatti , kvm@vger.kernel.org, qemu-devel@nongnu.org To: Joerg Roedel Return-path: Received: from cantor.suse.de ([195.135.220.2]:43343 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751215Ab0INP6F (ORCPT ); Tue, 14 Sep 2010 11:58:05 -0400 In-Reply-To: <1284479530-4748-2-git-send-email-joerg.roedel@amd.com> Sender: kvm-owner@vger.kernel.org List-ID: Joerg Roedel wrote: > 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; > Braces :(. Alex From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=56225 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OvXtY-0006A3-8P for qemu-devel@nongnu.org; Tue, 14 Sep 2010 11:58:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OvXtW-0006JK-PM for qemu-devel@nongnu.org; Tue, 14 Sep 2010 11:58:08 -0400 Received: from cantor.suse.de ([195.135.220.2]:43342 helo=mx1.suse.de) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OvXtW-0006Ie-Jz for qemu-devel@nongnu.org; Tue, 14 Sep 2010 11:58:06 -0400 Message-ID: <4C8F9B8B.9060205@suse.de> Date: Tue, 14 Sep 2010 17:58:03 +0200 From: Alexander Graf MIME-Version: 1.0 References: <1284479530-4748-1-git-send-email-joerg.roedel@amd.com> <1284479530-4748-2-git-send-email-joerg.roedel@amd.com> In-Reply-To: <1284479530-4748-2-git-send-email-joerg.roedel@amd.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] Re: [PATCH 1/3] Make kvm64 the default cpu model when kvm_enabled() List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Joerg Roedel Cc: Marcelo Tosatti , Avi Kivity , kvm@vger.kernel.org, qemu-devel@nongnu.org Joerg Roedel wrote: > 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; > Braces :(. Alex