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

[patchbot@xxxxxxx]

commit 93ea484375ab473379dd9c836261ef484bd71ab1
Merge: 9303ecb658a0194560d1eecde165a1511223c2d8 
0c9753ebda274b0e618d7b4032bb2d83d27483ed
Author:     Peter Maydell <peter.maydell@xxxxxxxxxx>
AuthorDate: Mon Jul 27 21:00:01 2020 +0100
Commit:     Peter Maydell <peter.maydell@xxxxxxxxxx>
CommitDate: Mon Jul 27 21:00:01 2020 +0100

    Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
    
    virtio,pci: bugfixes
    
    Minor bugfixes all over the places, including one CVE.
    
    Additionally, a fix for an ancient bug in migration -
    one has to wonder how come no one noticed.
    
    The fix is also non-trivial since we dare not break all
    existing machine types with pci - we have a work around
    in the works, for now we just skip the work-around for
    old machine types.
    
    Great job by Hogan Wang noticing, debugging and fixing it,
    and thanks to Dr. David Alan Gilbert for reviewing the patches.
    
    Signed-off-by: Michael S. Tsirkin <mst@xxxxxxxxxx>
    
    # gpg: Signature made Mon 27 Jul 2020 16:34:58 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-pci: fix virtio_pci_queue_enabled()
      MAINTAINERS: Cover the firmware JSON schema
      vhost-vdpa :Fix Coverity CID 1430270 / CID 1420267
      libvhost-user: Report descriptor index on panic
      Fix vhost-user buffer over-read on ram hot-unplug
      hw/pci-host: save/restore pci host config register
      virtio-mem-pci: force virtio version 1
    
    Signed-off-by: Peter Maydell <peter.maydell@xxxxxxxxxx>

 MAINTAINERS                           |  8 ++++++++
 contrib/libvhost-user/libvhost-user.c |  4 ++--
 hw/core/machine.c                     |  1 +
 hw/i386/pc.c                          |  3 ++-
 hw/pci/pci_host.c                     | 33 +++++++++++++++++++++++++++++++++
 hw/virtio/vhost-user.c                |  2 +-
 hw/virtio/vhost-vdpa.c                |  4 ++--
 hw/virtio/virtio-mem-pci.c            |  4 ++--
 hw/virtio/virtio-pci.c                |  2 +-
 hw/virtio/virtio.c                    |  7 ++++++-
 include/hw/pci/pci_host.h             |  1 +
 include/hw/virtio/virtio.h            |  1 +
 12 files changed, 60 insertions(+), 10 deletions(-)
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#master