From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33279) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1btZ9r-0003lf-Hf for qemu-devel@nongnu.org; Mon, 10 Oct 2016 07:54:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1btZ9q-00066O-Dp for qemu-devel@nongnu.org; Mon, 10 Oct 2016 07:54:15 -0400 Received: from mail-lf0-x241.google.com ([2a00:1450:4010:c07::241]:33957) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1btZ9q-00065z-1N for qemu-devel@nongnu.org; Mon, 10 Oct 2016 07:54:14 -0400 Received: by mail-lf0-x241.google.com with SMTP id p80so9620911lfp.1 for ; Mon, 10 Oct 2016 04:54:13 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 10 Oct 2016 13:53:39 +0200 Message-Id: <1476100421-28772-12-git-send-email-pbonzini@redhat.com> In-Reply-To: <1476100421-28772-1-git-send-email-pbonzini@redhat.com> References: <1476100421-28772-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 11/13] virtio: use virtio_bus_set_host_notifier to start/stop ioeventfd List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, borntraeger@de.ibm.com, cornelia.huck@de.ibm.com, famz@redhat.com, mst@redhat.com ioeventfd_disabled was the only reason for the default implementation of virtio_device_start_ioeventfd_impl not to use virtio_bus_set_host_notifier. This is now fixed, and the sole entry point to set up ioeventfd can now be virtio_bus_set_host_notifier. Reviewed-by: Stefan Hajnoczi Signed-off-by: Paolo Bonzini --- hw/virtio/virtio-bus.c | 4 ++-- hw/virtio/virtio.c | 8 +++----- include/hw/virtio/virtio-bus.h | 5 ----- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/hw/virtio/virtio-bus.c b/hw/virtio/virtio-bus.c index 440c742..d6feaaf 100644 --- a/hw/virtio/virtio-bus.c +++ b/hw/virtio/virtio-bus.c @@ -147,8 +147,8 @@ void virtio_bus_set_vdev_config(VirtioBusState *bus, uint8_t *config) } } -int set_host_notifier_internal(DeviceState *proxy, VirtioBusState *bus, - int n, bool assign) +static int set_host_notifier_internal(DeviceState *proxy, VirtioBusState *bus, + int n, bool assign) { VirtIODevice *vdev = virtio_bus_get_device(bus); VirtioBusClass *k = VIRTIO_BUS_GET_CLASS(bus); diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index 2817d42..9a10d86 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -2093,14 +2093,13 @@ static Property virtio_properties[] = { static int virtio_device_start_ioeventfd_impl(VirtIODevice *vdev) { VirtioBusState *qbus = VIRTIO_BUS(qdev_get_parent_bus(DEVICE(vdev))); - DeviceState *proxy = DEVICE(BUS(qbus)->parent); int n, r, err; for (n = 0; n < VIRTIO_QUEUE_MAX; n++) { if (!virtio_queue_get_num(vdev, n)) { continue; } - r = set_host_notifier_internal(proxy, qbus, n, true); + r = virtio_bus_set_host_notifier(qbus, n, true); if (r < 0) { err = r; goto assign_error; @@ -2124,7 +2123,7 @@ assign_error: continue; } - r = set_host_notifier_internal(proxy, qbus, n, false); + r = virtio_bus_set_host_notifier(qbus, n, false); assert(r >= 0); } return err; @@ -2141,14 +2140,13 @@ int virtio_device_start_ioeventfd(VirtIODevice *vdev) static void virtio_device_stop_ioeventfd_impl(VirtIODevice *vdev) { VirtioBusState *qbus = VIRTIO_BUS(qdev_get_parent_bus(DEVICE(vdev))); - DeviceState *proxy = DEVICE(BUS(qbus)->parent); int n, r; for (n = 0; n < VIRTIO_QUEUE_MAX; n++) { if (!virtio_queue_get_num(vdev, n)) { continue; } - r = set_host_notifier_internal(proxy, qbus, n, false); + r = virtio_bus_set_host_notifier(qbus, n, false); assert(r >= 0); } } diff --git a/include/hw/virtio/virtio-bus.h b/include/hw/virtio/virtio-bus.h index cbdf745..fdf7fda 100644 --- a/include/hw/virtio/virtio-bus.h +++ b/include/hw/virtio/virtio-bus.h @@ -134,9 +134,4 @@ void virtio_bus_stop_ioeventfd(VirtioBusState *bus); /* Switch from/to the generic ioeventfd handler */ int virtio_bus_set_host_notifier(VirtioBusState *bus, int n, bool assign); -/* This is temporary. It is only needed because virtio_bus_set_host_notifier - * sets ioeventfd_disabled but we will shortly get rid of it. */ -int set_host_notifier_internal(DeviceState *proxy, VirtioBusState *bus, - int n, bool assign); - #endif /* VIRTIO_BUS_H */ -- 2.7.4