From 465f99e9ffdb421e5fdb25ba17a0228c2f5de7f1 Mon Sep 17 00:00:00 2001 From: wanghailiangx Date: Mon, 23 May 2022 04:21:02 -0400 Subject: [PATCH] accel module: remove support for deprecated RPC names These were deprecated in 2019, it's time to remove support for them now. Change-Id: I5a715e9b9e991c6febec5e505384728281eee8b7 Signed-off-by: wanghailiangx Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/12773 Community-CI: Broadcom CI Community-CI: Mellanox Build Bot Reviewed-by: Changpeng Liu Reviewed-by: Jim Harris Tested-by: SPDK CI Jenkins --- module/accel/ioat/accel_engine_ioat_rpc.c | 2 -- python/spdk/rpc/ioat.py | 2 -- scripts/bash-completion/spdk | 2 +- scripts/rpc.py | 4 +--- 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/module/accel/ioat/accel_engine_ioat_rpc.c b/module/accel/ioat/accel_engine_ioat_rpc.c index 7c9450b4d..1bf280c90 100644 --- a/module/accel/ioat/accel_engine_ioat_rpc.c +++ b/module/accel/ioat/accel_engine_ioat_rpc.c @@ -53,5 +53,3 @@ rpc_ioat_scan_accel_engine(struct spdk_jsonrpc_request *request, spdk_jsonrpc_send_bool_response(request, true); } SPDK_RPC_REGISTER("ioat_scan_accel_engine", rpc_ioat_scan_accel_engine, SPDK_RPC_STARTUP) -SPDK_RPC_REGISTER_ALIAS_DEPRECATED(ioat_scan_accel_engine, ioat_scan_copy_engine) -SPDK_RPC_REGISTER_ALIAS_DEPRECATED(ioat_scan_accel_engine, scan_ioat_copy_engine) diff --git a/python/spdk/rpc/ioat.py b/python/spdk/rpc/ioat.py index dd76172f2..fc9ca4290 100644 --- a/python/spdk/rpc/ioat.py +++ b/python/spdk/rpc/ioat.py @@ -1,8 +1,6 @@ from .helpers import deprecated_alias -@deprecated_alias('ioat_scan_copy_engine') -@deprecated_alias('scan_ioat_copy_engine') def ioat_scan_accel_engine(client): """Enable IOAT accel engine. """ diff --git a/scripts/bash-completion/spdk b/scripts/bash-completion/spdk index 17e5bdd96..087d09785 100644 --- a/scripts/bash-completion/spdk +++ b/scripts/bash-completion/spdk @@ -30,7 +30,7 @@ _get_default_rpc_methods() { while read -r; do # Each method name seems to be prefixed with 20h x 4. Then it can # be followed with list of aliases enclosed inside (). Example: - # ioat_scan_accel_engine (ioat_scan_copy_engine, scan_ioat_copy_engine) + # ioat_scan_accel_engine [[ $REPLY =~ ^\ {4}([a-z]+(_[a-z]+)*)(\ *\((.+)\))? ]] || continue names=("${BASH_REMATCH[1]}") diff --git a/scripts/rpc.py b/scripts/rpc.py index 2e8167f74..cdada89ee 100755 --- a/scripts/rpc.py +++ b/scripts/rpc.py @@ -2538,9 +2538,7 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse def ioat_scan_accel_engine(args): rpc.ioat.ioat_scan_accel_engine(args.client) - p = subparsers.add_parser('ioat_scan_accel_engine', - aliases=['ioat_scan_copy_engine', 'scan_ioat_copy_engine'], - help='Enable IOAT accel engine offload.') + p = subparsers.add_parser('ioat_scan_accel_engine', help='Enable IOAT accel engine offload.') p.set_defaults(func=ioat_scan_accel_engine) # dsa