qemu-io: add pattern file for write command
PATCH v3 1/1 qemu-io: add pattern file for write command
The patch allows to provide a pattern file for write command. There was no similar ability before.
--- qemu-io-cmds.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 74 insertions(+), 6 deletions(-)
qemu-io-cmds.c +74 -6
@@ -21,6 +21,7 @@#include "qemu/option.h" #include "qemu/timer.h" #include "qemu/cutils.h" +#include "string.h" #define CMD_NOFILE_OK 0x01
@@ -343,6 +344,61 @@ static void *qemu_io_alloc(BlockBackend *blk, size_t len, int pattern)return buf; } +static void *qemu_io_alloc_from_file (BlockBackend *blk,size_t len, +char *file_name) +{ +char *buf, *buf_pos; +FILE *f =fopen (file_name,"r" ); +int l; + +if (!f) { +printf ("'%s': %s\n" , file_name,strerror (errno)); +return NULL ; + } + +if (qemuio_misalign) { + len +=MISALIGN_OFFSET ; + } + buf =blk_blockalign (blk, len); +memset (buf,0 , len); + + buf_pos = buf; + +while (len >0 ) { + l =fread (buf_pos,sizeof (char ), len, f); + +if (feof (f)) { +rewind (f); + } + +if (ferror (f)) { +printf ("'%s': %s\n" , file_name,strerror (errno)); + goto error; + } + +if (l ==0 ) { +printf ("'%s' is empty\n" , file_name); + goto error; + } + + len -= l; + buf_pos += l; + } + +if (qemuio_misalign) { + buf +=MISALIGN_OFFSET ; + } + + goto out; + +error: +qemu_vfree (buf); + buf =NULL ; +out: +fclose (f); +return buf; +} +static void qemu_io_free (void *p) {if (qemuio_misalign) {
@@ -965,7 +1021,7 @@ static const cmdinfo_t write_cmd = { .perm = BLK_PERM_WRITE, .argmin = 2, .argmax = -1, - .args = "[-bcCfnquz] [-P pattern] off len", + .args = "[-bcCfnquz] [-P pattern | -s source_file] off len", .oneline = "writes a number of bytes at a specified offset", .help = write_help, };
@@ -974,7 +1030,7 @@ static int write_f(BlockBackend *blk, int argc, char **argv) {struct timeval t1, t2;bool Cflag = false, qflag = false, bflag = false; -bool Pflag = false, zflag = false, cflag = false; +bool Pflag = false, zflag = false, cflag = false, sflag = false;int flags =0 ;int c, cnt, ret;char *buf =NULL ;
@@ -983,8 +1039,9 @@ static int write_f(BlockBackend *blk, int argc, char **argv)/* Some compilers get confused and warn if this is not initialized. */ int64_t total =0 ;int pattern =0xcd ; +char *file_name; -while ((c =getopt (argc, argv,"bcCfnpP:quz" )) !=-1 ) { +while ((c =getopt (argc, argv,"bcCfnpP:quzs:" )) !=-1 ) {switch (c) {case 'b' : bflag = true;
@@ -1020,6 +1077,10 @@ static int write_f(BlockBackend *blk, int argc, char **argv)case 'z' : zflag = true;break ; +case 's' : + sflag = true; + file_name =g_strdup (optarg); +break ;default :qemuio_command_usage (&write_cmd);return -EINVAL ;
@@ -1051,8 +1112,8 @@ static int write_f(BlockBackend *blk, int argc, char **argv)return -EINVAL ; } -if (zflag && Pflag) { -printf ("-z and -P cannot be specified at the same time\n" ); +if ((int )zflag + (int )Pflag + (int )sflag >1 ) { +printf ("Only one of -z, -P, and -s can be specified at the same time\n" );return -EINVAL ; }
@@ -1088,7 +1149,14 @@ static int write_f(BlockBackend *blk, int argc, char **argv) }if (!zflag) { - buf =qemu_io_alloc (blk, count, pattern); +if (sflag) { + buf =qemu_io_alloc_from_file (blk, count, file_name); +if (!buf) { +return -EINVAL ; + } + }else { + buf =qemu_io_alloc (blk, count, pattern); + } }gettimeofday (&t1,NULL );
Signature · 1 line
2.17.0
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series seems to have some coding style problems. See output below for more information:
Subject: [Qemu-devel] [PATCH v3] qemu-io: add pattern file for write command
Type: series
Message-id: [email protected]
=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===
From https://github.com/patchew-project/qemu
* [new tag] patchew/[email protected] -> patchew/[email protected]
Switched to a new branch 'test'6579ff71db qemu-io: add pattern file for write command
=== OUTPUT BEGIN ===
ERROR: suspect code indent for conditional statements (8, 11) #50: FILE: qemu-io-cmds.c:370:
+ if (feof(f)) {
+ rewind(f);
WARNING: line over 80 characters
#132: FILE: qemu-io-cmds.c:1116:
+ printf("Only one of -z, -P, and -s can be specified at the same time\n");
ERROR: Missing Signed-off-by: line(s)
total: 2 errors, 1 warnings, 129 lines checked
Commit 6579ff71dbaa (qemu-io: add pattern file for write command) has style problems, please review. If any of these errors are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
=== OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/[email protected]/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to [email protected]