From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52921) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VGpoB-0006f6-KZ for qemu-devel@nongnu.org; Tue, 03 Sep 2013 08:34:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VGpo3-0006Q2-7n for qemu-devel@nongnu.org; Tue, 03 Sep 2013 08:34:11 -0400 Received: from mail-ee0-x232.google.com ([2a00:1450:4013:c00::232]:57129) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VGpo3-0006Pe-0x for qemu-devel@nongnu.org; Tue, 03 Sep 2013 08:34:03 -0400 Received: by mail-ee0-f50.google.com with SMTP id d51so2978048eek.9 for ; Tue, 03 Sep 2013 05:34:02 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 3 Sep 2013 14:33:05 +0200 Message-Id: <1378211609-16121-15-git-send-email-pbonzini@redhat.com> In-Reply-To: <1378211609-16121-1-git-send-email-pbonzini@redhat.com> References: <1378211609-16121-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 14/38] ivshmem: reclaim memory in instance_finalize instead of exit 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 | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c index 2838866..46d8c27 100644 --- a/hw/misc/ivshmem.c +++ b/hw/misc/ivshmem.c @@ -784,17 +784,23 @@ static void pci_ivshmem_uninit(PCIDevice *dev) { IVShmemState *s = IVSHMEM(dev); + memory_region_del_subregion(&s->bar, &s->ivshmem); +} + +static void pci_ivshmem_instance_finalize(Object *obj) +{ + IVShmemState *s = IVSHMEM(obj); + 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, DEVICE(dev)); + vmstate_unregister_ram(&s->ivshmem, DEVICE(s)); memory_region_destroy(&s->ivshmem); memory_region_destroy(&s->bar); - unregister_savevm(DEVICE(dev), "ivshmem", s); + unregister_savevm(DEVICE(s), "ivshmem", s); } static Property ivshmem_properties[] = { @@ -829,6 +835,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.3.1