mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iscsi: Split URL into individual options

Browse Source 
This introduces a .bdrv_parse_filename handler for iscsi which parses an
URL if given and translates it to individual options.

Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Jeff Cody <jcody@redhat.com>
This commit is contained in:
Kevin Wolf 2016-12-08 14:23:06 +01:00 committed by Jeff Cody
parent a1cf5fac2b
commit d5895fcb1d
1 changed files with 140 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

193
block/iscsi.c
View File

@ -1483,20 +1483,6 @@ static void iscsi_readcapacity_sync(IscsiLun *iscsilun, Error **errp)
} }
} }
/* TODO Convert to fine grained options */
static QemuOptsList runtime_opts = {
.name = "iscsi",
.head = QTAILQ_HEAD_INITIALIZER(runtime_opts.head),
.desc = {
{
.name = "filename",
.type = QEMU_OPT_STRING,
.help = "URL to the iscsi image",
},
{ /* end of list */ }
},
};
static struct scsi_task *iscsi_do_inquiry(struct iscsi_context *iscsi, int lun, static struct scsi_task *iscsi_do_inquiry(struct iscsi_context *iscsi, int lun,
int evpd, int pc, void **inq, Error **errp) int evpd, int pc, void **inq, Error **errp)
{ {
@ -1618,20 +1604,102 @@ out:
* We support iscsi url's on the form * We support iscsi url's on the form
* iscsi://[<username>%<password>@]<host>[:<port>]/<targetname>/<lun> * iscsi://[<username>%<password>@]<host>[:<port>]/<targetname>/<lun>
*/ */
static void iscsi_parse_filename(const char *filename, QDict *options,
Error **errp)
{
struct iscsi_url *iscsi_url;
const char *transport_name;
char *lun_str;
iscsi_url = iscsi_parse_full_url(NULL, filename);
if (iscsi_url == NULL) {
error_setg(errp, "Failed to parse URL : %s", filename);
return;
}
#if LIBISCSI_API_VERSION >= (20160603)
switch (iscsi_url->transport) {
case TCP_TRANSPORT:
transport_name = "tcp";
break;
case ISER_TRANSPORT:
transport_name = "iser";
break;
default:
error_setg(errp, "Unknown transport type (%d)",
iscsi_url->transport);
return;
}
#else
transport_name = "tcp";
#endif
qdict_set_default_str(options, "transport", transport_name);
qdict_set_default_str(options, "portal", iscsi_url->portal);
qdict_set_default_str(options, "target", iscsi_url->target);
lun_str = g_strdup_printf("%d", iscsi_url->lun);
qdict_set_default_str(options, "lun", lun_str);
g_free(lun_str);
if (iscsi_url->user[0] != '\0') {
qdict_set_default_str(options, "user", iscsi_url->user);
qdict_set_default_str(options, "password", iscsi_url->passwd);
}
iscsi_destroy_url(iscsi_url);
}
/* TODO Add -iscsi options */
static QemuOptsList runtime_opts = {
.name = "iscsi",
.head = QTAILQ_HEAD_INITIALIZER(runtime_opts.head),
.desc = {
{
.name = "transport",
.type = QEMU_OPT_STRING,
},
{
.name = "portal",
.type = QEMU_OPT_STRING,
},
{
.name = "target",
.type = QEMU_OPT_STRING,
},
{
.name = "user",
.type = QEMU_OPT_STRING,
},
{
.name = "password",
.type = QEMU_OPT_STRING,
},
{
.name = "lun",
.type = QEMU_OPT_NUMBER,
},
{ /* end of list */ }
},
};
static int iscsi_open(BlockDriverState *bs, QDict *options, int flags, static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
Error **errp) Error **errp)
{ {
IscsiLun *iscsilun = bs->opaque; IscsiLun *iscsilun = bs->opaque;
struct iscsi_context *iscsi = NULL; struct iscsi_context *iscsi = NULL;
struct iscsi_url *iscsi_url = NULL;
struct scsi_task *task = NULL; struct scsi_task *task = NULL;
struct scsi_inquiry_standard *inq = NULL; struct scsi_inquiry_standard *inq = NULL;
struct scsi_inquiry_supported_pages *inq_vpd; struct scsi_inquiry_supported_pages *inq_vpd;
char *initiator_name = NULL; char *initiator_name = NULL;
QemuOpts *opts; QemuOpts *opts;
Error *local_err = NULL; Error *local_err = NULL;
const char *filename; const char *transport_name, *portal, *target;
int i, ret = 0, timeout = 0; const char *user, *password;
#if LIBISCSI_API_VERSION >= (20160603)
enum iscsi_transport_type transport;
#endif
int i, ret = 0, timeout = 0, lun;
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);
@ -1641,18 +1709,41 @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
goto out; goto out;
} }
filename = qemu_opt_get(opts, "filename"); transport_name = qemu_opt_get(opts, "transport");
portal = qemu_opt_get(opts, "portal");
target = qemu_opt_get(opts, "target");
user = qemu_opt_get(opts, "user");
password = qemu_opt_get(opts, "password");
lun = qemu_opt_get_number(opts, "lun", 0);
iscsi_url = iscsi_parse_full_url(iscsi, filename); if (!transport_name || !portal || !target) {
if (iscsi_url == NULL) { error_setg(errp, "Need all of transport, portal and target options");
error_setg(errp, "Failed to parse URL : %s", filename); ret = -EINVAL;
goto out;
}
if (user && !password) {
error_setg(errp, "If a user name is given, a password is required");
ret = -EINVAL;
goto out;
}
if (!strcmp(transport_name, "tcp")) {
#if LIBISCSI_API_VERSION >= (20160603)
transport = TCP_TRANSPORT;
} else if (!strcmp(transport_name, "iser")) {
transport = ISER_TRANSPORT;
#else
/* TCP is what older libiscsi versions always use */
#endif
} else {
error_setg(errp, "Unknown transport: %s", transport_name);
ret = -EINVAL; ret = -EINVAL;
goto out; goto out;
} }
memset(iscsilun, 0, sizeof(IscsiLun)); memset(iscsilun, 0, sizeof(IscsiLun));
initiator_name = parse_initiator_name(iscsi_url->target); initiator_name = parse_initiator_name(target);
iscsi = iscsi_create_context(initiator_name); iscsi = iscsi_create_context(initiator_name);
if (iscsi == NULL) { if (iscsi == NULL) {
@ -1661,21 +1752,20 @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
goto out; goto out;
} }
#if LIBISCSI_API_VERSION >= (20160603) #if LIBISCSI_API_VERSION >= (20160603)
if (iscsi_init_transport(iscsi, iscsi_url->transport)) { if (iscsi_init_transport(iscsi, transport)) {
error_setg(errp, ("Error initializing transport.")); error_setg(errp, ("Error initializing transport."));
ret = -EINVAL; ret = -EINVAL;
goto out; goto out;
} }
#endif #endif
if (iscsi_set_targetname(iscsi, iscsi_url->target)) { if (iscsi_set_targetname(iscsi, target)) {
error_setg(errp, "iSCSI: Failed to set target name."); error_setg(errp, "iSCSI: Failed to set target name.");
ret = -EINVAL; ret = -EINVAL;
goto out; goto out;
} }
if (iscsi_url->user[0] != '\0') { if (user) {
ret = iscsi_set_initiator_username_pwd(iscsi, iscsi_url->user, ret = iscsi_set_initiator_username_pwd(iscsi, user, password);
iscsi_url->passwd);
if (ret != 0) { if (ret != 0) {
error_setg(errp, "Failed to set initiator username and password"); error_setg(errp, "Failed to set initiator username and password");
ret = -EINVAL; ret = -EINVAL;
@ -1684,7 +1774,7 @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
} }
/* check if we got CHAP username/password via the options */ /* check if we got CHAP username/password via the options */
parse_chap(iscsi, iscsi_url->target, &local_err); parse_chap(iscsi, target, &local_err);
if (local_err != NULL) { if (local_err != NULL) {
error_propagate(errp, local_err); error_propagate(errp, local_err);
ret = -EINVAL; ret = -EINVAL;
@ -1700,7 +1790,7 @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
iscsi_set_header_digest(iscsi, ISCSI_HEADER_DIGEST_NONE_CRC32C); iscsi_set_header_digest(iscsi, ISCSI_HEADER_DIGEST_NONE_CRC32C);
/* check if we got HEADER_DIGEST via the options */ /* check if we got HEADER_DIGEST via the options */
parse_header_digest(iscsi, iscsi_url->target, &local_err); parse_header_digest(iscsi, target, &local_err);
if (local_err != NULL) { if (local_err != NULL) {
error_propagate(errp, local_err); error_propagate(errp, local_err);
ret = -EINVAL; ret = -EINVAL;
@ -1708,7 +1798,7 @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
} }
/* timeout handling is broken in libiscsi before 1.15.0 */ /* timeout handling is broken in libiscsi before 1.15.0 */
timeout = parse_timeout(iscsi_url->target); timeout = parse_timeout(target);
#if LIBISCSI_API_VERSION >= 20150621 #if LIBISCSI_API_VERSION >= 20150621
iscsi_set_timeout(iscsi, timeout); iscsi_set_timeout(iscsi, timeout);
#else #else
@ -1717,7 +1807,7 @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
} }
#endif #endif
if (iscsi_full_connect_sync(iscsi, iscsi_url->portal, iscsi_url->lun) != 0) { if (iscsi_full_connect_sync(iscsi, portal, lun) != 0) {
error_setg(errp, "iSCSI: Failed to connect to LUN : %s", error_setg(errp, "iSCSI: Failed to connect to LUN : %s",
iscsi_get_error(iscsi)); iscsi_get_error(iscsi));
ret = -EINVAL; ret = -EINVAL;
@ -1726,7 +1816,7 @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
iscsilun->iscsi = iscsi; iscsilun->iscsi = iscsi;
iscsilun->aio_context = bdrv_get_aio_context(bs); iscsilun->aio_context = bdrv_get_aio_context(bs);
iscsilun->lun = iscsi_url->lun; iscsilun->lun = lun;
iscsilun->has_write_same = true; iscsilun->has_write_same = true;
task = iscsi_do_inquiry(iscsilun->iscsi, iscsilun->lun, 0, 0, task = iscsi_do_inquiry(iscsilun->iscsi, iscsilun->lun, 0, 0,
@ -1829,9 +1919,6 @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
out: out:
qemu_opts_del(opts); qemu_opts_del(opts);
g_free(initiator_name); g_free(initiator_name);
if (iscsi_url != NULL) {
iscsi_destroy_url(iscsi_url);
}
if (task != NULL) { if (task != NULL) {
scsi_free_scsi_task(task); scsi_free_scsi_task(task);
} }
@ -2040,15 +2127,15 @@ static BlockDriver bdrv_iscsi = {
.format_name = "iscsi", .format_name = "iscsi",
.protocol_name = "iscsi", .protocol_name = "iscsi",
.instance_size = sizeof(IscsiLun), .instance_size = sizeof(IscsiLun),
.bdrv_needs_filename = true, .bdrv_parse_filename = iscsi_parse_filename,
.bdrv_file_open = iscsi_open, .bdrv_file_open = iscsi_open,
.bdrv_close = iscsi_close, .bdrv_close = iscsi_close,
.bdrv_create = iscsi_create, .bdrv_create = iscsi_create,
.create_opts = &iscsi_create_opts, .create_opts = &iscsi_create_opts,
.bdrv_reopen_prepare = iscsi_reopen_prepare, .bdrv_reopen_prepare = iscsi_reopen_prepare,
.bdrv_reopen_commit = iscsi_reopen_commit, .bdrv_reopen_commit = iscsi_reopen_commit,
.bdrv_invalidate_cache = iscsi_invalidate_cache, .bdrv_invalidate_cache = iscsi_invalidate_cache,
.bdrv_getlength = iscsi_getlength, .bdrv_getlength = iscsi_getlength,
.bdrv_get_info = iscsi_get_info, .bdrv_get_info = iscsi_get_info,
@ -2075,15 +2162,15 @@ static BlockDriver bdrv_iser = {
.format_name = "iser", .format_name = "iser",
.protocol_name = "iser", .protocol_name = "iser",
.instance_size = sizeof(IscsiLun), .instance_size = sizeof(IscsiLun),
.bdrv_needs_filename = true, .bdrv_parse_filename = iscsi_parse_filename,
.bdrv_file_open = iscsi_open, .bdrv_file_open = iscsi_open,
.bdrv_close = iscsi_close, .bdrv_close = iscsi_close,
.bdrv_create = iscsi_create, .bdrv_create = iscsi_create,
.create_opts = &iscsi_create_opts, .create_opts = &iscsi_create_opts,
.bdrv_reopen_prepare = iscsi_reopen_prepare, .bdrv_reopen_prepare = iscsi_reopen_prepare,
.bdrv_reopen_commit = iscsi_reopen_commit, .bdrv_reopen_commit = iscsi_reopen_commit,
.bdrv_invalidate_cache = iscsi_invalidate_cache, .bdrv_invalidate_cache = iscsi_invalidate_cache,
.bdrv_getlength = iscsi_getlength, .bdrv_getlength = iscsi_getlength,
.bdrv_get_info = iscsi_get_info, .bdrv_get_info = iscsi_get_info,