From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 19 Oct 2015 11:13:27 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/sstabellini/tags/2015-10-19-tag' into staging
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=26c7be842637ee65a79cd77f96a99c23ddcd90ad;p=osstest%2Fqemu.git

Merge remote-tracking branch 'remotes/sstabellini/tags/2015-10-19-tag' into staging

Xen 2015-10-19

# gpg: Signature made Mon 19 Oct 2015 11:24:05 BST using RSA key ID 70E1AE90
# gpg: Good signature from "Stefano Stabellini <stefano.stabellini@eu.citrix.com>"

* remotes/sstabellini/tags/2015-10-19-tag:
  xen-platform: Ensure xen is enabled when initializing
  pc: Require xen when initializing xenfv machine

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

26c7be842637ee65a79cd77f96a99c23ddcd90ad