Merge remote-tracking branch 'remotes/sstabellini/tags/xsa155' into staging
commit6126bc55220f7cde3392ef1fbbffcbc67240d4f0
authorPeter Maydell <peter.maydell@linaro.org>
Fri, 18 Dec 2015 15:32:32 +0000 (18 15:32 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Fri, 18 Dec 2015 15:32:32 +0000 (18 15:32 +0000)
tree64f99103ff5838afd549d7edc7da01dc6032f23c
parent18f49881cf8359e89396aac12f5d3cf3f8a632ba
parent7ea11bf376aea4bf8340eb363de9777c7f93e556
Merge remote-tracking branch 'remotes/sstabellini/tags/xsa155' into staging

XSA-155 fixes

# gpg: Signature made Fri 18 Dec 2015 15:16:18 GMT using RSA key ID 70E1AE90
# gpg: Good signature from "Stefano Stabellini <stefano.stabellini@eu.citrix.com>"

* remotes/sstabellini/tags/xsa155:
  xenfb: avoid reading twice the same fields from the shared page
  xen/blkif: Avoid double access to src->nr_segments

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