mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove dead-code (else-block) from block-qcow.c, by Marc Bevand.

Browse Source 
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4673 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
ths 2008-06-05 22:00:45 +00:00
parent f58c7b3545
commit 5452adbee0
1 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
block-qcow.c
View File

@ -339,33 +339,28 @@ static uint64_t get_cluster_offset(BlockDriverState *bs,
return -1; return -1;
} else { } else {
cluster_offset = bdrv_getlength(s->hd); cluster_offset = bdrv_getlength(s->hd);
if (allocate == 1) { /* round to cluster size */
/* round to cluster size */ cluster_offset = (cluster_offset + s->cluster_size - 1) &
cluster_offset = (cluster_offset + s->cluster_size - 1) & ~(s->cluster_size - 1);
~(s->cluster_size - 1); bdrv_truncate(s->hd, cluster_offset + s->cluster_size);
bdrv_truncate(s->hd, cluster_offset + s->cluster_size); /* if encrypted, we must initialize the cluster
/* if encrypted, we must initialize the cluster content which won't be written */
content which won't be written */ if (s->crypt_method &&
if (s->crypt_method && (n_end - n_start) < s->cluster_sectors) {
(n_end - n_start) < s->cluster_sectors) { uint64_t start_sect;
uint64_t start_sect; start_sect = (offset & ~(s->cluster_size - 1)) >> 9;
start_sect = (offset & ~(s->cluster_size - 1)) >> 9; memset(s->cluster_data + 512, 0x00, 512);
memset(s->cluster_data + 512, 0x00, 512); for(i = 0; i < s->cluster_sectors; i++) {
for(i = 0; i < s->cluster_sectors; i++) { if (i < n_start || i >= n_end) {
if (i < n_start || i >= n_end) { encrypt_sectors(s, start_sect + i,
encrypt_sectors(s, start_sect + i, s->cluster_data,
s->cluster_data, s->cluster_data + 512, 1, 1,
s->cluster_data + 512, 1, 1, &s->aes_encrypt_key);
&s->aes_encrypt_key); if (bdrv_pwrite(s->hd, cluster_offset + i * 512,
if (bdrv_pwrite(s->hd, cluster_offset + i * 512, s->cluster_data, 512) != 512)
s->cluster_data, 512) != 512) return -1;
return -1;
}
} }
} }
} else {
cluster_offset |= QCOW_OFLAG_COMPRESSED |
(uint64_t)compressed_size << (63 - s->cluster_bits);
} }
} }
/* update L2 table */ /* update L2 table */