diff options
| author | Avi Kivity <avi@redhat.com> | 2011-07-26 14:26:16 +0300 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-07-29 08:25:44 -0500 |
| commit | 4aa63af14969a50f9c3d2324127daff0f0199c61 (patch) | |
| tree | 2cd6f1f2d376dfa31c901de71caa1718f8080663 /hw/pc.h | |
| parent | bf3fb0e12aeb9fea08383c145f874ed7acc29e31 (diff) | |
| download | qemu-4aa63af14969a50f9c3d2324127daff0f0199c61.zip qemu-4aa63af14969a50f9c3d2324127daff0f0199c61.tar.gz qemu-4aa63af14969a50f9c3d2324127daff0f0199c61.tar.bz2 | |
pc: grab system_memory
While eventually this should come from the machine initialization function,
take a short cut to avoid converting all machines now.
Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/pc.h')
| -rw-r--r-- | hw/pc.h | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -6,6 +6,7 @@ #include "isa.h" #include "fdc.h" #include "net.h" +#include "memory.h" /* PC-style peripherals (also used by other machines). */ @@ -129,7 +130,8 @@ 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(const char *kernel_filename, +void pc_memory_init(MemoryRegion *system_memory, + const char *kernel_filename, const char *kernel_cmdline, const char *initrd_filename, ram_addr_t below_4g_mem_size, |