From 68778b816d930d625a550a700548c51e2205d1bb Mon Sep 17 00:00:00 2001 From: Fam Zheng Date: Thu, 17 Sep 2015 02:29:08 +0200 Subject: [PATCH 19/22] dataplane: Mark host notifiers' client type as "dataplane" Message-id: <1442456951-3827-10-git-send-email-famz@redhat.com> Patchwork-id: 67800 O-Subject: [RHEL-7.2 qemu-kvm-rhev PATCH v2 09/12] dataplane: Mark host notifiers' client type as "dataplane" Bugzilla: 1211689 RH-Acked-by: Kevin Wolf RH-Acked-by: Paolo Bonzini RH-Acked-by: Stefan Hajnoczi Signed-off-by: Fam Zheng --- hw/block/dataplane/virtio-blk.c | 4 ++-- hw/scsi/virtio-scsi-dataplane.c | 16 ++++++++-------- include/block/aio.h | 1 + 3 files changed, 11 insertions(+), 10 deletions(-) Signed-off-by: Miroslav Rezanina --- hw/block/dataplane/virtio-blk.c | 4 ++-- hw/scsi/virtio-scsi-dataplane.c | 16 ++++++++-------- include/block/aio.h | 1 + 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/hw/block/dataplane/virtio-blk.c b/hw/block/dataplane/virtio-blk.c index e472154..5419f1c 100644 --- a/hw/block/dataplane/virtio-blk.c +++ b/hw/block/dataplane/virtio-blk.c @@ -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_DATAPLANE, 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_DATAPLANE, NULL); /* Drain and switch bs back to the QEMU main loop */ diff --git a/hw/scsi/virtio-scsi-dataplane.c b/hw/scsi/virtio-scsi-dataplane.c index f7bab09..55c2524 100644 --- a/hw/scsi/virtio-scsi-dataplane.c +++ b/hw/scsi/virtio-scsi-dataplane.c @@ -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_DATAPLANE, 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_DATAPLANE, 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_DATAPLANE, NULL); } if (s->event_vring) { aio_set_event_notifier(s->ctx, &s->event_vring->host_notifier, - AIO_CLIENT_UNSPECIFIED, NULL); + AIO_CLIENT_DATAPLANE, 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_DATAPLANE, 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_DATAPLANE, NULL); aio_set_event_notifier(s->ctx, &s->event_vring->host_notifier, - AIO_CLIENT_UNSPECIFIED, NULL); + AIO_CLIENT_DATAPLANE, 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_DATAPLANE, NULL); } blk_drain_all(); /* ensure there are no in-flight requests */ diff --git a/include/block/aio.h b/include/block/aio.h index 3118e36..d1a7e7a 100644 --- a/include/block/aio.h +++ b/include/block/aio.h @@ -228,6 +228,7 @@ bool aio_dispatch(AioContext *ctx); #define AIO_CLIENT_PROTOCOL (1 << 1) #define AIO_CLIENT_NBD_SERVER (1 << 2) #define AIO_CLIENT_CONTEXT (1 << 3) +#define AIO_CLIENT_DATAPLANE (1 << 4) #define AIO_CLIENT_MASK_ALL -1 /* Progress in completing AIO work to occur. This can issue new pending -- 1.8.3.1