Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20140616' into...
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 16 Jun 2014 10:06:06 +0000 (11:06 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 16 Jun 2014 10:06:06 +0000 (11:06 +0100)
commit0bbac62618356794097b99a9b8b7634357170b03
tree3861bb55883487e6d57385ee750d675c6e37c27e
parent06a59afac4505f5ed942db4200e5ca16fcbba74d
parentdb80facefa62dff42bb50c73b0f03eda5f732b49
Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20140616' into staging

migration/next for 20140616

# gpg: Signature made Mon 16 Jun 2014 04:10:18 BST using RSA key ID 5872D723
# gpg: Can't check signature: public key not found

* remotes/juanquintela/tags/migration/20140616:
  migration: catch unknown flags in ram_load
  rdma: Fix block during rdma migration
  migration: Increase default max_downtime from 30ms to 300ms
  vmstate: Refactor opening of files
  savevm: Remove all the unneeded version_minimum_id_old (x86)
  savevm: Remove all the unneeded version_minimum_id_old (ppc)

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