From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:37784) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RLHSE-0008TM-AT for qemu-devel@nongnu.org; Tue, 01 Nov 2011 12:44:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RLHSD-0007eS-Ck for qemu-devel@nongnu.org; Tue, 01 Nov 2011 12:44:50 -0400 Received: from mail-qw0-f45.google.com ([209.85.216.45]:57934) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RLHSD-0007eO-AM for qemu-devel@nongnu.org; Tue, 01 Nov 2011 12:44:49 -0400 Received: by qadc12 with SMTP id c12so7489475qad.4 for ; Tue, 01 Nov 2011 09:44:48 -0700 (PDT) Message-ID: <4EB021FD.4040405@codemonkey.ws> Date: Tue, 01 Nov 2011 11:44:45 -0500 From: Anthony Liguori MIME-Version: 1.0 References: <1318519453-6672-1-git-send-email-agraf@suse.de> In-Reply-To: <1318519453-6672-1-git-send-email-agraf@suse.de> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] KVM: Use -cpu host as default on x86 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alexander Graf Cc: qemu-devel@nongnu.org On 10/13/2011 10:24 AM, Alexander Graf wrote: > When running QEMU without -cpu parameter, the user usually wants a sane > default. So far, we're using the qemu64/qemu32 CPU type, which basically > means "the maximum TCG can emulate". > > That's a really good default when using TCG, but when running with KVM > we much rather want a default saying "the maximum KVM can support". > > Fortunately we already have such a CPU type. It's called "host". All we > need to do is to select it by default when not getting a -cpu passed in. > > This fixes a lot of subtile breakage in the GNU toolchain (libgmp) which > hicks up on QEMU's non-existent CPU models. > > Signed-off-by: Alexander Graf Need to make sure that older machine types (i.e. pc-0.15, pc-0.14) default to the appropriate CPU model. Regards, Anthony Liguori > --- > hw/pc.c | 10 +++++++--- > hw/pc.h | 2 +- > hw/pc_piix.c | 2 +- > 3 files changed, 9 insertions(+), 5 deletions(-) > > diff --git a/hw/pc.c b/hw/pc.c > index 203627d..e0c48f2 100644 > --- a/hw/pc.c > +++ b/hw/pc.c > @@ -941,17 +941,21 @@ static CPUState *pc_new_cpu(const char *cpu_model) > return env; > } > > -void pc_cpus_init(const char *cpu_model) > +void pc_cpus_init(const char *cpu_model, int kvm_enabled) > { > int i; > > /* init CPUs */ > if (cpu_model == NULL) { > + if (kvm_enabled) { > + cpu_model = "host"; > + } else { > #ifdef TARGET_X86_64 > - cpu_model = "qemu64"; > + cpu_model = "qemu64"; > #else > - cpu_model = "qemu32"; > + cpu_model = "qemu32"; > #endif > + } > } > > for(i = 0; i< smp_cpus; i++) { > diff --git a/hw/pc.h b/hw/pc.h > index f3e21b6..b5519ff 100644 > --- a/hw/pc.h > +++ b/hw/pc.h > @@ -130,7 +130,7 @@ void pc_register_ferr_irq(qemu_irq irq); > void pc_cmos_set_s3_resume(void *opaque, int irq, int level); > void pc_acpi_smi_interrupt(void *opaque, int irq, int level); > > -void pc_cpus_init(const char *cpu_model); > +void pc_cpus_init(const char *cpu_model, int kvm_enabled); > void pc_memory_init(MemoryRegion *system_memory, > const char *kernel_filename, > const char *kernel_cmdline, > diff --git a/hw/pc_piix.c b/hw/pc_piix.c > index ce1c87f..a080191 100644 > --- a/hw/pc_piix.c > +++ b/hw/pc_piix.c > @@ -99,7 +99,7 @@ static void pc_init1(MemoryRegion *system_memory, > MemoryRegion *pci_memory; > MemoryRegion *rom_memory; > > - pc_cpus_init(cpu_model); > + pc_cpus_init(cpu_model, kvm_enabled()); > > if (kvmclock_enabled) { > kvmclock_create();