From 6f445382a88a7e642bf90b848aed46381aeba4e9 Mon Sep 17 00:00:00 2001 From: gongwei Date: Sat, 8 Oct 2022 06:25:51 +0000 Subject: [PATCH] bdev_iscsi: add bdev iscsi config json save bdev iscsi opts config Signed-off-by: gongwei Change-Id: I9601098b426b8c080ae374f2fa1c23eec14f140b Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/14898 Tested-by: SPDK CI Jenkins Reviewed-by: Changpeng Liu Reviewed-by: Tomasz Zawadzki --- module/bdev/iscsi/bdev_iscsi.c | 22 ++++++++++++++++++++++ test/json_config/config_filter.py | 1 + 2 files changed, 23 insertions(+) diff --git a/module/bdev/iscsi/bdev_iscsi.c b/module/bdev/iscsi/bdev_iscsi.c index 0d584ef9f..f5a150757 100644 --- a/module/bdev/iscsi/bdev_iscsi.c +++ b/module/bdev/iscsi/bdev_iscsi.c @@ -188,10 +188,32 @@ bdev_iscsi_finish(void) } } +static void +bdev_iscsi_opts_config_json(struct spdk_json_write_ctx *w) +{ + spdk_json_write_object_begin(w); + + spdk_json_write_named_string(w, "method", "bdev_iscsi_set_options"); + + spdk_json_write_named_object_begin(w, "params"); + spdk_json_write_named_uint64(w, "timeout_sec", g_opts.timeout_sec); + spdk_json_write_object_end(w); + + spdk_json_write_object_end(w); +} + +static int +bdev_iscsi_config_json(struct spdk_json_write_ctx *w) +{ + bdev_iscsi_opts_config_json(w); + return 0; +} + static struct spdk_bdev_module g_iscsi_bdev_module = { .name = "iscsi", .module_init = bdev_iscsi_initialize, .module_fini = bdev_iscsi_finish, + .config_json = bdev_iscsi_config_json, .get_ctx_size = bdev_iscsi_get_ctx_size, }; diff --git a/test/json_config/config_filter.py b/test/json_config/config_filter.py index c6e786cfb..9bd8b7ce8 100755 --- a/test/json_config/config_filter.py +++ b/test/json_config/config_filter.py @@ -31,6 +31,7 @@ def filter_methods(do_remove_global_rpcs): 'nvmf_set_crdt', 'bdev_set_options', 'bdev_wait_for_examine', + 'bdev_iscsi_set_options', 'bdev_nvme_set_options', 'bdev_nvme_set_hotplug', 'sock_impl_set_options',