From patchwork Thu Aug 11 23:07:18 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 109711 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 92331B6FD7 for ; Fri, 12 Aug 2011 09:09:12 +1000 (EST) Received: from localhost ([::1]:45099 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QreMy-0007i7-RL for incoming@patchwork.ozlabs.org; Thu, 11 Aug 2011 19:08:56 -0400 Received: from eggs.gnu.org ([140.186.70.92]:59532) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QreMH-0005t4-V8 for qemu-devel@nongnu.org; Thu, 11 Aug 2011 19:08:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QreMC-0004ip-Kt for qemu-devel@nongnu.org; Thu, 11 Aug 2011 19:08:13 -0400 Received: from mail-qy0-f180.google.com ([209.85.216.180]:59464) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QreMC-0004hi-H6 for qemu-devel@nongnu.org; Thu, 11 Aug 2011 19:08:08 -0400 Received: by mail-qy0-f180.google.com with SMTP id 31so1610068qyk.4 for ; Thu, 11 Aug 2011 16:08:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=d71UXWxloFXlNbrP2itqqj3ff7vxebmosWSlZ0QUZKU=; b=UdLUD9dxLqBtUXli8oVtkX+ASrEvkTZEVmXx6EpP3UEoKfl0mI65EVVQphkfJk9qY2 rWnwq6VvFTu2Z6AgWaROy3tKUVH3YYjUXnFPEgcyEmV8WnXlHvGGGvWiqP0oP21VX+Wz SmKvMbBo0VkHXVJzX6uCn5h4hP6hB6ArUYcSU= Received: by 10.229.62.209 with SMTP id y17mr140281qch.196.1313104088431; Thu, 11 Aug 2011 16:08:08 -0700 (PDT) Received: from localhost.localdomain (c-71-227-161-214.hsd1.wa.comcast.net [71.227.161.214]) by mx.google.com with ESMTPS id r3sm1904723qct.3.2011.08.11.16.08.07 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 11 Aug 2011 16:08:08 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 11 Aug 2011 16:07:18 -0700 Message-Id: <1313104041-1641-7-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1313104041-1641-1-git-send-email-rth@twiddle.net> References: <1313104041-1641-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.216.180 Cc: avi@redhat.com Subject: [Qemu-devel] [PATCH 6/9] ppc440: Pass in address_space_mem to ppc440ep_init. 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 Signed-off-by: Richard Henderson --- hw/ppc440.c | 11 +++++------ hw/ppc440.h | 6 +++--- hw/ppc440_bamboo.c | 3 ++- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/hw/ppc440.c b/hw/ppc440.c index 71e85ab..11933d9 100644 --- a/hw/ppc440.c +++ b/hw/ppc440.c @@ -20,7 +20,6 @@ #include "ppc405.h" #include "sysemu.h" #include "kvm.h" -#include "exec-memory.h" #define PPC440EP_PCI_CONFIG 0xeec00000 #define PPC440EP_PCI_INTACK 0xeed00000 @@ -35,9 +34,9 @@ static const unsigned int ppc440ep_sdram_bank_sizes[] = { 256<<20, 128<<20, 64<<20, 32<<20, 16<<20, 8<<20, 0 }; -CPUState *ppc440ep_init(ram_addr_t *ram_size, PCIBus **pcip, - const unsigned int pci_irq_nrs[4], int do_init, - const char *cpu_model) +CPUState *ppc440ep_init(MemoryRegion *address_space_mem, ram_addr_t *ram_size, + PCIBus **pcip, const unsigned int pci_irq_nrs[4], + int do_init, const char *cpu_model) { MemoryRegion *ram_memories = qemu_malloc(PPC440EP_SDRAM_NR_BANKS * sizeof(*ram_memories)); @@ -93,12 +92,12 @@ CPUState *ppc440ep_init(ram_addr_t *ram_size, PCIBus **pcip, isa_mmio_init(PPC440EP_PCI_IO, PPC440EP_PCI_IOLEN); if (serial_hds[0] != NULL) { - serial_mm_init(get_system_memory(), 0xef600300, 0, pic[0], + serial_mm_init(address_space_mem, 0xef600300, 0, pic[0], PPC_SERIAL_MM_BAUDBASE, serial_hds[0], DEVICE_BIG_ENDIAN); } if (serial_hds[1] != NULL) { - serial_mm_init(get_system_memory(), 0xef600400, 0, pic[1], + serial_mm_init(address_space_mem, 0xef600400, 0, pic[1], PPC_SERIAL_MM_BAUDBASE, serial_hds[1], DEVICE_BIG_ENDIAN); } diff --git a/hw/ppc440.h b/hw/ppc440.h index a40f917..9c27c36 100644 --- a/hw/ppc440.h +++ b/hw/ppc440.h @@ -14,8 +14,8 @@ #include "hw.h" -CPUState *ppc440ep_init(ram_addr_t *ram_size, PCIBus **pcip, - const unsigned int pci_irq_nrs[4], int do_init, - const char *cpu_model); +CPUState *ppc440ep_init(MemoryRegion *address_space, ram_addr_t *ram_size, + PCIBus **pcip, const unsigned int pci_irq_nrs[4], + int do_init, const char *cpu_model); #endif diff --git a/hw/ppc440_bamboo.c b/hw/ppc440_bamboo.c index f27c182..a417c8b 100644 --- a/hw/ppc440_bamboo.c +++ b/hw/ppc440_bamboo.c @@ -109,7 +109,8 @@ static void bamboo_init(MemoryRegion *address_space_mem, int i; /* Setup CPU. */ - env = ppc440ep_init(&ram_size, &pcibus, pci_irq_nrs, 1, cpu_model); + env = ppc440ep_init(address_space_mem, &ram_size, &pcibus, + pci_irq_nrs, 1, cpu_model); if (pcibus) { /* Register network interfaces. */