From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53382) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UjwMA-0007bk-Pb for qemu-devel@nongnu.org; Tue, 04 Jun 2013 14:53:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UjwM9-0007eQ-QW for qemu-devel@nongnu.org; Tue, 04 Jun 2013 14:53:18 -0400 Received: from mail-wg0-x235.google.com ([2a00:1450:400c:c00::235]:37632) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UjwM9-0007eF-LL for qemu-devel@nongnu.org; Tue, 04 Jun 2013 14:53:17 -0400 Received: by mail-wg0-f53.google.com with SMTP id c11so569051wgh.32 for ; Tue, 04 Jun 2013 11:53:16 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 4 Jun 2013 20:52:10 +0200 Message-Id: <1370371954-8479-16-git-send-email-pbonzini@redhat.com> In-Reply-To: <1370371954-8479-1-git-send-email-pbonzini@redhat.com> References: <1370371954-8479-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 15/39] ivshmem: split exit and instance_finalize List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mst@redhat.com Signed-off-by: Paolo Bonzini --- hw/misc/ivshmem.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c index a19a6d6..d4af440 100644 --- a/hw/misc/ivshmem.c +++ b/hw/misc/ivshmem.c @@ -772,13 +772,20 @@ static void pci_ivshmem_uninit(PCIDevice *dev) { IVShmemState *s = DO_UPCAST(IVShmemState, dev, dev); + memory_region_del_subregion(&s->bar, &s->ivshmem); +} + +static void pci_ivshmem_instance_finalize(Object *obj) +{ + PCIDevice *dev = PCI_DEVICE(obj); + IVShmemState *s = DO_UPCAST(IVShmemState, dev, dev); + if (s->migration_blocker) { migrate_del_blocker(s->migration_blocker); error_free(s->migration_blocker); } memory_region_destroy(&s->ivshmem_mmio); - memory_region_del_subregion(&s->bar, &s->ivshmem); vmstate_unregister_ram(&s->ivshmem, &s->dev.qdev); memory_region_destroy(&s->ivshmem); memory_region_destroy(&s->bar); @@ -816,6 +823,7 @@ static const TypeInfo ivshmem_info = { .parent = TYPE_PCI_DEVICE, .instance_size = sizeof(IVShmemState), .class_init = ivshmem_class_init, + .instance_finalize = pci_ivshmem_instance_finalize, }; static void ivshmem_register_types(void) -- 1.8.1.4