From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LXJRX-0005ta-KE
	for qemu-devel@nongnu.org; Wed, 11 Feb 2009 13:04:15 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LXJRW-0005rL-4A
	for qemu-devel@nongnu.org; Wed, 11 Feb 2009 13:04:14 -0500
Received: from [199.232.76.173] (port=38624 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LXJRW-0005rB-0x
	for qemu-devel@nongnu.org; Wed, 11 Feb 2009 13:04:14 -0500
Received: from savannah.gnu.org ([199.232.41.3]:50528 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 <INVALID.NOREPLY@gnu.org>)
	id 1LXJRV-0007jI-Kd
	for qemu-devel@nongnu.org; Wed, 11 Feb 2009 13:04:13 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1LXJRV-0003Qf-6W
	for qemu-devel@nongnu.org; Wed, 11 Feb 2009 18:04:13 +0000
Received: from blueswir1 by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <blueswir1@savannah.gnu.org>) id 1LXJRU-0003Qb-TR
	for qemu-devel@nongnu.org; Wed, 11 Feb 2009 18:04:13 +0000
MIME-Version: 1.0
Errors-To: blueswir1
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Blue Swirl <blauwirbel@gmail.com>
Message-Id: <E1LXJRU-0003Qb-TR@cvs.savannah.gnu.org>
Date: Wed, 11 Feb 2009 18:04:12 +0000
Subject: [Qemu-devel] [6611] Use qemu_ram_alloc
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: 6611
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6611
Author:   blueswir1
Date:     2009-02-11 18:04:12 +0000 (Wed, 11 Feb 2009)

Log Message:
-----------
Use qemu_ram_alloc

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

Modified: trunk/hw/ppc_prep.c
===================================================================
--- trunk/hw/ppc_prep.c	2009-02-11 15:21:54 UTC (rev 6610)
+++ trunk/hw/ppc_prep.c	2009-02-11 18:04:12 UTC (rev 6611)
@@ -543,7 +543,7 @@
     m48t59_t *m48t59;
     int PPC_io_memory;
     int linux_boot, i, nb_nics1, bios_size;
-    unsigned long bios_offset;
+    ram_addr_t ram_offset, vga_ram_offset, bios_offset;
     uint32_t kernel_base, kernel_size, initrd_base, initrd_size;
     PCIBus *pci_bus;
     qemu_irq *i8259;
@@ -577,10 +577,14 @@
     }
 
     /* allocate RAM */
-    cpu_register_physical_memory(0, ram_size, IO_MEM_RAM);
+    ram_offset = qemu_ram_alloc(ram_size);
+    cpu_register_physical_memory(0, ram_size, ram_offset);
 
+    /* allocate VGA RAM */
+    vga_ram_offset = qemu_ram_alloc(vga_ram_size);
+
     /* allocate and load BIOS */
-    bios_offset = ram_size + vga_ram_size;
+    bios_offset = qemu_ram_alloc(BIOS_SIZE);
     if (bios_name == NULL)
         bios_name = BIOS_FILENAME;
     snprintf(buf, sizeof(buf), "%s/%s", bios_dir, bios_name);
@@ -653,8 +657,8 @@
     cpu_register_physical_memory(0x80000000, 0x00800000, PPC_io_memory);
 
     /* init basic PC hardware */
-    pci_vga_init(pci_bus, phys_ram_base + ram_size, ram_size,
-                 vga_ram_size, 0, 0);
+    pci_vga_init(pci_bus, phys_ram_base + vga_ram_offset,
+                 vga_ram_offset, vga_ram_size, 0, 0);
     //    openpic = openpic_init(0x00000000, 0xF0000000, 1);
     //    pit = pit_init(0x40, i8259[0]);
     rtc_init(0x70, i8259[8], 2000);