1 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2 From: Wolfgang Bumiller <w.bumiller@proxmox.com>
3 Date: Tue, 10 Mar 2020 12:55:09 +0100
4 Subject: [PATCH 12/32] 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 | 29 ++++++++++++++++++++++++++---
15 1 file changed, 26 insertions(+), 3 deletions(-)
17 diff --git a/qemu-img.c b/qemu-img.c
18 index d2516968c6..8da1ea3951 100644
21 @@ -4406,11 +4406,13 @@ out:
35 @@ -4503,6 +4505,20 @@ 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(arg);
45 + if (dd->isize < 0) {
46 + error_report("invalid number: '%s'", arg);
53 static int img_dd(int argc, char **argv)
56 @@ -4517,12 +4533,14 @@ static int img_dd(int argc, char **argv)
58 const char *out_fmt = "raw";
59 const char *fmt = NULL;
61 + int64_t size = 0, readsize = 0;
62 int64_t block_count = 0, out_pos, in_pos;
63 bool force_share = false;
71 .bsz = 512, /* Block size is by default 512 bytes */
72 @@ -4544,6 +4562,7 @@ static int img_dd(int argc, char **argv)
73 { "of", img_dd_of, C_OF },
74 { "skip", img_dd_skip, C_SKIP },
75 { "osize", img_dd_osize, C_OSIZE },
76 + { "isize", img_dd_isize, C_ISIZE },
79 const struct option long_options[] = {
80 @@ -4750,14 +4769,18 @@ static int img_dd(int argc, char **argv)
82 in.buf = g_new(uint8_t, in.bsz);
84 - for (out_pos = 0; in_pos < size; block_count++) {
85 + readsize = (dd.isize > 0) ? dd.isize : size;
86 + for (out_pos = 0; in_pos < readsize; block_count++) {
88 - size_t in_bsz = in_pos + in.bsz > size ? size - in_pos : in.bsz;
89 + size_t in_bsz = in_pos + in.bsz > readsize ? readsize - in_pos : in.bsz;
91 in_ret = blk_pread(blk1, in_pos, in.buf, in_bsz);
93 in_ret = read(STDIN_FILENO, in.buf, in_bsz);
95 + if (dd.isize == 0) {
98 /* early EOF is considered an error */
99 error_report("Input ended unexpectedly");