From patchwork Mon Mar 7 19:25:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 8521891 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 5F678C0553 for ; Mon, 7 Mar 2016 19:32:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C427C20295 for ; Mon, 7 Mar 2016 19:32:49 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 14E1D2027D for ; Mon, 7 Mar 2016 19:32:49 +0000 (UTC) Received: from localhost ([::1]:57947 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ad0tc-0007oN-6w for patchwork-qemu-devel@patchwork.kernel.org; Mon, 07 Mar 2016 14:32:48 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44685) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ad0n7-000450-OD for qemu-devel@nongnu.org; Mon, 07 Mar 2016 14:26:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ad0n5-0003wM-5D for qemu-devel@nongnu.org; Mon, 07 Mar 2016 14:26:05 -0500 Received: from mx1.redhat.com ([209.132.183.28]:51490) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ad0n4-0003vF-WB for qemu-devel@nongnu.org; Mon, 07 Mar 2016 14:26:03 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id 906ED257E; Mon, 7 Mar 2016 19:26:02 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-61.ams2.redhat.com [10.36.116.61]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u27JQ0ZM015427 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Mon, 7 Mar 2016 14:26:01 -0500 Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 3D3D23004FAE; Mon, 7 Mar 2016 20:25:56 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Mon, 7 Mar 2016 20:25:28 +0100 Message-Id: <1457378754-21649-17-git-send-email-armbru@redhat.com> In-Reply-To: <1457378754-21649-1-git-send-email-armbru@redhat.com> References: <1457378754-21649-1-git-send-email-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: claudio.fontana@huawei.com, cam@cs.ualberta.ca, mlureau@redhat.com, david.marchand@6wind.com, pbonzini@redhat.com Subject: [Qemu-devel] [PATCH v2 16/42] ivshmem: Drop ivshmem_event() stub 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Markus Armbruster Reviewed-by: Marc-André Lureau --- hw/misc/ivshmem.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c index b087dc3..7119a07 100644 --- a/hw/misc/ivshmem.c +++ b/hw/misc/ivshmem.c @@ -267,11 +267,6 @@ static int ivshmem_can_receive(void * opaque) return sizeof(int64_t); } -static void ivshmem_event(void *opaque, int event) -{ - IVSHMEM_DPRINTF("ivshmem_event %d\n", event); -} - static void ivshmem_vector_notify(void *opaque) { MSIVector *entry = opaque; @@ -719,7 +714,7 @@ static void ivshmem_check_version(void *opaque, const uint8_t * buf, int size) IVSHMEM_DPRINTF("version check ok, switch to real chardev handler\n"); qemu_chr_add_handlers(s->server_chr, ivshmem_can_receive, ivshmem_read, - ivshmem_event, s); + NULL, s); } /* Select the MSI-X vectors used by device. @@ -941,7 +936,7 @@ static void pci_ivshmem_realize(PCIDevice *dev, Error **errp) pci_register_bar(dev, 2, attr, &s->bar); qemu_chr_add_handlers(s->server_chr, ivshmem_can_receive, - ivshmem_check_version, ivshmem_event, s); + ivshmem_check_version, NULL, s); } else { /* just map the file immediately, we're not using a server */ int fd;