Commit a378b49a authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Michael S. Tsirkin
Browse files

virtio: merge virtio_queue_aio_set_host_notifier_handler with virtio_queue_set_aio 



Eliminating the reentrancy is actually a nice thing that we can do
with the API that Michael proposed, so let's make it first class.
This also hides the complex assign/set_handler conventions from
callers of virtio_queue_aio_set_host_notifier_handler, which in
fact was always called with assign=true.

Reviewed-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent a8f2e5c8

hw/block/dataplane/virtio-blk.c

+3 −4
Original line number Diff line number Diff line
@@ -237,8 +237,8 @@ void virtio_blk_data_plane_start(VirtIOBlockDataPlane *s) 


    /* Get this show started by hooking up our callbacks */

    aio_context_acquire(s->ctx);

    virtio_set_queue_aio(s->vq, virtio_blk_data_plane_handle_output);

    virtio_queue_aio_set_host_notifier_handler(s->vq, s->ctx, true, true);

    virtio_queue_aio_set_host_notifier_handler(s->vq, s->ctx,

                                               virtio_blk_data_plane_handle_output);

    aio_context_release(s->ctx);

    return;
@@ -273,8 +273,7 @@ void virtio_blk_data_plane_stop(VirtIOBlockDataPlane *s) 
    aio_context_acquire(s->ctx);



    /* Stop notifications for new requests from guest */

    virtio_queue_aio_set_host_notifier_handler(s->vq, s->ctx, false, false);

    virtio_set_queue_aio(s->vq, NULL);

    virtio_queue_aio_set_host_notifier_handler(s->vq, s->ctx, NULL);



    /* Drain and switch bs back to the QEMU main loop */

    blk_set_aio_context(s->conf->conf.blk, qemu_get_aio_context());

hw/scsi/virtio-scsi-dataplane.c

+4 −8
Original line number Diff line number Diff line
@@ -81,8 +81,7 @@ static int virtio_scsi_vring_init(VirtIOSCSI *s, VirtQueue *vq, int n, 
        return rc;

    }



    virtio_queue_aio_set_host_notifier_handler(vq, s->ctx, true, true);

    virtio_set_queue_aio(vq, fn);

    virtio_queue_aio_set_host_notifier_handler(vq, s->ctx, fn);

    return 0;

}
@@ -99,13 +98,10 @@ static void virtio_scsi_clear_aio(VirtIOSCSI *s) 
    VirtIOSCSICommon *vs = VIRTIO_SCSI_COMMON(s);

    int i;



    virtio_queue_aio_set_host_notifier_handler(vs->ctrl_vq, s->ctx, false, false);

    virtio_set_queue_aio(vs->ctrl_vq, NULL);

    virtio_queue_aio_set_host_notifier_handler(vs->event_vq, s->ctx, false, false);

    virtio_set_queue_aio(vs->event_vq, NULL);

    virtio_queue_aio_set_host_notifier_handler(vs->ctrl_vq, s->ctx, NULL);

    virtio_queue_aio_set_host_notifier_handler(vs->event_vq, s->ctx, NULL);

    for (i = 0; i < vs->conf.num_queues; i++) {

        virtio_queue_aio_set_host_notifier_handler(vs->cmd_vqs[i], s->ctx, false, false);

        virtio_set_queue_aio(vs->cmd_vqs[i], NULL);

        virtio_queue_aio_set_host_notifier_handler(vs->cmd_vqs[i], s->ctx, NULL);

    }

}

hw/virtio/virtio.c

+5 −12
Original line number Diff line number Diff line
@@ -1159,14 +1159,6 @@ VirtQueue *virtio_add_queue(VirtIODevice *vdev, int queue_size, 
    return &vdev->vq[i];

}



void virtio_set_queue_aio(VirtQueue *vq,

                          void (*handle_output)(VirtIODevice *, VirtQueue *))

{

    assert(vq->handle_output);



    vq->handle_aio_output = handle_output;

}



void virtio_del_queue(VirtIODevice *vdev, int n)

{

    if (n < 0 || n >= VIRTIO_QUEUE_MAX) {
@@ -1809,18 +1801,19 @@ static void virtio_queue_host_notifier_aio_read(EventNotifier *n) 
}



void virtio_queue_aio_set_host_notifier_handler(VirtQueue *vq, AioContext *ctx,

                                                bool assign, bool set_handler)

                                                void (*handle_output)(VirtIODevice *,

                                                                      VirtQueue *))

{

    if (assign && set_handler) {

    if (handle_output) {

        vq->handle_aio_output = handle_output;

        aio_set_event_notifier(ctx, &vq->host_notifier, true,

                               virtio_queue_host_notifier_aio_read);

    } else {

        aio_set_event_notifier(ctx, &vq->host_notifier, true, NULL);

    }

    if (!assign) {

        /* Test and clear notifier before after disabling event,

         * in case poll callback didn't have time to run. */

        virtio_queue_host_notifier_aio_read(&vq->host_notifier);

        vq->handle_aio_output = NULL;

    }

}

include/hw/virtio/virtio.h

+2 −4
Original line number Diff line number Diff line
@@ -142,9 +142,6 @@ VirtQueue *virtio_add_queue(VirtIODevice *vdev, int queue_size, 
                            void (*handle_output)(VirtIODevice *,

                                                  VirtQueue *));



void virtio_set_queue_aio(VirtQueue *vq,

                          void (*handle_output)(VirtIODevice *, VirtQueue *));



void virtio_del_queue(VirtIODevice *vdev, int n);



void *virtqueue_alloc_element(size_t sz, unsigned out_num, unsigned in_num);
@@ -254,7 +251,8 @@ EventNotifier *virtio_queue_get_host_notifier(VirtQueue *vq); 
void virtio_queue_set_host_notifier_fd_handler(VirtQueue *vq, bool assign,

                                               bool set_handler);

void virtio_queue_aio_set_host_notifier_handler(VirtQueue *vq, AioContext *ctx,

                                                bool assign, bool set_handler);

                                                void (*fn)(VirtIODevice *,

                                                           VirtQueue *));

void virtio_irq(VirtQueue *vq);

VirtQueue *virtio_vector_first_queue(VirtIODevice *vdev, uint16_t vector);

VirtQueue *virtio_vector_next_queue(VirtQueue *vq);