Commit b6ee6f92 authored by Jim Harris's avatar Jim Harris Committed by Ben Walker
Browse files

iscsi, nvmf, vhost: remove default config file pathnames 



Config file pathnames have been possible on the command line
for a very long time, and all of the SPDK testing infrastructure
uses it.  The default pathnames were added a very long time ago,
and now can cause weird issues like conflicting with --wait-for-rpc
when an INI config file is not passed on the command line but is
pulled in by the default pathname instead.

So remove the default pathnames.

Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: Ia914ff1c9321235f79f8cc9a054ed7f099340151

Reviewed-on: https://review.gerrithub.io/424606


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent ba38785b

CHANGELOG.md

+4 −0
Original line number Diff line number Diff line
@@ -46,6 +46,10 @@ The ReactorMask config file parameter has been deprecated. Users should 
use the -m or --cpumask command line option to specify the CPU core mask

for the application.



Default config file pathnames have been removed from iscsi_tgt, nvmf_tgt

and vhost.  Config file pathnames may now only be specified using the

-c command line option.



## v18.07:



### bdev

app/iscsi_tgt/iscsi_tgt.c

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



	spdk_app_opts_init(&opts);

	opts.config_file = SPDK_ISCSI_DEFAULT_CONFIG;

	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

+0 −4
Original line number Diff line number Diff line
@@ -36,9 +36,6 @@ 
#include "spdk/env.h"

#include "spdk/event.h"



#define SPDK_NVMF_BUILD_ETC "/usr/local/etc/nvmf"

#define SPDK_NVMF_DEFAULT_CONFIG SPDK_NVMF_BUILD_ETC "/nvmf.conf"



static void

nvmf_usage(void)

{
@@ -67,7 +64,6 @@ main(int argc, char **argv) 
	/* default value in opts */

	spdk_app_opts_init(&opts);

	opts.name = "nvmf";

	opts.config_file = SPDK_NVMF_DEFAULT_CONFIG;

	opts.max_delay_us = 1000; /* 1 ms */

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

				      nvmf_parse_arg, nvmf_usage)) !=

app/vhost/vhost.c

+0 −2
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ 
#include "spdk/vhost.h"





#define SPDK_VHOST_DEFAULT_CONFIG "/usr/local/etc/spdk/vhost.conf"

#define SPDK_VHOST_DEFAULT_MEM_SIZE 1024



static const char *g_pid_path = NULL;
@@ -49,7 +48,6 @@ vhost_app_opts_init(struct spdk_app_opts *opts) 
{

	spdk_app_opts_init(opts);

	opts->name = "vhost";

	opts->config_file = SPDK_VHOST_DEFAULT_CONFIG;

	opts->mem_size = SPDK_VHOST_DEFAULT_MEM_SIZE;

}

lib/iscsi/iscsi.h

+0 −2
Original line number Diff line number Diff line
@@ -48,8 +48,6 @@ 
#include "spdk/assert.h"

#include "spdk/util.h"



#define SPDK_ISCSI_BUILD_ETC "/usr/local/etc/spdk"

#define SPDK_ISCSI_DEFAULT_CONFIG SPDK_ISCSI_BUILD_ETC "/iscsi.conf"

#define SPDK_ISCSI_DEFAULT_NODEBASE "iqn.2016-06.io.spdk"



#define DEFAULT_MAXR2T 4