From 423507e1a48804b853ea19ee9851f6a4eb4343ed Mon Sep 17 00:00:00 2001 From: Seth Howell Date: Fri, 16 Aug 2019 09:45:58 -0700 Subject: [PATCH] mk: move the bdev modules under module directory. This is more accurate to what they are, and will make defining library dependencies much simpler. This change in directory does not affect the final placement of naming of libraries at the end of time. Signed-off-by: Seth Howell reviewed on https://review.gerrithub.io/c/spdk/spdk/+/466975 (master) (cherry picked from commit 07fe6a43d6087a001713e0270af65a13e08533f0) Change-Id: Ic48a9233dff564e39ce357a9ea0a111ea2b6414b Signed-off-by: Seth Howell Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/466975 Reviewed-by: Ben Walker Reviewed-by: Tomasz Zawadzki Tested-by: SPDK CI Jenkins --- Makefile | 6 +- autobuild.sh | 2 +- lib/bdev/Makefile | 29 -------- mk/spdk.unittest.mk | 1 + module/Makefile | 44 ++++++++++++ module/bdev/Makefile | 71 +++++++++++++++++++ {lib => module}/bdev/aio/Makefile | 0 {lib => module}/bdev/aio/bdev_aio.c | 0 {lib => module}/bdev/aio/bdev_aio.h | 0 {lib => module}/bdev/aio/bdev_aio_rpc.c | 0 {lib => module}/bdev/compress/Makefile | 0 .../bdev/compress/vbdev_compress.c | 0 .../bdev/compress/vbdev_compress.h | 0 .../bdev/compress/vbdev_compress_rpc.c | 0 {lib => module}/bdev/crypto/Makefile | 0 {lib => module}/bdev/crypto/vbdev_crypto.c | 0 {lib => module}/bdev/crypto/vbdev_crypto.h | 0 .../bdev/crypto/vbdev_crypto_rpc.c | 0 {lib => module}/bdev/delay/Makefile | 0 {lib => module}/bdev/delay/vbdev_delay.c | 0 {lib => module}/bdev/delay/vbdev_delay.h | 0 {lib => module}/bdev/delay/vbdev_delay_rpc.c | 0 {lib => module}/bdev/error/Makefile | 0 {lib => module}/bdev/error/vbdev_error.c | 0 {lib => module}/bdev/error/vbdev_error.h | 0 {lib => module}/bdev/error/vbdev_error_rpc.c | 0 {lib => module}/bdev/gpt/Makefile | 0 {lib => module}/bdev/gpt/gpt.c | 0 {lib => module}/bdev/gpt/gpt.h | 0 {lib => module}/bdev/gpt/vbdev_gpt.c | 0 {lib => module}/bdev/iscsi/Makefile | 0 {lib => module}/bdev/iscsi/bdev_iscsi.c | 0 {lib => module}/bdev/iscsi/bdev_iscsi.h | 0 {lib => module}/bdev/iscsi/bdev_iscsi_rpc.c | 0 {lib => module}/bdev/lvol/Makefile | 0 {lib => module}/bdev/lvol/vbdev_lvol.c | 0 {lib => module}/bdev/lvol/vbdev_lvol.h | 0 {lib => module}/bdev/lvol/vbdev_lvol_rpc.c | 0 {lib => module}/bdev/malloc/Makefile | 0 {lib => module}/bdev/malloc/bdev_malloc.c | 0 {lib => module}/bdev/malloc/bdev_malloc.h | 0 {lib => module}/bdev/malloc/bdev_malloc_rpc.c | 0 {lib => module}/bdev/null/Makefile | 0 {lib => module}/bdev/null/bdev_null.c | 0 {lib => module}/bdev/null/bdev_null.h | 0 {lib => module}/bdev/null/bdev_null_rpc.c | 0 {lib => module}/bdev/nvme/Makefile | 0 {lib => module}/bdev/nvme/bdev_ftl.c | 0 {lib => module}/bdev/nvme/bdev_ftl.h | 0 {lib => module}/bdev/nvme/bdev_ftl_rpc.c | 0 {lib => module}/bdev/nvme/bdev_nvme.c | 0 {lib => module}/bdev/nvme/bdev_nvme.h | 0 {lib => module}/bdev/nvme/bdev_nvme_rpc.c | 0 {lib => module}/bdev/nvme/common.c | 0 {lib => module}/bdev/nvme/common.h | 0 {lib => module}/bdev/nvme/nvme_rpc.c | 0 {lib => module}/bdev/ocf/Makefile | 0 {lib => module}/bdev/ocf/ctx.c | 0 {lib => module}/bdev/ocf/ctx.h | 0 {lib => module}/bdev/ocf/data.c | 0 {lib => module}/bdev/ocf/data.h | 0 {lib => module}/bdev/ocf/env/.gitignore | 0 {lib => module}/bdev/ocf/env/Makefile | 10 +-- {lib => module}/bdev/ocf/env/ocf_env.c | 0 {lib => module}/bdev/ocf/env/ocf_env.h | 0 .../bdev/ocf/env/ocf_env_headers.h | 0 {lib => module}/bdev/ocf/env/ocf_env_list.h | 0 {lib => module}/bdev/ocf/stats.c | 0 {lib => module}/bdev/ocf/stats.h | 0 {lib => module}/bdev/ocf/utils.c | 0 {lib => module}/bdev/ocf/utils.h | 0 {lib => module}/bdev/ocf/vbdev_ocf.c | 0 {lib => module}/bdev/ocf/vbdev_ocf.h | 0 {lib => module}/bdev/ocf/vbdev_ocf_rpc.c | 0 {lib => module}/bdev/ocf/volume.c | 0 {lib => module}/bdev/ocf/volume.h | 0 {lib => module}/bdev/passthru/Makefile | 0 .../bdev/passthru/vbdev_passthru.c | 0 .../bdev/passthru/vbdev_passthru.h | 0 .../bdev/passthru/vbdev_passthru_rpc.c | 0 {lib => module}/bdev/pmem/Makefile | 0 {lib => module}/bdev/pmem/bdev_pmem.c | 0 {lib => module}/bdev/pmem/bdev_pmem.h | 0 {lib => module}/bdev/pmem/bdev_pmem_rpc.c | 0 {lib => module}/bdev/raid/Makefile | 0 {lib => module}/bdev/raid/bdev_raid.c | 0 {lib => module}/bdev/raid/bdev_raid.h | 0 {lib => module}/bdev/raid/bdev_raid_rpc.c | 0 {lib => module}/bdev/rbd/Makefile | 0 {lib => module}/bdev/rbd/bdev_rbd.c | 0 {lib => module}/bdev/rbd/bdev_rbd.h | 0 {lib => module}/bdev/rbd/bdev_rbd_rpc.c | 0 {lib => module}/bdev/rpc/Makefile | 0 {lib => module}/bdev/rpc/bdev_rpc.c | 0 {lib => module}/bdev/split/Makefile | 0 {lib => module}/bdev/split/vbdev_split.c | 0 {lib => module}/bdev/split/vbdev_split.h | 0 {lib => module}/bdev/split/vbdev_split_rpc.c | 0 {lib => module}/bdev/uring/Makefile | 0 {lib => module}/bdev/uring/bdev_uring.c | 0 {lib => module}/bdev/uring/bdev_uring.h | 0 {lib => module}/bdev/virtio/Makefile | 0 {lib => module}/bdev/virtio/bdev_virtio.h | 0 {lib => module}/bdev/virtio/bdev_virtio_blk.c | 0 {lib => module}/bdev/virtio/bdev_virtio_rpc.c | 0 .../bdev/virtio/bdev_virtio_scsi.c | 0 test/common/autotest_common.sh | 2 +- 107 files changed, 127 insertions(+), 38 deletions(-) create mode 100644 module/Makefile create mode 100644 module/bdev/Makefile rename {lib => module}/bdev/aio/Makefile (100%) rename {lib => module}/bdev/aio/bdev_aio.c (100%) rename {lib => module}/bdev/aio/bdev_aio.h (100%) rename {lib => module}/bdev/aio/bdev_aio_rpc.c (100%) rename {lib => module}/bdev/compress/Makefile (100%) rename {lib => module}/bdev/compress/vbdev_compress.c (100%) rename {lib => module}/bdev/compress/vbdev_compress.h (100%) rename {lib => module}/bdev/compress/vbdev_compress_rpc.c (100%) rename {lib => module}/bdev/crypto/Makefile (100%) rename {lib => module}/bdev/crypto/vbdev_crypto.c (100%) rename {lib => module}/bdev/crypto/vbdev_crypto.h (100%) rename {lib => module}/bdev/crypto/vbdev_crypto_rpc.c (100%) rename {lib => module}/bdev/delay/Makefile (100%) rename {lib => module}/bdev/delay/vbdev_delay.c (100%) rename {lib => module}/bdev/delay/vbdev_delay.h (100%) rename {lib => module}/bdev/delay/vbdev_delay_rpc.c (100%) rename {lib => module}/bdev/error/Makefile (100%) rename {lib => module}/bdev/error/vbdev_error.c (100%) rename {lib => module}/bdev/error/vbdev_error.h (100%) rename {lib => module}/bdev/error/vbdev_error_rpc.c (100%) rename {lib => module}/bdev/gpt/Makefile (100%) rename {lib => module}/bdev/gpt/gpt.c (100%) rename {lib => module}/bdev/gpt/gpt.h (100%) rename {lib => module}/bdev/gpt/vbdev_gpt.c (100%) rename {lib => module}/bdev/iscsi/Makefile (100%) rename {lib => module}/bdev/iscsi/bdev_iscsi.c (100%) rename {lib => module}/bdev/iscsi/bdev_iscsi.h (100%) rename {lib => module}/bdev/iscsi/bdev_iscsi_rpc.c (100%) rename {lib => module}/bdev/lvol/Makefile (100%) rename {lib => module}/bdev/lvol/vbdev_lvol.c (100%) rename {lib => module}/bdev/lvol/vbdev_lvol.h (100%) rename {lib => module}/bdev/lvol/vbdev_lvol_rpc.c (100%) rename {lib => module}/bdev/malloc/Makefile (100%) rename {lib => module}/bdev/malloc/bdev_malloc.c (100%) rename {lib => module}/bdev/malloc/bdev_malloc.h (100%) rename {lib => module}/bdev/malloc/bdev_malloc_rpc.c (100%) rename {lib => module}/bdev/null/Makefile (100%) rename {lib => module}/bdev/null/bdev_null.c (100%) rename {lib => module}/bdev/null/bdev_null.h (100%) rename {lib => module}/bdev/null/bdev_null_rpc.c (100%) rename {lib => module}/bdev/nvme/Makefile (100%) rename {lib => module}/bdev/nvme/bdev_ftl.c (100%) rename {lib => module}/bdev/nvme/bdev_ftl.h (100%) rename {lib => module}/bdev/nvme/bdev_ftl_rpc.c (100%) rename {lib => module}/bdev/nvme/bdev_nvme.c (100%) rename {lib => module}/bdev/nvme/bdev_nvme.h (100%) rename {lib => module}/bdev/nvme/bdev_nvme_rpc.c (100%) rename {lib => module}/bdev/nvme/common.c (100%) rename {lib => module}/bdev/nvme/common.h (100%) rename {lib => module}/bdev/nvme/nvme_rpc.c (100%) rename {lib => module}/bdev/ocf/Makefile (100%) rename {lib => module}/bdev/ocf/ctx.c (100%) rename {lib => module}/bdev/ocf/ctx.h (100%) rename {lib => module}/bdev/ocf/data.c (100%) rename {lib => module}/bdev/ocf/data.h (100%) rename {lib => module}/bdev/ocf/env/.gitignore (100%) rename {lib => module}/bdev/ocf/env/Makefile (89%) rename {lib => module}/bdev/ocf/env/ocf_env.c (100%) rename {lib => module}/bdev/ocf/env/ocf_env.h (100%) rename {lib => module}/bdev/ocf/env/ocf_env_headers.h (100%) rename {lib => module}/bdev/ocf/env/ocf_env_list.h (100%) rename {lib => module}/bdev/ocf/stats.c (100%) rename {lib => module}/bdev/ocf/stats.h (100%) rename {lib => module}/bdev/ocf/utils.c (100%) rename {lib => module}/bdev/ocf/utils.h (100%) rename {lib => module}/bdev/ocf/vbdev_ocf.c (100%) rename {lib => module}/bdev/ocf/vbdev_ocf.h (100%) rename {lib => module}/bdev/ocf/vbdev_ocf_rpc.c (100%) rename {lib => module}/bdev/ocf/volume.c (100%) rename {lib => module}/bdev/ocf/volume.h (100%) rename {lib => module}/bdev/passthru/Makefile (100%) rename {lib => module}/bdev/passthru/vbdev_passthru.c (100%) rename {lib => module}/bdev/passthru/vbdev_passthru.h (100%) rename {lib => module}/bdev/passthru/vbdev_passthru_rpc.c (100%) rename {lib => module}/bdev/pmem/Makefile (100%) rename {lib => module}/bdev/pmem/bdev_pmem.c (100%) rename {lib => module}/bdev/pmem/bdev_pmem.h (100%) rename {lib => module}/bdev/pmem/bdev_pmem_rpc.c (100%) rename {lib => module}/bdev/raid/Makefile (100%) rename {lib => module}/bdev/raid/bdev_raid.c (100%) rename {lib => module}/bdev/raid/bdev_raid.h (100%) rename {lib => module}/bdev/raid/bdev_raid_rpc.c (100%) rename {lib => module}/bdev/rbd/Makefile (100%) rename {lib => module}/bdev/rbd/bdev_rbd.c (100%) rename {lib => module}/bdev/rbd/bdev_rbd.h (100%) rename {lib => module}/bdev/rbd/bdev_rbd_rpc.c (100%) rename {lib => module}/bdev/rpc/Makefile (100%) rename {lib => module}/bdev/rpc/bdev_rpc.c (100%) rename {lib => module}/bdev/split/Makefile (100%) rename {lib => module}/bdev/split/vbdev_split.c (100%) rename {lib => module}/bdev/split/vbdev_split.h (100%) rename {lib => module}/bdev/split/vbdev_split_rpc.c (100%) rename {lib => module}/bdev/uring/Makefile (100%) rename {lib => module}/bdev/uring/bdev_uring.c (100%) rename {lib => module}/bdev/uring/bdev_uring.h (100%) rename {lib => module}/bdev/virtio/Makefile (100%) rename {lib => module}/bdev/virtio/bdev_virtio.h (100%) rename {lib => module}/bdev/virtio/bdev_virtio_blk.c (100%) rename {lib => module}/bdev/virtio/bdev_virtio_rpc.c (100%) rename {lib => module}/bdev/virtio/bdev_virtio_scsi.c (100%) diff --git a/Makefile b/Makefile index d512d54da..67cd217c4 100644 --- a/Makefile +++ b/Makefile @@ -37,6 +37,7 @@ SPDK_ROOT_DIR := $(CURDIR) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk DIRS-y += lib +DIRS-y += module DIRS-$(CONFIG_SHARED) += shared_lib DIRS-y += examples app include DIRS-$(CONFIG_TESTS) += test @@ -59,7 +60,7 @@ endif ifeq ($(CONFIG_SHARED),y) LIB = shared_lib else -LIB = lib +LIB = module endif ifeq ($(CONFIG_IPSEC_MB),y) @@ -86,8 +87,9 @@ ifneq ($(SKIP_DPDK_BUILD),1) dpdkbuild: $(DPDK_DEPS) endif -shared_lib: lib lib: $(DPDKBUILD) +module: lib +shared_lib: module app: $(LIB) test: $(LIB) examples: $(LIB) diff --git a/autobuild.sh b/autobuild.sh index 6344edf8b..5538180f1 100755 --- a/autobuild.sh +++ b/autobuild.sh @@ -28,7 +28,7 @@ if [ "$SPDK_TEST_OCF" -eq 1 ]; then # So we precompile OCF now for further use as standalone static library ./configure $(echo $config_params | sed 's/--enable-coverage//g') $MAKE $MAKEFLAGS include/spdk/config.h - CC=gcc CCAR=ar $MAKE $MAKEFLAGS -C lib/bdev/ocf/env exportlib O=$rootdir/build/ocf.a + CC=gcc CCAR=ar $MAKE $MAKEFLAGS -C module/bdev/ocf/env exportlib O=$rootdir/build/ocf.a # Set config to use precompiled library config_params="$config_params --with-ocf=/$rootdir/build/ocf.a" fi diff --git a/lib/bdev/Makefile b/lib/bdev/Makefile index 672e65beb..6de952147 100644 --- a/lib/bdev/Makefile +++ b/lib/bdev/Makefile @@ -42,33 +42,4 @@ C_SRCS = bdev.c bdev_rpc.c part.c scsi_nvme.c C_SRCS-$(CONFIG_VTUNE) += vtune.c LIBNAME = bdev -DIRS-y += delay error gpt lvol malloc null nvme passthru raid rpc split - -ifeq ($(CONFIG_CRYPTO),y) -DIRS-y += crypto -endif - -ifeq ($(CONFIG_OCF), y) -DIRS-y += ocf -DIRS-y += ocf/env -DEPDIRS-ocf := ocf/env -endif - -ifeq ($(CONFIG_REDUCE),y) -DIRS-y += compress -endif - -ifeq ($(CONFIG_URING),y) -DIRS-y += uring -endif - -ifeq ($(OS),Linux) -DIRS-y += aio -DIRS-$(CONFIG_ISCSI_INITIATOR) += iscsi -DIRS-$(CONFIG_VIRTIO) += virtio -DIRS-$(CONFIG_PMDK) += pmem -endif - -DIRS-$(CONFIG_RBD) += rbd - include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk diff --git a/mk/spdk.unittest.mk b/mk/spdk.unittest.mk index 0260f67c8..8ab55983a 100644 --- a/mk/spdk.unittest.mk +++ b/mk/spdk.unittest.mk @@ -38,6 +38,7 @@ include $(SPDK_ROOT_DIR)/mk/spdk.mock.unittest.mk C_SRCS = $(TEST_FILE) CFLAGS += -I$(SPDK_ROOT_DIR)/lib +CFLAGS += -I$(SPDK_ROOT_DIR)/module CFLAGS += -I$(SPDK_ROOT_DIR)/test CFLAGS += -ffunction-sections LDFLAGS += -Wl,--gc-sections diff --git a/module/Makefile b/module/Makefile new file mode 100644 index 000000000..2cbb5d05a --- /dev/null +++ b/module/Makefile @@ -0,0 +1,44 @@ +# +# 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. +# + +SPDK_ROOT_DIR := $(abspath $(CURDIR)/..) +include $(SPDK_ROOT_DIR)/mk/spdk.common.mk + +DIRS-y = bdev + +.PHONY: all clean $(DIRS-y) + +all: $(DIRS-y) +clean: $(DIRS-y) + +include $(SPDK_ROOT_DIR)/mk/spdk.subdirs.mk diff --git a/module/bdev/Makefile b/module/bdev/Makefile new file mode 100644 index 000000000..efb5aff81 --- /dev/null +++ b/module/bdev/Makefile @@ -0,0 +1,71 @@ +# +# 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. +# + +SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) +include $(SPDK_ROOT_DIR)/mk/spdk.common.mk + +DIRS-y += delay error gpt lvol malloc null nvme passthru raid rpc split + +ifeq ($(CONFIG_CRYPTO),y) +DIRS-y += crypto +endif + +ifeq ($(CONFIG_OCF), y) +DIRS-y += ocf +DIRS-y += ocf/env +DEPDIRS-ocf := ocf/env +endif + +ifeq ($(CONFIG_REDUCE),y) +DIRS-y += compress +endif + +ifeq ($(CONFIG_URING),y) +DIRS-y += uring +endif + +ifeq ($(OS),Linux) +DIRS-y += aio +DIRS-$(CONFIG_ISCSI_INITIATOR) += iscsi +DIRS-$(CONFIG_VIRTIO) += virtio +DIRS-$(CONFIG_PMDK) += pmem +endif + +DIRS-$(CONFIG_RBD) += rbd + +.PHONY: all clean $(DIRS-y) + +all: $(DIRS-y) +clean: $(DIRS-y) + +include $(SPDK_ROOT_DIR)/mk/spdk.subdirs.mk diff --git a/lib/bdev/aio/Makefile b/module/bdev/aio/Makefile similarity index 100% rename from lib/bdev/aio/Makefile rename to module/bdev/aio/Makefile diff --git a/lib/bdev/aio/bdev_aio.c b/module/bdev/aio/bdev_aio.c similarity index 100% rename from lib/bdev/aio/bdev_aio.c rename to module/bdev/aio/bdev_aio.c diff --git a/lib/bdev/aio/bdev_aio.h b/module/bdev/aio/bdev_aio.h similarity index 100% rename from lib/bdev/aio/bdev_aio.h rename to module/bdev/aio/bdev_aio.h diff --git a/lib/bdev/aio/bdev_aio_rpc.c b/module/bdev/aio/bdev_aio_rpc.c similarity index 100% rename from lib/bdev/aio/bdev_aio_rpc.c rename to module/bdev/aio/bdev_aio_rpc.c diff --git a/lib/bdev/compress/Makefile b/module/bdev/compress/Makefile similarity index 100% rename from lib/bdev/compress/Makefile rename to module/bdev/compress/Makefile diff --git a/lib/bdev/compress/vbdev_compress.c b/module/bdev/compress/vbdev_compress.c similarity index 100% rename from lib/bdev/compress/vbdev_compress.c rename to module/bdev/compress/vbdev_compress.c diff --git a/lib/bdev/compress/vbdev_compress.h b/module/bdev/compress/vbdev_compress.h similarity index 100% rename from lib/bdev/compress/vbdev_compress.h rename to module/bdev/compress/vbdev_compress.h diff --git a/lib/bdev/compress/vbdev_compress_rpc.c b/module/bdev/compress/vbdev_compress_rpc.c similarity index 100% rename from lib/bdev/compress/vbdev_compress_rpc.c rename to module/bdev/compress/vbdev_compress_rpc.c diff --git a/lib/bdev/crypto/Makefile b/module/bdev/crypto/Makefile similarity index 100% rename from lib/bdev/crypto/Makefile rename to module/bdev/crypto/Makefile diff --git a/lib/bdev/crypto/vbdev_crypto.c b/module/bdev/crypto/vbdev_crypto.c similarity index 100% rename from lib/bdev/crypto/vbdev_crypto.c rename to module/bdev/crypto/vbdev_crypto.c diff --git a/lib/bdev/crypto/vbdev_crypto.h b/module/bdev/crypto/vbdev_crypto.h similarity index 100% rename from lib/bdev/crypto/vbdev_crypto.h rename to module/bdev/crypto/vbdev_crypto.h diff --git a/lib/bdev/crypto/vbdev_crypto_rpc.c b/module/bdev/crypto/vbdev_crypto_rpc.c similarity index 100% rename from lib/bdev/crypto/vbdev_crypto_rpc.c rename to module/bdev/crypto/vbdev_crypto_rpc.c diff --git a/lib/bdev/delay/Makefile b/module/bdev/delay/Makefile similarity index 100% rename from lib/bdev/delay/Makefile rename to module/bdev/delay/Makefile diff --git a/lib/bdev/delay/vbdev_delay.c b/module/bdev/delay/vbdev_delay.c similarity index 100% rename from lib/bdev/delay/vbdev_delay.c rename to module/bdev/delay/vbdev_delay.c diff --git a/lib/bdev/delay/vbdev_delay.h b/module/bdev/delay/vbdev_delay.h similarity index 100% rename from lib/bdev/delay/vbdev_delay.h rename to module/bdev/delay/vbdev_delay.h diff --git a/lib/bdev/delay/vbdev_delay_rpc.c b/module/bdev/delay/vbdev_delay_rpc.c similarity index 100% rename from lib/bdev/delay/vbdev_delay_rpc.c rename to module/bdev/delay/vbdev_delay_rpc.c diff --git a/lib/bdev/error/Makefile b/module/bdev/error/Makefile similarity index 100% rename from lib/bdev/error/Makefile rename to module/bdev/error/Makefile diff --git a/lib/bdev/error/vbdev_error.c b/module/bdev/error/vbdev_error.c similarity index 100% rename from lib/bdev/error/vbdev_error.c rename to module/bdev/error/vbdev_error.c diff --git a/lib/bdev/error/vbdev_error.h b/module/bdev/error/vbdev_error.h similarity index 100% rename from lib/bdev/error/vbdev_error.h rename to module/bdev/error/vbdev_error.h diff --git a/lib/bdev/error/vbdev_error_rpc.c b/module/bdev/error/vbdev_error_rpc.c similarity index 100% rename from lib/bdev/error/vbdev_error_rpc.c rename to module/bdev/error/vbdev_error_rpc.c diff --git a/lib/bdev/gpt/Makefile b/module/bdev/gpt/Makefile similarity index 100% rename from lib/bdev/gpt/Makefile rename to module/bdev/gpt/Makefile diff --git a/lib/bdev/gpt/gpt.c b/module/bdev/gpt/gpt.c similarity index 100% rename from lib/bdev/gpt/gpt.c rename to module/bdev/gpt/gpt.c diff --git a/lib/bdev/gpt/gpt.h b/module/bdev/gpt/gpt.h similarity index 100% rename from lib/bdev/gpt/gpt.h rename to module/bdev/gpt/gpt.h diff --git a/lib/bdev/gpt/vbdev_gpt.c b/module/bdev/gpt/vbdev_gpt.c similarity index 100% rename from lib/bdev/gpt/vbdev_gpt.c rename to module/bdev/gpt/vbdev_gpt.c diff --git a/lib/bdev/iscsi/Makefile b/module/bdev/iscsi/Makefile similarity index 100% rename from lib/bdev/iscsi/Makefile rename to module/bdev/iscsi/Makefile diff --git a/lib/bdev/iscsi/bdev_iscsi.c b/module/bdev/iscsi/bdev_iscsi.c similarity index 100% rename from lib/bdev/iscsi/bdev_iscsi.c rename to module/bdev/iscsi/bdev_iscsi.c diff --git a/lib/bdev/iscsi/bdev_iscsi.h b/module/bdev/iscsi/bdev_iscsi.h similarity index 100% rename from lib/bdev/iscsi/bdev_iscsi.h rename to module/bdev/iscsi/bdev_iscsi.h diff --git a/lib/bdev/iscsi/bdev_iscsi_rpc.c b/module/bdev/iscsi/bdev_iscsi_rpc.c similarity index 100% rename from lib/bdev/iscsi/bdev_iscsi_rpc.c rename to module/bdev/iscsi/bdev_iscsi_rpc.c diff --git a/lib/bdev/lvol/Makefile b/module/bdev/lvol/Makefile similarity index 100% rename from lib/bdev/lvol/Makefile rename to module/bdev/lvol/Makefile diff --git a/lib/bdev/lvol/vbdev_lvol.c b/module/bdev/lvol/vbdev_lvol.c similarity index 100% rename from lib/bdev/lvol/vbdev_lvol.c rename to module/bdev/lvol/vbdev_lvol.c diff --git a/lib/bdev/lvol/vbdev_lvol.h b/module/bdev/lvol/vbdev_lvol.h similarity index 100% rename from lib/bdev/lvol/vbdev_lvol.h rename to module/bdev/lvol/vbdev_lvol.h diff --git a/lib/bdev/lvol/vbdev_lvol_rpc.c b/module/bdev/lvol/vbdev_lvol_rpc.c similarity index 100% rename from lib/bdev/lvol/vbdev_lvol_rpc.c rename to module/bdev/lvol/vbdev_lvol_rpc.c diff --git a/lib/bdev/malloc/Makefile b/module/bdev/malloc/Makefile similarity index 100% rename from lib/bdev/malloc/Makefile rename to module/bdev/malloc/Makefile diff --git a/lib/bdev/malloc/bdev_malloc.c b/module/bdev/malloc/bdev_malloc.c similarity index 100% rename from lib/bdev/malloc/bdev_malloc.c rename to module/bdev/malloc/bdev_malloc.c diff --git a/lib/bdev/malloc/bdev_malloc.h b/module/bdev/malloc/bdev_malloc.h similarity index 100% rename from lib/bdev/malloc/bdev_malloc.h rename to module/bdev/malloc/bdev_malloc.h diff --git a/lib/bdev/malloc/bdev_malloc_rpc.c b/module/bdev/malloc/bdev_malloc_rpc.c similarity index 100% rename from lib/bdev/malloc/bdev_malloc_rpc.c rename to module/bdev/malloc/bdev_malloc_rpc.c diff --git a/lib/bdev/null/Makefile b/module/bdev/null/Makefile similarity index 100% rename from lib/bdev/null/Makefile rename to module/bdev/null/Makefile diff --git a/lib/bdev/null/bdev_null.c b/module/bdev/null/bdev_null.c similarity index 100% rename from lib/bdev/null/bdev_null.c rename to module/bdev/null/bdev_null.c diff --git a/lib/bdev/null/bdev_null.h b/module/bdev/null/bdev_null.h similarity index 100% rename from lib/bdev/null/bdev_null.h rename to module/bdev/null/bdev_null.h diff --git a/lib/bdev/null/bdev_null_rpc.c b/module/bdev/null/bdev_null_rpc.c similarity index 100% rename from lib/bdev/null/bdev_null_rpc.c rename to module/bdev/null/bdev_null_rpc.c diff --git a/lib/bdev/nvme/Makefile b/module/bdev/nvme/Makefile similarity index 100% rename from lib/bdev/nvme/Makefile rename to module/bdev/nvme/Makefile diff --git a/lib/bdev/nvme/bdev_ftl.c b/module/bdev/nvme/bdev_ftl.c similarity index 100% rename from lib/bdev/nvme/bdev_ftl.c rename to module/bdev/nvme/bdev_ftl.c diff --git a/lib/bdev/nvme/bdev_ftl.h b/module/bdev/nvme/bdev_ftl.h similarity index 100% rename from lib/bdev/nvme/bdev_ftl.h rename to module/bdev/nvme/bdev_ftl.h diff --git a/lib/bdev/nvme/bdev_ftl_rpc.c b/module/bdev/nvme/bdev_ftl_rpc.c similarity index 100% rename from lib/bdev/nvme/bdev_ftl_rpc.c rename to module/bdev/nvme/bdev_ftl_rpc.c diff --git a/lib/bdev/nvme/bdev_nvme.c b/module/bdev/nvme/bdev_nvme.c similarity index 100% rename from lib/bdev/nvme/bdev_nvme.c rename to module/bdev/nvme/bdev_nvme.c diff --git a/lib/bdev/nvme/bdev_nvme.h b/module/bdev/nvme/bdev_nvme.h similarity index 100% rename from lib/bdev/nvme/bdev_nvme.h rename to module/bdev/nvme/bdev_nvme.h diff --git a/lib/bdev/nvme/bdev_nvme_rpc.c b/module/bdev/nvme/bdev_nvme_rpc.c similarity index 100% rename from lib/bdev/nvme/bdev_nvme_rpc.c rename to module/bdev/nvme/bdev_nvme_rpc.c diff --git a/lib/bdev/nvme/common.c b/module/bdev/nvme/common.c similarity index 100% rename from lib/bdev/nvme/common.c rename to module/bdev/nvme/common.c diff --git a/lib/bdev/nvme/common.h b/module/bdev/nvme/common.h similarity index 100% rename from lib/bdev/nvme/common.h rename to module/bdev/nvme/common.h diff --git a/lib/bdev/nvme/nvme_rpc.c b/module/bdev/nvme/nvme_rpc.c similarity index 100% rename from lib/bdev/nvme/nvme_rpc.c rename to module/bdev/nvme/nvme_rpc.c diff --git a/lib/bdev/ocf/Makefile b/module/bdev/ocf/Makefile similarity index 100% rename from lib/bdev/ocf/Makefile rename to module/bdev/ocf/Makefile diff --git a/lib/bdev/ocf/ctx.c b/module/bdev/ocf/ctx.c similarity index 100% rename from lib/bdev/ocf/ctx.c rename to module/bdev/ocf/ctx.c diff --git a/lib/bdev/ocf/ctx.h b/module/bdev/ocf/ctx.h similarity index 100% rename from lib/bdev/ocf/ctx.h rename to module/bdev/ocf/ctx.h diff --git a/lib/bdev/ocf/data.c b/module/bdev/ocf/data.c similarity index 100% rename from lib/bdev/ocf/data.c rename to module/bdev/ocf/data.c diff --git a/lib/bdev/ocf/data.h b/module/bdev/ocf/data.h similarity index 100% rename from lib/bdev/ocf/data.h rename to module/bdev/ocf/data.h diff --git a/lib/bdev/ocf/env/.gitignore b/module/bdev/ocf/env/.gitignore similarity index 100% rename from lib/bdev/ocf/env/.gitignore rename to module/bdev/ocf/env/.gitignore diff --git a/lib/bdev/ocf/env/Makefile b/module/bdev/ocf/env/Makefile similarity index 89% rename from lib/bdev/ocf/env/Makefile rename to module/bdev/ocf/env/Makefile index c47ea3e4e..0921225b7 100644 --- a/lib/bdev/ocf/env/Makefile +++ b/module/bdev/ocf/env/Makefile @@ -76,17 +76,17 @@ all: ocf_inc ocf_src $(Q)$(MAKE) $(LIB) ocf_inc: - $(Q)$(MAKE) -C "$(CONFIG_OCF_PATH)" inc O="$(SPDK_ROOT_DIR)/lib/bdev/ocf/env/" --quiet + $(Q)$(MAKE) -C "$(CONFIG_OCF_PATH)" inc O="$(SPDK_ROOT_DIR)/module/bdev/ocf/env/" --quiet ocf_src: ocf_inc - $(Q)$(MAKE) -C "$(CONFIG_OCF_PATH)" src O="$(SPDK_ROOT_DIR)/lib/bdev/ocf/env/" CMD=cp --quiet + $(Q)$(MAKE) -C "$(CONFIG_OCF_PATH)" src O="$(SPDK_ROOT_DIR)/module/bdev/ocf/env/" CMD=cp --quiet ocf_distclean: - $(Q)$(MAKE) -C "$(CONFIG_OCF_PATH)" distclean O="$(SPDK_ROOT_DIR)/lib/bdev/ocf/env/" --quiet + $(Q)$(MAKE) -C "$(CONFIG_OCF_PATH)" distclean O="$(SPDK_ROOT_DIR)/module/bdev/ocf/env/" --quiet clean: ocf_distclean - $(Q)rm -rf "$(SPDK_ROOT_DIR)/lib/bdev/ocf/env/include" \ - "$(SPDK_ROOT_DIR)/lib/bdev/ocf/env/src" \ + $(Q)rm -rf "$(SPDK_ROOT_DIR)/module/bdev/ocf/env/include" \ + "$(SPDK_ROOT_DIR)/module/bdev/ocf/env/src" \ $(LIB) $(OBJS); $(LIB): $(OBJS) diff --git a/lib/bdev/ocf/env/ocf_env.c b/module/bdev/ocf/env/ocf_env.c similarity index 100% rename from lib/bdev/ocf/env/ocf_env.c rename to module/bdev/ocf/env/ocf_env.c diff --git a/lib/bdev/ocf/env/ocf_env.h b/module/bdev/ocf/env/ocf_env.h similarity index 100% rename from lib/bdev/ocf/env/ocf_env.h rename to module/bdev/ocf/env/ocf_env.h diff --git a/lib/bdev/ocf/env/ocf_env_headers.h b/module/bdev/ocf/env/ocf_env_headers.h similarity index 100% rename from lib/bdev/ocf/env/ocf_env_headers.h rename to module/bdev/ocf/env/ocf_env_headers.h diff --git a/lib/bdev/ocf/env/ocf_env_list.h b/module/bdev/ocf/env/ocf_env_list.h similarity index 100% rename from lib/bdev/ocf/env/ocf_env_list.h rename to module/bdev/ocf/env/ocf_env_list.h diff --git a/lib/bdev/ocf/stats.c b/module/bdev/ocf/stats.c similarity index 100% rename from lib/bdev/ocf/stats.c rename to module/bdev/ocf/stats.c diff --git a/lib/bdev/ocf/stats.h b/module/bdev/ocf/stats.h similarity index 100% rename from lib/bdev/ocf/stats.h rename to module/bdev/ocf/stats.h diff --git a/lib/bdev/ocf/utils.c b/module/bdev/ocf/utils.c similarity index 100% rename from lib/bdev/ocf/utils.c rename to module/bdev/ocf/utils.c diff --git a/lib/bdev/ocf/utils.h b/module/bdev/ocf/utils.h similarity index 100% rename from lib/bdev/ocf/utils.h rename to module/bdev/ocf/utils.h diff --git a/lib/bdev/ocf/vbdev_ocf.c b/module/bdev/ocf/vbdev_ocf.c similarity index 100% rename from lib/bdev/ocf/vbdev_ocf.c rename to module/bdev/ocf/vbdev_ocf.c diff --git a/lib/bdev/ocf/vbdev_ocf.h b/module/bdev/ocf/vbdev_ocf.h similarity index 100% rename from lib/bdev/ocf/vbdev_ocf.h rename to module/bdev/ocf/vbdev_ocf.h diff --git a/lib/bdev/ocf/vbdev_ocf_rpc.c b/module/bdev/ocf/vbdev_ocf_rpc.c similarity index 100% rename from lib/bdev/ocf/vbdev_ocf_rpc.c rename to module/bdev/ocf/vbdev_ocf_rpc.c diff --git a/lib/bdev/ocf/volume.c b/module/bdev/ocf/volume.c similarity index 100% rename from lib/bdev/ocf/volume.c rename to module/bdev/ocf/volume.c diff --git a/lib/bdev/ocf/volume.h b/module/bdev/ocf/volume.h similarity index 100% rename from lib/bdev/ocf/volume.h rename to module/bdev/ocf/volume.h diff --git a/lib/bdev/passthru/Makefile b/module/bdev/passthru/Makefile similarity index 100% rename from lib/bdev/passthru/Makefile rename to module/bdev/passthru/Makefile diff --git a/lib/bdev/passthru/vbdev_passthru.c b/module/bdev/passthru/vbdev_passthru.c similarity index 100% rename from lib/bdev/passthru/vbdev_passthru.c rename to module/bdev/passthru/vbdev_passthru.c diff --git a/lib/bdev/passthru/vbdev_passthru.h b/module/bdev/passthru/vbdev_passthru.h similarity index 100% rename from lib/bdev/passthru/vbdev_passthru.h rename to module/bdev/passthru/vbdev_passthru.h diff --git a/lib/bdev/passthru/vbdev_passthru_rpc.c b/module/bdev/passthru/vbdev_passthru_rpc.c similarity index 100% rename from lib/bdev/passthru/vbdev_passthru_rpc.c rename to module/bdev/passthru/vbdev_passthru_rpc.c diff --git a/lib/bdev/pmem/Makefile b/module/bdev/pmem/Makefile similarity index 100% rename from lib/bdev/pmem/Makefile rename to module/bdev/pmem/Makefile diff --git a/lib/bdev/pmem/bdev_pmem.c b/module/bdev/pmem/bdev_pmem.c similarity index 100% rename from lib/bdev/pmem/bdev_pmem.c rename to module/bdev/pmem/bdev_pmem.c diff --git a/lib/bdev/pmem/bdev_pmem.h b/module/bdev/pmem/bdev_pmem.h similarity index 100% rename from lib/bdev/pmem/bdev_pmem.h rename to module/bdev/pmem/bdev_pmem.h diff --git a/lib/bdev/pmem/bdev_pmem_rpc.c b/module/bdev/pmem/bdev_pmem_rpc.c similarity index 100% rename from lib/bdev/pmem/bdev_pmem_rpc.c rename to module/bdev/pmem/bdev_pmem_rpc.c diff --git a/lib/bdev/raid/Makefile b/module/bdev/raid/Makefile similarity index 100% rename from lib/bdev/raid/Makefile rename to module/bdev/raid/Makefile diff --git a/lib/bdev/raid/bdev_raid.c b/module/bdev/raid/bdev_raid.c similarity index 100% rename from lib/bdev/raid/bdev_raid.c rename to module/bdev/raid/bdev_raid.c diff --git a/lib/bdev/raid/bdev_raid.h b/module/bdev/raid/bdev_raid.h similarity index 100% rename from lib/bdev/raid/bdev_raid.h rename to module/bdev/raid/bdev_raid.h diff --git a/lib/bdev/raid/bdev_raid_rpc.c b/module/bdev/raid/bdev_raid_rpc.c similarity index 100% rename from lib/bdev/raid/bdev_raid_rpc.c rename to module/bdev/raid/bdev_raid_rpc.c diff --git a/lib/bdev/rbd/Makefile b/module/bdev/rbd/Makefile similarity index 100% rename from lib/bdev/rbd/Makefile rename to module/bdev/rbd/Makefile diff --git a/lib/bdev/rbd/bdev_rbd.c b/module/bdev/rbd/bdev_rbd.c similarity index 100% rename from lib/bdev/rbd/bdev_rbd.c rename to module/bdev/rbd/bdev_rbd.c diff --git a/lib/bdev/rbd/bdev_rbd.h b/module/bdev/rbd/bdev_rbd.h similarity index 100% rename from lib/bdev/rbd/bdev_rbd.h rename to module/bdev/rbd/bdev_rbd.h diff --git a/lib/bdev/rbd/bdev_rbd_rpc.c b/module/bdev/rbd/bdev_rbd_rpc.c similarity index 100% rename from lib/bdev/rbd/bdev_rbd_rpc.c rename to module/bdev/rbd/bdev_rbd_rpc.c diff --git a/lib/bdev/rpc/Makefile b/module/bdev/rpc/Makefile similarity index 100% rename from lib/bdev/rpc/Makefile rename to module/bdev/rpc/Makefile diff --git a/lib/bdev/rpc/bdev_rpc.c b/module/bdev/rpc/bdev_rpc.c similarity index 100% rename from lib/bdev/rpc/bdev_rpc.c rename to module/bdev/rpc/bdev_rpc.c diff --git a/lib/bdev/split/Makefile b/module/bdev/split/Makefile similarity index 100% rename from lib/bdev/split/Makefile rename to module/bdev/split/Makefile diff --git a/lib/bdev/split/vbdev_split.c b/module/bdev/split/vbdev_split.c similarity index 100% rename from lib/bdev/split/vbdev_split.c rename to module/bdev/split/vbdev_split.c diff --git a/lib/bdev/split/vbdev_split.h b/module/bdev/split/vbdev_split.h similarity index 100% rename from lib/bdev/split/vbdev_split.h rename to module/bdev/split/vbdev_split.h diff --git a/lib/bdev/split/vbdev_split_rpc.c b/module/bdev/split/vbdev_split_rpc.c similarity index 100% rename from lib/bdev/split/vbdev_split_rpc.c rename to module/bdev/split/vbdev_split_rpc.c diff --git a/lib/bdev/uring/Makefile b/module/bdev/uring/Makefile similarity index 100% rename from lib/bdev/uring/Makefile rename to module/bdev/uring/Makefile diff --git a/lib/bdev/uring/bdev_uring.c b/module/bdev/uring/bdev_uring.c similarity index 100% rename from lib/bdev/uring/bdev_uring.c rename to module/bdev/uring/bdev_uring.c diff --git a/lib/bdev/uring/bdev_uring.h b/module/bdev/uring/bdev_uring.h similarity index 100% rename from lib/bdev/uring/bdev_uring.h rename to module/bdev/uring/bdev_uring.h diff --git a/lib/bdev/virtio/Makefile b/module/bdev/virtio/Makefile similarity index 100% rename from lib/bdev/virtio/Makefile rename to module/bdev/virtio/Makefile diff --git a/lib/bdev/virtio/bdev_virtio.h b/module/bdev/virtio/bdev_virtio.h similarity index 100% rename from lib/bdev/virtio/bdev_virtio.h rename to module/bdev/virtio/bdev_virtio.h diff --git a/lib/bdev/virtio/bdev_virtio_blk.c b/module/bdev/virtio/bdev_virtio_blk.c similarity index 100% rename from lib/bdev/virtio/bdev_virtio_blk.c rename to module/bdev/virtio/bdev_virtio_blk.c diff --git a/lib/bdev/virtio/bdev_virtio_rpc.c b/module/bdev/virtio/bdev_virtio_rpc.c similarity index 100% rename from lib/bdev/virtio/bdev_virtio_rpc.c rename to module/bdev/virtio/bdev_virtio_rpc.c diff --git a/lib/bdev/virtio/bdev_virtio_scsi.c b/module/bdev/virtio/bdev_virtio_scsi.c similarity index 100% rename from lib/bdev/virtio/bdev_virtio_scsi.c rename to module/bdev/virtio/bdev_virtio_scsi.c diff --git a/test/common/autotest_common.sh b/test/common/autotest_common.sh index 4170fd969..260fecbad 100644 --- a/test/common/autotest_common.sh +++ b/test/common/autotest_common.sh @@ -594,7 +594,7 @@ function part_dev_by_gpt () { parted -s $nbd_path mklabel gpt mkpart first '0%' '50%' mkpart second '50%' '100%' # change the GUID to SPDK GUID value - SPDK_GPT_GUID=$(grep SPDK_GPT_PART_TYPE_GUID $rootdir/lib/bdev/gpt/gpt.h \ + SPDK_GPT_GUID=$(grep SPDK_GPT_PART_TYPE_GUID $rootdir/module/bdev/gpt/gpt.h \ | awk -F "(" '{ print $2}' | sed 's/)//g' \ | awk -F ", " '{ print $1 "-" $2 "-" $3 "-" $4 "-" $5}' | sed 's/0x//g') sgdisk -t 1:$SPDK_GPT_GUID $nbd_path