Commit 71b08028 authored by Maciej Szwed's avatar Maciej Szwed Committed by Darek Stojaczyk
Browse files

bdev/nvme: Move functions related to NVMe controller to common.c 



Functions moved in this patch may be used in future by
other NVMe based bdevs.

Signed-off-by: default avatarMaciej Szwed <maciej.szwed@intel.com>
Change-Id: I975b61b7f78855e67d65ab7d9fd9f5dd859ac570
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/443753


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarPawel Wodkowski <pawelx.wodkowski@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
parent d8ee1237

lib/bdev/nvme/bdev_nvme.c

+0 −41
Original line number Diff line number Diff line
@@ -150,18 +150,6 @@ spdk_bdev_nvme_get_io_qpair(struct spdk_io_channel *ctrlr_io_ch) 
	return nvme_ch->qpair;

}



struct nvme_bdev_ctrlr *

nvme_bdev_first_ctrlr(void)

{

	return TAILQ_FIRST(&g_nvme_bdev_ctrlrs);

}



struct nvme_bdev_ctrlr *

nvme_bdev_next_ctrlr(struct nvme_bdev_ctrlr *prev)

{

	return TAILQ_NEXT(prev, tailq);

}



static int

bdev_nvme_get_ctx_size(void)

{
@@ -562,35 +550,6 @@ bdev_nvme_get_io_channel(void *ctx) 
	return spdk_get_io_channel(nvme_bdev->nvme_bdev_ctrlr->ctrlr);

}



void

nvme_bdev_dump_trid_json(struct spdk_nvme_transport_id *trid, struct spdk_json_write_ctx *w)

{

	const char *trtype_str;

	const char *adrfam_str;



	trtype_str = spdk_nvme_transport_id_trtype_str(trid->trtype);

	if (trtype_str) {

		spdk_json_write_named_string(w, "trtype", trtype_str);

	}



	adrfam_str = spdk_nvme_transport_id_adrfam_str(trid->adrfam);

	if (adrfam_str) {

		spdk_json_write_named_string(w, "adrfam", adrfam_str);

	}



	if (trid->traddr[0] != '\0') {

		spdk_json_write_named_string(w, "traddr", trid->traddr);

	}



	if (trid->trsvcid[0] != '\0') {

		spdk_json_write_named_string(w, "trsvcid", trid->trsvcid);

	}



	if (trid->subnqn[0] != '\0') {

		spdk_json_write_named_string(w, "subnqn", trid->subnqn);

	}

}



static int

bdev_nvme_dump_info_json(void *ctx, struct spdk_json_write_ctx *w)

{

lib/bdev/nvme/bdev_nvme.h

+0 −5
Original line number Diff line number Diff line
@@ -53,12 +53,7 @@ struct spdk_bdev_nvme_opts { 
	uint64_t nvme_adminq_poll_period_us;

};



void nvme_bdev_dump_trid_json(struct spdk_nvme_transport_id *trid,

			      struct spdk_json_write_ctx *w);



struct spdk_nvme_qpair *spdk_bdev_nvme_get_io_qpair(struct spdk_io_channel *ctrlr_io_ch);

struct nvme_bdev_ctrlr *nvme_bdev_first_ctrlr(void);

struct nvme_bdev_ctrlr *nvme_bdev_next_ctrlr(struct nvme_bdev_ctrlr *prev);

void spdk_bdev_nvme_get_opts(struct spdk_bdev_nvme_opts *opts);

int spdk_bdev_nvme_set_opts(const struct spdk_bdev_nvme_opts *opts);

int spdk_bdev_nvme_set_hotplug(bool enabled, uint64_t period_us, spdk_msg_fn cb, void *cb_ctx);

lib/bdev/nvme/common.c

+41 −0
Original line number Diff line number Diff line
@@ -68,3 +68,44 @@ nvme_bdev_ctrlr_get_by_name(const char *name) 


	return NULL;

}



struct nvme_bdev_ctrlr *

nvme_bdev_first_ctrlr(void)

{

	return TAILQ_FIRST(&g_nvme_bdev_ctrlrs);

}



struct nvme_bdev_ctrlr *

nvme_bdev_next_ctrlr(struct nvme_bdev_ctrlr *prev)

{

	return TAILQ_NEXT(prev, tailq);

}



void

nvme_bdev_dump_trid_json(struct spdk_nvme_transport_id *trid, struct spdk_json_write_ctx *w)

{

	const char *trtype_str;

	const char *adrfam_str;



	trtype_str = spdk_nvme_transport_id_trtype_str(trid->trtype);

	if (trtype_str) {

		spdk_json_write_named_string(w, "trtype", trtype_str);

	}



	adrfam_str = spdk_nvme_transport_id_adrfam_str(trid->adrfam);

	if (adrfam_str) {

		spdk_json_write_named_string(w, "adrfam", adrfam_str);

	}



	if (trid->traddr[0] != '\0') {

		spdk_json_write_named_string(w, "traddr", trid->traddr);

	}



	if (trid->trsvcid[0] != '\0') {

		spdk_json_write_named_string(w, "trsvcid", trid->trsvcid);

	}



	if (trid->subnqn[0] != '\0') {

		spdk_json_write_named_string(w, "subnqn", trid->subnqn);

	}

}

lib/bdev/nvme/common.h

+5 −0
Original line number Diff line number Diff line
@@ -80,5 +80,10 @@ struct nvme_bdev { 


struct nvme_bdev_ctrlr *nvme_bdev_ctrlr_get(const struct spdk_nvme_transport_id *trid);

struct nvme_bdev_ctrlr *nvme_bdev_ctrlr_get_by_name(const char *name);

struct nvme_bdev_ctrlr *nvme_bdev_first_ctrlr(void);

struct nvme_bdev_ctrlr *nvme_bdev_next_ctrlr(struct nvme_bdev_ctrlr *prev);



void nvme_bdev_dump_trid_json(struct spdk_nvme_transport_id *trid,

			      struct spdk_json_write_ctx *w);



#endif /* SPDK_COMMON_BDEV_NVME_H */