From b9063e4b7020003eaad0134811d9ec3515c1f37f Mon Sep 17 00:00:00 2001 From: Pawel Kaminski Date: Tue, 27 Aug 2019 16:43:52 -0400 Subject: [PATCH] rpc: Rename apply_nvme_firmware to bdev_nvme_apply_firmware. Change-Id: I16e4c47d0752b6a35335dfc3c06b8a85c7597c92 Signed-off-by: Pawel Kaminski Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/466471 Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Ben Walker Reviewed-by: Broadcom SPDK FC-NVMe CI --- doc/jsonrpc.md | 2 +- module/bdev/nvme/bdev_nvme_rpc.c | 7 ++++--- scripts/rpc.py | 13 +++++++------ scripts/rpc/bdev.py | 5 +++-- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/doc/jsonrpc.md b/doc/jsonrpc.md index 60ce1d519..3dbd90422 100644 --- a/doc/jsonrpc.md +++ b/doc/jsonrpc.md @@ -291,7 +291,7 @@ Example response: "bdev_error_delete", "bdev_error_create", "construct_passthru_bdev", - "apply_nvme_firmware", + "bdev_nvme_apply_firmware", "delete_nvme_controller", "construct_nvme_bdev", "bdev_null_create", diff --git a/module/bdev/nvme/bdev_nvme_rpc.c b/module/bdev/nvme/bdev_nvme_rpc.c index acde20cda..8d1f9dccf 100644 --- a/module/bdev/nvme/bdev_nvme_rpc.c +++ b/module/bdev/nvme/bdev_nvme_rpc.c @@ -599,8 +599,8 @@ apply_firmware_complete(struct spdk_bdev_io *bdev_io, bool success, void *cb_arg } static void -spdk_rpc_apply_nvme_firmware(struct spdk_jsonrpc_request *request, - const struct spdk_json_val *params) +spdk_rpc_bdev_nvme_apply_firmware(struct spdk_jsonrpc_request *request, + const struct spdk_json_val *params) { int rc; int fd = -1; @@ -780,4 +780,5 @@ spdk_rpc_apply_nvme_firmware(struct spdk_jsonrpc_request *request, return; } } -SPDK_RPC_REGISTER("apply_nvme_firmware", spdk_rpc_apply_nvme_firmware, SPDK_RPC_RUNTIME) +SPDK_RPC_REGISTER("bdev_nvme_apply_firmware", spdk_rpc_bdev_nvme_apply_firmware, SPDK_RPC_RUNTIME) +SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_nvme_apply_firmware, apply_nvme_firmware) diff --git a/scripts/rpc.py b/scripts/rpc.py index 630ffcb3b..5143ab2fd 100755 --- a/scripts/rpc.py +++ b/scripts/rpc.py @@ -652,15 +652,16 @@ if __name__ == "__main__": '-n', '--num', help='the number of commands you want to fail', type=int, default=1) p.set_defaults(func=bdev_error_inject_error) - def apply_firmware(args): - print_dict(rpc.bdev.apply_firmware(args.client, - bdev_name=args.bdev_name, - filename=args.filename)) + def bdev_nvme_apply_firmware(args): + print_dict(rpc.bdev.bdev_nvme_apply_firmware(args.client, + bdev_name=args.bdev_name, + filename=args.filename)) - p = subparsers.add_parser('apply_firmware', help='Download and commit firmware to NVMe device') + p = subparsers.add_parser('apply_firmware', aliases=['apply_firmware'], + help='Download and commit firmware to NVMe device') p.add_argument('filename', help='filename of the firmware to download') p.add_argument('bdev_name', help='name of the NVMe device') - p.set_defaults(func=apply_firmware) + p.set_defaults(func=bdev_nvme_apply_firmware) # iSCSI def set_iscsi_options(args): diff --git a/scripts/rpc/bdev.py b/scripts/rpc/bdev.py index a86013c70..197801ced 100644 --- a/scripts/rpc/bdev.py +++ b/scripts/rpc/bdev.py @@ -805,7 +805,8 @@ def set_bdev_qos_limit( return client.call('set_bdev_qos_limit', params) -def apply_firmware(client, bdev_name, filename): +@deprecated_alias('apply_firmware') +def bdev_nvme_apply_firmware(client, bdev_name, filename): """Download and commit firmware to NVMe device. Args: @@ -816,4 +817,4 @@ def apply_firmware(client, bdev_name, filename): 'filename': filename, 'bdev_name': bdev_name, } - return client.call('apply_nvme_firmware', params) + return client.call('bdev_nvme_apply_firmware', params)