diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-05-13 16:19:55 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-05-14 08:53:31 -0500 |
| commit | 6eebf958abf3f3f701116d4524ef88bb9fd6e341 (patch) | |
| tree | 3dc67c3bb03950bef367f956c4c28d798dc6c309 /exec.c | |
| parent | d34dc45d34618aa2495e892caba62a4aa521b386 (diff) | |
| download | focaccia-qemu-6eebf958abf3f3f701116d4524ef88bb9fd6e341.tar.gz focaccia-qemu-6eebf958abf3f3f701116d4524ef88bb9fd6e341.zip | |
osdep, kvm: rename low-level RAM allocation functions
This is preparatory to the introduction of a separate freeing API. Reported-by: Amos Kong <akong@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Reviewed-by: Amos Kong <akong@redhat.com> Message-id: 1368454796-14989-2-git-send-email-pbonzini@redhat.com Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'exec.c')
| -rw-r--r-- | exec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/exec.c b/exec.c index 19725dbc05..49344577ea 100644 --- a/exec.c +++ b/exec.c @@ -1062,7 +1062,7 @@ ram_addr_t qemu_ram_alloc_from_ptr(ram_addr_t size, void *host, #if defined (__linux__) && !defined(TARGET_S390X) new_block->host = file_ram_alloc(new_block, size, mem_path); if (!new_block->host) { - new_block->host = qemu_vmalloc(size); + new_block->host = qemu_anon_ram_alloc(size); memory_try_enable_merging(new_block->host, size); } #else @@ -1074,9 +1074,9 @@ ram_addr_t qemu_ram_alloc_from_ptr(ram_addr_t size, void *host, xen_ram_alloc(new_block->offset, size, mr); } else if (kvm_enabled()) { /* some s390/kvm configurations have special constraints */ - new_block->host = kvm_vmalloc(size); + new_block->host = kvm_ram_alloc(size); } else { - new_block->host = qemu_vmalloc(size); + new_block->host = qemu_anon_ram_alloc(size); } memory_try_enable_merging(new_block->host, size); } |