@@ -432,21 +432,34 @@ static int get_dev(struct nvme_dev **dev, int argc, char **argv, int flags)
432
432
return ret != 0 ? - errno : 0 ;
433
433
}
434
434
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
+
435
450
int parse_and_open (struct nvme_dev * * dev , int argc , char * * argv ,
436
451
const char * desc ,
437
452
struct argconfig_commandline_options * opts )
438
453
{
439
454
int ret ;
440
455
441
- ret = argconfig_parse (argc , argv , desc , opts );
456
+ ret = parse_args (argc , argv , desc , opts );
442
457
if (ret )
443
458
return ret ;
444
459
445
460
ret = get_dev (dev , argc , argv , O_RDONLY );
446
461
if (ret < 0 )
447
462
argconfig_print_help (desc , opts );
448
- else
449
- log_level = map_log_level (verbose_level , false);
450
463
451
464
return ret ;
452
465
}
@@ -3279,7 +3292,7 @@ static int list_subsys(int argc, char **argv, struct command *cmd,
3279
3292
3280
3293
NVME_ARGS (opts );
3281
3294
3282
- err = argconfig_parse (argc , argv , desc , opts );
3295
+ err = parse_args (argc , argv , desc , opts );
3283
3296
if (err < 0 )
3284
3297
return err ;
3285
3298
@@ -3337,7 +3350,7 @@ static int list(int argc, char **argv, struct command *cmd, struct plugin *plugi
3337
3350
3338
3351
NVME_ARGS (opts );
3339
3352
3340
- err = argconfig_parse (argc , argv , desc , opts );
3353
+ err = parse_args (argc , argv , desc , opts );
3341
3354
if (err < 0 )
3342
3355
return err ;
3343
3356
@@ -6121,7 +6134,7 @@ static int format_cmd(int argc, char **argv, struct command *cmd, struct plugin
6121
6134
OPT_FLAG ("force" , 0 , & cfg .force , force ),
6122
6135
OPT_SUFFIX ("block-size" , 'b' , & cfg .bs , bs ));
6123
6136
6124
- err = argconfig_parse (argc , argv , desc , opts );
6137
+ err = parse_args (argc , argv , desc , opts );
6125
6138
if (err )
6126
6139
return err ;
6127
6140
@@ -7776,7 +7789,7 @@ static int submit_io(int opcode, char *command, const char *desc, int argc, char
7776
7789
if (err )
7777
7790
return err ;
7778
7791
} else {
7779
- err = argconfig_parse (argc , argv , desc , opts );
7792
+ err = parse_args (argc , argv , desc , opts );
7780
7793
if (err )
7781
7794
return err ;
7782
7795
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
8968
8981
OPT_STR ("nqn" , 'n' , & cfg .nqn , nqn ),
8969
8982
OPT_UINT ("hmac" , 'm' , & cfg .hmac , hmac ));
8970
8983
8971
- err = argconfig_parse (argc , argv , desc , opts );
8984
+ err = parse_args (argc , argv , desc , opts );
8972
8985
if (err )
8973
8986
return err ;
8974
8987
@@ -9082,7 +9095,7 @@ static int check_dhchap_key(int argc, char **argv, struct command *command, stru
9082
9095
NVME_ARGS (opts ,
9083
9096
OPT_STR ("key" , 'k' , & cfg .key , key ));
9084
9097
9085
- err = argconfig_parse (argc , argv , desc , opts );
9098
+ err = parse_args (argc , argv , desc , opts );
9086
9099
if (err )
9087
9100
return err ;
9088
9101
@@ -9201,7 +9214,7 @@ static int gen_tls_key(int argc, char **argv, struct command *command, struct pl
9201
9214
OPT_UINT ("identity" , 'I' , & cfg .identity , identity ),
9202
9215
OPT_FLAG ("insert" , 'i' , & cfg .insert , insert ));
9203
9216
9204
- err = argconfig_parse (argc , argv , desc , opts );
9217
+ err = parse_args (argc , argv , desc , opts );
9205
9218
if (err )
9206
9219
return err ;
9207
9220
if (cfg .hmac < 1 || cfg .hmac > 2 ) {
@@ -9319,7 +9332,7 @@ static int check_tls_key(int argc, char **argv, struct command *command, struct
9319
9332
OPT_UINT ("identity" , 'I' , & cfg .identity , identity ),
9320
9333
OPT_FLAG ("insert" , 'i' , & cfg .insert , insert ));
9321
9334
9322
- err = argconfig_parse (argc , argv , desc , opts );
9335
+ err = parse_args (argc , argv , desc , opts );
9323
9336
if (err )
9324
9337
return err ;
9325
9338
0 commit comments