From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:58230) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RXGVg-0001Rl-6w for qemu-devel@nongnu.org; Sun, 04 Dec 2011 13:09:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RXGVf-0004Go-8W for qemu-devel@nongnu.org; Sun, 04 Dec 2011 13:09:56 -0500 Received: from mx1.redhat.com ([209.132.183.28]:30606) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RXGVe-0004Gd-Sw for qemu-devel@nongnu.org; Sun, 04 Dec 2011 13:09:55 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id pB4I9sxg016812 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Sun, 4 Dec 2011 13:09:54 -0500 Received: from cleopatra.tlv.redhat.com (cleopatra.tlv.redhat.com [10.35.255.11]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id pB4I9r4g021315 for ; Sun, 4 Dec 2011 13:09:53 -0500 From: Avi Kivity Date: Sun, 4 Dec 2011 20:09:37 +0200 Message-Id: <1323022181-28110-3-git-send-email-avi@redhat.com> In-Reply-To: <1323022181-28110-1-git-send-email-avi@redhat.com> References: <1323022181-28110-1-git-send-email-avi@redhat.com> Subject: [Qemu-devel] [PATCH v2 2/6] memory: introduce memory_region_set_address() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Allow changing the address of a memory region while it is in the memory hierarchy. Signed-off-by: Avi Kivity --- memory.c | 21 +++++++++++++++++++++ memory.h | 11 +++++++++++ 2 files changed, 32 insertions(+), 0 deletions(-) diff --git a/memory.c b/memory.c index d0f90ca..a080d21 100644 --- a/memory.c +++ b/memory.c @@ -1324,6 +1324,27 @@ void memory_region_set_enabled(MemoryRegion *mr, bool enabled) memory_region_update_topology(NULL); } +void memory_region_set_address(MemoryRegion *mr, target_phys_addr_t addr) +{ + MemoryRegion *parent = mr->parent; + unsigned priority = mr->priority; + bool may_overlap = mr->may_overlap; + + if (addr == mr->addr || !parent) { + mr->addr = addr; + return; + } + + memory_region_transaction_begin(); + memory_region_del_subregion(parent, mr); + if (may_overlap) { + memory_region_add_subregion_overlap(parent, addr, mr, priority); + } else { + memory_region_add_subregion(parent, addr, mr); + } + memory_region_transaction_commit(); +} + void set_system_memory_map(MemoryRegion *mr) { address_space_memory.root = mr; diff --git a/memory.h b/memory.h index c6997c4..db53422 100644 --- a/memory.h +++ b/memory.h @@ -518,6 +518,17 @@ void memory_region_del_subregion(MemoryRegion *mr, */ void memory_region_set_enabled(MemoryRegion *mr, bool enabled); +/* + * memory_region_set_address: dynamically update the address of a region + * + * Dynamically updates the address of a region, relative to its parent. + * May be used on regions are currently part of a memory hierarchy. + * + * @mr: the region to be updated + * @addr: new address, relative to parent region + */ +void memory_region_set_address(MemoryRegion *mr, target_phys_addr_t addr); + /* Start a transaction; changes will be accumulated and made visible only * when the transaction ends. */ -- 1.7.7.1