From b961d9cc12de49251d135307eaa05ec0fc9dd2fa Mon Sep 17 00:00:00 2001 From: Ben Walker Date: Tue, 2 May 2017 11:18:25 -0700 Subject: [PATCH] include: Move the remainder of the code base to stdinc.h Change-Id: I6a142feeaad3117bd3c75e7c5cb7231a1cfa78ae Signed-off-by: Ben Walker --- app/iscsi_tgt/iscsi_tgt.c | 4 +--- app/iscsi_top/iscsi_top.cpp | 13 +---------- app/nvmf_tgt/conf.c | 9 +------- app/nvmf_tgt/nvmf_main.c | 7 +----- app/nvmf_tgt/nvmf_rpc.c | 3 +-- app/nvmf_tgt/nvmf_tgt.c | 7 +----- app/nvmf_tgt/nvmf_tgt.h | 2 +- app/trace/trace.cpp | 15 +------------ app/vhost/vhost.c | 5 +---- examples/ioat/kperf/ioat_kperf.c | 8 +------ examples/ioat/perf/perf.c | 7 +----- examples/ioat/verify/verify.c | 6 +---- examples/nvme/arbitration/arbitration.c | 5 +---- examples/nvme/fio_plugin/fio_plugin.c | 6 +---- examples/nvme/hello_world/hello_world.c | 5 +---- examples/nvme/hotplug/hotplug.c | 9 +------- examples/nvme/identify/identify.c | 7 +----- examples/nvme/nvme_manage/nvme_manage.c | 11 +--------- examples/nvme/perf/perf.c | 7 +----- examples/nvme/reserve/reserve.c | 6 +---- include/spdk/stdinc.h | 19 ++++++++++++++++ include/spdk_internal/assert.h | 4 ++-- include/spdk_internal/bdev.h | 6 +---- include/spdk_internal/copy_engine.h | 3 +-- include/spdk_internal/event.h | 2 +- lib/bdev/aio/blockdev_aio.c | 8 +------ lib/bdev/aio/blockdev_aio.h | 3 ++- lib/bdev/bdev.c | 7 ++---- lib/bdev/malloc/blockdev_malloc.c | 3 +-- lib/bdev/malloc/blockdev_malloc.h | 2 +- lib/bdev/nvme/blockdev_nvme.c | 10 ++------- lib/bdev/nvme/blockdev_nvme.h | 2 +- lib/bdev/nvme/blockdev_nvme_rpc.c | 2 +- lib/bdev/rbd/blockdev_rbd.c | 13 +++-------- lib/bdev/rbd/blockdev_rbd.h | 2 +- lib/bdev/split/vbdev_split.c | 6 +---- lib/blob/bdev/blob_bdev.c | 10 ++------- lib/blob/blobstore.c | 7 +----- lib/blob/request.c | 4 +--- lib/blob/request.h | 2 +- lib/blobfs/blobfs.c | 7 +----- lib/blobfs/tree.c | 7 +----- lib/conf/conf.c | 9 ++------ lib/copy/copy_engine.c | 6 ++--- lib/copy/ioat/copy_engine_ioat.c | 5 +---- lib/cunit/spdk_cunit.c | 4 ++-- lib/env_dpdk/env.c | 5 ++--- lib/env_dpdk/env_internal.h | 14 ++---------- lib/env_dpdk/init.c | 16 ++------------ lib/env_dpdk/vtophys.c | 9 ++------ lib/event/app.c | 15 ++----------- lib/event/reactor.c | 8 ++----- lib/event/rpc/app_rpc.c | 7 +----- lib/event/subsystem.c | 6 ++--- lib/ioat/ioat.c | 4 ++-- lib/ioat/ioat_internal.h | 9 ++------ lib/iscsi/acceptor.c | 6 +---- lib/iscsi/conn.c | 15 ++++--------- lib/iscsi/conn.h | 3 +-- lib/iscsi/crc32c.c | 8 +------ lib/iscsi/crc32c.h | 4 +--- lib/iscsi/init_grp.c | 15 +------------ lib/iscsi/iscsi.c | 19 +--------------- lib/iscsi/iscsi.h | 6 +---- lib/iscsi/iscsi_subsystem.c | 4 +--- lib/iscsi/md5.c | 4 +--- lib/iscsi/md5.h | 2 +- lib/iscsi/param.c | 8 +------ lib/iscsi/param.h | 2 +- lib/iscsi/portal_grp.c | 16 +------------- lib/iscsi/tgt_node.c | 22 +------------------ lib/iscsi/tgt_node.h | 3 +-- lib/json/json_internal.h | 14 ++---------- lib/jsonrpc/jsonrpc_internal.h | 13 ++--------- lib/log/log.c | 11 ++-------- lib/net/interface.c | 12 +--------- lib/net/net_rpc.c | 5 +---- lib/net/sock.c | 13 +---------- lib/nvme/nvme_ctrlr.c | 4 +++- lib/nvme/nvme_internal.h | 15 ++----------- lib/nvme/nvme_pcie.c | 5 +---- lib/nvme/nvme_rdma.c | 10 ++------- lib/nvme/nvme_uevent.c | 13 +++-------- lib/nvmf/discovery.c | 3 +-- lib/nvmf/nvmf.c | 2 +- lib/nvmf/nvmf_internal.h | 5 +---- lib/nvmf/rdma.c | 8 ++----- lib/nvmf/request.c | 2 +- lib/nvmf/session.c | 4 +--- lib/nvmf/session.h | 3 +-- lib/nvmf/subsystem.c | 3 +-- lib/nvmf/transport.c | 5 ++--- lib/nvmf/transport.h | 2 +- lib/nvmf/virtual.c | 3 +-- lib/rpc/rpc.c | 15 +------------ lib/scsi/scsi_internal.h | 14 +----------- lib/trace/trace.c | 14 ++---------- lib/util/bit_array.c | 10 ++------- lib/util/fd.c | 8 ++----- lib/util/io_channel.c | 6 +---- lib/util/string.c | 7 +----- lib/vhost/task.c | 2 +- lib/vhost/vhost.c | 10 ++------- lib/vhost/vhost_iommu.c | 15 +++++-------- lib/vhost/vhost_iommu.h | 2 +- lib/vhost/vhost_rpc.c | 2 +- test/lib/bdev/bdevio/bdevio.c | 5 +---- test/lib/bdev/bdevperf/bdevperf.c | 6 +---- test/lib/blob/blob_ut/blob_ut.c | 5 +---- test/lib/blobfs/blobfs_ut/blobfs_ut.c | 5 +---- test/lib/blobfs/cache_ut/cache_ut.c | 8 +------ test/lib/blobfs/fuse/fuse.c | 13 +++-------- test/lib/blobfs/mkfs/mkfs.c | 10 ++------- test/lib/env/pci/pci_ut.c | 5 +---- test/lib/env/vtophys/vtophys.c | 5 +---- test/lib/event/event_perf/event_perf.c | 6 +---- test/lib/event/reactor/reactor.c | 5 +---- test/lib/event/reactor_perf/reactor_perf.c | 5 +---- test/lib/event/subsystem/subsystem_ut.c | 3 +-- test/lib/ioat/unit/ioat_ut.c | 6 ++--- test/lib/iscsi/param/param_ut.c | 4 +--- test/lib/iscsi/pdu/pdu.c | 6 ++--- test/lib/iscsi/target_node/target_node_ut.c | 4 +--- test/lib/json/jsoncat/jsoncat.c | 4 +--- test/lib/json/parse/json_parse_ut.c | 5 ++--- test/lib/json/util/json_util_ut.c | 5 ++--- test/lib/json/write/json_write_ut.c | 5 ++--- test/lib/jsonrpc/server/jsonrpc_server_ut.c | 6 ++--- test/lib/log/log_ut.c | 5 +---- test/lib/nvme/aer/aer.c | 7 +----- test/lib/nvme/e2edp/nvme_dp.c | 6 +---- test/lib/nvme/overhead/overhead.c | 10 +-------- test/lib/nvme/reset/reset.c | 5 +---- test/lib/nvme/sgl/sgl.c | 6 +---- .../nvme/unit/nvme_ctrlr_c/nvme_ctrlr_ut.c | 4 ++-- test/lib/nvme/unit/nvme_pcie_c/nvme_pcie_ut.c | 3 +-- .../nvme/unit/nvme_qpair_c/nvme_qpair_ut.c | 2 +- test/lib/nvmf/direct/direct_ut.c | 5 +---- test/lib/nvmf/discovery/discovery_ut.c | 5 +---- test/lib/nvmf/request/request_ut.c | 5 +---- test/lib/nvmf/session/session_ut.c | 5 +---- test/lib/nvmf/subsystem/subsystem_ut.c | 5 +---- test/lib/nvmf/virtual/virtual_ut.c | 5 +---- test/lib/scsi/dev/dev_ut.c | 4 +--- test/lib/scsi/init/init_ut.c | 5 +---- test/lib/scsi/lun/lun_ut.c | 5 +---- test/lib/scsi/scsi_bdev/scsi_bdev_ut.c | 4 +--- test/lib/test_env.c | 5 +---- test/lib/util/bit_array/bit_array_ut.c | 2 +- test/lib/util/io_channel/io_channel_ut.c | 4 +--- test/lib/util/string/string_ut.c | 2 +- test/spdk_cunit.h | 3 ++- 152 files changed, 222 insertions(+), 801 deletions(-) diff --git a/app/iscsi_tgt/iscsi_tgt.c b/app/iscsi_tgt/iscsi_tgt.c index 2adee1c9a..e5203532a 100644 --- a/app/iscsi_tgt/iscsi_tgt.c +++ b/app/iscsi_tgt/iscsi_tgt.c @@ -31,9 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include +#include "spdk/stdinc.h" #include #include diff --git a/app/iscsi_top/iscsi_top.cpp b/app/iscsi_top/iscsi_top.cpp index e298f23a4..e6f529d62 100644 --- a/app/iscsi_top/iscsi_top.cpp +++ b/app/iscsi_top/iscsi_top.cpp @@ -31,19 +31,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include +#include "spdk/stdinc.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include #include diff --git a/app/nvmf_tgt/conf.c b/app/nvmf_tgt/conf.c index 01acc0875..c1704967a 100644 --- a/app/nvmf_tgt/conf.c +++ b/app/nvmf_tgt/conf.c @@ -31,14 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include -#include -#include -#include -#include +#include "spdk/stdinc.h" #include #include diff --git a/app/nvmf_tgt/nvmf_main.c b/app/nvmf_tgt/nvmf_main.c index 376254750..a05bbc700 100644 --- a/app/nvmf_tgt/nvmf_main.c +++ b/app/nvmf_tgt/nvmf_main.c @@ -31,12 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include -#include -#include +#include "spdk/stdinc.h" #include "spdk/env.h" #include "nvmf_tgt.h" diff --git a/app/nvmf_tgt/nvmf_rpc.c b/app/nvmf_tgt/nvmf_rpc.c index c02f38c67..b8b9f57a6 100644 --- a/app/nvmf_tgt/nvmf_rpc.c +++ b/app/nvmf_tgt/nvmf_rpc.c @@ -31,8 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include +#include "spdk/stdinc.h" #include "spdk/bdev.h" #include "spdk/log.h" diff --git a/app/nvmf_tgt/nvmf_tgt.c b/app/nvmf_tgt/nvmf_tgt.c index a923a888c..487e4aee2 100644 --- a/app/nvmf_tgt/nvmf_tgt.c +++ b/app/nvmf_tgt/nvmf_tgt.c @@ -31,12 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include -#include -#include +#include "spdk/stdinc.h" #include #include diff --git a/app/nvmf_tgt/nvmf_tgt.h b/app/nvmf_tgt/nvmf_tgt.h index b59d6d110..62f0c6803 100644 --- a/app/nvmf_tgt/nvmf_tgt.h +++ b/app/nvmf_tgt/nvmf_tgt.h @@ -34,7 +34,7 @@ #ifndef NVMF_TGT_H #define NVMF_TGT_H -#include +#include "spdk/stdinc.h" #include "spdk/nvmf.h" #include "spdk/queue.h" diff --git a/app/trace/trace.cpp b/app/trace/trace.cpp index ecd4e96c0..bc6ed6555 100644 --- a/app/trace/trace.cpp +++ b/app/trace/trace.cpp @@ -31,20 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "spdk/stdinc.h" #include diff --git a/app/vhost/vhost.c b/app/vhost/vhost.c index a5cc795e3..542c4e51c 100644 --- a/app/vhost/vhost.c +++ b/app/vhost/vhost.c @@ -31,10 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include +#include "spdk/stdinc.h" #include "spdk/log.h" #include "spdk/conf.h" diff --git a/examples/ioat/kperf/ioat_kperf.c b/examples/ioat/kperf/ioat_kperf.c index 636ff064b..988f47545 100644 --- a/examples/ioat/kperf/ioat_kperf.c +++ b/examples/ioat/kperf/ioat_kperf.c @@ -31,13 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include -#include -#include -#include +#include "spdk/stdinc.h" #define ioat_max(a,b) (((a)>(b))?(a):(b)) diff --git a/examples/ioat/perf/perf.c b/examples/ioat/perf/perf.c index 4798880a3..bec975eb7 100644 --- a/examples/ioat/perf/perf.c +++ b/examples/ioat/perf/perf.c @@ -31,12 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include -#include -#include +#include "spdk/stdinc.h" #include #include diff --git a/examples/ioat/verify/verify.c b/examples/ioat/verify/verify.c index dea60b682..f546768d8 100644 --- a/examples/ioat/verify/verify.c +++ b/examples/ioat/verify/verify.c @@ -31,11 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include -#include +#include "spdk/stdinc.h" #include #include diff --git a/examples/nvme/arbitration/arbitration.c b/examples/nvme/arbitration/arbitration.c index add7c0d4a..f5dab0192 100644 --- a/examples/nvme/arbitration/arbitration.c +++ b/examples/nvme/arbitration/arbitration.c @@ -31,10 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include +#include "spdk/stdinc.h" #include #include diff --git a/examples/nvme/fio_plugin/fio_plugin.c b/examples/nvme/fio_plugin/fio_plugin.c index 41ad6cab7..1b4446f88 100644 --- a/examples/nvme/fio_plugin/fio_plugin.c +++ b/examples/nvme/fio_plugin/fio_plugin.c @@ -31,11 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include -#include +#include "spdk/stdinc.h" #include "spdk/nvme.h" #include "spdk/env.h" diff --git a/examples/nvme/hello_world/hello_world.c b/examples/nvme/hello_world/hello_world.c index 66e83c450..9baf52840 100644 --- a/examples/nvme/hello_world/hello_world.c +++ b/examples/nvme/hello_world/hello_world.c @@ -31,10 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include +#include "spdk/stdinc.h" #include "spdk/nvme.h" #include "spdk/env.h" diff --git a/examples/nvme/hotplug/hotplug.c b/examples/nvme/hotplug/hotplug.c index c38b1436e..d2573050f 100644 --- a/examples/nvme/hotplug/hotplug.c +++ b/examples/nvme/hotplug/hotplug.c @@ -31,14 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include -#include -#include -#include -#include +#include "spdk/stdinc.h" #include #include diff --git a/examples/nvme/identify/identify.c b/examples/nvme/identify/identify.c index c151c6057..071df62ef 100644 --- a/examples/nvme/identify/identify.c +++ b/examples/nvme/identify/identify.c @@ -31,12 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include -#include -#include +#include "spdk/stdinc.h" #include "spdk/log.h" #include "spdk/nvme.h" diff --git a/examples/nvme/nvme_manage/nvme_manage.c b/examples/nvme/nvme_manage/nvme_manage.c index 40b36a054..7901f1108 100644 --- a/examples/nvme/nvme_manage/nvme_manage.c +++ b/examples/nvme/nvme_manage/nvme_manage.c @@ -31,16 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "spdk/stdinc.h" #include "spdk/nvme.h" #include "spdk/env.h" diff --git a/examples/nvme/perf/perf.c b/examples/nvme/perf/perf.c index 73ffb3398..68f2456a4 100644 --- a/examples/nvme/perf/perf.c +++ b/examples/nvme/perf/perf.c @@ -31,10 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include +#include "spdk/stdinc.h" #include #include @@ -49,8 +46,6 @@ #if HAVE_LIBAIO #include -#include -#include #endif struct ctrlr_entry { diff --git a/examples/nvme/reserve/reserve.c b/examples/nvme/reserve/reserve.c index 5a83f062f..16ef78b80 100644 --- a/examples/nvme/reserve/reserve.c +++ b/examples/nvme/reserve/reserve.c @@ -31,11 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include -#include +#include "spdk/stdinc.h" #include "spdk/nvme.h" #include "spdk/env.h" diff --git a/include/spdk/stdinc.h b/include/spdk/stdinc.h index e3026b36f..9f473606b 100644 --- a/include/spdk/stdinc.h +++ b/include/spdk/stdinc.h @@ -46,6 +46,7 @@ extern "C" { /* Standard C */ #include +#include #include #include #include @@ -56,15 +57,33 @@ extern "C" { #include #include #include +#include /* POSIX */ +#include +#include +#include +#include +#include +#include #include #include +#include +#include +#include #include +#include +#include #include +#include +#include #include #include +#include #include +#include +#include +#include #ifdef __cplusplus } diff --git a/include/spdk_internal/assert.h b/include/spdk_internal/assert.h index d5bb0ebe4..7e4c45070 100644 --- a/include/spdk_internal/assert.h +++ b/include/spdk_internal/assert.h @@ -34,14 +34,14 @@ #ifndef SPDK_INTERNAL_ASSERT_H #define SPDK_INTERNAL_ASSERT_H +#include "spdk/stdinc.h" + #ifdef __cplusplus extern "C" { #endif #include "spdk/assert.h" -#include - #if !defined(DEBUG) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)) #define SPDK_UNREACHABLE() __builtin_unreachable() #else diff --git a/include/spdk_internal/bdev.h b/include/spdk_internal/bdev.h index 09258ef35..3501cf8c0 100644 --- a/include/spdk_internal/bdev.h +++ b/include/spdk_internal/bdev.h @@ -39,11 +39,7 @@ #ifndef SPDK_INTERNAL_BDEV_H #define SPDK_INTERNAL_BDEV_H -#include -#include -#include /* for offsetof */ -#include /* for struct iovec */ -#include +#include "spdk/stdinc.h" #include "spdk/bdev.h" #include "spdk/event.h" diff --git a/include/spdk_internal/copy_engine.h b/include/spdk_internal/copy_engine.h index 073b461d1..04a00f9b6 100644 --- a/include/spdk_internal/copy_engine.h +++ b/include/spdk_internal/copy_engine.h @@ -34,8 +34,7 @@ #ifndef SPDK_INTERNAL_COPY_ENGINE_H #define SPDK_INTERNAL_COPY_ENGINE_H -#include -#include +#include "spdk/stdinc.h" #include "spdk/copy_engine.h" #include "spdk/queue.h" diff --git a/include/spdk_internal/event.h b/include/spdk_internal/event.h index e1da1e0f2..e59f22d0b 100644 --- a/include/spdk_internal/event.h +++ b/include/spdk_internal/event.h @@ -34,7 +34,7 @@ #ifndef SPDK_INTERNAL_EVENT_H #define SPDK_INTERNAL_EVENT_H -#include +#include "spdk/stdinc.h" #include "spdk/event.h" diff --git a/lib/bdev/aio/blockdev_aio.c b/lib/bdev/aio/blockdev_aio.c index d9ae0c48c..7d2b11b27 100644 --- a/lib/bdev/aio/blockdev_aio.c +++ b/lib/bdev/aio/blockdev_aio.c @@ -33,13 +33,7 @@ #include "blockdev_aio.h" -#include -#include -#include -#include -#include -#include -#include +#include "spdk/stdinc.h" #include "spdk/bdev.h" #include "spdk/conf.h" diff --git a/lib/bdev/aio/blockdev_aio.h b/lib/bdev/aio/blockdev_aio.h index 1e09a44ea..e855ee028 100644 --- a/lib/bdev/aio/blockdev_aio.h +++ b/lib/bdev/aio/blockdev_aio.h @@ -34,7 +34,8 @@ #ifndef SPDK_BLOCKDEV_AIO_H #define SPDK_BLOCKDEV_AIO_H -#include +#include "spdk/stdinc.h" + #include #include "spdk/queue.h" diff --git a/lib/bdev/bdev.c b/lib/bdev/bdev.c index 8027ded98..86a75c981 100644 --- a/lib/bdev/bdev.c +++ b/lib/bdev/bdev.c @@ -32,12 +32,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "spdk/bdev.h" +#include "spdk/stdinc.h" -#include -#include -#include -#include +#include "spdk/bdev.h" #include #include diff --git a/lib/bdev/malloc/blockdev_malloc.c b/lib/bdev/malloc/blockdev_malloc.c index ab39eb0d1..82fb56c8a 100644 --- a/lib/bdev/malloc/blockdev_malloc.c +++ b/lib/bdev/malloc/blockdev_malloc.c @@ -32,8 +32,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include +#include "spdk/stdinc.h" #include "blockdev_malloc.h" #include "spdk/bdev.h" diff --git a/lib/bdev/malloc/blockdev_malloc.h b/lib/bdev/malloc/blockdev_malloc.h index f680129a2..e88c4a6d9 100644 --- a/lib/bdev/malloc/blockdev_malloc.h +++ b/lib/bdev/malloc/blockdev_malloc.h @@ -34,7 +34,7 @@ #ifndef SPDK_BLOCKDEV_MALLOC_H #define SPDK_BLOCKDEV_MALLOC_H -#include +#include "spdk/stdinc.h" #include "spdk/bdev.h" diff --git a/lib/bdev/nvme/blockdev_nvme.c b/lib/bdev/nvme/blockdev_nvme.c index 797df09cf..a17bbf811 100644 --- a/lib/bdev/nvme/blockdev_nvme.c +++ b/lib/bdev/nvme/blockdev_nvme.c @@ -32,16 +32,10 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "spdk/stdinc.h" + #include "blockdev_nvme.h" -#include -#include -#include -#include -#include - -#include - #include "spdk/conf.h" #include "spdk/endian.h" #include "spdk/bdev.h" diff --git a/lib/bdev/nvme/blockdev_nvme.h b/lib/bdev/nvme/blockdev_nvme.h index dfa4d98a1..4532f7d71 100644 --- a/lib/bdev/nvme/blockdev_nvme.h +++ b/lib/bdev/nvme/blockdev_nvme.h @@ -34,7 +34,7 @@ #ifndef SPDK_BLOCKDEV_NVME_H #define SPDK_BLOCKDEV_NVME_H -#include +#include "spdk/stdinc.h" #include "spdk/nvme.h" diff --git a/lib/bdev/nvme/blockdev_nvme_rpc.c b/lib/bdev/nvme/blockdev_nvme_rpc.c index 0381476b1..d32af6018 100644 --- a/lib/bdev/nvme/blockdev_nvme_rpc.c +++ b/lib/bdev/nvme/blockdev_nvme_rpc.c @@ -31,7 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include "spdk/stdinc.h" #include "blockdev_nvme.h" diff --git a/lib/bdev/rbd/blockdev_rbd.c b/lib/bdev/rbd/blockdev_rbd.c index e242e10db..4fdbb2377 100644 --- a/lib/bdev/rbd/blockdev_rbd.c +++ b/lib/bdev/rbd/blockdev_rbd.c @@ -31,20 +31,13 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "spdk/stdinc.h" + #include "blockdev_rbd.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include +#include #include "spdk/conf.h" #include "spdk/env.h" diff --git a/lib/bdev/rbd/blockdev_rbd.h b/lib/bdev/rbd/blockdev_rbd.h index 900177deb..bbc2ca563 100644 --- a/lib/bdev/rbd/blockdev_rbd.h +++ b/lib/bdev/rbd/blockdev_rbd.h @@ -34,7 +34,7 @@ #ifndef SPDK_BLOCKDEV_RBD_H #define SPDK_BLOCKDEV_RBD_H -#include +#include "spdk/stdinc.h" #include "spdk/bdev.h" diff --git a/lib/bdev/split/vbdev_split.c b/lib/bdev/split/vbdev_split.c index fdfffe99e..46e270283 100644 --- a/lib/bdev/split/vbdev_split.c +++ b/lib/bdev/split/vbdev_split.c @@ -36,11 +36,7 @@ * bdev and slices it into multiple smaller bdevs. */ -#include -#include -#include -#include -#include +#include "spdk/stdinc.h" #include "spdk/rpc.h" #include "spdk/conf.h" diff --git a/lib/blob/bdev/blob_bdev.c b/lib/blob/bdev/blob_bdev.c index 82e8a2118..6b0c6d41e 100644 --- a/lib/blob/bdev/blob_bdev.c +++ b/lib/blob/bdev/blob_bdev.c @@ -30,14 +30,8 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include -#include -#include -#include -#include + +#include "spdk/stdinc.h" #include "spdk/blob_bdev.h" #include "spdk/blob.h" diff --git a/lib/blob/blobstore.c b/lib/blob/blobstore.c index 4a1252d21..130821d2c 100644 --- a/lib/blob/blobstore.c +++ b/lib/blob/blobstore.c @@ -31,12 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include -#include -#include +#include "spdk/stdinc.h" #include "spdk/blob.h" #include "spdk/env.h" diff --git a/lib/blob/request.c b/lib/blob/request.c index 0301e0640..c78a9036c 100644 --- a/lib/blob/request.c +++ b/lib/blob/request.c @@ -31,9 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include +#include "spdk/stdinc.h" #include "blobstore.h" #include "request.h" diff --git a/lib/blob/request.h b/lib/blob/request.h index 2bf9820d9..7f571569b 100644 --- a/lib/blob/request.h +++ b/lib/blob/request.h @@ -34,7 +34,7 @@ #ifndef SPDK_BS_REQUEST_H #define SPDK_BS_REQUEST_H -#include +#include "spdk/stdinc.h" #include "spdk/blob.h" diff --git a/lib/blobfs/blobfs.c b/lib/blobfs/blobfs.c index ebb83102b..297c6b878 100644 --- a/lib/blobfs/blobfs.c +++ b/lib/blobfs/blobfs.c @@ -31,12 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include -#include -#include +#include "spdk/stdinc.h" #include "spdk/blobfs.h" #include "blobfs_internal.h" diff --git a/lib/blobfs/tree.c b/lib/blobfs/tree.c index 45c6aa467..fb14bcaee 100644 --- a/lib/blobfs/tree.c +++ b/lib/blobfs/tree.c @@ -31,12 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include -#include -#include +#include "spdk/stdinc.h" #include "spdk/blobfs.h" #include "blobfs_internal.h" diff --git a/lib/conf/conf.c b/lib/conf/conf.c index 63719eac5..8ab451b35 100644 --- a/lib/conf/conf.c +++ b/lib/conf/conf.c @@ -32,14 +32,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "spdk/stdinc.h" + #include "spdk/conf.h" - -#include -#include -#include -#include -#include - #include "spdk/string.h" struct spdk_conf_value { diff --git a/lib/copy/copy_engine.c b/lib/copy/copy_engine.c index d38543919..db56c7ee2 100644 --- a/lib/copy/copy_engine.c +++ b/lib/copy/copy_engine.c @@ -31,11 +31,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "spdk_internal/copy_engine.h" +#include "spdk/stdinc.h" -#include -#include -#include +#include "spdk_internal/copy_engine.h" #include #include diff --git a/lib/copy/ioat/copy_engine_ioat.c b/lib/copy/ioat/copy_engine_ioat.c index 7ae6cc014..305e38d8d 100644 --- a/lib/copy/ioat/copy_engine_ioat.c +++ b/lib/copy/ioat/copy_engine_ioat.c @@ -31,10 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include +#include "spdk/stdinc.h" #include "spdk_internal/copy_engine.h" diff --git a/lib/cunit/spdk_cunit.c b/lib/cunit/spdk_cunit.c index 29e1d4b21..55c1e9346 100644 --- a/lib/cunit/spdk_cunit.c +++ b/lib/cunit/spdk_cunit.c @@ -31,9 +31,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "spdk_cunit.h" +#include "spdk/stdinc.h" -#include +#include "spdk_cunit.h" static int spdk_cunit_get_test_result(CU_pTest test) diff --git a/lib/env_dpdk/env.c b/lib/env_dpdk/env.c index eaaeaf1de..99a9b18f2 100644 --- a/lib/env_dpdk/env.c +++ b/lib/env_dpdk/env.c @@ -31,10 +31,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "spdk/env.h" +#include "spdk/stdinc.h" -#include -#include +#include "spdk/env.h" #include #include diff --git a/lib/env_dpdk/env_internal.h b/lib/env_dpdk/env_internal.h index 1a1527f8a..e195d9007 100644 --- a/lib/env_dpdk/env_internal.h +++ b/lib/env_dpdk/env_internal.h @@ -34,22 +34,12 @@ #ifndef SPDK_ENV_INTERNAL_H #define SPDK_ENV_INTERNAL_H +#include "spdk/stdinc.h" + #define spdk_pci_device rte_pci_device #include "spdk/env.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - #include #include #include diff --git a/lib/env_dpdk/init.c b/lib/env_dpdk/init.c index 8176c7cf0..05230b089 100644 --- a/lib/env_dpdk/init.c +++ b/lib/env_dpdk/init.c @@ -31,21 +31,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "env_internal.h" +#include "spdk/stdinc.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "env_internal.h" #include #include diff --git a/lib/env_dpdk/vtophys.c b/lib/env_dpdk/vtophys.c index 212de4d56..c11cc5ac4 100644 --- a/lib/env_dpdk/vtophys.c +++ b/lib/env_dpdk/vtophys.c @@ -31,14 +31,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "env_internal.h" +#include "spdk/stdinc.h" -#include -#include -#include -#include -#include -#include +#include "env_internal.h" #include #include diff --git a/lib/event/app.c b/lib/event/app.c index 39c4a7d64..6fd69c1dd 100644 --- a/lib/event/app.c +++ b/lib/event/app.c @@ -31,20 +31,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "spdk_internal/event.h" +#include "spdk/stdinc.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "spdk_internal/event.h" #include #include diff --git a/lib/event/reactor.c b/lib/event/reactor.c index f0ad588d7..c5043425c 100644 --- a/lib/event/reactor.c +++ b/lib/event/reactor.c @@ -31,13 +31,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "spdk_internal/event.h" +#include "spdk/stdinc.h" -#include -#include -#include -#include -#include +#include "spdk_internal/event.h" #ifdef __linux__ #include diff --git a/lib/event/rpc/app_rpc.c b/lib/event/rpc/app_rpc.c index 11b4d8719..a1befad7a 100644 --- a/lib/event/rpc/app_rpc.c +++ b/lib/event/rpc/app_rpc.c @@ -31,12 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - -#include -#include -#include -#include -#include +#include "spdk/stdinc.h" #include "spdk/rpc.h" #include "spdk/util.h" diff --git a/lib/event/subsystem.c b/lib/event/subsystem.c index c25cb262e..57db21a49 100644 --- a/lib/event/subsystem.c +++ b/lib/event/subsystem.c @@ -31,11 +31,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "spdk_internal/event.h" +#include "spdk/stdinc.h" -#include -#include -#include +#include "spdk_internal/event.h" static TAILQ_HEAD(spdk_subsystem_list, spdk_subsystem) g_subsystems = TAILQ_HEAD_INITIALIZER(g_subsystems); diff --git a/lib/ioat/ioat.c b/lib/ioat/ioat.c index 9e6feac62..367d39e16 100644 --- a/lib/ioat/ioat.c +++ b/lib/ioat/ioat.c @@ -31,6 +31,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "spdk/stdinc.h" + #include "ioat_internal.h" #include "spdk/env.h" @@ -38,8 +40,6 @@ #include "spdk_internal/log.h" -#include - struct ioat_driver { pthread_mutex_t lock; TAILQ_HEAD(, spdk_ioat_chan) attached_chans; diff --git a/lib/ioat/ioat_internal.h b/lib/ioat/ioat_internal.h index e76c4fc95..81cffff52 100644 --- a/lib/ioat/ioat_internal.h +++ b/lib/ioat/ioat_internal.h @@ -34,15 +34,10 @@ #ifndef __IOAT_INTERNAL_H__ #define __IOAT_INTERNAL_H__ +#include "spdk/stdinc.h" + #include "spdk/ioat.h" #include "spdk/ioat_spec.h" - -#include -#include -#include -#include -#include - #include "spdk/queue.h" #include "spdk/mmio.h" diff --git a/lib/iscsi/acceptor.c b/lib/iscsi/acceptor.c index 53f83c1f9..17b68e02a 100644 --- a/lib/iscsi/acceptor.c +++ b/lib/iscsi/acceptor.c @@ -32,11 +32,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include - -#include +#include "spdk/stdinc.h" #include "spdk/env.h" #include "spdk/event.h" diff --git a/lib/iscsi/conn.c b/lib/iscsi/conn.c index 5c6c1b563..f5d7d28a9 100644 --- a/lib/iscsi/conn.c +++ b/lib/iscsi/conn.c @@ -32,24 +32,17 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include -#include -#include - -#include -#include "spdk/queue.h" -#include -#include +#include "spdk/stdinc.h" #include #include +#include + #include "spdk/endian.h" #include "spdk/env.h" #include "spdk/event.h" +#include "spdk/queue.h" #include "spdk/trace.h" #include "spdk/net.h" diff --git a/lib/iscsi/conn.h b/lib/iscsi/conn.h index e991d4796..db2a2dba9 100644 --- a/lib/iscsi/conn.h +++ b/lib/iscsi/conn.h @@ -35,8 +35,7 @@ #ifndef SPDK_ISCSI_CONN_H #define SPDK_ISCSI_CONN_H -#include -#include +#include "spdk/stdinc.h" #include "iscsi/iscsi.h" #include "spdk/queue.h" diff --git a/lib/iscsi/crc32c.c b/lib/iscsi/crc32c.c index aca69ccb5..e1fc4eefc 100644 --- a/lib/iscsi/crc32c.c +++ b/lib/iscsi/crc32c.c @@ -32,13 +32,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include - -#include -#include -#include -#include +#include "spdk/stdinc.h" #include "iscsi/iscsi.h" #include "iscsi/crc32c.h" diff --git a/lib/iscsi/crc32c.h b/lib/iscsi/crc32c.h index db2e1ae46..2521ea7e6 100644 --- a/lib/iscsi/crc32c.h +++ b/lib/iscsi/crc32c.h @@ -35,9 +35,7 @@ #ifndef SPDK_CRC32C_H #define SPDK_CRC32C_H -#include -#include -#include +#include "spdk/stdinc.h" #define SPDK_CRC32C_INITIAL 0xffffffffUL #define SPDK_CRC32C_XOR 0xffffffffUL diff --git a/lib/iscsi/init_grp.c b/lib/iscsi/init_grp.c index 502ab06e0..747688cde 100644 --- a/lib/iscsi/init_grp.c +++ b/lib/iscsi/init_grp.c @@ -32,20 +32,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "spdk/stdinc.h" #include "spdk/conf.h" #include "spdk/net.h" diff --git a/lib/iscsi/iscsi.c b/lib/iscsi/iscsi.c index 20473d727..c6e30bb64 100644 --- a/lib/iscsi/iscsi.c +++ b/lib/iscsi/iscsi.c @@ -32,23 +32,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "spdk/stdinc.h" #include #include @@ -166,7 +150,6 @@ spdk_make_digest_word(uint8_t *buf, size_t len, uint32_t crc32c) #endif #ifndef HAVE_SRANDOMDEV -#include static void srandomdev(void) { diff --git a/lib/iscsi/iscsi.h b/lib/iscsi/iscsi.h index 03b03a2ef..de9fe95b9 100644 --- a/lib/iscsi/iscsi.h +++ b/lib/iscsi/iscsi.h @@ -35,11 +35,7 @@ #ifndef SPDK_ISCSI_H #define SPDK_ISCSI_H -#include -#include -#include -#include -#include +#include "spdk/stdinc.h" #include "spdk/bdev.h" #include "spdk/iscsi_spec.h" diff --git a/lib/iscsi/iscsi_subsystem.c b/lib/iscsi/iscsi_subsystem.c index befe14e0a..9e37bd7fa 100644 --- a/lib/iscsi/iscsi_subsystem.c +++ b/lib/iscsi/iscsi_subsystem.c @@ -32,9 +32,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include +#include "spdk/stdinc.h" #include #include diff --git a/lib/iscsi/md5.c b/lib/iscsi/md5.c index 4c6d312a6..80cc112a4 100644 --- a/lib/iscsi/md5.c +++ b/lib/iscsi/md5.c @@ -32,10 +32,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include +#include "spdk/stdinc.h" -#include #include #include "iscsi/md5.h" diff --git a/lib/iscsi/md5.h b/lib/iscsi/md5.h index 52ce668b3..ff571b4a8 100644 --- a/lib/iscsi/md5.h +++ b/lib/iscsi/md5.h @@ -35,7 +35,7 @@ #ifndef SPDK_MD5_H #define SPDK_MD5_H -#include +#include "spdk/stdinc.h" #include diff --git a/lib/iscsi/param.c b/lib/iscsi/param.c index f1be26579..ef1cbf9af 100644 --- a/lib/iscsi/param.c +++ b/lib/iscsi/param.c @@ -32,13 +32,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include -#include -#include -#include +#include "spdk/stdinc.h" #include "spdk/string.h" #include "iscsi/iscsi.h" diff --git a/lib/iscsi/param.h b/lib/iscsi/param.h index 9666f3cbe..c9dc8cab9 100644 --- a/lib/iscsi/param.h +++ b/lib/iscsi/param.h @@ -35,7 +35,7 @@ #ifndef SPDK_ISCSI_PARAM_H #define SPDK_ISCSI_PARAM_H -#include +#include "spdk/stdinc.h" enum iscsi_param_type { ISPT_INVALID = -1, diff --git a/lib/iscsi/portal_grp.c b/lib/iscsi/portal_grp.c index 2ac8db27a..c9fd7ebc9 100644 --- a/lib/iscsi/portal_grp.c +++ b/lib/iscsi/portal_grp.c @@ -32,21 +32,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include +#include "spdk/stdinc.h" #include "spdk/conf.h" #include "spdk/net.h" diff --git a/lib/iscsi/tgt_node.c b/lib/iscsi/tgt_node.c index b4d16626a..bbd1869eb 100644 --- a/lib/iscsi/tgt_node.c +++ b/lib/iscsi/tgt_node.c @@ -32,27 +32,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include +#include "spdk/stdinc.h" #include "spdk/env.h" #include "spdk/event.h" diff --git a/lib/iscsi/tgt_node.h b/lib/iscsi/tgt_node.h index df036edb4..cda476e61 100644 --- a/lib/iscsi/tgt_node.h +++ b/lib/iscsi/tgt_node.h @@ -35,8 +35,7 @@ #ifndef SPDK_ISCSI_TGT_NODE_H_ #define SPDK_ISCSI_TGT_NODE_H_ -#include -#include +#include "spdk/stdinc.h" #include "spdk/scsi.h" diff --git a/lib/json/json_internal.h b/lib/json/json_internal.h index 1b47b5d48..fa2258e9f 100644 --- a/lib/json/json_internal.h +++ b/lib/json/json_internal.h @@ -34,19 +34,9 @@ #ifndef SPDK_JSON_INTERNAL_H_ #define SPDK_JSON_INTERNAL_H_ +#include "spdk/stdinc.h" + #include "spdk/json.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - #include "spdk/likely.h" #include "spdk/string.h" diff --git a/lib/jsonrpc/jsonrpc_internal.h b/lib/jsonrpc/jsonrpc_internal.h index 108370939..97f5edcab 100644 --- a/lib/jsonrpc/jsonrpc_internal.h +++ b/lib/jsonrpc/jsonrpc_internal.h @@ -34,19 +34,10 @@ #ifndef SPDK_JSONRPC_INTERNAL_H_ #define SPDK_JSONRPC_INTERNAL_H_ +#include "spdk/stdinc.h" + #include "spdk/jsonrpc.h" -#include -#include -#include -#include -#include -#include - -#include -#include -#include - #include "spdk_internal/log.h" #define SPDK_JSONRPC_RECV_BUF_SIZE (32 * 1024) diff --git a/lib/log/log.c b/lib/log/log.c index ae1d2480f..126716ab5 100644 --- a/lib/log/log.c +++ b/lib/log/log.c @@ -31,16 +31,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "spdk_internal/log.h" +#include "spdk/stdinc.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include "spdk_internal/log.h" static TAILQ_HEAD(, spdk_trace_flag) g_trace_flags = TAILQ_HEAD_INITIALIZER(g_trace_flags); diff --git a/lib/net/interface.c b/lib/net/interface.c index 8e7c34a89..e7125607c 100644 --- a/lib/net/interface.c +++ b/lib/net/interface.c @@ -31,7 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include "spdk/stdinc.h" #include "spdk/log.h" #include "spdk/net.h" @@ -40,19 +40,9 @@ #ifdef __linux__ /* Interface management is Linux-specific */ -#include -#include -#include #include #include #include -#include -#include -#include -#include -#include -#include -#include static TAILQ_HEAD(, spdk_interface) g_interface_head; diff --git a/lib/net/net_rpc.c b/lib/net/net_rpc.c index 54159f8f8..3dcb12a93 100644 --- a/lib/net/net_rpc.c +++ b/lib/net/net_rpc.c @@ -31,10 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include +#include "spdk/stdinc.h" #include "spdk/rpc.h" #include "spdk/net.h" diff --git a/lib/net/sock.c b/lib/net/sock.c index 31485b9cd..d15444e1b 100644 --- a/lib/net/sock.c +++ b/lib/net/sock.c @@ -31,18 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "spdk/stdinc.h" #include "spdk/event.h" #include "spdk/log.h" diff --git a/lib/nvme/nvme_ctrlr.c b/lib/nvme/nvme_ctrlr.c index 25334bc5e..a1be13770 100644 --- a/lib/nvme/nvme_ctrlr.c +++ b/lib/nvme/nvme_ctrlr.c @@ -31,9 +31,11 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "spdk/stdinc.h" + #include "nvme_internal.h" + #include "spdk/env.h" -#include static int nvme_ctrlr_construct_and_submit_aer(struct spdk_nvme_ctrlr *ctrlr, struct nvme_async_event_request *aer); diff --git a/lib/nvme/nvme_internal.h b/lib/nvme/nvme_internal.h index 8afd104fa..ac1247c41 100644 --- a/lib/nvme/nvme_internal.h +++ b/lib/nvme/nvme_internal.h @@ -34,25 +34,14 @@ #ifndef __NVME_INTERNAL_H__ #define __NVME_INTERNAL_H__ -#include "spdk/nvme.h" +#include "spdk/stdinc.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "spdk/nvme.h" #if defined(__i386__) || defined(__x86_64__) #include #endif -#include - #include "spdk/queue.h" #include "spdk/barrier.h" #include "spdk/bit_array.h" diff --git a/lib/nvme/nvme_pcie.c b/lib/nvme/nvme_pcie.c index acc9f61f4..eede2d551 100644 --- a/lib/nvme/nvme_pcie.c +++ b/lib/nvme/nvme_pcie.c @@ -35,10 +35,7 @@ * NVMe over PCIe transport */ -#include -#include -#include -#include +#include "spdk/stdinc.h" #include "spdk/likely.h" #include "nvme_internal.h" diff --git a/lib/nvme/nvme_rdma.c b/lib/nvme/nvme_rdma.c index 1fefd5fd9..d9bb4fee5 100644 --- a/lib/nvme/nvme_rdma.c +++ b/lib/nvme/nvme_rdma.c @@ -35,17 +35,11 @@ * NVMe over RDMA transport */ -#include -#include +#include "spdk/stdinc.h" + #include #include #include -#include -#include -#include -#include -#include -#include #include "spdk/assert.h" #include "spdk/log.h" diff --git a/lib/nvme/nvme_uevent.c b/lib/nvme/nvme_uevent.c index 8eec0ed64..cd5fbed40 100644 --- a/lib/nvme/nvme_uevent.c +++ b/lib/nvme/nvme_uevent.c @@ -31,22 +31,15 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "spdk/stdinc.h" + #include "spdk/log.h" #include "spdk/event.h" + #include "nvme_uevent.h" #ifdef __linux__ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #define SPDK_UEVENT_MSG_LEN 4096 diff --git a/lib/nvmf/discovery.c b/lib/nvmf/discovery.c index 5c9c035fd..1d4493c9a 100644 --- a/lib/nvmf/discovery.c +++ b/lib/nvmf/discovery.c @@ -35,8 +35,7 @@ * NVMe over Fabrics discovery service */ -#include -#include +#include "spdk/stdinc.h" #include "nvmf_internal.h" #include "session.h" diff --git a/lib/nvmf/nvmf.c b/lib/nvmf/nvmf.c index d6326c2c6..d40790d3e 100644 --- a/lib/nvmf/nvmf.c +++ b/lib/nvmf/nvmf.c @@ -31,7 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include "spdk/stdinc.h" #include "spdk/conf.h" #include "spdk/nvmf.h" diff --git a/lib/nvmf/nvmf_internal.h b/lib/nvmf/nvmf_internal.h index 214fe4be9..3be0d470b 100644 --- a/lib/nvmf/nvmf_internal.h +++ b/lib/nvmf/nvmf_internal.h @@ -34,10 +34,7 @@ #ifndef __NVMF_INTERNAL_H__ #define __NVMF_INTERNAL_H__ -#include -#include -#include -#include +#include "spdk/stdinc.h" #include "spdk/nvmf_spec.h" #include "spdk/assert.h" diff --git a/lib/nvmf/rdma.c b/lib/nvmf/rdma.c index 1118565f2..c0073e6e3 100644 --- a/lib/nvmf/rdma.c +++ b/lib/nvmf/rdma.c @@ -31,15 +31,11 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include +#include "spdk/stdinc.h" + #include #include #include -#include -#include -#include #include "nvmf_internal.h" #include "request.h" diff --git a/lib/nvmf/request.c b/lib/nvmf/request.c index a5dd1d6c2..a1122fda3 100644 --- a/lib/nvmf/request.c +++ b/lib/nvmf/request.c @@ -31,7 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include "spdk/stdinc.h" #include "nvmf_internal.h" #include "request.h" diff --git a/lib/nvmf/session.c b/lib/nvmf/session.c index 6dd0bae0d..499241fc2 100644 --- a/lib/nvmf/session.c +++ b/lib/nvmf/session.c @@ -31,9 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include +#include "spdk/stdinc.h" #include "session.h" #include "nvmf_internal.h" diff --git a/lib/nvmf/session.h b/lib/nvmf/session.h index 9b5ff6cd4..40a2b01ca 100644 --- a/lib/nvmf/session.h +++ b/lib/nvmf/session.h @@ -34,8 +34,7 @@ #ifndef NVMF_SESSION_H #define NVMF_SESSION_H -#include -#include +#include "spdk/stdinc.h" #include "spdk/nvmf_spec.h" #include "spdk/queue.h" diff --git a/lib/nvmf/subsystem.c b/lib/nvmf/subsystem.c index 1ba515787..d157f24ea 100644 --- a/lib/nvmf/subsystem.c +++ b/lib/nvmf/subsystem.c @@ -31,8 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include +#include "spdk/stdinc.h" #include "nvmf_internal.h" #include "session.h" diff --git a/lib/nvmf/transport.c b/lib/nvmf/transport.c index bd4f56a74..1b9b0bccc 100644 --- a/lib/nvmf/transport.c +++ b/lib/nvmf/transport.c @@ -31,10 +31,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "transport.h" +#include "spdk/stdinc.h" -#include -#include +#include "transport.h" #include "spdk/log.h" #include "spdk/nvmf.h" diff --git a/lib/nvmf/transport.h b/lib/nvmf/transport.h index 6504dbf0a..2c6959e7d 100644 --- a/lib/nvmf/transport.h +++ b/lib/nvmf/transport.h @@ -34,7 +34,7 @@ #ifndef SPDK_NVMF_TRANSPORT_H #define SPDK_NVMF_TRANSPORT_H -#include +#include "spdk/stdinc.h" #include "spdk/nvmf.h" diff --git a/lib/nvmf/virtual.c b/lib/nvmf/virtual.c index c6f43b213..528875b6e 100644 --- a/lib/nvmf/virtual.c +++ b/lib/nvmf/virtual.c @@ -31,8 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include +#include "spdk/stdinc.h" #include "subsystem.h" #include "session.h" diff --git a/lib/rpc/rpc.c b/lib/rpc/rpc.c index 3738c664c..21b91a023 100644 --- a/lib/rpc/rpc.c +++ b/lib/rpc/rpc.c @@ -31,20 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "spdk/stdinc.h" #include "spdk/queue.h" #include "spdk/rpc.h" diff --git a/lib/scsi/scsi_internal.h b/lib/scsi/scsi_internal.h index faa08b235..f4e2f2c1f 100644 --- a/lib/scsi/scsi_internal.h +++ b/lib/scsi/scsi_internal.h @@ -35,19 +35,7 @@ #ifndef SPDK_SCSI_INTERNAL_H #define SPDK_SCSI_INTERNAL_H -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "spdk/stdinc.h" #include "spdk/bdev.h" #include "spdk/scsi.h" diff --git a/lib/trace/trace.c b/lib/trace/trace.c index ef782dc45..4374f658b 100644 --- a/lib/trace/trace.c +++ b/lib/trace/trace.c @@ -31,21 +31,11 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "spdk/stdinc.h" + #include "spdk/env.h" #include "spdk/trace.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - #include #include diff --git a/lib/util/bit_array.c b/lib/util/bit_array.c index 5b90aa152..7326f2716 100644 --- a/lib/util/bit_array.c +++ b/lib/util/bit_array.c @@ -31,17 +31,11 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "spdk/stdinc.h" + #include "spdk/bit_array.h" #include "spdk/env.h" -#include -#include -#include -#include -#include -#include -#include - #include "spdk/likely.h" #include "spdk/util.h" diff --git a/lib/util/fd.c b/lib/util/fd.c index fac11676b..83a196808 100644 --- a/lib/util/fd.c +++ b/lib/util/fd.c @@ -31,13 +31,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "spdk/fd.h" +#include "spdk/stdinc.h" -#include -#include -#include -#include -#include +#include "spdk/fd.h" #ifdef __linux__ #include diff --git a/lib/util/io_channel.c b/lib/util/io_channel.c index 32ceb98d5..ce6260055 100644 --- a/lib/util/io_channel.c +++ b/lib/util/io_channel.c @@ -31,11 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include -#include +#include "spdk/stdinc.h" #include "spdk/io_channel.h" #include "spdk/log.h" diff --git a/lib/util/string.c b/lib/util/string.c index bf268b730..d9aaad80c 100644 --- a/lib/util/string.c +++ b/lib/util/string.c @@ -32,12 +32,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include -#include -#include +#include "spdk/stdinc.h" #include "spdk/string.h" diff --git a/lib/vhost/task.c b/lib/vhost/task.c index 615eb9a67..638304982 100644 --- a/lib/vhost/task.c +++ b/lib/vhost/task.c @@ -31,7 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include "spdk/stdinc.h" #include #include diff --git a/lib/vhost/vhost.c b/lib/vhost/vhost.c index c31f3f8b5..a899f4667 100644 --- a/lib/vhost/vhost.c +++ b/lib/vhost/vhost.c @@ -31,16 +31,10 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "spdk/stdinc.h" + #include #include -#include -#include -#include -#include -#include -#include -#include -#include #include #include diff --git a/lib/vhost/vhost_iommu.c b/lib/vhost/vhost_iommu.c index 977139ba4..bdf80bac5 100644 --- a/lib/vhost/vhost_iommu.c +++ b/lib/vhost/vhost_iommu.c @@ -31,20 +31,15 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include -#include -#include -#include +#include "spdk/stdinc.h" -#include #include -#include -#include +#include "spdk/env.h" +#include "spdk/util.h" + #include "spdk_internal/log.h" + #include "vhost_iommu.h" static struct { diff --git a/lib/vhost/vhost_iommu.h b/lib/vhost/vhost_iommu.h index 9739c6925..713c072b3 100644 --- a/lib/vhost/vhost_iommu.h +++ b/lib/vhost/vhost_iommu.h @@ -34,7 +34,7 @@ #ifndef SPDK_VHOST_IOMMU_H #define SPDK_VHOST_IOMMU_H -#include +#include "spdk/stdinc.h" /** * Register given memory block in currently used IOMMU. If no IOMMU is used this diff --git a/lib/vhost/vhost_rpc.c b/lib/vhost/vhost_rpc.c index fabe0ffce..6b20bb5d6 100644 --- a/lib/vhost/vhost_rpc.c +++ b/lib/vhost/vhost_rpc.c @@ -31,7 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include "spdk/stdinc.h" #include "spdk_internal/log.h" #include "spdk/rpc.h" diff --git a/test/lib/bdev/bdevio/bdevio.c b/test/lib/bdev/bdevio/bdevio.c index c28b2d6ab..c86f4e4f3 100644 --- a/test/lib/bdev/bdevio/bdevio.c +++ b/test/lib/bdev/bdevio/bdevio.c @@ -32,10 +32,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include +#include "spdk/stdinc.h" #include "spdk/bdev.h" #include "spdk/copy_engine.h" diff --git a/test/lib/bdev/bdevperf/bdevperf.c b/test/lib/bdev/bdevperf/bdevperf.c index 2b6163fed..cf133f8f6 100644 --- a/test/lib/bdev/bdevperf/bdevperf.c +++ b/test/lib/bdev/bdevperf/bdevperf.c @@ -32,11 +32,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include -#include +#include "spdk/stdinc.h" #include #include diff --git a/test/lib/blob/blob_ut/blob_ut.c b/test/lib/blob/blob_ut/blob_ut.c index 450bfe794..359641e00 100644 --- a/test/lib/blob/blob_ut/blob_ut.c +++ b/test/lib/blob/blob_ut/blob_ut.c @@ -31,10 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include +#include "spdk/stdinc.h" #include "spdk_cunit.h" #include "spdk/blob.h" diff --git a/test/lib/blobfs/blobfs_ut/blobfs_ut.c b/test/lib/blobfs/blobfs_ut/blobfs_ut.c index 9d337c389..03e07c1b0 100644 --- a/test/lib/blobfs/blobfs_ut/blobfs_ut.c +++ b/test/lib/blobfs/blobfs_ut/blobfs_ut.c @@ -31,10 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include +#include "spdk/stdinc.h" #include "CUnit/Basic.h" diff --git a/test/lib/blobfs/cache_ut/cache_ut.c b/test/lib/blobfs/cache_ut/cache_ut.c index 277139fd9..6008fd026 100644 --- a/test/lib/blobfs/cache_ut/cache_ut.c +++ b/test/lib/blobfs/cache_ut/cache_ut.c @@ -31,13 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include -#include -#include -#include +#include "spdk/stdinc.h" #include "spdk/blobfs.h" #include "spdk/env.h" diff --git a/test/lib/blobfs/fuse/fuse.c b/test/lib/blobfs/fuse/fuse.c index a7d16ca70..ffadef5c4 100644 --- a/test/lib/blobfs/fuse/fuse.c +++ b/test/lib/blobfs/fuse/fuse.c @@ -30,20 +30,13 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#define FUSE_USE_VERSION 30 +#include "spdk/stdinc.h" + +#define FUSE_USE_VERSION 30 #include "fuse3/fuse.h" #include "fuse3/fuse_lowlevel.h" -#include -#include -#include -#include -#include -#include -#include -#include - #include "spdk/blobfs.h" #include "spdk/bdev.h" #include "spdk/event.h" diff --git a/test/lib/blobfs/mkfs/mkfs.c b/test/lib/blobfs/mkfs/mkfs.c index 13e15dd74..6b3d59ed0 100644 --- a/test/lib/blobfs/mkfs/mkfs.c +++ b/test/lib/blobfs/mkfs/mkfs.c @@ -30,14 +30,8 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include -#include -#include -#include -#include + +#include "spdk/stdinc.h" #include "spdk/blobfs.h" #include "spdk/bdev.h" diff --git a/test/lib/env/pci/pci_ut.c b/test/lib/env/pci/pci_ut.c index d8c8d7446..48a98c462 100644 --- a/test/lib/env/pci/pci_ut.c +++ b/test/lib/env/pci/pci_ut.c @@ -31,10 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include +#include "spdk/stdinc.h" #include "spdk/env.h" diff --git a/test/lib/env/vtophys/vtophys.c b/test/lib/env/vtophys/vtophys.c index d306d836f..0656317b9 100644 --- a/test/lib/env/vtophys/vtophys.c +++ b/test/lib/env/vtophys/vtophys.c @@ -31,10 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include +#include "spdk/stdinc.h" #include "spdk/env.h" diff --git a/test/lib/event/event_perf/event_perf.c b/test/lib/event/event_perf/event_perf.c index fa0f4e49a..7608977da 100644 --- a/test/lib/event/event_perf/event_perf.c +++ b/test/lib/event/event_perf/event_perf.c @@ -31,11 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include -#include +#include "spdk/stdinc.h" #include #include diff --git a/test/lib/event/reactor/reactor.c b/test/lib/event/reactor/reactor.c index 4fbc68ca2..3a262ccb0 100644 --- a/test/lib/event/reactor/reactor.c +++ b/test/lib/event/reactor/reactor.c @@ -31,10 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include +#include "spdk/stdinc.h" #include "spdk/event.h" diff --git a/test/lib/event/reactor_perf/reactor_perf.c b/test/lib/event/reactor_perf/reactor_perf.c index a871081cf..5b287a3ac 100644 --- a/test/lib/event/reactor_perf/reactor_perf.c +++ b/test/lib/event/reactor_perf/reactor_perf.c @@ -31,10 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include +#include "spdk/stdinc.h" #include "spdk/env.h" #include "spdk/event.h" diff --git a/test/lib/event/subsystem/subsystem_ut.c b/test/lib/event/subsystem/subsystem_ut.c index 105ae6be4..ebdc32d31 100644 --- a/test/lib/event/subsystem/subsystem_ut.c +++ b/test/lib/event/subsystem/subsystem_ut.c @@ -31,8 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include +#include "spdk/stdinc.h" #include diff --git a/test/lib/ioat/unit/ioat_ut.c b/test/lib/ioat/unit/ioat_ut.c index e721f5c9e..601912220 100644 --- a/test/lib/ioat/unit/ioat_ut.c +++ b/test/lib/ioat/unit/ioat_ut.c @@ -31,11 +31,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "CUnit/Basic.h" +#include "spdk/stdinc.h" -#include -#include -#include +#include "CUnit/Basic.h" #include "ioat/ioat.c" diff --git a/test/lib/iscsi/param/param_ut.c b/test/lib/iscsi/param/param_ut.c index fa8cc263e..189384b66 100644 --- a/test/lib/iscsi/param/param_ut.c +++ b/test/lib/iscsi/param/param_ut.c @@ -31,9 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include +#include "spdk/stdinc.h" #include "spdk/scsi.h" diff --git a/test/lib/iscsi/pdu/pdu.c b/test/lib/iscsi/pdu/pdu.c index d6720244f..529567105 100644 --- a/test/lib/iscsi/pdu/pdu.c +++ b/test/lib/iscsi/pdu/pdu.c @@ -31,11 +31,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include +#include "spdk/stdinc.h" -#include +#include "spdk/endian.h" #include "spdk/scsi.h" #include "CUnit/Basic.h" diff --git a/test/lib/iscsi/target_node/target_node_ut.c b/test/lib/iscsi/target_node/target_node_ut.c index 34b419ce7..50e41fd7f 100644 --- a/test/lib/iscsi/target_node/target_node_ut.c +++ b/test/lib/iscsi/target_node/target_node_ut.c @@ -31,9 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include +#include "spdk/stdinc.h" #include "spdk/scsi.h" diff --git a/test/lib/json/jsoncat/jsoncat.c b/test/lib/json/jsoncat/jsoncat.c index 2336e54f0..9984e32b4 100644 --- a/test/lib/json/jsoncat/jsoncat.c +++ b/test/lib/json/jsoncat/jsoncat.c @@ -33,9 +33,7 @@ /* Simple JSON "cat" utility */ -#include -#include -#include +#include "spdk/stdinc.h" #include "spdk/json.h" diff --git a/test/lib/json/parse/json_parse_ut.c b/test/lib/json/parse/json_parse_ut.c index d13143d84..a50db1664 100644 --- a/test/lib/json/parse/json_parse_ut.c +++ b/test/lib/json/parse/json_parse_ut.c @@ -31,13 +31,12 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "spdk/stdinc.h" + #include "spdk_cunit.h" #include "json_parse.c" -#include -#include - static uint8_t g_buf[1000]; static void *g_end; static struct spdk_json_val g_vals[100]; diff --git a/test/lib/json/util/json_util_ut.c b/test/lib/json/util/json_util_ut.c index 054e8347d..b9c1ba879 100644 --- a/test/lib/json/util/json_util_ut.c +++ b/test/lib/json/util/json_util_ut.c @@ -31,13 +31,12 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "spdk/stdinc.h" + #include "spdk_cunit.h" #include "json_util.c" -#include -#include - #define NUM_SETUP(x) \ snprintf(buf, sizeof(buf), "%s", x); \ v.type = SPDK_JSON_VAL_NUMBER; \ diff --git a/test/lib/json/write/json_write_ut.c b/test/lib/json/write/json_write_ut.c index 6afca1438..a00ff1456 100644 --- a/test/lib/json/write/json_write_ut.c +++ b/test/lib/json/write/json_write_ut.c @@ -31,13 +31,12 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "spdk/stdinc.h" + #include "spdk_cunit.h" #include "json_write.c" -#include -#include - #include "spdk/util.h" static uint8_t g_buf[1000]; diff --git a/test/lib/jsonrpc/server/jsonrpc_server_ut.c b/test/lib/jsonrpc/server/jsonrpc_server_ut.c index 937db1bd4..c1b1d2040 100644 --- a/test/lib/jsonrpc/server/jsonrpc_server_ut.c +++ b/test/lib/jsonrpc/server/jsonrpc_server_ut.c @@ -31,14 +31,12 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "spdk/stdinc.h" + #include "spdk_cunit.h" #include "jsonrpc_server.c" -#include -#include -#include - #define MAX_PARAMS 100 #define MAX_REQS 100 diff --git a/test/lib/log/log_ut.c b/test/lib/log/log_ut.c index 7ea0056cd..8c8f42938 100644 --- a/test/lib/log/log_ut.c +++ b/test/lib/log/log_ut.c @@ -31,10 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include +#include "spdk/stdinc.h" #include "spdk_cunit.h" #include "spdk/log.h" diff --git a/test/lib/nvme/aer/aer.c b/test/lib/nvme/aer/aer.c index 137b59fa0..a2005f5c9 100644 --- a/test/lib/nvme/aer/aer.c +++ b/test/lib/nvme/aer/aer.c @@ -31,12 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include -#include -#include +#include "spdk/stdinc.h" #include "spdk/log.h" #include "spdk/nvme.h" diff --git a/test/lib/nvme/e2edp/nvme_dp.c b/test/lib/nvme/e2edp/nvme_dp.c index 929418940..07137afbe 100644 --- a/test/lib/nvme/e2edp/nvme_dp.c +++ b/test/lib/nvme/e2edp/nvme_dp.c @@ -35,11 +35,7 @@ * NVMe end-to-end data protection test */ -#include -#include -#include -#include -#include +#include "spdk/stdinc.h" #include "spdk/nvme.h" #include "spdk/env.h" diff --git a/test/lib/nvme/overhead/overhead.c b/test/lib/nvme/overhead/overhead.c index 2f2b6303a..3dd20e658 100644 --- a/test/lib/nvme/overhead/overhead.c +++ b/test/lib/nvme/overhead/overhead.c @@ -31,13 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include -#include -#include -#include +#include "spdk/stdinc.h" #include "spdk/barrier.h" #include "spdk/fd.h" @@ -48,8 +42,6 @@ #if HAVE_LIBAIO #include -#include -#include #endif struct ctrlr_entry { diff --git a/test/lib/nvme/reset/reset.c b/test/lib/nvme/reset/reset.c index 8edf119dc..c2cdc979c 100644 --- a/test/lib/nvme/reset/reset.c +++ b/test/lib/nvme/reset/reset.c @@ -31,10 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include +#include "spdk/stdinc.h" #include #include diff --git a/test/lib/nvme/sgl/sgl.c b/test/lib/nvme/sgl/sgl.c index 4f0481b9e..c58180b50 100644 --- a/test/lib/nvme/sgl/sgl.c +++ b/test/lib/nvme/sgl/sgl.c @@ -31,11 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include -#include +#include "spdk/stdinc.h" #include "spdk/nvme.h" #include "spdk/env.h" diff --git a/test/lib/nvme/unit/nvme_ctrlr_c/nvme_ctrlr_ut.c b/test/lib/nvme/unit/nvme_ctrlr_c/nvme_ctrlr_ut.c index c2dcc9d08..2c53c3f87 100644 --- a/test/lib/nvme/unit/nvme_ctrlr_c/nvme_ctrlr_ut.c +++ b/test/lib/nvme/unit/nvme_ctrlr_c/nvme_ctrlr_ut.c @@ -31,12 +31,12 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "spdk/stdinc.h" + #include "spdk_cunit.h" #include "spdk_internal/log.h" -#include - #include "lib/test_env.c" struct spdk_trace_flag SPDK_TRACE_NVME = { diff --git a/test/lib/nvme/unit/nvme_pcie_c/nvme_pcie_ut.c b/test/lib/nvme/unit/nvme_pcie_c/nvme_pcie_ut.c index fc242d542..c4f2f9c89 100644 --- a/test/lib/nvme/unit/nvme_pcie_c/nvme_pcie_ut.c +++ b/test/lib/nvme/unit/nvme_pcie_c/nvme_pcie_ut.c @@ -31,8 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include +#include "spdk/stdinc.h" #include "spdk_cunit.h" diff --git a/test/lib/nvme/unit/nvme_qpair_c/nvme_qpair_ut.c b/test/lib/nvme/unit/nvme_qpair_c/nvme_qpair_ut.c index 5ffa1586d..53508ad9b 100644 --- a/test/lib/nvme/unit/nvme_qpair_c/nvme_qpair_ut.c +++ b/test/lib/nvme/unit/nvme_qpair_c/nvme_qpair_ut.c @@ -31,7 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include "spdk/stdinc.h" #include "spdk_cunit.h" diff --git a/test/lib/nvmf/direct/direct_ut.c b/test/lib/nvmf/direct/direct_ut.c index 374fd3139..b43b85a4f 100644 --- a/test/lib/nvmf/direct/direct_ut.c +++ b/test/lib/nvmf/direct/direct_ut.c @@ -31,10 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include +#include "spdk/stdinc.h" #include "spdk_cunit.h" diff --git a/test/lib/nvmf/discovery/discovery_ut.c b/test/lib/nvmf/discovery/discovery_ut.c index 1efba517b..a83d85168 100644 --- a/test/lib/nvmf/discovery/discovery_ut.c +++ b/test/lib/nvmf/discovery/discovery_ut.c @@ -31,10 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include +#include "spdk/stdinc.h" #include "spdk_cunit.h" diff --git a/test/lib/nvmf/request/request_ut.c b/test/lib/nvmf/request/request_ut.c index 9bddeaae6..6de838aa0 100644 --- a/test/lib/nvmf/request/request_ut.c +++ b/test/lib/nvmf/request/request_ut.c @@ -31,10 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include +#include "spdk/stdinc.h" #include "spdk_cunit.h" diff --git a/test/lib/nvmf/session/session_ut.c b/test/lib/nvmf/session/session_ut.c index 875c6f5b2..d330d70f9 100644 --- a/test/lib/nvmf/session/session_ut.c +++ b/test/lib/nvmf/session/session_ut.c @@ -31,10 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include +#include "spdk/stdinc.h" #include "spdk_cunit.h" diff --git a/test/lib/nvmf/subsystem/subsystem_ut.c b/test/lib/nvmf/subsystem/subsystem_ut.c index 223515425..605c7c14c 100644 --- a/test/lib/nvmf/subsystem/subsystem_ut.c +++ b/test/lib/nvmf/subsystem/subsystem_ut.c @@ -31,10 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include +#include "spdk/stdinc.h" #include "spdk_cunit.h" #include "subsystem.h" diff --git a/test/lib/nvmf/virtual/virtual_ut.c b/test/lib/nvmf/virtual/virtual_ut.c index 5ac534b54..4aba78587 100644 --- a/test/lib/nvmf/virtual/virtual_ut.c +++ b/test/lib/nvmf/virtual/virtual_ut.c @@ -31,10 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include +#include "spdk/stdinc.h" #include "spdk_cunit.h" diff --git a/test/lib/scsi/dev/dev_ut.c b/test/lib/scsi/dev/dev_ut.c index 96a0c9cb6..e571b37e3 100644 --- a/test/lib/scsi/dev/dev_ut.c +++ b/test/lib/scsi/dev/dev_ut.c @@ -31,9 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include +#include "spdk/stdinc.h" #include "CUnit/Basic.h" #include "spdk_cunit.h" diff --git a/test/lib/scsi/init/init_ut.c b/test/lib/scsi/init/init_ut.c index ef8dc6e14..3c89cb527 100644 --- a/test/lib/scsi/init/init_ut.c +++ b/test/lib/scsi/init/init_ut.c @@ -31,10 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include +#include "spdk/stdinc.h" #include "spdk/event.h" #include "spdk/scsi.h" diff --git a/test/lib/scsi/lun/lun_ut.c b/test/lib/scsi/lun/lun_ut.c index b4780d78e..99205a617 100644 --- a/test/lib/scsi/lun/lun_ut.c +++ b/test/lib/scsi/lun/lun_ut.c @@ -31,10 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include +#include "spdk/stdinc.h" #include "spdk_cunit.h" diff --git a/test/lib/scsi/scsi_bdev/scsi_bdev_ut.c b/test/lib/scsi/scsi_bdev/scsi_bdev_ut.c index b8fde492d..879af87ae 100644 --- a/test/lib/scsi/scsi_bdev/scsi_bdev_ut.c +++ b/test/lib/scsi/scsi_bdev/scsi_bdev_ut.c @@ -31,9 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include +#include "spdk/stdinc.h" #include "task.c" #include "scsi_bdev.c" diff --git a/test/lib/test_env.c b/test/lib/test_env.c index 02358a094..379b15115 100644 --- a/test/lib/test_env.c +++ b/test/lib/test_env.c @@ -31,10 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include +#include "spdk/stdinc.h" #include "spdk/env.h" diff --git a/test/lib/util/bit_array/bit_array_ut.c b/test/lib/util/bit_array/bit_array_ut.c index b89cf2626..e7084a3d2 100644 --- a/test/lib/util/bit_array/bit_array_ut.c +++ b/test/lib/util/bit_array/bit_array_ut.c @@ -31,7 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include "spdk/stdinc.h" #include "spdk_cunit.h" diff --git a/test/lib/util/io_channel/io_channel_ut.c b/test/lib/util/io_channel/io_channel_ut.c index 739e26be1..7b3175ea0 100644 --- a/test/lib/util/io_channel/io_channel_ut.c +++ b/test/lib/util/io_channel/io_channel_ut.c @@ -31,9 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include +#include "spdk/stdinc.h" #include "spdk_cunit.h" diff --git a/test/lib/util/string/string_ut.c b/test/lib/util/string/string_ut.c index 6a07a2f66..d0baec870 100644 --- a/test/lib/util/string/string_ut.c +++ b/test/lib/util/string/string_ut.c @@ -31,7 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include "spdk/stdinc.h" #include "spdk_cunit.h" diff --git a/test/spdk_cunit.h b/test/spdk_cunit.h index 919d00e77..c40c18e59 100644 --- a/test/spdk_cunit.h +++ b/test/spdk_cunit.h @@ -34,7 +34,8 @@ #ifndef SPDK_CUNIT_H #define SPDK_CUNIT_H -#include +#include "spdk/stdinc.h" + #include /*