From patchwork Thu Aug 11 03:07:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Reda Sallahi X-Patchwork-Id: 9274413 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0D47B600CA for ; Thu, 11 Aug 2016 03:08:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E6179284AD for ; Thu, 11 Aug 2016 03:08:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D8F54284BB; Thu, 11 Aug 2016 03:08:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 96D5D284AD for ; Thu, 11 Aug 2016 03:08:07 +0000 (UTC) Received: from localhost ([::1]:45187 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bXgLl-0004H2-VG for patchwork-qemu-devel@patchwork.kernel.org; Wed, 10 Aug 2016 23:08:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44116) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bXgLR-0004Gw-7N for qemu-devel@nongnu.org; Wed, 10 Aug 2016 23:07:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bXgLM-0000I5-VU for qemu-devel@nongnu.org; Wed, 10 Aug 2016 23:07:44 -0400 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:36140) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bXgLM-0000Hy-KI; Wed, 10 Aug 2016 23:07:40 -0400 Received: by mail-wm0-x241.google.com with SMTP id i138so491238wmf.3; Wed, 10 Aug 2016 20:07:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=U5NuoKIxFVe9QVb73zziMmvckL22zSQbNSXpLyy+Vxo=; b=bZSGQdizsOWtamp3YVT0dTeL/7NpQZ3N8tlLGJEffDA19btTNIEEg/Whd7yGt7fsu3 qD0imyy2qCmqtoZMWgVp7teQ6AyE3J2RVX2gQs5Uh3PZbiKHCfnzTguGHkHJA5vljMaX O0B3HrQosbe9m/DSEMLZO+1DiVWSPLs6YK0kgoWjCE3YgvcORJUOssIBmml2Ui4TZvud db6RxnzsKe1E7+XZYNj3JZJzRkR0H4yNbEh3Av5by4wsEkb2ozXsPjsiAhCFF0Zg1yo7 bBPqdwdk5Sn5owNv28OdA9IY61nVC67sB3DlUX5fTM+QWK59WoNdZpIt5sy6j/cDes9C UtrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=U5NuoKIxFVe9QVb73zziMmvckL22zSQbNSXpLyy+Vxo=; b=UC1xWmX4TdFx/QMX89/6a1CgK2tEq01P9l/Ya7K+TZ0mZ7Brhz5peqdmlVbhqG+JVL wGyTMYiJmiGwUIo3Sz6dYuZ2MhuWrxW8E9cAF3nsHnEb5kUKzV3YRBBOSul7Y60TIZmB nk3832k6CtGDlIsHuxLgOKIQ1XHlGkQYb8L1SE423kPs9/ZbWhGiccCEgUTHHhfs6qnD cQevIxrc3oVnfhsw68RQUyR1TKC4WTBGYBc4n92AuLAmPX8ickAF+bYODb3+6dbT3KwM dBS+r4HOBRLZlqQTolm29kbmD2tCdzfZpXZu2J0SxmlgtMjml0RITzSa8UJipfL6DQCz 8kYQ== X-Gm-Message-State: AEkoouvY7Tv0bcfNZ0+bWyJ2U2679696a1LLXK+kui+dXseJIhVmnDfqmXN4XIiVYXmKOQ== X-Received: by 10.194.97.17 with SMTP id dw17mr6819371wjb.8.1470884859090; Wed, 10 Aug 2016 20:07:39 -0700 (PDT) Received: from localhost.localdomain (ram94-2-82-66-69-246.fbx.proxad.net. [82.66.69.246]) by smtp.gmail.com with ESMTPSA id q23sm880824wme.17.2016.08.10.20.07.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Aug 2016 20:07:38 -0700 (PDT) From: Reda Sallahi To: qemu-devel@nongnu.org Date: Thu, 11 Aug 2016 05:07:30 +0200 Message-Id: <20160811030730.23682-1-fullmanet@gmail.com> X-Mailer: git-send-email 2.9.2 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::241 Subject: [Qemu-devel] [PATCH] qemu-img: add conv=notrunc option to dd 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: Kevin Wolf , Fam Zheng , qemu-block@nongnu.org, Max Reitz , Reda Sallahi , Stefan Hajnoczi Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP This adds the conv=notrunc option to dd which tells dd to not truncate the output. For the time being we make it mandatory to specify conv=notrunc. Signed-off-by: Reda Sallahi --- qemu-img-cmds.hx | 4 ++-- qemu-img.c | 31 ++++++++++++++++++++++++++++--- qemu-img.texi | 15 +++++++++------ tests/qemu-iotests/158 | 2 +- tests/qemu-iotests/159 | 3 ++- tests/qemu-iotests/160 | 7 ++++--- 6 files changed, 46 insertions(+), 16 deletions(-) diff --git a/qemu-img-cmds.hx b/qemu-img-cmds.hx index f054599..18685ac 100644 --- a/qemu-img-cmds.hx +++ b/qemu-img-cmds.hx @@ -46,9 +46,9 @@ STEXI ETEXI DEF("dd", img_dd, - "dd [--image-opts] [-f fmt] [-O output_fmt] [bs=block_size] [count=blocks] [skip=blocks] if=input of=output") + "dd [--image-opts] [-f fmt] [-O output_fmt] [bs=block_size] [count=blocks] [skip=blocks] [conv=notrunc] if=input of=output") STEXI -@item dd [--image-opts] [-f @var{fmt}] [-O @var{output_fmt}] [bs=@var{block_size}] [count=@var{blocks}] [skip=@var{blocks}] if=@var{input} of=@var{output} +@item dd [--image-opts] [-f @var{fmt}] [-O @var{output_fmt}] [bs=@var{block_size}] [count=@var{blocks}] [skip=@var{blocks}] [conv=notrunc] if=@var{input} of=@var{output} ETEXI DEF("info", img_info, diff --git a/qemu-img.c b/qemu-img.c index 3adec86..16b56b8 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -174,7 +174,8 @@ static void QEMU_NORETURN help(void) " 'count=N' copy only N input blocks\n" " 'if=FILE' read from FILE\n" " 'of=FILE' write to FILE\n" - " 'skip=N' skip N bs-sized blocks at the start of input\n"; + " 'skip=N' skip N bs-sized blocks at the start of input\n" + " 'conv=notrunc' do not truncate the output file\n"; printf("%s\nSupported formats:", help_msg); bdrv_iterate_format(format_print, NULL); @@ -3807,10 +3808,12 @@ out: #define C_IF 04 #define C_OF 010 #define C_SKIP 020 +#define C_CONV 040 struct DdInfo { unsigned int flags; int64_t count; + unsigned int conv; }; struct DdIo { @@ -3894,6 +3897,21 @@ static int img_dd_skip(const char *arg, return 0; } +#define C_NOTRUNC 01 + +static int img_dd_conv(const char *arg, + struct DdIo *in, struct DdIo *out, + struct DdInfo *dd) +{ + if (!strcmp(arg, "notrunc")) { + dd->conv |= C_NOTRUNC; + return 0; + } else { + error_report("invalid conversion: '%s'", arg); + return 1; + } +} + static int img_dd(int argc, char **argv) { int ret = 0; @@ -3909,10 +3927,11 @@ static int img_dd(int argc, char **argv) const char *out_fmt = "raw"; const char *fmt = NULL; int64_t size = 0; - int64_t block_count = 0, out_pos, in_pos; + int64_t out_pos, in_pos; struct DdInfo dd = { .flags = 0, .count = 0, + .conv = 0 }; struct DdIo in = { .bsz = 512, /* Block size is by default 512 bytes */ @@ -3933,6 +3952,7 @@ static int img_dd(int argc, char **argv) { "if", img_dd_if, C_IF }, { "of", img_dd_of, C_OF }, { "skip", img_dd_skip, C_SKIP }, + { "conv", img_dd_conv, C_CONV }, { NULL, NULL, 0 } }; const struct option long_options[] = { @@ -3997,6 +4017,11 @@ static int img_dd(int argc, char **argv) g_free(arg); arg = NULL; } + if (!(dd.conv & C_NOTRUNC)) { + error_report("conv=notrunc not specified"); + ret = -1; + goto out; + } if (!(dd.flags & C_IF && dd.flags & C_OF)) { error_report("Must specify both input and output files"); @@ -4091,7 +4116,7 @@ static int img_dd(int argc, char **argv) in.buf = g_new(uint8_t, in.bsz); - for (out_pos = 0; in_pos < size; block_count++) { + for (out_pos = 0; in_pos < size; ) { int in_ret, out_ret; if (in_pos + in.bsz > size) { diff --git a/qemu-img.texi b/qemu-img.texi index 174aae3..891af14 100644 --- a/qemu-img.texi +++ b/qemu-img.texi @@ -144,15 +144,18 @@ Parameters to dd subcommand: @table @option @item bs=@var{block_size} -defines the block size +Defines the block size. @item count=@var{blocks} -sets the number of input blocks to copy +Sets the number of input blocks to copy. @item if=@var{input} -sets the input file +Sets the input file. @item of=@var{output} -sets the output file +Sets the output file. dd truncates the output file to zero if 'conv=notrunc' +is not specified. @item skip=@var{blocks} -sets the number of input blocks to skip +Sets the number of input blocks to skip. +@item conv=notrunc +Makes dd not truncate output file to zero. @end table Command description: @@ -326,7 +329,7 @@ skipped. This is useful for formats such as @code{rbd} if the target volume has already been created with site specific options that cannot be supplied through qemu-img. -@item dd [-f @var{fmt}] [-O @var{output_fmt}] [bs=@var{block_size}] [count=@var{blocks}] [skip=@var{blocks}] if=@var{input} of=@var{output} +@item dd [-f @var{fmt}] [-O @var{output_fmt}] [bs=@var{block_size}] [count=@var{blocks}] [skip=@var{blocks}] [conv=notrunc] if=@var{input} of=@var{output} Dd copies from @var{input} file to @var{output} file converting it from @var{fmt} format to @var{output_fmt} format. diff --git a/tests/qemu-iotests/158 b/tests/qemu-iotests/158 index 5b335db..63e2a10 100755 --- a/tests/qemu-iotests/158 +++ b/tests/qemu-iotests/158 @@ -53,7 +53,7 @@ $QEMU_IO -c "write -P 0xa 0 $size" "$TEST_IMG" | _filter_qemu_io echo echo "== Converting the image with dd ==" -$QEMU_IMG dd if="$TEST_IMG" of="$TEST_IMG.out" -O "$IMGFMT" +$QEMU_IMG dd if="$TEST_IMG" of="$TEST_IMG.out" conv=notrunc -O "$IMGFMT" TEST_IMG="$TEST_IMG.out" _check_test_img echo diff --git a/tests/qemu-iotests/159 b/tests/qemu-iotests/159 index 825f05f..d68a19f 100755 --- a/tests/qemu-iotests/159 +++ b/tests/qemu-iotests/159 @@ -55,7 +55,8 @@ for bs in $TEST_SIZES; do echo echo "== Converting the image with dd with a block size of $bs ==" - $QEMU_IMG dd if="$TEST_IMG" of="$TEST_IMG.out" bs=$bs -O "$IMGFMT" + $QEMU_IMG dd if="$TEST_IMG" of="$TEST_IMG.out" bs=$bs conv=notrunc \ + -O "$IMGFMT" TEST_IMG="$TEST_IMG.out" _check_test_img echo diff --git a/tests/qemu-iotests/160 b/tests/qemu-iotests/160 index 5c910e5..53b3c30 100755 --- a/tests/qemu-iotests/160 +++ b/tests/qemu-iotests/160 @@ -55,10 +55,11 @@ for skip in $TEST_SKIP_BLOCKS; do echo echo "== Converting the image with dd with skip=$skip ==" - $QEMU_IMG dd if="$TEST_IMG" of="$TEST_IMG.out" skip="$skip" -O "$IMGFMT" \ - 2> /dev/null + $QEMU_IMG dd if="$TEST_IMG" of="$TEST_IMG.out" skip="$skip" conv=notrunc \ + -O "$IMGFMT" 2> /dev/null TEST_IMG="$TEST_IMG.out" _check_test_img - dd if="$TEST_IMG" of="$TEST_IMG.out.dd" skip="$skip" status=none + dd if="$TEST_IMG" of="$TEST_IMG.out.dd" skip="$skip" conv=notrunc \ + status=none echo echo "== Compare the images with qemu-img compare =="