commit 07bdaa4196b51bc7ffa7c3f74e9e4a9dc8a7966a
author Paolo Bonzini <pbonzini@redhat.com> Fri Mar 25 12:55:08 2016 +0100
committer Paolo Bonzini <pbonzini@redhat.com> Sun May 29 09:11:12 2016 +0200
tree 5892b36a9f4f08503620ea876dd56f1ae6f763e2
parent f615f39616c4fd1a3a3b078af8d75bb4be6390de

memory: split memory_region_from_host from qemu_ram_addr_from_host

Move the old qemu_ram_addr_from_host to memory_region_from_host and
make it return an offset within the region.  For qemu_ram_addr_from_host
return the ram_addr_t directly, similar to what it was before
commit 1b5ec23 ("memory: return MemoryRegion from qemu_ram_addr_from_host",
2013-07-04).

Reviewed-by: Marc-André Lureau <marcandre.lureau@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

cputlb.c

diff --git a/cputlb.c b/cputlb.c
index 1ff6354..23c9b91 100644
--- a/cputlb.c
+++ b/cputlb.c
@@ -246,7 +246,8 @@
 {
     ram_addr_t ram_addr;
 
-    if (qemu_ram_addr_from_host(ptr, &ram_addr) == NULL) {
+    ram_addr = qemu_ram_addr_from_host(ptr);
+    if (ram_addr == RAM_ADDR_INVALID) {
         fprintf(stderr, "Bad ram pointer %p\n", ptr);
         abort();
     }