Add group/category to numa/mem node options

[fio.git] / parse.c

diff --git a/parse.c b/parse.c
index a701a5bb67b78dbdaa05dd827c776c9dd73ff34f..606c54bb62cf731136ad347e02fe6f0c6bba2d16 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -464,6 +464,25 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
                                        " (%u min)\n", ull, o->minval);
                        return 1;
                }
+               if (o->posval[0].ival) {
+                       posval_sort(o, posval);
+
+                       ret = 1;
+                       for (i = 0; i < PARSE_MAX_VP; i++) {
+                               vp = &posval[i];
+                               if (!vp->ival || vp->ival[0] == '\0')
+                                       continue;
+                               if (vp->oval == ull) {
+                                       ret = 0;
+                                       break;
+                               }
+                       }
+                       if (ret) {
+                               log_err("fio: value %llu not allowed:\n", ull);
+                               show_option_values(o);
+                               return 1;
+                       }
+               }
 
                if (fn)
                        ret = fn(data, &ull);
@@ -1149,6 +1168,11 @@ void option_init(struct fio_option *o)
        }
        if (!o->cb && (!o->off1 && !o->roff1))
                log_err("Option %s: neither cb nor offset given\n", o->name);
+       if (!o->category) {
+               log_info("Options %s: no category defined. Setting to misc\n", o->name);
+               o->category = FIO_OPT_C_GENERAL;
+               o->group = FIO_OPT_G_INVALID;
+       }
        if (o->type == FIO_OPT_STR || o->type == FIO_OPT_STR_STORE ||
            o->type == FIO_OPT_STR_MULTI)
                return;
@@ -1156,10 +1180,6 @@ void option_init(struct fio_option *o)
                      (o->roff1 || o->roff2 || o->roff3 || o->roff4))) {
                log_err("Option %s: both cb and offset given\n", o->name);
        }
-       if (!o->category) {
-               log_info("Options %s: no category defined. Setting to misc\n", o->name);
-               o->category = FIO_OPT_C_GENERAL;
-       }
 }
 
 /*