From: Peter Maydell Date: Fri, 18 Dec 2015 15:32:32 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/sstabellini/tags/xsa155' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=6126bc55220f7cde3392ef1fbbffcbc67240d4f0;p=qemu.git 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 " * 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 --- 6126bc55220f7cde3392ef1fbbffcbc67240d4f0