]> git.proxmox.com Git - mirror_qemu.git/commit
Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20180525' into...
authorPeter Maydell <peter.maydell@linaro.org>
Fri, 25 May 2018 16:52:34 +0000 (17:52 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Fri, 25 May 2018 16:52:34 +0000 (17:52 +0100)
commit98c0a88ea31140d2fdb0eac9c153212d036f6d0d
treeaed32d61ab1c66b0b176aafa8d0d56b2c07332db
parent5a5c383b1373aeb6c87a0d6060f6c3dc7c53082b
parentbf269906f5b225a04825b2bce4364bfe1d509999
Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20180525' into staging

migration/next for 20180525

# gpg: Signature made Fri 25 May 2018 14:30:47 BST
# gpg:                using RSA key F487EF185872D723
# gpg: Good signature from "Juan Quintela <quintela@redhat.com>"
# gpg:                 aka "Juan Quintela <quintela@trasno.org>"
# Primary key fingerprint: 1899 FF8E DEBF 58CC EE03  4B82 F487 EF18 5872 D723

* remotes/juanquintela/tags/migration/20180525:
  migration: use g_free for ram load bitmap
  migration: fix exec/fd migrations

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