Commit df46c41a authored by Ben Walker's avatar Ben Walker Committed by Daniel Verkamp
Browse files

nvme: Unify spdk_nvme_discover and spdk_nvme_probe 



They were very close to the same already, so finish the job.

Change-Id: Ifba9e3b2d11a3e70cbfbe46f57a67552db2757ed
Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
parent c00bce39

app/nvmf_tgt/conf.c

+2 −2
Original line number Diff line number Diff line
@@ -557,7 +557,7 @@ spdk_nvmf_parse_subsystem(struct spdk_conf_section *sp) 
			ctx.any = false;

		}



		if (spdk_nvme_probe(&ctx, probe_cb, attach_cb, NULL)) {

		if (spdk_nvme_probe(NULL, &ctx, probe_cb, attach_cb, NULL)) {

			SPDK_ERRLOG("One or more controllers failed in spdk_nvme_probe()\n");

		}
@@ -748,7 +748,7 @@ spdk_nvmf_parse_subsystem_for_rpc(const char *name, 
			ctx.any = false;

		}



		if (spdk_nvme_probe(&ctx, probe_cb, attach_cb, NULL)) {

		if (spdk_nvme_probe(NULL, &ctx, probe_cb, attach_cb, NULL)) {

			SPDK_ERRLOG("One or more controllers failed in spdk_nvme_probe()\n");

		}

examples/nvme/arbitration/arbitration.c

+1 −1
Original line number Diff line number Diff line
@@ -882,7 +882,7 @@ register_controllers(void) 
{

	printf("Initializing NVMe Controllers\n");



	if (spdk_nvme_probe(NULL, probe_cb, attach_cb, NULL) != 0) {

	if (spdk_nvme_probe(NULL, NULL, probe_cb, attach_cb, NULL) != 0) {

		fprintf(stderr, "spdk_nvme_probe() failed\n");

		return 1;

	}

examples/nvme/fio_plugin/fio_plugin.c

+1 −1
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ static int spdk_fio_setup(struct thread_data *td) 
	}



	/* Enumerate all of the controllers */

	if (spdk_nvme_probe(td, probe_cb, attach_cb, NULL) != 0) {

	if (spdk_nvme_probe(NULL, td, probe_cb, attach_cb, NULL) != 0) {

		fprintf(stderr, "spdk_nvme_probe() failed\n");

		return 1;

	}

examples/nvme/hello_world/hello_world.c

+1 −1
Original line number Diff line number Diff line
@@ -340,7 +340,7 @@ int main(int argc, char **argv) 
	 *  called for each controller after the SPDK NVMe driver has completed

	 *  initializing the controller we chose to attach.

	 */

	rc = spdk_nvme_probe(NULL, probe_cb, attach_cb, NULL);

	rc = spdk_nvme_probe(NULL, NULL, probe_cb, attach_cb, NULL);

	if (rc != 0) {

		fprintf(stderr, "spdk_nvme_probe() failed\n");

		cleanup();

examples/nvme/hotplug/hotplug.c

+2 −2
Original line number Diff line number Diff line
@@ -337,7 +337,7 @@ io_loop(void) 
		/*

		 * Check for hotplug events.

		 */

		if (spdk_nvme_probe(NULL, probe_cb, attach_cb, remove_cb) != 0) {

		if (spdk_nvme_probe(NULL, NULL, probe_cb, attach_cb, remove_cb) != 0) {

			fprintf(stderr, "spdk_nvme_probe() failed\n");

			break;

		}
@@ -421,7 +421,7 @@ register_controllers(void) 
{

	fprintf(stderr, "Initializing NVMe Controllers\n");



	if (spdk_nvme_probe(NULL, probe_cb, attach_cb, remove_cb) != 0) {

	if (spdk_nvme_probe(NULL, NULL, probe_cb, attach_cb, remove_cb) != 0) {

		fprintf(stderr, "spdk_nvme_probe() failed\n");

		return 1;

	}