From 6917f6e061e2ea688b9d6e403ae11d2af96fe65c Mon Sep 17 00:00:00 2001
From: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Date: Fri, 29 May 2020 10:07:54 +0900
Subject: [PATCH] lib/iscsi: Remove inclusion of SPDK event library except
 shared memory ID for iSCSI top application

iSCSI library still needs to include SPDK event library only for
shared memory ID to allocate shared memory for iSCSI top application.

We will move the code to module library separately later but remove
all other inclusion of SPDK event library in this patch.

Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: I21d77b9cc00c6a1f512546a6a0202c8fa5623bed
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2686
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
---
 lib/iscsi/iscsi.h                                | 1 -
 lib/iscsi/iscsi_rpc.c                            | 1 -
 lib/iscsi/portal_grp.c                           | 1 -
 test/unit/lib/iscsi/common.c                     | 1 -
 test/unit/lib/iscsi/portal_grp.c/portal_grp_ut.c | 1 -
 5 files changed, 5 deletions(-)

diff --git a/lib/iscsi/iscsi.h b/lib/iscsi/iscsi.h
index c998466e8..b1747e4ab 100644
--- a/lib/iscsi/iscsi.h
+++ b/lib/iscsi/iscsi.h
@@ -39,7 +39,6 @@
 
 #include "spdk/bdev.h"
 #include "spdk/iscsi_spec.h"
-#include "spdk/event.h"
 #include "spdk/thread.h"
 #include "spdk/sock.h"
 
diff --git a/lib/iscsi/iscsi_rpc.c b/lib/iscsi/iscsi_rpc.c
index 216c3ee32..6df6a3b97 100644
--- a/lib/iscsi/iscsi_rpc.c
+++ b/lib/iscsi/iscsi_rpc.c
@@ -40,7 +40,6 @@
 
 #include "spdk/rpc.h"
 #include "spdk/util.h"
-#include "spdk/event.h"
 #include "spdk/string.h"
 #include "spdk_internal/log.h"
 
diff --git a/lib/iscsi/portal_grp.c b/lib/iscsi/portal_grp.c
index 490a5e089..986562ad7 100644
--- a/lib/iscsi/portal_grp.c
+++ b/lib/iscsi/portal_grp.c
@@ -36,7 +36,6 @@
 
 #include "spdk/conf.h"
 #include "spdk/sock.h"
-#include "spdk/event.h"
 #include "spdk/string.h"
 
 #include "spdk_internal/log.h"
diff --git a/test/unit/lib/iscsi/common.c b/test/unit/lib/iscsi/common.c
index a0ff0c475..e6631848a 100644
--- a/test/unit/lib/iscsi/common.c
+++ b/test/unit/lib/iscsi/common.c
@@ -3,7 +3,6 @@
 #include "iscsi/conn.h"
 
 #include "spdk/env.h"
-#include "spdk/event.h"
 #include "spdk/sock.h"
 #include "spdk_cunit.h"
 
diff --git a/test/unit/lib/iscsi/portal_grp.c/portal_grp_ut.c b/test/unit/lib/iscsi/portal_grp.c/portal_grp_ut.c
index 9e6a967d1..a89a1567f 100644
--- a/test/unit/lib/iscsi/portal_grp.c/portal_grp_ut.c
+++ b/test/unit/lib/iscsi/portal_grp.c/portal_grp_ut.c
@@ -32,7 +32,6 @@
  */
 
 #include "spdk/stdinc.h"
-#include "spdk/event.h"
 
 #include "spdk_cunit.h"