From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:39167) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qhjqo-0002o8-6m for qemu-devel@nongnu.org; Fri, 15 Jul 2011 10:58:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qhjqi-00035j-Ix for qemu-devel@nongnu.org; Fri, 15 Jul 2011 10:58:45 -0400 Received: from mnementh.archaic.org.uk ([81.2.115.146]:59255) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qhjqi-00033y-7V for qemu-devel@nongnu.org; Fri, 15 Jul 2011 10:58:40 -0400 From: Peter Maydell Date: Fri, 15 Jul 2011 15:58:25 +0100 Message-Id: <1310741906-1606-12-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1310741906-1606-1-git-send-email-peter.maydell@linaro.org> References: <1310741906-1606-1-git-send-email-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH 11/12] hw/sysbus: Add sysbus_mmio_unmap() for unmapping a region List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Riku Voipio , =?UTF-8?q?Juha=20Riihim=C3=A4ki?= , Markus Armbruster , patches@linaro.org From: Juha Riihimäki Add support for unmapping a SysBus device's mmio region, via a new function sysbus_mmio_unmap(). This simply reverses the effect of sysbus_mmio_map(). Signed-off-by: Juha Riihimäki Signed-off-by: Peter Maydell --- hw/sysbus.c | 17 +++++++++++++++++ hw/sysbus.h | 1 + 2 files changed, 18 insertions(+), 0 deletions(-) diff --git a/hw/sysbus.c b/hw/sysbus.c index 2e22be7..021c653 100644 --- a/hw/sysbus.c +++ b/hw/sysbus.c @@ -39,6 +39,23 @@ void sysbus_connect_irq(SysBusDevice *dev, int n, qemu_irq irq) } } +void sysbus_mmio_unmap(SysBusDevice *dev, int n) +{ + assert(n >= 0 && n < dev->num_mmio); + + if (dev->mmio[n].addr == (target_phys_addr_t)-1) { + /* region already unmapped */ + return; + } + if (dev->mmio[n].cb) { + dev->mmio[n].cb(dev, (target_phys_addr_t)-1); + } else { + cpu_register_physical_memory(dev->mmio[n].addr, dev->mmio[n].size, + IO_MEM_UNASSIGNED); + } + dev->mmio[n].addr = (target_phys_addr_t)-1; +} + void sysbus_mmio_map(SysBusDevice *dev, int n, target_phys_addr_t addr) { assert(n >= 0 && n < dev->num_mmio); diff --git a/hw/sysbus.h b/hw/sysbus.h index 4e8cb16..4f93b70 100644 --- a/hw/sysbus.h +++ b/hw/sysbus.h @@ -53,6 +53,7 @@ void sysbus_init_ioports(SysBusDevice *dev, pio_addr_t ioport, pio_addr_t size); void sysbus_connect_irq(SysBusDevice *dev, int n, qemu_irq irq); void sysbus_mmio_map(SysBusDevice *dev, int n, target_phys_addr_t addr); +void sysbus_mmio_unmap(SysBusDevice *dev, int n); /* Legacy helper function for creating devices. */ DeviceState *sysbus_create_varargs(const char *name, -- 1.7.1