summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2014-06-26 13:23:23 +0200
committerKevin Wolf <kwolf@redhat.com>2014-08-15 15:07:13 +0200
commit75d3d21f9ed9fc66a56d4d7cf491d504541fc6ac (patch)
treeb71cf60ee59ed5c2161ec9a9e5f5afc4a7daf4a3
parent57322b7811a9136507742bb7ebc2215dd8c2e911 (diff)
downloadqemu-75d3d21f9ed9fc66a56d4d7cf491d504541fc6ac.tar.gz
qemu-75d3d21f9ed9fc66a56d4d7cf491d504541fc6ac.tar.bz2
qemu-75d3d21f9ed9fc66a56d4d7cf491d504541fc6ac.zip
block: Drop superfluous aligning of bdrv_getlength()'s value
It returns a multiple of the sector size. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Max Reitz <mreitz@redhat.com> Reviewed-by: Benoit Canet <benoit@irqsave.net> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-rw-r--r--block.c1
-rw-r--r--block/qcow2.c1
2 files changed, 0 insertions, 2 deletions
diff --git a/block.c b/block.c
index 2fcc2f738a..1af74e601b 100644
--- a/block.c
+++ b/block.c
@@ -1314,7 +1314,6 @@ int bdrv_append_temp_snapshot(BlockDriverState *bs, int flags, Error **errp)
error_setg_errno(errp, -total_size, "Could not get image size");
goto out;
}
- total_size &= BDRV_SECTOR_MASK;
/* Create the temporary image */
ret = get_tmp_filename(tmp_filename, PATH_MAX + 1);
diff --git a/block/qcow2.c b/block/qcow2.c
index ad93824c6c..964ab93b08 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -1947,7 +1947,6 @@ static int qcow2_write_compressed(BlockDriverState *bs, int64_t sector_num,
/* align end of file to a sector boundary to ease reading with
sector based I/Os */
cluster_offset = bdrv_getlength(bs->file);
- cluster_offset = (cluster_offset + 511) & ~511;
bdrv_truncate(bs->file, cluster_offset);
return 0;
}