From patchwork Mon Oct 12 16:41:22 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: 529262 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 012AA1402B7 for ; Tue, 13 Oct 2015 04:19:57 +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=e9YwTHTe; dkim-atps=neutral Received: from localhost ([::1]:57398 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZlglO-00062U-KL for incoming@patchwork.ozlabs.org; Mon, 12 Oct 2015 13:19:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33417) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZlgGt-0007E1-Us for qemu-devel@nongnu.org; Mon, 12 Oct 2015 12:48:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZlgGq-0002yN-NF for qemu-devel@nongnu.org; Mon, 12 Oct 2015 12:48:23 -0400 Received: from mail-pa0-x234.google.com ([2607:f8b0:400e:c03::234]:34362) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZlgGq-0002yI-HX for qemu-devel@nongnu.org; Mon, 12 Oct 2015 12:48:20 -0400 Received: by padhy16 with SMTP id hy16so158293723pad.1 for ; Mon, 12 Oct 2015 09:48:20 -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=e9YwTHTeGjxNf/W2t+Y49TCyED8y0ZBdTdw4ymB69PIp+v7n2YZ/aYoehYi2jCp0w4 U97fbzkJY09GSvNJ59jpMYaXyb640RORHwZXtDnvPIi0V8pPxSwQ2sIkfDG8T2zUFuJd PXrmV0LVHXMPRziXEYVsqIgfLDDLbDb6iZqJLucMRMrtYKn7wDJjGVh/iFNcgHsWHVkY PUYTD85zvflmTrRrOVE/uA4m9kj3bSZA3kXE2RhyRtKk/533qUG4M10yVJKH34mhWTAK GPTooADzbgdvRnbfBhk/ALbjmsJ6jAf4+7gzeHnhFQX3Cem0kchKBqbcUMbr1hjPr79y uNlw== X-Received: by 10.67.22.97 with SMTP id hr1mr29592668pad.81.1444668500172; Mon, 12 Oct 2015 09:48:20 -0700 (PDT) Received: from localhost (APoitiers-257-1-35-234.w90-38.abo.wanadoo.fr. [90.38.210.234]) by smtp.gmail.com with ESMTPSA id tz1sm19284678pbc.50.2015.10.12.09.48.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Oct 2015 09:48:19 -0700 (PDT) From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Date: Mon, 12 Oct 2015 18:41:22 +0200 Message-Id: <1444668104-22955-29-git-send-email-marcandre.lureau@redhat.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1444668104-22955-1-git-send-email-marcandre.lureau@redhat.com> References: <1444668104-22955-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:400e:c03::234 Cc: peter.maydell@linaro.org, drjones@redhat.com, claudio.fontana@huawei.com, stefanha@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , pbonzini@redhat.com, cam@cs.ualberta.ca Subject: [Qemu-devel] [PULL v2 28/50] 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 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)