Branch: refs/heads/master Home: https://github.com/qemu/qemu Commit: fc6008f37a6f5779fc8c723823861c43a0abfb44 https://github.com/qemu/qemu/commit/fc6008f37a6f5779fc8c723823861c43a0abfb44 Author: Marc-André Lureau <marcandre.lur...@redhat.com> Date: 2018-03-29 (Thu, 29 Mar 2018)
Changed paths: M migration/postcopy-ram.c Log Message: ----------- migration: fix pfd leak Fix leak spotted by ASAN: Direct leak of 16 byte(s) in 1 object(s) allocated from: #0 0x7fe1abb80a38 in __interceptor_calloc (/lib64/libasan.so.4+0xdea38) #1 0x7fe1aaf1bf75 in g_malloc0 ../glib/gmem.c:124 #2 0x7fe1aaf1c249 in g_malloc0_n ../glib/gmem.c:355 #3 0x55f4841cfaa9 in postcopy_ram_fault_thread /home/elmarco/src/qemu/migration/postcopy-ram.c:596 #4 0x55f48479447b in qemu_thread_start /home/elmarco/src/qemu/util/qemu-thread-posix.c:504 #5 0x7fe1a043550a in start_thread (/lib64/libpthread.so.0+0x750a) Regression introduced with commit 00fa4fc85b00f1a8a810068d158a7a66e88658eb. Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com> Message-Id: <20180321113644.21899-1-marcandre.lur...@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <f4...@amsat.org> Reviewed-by: Peter Xu <pet...@redhat.com> Signed-off-by: Dr. David Alan Gilbert <dgilb...@redhat.com> Commit: 0746a92612276aee69e66dfe6782b0f882d221d5 https://github.com/qemu/qemu/commit/0746a92612276aee69e66dfe6782b0f882d221d5 Author: Dr. David Alan Gilbert <dgilb...@redhat.com> Date: 2018-03-29 (Thu, 29 Mar 2018) Changed paths: M migration/migration.c Log Message: ----------- migration: Don't activate block devices if using -S Activating the block devices causes the locks to be taken on the backing file. If we're running with -S and the destination libvirt hasn't started the destination with 'cont', it's expecting the locks are still untaken. Don't activate the block devices if we're not going to autostart the VM; 'cont' already will do that anyway. bz: https://bugzilla.redhat.com/show_bug.cgi?id=1560854 Signed-off-by: Dr. David Alan Gilbert <dgilb...@redhat.com> Message-Id: <20180328170207.49512-1-dgilb...@redhat.com> Reviewed-by: Eric Blake <ebl...@redhat.com> Signed-off-by: Dr. David Alan Gilbert <dgilb...@redhat.com> Commit: 4cd327ded7337c418da114c184cf5868fd980ab4 https://github.com/qemu/qemu/commit/4cd327ded7337c418da114c184cf5868fd980ab4 Author: Peter Maydell <peter.mayd...@linaro.org> Date: 2018-03-30 (Fri, 30 Mar 2018) Changed paths: M migration/migration.c M migration/postcopy-ram.c Log Message: ----------- Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20180329a' into staging Migration pull (small fixes) A pair of two small fixes for 2.12. # gpg: Signature made Thu 29 Mar 2018 14:55:17 BST # gpg: using RSA key 0516331EBC5BFDE7 # gpg: Good signature from "Dr. David Alan Gilbert (RH2) <dgilb...@redhat.com>" # Primary key fingerprint: 45F5 C71B 4A0C B7FB 977A 9FA9 0516 331E BC5B FDE7 * remotes/dgilbert/tags/pull-migration-20180329a: migration: Don't activate block devices if using -S migration: fix pfd leak Signed-off-by: Peter Maydell <peter.mayd...@linaro.org> Compare: https://github.com/qemu/qemu/compare/47d3b60858d9...4cd327ded733