d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

nvmf: remove deprecated conn_sched parameter

Browse Source 
This parameter was ignored, and was a parameter to the
nvmf_set_config RPC.

For reference, this was deprecated in June 2020, commit
c37cf9fb.

Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: I013f4d7cf874e7e26a8a1d299fdf9d8fa05da580
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/11544
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
This commit is contained in:
Jim Harris 2022-02-10 12:23:40 +00:00
parent e8fdde5235
commit 5d2d253125
4 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
module/event/subsystems/nvmf/event_nvmf.h
View File

@ -48,7 +48,6 @@ struct spdk_nvmf_admin_passthru_conf {
};
struct spdk_nvmf_tgt_conf {
uint32_t conn_sched; /* Deprecated. */
struct spdk_nvmf_admin_passthru_conf admin_passthru;
enum spdk_nvmf_tgt_discovery_filter discovery_filter;
};

10
module/event/subsystems/nvmf/nvmf_rpc.c
View File

@ -73,15 +73,6 @@ SPDK_RPC_REGISTER("nvmf_set_max_subsystems", rpc_nvmf_set_max_subsystems,
SPDK_RPC_STARTUP)
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(nvmf_set_max_subsystems, set_nvmf_target_max_subsystems)
static int decode_conn_sched(const struct spdk_json_val *val, void *out)
{
*(uint32_t *)out = 0;
SPDK_NOTICELOG("conn_sched is no longer a supported parameter. Ignoring.");
return 0;
}
static const struct spdk_json_object_decoder admin_passthru_decoder[] = {
{"identify_ctrlr", offsetof(struct spdk_nvmf_admin_passthru_conf, identify_ctrlr), spdk_json_decode_bool}
};
@ -197,7 +188,6 @@ nvmf_decode_poll_groups_mask(const struct spdk_json_val *val, void *out)
}
static const struct spdk_json_object_decoder nvmf_rpc_subsystem_tgt_conf_decoder[] = {
{"conn_sched", offsetof(struct spdk_nvmf_tgt_conf, conn_sched), decode_conn_sched, true},
{"admin_cmd_passthru", offsetof(struct spdk_nvmf_tgt_conf, admin_passthru), decode_admin_passthru, true},
{"poll_groups_mask", 0, nvmf_decode_poll_groups_mask, true},
{"discovery_filter", offsetof(struct spdk_nvmf_tgt_conf, discovery_filter), decode_discovery_filter, true}

2
scripts/rpc.py
View File

@ -2013,14 +2013,12 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse
def nvmf_set_config(args):
rpc.nvmf.nvmf_set_config(args.client,
conn_sched=args.conn_sched,
passthru_identify_ctrlr=args.passthru_identify_ctrlr,
poll_groups_mask=args.poll_groups_mask,
discovery_filter=args.discovery_filter)
p = subparsers.add_parser('nvmf_set_config', aliases=['set_nvmf_target_config'],
help='Set NVMf target config')
p.add_argument('-s', '--conn-sched', help='(Deprecated). Ignored.')
p.add_argument('-i', '--passthru-identify-ctrlr', help="""Passthrough fields like serial number and model number
when the controller has a single namespace that is an NVMe bdev""", action='store_true')
p.add_argument('-m', '--poll-groups-mask', help='Set cpumask for NVMf poll groups (optional)', type=str)

4
scripts/rpc/nvmf.py
View File

@ -21,14 +21,12 @@ def nvmf_set_max_subsystems(client,
@deprecated_alias('set_nvmf_target_config')
def nvmf_set_config(client,
conn_sched=None,
passthru_identify_ctrlr=None,
poll_groups_mask=None,
discovery_filter=None):
"""Set NVMe-oF target subsystem configuration.
Args:
conn_sched: (Deprecated) Ignored
discovery_filter: Set discovery filter (optional), possible values are: `match_any` (default) or
comma separated values: `transport`, `address`, `svcid`
@ -37,8 +35,6 @@ def nvmf_set_config(client,
"""
params = {}
if conn_sched:
print("WARNING: conn_sched is deprecated and ignored.")
if passthru_identify_ctrlr:
admin_cmd_passthru = {}
admin_cmd_passthru['identify_ctrlr'] = passthru_identify_ctrlr