Commit 31eb1202 authored by Kevin Wolf's avatar Kevin Wolf Committed by Jeff Cody
Browse files

iscsi: Add blockdev-add support 



This adds blockdev-add support for iscsi devices.

Reviewed-by: default avatarDaniel P. Berrange <berrange@redhat.com>
Reviewed-by: default avatarFam Zheng <famz@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Signed-off-by: default avatarJeff Cody <jcody@redhat.com>
parent 1d560104

block/iscsi.c

+9 −5
Original line number Diff line number Diff line
@@ -1291,13 +1291,13 @@ static void apply_header_digest(struct iscsi_context *iscsi, QemuOpts *opts, 
    digest = qemu_opt_get(opts, "header-digest");

    if (!digest) {

        iscsi_set_header_digest(iscsi, ISCSI_HEADER_DIGEST_NONE_CRC32C);

    } else if (!strcmp(digest, "CRC32C")) {

    } else if (!strcmp(digest, "crc32c")) {

        iscsi_set_header_digest(iscsi, ISCSI_HEADER_DIGEST_CRC32C);

    } else if (!strcmp(digest, "NONE")) {

    } else if (!strcmp(digest, "none")) {

        iscsi_set_header_digest(iscsi, ISCSI_HEADER_DIGEST_NONE);

    } else if (!strcmp(digest, "CRC32C-NONE")) {

    } else if (!strcmp(digest, "crc32c-none")) {

        iscsi_set_header_digest(iscsi, ISCSI_HEADER_DIGEST_CRC32C_NONE);

    } else if (!strcmp(digest, "NONE-CRC32C")) {

    } else if (!strcmp(digest, "none-crc32c")) {

        iscsi_set_header_digest(iscsi, ISCSI_HEADER_DIGEST_NONE_CRC32C);

    } else {

        error_setg(errp, "Invalid header-digest setting : %s", digest);
@@ -1576,7 +1576,11 @@ static void iscsi_parse_iscsi_option(const char *target, QDict *options) 


    header_digest = qemu_opt_get(opts, "header-digest");

    if (header_digest) {

        qdict_set_default_str(options, "header-digest", header_digest);

        /* -iscsi takes upper case values, but QAPI only supports lower case

         * enum constant names, so we have to convert here. */

        char *qapi_value = g_ascii_strdown(header_digest, -1);

        qdict_set_default_str(options, "header-digest", qapi_value);

        g_free(qapi_value);

    }



    timeout = qemu_opt_get(opts, "timeout");

qapi/block-core.json

+70 −5
Original line number Diff line number Diff line
@@ -2110,16 +2110,17 @@ 
# @nfs: Since 2.8

# @replication: Since 2.8

# @ssh: Since 2.8

# @iscsi: Since 2.9

#

# Since: 2.0

##

{ 'enum': 'BlockdevDriver',

  'data': [ 'archipelago', 'blkdebug', 'blkverify', 'bochs', 'cloop',

            'dmg', 'file', 'ftp', 'ftps', 'gluster', 'host_cdrom',

            'host_device', 'http', 'https', 'luks', 'nbd', 'nfs', 'null-aio',

            'null-co', 'parallels', 'qcow', 'qcow2', 'qed', 'quorum', 'raw',

            'replication', 'ssh', 'vdi', 'vhdx', 'vmdk', 'vpc',

            'vvfat' ] }

            'host_device', 'http', 'https', 'iscsi', 'luks', 'nbd', 'nfs',

            'null-aio', 'null-co', 'parallels', 'qcow', 'qcow2', 'qed',

            'quorum', 'raw', 'replication', 'ssh', 'vdi', 'vhdx', 'vmdk',

            'vpc', 'vvfat' ] }



##

# @BlockdevOptionsFile:
@@ -2600,6 +2601,70 @@ 
            '*debug': 'int',

            '*logfile': 'str' } }



##

# @IscsiTransport:

#

# An enumeration of libiscsi transport types

#

# Since: 2.9

##

{ 'enum': 'IscsiTransport',

  'data': [ 'tcp', 'iser' ] }



##

# @IscsiHeaderDigest:

#

# An enumeration of header digests supported by libiscsi

#

# Since: 2.9

##

{ 'enum': 'IscsiHeaderDigest',

  'prefix': 'QAPI_ISCSI_HEADER_DIGEST',

  'data': [ 'crc32c', 'none', 'crc32c-none', 'none-crc32c' ] }



##

# @BlockdevOptionsIscsi:

#

# @transport        The iscsi transport type

#

# @portal           The address of the iscsi portal

#

# @target           The target iqn name

#

# @lun              #optional LUN to connect to. Defaults to 0.

#

# @user             #optional User name to log in with. If omitted, no CHAP

#                   authentication is performed.

#

# @password-secret  #optional The ID of a QCryptoSecret object providing

#                   the password for the login. This option is required if

#                   @user is specified.

#

# @initiator-name   #optional The iqn name we want to identify to the target

#                   as. If this option is not specified, an initiator name is

#                   generated automatically.

#

# @header-digest    #optional The desired header digest. Defaults to

#                   none-crc32c.

#

# @timeout          #optional Timeout in seconds after which a request will

#                   timeout. 0 means no timeout and is the default.

#

# Driver specific block device options for iscsi

#

# Since: 2.9

##

{ 'struct': 'BlockdevOptionsIscsi',

  'data': { 'transport': 'IscsiTransport',

            'portal': 'str',

            'target': 'str',

            '*lun': 'int',

            '*user': 'str',

            '*password-secret': 'str',

            '*initiator-name': 'str',

            '*header-digest': 'IscsiHeaderDigest',

            '*timeout': 'int' } }



##

# @ReplicationMode:

#
@@ -2786,7 +2851,7 @@ 
      'host_device':'BlockdevOptionsFile',

      'http':       'BlockdevOptionsCurl',

      'https':      'BlockdevOptionsCurl',

# TODO iscsi: Wait for structured options

      'iscsi':      'BlockdevOptionsIscsi',

      'luks':       'BlockdevOptionsLUKS',

      'nbd':        'BlockdevOptionsNbd',

      'nfs':        'BlockdevOptionsNfs',