warren/libiscsi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LS --SHOW-LUNS Dont treat NOT_READY/MEDIUM_NOT_PRESENT as an error

Browse Source 
Detect this sensecode and just print (No media) for that LUN
This commit is contained in:
Ronnie Sahlberg
2012-07-10 16:50:16 +10:00
parent cadc1650e1
commit 213918a2f3
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/iscsi-ls.c
+12 -2
View File
@@ -60,7 +60,7 @@ void show_lun(struct iscsi_context *iscsi, int lun)
{ {
struct scsi_task *task; struct scsi_task *task;
struct scsi_inquiry_standard *inq; struct scsi_inquiry_standard *inq;
int type; int type, no_media;
long long size = 0; long long size = 0;
int size_pf = 0; int size_pf = 0;
static const char sf[] = {' ', 'k', 'M', 'G', 'T' }; static const char sf[] = {' ', 'k', 'M', 'G', 'T' };
@@ -77,7 +77,14 @@ tur_try_again:
goto tur_try_again; goto tur_try_again;
} }
} }
if (task->status != SCSI_STATUS_GOOD) {
no_media = 0;
if (task->status == SCSI_STATUS_CHECK_CONDITION
&& task->sense.key == SCSI_SENSE_NOT_READY
&& task->sense.ascq == SCSI_SENSE_ASCQ_MEDIUM_NOT_PRESENT) {
/* not an error, just a cdrom without a disk most likely */
no_media = 1;
} else if (task->status != SCSI_STATUS_GOOD) {
fprintf(stderr, "TESTUNITREADY failed with %s\n", iscsi_get_error(iscsi)); fprintf(stderr, "TESTUNITREADY failed with %s\n", iscsi_get_error(iscsi));
exit(10); exit(10);
} }
@@ -131,6 +138,9 @@ tur_try_again:
if (type == SCSI_INQUIRY_PERIPHERAL_DEVICE_TYPE_DIRECT_ACCESS) { if (type == SCSI_INQUIRY_PERIPHERAL_DEVICE_TYPE_DIRECT_ACCESS) {
printf(" (Size:%lld%c)", size, sf[size_pf]); printf(" (Size:%lld%c)", size, sf[size_pf]);
} }
if (no_media) {
printf(" (No media loaded)");
}
printf("\n"); printf("\n");
} }