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

[patchbot@xxxxxxx]

commit c36ed06e9159fa484b711dfdd27ec64d7ac3d17a
Merge: d93b1fb009b64333d324a2fe76fe805f2ac2cda4 
4b5b47abbf23246bd8dde4c6faaed8b7249d8654
Author:     Stefan Hajnoczi <stefanha@xxxxxxxxxx>
AuthorDate: Mon Nov 21 11:09:58 2016 +0000
Commit:     Stefan Hajnoczi <stefanha@xxxxxxxxxx>
CommitDate: Mon Nov 21 11:09:58 2016 +0000

    Merge remote-tracking branch 'mst/tags/for_upstream' into staging
    
    virtio, vhost, pc: fixes
    
    Most notably this fixes a regression with vhost introduced by the pull 
before
    last.
    
    Signed-off-by: Michael S. Tsirkin <mst@xxxxxxxxxx>
    
    # gpg: Signature made Fri 18 Nov 2016 03:51:55 PM GMT
    # gpg:                using RSA key 0x281F0DB8D28D5469
    # gpg: Good signature from "Michael S. Tsirkin <mst@xxxxxxxxxx>"
    # gpg:                 aka "Michael S. Tsirkin <mst@xxxxxxxxxx>"
    # 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
    
    * mst/tags/for_upstream:
      acpi: Use apic_id_limit when calculating legacy ACPI table size
      ipmi: fix qemu crash while migrating with ipmi
      ivshmem: Fix 64 bit memory bar configuration
      virtio: set ISR on dataplane notifications
      virtio: access ISR atomically
      virtio: introduce grab/release_ioeventfd to fix vhost
      virtio-crypto: fix virtio_queue_set_notification() race
    
    Message-id: 1479484366-7977-1-git-send-email-mst@xxxxxxxxxx
    Signed-off-by: Stefan Hajnoczi <stefanha@xxxxxxxxxx>

 hw/block/dataplane/virtio-blk.c |  4 +--
 hw/i386/acpi-build.c            |  2 +-
 hw/ipmi/isa_ipmi_kcs.c          |  6 ++--
 hw/scsi/virtio-scsi-dataplane.c |  7 -----
 hw/scsi/virtio-scsi.c           |  2 +-
 hw/virtio/trace-events          |  2 +-
 hw/virtio/vhost.c               | 14 ++++-----
 hw/virtio/virtio-bus.c          | 58 +++++++++++++++++++++++++++++-------
 hw/virtio/virtio-crypto.c       | 13 ++++++--
 hw/virtio/virtio-mmio.c         |  6 ++--
 hw/virtio/virtio-pci.c          |  9 ++----
 hw/virtio/virtio.c              | 66 +++++++++++++++++++++++++++++++++++------
 include/hw/virtio/virtio-bus.h  | 14 +++++++++
 include/hw/virtio/virtio-scsi.h |  1 -
 include/hw/virtio/virtio.h      |  4 ++-
 15 files changed, 151 insertions(+), 57 deletions(-)
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog