From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44701) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WW4KH-0001c1-IG for qemu-devel@nongnu.org; Fri, 04 Apr 2014 09:38:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WW4KA-00064w-1C for qemu-devel@nongnu.org; Fri, 04 Apr 2014 09:38:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57122) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WW4K9-00064k-Na for qemu-devel@nongnu.org; Fri, 04 Apr 2014 09:38:25 -0400 From: Igor Mammedov Date: Fri, 4 Apr 2014 15:36:36 +0200 Message-Id: <1396618620-27823-12-git-send-email-imammedo@redhat.com> In-Reply-To: <1396618620-27823-1-git-send-email-imammedo@redhat.com> References: <1396618620-27823-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH 11/35] 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: peter.maydell@linaro.org, mst@redhat.com, aik@ozlabs.ru, hutao@cn.fujitsu.com, mjt@tls.msk.ru, lcapitulino@redhat.com, kraxel@redhat.com, akong@redhat.com, quintela@redhat.com, armbru@redhat.com, aliguori@amazon.com, jan.kiszka@siemens.com, lersek@redhat.com, ehabkost@redhat.com, marcel.a@redhat.com, stefanha@redhat.com, chegu_vinod@hp.com, rth@twiddle.net, kwolf@redhat.com, s.priebe@profihost.ag, mreitz@redhat.com, vasilis.liaskovitis@profitbricks.com, pbonzini@redhat.com, afaerber@suse.de which allows to check if MemoryRegion is already mapped. Signed-off-by: Igor Mammedov --- include/exec/memory.h | 8 ++++++++ memory.c | 15 ++++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/include/exec/memory.h b/include/exec/memory.h index c084db2..200d3c5 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..f4d8e69 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,16 @@ bool memory_region_present(MemoryRegion *parent, hwaddr addr) return true; } +bool memory_region_is_mapped(MemoryRegion *mr) +{ + mr = memory_region_find(mr, 0, 1).mr; + if (!mr) { + return false; + } + memory_region_unref(mr); + return true; +} + MemoryRegionSection memory_region_find(MemoryRegion *mr, hwaddr addr, uint64_t size) { @@ -1586,6 +1596,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.9.0