diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-04-22 08:08:22 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-04-22 08:08:22 -0500 |
| commit | f1ab7a5acf08dcc11638b22660ed87d5f6d633c2 (patch) | |
| tree | 4feebf5c7cb407a13225d4c3cf1870914140a719 /qemu-img.c | |
| parent | 25690739f1f067b6d8b2e616d87b1d976db0db92 (diff) | |
| parent | 7da94ca741e01a80afd65e107cc2cee160d1b2d2 (diff) | |
| download | qemu-f1ab7a5acf08dcc11638b22660ed87d5f6d633c2.tar.gz qemu-f1ab7a5acf08dcc11638b22660ed87d5f6d633c2.tar.bz2 qemu-f1ab7a5acf08dcc11638b22660ed87d5f6d633c2.zip | |
Merge remote-tracking branch 'kwolf/for-anthony' into staging
# By Kevin Wolf (16) and Stefan Hajnoczi (4)
# Via Kevin Wolf
* kwolf/for-anthony:
qemu-iotests: add 053 unaligned compressed image size test
block: Allow overriding backing.file.filename
block: Remove filename parameter from .bdrv_file_open()
vvfat: Use bdrv_open options instead of filename
sheepdog: Use bdrv_open options instead of filename
rbd: Use bdrv_open options instead of filename
iscsi: Use bdrv_open options instead of filename
gluster: Use bdrv_open options instead of filename
curl: Use bdrv_open options instead of filename
blkverify: Use bdrv_open options instead of filename
blkdebug: Use bdrv_open options instead of filename
raw-win32: Use bdrv_open options instead of filename
raw-posix: Use bdrv_open options instead of filename
block: Enable filename option
block: Add driver-specific options for backing files
block: Fail gracefully when using a format driver on protocol level
qemu-iotests: Fix _filter_qemu
qemu-img: do not zero-pad the compressed write buffer
qcow: allow sub-cluster compressed write to last cluster
qcow2: allow sub-cluster compressed write to last cluster
Message-id: 1366630294-18984-1-git-send-email-kwolf@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'qemu-img.c')
| -rw-r--r-- | qemu-img.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/qemu-img.c b/qemu-img.c index 31627b0da8..cd096a1361 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -1425,12 +1425,8 @@ static int img_convert(int argc, char **argv) } assert (remainder == 0); - if (n < cluster_sectors) { - memset(buf + n * 512, 0, cluster_size - n * 512); - } - if (!buffer_is_zero(buf, cluster_size)) { - ret = bdrv_write_compressed(out_bs, sector_num, buf, - cluster_sectors); + if (!buffer_is_zero(buf, n * BDRV_SECTOR_SIZE)) { + ret = bdrv_write_compressed(out_bs, sector_num, buf, n); if (ret != 0) { error_report("error while compressing sector %" PRId64 ": %s", sector_num, strerror(-ret)); |