From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32995) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UrRCC-00079m-8u for qemu-devel@nongnu.org; Tue, 25 Jun 2013 07:14:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UrRCA-0000Fp-Te for qemu-devel@nongnu.org; Tue, 25 Jun 2013 07:14:00 -0400 Received: from mail-ea0-x22b.google.com ([2a00:1450:4013:c01::22b]:34138) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UrRCA-0000Fi-Nn for qemu-devel@nongnu.org; Tue, 25 Jun 2013 07:13:58 -0400 Received: by mail-ea0-f171.google.com with SMTP id m14so6765926eaj.30 for ; Tue, 25 Jun 2013 04:13:58 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 25 Jun 2013 13:13:24 +0200 Message-Id: <1372158807-19715-9-git-send-email-pbonzini@redhat.com> In-Reply-To: <1372158807-19715-1-git-send-email-pbonzini@redhat.com> References: <1372158807-19715-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 08/11] 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 b7f032d..fb12588 100644 --- a/exec.c +++ b/exec.c @@ -1409,18 +1409,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