block/iscsi: restore compatiblity with libiscsi 1.9.0
RHEL7 and others are stuck with libiscsi 1.9.0 since there unfortunately was an ABI breakage after that release. Signed-off-by: Peter Lieven <pl@kamp.de> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Message-id: 1435313881-19366-1-git-send-email-pl@kamp.de Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
parent
d7b2529792
commit
9049736ec7
|
@ -169,6 +169,19 @@ static inline unsigned exp_random(double mean)
|
||||||
return -mean * log((double)rand() / RAND_MAX);
|
return -mean * log((double)rand() / RAND_MAX);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* SCSI_STATUS_TASK_SET_FULL and SCSI_STATUS_TIMEOUT were introduced
|
||||||
|
* in libiscsi 1.10.0 as part of an enum. The LIBISCSI_API_VERSION
|
||||||
|
* macro was introduced in 1.11.0. So use the API_VERSION macro as
|
||||||
|
* a hint that the macros are defined and define them ourselves
|
||||||
|
* otherwise to keep the required libiscsi version at 1.9.0 */
|
||||||
|
#if !defined(LIBISCSI_API_VERSION)
|
||||||
|
#define QEMU_SCSI_STATUS_TASK_SET_FULL 0x28
|
||||||
|
#define QEMU_SCSI_STATUS_TIMEOUT 0x0f000002
|
||||||
|
#else
|
||||||
|
#define QEMU_SCSI_STATUS_TASK_SET_FULL SCSI_STATUS_TASK_SET_FULL
|
||||||
|
#define QEMU_SCSI_STATUS_TIMEOUT SCSI_STATUS_TIMEOUT
|
||||||
|
#endif
|
||||||
|
|
||||||
static void
|
static void
|
||||||
iscsi_co_generic_cb(struct iscsi_context *iscsi, int status,
|
iscsi_co_generic_cb(struct iscsi_context *iscsi, int status,
|
||||||
void *command_data, void *opaque)
|
void *command_data, void *opaque)
|
||||||
|
@ -189,11 +202,12 @@ iscsi_co_generic_cb(struct iscsi_context *iscsi, int status,
|
||||||
iTask->do_retry = 1;
|
iTask->do_retry = 1;
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
if (status == SCSI_STATUS_BUSY || status == SCSI_STATUS_TIMEOUT ||
|
if (status == SCSI_STATUS_BUSY ||
|
||||||
status == SCSI_STATUS_TASK_SET_FULL) {
|
status == QEMU_SCSI_STATUS_TIMEOUT ||
|
||||||
|
status == QEMU_SCSI_STATUS_TASK_SET_FULL) {
|
||||||
unsigned retry_time =
|
unsigned retry_time =
|
||||||
exp_random(iscsi_retry_times[iTask->retries - 1]);
|
exp_random(iscsi_retry_times[iTask->retries - 1]);
|
||||||
if (status == SCSI_STATUS_TIMEOUT) {
|
if (status == QEMU_SCSI_STATUS_TIMEOUT) {
|
||||||
/* make sure the request is rescheduled AFTER the
|
/* make sure the request is rescheduled AFTER the
|
||||||
* reconnect is initiated */
|
* reconnect is initiated */
|
||||||
retry_time = EVENT_INTERVAL * 2;
|
retry_time = EVENT_INTERVAL * 2;
|
||||||
|
@ -1355,7 +1369,7 @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
|
||||||
QemuOpts *opts;
|
QemuOpts *opts;
|
||||||
Error *local_err = NULL;
|
Error *local_err = NULL;
|
||||||
const char *filename;
|
const char *filename;
|
||||||
int i, ret = 0;
|
int i, ret = 0, timeout = 0;
|
||||||
|
|
||||||
opts = qemu_opts_create(&runtime_opts, NULL, 0, &error_abort);
|
opts = qemu_opts_create(&runtime_opts, NULL, 0, &error_abort);
|
||||||
qemu_opts_absorb_qdict(opts, options, &local_err);
|
qemu_opts_absorb_qdict(opts, options, &local_err);
|
||||||
|
@ -1425,7 +1439,15 @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
iscsi_set_timeout(iscsi, parse_timeout(iscsi_url->target));
|
/* timeout handling is broken in libiscsi before 1.15.0 */
|
||||||
|
timeout = parse_timeout(iscsi_url->target);
|
||||||
|
#if defined(LIBISCSI_API_VERSION) && LIBISCSI_API_VERSION >= 20150621
|
||||||
|
iscsi_set_timeout(iscsi, timeout);
|
||||||
|
#else
|
||||||
|
if (timeout) {
|
||||||
|
error_report("iSCSI: ignoring timeout value for libiscsi <1.15.0");
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
if (iscsi_full_connect_sync(iscsi, iscsi_url->portal, iscsi_url->lun) != 0) {
|
if (iscsi_full_connect_sync(iscsi, iscsi_url->portal, iscsi_url->lun) != 0) {
|
||||||
error_setg(errp, "iSCSI: Failed to connect to LUN : %s",
|
error_setg(errp, "iSCSI: Failed to connect to LUN : %s",
|
||||||
|
|
|
@ -3618,15 +3618,15 @@ if compile_prog "" "" ; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
##########################################
|
##########################################
|
||||||
# Do we have libiscsi >= 1.10.0
|
# Do we have libiscsi >= 1.9.0
|
||||||
if test "$libiscsi" != "no" ; then
|
if test "$libiscsi" != "no" ; then
|
||||||
if $pkg_config --atleast-version=1.10.0 libiscsi; then
|
if $pkg_config --atleast-version=1.9.0 libiscsi; then
|
||||||
libiscsi="yes"
|
libiscsi="yes"
|
||||||
libiscsi_cflags=$($pkg_config --cflags libiscsi)
|
libiscsi_cflags=$($pkg_config --cflags libiscsi)
|
||||||
libiscsi_libs=$($pkg_config --libs libiscsi)
|
libiscsi_libs=$($pkg_config --libs libiscsi)
|
||||||
else
|
else
|
||||||
if test "$libiscsi" = "yes" ; then
|
if test "$libiscsi" = "yes" ; then
|
||||||
feature_not_found "libiscsi" "Install libiscsi >= 1.10.0"
|
feature_not_found "libiscsi" "Install libiscsi >= 1.9.0"
|
||||||
fi
|
fi
|
||||||
libiscsi="no"
|
libiscsi="no"
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -2296,7 +2296,8 @@ line or a configuration file.
|
||||||
|
|
||||||
Since version Qemu 2.4 it is possible to specify a iSCSI request timeout to detect
|
Since version Qemu 2.4 it is possible to specify a iSCSI request timeout to detect
|
||||||
stalled requests and force a reestablishment of the session. The timeout
|
stalled requests and force a reestablishment of the session. The timeout
|
||||||
is specified in seconds. The default is 0 which means no timeout.
|
is specified in seconds. The default is 0 which means no timeout. Libiscsi
|
||||||
|
1.15.0 or greater is required for this feature.
|
||||||
|
|
||||||
Example (without authentication):
|
Example (without authentication):
|
||||||
@example
|
@example
|
||||||
|
|
Loading…
Reference in New Issue