diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2016-10-21 22:48:14 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2016-10-30 20:06:21 +0200 |
| commit | ed08a2a0ba165bfa3d520126eed340c803308321 (patch) | |
| tree | b84e53daba9e6bc08c8c9c6d5b39070f45bc89d8 | |
| parent | e616c2f390634a241f7899ff4c52bed9803103c6 (diff) | |
virtio: use virtio_bus_set_host_notifier to start/stop ioeventfd
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 <stefanha@redhat.com>
Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
| -rw-r--r-- | hw/virtio/virtio-bus.c | 4 | ||||
| -rw-r--r-- | hw/virtio/virtio.c | 8 | ||||
| -rw-r--r-- | 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 b0e45442d9..fd105b80a7 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 2ece690c56..b738163520 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); } } diff --git a/include/hw/virtio/virtio-bus.h b/include/hw/virtio/virtio-bus.h index cbdf745c84..fdf7fdab81 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 */ |