From: Peter Maydell Date: Wed, 15 Mar 2017 14:19:59 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging X-Git-Tag: qemu-xen-4.10.0-rc1~415 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=7584bf5e6fcb444a75687314ab9d06d2ba1f8e4e;p=qemu-xen.git Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging # gpg: Signature made Wed 15 Mar 2017 05:05:04 GMT # gpg: using RSA key 0x9CA4ABB381AB73C8 # gpg: Good signature from "Stefan Hajnoczi " # gpg: aka "Stefan Hajnoczi " # Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8 * remotes/stefanha/tags/block-pull-request: os: don't corrupt pre-existing memory-backend data with prealloc Signed-off-by: Peter Maydell --- 7584bf5e6fcb444a75687314ab9d06d2ba1f8e4e