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

[patchbot@xxxxxxx]

commit 881419b7117d5350c2a0288bfb79f2a83715df32
Merge: d15532d91be177e7528310e0110e39f915779a99 
facc68516a7ee6d4992dc47b42b47c600b20b21d
Author:     Peter Maydell <peter.maydell@xxxxxxxxxx>
AuthorDate: Tue Aug 4 16:51:32 2020 +0100
Commit:     Peter Maydell <peter.maydell@xxxxxxxxxx>
CommitDate: Tue Aug 4 16:51:32 2020 +0100

    Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
    
    virtio: bugfix
    
    A last minute bugfix.
    
    Signed-off-by: Michael S. Tsirkin <mst@xxxxxxxxxx>
    
    # gpg: Signature made Tue 04 Aug 2020 16:48:37 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:
      virtio-mem: Correct format specifier mismatch for RISC-V
    
    Signed-off-by: Peter Maydell <peter.maydell@xxxxxxxxxx>

 hw/virtio/virtio-mem.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#staging