[Qemu-devel] [4295] Musicpal: convert to ram_addr_t

[Andrzej Zaborowski]

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 = {