From 207c959a2cafcb528f6ee981df84197a9269e25c Mon Sep 17 00:00:00 2001
From: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Date: Fri, 29 May 2020 10:19:01 +0900
Subject: [PATCH] lib/nvmf: Remove inclusion of SPDK event library

Remove inclusion of spdk/event.h and spdk_internal/event.h from
SPDK nvmf library. Their dependency had been removed.

Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: Ibc6c52ab41555d9b29afc3e16c1c3fd0bf5fc63a
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2687
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
---
 lib/nvmf/ctrlr_discovery.c            | 1 -
 lib/nvmf/fc.c                         | 1 -
 lib/nvmf/nvmf_fc.h                    | 1 -
 lib/nvmf/nvmf_rpc.c                   | 1 -
 lib/nvmf/subsystem.c                  | 1 -
 test/unit/lib/nvmf/fc.c/fc_ut.c       | 1 -
 test/unit/lib/nvmf/fc_ls.c/fc_ls_ut.c | 1 -
 7 files changed, 7 deletions(-)

diff --git a/lib/nvmf/ctrlr_discovery.c b/lib/nvmf/ctrlr_discovery.c
index 1d3adcab9..5f6f9b191 100644
--- a/lib/nvmf/ctrlr_discovery.c
+++ b/lib/nvmf/ctrlr_discovery.c
@@ -40,7 +40,6 @@
 #include "nvmf_internal.h"
 #include "transport.h"
 
-#include "spdk/event.h"
 #include "spdk/string.h"
 #include "spdk/trace.h"
 #include "spdk/nvmf_spec.h"
diff --git a/lib/nvmf/fc.c b/lib/nvmf/fc.c
index d40ad2516..5c1922189 100644
--- a/lib/nvmf/fc.c
+++ b/lib/nvmf/fc.c
@@ -41,7 +41,6 @@
 #include "spdk/string.h"
 #include "spdk/trace.h"
 #include "spdk/util.h"
-#include "spdk/event.h"
 #include "spdk/likely.h"
 #include "spdk/endian.h"
 #include "spdk/log.h"
diff --git a/lib/nvmf/nvmf_fc.h b/lib/nvmf/nvmf_fc.h
index 251d31e98..5eca88746 100644
--- a/lib/nvmf/nvmf_fc.h
+++ b/lib/nvmf/nvmf_fc.h
@@ -39,7 +39,6 @@
 #include "spdk/assert.h"
 #include "spdk/nvme_spec.h"
 #include "spdk/nvmf_fc_spec.h"
-#include "spdk/event.h"
 #include "spdk/thread.h"
 #include "nvmf_internal.h"
 
diff --git a/lib/nvmf/nvmf_rpc.c b/lib/nvmf/nvmf_rpc.c
index 9bc88ab89..5c0c66386 100644
--- a/lib/nvmf/nvmf_rpc.c
+++ b/lib/nvmf/nvmf_rpc.c
@@ -40,7 +40,6 @@
 #include "spdk/string.h"
 #include "spdk/util.h"
 
-#include "spdk_internal/event.h"
 #include "spdk_internal/log.h"
 #include "spdk_internal/assert.h"
 
diff --git a/lib/nvmf/subsystem.c b/lib/nvmf/subsystem.c
index 59dc370ac..16994c4e4 100644
--- a/lib/nvmf/subsystem.c
+++ b/lib/nvmf/subsystem.c
@@ -36,7 +36,6 @@
 #include "nvmf_internal.h"
 #include "transport.h"
 
-#include "spdk/event.h"
 #include "spdk/likely.h"
 #include "spdk/string.h"
 #include "spdk/trace.h"
diff --git a/test/unit/lib/nvmf/fc.c/fc_ut.c b/test/unit/lib/nvmf/fc.c/fc_ut.c
index 3156dc749..a3a202c29 100644
--- a/test/unit/lib/nvmf/fc.c/fc_ut.c
+++ b/test/unit/lib/nvmf/fc.c/fc_ut.c
@@ -36,7 +36,6 @@
 #include "spdk/env.h"
 #include "spdk_cunit.h"
 #include "spdk/nvmf.h"
-#include "spdk_internal/event.h"
 #include "spdk/endian.h"
 #include "spdk/trace.h"
 #include "spdk_internal/log.h"
diff --git a/test/unit/lib/nvmf/fc_ls.c/fc_ls_ut.c b/test/unit/lib/nvmf/fc_ls.c/fc_ls_ut.c
index f8611fd7f..22a84c4c7 100644
--- a/test/unit/lib/nvmf/fc_ls.c/fc_ls_ut.c
+++ b/test/unit/lib/nvmf/fc_ls.c/fc_ls_ut.c
@@ -36,7 +36,6 @@
 #include "spdk/env.h"
 #include "spdk_cunit.h"
 #include "spdk/nvmf.h"
-#include "spdk_internal/event.h"
 #include "spdk/endian.h"
 #include "spdk/trace.h"
 #include "spdk_internal/log.h"