Commit 5be704cf authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Tomasz Zawadzki
Browse files

test/nvme: Use foreach_dev() macro for detach 



Signed-off-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: Ibf2e50e23c14929a42fff9b155907302b53a4126
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4438


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
parent 47d4ead9

test/nvme/aer/aer.c

+1 −4
Original line number Diff line number Diff line
@@ -525,7 +525,6 @@ spdk_aer_changed_ns_test(void) 
int main(int argc, char **argv)

{

	struct dev		*dev;

	int			i;

	struct spdk_env_opts	opts;

	int			rc;
@@ -597,9 +596,7 @@ int main(int argc, char **argv) 
		spdk_nvme_ctrlr_register_aer_callback(dev->ctrlr, NULL, NULL);

	}



	for (i = 0; i < g_num_devs; i++) {

		struct dev *dev = &g_devs[i];



	foreach_dev(dev) {

		spdk_nvme_detach(dev->ctrlr);

	}

test/nvme/e2edp/nvme_dp.c

+3 −5
Original line number Diff line number Diff line
@@ -605,7 +605,7 @@ attach_cb(void *cb_ctx, const struct spdk_nvme_transport_id *trid, 
int main(int argc, char **argv)

{

	struct dev		*iter;

	int			rc, i;

	int			rc;

	struct spdk_env_opts	opts;



	spdk_env_opts_init(&opts);
@@ -642,10 +642,8 @@ int main(int argc, char **argv) 


	printf("Cleaning up...\n");



	for (i = 0; i < num_devs; i++) {

		struct dev *dev = &devs[i];



		spdk_nvme_detach(dev->ctrlr);

	foreach_dev(iter) {

		spdk_nvme_detach(iter->ctrlr);

	}



	return rc;

test/nvme/err_injection/err_injection.c

+1 −3
Original line number Diff line number Diff line
@@ -213,7 +213,6 @@ cleanup: 
int main(int argc, char **argv)

{

	struct dev		*dev;

	int			i;

	struct spdk_env_opts	opts;

	int			rc;
@@ -270,8 +269,7 @@ int main(int argc, char **argv) 


exit:

	printf("Cleaning up...\n");

	for (i = 0; i < num_devs; i++) {

		struct dev *dev = &devs[i];

	foreach_dev(dev) {

		spdk_nvme_detach(dev->ctrlr);

	}

test/nvme/reserve/reserve.c

+2 −4
Original line number Diff line number Diff line
@@ -412,7 +412,6 @@ attach_cb(void *cb_ctx, const struct spdk_nvme_transport_id *trid, 
int main(int argc, char **argv)

{

	struct dev		*iter;

	int			i;

	struct spdk_env_opts	opts;

	int			ret = 0;
@@ -448,9 +447,8 @@ int main(int argc, char **argv) 


	printf("Reservation test %s\n", ret ? "failed" : "passed");



	for (i = 0; i < g_num_devs; i++) {

		struct dev *dev = &g_devs[i];

		spdk_nvme_detach(dev->ctrlr);

	foreach_dev(iter) {

		spdk_nvme_detach(iter->ctrlr);

	}



	return ret;

test/nvme/sgl/sgl.c

+3 −5
Original line number Diff line number Diff line
@@ -493,7 +493,7 @@ attach_cb(void *cb_ctx, const struct spdk_nvme_transport_id *trid, 
int main(int argc, char **argv)

{

	struct dev		*iter;

	int			rc, i;

	int			rc;

	struct spdk_env_opts	opts;



	spdk_env_opts_init(&opts);
@@ -535,10 +535,8 @@ int main(int argc, char **argv) 


	printf("Cleaning up...\n");



	for (i = 0; i < num_devs; i++) {

		struct dev *dev = &devs[i];



		spdk_nvme_detach(dev->ctrlr);

	foreach_dev(iter) {

		spdk_nvme_detach(iter->ctrlr);

	}



	return rc;