From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JrkBI-0000kj-PN
	for qemu-devel@nongnu.org; Thu, 01 May 2008 21:35:24 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JrkBI-0000kN-7S
	for qemu-devel@nongnu.org; Thu, 01 May 2008 21:35:24 -0400
Received: from [199.232.76.173] (port=54292 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JrkBH-0000kH-Th
	for qemu-devel@nongnu.org; Thu, 01 May 2008 21:35:23 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <balrogg@gmail.com>) id 1JrkBH-0002BX-KS
	for qemu-devel@nongnu.org; Thu, 01 May 2008 21:35:23 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <balrogg@gmail.com>) id 1JrkBF-0005cL-Us
	for qemu-devel@nongnu.org; Fri, 02 May 2008 01:35:22 +0000
Received: from balrog by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <balrog@savannah.gnu.org>) id 1JrkBF-0005by-Io
	for qemu-devel@nongnu.org; Fri, 02 May 2008 01:35:21 +0000
MIME-Version: 1.0
Errors-To: balrog
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Andrzej Zaborowski <balrogg@gmail.com>
Message-Id: <E1JrkBF-0005by-Io@cvs.savannah.gnu.org>
Date: Fri, 02 May 2008 01:35:21 +0000
Subject: [Qemu-devel] [4295] Musicpal: convert to ram_addr_t
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Revision: 4295
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4295
Author:   balrog
Date:     2008-05-02 01:35:20 +0000 (Fri, 02 May 2008)

Log Message:
-----------
Musicpal: convert to ram_addr_t

Modified Paths:
--------------
    trunk/hw/musicpal.c

Modified: trunk/hw/musicpal.c
===================================================================
--- trunk/hw/musicpal.c	2008-05-01 19:05:12 UTC (rev 4294)
+++ trunk/hw/musicpal.c	2008-05-02 01:35:20 UTC (rev 4295)
@@ -1380,7 +1380,7 @@
     .board_id = 0x20e,
 };
 
-static void musicpal_init(int ram_size, int vga_ram_size,
+static void musicpal_init(ram_addr_t ram_size, int vga_ram_size,
                const char *boot_device, DisplayState *ds,
                const char *kernel_filename, const char *kernel_cmdline,
                const char *initrd_filename, const char *cpu_model)
@@ -1410,7 +1410,7 @@
 
     /* Catch various stuff not handled by separate subsystems */
     iomemtype = cpu_register_io_memory(0, musicpal_readfn,
-                                       musicpal_writefn, first_cpu);
+                                       musicpal_writefn, env);
     cpu_register_physical_memory(0x80000000, 0x10000, iomemtype);
 
     pic = mv88w8618_pic_init(MP_PIC_BASE, pic[ARM_PIC_CPU_IRQ]);
@@ -1465,7 +1465,7 @@
     musicpal_binfo.kernel_filename = kernel_filename;
     musicpal_binfo.kernel_cmdline = kernel_cmdline;
     musicpal_binfo.initrd_filename = initrd_filename;
-    arm_load_kernel(first_cpu, &musicpal_binfo);
+    arm_load_kernel(env, &musicpal_binfo);
 }
 
 QEMUMachine musicpal_machine = {