From patchwork Tue Sep 3 12:33:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 272273 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 55F012C00A3 for ; Wed, 4 Sep 2013 00:13:26 +1000 (EST) Received: from localhost ([::1]:45546 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VGpwB-0008Da-3U for incoming@patchwork.ozlabs.org; Tue, 03 Sep 2013 08:42:27 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=gqxx1DXqXm8CaBHgmcUajKq6OuHG2vvjio7NFnnbS8Q=; b=HyWCuCPdVoFWk1AC0HPxgkd6DkqDOBN4L3wn1kORBquqsXr7VL8oKQb6XALb5JZXAy dq91CAOGaB5s3GFtSDBUjyvLjQA3KBjJVhAigRkJGYeAjYVWd5ObR9Mia9J3pwoJDfaJ QC88R68ZyGw5cVtSoY4XajNdSbYfCZkgliicBw84dBH6aPu8r9E5W5nRx9YG3K8Xcku1 nr2GxW6CtvRnuB4cw85QqF0iZgnUeiqGlJvL6im0rce8AFmVvG6DtGU8S/1VZ2WhIpnv CAQVapweIW1z08e2V1SHJes1VEP28+6z+gu8zz3NGTVxMASJgeN0SvAtmuBV0HnXjFWO 67Mg== X-Received: by 10.14.221.195 with SMTP id r43mr3163520eep.59.1378211642256; Tue, 03 Sep 2013 05:34:02 -0700 (PDT) Received: from playground.lan (net-37-117-144-28.cust.dsl.vodafone.it. [37.117.144.28]) by mx.google.com with ESMTPSA id f49sm31150419eec.7.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 03 Sep 2013 05:34:01 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 3 Sep 2013 14:33:05 +0200 Message-Id: <1378211609-16121-15-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1378211609-16121-1-git-send-email-pbonzini@redhat.com> References: <1378211609-16121-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:4013:c00::232 Cc: mst@redhat.com Subject: [Qemu-devel] [PATCH 14/38] ivshmem: reclaim memory in instance_finalize instead of exit 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/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)