X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=options.c;h=82d5ff51b47f684be065d848f1493aac63f6dbad;hp=62bbb43c893a08d21be4418a8f2c68932af35066;hb=724e4435c1374e97309b122429ad9291744966c0;hpb=a12a3b4d8903b9941705067442c2c530a94635f3

diff --git a/options.c b/options.c
index 62bbb43c..82d5ff51 100644
--- a/options.c
+++ b/options.c
@@ -217,12 +217,27 @@ static int str_verify_offset_cb(void *data, unsigned int *off)
 	return 0;
 }
 
-static int str_verify_pattern_cb(void *data, unsigned int *off)
+static int str_verify_cb(void *data, const char *mem)
 {
 	struct thread_data *td = data;
-	unsigned int msb;
+	unsigned int nr, msb;
+	char *pat;
 
-	msb = fls(*off);
+	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);
 	if (msb <= 8)
 		td->o.verify_pattern_bytes = 1;
 	else if (msb <= 16)
@@ -232,7 +247,7 @@ static int str_verify_pattern_cb(void *data, unsigned int *off)
 	else
 		td->o.verify_pattern_bytes = 4;
 
-	td->o.verify_pattern = *off;
+	td->o.verify_pattern = nr;
 	return 0;
 }
 
@@ -603,6 +618,7 @@ 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 = {
@@ -642,6 +658,10 @@ 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,
@@ -651,7 +671,7 @@ static struct fio_option options[] = {
 	},
 	{
 		.name	= "do_verify",
-		.type	= FIO_OPT_INT,
+		.type	= FIO_OPT_BOOL,
 		.off1	= td_var_offset(do_verify),
 		.help	= "Run verification stage after write",
 		.def	= "1",
@@ -681,16 +701,9 @@ 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_INT,
+		.type	= FIO_OPT_BOOL,
 		.off1	= td_var_offset(verify_fatal),
 		.def	= "0",
 		.help	= "Exit on a single verify failure, don't continue",