On 21 May 2013 11:57, Paolo Bonzini <pbonz...@redhat.com> wrote: > 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 <pbonz...@redhat.com> > --- > 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 > */
You need to change the first para of the doc comment, which still says @address_space. In fact the entire doc comment is pretty confusing now. The code looks OK but I forget what the rationale for this change is; it would be nice if the comment was informative enough to remind me :-) -- PMM
