Fix merge error hiding mmap ioengine under Windows build

[fio.git] / options.c

diff --git a/options.c b/options.c
index ae5bcc5bca06f409132b474e11555dce5c0f8c1f..67d0d2ddb2ad22b8bd5789c9691fb1334476e195 100644 (file)
--- a/options.c
+++ b/options.c
@@ -675,6 +675,11 @@ static int str_verify_pattern_cb(void *data, const char *input)
                }
        }
        td->o.verify_pattern_bytes = i;
+       /*
+        * VERIFY_META could already be set
+        */
+       if (td->o.verify == VERIFY_NONE)
+               td->o.verify = VERIFY_PATTERN;
        return 0;
 }
 
@@ -941,12 +946,12 @@ static struct fio_option options[FIO_MAX_OPTS] = {
 #endif
 #ifdef FIO_HAVE_WINDOWSAIO
                          { .ival = "windowsaio",
-                               .help = "Windows native asynchronous IO"
+                           .help = "Windows native asynchronous IO"
                          },
+#endif
                          { .ival = "mmap",
                            .help = "Memory mapped IO"
                          },
-#endif
 #ifdef FIO_HAVE_SPLICE
                          { .ival = "splice",
                            .help = "splice/vmsplice based IO",
@@ -1466,6 +1471,14 @@ static struct fio_option options[FIO_MAX_OPTS] = {
                .help   = "Exit on a single verify failure, don't continue",
                .parent = "verify",
        },
+       {
+               .name   = "verify_dump",
+               .type   = FIO_OPT_BOOL,
+               .off1   = td_var_offset(verify_dump),
+               .def    = "1",
+               .help   = "Dump contents of good and bad blocks on failure",
+               .parent = "verify",
+       },
        {
                .name   = "verify_async",
                .type   = FIO_OPT_INT,