system/qemu
system/qemu
1
0
Fork 0
mirror of https://gitlab.com/qemu-project/qemu synced 2024-09-20 03:01:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use qemu_ram_alloc.

Browse source 
Signed-off-by: Paul Brook <paul@codesourcery.com>


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7052 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
pbrook 2009-04-09 17:15:18 +00:00
parent 088ab16c6b
commit 7ffab4d78c
4 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
hw/arm-misc.h
View file

@ -27,6 +27,7 @@ struct arm_boot_info {
const char *kernel_cmdline; const char *kernel_cmdline;
const char *initrd_filename; const char *initrd_filename;
target_phys_addr_t loader_start; target_phys_addr_t loader_start;
target_phys_addr_t smp_loader_start;
int nb_cpus; int nb_cpus;
int board_id; int board_id;
int (*atag_board)(struct arm_boot_info *info, void *p); int (*atag_board)(struct arm_boot_info *info, void *p);

2
hw/integratorcp.c
View file

@ -457,7 +457,7 @@ static void integratorcp_init(ram_addr_t ram_size, int vga_ram_size,
const char *initrd_filename, const char *cpu_model) const char *initrd_filename, const char *cpu_model)
{ {
CPUState *env; CPUState *env;
uint32_t ram_offset; ram_addr_t ram_offset;
qemu_irq *pic; qemu_irq *pic;
qemu_irq *cpu_pic; qemu_irq *cpu_pic;
int sd; int sd;

17
hw/realview.c
View file

@ -29,6 +29,7 @@ static void realview_init(ram_addr_t ram_size, int vga_ram_size,
const char *initrd_filename, const char *cpu_model) const char *initrd_filename, const char *cpu_model)
{ {
CPUState *env; CPUState *env;
ram_addr_t ram_offset;
qemu_irq *pic; qemu_irq *pic;
void *scsi_hba; void *scsi_hba;
PCIBus *pci_bus; PCIBus *pci_bus;
@ -64,9 +65,10 @@ static void realview_init(ram_addr_t ram_size, int vga_ram_size,
} }
} }
ram_offset = qemu_ram_alloc(ram_size);
/* ??? RAM should repeat to fill physical memory space. */ /* ??? RAM should repeat to fill physical memory space. */
/* SDRAM at address zero. */ /* SDRAM at address zero. */
cpu_register_physical_memory(0, ram_size, IO_MEM_RAM); cpu_register_physical_memory(0, ram_size, ram_offset | IO_MEM_RAM);
arm_sysctl_init(0x10000000, 0xc1400400); arm_sysctl_init(0x10000000, 0xc1400400);
@ -182,18 +184,19 @@ static void realview_init(ram_addr_t ram_size, int vga_ram_size,
/* 0x68000000 PCI mem 1. */ /* 0x68000000 PCI mem 1. */
/* 0x6c000000 PCI mem 2. */ /* 0x6c000000 PCI mem 2. */
/* ??? Hack to map an additional page of ram for the secondary CPU
startup code. I guess this works on real hardware because the
BootROM happens to be in ROM/flash or in memory that isn't clobbered
until after Linux boots the secondary CPUs. */
ram_offset = qemu_ram_alloc(0x1000);
cpu_register_physical_memory(0x80000000, 0x1000, ram_offset | IO_MEM_RAM);
realview_binfo.ram_size = ram_size; realview_binfo.ram_size = ram_size;
realview_binfo.kernel_filename = kernel_filename; realview_binfo.kernel_filename = kernel_filename;
realview_binfo.kernel_cmdline = kernel_cmdline; realview_binfo.kernel_cmdline = kernel_cmdline;
realview_binfo.initrd_filename = initrd_filename; realview_binfo.initrd_filename = initrd_filename;
realview_binfo.nb_cpus = ncpu; realview_binfo.nb_cpus = ncpu;
arm_load_kernel(first_cpu, &realview_binfo); arm_load_kernel(first_cpu, &realview_binfo);
/* ??? Hack to map an additional page of ram for the secondary CPU
startup code. I guess this works on real hardware because the
BootROM happens to be in ROM/flash or in memory that isn't clobbered
until after Linux boots the secondary CPUs. */
cpu_register_physical_memory(0x80000000, 0x1000, IO_MEM_RAM + ram_size);
} }
QEMUMachine realview_machine = { QEMUMachine realview_machine = {

4
hw/versatilepb.c
View file

@ -160,6 +160,7 @@ static void versatile_init(ram_addr_t ram_size, int vga_ram_size,
int board_id) int board_id)
{ {
CPUState *env; CPUState *env;
ram_addr_t ram_offset;
qemu_irq *pic; qemu_irq *pic;
qemu_irq *sic; qemu_irq *sic;
void *scsi_hba; void *scsi_hba;
@ -176,9 +177,10 @@ static void versatile_init(ram_addr_t ram_size, int vga_ram_size,
fprintf(stderr, "Unable to find CPU definition\n"); fprintf(stderr, "Unable to find CPU definition\n");
exit(1); exit(1);
} }
ram_offset = qemu_ram_alloc(ram_size);
/* ??? RAM should repeat to fill physical memory space. */ /* ??? RAM should repeat to fill physical memory space. */
/* SDRAM at address zero. */ /* SDRAM at address zero. */
cpu_register_physical_memory(0, ram_size, IO_MEM_RAM); cpu_register_physical_memory(0, ram_size, ram_offset | IO_MEM_RAM);
arm_sysctl_init(0x10000000, 0x41007004); arm_sysctl_init(0x10000000, 0x41007004);
pic = arm_pic_init_cpu(env); pic = arm_pic_init_cpu(env);