diff options
| author | SeokYeon Hwang <syeon.hwang@samsung.com> | 2014-06-16 12:18:43 +0900 |
|---|---|---|
| committer | SeokYeon Hwang <syeon.hwang@samsung.com> | 2014-06-16 14:02:16 +0900 |
| commit | 182b9a44a4df628515135db9869319a34ccb296f (patch) | |
| tree | 80e5d1abf0b238563823b50b24857e2b2c3dc6d5 /hw | |
| parent | 6e12ac9f22be13932cb5e9b68dc5fda06055e27a (diff) | |
| download | qemu-182b9a44a4df628515135db9869319a34ccb296f.tar.gz qemu-182b9a44a4df628515135db9869319a34ccb296f.tar.bz2 qemu-182b9a44a4df628515135db9869319a34ccb296f.zip | |
emulator: modify RAM preallocation logic
Change-Id: Idfe6eb74f35fa13c9518dedb18adec3b9ed1de20
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/i386/pc_piix.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 8050a67be7..ff92135fc0 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -58,7 +58,7 @@ void pc_init_pci(QEMUMachineInitArgs *args); extern MemoryRegion *global_ram_memory; -extern void *preallocated_ptr; +extern void *preallocated_ram_ptr; #endif static const int ide_iobase[MAX_IDE_BUS] = { 0x1f0, 0x170 }; @@ -162,13 +162,6 @@ static void pc_init1(QEMUMachineInitArgs *args, /* allocate ram and load rom/bios */ if (!xen_enabled()) { -#ifdef CONFIG_MARU - // W/A for allocate larger continuous heap. - // see vl.c - if(preallocated_ptr != NULL) { - g_free(preallocated_ptr); - } -#endif fw_cfg = pc_memory_init(system_memory, args->kernel_filename, args->kernel_cmdline, args->initrd_filename, |