[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v4 01/32] blockdev: prepare iSCSI block driver for d
From: |
Colin Lord |
Subject: |
[Qemu-block] [PATCH v4 01/32] blockdev: prepare iSCSI block driver for dynamic loading |
Date: |
Thu, 14 Jul 2016 15:02:57 -0400 |
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>
---
block/iscsi.c | 36 ------------------------------------
vl.c | 38 ++++++++++++++++++++++++++++++++++++++
2 files changed, 38 insertions(+), 36 deletions(-)
diff --git a/block/iscsi.c b/block/iscsi.c
index 434cb37..b52cd37 100644
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -1882,45 +1882,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 356713e..90ed255 100644
--- a/vl.c
+++ b/vl.c
@@ -506,6 +506,41 @@ static QemuOptsList qemu_fw_cfg_opts = {
},
};
+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 */ }
+ },
+};
+
/**
* Get machine options
*
@@ -3000,6 +3035,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.5.5
- [Qemu-block] [PATCH v4 00/32] Dynamic module loading for block drivers, Colin Lord, 2016/07/14
- [Qemu-block] [PATCH v4 01/32] blockdev: prepare iSCSI block driver for dynamic loading,
Colin Lord <=
- [Qemu-block] [PATCH v4 05/32] blockdev: Move cloop probe to its own file, Colin Lord, 2016/07/14
- [Qemu-block] [PATCH v4 03/32] blockdev: Add dynamic module loading for block drivers, Colin Lord, 2016/07/14
- [Qemu-block] [PATCH v4 04/32] blockdev: Move bochs probe into separate file, Colin Lord, 2016/07/14
- [Qemu-block] [PATCH v4 02/32] blockdev: Add dynamic generation of module_block.h, Colin Lord, 2016/07/14
- [Qemu-block] [PATCH v4 06/32] blockdev: Move luks probe to its own file, Colin Lord, 2016/07/14
- [Qemu-block] [PATCH v4 08/32] blockdev: Move parallels probe to its own file, Colin Lord, 2016/07/14
- [Qemu-block] [PATCH v4 07/32] blockdev: Move dmg probe to its own file, Colin Lord, 2016/07/14
- [Qemu-block] [PATCH v4 10/32] blockdev: Move qcow2 probe to its own file, Colin Lord, 2016/07/14
- [Qemu-block] [PATCH v4 09/32] blockdev: Move qcow probe to its own file, Colin Lord, 2016/07/14
- [Qemu-block] [PATCH v4 13/32] blockdev: Move vdi probe to its own file, Colin Lord, 2016/07/14