Merge remote-tracking branch 'remotes/juanquintela/tags/migration-pull-request' into...
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 6 Jun 2019 09:51:19 +0000 (10:51 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 6 Jun 2019 09:51:19 +0000 (10:51 +0100)
Migration Pull request

# gpg: Signature made Wed 05 Jun 2019 12:52:06 BST
# gpg:                using RSA key 1899FF8EDEBF58CCEE034B82F487EF185872D723
# gpg: Good signature from "Juan Quintela <quintela@redhat.com>" [full]
# gpg:                 aka "Juan Quintela <quintela@trasno.org>" [full]
# Primary key fingerprint: 1899 FF8E DEBF 58CC EE03  4B82 F487 EF18 5872 D723

* remotes/juanquintela/tags/migration-pull-request:
  migratioin/ram: leave RAMBlock->bmap blank on allocating
  migration-test: Add a test for fd protocol
  migration: Fix fd protocol for incoming defer
  migration/ram.c: multifd_send_state->count is not really used
  migration/ram.c: MultiFDSendParams.sem_sync is not really used

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Trivial merge