summary refs log tree commit diff stats
path: root/exec.c
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2013-05-06 14:28:39 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2013-07-04 17:42:45 +0200
commit23887b79df2be53dc49166e1b677469abfb92147 (patch)
tree8845a4facd8d5dbd80a04c6108be4afa1cc74443 /exec.c
parentdfde4e6e1a868f60033ece0590b1f75e6c57fa16 (diff)
downloadfocaccia-qemu-23887b79df2be53dc49166e1b677469abfb92147.tar.gz
focaccia-qemu-23887b79df2be53dc49166e1b677469abfb92147.zip
exec: check MRU in qemu_ram_addr_from_host
This function is not used outside the iothread mutex, so it
can use ram_list.mru_block.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'exec.c')
-rw-r--r--exec.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/exec.c b/exec.c
index e3ac1a18fd..69af46e3bf 100644
--- a/exec.c
+++ b/exec.c
@@ -1400,18 +1400,26 @@ int qemu_ram_addr_from_host(void *ptr, ram_addr_t *ram_addr)
         return 0;
     }
 
+    block = ram_list.mru_block;
+    if (block && block->host && host - block->host < block->length) {
+        goto found;
+    }
+
     QTAILQ_FOREACH(block, &ram_list.blocks, next) {
         /* This case append when the block is not mapped. */
         if (block->host == NULL) {
             continue;
         }
         if (host - block->host < block->length) {
-            *ram_addr = block->offset + (host - block->host);
-            return 0;
+            goto found;
         }
     }
 
     return -1;
+
+found:
+    *ram_addr = block->offset + (host - block->host);
+    return 0;
 }
 
 /* Some of the softmmu routines need to translate from a host pointer