From patchwork Fri Jun 17 14:44:03 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 100831 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id DAEE2B6FCB for ; Sat, 18 Jun 2011 02:43:26 +1000 (EST) Received: from localhost ([::1]:38419 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QXc8f-0004gR-Dp for incoming@patchwork.ozlabs.org; Fri, 17 Jun 2011 12:43:21 -0400 Received: from eggs.gnu.org ([140.186.70.92]:57749) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QXaHL-00047W-7E for qemu-devel@nongnu.org; Fri, 17 Jun 2011 10:44:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QXaHJ-0002gU-7V for qemu-devel@nongnu.org; Fri, 17 Jun 2011 10:44:10 -0400 Received: from cantor.suse.de ([195.135.220.2]:42702 helo=mx1.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QXaHH-0002fQ-Dj for qemu-devel@nongnu.org; Fri, 17 Jun 2011 10:44:07 -0400 Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.221.2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.suse.de (Postfix) with ESMTP id 9AF7993EE3; Fri, 17 Jun 2011 16:44:05 +0200 (CEST) From: Alexander Graf To: "qemu-devel@nongnu.org Developers" Date: Fri, 17 Jun 2011 16:44:03 +0200 Message-Id: <1308321844-11699-9-git-send-email-agraf@suse.de> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: <1308321844-11699-1-git-send-email-agraf@suse.de> References: <1308321844-11699-1-git-send-email-agraf@suse.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-Received-From: 195.135.220.2 Cc: Aurelien Jarno Subject: [Qemu-devel] [PATCH 8/9] PPC: 440: Use 440 style MMU as default, so Qemu knows the MMU type 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org We have some KVM interaction code in Qemu that tries to be clever and ignore some capabilities when running on BookE style MMUs. Unfortunately, the default CPU bamboo was defaulting to was not a BookE-style MMU, resulting in the check to fail. With this patch, guests can run again on 440 with -enable-kvm. Signed-off-by: Alexander Graf --- hw/ppc440.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/ppc440.c b/hw/ppc440.c index 1ed001a..90abc91 100644 --- a/hw/ppc440.c +++ b/hw/ppc440.c @@ -45,8 +45,9 @@ CPUState *ppc440ep_init(ram_addr_t *ram_size, PCIBus **pcip, qemu_irq *irqs; qemu_irq *pci_irqs; - if (cpu_model == NULL) - cpu_model = "405"; // XXX: should be 440EP + if (cpu_model == NULL) { + cpu_model = "440-Xilinx"; // XXX: should be 440EP + } env = cpu_init(cpu_model); if (!env) { fprintf(stderr, "Unable to initialize CPU!\n");