From patchwork Thu Aug 11 23:07:21 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 109710 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 333C2B6F6F for ; Fri, 12 Aug 2011 09:08:49 +1000 (EST) Received: from localhost ([::1]:42662 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QreMl-0006QN-IM for incoming@patchwork.ozlabs.org; Thu, 11 Aug 2011 19:08:43 -0400 Received: from eggs.gnu.org ([140.186.70.92]:59555) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QreMK-00062p-8O for qemu-devel@nongnu.org; Thu, 11 Aug 2011 19:08:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QreMG-0004jX-61 for qemu-devel@nongnu.org; Thu, 11 Aug 2011 19:08:16 -0400 Received: from mail-qw0-f45.google.com ([209.85.216.45]:59977) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QreMF-0004ha-RU for qemu-devel@nongnu.org; Thu, 11 Aug 2011 19:08:11 -0400 Received: by mail-qw0-f45.google.com with SMTP id 8so1594227qwj.4 for ; Thu, 11 Aug 2011 16:08:11 -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=WzAjyIEA22VEYywSPGouI+d4t+IQSffD29ZoQ4hR03M=; b=MBCsh7KvR7Ae49a3qmTw3GGpbcLlBV5+ENEhY2azcX08iBgxTOeAwYjSKk0kdTxDYZ q+v6QcxuT7YKDzrg+iPaeegh0Hmv1rxgHKKKzJCQMEbpb/PSvzqXvOl+AmL65lyViA84 miy5poeVcS6KlErMjN8ignwZo7LOwqZnxNS9w= Received: by 10.224.216.5 with SMTP id hg5mr164489qab.268.1313104091757; Thu, 11 Aug 2011 16:08:11 -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.10 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 11 Aug 2011 16:08:11 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 11 Aug 2011 16:07:21 -0700 Message-Id: <1313104041-1641-10-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.45 Cc: avi@redhat.com Subject: [Qemu-devel] [PATCH 9/9] sun4u: Pass address_space_mem to sun4uv_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/sun4u.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/sun4u.c b/hw/sun4u.c index 346d6d9..6739ba2 100644 --- a/hw/sun4u.c +++ b/hw/sun4u.c @@ -38,7 +38,6 @@ #include "loader.h" #include "elf.h" #include "blockdev.h" -#include "exec-memory.h" //#define DEBUG_IRQ //#define DEBUG_EBUS @@ -732,7 +731,8 @@ static CPUState *cpu_devinit(const char *cpu_model, const struct hwdef *hwdef) return env; } -static void sun4uv_init(ram_addr_t RAM_size, +static void sun4uv_init(MemoryRegion *address_space_mem, + ram_addr_t RAM_size, const char *boot_devices, const char *kernel_filename, const char *kernel_cmdline, const char *initrd_filename, const char *cpu_model, @@ -768,7 +768,7 @@ static void sun4uv_init(ram_addr_t RAM_size, i = 0; if (hwdef->console_serial_base) { - serial_mm_init(get_system_memory(), hwdef->console_serial_base, 0, + serial_mm_init(address_space_mem, hwdef->console_serial_base, 0, NULL, 115200, serial_hds[i], DEVICE_BIG_ENDIAN); i++; } @@ -875,7 +875,7 @@ static void sun4u_init(MemoryRegion *address_space_mem, const char *kernel_filename, const char *kernel_cmdline, const char *initrd_filename, const char *cpu_model) { - sun4uv_init(RAM_size, boot_devices, kernel_filename, + sun4uv_init(address_space_mem, RAM_size, boot_devices, kernel_filename, kernel_cmdline, initrd_filename, cpu_model, &hwdefs[0]); } @@ -887,7 +887,7 @@ static void sun4v_init(MemoryRegion *address_space_mem, const char *kernel_filename, const char *kernel_cmdline, const char *initrd_filename, const char *cpu_model) { - sun4uv_init(RAM_size, boot_devices, kernel_filename, + sun4uv_init(address_space_mem, RAM_size, boot_devices, kernel_filename, kernel_cmdline, initrd_filename, cpu_model, &hwdefs[1]); } @@ -899,7 +899,7 @@ static void niagara_init(MemoryRegion *address_space_mem, const char *kernel_filename, const char *kernel_cmdline, const char *initrd_filename, const char *cpu_model) { - sun4uv_init(RAM_size, boot_devices, kernel_filename, + sun4uv_init(address_space_mem, RAM_size, boot_devices, kernel_filename, kernel_cmdline, initrd_filename, cpu_model, &hwdefs[2]); }