t/zbd: avoid test case 31 failure with small devices

[fio.git] / cconv.c

diff --git a/cconv.c b/cconv.c
index 9095d5195eb2d1c4592e27f0b87cd0adaa925fba..16112248a6b71016c2542a5097ca35750f9a470b 100644 (file)
--- a/cconv.c
+++ b/cconv.c
@@ -111,6 +111,7 @@ int convert_thread_options_to_cpu(struct thread_options *o,
        o->serialize_overlap = le32_to_cpu(top->serialize_overlap);
        o->size = le64_to_cpu(top->size);
        o->io_size = le64_to_cpu(top->io_size);
+       o->num_range = le32_to_cpu(top->num_range);
        o->size_percent = le32_to_cpu(top->size_percent);
        o->io_size_percent = le32_to_cpu(top->io_size_percent);
        o->fill_device = le32_to_cpu(top->fill_device);
@@ -216,9 +217,9 @@ int convert_thread_options_to_cpu(struct thread_options *o,
        o->log_prio = le32_to_cpu(top->log_prio);
        o->log_gz = le32_to_cpu(top->log_gz);
        o->log_gz_store = le32_to_cpu(top->log_gz_store);
-       o->log_unix_epoch = le32_to_cpu(top->log_unix_epoch);
        o->log_alternate_epoch = le32_to_cpu(top->log_alternate_epoch);
        o->log_alternate_epoch_clock_id = le32_to_cpu(top->log_alternate_epoch_clock_id);
+       o->job_start_clock_id = le32_to_cpu(top->job_start_clock_id);
        o->norandommap = le32_to_cpu(top->norandommap);
        o->softrandommap = le32_to_cpu(top->softrandommap);
        o->bs_unaligned = le32_to_cpu(top->bs_unaligned);
@@ -233,6 +234,7 @@ int convert_thread_options_to_cpu(struct thread_options *o,
        o->random_generator = le32_to_cpu(top->random_generator);
        o->hugepage_size = le32_to_cpu(top->hugepage_size);
        o->rw_min_bs = le64_to_cpu(top->rw_min_bs);
+       o->thinkcycles = le32_to_cpu(top->thinkcycles);
        o->thinktime = le32_to_cpu(top->thinktime);
        o->thinktime_spin = le32_to_cpu(top->thinktime_spin);
        o->thinktime_blocks = le32_to_cpu(top->thinktime_blocks);
@@ -281,6 +283,7 @@ int convert_thread_options_to_cpu(struct thread_options *o,
        o->nice = le32_to_cpu(top->nice);
        o->ioprio = le32_to_cpu(top->ioprio);
        o->ioprio_class = le32_to_cpu(top->ioprio_class);
+       o->ioprio_hint = le32_to_cpu(top->ioprio_hint);
        o->file_service_type = le32_to_cpu(top->file_service_type);
        o->group_reporting = le32_to_cpu(top->group_reporting);
        o->stats = le32_to_cpu(top->stats);
@@ -351,9 +354,11 @@ int convert_thread_options_to_cpu(struct thread_options *o,
                o->merge_blktrace_iters[i].u.f = fio_uint64_to_double(le64_to_cpu(top->merge_blktrace_iters[i].u.i));
 
        o->fdp = le32_to_cpu(top->fdp);
-       o->fdp_nrpli = le32_to_cpu(top->fdp_nrpli);
-       for (i = 0; i < o->fdp_nrpli; i++)
-               o->fdp_plis[i] = le32_to_cpu(top->fdp_plis[i]);
+       o->dp_type = le32_to_cpu(top->dp_type);
+       o->dp_id_select = le32_to_cpu(top->dp_id_select);
+       o->dp_nr_ids = le32_to_cpu(top->dp_nr_ids);
+       for (i = 0; i < o->dp_nr_ids; i++)
+               o->dp_ids[i] = le32_to_cpu(top->dp_ids[i]);
 #if 0
        uint8_t cpumask[FIO_TOP_STR_MAX];
        uint8_t verify_cpumask[FIO_TOP_STR_MAX];
@@ -453,9 +458,9 @@ void convert_thread_options_to_net(struct thread_options_pack *top,
        top->log_prio = cpu_to_le32(o->log_prio);
        top->log_gz = cpu_to_le32(o->log_gz);
        top->log_gz_store = cpu_to_le32(o->log_gz_store);
-       top->log_unix_epoch = cpu_to_le32(o->log_unix_epoch);
        top->log_alternate_epoch = cpu_to_le32(o->log_alternate_epoch);
        top->log_alternate_epoch_clock_id = cpu_to_le32(o->log_alternate_epoch_clock_id);
+       top->job_start_clock_id = cpu_to_le32(o->job_start_clock_id);
        top->norandommap = cpu_to_le32(o->norandommap);
        top->softrandommap = cpu_to_le32(o->softrandommap);
        top->bs_unaligned = cpu_to_le32(o->bs_unaligned);
@@ -470,6 +475,7 @@ void convert_thread_options_to_net(struct thread_options_pack *top,
        top->random_generator = cpu_to_le32(o->random_generator);
        top->hugepage_size = cpu_to_le32(o->hugepage_size);
        top->rw_min_bs = __cpu_to_le64(o->rw_min_bs);
+       top->thinkcycles = cpu_to_le32(o->thinkcycles);
        top->thinktime = cpu_to_le32(o->thinktime);
        top->thinktime_spin = cpu_to_le32(o->thinktime_spin);
        top->thinktime_blocks = cpu_to_le32(o->thinktime_blocks);
@@ -495,6 +501,7 @@ void convert_thread_options_to_net(struct thread_options_pack *top,
        top->nice = cpu_to_le32(o->nice);
        top->ioprio = cpu_to_le32(o->ioprio);
        top->ioprio_class = cpu_to_le32(o->ioprio_class);
+       top->ioprio_hint = cpu_to_le32(o->ioprio_hint);
        top->file_service_type = cpu_to_le32(o->file_service_type);
        top->group_reporting = cpu_to_le32(o->group_reporting);
        top->stats = cpu_to_le32(o->stats);
@@ -604,6 +611,7 @@ void convert_thread_options_to_net(struct thread_options_pack *top,
 
        top->size = __cpu_to_le64(o->size);
        top->io_size = __cpu_to_le64(o->io_size);
+       top->num_range = __cpu_to_le32(o->num_range);
        top->verify_backlog = __cpu_to_le64(o->verify_backlog);
        top->start_delay = __cpu_to_le64(o->start_delay);
        top->start_delay_high = __cpu_to_le64(o->start_delay_high);
@@ -645,9 +653,11 @@ void convert_thread_options_to_net(struct thread_options_pack *top,
                top->merge_blktrace_iters[i].u.i = __cpu_to_le64(fio_double_to_uint64(o->merge_blktrace_iters[i].u.f));
 
        top->fdp = cpu_to_le32(o->fdp);
-       top->fdp_nrpli = cpu_to_le32(o->fdp_nrpli);
-       for (i = 0; i < o->fdp_nrpli; i++)
-               top->fdp_plis[i] = cpu_to_le32(o->fdp_plis[i]);
+       top->dp_type = cpu_to_le32(o->dp_type);
+       top->dp_id_select = cpu_to_le32(o->dp_id_select);
+       top->dp_nr_ids = cpu_to_le32(o->dp_nr_ids);
+       for (i = 0; i < o->dp_nr_ids; i++)
+               top->dp_ids[i] = cpu_to_le32(o->dp_ids[i]);
 #if 0
        uint8_t cpumask[FIO_TOP_STR_MAX];
        uint8_t verify_cpumask[FIO_TOP_STR_MAX];