diff options
| author | Anthony Liguori | 2014-01-10 20:05:17 +0100 |
|---|---|---|
| committer | Anthony Liguori | 2014-01-10 20:05:17 +0100 |
| commit | eedc1a5db5e4d941e39e54344322c0b1e89dfdcd (patch) | |
| tree | ab77f6333570d3234221d43fabf838968eca3f93 /block | |
| parent | Merge remote-tracking branch 'stefanha/block' into staging (diff) | |
| parent | scsi-disk: add UNMAP limits to block limits VPD page (diff) | |
| download | qemu-eedc1a5db5e4d941e39e54344322c0b1e89dfdcd.tar.gz qemu-eedc1a5db5e4d941e39e54344322c0b1e89dfdcd.tar.xz qemu-eedc1a5db5e4d941e39e54344322c0b1e89dfdcd.zip | |
Merge remote-tracking branch 'bonzini/scsi-next' into staging
* bonzini/scsi-next:
scsi-disk: add UNMAP limits to block limits VPD page
block/iscsi: use a bh to schedule co reentrance
Message-id: 1387720926-11421-1-git-send-email-pbonzini@redhat.com
Signed-off-by: Anthony Liguori <aliguori@amazon.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/iscsi.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/block/iscsi.c b/block/iscsi.c index 294b2c6ab3..56c0799f3d 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -68,6 +68,7 @@ typedef struct IscsiTask { int do_retry; struct scsi_task *task; Coroutine *co; + QEMUBH *bh; } IscsiTask; typedef struct IscsiAIOCB { @@ -123,6 +124,13 @@ iscsi_schedule_bh(IscsiAIOCB *acb) qemu_bh_schedule(acb->bh); } +static void iscsi_co_generic_bh_cb(void *opaque) +{ + struct IscsiTask *iTask = opaque; + qemu_bh_delete(iTask->bh); + qemu_coroutine_enter(iTask->co, NULL); +} + static void iscsi_co_generic_cb(struct iscsi_context *iscsi, int status, void *command_data, void *opaque) @@ -147,7 +155,8 @@ iscsi_co_generic_cb(struct iscsi_context *iscsi, int status, out: if (iTask->co) { - qemu_coroutine_enter(iTask->co, NULL); + iTask->bh = qemu_bh_new(iscsi_co_generic_bh_cb, iTask); + qemu_bh_schedule(iTask->bh); } } |