From 00450d8a8427020d3d1b1b91c41a9c2a04a450c9 Mon Sep 17 00:00:00 2001
From: Seth Howell <seth.howell@intel.com>
Date: Tue, 6 Nov 2018 12:25:51 -0700
Subject: [PATCH] nvme/aer: unregister aer cb before detaching from ctrlrs

This will enable us to fail all outstanding I/O when disconnecting an
NVMe-oF qpair.

Change-Id: I84190a19da23ef2d88d9fc26e25b33bd0f364b0c
Signed-off-by: Seth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/432211
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Paul Luse <paul.e.luse@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
---
 test/nvme/aer/aer.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/nvme/aer/aer.c b/test/nvme/aer/aer.c
index 90ec32bd1..10b5b1c2a 100644
--- a/test/nvme/aer/aer.c
+++ b/test/nvme/aer/aer.c
@@ -566,6 +566,11 @@ int main(int argc, char **argv)
 		}
 	}
 
+	/* unregister AER callback so we don't fail on aborted AERs when we close out qpairs. */
+	foreach_dev(dev) {
+		spdk_nvme_ctrlr_register_aer_callback(dev->ctrlr, NULL, NULL);
+	}
+
 	for (i = 0; i < num_devs; i++) {
 		struct dev *dev = &devs[i];