qemu-stable
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-stable] [PATCH 77/88] qcow2: Respect bdrv_truncate() error


From: Michael Roth
Subject: [Qemu-stable] [PATCH 77/88] qcow2: Respect bdrv_truncate() error
Date: Thu, 8 Jan 2015 11:34:21 -0600

From: Max Reitz <address@hidden>

bdrv_truncate() may fail and qcow2_write_compressed() should return the
error code in that case.

Cc: address@hidden
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
(cherry picked from commit 6a69b9620ac1562a067990d87284a85552bfd61b)

Conflicts:
        block/qcow2.c

*removed context dependency on 75d3d21

Signed-off-by: Michael Roth <address@hidden>
---
 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




reply via email to

[Prev in Thread] Current Thread [Next in Thread]