From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 28 Mar 2017 10:10:36 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
X-Git-Tag: v2.9.0-rc2~6
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=142b9ca51d7260d20f6e87bd7f2020ac0a7d95d9;p=mirror_qemu.git

Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging

# gpg: Signature made Tue 28 Mar 2017 11:07:02 BST
# gpg:                using RSA key 0x9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/block-pull-request:
  parallels: wrong call to bdrv_truncate

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

142b9ca51d7260d20f6e87bd7f2020ac0a7d95d9