From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60270) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bMq7A-0002fY-Ly for qemu-devel@nongnu.org; Tue, 12 Jul 2016 01:20:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bMq78-0005PS-AX for qemu-devel@nongnu.org; Tue, 12 Jul 2016 01:20:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58237) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bMq78-0005PL-2P for qemu-devel@nongnu.org; Tue, 12 Jul 2016 01:20:10 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7E53D2DC35D for ; Tue, 12 Jul 2016 05:20:09 +0000 (UTC) From: Fam Zheng Date: Tue, 12 Jul 2016 13:19:55 +0800 Message-Id: <1468300800-31256-2-git-send-email-famz@redhat.com> In-Reply-To: <1468300800-31256-1-git-send-email-famz@redhat.com> References: <1468300800-31256-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH 1/6] virtio-bus: Drop "set_handler" parameter List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, mst@redhat.com, kwolf@redhat.com, pbonzini@redhat.com It always equals to assign now. Signed-off-by: Fam Zheng Reviewed-by: Stefan Hajnoczi --- hw/virtio/virtio-bus.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/hw/virtio/virtio-bus.c b/hw/virtio/virtio-bus.c index a85b7c8..8700de0 100644 --- a/hw/virtio/virtio-bus.c +++ b/hw/virtio/virtio-bus.c @@ -150,10 +150,9 @@ void virtio_bus_set_vdev_config(VirtioBusState *bus, uint8_t *config) * This function handles both assigning the ioeventfd handler and * registering it with the kernel. * assign: register/deregister ioeventfd with the kernel - * set_handler: use the generic ioeventfd handler */ static int set_host_notifier_internal(DeviceState *proxy, VirtioBusState *bus, - int n, bool assign, bool set_handler) + int n, bool assign) { VirtIODevice *vdev = virtio_bus_get_device(bus); VirtioBusClass *k = VIRTIO_BUS_GET_CLASS(bus); @@ -167,7 +166,7 @@ static int set_host_notifier_internal(DeviceState *proxy, VirtioBusState *bus, error_report("%s: unable to init event notifier: %d", __func__, r); return r; } - virtio_queue_set_host_notifier_fd_handler(vq, true, set_handler); + virtio_queue_set_host_notifier_fd_handler(vq, true, true); r = k->ioeventfd_assign(proxy, notifier, n, assign); if (r < 0) { error_report("%s: unable to assign ioeventfd: %d", __func__, r); @@ -201,7 +200,7 @@ void virtio_bus_start_ioeventfd(VirtioBusState *bus) if (!virtio_queue_get_num(vdev, n)) { continue; } - r = set_host_notifier_internal(proxy, bus, n, true, true); + r = set_host_notifier_internal(proxy, bus, n, true); if (r < 0) { goto assign_error; } @@ -215,7 +214,7 @@ assign_error: continue; } - r = set_host_notifier_internal(proxy, bus, n, false, false); + r = set_host_notifier_internal(proxy, bus, n, false); assert(r >= 0); } k->ioeventfd_set_started(proxy, false, true); @@ -237,7 +236,7 @@ void virtio_bus_stop_ioeventfd(VirtioBusState *bus) if (!virtio_queue_get_num(vdev, n)) { continue; } - r = set_host_notifier_internal(proxy, bus, n, false, false); + r = set_host_notifier_internal(proxy, bus, n, false); assert(r >= 0); } k->ioeventfd_set_started(proxy, false, false); @@ -269,7 +268,7 @@ int virtio_bus_set_host_notifier(VirtioBusState *bus, int n, bool assign) */ virtio_bus_stop_ioeventfd(bus); } - return set_host_notifier_internal(proxy, bus, n, assign, false); + return set_host_notifier_internal(proxy, bus, n, assign); } static char *virtio_bus_get_dev_path(DeviceState *dev) -- 2.7.4