From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54966) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c0xaD-00036b-AB for qemu-devel@nongnu.org; Sun, 30 Oct 2016 17:24:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c0xaC-0006nB-7e for qemu-devel@nongnu.org; Sun, 30 Oct 2016 17:24:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60408) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1c0xaB-0006n4-W1 for qemu-devel@nongnu.org; Sun, 30 Oct 2016 17:24:00 -0400 Date: Sun, 30 Oct 2016 23:23:57 +0200 From: "Michael S. Tsirkin" Message-ID: <1477850917-1214-14-git-send-email-mst@redhat.com> References: <1477850917-1214-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1477850917-1214-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL 13/47] 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: Peter Maydell , Paolo Bonzini , Stefan Hajnoczi , Cornelia Huck From: Paolo Bonzini ioeventfd_disabled was the only reason for the default implementation of virtio_device_start_ioeventfd not to use virtio_bus_set_host_notifier. This is now fixed, and the sole entry point to set up ioeventfd can be virtio_bus_set_host_notifier. Reviewed-by: Stefan Hajnoczi Reviewed-by: Cornelia Huck Signed-off-by: Paolo Bonzini Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- include/hw/virtio/virtio-bus.h | 5 ----- hw/virtio/virtio-bus.c | 4 ++-- hw/virtio/virtio.c | 8 +++----- 3 files changed, 5 insertions(+), 12 deletions(-) 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 */ diff --git a/hw/virtio/virtio-bus.c b/hw/virtio/virtio-bus.c index b0e4544..fd105b8 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 2ece690..b738163 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -2145,14 +2145,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; @@ -2176,7 +2175,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; @@ -2193,14 +2192,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); } } -- MST