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

[patchbot@xxxxxxx]

commit 51f492e5da8ca5f3df1429d1c4577aeae500b96d
Merge: 60c5a47a16aa227155877b1436b4467a106587d6 
453ac8835b002263a6b7b0843e7c90fa8b19c869
Author:     Stefan Hajnoczi <stefanha@xxxxxxxxxx>
AuthorDate: Tue Nov 15 19:50:06 2016 +0000
Commit:     Stefan Hajnoczi <stefanha@xxxxxxxxxx>
CommitDate: Tue Nov 15 19:50:36 2016 +0000

    Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
    
    virtio, vhost, pc, pci: documentation, fixes and cleanups
    
    Lots of fixes all over the place.
    
    Unfortunately, this does not yet fix a regression with vhost
    introduced by the last pull, the issue is typically this error:
        kvm_mem_ioeventfd_add: error adding ioeventfd: File exists
    followed by QEMU aborting.
    
    Signed-off-by: Michael S. Tsirkin <mst@xxxxxxxxxx>
    
    * remotes/mst/tags/for_upstream: (28 commits)
      docs: add PCIe devices placement guidelines
      virtio: drop virtio_queue_get_ring_{size,addr}()
      vhost: drop legacy vring layout bits
      vhost: adapt vhost_verify_ring_mappings() to virtio 1 ring layout
      nvdimm acpi: introduce NVDIMM_DSM_MEMORY_SIZE
      nvdimm acpi: use aml_name_decl to define named object
      nvdimm acpi: rename nvdimm_dsm_reserved_root
      nvdimm acpi: fix two comments
      nvdimm acpi: define DSM return codes
      nvdimm acpi: rename nvdimm_acpi_hotplug
      nvdimm acpi: cleanup nvdimm_build_fit
      nvdimm acpi: rename nvdimm_plugged_device_list
      docs: improve the doc of Read FIT method
      nvdimm acpi: clean up nvdimm_build_acpi
      pc: memhp: stop handling nvdimm hotplug in pc_dimm_unplug
      pc: memhp: move nvdimm hotplug out of memory hotplug
      nvdimm acpi: drop the lock of fit buffer
      qdev: hotplug: drop HotplugHandler.post_plug callback
      vhost: migration blocker only if shared log is used
      virtio-net: mark VIRTIO_NET_F_GSO as legacy
      ...
    
    Message-id: 1479237527-11846-1-git-send-email-mst@xxxxxxxxxx
    Signed-off-by: Stefan Hajnoczi <stefanha@xxxxxxxxxx>

 default-configs/mips-softmmu-common.mak |   1 +
 docs/pcie.txt                           | 310 ++++++++++++++++++++++++++++++++
 docs/specs/acpi_mem_hotplug.txt         |   3 -
 docs/specs/acpi_nvdimm.txt              |  99 +++++-----
 hw/acpi/ich9.c                          |   8 +-
 hw/acpi/memory_hotplug.c                |  31 +---
 hw/acpi/nvdimm.c                        | 166 ++++++++---------
 hw/acpi/piix4.c                         |   7 +-
 hw/core/hotplug.c                       |  11 --
 hw/core/qdev.c                          |  20 +--
 hw/i386/acpi-build.c                    |   3 +-
 hw/i386/intel_iommu.c                   |   6 +-
 hw/i386/intel_iommu_internal.h          |   2 +-
 hw/i386/pc.c                            |  29 +--
 hw/net/virtio-net.c                     |   3 +-
 hw/s390x/virtio-ccw.c                   |   4 +-
 hw/virtio/vhost.c                       |  94 ++++++----
 hw/virtio/virtio-balloon.c              |   2 +-
 hw/virtio/virtio-crypto-pci.c           |   2 +-
 hw/virtio/virtio-crypto.c               |   1 +
 hw/virtio/virtio-pci.c                  |   4 +-
 hw/virtio/virtio.c                      |  23 +--
 include/hw/acpi/acpi-defs.h             |   5 +-
 include/hw/hotplug.h                    |  11 --
 include/hw/i386/intel_iommu.h           |   9 +-
 include/hw/mem/nvdimm.h                 |  20 +--
 include/hw/virtio/vhost.h               |   7 +-
 include/hw/virtio/virtio.h              |  12 +-
 28 files changed, 586 insertions(+), 307 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