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,
 };