From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35868) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bmhRo-0007Nz-4R for qemu-devel@nongnu.org; Wed, 21 Sep 2016 09:20:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bmhRl-0001CU-QY for qemu-devel@nongnu.org; Wed, 21 Sep 2016 09:20:23 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:36376) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bmhRl-0001CL-Hn for qemu-devel@nongnu.org; Wed, 21 Sep 2016 09:20:21 -0400 Received: by mail-wm0-f68.google.com with SMTP id b184so8569030wma.3 for ; Wed, 21 Sep 2016 06:20:21 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 21 Sep 2016 15:18:57 +0200 Message-Id: <1474463939-12223-11-git-send-email-pbonzini@redhat.com> In-Reply-To: <1474463939-12223-1-git-send-email-pbonzini@redhat.com> References: <1474463939-12223-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 10/12] virtio: do not export set_host_notifier_internal List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: borntraeger@de.ibm.com, cornelia.huck@de.ibm.com, mst@redhat.com, famz@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. 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 ef8f622..289bf86 100644 --- a/hw/virtio/virtio-bus.c +++ b/hw/virtio/virtio-bus.c @@ -146,8 +146,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 e7b7d0a..8abcd3d 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -1919,14 +1919,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; @@ -1950,7 +1949,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; @@ -1967,14 +1966,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 b812cad..209c418 100644 --- a/include/hw/virtio/virtio-bus.h +++ b/include/hw/virtio/virtio-bus.h @@ -137,9 +137,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, bool set_handler); - #endif /* VIRTIO_BUS_H */ -- 2.7.4