From 5ad576336a4eaadaab2040545a4127d611a7c88d Mon Sep 17 00:00:00 2001 From: Seth Howell Date: Sun, 10 May 2020 12:45:14 -0700 Subject: [PATCH] module/event_vmd: add a map file and remove spdk prefix. Signed-off-by: Seth Howell Change-Id: Ie7c85eb24f75592a79d09c5bbd07f6d11c9a6abd Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2355 Community-CI: Mellanox Build Bot Community-CI: Broadcom CI Reviewed-by: Jim Harris Reviewed-by: Tomasz Zawadzki Tested-by: SPDK CI Jenkins --- module/event/subsystems/vmd/Makefile | 2 ++ module/event/subsystems/vmd/vmd.c | 12 ++++++------ module/event/subsystems/vmd/vmd_rpc.c | 4 ++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/module/event/subsystems/vmd/Makefile b/module/event/subsystems/vmd/Makefile index 15a69e453..403d9787a 100644 --- a/module/event/subsystems/vmd/Makefile +++ b/module/event/subsystems/vmd/Makefile @@ -41,4 +41,6 @@ SO_SUFFIX := $(SO_VER).$(SO_MINOR) C_SRCS = vmd.c vmd_rpc.c LIBNAME = event_vmd +SPDK_MAP_FILE = $(SPDK_ROOT_DIR)/mk/spdk_blank.map + include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk diff --git a/module/event/subsystems/vmd/vmd.c b/module/event/subsystems/vmd/vmd.c index 98b668a84..55eb47019 100644 --- a/module/event/subsystems/vmd/vmd.c +++ b/module/event/subsystems/vmd/vmd.c @@ -80,7 +80,7 @@ vmd_subsystem_init(void) } static void -spdk_vmd_subsystem_init(void) +_vmd_subsystem_init(void) { struct spdk_conf_section *sp; int rc = 0; @@ -96,7 +96,7 @@ spdk_vmd_subsystem_init(void) } static void -spdk_vmd_subsystem_fini(void) +vmd_subsystem_fini(void) { spdk_poller_unregister(&g_hotplug_poller); @@ -106,7 +106,7 @@ spdk_vmd_subsystem_fini(void) } static void -spdk_vmd_write_config_json(struct spdk_json_write_ctx *w) +vmd_write_config_json(struct spdk_json_write_ctx *w) { spdk_json_write_array_begin(w); @@ -123,10 +123,10 @@ spdk_vmd_write_config_json(struct spdk_json_write_ctx *w) static struct spdk_subsystem g_spdk_subsystem_vmd = { .name = "vmd", - .init = spdk_vmd_subsystem_init, - .fini = spdk_vmd_subsystem_fini, + .init = _vmd_subsystem_init, + .fini = vmd_subsystem_fini, .config = NULL, - .write_config_json = spdk_vmd_write_config_json, + .write_config_json = vmd_write_config_json, }; SPDK_SUBSYSTEM_REGISTER(g_spdk_subsystem_vmd); diff --git a/module/event/subsystems/vmd/vmd_rpc.c b/module/event/subsystems/vmd/vmd_rpc.c index 552955941..35843e688 100644 --- a/module/event/subsystems/vmd/vmd_rpc.c +++ b/module/event/subsystems/vmd/vmd_rpc.c @@ -40,7 +40,7 @@ #include "event_vmd.h" static void -spdk_rpc_vmd_enable(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) +rpc_vmd_enable(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { struct spdk_json_write_ctx *w; int rc; @@ -52,4 +52,4 @@ spdk_rpc_vmd_enable(struct spdk_jsonrpc_request *request, const struct spdk_json spdk_jsonrpc_end_result(request, w); } -SPDK_RPC_REGISTER("enable_vmd", spdk_rpc_vmd_enable, SPDK_RPC_STARTUP) +SPDK_RPC_REGISTER("enable_vmd", rpc_vmd_enable, SPDK_RPC_STARTUP)