aboutsummaryrefslogtreecommitdiff
path: root/exec.c
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2013-07-31 15:11:08 +0200
committerAnthony Liguori <anthony@codemonkey.ws>2013-09-12 11:45:31 -0500
commit91138037cb341a04a66e4c43b6cb31d5d8a43a73 (patch)
tree9ab40169a46bf3ab0de332920ff8cceb0edecc88 /exec.c
parent3435f39513a104294b5e3bbf3612047028d25cfc (diff)
downloadqemu-91138037cb341a04a66e4c43b6cb31d5d8a43a73.zip
qemu-91138037cb341a04a66e4c43b6cb31d5d8a43a73.tar.gz
qemu-91138037cb341a04a66e4c43b6cb31d5d8a43a73.tar.bz2
exec: Simplify the guest physical memory allocation hook
Make it a generic hook rather than a KVM hook. Less code and ifdeffery. Since the only user of the hook is old S390 KVM, there's hope we can get rid of it some day. Acked-by: Christian Borntraeger <borntraeger@de.ibm.com> Signed-off-by: Markus Armbruster <armbru@redhat.com> Acked-by: Laszlo Ersek <lersek@redhat.com> Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Message-id: 1375276272-15988-5-git-send-email-armbru@redhat.com Signed-off-by: Anthony Liguori <anthony@codemonkey.ws>
Diffstat (limited to 'exec.c')
-rw-r--r--exec.c19
1 files changed, 13 insertions, 6 deletions
diff --git a/exec.c b/exec.c
index 0a6dd2e..a3dfd1d 100644
--- a/exec.c
+++ b/exec.c
@@ -749,6 +749,18 @@ static int subpage_register (subpage_t *mmio, uint32_t start, uint32_t end,
uint16_t section);
static subpage_t *subpage_init(AddressSpace *as, hwaddr base);
+static void *(*phys_mem_alloc)(ram_addr_t size) = qemu_anon_ram_alloc;
+
+/*
+ * Set a custom physical guest memory alloator.
+ * Accelerators with unusual needs may need this. Hopefully, we can
+ * get rid of it eventually.
+ */
+void phys_mem_set_alloc(void *(*alloc)(ram_addr_t))
+{
+ phys_mem_alloc = alloc;
+}
+
static uint16_t phys_section_add(MemoryRegionSection *section)
{
/* The physical section number is ORed with a page-aligned
@@ -1124,12 +1136,7 @@ ram_addr_t qemu_ram_alloc_from_ptr(ram_addr_t size, void *host,
#endif
}
if (!new_block->host) {
- if (kvm_enabled()) {
- /* some s390/kvm configurations have special constraints */
- new_block->host = kvm_ram_alloc(size);
- } else {
- new_block->host = qemu_anon_ram_alloc(size);
- }
+ new_block->host = phys_mem_alloc(size);
memory_try_enable_merging(new_block->host, size);
}
}