diff options
| author | Peter Lieven <pl@kamp.de> | 2015-04-16 16:08:31 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2015-04-28 15:36:10 +0200 |
| commit | e380aff831c24b37c023010852e7ddd2ae1ec385 (patch) | |
| tree | f55e2163b08da59b4ae0e6a4d9b489a1b713c7f9 /block/iscsi.c | |
| parent | 59dd0a22ca4c3ac70c37263208b9e49cfeacf2e4 (diff) | |
| download | qemu-e380aff831c24b37c023010852e7ddd2ae1ec385.tar.gz qemu-e380aff831c24b37c023010852e7ddd2ae1ec385.tar.bz2 qemu-e380aff831c24b37c023010852e7ddd2ae1ec385.zip | |
block/iscsi: handle SCSI_STATUS_TASK_SET_FULL
a target may issue a SCSI_STATUS_TASK_SET_FULL status
if there is more than one "BUSY" command queued already.
Signed-off-by: Peter Lieven <pl@kamp.de>
Message-id: 1429193313-4263-8-git-send-email-pl@kamp.de
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block/iscsi.c')
| -rw-r--r-- | block/iscsi.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/block/iscsi.c b/block/iscsi.c index 5999f74877..328907b33f 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -186,10 +186,13 @@ iscsi_co_generic_cb(struct iscsi_context *iscsi, int status, iTask->do_retry = 1; goto out; } - if (status == SCSI_STATUS_BUSY) { + /* status 0x28 is SCSI_TASK_SET_FULL. It was first introduced + * in libiscsi 1.10.0. Hardcode this value here to avoid + * the need to bump the libiscsi requirement to 1.10.0 */ + if (status == SCSI_STATUS_BUSY || status == 0x28) { unsigned retry_time = exp_random(iscsi_retry_times[iTask->retries - 1]); - error_report("iSCSI Busy (retry #%u in %u ms): %s", + error_report("iSCSI Busy/TaskSetFull (retry #%u in %u ms): %s", iTask->retries, retry_time, iscsi_get_error(iscsi)); aio_timer_init(iTask->iscsilun->aio_context, |