From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34875) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ujq8P-0008KI-MN for qemu-devel@nongnu.org; Tue, 04 Jun 2013 08:14:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ujq8L-0002ap-2D for qemu-devel@nongnu.org; Tue, 04 Jun 2013 08:14:41 -0400 Received: from mail-bk0-x235.google.com ([2a00:1450:4008:c01::235]:47283) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ujq8K-0002af-T0 for qemu-devel@nongnu.org; Tue, 04 Jun 2013 08:14:37 -0400 Received: by mail-bk0-f53.google.com with SMTP id mx10so88843bkb.26 for ; Tue, 04 Jun 2013 05:14:36 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 4 Jun 2013 14:13:58 +0200 Message-Id: <1370348041-6768-15-git-send-email-pbonzini@redhat.com> In-Reply-To: <1370348041-6768-1-git-send-email-pbonzini@redhat.com> References: <1370348041-6768-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH v2 14/17] exec: check MRU in qemu_ram_addr_from_host List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org This function is not used outside the iothread mutex, so it can use ram_list.mru_block. Signed-off-by: Paolo Bonzini --- exec.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/exec.c b/exec.c index bf287cb..9fd4c90 100644 --- a/exec.c +++ b/exec.c @@ -1441,18 +1441,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 -- 1.8.1.4