1 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2 From: Wolfgang Bumiller <w.bumiller@proxmox.com>
3 Date: Mon, 6 Apr 2020 12:16:41 +0200
4 Subject: [PATCH] PVE: [Up] qemu-img dd: add isize parameter
6 for writing small images from stdin to bigger ones
8 In order to distinguish between an actually unexpected and
9 an expected end of input.
11 Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
12 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
14 qemu-img.c | 28 +++++++++++++++++++++++++---
15 1 file changed, 25 insertions(+), 3 deletions(-)
17 diff --git a/qemu-img.c b/qemu-img.c
18 index f773182bd0..98a6562364 100644
21 @@ -4794,11 +4794,13 @@ static int img_bitmap(int argc, char **argv)
35 @@ -4887,6 +4889,19 @@ static int img_dd_osize(const char *arg,
39 +static int img_dd_isize(const char *arg,
40 + struct DdIo *in, struct DdIo *out,
43 + dd->isize = cvtnum("size", arg);
45 + if (dd->isize < 0) {
52 static int img_dd(int argc, char **argv)
55 @@ -4901,12 +4916,14 @@ static int img_dd(int argc, char **argv)
57 const char *out_fmt = "raw";
58 const char *fmt = NULL;
60 + int64_t size = 0, readsize = 0;
61 int64_t block_count = 0, out_pos, in_pos;
62 bool force_share = false;
70 .bsz = 512, /* Block size is by default 512 bytes */
71 @@ -4928,6 +4945,7 @@ static int img_dd(int argc, char **argv)
72 { "of", img_dd_of, C_OF },
73 { "skip", img_dd_skip, C_SKIP },
74 { "osize", img_dd_osize, C_OSIZE },
75 + { "isize", img_dd_isize, C_ISIZE },
78 const struct option long_options[] = {
79 @@ -5124,14 +5142,18 @@ static int img_dd(int argc, char **argv)
81 in.buf = g_new(uint8_t, in.bsz);
83 - for (out_pos = 0; in_pos < size; block_count++) {
84 + readsize = (dd.isize > 0) ? dd.isize : size;
85 + for (out_pos = 0; in_pos < readsize; block_count++) {
87 - size_t in_bsz = in_pos + in.bsz > size ? size - in_pos : in.bsz;
88 + size_t in_bsz = in_pos + in.bsz > readsize ? readsize - in_pos : in.bsz;
90 in_ret = blk_pread(blk1, in_pos, in.buf, in_bsz);
92 in_ret = read(STDIN_FILENO, in.buf, in_bsz);
94 + if (dd.isize == 0) {
97 /* early EOF is considered an error */
98 error_report("Input ended unexpectedly");