diff --git a/lib/event/subsystems/nvmf/nvmf_rpc.c b/lib/event/subsystems/nvmf/nvmf_rpc.c index 8e6e6e0ca..adb34f002 100644 --- a/lib/event/subsystems/nvmf/nvmf_rpc.c +++ b/lib/event/subsystems/nvmf/nvmf_rpc.c @@ -1302,16 +1302,6 @@ static const struct spdk_json_object_decoder nvmf_rpc_subsystem_tgt_opts_decoder {"max_subsystems", 0, spdk_json_decode_uint32, true} }; -static void -nvmf_rpc_subsystem_set_tgt_opts(struct spdk_jsonrpc_request *request, - const struct spdk_json_val *params) -{ - spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_REQUEST, - "This function has been deprecated in favor of set_nvmf_target_max_subsystems and create_nvmf_transport"); -} -SPDK_RPC_REGISTER("set_nvmf_target_options", nvmf_rpc_subsystem_set_tgt_opts, - SPDK_RPC_STARTUP | SPDK_RPC_RUNTIME) - static void nvmf_rpc_subsystem_set_tgt_max_subsystems(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) diff --git a/scripts/rpc.py b/scripts/rpc.py index e2d41d225..601568926 100755 --- a/scripts/rpc.py +++ b/scripts/rpc.py @@ -1333,24 +1333,6 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse p.set_defaults(func=get_interfaces) # NVMe-oF - def set_nvmf_target_options(args): - rpc.nvmf.set_nvmf_target_options(args.client, - max_queue_depth=args.max_queue_depth, - max_qpairs_per_ctrlr=args.max_qpairs_per_ctrlr, - in_capsule_data_size=args.in_capsule_data_size, - max_io_size=args.max_io_size, - max_subsystems=args.max_subsystems, - io_unit_size=args.io_unit_size) - - p = subparsers.add_parser('set_nvmf_target_options', help='Set NVMf target options') - p.add_argument('-q', '--max-queue-depth', help='Max number of outstanding I/O per queue', type=int) - p.add_argument('-p', '--max-qpairs-per-ctrlr', help='Max number of SQ and CQ per controller', type=int) - p.add_argument('-c', '--in-capsule-data-size', help='Max number of in-capsule data size', type=int) - p.add_argument('-i', '--max-io-size', help='Max I/O size (bytes)', type=int) - p.add_argument('-x', '--max-subsystems', help='Max number of NVMf subsystems', type=int) - p.add_argument('-u', '--io-unit-size', help='I/O unit size (bytes)', type=int) - p.set_defaults(func=set_nvmf_target_options) - def set_nvmf_target_max_subsystems(args): rpc.nvmf.set_nvmf_target_max_subsystems(args.client, max_subsystems=args.max_subsystems) diff --git a/scripts/rpc/nvmf.py b/scripts/rpc/nvmf.py index 848ac075c..787d57a2c 100644 --- a/scripts/rpc/nvmf.py +++ b/scripts/rpc/nvmf.py @@ -1,42 +1,3 @@ - - -def set_nvmf_target_options(client, - max_queue_depth=None, - max_qpairs_per_ctrlr=None, - in_capsule_data_size=None, - max_io_size=None, - max_subsystems=None, - io_unit_size=None): - """Set NVMe-oF target options. - - Args: - max_queue_depth: Max number of outstanding I/O per queue (optional) - max_qpairs_per_ctrlr: Max number of SQ and CQ per controller (optional) - in_capsule_data_size: Maximum in-capsule data size in bytes (optional) - max_io_size: Maximum I/O data size in bytes (optional) - max_subsystems: Maximum number of NVMe-oF subsystems (optional) - io_unit_size: I/O unit size in bytes (optional) - - Returns: - True or False - """ - params = {} - - if max_queue_depth: - params['max_queue_depth'] = max_queue_depth - if max_qpairs_per_ctrlr: - params['max_qpairs_per_ctrlr'] = max_qpairs_per_ctrlr - if in_capsule_data_size: - params['in_capsule_data_size'] = in_capsule_data_size - if max_io_size: - params['max_io_size'] = max_io_size - if max_subsystems: - params['max_subsystems'] = max_subsystems - if io_unit_size: - params['io_unit_size'] = io_unit_size - return client.call('set_nvmf_target_options', params) - - def set_nvmf_target_max_subsystems(client, max_subsystems=None): """Set NVMe-oF target options.