From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark McLoughlin Subject: [PATCH 11/12] kvm: qemu: device-assignment: munmap() mmio regions Date: Fri, 28 Nov 2008 17:10:49 +0000 Message-ID: <1227892250-14386-11-git-send-email-markmc@redhat.com> References: <> <1227892250-14386-1-git-send-email-markmc@redhat.com> <1227892250-14386-2-git-send-email-markmc@redhat.com> <1227892250-14386-3-git-send-email-markmc@redhat.com> <1227892250-14386-4-git-send-email-markmc@redhat.com> <1227892250-14386-5-git-send-email-markmc@redhat.com> <1227892250-14386-6-git-send-email-markmc@redhat.com> <1227892250-14386-7-git-send-email-markmc@redhat.com> <1227892250-14386-8-git-send-email-markmc@redhat.com> <1227892250-14386-9-git-send-email-markmc@redhat.com> <1227892250-14386-10-git-send-email-markmc@redhat.com> Cc: kvm@vger.kernel.org, Mark McLoughlin To: Avi Kivity Return-path: Received: from mail14.svc.cra.dublin.eircom.net ([159.134.118.30]:39529 "HELO mail14.svc.cra.dublin.eircom.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1752109AbYK1RMI (ORCPT ); Fri, 28 Nov 2008 12:12:08 -0500 In-Reply-To: <1227892250-14386-10-git-send-email-markmc@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: Undo the effects of assigned_dev_register_regions(); made unneccessarily difficult by the twisty data structures. Signed-off-by: Mark McLoughlin --- qemu/hw/device-assignment.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/qemu/hw/device-assignment.c b/qemu/hw/device-assignment.c index 5f803b1..1964fbc 100644 --- a/qemu/hw/device-assignment.c +++ b/qemu/hw/device-assignment.c @@ -330,6 +330,7 @@ static int assigned_dev_register_regions(PCIRegion *io_regions, cur_region->resource_fd, (off_t) 0); if (pci_dev->v_addrs[i].u.r_virtbase == MAP_FAILED) { + pci_dev->v_addrs[i].u.r_virtbase = NULL; fprintf(stderr, "%s: Error: Couldn't mmap 0x%x!" "\n", __func__, (uint32_t) (cur_region->base_addr)); @@ -444,6 +445,25 @@ void free_assigned_device(AssignedDevInfo *adev) AssignedDevice *dev = adev->assigned_dev; if (dev) { + int i; + + for (i = 0; i < dev->real_device.region_number; i++) { + PCIRegion *pci_region = &dev->real_device.regions[i]; + AssignedDevRegion *region = &dev->v_addrs[i]; + + if (!pci_region->valid || !(pci_region->type & IORESOURCE_MEM)) + continue; + + if (region->u.r_virtbase) { + int ret = munmap(region->u.r_virtbase, + (pci_region->size + 0xFFF) & 0xFFFFF000); + if (ret != 0) + fprintf(stderr, + "Failed to unmap assigned device region: %s\n", + strerror(errno)); + } + } + if (dev->real_device.config_fd) { close(dev->real_device.config_fd); dev->real_device.config_fd = 0; -- 1.5.4.3