ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

examples/hello_bdev: allow running without ini config file

Browse Source 
Remove the config file check explicitly preventing hello_bdev
from starting and also update the docs not to reference config
files at all.

Change-Id: Ieefb629ef16d75a43c2c1fad2ac442f6e37cc16d
Signed-off-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/483386
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
This commit is contained in:
Darek Stojaczyk 2020-01-30 14:45:46 +01:00 committed by Tomasz Zawadzki
parent 70597c0a14
commit 15d92f6a12
1 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
examples/bdev/hello_world/hello_bdev.c
View File

@ -199,9 +199,9 @@ hello_start(void *arg1)
SPDK_NOTICELOG("Successfully started the application\n"); SPDK_NOTICELOG("Successfully started the application\n");
/* /*
* Get the bdev. There can be many bdevs configured in * Get the bdev. There can be many bdevs configured, but this
* in the configuration file but this application will only * application will only use the one input by the user at runtime so
* use the one input by the user at runtime so we get it via its name. * we get it via its name.
*/ */
hello_context->bdev = spdk_bdev_get_by_name(hello_context->bdev_name); hello_context->bdev = spdk_bdev_get_by_name(hello_context->bdev_name);
if (hello_context->bdev == NULL) { if (hello_context->bdev == NULL) {
@ -262,35 +262,30 @@ main(int argc, char **argv)
opts.name = "hello_bdev"; opts.name = "hello_bdev";
/* /*
* The user can provide the config file and bdev name at run time. * Parse built-in SPDK command line parameters as well
* For example, to use Malloc0 in file bdev.conf run with params * as our custom one(s).
* ./hello_bdev -c bdev.conf -b Malloc0
* To use passthru bdev PT0 run with params
* ./hello_bdev -c bdev.conf -b PT0
* If the bdev name is not specified,
* then Malloc0 is used by default
*/ */
if ((rc = spdk_app_parse_args(argc, argv, &opts, "b:", NULL, hello_bdev_parse_arg, if ((rc = spdk_app_parse_args(argc, argv, &opts, "b:", NULL, hello_bdev_parse_arg,
hello_bdev_usage)) != SPDK_APP_PARSE_ARGS_SUCCESS) { hello_bdev_usage)) != SPDK_APP_PARSE_ARGS_SUCCESS) {
exit(rc); exit(rc);
} }
if (opts.config_file == NULL) {
SPDK_ERRLOG("configfile must be specified using -c <conffile> e.g. -c bdev.conf\n");
exit(1);
}
hello_context.bdev_name = g_bdev_name; hello_context.bdev_name = g_bdev_name;
/* /*
* spdk_app_start() will block running hello_start() until * spdk_app_start() will initialize the SPDK framework, call hello_start(),
* spdk_app_stop() is called by someone (not simply when * and then block until spdk_app_stop() is called (or if an initialization
* hello_start() returns), or if an error occurs during * error occurs, spdk_app_start() will return with rc even without calling
* spdk_app_start() before hello_start() runs. * hello_start().
*/ */
rc = spdk_app_start(&opts, hello_start, &hello_context); rc = spdk_app_start(&opts, hello_start, &hello_context);
if (rc) { if (rc) {
SPDK_ERRLOG("ERROR starting application\n"); SPDK_ERRLOG("ERROR starting application\n");
} }
/* At this point either spdk_app_stop() was called, or spdk_app_start()
* failed because of internal error.
*/
/* When the app stops, free up memory that we allocated. */ /* When the app stops, free up memory that we allocated. */
spdk_dma_free(hello_context.buff); spdk_dma_free(hello_context.buff);