From 5d2d59be8d1438aba90e0334c1accab35401b980 Mon Sep 17 00:00:00 2001 From: Konrad Sztyber Date: Wed, 29 Mar 2023 12:06:33 +0200 Subject: [PATCH] accel: move accel_module.h to include/spdk This file should be external to enable out-of-tree accel modules. Signed-off-by: Konrad Sztyber Change-Id: I2e973d0e88d7145d0fc9714f56db48486b00f3b7 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/17419 Tested-by: SPDK CI Jenkins Reviewed-by: Aleksey Marchuk Reviewed-by: Jacek Kalwas Reviewed-by: Jim Harris --- include/{spdk_internal => spdk}/accel_module.h | 0 lib/accel/accel.c | 2 +- lib/accel/accel_rpc.c | 2 +- lib/accel/accel_sw.c | 2 +- module/accel/dpdk_compressdev/accel_dpdk_compressdev.c | 2 +- module/accel/dpdk_cryptodev/accel_dpdk_cryptodev.c | 2 +- module/accel/dsa/accel_dsa.c | 2 +- module/accel/iaa/accel_iaa.c | 2 +- module/accel/ioat/accel_ioat.c | 2 +- module/accel/mlx5/accel_mlx5.c | 2 +- module/bdev/compress/vbdev_compress.c | 2 +- module/bdev/crypto/vbdev_crypto.h | 2 +- test/unit/lib/accel/accel.c/accel_ut.c | 2 +- 13 files changed, 12 insertions(+), 12 deletions(-) rename include/{spdk_internal => spdk}/accel_module.h (100%) diff --git a/include/spdk_internal/accel_module.h b/include/spdk/accel_module.h similarity index 100% rename from include/spdk_internal/accel_module.h rename to include/spdk/accel_module.h diff --git a/lib/accel/accel.c b/lib/accel/accel.c index f7f368fdd..303ca499a 100644 --- a/lib/accel/accel.c +++ b/lib/accel/accel.c @@ -6,7 +6,7 @@ #include "spdk/stdinc.h" -#include "spdk_internal/accel_module.h" +#include "spdk/accel_module.h" #include "accel_internal.h" diff --git a/lib/accel/accel_rpc.c b/lib/accel/accel_rpc.c index da1009d56..48768a012 100644 --- a/lib/accel/accel_rpc.c +++ b/lib/accel/accel_rpc.c @@ -5,7 +5,7 @@ */ #include "accel_internal.h" -#include "spdk_internal/accel_module.h" +#include "spdk/accel_module.h" #include "spdk/rpc.h" #include "spdk/util.h" diff --git a/lib/accel/accel_sw.c b/lib/accel/accel_sw.c index 7466e0b66..d64c98229 100644 --- a/lib/accel/accel_sw.c +++ b/lib/accel/accel_sw.c @@ -6,7 +6,7 @@ #include "spdk/stdinc.h" -#include "spdk_internal/accel_module.h" +#include "spdk/accel_module.h" #include "accel_internal.h" #include "spdk/env.h" diff --git a/module/accel/dpdk_compressdev/accel_dpdk_compressdev.c b/module/accel/dpdk_compressdev/accel_dpdk_compressdev.c index 83a73fbcc..955890ba9 100644 --- a/module/accel/dpdk_compressdev/accel_dpdk_compressdev.c +++ b/module/accel/dpdk_compressdev/accel_dpdk_compressdev.c @@ -5,7 +5,7 @@ */ #include "accel_dpdk_compressdev.h" -#include "spdk_internal/accel_module.h" +#include "spdk/accel_module.h" #include "spdk/stdinc.h" #include "spdk/rpc.h" diff --git a/module/accel/dpdk_cryptodev/accel_dpdk_cryptodev.c b/module/accel/dpdk_cryptodev/accel_dpdk_cryptodev.c index 37de4a40e..140b92a67 100644 --- a/module/accel/dpdk_cryptodev/accel_dpdk_cryptodev.c +++ b/module/accel/dpdk_cryptodev/accel_dpdk_cryptodev.c @@ -7,7 +7,7 @@ #include "accel_dpdk_cryptodev.h" #include "spdk/accel.h" -#include "spdk_internal/accel_module.h" +#include "spdk/accel_module.h" #include "spdk/env.h" #include "spdk/likely.h" #include "spdk/thread.h" diff --git a/module/accel/dsa/accel_dsa.c b/module/accel/dsa/accel_dsa.c index 9e7616fa7..0f0d04dd9 100644 --- a/module/accel/dsa/accel_dsa.c +++ b/module/accel/dsa/accel_dsa.c @@ -7,7 +7,7 @@ #include "spdk/stdinc.h" -#include "spdk_internal/accel_module.h" +#include "spdk/accel_module.h" #include "spdk/log.h" #include "spdk_internal/idxd.h" diff --git a/module/accel/iaa/accel_iaa.c b/module/accel/iaa/accel_iaa.c index 190c536ea..f16e7311b 100644 --- a/module/accel/iaa/accel_iaa.c +++ b/module/accel/iaa/accel_iaa.c @@ -7,7 +7,7 @@ #include "spdk/stdinc.h" -#include "spdk_internal/accel_module.h" +#include "spdk/accel_module.h" #include "spdk/log.h" #include "spdk_internal/idxd.h" diff --git a/module/accel/ioat/accel_ioat.c b/module/accel/ioat/accel_ioat.c index d1c05a94a..69a3cb348 100644 --- a/module/accel/ioat/accel_ioat.c +++ b/module/accel/ioat/accel_ioat.c @@ -7,7 +7,7 @@ #include "spdk/stdinc.h" -#include "spdk_internal/accel_module.h" +#include "spdk/accel_module.h" #include "spdk/log.h" #include "spdk/likely.h" diff --git a/module/accel/mlx5/accel_mlx5.c b/module/accel/mlx5/accel_mlx5.c index e1c94cba3..a6b41e596 100644 --- a/module/accel/mlx5/accel_mlx5.c +++ b/module/accel/mlx5/accel_mlx5.c @@ -14,7 +14,7 @@ #include "spdk_internal/mlx5.h" #include "spdk_internal/rdma.h" -#include "spdk_internal/accel_module.h" +#include "spdk/accel_module.h" #include "spdk_internal/assert.h" #include "spdk_internal/sgl.h" #include "accel_mlx5.h" diff --git a/module/bdev/compress/vbdev_compress.c b/module/bdev/compress/vbdev_compress.c index db63cbc0e..da814f9ac 100644 --- a/module/bdev/compress/vbdev_compress.c +++ b/module/bdev/compress/vbdev_compress.c @@ -19,7 +19,7 @@ #include "spdk/log.h" #include "spdk/accel.h" -#include "spdk_internal/accel_module.h" +#include "spdk/accel_module.h" #define CHUNK_SIZE (1024 * 16) diff --git a/module/bdev/crypto/vbdev_crypto.h b/module/bdev/crypto/vbdev_crypto.h index 27079faa4..93b77c833 100644 --- a/module/bdev/crypto/vbdev_crypto.h +++ b/module/bdev/crypto/vbdev_crypto.h @@ -13,7 +13,7 @@ #include "spdk/string.h" #include "spdk/log.h" #include "spdk/accel.h" -#include "spdk_internal/accel_module.h" +#include "spdk/accel_module.h" #include "spdk/bdev.h" diff --git a/test/unit/lib/accel/accel.c/accel_ut.c b/test/unit/lib/accel/accel.c/accel_ut.c index bd7a11404..2d0e3493a 100644 --- a/test/unit/lib/accel/accel.c/accel_ut.c +++ b/test/unit/lib/accel/accel.c/accel_ut.c @@ -6,7 +6,7 @@ #include "spdk_cunit.h" #include "spdk_internal/mock.h" -#include "spdk_internal/accel_module.h" +#include "spdk/accel_module.h" #include "thread/thread_internal.h" #include "common/lib/ut_multithread.c" #include "common/lib/test_iobuf.c"