motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-19 08:02:15 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

block/dirty-bitmap: Clean up local variable shadowing

Browse source 
Local variables shadowing other local variables or parameters make the
code needlessly hard to understand.  Tracked down with -Wshadow=local.
Clean up: rename both the pair of parameters and the pair of local
variables.  While there, move the local variables to function scope.

Suggested-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Message-ID: <20230921121312.1301864-5-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2023-09-21 14:13:09 +02:00
parent e33e66b1b3
commit 6a0f7ff7dd
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

19
block/monitor/bitmap-qmp-cmds.c
View file

@ -258,37 +258,38 @@ void qmp_block_dirty_bitmap_disable(const char *node, const char *name,
bdrv_disable_dirty_bitmap(bitmap); bdrv_disable_dirty_bitmap(bitmap);
} }
BdrvDirtyBitmap *block_dirty_bitmap_merge(const char *node, const char *target, BdrvDirtyBitmap *block_dirty_bitmap_merge(const char *dst_node,
const char *dst_bitmap,
BlockDirtyBitmapOrStrList *bms, BlockDirtyBitmapOrStrList *bms,
HBitmap **backup, Error **errp) HBitmap **backup, Error **errp)
{ {
BlockDriverState *bs; BlockDriverState *bs;
BdrvDirtyBitmap *dst, *src; BdrvDirtyBitmap *dst, *src;
BlockDirtyBitmapOrStrList *lst; BlockDirtyBitmapOrStrList *lst;
const char *src_node, *src_bitmap;
HBitmap *local_backup = NULL; HBitmap *local_backup = NULL;
GLOBAL_STATE_CODE(); GLOBAL_STATE_CODE();
dst = block_dirty_bitmap_lookup(node, target, &bs, errp); dst = block_dirty_bitmap_lookup(dst_node, dst_bitmap, &bs, errp);
if (!dst) { if (!dst) {
return NULL; return NULL;
} }
for (lst = bms; lst; lst = lst->next) { for (lst = bms; lst; lst = lst->next) {
switch (lst->value->type) { switch (lst->value->type) {
const char *name, *node;
case QTYPE_QSTRING: case QTYPE_QSTRING:
name = lst->value->u.local; src_bitmap = lst->value->u.local;
src = bdrv_find_dirty_bitmap(bs, name); src = bdrv_find_dirty_bitmap(bs, src_bitmap);
if (!src) { if (!src) {
error_setg(errp, "Dirty bitmap '%s' not found", name); error_setg(errp, "Dirty bitmap '%s' not found", src_bitmap);
goto fail; goto fail;
} }
break; break;
case QTYPE_QDICT: case QTYPE_QDICT:
node = lst->value->u.external.node; src_node = lst->value->u.external.node;
name = lst->value->u.external.name; src_bitmap = lst->value->u.external.name;
src = block_dirty_bitmap_lookup(node, name, NULL, errp); src = block_dirty_bitmap_lookup(src_node, src_bitmap, NULL, errp);
if (!src) { if (!src) {
goto fail; goto fail;
} }

3
block/qcow2-bitmap.c
View file

@ -1555,7 +1555,6 @@ bool qcow2_store_persistent_dirty_bitmaps(BlockDriverState *bs,
FOR_EACH_DIRTY_BITMAP(bs, bitmap) { FOR_EACH_DIRTY_BITMAP(bs, bitmap) {
const char *name = bdrv_dirty_bitmap_name(bitmap); const char *name = bdrv_dirty_bitmap_name(bitmap);
uint32_t granularity = bdrv_dirty_bitmap_granularity(bitmap); uint32_t granularity = bdrv_dirty_bitmap_granularity(bitmap);
Qcow2Bitmap *bm;
if (!bdrv_dirty_bitmap_get_persistence(bitmap) || if (!bdrv_dirty_bitmap_get_persistence(bitmap) ||
bdrv_dirty_bitmap_inconsistent(bitmap)) { bdrv_dirty_bitmap_inconsistent(bitmap)) {
@ -1625,7 +1624,7 @@ bool qcow2_store_persistent_dirty_bitmaps(BlockDriverState *bs,
/* allocate clusters and store bitmaps */ /* allocate clusters and store bitmaps */
QSIMPLEQ_FOREACH(bm, bm_list, entry) { QSIMPLEQ_FOREACH(bm, bm_list, entry) {
BdrvDirtyBitmap *bitmap = bm->dirty_bitmap; bitmap = bm->dirty_bitmap;
if (bitmap == NULL || bdrv_dirty_bitmap_readonly(bitmap)) { if (bitmap == NULL || bdrv_dirty_bitmap_readonly(bitmap)) {
continue; continue;