Skip to content

Commit 931082b

Browse files
committed
nvme: initialize default library logging
The library will only print errors unless we initialize default logging. By doing so, all nvme commands are enabled to also print debug information. Signed-off-by: Daniel Wagner <dwagner@suse.de>
1 parent aa594c4 commit 931082b

File tree

1 file changed

+24
-11
lines changed

1 file changed

+24
-11
lines changed

nvme.c

+24-11
Original file line numberDiff line numberDiff line change
@@ -432,21 +432,34 @@ static int get_dev(struct nvme_dev **dev, int argc, char **argv, int flags)
432432
return ret != 0 ? -errno : 0;
433433
}
434434

435+
static int parse_args(int argc, char *argv[], const char *desc,
436+
struct argconfig_commandline_options *opts)
437+
{
438+
int ret;
439+
440+
ret = argconfig_parse(argc, argv, desc, opts);
441+
if (ret)
442+
return ret;
443+
444+
log_level = map_log_level(verbose_level, false);
445+
nvme_init_default_logging(stderr, log_level, false, false);
446+
447+
return 0;
448+
}
449+
435450
int parse_and_open(struct nvme_dev **dev, int argc, char **argv,
436451
const char *desc,
437452
struct argconfig_commandline_options *opts)
438453
{
439454
int ret;
440455

441-
ret = argconfig_parse(argc, argv, desc, opts);
456+
ret = parse_args(argc, argv, desc, opts);
442457
if (ret)
443458
return ret;
444459

445460
ret = get_dev(dev, argc, argv, O_RDONLY);
446461
if (ret < 0)
447462
argconfig_print_help(desc, opts);
448-
else
449-
log_level = map_log_level(verbose_level, false);
450463

451464
return ret;
452465
}
@@ -3279,7 +3292,7 @@ static int list_subsys(int argc, char **argv, struct command *cmd,
32793292

32803293
NVME_ARGS(opts);
32813294

3282-
err = argconfig_parse(argc, argv, desc, opts);
3295+
err = parse_args(argc, argv, desc, opts);
32833296
if (err < 0)
32843297
return err;
32853298

@@ -3337,7 +3350,7 @@ static int list(int argc, char **argv, struct command *cmd, struct plugin *plugi
33373350

33383351
NVME_ARGS(opts);
33393352

3340-
err = argconfig_parse(argc, argv, desc, opts);
3353+
err = parse_args(argc, argv, desc, opts);
33413354
if (err < 0)
33423355
return err;
33433356

@@ -6121,7 +6134,7 @@ static int format_cmd(int argc, char **argv, struct command *cmd, struct plugin
61216134
OPT_FLAG("force", 0, &cfg.force, force),
61226135
OPT_SUFFIX("block-size", 'b', &cfg.bs, bs));
61236136

6124-
err = argconfig_parse(argc, argv, desc, opts);
6137+
err = parse_args(argc, argv, desc, opts);
61256138
if (err)
61266139
return err;
61276140

@@ -7776,7 +7789,7 @@ static int submit_io(int opcode, char *command, const char *desc, int argc, char
77767789
if (err)
77777790
return err;
77787791
} else {
7779-
err = argconfig_parse(argc, argv, desc, opts);
7792+
err = parse_args(argc, argv, desc, opts);
77807793
if (err)
77817794
return err;
77827795
err = open_exclusive(&dev, argc, argv, cfg.force);
@@ -8968,7 +8981,7 @@ static int gen_dhchap_key(int argc, char **argv, struct command *command, struct
89688981
OPT_STR("nqn", 'n', &cfg.nqn, nqn),
89698982
OPT_UINT("hmac", 'm', &cfg.hmac, hmac));
89708983

8971-
err = argconfig_parse(argc, argv, desc, opts);
8984+
err = parse_args(argc, argv, desc, opts);
89728985
if (err)
89738986
return err;
89748987

@@ -9082,7 +9095,7 @@ static int check_dhchap_key(int argc, char **argv, struct command *command, stru
90829095
NVME_ARGS(opts,
90839096
OPT_STR("key", 'k', &cfg.key, key));
90849097

9085-
err = argconfig_parse(argc, argv, desc, opts);
9098+
err = parse_args(argc, argv, desc, opts);
90869099
if (err)
90879100
return err;
90889101

@@ -9201,7 +9214,7 @@ static int gen_tls_key(int argc, char **argv, struct command *command, struct pl
92019214
OPT_UINT("identity", 'I', &cfg.identity, identity),
92029215
OPT_FLAG("insert", 'i', &cfg.insert, insert));
92039216

9204-
err = argconfig_parse(argc, argv, desc, opts);
9217+
err = parse_args(argc, argv, desc, opts);
92059218
if (err)
92069219
return err;
92079220
if (cfg.hmac < 1 || cfg.hmac > 2) {
@@ -9319,7 +9332,7 @@ static int check_tls_key(int argc, char **argv, struct command *command, struct
93199332
OPT_UINT("identity", 'I', &cfg.identity, identity),
93209333
OPT_FLAG("insert", 'i', &cfg.insert, insert));
93219334

9322-
err = argconfig_parse(argc, argv, desc, opts);
9335+
err = parse_args(argc, argv, desc, opts);
93239336
if (err)
93249337
return err;
93259338

0 commit comments

Comments
 (0)