david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use qemu_ram_alloc

Browse Source 
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6611 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
blueswir1 2009-02-11 18:04:12 +00:00
parent 6f338c3469
commit cf9c147c68
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hw/ppc_prep.c
View File

@ -543,7 +543,7 @@ static void ppc_prep_init (ram_addr_t ram_size, int vga_ram_size,
m48t59_t *m48t59; m48t59_t *m48t59;
int PPC_io_memory; int PPC_io_memory;
int linux_boot, i, nb_nics1, bios_size; 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; uint32_t kernel_base, kernel_size, initrd_base, initrd_size;
PCIBus *pci_bus; PCIBus *pci_bus;
qemu_irq *i8259; qemu_irq *i8259;
@ -577,10 +577,14 @@ static void ppc_prep_init (ram_addr_t ram_size, int vga_ram_size,
} }
/* allocate RAM */ /* 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 */ /* allocate and load BIOS */
bios_offset = ram_size + vga_ram_size; bios_offset = qemu_ram_alloc(BIOS_SIZE);
if (bios_name == NULL) if (bios_name == NULL)
bios_name = BIOS_FILENAME; bios_name = BIOS_FILENAME;
snprintf(buf, sizeof(buf), "%s/%s", bios_dir, bios_name); snprintf(buf, sizeof(buf), "%s/%s", bios_dir, bios_name);
@ -653,8 +657,8 @@ static void ppc_prep_init (ram_addr_t ram_size, int vga_ram_size,
cpu_register_physical_memory(0x80000000, 0x00800000, PPC_io_memory); cpu_register_physical_memory(0x80000000, 0x00800000, PPC_io_memory);
/* init basic PC hardware */ /* init basic PC hardware */
pci_vga_init(pci_bus, phys_ram_base + ram_size, ram_size, pci_vga_init(pci_bus, phys_ram_base + vga_ram_offset,
vga_ram_size, 0, 0); vga_ram_offset, vga_ram_size, 0, 0);
// openpic = openpic_init(0x00000000, 0xF0000000, 1); // openpic = openpic_init(0x00000000, 0xF0000000, 1);
// pit = pit_init(0x40, i8259[0]); // pit = pit_init(0x40, i8259[0]);
rtc_init(0x70, i8259[8], 2000); rtc_init(0x70, i8259[8], 2000);