From 5c55a00df38cee4665b3bcba4a2e5fac5b41a590 Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Fri, 4 May 2018 10:26:10 +0900 Subject: [PATCH] log: Make log_level and trace related RPCs callable during SPDK startup Change-Id: I049fea136f1ea37129ec73de98fc021b4b71e3f6 Signed-off-by: Shuhei Matsumoto Reviewed-on: https://review.gerrithub.io/408419 Reviewed-by: Daniel Verkamp Reviewed-by: Pawel Wodkowski Reviewed-by: Jim Harris Tested-by: SPDK Automated Test System --- lib/log/rpc/log_rpc.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/lib/log/rpc/log_rpc.c b/lib/log/rpc/log_rpc.c index cc00e8984..fea7607ae 100644 --- a/lib/log/rpc/log_rpc.c +++ b/lib/log/rpc/log_rpc.c @@ -134,7 +134,8 @@ invalid: spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, "Invalid parameters"); free_rpc_log_level(&req); } -SPDK_RPC_REGISTER("set_log_print_level", spdk_rpc_set_log_print_level, SPDK_RPC_RUNTIME) +SPDK_RPC_REGISTER("set_log_print_level", spdk_rpc_set_log_print_level, + SPDK_RPC_STARTUP | SPDK_RPC_RUNTIME) static void spdk_rpc_get_log_print_level(struct spdk_jsonrpc_request *request, @@ -162,7 +163,8 @@ spdk_rpc_get_log_print_level(struct spdk_jsonrpc_request *request, spdk_jsonrpc_end_result(request, w); } -SPDK_RPC_REGISTER("get_log_print_level", spdk_rpc_get_log_print_level, SPDK_RPC_RUNTIME) +SPDK_RPC_REGISTER("get_log_print_level", spdk_rpc_get_log_print_level, + SPDK_RPC_STARTUP | SPDK_RPC_RUNTIME) static void spdk_rpc_set_log_level(struct spdk_jsonrpc_request *request, @@ -201,7 +203,7 @@ invalid: spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, "Invalid parameters"); free_rpc_log_level(&req); } -SPDK_RPC_REGISTER("set_log_level", spdk_rpc_set_log_level, SPDK_RPC_RUNTIME) +SPDK_RPC_REGISTER("set_log_level", spdk_rpc_set_log_level, SPDK_RPC_STARTUP | SPDK_RPC_RUNTIME) static void spdk_rpc_get_log_level(struct spdk_jsonrpc_request *request, @@ -228,7 +230,7 @@ spdk_rpc_get_log_level(struct spdk_jsonrpc_request *request, spdk_jsonrpc_end_result(request, w); } -SPDK_RPC_REGISTER("get_log_level", spdk_rpc_get_log_level, SPDK_RPC_RUNTIME) +SPDK_RPC_REGISTER("get_log_level", spdk_rpc_get_log_level, SPDK_RPC_STARTUP | SPDK_RPC_RUNTIME) static void spdk_rpc_set_trace_flag(struct spdk_jsonrpc_request *request, @@ -264,7 +266,7 @@ invalid: spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, "Invalid parameters"); free_rpc_trace_flag(&req); } -SPDK_RPC_REGISTER("set_trace_flag", spdk_rpc_set_trace_flag, SPDK_RPC_RUNTIME) +SPDK_RPC_REGISTER("set_trace_flag", spdk_rpc_set_trace_flag, SPDK_RPC_STARTUP | SPDK_RPC_RUNTIME) static void spdk_rpc_clear_trace_flag(struct spdk_jsonrpc_request *request, @@ -300,7 +302,8 @@ invalid: spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, "Invalid parameters"); free_rpc_trace_flag(&req); } -SPDK_RPC_REGISTER("clear_trace_flag", spdk_rpc_clear_trace_flag, SPDK_RPC_RUNTIME) +SPDK_RPC_REGISTER("clear_trace_flag", spdk_rpc_clear_trace_flag, + SPDK_RPC_STARTUP | SPDK_RPC_RUNTIME) static void spdk_rpc_get_trace_flags(struct spdk_jsonrpc_request *request, @@ -330,4 +333,4 @@ spdk_rpc_get_trace_flags(struct spdk_jsonrpc_request *request, spdk_json_write_object_end(w); spdk_jsonrpc_end_result(request, w); } -SPDK_RPC_REGISTER("get_trace_flags", spdk_rpc_get_trace_flags, SPDK_RPC_RUNTIME) +SPDK_RPC_REGISTER("get_trace_flags", spdk_rpc_get_trace_flags, SPDK_RPC_STARTUP | SPDK_RPC_RUNTIME)