diff --git a/include/spdk_internal/log.h b/include/spdk_internal/log.h deleted file mode 100644 index e77d94a6c..000000000 --- a/include/spdk_internal/log.h +++ /dev/null @@ -1,44 +0,0 @@ -/*- - * BSD LICENSE - * - * Copyright (c) Intel Corporation. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** - * \file - * Logging interfaces - */ - -#ifndef SPDK_INTERNAL_LOG_H -#define SPDK_INTERNAL_LOG_H - -#include "spdk/log.h" - -#endif /* SPDK_INTERNAL_LOG_H */ diff --git a/include/spdk_internal/virtio.h b/include/spdk_internal/virtio.h index c30013efe..3d3e93372 100644 --- a/include/spdk_internal/virtio.h +++ b/include/spdk_internal/virtio.h @@ -40,7 +40,7 @@ #include #include -#include "spdk_internal/log.h" +#include "spdk/log.h" #include "spdk/likely.h" #include "spdk/queue.h" #include "spdk/json.h" diff --git a/lib/bdev/bdev.c b/lib/bdev/bdev.c index 742a4c95a..ba218d770 100644 --- a/lib/bdev/bdev.c +++ b/lib/bdev/bdev.c @@ -48,7 +48,7 @@ #include "spdk/trace.h" #include "spdk/bdev_module.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #include "spdk/string.h" #include "bdev_internal.h" diff --git a/lib/bdev/bdev_rpc.c b/lib/bdev/bdev_rpc.c index a628b3132..1e799a598 100644 --- a/lib/bdev/bdev_rpc.c +++ b/lib/bdev/bdev_rpc.c @@ -40,7 +40,7 @@ #include "spdk/base64.h" #include "spdk/bdev_module.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" struct spdk_rpc_set_bdev_opts { uint32_t bdev_io_pool_size; diff --git a/lib/blob/blobstore.c b/lib/blob/blobstore.c index d759a02d1..0afd4919d 100644 --- a/lib/blob/blobstore.c +++ b/lib/blob/blobstore.c @@ -45,7 +45,7 @@ #include "spdk/string.h" #include "spdk_internal/assert.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #include "blobstore.h" diff --git a/lib/blob/request.c b/lib/blob/request.c index d721369b9..6174f1f0e 100644 --- a/lib/blob/request.c +++ b/lib/blob/request.c @@ -39,7 +39,7 @@ #include "spdk/thread.h" #include "spdk/queue.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" void bs_call_cpl(struct spdk_bs_cpl *cpl, int bserrno) diff --git a/lib/blobfs/blobfs.c b/lib/blobfs/blobfs.c index 629a03835..f739d03b8 100644 --- a/lib/blobfs/blobfs.c +++ b/lib/blobfs/blobfs.c @@ -42,7 +42,7 @@ #include "spdk/assert.h" #include "spdk/env.h" #include "spdk/util.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #include "spdk/trace.h" #define BLOBFS_TRACE(file, str, args...) \ diff --git a/lib/blobfs/tree.c b/lib/blobfs/tree.c index be9417386..acdc09a27 100644 --- a/lib/blobfs/tree.c +++ b/lib/blobfs/tree.c @@ -39,7 +39,7 @@ #include "spdk/queue.h" #include "spdk/assert.h" #include "spdk/env.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" uint32_t g_fs_cache_buffer_shift = CACHE_BUFFER_SHIFT_DEFAULT; diff --git a/lib/env_ocf/ocf_env.c b/lib/env_ocf/ocf_env.c index ab5445203..409da734d 100644 --- a/lib/env_ocf/ocf_env.c +++ b/lib/env_ocf/ocf_env.c @@ -35,7 +35,7 @@ #include "spdk/crc32.h" #include "spdk/env.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" /* Number of buffers for mempool * Need to be power of two - 1 for better memory utilization diff --git a/lib/env_ocf/ocf_env.h b/lib/env_ocf/ocf_env.h index 0ede4cdfb..4484954de 100644 --- a/lib/env_ocf/ocf_env.h +++ b/lib/env_ocf/ocf_env.h @@ -49,7 +49,7 @@ #include "spdk/likely.h" #include "spdk/env.h" #include "spdk/util.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #include "ocf_env_list.h" #include "ocf/ocf_err.h" diff --git a/lib/event/app_rpc.c b/lib/event/app_rpc.c index 90cd14065..214d42285 100644 --- a/lib/event/app_rpc.c +++ b/lib/event/app_rpc.c @@ -40,7 +40,7 @@ #include "spdk/env.h" #include "spdk/thread.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #include "spdk_internal/event.h" #include "spdk_internal/thread.h" diff --git a/lib/event/json_config.c b/lib/event/json_config.c index 6cb059387..c5e1a43fe 100644 --- a/lib/event/json_config.c +++ b/lib/event/json_config.c @@ -42,7 +42,6 @@ #include "spdk/rpc.h" #include "spdk_internal/event.h" -#include "spdk_internal/log.h" #define SPDK_DEBUG_APP_CFG(...) SPDK_DEBUGLOG(app_config, __VA_ARGS__) diff --git a/lib/event/log_rpc.c b/lib/event/log_rpc.c index ca42d0563..9823d64a9 100644 --- a/lib/event/log_rpc.c +++ b/lib/event/log_rpc.c @@ -34,7 +34,7 @@ #include "spdk/rpc.h" #include "spdk/util.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" struct rpc_log_flag { char *flag; diff --git a/lib/event/reactor.c b/lib/event/reactor.c index 70ae439b2..a71caa898 100644 --- a/lib/event/reactor.c +++ b/lib/event/reactor.c @@ -35,7 +35,6 @@ #include "spdk/likely.h" #include "spdk_internal/event.h" -#include "spdk_internal/log.h" #include "spdk_internal/thread.h" #include "spdk/log.h" diff --git a/lib/ftl/ftl_core.c b/lib/ftl/ftl_core.c index 109a99288..c2d7ff3a9 100644 --- a/lib/ftl/ftl_core.c +++ b/lib/ftl/ftl_core.c @@ -37,7 +37,7 @@ #include "spdk/thread.h" #include "spdk/bdev_module.h" #include "spdk/string.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #include "spdk/ftl.h" #include "spdk/crc32.h" diff --git a/lib/ftl/ftl_core.h b/lib/ftl/ftl_core.h index b782ba731..2a45f132e 100644 --- a/lib/ftl/ftl_core.h +++ b/lib/ftl/ftl_core.h @@ -38,7 +38,7 @@ #include "spdk/uuid.h" #include "spdk/thread.h" #include "spdk/util.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #include "spdk/likely.h" #include "spdk/queue.h" #include "spdk/ftl.h" diff --git a/lib/ftl/ftl_debug.c b/lib/ftl/ftl_debug.c index 9fbb43810..4ef4fec02 100644 --- a/lib/ftl/ftl_debug.c +++ b/lib/ftl/ftl_debug.c @@ -31,7 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "spdk_internal/log.h" +#include "spdk/log.h" #include "spdk/ftl.h" #include "ftl_debug.h" #include "ftl_band.h" diff --git a/lib/ftl/ftl_init.c b/lib/ftl/ftl_init.c index 4ff882c51..a81cef316 100644 --- a/lib/ftl/ftl_init.c +++ b/lib/ftl/ftl_init.c @@ -36,7 +36,7 @@ #include "spdk/thread.h" #include "spdk/string.h" #include "spdk/likely.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #include "spdk/ftl.h" #include "spdk/likely.h" #include "spdk/string.h" diff --git a/lib/ftl/ftl_reloc.c b/lib/ftl/ftl_reloc.c index 66b7bd64d..07b42319a 100644 --- a/lib/ftl/ftl_reloc.c +++ b/lib/ftl/ftl_reloc.c @@ -32,7 +32,7 @@ */ #include "spdk/likely.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #include "spdk/ftl.h" #include "ftl_reloc.h" diff --git a/lib/idxd/idxd.c b/lib/idxd/idxd.c index 4df434dc9..0efbbb9ca 100644 --- a/lib/idxd/idxd.c +++ b/lib/idxd/idxd.c @@ -38,7 +38,7 @@ #include "spdk/util.h" #include "spdk/memory.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #include "spdk_internal/idxd.h" #include "idxd.h" diff --git a/lib/ioat/ioat.c b/lib/ioat/ioat.c index 74662a2fc..3d3361ec4 100644 --- a/lib/ioat/ioat.c +++ b/lib/ioat/ioat.c @@ -39,7 +39,7 @@ #include "spdk/util.h" #include "spdk/memory.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" struct ioat_driver { pthread_mutex_t lock; diff --git a/lib/iscsi/conn.c b/lib/iscsi/conn.c index d81be6902..2dd90459d 100644 --- a/lib/iscsi/conn.c +++ b/lib/iscsi/conn.c @@ -44,7 +44,7 @@ #include "spdk/sock.h" #include "spdk/string.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #include "iscsi/task.h" #include "iscsi/conn.h" diff --git a/lib/iscsi/init_grp.c b/lib/iscsi/init_grp.c index 7c3a4eaaf..542544ca6 100644 --- a/lib/iscsi/init_grp.c +++ b/lib/iscsi/init_grp.c @@ -37,7 +37,7 @@ #include "spdk/conf.h" #include "spdk/string.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #include "iscsi/iscsi.h" #include "iscsi/init_grp.h" diff --git a/lib/iscsi/iscsi.c b/lib/iscsi/iscsi.c index e8961bfe2..da5a7e046 100644 --- a/lib/iscsi/iscsi.c +++ b/lib/iscsi/iscsi.c @@ -55,7 +55,7 @@ #include "spdk/bdev.h" #include "iscsi/portal_grp.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #define MAX_TMPBUF 1024 diff --git a/lib/iscsi/iscsi_rpc.c b/lib/iscsi/iscsi_rpc.c index 598ef28f0..e413c70cb 100644 --- a/lib/iscsi/iscsi_rpc.c +++ b/lib/iscsi/iscsi_rpc.c @@ -41,7 +41,7 @@ #include "spdk/rpc.h" #include "spdk/util.h" #include "spdk/string.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" static void rpc_iscsi_get_initiator_groups(struct spdk_jsonrpc_request *request, diff --git a/lib/iscsi/iscsi_subsystem.c b/lib/iscsi/iscsi_subsystem.c index a3d83ef7b..c0e7d37c8 100644 --- a/lib/iscsi/iscsi_subsystem.c +++ b/lib/iscsi/iscsi_subsystem.c @@ -45,7 +45,7 @@ #include "iscsi/task.h" #include "iscsi/tgt_node.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" struct spdk_iscsi_opts *g_spdk_iscsi_opts = NULL; diff --git a/lib/iscsi/param.c b/lib/iscsi/param.c index ec4e2c330..1a353c4e5 100644 --- a/lib/iscsi/param.c +++ b/lib/iscsi/param.c @@ -40,7 +40,7 @@ #include "iscsi/conn.h" #include "spdk/string.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #define MAX_TMPBUF 1024 diff --git a/lib/iscsi/portal_grp.c b/lib/iscsi/portal_grp.c index a1f7f3b3a..a8f54a22c 100644 --- a/lib/iscsi/portal_grp.c +++ b/lib/iscsi/portal_grp.c @@ -38,7 +38,7 @@ #include "spdk/sock.h" #include "spdk/string.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #include "iscsi/iscsi.h" #include "iscsi/conn.h" diff --git a/lib/iscsi/tgt_node.c b/lib/iscsi/tgt_node.c index ba2e91373..9e44b97ec 100644 --- a/lib/iscsi/tgt_node.c +++ b/lib/iscsi/tgt_node.c @@ -38,7 +38,7 @@ #include "spdk/sock.h" #include "spdk/scsi.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #include "iscsi/iscsi.h" #include "iscsi/conn.h" diff --git a/lib/json/json_util.c b/lib/json/json_util.c index 8107d05ae..500952f35 100644 --- a/lib/json/json_util.c +++ b/lib/json/json_util.c @@ -34,7 +34,7 @@ #include "spdk/json.h" #include "spdk_internal/utf.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #define SPDK_JSON_DEBUG(...) SPDK_DEBUGLOG(json_util, __VA_ARGS__) diff --git a/lib/jsonrpc/jsonrpc_internal.h b/lib/jsonrpc/jsonrpc_internal.h index f51bedf62..4e5852e2e 100644 --- a/lib/jsonrpc/jsonrpc_internal.h +++ b/lib/jsonrpc/jsonrpc_internal.h @@ -38,7 +38,7 @@ #include "spdk/jsonrpc.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #define SPDK_JSONRPC_RECV_BUF_SIZE (32 * 1024) #define SPDK_JSONRPC_SEND_BUF_SIZE_INIT (32 * 1024) diff --git a/lib/log/log.c b/lib/log/log.c index b7f0e453d..c1cbbb46e 100644 --- a/lib/log/log.c +++ b/lib/log/log.c @@ -33,7 +33,7 @@ #include "spdk/stdinc.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" static const char *const spdk_level_names[] = { [SPDK_LOG_ERROR] = "ERROR", diff --git a/lib/log/log_flags.c b/lib/log/log_flags.c index d6721a6b0..9daffafc6 100644 --- a/lib/log/log_flags.c +++ b/lib/log/log_flags.c @@ -33,7 +33,7 @@ #include "spdk/stdinc.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" static TAILQ_HEAD(, spdk_log_flag) g_log_flags = TAILQ_HEAD_INITIALIZER(g_log_flags); diff --git a/lib/lvol/lvol.c b/lib/lvol/lvol.c index 4b7a6a57b..daef811b3 100644 --- a/lib/lvol/lvol.c +++ b/lib/lvol/lvol.c @@ -32,7 +32,7 @@ */ #include "spdk_internal/lvolstore.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #include "spdk/string.h" #include "spdk/thread.h" #include "spdk/blob_bdev.h" diff --git a/lib/nbd/nbd.c b/lib/nbd/nbd.c index 68c1ccb68..74538d187 100644 --- a/lib/nbd/nbd.c +++ b/lib/nbd/nbd.c @@ -45,7 +45,6 @@ #include "spdk/util.h" #include "spdk/thread.h" -#include "spdk_internal/log.h" #include "spdk/queue.h" #define GET_IO_LOOP_COUNT 16 diff --git a/lib/nbd/nbd_rpc.c b/lib/nbd/nbd_rpc.c index 7fa8f4ccb..2e65811e9 100644 --- a/lib/nbd/nbd_rpc.c +++ b/lib/nbd/nbd_rpc.c @@ -39,7 +39,7 @@ #include #include "nbd_internal.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" struct rpc_nbd_start_disk { char *bdev_name; diff --git a/lib/net/net_rpc.c b/lib/net/net_rpc.c index 0f717db6f..d557cb48d 100644 --- a/lib/net/net_rpc.c +++ b/lib/net/net_rpc.c @@ -39,7 +39,7 @@ #include "spdk/net.h" #include "spdk/util.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" struct rpc_ip_address { int32_t ifc_index; diff --git a/lib/notify/notify_rpc.c b/lib/notify/notify_rpc.c index f9c58745b..ac538ee1a 100644 --- a/lib/notify/notify_rpc.c +++ b/lib/notify/notify_rpc.c @@ -38,7 +38,7 @@ #include "spdk/env.h" #include "spdk/util.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" static int notify_get_types_cb(const struct spdk_notify_type *type, void *ctx) diff --git a/lib/nvme/nvme_internal.h b/lib/nvme/nvme_internal.h index 9fe27bd77..8a946e367 100644 --- a/lib/nvme/nvme_internal.h +++ b/lib/nvme/nvme_internal.h @@ -56,7 +56,7 @@ #include "spdk/uuid.h" #include "spdk_internal/assert.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" extern pid_t g_spdk_nvme_pid; diff --git a/lib/nvme/nvme_opal.c b/lib/nvme/nvme_opal.c index dbe21ac1d..17de90e4a 100644 --- a/lib/nvme/nvme_opal.c +++ b/lib/nvme/nvme_opal.c @@ -31,7 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "spdk/opal.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #include "spdk/util.h" #include "nvme_opal_internal.h" diff --git a/lib/nvmf/ctrlr.c b/lib/nvmf/ctrlr.c index ae91a5d75..25c05063a 100644 --- a/lib/nvmf/ctrlr.c +++ b/lib/nvmf/ctrlr.c @@ -46,7 +46,7 @@ #include "spdk/util.h" #include "spdk/version.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #define MIN_KEEP_ALIVE_TIMEOUT_IN_MS 10000 #define NVMF_DISC_KATO_IN_MS 120000 diff --git a/lib/nvmf/ctrlr_bdev.c b/lib/nvmf/ctrlr_bdev.c index 666a86be7..a631b8003 100644 --- a/lib/nvmf/ctrlr_bdev.c +++ b/lib/nvmf/ctrlr_bdev.c @@ -47,7 +47,7 @@ #include "spdk/string.h" #include "spdk/util.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" static bool nvmf_subsystem_bdev_io_type_supported(struct spdk_nvmf_subsystem *subsystem, diff --git a/lib/nvmf/ctrlr_discovery.c b/lib/nvmf/ctrlr_discovery.c index 57c07ccb5..bb978941d 100644 --- a/lib/nvmf/ctrlr_discovery.c +++ b/lib/nvmf/ctrlr_discovery.c @@ -45,7 +45,7 @@ #include "spdk/nvmf_spec.h" #include "spdk/bdev_module.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" static struct spdk_nvmf_discovery_log_page * nvmf_generate_discovery_log(struct spdk_nvmf_tgt *tgt, const char *hostnqn, size_t *log_page_size) diff --git a/lib/nvmf/fc.c b/lib/nvmf/fc.c index c1c2bf05a..0177dd660 100644 --- a/lib/nvmf/fc.c +++ b/lib/nvmf/fc.c @@ -46,8 +46,6 @@ #include "spdk/log.h" #include "spdk/thread.h" -#include "spdk_internal/log.h" - #include "nvmf_fc.h" #include "fc_lld.h" diff --git a/lib/nvmf/fc_ls.c b/lib/nvmf/fc_ls.c index f2538578b..c9a23a5c6 100644 --- a/lib/nvmf/fc_ls.c +++ b/lib/nvmf/fc_ls.c @@ -39,7 +39,7 @@ #include "spdk/trace.h" #include "spdk/util.h" #include "spdk/endian.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #include "nvmf_internal.h" #include "transport.h" diff --git a/lib/nvmf/nvmf.c b/lib/nvmf/nvmf.c index f58be3e20..3fa9c57a3 100644 --- a/lib/nvmf/nvmf.c +++ b/lib/nvmf/nvmf.c @@ -42,7 +42,7 @@ #include "spdk/endian.h" #include "spdk/string.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #include "nvmf_internal.h" #include "transport.h" diff --git a/lib/nvmf/nvmf_rpc.c b/lib/nvmf/nvmf_rpc.c index 5a7c8e119..3b137c76c 100644 --- a/lib/nvmf/nvmf_rpc.c +++ b/lib/nvmf/nvmf_rpc.c @@ -41,7 +41,6 @@ #include "spdk/util.h" #include "spdk/bit_array.h" -#include "spdk_internal/log.h" #include "spdk_internal/assert.h" #include "nvmf_internal.h" diff --git a/lib/nvmf/rdma.c b/lib/nvmf/rdma.c index 160327837..7a02acce0 100644 --- a/lib/nvmf/rdma.c +++ b/lib/nvmf/rdma.c @@ -42,7 +42,7 @@ #include "spdk/util.h" #include "spdk_internal/assert.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #include "spdk_internal/rdma.h" #include "nvmf_internal.h" diff --git a/lib/nvmf/subsystem.c b/lib/nvmf/subsystem.c index 6ebb4823e..46494d7fe 100644 --- a/lib/nvmf/subsystem.c +++ b/lib/nvmf/subsystem.c @@ -45,7 +45,7 @@ #include "spdk/file.h" #include "spdk/bdev_module.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #include "spdk_internal/utf.h" #define MODEL_NUMBER_DEFAULT "SPDK bdev Controller" diff --git a/lib/nvmf/tcp.c b/lib/nvmf/tcp.c index a5736b483..0885acb7b 100644 --- a/lib/nvmf/tcp.c +++ b/lib/nvmf/tcp.c @@ -43,7 +43,7 @@ #include "spdk/util.h" #include "spdk_internal/assert.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #include "spdk_internal/nvme_tcp.h" #include "nvmf_internal.h" diff --git a/lib/rdma/rdma_mlx5_dv.c b/lib/rdma/rdma_mlx5_dv.c index bae3afdda..06e7f9c41 100644 --- a/lib/rdma/rdma_mlx5_dv.c +++ b/lib/rdma/rdma_mlx5_dv.c @@ -39,7 +39,7 @@ #include "spdk/likely.h" #include "spdk_internal/rdma.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" struct spdk_rdma_mlx5_dv_qp { struct spdk_rdma_qp common; diff --git a/lib/rdma/rdma_verbs.c b/lib/rdma/rdma_verbs.c index 66be5bf60..e0cc2d403 100644 --- a/lib/rdma/rdma_verbs.c +++ b/lib/rdma/rdma_verbs.c @@ -38,7 +38,7 @@ #include "spdk/likely.h" #include "spdk_internal/rdma.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" struct spdk_rdma_qp * spdk_rdma_qp_create(struct rdma_cm_id *cm_id, struct spdk_rdma_qp_init_attr *qp_attr) diff --git a/lib/reduce/reduce.c b/lib/reduce/reduce.c index b8daf5783..b964520b4 100644 --- a/lib/reduce/reduce.c +++ b/lib/reduce/reduce.c @@ -38,7 +38,7 @@ #include "spdk/string.h" #include "spdk/bit_array.h" #include "spdk/util.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #include "libpmem.h" diff --git a/lib/scsi/scsi_internal.h b/lib/scsi/scsi_internal.h index 926b82dc2..44cc4761e 100644 --- a/lib/scsi/scsi_internal.h +++ b/lib/scsi/scsi_internal.h @@ -43,7 +43,7 @@ #include "spdk/trace.h" #include "spdk/dif.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" enum { SPDK_SCSI_TASK_UNKNOWN = -1, diff --git a/lib/sock/sock.c b/lib/sock/sock.c index 5741bfd59..8f3b4794c 100644 --- a/lib/sock/sock.c +++ b/lib/sock/sock.c @@ -35,7 +35,7 @@ #include "spdk/sock.h" #include "spdk_internal/sock.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #define SPDK_SOCK_DEFAULT_PRIORITY 0 #define SPDK_SOCK_DEFAULT_ZCOPY true diff --git a/lib/sock/sock_rpc.c b/lib/sock/sock_rpc.c index bd6431f9c..2ffe2d80e 100644 --- a/lib/sock/sock_rpc.c +++ b/lib/sock/sock_rpc.c @@ -36,7 +36,7 @@ #include "spdk/util.h" #include "spdk/string.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" static const struct spdk_json_object_decoder rpc_sock_impl_get_opts_decoders[] = { diff --git a/lib/thread/thread.c b/lib/thread/thread.c index a6de61b0f..d80687f0f 100644 --- a/lib/thread/thread.c +++ b/lib/thread/thread.c @@ -40,7 +40,7 @@ #include "spdk/thread.h" #include "spdk/util.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #include "spdk_internal/thread.h" #define SPDK_MSG_BATCH_SIZE 8 diff --git a/lib/trace/trace_flags.c b/lib/trace/trace_flags.c index 29e6405ad..f78d26a26 100644 --- a/lib/trace/trace_flags.c +++ b/lib/trace/trace_flags.c @@ -36,7 +36,6 @@ #include "spdk/env.h" #include "spdk/trace.h" #include "spdk/log.h" -#include "spdk_internal/log.h" struct spdk_trace_flags *g_trace_flags = NULL; static struct spdk_trace_register_fn *g_reg_fn_head = NULL; diff --git a/lib/trace/trace_rpc.c b/lib/trace/trace_rpc.c index b77dabe0e..5cab419fa 100644 --- a/lib/trace/trace_rpc.c +++ b/lib/trace/trace_rpc.c @@ -34,7 +34,7 @@ #include "spdk/rpc.h" #include "spdk/util.h" #include "spdk/trace.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" struct rpc_tpoint_group { char *name; diff --git a/lib/vhost/vhost_internal.h b/lib/vhost/vhost_internal.h index 3aa89768a..d6aaddc18 100644 --- a/lib/vhost/vhost_internal.h +++ b/lib/vhost/vhost_internal.h @@ -40,7 +40,7 @@ #include #include "spdk_internal/vhost_user.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #include "spdk/util.h" #include "spdk/rpc.h" #include "spdk/config.h" diff --git a/lib/vhost/vhost_rpc.c b/lib/vhost/vhost_rpc.c index 844359684..8dfef5f84 100644 --- a/lib/vhost/vhost_rpc.c +++ b/lib/vhost/vhost_rpc.c @@ -33,7 +33,7 @@ #include "spdk/stdinc.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #include "spdk/rpc.h" #include "spdk/util.h" #include "spdk/string.h" diff --git a/lib/virtio/vhost_user.h b/lib/virtio/vhost_user.h index 0caf51ebc..cea13375e 100644 --- a/lib/virtio/vhost_user.h +++ b/lib/virtio/vhost_user.h @@ -36,7 +36,7 @@ #include "spdk/stdinc.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #include "spdk_internal/virtio.h" #include "spdk_internal/vhost_user.h" diff --git a/lib/vmd/vmd.h b/lib/vmd/vmd.h index 46490a6f7..d44ede902 100644 --- a/lib/vmd/vmd.h +++ b/lib/vmd/vmd.h @@ -38,7 +38,7 @@ #include "spdk/vmd.h" #include "spdk/env.h" #include "spdk/util.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #include "vmd_spec.h" struct vmd_hot_plug; diff --git a/module/accel/idxd/accel_engine_idxd.c b/module/accel/idxd/accel_engine_idxd.c index 5cf3e5bbd..f5fcb9e02 100644 --- a/module/accel/idxd/accel_engine_idxd.c +++ b/module/accel/idxd/accel_engine_idxd.c @@ -36,7 +36,7 @@ #include "spdk/stdinc.h" #include "spdk_internal/accel_engine.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #include "spdk_internal/idxd.h" #include "spdk/env.h" diff --git a/module/accel/ioat/accel_engine_ioat.c b/module/accel/ioat/accel_engine_ioat.c index e07f08ef2..8d41755a4 100644 --- a/module/accel/ioat/accel_engine_ioat.c +++ b/module/accel/ioat/accel_engine_ioat.c @@ -36,7 +36,7 @@ #include "spdk/stdinc.h" #include "spdk_internal/accel_engine.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #include "spdk/env.h" #include "spdk/conf.h" diff --git a/module/bdev/aio/bdev_aio.c b/module/bdev/aio/bdev_aio.c index a9de0bc16..e4be6ab8d 100644 --- a/module/bdev/aio/bdev_aio.c +++ b/module/bdev/aio/bdev_aio.c @@ -47,7 +47,7 @@ #include "spdk/util.h" #include "spdk/string.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #include diff --git a/module/bdev/aio/bdev_aio_rpc.c b/module/bdev/aio/bdev_aio_rpc.c index 0968b8d76..a4f6df141 100644 --- a/module/bdev/aio/bdev_aio_rpc.c +++ b/module/bdev/aio/bdev_aio_rpc.c @@ -35,7 +35,7 @@ #include "spdk/rpc.h" #include "spdk/util.h" #include "spdk/string.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" struct rpc_construct_aio { char *name; diff --git a/module/bdev/compress/vbdev_compress.c b/module/bdev/compress/vbdev_compress.c index 4377b1c33..95f36709a 100644 --- a/module/bdev/compress/vbdev_compress.c +++ b/module/bdev/compress/vbdev_compress.c @@ -44,7 +44,7 @@ #include "spdk/util.h" #include "spdk/bdev_module.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #include #include diff --git a/module/bdev/compress/vbdev_compress_rpc.c b/module/bdev/compress/vbdev_compress_rpc.c index 4665e79ef..19be286fc 100644 --- a/module/bdev/compress/vbdev_compress_rpc.c +++ b/module/bdev/compress/vbdev_compress_rpc.c @@ -35,7 +35,7 @@ #include "spdk/rpc.h" #include "spdk/util.h" #include "spdk/string.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" struct rpc_bdev_compress_get_orphans { char *name; diff --git a/module/bdev/crypto/vbdev_crypto.c b/module/bdev/crypto/vbdev_crypto.c index a7d20fee0..40d229b98 100644 --- a/module/bdev/crypto/vbdev_crypto.c +++ b/module/bdev/crypto/vbdev_crypto.c @@ -38,7 +38,7 @@ #include "spdk/endian.h" #include "spdk/thread.h" #include "spdk/bdev_module.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #include #include diff --git a/module/bdev/crypto/vbdev_crypto.h b/module/bdev/crypto/vbdev_crypto.h index 458b29c6b..98ca50d81 100644 --- a/module/bdev/crypto/vbdev_crypto.h +++ b/module/bdev/crypto/vbdev_crypto.h @@ -37,7 +37,7 @@ #include "spdk/rpc.h" #include "spdk/util.h" #include "spdk/string.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #include "spdk/bdev.h" diff --git a/module/bdev/delay/vbdev_delay.c b/module/bdev/delay/vbdev_delay.c index ac8231a59..f155f5714 100644 --- a/module/bdev/delay/vbdev_delay.c +++ b/module/bdev/delay/vbdev_delay.c @@ -43,7 +43,7 @@ #include "spdk/util.h" #include "spdk/bdev_module.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" static int vbdev_delay_init(void); diff --git a/module/bdev/delay/vbdev_delay_rpc.c b/module/bdev/delay/vbdev_delay_rpc.c index e53c7d9c2..2a89c027d 100644 --- a/module/bdev/delay/vbdev_delay_rpc.c +++ b/module/bdev/delay/vbdev_delay_rpc.c @@ -36,7 +36,7 @@ #include "spdk/rpc.h" #include "spdk/util.h" #include "spdk/string.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #include "spdk_internal/assert.h" struct rpc_update_latency { diff --git a/module/bdev/error/vbdev_error.c b/module/bdev/error/vbdev_error.c index 643d0d8a1..c614524a4 100644 --- a/module/bdev/error/vbdev_error.c +++ b/module/bdev/error/vbdev_error.c @@ -44,7 +44,7 @@ #include "spdk/string.h" #include "spdk/bdev_module.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #include "vbdev_error.h" diff --git a/module/bdev/error/vbdev_error_rpc.c b/module/bdev/error/vbdev_error_rpc.c index 2dcbfd33e..4d9f3a766 100644 --- a/module/bdev/error/vbdev_error_rpc.c +++ b/module/bdev/error/vbdev_error_rpc.c @@ -36,7 +36,7 @@ #include "spdk/rpc.h" #include "spdk/util.h" #include "spdk/string.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #include "vbdev_error.h" #define ERROR_BDEV_IO_TYPE_INVALID (SPDK_BDEV_IO_TYPE_RESET + 1) diff --git a/module/bdev/ftl/bdev_ftl.c b/module/bdev/ftl/bdev_ftl.c index cf4f77142..5eb7335bd 100644 --- a/module/bdev/ftl/bdev_ftl.c +++ b/module/bdev/ftl/bdev_ftl.c @@ -42,7 +42,7 @@ #include "spdk/util.h" #include "spdk/string.h" #include "spdk/ftl.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #include "bdev_ftl.h" diff --git a/module/bdev/ftl/bdev_ftl_rpc.c b/module/bdev/ftl/bdev_ftl_rpc.c index 045619342..36e78b934 100644 --- a/module/bdev/ftl/bdev_ftl_rpc.c +++ b/module/bdev/ftl/bdev_ftl_rpc.c @@ -35,7 +35,7 @@ #include "spdk/util.h" #include "spdk/bdev_module.h" #include "spdk/string.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #include "bdev_ftl.h" diff --git a/module/bdev/gpt/gpt.c b/module/bdev/gpt/gpt.c index f3bd91772..0944f0503 100644 --- a/module/bdev/gpt/gpt.c +++ b/module/bdev/gpt/gpt.c @@ -37,7 +37,7 @@ #include "spdk/endian.h" #include "spdk/event.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #define GPT_PRIMARY_PARTITION_TABLE_LBA 0x1 #define PRIMARY_PARTITION_NUMBER 4 diff --git a/module/bdev/gpt/vbdev_gpt.c b/module/bdev/gpt/vbdev_gpt.c index decf8448c..24cd23328 100644 --- a/module/bdev/gpt/vbdev_gpt.c +++ b/module/bdev/gpt/vbdev_gpt.c @@ -47,7 +47,7 @@ #include "spdk/util.h" #include "spdk/bdev_module.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" static int vbdev_gpt_init(void); static void vbdev_gpt_examine(struct spdk_bdev *bdev); diff --git a/module/bdev/iscsi/bdev_iscsi.c b/module/bdev/iscsi/bdev_iscsi.c index bfc71618c..b61b0209c 100644 --- a/module/bdev/iscsi/bdev_iscsi.c +++ b/module/bdev/iscsi/bdev_iscsi.c @@ -44,7 +44,7 @@ #include "spdk/string.h" #include "spdk/iscsi_spec.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #include "spdk/bdev_module.h" #include "iscsi/iscsi.h" diff --git a/module/bdev/iscsi/bdev_iscsi_rpc.c b/module/bdev/iscsi/bdev_iscsi_rpc.c index 5c3bdf551..6e0edc38a 100644 --- a/module/bdev/iscsi/bdev_iscsi_rpc.c +++ b/module/bdev/iscsi/bdev_iscsi_rpc.c @@ -36,7 +36,7 @@ #include "spdk/util.h" #include "spdk/string.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" struct rpc_bdev_iscsi_create { char *name; diff --git a/module/bdev/lvol/vbdev_lvol.c b/module/bdev/lvol/vbdev_lvol.c index 055acfc7f..f2bf608f6 100644 --- a/module/bdev/lvol/vbdev_lvol.c +++ b/module/bdev/lvol/vbdev_lvol.c @@ -34,7 +34,7 @@ #include "spdk/blob_bdev.h" #include "spdk/rpc.h" #include "spdk/bdev_module.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #include "spdk/string.h" #include "spdk/uuid.h" diff --git a/module/bdev/lvol/vbdev_lvol_rpc.c b/module/bdev/lvol/vbdev_lvol_rpc.c index a9c46d4f3..1f0f69a4f 100644 --- a/module/bdev/lvol/vbdev_lvol_rpc.c +++ b/module/bdev/lvol/vbdev_lvol_rpc.c @@ -36,7 +36,7 @@ #include "spdk/util.h" #include "vbdev_lvol.h" #include "spdk/string.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" SPDK_LOG_REGISTER_COMPONENT(lvol_rpc) diff --git a/module/bdev/malloc/bdev_malloc.c b/module/bdev/malloc/bdev_malloc.c index bba414dcd..6f0fd570e 100644 --- a/module/bdev/malloc/bdev_malloc.c +++ b/module/bdev/malloc/bdev_malloc.c @@ -45,7 +45,7 @@ #include "spdk/string.h" #include "spdk/bdev_module.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" struct malloc_disk { struct spdk_bdev disk; diff --git a/module/bdev/malloc/bdev_malloc_rpc.c b/module/bdev/malloc/bdev_malloc_rpc.c index 4262d574f..c58d384cd 100644 --- a/module/bdev/malloc/bdev_malloc_rpc.c +++ b/module/bdev/malloc/bdev_malloc_rpc.c @@ -36,7 +36,7 @@ #include "spdk/util.h" #include "spdk/uuid.h" #include "spdk/string.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" struct rpc_construct_malloc { char *name; diff --git a/module/bdev/null/bdev_null.c b/module/bdev/null/bdev_null.c index 1163fdbab..827026a31 100644 --- a/module/bdev/null/bdev_null.c +++ b/module/bdev/null/bdev_null.c @@ -42,7 +42,7 @@ #include "spdk/likely.h" #include "spdk/bdev_module.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #include "bdev_null.h" diff --git a/module/bdev/null/bdev_null_rpc.c b/module/bdev/null/bdev_null_rpc.c index 72fcb22f9..b8ebbed32 100644 --- a/module/bdev/null/bdev_null_rpc.c +++ b/module/bdev/null/bdev_null_rpc.c @@ -35,7 +35,7 @@ #include "spdk/util.h" #include "spdk/string.h" #include "spdk/bdev_module.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #include "bdev_null.h" diff --git a/module/bdev/nvme/bdev_nvme.c b/module/bdev/nvme/bdev_nvme.c index d3ce183c3..e4c4267cf 100644 --- a/module/bdev/nvme/bdev_nvme.c +++ b/module/bdev/nvme/bdev_nvme.c @@ -49,7 +49,7 @@ #include "spdk/util.h" #include "spdk/bdev_module.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #define SPDK_BDEV_NVME_DEFAULT_DELAY_CMD_SUBMIT true diff --git a/module/bdev/nvme/bdev_nvme_cuse_rpc.c b/module/bdev/nvme/bdev_nvme_cuse_rpc.c index c116c510d..35abd38af 100644 --- a/module/bdev/nvme/bdev_nvme_cuse_rpc.c +++ b/module/bdev/nvme/bdev_nvme_cuse_rpc.c @@ -40,7 +40,7 @@ #include "spdk/util.h" #include "spdk/nvme.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" struct rpc_nvme_cuse_register { char *name; diff --git a/module/bdev/nvme/bdev_nvme_rpc.c b/module/bdev/nvme/bdev_nvme_rpc.c index 4366fb4e4..7311685eb 100644 --- a/module/bdev/nvme/bdev_nvme_rpc.c +++ b/module/bdev/nvme/bdev_nvme_rpc.c @@ -42,7 +42,7 @@ #include "spdk/rpc.h" #include "spdk/util.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #include "spdk/bdev_module.h" struct open_descriptors { diff --git a/module/bdev/nvme/bdev_ocssd.c b/module/bdev/nvme/bdev_ocssd.c index 79a7ccdd7..a68b3b3d9 100644 --- a/module/bdev/nvme/bdev_ocssd.c +++ b/module/bdev/nvme/bdev_ocssd.c @@ -40,7 +40,6 @@ #include "spdk/util.h" #include "spdk/nvme_ocssd.h" #include "spdk/nvme_ocssd_spec.h" -#include "spdk_internal/log.h" #include "spdk/nvme.h" #include "common.h" #include "bdev_ocssd.h" diff --git a/module/bdev/nvme/nvme_rpc.c b/module/bdev/nvme/nvme_rpc.c index e6a938384..dadb3e20a 100644 --- a/module/bdev/nvme/nvme_rpc.c +++ b/module/bdev/nvme/nvme_rpc.c @@ -36,7 +36,7 @@ #include "spdk/rpc.h" #include "spdk/util.h" #include "spdk/bdev_module.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #include "bdev_nvme.h" #include "common.h" diff --git a/module/bdev/nvme/vbdev_opal.c b/module/bdev/nvme/vbdev_opal.c index 1c6276867..a0588ab58 100644 --- a/module/bdev/nvme/vbdev_opal.c +++ b/module/bdev/nvme/vbdev_opal.c @@ -34,7 +34,7 @@ #include "spdk/opal.h" #include "spdk/bdev_module.h" #include "vbdev_opal.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #include "spdk/string.h" /* OPAL locking range only supports operations on nsid=1 for now */ diff --git a/module/bdev/nvme/vbdev_opal_rpc.c b/module/bdev/nvme/vbdev_opal_rpc.c index ee270ef35..ef372cc7f 100644 --- a/module/bdev/nvme/vbdev_opal_rpc.c +++ b/module/bdev/nvme/vbdev_opal_rpc.c @@ -34,7 +34,7 @@ #include "spdk/rpc.h" #include "spdk/util.h" #include "spdk/string.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #include "vbdev_opal.h" diff --git a/module/bdev/ocf/ctx.c b/module/bdev/ocf/ctx.c index 66d0fd38b..94060d033 100644 --- a/module/bdev/ocf/ctx.c +++ b/module/bdev/ocf/ctx.c @@ -34,7 +34,7 @@ #include #include "spdk/env.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #include "ctx.h" #include "ocf_env.h" diff --git a/module/bdev/ocf/vbdev_ocf.c b/module/bdev/ocf/vbdev_ocf.c index b09187a37..be2ae6acd 100644 --- a/module/bdev/ocf/vbdev_ocf.c +++ b/module/bdev/ocf/vbdev_ocf.c @@ -45,7 +45,7 @@ #include "spdk/conf.h" #include "spdk/thread.h" #include "spdk/string.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #include "spdk/cpuset.h" static struct spdk_bdev_module ocf_if; diff --git a/module/bdev/ocf/volume.c b/module/bdev/ocf/volume.c index e96538456..648109764 100644 --- a/module/bdev/ocf/volume.c +++ b/module/bdev/ocf/volume.c @@ -36,7 +36,7 @@ #include "spdk/bdev_module.h" #include "spdk/env.h" #include "spdk/thread.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #include "data.h" #include "volume.h" diff --git a/module/bdev/passthru/vbdev_passthru.c b/module/bdev/passthru/vbdev_passthru.c index 3531c0078..33520188b 100644 --- a/module/bdev/passthru/vbdev_passthru.c +++ b/module/bdev/passthru/vbdev_passthru.c @@ -48,7 +48,7 @@ #include "spdk/util.h" #include "spdk/bdev_module.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" static int vbdev_passthru_init(void); diff --git a/module/bdev/passthru/vbdev_passthru_rpc.c b/module/bdev/passthru/vbdev_passthru_rpc.c index 6f573ce76..eb7b38e33 100644 --- a/module/bdev/passthru/vbdev_passthru_rpc.c +++ b/module/bdev/passthru/vbdev_passthru_rpc.c @@ -35,7 +35,7 @@ #include "spdk/rpc.h" #include "spdk/util.h" #include "spdk/string.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" /* Structure to hold the parameters for this RPC method. */ struct rpc_bdev_passthru_create { diff --git a/module/bdev/pmem/bdev_pmem.c b/module/bdev/pmem/bdev_pmem.c index eb9522b11..253c9c99c 100644 --- a/module/bdev/pmem/bdev_pmem.c +++ b/module/bdev/pmem/bdev_pmem.c @@ -37,7 +37,7 @@ #include "spdk/util.h" #include "spdk/rpc.h" #include "spdk/bdev_module.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #include "spdk/config.h" #include "bdev_pmem.h" diff --git a/module/bdev/pmem/bdev_pmem_rpc.c b/module/bdev/pmem/bdev_pmem_rpc.c index d0813d002..bfd93e5eb 100644 --- a/module/bdev/pmem/bdev_pmem_rpc.c +++ b/module/bdev/pmem/bdev_pmem_rpc.c @@ -37,7 +37,7 @@ #include "spdk/string.h" #include "libpmemblk.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" struct rpc_construct_pmem { char *pmem_file; diff --git a/module/bdev/raid/bdev_raid.c b/module/bdev/raid/bdev_raid.c index 2f82b06a9..521509da8 100644 --- a/module/bdev/raid/bdev_raid.c +++ b/module/bdev/raid/bdev_raid.c @@ -35,7 +35,7 @@ #include "spdk/env.h" #include "spdk/thread.h" #include "spdk/conf.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #include "spdk/string.h" #include "spdk/util.h" #include "spdk/json.h" diff --git a/module/bdev/raid/bdev_raid_rpc.c b/module/bdev/raid/bdev_raid_rpc.c index bc35e6014..f65d2b310 100644 --- a/module/bdev/raid/bdev_raid_rpc.c +++ b/module/bdev/raid/bdev_raid_rpc.c @@ -36,7 +36,7 @@ #include "bdev_raid.h" #include "spdk/util.h" #include "spdk/string.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #include "spdk/env.h" #define RPC_MAX_BASE_BDEVS 255 diff --git a/module/bdev/raid/raid0.c b/module/bdev/raid/raid0.c index 9c55db46e..7d7ffca41 100644 --- a/module/bdev/raid/raid0.c +++ b/module/bdev/raid/raid0.c @@ -38,7 +38,7 @@ #include "spdk/string.h" #include "spdk/util.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" /* * brief: diff --git a/module/bdev/raid/raid5.c b/module/bdev/raid/raid5.c index 7c43b380f..2b29de5d9 100644 --- a/module/bdev/raid/raid5.c +++ b/module/bdev/raid/raid5.c @@ -38,7 +38,7 @@ #include "spdk/string.h" #include "spdk/util.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" struct raid5_info { /* The parent raid bdev */ diff --git a/module/bdev/rbd/bdev_rbd.c b/module/bdev/rbd/bdev_rbd.c index 359e0ae6f..a886ad269 100644 --- a/module/bdev/rbd/bdev_rbd.c +++ b/module/bdev/rbd/bdev_rbd.c @@ -50,7 +50,7 @@ #include "spdk/likely.h" #include "spdk/bdev_module.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #define SPDK_RBD_QUEUE_DEPTH 128 #define MAX_EVENTS_PER_POLL 128 diff --git a/module/bdev/rbd/bdev_rbd_rpc.c b/module/bdev/rbd/bdev_rbd_rpc.c index d9322fb8a..026869f64 100644 --- a/module/bdev/rbd/bdev_rbd_rpc.c +++ b/module/bdev/rbd/bdev_rbd_rpc.c @@ -35,7 +35,7 @@ #include "spdk/rpc.h" #include "spdk/util.h" #include "spdk/string.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" struct rpc_create_rbd { char *name; diff --git a/module/bdev/split/vbdev_split.c b/module/bdev/split/vbdev_split.c index 827fe9856..526a879e1 100644 --- a/module/bdev/split/vbdev_split.c +++ b/module/bdev/split/vbdev_split.c @@ -46,7 +46,7 @@ #include "spdk/util.h" #include "spdk/bdev_module.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" struct spdk_vbdev_split_config { char *base_bdev; diff --git a/module/bdev/split/vbdev_split_rpc.c b/module/bdev/split/vbdev_split_rpc.c index a8c6f3be0..a222236c1 100644 --- a/module/bdev/split/vbdev_split_rpc.c +++ b/module/bdev/split/vbdev_split_rpc.c @@ -36,7 +36,7 @@ #include "spdk/string.h" #include "vbdev_split.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" struct rpc_construct_split { char *base_bdev; diff --git a/module/bdev/uring/bdev_uring.c b/module/bdev/uring/bdev_uring.c index a59d16082..beee8f238 100644 --- a/module/bdev/uring/bdev_uring.c +++ b/module/bdev/uring/bdev_uring.c @@ -46,7 +46,7 @@ #include "spdk/util.h" #include "spdk/string.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #include "spdk_internal/uring.h" struct bdev_uring_io_channel { diff --git a/module/bdev/uring/bdev_uring_rpc.c b/module/bdev/uring/bdev_uring_rpc.c index e65751002..3bb2beb42 100644 --- a/module/bdev/uring/bdev_uring_rpc.c +++ b/module/bdev/uring/bdev_uring_rpc.c @@ -35,7 +35,7 @@ #include "spdk/rpc.h" #include "spdk/util.h" #include "spdk/string.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" /* Structure to hold the parameters for this RPC method. */ struct rpc_create_uring { diff --git a/module/bdev/virtio/bdev_virtio_blk.c b/module/bdev/virtio/bdev_virtio_blk.c index 66761b4e7..f56d24066 100644 --- a/module/bdev/virtio/bdev_virtio_blk.c +++ b/module/bdev/virtio/bdev_virtio_blk.c @@ -44,7 +44,7 @@ #include "spdk_internal/assert.h" #include "spdk/bdev_module.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #include "spdk_internal/virtio.h" #include "spdk_internal/vhost_user.h" diff --git a/module/bdev/virtio/bdev_virtio_rpc.c b/module/bdev/virtio/bdev_virtio_rpc.c index 3c3c276eb..43a8b1edc 100644 --- a/module/bdev/virtio/bdev_virtio_rpc.c +++ b/module/bdev/virtio/bdev_virtio_rpc.c @@ -36,7 +36,7 @@ #include "spdk/string.h" #include "spdk/rpc.h" #include "spdk/util.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #include "bdev_virtio.h" diff --git a/module/bdev/virtio/bdev_virtio_scsi.c b/module/bdev/virtio/bdev_virtio_scsi.c index a9a5f30b8..d7fa1c9cd 100644 --- a/module/bdev/virtio/bdev_virtio_scsi.c +++ b/module/bdev/virtio/bdev_virtio_scsi.c @@ -44,7 +44,7 @@ #include "spdk/json.h" #include "spdk/bdev_module.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #include "spdk_internal/virtio.h" #include "spdk_internal/vhost_user.h" diff --git a/module/bdev/zone_block/vbdev_zone_block.c b/module/bdev/zone_block/vbdev_zone_block.c index 246f05528..51b38e377 100644 --- a/module/bdev/zone_block/vbdev_zone_block.c +++ b/module/bdev/zone_block/vbdev_zone_block.c @@ -39,7 +39,7 @@ #include "spdk/nvme.h" #include "spdk/bdev_zone.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" static int zone_block_init(void); static int zone_block_get_ctx_size(void); diff --git a/module/bdev/zone_block/vbdev_zone_block_rpc.c b/module/bdev/zone_block/vbdev_zone_block_rpc.c index b7f485190..d34d0bc54 100644 --- a/module/bdev/zone_block/vbdev_zone_block_rpc.c +++ b/module/bdev/zone_block/vbdev_zone_block_rpc.c @@ -39,7 +39,7 @@ #include "spdk/string.h" #include "spdk/rpc.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" struct rpc_construct_zone_block { char *name; diff --git a/module/blobfs/bdev/blobfs_bdev.c b/module/blobfs/bdev/blobfs_bdev.c index 23b9feb17..9e218aea6 100644 --- a/module/blobfs/bdev/blobfs_bdev.c +++ b/module/blobfs/bdev/blobfs_bdev.c @@ -43,8 +43,6 @@ #include "spdk/rpc.h" #include "spdk/util.h" -#include "spdk_internal/log.h" - #include "blobfs_fuse.h" /* Dummy bdev module used to to claim bdevs. */ diff --git a/module/blobfs/bdev/blobfs_bdev_rpc.c b/module/blobfs/bdev/blobfs_bdev_rpc.c index 46696f2ab..a3da7432d 100644 --- a/module/blobfs/bdev/blobfs_bdev_rpc.c +++ b/module/blobfs/bdev/blobfs_bdev_rpc.c @@ -42,8 +42,6 @@ #include "spdk/rpc.h" #include "spdk/util.h" -#include "spdk_internal/log.h" - #ifndef PAGE_SIZE #define PAGE_SIZE 4096 #endif diff --git a/module/env_dpdk/env_dpdk_rpc.c b/module/env_dpdk/env_dpdk_rpc.c index e66f13609..3e752ea67 100644 --- a/module/env_dpdk/env_dpdk_rpc.c +++ b/module/env_dpdk/env_dpdk_rpc.c @@ -34,7 +34,7 @@ #include "spdk/stdinc.h" #include "spdk/rpc.h" #include "spdk/env_dpdk.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" static void rpc_env_dpdk_get_mem_stats(struct spdk_jsonrpc_request *request, diff --git a/module/event/subsystems/nvmf/event_nvmf.h b/module/event/subsystems/nvmf/event_nvmf.h index 58d3f713b..407709fa5 100644 --- a/module/event/subsystems/nvmf/event_nvmf.h +++ b/module/event/subsystems/nvmf/event_nvmf.h @@ -40,7 +40,7 @@ #include "spdk/queue.h" #include "spdk_internal/event.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #define ACCEPT_TIMEOUT_US 10000 /* 10ms */ diff --git a/module/event/subsystems/vmd/vmd_rpc.c b/module/event/subsystems/vmd/vmd_rpc.c index 35843e688..eb01be143 100644 --- a/module/event/subsystems/vmd/vmd_rpc.c +++ b/module/event/subsystems/vmd/vmd_rpc.c @@ -36,7 +36,7 @@ #include "spdk/rpc.h" #include "spdk/util.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #include "event_vmd.h" static void diff --git a/test/unit/lib/iscsi/common.c b/test/unit/lib/iscsi/common.c index 6c0add767..52fbddd2a 100644 --- a/test/unit/lib/iscsi/common.c +++ b/test/unit/lib/iscsi/common.c @@ -6,7 +6,7 @@ #include "spdk/sock.h" #include "spdk_cunit.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #include "spdk_internal/mock.h" #include "scsi/scsi_internal.h" diff --git a/test/unit/lib/nvme/nvme_ctrlr.c/nvme_ctrlr_ut.c b/test/unit/lib/nvme/nvme_ctrlr.c/nvme_ctrlr_ut.c index b43a610f0..c43a016a5 100644 --- a/test/unit/lib/nvme/nvme_ctrlr.c/nvme_ctrlr_ut.c +++ b/test/unit/lib/nvme/nvme_ctrlr.c/nvme_ctrlr_ut.c @@ -35,7 +35,7 @@ #include "spdk_cunit.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #include "common/lib/test_env.c" diff --git a/test/unit/lib/nvmf/fc.c/fc_ut.c b/test/unit/lib/nvmf/fc.c/fc_ut.c index e5fa1211c..63b719d1f 100644 --- a/test/unit/lib/nvmf/fc.c/fc_ut.c +++ b/test/unit/lib/nvmf/fc.c/fc_ut.c @@ -38,7 +38,7 @@ #include "spdk/nvmf.h" #include "spdk/endian.h" #include "spdk/trace.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #include "ut_multithread.c" diff --git a/test/unit/lib/nvmf/fc_ls.c/fc_ls_ut.c b/test/unit/lib/nvmf/fc_ls.c/fc_ls_ut.c index 66927f4db..6f5bc42ac 100644 --- a/test/unit/lib/nvmf/fc_ls.c/fc_ls_ut.c +++ b/test/unit/lib/nvmf/fc_ls.c/fc_ls_ut.c @@ -38,7 +38,7 @@ #include "spdk/nvmf.h" #include "spdk/endian.h" #include "spdk/trace.h" -#include "spdk_internal/log.h" +#include "spdk/log.h" #include "ut_multithread.c"