From 650ced4c39b8b0ffce0c2995ace439e3472ae4cb Mon Sep 17 00:00:00 2001
From: Seth Howell <seth.howell@intel.com>
Date: Sun, 10 May 2020 12:42:57 -0700
Subject: [PATCH] module/event_vhost: add a map file and remove spdk prefix.

Signed-off-by: Seth Howell <seth.howell@intel.com>
Change-Id: I1467ea67269b50f346d84bb926b885c6e581a78f
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2354
Community-CI: Mellanox Build Bot
Community-CI: Broadcom CI
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
---
 module/event/subsystems/vhost/Makefile |  2 ++
 module/event/subsystems/vhost/vhost.c  | 16 ++++++++--------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/module/event/subsystems/vhost/Makefile b/module/event/subsystems/vhost/Makefile
index 551434387..0994b3dc7 100644
--- a/module/event/subsystems/vhost/Makefile
+++ b/module/event/subsystems/vhost/Makefile
@@ -41,4 +41,6 @@ SO_SUFFIX := $(SO_VER).$(SO_MINOR)
 C_SRCS = vhost.c
 LIBNAME = event_vhost
 
+SPDK_MAP_FILE = $(SPDK_ROOT_DIR)/mk/spdk_blank.map
+
 include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk
diff --git a/module/event/subsystems/vhost/vhost.c b/module/event/subsystems/vhost/vhost.c
index a3d2c588f..a0c386d98 100644
--- a/module/event/subsystems/vhost/vhost.c
+++ b/module/event/subsystems/vhost/vhost.c
@@ -38,33 +38,33 @@
 #include "spdk_internal/event.h"
 
 static void
-spdk_vhost_subsystem_init_done(int rc)
+vhost_subsystem_init_done(int rc)
 {
 	spdk_subsystem_init_next(rc);
 }
 
 static void
-spdk_vhost_subsystem_init(void)
+vhost_subsystem_init(void)
 {
-	spdk_vhost_init(spdk_vhost_subsystem_init_done);
+	spdk_vhost_init(vhost_subsystem_init_done);
 }
 
 static void
-spdk_vhost_subsystem_fini_done(void)
+vhost_subsystem_fini_done(void)
 {
 	spdk_subsystem_fini_next();
 }
 
 static void
-spdk_vhost_subsystem_fini(void)
+vhost_subsystem_fini(void)
 {
-	spdk_vhost_fini(spdk_vhost_subsystem_fini_done);
+	spdk_vhost_fini(vhost_subsystem_fini_done);
 }
 
 static struct spdk_subsystem g_spdk_subsystem_vhost = {
 	.name = "vhost",
-	.init = spdk_vhost_subsystem_init,
-	.fini = spdk_vhost_subsystem_fini,
+	.init = vhost_subsystem_init,
+	.fini = vhost_subsystem_fini,
 	.config = NULL,
 	.write_config_json = spdk_vhost_config_json,
 };