[qemu-xen master] Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20200731' into staging

[patchbot@xxxxxxx]

commit d74824cf7c8b352f9045e949dc636c7207a41eee
Merge: 1448629751871c4924c234c2faaa968fc26890e1 
148d25e0f6ad1dc3bd6aace092d65262d4217ec6
Author:     Peter Maydell <peter.maydell@xxxxxxxxxx>
AuthorDate: Fri Jul 31 10:28:12 2020 +0100
Commit:     Peter Maydell <peter.maydell@xxxxxxxxxx>
CommitDate: Fri Jul 31 10:28:13 2020 +0100

    Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20200731' into 
staging
    
    Fix a problem introduced in a recent fix.
    
    # gpg: Signature made Fri 31 Jul 2020 09:50:28 BST
    # gpg:                using RSA key C3D0D66DC3624FF6A8C018CEDECF6B93C6F02FAF
    # gpg:                issuer "cohuck@xxxxxxxxxx"
    # gpg: Good signature from "Cornelia Huck <conny@xxxxxxxxxxxxxxxx>" 
[marginal]
    # gpg:                 aka "Cornelia Huck <huckc@xxxxxxxxxxxxxxxxxx>" [full]
    # gpg:                 aka "Cornelia Huck <cornelia.huck@xxxxxxxxxx>" [full]
    # gpg:                 aka "Cornelia Huck <cohuck@xxxxxxxxxx>" [marginal]
    # gpg:                 aka "Cornelia Huck <cohuck@xxxxxxxxxx>" [marginal]
    # Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0  18CE DECF 6B93 C6F0 
2FAF
    
    * remotes/cohuck/tags/s390x-20200731:
      s390x/s390-virtio-ccw: fix off-by-one in loadparm getter
    
    Signed-off-by: Peter Maydell <peter.maydell@xxxxxxxxxx>

 hw/s390x/s390-virtio-ccw.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#master