From patchwork Fri Jun 26 14:49:32 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 488897 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id A070E140293 for ; Sat, 27 Jun 2015 01:19:34 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=glWmfbWe; dkim-atps=neutral Received: from localhost ([::1]:60679 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z8VPg-0004JY-PU for incoming@patchwork.ozlabs.org; Fri, 26 Jun 2015 11:19:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57451) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z8UyE-0005Os-NJ for qemu-devel@nongnu.org; Fri, 26 Jun 2015 10:51:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z8UyD-0002W9-ML for qemu-devel@nongnu.org; Fri, 26 Jun 2015 10:51:10 -0400 Received: from mail-qk0-x22f.google.com ([2607:f8b0:400d:c09::22f]:35806) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z8UyD-0002Vo-I6 for qemu-devel@nongnu.org; Fri, 26 Jun 2015 10:51:09 -0400 Received: by qkbp125 with SMTP id p125so56294689qkb.2 for ; Fri, 26 Jun 2015 07:51:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=QgeoO6nNagcBPKXF1Y+0SaCJnTLhjGlA2KOaqIwq/Ls=; b=glWmfbWecWtZZS/BCGMdrrUu2nNHmIstFbSp4ZQprfoB0HPp8QB02z4YBmWO9ephBb 2psiowx3l68kTUiq9x1sjpStaBdSS7haZ35rU7a/7oe3c6JuGK14BDEhM+Ec2n/Jh/ws lBgRqbAbDqDc4xOyRKFeONIjWiouYI/IOdSDdWcnoKxnKq3JxDNs8BD73Nh8wUJh7h6X MoIgyhOxydnQh67Jpe2/hSgCj8SKNQIlahC+1o4cdRQhQTQC2FC84gO0EM4FvRsVFmxL Ym03BFcJghh3Fq1LqxtY6hIz4KgRrtYZSfNgplfPFZFsYrqnFSqdZJE4AZORzZKAiwSp qZ8Q== X-Received: by 10.55.21.141 with SMTP id 13mr4465469qkv.101.1435330269225; Fri, 26 Jun 2015 07:51:09 -0700 (PDT) Received: from localhost (bne75-h02-31-39-163-232.dsl.sta.abo.bbox.fr. [31.39.163.232]) by mx.google.com with ESMTPSA id 17sm6900772qhd.45.2015.06.26.07.51.07 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Jun 2015 07:51:08 -0700 (PDT) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Fri, 26 Jun 2015 16:49:32 +0200 Message-Id: <1435330185-23248-27-git-send-email-marcandre.lureau@gmail.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1435330185-23248-1-git-send-email-marcandre.lureau@gmail.com> References: <1435330185-23248-1-git-send-email-marcandre.lureau@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c09::22f Cc: cam@cs.ualberta.ca, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , stefanha@redhat.com Subject: [Qemu-devel] [PATCH 26/39] ivshmem: fix pci_ivshmem_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 Free all objects owned by the device, making sure the device is free, fixing hot-unplug. Signed-off-by: Marc-André Lureau --- hw/misc/ivshmem.c | 38 +++++++++++++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c index 2e9320b..df3bd9d 100644 --- a/hw/misc/ivshmem.c +++ b/hw/misc/ivshmem.c @@ -799,15 +799,47 @@ static void pci_ivshmem_realize(PCIDevice *dev, Error **errp) static void pci_ivshmem_exit(PCIDevice *dev) { IVShmemState *s = IVSHMEM(dev); + int i; + + fifo8_destroy(&s->incoming_fifo); if (s->migration_blocker) { migrate_del_blocker(s->migration_blocker); error_free(s->migration_blocker); } - memory_region_del_subregion(&s->bar, &s->ivshmem); - vmstate_unregister_ram(&s->ivshmem, DEVICE(dev)); - fifo8_destroy(&s->incoming_fifo); + if (s->shm_fd >= 0) { + void *addr = memory_region_get_ram_ptr(&s->ivshmem); + + vmstate_unregister_ram(&s->ivshmem, DEVICE(dev)); + memory_region_del_subregion(&s->bar, &s->ivshmem); + + if (munmap(addr, s->ivshmem_size) == -1) { + error_report("Failed to munmap shared memory %s", strerror(errno)); + } + } + + if (s->eventfd_chr) { + for (i = 0; i < s->vectors; i++) { + if (s->eventfd_chr[i]) { + qemu_chr_free(s->eventfd_chr[i]); + } + } + g_free(s->eventfd_chr); + } + + if (s->peers) { + for (i = 0; i < s->nb_peers; i++) { + close_guest_eventfds(s, i); + } + g_free(s->peers); + } + + if (ivshmem_has_feature(s, IVSHMEM_MSI)) { + msix_uninit_exclusive_bar(dev); + } + + g_free(s->eventfd_table); } static bool test_msix(void *opaque, int version_id)