libiscsi: add option to use libiscsi (if available) instead of the builtin inferior...

[sahlberg/dbench.git] / dbench.c

diff --git a/dbench.c b/dbench.c
index ffbba3ce97346e3a40016652c124f24d27088f0b..3f2c6c21e482527e6adddde163e9d685a41b126b 100644 (file)
--- a/dbench.c
+++ b/dbench.c
@@ -48,8 +48,7 @@ struct options options = {
        .run_once            = 0,
        .allow_scsi_writes   = 0,
        .trunc_io            = 0,
-       .iscsi_lun           = 1,
-       .iscsi_port          = 3260,
+       .iscsi_initiatorname = "iqn.2011-09.org.samba.dbench:client",
        .machine_readable    = 0,
 };
 
@@ -428,14 +427,10 @@ static void process_opts(int argc, const char **argv)
                  "scsi device", NULL },
                { "allow-scsi-writes", 0, POPT_ARG_NONE, &options.allow_scsi_writes, 0,
                  "Allow SCSI write command to the device", NULL},
-               { "iscsi-lun", 0, POPT_ARG_INT, &options.iscsi_lun, 0, 
-                 "iSCSI LUN to send I/O to", NULL },
-               { "iscsi-portal",  0, POPT_ARG_STRING, &options.iscsi_portal, 0, 
-                 "ip address of iscsi target", NULL },
-               { "iscsi-port", 0, POPT_ARG_INT, &options.iscsi_port, 0, 
-                 "iSCSI tcp port to connect to", NULL },
-               { "iscsi-target",  0, POPT_ARG_STRING, &options.iscsi_target, 0, 
-                 "iscsi IQN name of target", NULL },
+               { "iscsi-device",  0, POPT_ARG_STRING, &options.iscsi_device, 0, 
+                 "iscsi URL for the target device", NULL },
+               { "iscsi-initiatorname",  0, POPT_ARG_STRING, &options.iscsi_initiatorname, 0, 
+                 "iscsi InitiatorName", NULL },
                { "warmup", 0, POPT_ARG_INT, &options.warmup, 0, 
                  "How many seconds of warmup to run", NULL },
                { "machine-readable", 0, POPT_ARG_NONE, &options.machine_readable, 0,