From nobody Sat Sep 21 02:48:26 2024 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=1697450926; cv=none; d=zohomail.com; s=zohoarc; b=Fv+f0f3CMFJS5HDnGlcJqverr9OaFQs+a3oIu3ATceQay4910urfM0+iewa+iaazusCOaRJcVWemXKsphFdNooxYmHwPl9nsLBmaScKwt+Nfu0KlzV37uUTMR8u5TQbEaK2kURncG1zu8zKm5W9z1bnrANHXo39K/mKYrlIT/aI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1697450926; 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=R6jP234wOOahYCUj8obZfp4QGV0YMNFnIyNVzn5qn0c=; b=YhWeimvMMPT3X0eb/jEdVmq1KlEkIoK0Pl7rWGwUsmlrFu6GQbGEWuRTEUMA5oMggCbKWimgw87WFIOebeN1mWjbYObufc9owdd9DHa+u023CrO9yI9+KSWTdKqdAgKyVWE1lzP9fHftYqDG/eYClOil7kydh9mKEwv3NvJ8EFQ= 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 1697450926640791.2484858605245; Mon, 16 Oct 2023 03:08:46 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qsKWc-0002zM-Qo; Mon, 16 Oct 2023 06:08:38 -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 1qsKWW-0002Sg-MU for qemu-devel@nongnu.org; Mon, 16 Oct 2023 06:08:34 -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 1qsKWT-0007e4-SD for qemu-devel@nongnu.org; Mon, 16 Oct 2023 06:08: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-629-Br81yiciOtqg3zmwpmnOXA-1; Mon, 16 Oct 2023 06:08:26 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (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 A1C851029F43; Mon, 16 Oct 2023 10:08:25 +0000 (UTC) Received: from secure.mitica (unknown [10.39.194.127]) by smtp.corp.redhat.com (Postfix) with ESMTP id 17C7163F21; Mon, 16 Oct 2023 10:08:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697450909; 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=R6jP234wOOahYCUj8obZfp4QGV0YMNFnIyNVzn5qn0c=; b=bUB7sTGJV+35SUv4M00W/XSLuUYqTZ0S66327+Z5lngIzkXRLGe8UhNy3pbvHsuqJuvp7d 9hRM0U76VOq0qdet3DhPrpxyEp9GEz609AmNlzNp5ICfK4ZjDu3L5mOzDoAlVS11PW6Hd5 KalzMOppTFD5TMFOZEl4nAo3tuQ+v/g= X-MC-Unique: Br81yiciOtqg3zmwpmnOXA-1 From: Juan Quintela To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Paolo Bonzini , Vladimir Sementsov-Ogievskiy , Fam Zheng , Cleber Rosa , Eric Blake , Li Zhijian , Peter Xu , Markus Armbruster , John Snow , Stefan Hajnoczi , Juan Quintela , Leonardo Bras , Laurent Vivier , Fabiano Rosas , Thomas Huth Subject: [PULL 25/38] migration/rdma: Declare for index variables local Date: Mon, 16 Oct 2023 12:06:53 +0200 Message-ID: <20231016100706.2551-26-quintela@redhat.com> In-Reply-To: <20231016100706.2551-1-quintela@redhat.com> References: <20231016100706.2551-1-quintela@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 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.129.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_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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1697450926987100001 Content-Type: text/plain; charset="utf-8" Declare all variables that are only used inside a for loop inside the for statement. This makes clear that they are not used outside of the for loop. Reviewed-by: Fabiano Rosas Reviewed-by: Li Zhijian Signed-off-by: Juan Quintela Message-ID: <20231011203527.9061-13-quintela@redhat.com> --- migration/rdma.c | 44 ++++++++++++++++++-------------------------- 1 file changed, 18 insertions(+), 26 deletions(-) diff --git a/migration/rdma.c b/migration/rdma.c index 5f6a771e8e..09015fbd1a 100644 --- a/migration/rdma.c +++ b/migration/rdma.c @@ -559,10 +559,8 @@ static void rdma_add_block(RDMAContext *rdma, const ch= ar *block_name, local->block =3D g_new0(RDMALocalBlock, local->nb_blocks + 1); =20 if (local->nb_blocks) { - int x; - if (rdma->blockmap) { - for (x =3D 0; x < local->nb_blocks; x++) { + for (int x =3D 0; x < local->nb_blocks; x++) { g_hash_table_remove(rdma->blockmap, (void *)(uintptr_t)old[x].offset); g_hash_table_insert(rdma->blockmap, @@ -649,15 +647,12 @@ static void rdma_delete_block(RDMAContext *rdma, RDMA= LocalBlock *block) { RDMALocalBlocks *local =3D &rdma->local_ram_blocks; RDMALocalBlock *old =3D local->block; - int x; =20 if (rdma->blockmap) { g_hash_table_remove(rdma->blockmap, (void *)(uintptr_t)block->offs= et); } if (block->pmr) { - int j; - - for (j =3D 0; j < block->nb_chunks; j++) { + for (int j =3D 0; j < block->nb_chunks; j++) { if (!block->pmr[j]) { continue; } @@ -687,7 +682,7 @@ static void rdma_delete_block(RDMAContext *rdma, RDMALo= calBlock *block) block->block_name =3D NULL; =20 if (rdma->blockmap) { - for (x =3D 0; x < local->nb_blocks; x++) { + for (int x =3D 0; x < local->nb_blocks; x++) { g_hash_table_remove(rdma->blockmap, (void *)(uintptr_t)old[x].offset); } @@ -705,7 +700,7 @@ static void rdma_delete_block(RDMAContext *rdma, RDMALo= calBlock *block) memcpy(local->block + block->index, old + (block->index + 1), sizeof(RDMALocalBlock) * (local->nb_blocks - (block->index + 1))); - for (x =3D block->index; x < local->nb_blocks - 1; x++) { + for (int x =3D block->index; x < local->nb_blocks - 1; x++) { local->block[x].index--; } } @@ -725,7 +720,7 @@ static void rdma_delete_block(RDMAContext *rdma, RDMALo= calBlock *block) local->nb_blocks--; =20 if (local->nb_blocks && rdma->blockmap) { - for (x =3D 0; x < local->nb_blocks; x++) { + for (int x =3D 0; x < local->nb_blocks; x++) { g_hash_table_insert(rdma->blockmap, (void *)(uintptr_t)local->block[x].offset, &local->block[x]); @@ -828,12 +823,12 @@ static int qemu_rdma_broken_ipv6_kernel(struct ibv_co= ntext *verbs, Error **errp) * Otherwise, there are no guarantees until the bug is fixed in linux. */ if (!verbs) { - int num_devices, x; + int num_devices; struct ibv_device **dev_list =3D ibv_get_device_list(&num_devices); bool roce_found =3D false; bool ib_found =3D false; =20 - for (x =3D 0; x < num_devices; x++) { + for (int x =3D 0; x < num_devices; x++) { verbs =3D ibv_open_device(dev_list[x]); /* * ibv_open_device() is not documented to set errno. If @@ -925,7 +920,6 @@ static int qemu_rdma_resolve_host(RDMAContext *rdma, Er= ror **errp) char port_str[16]; struct rdma_cm_event *cm_event; char ip[40] =3D "unknown"; - struct rdma_addrinfo *e; =20 if (rdma->host =3D=3D NULL || !strcmp(rdma->host, "")) { error_setg(errp, "RDMA ERROR: RDMA hostname has not been set"); @@ -957,7 +951,7 @@ static int qemu_rdma_resolve_host(RDMAContext *rdma, Er= ror **errp) } =20 /* Try all addresses, saving the first error in @err */ - for (e =3D res; e !=3D NULL; e =3D e->ai_next) { + for (struct rdma_addrinfo *e =3D res; e !=3D NULL; e =3D e->ai_next) { Error **local_errp =3D err ? NULL : &err; =20 inet_ntop(e->ai_family, @@ -2777,7 +2771,7 @@ static ssize_t qio_channel_rdma_writev(QIOChannel *io= c, RDMAContext *rdma; int ret; ssize_t done =3D 0; - size_t i, len; + size_t len; =20 RCU_READ_LOCK_GUARD(); rdma =3D qatomic_rcu_read(&rioc->rdmaout); @@ -2803,7 +2797,7 @@ static ssize_t qio_channel_rdma_writev(QIOChannel *io= c, return -1; } =20 - for (i =3D 0; i < niov; i++) { + for (int i =3D 0; i < niov; i++) { size_t remaining =3D iov[i].iov_len; uint8_t * data =3D (void *)iov[i].iov_base; while (remaining) { @@ -2866,7 +2860,7 @@ static ssize_t qio_channel_rdma_readv(QIOChannel *ioc, RDMAControlHeader head; int ret; ssize_t done =3D 0; - size_t i, len; + size_t len; =20 RCU_READ_LOCK_GUARD(); rdma =3D qatomic_rcu_read(&rioc->rdmain); @@ -2882,7 +2876,7 @@ static ssize_t qio_channel_rdma_readv(QIOChannel *ioc, return -1; } =20 - for (i =3D 0; i < niov; i++) { + for (int i =3D 0; i < niov; i++) { size_t want =3D iov[i].iov_len; uint8_t *data =3D (void *)iov[i].iov_base; =20 @@ -3556,8 +3550,6 @@ int rdma_registration_handle(QEMUFile *f) void *host_addr; int ret; int idx =3D 0; - int count =3D 0; - int i =3D 0; =20 if (!migrate_rdma()) { return 0; @@ -3628,7 +3620,7 @@ int rdma_registration_handle(QEMUFile *f) qsort(rdma->local_ram_blocks.block, rdma->local_ram_blocks.nb_blocks, sizeof(RDMALocalBlock), dest_ram_sort_func); - for (i =3D 0; i < local->nb_blocks; i++) { + for (int i =3D 0; i < local->nb_blocks; i++) { local->block[i].index =3D i; } =20 @@ -3646,7 +3638,7 @@ int rdma_registration_handle(QEMUFile *f) * Both sides use the "remote" structure to communicate and up= date * their "local" descriptions with what was sent. */ - for (i =3D 0; i < local->nb_blocks; i++) { + for (int i =3D 0; i < local->nb_blocks; i++) { rdma->dest_blocks[i].remote_host_addr =3D (uintptr_t)(local->block[i].local_host_addr); =20 @@ -3686,7 +3678,7 @@ int rdma_registration_handle(QEMUFile *f) reg_resp.repeat =3D head.repeat; registers =3D (RDMARegister *) rdma->wr_data[idx].control_curr; =20 - for (count =3D 0; count < head.repeat; count++) { + for (int count =3D 0; count < head.repeat; count++) { uint64_t chunk; uint8_t *chunk_start, *chunk_end; =20 @@ -3761,7 +3753,7 @@ int rdma_registration_handle(QEMUFile *f) unreg_resp.repeat =3D head.repeat; registers =3D (RDMARegister *) rdma->wr_data[idx].control_curr; =20 - for (count =3D 0; count < head.repeat; count++) { + for (int count =3D 0; count < head.repeat; count++) { reg =3D ®isters[count]; network_to_register(reg); =20 @@ -3909,7 +3901,7 @@ int rdma_registration_stop(QEMUFile *f, uint64_t flag= s) if (flags =3D=3D RAM_CONTROL_SETUP) { RDMAControlHeader resp =3D {.type =3D RDMA_CONTROL_RAM_BLOCKS_RESU= LT }; RDMALocalBlocks *local =3D &rdma->local_ram_blocks; - int reg_result_idx, i, nb_dest_blocks; + int reg_result_idx, nb_dest_blocks; =20 head.type =3D RDMA_CONTROL_RAM_BLOCKS_REQUEST; trace_rdma_registration_stop_ram(); @@ -3957,7 +3949,7 @@ int rdma_registration_stop(QEMUFile *f, uint64_t flag= s) qemu_rdma_move_header(rdma, reg_result_idx, &resp); memcpy(rdma->dest_blocks, rdma->wr_data[reg_result_idx].control_curr, resp.len); - for (i =3D 0; i < nb_dest_blocks; i++) { + for (int i =3D 0; i < nb_dest_blocks; i++) { network_to_dest_block(&rdma->dest_blocks[i]); =20 /* We require that the blocks are in the same order */ --=20 2.41.0