[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 18/38] migration/ram: Fix compilation with -Wshadow=local
|
From: |
Juan Quintela |
|
Subject: |
[PULL 18/38] migration/ram: Fix compilation with -Wshadow=local |
|
Date: |
Tue, 31 Oct 2023 10:01:22 +0100 |
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 05/38] migration: Receiving a zero page non zero is an error, (continued)
- [PULL 05/38] migration: Receiving a zero page non zero is an error, Juan Quintela, 2023/10/31
- [PULL 08/38] migration: Give one error if trying to set COMPRESSION and XBZRLE, Juan Quintela, 2023/10/31
- [PULL 10/38] migration: Make compress_data_with_multithreads return bool, Juan Quintela, 2023/10/31
- [PULL 09/38] migration: Remove save_page_use_compression(), Juan Quintela, 2023/10/31
- [PULL 12/38] migration: Move busy++ to migrate_with_multithread, Juan Quintela, 2023/10/31
- [PULL 14/38] migration: Export send_queued_data(), Juan Quintela, 2023/10/31
- [PULL 15/38] migration: Move ram_flush_compressed_data() to ram-compress.c, Juan Quintela, 2023/10/31
- [PULL 16/38] migration: Merge flush_compressed_data() and compress_flush_data(), Juan Quintela, 2023/10/31
- [PULL 11/38] migration: Simplify compress_page_with_multithread(), Juan Quintela, 2023/10/31
- [PULL 17/38] migration: Rename ram_compressed_pages() to compress_ram_pages(), Juan Quintela, 2023/10/31
- [PULL 18/38] migration/ram: Fix compilation with -Wshadow=local,
Juan Quintela <=
- [PULL 13/38] migration: Create compress_update_rates(), Juan Quintela, 2023/10/31
- [PULL 20/38] migration: set file error on subsection loading, Juan Quintela, 2023/10/31
- [PULL 19/38] migration: rename vmstate_save_needed->vmstate_section_needed, Juan Quintela, 2023/10/31
- [PULL 21/38] qemu-iotests: Filter warnings about block migration being deprecated, Juan Quintela, 2023/10/31
- [PULL 23/38] migration: migrate 'blk' command option is deprecated., Juan Quintela, 2023/10/31
- [PULL 26/38] migration: Stop migration immediately in RDMA error paths, Juan Quintela, 2023/10/31
- [PULL 22/38] migration: migrate 'inc' command option is deprecated., Juan Quintela, 2023/10/31
- [PULL 29/38] qemu_file: total_transferred is not used anymore, Juan Quintela, 2023/10/31
- [PULL 24/38] migration: Deprecate block migration, Juan Quintela, 2023/10/31
- [PULL 27/38] qemu-file: Don't increment qemu_file_transferred at qemu_file_fill_buffer, Juan Quintela, 2023/10/31