Commit 57fd99b9 authored by Jim Harris's avatar Jim Harris Committed by Konrad Sztyber
Browse files

env: add opts_size to spdk_env_opts 



This will help with ABI compatibility as new fields get added
to this structure.

User is responsible for setting opts_size. Major version has been
bumped, so users will need to rebuild against latest code, if they
do not set opts_size we will just treat that as if the structure
ends right before opts_size. We will also print an ERRLOG to warn
user to set opts_size appropriately.

As part of this patch, update all in-tree callers of
spdk_env_opts_init() to set the opts_size.

Signed-off-by: default avatarJim Harris <jim.harris@samsung.com>
Change-Id: If2611eccc8b3c43e1dc1654028d000a8a12a544e
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/23940


Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz@tzawadzki.com>
parent 21eda816

app/fio/bdev/fio_plugin.c

+1 −0
Original line number Diff line number Diff line
@@ -336,6 +336,7 @@ spdk_init_thread_poll(void *arg) 
	}



	/* Initialize the environment library */

	opts.opts_size = sizeof(opts);

	spdk_env_opts_init(&opts);

	opts.name = "fio";

app/fio/nvme/fio_plugin.c

+1 −0
Original line number Diff line number Diff line
@@ -603,6 +603,7 @@ spdk_fio_setup(struct thread_data *td) 
	TAILQ_INIT(&fio_thread->fio_qpair);



	if (!g_spdk_env_initialized) {

		opts.opts_size = sizeof(opts);

		spdk_env_opts_init(&opts);

		opts.name = "fio";

		opts.mem_size = fio_options->mem_size;

app/spdk_lspci/spdk_lspci.c

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ main(int argc, char **argv) 
		}

	}



	opts.opts_size = sizeof(opts);

	spdk_env_opts_init(&opts);

	opts.name = "spdk_lspci";

app/spdk_nvme_discover/discovery_aer.c

+1 −0
Original line number Diff line number Diff line
@@ -257,6 +257,7 @@ main(int argc, char **argv) 
	struct spdk_nvme_ctrlr_opts ctrlr_opts;

	struct spdk_nvme_detach_ctx *detach_ctx = NULL;



	opts.opts_size = sizeof(opts);

	spdk_env_opts_init(&opts);

	opts.name = "discovery_aer";

	rc = parse_args(argc, argv, &opts);

app/spdk_nvme_identify/identify.c

+1 −0
Original line number Diff line number Diff line
@@ -2899,6 +2899,7 @@ main(int argc, char **argv) 
		return rc;

	}



	opts.opts_size = sizeof(opts);

	spdk_env_opts_init(&opts);

	opts.name = "identify";

	opts.shm_id = g_shm_id;