From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D1F6AC25B48 for ; Tue, 24 Oct 2023 10:35:27 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qvEkl-0008Iq-Dr; Tue, 24 Oct 2023 06:35:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qvEkc-0008IF-VE for qemu-devel@nongnu.org; Tue, 24 Oct 2023 06:35:07 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qvEkW-0005ie-MH for qemu-devel@nongnu.org; Tue, 24 Oct 2023 06:35:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698143699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=keKlCHU20IhGj4d4oRFimBPmSu1JL6qBA3VyWY6DxYs=; b=RqHs9NX3oDxgGtBD8d9yCdeMO0Z3aq/iejXRH3bIgtQiNhsJmEnclmLf6yLquj7UCEcoSh I5hTX7hLNqOBXS5Rgg58Snun3fJFwzIaRTD1MX89YwhIbBn1iszNxlepjIhjYrxsywgrAk HzAeURRvGhn036/FleFehyhnlSK0ak0= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-665-bUuUOypENN6EeQW709dLmg-1; Tue, 24 Oct 2023 06:34:55 -0400 X-MC-Unique: bUuUOypENN6EeQW709dLmg-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 41B9D3822E89; Tue, 24 Oct 2023 10:34:55 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.193.56]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 20A6E1C060AE; Tue, 24 Oct 2023 10:34:55 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 1526B21E6A1F; Tue, 24 Oct 2023 12:34:54 +0200 (CEST) From: Markus Armbruster To: Thomas Huth Cc: qemu-devel@nongnu.org, Juan Quintela , Peter Xu , Fabiano Rosas , Leonardo Bras Subject: Re: [PATCH v2] migration/ram: Fix compilation with -Wshadow=local References: <20231024092220.55305-1-thuth@redhat.com> Date: Tue, 24 Oct 2023 12:34:54 +0200 In-Reply-To: <20231024092220.55305-1-thuth@redhat.com> (Thomas Huth's message of "Tue, 24 Oct 2023 11:22:20 +0200") Message-ID: <87a5s8s3zl.fsf@pond.sub.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.7 Received-SPF: pass client-ip=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Thomas Huth writes: > 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 > --- > v2: Need the value for the qemu_file_set_error() line, too > > migration/ram.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/migration/ram.c b/migration/ram.c > index 92769902bb..212add4481 100644 > --- a/migration/ram.c > +++ b/migration/ram.c > @@ -3208,6 +3208,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); > } > @@ -3238,9 +3240,9 @@ static int ram_save_complete(QEMUFile *f, void *opaque) > > ram_flush_compressed_data(rs); > > - 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); > } > } Still ugly, but we want a minimally invasive fix now, and this is one. Reviewed-by: Markus Armbruster and queued. Thanks!