@@ -283,7 +283,7 @@ void virtio_blk_data_plane_start(VirtIOBlockDataPlane *s)
/* Get this show started by hooking up our callbacks */
aio_context_acquire(s->ctx);
- aio_set_event_notifier(s->ctx, &s->host_notifier, AIO_CLIENT_UNSPECIFIED,
+ aio_set_event_notifier(s->ctx, &s->host_notifier, AIO_CLIENT_EXTERNAL,
handle_notify);
aio_context_release(s->ctx);
return;
@@ -320,7 +320,7 @@ void virtio_blk_data_plane_stop(VirtIOBlockDataPlane *s)
aio_context_acquire(s->ctx);
/* Stop notifications for new requests from guest */
- aio_set_event_notifier(s->ctx, &s->host_notifier, AIO_CLIENT_UNSPECIFIED,
+ aio_set_event_notifier(s->ctx, &s->host_notifier, AIO_CLIENT_EXTERNAL,
NULL);
/* Drain and switch bs back to the QEMU main loop */
@@ -60,7 +60,7 @@ static VirtIOSCSIVring *virtio_scsi_vring_init(VirtIOSCSI *s,
r = g_slice_new(VirtIOSCSIVring);
r->host_notifier = *virtio_queue_get_host_notifier(vq);
r->guest_notifier = *virtio_queue_get_guest_notifier(vq);
- aio_set_event_notifier(s->ctx, &r->host_notifier, AIO_CLIENT_UNSPECIFIED,
+ aio_set_event_notifier(s->ctx, &r->host_notifier, AIO_CLIENT_EXTERNAL,
handler);
r->parent = s;
@@ -72,7 +72,7 @@ static VirtIOSCSIVring *virtio_scsi_vring_init(VirtIOSCSI *s,
return r;
fail_vring:
- aio_set_event_notifier(s->ctx, &r->host_notifier, AIO_CLIENT_UNSPECIFIED,
+ aio_set_event_notifier(s->ctx, &r->host_notifier, AIO_CLIENT_EXTERNAL,
NULL);
k->set_host_notifier(qbus->parent, n, false);
g_slice_free(VirtIOSCSIVring, r);
@@ -165,16 +165,16 @@ static void virtio_scsi_clear_aio(VirtIOSCSI *s)
if (s->ctrl_vring) {
aio_set_event_notifier(s->ctx, &s->ctrl_vring->host_notifier,
- AIO_CLIENT_UNSPECIFIED, NULL);
+ AIO_CLIENT_EXTERNAL, NULL);
}
if (s->event_vring) {
aio_set_event_notifier(s->ctx, &s->event_vring->host_notifier,
- AIO_CLIENT_UNSPECIFIED, NULL);
+ AIO_CLIENT_EXTERNAL, NULL);
}
if (s->cmd_vrings) {
for (i = 0; i < vs->conf.num_queues && s->cmd_vrings[i]; i++) {
aio_set_event_notifier(s->ctx, &s->cmd_vrings[i]->host_notifier,
- AIO_CLIENT_UNSPECIFIED, NULL);
+ AIO_CLIENT_EXTERNAL, NULL);
}
}
}
@@ -296,12 +296,12 @@ void virtio_scsi_dataplane_stop(VirtIOSCSI *s)
aio_context_acquire(s->ctx);
aio_set_event_notifier(s->ctx, &s->ctrl_vring->host_notifier,
- AIO_CLIENT_UNSPECIFIED, NULL);
+ AIO_CLIENT_EXTERNAL, NULL);
aio_set_event_notifier(s->ctx, &s->event_vring->host_notifier,
- AIO_CLIENT_UNSPECIFIED, NULL);
+ AIO_CLIENT_EXTERNAL, NULL);
for (i = 0; i < vs->conf.num_queues; i++) {
aio_set_event_notifier(s->ctx, &s->cmd_vrings[i]->host_notifier,
- AIO_CLIENT_UNSPECIFIED, NULL);
+ AIO_CLIENT_EXTERNAL, NULL);
}
blk_drain_all(); /* ensure there are no in-flight requests */
They will be excluded by type in the nested event loops in block layer, so that unwanted events won't be processed there. Signed-off-by: Fam Zheng <famz@redhat.com> --- hw/block/dataplane/virtio-blk.c | 4 ++-- hw/scsi/virtio-scsi-dataplane.c | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-)