From patchwork Thu Aug 11 23:07:20 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 109716 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 5689CB6F76 for ; Fri, 12 Aug 2011 09:36:03 +1000 (EST) Received: from localhost ([::1]:48395 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QreNO-0000zF-QR for incoming@patchwork.ozlabs.org; Thu, 11 Aug 2011 19:09:22 -0400 Received: from eggs.gnu.org ([140.186.70.92]:59568) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QreMK-00064x-Px 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 1QreME-0004jA-Up 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 1QreME-0004ha-QQ for qemu-devel@nongnu.org; Thu, 11 Aug 2011 19:08:10 -0400 Received: by mail-qw0-f45.google.com with SMTP id 8so1594227qwj.4 for ; Thu, 11 Aug 2011 16:08:10 -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=/0hBgq+AU8rEIg1OpzX3FnHbkULk552OadzolHkXFag=; b=pa1QblaMjPmnyx/DCgoUZBBtt0j/aQSWN/7XuawWd7aInCOM1DpJXg4ngwcLNtZlaM yLjIPXe9gw7oiXxXkgRCin1EnpE4Ql73AYrx9ZewMUFv9G0UxO59GPiK+QzEtEnR27Rb /GqVTwYobUIP/QMQfS1vzOcXJU0EFLtY+OryE= Received: by 10.224.198.129 with SMTP id eo1mr166849qab.209.1313104090729; Thu, 11 Aug 2011 16:08:10 -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.09 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 11 Aug 2011 16:08:10 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 11 Aug 2011 16:07:20 -0700 Message-Id: <1313104041-1641-9-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 8/9] sm501: Pass address_space_mem to sm501_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/devices.h | 6 +++++- hw/r2d.c | 3 ++- hw/sm501.c | 7 +++---- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/hw/devices.h b/hw/devices.h index 07fda83..36c21e7 100644 --- a/hw/devices.h +++ b/hw/devices.h @@ -1,6 +1,9 @@ #ifndef QEMU_DEVICES_H #define QEMU_DEVICES_H +/* ??? Not all users of this file can include cpu-common.h. */ +typedef struct MemoryRegion MemoryRegion; + /* Devices that have nowhere better to go. */ /* smc91c111.c */ @@ -57,7 +60,8 @@ qemu_irq *tc6393xb_gpio_in_get(TC6393xbState *s); qemu_irq tc6393xb_l3v_get(TC6393xbState *s); /* sm501.c */ -void sm501_init(uint32_t base, uint32_t local_mem_bytes, qemu_irq irq, +void sm501_init(MemoryRegion *address_space_mem, uint32_t base, + uint32_t local_mem_bytes, qemu_irq irq, CharDriverState *chr); #endif diff --git a/hw/r2d.c b/hw/r2d.c index e9ec58f..1338cd7 100644 --- a/hw/r2d.c +++ b/hw/r2d.c @@ -262,7 +262,8 @@ static void r2d_init(MemoryRegion *address_space_mem, sysbus_create_varargs("sh_pci", 0x1e200000, irq[PCI_INTA], irq[PCI_INTB], irq[PCI_INTC], irq[PCI_INTD], NULL); - sm501_init(0x10000000, SM501_VRAM_SIZE, irq[SM501], serial_hds[2]); + sm501_init(address_space_mem, 0x10000000, SM501_VRAM_SIZE, + irq[SM501], serial_hds[2]); /* onboard CF (True IDE mode, Master only). */ dinfo = drive_get(IF_IDE, 0, 0); diff --git a/hw/sm501.c b/hw/sm501.c index 56db3b9..8ec498f 100644 --- a/hw/sm501.c +++ b/hw/sm501.c @@ -30,7 +30,6 @@ #include "sysbus.h" #include "qdev-addr.h" #include "range.h" -#include "exec-memory.h" /* * Status: 2010/05/07 @@ -1386,8 +1385,8 @@ static void sm501_update_display(void *opaque) sm501_draw_crt(s); } -void sm501_init(uint32_t base, uint32_t local_mem_bytes, qemu_irq irq, - CharDriverState *chr) +void sm501_init(MemoryRegion *address_space_mem, uint32_t base, + uint32_t local_mem_bytes, qemu_irq irq, CharDriverState *chr) { SM501State * s; DeviceState *dev; @@ -1441,7 +1440,7 @@ void sm501_init(uint32_t base, uint32_t local_mem_bytes, qemu_irq irq, /* bridge to serial emulation module */ if (chr) { - serial_mm_init(get_system_memory(), + serial_mm_init(address_space_mem, base + MMIO_BASE_OFFSET + SM501_UART0, 2, NULL, /* TODO : chain irq to IRL */ 115200, chr, DEVICE_NATIVE_ENDIAN);