Commit f57b4b5f authored by Colin Lord's avatar Colin Lord Committed by Max Reitz
Browse files

blockdev: prepare iSCSI block driver for dynamic loading 



This commit moves the initialization of the QemuOptsList qemu_iscsi_opts
struct out of block/iscsi.c in order to allow the iscsi module to be
dynamically loaded.

Signed-off-by: default avatarColin Lord <clord@redhat.com>
Reviewed-by: default avatarFam Zheng <famz@redhat.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Message-id: 1471008424-16465-2-git-send-email-clord@redhat.com
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
parent f7c15533

block/iscsi.c

+0 −36
Original line number Diff line number Diff line
@@ -2010,45 +2010,9 @@ static BlockDriver bdrv_iscsi = { 
    .bdrv_attach_aio_context = iscsi_attach_aio_context,

};



static QemuOptsList qemu_iscsi_opts = {

    .name = "iscsi",

    .head = QTAILQ_HEAD_INITIALIZER(qemu_iscsi_opts.head),

    .desc = {

        {

            .name = "user",

            .type = QEMU_OPT_STRING,

            .help = "username for CHAP authentication to target",

        },{

            .name = "password",

            .type = QEMU_OPT_STRING,

            .help = "password for CHAP authentication to target",

        },{

            .name = "password-secret",

            .type = QEMU_OPT_STRING,

            .help = "ID of the secret providing password for CHAP "

                    "authentication to target",

        },{

            .name = "header-digest",

            .type = QEMU_OPT_STRING,

            .help = "HeaderDigest setting. "

                    "{CRC32C|CRC32C-NONE|NONE-CRC32C|NONE}",

        },{

            .name = "initiator-name",

            .type = QEMU_OPT_STRING,

            .help = "Initiator iqn name to use when connecting",

        },{

            .name = "timeout",

            .type = QEMU_OPT_NUMBER,

            .help = "Request timeout in seconds (default 0 = no timeout)",

        },

        { /* end of list */ }

    },

};



static void iscsi_block_init(void)

{

    bdrv_register(&bdrv_iscsi);

    qemu_add_opts(&qemu_iscsi_opts);

}



block_init(iscsi_block_init);

vl.c

+40 −0
Original line number Diff line number Diff line
@@ -507,6 +507,43 @@ static QemuOptsList qemu_fw_cfg_opts = { 
    },

};



#ifdef CONFIG_LIBISCSI

static QemuOptsList qemu_iscsi_opts = {

    .name = "iscsi",

    .head = QTAILQ_HEAD_INITIALIZER(qemu_iscsi_opts.head),

    .desc = {

        {

            .name = "user",

            .type = QEMU_OPT_STRING,

            .help = "username for CHAP authentication to target",

        },{

            .name = "password",

            .type = QEMU_OPT_STRING,

            .help = "password for CHAP authentication to target",

        },{

            .name = "password-secret",

            .type = QEMU_OPT_STRING,

            .help = "ID of the secret providing password for CHAP "

                    "authentication to target",

        },{

            .name = "header-digest",

            .type = QEMU_OPT_STRING,

            .help = "HeaderDigest setting. "

                    "{CRC32C|CRC32C-NONE|NONE-CRC32C|NONE}",

        },{

            .name = "initiator-name",

            .type = QEMU_OPT_STRING,

            .help = "Initiator iqn name to use when connecting",

        },{

            .name = "timeout",

            .type = QEMU_OPT_NUMBER,

            .help = "Request timeout in seconds (default 0 = no timeout)",

        },

        { /* end of list */ }

    },

};

#endif



/**

 * Get machine options

 *
@@ -3017,6 +3054,9 @@ int main(int argc, char **argv, char **envp) 
    qemu_add_opts(&qemu_icount_opts);

    qemu_add_opts(&qemu_semihosting_config_opts);

    qemu_add_opts(&qemu_fw_cfg_opts);

#ifdef CONFIG_LIBISCSI

    qemu_add_opts(&qemu_iscsi_opts);

#endif

    module_call_init(MODULE_INIT_OPTS);



    runstate_init();