From 79c9b1e5df9ce9c10e33fc36bb1ddad7f68fad61 Mon Sep 17 00:00:00 2001
From: Jim Harris <james.r.harris@intel.com>
Date: Wed, 20 Jul 2022 00:54:17 +0000
Subject: [PATCH] idxd: rename internal header file to idxd_internal.h

This avoids confusion with the public idxd.h
header file which causes problems with abidiff.

Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: I7910c93d9d95b99c82f4dfdba845e6804e1b6568
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/13729
Community-CI: Mellanox Build Bot
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Paul Luse <paul.e.luse@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Konrad Sztyber <konrad.sztyber@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
---
 lib/idxd/idxd.c                               | 2 +-
 lib/idxd/{idxd.h => idxd_internal.h}          | 0
 lib/idxd/idxd_kernel.c                        | 2 +-
 lib/idxd/idxd_user.c                          | 2 +-
 test/unit/lib/idxd/idxd_user.c/idxd_user_ut.c | 1 -
 5 files changed, 3 insertions(+), 4 deletions(-)
 rename lib/idxd/{idxd.h => idxd_internal.h} (100%)

diff --git a/lib/idxd/idxd.c b/lib/idxd/idxd.c
index 9698625c4..205176b34 100644
--- a/lib/idxd/idxd.c
+++ b/lib/idxd/idxd.c
@@ -14,7 +14,7 @@
 #include "spdk/log.h"
 #include "spdk_internal/idxd.h"
 
-#include "idxd.h"
+#include "idxd_internal.h"
 
 #define ALIGN_4K 0x1000
 #define USERSPACE_DRIVER_NAME "user"
diff --git a/lib/idxd/idxd.h b/lib/idxd/idxd_internal.h
similarity index 100%
rename from lib/idxd/idxd.h
rename to lib/idxd/idxd_internal.h
diff --git a/lib/idxd/idxd_kernel.c b/lib/idxd/idxd_kernel.c
index b6f6bb155..fb1f898df 100644
--- a/lib/idxd/idxd_kernel.c
+++ b/lib/idxd/idxd_kernel.c
@@ -16,7 +16,7 @@
 #include "spdk/log.h"
 #include "spdk_internal/idxd.h"
 
-#include "idxd.h"
+#include "idxd_internal.h"
 
 struct spdk_kernel_idxd_device {
 	struct spdk_idxd_device	idxd;
diff --git a/lib/idxd/idxd_user.c b/lib/idxd/idxd_user.c
index fe9f02d45..ee39c417b 100644
--- a/lib/idxd/idxd_user.c
+++ b/lib/idxd/idxd_user.c
@@ -14,7 +14,7 @@
 #include "spdk/log.h"
 #include "spdk_internal/idxd.h"
 
-#include "idxd.h"
+#include "idxd_internal.h"
 
 struct spdk_user_idxd_device {
 	struct spdk_idxd_device	idxd;
diff --git a/test/unit/lib/idxd/idxd_user.c/idxd_user_ut.c b/test/unit/lib/idxd/idxd_user.c/idxd_user_ut.c
index 078db663a..1d9e004b3 100644
--- a/test/unit/lib/idxd/idxd_user.c/idxd_user_ut.c
+++ b/test/unit/lib/idxd/idxd_user.c/idxd_user_ut.c
@@ -8,7 +8,6 @@
 #include "spdk_internal/idxd.h"
 #include "common/lib/test_env.c"
 
-#include "idxd/idxd.h"
 #include "idxd/idxd_user.c"
 
 #define FAKE_REG_SIZE 0x1000