david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qemu-io: Verify read data by patterns (Kevin Wolf)

Browse Source 
This patch adds a -P option to read and readv which allows to compare the read
data to a given pattern. This can be used to verify data written by write -P.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7182 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
aliguori 2009-04-18 15:36:23 +00:00
parent 838ab728bf
commit c48101ae92
1 changed files with 40 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
qemu-io.c
View File

@ -192,6 +192,7 @@ read_help(void)
" Reads a segment of the currently open file, optionally dumping it to the\n" " Reads a segment of the currently open file, optionally dumping it to the\n"
" standard output stream (with -v option) for subsequent inspection.\n" " standard output stream (with -v option) for subsequent inspection.\n"
" -p, -- use bdrv_pread to read the file\n" " -p, -- use bdrv_pread to read the file\n"
" -P, -- use a pattern to verify read data\n"
" -C, -- report statistics in a machine parsable format\n" " -C, -- report statistics in a machine parsable format\n"
" -v, -- dump buffer to standard output\n" " -v, -- dump buffer to standard output\n"
" -q, -- quite mode, do not show I/O statistics\n" " -q, -- quite mode, do not show I/O statistics\n"
@ -207,8 +208,10 @@ read_f(int argc, char **argv)
char *buf; char *buf;
int64_t offset; int64_t offset;
int count, total; int count, total;
int pattern = 0;
int Pflag = 0;
while ((c = getopt(argc, argv, "Cpqv")) != EOF) { while ((c = getopt(argc, argv, "CpP:qv")) != EOF) {
switch (c) { switch (c) {
case 'C': case 'C':
Cflag = 1; Cflag = 1;
@ -216,6 +219,10 @@ read_f(int argc, char **argv)
case 'p': case 'p':
pflag = 1; pflag = 1;
break; break;
case 'P':
Pflag = 1;
pattern = atoi(optarg);
break;
case 'q': case 'q':
qflag = 1; qflag = 1;
break; break;
@ -270,6 +277,17 @@ read_f(int argc, char **argv)
return 0; return 0;
} }
if (Pflag) {
void* cmp_buf = malloc(count);
memset(cmp_buf, pattern, count);
if (memcmp(buf, cmp_buf, count)) {
printf("Pattern verification failed at offset %lld, "
"%d bytes\n",
(long long) offset, count);
}
free(cmp_buf);
}
if (qflag) if (qflag)
return 0; return 0;
@ -291,7 +309,7 @@ static const cmdinfo_t read_cmd = {
.cfunc = read_f, .cfunc = read_f,
.argmin = 2, .argmin = 2,
.argmax = -1, .argmax = -1,
.args = "[-aCpqv] off len", .args = "[-aCpqv] [-P pattern ] off len",
.oneline = "reads a number of bytes at a specified offset", .oneline = "reads a number of bytes at a specified offset",
.help = read_help, .help = read_help,
}; };
@ -312,6 +330,7 @@ readv_help(void)
" standard output stream (with -v option) for subsequent inspection.\n" " standard output stream (with -v option) for subsequent inspection.\n"
" Uses multiple iovec buffers if more than one byte range is specified.\n" " Uses multiple iovec buffers if more than one byte range is specified.\n"
" -C, -- report statistics in a machine parsable format\n" " -C, -- report statistics in a machine parsable format\n"
" -P, -- use a pattern to verify read data\n"
" -v, -- dump buffer to standard output\n" " -v, -- dump buffer to standard output\n"
" -q, -- quite mode, do not show I/O statistics\n" " -q, -- quite mode, do not show I/O statistics\n"
"\n"); "\n");
@ -328,12 +347,18 @@ readv_f(int argc, char **argv)
int count = 0, total; int count = 0, total;
int nr_iov, i; int nr_iov, i;
QEMUIOVector qiov; QEMUIOVector qiov;
int pattern = 0;
int Pflag = 0;
while ((c = getopt(argc, argv, "Cqv")) != EOF) { while ((c = getopt(argc, argv, "CP:qv")) != EOF) {
switch (c) { switch (c) {
case 'C': case 'C':
Cflag = 1; Cflag = 1;
break; break;
case 'P':
Pflag = 1;
pattern = atoi(optarg);
break;
case 'q': case 'q':
qflag = 1; qflag = 1;
break; break;
@ -406,6 +431,17 @@ readv_f(int argc, char **argv)
return 0; return 0;
} }
if (Pflag) {
void* cmp_buf = malloc(count);
memset(cmp_buf, pattern, count);
if (memcmp(buf, cmp_buf, count)) {
printf("Pattern verification failed at offset %lld, "
"%d bytes\n",
(long long) offset, count);
}
free(cmp_buf);
}
if (qflag) if (qflag)
return 0; return 0;
@ -426,7 +462,7 @@ static const cmdinfo_t readv_cmd = {
.cfunc = readv_f, .cfunc = readv_f,
.argmin = 2, .argmin = 2,
.argmax = -1, .argmax = -1,
.args = "[-Cqv] off len [len..]", .args = "[-Cqv] [-P pattern ] off len [len..]",
.oneline = "reads a number of bytes at a specified offset", .oneline = "reads a number of bytes at a specified offset",
.help = readv_help, .help = readv_help,
}; };