From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 20 Mar 2018 15:48:34 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ed627b2ad37469eeba9e9ed5fecfe315df9ecc60;p=qemu.git

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
---

ed627b2ad37469eeba9e9ed5fecfe315df9ecc60
diff --cc migration/migration.c
index 623f373326,1f22f463d3..fc629e5965
--- a/migration/migration.c
+++ b/migration/migration.c
@@@ -155,11 -155,10 +155,13 @@@ MigrationIncomingState *migration_incom
      if (!once) {
          mis_current.state = MIGRATION_STATUS_NONE;
          memset(&mis_current, 0, sizeof(MigrationIncomingState));
+         mis_current.postcopy_remote_fds = g_array_new(FALSE, TRUE,
+                                                    sizeof(struct PostCopyFD));
          qemu_mutex_init(&mis_current.rp_mutex);
          qemu_event_init(&mis_current.main_thread_load_event, false);
 +
 +        init_dirty_bitmap_incoming_migration();
 +
          once = true;
      }
      return &mis_current;
diff --cc scripts/update-linux-headers.sh
index da9030a01c,d18e2f1ffa..5b1d8dcdf4
--- a/scripts/update-linux-headers.sh
+++ b/scripts/update-linux-headers.sh
@@@ -39,7 -39,9 +39,10 @@@ cp_portable() 
                                       -e 'input-event-codes' \
                                       -e 'sys/' \
                                       -e 'pvrdma_verbs' \
 +                                     -e 'drm.h' \
+                                      -e 'limits' \
+                                      -e 'linux/kernel' \
+                                      -e 'linux/sysinfo' \
                                       > /dev/null
      then
          echo "Unexpected #include in input file $f".
@@@ -151,12 -153,11 +158,14 @@@ rm -rf "$output/include/standard-header
  mkdir -p "$output/include/standard-headers/linux"
  for i in "$tmpdir"/include/linux/*virtio*.h "$tmpdir/include/linux/input.h" \
           "$tmpdir/include/linux/input-event-codes.h" \
-          "$tmpdir/include/linux/pci_regs.h"; do
+          "$tmpdir/include/linux/pci_regs.h" \
+          "$tmpdir/include/linux/ethtool.h" "$tmpdir/include/linux/kernel.h" \
+          "$tmpdir/include/linux/sysinfo.h"; do
      cp_portable "$i" "$output/include/standard-headers/linux"
  done
 +mkdir -p "$output/include/standard-headers/drm"
 +cp_portable "$tmpdir/include/drm/drm_fourcc.h" \
 +            "$output/include/standard-headers/drm"
  
  rm -rf "$output/include/standard-headers/drivers/infiniband/hw/vmw_pvrdma"
  mkdir -p "$output/include/standard-headers/drivers/infiniband/hw/vmw_pvrdma"