[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 22/39] migration/ram: Fix compilation with -Wshadow=local
From: |
Juan Quintela |
Subject: |
[PULL 22/39] migration/ram: Fix compilation with -Wshadow=local |
Date: |
Tue, 24 Oct 2023 15:12:48 +0200 |
From: Thomas Huth <thuth@redhat.com>
Rename the variable here to avoid that it shadows a variable from
the beginning of the function scope. With this change the code now
successfully compiles with -Wshadow=local.
Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-ID: <20231024092220.55305-1-thuth@redhat.com>
---
migration/ram.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index 6335564035..024dedb6b1 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -3147,6 +3147,8 @@ static int ram_save_complete(QEMUFile *f, void *opaque)
rs->last_stage = !migration_in_colo_state();
WITH_RCU_READ_LOCK_GUARD() {
+ int rdma_reg_ret;
+
if (!migration_in_postcopy()) {
migration_bitmap_sync_precopy(rs, true);
}
@@ -3177,9 +3179,9 @@ static int ram_save_complete(QEMUFile *f, void *opaque)
compress_flush_data();
- int ret = rdma_registration_stop(f, RAM_CONTROL_FINISH);
- if (ret < 0) {
- qemu_file_set_error(f, ret);
+ rdma_reg_ret = rdma_registration_stop(f, RAM_CONTROL_FINISH);
+ if (rdma_reg_ret < 0) {
+ qemu_file_set_error(f, rdma_reg_ret);
}
}
--
2.41.0
- [PULL 11/39] migration: Simplify compress_page_with_multithread(), (continued)
- [PULL 11/39] migration: Simplify compress_page_with_multithread(), Juan Quintela, 2023/10/24
- [PULL 16/39] migration: Merge flush_compressed_data() and compress_flush_data(), Juan Quintela, 2023/10/24
- [PULL 15/39] migration: Move ram_flush_compressed_data() to ram-compress.c, Juan Quintela, 2023/10/24
- [PULL 19/39] hw/s390x/s390-skeys: Don't call register_savevm_live() during instance_init(), Juan Quintela, 2023/10/24
- [PULL 18/39] hw/ipmi: Don't call vmstate_register() from instance_init() functions, Juan Quintela, 2023/10/24
- [PULL 20/39] hw/s390x/s390-stattrib: Simplify handling of the "migration-enabled" property, Juan Quintela, 2023/10/24
- [PULL 23/39] migration: rename vmstate_save_needed->vmstate_section_needed, Juan Quintela, 2023/10/24
- [PULL 21/39] hw/s390x/s390-stattrib: Don't call register_savevm_live() during instance_init(), Juan Quintela, 2023/10/24
- [PULL 22/39] migration/ram: Fix compilation with -Wshadow=local,
Juan Quintela <=
- [PULL 25/39] migration: Create vmstate_register_any(), Juan Quintela, 2023/10/24
- [PULL 17/39] migration: Rename ram_compressed_pages() to compress_ram_pages(), Juan Quintela, 2023/10/24
- [PULL 24/39] migration: set file error on subsection loading, Juan Quintela, 2023/10/24
- [PULL 07/39] migration: Give one error if trying to set MULTIFD and XBZRLE, Juan Quintela, 2023/10/24
- [PULL 29/39] migration: Hack to maintain backwards compatibility for ppc, Juan Quintela, 2023/10/24
- [PULL 27/39] migration: Use vmstate_register_any() for isa-ide, Juan Quintela, 2023/10/24
- [PULL 31/39] migration: Improve example and documentation of vmstate_register(), Juan Quintela, 2023/10/24
- [PULL 35/39] qemu-iotests: Filter warnings about block migration being deprecated, Juan Quintela, 2023/10/24
- [PULL 28/39] migration: Use VMSTATE_INSTANCE_ID_ANY for slirp, Juan Quintela, 2023/10/24
- [PULL 33/39] migration: Use vmstate_register_any() for eeprom93xx, Juan Quintela, 2023/10/24