[qemu-xen master] Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging

[patchbot@xxxxxxx]

commit 0fb7ea45157d63507675a4011bc4b24588217f6e
Merge: 45db94cc90c286a9965a285ba19450f448760a09 
4dc5acc07e88b2776513db75944f2e240116ebda
Author:     Peter Maydell <peter.maydell@xxxxxxxxxx>
AuthorDate: Fri Jul 10 19:29:07 2020 +0100
Commit:     Peter Maydell <peter.maydell@xxxxxxxxxx>
CommitDate: Fri Jul 10 19:29:07 2020 +0100

    Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
    
    virtio: bugfix
    
    fixes vdpa on non-kvm platforms
    
    Signed-off-by: Michael S. Tsirkin <mst@xxxxxxxxxx>
    
    # gpg: Signature made Wed 08 Jul 2020 11:17:48 BST
    # gpg:                using RSA key 5D09FD0871C8F85B94CA8A0D281F0DB8D28D5469
    # gpg:                issuer "mst@xxxxxxxxxx"
    # gpg: Good signature from "Michael S. Tsirkin <mst@xxxxxxxxxx>" [full]
    # gpg:                 aka "Michael S. Tsirkin <mst@xxxxxxxxxx>" [full]
    # Primary key fingerprint: 0270 606B 6F3C DF3D 0B17  0970 C350 3912 AFBE 
8E67
    #      Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA  8A0D 281F 0DB8 D28D 
5469
    
    * remotes/mst/tags/for_upstream:
      vhost-vdpa: fix the compile issue without kvm
    
    Signed-off-by: Peter Maydell <peter.maydell@xxxxxxxxxx>

 hw/virtio/vhost-vdpa.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#master