Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
commited627b2ad37469eeba9e9ed5fecfe315df9ecc60
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 20 Mar 2018 15:48:34 +0000 (20 15:48 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 20 Mar 2018 15:48:34 +0000 (20 15:48 +0000)
treeaca1c6bddbaa61ffe2d029b123539fe20e6ecddc
parent4aafb1b192e5d3685e94cefdce63343a86d64647
parent1dc61e7b37d339c42ec9bd7a7eec1ef2c22f351c
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging

virtio,vhost,pci,pc: features, cleanups

SRAT tables for DIMM devices
new virtio net flags for speed/duplex
post-copy migration support in vhost
cleanups in pci

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Tue 20 Mar 2018 14:40:43 GMT
# gpg:                using RSA key 281F0DB8D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>"
# 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: (51 commits)
  postcopy shared docs
  libvhost-user: Claim support for postcopy
  postcopy: Allow shared memory
  vhost: Huge page align and merge
  vhost+postcopy: Wire up POSTCOPY_END notify
  vhost-user: Add VHOST_USER_POSTCOPY_END message
  libvhost-user: mprotect & madvises for postcopy
  vhost+postcopy: Call wakeups
  vhost+postcopy: Add vhost waker
  postcopy: postcopy_notify_shared_wake
  postcopy: helper for waking shared
  vhost+postcopy: Resolve client address
  postcopy-ram: add a stub for postcopy_request_shared_page
  vhost+postcopy: Helper to send requests to source for shared pages
  vhost+postcopy: Stash RAMBlock and offset
  vhost+postcopy: Send address back to qemu
  libvhost-user+postcopy: Register new regions with the ufd
  migration/ram: ramblock_recv_bitmap_test_byte_offset
  postcopy+vhost-user: Split set_mem_table for postcopy
  vhost+postcopy: Transmit 'listen' to slave
  ...

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
# Conflicts:
# scripts/update-linux-headers.sh
16 files changed:
Makefile
exec.c
hw/i386/acpi-build.c
hw/pci/pci.c
hw/ppc/spapr.c
include/hw/pci/pci.h
migration/migration.c
migration/migration.h
migration/ram.c
migration/savevm.c
migration/trace-events
qapi/misc.json
qmp.c
scripts/update-linux-headers.sh
trace-events
vl.c