From 21844100270c97991f94a915c5713203801c7940 Mon Sep 17 00:00:00 2001
From: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Date: Tue, 22 Jun 2021 17:22:42 +0900
Subject: [PATCH] test/env_dpdk_post_init: Use spdk_nvme_detach_async()

Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: I7d78cc1a5ab1d696abcba9cd83aeac913ea101de
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/8472
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
---
 test/env/env_dpdk_post_init/env_dpdk_post_init.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/test/env/env_dpdk_post_init/env_dpdk_post_init.c b/test/env/env_dpdk_post_init/env_dpdk_post_init.c
index 1b3897ea8..9ed08354d 100644
--- a/test/env/env_dpdk_post_init/env_dpdk_post_init.c
+++ b/test/env/env_dpdk_post_init/env_dpdk_post_init.c
@@ -95,6 +95,7 @@ main(int argc, char **argv)
 {
 	int ret;
 	int i;
+	struct spdk_nvme_detach_ctx *detach_ctx = NULL;
 
 	printf("Starting DPDK initialization...\n");
 	ret = rte_eal_init(argc, argv);
@@ -119,7 +120,11 @@ main(int argc, char **argv)
 	printf("Cleaning up...\n");
 	for (i = 0; i < g_num_devs; i++) {
 		struct dev *dev = &g_nvme_devs[i];
-		spdk_nvme_detach(dev->ctrlr);
+		spdk_nvme_detach_async(dev->ctrlr, &detach_ctx);
+	}
+
+	if (detach_ctx) {
+		spdk_nvme_detach_poll(detach_ctx);
 	}
 
 	return g_failed;