OSDN Git Service

Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20141015' into...
authorPeter Maydell <peter.maydell@linaro.org>
Wed, 15 Oct 2014 10:55:53 +0000 (11:55 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Wed, 15 Oct 2014 10:55:54 +0000 (11:55 +0100)
commit32d9c5613e3cbb5d90daa3a1c629fb389e749d03
tree9a93c3a76f7ef0832a1467a766e1ddb17ae87168
parent88e6599669a2f8c9ec5b8baa62178bc3dfc340ae
parent5b0e9dd46fbda5152566a4a26fd96bc0d0452bf7
Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20141015' into staging

migration/next for 20141015

# gpg: Signature made Wed 15 Oct 2014 09:21:54 BST using RSA key ID 5872D723
# gpg: Can't check signature: public key not found

* remotes/juanquintela/tags/migration/20141015:
  migration: catch unknown flag combinations in ram_load
  qemu-file: Move stdio implementation to qemu-file-stdio.c
  qemu-file: Move unix and socket implementations to qemu-file-unix.c
  qemu-file: Use qemu_file_is_writable() on stdio_fclose()
  qemu-file: Make qemu_file_is_writable() non-static
  qemu-file: Add copyright header to qemu-file.c
  vmstate: Allow dynamic allocation for VBUFFER during migration
  block/migration: Disable cache invalidate for incoming migration
  Tests: QEMUSizedBuffer/QEMUBuffer
  QEMUSizedBuffer based QEMUFile

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