[Qemu-commits] [qemu/qemu] 0eaf45: qemu-nbd: Close inherited stderr

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 0eaf453ebf6788885fbb5d40426b154ef8805407
      
https://github.com/qemu/qemu/commit/0eaf453ebf6788885fbb5d40426b154ef8805407
  Author: Raphael Pour <address@hidden>
  Date:   2020-05-18 (Mon, 18 May 2020)

  Changed paths:
    M qemu-nbd.c

  Log Message:
  -----------
  qemu-nbd: Close inherited stderr

Close inherited stderr of the parent if fork_process is false.
Otherwise no one will close it. (introduced by e6df58a5)

This only affected 'qemu-nbd -c /dev/nbd0'.

Signed-off-by: Raphael Pour <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
[eblake: Enhance commit message]
Signed-off-by: Eric Blake <address@hidden>


  Commit: 43d589b074370ebc9b340340b5f641b385da9df8
      
https://github.com/qemu/qemu/commit/43d589b074370ebc9b340340b5f641b385da9df8
  Author: Eyal Moscovici <address@hidden>
  Date:   2020-05-18 (Mon, 18 May 2020)

  Changed paths:
    M qemu-img.c
    M tests/qemu-iotests/049.out

  Log Message:
  -----------
  qemu_img: add cvtnum_full to print error reports

All calls to cvtnum check the return value and print the same error
message more or less. And so error reporting moved to cvtnum_full to
reduce code duplication and provide a single error
message. Additionally, cvtnum now wraps cvtnum_full with the existing
default range of 0 to MAX_INT64.

Acked-by: Mark Kanda <address@hidden>
Signed-off-by: Eyal Moscovici <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
[eblake: fix printf formatting, avoid trailing space, change error wording,
reformat commit message]
Signed-off-by: Eric Blake <address@hidden>


  Commit: 8f282e83edd3d1b4ea6e9258f5a4081b490c33cc
      
https://github.com/qemu/qemu/commit/8f282e83edd3d1b4ea6e9258f5a4081b490c33cc
  Author: Eyal Moscovici <address@hidden>
  Date:   2020-05-18 (Mon, 18 May 2020)

  Changed paths:
    M qemu-img.c

  Log Message:
  -----------
  qemu-img: validate image length in img_map

The code handles this case correctly: we merely skip the loop. However it
is probably best to return an explicit error.

Reviewed-by: Eric Blake <address@hidden>
Acked-by: Mark Kanda <address@hidden>
Signed-off-by: Eyal Moscovici <address@hidden>
Message-Id: <address@hidden>
[eblake: commit message tweak]
Signed-off-by: Eric Blake <address@hidden>


  Commit: e46c0b18cfd02195a0d527ca73f3ed9f3ce5eacb
      
https://github.com/qemu/qemu/commit/e46c0b18cfd02195a0d527ca73f3ed9f3ce5eacb
  Author: Eyal Moscovici <address@hidden>
  Date:   2020-05-18 (Mon, 18 May 2020)

  Changed paths:
    M qemu-img.c

  Log Message:
  -----------
  qemu-img: refactor dump_map_entry JSON format output

Previously dump_map_entry identified whether we need to start a new JSON
array based on whether start address == 0. In this refactor we remove
this assumption as in following patches we will allow map to start from
an arbitrary position.

Reviewed-by: Eric Blake <address@hidden>
Acked-by: Mark Kanda <address@hidden>
Signed-off-by: Eyal Moscovici <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Eric Blake <address@hidden>


  Commit: c0469496b32910a6a092d5b614efbf4088b13a29
      
https://github.com/qemu/qemu/commit/c0469496b32910a6a092d5b614efbf4088b13a29
  Author: Eyal Moscovici <address@hidden>
  Date:   2020-05-18 (Mon, 18 May 2020)

  Changed paths:
    M docs/tools/qemu-img.rst
    M qemu-img-cmds.hx
    M qemu-img.c

  Log Message:
  -----------
  qemu-img: Add --start-offset and --max-length to map

The mapping operation of large disks especially ones stored over a
long chain of QCOW2 files can take a long time to finish.
Additionally when mapping fails there was no way recover by
restarting the mapping from the failed location.

The new options, --start-offset and --max-length allows the user to
divide these type of map operations into shorter independent tasks.

Reviewed-by: Eric Blake <address@hidden>
Acked-by: Mark Kanda <address@hidden>
Co-developed-by: Yoav Elnekave <address@hidden>
Signed-off-by: Yoav Elnekave <address@hidden>
Signed-off-by: Eyal Moscovici <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Eric Blake <address@hidden>


  Commit: d8154b0945f795177511ea0e2212bd5c749fe84c
      
https://github.com/qemu/qemu/commit/d8154b0945f795177511ea0e2212bd5c749fe84c
  Author: Eric Blake <address@hidden>
  Date:   2020-05-18 (Mon, 18 May 2020)

  Changed paths:
    M tests/qemu-iotests/223
    M tests/qemu-iotests/223.out

  Log Message:
  -----------
  iotests: Enhance 223 to cover qemu-img map improvements

Since qemu-img map + x-dirty-bitmap remains the easiest way to read
persistent bitmaps at the moment, it makes a reasonable place to add
coverage to ensure we do not regress on the just-added parameters to
qemu-img map.

Signed-off-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>


  Commit: a89af8c20ab289785806fcc1589b0f4265bd4e90
      
https://github.com/qemu/qemu/commit/a89af8c20ab289785806fcc1589b0f4265bd4e90
  Author: Peter Maydell <address@hidden>
  Date:   2020-05-18 (Mon, 18 May 2020)

  Changed paths:
    M docs/tools/qemu-img.rst
    M qemu-img-cmds.hx
    M qemu-img.c
    M qemu-nbd.c
    M tests/qemu-iotests/049.out
    M tests/qemu-iotests/223
    M tests/qemu-iotests/223.out

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2020-05-18' into 
staging

nbd patches for 2020-05-20

- fix stranded fd in 'qemu-nbd -c /dev/nbd0'
- add 'qemu-img map --start-offset --max-length' options

# gpg: Signature made Mon 18 May 2020 17:29:56 BST
# gpg:                using RSA key 71C2CC22B1C4602927D2F3AAA7A16B4A2527436A
# gpg: Good signature from "Eric Blake <address@hidden>" [full]
# gpg:                 aka "Eric Blake (Free Software Programmer) 
<address@hidden>" [full]
# gpg:                 aka "[jpeg image of size 6874]" [full]
# Primary key fingerprint: 71C2 CC22 B1C4 6029 27D2  F3AA A7A1 6B4A 2527 436A

* remotes/ericb/tags/pull-nbd-2020-05-18:
  iotests: Enhance 223 to cover qemu-img map improvements
  qemu-img: Add --start-offset and --max-length to map
  qemu-img: refactor dump_map_entry JSON format output
  qemu-img: validate image length in img_map
  qemu_img: add cvtnum_full to print error reports
  qemu-nbd: Close inherited stderr

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/a28c9c8c9fc4...a89af8c20ab2