[qemu-xen master] Merge remote-tracking branch 'remotes/maxreitz/tags/pull-block-2020-07-21' into staging

[patchbot@xxxxxxx]

commit 98d897eb4b6fb8c637b2b046e1c543bc5a9f2c4e
Merge: 90218a9a393c7925f330e7dcc08658e2a01d3bd4 
1d719ddc35e9827b6e5df771555874df34301a0d
Author:     Peter Maydell <peter.maydell@xxxxxxxxxx>
AuthorDate: Tue Jul 21 14:03:45 2020 +0100
Commit:     Peter Maydell <peter.maydell@xxxxxxxxxx>
CommitDate: Tue Jul 21 14:03:45 2020 +0100

    Merge remote-tracking branch 'remotes/maxreitz/tags/pull-block-2020-07-21' 
into staging
    
    Block patches for 5.1:
    - Let LUKS images only be shared between VMs if the guest device was
      configured to allow that
    - Fix abort() from bdrv_aio_cancel() for guest devices without a BDS
    
    # gpg: Signature made Tue 21 Jul 2020 12:47:17 BST
    # gpg:                using RSA key 91BEB60A30DB3E8857D11829F407DB0061D5CF40
    # gpg:                issuer "mreitz@xxxxxxxxxx"
    # gpg: Good signature from "Max Reitz <mreitz@xxxxxxxxxx>" [full]
    # Primary key fingerprint: 91BE B60A 30DB 3E88 57D1  1829 F407 DB00 61D5 
CF40
    
    * remotes/maxreitz/tags/pull-block-2020-07-21:
      block: fix bdrv_aio_cancel() for ENOMEDIUM requests
      qemu-iotests: add testcase for bz #1857490
      block/crypto: disallow write sharing by default
    
    Signed-off-by: Peter Maydell <peter.maydell@xxxxxxxxxx>

 block/block-backend.c      |  8 ++++++++
 block/crypto.c             |  2 +-
 tests/qemu-iotests/296     | 44 +++++++++++++++++++++++++++++++++++++++++++-
 tests/qemu-iotests/296.out | 12 ++++++++++--
 4 files changed, 62 insertions(+), 4 deletions(-)
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#master