From: Peter Maydell Date: Fri, 2 Nov 2018 09:49:35 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20181031a' into... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=4cb890b858bd1bd5935457401630d95754c4be48;p=qemu.git Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20181031a' into staging Minor migration fixes 2018-10-31 # gpg: Signature made Wed 31 Oct 2018 16:55:40 GMT # gpg: using RSA key 0516331EBC5BFDE7 # gpg: Good signature from "Dr. David Alan Gilbert (RH2) " # Primary key fingerprint: 45F5 C71B 4A0C B7FB 977A 9FA9 0516 331E BC5B FDE7 * remotes/dgilbert/tags/pull-migration-20181031a: migration: avoid segmentfault when take a snapshot of a VM which being migrated qapi: Fix COLOStatus and query-colo-status since version COLO: Fix Colo doc secondeary should be secondary Signed-off-by: Peter Maydell --- 4cb890b858bd1bd5935457401630d95754c4be48