From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60953) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y9H0W-00055c-DE for qemu-devel@nongnu.org; Thu, 08 Jan 2015 12:36:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y9H05-0006xU-9f for qemu-devel@nongnu.org; Thu, 08 Jan 2015 12:36:28 -0500 Received: from e9.ny.us.ibm.com ([32.97.182.139]:46650) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y9H05-0006xA-4r for qemu-devel@nongnu.org; Thu, 08 Jan 2015 12:36:01 -0500 Received: from /spool/local by e9.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 8 Jan 2015 12:36:00 -0500 From: Michael Roth Date: Thu, 8 Jan 2015 11:34:21 -0600 Message-Id: <1420738472-23267-78-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1420738472-23267-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1420738472-23267-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 77/88] qcow2: Respect bdrv_truncate() error List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org From: Max Reitz bdrv_truncate() may fail and qcow2_write_compressed() should return the error code in that case. Cc: qemu-stable@nongnu.org Signed-off-by: Max Reitz Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf (cherry picked from commit 6a69b9620ac1562a067990d87284a85552bfd61b) Conflicts: block/qcow2.c *removed context dependency on 75d3d21 Signed-off-by: Michael Roth --- block/qcow2.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index e3cc23c..d53f181 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -1960,8 +1960,7 @@ static int qcow2_write_compressed(BlockDriverState *bs, int64_t sector_num, sector based I/Os */ cluster_offset = bdrv_getlength(bs->file); cluster_offset = (cluster_offset + 511) & ~511; - bdrv_truncate(bs->file, cluster_offset); - return 0; + return bdrv_truncate(bs->file, cluster_offset); } if (nb_sectors != s->cluster_sectors) { -- 1.9.1