From patchwork Thu Jul 4 15:13:21 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 256955 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 5F90F2C008A for ; Fri, 5 Jul 2013 02:01:38 +1000 (EST) Received: from localhost ([::1]:35579 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UulO2-0004qy-Ag for incoming@patchwork.ozlabs.org; Thu, 04 Jul 2013 11:23:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44755) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UulFb-00018k-KJ for qemu-devel@nongnu.org; Thu, 04 Jul 2013 11:15:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UulFa-0005Mp-2K for qemu-devel@nongnu.org; Thu, 04 Jul 2013 11:15:15 -0400 Received: from mail-we0-x231.google.com ([2a00:1450:400c:c03::231]:64609) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UulFZ-0005MX-RA for qemu-devel@nongnu.org; Thu, 04 Jul 2013 11:15:13 -0400 Received: by mail-we0-f177.google.com with SMTP id m19so1180666wev.8 for ; Thu, 04 Jul 2013 08:15:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; bh=W9XY3AStn58nRM/r6plsl0ag9uQvlmMyJ1SrvWbrWfw=; b=dt6MW9x5TSRksS/p3AF9xxjdQ8hbw7X8KcVeGBQlYCnvfULwIhMgH3FqCJIXG+7Mc7 0dFjLZwpyzHCPO+1cPAzIr+gfqjeSUfLN+hMktE21Y6JjqIT0bLjjlCD+R2kp++NezDm ww3XkgYV72et6SKhRBHTL3D2SAncA3v95LaK5CWpADtoIA4Oul8Nw4HGWvQyos3ys3Wb whG7PlZJ4JmWL9B1OenHQhYxW7KB/LXDqCf9J+AL7bu3yUv6jL2cVGUct/7cHhn7cUww uYMJtjuJwIfUMyEWH8/rQ2MLgpwxN1yuPlGx/87qnrhh5dkTJf3V4I/BYktbjtl4Vu2d vuQg== X-Received: by 10.194.170.168 with SMTP id an8mr3769123wjc.72.1372950913240; Thu, 04 Jul 2013 08:15:13 -0700 (PDT) Received: from playground.station (net-37-117-148-210.cust.dsl.vodafone.it. [37.117.148.210]) by mx.google.com with ESMTPSA id d8sm4212546wiz.0.2013.07.04.08.15.11 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 04 Jul 2013 08:15:12 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 4 Jul 2013 17:13:21 +0200 Message-Id: <1372950842-32422-26-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1372950842-32422-1-git-send-email-pbonzini@redhat.com> References: <1372950842-32422-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c03::231 Subject: [Qemu-devel] [PATCH 25/66] exec: check MRU in qemu_ram_addr_from_host X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.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 e3ac1a1..69af46e 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