[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [6611] Use qemu_ram_alloc
From: |
Blue Swirl |
Subject: |
[Qemu-devel] [6611] Use qemu_ram_alloc |
Date: |
Wed, 11 Feb 2009 18:04:12 +0000 |
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);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-devel] [6611] Use qemu_ram_alloc,
Blue Swirl <=