From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Williamson Subject: [PATCH] device-assignment: Cleanup on exit Date: Thu, 10 Jun 2010 13:27:15 -0600 Message-ID: <20100610192715.27230.23460.stgit@localhost.localdomain> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit To: kvm@vger.kernel.org Return-path: Received: from qmta04.emeryville.ca.mail.comcast.net ([76.96.30.40]:34908 "EHLO qmta04.emeryville.ca.mail.comcast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759128Ab0FJT1b (ORCPT ); Thu, 10 Jun 2010 15:27:31 -0400 Sender: kvm-owner@vger.kernel.org List-ID: close() the resource fd when we're done with it. Unregister and munmap the anonymous memory for the MSIX table. Signed-off-by: Alex Williamson --- hw/device-assignment.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/hw/device-assignment.c b/hw/device-assignment.c index 2b963b5..d2c5fbb 100644 --- a/hw/device-assignment.c +++ b/hw/device-assignment.c @@ -60,6 +60,8 @@ static void assigned_dev_load_option_rom(AssignedDevice *dev); +static void assigned_dev_unregister_msix_mmio(AssignedDevice *dev); + static uint32_t guest_to_host_ioport(AssignedDevRegion *region, uint32_t addr) { return region->u.r_baseport + (addr - region->e_physbase); @@ -783,10 +785,14 @@ static void free_assigned_device(AssignedDevice *dev) fprintf(stderr, "Failed to unmap assigned device region: %s\n", strerror(errno)); + close(pci_region->resource_fd); } } } + if (dev->cap.available & ASSIGNED_DEVICE_CAP_MSIX) + assigned_dev_unregister_msix_mmio(dev); + if (dev->real_device.config_fd) { close(dev->real_device.config_fd); dev->real_device.config_fd = 0; @@ -1370,6 +1376,21 @@ static int assigned_dev_register_msix_mmio(AssignedDevice *dev) return 0; } +static void assigned_dev_unregister_msix_mmio(AssignedDevice *dev) +{ + if (!dev->msix_table_page) + return; + + cpu_unregister_io_memory(dev->mmio_index); + dev->mmio_index = 0; + + if (munmap(dev->msix_table_page, 0x1000) == -1) { + fprintf(stderr, "error unmapping msix_table_page! %s\n", + strerror(errno)); + } + dev->msix_table_page = NULL; +} + static int assigned_initfn(struct PCIDevice *pci_dev) { AssignedDevice *dev = DO_UPCAST(AssignedDevice, dev, pci_dev);