Commit 233521b1 authored by Max Reitz's avatar Max Reitz
Browse files

qcow2: Emit errp when truncating the image tail 



bdrv_truncate() has an errp parameter which is always set when an error
occurs.  Let's use that instead of a plain strerror().

Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
Message-id: 20171009155431.14093-1-mreitz@redhat.com
Reviewed-by: default avatarPavel Butsykin <pbutsykin@virtuozzo.com>
Reviewed-by: default avatarJeff Cody <jcody@redhat.com>
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
parent b66df843

block/qcow2.c

+7 −6
Original line number Diff line number Diff line
@@ -3145,12 +3145,13 @@ static int qcow2_truncate(BlockDriverState *bs, int64_t offset, 
            return last_cluster;

        }

        if ((last_cluster + 1) * s->cluster_size < old_file_size) {

            ret = bdrv_truncate(bs->file, (last_cluster + 1) * s->cluster_size,

                                PREALLOC_MODE_OFF, NULL);

            if (ret < 0) {

                warn_report("Failed to truncate the tail of the image: %s",

                            strerror(-ret));

                ret = 0;

            Error *local_err = NULL;



            bdrv_truncate(bs->file, (last_cluster + 1) * s->cluster_size,

                          PREALLOC_MODE_OFF, &local_err);

            if (local_err) {

                warn_reportf_err(local_err,

                                 "Failed to truncate the tail of the image: ");

            }

        }

    } else {