[Qemu-commits] [qemu/qemu] a79717: qemu-iotests: Fix FilePaths cleanup

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: a7971702f473d0461b527bfda476d164d3f2feff
      
https://github.com/qemu/qemu/commit/a7971702f473d0461b527bfda476d164d3f2feff
  Author: Nir Soffer <nirsof@gmail.com>
  Date:   2020-09-15 (Tue, 15 Sep 2020)

  Changed paths:
    M tests/qemu-iotests/iotests.py

  Log Message:
  -----------
  qemu-iotests: Fix FilePaths cleanup

If os.remove() fails to remove one of the paths, for example if the file
was removed by the test, the cleanup loop would exit silently, without
removing the rest of the files.

Fixes: de263986b5dc
Signed-off-by: Nir Soffer <nsoffer@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20200828232152.205833-2-nsoffer@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>


  Commit: f765af87c203723f77da37716a74f0eca99f192c
      
https://github.com/qemu/qemu/commit/f765af87c203723f77da37716a74f0eca99f192c
  Author: Nir Soffer <nirsof@gmail.com>
  Date:   2020-09-15 (Tue, 15 Sep 2020)

  Changed paths:
    M tests/qemu-iotests/iotests.py

  Log Message:
  -----------
  qemu-iotests: Fix FilePaths docstring

When this class was extracted from FilePath, the docstring was not
updated for generating multiple files, and the example usage was
referencing unrelated file.

While fixing the docstring, add example for creating sockets, which
should use iotests.sock_dir instead of the default base_dir.

Fixes: de263986b5dc
Signed-off-by: Nir Soffer <nsoffer@redhat.com>
Message-Id: <20200828232152.205833-3-nsoffer@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>


  Commit: a242b19e80faa95fd5856fca2d4115e853d465b1
      
https://github.com/qemu/qemu/commit/a242b19e80faa95fd5856fca2d4115e853d465b1
  Author: Nir Soffer <nirsof@gmail.com>
  Date:   2020-09-15 (Tue, 15 Sep 2020)

  Changed paths:
    M tests/qemu-iotests/194
    M tests/qemu-iotests/257
    M tests/qemu-iotests/iotests.py

  Log Message:
  -----------
  qemu-iotests: Support varargs syntax in FilePaths

Accept variable number of names instead of a sequence:

    with FilePaths("a", "b", "c") as (a, b, c):

The disadvantage is that base_dir must be used as kwarg:

    with FilePaths("a", "b", base_dir=soc_dir) as (sock1, sock2):

But this is more clear and calling optional argument as positional
arguments is bad idea anyway.

Signed-off-by: Nir Soffer <nsoffer@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20200828232152.205833-4-nsoffer@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>


  Commit: 3192fad7f789404dce6041d01400db3c16a0b5d1
      
https://github.com/qemu/qemu/commit/3192fad7f789404dce6041d01400db3c16a0b5d1
  Author: Nir Soffer <nirsof@gmail.com>
  Date:   2020-09-15 (Tue, 15 Sep 2020)

  Changed paths:
    M tests/qemu-iotests/194
    M tests/qemu-iotests/208
    M tests/qemu-iotests/222
    M tests/qemu-iotests/257
    M tests/qemu-iotests/iotests.py

  Log Message:
  -----------
  qemu-iotests: Merge FilePaths and FilePath

FilePath creates now one temporary file:

    with FilePath("a") as a:

Or more:

    with FilePath("a", "b", "c") as (a, b, c):

This is also the behavior of the file_path() helper, used by some of the
tests. Now we have only 2 helpers for creating temporary files instead
of 3.

Signed-off-by: Nir Soffer <nsoffer@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20200828232152.205833-5-nsoffer@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>


  Commit: 7cc002a06cde0e4df6cb4d546e4b21bb6433fcc3
      
https://github.com/qemu/qemu/commit/7cc002a06cde0e4df6cb4d546e4b21bb6433fcc3
  Author: Nir Soffer <nirsof@gmail.com>
  Date:   2020-09-15 (Tue, 15 Sep 2020)

  Changed paths:
    M tests/qemu-iotests/iotests.py

  Log Message:
  -----------
  qemu-iotests: Simplify FilePath __init__

Use list comprehension instead of append loop.

Signed-off-by: Nir Soffer <nsoffer@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20200828232152.205833-6-nsoffer@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>


  Commit: 5eb9a3c7b0571562c0289747690e25e6855bc96f
      
https://github.com/qemu/qemu/commit/5eb9a3c7b0571562c0289747690e25e6855bc96f
  Author: Lukas Straub <lukasstraub2@web.de>
  Date:   2020-09-15 (Tue, 15 Sep 2020)

  Changed paths:
    M block/quorum.c

  Log Message:
  -----------
  block/quorum.c: stable children names

If we remove the child with the highest index from the quorum,
decrement s->next_child_index. This way we get stable children
names as long as we only remove the last child.

Signed-off-by: Lukas Straub <lukasstraub2@web.de>
Fixes: https://bugs.launchpad.net/bugs/1881231
Reviewed-by: Zhang Chen <chen.zhang@intel.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Message-Id: 
<5d5f930424c1c770754041aa8ad6421dc4e2b58e.1596536719.git.lukasstraub2@web.de>
Signed-off-by: Max Reitz <mreitz@redhat.com>


  Commit: af8d43d3933a4bec0977b9f33d69443a2d166861
      
https://github.com/qemu/qemu/commit/af8d43d3933a4bec0977b9f33d69443a2d166861
  Author: Peter Lieven <pl@kamp.de>
  Date:   2020-09-15 (Tue, 15 Sep 2020)

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

  Log Message:
  -----------
  qemu-img: avoid unaligned read requests during convert

in case of large continous areas that share the same allocation status
it happens that the value of s->sector_next_status is unaligned to the
cluster size or even request alignment of the source. Avoid this by
stripping down the s->sector_next_status position to cluster boundaries.

Signed-off-by: Peter Lieven <pl@kamp.de>
Message-Id: <20200901125129.6398-1-pl@kamp.de>
[mreitz: Disable vhdx for 251]
Signed-off-by: Max Reitz <mreitz@redhat.com>


  Commit: 02b1ecfa100e7ecc2306560cd27a4a2622bfeb04
      
https://github.com/qemu/qemu/commit/02b1ecfa100e7ecc2306560cd27a4a2622bfeb04
  Author: Alberto Garcia <berto@igalia.com>
  Date:   2020-09-15 (Tue, 15 Sep 2020)

  Changed paths:
    M block/qcow2-bitmap.c
    M block/qcow2-cluster.c
    M block/qcow2-refcount.c
    M block/qcow2-snapshot.c
    M block/qcow2.c
    M block/qcow2.h

  Log Message:
  -----------
  qcow2: Use macros for the L1, refcount and bitmap table entry sizes

This patch replaces instances of sizeof(uint64_t) in the qcow2 driver
with macros that indicate what those sizes are actually referring to.

Signed-off-by: Alberto Garcia <berto@igalia.com>
Message-Id: <20200828110828.13833-1-berto@igalia.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>


  Commit: 184581fa4d8a83c601d967971f8460faeeb742ac
      
https://github.com/qemu/qemu/commit/184581fa4d8a83c601d967971f8460faeeb742ac
  Author: Alberto Garcia <berto@igalia.com>
  Date:   2020-09-15 (Tue, 15 Sep 2020)

  Changed paths:
    M block/qcow2-cluster.c
    A tests/qemu-iotests/305
    A tests/qemu-iotests/305.out
    M tests/qemu-iotests/group

  Log Message:
  -----------
  qcow2: Fix removal of list members from BDRVQcow2State.cluster_allocs

When a write request needs to allocate new clusters (or change the L2
bitmap of existing ones) a QCowL2Meta structure is created so the L2
metadata can be later updated and any copy-on-write can be performed
if necessary.

A write request can span a region consisting of an arbitrary
combination of previously unallocated and allocated clusters, and if
the unallocated ones can be put contiguous to the existing ones then
QEMU will do so in order to minimize the number of write operations.

In practice this means that a write request has not just one but a
number of QCowL2Meta structures. All of them are added to the
cluster_allocs list that is stored in BDRVQcow2State and is used to
detect overlapping requests. After the write request finishes all its
associated QCowL2Meta are removed from that list. calculate_l2_meta()
takes care of creating and putting those structures in the list, and
qcow2_handle_l2meta() takes care of removing them.

The problem is that the error path in handle_alloc() also tries to
remove an item in that list, a remnant from the time when this was
handled there (that code would not even be correct anymore because
it only removes one struct and not all the ones from the same write
request).

This can trigger a double removal of the same item from the list,
causing a crash. This is not easy to reproduce in practice because
it requires that do_alloc_cluster_offset() fails after a successful
previous allocation during the same write request, but it can be
reproduced with the included test case.

Signed-off-by: Alberto Garcia <berto@igalia.com>
Message-Id: 
<3440a1c4d53c4fe48312b478c96accb338cbef7c.1599150873.git.berto@igalia.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>


  Commit: f7bd5bba1b8ce7200600bacee024bce525083f60
      
https://github.com/qemu/qemu/commit/f7bd5bba1b8ce7200600bacee024bce525083f60
  Author: Alberto Garcia <berto@igalia.com>
  Date:   2020-09-15 (Tue, 15 Sep 2020)

  Changed paths:
    M block/qcow2.c

  Log Message:
  -----------
  qcow2: Don't check nb_clusters when removing l2meta from the list

In the past, when a new cluster was allocated the l2meta structure was
a variable in the stack so it was necessary to have a way to tell
whether it had been initialized and contained valid data or not. The
nb_clusters field was used for this purpose. Since commit f50f88b9fe
this is no longer the case, l2meta (nowadays a pointer to a list) is
only allocated when needed and nb_clusters is guaranteed to be > 0 so
this check is unnecessary.

Signed-off-by: Alberto Garcia <berto@igalia.com>
Message-Id: 
<ab0b67c29c7ba26e598db35f12aa5ab5982539c1.1599150873.git.berto@igalia.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>


  Commit: 2b60c5b996e71eb5186bed7727982a471d5d2558
      
https://github.com/qemu/qemu/commit/2b60c5b996e71eb5186bed7727982a471d5d2558
  Author: Alberto Garcia <berto@igalia.com>
  Date:   2020-09-15 (Tue, 15 Sep 2020)

  Changed paths:
    M block/qcow2-cluster.c

  Log Message:
  -----------
  qcow2: Rewrite the documentation of qcow2_alloc_cluster_offset()

The current text corresponds to an earlier, simpler version of this
function and it does not explain how it works now.

Signed-off-by: Alberto Garcia <berto@igalia.com>
Message-Id: 
<bb5bd06f07c5a05b0818611de0d06ec5b66c8df3.1599150873.git.berto@igalia.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>


  Commit: c075c42f9bbde79d07bb680ad0d8aa20b5a387dc
      
https://github.com/qemu/qemu/commit/c075c42f9bbde79d07bb680ad0d8aa20b5a387dc
  Author: Yi Li <yili@winhong.com>
  Date:   2020-09-15 (Tue, 15 Sep 2020)

  Changed paths:
    M qemu-img.c

  Log Message:
  -----------
  qemu-img: Explicit number replaced by a constant

Signed-off-by: Yi Li <yili@winhong.com>
Message-Id: <20200819013607.32280-1-yili@winhong.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>


  Commit: 33fe08fcaf3773e2151bb60b4f9c62159a0c6633
      
https://github.com/qemu/qemu/commit/33fe08fcaf3773e2151bb60b4f9c62159a0c6633
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2020-09-15 (Tue, 15 Sep 2020)

  Changed paths:
    M tests/check-block.sh
    M tests/qemu-iotests/030

  Log Message:
  -----------
  iotests: Skip test_stream_parallel in test 030 when doing "make check"

The test_stream_parallel test still occasionally fails in the CI.
Thus let's disable it during "make check" for now so that it does
not cause trouble during merge tests. We can enable it again once
the problem has been resolved.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20200907113824.134788-1-thuth@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>


  Commit: 83a6a90009401f02bdb18fd2414dbae090d0f2b5
      
https://github.com/qemu/qemu/commit/83a6a90009401f02bdb18fd2414dbae090d0f2b5
  Author: Swapnil Ingle <swapnil.ingle@nutanix.com>
  Date:   2020-09-15 (Tue, 15 Sep 2020)

  Changed paths:
    M block/vhdx.c

  Log Message:
  -----------
  block/vhdx: Support vhdx image only with 512 bytes logical sector size

block/vhdx uses qemu block layer where sector size is always 512 bytes.
This may have issues  with 4K logical sector sized vhdx image.

For e.g qemu-img convert on such images fails with following assert:

$qemu-img convert -f vhdx -O raw 4KTest1.vhdx test.raw
qemu-img: util/iov.c:388: qiov_slice: Assertion `offset + len <=
qiov->size' failed.
Aborted

This patch adds an check to return ENOTSUP for vhdx images which
have logical sector size other than 512 bytes.

Signed-off-by: Swapnil Ingle <swapnil.ingle@nutanix.com>
Message-Id: <1596794594-44531-1-git-send-email-swapnil.ingle@nutanix.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>


  Commit: 1a52b73dbad8f0b72ba1df30a817926983037565
      
https://github.com/qemu/qemu/commit/1a52b73dbad8f0b72ba1df30a817926983037565
  Author: Alberto Garcia <berto@igalia.com>
  Date:   2020-09-15 (Tue, 15 Sep 2020)

  Changed paths:
    M block/qcow2.c

  Log Message:
  -----------
  qcow2: Handle QCowL2Meta on error in preallocate_co()

If qcow2_alloc_cluster_offset() or qcow2_alloc_cluster_link_l2() fail
then this function simply returns the error code, potentially leaking
the QCowL2Meta structure and leaving stale items in s->cluster_allocs.

A second problem is that this function calls qcow2_free_any_clusters()
on failure but passing a host cluster offset instead of an L2 entry.
Luckily for normal uncompressed clusters a raw offset also works like
a valid L2 entry so it works just the same, but we should be using
qcow2_free_clusters() instead.

This patch fixes both problems by using qcow2_handle_l2meta().

Signed-off-by: Alberto Garcia <berto@igalia.com>
Message-Id: 
<cd3a6b9abd43f9c0b60be413d760f0cacc67eb66.1599573989.git.berto@igalia.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>


  Commit: 3fec237fca3bfdd4b6cc4749a9fa737062fb6611
      
https://github.com/qemu/qemu/commit/3fec237fca3bfdd4b6cc4749a9fa737062fb6611
  Author: Alberto Garcia <berto@igalia.com>
  Date:   2020-09-15 (Tue, 15 Sep 2020)

  Changed paths:
    M block/qcow2-cluster.c
    M block/qcow2-refcount.c
    M block/qcow2.h

  Log Message:
  -----------
  qcow2: Make qcow2_free_any_clusters() free only one cluster

This function takes an L2 entry and a number of clusters to free.
Although in principle it can free any type of cluster (using the L2
entry to determine its type) in practice the API is broken because
compressed clusters have a variable size and there is no way to free
more than one without having the L2 entry of each one of them.

The good news all callers are passing nb_clusters=1 so we can simply
get rid of that parameter.

Signed-off-by: Alberto Garcia <berto@igalia.com>
Message-Id: 
<77cea0f4616f921d37e971b3c5b18a2faa24b173.1599573989.git.berto@igalia.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>


  Commit: 580384d63718beaa1edaafd9875058805b7a0beb
      
https://github.com/qemu/qemu/commit/580384d63718beaa1edaafd9875058805b7a0beb
  Author: Alberto Garcia <berto@igalia.com>
  Date:   2020-09-15 (Tue, 15 Sep 2020)

  Changed paths:
    M block/qcow2.c

  Log Message:
  -----------
  qcow2: Return the original error code in qcow2_co_pwrite_zeroes()

This function checks the current status of a (sub)cluster in order to
see if an unaligned 'write zeroes' request can be done efficiently by
simply updating the L2 metadata and without having to write actual
zeroes to disk.

If the situation does not allow using the fast path then the function
returns -ENOTSUP and the caller falls back to writing zeroes.

If can happen however that the aforementioned check returns an actual
error code so in this case we should pass it to the caller.

Signed-off-by: Alberto Garcia <berto@igalia.com>
Message-Id: <20200909123739.719-1-berto@igalia.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>


  Commit: 30b70f070f76baf7075a6668ad6b30025caadf5d
      
https://github.com/qemu/qemu/commit/30b70f070f76baf7075a6668ad6b30025caadf5d
  Author: John Snow <jsnow@redhat.com>
  Date:   2020-09-15 (Tue, 15 Sep 2020)

  Changed paths:
    M block/rbd.c

  Log Message:
  -----------
  block/rbd: remove runtime_opts

This saw its last use in 4bfb274165ba.

Signed-off-by: John Snow <jsnow@redhat.com>
Message-Id: <20200806211345.2925343-2-jsnow@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>


  Commit: c1dadda02ca62823d5ee21dc6435d593c3993d32
      
https://github.com/qemu/qemu/commit/c1dadda02ca62823d5ee21dc6435d593c3993d32
  Author: John Snow <jsnow@redhat.com>
  Date:   2020-09-15 (Tue, 15 Sep 2020)

  Changed paths:
    M block/qcow.c

  Log Message:
  -----------
  block/qcow: remove runtime opts

Introduced by d85f4222b468,
These were seemingly never used at all.

Signed-off-by: John Snow <jsnow@redhat.com>
Message-Id: <20200806211345.2925343-3-jsnow@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>


  Commit: 8e958260c5a562f3be08beef2055975c04836200
      
https://github.com/qemu/qemu/commit/8e958260c5a562f3be08beef2055975c04836200
  Author: Alberto Garcia <berto@igalia.com>
  Date:   2020-09-15 (Tue, 15 Sep 2020)

  Changed paths:
    M block/qcow2.c
    M tests/qemu-iotests/125
    M tests/qemu-iotests/125.out

  Log Message:
  -----------
  qcow2: Make preallocate_co() resize the image to the correct size

This function preallocates metadata structures and then extends the
image to its new size, but that new size calculation is wrong because
it doesn't take into account that the host_offset variable is always
cluster-aligned.

This problem can be reproduced with preallocation=metadata when the
original size is not cluster-aligned but the new size is. In this case
the final image size will be shorter than expected.

   qemu-img create -f qcow2 img.qcow2 31k
   qemu-img resize --preallocation=metadata img.qcow2 128k

Signed-off-by: Alberto Garcia <berto@igalia.com>
Message-Id: 
<adeb8b059917b141d5f5b3bd2a016262d3052c79.1599833007.git.berto@igalia.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
[mreitz: Mark compat=0.10 unsupported for iotest 125]
Signed-off-by: Max Reitz <mreitz@redhat.com>


  Commit: bfd0989acffe0b348a4be5155a4688d92c34b1ef
      
https://github.com/qemu/qemu/commit/bfd0989acffe0b348a4be5155a4688d92c34b1ef
  Author: Alberto Garcia <berto@igalia.com>
  Date:   2020-09-15 (Tue, 15 Sep 2020)

  Changed paths:
    M block/qcow2-cluster.c
    M block/qcow2.c
    M block/qcow2.h

  Log Message:
  -----------
  qcow2: Convert qcow2_alloc_cluster_offset() into qcow2_alloc_host_offset()

qcow2_alloc_cluster_offset() takes an (unaligned) guest offset and
returns the (aligned) offset of the corresponding cluster in the qcow2
image.

In practice none of the callers need to know where the cluster starts
so this patch makes the function calculate and return the final host
offset directly. The function is also renamed accordingly.

See 388e581615 for a similar change to qcow2_get_cluster_offset().

Signed-off-by: Alberto Garcia <berto@igalia.com>
Message-Id: 
<9bfef50ec9200d752413be4fc2aeb22a28378817.1599833007.git.berto@igalia.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>


  Commit: 7bae7c805d82675eb3a02c744093703d84ada2d6
      
https://github.com/qemu/qemu/commit/7bae7c805d82675eb3a02c744093703d84ada2d6
  Author: Stefano Garzarella <sgarzare@redhat.com>
  Date:   2020-09-15 (Tue, 15 Sep 2020)

  Changed paths:
    M block/rbd.c

  Log Message:
  -----------
  block/rbd: add 'namespace' to qemu_rbd_strong_runtime_opts[]

Commit 19ae9ae014 ("block/rbd: Add support for ceph namespaces")
introduced namespace support for RBD, but we forgot to add the
new 'namespace' options to qemu_rbd_strong_runtime_opts[].

The 'namespace' is used to identify the image, so it is a strong
option since it can changes the data of a BDS.

Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1821528
Fixes: 19ae9ae014 ("block/rbd: Add support for ceph namespaces")
Cc: Florian Florensa <fflorensa@online.net>
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Message-Id: <20200914190553.74871-1-sgarzare@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>


  Commit: 9b14671aec0a1dd9472f260f2482409c71f0e24d
      
https://github.com/qemu/qemu/commit/9b14671aec0a1dd9472f260f2482409c71f0e24d
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2020-09-15 (Tue, 15 Sep 2020)

  Changed paths:
    M block/qcow.c
    M block/qcow2-bitmap.c
    M block/qcow2-cluster.c
    M block/qcow2-refcount.c
    M block/qcow2-snapshot.c
    M block/qcow2.c
    M block/qcow2.h
    M block/quorum.c
    M block/rbd.c
    M block/vhdx.c
    M qemu-img.c
    M tests/check-block.sh
    M tests/qemu-iotests/030
    M tests/qemu-iotests/125
    M tests/qemu-iotests/125.out
    M tests/qemu-iotests/194
    M tests/qemu-iotests/208
    M tests/qemu-iotests/222
    M tests/qemu-iotests/251
    M tests/qemu-iotests/257
    A tests/qemu-iotests/305
    A tests/qemu-iotests/305.out
    M tests/qemu-iotests/group
    M tests/qemu-iotests/iotests.py

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/maxreitz/tags/pull-block-2020-09-15' 
into staging

Block patches:
- Several qcow2 fixes and refactorings
- Let qemu-img convert try to stay at cluster boundaries
- Stable child names for quorum (with x-blockdev-change)
- Explicitly drop vhdx 4k sector support, as it was never actually
  working
- rbd: Mark @namespace a strong runtime option
- iotests.py improvements
- Drop unused runtime_opts objects
- Skip a test case in 030 when run through make check-block

# gpg: Signature made Tue 15 Sep 2020 11:27:05 BST
# gpg:                using RSA key 91BEB60A30DB3E8857D11829F407DB0061D5CF40
# gpg:                issuer "mreitz@redhat.com"
# gpg: Good signature from "Max Reitz <mreitz@redhat.com>" [full]
# Primary key fingerprint: 91BE B60A 30DB 3E88 57D1  1829 F407 DB00 61D5 CF40

* remotes/maxreitz/tags/pull-block-2020-09-15: (22 commits)
  block/rbd: add 'namespace' to qemu_rbd_strong_runtime_opts[]
  qcow2: Convert qcow2_alloc_cluster_offset() into qcow2_alloc_host_offset()
  qcow2: Make preallocate_co() resize the image to the correct size
  block/qcow: remove runtime opts
  block/rbd: remove runtime_opts
  qcow2: Return the original error code in qcow2_co_pwrite_zeroes()
  qcow2: Make qcow2_free_any_clusters() free only one cluster
  qcow2: Handle QCowL2Meta on error in preallocate_co()
  block/vhdx: Support vhdx image only with 512 bytes logical sector size
  iotests: Skip test_stream_parallel in test 030 when doing "make check"
  qemu-img: Explicit number replaced by a constant
  qcow2: Rewrite the documentation of qcow2_alloc_cluster_offset()
  qcow2: Don't check nb_clusters when removing l2meta from the list
  qcow2: Fix removal of list members from BDRVQcow2State.cluster_allocs
  qcow2: Use macros for the L1, refcount and bitmap table entry sizes
  qemu-img: avoid unaligned read requests during convert
  block/quorum.c: stable children names
  qemu-iotests: Simplify FilePath __init__
  qemu-iotests: Merge FilePaths and FilePath
  qemu-iotests: Support varargs syntax in FilePaths
  ...

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/2d2c73d0e3d5...9b14671aec0a