[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/15] memory: allow memory_region_find() to run on
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 06/15] memory: allow memory_region_find() to run on non-root memory regions |
Date: |
Fri, 24 May 2013 19:02:58 +0200 |
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.
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
include/exec/memory.h | 28 +++++++++++++++++++---------
memory.c | 20 +++++++++++++++-----
2 files changed, 34 insertions(+), 14 deletions(-)
diff --git a/include/exec/memory.h b/include/exec/memory.h
index 9e88320..329ffb1 100644
--- a/include/exec/memory.h
+++ b/include/exec/memory.h
@@ -718,24 +718,34 @@ void memory_region_set_alias_offset(MemoryRegion *mr,
hwaddr offset);
/**
- * memory_region_find: locate a MemoryRegion in an address space
+ * memory_region_find: translate an address/size relative to a
+ * MemoryRegion into a #MemoryRegionSection.
*
- * Locates the first #MemoryRegion within an address space given by
- * @address_space that overlaps the range given by @addr and @size.
+ * Locates the first #MemoryRegion within @mr that overlaps the range
+ * given by @addr and @size.
*
* Returns a #MemoryRegionSection that describes a contiguous overlap.
* It will have the following characteristics:
- * address@hidden >= @addr
- * address@hidden + address@hidden <= @addr + @size
* address@hidden = 0 iff no overlap was found
* address@hidden 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
+ * Remember that in the return value the @offset_within_region is
+ * relative to the returned region (in the address@hidden field), not to the
+ * @mr argument.
+ *
+ * Similarly, the address@hidden is relative to the
+ * address space that contains both regions, the passed and the
+ * returned one. However, in the special case where the @mr argument
+ * has no parent (and thus is the root of the address space), the
+ * following will hold:
+ * address@hidden >= @addr
+ * address@hidden + address@hidden <= @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,
--
1.8.1.4
- [Qemu-devel] [PULL 00/15] IOMMU patches for 1.6, part 1, Paolo Bonzini, 2013/05/24
- [Qemu-devel] [PATCH 01/15] exec: remove obsolete comment, Paolo Bonzini, 2013/05/24
- [Qemu-devel] [PATCH 02/15] exec: eliminate qemu_put_ram_ptr, Paolo Bonzini, 2013/05/24
- [Qemu-devel] [PATCH 03/15] exec: make qemu_get_ram_ptr private, Paolo Bonzini, 2013/05/24
- [Qemu-devel] [PATCH 05/15] memory: assert that PhysPageEntry's ptr does not overflow, Paolo Bonzini, 2013/05/24
- [Qemu-devel] [PATCH 04/15] exec: eliminate stq_phys_notdirty, Paolo Bonzini, 2013/05/24
- [Qemu-devel] [PATCH 06/15] memory: allow memory_region_find() to run on non-root memory regions,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 07/15] memory: Replace open-coded memory_region_is_romd, Paolo Bonzini, 2013/05/24
- [Qemu-devel] [PATCH 08/15] memory: Rename readable flag to romd_mode, Paolo Bonzini, 2013/05/24
- [Qemu-devel] [PATCH 09/15] memory: do not duplicate memory_region_destructor_none, Paolo Bonzini, 2013/05/24
- [Qemu-devel] [PATCH 10/15] memory: make memory_global_sync_dirty_bitmap take an AddressSpace, Paolo Bonzini, 2013/05/24
- [Qemu-devel] [PATCH 11/15] memory: fix address space initialization/destruction, Paolo Bonzini, 2013/05/24
- [Qemu-devel] [PATCH 12/15] s390x: reduce TARGET_PHYS_ADDR_SPACE_BITS to 62, Paolo Bonzini, 2013/05/24