[qemu-xen master] Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2020-07-28' into staging

[patchbot@xxxxxxx]

commit 5045be872db97be2aecc694bf43762e75e7e5395
Merge: b1753831b0e58587db4fdf8219237331269c00c3 
12c75e20a269ac917f4a76936d7142264e522233
Author:     Peter Maydell <peter.maydell@xxxxxxxxxx>
AuthorDate: Tue Jul 28 20:43:03 2020 +0100
Commit:     Peter Maydell <peter.maydell@xxxxxxxxxx>
CommitDate: Tue Jul 28 20:43:03 2020 +0100

    Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2020-07-28' into 
staging
    
    nbd patches for 2020-07-28
    
    - fix NBD handling of trim/zero requests larger than 2G
    - allow no-op resizes on NBD (in turn fixing qemu-img convert -c into NBD)
    - several deadlock fixes when using NBD reconnect
    
    # gpg: Signature made Tue 28 Jul 2020 15:59:42 BST
    # gpg:                using RSA key 71C2CC22B1C4602927D2F3AAA7A16B4A2527436A
    # gpg: Good signature from "Eric Blake <eblake@xxxxxxxxxx>" [full]
    # gpg:                 aka "Eric Blake (Free Software Programmer) 
<ebb9@xxxxxxx>" [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-07-28:
      block/nbd: nbd_co_reconnect_loop(): don't sleep if drained
      block/nbd: on shutdown terminate connection attempt
      block/nbd: allow drain during reconnect attempt
      block/nbd: split nbd_establish_connection out of nbd_client_connect
      iotests: Test convert to qcow2 compressed to NBD
      iotests: Add more qemu_img helpers
      iotests: Make qemu_nbd_popen() a contextmanager
      block: nbd: Fix convert qcow2 compressed to nbd
      nbd: Fix large trim/zero requests
    
    Signed-off-by: Peter Maydell <peter.maydell@xxxxxxxxxx>

 block/nbd.c                   | 126 ++++++++++++++++++++++++++++++-----------
 block/trace-events            |   4 +-
 nbd/server.c                  |  28 ++++++++--
 qemu-io-cmds.c                |   2 +-
 tests/qemu-iotests/264        |  76 ++++++++++---------------
 tests/qemu-iotests/264.out    |   2 +
 tests/qemu-iotests/302        | 127 ++++++++++++++++++++++++++++++++++++++++++
 tests/qemu-iotests/302.out    |  31 +++++++++++
 tests/qemu-iotests/group      |   1 +
 tests/qemu-iotests/iotests.py |  34 ++++++++++-
 10 files changed, 342 insertions(+), 89 deletions(-)

--
generated by git-patchbot for /home/xen/git/qemu-xen.git#master