From nobody Fri May 3 12:41:51 2024 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=1559130491; cv=none; d=zoho.com; s=zohoarc; b=ci6KlVxz6koJ+z1eW1K0QFHdTbECdUHhq0oemZqFOfOx8H6PwtBUe67zAqcOU2Vn1aH/aHk7aPEDtVhhXqZR2c8zh8vz64E2bCpcUNp08RGDFdu1Af+RjrPrn56se9gCBcx9guepp1IJCgo6oPgJAcz2MtKL9F99OY7aMdyrYdM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559130491; 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=hya2Zi1R72ErP0Urzc4+4QzWPMOOHO51wzHXvW1Rhlg=; b=L0Q4rsIieK9wBrgRZ8whmzrHmT7AdUkm/ew7SkDqZ8eDd9mhbuL2WKiv/Am8CnkWlQDBLpljxcEDeYqMeitKNFhyLLk1rXdwwl5r58YQx29Ro69FLTT2fR2uOKbqqg3pvYja5e26dlftDZuHdYqnOd1L3wiPgdkdS/ZXEzJDSyU= 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 (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 15591304911051000.918726235775; Wed, 29 May 2019 04:48:11 -0700 (PDT) Received: from localhost ([127.0.0.1]:52301 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hVx3q-0007EC-1K for importer@patchew.org; Wed, 29 May 2019 07:48:02 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49781) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hVx2b-0006kF-40 for qemu-devel@nongnu.org; Wed, 29 May 2019 07:46:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hVx2X-0006sN-5x for qemu-devel@nongnu.org; Wed, 29 May 2019 07:46:42 -0400 Received: from relay.sw.ru ([185.231.240.75]:33758) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hVx2R-0006ms-Mi; Wed, 29 May 2019 07:46:36 -0400 Received: from [10.94.4.71] (helo=dptest2.qa.sw.ru) by relay.sw.ru with esmtp (Exim 4.91) (envelope-from ) id 1hVx2M-0003Dw-CH; Wed, 29 May 2019 14:46:30 +0300 From: Denis Plotnikov To: eblake@redhat.com, kwolf@redhat.com, mreitz@redhat.com Date: Wed, 29 May 2019 14:46:24 +0300 Message-Id: <20190529114624.23107-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 v2] 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: qemu-devel@nongnu.org, qemu-block@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. --- qemu-io-cmds.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 54 insertions(+), 4 deletions(-) diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c index 09750a23ce..148f2ff92a 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,35 @@ 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) +{ + void *buf; + FILE *f =3D fopen(file_name, "r"); + + if (!f) { + printf("cannot open file '%s'\n", file_name); + return NULL; + } + + if (qemuio_misalign) { + len +=3D MISALIGN_OFFSET; + } + buf =3D blk_blockalign(blk, len); + memset(buf, 0, len); + + if (!fread(buf, sizeof(char), len, f)) { + printf("file '%s' is empty\n", file_name); + qemu_vfree(buf); + return NULL; + } + + if (qemuio_misalign) { + buf +=3D MISALIGN_OFFSET; + } + return buf; +} + static void qemu_io_free(void *p) { if (qemuio_misalign) { @@ -965,7 +995,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 +1004,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 +1013,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; =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 +1051,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; @@ -1056,6 +1091,14 @@ static int write_f(BlockBackend *blk, int argc, char= **argv) return -EINVAL; } =20 + if (sflag && Pflag) { + printf("-s and -P cannot be specified at the same time\n"); + } + + if (sflag && zflag) { + printf("-s and -z cannot be specified at the same time\n"); + } + offset =3D cvtnum(argv[optind]); if (offset < 0) { print_cvtnum_err(offset, argv[optind]); @@ -1088,7 +1131,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