[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v4 3/8] blockdev: prepare iSCSI block driver for dyna
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PULL v4 3/8] blockdev: prepare iSCSI block driver for dynamic loading |
Date: |
Tue, 20 Sep 2016 22:43:56 +0200 |
From: Colin Lord <address@hidden>
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: Colin Lord <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Message-id: address@hidden
Reviewed-by: Max Reitz <address@hidden>
Signed-off-by: Max Reitz <address@hidden>
---
block/iscsi.c | 36 ------------------------------------
vl.c | 40 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 40 insertions(+), 36 deletions(-)
diff --git a/block/iscsi.c b/block/iscsi.c
index 95ce9e1..c4a0937 100644
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -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);
diff --git a/vl.c b/vl.c
index fca0487..fd321e2 100644
--- a/vl.c
+++ b/vl.c
@@ -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();
--
2.9.3
- [Qemu-devel] [PULL v4 0/8] Block layer patches, Max Reitz, 2016/09/20
- [Qemu-devel] [PULL v4 2/8] qemu-img: add skip option to dd, Max Reitz, 2016/09/20
- [Qemu-devel] [PULL v4 3/8] blockdev: prepare iSCSI block driver for dynamic loading,
Max Reitz <=
- [Qemu-devel] [PULL v4 1/8] qemu-img: add the 'dd' subcommand, Max Reitz, 2016/09/20
- [Qemu-devel] [PULL v4 6/8] blockdev: Modularize nfs block driver, Max Reitz, 2016/09/20
- [Qemu-devel] [PULL v4 4/8] blockdev: Add dynamic generation of module_block.h, Max Reitz, 2016/09/20
- [Qemu-devel] [PULL v4 5/8] blockdev: Add dynamic module loading for block drivers, Max Reitz, 2016/09/20
- [Qemu-devel] [PULL v4 7/8] commit: get the overlay node before manipulating the backing chain, Max Reitz, 2016/09/20
- [Qemu-devel] [PULL v4 8/8] iotest 055: refactor and speed up, Max Reitz, 2016/09/20
- Re: [Qemu-devel] [PULL v4 0/8] Block layer patches, Peter Maydell, 2016/09/22