qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
	libvir-list@redhat.com, Stefan Hajnoczi <stefanha@redhat.com>,
	Fam Zheng <fam@euphon.net>, Hanna Reitz <hreitz@redhat.com>,
	Li Zhijian <lizhijian@fujitsu.com>, Peter Xu <peterx@redhat.com>,
	Leonardo Bras <leobras@redhat.com>,
	Juan Quintela <quintela@redhat.com>,
	Eric Blake <eblake@redhat.com>,
	Markus Armbruster <armbru@redhat.com>,
	Hailiang Zhang <zhanghailiang@xfusion.com>,
	qemu-block@nongnu.org, Fabiano Rosas <farosas@suse.de>,
	Thomas Huth <thuth@redhat.com>
Subject: [PULL 18/38] migration/ram: Fix compilation with -Wshadow=local
Date: Tue, 31 Oct 2023 10:01:22 +0100	[thread overview]
Message-ID: <20231031090142.13122-19-quintela@redhat.com> (raw)
In-Reply-To: <20231031090142.13122-1-quintela@redhat.com>

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



  parent reply	other threads:[~2023-10-31  9:09 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-31  9:01 [PULL 00/38] Migration 20231031 patches Juan Quintela
2023-10-31  9:01 ` [PULL 01/38] migration/doc: Add contents Juan Quintela
2023-10-31  9:01 ` [PULL 02/38] migration/doc: Add documentation for backwards compatiblity Juan Quintela
2023-10-31  9:01 ` [PULL 03/38] migration/doc: How to migrate when hosts have different features Juan Quintela
2023-10-31  9:01 ` [PULL 04/38] migration/doc: We broke backwards compatibility Juan Quintela
2023-10-31  9:01 ` [PULL 05/38] migration: Receiving a zero page non zero is an error Juan Quintela
2023-10-31  9:01 ` [PULL 06/38] migration: Rename ram_handle_compressed() to ram_handle_zero() Juan Quintela
2023-10-31  9:01 ` [PULL 07/38] migration: Give one error if trying to set MULTIFD and XBZRLE Juan Quintela
2023-10-31  9:01 ` [PULL 08/38] migration: Give one error if trying to set COMPRESSION " Juan Quintela
2023-10-31  9:01 ` [PULL 09/38] migration: Remove save_page_use_compression() Juan Quintela
2023-10-31  9:01 ` [PULL 10/38] migration: Make compress_data_with_multithreads return bool Juan Quintela
2023-10-31  9:01 ` [PULL 11/38] migration: Simplify compress_page_with_multithread() Juan Quintela
2023-10-31  9:01 ` [PULL 12/38] migration: Move busy++ to migrate_with_multithread Juan Quintela
2023-10-31  9:01 ` [PULL 13/38] migration: Create compress_update_rates() Juan Quintela
2023-10-31  9:01 ` [PULL 14/38] migration: Export send_queued_data() Juan Quintela
2023-10-31  9:01 ` [PULL 15/38] migration: Move ram_flush_compressed_data() to ram-compress.c Juan Quintela
2023-10-31  9:01 ` [PULL 16/38] migration: Merge flush_compressed_data() and compress_flush_data() Juan Quintela
2023-10-31  9:01 ` [PULL 17/38] migration: Rename ram_compressed_pages() to compress_ram_pages() Juan Quintela
2023-10-31  9:01 ` Juan Quintela [this message]
2023-10-31  9:01 ` [PULL 19/38] migration: rename vmstate_save_needed->vmstate_section_needed Juan Quintela
2023-10-31  9:01 ` [PULL 20/38] migration: set file error on subsection loading Juan Quintela
2023-10-31  9:01 ` [PULL 21/38] qemu-iotests: Filter warnings about block migration being deprecated Juan Quintela
2023-10-31  9:01 ` [PULL 22/38] migration: migrate 'inc' command option is deprecated Juan Quintela
2023-10-31  9:01 ` [PULL 23/38] migration: migrate 'blk' " Juan Quintela
2023-10-31  9:01 ` [PULL 24/38] migration: Deprecate block migration Juan Quintela
2023-10-31  9:01 ` [PULL 25/38] migration: Deprecate old compression method Juan Quintela
2023-10-31  9:01 ` [PULL 26/38] migration: Stop migration immediately in RDMA error paths Juan Quintela
2023-10-31  9:01 ` [PULL 27/38] qemu-file: Don't increment qemu_file_transferred at qemu_file_fill_buffer Juan Quintela
2023-10-31  9:01 ` [PULL 28/38] qemu_file: Use a stat64 for qemu_file_transferred Juan Quintela
2023-10-31  9:01 ` [PULL 29/38] qemu_file: total_transferred is not used anymore Juan Quintela
2023-10-31  9:01 ` [PULL 30/38] migration: Use the number of transferred bytes directly Juan Quintela
2023-10-31  9:01 ` [PULL 31/38] qemu_file: Remove unused qemu_file_transferred() Juan Quintela
2023-10-31  9:01 ` [PULL 32/38] qemu-file: Remove _noflush from qemu_file_transferred_noflush() Juan Quintela
2023-10-31  9:01 ` [PULL 33/38] migration: migration_transferred_bytes() don't need the QEMUFile Juan Quintela
2023-10-31  9:01 ` [PULL 34/38] migration: migration_rate_limit_reset() " Juan Quintela
2023-10-31  9:01 ` [PULL 35/38] qemu-file: Simplify qemu_file_get_error() Juan Quintela
2023-10-31  9:01 ` [PULL 36/38] migration: Use migration_transferred_bytes() Juan Quintela
2023-10-31  9:01 ` [PULL 37/38] migration: Remove transferred atomic counter Juan Quintela
2023-10-31  9:01 ` [PULL 38/38] qemu-file: Make qemu_fflush() return errors Juan Quintela
2023-10-31 23:31 ` [PULL 00/38] Migration 20231031 patches Stefan Hajnoczi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231031090142.13122-19-quintela@redhat.com \
    --to=quintela@redhat.com \
    --cc=armbru@redhat.com \
    --cc=eblake@redhat.com \
    --cc=fam@euphon.net \
    --cc=farosas@suse.de \
    --cc=hreitz@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=leobras@redhat.com \
    --cc=libvir-list@redhat.com \
    --cc=lizhijian@fujitsu.com \
    --cc=peterx@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    --cc=thuth@redhat.com \
    --cc=zhanghailiang@xfusion.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).