X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=options.c;h=d17dbb1cd6f45696866822a0b190fb77129331e6;hp=36f80fce61a7f6fe24dda2c474580bc3b74bb4bf;hb=e28218f3017e5eb156d3a4a6e7b33651dc022cea;hpb=fc74ac1d749c977308016eb22c8658a9a5ac7989

diff --git a/options.c b/options.c
index 36f80fce..d17dbb1c 100644
--- a/options.c
+++ b/options.c
@@ -333,27 +333,12 @@ static int str_verify_offset_cb(void *data, unsigned int *off)
 	return 0;
 }
 
-static int str_verify_cb(void *data, const char *mem)
+static int str_verify_pattern_cb(void *data, unsigned int *off)
 {
 	struct thread_data *td = data;
-	unsigned int nr, msb;
-	char *pat;
+	unsigned int msb;
 
-	if (td->o.verify != VERIFY_PATTERN)
-		return 0;
-
-	pat = get_opt_postfix(mem);
-	if (!pat) {
-		log_err("fio: missing pattern\n");
-		return 1;
-	}
-
-	if (strstr(pat, "0x") || strstr(pat, "0X"))
-		nr = strtol(pat, NULL, 16);
-	else
-		nr = strtol(pat, NULL, 16);
-
-	msb = fls(nr);
+	msb = fls(*off);
 	if (msb <= 8)
 		td->o.verify_pattern_bytes = 1;
 	else if (msb <= 16)
@@ -363,7 +348,7 @@ static int str_verify_cb(void *data, const char *mem)
 	else
 		td->o.verify_pattern_bytes = 4;
 
-	td->o.verify_pattern = nr;
+	td->o.verify_pattern = *off;
 	return 0;
 }
 
@@ -752,7 +737,6 @@ static struct fio_option options[] = {
 		.name	= "verify",
 		.type	= FIO_OPT_STR,
 		.off1	= td_var_offset(verify),
-		.cb	= str_verify_cb,
 		.help	= "Verify data written",
 		.def	= "0",
 		.posval = {
@@ -792,10 +776,6 @@ static struct fio_option options[] = {
 			    .oval = VERIFY_META,
 			    .help = "Use io information",
 			  },
-			  { .ival = "pattern",
-			    .oval = VERIFY_PATTERN,
-			    .help = "Verify a specific buffer pattern",
-			  },
 			  {
 			    .ival = "null",
 			    .oval = VERIFY_NULL,
@@ -835,6 +815,13 @@ static struct fio_option options[] = {
 		.cb	= str_verify_offset_cb,	
 		.parent	= "verify",
 	},
+	{
+		.name	= "verify_pattern",
+		.type	= FIO_OPT_INT,
+		.cb	= str_verify_pattern_cb,
+		.help	= "Fill pattern for IO buffers",
+		.parent	= "verify",
+	},
 	{
 		.name	= "verify_fatal",
 		.type	= FIO_OPT_BOOL,