diff options
| author | ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-06-05 22:00:45 +0000 |
|---|---|---|
| committer | ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-06-05 22:00:45 +0000 |
| commit | 5452adbee0fb19f2d0662e055e72c4128bcfb976 (patch) | |
| tree | 2da9d85205efb537a8b74e6a7d89813b935a9658 /block-qcow.c | |
| parent | f58c7b354595228e10f023e86b80a7bab527186a (diff) | |
| download | qemu-5452adbee0fb19f2d0662e055e72c4128bcfb976.tar.gz qemu-5452adbee0fb19f2d0662e055e72c4128bcfb976.tar.bz2 qemu-5452adbee0fb19f2d0662e055e72c4128bcfb976.zip | |
Remove dead-code (else-block) from block-qcow.c, by Marc Bevand.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4673 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'block-qcow.c')
| -rw-r--r-- | block-qcow.c | 45 |
1 files changed, 20 insertions, 25 deletions
diff --git a/block-qcow.c b/block-qcow.c index 0ac2b42b4f..1fecf3078b 100644 --- a/block-qcow.c +++ b/block-qcow.c @@ -339,33 +339,28 @@ static uint64_t get_cluster_offset(BlockDriverState *bs, return -1; } else { cluster_offset = bdrv_getlength(s->hd); - if (allocate == 1) { - /* round to cluster size */ - cluster_offset = (cluster_offset + s->cluster_size - 1) & - ~(s->cluster_size - 1); - bdrv_truncate(s->hd, cluster_offset + s->cluster_size); - /* if encrypted, we must initialize the cluster - content which won't be written */ - if (s->crypt_method && - (n_end - n_start) < s->cluster_sectors) { - uint64_t start_sect; - start_sect = (offset & ~(s->cluster_size - 1)) >> 9; - memset(s->cluster_data + 512, 0x00, 512); - for(i = 0; i < s->cluster_sectors; i++) { - if (i < n_start || i >= n_end) { - encrypt_sectors(s, start_sect + i, - s->cluster_data, - s->cluster_data + 512, 1, 1, - &s->aes_encrypt_key); - if (bdrv_pwrite(s->hd, cluster_offset + i * 512, - s->cluster_data, 512) != 512) - return -1; - } + /* round to cluster size */ + cluster_offset = (cluster_offset + s->cluster_size - 1) & + ~(s->cluster_size - 1); + bdrv_truncate(s->hd, cluster_offset + s->cluster_size); + /* if encrypted, we must initialize the cluster + content which won't be written */ + if (s->crypt_method && + (n_end - n_start) < s->cluster_sectors) { + uint64_t start_sect; + start_sect = (offset & ~(s->cluster_size - 1)) >> 9; + memset(s->cluster_data + 512, 0x00, 512); + for(i = 0; i < s->cluster_sectors; i++) { + if (i < n_start || i >= n_end) { + encrypt_sectors(s, start_sect + i, + s->cluster_data, + s->cluster_data + 512, 1, 1, + &s->aes_encrypt_key); + if (bdrv_pwrite(s->hd, cluster_offset + i * 512, + s->cluster_data, 512) != 512) + return -1; } } - } else { - cluster_offset |= QCOW_OFLAG_COMPRESSED | - (uint64_t)compressed_size << (63 - s->cluster_bits); } } /* update L2 table */ |