Commit 88a72713 authored by Daniel Verkamp's avatar Daniel Verkamp Committed by Jim Harris
Browse files

nvmf: combine set_aer_callback and attach 



Change-Id: Icb6aab97aa78862b19c1fa68fac2b7ac44feea90
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
parent b592cf6c

include/spdk/nvmf.h

+0 −5
Original line number Diff line number Diff line
@@ -89,11 +89,6 @@ struct spdk_nvmf_ctrlr_ops { 
	 */

	int (*attach)(struct spdk_nvmf_subsystem *subsystem);



	/**

	 * Set NVMe ctrlr AER.

	 */

	void (*set_aer_callback)(struct spdk_nvmf_subsystem *subsys);



	/**

	 * Get NVMe identify controller data.

	 */

lib/nvmf/direct.c

+3 −8
Original line number Diff line number Diff line
@@ -270,19 +270,14 @@ nvmf_direct_ctrlr_attach(struct spdk_nvmf_subsystem *subsystem) 
		return -1;

	}



	return 0;

}

	spdk_nvme_ctrlr_register_aer_callback(subsystem->dev.direct.ctrlr,

					      nvmf_direct_ctrlr_complete_aer, subsystem);



static void

nvmf_direct_ctrlr_set_aer_callback(struct spdk_nvmf_subsystem *subsys)

{

	spdk_nvme_ctrlr_register_aer_callback(subsys->dev.direct.ctrlr,

					      nvmf_direct_ctrlr_complete_aer, subsys);

	return 0;

}



const struct spdk_nvmf_ctrlr_ops spdk_nvmf_direct_ctrlr_ops = {

	.attach				= nvmf_direct_ctrlr_attach,

	.set_aer_callback		= nvmf_direct_ctrlr_set_aer_callback,

	.ctrlr_get_data			= nvmf_direct_ctrlr_get_data,

	.process_admin_cmd		= nvmf_direct_ctrlr_process_admin_cmd,

	.process_io_cmd			= nvmf_direct_ctrlr_process_io_cmd,

lib/nvmf/subsystem.c

+0 −1
Original line number Diff line number Diff line
@@ -316,7 +316,6 @@ nvmf_subsystem_add_ctrlr(struct spdk_nvmf_subsystem *subsystem, 
	subsystem->dev.direct.ctrlr = ctrlr;

	subsystem->dev.direct.pci_addr = *pci_addr;



	subsystem->ops->set_aer_callback(subsystem);

	return 0;

}

lib/nvmf/virtual.c

+0 −6
Original line number Diff line number Diff line
@@ -556,14 +556,8 @@ nvmf_virtual_ctrlr_detach(struct spdk_nvmf_subsystem *subsystem) 
	subsystem->dev.virt.ns_count = 0;

}



static void

nvmf_virtual_ctrlr_set_aer_callback(struct spdk_nvmf_subsystem *subsys)

{

}



const struct spdk_nvmf_ctrlr_ops spdk_nvmf_virtual_ctrlr_ops = {

	.attach				= nvmf_virtual_ctrlr_attach,

	.set_aer_callback		= nvmf_virtual_ctrlr_set_aer_callback,

	.ctrlr_get_data			= nvmf_virtual_ctrlr_get_data,

	.process_admin_cmd		= nvmf_virtual_ctrlr_process_admin_cmd,

	.process_io_cmd			= nvmf_virtual_ctrlr_process_io_cmd,