From patchwork Tue Oct 6 19:19:23 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: 526930 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from eggs.gnu.org (eggs.gnu.org [IPv6:2001:4830:134:3::10]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 10BC8140D8B for ; Wed, 7 Oct 2015 06:27:18 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=pD60Rebf; dkim-atps=neutral Received: from lists.gnu.org ([208.118.235.17]:35398) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZjXtK-0007Rr-JI for incoming@patchwork.ozlabs.org; Tue, 06 Oct 2015 15:27:14 -0400 Received: from localhost ([::1]:53348 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZjXtK-0001D0-0N for incoming@patchwork.ozlabs.org; Tue, 06 Oct 2015 15:27:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59901) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZjXoB-0001ax-Mn for qemu-devel@nongnu.org; Tue, 06 Oct 2015 15:22:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZjXnf-0005aF-PB for qemu-devel@nongnu.org; Tue, 06 Oct 2015 15:21:55 -0400 Received: from mail-qg0-x22c.google.com ([2607:f8b0:400d:c04::22c]:35175) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZjXnf-0005Wm-13 for qemu-devel@nongnu.org; Tue, 06 Oct 2015 15:21:23 -0400 Received: by qgt47 with SMTP id 47so183774070qgt.2 for ; Tue, 06 Oct 2015 12:21:22 -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 :mime-version:content-type:content-transfer-encoding; bh=dfJo6Gf/aNKoJ7AsV3WKA897BDixJL0umQ6hL2e8Lwo=; b=pD60RebfkRb7Fxc0nQRGwrJdz7RvlJ6oTe8XKIxeQBpJtqxEHxppSXahFrcUHurEq6 UWJoArcm88Gq5iRR8LqFgSkDj0Wy1h3SB8keOjbWe6QdZzRylAE0fbA5XHRKQZ5HfQPx 2uz4byknJetSrInciT/dmVjjkmOnXKUKO1NS5yhE1UWKYVY1OL9rBsTS5oY1dx9Fp7Jl 5uM/K2KkJV7Qyi2GKSYZ2AgfP8FiUJE5W2SQyQRnkEJ8CHJeo8B7Mqo/UfoQ/iAy0x4P f9D49I+YdaRlFj5ByzQsWFvbO5KyVfS6LvWz1TCRqvX/goSsoIxeNJnda1U2iPTWDmtu rPuA== X-Received: by 10.140.144.8 with SMTP id 8mr50523891qhq.54.1444159282420; Tue, 06 Oct 2015 12:21:22 -0700 (PDT) Received: from localhost (bne75-h02-31-39-163-232.dsl.sta.abo.bbox.fr. [31.39.163.232]) by smtp.gmail.com with ESMTPSA id v75sm14520534qgd.37.2015.10.06.12.21.21 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Oct 2015 12:21:21 -0700 (PDT) From: marcandre.lureau@redhat.com To: peter.maydell@linaro.org Date: Tue, 6 Oct 2015 21:19:23 +0200 Message-Id: <1444159184-18153-28-git-send-email-marcandre.lureau@redhat.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1444159184-18153-1-git-send-email-marcandre.lureau@redhat.com> References: <1444159184-18153-1-git-send-email-marcandre.lureau@redhat.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:c04::22c Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-devel@nongnu.org Subject: [Qemu-devel] [PULL 27/48] 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 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x From: Marc-André Lureau Free all objects owned by the device, making sure the device is free, fixing hot-unplug. Signed-off-by: Marc-André Lureau Reviewed-by: Claudio Fontana --- 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 7be3d5e..d1b5d35 100644 --- a/hw/misc/ivshmem.c +++ b/hw/misc/ivshmem.c @@ -800,15 +800,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)