From patchwork Tue May 21 10:57:07 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 245291 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E3CC92C00BD for ; Tue, 21 May 2013 21:53:59 +1000 (EST) Received: from localhost ([::1]:46626 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UekKB-0001nO-Iu for incoming@patchwork.ozlabs.org; Tue, 21 May 2013 07:01:47 -0400 Received: from eggs.gnu.org ([208.118.235.92]:44791) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UekGO-0003kr-VQ for qemu-devel@nongnu.org; Tue, 21 May 2013 06:57:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UekGN-000508-On for qemu-devel@nongnu.org; Tue, 21 May 2013 06:57:52 -0400 Received: from mail-ea0-x234.google.com ([2a00:1450:4013:c01::234]:37948) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UekGN-0004zx-Hz for qemu-devel@nongnu.org; Tue, 21 May 2013 06:57:51 -0400 Received: by mail-ea0-f180.google.com with SMTP id g10so295599eak.39 for ; Tue, 21 May 2013 03:57:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=b+rYpnc/bUPOCheWxRFt6Zd9m3OVgkKgmmllIUMD0+E=; b=xrT0AAYDoe5xNO9wmvkYcVWMk0TjAaVdxJIGlouia84zvtJW9q39PZESfc6ropPZ0D DoAt/CBaGp44CQEUUvcTgq5IGPpkYt0gFEiKrTK0FN4csu3UQTp35ASYLVq9egBZ38yp mDa95umh3sduM8w2ZrjJMQ6qC7+zs+nQ2Zln/d8GOyzQChxSZKl6eN5Pi2BEHGu8mLre LwZPrUeGRYFBQzzMmJoAKfH6jCekr77xEdVwHGtqcPkuEZKPyeGeumzo/4CI2uxee2YW 7+QZhbACoF0LrSnODd7rnEHy8sX8p3LIMXjBFYViJHyat93tTXoqmFUgL070IH+XXf+5 U0Nw== X-Received: by 10.15.26.6 with SMTP id m6mr5401942eeu.4.1369133870707; Tue, 21 May 2013 03:57:50 -0700 (PDT) Received: from playground.lan (net-37-116-223-193.cust.dsl.vodafone.it. [37.116.223.193]) by mx.google.com with ESMTPSA id a5sm2754398ees.6.2013.05.21.03.57.48 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 21 May 2013 03:57:49 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 21 May 2013 12:57:07 +0200 Message-Id: <1369133851-1894-7-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1369133851-1894-1-git-send-email-pbonzini@redhat.com> References: <1369133851-1894-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:4013:c01::234 Cc: peter.maydell@linaro.org, jan.kiszka@gmail.com, David Gibson Subject: [Qemu-devel] [PATCH 06/30] memory: allow memory_region_find() to run on non-root memory regions 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 memory_region_find() is similar to registering a MemoryListener and checking for the MemoryRegionSections that come from a particular region. There is no reason for this to be limited to a root memory region. Signed-off-by: Paolo Bonzini --- include/exec/memory.h | 13 +++++++------ memory.c | 20 +++++++++++++++----- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/include/exec/memory.h b/include/exec/memory.h index 9e88320..efe210b 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -725,17 +725,18 @@ void memory_region_set_alias_offset(MemoryRegion *mr, * * Returns a #MemoryRegionSection that describes a contiguous overlap. * It will have the following characteristics: - * .@offset_within_address_space >= @addr - * .@offset_within_address_space + .@size <= @addr + @size * .@size = 0 iff no overlap was found * .@mr is non-%NULL iff an overlap was found * - * @address_space: a top-level (i.e. parentless) region that contains - * the region to be found - * @addr: start of the area within @address_space to be searched + * If @mr has no parent, @addr is an absolute address in an AddressSpace, hence: + * .@offset_within_address_space >= @addr + * .@offset_within_address_space + .@size <= @addr + @size + * + * @mr: a MemoryRegion within which @addr is a relative address + * @addr: start of the area within @as to be searched * @size: size of the area to be searched */ -MemoryRegionSection memory_region_find(MemoryRegion *address_space, +MemoryRegionSection memory_region_find(MemoryRegion *mr, hwaddr addr, uint64_t size); /** diff --git a/memory.c b/memory.c index 75ca281..34bfb13 100644 --- a/memory.c +++ b/memory.c @@ -1451,15 +1451,24 @@ static FlatRange *address_space_lookup(AddressSpace *as, AddrRange addr) sizeof(FlatRange), cmp_flatrange_addr); } -MemoryRegionSection memory_region_find(MemoryRegion *address_space, +MemoryRegionSection memory_region_find(MemoryRegion *mr, hwaddr addr, uint64_t size) { - AddressSpace *as = memory_region_to_address_space(address_space); - AddrRange range = addrrange_make(int128_make64(addr), - int128_make64(size)); - FlatRange *fr = address_space_lookup(as, range); MemoryRegionSection ret = { .mr = NULL, .size = 0 }; + MemoryRegion *root; + AddressSpace *as; + AddrRange range; + FlatRange *fr; + + addr += mr->addr; + for (root = mr; root->parent; ) { + root = root->parent; + addr += root->addr; + } + as = memory_region_to_address_space(root); + range = addrrange_make(int128_make64(addr), int128_make64(size)); + fr = address_space_lookup(as, range); if (!fr) { return ret; } @@ -1470,6 +1479,7 @@ MemoryRegionSection memory_region_find(MemoryRegion *address_space, } ret.mr = fr->mr; + ret.address_space = as; range = addrrange_intersection(range, fr->addr); ret.offset_within_region = fr->offset_in_region; ret.offset_within_region += int128_get64(int128_sub(range.start,