Commit 48701bd9 authored by Ziye Yang's avatar Ziye Yang Committed by Tomasz Zawadzki
Browse files

lib/event: support ABI compatibility for spdk_app_opts. 



This patch is used to support ABI compatability issue for spdk_app_opts.

Fixes #1484

Signed-off-by: default avatarZiye Yang <ziye.yang@intel.com>
Change-Id: I6fed777fa15b367f7c3706b8f218d86d56493906
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5330


Community-CI: Broadcom CI
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarJacek Kalwas <jacek.kalwas@intel.com>
parent e4f8ec05

CHANGELOG.md

+4 −0
Original line number Diff line number Diff line
@@ -19,6 +19,10 @@ The pci_whitelist, pci_blacklist and master_core members of struct spdk_env_opts 
have been deprecated.  The new members are named pci_allowed, pci_blocked and

main_core respectively.



An `opts_size`element was added in the `spdk_app_opts` structure

to solve the ABI compatiblity issue between different SPDK version. An `opts_size`

parameter is added into `spdk_app_opts_init` function.



### nvmf



Broadcom FC LLD driver and SPDK NVMe-oF FC transport consolidated one LLD API,

app/iscsi_tgt/iscsi_tgt.c

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

	struct spdk_app_opts opts = {};



	spdk_app_opts_init(&opts);

	spdk_app_opts_init(&opts, sizeof(opts));

	opts.name = "iscsi";

	if ((rc = spdk_app_parse_args(argc, argv, &opts, "b", NULL,

				      iscsi_parse_arg, iscsi_usage)) !=

app/nvmf_tgt/nvmf_main.c

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ main(int argc, char **argv) 
	struct spdk_app_opts opts = {};



	/* default value in opts */

	spdk_app_opts_init(&opts);

	spdk_app_opts_init(&opts, sizeof(opts));

	opts.name = "nvmf";

	if ((rc = spdk_app_parse_args(argc, argv, &opts, "", NULL,

				      nvmf_parse_arg, nvmf_usage)) !=

app/spdk_dd/spdk_dd.c

+1 −1
Original line number Diff line number Diff line
@@ -1104,7 +1104,7 @@ main(int argc, char **argv) 
	struct spdk_app_opts opts = {};

	int rc = 1;



	spdk_app_opts_init(&opts);

	spdk_app_opts_init(&opts, sizeof(opts));

	opts.name = "spdk_dd";

	opts.reactor_mask = "0x1";

	opts.shutdown_cb = dd_finish;

app/spdk_tgt/spdk_tgt.c

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ main(int argc, char **argv) 
	struct spdk_app_opts opts = {};

	int rc;



	spdk_app_opts_init(&opts);

	spdk_app_opts_init(&opts, sizeof(opts));

	opts.name = "spdk_tgt";

	if ((rc = spdk_app_parse_args(argc, argv, &opts, g_spdk_tgt_get_opts_string,

				      NULL, spdk_tgt_parse_arg, spdk_tgt_usage)) !=