From 71a082583c93a7767d1bb331138990282dfdc01d Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Tue, 9 Apr 2013 20:49:45 +0200 Subject: [PATCH] options: make unit_base be posval[] based We can kill the verifier and ensure we only get the possible values we need. Signed-off-by: Jens Axboe --- options.c | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/options.c b/options.c index 8a8f24cb..c838ee00 100644 --- 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 */ @@ -3102,9 +3083,21 @@ struct fio_option fio_options[FIO_MAX_OPTS] = { .name = "unit_base", .type = FIO_OPT_INT, .off1 = td_var_offset(unit_base), - .verify = unit_base_verify, .prio = 1, - .def = "0", + .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, -- 2.25.1