[Qemu-commits] [qemu/qemu] 36b998: tests/qemu-iotests: Fix output of qemu-io related ...

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 36b9986b08787019ef42f985b4002e275275a135
      
https://github.com/qemu/qemu/commit/36b9986b08787019ef42f985b4002e275275a135
  Author: Thomas Huth <address@hidden>
  Date:   2019-04-30 (Tue, 30 Apr 2019)

  Changed paths:
    M tests/qemu-iotests/026.out
    M tests/qemu-iotests/060.out
    M tests/qemu-iotests/069.out
    M tests/qemu-iotests/070.out
    M tests/qemu-iotests/075.out
    M tests/qemu-iotests/076.out
    M tests/qemu-iotests/078.out
    M tests/qemu-iotests/080.out
    M tests/qemu-iotests/081.out
    M tests/qemu-iotests/088.out
    M tests/qemu-iotests/103.out
    M tests/qemu-iotests/114.out
    M tests/qemu-iotests/116.out
    M tests/qemu-iotests/131.out
    M tests/qemu-iotests/133.out
    M tests/qemu-iotests/137.out
    M tests/qemu-iotests/140.out
    M tests/qemu-iotests/143.out
    M tests/qemu-iotests/153.out
    M tests/qemu-iotests/187.out
    M tests/qemu-iotests/188.out
    M tests/qemu-iotests/197.out
    M tests/qemu-iotests/205
    M tests/qemu-iotests/215.out
    M tests/qemu-iotests/226.out
    M tests/qemu-iotests/244.out

  Log Message:
  -----------
  tests/qemu-iotests: Fix output of qemu-io related tests

One of the recent commits changed the way qemu-io prints out its
errors and warnings - they are now prefixed with the program name.
We've got to adapt the iotests accordingly to prevent that they
are failing.

Fixes: 99e98d7c9fc1a1639fad ("qemu-io: Use error_[gs]et_progname()")
Signed-off-by: Thomas Huth <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 1bffe1ae7a7b707c3a14ea2ccd00d3609d3ce4d8
      
https://github.com/qemu/qemu/commit/1bffe1ae7a7b707c3a14ea2ccd00d3609d3ce4d8
  Author: Kevin Wolf <address@hidden>
  Date:   2019-04-30 (Tue, 30 Apr 2019)

  Changed paths:
    M block.c

  Log Message:
  -----------
  block: Fix AioContext switch for bs->drv == NULL

Even for block nodes with bs->drv == NULL, we can't just ignore a
bdrv_set_aio_context() call. Leaving the node in its old context can
mean that it's still in an iothread context in bdrv_close_all() during
shutdown, resulting in an attempted unlock of the AioContext lock which
we don't hold.

This is an example stack trace of a related crash:

 #0  0x00007ffff59da57f in raise () at /lib64/libc.so.6
 #1  0x00007ffff59c4895 in abort () at /lib64/libc.so.6
 #2  0x0000555555b97b1e in error_exit (err=<optimized out>, address@hidden 
<__func__.19059> "qemu_mutex_unlock_impl") at util/qemu-thread-posix.c:36
 #3  0x0000555555b97f7f in qemu_mutex_unlock_impl (address@hidden, 
address@hidden "util/async.c", address@hidden) at util/qemu-thread-posix.c:97
 #4  0x0000555555b92f55 in aio_context_release (address@hidden) at 
util/async.c:507
 #5  0x0000555555b05cf8 in bdrv_prwv_co (address@hidden, address@hidden, 
address@hidden, address@hidden, address@hidden)
         at block/io.c:833
 #6  0x0000555555b060a9 in bdrv_pwritev (qiov=0x7fffffffd4f0, offset=131072, 
child=0x7fffc80012f0) at block/io.c:990
 #7  0x0000555555b060a9 in bdrv_pwrite (child=0x7fffc80012f0, offset=131072, 
buf=<optimized out>, bytes=<optimized out>) at block/io.c:990
 #8  0x0000555555ae172b in qcow2_cache_entry_flush (address@hidden, 
address@hidden, address@hidden) at block/qcow2-cache.c:51
 #9  0x0000555555ae18dd in qcow2_cache_write (address@hidden, c=0x5555568cc740) 
at block/qcow2-cache.c:248
 #10 0x0000555555ae15de in qcow2_cache_flush (bs=0x555556810680, c=<optimized 
out>) at block/qcow2-cache.c:259
 #11 0x0000555555ae16b1 in qcow2_cache_flush_dependency (c=0x5555568a1700, 
c=0x5555568a1700, bs=0x555556810680) at block/qcow2-cache.c:194
 #12 0x0000555555ae16b1 in qcow2_cache_entry_flush (address@hidden, 
address@hidden, address@hidden) at block/qcow2-cache.c:194
 #13 0x0000555555ae18dd in qcow2_cache_write (address@hidden, c=0x5555568a1700) 
at block/qcow2-cache.c:248
 #14 0x0000555555ae15de in qcow2_cache_flush (address@hidden, c=<optimized 
out>) at block/qcow2-cache.c:259
 #15 0x0000555555ad242c in qcow2_inactivate (address@hidden) at 
block/qcow2.c:2124
 #16 0x0000555555ad2590 in qcow2_close (bs=0x555556810680) at block/qcow2.c:2153
 #17 0x0000555555ab0c62 in bdrv_close (bs=0x555556810680) at block.c:3358
 #18 0x0000555555ab0c62 in bdrv_delete (bs=0x555556810680) at block.c:3542
 #19 0x0000555555ab0c62 in bdrv_unref (bs=0x555556810680) at block.c:4598
 #20 0x0000555555af4d72 in blk_remove_bs (address@hidden) at 
block/block-backend.c:785
 #21 0x0000555555af4dbb in blk_remove_all_bs () at block/block-backend.c:483
 #22 0x0000555555aae02f in bdrv_close_all () at block.c:3412
 #23 0x00005555557f9796 in main (argc=<optimized out>, argv=<optimized out>, 
envp=<optimized out>) at vl.c:4776

The reproducer I used is a qcow2 image on gluster volume, where the
virtual disk size (4 GB) is larger than the gluster volume size (64M),
so we can easily trigger an ENOSPC. This backend is assigned to a
virtio-blk device using an iothread, and then from the guest a
'dd if=/dev/zero of=/dev/vda bs=1G count=1' causes the VM to stop
because of an I/O error. qemu_gluster_co_flush_to_disk() sets
bs->drv = NULL on error, so when virtio-blk stops the dataplane, the
block nodes stay in the iothread AioContext. A 'quit' monitor command
issued from this paused state crashes the process.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1631227
Cc: address@hidden
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Reviewed-by: Stefano Garzarella <address@hidden>


  Commit: 126734c4f7c38592f6f36ac9e02ab3aad13a656f
      
https://github.com/qemu/qemu/commit/126734c4f7c38592f6f36ac9e02ab3aad13a656f
  Author: Zhengui li <address@hidden>
  Date:   2019-04-30 (Tue, 30 Apr 2019)

  Changed paths:
    M block/vpc.c

  Log Message:
  -----------
  vpc: unlock Coroutine lock to make IO submit Concurrently

Concurrent IO becomes serial IO because of the qemu Coroutine lock,
which reduce IO performance severely.

So unlock Coroutine lock before bdrv_co_pwritev and
bdrv_co_preadv to fix it.

Signed-off-by: Zhengui li <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 7502be838e2fb62cc00f9e55f632e0b88ead5e6e
      
https://github.com/qemu/qemu/commit/7502be838e2fb62cc00f9e55f632e0b88ead5e6e
  Author: Sam Eiderman <address@hidden>
  Date:   2019-04-30 (Tue, 30 Apr 2019)

  Changed paths:
    M block/vmdk.c

  Log Message:
  -----------
  vmdk: Set vmdk parent backing_format to vmdk

Commit b69864e5a ("vmdk: Support version=3 in VMDK descriptor files")
fixed the probe function to correctly guess vmdk descriptors with
version=3.

This solves the issue where vmdk snapshot with parent vmdk descriptor
containing "version=3" would be treated as raw instead vmdk.

In the future case where a new vmdk version is introduced, we will again
experience this issue, even if the user will provide "-f vmdk" it will
only apply to the tip image and not to the underlying "misprobed" parent
image.

The code in vmdk.c already assumes that the backing file of vmdk must be
vmdk (see vmdk_is_cid_valid which returns 0 if backing file is not
vmdk).

So let's make it official by supplying the backing_format as vmdk.

Reviewed-by: Mark Kanda <address@hidden>
Reviewed-By: Liran Alon <address@hidden>
Reviewed-by: Arbel Moshe <address@hidden>
Signed-off-by: Shmuel Eiderman <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: e9991e29ea5efb91324a1b1e10fbf553867964df
      
https://github.com/qemu/qemu/commit/e9991e29ea5efb91324a1b1e10fbf553867964df
  Author: Stefano Garzarella <address@hidden>
  Date:   2019-04-30 (Tue, 30 Apr 2019)

  Changed paths:
    M block/vhdx.c
    M block/vhdx.h

  Log Message:
  -----------
  block/vhdx: Remove redundant IEC binary prefixes definition

IEC binary prefixes are already defined in "qemu/units.h",
so we can remove redundant definitions in "block/vhdx.h".

Signed-off-by: Stefano Garzarella <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: John Snow <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 0cb98af2187a5c7e1723fc28f8ed359634dff550
      
https://github.com/qemu/qemu/commit/0cb98af2187a5c7e1723fc28f8ed359634dff550
  Author: Stefano Garzarella <address@hidden>
  Date:   2019-04-30 (Tue, 30 Apr 2019)

  Changed paths:
    M block/vhdx-log.c
    M block/vhdx.c
    M block/vhdx.h

  Log Message:
  -----------
  block/vhdx: Use IEC binary prefixes for size constants

Using IEC binary prefixes in order to make the code more readable,
with the exception of DEFAULT_LOG_SIZE because it's passed to
stringify().

Signed-off-by: Stefano Garzarella <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: John Snow <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 754da86714d550c3f995f11a2587395081362e0a
      
https://github.com/qemu/qemu/commit/754da86714d550c3f995f11a2587395081362e0a
  Author: Eric Blake <address@hidden>
  Date:   2019-04-30 (Tue, 30 Apr 2019)

  Changed paths:
    M util/cutils.c

  Log Message:
  -----------
  cutils: Fix size_to_str() on 32-bit platforms

When extracting a human-readable size formatter, we changed 'uint64_t
div' pre-patch to 'unsigned long div' post-patch. Which breaks on
32-bit platforms, resulting in 'inf' instead of intended values larger
than 999GB.

Fixes: 22951aaa
CC: address@hidden
Reported-by: Max Reitz <address@hidden>
Signed-off-by: Eric Blake <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: de38b5005e946aa3714963ea4c501e279e7d3666
      
https://github.com/qemu/qemu/commit/de38b5005e946aa3714963ea4c501e279e7d3666
  Author: Eric Blake <address@hidden>
  Date:   2019-04-30 (Tue, 30 Apr 2019)

  Changed paths:
    M block/qapi.c
    M tests/qemu-iotests/043.out
    M tests/qemu-iotests/053.out
    M tests/qemu-iotests/059.out
    M tests/qemu-iotests/060.out
    M tests/qemu-iotests/061.out
    M tests/qemu-iotests/070.out
    M tests/qemu-iotests/082.out
    M tests/qemu-iotests/084.out
    M tests/qemu-iotests/089.out
    M tests/qemu-iotests/095.out
    M tests/qemu-iotests/104.out
    M tests/qemu-iotests/110.out
    M tests/qemu-iotests/114.out
    M tests/qemu-iotests/126.out
    M tests/qemu-iotests/130.out
    M tests/qemu-iotests/153.out
    M tests/qemu-iotests/191.out
    M tests/qemu-iotests/195.out
    M tests/qemu-iotests/198.out
    M tests/qemu-iotests/206.out
    M tests/qemu-iotests/207.out
    M tests/qemu-iotests/210.out
    M tests/qemu-iotests/211.out
    M tests/qemu-iotests/212.out
    M tests/qemu-iotests/213.out
    M tests/qemu-iotests/233.out
    M tests/qemu-iotests/237.out
    M tests/qemu-iotests/242.out

  Log Message:
  -----------
  qemu-img: Saner printing of large file sizes

Disk sizes close to INT64_MAX cause overflow, for some pretty
ridiculous output:

  $ ./nbdkit -U - memory size=$((2**63 - 512)) --run 'qemu-img info $nbd'
  image: nbd+unix://?socket=/tmp/nbdkitHSAzNz/socket
  file format: raw
  virtual size: -8388607T (9223372036854775296 bytes)
  disk size: unavailable

But there's no reason to have two separate implementations of integer
to human-readable abbreviation, where one has overflow and stops at
'T', while the other avoids overflow and goes all the way to 'E'. With
this patch, the output now claims 8EiB instead of -8388607T, which
really is the correct rounding of largest file size supported by qemu
(we could go 511 bytes larger if we used byte-accurate sizing instead
of rounding up to the next sector boundary, but that wouldn't change
the human-readable result).

Quite a few iotests need updates to expected output to match.

Reported-by: Richard W.M. Jones <address@hidden>
Signed-off-by: Eric Blake <address@hidden>
Tested-by: Richard W.M. Jones <address@hidden>
Reviewed-by: Alberto Garcia <address@hidden>
Reviewed-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
Tested-by: Max Reitz <address@hidden>


  Commit: f29fbf7c6b1c9a84f6931c1c222716fbe073e6e4
      
https://github.com/qemu/qemu/commit/f29fbf7c6b1c9a84f6931c1c222716fbe073e6e4
  Author: Kevin Wolf <address@hidden>
  Date:   2019-04-30 (Tue, 30 Apr 2019)

  Changed paths:
    M block/qcow2.c

  Log Message:
  -----------
  qcow2: Avoid COW during metadata preallocation

Limiting the allocation to INT_MAX bytes isn't particularly clever
because it means that the final cluster will be a partial cluster which
will be completed through a COW operation. This results in unnecessary
data read and write requests which lead to an unwanted non-sparse
filesystem block for metadata preallocation.

Align the maximum allocation size down to the cluster size to avoid this
situation.

Cc: address@hidden
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>


  Commit: 360bd07471dfd1830246e8403ffdc9ba9d82f9d4
      
https://github.com/qemu/qemu/commit/360bd07471dfd1830246e8403ffdc9ba9d82f9d4
  Author: Kevin Wolf <address@hidden>
  Date:   2019-04-30 (Tue, 30 Apr 2019)

  Changed paths:
    M block/qcow2.c

  Log Message:
  -----------
  qcow2: Add errp to preallocate_co()

We'll add a bdrv_co_truncate() call in the next patch which can return
an Error that we don't want to discard. So add an errp parameter to
preallocate_co().

Cc: address@hidden
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>


  Commit: 718c0fce2f56755a8d8f737607779a98aa6e7cc4
      
https://github.com/qemu/qemu/commit/718c0fce2f56755a8d8f737607779a98aa6e7cc4
  Author: Kevin Wolf <address@hidden>
  Date:   2019-04-30 (Tue, 30 Apr 2019)

  Changed paths:
    M block/qcow2.c

  Log Message:
  -----------
  qcow2: Fix full preallocation with external data file

preallocate_co() already gave the data file the full size without
forwarding the requested preallocation mode to the protocol. When
bdrv_co_truncate() was called later with the preallocation mode, the
file didn't actually grow any more, so the data file stayed unallocated
even if full preallocation was requested.

Pass the right preallocation mode to preallocate_co() and remove the
second bdrv_co_truncate() to fix this. As a side effect, the ugly
one-byte write in preallocate_co() is replaced with a truncate call,
now leaving the last block unallocated on the protocol level as it
should be.

Cc: address@hidden
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>


  Commit: 0ef5a8e6ceb06205b96201b469748409a47f5b89
      
https://github.com/qemu/qemu/commit/0ef5a8e6ceb06205b96201b469748409a47f5b89
  Author: Max Reitz <address@hidden>
  Date:   2019-04-30 (Tue, 30 Apr 2019)

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

  Log Message:
  -----------
  iotests: Perform the correct test in 082

In the "amend" section of 082, we perform a single "convert" test
(namely "convert -o help").  That does not make sense, especially
because we have done exactly that "convert" test earlier in 082 already.

Replacing "convert" by "amend" yields an error, which is correct because
there is no point in "amend" having a default format.  The user has to
either specify the format, or give a file for qemu-img to probe.

Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: John Snow <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: f4619af0c113a5f7434176d5f508b8a58c4d53d7
      
https://github.com/qemu/qemu/commit/f4619af0c113a5f7434176d5f508b8a58c4d53d7
  Author: Max Reitz <address@hidden>
  Date:   2019-04-30 (Tue, 30 Apr 2019)

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

  Log Message:
  -----------
  qemu-img: Make create hint at protocol options

qemu-img create allows giving just a format and "-o help" to get a list
of the options supported by that format.  Users may not realize that the
protocol level may offer even more options, which they only get to see
by specifying a filename.

This patch adds a note to hint at that fact.

Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: John Snow <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: db04524f820582ebf1189223b6378de238511da1
      
https://github.com/qemu/qemu/commit/db04524f820582ebf1189223b6378de238511da1
  Author: Kevin Wolf <address@hidden>
  Date:   2019-04-30 (Tue, 30 Apr 2019)

  Changed paths:
    M block/qcow2.c

  Log Message:
  -----------
  qcow2: Fix qcow2_make_empty() with external data file

make_completely_empty() is an optimisated path for bdrv_make_empty()
where completely new metadata is created inside the image file instead
of going through all clusters and discarding them. For an external data
file, however, we actually need to do discard operations on the data
file; just overwriting the qcow2 file doesn't get rid of the data.

The necessary slow path with an explicit discard operation already
exists for other cases. Use it for external data files, too.

Cc: address@hidden
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>


  Commit: e1f4a37a49ebb346d846eddc5cd4ebbb7afd9990
      
https://github.com/qemu/qemu/commit/e1f4a37a49ebb346d846eddc5cd4ebbb7afd9990
  Author: Alberto Garcia <address@hidden>
  Date:   2019-04-30 (Tue, 30 Apr 2019)

  Changed paths:
    M block/qcow2.c

  Log Message:
  -----------
  qcow2: Fix error handling in the compression code

This patch fixes a few things in the way error codes are handled in
the qcow2 compression code:

a) qcow2_co_pwritev_compressed() expects qcow2_co_compress() to only
   return -1 or -2 on failure, but this is not correct. Since the
   change from qcow2_compress() to qcow2_co_compress() in commit
   ceb029cd6feccf9f7607 the new code can also return -EINVAL (although
   there does not seem to exist any code path that would cause that
   error in the current implementation).

b) -1 and -2 are ad-hoc error codes defined in qcow2_compress().
   This patch replaces them with standard constants from errno.h.

c) Both qcow2_compress() and qcow2_co_do_compress() return a negative
   value on failure, but qcow2_co_pwritev_compressed() stores the
   value in an unsigned data type.

Signed-off-by: Alberto Garcia <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 371420e2173b8055f82366bdb366f9399c7d9c3c
      
https://github.com/qemu/qemu/commit/371420e2173b8055f82366bdb366f9399c7d9c3c
  Author: Vladimir Sementsov-Ogievskiy <address@hidden>
  Date:   2019-04-30 (Tue, 30 Apr 2019)

  Changed paths:
    M include/block/block_int.h
    M include/sysemu/block-backend.h

  Log Message:
  -----------
  block: introduce byte-based io helpers

Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Stefano Garzarella <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: b00cb15bdaca7dff7e554d77b7e7a355fc5c73f2
      
https://github.com/qemu/qemu/commit/b00cb15bdaca7dff7e554d77b7e7a355fc5c73f2
  Author: Vladimir Sementsov-Ogievskiy <address@hidden>
  Date:   2019-04-30 (Tue, 30 Apr 2019)

  Changed paths:
    M block/qcow2.c

  Log Message:
  -----------
  block/qcow2: use buffer-based io

Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Stefano Garzarella <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 4ed3e0c48620a7f426bcec405745c6f01f560a8e
      
https://github.com/qemu/qemu/commit/4ed3e0c48620a7f426bcec405745c6f01f560a8e
  Author: Vladimir Sementsov-Ogievskiy <address@hidden>
  Date:   2019-04-30 (Tue, 30 Apr 2019)

  Changed paths:
    M block/qcow.c

  Log Message:
  -----------
  block/qcow: use buffer-based io

Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Stefano Garzarella <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 696e8cb292074c28ced30b4a11d51dc8b3087db4
      
https://github.com/qemu/qemu/commit/696e8cb292074c28ced30b4a11d51dc8b3087db4
  Author: Vladimir Sementsov-Ogievskiy <address@hidden>
  Date:   2019-04-30 (Tue, 30 Apr 2019)

  Changed paths:
    M block/qed-table.c
    M block/qed.c

  Log Message:
  -----------
  block/qed: use buffer-based io

Move to _co_ versions of io functions qed_read_table() and
qed_write_table(), as we use qemu_co_mutex_unlock()
anyway.

Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Stefano Garzarella <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: a4072543ccdddbd241d5962d9237b8b41fd006bf
      
https://github.com/qemu/qemu/commit/a4072543ccdddbd241d5962d9237b8b41fd006bf
  Author: Vladimir Sementsov-Ogievskiy <address@hidden>
  Date:   2019-04-30 (Tue, 30 Apr 2019)

  Changed paths:
    M block/parallels.c

  Log Message:
  -----------
  block/parallels: use buffer-based io

Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Stefano Garzarella <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 607dbdc4e09bfefa3f165079a5e87df035a0e26c
      
https://github.com/qemu/qemu/commit/607dbdc4e09bfefa3f165079a5e87df035a0e26c
  Author: Vladimir Sementsov-Ogievskiy <address@hidden>
  Date:   2019-04-30 (Tue, 30 Apr 2019)

  Changed paths:
    M block/backup.c

  Log Message:
  -----------
  block/backup: use buffer-based io

Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Stefano Garzarella <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 08b6261f34e4800f99f3ce9d47bfb95c2f15b656
      
https://github.com/qemu/qemu/commit/08b6261f34e4800f99f3ce9d47bfb95c2f15b656
  Author: Vladimir Sementsov-Ogievskiy <address@hidden>
  Date:   2019-04-30 (Tue, 30 Apr 2019)

  Changed paths:
    M block/commit.c

  Log Message:
  -----------
  block/commit: use buffer-based io

Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Stefano Garzarella <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: f4326aefcf2cd0e89675ca13978597913586d393
      
https://github.com/qemu/qemu/commit/f4326aefcf2cd0e89675ca13978597913586d393
  Author: Vladimir Sementsov-Ogievskiy <address@hidden>
  Date:   2019-04-30 (Tue, 30 Apr 2019)

  Changed paths:
    M block/stream.c

  Log Message:
  -----------
  block/stream: use buffer-based io

Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Stefano Garzarella <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 265a7e54efad246f4bde63f77aee6311f436f5f1
      
https://github.com/qemu/qemu/commit/265a7e54efad246f4bde63f77aee6311f436f5f1
  Author: Vladimir Sementsov-Ogievskiy <address@hidden>
  Date:   2019-04-30 (Tue, 30 Apr 2019)

  Changed paths:
    M qemu-img.c

  Log Message:
  -----------
  qemu-img: use buffer-based io

Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Stefano Garzarella <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 065abf9f2b4ed61017d31da8a94f1ddc6f54beb5
      
https://github.com/qemu/qemu/commit/065abf9f2b4ed61017d31da8a94f1ddc6f54beb5
  Author: Alberto Garcia <address@hidden>
  Date:   2019-04-30 (Tue, 30 Apr 2019)

  Changed paths:
    M block/commit.c

  Log Message:
  -----------
  commit: Make base read-only if there is an early failure

You can reproduce this by passing an invalid filter-node-name (like
"1234") to block-commit. In this case the base image is put in
read-write mode but is never reset back to read-only.

Signed-off-by: Alberto Garcia <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: a2aa8b07cd73ff25b90c11b332a9633dd4b33717
      
https://github.com/qemu/qemu/commit/a2aa8b07cd73ff25b90c11b332a9633dd4b33717
  Author: Alberto Garcia <address@hidden>
  Date:   2019-04-30 (Tue, 30 Apr 2019)

  Changed paths:
    A tests/qemu-iotests/249
    A tests/qemu-iotests/249.out
    M tests/qemu-iotests/group

  Log Message:
  -----------
  iotests: Check that images are in read-only mode after block-commit

This tests the fix from the previous patch.

Signed-off-by: Alberto Garcia <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 54277a2aab876aba7b55c7e88e2b372691849741
      
https://github.com/qemu/qemu/commit/54277a2aab876aba7b55c7e88e2b372691849741
  Author: Vladimir Sementsov-Ogievskiy <address@hidden>
  Date:   2019-04-30 (Tue, 30 Apr 2019)

  Changed paths:
    M block/qed-check.c
    M block/qed-table.c
    M block/qed.c
    M block/qed.h

  Log Message:
  -----------
  block/qed: add missed coroutine_fn markers

qed_read_table and qed_write_table use coroutine-only interfaces but
are not marked coroutine_fn. Happily, they are called only from
coroutine context, so we only need to add missed markers.

Reported-by: Kevin Wolf <address@hidden>
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: f75d15231e56cb0f2bafe19faf1229c459a60731
      
https://github.com/qemu/qemu/commit/f75d15231e56cb0f2bafe19faf1229c459a60731
  Author: Peter Maydell <address@hidden>
  Date:   2019-04-30 (Tue, 30 Apr 2019)

  Changed paths:
    M block.c
    M block/backup.c
    M block/commit.c
    M block/parallels.c
    M block/qapi.c
    M block/qcow.c
    M block/qcow2.c
    M block/qed-check.c
    M block/qed-table.c
    M block/qed.c
    M block/qed.h
    M block/stream.c
    M block/vhdx-log.c
    M block/vhdx.c
    M block/vhdx.h
    M block/vmdk.c
    M block/vpc.c
    M include/block/block_int.h
    M include/sysemu/block-backend.h
    M qemu-img.c
    M tests/qemu-iotests/026.out
    M tests/qemu-iotests/043.out
    M tests/qemu-iotests/053.out
    M tests/qemu-iotests/059.out
    M tests/qemu-iotests/060.out
    M tests/qemu-iotests/061.out
    M tests/qemu-iotests/069.out
    M tests/qemu-iotests/070.out
    M tests/qemu-iotests/075.out
    M tests/qemu-iotests/076.out
    M tests/qemu-iotests/078.out
    M tests/qemu-iotests/080.out
    M tests/qemu-iotests/081.out
    M tests/qemu-iotests/082
    M tests/qemu-iotests/082.out
    M tests/qemu-iotests/084.out
    M tests/qemu-iotests/088.out
    M tests/qemu-iotests/089.out
    M tests/qemu-iotests/095.out
    M tests/qemu-iotests/103.out
    M tests/qemu-iotests/104.out
    M tests/qemu-iotests/110.out
    M tests/qemu-iotests/114.out
    M tests/qemu-iotests/116.out
    M tests/qemu-iotests/126.out
    M tests/qemu-iotests/130.out
    M tests/qemu-iotests/131.out
    M tests/qemu-iotests/133.out
    M tests/qemu-iotests/137.out
    M tests/qemu-iotests/140.out
    M tests/qemu-iotests/143.out
    M tests/qemu-iotests/153.out
    M tests/qemu-iotests/187.out
    M tests/qemu-iotests/188.out
    M tests/qemu-iotests/191.out
    M tests/qemu-iotests/195.out
    M tests/qemu-iotests/197.out
    M tests/qemu-iotests/198.out
    M tests/qemu-iotests/205
    M tests/qemu-iotests/206.out
    M tests/qemu-iotests/207.out
    M tests/qemu-iotests/210.out
    M tests/qemu-iotests/211.out
    M tests/qemu-iotests/212.out
    M tests/qemu-iotests/213.out
    M tests/qemu-iotests/215.out
    M tests/qemu-iotests/226.out
    M tests/qemu-iotests/233.out
    M tests/qemu-iotests/237.out
    M tests/qemu-iotests/242.out
    M tests/qemu-iotests/244.out
    A tests/qemu-iotests/249
    A tests/qemu-iotests/249.out
    M tests/qemu-iotests/group
    M util/cutils.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging

Block layer patches:

- iotests: Fix output of qemu-io related tests
- Don't ignore bdrv_set_aio_context() for nodes with bs->drv = NUL
- vmdk: Set vmdk parent backing_format to vmdk
- qcow2: Preallocation fixes (especially for external data files)
- Add linear-buffer-based APIs (as wrappers around qiov-based ones)
- Various code cleanups and small corner case fixes

# gpg: Signature made Tue 30 Apr 2019 16:35:09 BST
# gpg:                using RSA key 7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <address@hidden>" [full]
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74  56FE 7F09 B272 C88F 2FD6

* remotes/kevin/tags/for-upstream: (27 commits)
  block/qed: add missed coroutine_fn markers
  iotests: Check that images are in read-only mode after block-commit
  commit: Make base read-only if there is an early failure
  qemu-img: use buffer-based io
  block/stream: use buffer-based io
  block/commit: use buffer-based io
  block/backup: use buffer-based io
  block/parallels: use buffer-based io
  block/qed: use buffer-based io
  block/qcow: use buffer-based io
  block/qcow2: use buffer-based io
  block: introduce byte-based io helpers
  qcow2: Fix error handling in the compression code
  qcow2: Fix qcow2_make_empty() with external data file
  qemu-img: Make create hint at protocol options
  iotests: Perform the correct test in 082
  qcow2: Fix full preallocation with external data file
  qcow2: Add errp to preallocate_co()
  qcow2: Avoid COW during metadata preallocation
  qemu-img: Saner printing of large file sizes
  ...

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


Compare: https://github.com/qemu/qemu/compare/c4bfdd5947fd...f75d15231e56