From 549429e12d4621896b63febd4f5cb456f9d1e74d Mon Sep 17 00:00:00 2001
From: paul luse <paul.e.luse@intel.com>
Date: Wed, 8 Sep 2021 12:04:07 -0400
Subject: [PATCH] idxd: move header file to include dir

Used to be in the lib directory but an upcoming patch needs
access to it so move it to a more appropriate location.

The changes in the .h file were needed to address compile
error when in the /include dir (didn't get errors elsewhere)

Signed-off-by: paul luse <paul.e.luse@intel.com>
Change-Id: I44d11fc620f213b13683d62dca899e2792ca6ed5
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/9450
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Ziye Yang <ziye.yang@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
---
 {lib/idxd => include/spdk}/idxd_spec.h | 14 +++++++-------
 lib/idxd/idxd.h                        |  3 +--
 2 files changed, 8 insertions(+), 9 deletions(-)
 rename {lib/idxd => include/spdk}/idxd_spec.h (98%)

diff --git a/lib/idxd/idxd_spec.h b/include/spdk/idxd_spec.h
similarity index 98%
rename from lib/idxd/idxd_spec.h
rename to include/spdk/idxd_spec.h
index 0bbba162d..0437db2ed 100644
--- a/lib/idxd/idxd_spec.h
+++ b/include/spdk/idxd_spec.h
@@ -226,18 +226,18 @@ struct idxd_hw_desc {
 	uint16_t	rsvd1;
 	union {
 		uint8_t		expected_res;
-		struct delta {
+		struct {
 			uint64_t	addr;
 			uint32_t	max_size;
 		} delta;
 		uint32_t	delta_rec_size;
 		uint64_t	dest2;
-		struct crc32c {
+		struct {
 			uint32_t	seed;
 			uint32_t	rsvd;
 			uint64_t	addr;
 		} crc32c;
-		struct dif_chk {
+		struct {
 			uint8_t		src_flags;
 			uint8_t		rsvd1;
 			uint8_t		flags;
@@ -246,7 +246,7 @@ struct idxd_hw_desc {
 			uint16_t	app_tag_mask;
 			uint16_t	app_tag_seed;
 		} dif_chk;
-		struct dif_ins {
+		struct {
 			uint8_t		rsvd1;
 			uint8_t		dest_flag;
 			uint8_t		flags;
@@ -255,7 +255,7 @@ struct idxd_hw_desc {
 			uint16_t	app_tag_mask;
 			uint16_t	app_tag_seed;
 		} dif_ins;
-		struct dif_upd {
+		struct {
 			uint8_t		src_flags;
 			uint8_t		dest_flags;
 			uint8_t		flags;
@@ -289,13 +289,13 @@ struct idxd_hw_comp_record {
 			uint16_t	dif_chk_app_tag_mask;
 			uint16_t	dif_chk_app_tag;
 		};
-		struct dif_ins_comp {
+		struct {
 			uint64_t	rsvd;
 			uint32_t	ref_tag;
 			uint16_t	app_tag_mask;
 			uint16_t	app_tag;
 		} dif_ins_comp;
-		struct dif_upd_comp {
+		struct {
 			uint32_t	src_ref_tag;
 			uint16_t	src_app_tag_mask;
 			uint16_t	src_app_tag;
diff --git a/lib/idxd/idxd.h b/lib/idxd/idxd.h
index 6331b6fbb..77409540f 100644
--- a/lib/idxd/idxd.h
+++ b/lib/idxd/idxd.h
@@ -39,8 +39,7 @@
 #include "spdk/idxd.h"
 #include "spdk/queue.h"
 #include "spdk/mmio.h"
-
-#include "idxd_spec.h"
+#include "spdk/idxd_spec.h"
 
 #ifdef __cplusplus
 extern "C" {