From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:57434) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UZijR-0001RH-N8 for qemu-devel@nongnu.org; Tue, 07 May 2013 10:19:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UZijH-0006MJ-07 for qemu-devel@nongnu.org; Tue, 07 May 2013 10:19:05 -0400 Received: from mail-wi0-x233.google.com ([2a00:1450:400c:c05::233]:37868) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UZijG-0006Lg-QA for qemu-devel@nongnu.org; Tue, 07 May 2013 10:18:54 -0400 Received: by mail-wi0-f179.google.com with SMTP id l13so695293wie.0 for ; Tue, 07 May 2013 07:18:52 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 7 May 2013 16:17:13 +0200 Message-Id: <1367936238-12196-36-git-send-email-pbonzini@redhat.com> In-Reply-To: <1367936238-12196-1-git-send-email-pbonzini@redhat.com> References: <1367936238-12196-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 35/40] 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: aik@ozlabs.ru, jan.kiszka@siemens.com, qemulist@gmail.com, stefanha@redhat.com, david@gibson.dropbear.id.au 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 files changed, 10 insertions(+), 2 deletions(-) diff --git a/exec.c b/exec.c index f163a55..2914936 100644 --- a/exec.c +++ b/exec.c @@ -1412,18 +1412,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.7.1