ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

migration: 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: Peter Xu <peterx@redhat.com>
Reviewed-by: Li Zhijian <lizhijian@fujitsu.com>
Message-ID: <20230921121312.1301864-3-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2023-09-21 14:13:07 +02:00
parent bbde656263
commit 7f3de3f02f
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
migration/block.c
View File

@ -440,8 +440,8 @@ static int init_blk_migration(QEMUFile *f)
/* Can only insert new BDSes now because doing so while iterating block /* Can only insert new BDSes now because doing so while iterating block
* devices may end up in a deadlock (iterating the new BDSes, too). */ * devices may end up in a deadlock (iterating the new BDSes, too). */
for (i = 0; i < num_bs; i++) { for (i = 0; i < num_bs; i++) {
BlkMigDevState *bmds = bmds_bs[i].bmds; bmds = bmds_bs[i].bmds;
BlockDriverState *bs = bmds_bs[i].bs; bs = bmds_bs[i].bs;
if (bmds) { if (bmds) {
ret = blk_insert_bs(bmds->blk, bs, &local_err); ret = blk_insert_bs(bmds->blk, bs, &local_err);

8
migration/ram.c
View File

@ -3517,8 +3517,6 @@ int colo_init_ram_cache(void)
* we use the same name 'ram_bitmap' as for migration. * we use the same name 'ram_bitmap' as for migration.
*/ */
if (ram_bytes_total()) { if (ram_bytes_total()) {
RAMBlock *block;
RAMBLOCK_FOREACH_NOT_IGNORED(block) { RAMBLOCK_FOREACH_NOT_IGNORED(block) {
unsigned long pages = block->max_length >> TARGET_PAGE_BITS; unsigned long pages = block->max_length >> TARGET_PAGE_BITS;
block->bmap = bitmap_new(pages); block->bmap = bitmap_new(pages);
@ -3998,12 +3996,12 @@ static int ram_load_precopy(QEMUFile *f)
} }
} }
if (migrate_ignore_shared()) { if (migrate_ignore_shared()) {
hwaddr addr = qemu_get_be64(f); hwaddr addr2 = qemu_get_be64(f);
if (migrate_ram_is_ignored(block) && if (migrate_ram_is_ignored(block) &&
block->mr->addr != addr) { block->mr->addr != addr2) {
error_report("Mismatched GPAs for block %s " error_report("Mismatched GPAs for block %s "
"%" PRId64 "!= %" PRId64, "%" PRId64 "!= %" PRId64,
id, (uint64_t)addr, id, (uint64_t)addr2,
(uint64_t)block->mr->addr); (uint64_t)block->mr->addr);
ret = -EINVAL; ret = -EINVAL;
} }

8
migration/rdma.c
View File

@ -1902,9 +1902,11 @@ static int qemu_rdma_exchange_send(RDMAContext *rdma, RDMAControlHeader *head,
* by waiting for a READY message. * by waiting for a READY message.
*/ */
if (rdma->control_ready_expected) { if (rdma->control_ready_expected) {
RDMAControlHeader resp; RDMAControlHeader resp_ignored;
ret = qemu_rdma_exchange_get_response(rdma,
&resp, RDMA_CONTROL_READY, RDMA_WRID_READY); ret = qemu_rdma_exchange_get_response(rdma, &resp_ignored,
RDMA_CONTROL_READY,
RDMA_WRID_READY);
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} }

2
migration/vmstate.c
View File

@ -97,7 +97,7 @@ int vmstate_load_state(QEMUFile *f, const VMStateDescription *vmsd,
return -EINVAL; return -EINVAL;
} }
if (vmsd->pre_load) { if (vmsd->pre_load) {
int ret = vmsd->pre_load(opaque); ret = vmsd->pre_load(opaque);
if (ret) { if (ret) {
return ret; return ret;
} }