Commit 698dbd02 authored by Krzysztof Karas's avatar Krzysztof Karas Committed by Tomasz Zawadzki
Browse files

lib/event: remove outdated opts 



Remove some deprecated opts and comments around opts.

Change-Id: Ic081a53908720ee79494d0cfc29f74f8b54591b1
Signed-off-by: default avatarKrzysztof Karas <krzysztof.karas@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/21997


Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
Community-CI: Mellanox Build Bot
parent 45ca7ea0

lib/event/app.c

+0 −7
Original line number Diff line number Diff line
@@ -93,7 +93,6 @@ static const struct option g_cmdline_options[] = { 
	{"mem-channels",		required_argument,	NULL, MEM_CHANNELS_OPT_IDX},

#define MAIN_CORE_OPT_IDX	'p'

	{"main-core",			required_argument,	NULL, MAIN_CORE_OPT_IDX},

	{"master-core",			required_argument,	NULL, MAIN_CORE_OPT_IDX}, /* deprecated */

#define RPC_SOCKET_OPT_IDX	'r'

	{"rpc-socket",			required_argument,	NULL, RPC_SOCKET_OPT_IDX},

#define MEM_SIZE_OPT_IDX	's'
@@ -104,15 +103,12 @@ static const struct option g_cmdline_options[] = { 
	{"version",			no_argument,		NULL, VERSION_OPT_IDX},

#define PCI_BLOCKED_OPT_IDX	'B'

	{"pci-blocked",			required_argument,	NULL, PCI_BLOCKED_OPT_IDX},

	{"pci-blacklist",		required_argument,	NULL, PCI_BLOCKED_OPT_IDX}, /* deprecated */

#define LOGFLAG_OPT_IDX		'L'

	{"logflag",			required_argument,	NULL, LOGFLAG_OPT_IDX},

#define HUGE_UNLINK_OPT_IDX	'R'

	{"huge-unlink",			no_argument,		NULL, HUGE_UNLINK_OPT_IDX},

#define PCI_ALLOWED_OPT_IDX	'A'

	{"pci-allowed",			required_argument,	NULL, PCI_ALLOWED_OPT_IDX},

#define PCI_WHITELIST_OPT_IDX	'W'

	{"pci-whitelist",		required_argument,	NULL, PCI_WHITELIST_OPT_IDX}, /* deprecated */

#define INTERRUPT_MODE_OPT_IDX 256

	{"interrupt-mode",		no_argument,		NULL, INTERRUPT_MODE_OPT_IDX},

#define SILENCE_NOTICELOG_OPT_IDX 257
@@ -1248,9 +1244,6 @@ spdk_app_parse_args(int argc, char **argv, struct spdk_app_opts *opts, 
		case HUGE_UNLINK_OPT_IDX:

			opts->unlink_hugepage = true;

			break;

		case PCI_WHITELIST_OPT_IDX:

			SPDK_WARNLOG("-W/--pci-whitelist is deprecated.  Use -A/--pci-allowed.\n");

		/* fallthrough */

		case PCI_ALLOWED_OPT_IDX:

			if (opts->pci_blocked) {

				free(opts->pci_blocked);

test/unit/lib/event/app.c/app_ut.c

+4 −4
Original line number Diff line number Diff line
@@ -73,10 +73,10 @@ test_spdk_app_parse_args(void) 
				       "-B",

				       "0000:81:00.0"

				      };

	char *invalid_argv_BW[test_argc] = {"app_ut",

	char *invalid_argv_BA[test_argc] = {"app_ut",

					    "-B",

					    "0000:81:00.0",

					    "-W",

					    "-A",

					    "0000:82:00.0",

					    "-cspdk.conf"

					   };
@@ -145,8 +145,8 @@ test_spdk_app_parse_args(void) 
	optind = 1;

	clean_opts(&opts);



	/* Specify -B and -W options at the same time. Expected result: FAIL */

	rc = spdk_app_parse_args(test_argc, invalid_argv_BW, &opts, "", NULL, unittest_parse_args, NULL);

	/* Specify -B and -A options at the same time. Expected result: FAIL */

	rc = spdk_app_parse_args(test_argc, invalid_argv_BA, &opts, "", NULL, unittest_parse_args, NULL);

	SPDK_CU_ASSERT_FATAL(rc == SPDK_APP_PARSE_ARGS_FAIL);

	optind = 1;

	clean_opts(&opts);