Commit e838f2ec authored by Konrad Sztyber's avatar Konrad Sztyber Committed by Tomasz Zawadzki
Browse files

nvme: keep stubbed function in a single place 



It gets rid of a few #ifdefs from source files with actual code.

Signed-off-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Change-Id: I62af47ba3c5cac0e00becb979b27df98ff05bfe6
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/22112


Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent 5420e499

lib/nvme/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -14,7 +14,8 @@ C_SRCS = nvme_ctrlr_cmd.c nvme_ctrlr.c nvme_fabric.c nvme_ns_cmd.c \ 
	nvme_quirks.c nvme_transport.c nvme_discovery.c \

	nvme_ctrlr_ocssd_cmd.c nvme_ns_ocssd_cmd.c nvme_tcp.c \

	nvme_opal.c nvme_io_msg.c nvme_poll_group.c nvme_zns.c \

	nvme_cuse.c

	nvme_stubs.c

C_SRCS-$(CONFIG_NVME_CUSE) += nvme_cuse.c

C_SRCS-$(CONFIG_VFIO_USER) += nvme_vfio_user.c

C_SRCS-$(CONFIG_RDMA) += nvme_rdma.c

lib/nvme/nvme.c

+0 −9
Original line number Diff line number Diff line
@@ -1602,13 +1602,4 @@ nvme_parse_addr(struct sockaddr_storage *sa, int family, const char *addr, const 
	return ret;

}



#ifndef SPDK_CONFIG_RDMA

void

spdk_nvme_rdma_init_hooks(struct spdk_nvme_rdma_hooks *hooks)

{

	SPDK_ERRLOG("spdk_nvme_rdma_init_hooks() is unsupported: RDMA transport is not available\n");

	abort();

}

#endif



SPDK_LOG_REGISTER_COMPONENT(nvme)

lib/nvme/nvme_cuse.c

+0 −39
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 
#include "spdk/log.h"

#include "spdk/nvme.h"



#ifdef SPDK_CONFIG_NVME_CUSE

#define FUSE_USE_VERSION 31



#include <fuse3/cuse_lowlevel.h>
@@ -1415,41 +1414,3 @@ spdk_nvme_cuse_get_ns_name(struct spdk_nvme_ctrlr *ctrlr, uint32_t nsid, char *n 
}



SPDK_LOG_REGISTER_COMPONENT(nvme_cuse)
 


#else /* SPDK_CONFIG_NVME_CUSE */



int

spdk_nvme_cuse_get_ctrlr_name(struct spdk_nvme_ctrlr *ctrlr, char *name, size_t *size)

{

	SPDK_ERRLOG("spdk_nvme_cuse_get_ctrlr_name() is unsupported\n");

	return -ENOTSUP;

}



int

spdk_nvme_cuse_get_ns_name(struct spdk_nvme_ctrlr *ctrlr, uint32_t nsid, char *name, size_t *size)

{

	SPDK_ERRLOG("spdk_nvme_cuse_get_ns_name() is unsupported\n");

	return -ENOTSUP;

}



int

spdk_nvme_cuse_register(struct spdk_nvme_ctrlr *ctrlr)

{

	SPDK_ERRLOG("spdk_nvme_cuse_register() is unsupported\n");

	return -ENOTSUP;

}



int

spdk_nvme_cuse_unregister(struct spdk_nvme_ctrlr *ctrlr)

{

	SPDK_ERRLOG("spdk_nvme_cuse_unregister() is unsupported\n");

	return -ENOTSUP;

}



void

spdk_nvme_cuse_update_namespaces(struct spdk_nvme_ctrlr *ctrlr)

{

	SPDK_ERRLOG("spdk_nvme_cuse_update_namespaces() is unsupported\n");

}



#endif

lib/nvme/nvme_stubs.c

0 → 100644
+54 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: BSD-3-Clause

 * Copyright (c) 2024 Intel Corporation.  All rights reserved.

 */



#include "spdk/config.h"

#include "spdk/log.h"

#include "spdk/nvme.h"

#include "spdk/stdinc.h"

#include "nvme_internal.h"



#ifndef SPDK_CONFIG_NVME_CUSE

int

spdk_nvme_cuse_get_ctrlr_name(struct spdk_nvme_ctrlr *ctrlr, char *name, size_t *size)

{

	SPDK_ERRLOG("spdk_nvme_cuse_get_ctrlr_name() is unsupported\n");

	return -ENOTSUP;

}



int

spdk_nvme_cuse_get_ns_name(struct spdk_nvme_ctrlr *ctrlr, uint32_t nsid, char *name, size_t *size)

{

	SPDK_ERRLOG("spdk_nvme_cuse_get_ns_name() is unsupported\n");

	return -ENOTSUP;

}



int

spdk_nvme_cuse_register(struct spdk_nvme_ctrlr *ctrlr)

{

	SPDK_ERRLOG("spdk_nvme_cuse_register() is unsupported\n");

	return -ENOTSUP;

}



int

spdk_nvme_cuse_unregister(struct spdk_nvme_ctrlr *ctrlr)

{

	SPDK_ERRLOG("spdk_nvme_cuse_unregister() is unsupported\n");

	return -ENOTSUP;

}



void

spdk_nvme_cuse_update_namespaces(struct spdk_nvme_ctrlr *ctrlr)

{

	SPDK_ERRLOG("spdk_nvme_cuse_update_namespaces() is unsupported\n");

}

#endif /* !SPDK_CONFIG_NVME_CUSE */



#ifndef SPDK_CONFIG_RDMA

void

spdk_nvme_rdma_init_hooks(struct spdk_nvme_rdma_hooks *hooks)

{

	SPDK_ERRLOG("spdk_nvme_rdma_init_hooks() is unsupported: RDMA transport is not available\n");

	abort();

}

#endif /* !SPDK_CONFIG_RDMA */