diff options
| author | Thomas Huth <thuth@redhat.com> | 2023-10-24 11:22:20 +0200 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2023-10-30 17:44:03 +0100 |
| commit | bc3d41a9f62905629d6da98f68cc15069d2374c6 (patch) | |
| tree | 4478ec69d4c402ed0ddcd76a0f3fd2b9f6bbee03 | |
| parent | 8258f2fa06f71c7a48b95c39c896626564fe3474 (diff) | |
| download | focaccia-qemu-bc3d41a9f62905629d6da98f68cc15069d2374c6.tar.gz focaccia-qemu-bc3d41a9f62905629d6da98f68cc15069d2374c6.zip | |
migration/ram: Fix compilation with -Wshadow=local
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>
| -rw-r--r-- | migration/ram.c | 8 |
1 files 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); } } |