block/vdi: Clean up local variable shadowing
Local variables shadowing other local variables or parameters make the code needlessly hard to understand. Tracked down with -Wshadow=local. Clean up: delete inner declarations when they are actually redundant, else rename variables. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Reviewed-by: Kevin Wolf <kwolf@redhat.com> Message-ID: <20230921121312.1301864-6-armbru@redhat.com>
This commit is contained in:
parent
6a0f7ff7dd
commit
d25b99c72b
|
@ -634,7 +634,6 @@ vdi_co_pwritev(BlockDriverState *bs, int64_t offset, int64_t bytes,
|
|||
bmap_entry = le32_to_cpu(s->bmap[block_index]);
|
||||
if (!VDI_IS_ALLOCATED(bmap_entry)) {
|
||||
/* Allocate new block and write to it. */
|
||||
uint64_t data_offset;
|
||||
qemu_co_rwlock_upgrade(&s->bmap_lock);
|
||||
bmap_entry = le32_to_cpu(s->bmap[block_index]);
|
||||
if (VDI_IS_ALLOCATED(bmap_entry)) {
|
||||
|
@ -700,7 +699,7 @@ nonallocating_write:
|
|||
/* One or more new blocks were allocated. */
|
||||
VdiHeader *header;
|
||||
uint8_t *base;
|
||||
uint64_t offset;
|
||||
uint64_t bmap_offset;
|
||||
uint32_t n_sectors;
|
||||
|
||||
g_free(block);
|
||||
|
@ -723,11 +722,11 @@ nonallocating_write:
|
|||
bmap_first /= (SECTOR_SIZE / sizeof(uint32_t));
|
||||
bmap_last /= (SECTOR_SIZE / sizeof(uint32_t));
|
||||
n_sectors = bmap_last - bmap_first + 1;
|
||||
offset = s->bmap_sector + bmap_first;
|
||||
bmap_offset = s->bmap_sector + bmap_first;
|
||||
base = ((uint8_t *)&s->bmap[0]) + bmap_first * SECTOR_SIZE;
|
||||
logout("will write %u block map sectors starting from entry %u\n",
|
||||
n_sectors, bmap_first);
|
||||
ret = bdrv_co_pwrite(bs->file, offset * SECTOR_SIZE,
|
||||
ret = bdrv_co_pwrite(bs->file, bmap_offset * SECTOR_SIZE,
|
||||
n_sectors * SECTOR_SIZE, base, 0);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue