Merge remote-tracking branch 'remotes/sstabellini/tags/xen-migration-2.4-tag' into...
commite95edefbd0559e1d0aa09549641b5d9af1f96fac
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 3 Aug 2015 16:33:35 +0000 (3 17:33 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 3 Aug 2015 16:33:35 +0000 (3 17:33 +0100)
tree88dcd36e5ae08283a170ee8bf9394932c94a5871
parentf60c87154ac722c528fd5582f7137914a93c5eec
parent8c6dc68f4cff9eef870497a19a5373dde9dbdcc2
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 <stefano.stabellini@eu.citrix.com>"

* 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 <peter.maydell@linaro.org>