[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v4 03/12] dataplane: Mark host notifiers' client typ
From: |
Fam Zheng |
Subject: |
[Qemu-block] [PATCH v4 03/12] dataplane: Mark host notifiers' client type as "external" |
Date: |
Tue, 20 Oct 2015 13:16:54 +0800 |
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 <address@hidden>
---
hw/block/dataplane/virtio-blk.c | 5 ++---
hw/scsi/virtio-scsi-dataplane.c | 18 ++++++++----------
2 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/hw/block/dataplane/virtio-blk.c b/hw/block/dataplane/virtio-blk.c
index f8716bc..c42ddeb 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, false,
+ aio_set_event_notifier(s->ctx, &s->host_notifier, true,
handle_notify);
aio_context_release(s->ctx);
return;
@@ -320,8 +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, false,
- NULL);
+ aio_set_event_notifier(s->ctx, &s->host_notifier, true, NULL);
/* Drain and switch bs back to the QEMU main loop */
blk_set_aio_context(s->conf->conf.blk, qemu_get_aio_context());
diff --git a/hw/scsi/virtio-scsi-dataplane.c b/hw/scsi/virtio-scsi-dataplane.c
index 21f51df..0d8d71e 100644
--- a/hw/scsi/virtio-scsi-dataplane.c
+++ b/hw/scsi/virtio-scsi-dataplane.c
@@ -60,8 +60,7 @@ static VirtIOSCSIVring *virtio_scsi_vring_init(VirtIOSCSI *s,
r = g_new(VirtIOSCSIVring, 1);
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, false,
- handler);
+ aio_set_event_notifier(s->ctx, &r->host_notifier, true, handler);
r->parent = s;
@@ -72,8 +71,7 @@ static VirtIOSCSIVring *virtio_scsi_vring_init(VirtIOSCSI *s,
return r;
fail_vring:
- aio_set_event_notifier(s->ctx, &r->host_notifier, false,
- NULL);
+ aio_set_event_notifier(s->ctx, &r->host_notifier, true, NULL);
k->set_host_notifier(qbus->parent, n, false);
g_free(r);
return NULL;
@@ -165,16 +163,16 @@ static void virtio_scsi_clear_aio(VirtIOSCSI *s)
if (s->ctrl_vring) {
aio_set_event_notifier(s->ctx, &s->ctrl_vring->host_notifier,
- false, NULL);
+ true, NULL);
}
if (s->event_vring) {
aio_set_event_notifier(s->ctx, &s->event_vring->host_notifier,
- false, NULL);
+ true, 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,
- false, NULL);
+ true, NULL);
}
}
}
@@ -296,12 +294,12 @@ void virtio_scsi_dataplane_stop(VirtIOSCSI *s)
aio_context_acquire(s->ctx);
aio_set_event_notifier(s->ctx, &s->ctrl_vring->host_notifier,
- false, NULL);
+ true, NULL);
aio_set_event_notifier(s->ctx, &s->event_vring->host_notifier,
- false, NULL);
+ true, NULL);
for (i = 0; i < vs->conf.num_queues; i++) {
aio_set_event_notifier(s->ctx, &s->cmd_vrings[i]->host_notifier,
- false, NULL);
+ true, NULL);
}
blk_drain_all(); /* ensure there are no in-flight requests */
--
2.4.3
- [Qemu-block] [PATCH v4 00/12] block: Protect nested event loop with bdrv_drained_begin and bdrv_drained_end, Fam Zheng, 2015/10/20
- [Qemu-block] [PATCH v4 05/12] block: Introduce "drained begin/end" API, Fam Zheng, 2015/10/20
- [Qemu-block] [PATCH v4 06/12] block: Add "drained begin/end" for transactional external snapshot, Fam Zheng, 2015/10/20
- [Qemu-block] [PATCH v4 07/12] block: Add "drained begin/end" for transactional backup, Fam Zheng, 2015/10/20
- [Qemu-block] [PATCH v4 08/12] block: Add "drained begin/end" for transactional blockdev-backup, Fam Zheng, 2015/10/20
- [Qemu-block] [PATCH v4 09/12] block: Add "drained begin/end" for internal snapshot, Fam Zheng, 2015/10/20
- [Qemu-block] [PATCH v4 12/12] tests: Add test case for aio_disable_external, Fam Zheng, 2015/10/20
- [Qemu-block] [PATCH v4 03/12] dataplane: Mark host notifiers' client type as "external",
Fam Zheng <=
- [Qemu-block] [PATCH v4 01/12] aio: Add "is_external" flag for event handlers, Fam Zheng, 2015/10/20
- [Qemu-block] [PATCH v4 02/12] nbd: Mark fd handlers client type as "external", Fam Zheng, 2015/10/20
- [Qemu-block] [PATCH v4 11/12] qed: Implement .bdrv_drain, Fam Zheng, 2015/10/20
- [Qemu-block] [PATCH v4 04/12] aio: introduce aio_{disable, enable}_external, Fam Zheng, 2015/10/20
- [Qemu-block] [PATCH v4 10/12] block: Introduce BlockDriver.bdrv_drain callback, Fam Zheng, 2015/10/20
- Re: [Qemu-block] [PATCH v4 00/12] block: Protect nested event loop with bdrv_drained_begin and bdrv_drained_end, Kevin Wolf, 2015/10/20