commit 7443b43758ba5eeca8f81ca15fe9fced8983be26
author Paolo Bonzini <pbonzini@redhat.com> Mon Jun 03 12:44:02 2013 +0200
committer Paolo Bonzini <pbonzini@redhat.com> Thu Jul 04 17:42:45 2013 +0200
tree e41bbaa5326ea41ed978582fe0eba2b55b9608c4
parent 23887b79df2be53dc49166e1b677469abfb92147

exec: move qemu_ram_addr_from_host_nofail to cputlb.c

After the next patch it would not be used elsewhere anyway.  Also,
the _nofail and the standard versions of this function return different
things, which is confusing.  Removing the function from the public headers
limits the confusion.

Reviewed-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

cputlb.c

diff --git a/cputlb.c b/cputlb.c
index 80b2a94..be24080 100644
--- a/cputlb.c
+++ b/cputlb.c
@@ -158,6 +158,17 @@
     }
 }
 
+static inline ram_addr_t qemu_ram_addr_from_host_nofail(void *ptr)
+{
+    ram_addr_t ram_addr;
+
+    if (qemu_ram_addr_from_host(ptr, &ram_addr)) {
+        fprintf(stderr, "Bad ram pointer %p\n", ptr);
+        abort();
+    }
+    return ram_addr;
+}
+
 static inline void tlb_update_dirty(CPUTLBEntry *tlb_entry)
 {
     ram_addr_t ram_addr;

exec.c

diff --git a/exec.c b/exec.c
index 69af46e..55c0750 100644
--- a/exec.c
+++ b/exec.c
@@ -1390,6 +1390,8 @@
     }
 }
 
+/* Some of the softmmu routines need to translate from a host pointer
+   (typically a TLB entry) back to a ram offset.  */
 int qemu_ram_addr_from_host(void *ptr, ram_addr_t *ram_addr)
 {
     RAMBlock *block;
@@ -1422,19 +1424,6 @@
     return 0;
 }
 
-/* Some of the softmmu routines need to translate from a host pointer
-   (typically a TLB entry) back to a ram offset.  */
-ram_addr_t qemu_ram_addr_from_host_nofail(void *ptr)
-{
-    ram_addr_t ram_addr;
-
-    if (qemu_ram_addr_from_host(ptr, &ram_addr)) {
-        fprintf(stderr, "Bad ram pointer %p\n", ptr);
-        abort();
-    }
-    return ram_addr;
-}
-
 static void notdirty_mem_write(void *opaque, hwaddr ram_addr,
                                uint64_t val, unsigned size)
 {
@@ -2121,7 +2110,9 @@
 {
     if (buffer != bounce.buffer) {
         if (is_write) {
-            ram_addr_t addr1 = qemu_ram_addr_from_host_nofail(buffer);
+            ram_addr_t addr1;
+            int rc = qemu_ram_addr_from_host(buffer, &addr1);
+            assert(rc == 0);
             while (access_len) {
                 unsigned l;
                 l = TARGET_PAGE_SIZE;

include/exec/cpu-common.h

diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h
index 5240ae2..7abb70f 100644
--- a/include/exec/cpu-common.h
+++ b/include/exec/cpu-common.h
@@ -53,7 +53,6 @@
 void qemu_ram_remap(ram_addr_t addr, ram_addr_t length);
 /* This should not be used by devices.  */
 int qemu_ram_addr_from_host(void *ptr, ram_addr_t *ram_addr);
-ram_addr_t qemu_ram_addr_from_host_nofail(void *ptr);
 void qemu_ram_set_idstr(ram_addr_t addr, const char *name, DeviceState *dev);
 
 void cpu_physical_memory_rw(hwaddr addr, uint8_t *buf,