nvmf: Move spdk_internal/nvmf.h to spdk/nvmf_cmd.h

This is a public header that needs to be accessible to
code outside of the SPDK project. The spdk_internal/
directory does not end up getting packaged - it's just for
headers used by multiple libraries within SPDK.

Change-Id: I14e1ab4fda4b0ee779203d190a266240b10be6ae
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/413
Reviewed-by: Ziye Yang <ziye.yang@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: Michael Haeuptle <michaelhaeuptle@gmail.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>

include/spdk/nvmf_cmd.h

@@ -31,8 +31,8 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SPDK_INTERNAL_NVMF_H_
-#define SPDK_INTERNAL_NVMF_H_
+#ifndef SPDK_NVMF_CMD_H_
+#define SPDK_NVMF_CMD_H_
 
 #include "spdk/stdinc.h"
 #include "spdk/nvmf.h"
@@ -72,4 +72,4 @@ struct spdk_nvme_cmd *spdk_nvmf_request_get_cmd(struct spdk_nvmf_request *req);
 struct spdk_nvme_cpl *spdk_nvmf_request_get_response(struct spdk_nvmf_request *req);
 int spdk_nvmf_custom_identify_hdlr(struct spdk_nvmf_request *req);
 
-#endif /* SPDK_INTERNAL_NVMF_H_ */
+#endif /* SPDK_NVMF_CMD_H_ */

lib/nvmf/ctrlr.c

@@ -41,11 +41,11 @@
 #include "spdk/thread.h"
 #include "spdk/trace.h"
 #include "spdk/nvme_spec.h"
+#include "spdk/nvmf_cmd.h"
 #include "spdk/string.h"
 #include "spdk/util.h"
 #include "spdk/version.h"
 
-#include "spdk_internal/nvmf.h"
 #include "spdk_internal/log.h"
 
 #define MIN_KEEP_ALIVE_TIMEOUT_IN_MS 10000

lib/nvmf/ctrlr_bdev.c

@@ -40,13 +40,13 @@
 #include "spdk/thread.h"
 #include "spdk/likely.h"
 #include "spdk/nvme.h"
+#include "spdk/nvmf_cmd.h"
 #include "spdk/nvmf_spec.h"
 #include "spdk/trace.h"
 #include "spdk/scsi_spec.h"
 #include "spdk/string.h"
 #include "spdk/util.h"
 
-#include "spdk_internal/nvmf.h"
 #include "spdk_internal/log.h"
 
 static bool

lib/nvmf/custom_cmd_hdlr.c

@@ -38,7 +38,8 @@
 #include "spdk/stdinc.h"
 
 #include "spdk/bdev.h"
-#include "spdk_internal/nvmf.h"
+#include "spdk/nvmf_cmd.h"
+
 #include "spdk_internal/log.h"
 
 static void

lib/nvmf/nvmf_internal.h

@@ -38,6 +38,7 @@
 
 #include "spdk/likely.h"
 #include "spdk/nvmf.h"
+#include "spdk/nvmf_cmd.h"
 #include "spdk/nvmf_transport.h"
 #include "spdk/nvmf_spec.h"
 #include "spdk/assert.h"
@@ -46,8 +47,6 @@
 #include "spdk/util.h"
 #include "spdk/thread.h"
 
-#include "spdk_internal/nvmf.h"
-
 enum spdk_nvmf_subsystem_state {
 	SPDK_NVMF_SUBSYSTEM_INACTIVE = 0,
 	SPDK_NVMF_SUBSYSTEM_ACTIVATING,

module/event/subsystems/nvmf/nvmf_tgt.c

@@ -38,10 +38,9 @@
 #include "spdk/thread.h"
 #include "spdk/log.h"
 #include "spdk/nvme.h"
+#include "spdk/nvmf_cmd.h"
 #include "spdk/util.h"
 
-#include "spdk_internal/nvmf.h"
-
 enum nvmf_tgt_state {
 	NVMF_TGT_INIT_NONE = 0,
 	NVMF_TGT_INIT_PARSE_CONFIG,