From nobody Wed Feb 11 05:35:39 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1697531823; cv=none; d=zohomail.com; s=zohoarc; b=IVzORfHo5RQn2DREqe7SfAsuAby/qIzWjAXQi0dSog1IHoF755U3QgLwihQmTvCJjEdldKccVr2ZAB2zeX5pzK+z66ebRBj+EWQUa++OFxm5wKV7AmyYQl39eWKMhcR/bX1mLTxwX7jbTboz8z4Bfi0Tm9entxlUb97p3Ip76oo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1697531823; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=LGzZnFSMqWKxGcuhRASuKFzl/RSCBXuu+XMNIzZxRUI=; b=ZIXP34TktDV7l86E511TFxamyZGqqmBZcorQNpi1sdlit8mvDeK4bNqhyxCNDILD4qIyU3KFNWTUj2AGd89K9d9mejuwcFTE9hHbCjPRvRzcFuILwPL1lanMr0I7pVSVDRgHX9GfDJD/w3xI3h+21P4B8vt5k1Si+vE4P0z/P8I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1697531823803338.0850366855542; Tue, 17 Oct 2023 01:37:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qsfUO-0006b0-JQ; Tue, 17 Oct 2023 04:31:44 -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 1qsfUC-0005xE-Rn for qemu-devel@nongnu.org; Tue, 17 Oct 2023 04:31:33 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qsfU8-0005QH-FE for qemu-devel@nongnu.org; Tue, 17 Oct 2023 04:31:32 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-156-ILCiu4L8P8y9wF-I-9HlhQ-1; Tue, 17 Oct 2023 04:31:20 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CABEB8F15C4; Tue, 17 Oct 2023 08:31:19 +0000 (UTC) Received: from secure.mitica (unknown [10.39.194.127]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3F8E71C060AE; Tue, 17 Oct 2023 08:31:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697531486; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LGzZnFSMqWKxGcuhRASuKFzl/RSCBXuu+XMNIzZxRUI=; b=MEL0ybh00xNDvw7F0D+BynEODu6reFPUd6WONx5cJRsCq/CRyaOpTnfS7R5zOMdIUjGe4g pdAShjKxT7a8QofY1HqTGFwu+eMPSjV8a3aUQE32IKOZHoaQePn7tyui9UOeowWq6I2csR wVClptjmEROw4IHJ5mZNS2oestocnE0= X-MC-Unique: ILCiu4L8P8y9wF-I-9HlhQ-1 From: Juan Quintela To: qemu-devel@nongnu.org Cc: Eric Blake , Thomas Huth , Fabiano Rosas , Leonardo Bras , Vladimir Sementsov-Ogievskiy , Markus Armbruster , Peter Xu , Paolo Bonzini , Fam Zheng , Stefan Hajnoczi , Li Zhijian , John Snow , qemu-block@nongnu.org, Cleber Rosa , Juan Quintela , Laurent Vivier Subject: [PULL 24/38] migration/rdma: Use i as for index instead of idx Date: Tue, 17 Oct 2023 10:29:49 +0200 Message-ID: <20231017083003.15951-25-quintela@redhat.com> In-Reply-To: <20231017083003.15951-1-quintela@redhat.com> References: <20231017083003.15951-1-quintela@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.7 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=quintela@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_H3=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1697531825837100003 Content-Type: text/plain; charset="utf-8" Once there, all the uses are local to the for, so declare the variable inside the for statement. Reviewed-by: Fabiano Rosas Reviewed-by: Li Zhijian Signed-off-by: Juan Quintela Message-ID: <20231011203527.9061-12-quintela@redhat.com> --- migration/rdma.c | 49 ++++++++++++++++++++++-------------------------- 1 file changed, 22 insertions(+), 27 deletions(-) diff --git a/migration/rdma.c b/migration/rdma.c index e973579a52..5f6a771e8e 100644 --- a/migration/rdma.c +++ b/migration/rdma.c @@ -2354,7 +2354,6 @@ static int qemu_rdma_write(RDMAContext *rdma, static void qemu_rdma_cleanup(RDMAContext *rdma) { Error *err =3D NULL; - int idx; =20 if (rdma->cm_id && rdma->connected) { if ((rdma->errored || @@ -2381,12 +2380,12 @@ static void qemu_rdma_cleanup(RDMAContext *rdma) g_free(rdma->dest_blocks); rdma->dest_blocks =3D NULL; =20 - for (idx =3D 0; idx < RDMA_WRID_MAX; idx++) { - if (rdma->wr_data[idx].control_mr) { + for (int i =3D 0; i < RDMA_WRID_MAX; i++) { + if (rdma->wr_data[i].control_mr) { rdma->total_registrations--; - ibv_dereg_mr(rdma->wr_data[idx].control_mr); + ibv_dereg_mr(rdma->wr_data[i].control_mr); } - rdma->wr_data[idx].control_mr =3D NULL; + rdma->wr_data[i].control_mr =3D NULL; } =20 if (rdma->local_ram_blocks.block) { @@ -2452,7 +2451,7 @@ static void qemu_rdma_cleanup(RDMAContext *rdma) =20 static int qemu_rdma_source_init(RDMAContext *rdma, bool pin_all, Error **= errp) { - int ret, idx; + int ret; =20 /* * Will be validated against destination's actual capabilities @@ -2480,18 +2479,17 @@ static int qemu_rdma_source_init(RDMAContext *rdma,= bool pin_all, Error **errp) =20 /* Build the hash that maps from offset to RAMBlock */ rdma->blockmap =3D g_hash_table_new(g_direct_hash, g_direct_equal); - for (idx =3D 0; idx < rdma->local_ram_blocks.nb_blocks; idx++) { + for (int i =3D 0; i < rdma->local_ram_blocks.nb_blocks; i++) { g_hash_table_insert(rdma->blockmap, - (void *)(uintptr_t)rdma->local_ram_blocks.block[idx].offse= t, - &rdma->local_ram_blocks.block[idx]); + (void *)(uintptr_t)rdma->local_ram_blocks.block[i].offset, + &rdma->local_ram_blocks.block[i]); } =20 - for (idx =3D 0; idx < RDMA_WRID_MAX; idx++) { - ret =3D qemu_rdma_reg_control(rdma, idx); + for (int i =3D 0; i < RDMA_WRID_MAX; i++) { + ret =3D qemu_rdma_reg_control(rdma, i); if (ret < 0) { - error_setg(errp, - "RDMA ERROR: rdma migration: error registering %d c= ontrol!", - idx); + error_setg(errp, "RDMA ERROR: rdma migration: error " + "registering %d control!", i); goto err_rdma_source_init; } } @@ -2625,16 +2623,16 @@ err_rdma_source_connect: static int qemu_rdma_dest_init(RDMAContext *rdma, Error **errp) { Error *err =3D NULL; - int ret, idx; + int ret; struct rdma_cm_id *listen_id; char ip[40] =3D "unknown"; struct rdma_addrinfo *res, *e; char port_str[16]; int reuse =3D 1; =20 - for (idx =3D 0; idx < RDMA_WRID_MAX; idx++) { - rdma->wr_data[idx].control_len =3D 0; - rdma->wr_data[idx].control_curr =3D NULL; + for (int i =3D 0; i < RDMA_WRID_MAX; i++) { + rdma->wr_data[i].control_len =3D 0; + rdma->wr_data[i].control_curr =3D NULL; } =20 if (!rdma->host || !rdma->host[0]) { @@ -2723,11 +2721,9 @@ err_dest_init_create_listen_id: static void qemu_rdma_return_path_dest_init(RDMAContext *rdma_return_path, RDMAContext *rdma) { - int idx; - - for (idx =3D 0; idx < RDMA_WRID_MAX; idx++) { - rdma_return_path->wr_data[idx].control_len =3D 0; - rdma_return_path->wr_data[idx].control_curr =3D NULL; + for (int i =3D 0; i < RDMA_WRID_MAX; i++) { + rdma_return_path->wr_data[i].control_len =3D 0; + rdma_return_path->wr_data[i].control_curr =3D NULL; } =20 /*the CM channel and CM id is shared*/ @@ -3376,7 +3372,6 @@ static int qemu_rdma_accept(RDMAContext *rdma) struct rdma_cm_event *cm_event; struct ibv_context *verbs; int ret; - int idx; =20 ret =3D rdma_get_cm_event(rdma->channel, &cm_event); if (ret < 0) { @@ -3462,10 +3457,10 @@ static int qemu_rdma_accept(RDMAContext *rdma) =20 qemu_rdma_init_ram_blocks(rdma); =20 - for (idx =3D 0; idx < RDMA_WRID_MAX; idx++) { - ret =3D qemu_rdma_reg_control(rdma, idx); + for (int i =3D 0; i < RDMA_WRID_MAX; i++) { + ret =3D qemu_rdma_reg_control(rdma, i); if (ret < 0) { - error_report("rdma: error registering %d control", idx); + error_report("rdma: error registering %d control", i); goto err_rdma_dest_wait; } } --=20 2.41.0