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

iscsi-test-cu: support arbitrary device nodes

Browse Source 
We support SG_IO on various block devices, including but not limited to:
SCSI disks, CDROMs and tapes, virtio-blk and nvmve.

Instead of checking a filename prefix just treat anything that isn't
an iscsi:// url as a device node.  The ioctl checks after open will weed
out devices (or files) that don't support SG_IO.

Signed-off-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Christoph Hellwig
2015-04-18 13:57:50 +02:00
committed by Ronnie Sahlberg
parent ba120e4347
commit e2e401c50c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test-tool/iscsi-test-cu.c
View File

@@ -1036,7 +1036,7 @@ main(int argc, char *argv[])
if (!strncmp(argv[optind], "iscsi://", 8)) { if (!strncmp(argv[optind], "iscsi://", 8)) {
sd->iscsi_url = strdup(argv[optind++]); sd->iscsi_url = strdup(argv[optind++]);
#ifdef HAVE_SG_IO #ifdef HAVE_SG_IO
} else if (!strncmp(argv[optind], "/dev/sg", 7)) { } else {
sd->sgio_dev = strdup(argv[optind++]); sd->sgio_dev = strdup(argv[optind++]);
#endif #endif
} }
@@ -1052,7 +1052,7 @@ main(int argc, char *argv[])
if (sd->iscsi_url == NULL && sd->sgio_dev== NULL ) { if (sd->iscsi_url == NULL && sd->sgio_dev== NULL ) {
#ifdef HAVE_SG_IO #ifdef HAVE_SG_IO
fprintf(stderr, "You must specify either an iSCSI URL or a /dev/sg device\n"); fprintf(stderr, "You must specify either an iSCSI URL or a device file\n");
#else #else
fprintf(stderr, "You must specify either an iSCSI URL\n"); fprintf(stderr, "You must specify either an iSCSI URL\n");
#endif #endif