From: Peter Maydell Date: Mon, 3 Aug 2015 16:33:35 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/sstabellini/tags/xen-migration-2.4-tag' into... X-Git-Tag: qemu-xen-4.7.0-rc1~124 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=e95edefbd0559e1d0aa09549641b5d9af1f96fac;p=qemu-xen.git Merge remote-tracking branch 'remotes/sstabellini/tags/xen-migration-2.4-tag' into staging xen-migration-2.4 # gpg: Signature made Mon 03 Aug 2015 17:18:36 BST using RSA key ID 70E1AE90 # gpg: Good signature from "Stefano Stabellini " * remotes/sstabellini/tags/xen-migration-2.4-tag: migration: Fix regression for xenfv and pc,accel=xen machine. migration: Fix global state with Xen. Signed-off-by: Peter Maydell --- e95edefbd0559e1d0aa09549641b5d9af1f96fac