diff options
| author | Anthony PERARD <anthony.perard@citrix.com> | 2011-04-11 19:48:11 +0100 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2011-05-08 10:10:00 +0200 |
| commit | e0e7e67b455afa254356acdac1254653f6eed47b (patch) | |
| tree | 6ff69bc3127b6d18f72f7e898a08168bf3893cdb /hw/pc.h | |
| parent | 3285cf4fe78b4b83b70b9306cc97968b414a6e9d (diff) | |
| download | qemu-e0e7e67b455afa254356acdac1254653f6eed47b.zip qemu-e0e7e67b455afa254356acdac1254653f6eed47b.tar.gz qemu-e0e7e67b455afa254356acdac1254653f6eed47b.tar.bz2 | |
pc_memory_init: Move memory calculation to the caller.
This patch moves above_4g_mem_size and below_4g_mem_size calculation in
the caller of pc_memory_init (pc_init1). And the prototype of
pc_memory_init is changed because there is no need anymore to have
variable pointer and the ram_size parameter.
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'hw/pc.h')
| -rw-r--r-- | hw/pc.h | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -129,12 +129,11 @@ void pc_cmos_set_s3_resume(void *opaque, int irq, int level); void pc_acpi_smi_interrupt(void *opaque, int irq, int level); void pc_cpus_init(const char *cpu_model); -void pc_memory_init(ram_addr_t ram_size, - const char *kernel_filename, +void pc_memory_init(const char *kernel_filename, const char *kernel_cmdline, const char *initrd_filename, - ram_addr_t *below_4g_mem_size_p, - ram_addr_t *above_4g_mem_size_p); + ram_addr_t below_4g_mem_size, + ram_addr_t above_4g_mem_size); qemu_irq *pc_allocate_cpu_irq(void); void pc_vga_init(PCIBus *pci_bus); void pc_basic_device_init(qemu_irq *isa_irq, |