From patchwork Tue Jun 4 18:52:12 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 248818 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0C5262C009A for ; Wed, 5 Jun 2013 04:57:51 +1000 (EST) Received: from localhost ([::1]:53707 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UjwQX-000631-8U for incoming@patchwork.ozlabs.org; Tue, 04 Jun 2013 14:57:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53421) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UjwME-0007j9-GC for qemu-devel@nongnu.org; Tue, 04 Jun 2013 14:53:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UjwMD-0007fP-Go for qemu-devel@nongnu.org; Tue, 04 Jun 2013 14:53:22 -0400 Received: from mail-wg0-x232.google.com ([2a00:1450:400c:c00::232]:50614) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UjwMD-0007fE-Ag for qemu-devel@nongnu.org; Tue, 04 Jun 2013 14:53:21 -0400 Received: by mail-wg0-f50.google.com with SMTP id k13so553012wgh.17 for ; Tue, 04 Jun 2013 11:53:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=gED3wr/P3Aah59viQiuDfA/W9PYibEbklyeEB7bCGaA=; b=EGukAePXfB8BZfoB+QSpefoxPcD2a4Uv5S82hX7Og2PUFy5mZUIyd/FVGFuJiys7Hz yVSYT6lrOV8SqnQiTKXE1ujVm13daTvEQw4R8mCxvgbgZOlI0hG642ZqLwoKl8LIpaTI 8yYZKK9oigTHNTgSUIU46gl1S1kc5Rafc6Qh3b53jERE0DkAbmnyl6vkhUDlgHPtYVH5 IEtEF/gCTveB+p8NKn/VJstFjUXwEwOoV6uerGPFD5xa6bDYAUboSXDMHtRtyW5WLjOq rhcqK2HdH/oCGzTpv0S8abjccjC9N1j7YoIWzyU6bwwYdEUpaHamfD/w0tGmw1x7hsFU cpfQ== X-Received: by 10.180.9.238 with SMTP id d14mr2913643wib.18.1370372000511; Tue, 04 Jun 2013 11:53:20 -0700 (PDT) Received: from playground.lan (net-37-116-217-184.cust.dsl.vodafone.it. [37.116.217.184]) by mx.google.com with ESMTPSA id fx7sm4590484wic.11.2013.06.04.11.53.18 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 04 Jun 2013 11:53:19 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 4 Jun 2013 20:52:12 +0200 Message-Id: <1370371954-8479-18-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1370371954-8479-1-git-send-email-pbonzini@redhat.com> References: <1370371954-8479-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c00::232 Cc: mst@redhat.com Subject: [Qemu-devel] [PATCH 17/39] vfio: split exit and instance_finalize X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Paolo Bonzini --- hw/misc/vfio.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 47 insertions(+), 4 deletions(-) diff --git a/hw/misc/vfio.c b/hw/misc/vfio.c index 2bcef7a..c9c68fa 100644 --- a/hw/misc/vfio.c +++ b/hw/misc/vfio.c @@ -2167,6 +2167,12 @@ static void vfio_teardown_msi(VFIODevice *vdev) if (vdev->msix) { msix_uninit(&vdev->pdev, &vdev->bars[vdev->msix->table_bar].mem, &vdev->bars[vdev->msix->pba_bar].mem); + } +} + +static void vfio_destroy_msi(VFIODevice *vdev) +{ + if (vdev->msix) { msix_free(&vdev->pdev); } } @@ -2203,10 +2209,23 @@ static void vfio_unmap_bar(VFIODevice *vdev, int nr) vfio_bar_quirk_teardown(vdev, nr); memory_region_del_subregion(&bar->mem, &bar->mmap_mem); - munmap(bar->mmap, memory_region_size(&bar->mmap_mem)); if (vdev->msix && vdev->msix->table_bar == nr) { memory_region_del_subregion(&bar->mem, &vdev->msix->mmap_mem); + } +} + +static void vfio_destroy_bar(VFIODevice *vdev, int nr) +{ + VFIOBAR *bar = &vdev->bars[nr]; + + if (!bar->size) { + return; + } + + munmap(bar->mmap, memory_region_size(&bar->mmap_mem)); + + if (vdev->msix && vdev->msix->table_bar == nr) { munmap(vdev->msix->mmap, memory_region_size(&vdev->msix->mmap_mem)); } @@ -2360,6 +2379,18 @@ static void vfio_unmap_bars(VFIODevice *vdev) if (vdev->has_vga) { vfio_vga_quirk_teardown(vdev); pci_unregister_vga(&vdev->pdev); + } +} + +static void vfio_destroy_bars(VFIODevice *vdev) +{ + int i; + + for (i = 0; i < PCI_ROM_SLOT; i++) { + vfio_destroy_bar(vdev, i); + } + + if (vdev->has_vga) { memory_region_destroy(&vdev->vga.region[QEMU_PCI_VGA_MEM].mem); memory_region_destroy(&vdev->vga.region[QEMU_PCI_VGA_IO_LO].mem); memory_region_destroy(&vdev->vga.region[QEMU_PCI_VGA_IO_HI].mem); @@ -3092,7 +3123,9 @@ static int vfio_initfn(PCIDevice *pdev) out_teardown: pci_device_set_intx_routing_notifier(&vdev->pdev, NULL); vfio_teardown_msi(vdev); + vfio_destroy_msi(vdev); vfio_unmap_bars(vdev); + vfio_destroy_bars(vdev); out_put: g_free(vdev->emulated_config_bits); vfio_put_device(vdev); @@ -3103,15 +3136,24 @@ out_put: static void vfio_exitfn(PCIDevice *pdev) { VFIODevice *vdev = DO_UPCAST(VFIODevice, pdev, pdev); - VFIOGroup *group = vdev->group; pci_device_set_intx_routing_notifier(&vdev->pdev, NULL); vfio_disable_interrupts(vdev); + vfio_teardown_msi(vdev); + vfio_unmap_bars(vdev); +} + +static void vfio_instance_finalize(Object *obj) +{ + PCIDevice *pdev = PCI_DEVICE(obj); + VFIODevice *vdev = DO_UPCAST(VFIODevice, pdev, pdev); + VFIOGroup *group = vdev->group; + if (vdev->intx.mmap_timer) { qemu_free_timer(vdev->intx.mmap_timer); } - vfio_teardown_msi(vdev); - vfio_unmap_bars(vdev); + vfio_destroy_msi(vdev); + vfio_destroy_bars(vdev); g_free(vdev->emulated_config_bits); vfio_put_device(vdev); vfio_put_group(group); @@ -3209,6 +3251,7 @@ static const TypeInfo vfio_pci_dev_info = { .parent = TYPE_PCI_DEVICE, .instance_size = sizeof(VFIODevice), .class_init = vfio_pci_dev_class_init, + .instance_finalize = vfio_instance_finalize, }; static void register_vfio_pci_dev_type(void)