From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48481) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ai6gM-0000IE-UF for qemu-devel@nongnu.org; Mon, 21 Mar 2016 16:44:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ai6gL-0000jV-C9 for qemu-devel@nongnu.org; Mon, 21 Mar 2016 16:44:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55232) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ai6gL-0000j0-7X for qemu-devel@nongnu.org; Mon, 21 Mar 2016 16:44:09 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id D31A4711D9 for ; Mon, 21 Mar 2016 20:44:08 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-41.ams2.redhat.com [10.36.116.41]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u2LKi7ss013216 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Mon, 21 Mar 2016 16:44:08 -0400 From: Markus Armbruster Date: Mon, 21 Mar 2016 21:43:36 +0100 Message-Id: <1458593043-31731-14-git-send-email-armbru@redhat.com> In-Reply-To: <1458593043-31731-1-git-send-email-armbru@redhat.com> References: <1458593043-31731-1-git-send-email-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL v2 13/40] ivshmem: Clean up after commit 9940c32 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org IVShmemState member eventfd_chr is useless since commit 9940c32. Drop it. Signed-off-by: Markus Armbruster Reviewed-by: Marc-Andr=C3=A9 Lureau Message-Id: <1458066895-20632-14-git-send-email-armbru@redhat.com> --- hw/misc/ivshmem.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c index 6ac8c0d..9ea79ab 100644 --- a/hw/misc/ivshmem.c +++ b/hw/misc/ivshmem.c @@ -79,7 +79,6 @@ typedef struct IVShmemState { uint32_t intrmask; uint32_t intrstatus; =20 - CharDriverState **eventfd_chr; CharDriverState *server_chr; Fifo8 incoming_fifo; MemoryRegion ivshmem_mmio; @@ -942,8 +941,6 @@ static void pci_ivshmem_realize(PCIDevice *dev, Error= **errp) =20 pci_register_bar(dev, 2, attr, &s->bar); =20 - s->eventfd_chr =3D g_malloc0(s->vectors * sizeof(CharDriverState= *)); - qemu_chr_add_handlers(s->server_chr, ivshmem_can_receive, ivshmem_check_version, ivshmem_event, s); } else { @@ -1007,15 +1004,6 @@ static void pci_ivshmem_exit(PCIDevice *dev) memory_region_del_subregion(&s->bar, &s->ivshmem); } =20 - if (s->eventfd_chr) { - for (i =3D 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 =3D 0; i < s->nb_peers; i++) { close_peer_eventfds(s, i); --=20 2.4.3