Commit bd920fd5 authored by Boris Glimcher's avatar Boris Glimcher Committed by Tomasz Zawadzki
Browse files

nvmf: freebsd fix for nonstring break 



Part of the #3661 the break was introduced to FreeBSD.
Since FreeBSD is using clang and not gcc and missing nonstring.

Fixes #3691

Change-Id: I9cb704c3dfee35b5fd7a6b2553c6b63af109c483
Signed-off-by: default avatarBoris Glimcher <Boris.Glimcher@emc.com>
Reviewed-on: https://review.spdk.io/c/spdk/spdk/+/26174


Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK Automated Test System <spdkbot@gmail.com>
Reviewed-by: default avatarKonrad Sztyber <ksztyber@nvidia.com>
Reviewed-by: default avatarCody Cheng <cody.cheng@unh.edu>
Reviewed-by: default avatarJim Harris <jim.harris@nvidia.com>
parent 29b08ec4

lib/nvmf/nvmf_internal.h

+6 −0
Original line number Diff line number Diff line
@@ -32,6 +32,12 @@ 
#define NVMF_DEFAULT_KAS 100

#define NVMF_DEFAULT_MIN_KATO 10000



#if __has_attribute(nonstring)

#define __spdk_nonstring __attribute__((nonstring))

#else

#define __spdk_nonstring

#endif



enum spdk_nvmf_tgt_state {

	NVMF_TGT_IDLE = 0,

	NVMF_TGT_RUNNING,

lib/nvmf/nvmf_rpc.c

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ static int rpc_ana_state_parse(const char *str, enum spdk_nvme_ana_state *ana_st 
static int

json_write_hex_str(struct spdk_json_write_ctx *w, const void *data, size_t size)

{

	static const char __attribute__((nonstring)) hex_char[16] = "0123456789ABCDEF";

	static const char __spdk_nonstring hex_char[16] = "0123456789ABCDEF";

	const uint8_t *buf = data;

	char *str, *out;

	int rc;

test/unit/lib/nvmf/ctrlr_bdev.c/ctrlr_bdev_ut.c

+1 −1
Original line number Diff line number Diff line
@@ -554,7 +554,7 @@ test_nvmf_bdev_ctrlr_identify_ns(void) 
	struct spdk_bdev bdev = {};

	struct spdk_bdev_desc desc = {};

	uint8_t ns_g_id[16] = "abcdefgh";

	uint8_t __attribute__((nonstring)) eui64[8] = "12345678";

	uint8_t __spdk_nonstring eui64[8] = "12345678";



	desc.bdev = &bdev;

	ns.desc = &desc;