From patchwork Fri Feb 14 19:22:52 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stuart Yoder X-Patchwork-Id: 24665 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f71.google.com (mail-yh0-f71.google.com [209.85.213.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5D18A2055D for ; Fri, 14 Feb 2014 19:24:12 +0000 (UTC) Received: by mail-yh0-f71.google.com with SMTP id z6sf28066337yhz.10 for ; Fri, 14 Feb 2014 11:24:11 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:mime-version:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list:content-type; bh=kdXdTfIvwwpaL6Y948fMMcNx1NqE2Gr90ivMQUZTBEc=; b=U97PitJ5U021Zlop8kO+PoJuN8jJIAhTIRnc7gZdtxg8r6/uvwIwotFsKLq2P/JB01 0vH3AtEFWRK3tqcRYwLgnVYILs4zsi5T633Qs/+GRb3VXjTPw/IvnhgnkTI+W+2Vb+g4 wX9+L086vgK78EOA6KkrFkRhXOSxTjXYWa5/iULPwwe49VRjNC5a/VGgdEfqYmPCKjqq WIBJz1cQJs9uLPBSwI75jBUSdYV+YiRwRem+cV3q9LCrXUcSdsimXn022g9P8W82i4ON lwThusJuyQOaoXXzdfS75m7Wm89IPNJIwx45mBf09bmWNHeUwc/1NtD8iXRdynVanzD8 ITpA== X-Gm-Message-State: ALoCoQnVMH6JXXzX3P32bvQVtfeMH6AJbZsfJfx/wxgOkl7S88g+G30v2Gup6mMlU7jl9EBr+mBL X-Received: by 10.52.53.73 with SMTP id z9mr3453518vdo.4.1392405851536; Fri, 14 Feb 2014 11:24:11 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.30.201 with SMTP id d67ls148487qgd.62.gmail; Fri, 14 Feb 2014 11:24:11 -0800 (PST) X-Received: by 10.220.99.7 with SMTP id s7mr2604275vcn.19.1392405851367; Fri, 14 Feb 2014 11:24:11 -0800 (PST) Received: from mail-ve0-f172.google.com (mail-ve0-f172.google.com [209.85.128.172]) by mx.google.com with ESMTPS id p9si2227576vdv.148.2014.02.14.11.24.11 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 14 Feb 2014 11:24:11 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.172 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.172; Received: by mail-ve0-f172.google.com with SMTP id c14so10130194vea.3 for ; Fri, 14 Feb 2014 11:24:11 -0800 (PST) X-Received: by 10.52.185.196 with SMTP id fe4mr1994014vdc.27.1392405851282; Fri, 14 Feb 2014 11:24:11 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.174.196 with SMTP id u4csp133264vcz; Fri, 14 Feb 2014 11:24:10 -0800 (PST) X-Received: by 10.140.93.130 with SMTP id d2mr15180418qge.41.1392405850799; Fri, 14 Feb 2014 11:24:10 -0800 (PST) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id f91si4559686qge.198.2014.02.14.11.24.10 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 14 Feb 2014 11:24:10 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:53502 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WEOMr-0002t1-W7 for patch@linaro.org; Fri, 14 Feb 2014 14:24:10 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59961) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WEOMB-0002Jk-SD for qemu-devel@nongnu.org; Fri, 14 Feb 2014 14:23:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WEOM5-0000s7-Pm for qemu-devel@nongnu.org; Fri, 14 Feb 2014 14:23:27 -0500 Received: from co1ehsobe001.messaging.microsoft.com ([216.32.180.184]:50288 helo=co1outboundpool.messaging.microsoft.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WEOLs-0000Lx-Q8; Fri, 14 Feb 2014 14:23:08 -0500 Received: from mail94-co1-R.bigfish.com (10.243.78.243) by CO1EHSOBE004.bigfish.com (10.243.66.67) with Microsoft SMTP Server id 14.1.225.22; Fri, 14 Feb 2014 19:23:07 +0000 Received: from mail94-co1 (localhost [127.0.0.1]) by mail94-co1-R.bigfish.com (Postfix) with ESMTP id 4D46C2801F0; Fri, 14 Feb 2014 19:23:07 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: 0 X-BigFish: VS0(zzzz1f42h2148h208ch1ee6h1de0h1fdah2073h2146h1202h1e76h2189h1d1ah1d2ah21bch1fc6hzz1de098h8275bh1de097hz2dh2a8h839hd24he5bhf0ah1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h1504h1537h162dh1631h1758h1898h18e1h1946h19b5h1ad9h1b0ah1b2fh2222h224fh1fb3h1d0ch1d2eh1d3fh1dfeh1dffh1e23h1fe8h1ff5h2218h2216h226dh22d0h24afh2327h2336h2438h2461h2487h24d7h2516h2545h255eh1155h) Received: from mail94-co1 (localhost.localdomain [127.0.0.1]) by mail94-co1 (MessageSwitch) id 139240578684143_6409; Fri, 14 Feb 2014 19:23:06 +0000 (UTC) Received: from CO1EHSMHS010.bigfish.com (unknown [10.243.78.253]) by mail94-co1.bigfish.com (Postfix) with ESMTP id 0F44FD40041; Fri, 14 Feb 2014 19:23:06 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by CO1EHSMHS010.bigfish.com (10.243.66.20) with Microsoft SMTP Server (TLS) id 14.16.227.3; Fri, 14 Feb 2014 19:23:05 +0000 Received: from az84smr01.freescale.net (10.64.34.197) by 039-SN1MMR1-004.039d.mgd.msft.net (10.84.1.14) with Microsoft SMTP Server (TLS) id 14.3.158.2; Fri, 14 Feb 2014 19:23:04 +0000 Received: from right.am.freescale.net (right.am.freescale.net [10.81.116.70]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id s1EJMx1R028609; Fri, 14 Feb 2014 12:23:04 -0700 From: Stuart Yoder To: Date: Fri, 14 Feb 2014 13:22:52 -0600 Message-ID: <1392405772-8664-2-git-send-email-stuart.yoder@freescale.com> X-Mailer: git-send-email 1.7.9.7 In-Reply-To: <1392405772-8664-1-git-send-email-stuart.yoder@freescale.com> References: <1392405772-8664-1-git-send-email-stuart.yoder@freescale.com> MIME-Version: 1.0 X-OriginatorOrg: freescale.com X-FOPE-CONNECTOR: Id%0$Dn%*$RO%0$TLS%0$FQDN%$TlsDn% X-FOPE-CONNECTOR: Id%0$Dn%FREESCALE.MAIL.ONMICROSOFT.COM$RO%1$TLS%0$FQDN%$TlsDn% X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 X-Received-From: 216.32.180.184 Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org, Stuart Yoder Subject: [Qemu-devel] [PATCH 2/2] QEMU: PPC: set default cpu type to be 'host' X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: stuart.yoder@freescale.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.172 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Stuart Yoder -for KVM we always want the cpu to be that of the host system, so make that the default -for TGC mode, the emulated cpu type should be explicitly set Signed-off-by: Stuart Yoder --- hw/ppc/e500.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index b37ce9d..69dbf47 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -621,7 +621,11 @@ void ppce500_init(QEMUMachineInitArgs *args, PPCE500Params *params) /* Setup CPUs */ if (args->cpu_model == NULL) { - args->cpu_model = "e500v2_v30"; + if (kvm_enabled()) { + args->cpu_model = "host"; + } else { + args->cpu_model = "e500v2_v30"; + } } irqs = g_malloc0(smp_cpus * sizeof(qemu_irq *));