Commit 2deb63c2 authored by Peter Lieven's avatar Peter Lieven Committed by Paolo Bonzini
Browse files

block/iscsi: statically link qemu_iscsi_opts 



commit f57b4b5f moved qemu_iscsi_opts into vl.c. This
made them invisible for qemu-img, qemu-nbd etc.

Fixes: f57b4b5f
Cc: qemu-stable@nongnu.org
Signed-off-by: default avatarPeter Lieven <pl@kamp.de>
Message-Id: <1485262161-18543-1-git-send-email-pl@kamp.de>
[Drop useless #ifdef. - Paolo]
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 0b564e6f

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -1642,6 +1642,7 @@ M: Peter Lieven <pl@kamp.de> 
L: qemu-block@nongnu.org

S: Supported

F: block/iscsi.c

F: block/iscsi-opts.c



NFS

M: Jeff Cody <jcody@redhat.com>

block/Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ block-obj-y += throttle-groups.o 


block-obj-y += nbd.o nbd-client.o sheepdog.o

block-obj-$(CONFIG_LIBISCSI) += iscsi.o

block-obj-$(if $(CONFIG_LIBISCSI),y,n) += iscsi-opts.o

block-obj-$(CONFIG_LIBNFS) += nfs.o

block-obj-$(CONFIG_CURL) += curl.o

block-obj-$(CONFIG_RBD) += rbd.o

block/iscsi-opts.c

0 → 100644
+69 −0
Original line number Diff line number Diff line 
/*

 * QEMU Block driver for iSCSI images (static options)

 *

 * Copyright (c) 2017 Peter Lieven <pl@kamp.de>

 *

 * Permission is hereby granted, free of charge, to any person obtaining a copy

 * of this software and associated documentation files (the "Software"), to deal

 * in the Software without restriction, including without limitation the rights

 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

 * copies of the Software, and to permit persons to whom the Software is

 * furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

 * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 * THE SOFTWARE.

 */



#include "qemu/osdep.h"

#include "qemu-common.h"

#include "qemu/config-file.h"



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_opts_init(void)

{

    qemu_add_opts(&qemu_iscsi_opts);

}



block_init(iscsi_block_opts_init);

vl.c

+0 −40
Original line number Diff line number Diff line
@@ -515,43 +515,6 @@ 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

 *
@@ -3045,9 +3008,6 @@ 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();