options: make unit_base be posval[] based

[fio.git] / options.c

diff --git a/options.c b/options.c
index b8ce5a763ce427cc733c7738cca59125e6ec7c62..c838ee00b2eb01c15d4f70bf99d9a0dd999dc140 100644 (file)
--- a/options.c
+++ b/options.c
@@ -949,25 +949,6 @@ static int kb_base_verify(struct fio_option *o, void *data)
        return 0;
 }
 
-static int unit_base_verify(struct fio_option *o, void *data)
-{
-       struct thread_data *td = data;
-
-       /* 0 = default, pick based on engine
-        * 1 = use bits
-        * 8 = use bytes
-        */
-       if (td->o.unit_base != 0 &&
-               td->o.unit_base != 1 &&
-               td->o.unit_base != 8) {
-               log_err("fio: unit_base set to nonsensical value: %u\n",
-                               td->o.unit_base);
-               return 1;
-       }
-
-       return 0;
-}
-
 /*
  * Option grouping
  */
@@ -1173,24 +1154,8 @@ struct fio_option fio_options[FIO_MAX_OPTS] = {
                .prio   = -1, /* must come after "directory" */
                .help   = "Override default $jobname.$jobnum.$filenum naming",
                .def    = "$jobname.$jobnum.$filenum",
-       },
-       {
-               .name   = "kb_base",
-               .type   = FIO_OPT_INT,
-               .off1   = td_var_offset(kb_base),
-               .verify = kb_base_verify,
-               .prio   = 1,
-               .def    = "1024",
-               .help   = "How many bytes per KB for reporting (1000 or 1024)",
-       },
-       {
-               .name   = "unit_base",
-               .type   = FIO_OPT_INT,
-               .off1   = td_var_offset(unit_base),
-               .verify = unit_base_verify,
-               .prio   = 1,
-               .def    = "0",
-               .help   = "Bit multiple of result summary data (8 for byte, 1 for bit)",
+               .category = FIO_OPT_C_FILE,
+               .group  = FIO_OPT_G_FILENAME,
        },
        {
                .name   = "lockfile",
@@ -3114,6 +3079,29 @@ struct fio_option fio_options[FIO_MAX_OPTS] = {
                .category = FIO_OPT_C_GENERAL,
                .group  = FIO_OPT_G_INVALID,
        },
+       {
+               .name   = "unit_base",
+               .type   = FIO_OPT_INT,
+               .off1   = td_var_offset(unit_base),
+               .prio   = 1,
+               .posval = {
+                         { .ival = "0",
+                           .oval = 0,
+                           .help = "Auto-detect",
+                         },
+                         { .ival = "8",
+                           .oval = 8,
+                           .help = "Normal (byte based)",
+                         },
+                         { .ival = "1",
+                           .oval = 1,
+                           .help = "Bit based",
+                         },
+               },
+               .help   = "Bit multiple of result summary data (8 for byte, 1 for bit)",
+               .category = FIO_OPT_C_GENERAL,
+               .group  = FIO_OPT_G_INVALID,
+       },
        {
                .name   = "hugepage-size",
                .lname  = "Hugepage size",