Commit a96a6ecf authored by Ben Walker's avatar Ben Walker
Browse files

nvme: Rename nvme_qpair_construct to nvme_qpair_init 



This function initializes the members of an existing
qpair struct. It doesn't construct one from scratch.

Change-Id: I0b9afac1ad25cfb217efd146702f693c74f5f697
Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 3e5c1d0a

lib/nvme/nvme_internal.h

+4 −4
Original line number Diff line number Diff line
@@ -529,7 +529,7 @@ int nvme_ctrlr_submit_admin_request(struct spdk_nvme_ctrlr *ctrlr, 
					struct nvme_request *req);

int	nvme_ctrlr_get_cap(struct spdk_nvme_ctrlr *ctrlr, union spdk_nvme_cap_register *cap);

void	nvme_ctrlr_init_cap(struct spdk_nvme_ctrlr *ctrlr, const union spdk_nvme_cap_register *cap);

int	nvme_qpair_construct(struct spdk_nvme_qpair *qpair, uint16_t id,

int	nvme_qpair_init(struct spdk_nvme_qpair *qpair, uint16_t id,

			uint16_t num_entries,

			struct spdk_nvme_ctrlr *ctrlr,

			enum spdk_nvme_qprio qprio);

lib/nvme/nvme_pcie.c

+6 −6
Original line number Diff line number Diff line
@@ -523,7 +523,7 @@ nvme_pcie_ctrlr_construct_admin_qpair(struct spdk_nvme_ctrlr *ctrlr) 


	ctrlr->adminq = &pqpair->qpair;



	rc = nvme_qpair_construct(ctrlr->adminq,

	rc = nvme_qpair_init(ctrlr->adminq,

			     0, /* qpair ID */

			     NVME_ADMIN_ENTRIES,

			     ctrlr,
@@ -1345,7 +1345,7 @@ nvme_pcie_ctrlr_create_io_qpair(struct spdk_nvme_ctrlr *ctrlr, uint16_t qid, 


	qpair = &pqpair->qpair;



	rc = nvme_qpair_construct(qpair, qid, ctrlr->opts.io_queue_size, ctrlr, qprio);

	rc = nvme_qpair_init(qpair, qid, ctrlr->opts.io_queue_size, ctrlr, qprio);

	if (rc != 0) {

		nvme_pcie_qpair_destroy(qpair);

		return NULL;

lib/nvme/nvme_qpair.c

+4 −4
Original line number Diff line number Diff line
@@ -340,7 +340,7 @@ spdk_nvme_qpair_process_completions(struct spdk_nvme_qpair *qpair, uint32_t max_ 
}



int

nvme_qpair_construct(struct spdk_nvme_qpair *qpair, uint16_t id,

nvme_qpair_init(struct spdk_nvme_qpair *qpair, uint16_t id,

		uint16_t num_entries,

		struct spdk_nvme_ctrlr *ctrlr,

		enum spdk_nvme_qprio qprio)

lib/nvme/nvme_rdma.c

+1 −1
Original line number Diff line number Diff line
@@ -941,7 +941,7 @@ nvme_rdma_ctrlr_create_qpair(struct spdk_nvme_ctrlr *ctrlr, uint16_t qid, 
		num_entries = ctrlr->opts.io_queue_size;

	}



	rc = nvme_qpair_construct(qpair, qid, num_entries, ctrlr, qprio);

	rc = nvme_qpair_init(qpair, qid, num_entries, ctrlr, qprio);

	if (rc != 0) {

		return NULL;

	}

test/lib/nvme/unit/nvme_ctrlr_c/nvme_ctrlr_ut.c

+4 −4
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ nvme_transport_qpair_reset(struct spdk_nvme_qpair *qpair) 
	return 0;

}



int nvme_qpair_construct(struct spdk_nvme_qpair *qpair, uint16_t id,

int nvme_qpair_init(struct spdk_nvme_qpair *qpair, uint16_t id,

		    uint16_t num_entries,

		    struct spdk_nvme_ctrlr *ctrlr,

		    enum spdk_nvme_qprio qprio)