From patchwork Wed Feb 24 20:35:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 8414271 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 D8D87C0553 for ; Wed, 24 Feb 2016 20:41:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 40D2520295 for ; Wed, 24 Feb 2016 20:41:40 +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 82D892021F for ; Wed, 24 Feb 2016 20:41:39 +0000 (UTC) Received: from localhost ([::1]:38285 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYgFe-00053c-U6 for patchwork-qemu-devel@patchwork.kernel.org; Wed, 24 Feb 2016 15:41:38 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40797) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYgA1-0002nR-W4 for qemu-devel@nongnu.org; Wed, 24 Feb 2016 15:35:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aYgA1-00053r-4M for qemu-devel@nongnu.org; Wed, 24 Feb 2016 15:35:49 -0500 Received: from mx1.redhat.com ([209.132.183.28]:45869) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYgA0-00053j-W0 for qemu-devel@nongnu.org; Wed, 24 Feb 2016 15:35:49 -0500 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 9DCA363141; Wed, 24 Feb 2016 20:35:48 +0000 (UTC) Received: from redhat.com (vpn1-6-57.ams2.redhat.com [10.36.6.57]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id u1OKZkl2013555; Wed, 24 Feb 2016 15:35:46 -0500 Date: Wed, 24 Feb 2016 22:35:45 +0200 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: <1456343639-3471-13-git-send-email-mst@redhat.com> References: <1456343639-3471-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1456343639-3471-1-git-send-email-mst@redhat.com> X-Mutt-Fcc: =sent X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Wed, 24 Feb 2016 20:35:48 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Cc: Peter Maydell , Fam Zheng , Stefan Hajnoczi , Paolo Bonzini Subject: [Qemu-devel] [PULL 12/23] virtio: add AioContext-specific function for host notifiers 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 From: Paolo Bonzini This is used to register ioeventfd with a dataplane thread. Signed-off-by: Paolo Bonzini Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Fam Zheng Acked-by: Stefan Hajnoczi --- include/hw/virtio/virtio.h | 2 ++ hw/virtio/virtio.c | 16 ++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h index c38a2fe..3ecdb20 100644 --- a/include/hw/virtio/virtio.h +++ b/include/hw/virtio/virtio.h @@ -249,6 +249,8 @@ void virtio_queue_set_guest_notifier_fd_handler(VirtQueue *vq, bool assign, EventNotifier *virtio_queue_get_host_notifier(VirtQueue *vq); void virtio_queue_set_host_notifier_fd_handler(VirtQueue *vq, bool assign, bool set_handler); +void virtio_queue_aio_set_host_notifier_handler(VirtQueue *vq, AioContext *ctx, + bool assign, bool set_handler); void virtio_queue_notify_vq(VirtQueue *vq); void virtio_irq(VirtQueue *vq); VirtQueue *virtio_vector_first_queue(VirtIODevice *vdev, uint16_t vector); diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index e365960..f419e7c 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -1786,6 +1786,22 @@ static void virtio_queue_host_notifier_read(EventNotifier *n) } } +void virtio_queue_aio_set_host_notifier_handler(VirtQueue *vq, AioContext *ctx, + bool assign, bool set_handler) +{ + if (assign && set_handler) { + aio_set_event_notifier(ctx, &vq->host_notifier, true, + virtio_queue_host_notifier_read); + } else { + aio_set_event_notifier(ctx, &vq->host_notifier, true, NULL); + } + if (!assign) { + /* Test and clear notifier before after disabling event, + * in case poll callback didn't have time to run. */ + virtio_queue_host_notifier_read(&vq->host_notifier); + } +} + void virtio_queue_set_host_notifier_fd_handler(VirtQueue *vq, bool assign, bool set_handler) {