From nobody Mon Nov 10 20:49:06 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1559288851; cv=none; d=zoho.com; s=zohoarc; b=QxlzK7kfM/a3x1D1hlUwsxgv3JI3ludTXNDOdilzfz4CU9ZqFref5qIYCGmDrLPHGzbscIv1/mG+gv0Yq17gftGgnD9Cl8eAPsk3HJEsJnPYMEpni3z7dspmvLX0Ei2yjql2t7GycGbdDpNwiYq8roxZz+y8n7BCbB7taSnfx7I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559288851; h=Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=5v0ibJtdD04QaedFzRowwPulffZgVzE6MFaq8TbDJgg=; b=b9LXPiu5H4btpqEIvuHPWSxJ6nHmlyvfIh3BpkkmLJakQ3Oz+qZFMPPiOJvVGCzZcwMyvXpcDp/D8+5Vnlx8vNe6xiVrsjw6prBKK+PP610EVYg9BdEik6aa+Q05MccdB+F+FNmxx3LFFRs/U9PSckjltwV4FAPqVuqNDQQFlBI= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1559288851814193.88751254134013; Fri, 31 May 2019 00:47:31 -0700 (PDT) Received: from localhost ([127.0.0.1]:38110 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWcG4-0004Sk-SG for importer@patchew.org; Fri, 31 May 2019 03:47:24 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49691) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWcFC-0004AW-SY for qemu-devel@nongnu.org; Fri, 31 May 2019 03:46:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hWcF9-0000IV-W3 for qemu-devel@nongnu.org; Fri, 31 May 2019 03:46:30 -0400 Received: from relay.sw.ru ([185.231.240.75]:38854) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hWcF7-0000A3-BE; Fri, 31 May 2019 03:46:25 -0400 Received: from [10.94.4.71] (helo=dptest2.qa.sw.ru) by relay.sw.ru with esmtp (Exim 4.91) (envelope-from ) id 1hWcF2-0003Jx-UM; Fri, 31 May 2019 10:46:21 +0300 From: Denis Plotnikov To: sgarzare@redhat.com, kwolf@redhat.com, mreitz@redhat.com, qemu-block@nongnu.org Date: Fri, 31 May 2019 10:46:20 +0300 Message-Id: <20190531074620.24934-1-dplotnikov@virtuozzo.com> X-Mailer: git-send-email 2.17.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 185.231.240.75 Subject: [Qemu-devel] [PATCH v5] qemu-io: add pattern file for write command X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: vsementsov@virtuozzo.com, qemu-devel@nongnu.org, den@virtuozzo.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The patch allows to provide a pattern file for write command. There was no similar ability before. Signed-off-by: Denis Plotnikov --- v5: * file name initiated with null to make compilers happy v4: * missing signed-off clause added =20 v3: * missing file closing added * exclusive flags processing changed * buffer void* converted to char* to fix pointer arithmetics * file reading error processing added --- qemu-io-cmds.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 75 insertions(+), 6 deletions(-) diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c index 09750a23ce..5779c3b77d 100644 --- a/qemu-io-cmds.c +++ b/qemu-io-cmds.c @@ -21,6 +21,7 @@ #include "qemu/option.h" #include "qemu/timer.h" #include "qemu/cutils.h" +#include "string.h" =20 #define CMD_NOFILE_OK 0x01 =20 @@ -343,6 +344,61 @@ static void *qemu_io_alloc(BlockBackend *blk, size_t l= en, int pattern) return buf; } =20 +static void *qemu_io_alloc_from_file(BlockBackend *blk, size_t len, + char *file_name) +{ + char *buf, *buf_pos; + FILE *f =3D fopen(file_name, "r"); + int l; + + if (!f) { + printf("'%s': %s\n", file_name, strerror(errno)); + return NULL; + } + + if (qemuio_misalign) { + len +=3D MISALIGN_OFFSET; + } + buf =3D blk_blockalign(blk, len); + memset(buf, 0, len); + + buf_pos =3D buf; + + while (len > 0) { + l =3D 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 =3D=3D 0) { + printf("'%s' is empty\n", file_name); + goto error; + } + + len -=3D l; + buf_pos +=3D l; + } + + if (qemuio_misalign) { + buf +=3D MISALIGN_OFFSET; + } + + goto out; + +error: + qemu_vfree(buf); + buf =3D 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 =3D { .perm =3D BLK_PERM_WRITE, .argmin =3D 2, .argmax =3D -1, - .args =3D "[-bcCfnquz] [-P pattern] off len", + .args =3D "[-bcCfnquz] [-P pattern | -s source_file] off len", .oneline =3D "writes a number of bytes at a specified offset", .help =3D write_help, }; @@ -974,7 +1030,7 @@ static int write_f(BlockBackend *blk, int argc, char *= *argv) { struct timeval t1, t2; bool Cflag =3D false, qflag =3D false, bflag =3D false; - bool Pflag =3D false, zflag =3D false, cflag =3D false; + bool Pflag =3D false, zflag =3D false, cflag =3D false, sflag =3D fals= e; int flags =3D 0; int c, cnt, ret; char *buf =3D 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 =3D 0; int pattern =3D 0xcd; + char *file_name =3D NULL; =20 - while ((c =3D getopt(argc, argv, "bcCfnpP:quz")) !=3D -1) { + while ((c =3D getopt(argc, argv, "bcCfnpP:quzs:")) !=3D -1) { switch (c) { case 'b': bflag =3D true; @@ -1020,6 +1077,10 @@ static int write_f(BlockBackend *blk, int argc, char= **argv) case 'z': zflag =3D true; break; + case 's': + sflag =3D true; + file_name =3D g_strdup(optarg); + break; default: qemuio_command_usage(&write_cmd); return -EINVAL; @@ -1051,8 +1112,9 @@ static int write_f(BlockBackend *blk, int argc, char = **argv) return -EINVAL; } =20 - 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; } =20 @@ -1088,7 +1150,14 @@ static int write_f(BlockBackend *blk, int argc, char= **argv) } =20 if (!zflag) { - buf =3D qemu_io_alloc(blk, count, pattern); + if (sflag) { + buf =3D qemu_io_alloc_from_file(blk, count, file_name); + if (!buf) { + return -EINVAL; + } + } else { + buf =3D qemu_io_alloc(blk, count, pattern); + } } =20 gettimeofday(&t1, NULL); --=20 2.17.0