From nobody Sun May 5 14:29:39 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=1565161664; cv=none; d=zoho.com; s=zohoarc; b=GaQXGRTT42yNDKVj1QeFPhuux8+XjxgIxAgHupApAqpa+03huh2wBCiEv/dCBVqZXx7dDWqc2PO2X1U8NOuqo3odIxzCffY6gtvxl5hlSMc13haYl9ToZSJKLGPDv+45nrJEOCNAIksHJrOFoGBTob36m2JgsnFi1LuEuglLrBg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565161664; 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=uaMopZuVY2KH5sdWb+NXem4olsKo5tllxPU2EcCRBDI=; b=SM/xgq2eBFNL1FGsT6qWJl3USMFO/N7syIvjD81v3cxRFs88gDh1e439NgmJFlR61MNJsTp0FvwLJ87LdII+AKUirwncmCfu7mS7LUJeDSC2D7b2J0GqHKqfrurasu0GUx8TuvBdPQBcb95CnEukjYtUlCaD6D4EECvIqE+i2cg= 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 1565161663760926.8640023862724; Wed, 7 Aug 2019 00:07:43 -0700 (PDT) Received: from localhost ([::1]:37566 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hvG2w-0004xC-Hv for importer@patchew.org; Wed, 07 Aug 2019 03:07:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58874) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hvG2O-0004Ss-Hl for qemu-devel@nongnu.org; Wed, 07 Aug 2019 03:07:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hvG2N-0005EM-9I for qemu-devel@nongnu.org; Wed, 07 Aug 2019 03:07:08 -0400 Received: from relay.sw.ru ([185.231.240.75]:51612) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hvG2N-0005Dd-2F; Wed, 07 Aug 2019 03:07:07 -0400 Received: from [10.94.4.71] (helo=dptest2.qa.sw.ru) by relay.sw.ru with esmtp (Exim 4.92) (envelope-from ) id 1hvG2I-0002lZ-Lz; Wed, 07 Aug 2019 10:07:03 +0300 From: Denis Plotnikov To: qemu-devel@nongnu.org Date: Wed, 7 Aug 2019 10:06:31 +0300 Message-Id: <20190807070631.9908-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 v8] qemu-io: add pattern file for write command X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, vsementsov@virtuozzo.com, den@virtuozzo.com, qemu-block@nongnu.org, mreitz@redhat.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 --- v8: fix according to Max's comments * get rid of unnecessary buffer for the pattern * buffer allocation just in bytes * take into account the missalign offset * don't copy file name * changed char* to const char* in input params v7: * fix variable naming * make code more readable * extend help for write command v6: * the pattern file is read once to reduce io v5: * file name initiated with null to make compilers happy v4: * missing signed-off clause added 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 | 83 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 77 insertions(+), 6 deletions(-) diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c index 09750a23ce..940271ea00 100644 --- a/qemu-io-cmds.c +++ b/qemu-io-cmds.c @@ -343,6 +343,63 @@ 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, + const char *file_name) +{ + char *buf, *buf_origin; + FILE *f =3D fopen(file_name, "r"); + int pattern_len; + + if (!f) { + perror(file_name); + return NULL; + } + + if (qemuio_misalign) { + len +=3D MISALIGN_OFFSET; + } + + buf_origin =3D buf =3D blk_blockalign(blk, len); + + if (qemuio_misalign) { + buf_origin +=3D MISALIGN_OFFSET; + } + + pattern_len =3D fread(buf_origin, 1, len, f); + + if (ferror(f)) { + perror(file_name); + goto error; + } + + if (pattern_len =3D=3D 0) { + fprintf(stderr, "%s: file is empty\n", file_name); + goto error; + } + + fclose(f); + + if (len > pattern_len) { + len -=3D pattern_len; + buf +=3D pattern_len; + + while (len > 0) { + size_t len_to_copy =3D MIN(pattern_len, len); + + memcpy(buf, buf_origin, len_to_copy); + + len -=3D len_to_copy; + buf +=3D len_to_copy; + } + } + + return buf_origin; + +error: + qemu_vfree(buf_origin); + return NULL; +} + static void qemu_io_free(void *p) { if (qemuio_misalign) { @@ -949,6 +1006,7 @@ static void write_help(void) " -n, -- with -z, don't allow slow fallback\n" " -p, -- ignored for backwards compatibility\n" " -P, -- use different pattern to fill file\n" +" -s, -- use a pattern file to fill the write buffer\n" " -C, -- report statistics in a machine parsable format\n" " -q, -- quiet mode, do not show I/O statistics\n" " -u, -- with -z, allow unmapping\n" @@ -965,7 +1023,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 +1032,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 +1041,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; + const 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 +1079,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 optarg; + break; default: qemuio_command_usage(&write_cmd); return -EINVAL; @@ -1051,8 +1114,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 +1152,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