From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32880) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WrSHX-0003k5-En for qemu-devel@nongnu.org; Mon, 02 Jun 2014 09:28:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WrSHR-0007zJ-93 for qemu-devel@nongnu.org; Mon, 02 Jun 2014 09:28:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:14126) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WrSHR-0007z3-0l for qemu-devel@nongnu.org; Mon, 02 Jun 2014 09:28:01 -0400 From: Igor Mammedov Date: Mon, 2 Jun 2014 15:25:06 +0200 Message-Id: <1401715529-636-11-git-send-email-imammedo@redhat.com> In-Reply-To: <1401715529-636-1-git-send-email-imammedo@redhat.com> References: <1401715529-636-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH v4 10/33] memory: add memory_region_is_mapped() API List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: lcapitulino@redhat.com, aliguori@amazon.com, mst@redhat.com which allows to check if MemoryRegion is already mapped. Signed-off-by: Igor Mammedov --- v2: simplify check, just by checking if MR has parent --- include/exec/memory.h | 8 ++++++++ memory.c | 10 +++++++++- 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/include/exec/memory.h b/include/exec/memory.h index 1d55ad9..ab11c32 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -848,6 +848,14 @@ void memory_region_set_alias_offset(MemoryRegion *mr, bool memory_region_present(MemoryRegion *parent, hwaddr addr); /** + * memory_region_is_mapped: returns true if #MemoryRegion is mapped + * into any address space. + * + * @mr: a #MemoryRegion which should be checked if it's mapped + */ +bool memory_region_is_mapped(MemoryRegion *mr); + +/** * memory_region_find: translate an address/size relative to a * MemoryRegion into a #MemoryRegionSection. * diff --git a/memory.c b/memory.c index 3f1df23..2c952ea 100644 --- a/memory.c +++ b/memory.c @@ -492,7 +492,7 @@ static AddressSpace *memory_region_to_address_space(MemoryRegion *mr) return as; } } - abort(); + return NULL; } /* Render a memory region into the global view. Ranges in @view obscure @@ -1569,6 +1569,11 @@ bool memory_region_present(MemoryRegion *parent, hwaddr addr) return true; } +bool memory_region_is_mapped(MemoryRegion *mr) +{ + return mr->parent ? true : false; +} + MemoryRegionSection memory_region_find(MemoryRegion *mr, hwaddr addr, uint64_t size) { @@ -1586,6 +1591,9 @@ MemoryRegionSection memory_region_find(MemoryRegion *mr, } as = memory_region_to_address_space(root); + if (!as) { + return ret; + } range = addrrange_make(int128_make64(addr), int128_make64(size)); view = address_space_get_flatview(as); -- 1.7.1