From nobody Fri Oct 18 04:35:01 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=1695048327; cv=none; d=zohomail.com; s=zohoarc; b=LNW2usBMml6jDuJfJMQNmChcmFqpQJqIq3sG2wo/RQxtHp2OYrwWE/3MaGjkdMS6GENqnfUk8OlyDA6nHcRNHlwKNrUjRvciSPWVmXoo9vbzKFqhY4gyTGixh+wVj3MDDJKgdKdAvbSd+gI/QLIsFSvlfZRvkS7fWLDaFY+fkzg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695048327; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=aJm19gRF1BeP3FlRLLg1oF19qpeBGox3CvwduF1S/+Y=; b=NwMwoUnkTImAONOGLLabN2cDQbXAnIoYNpumorQMlxjSGi98dYRbKD9xtgX7fzH7QP0zkCzUQFit1i18WCzbJWB69GNUAdsufgnzHYNcxi0mi3O+NQFOEDnQpk0UvqUhgmej62Lk1Vrmy9IVoGJ38uQv8Z0GcOhjMlm8sy+s9Rc= 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 1695048327357358.18876730459033; Mon, 18 Sep 2023 07:45:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiFSw-0003D6-Ng; Mon, 18 Sep 2023 10:43:10 -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 1qiFSK-0002x0-PB for qemu-devel@nongnu.org; Mon, 18 Sep 2023 10:42: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 1qiFS2-0002aG-NR for qemu-devel@nongnu.org; Mon, 18 Sep 2023 10:42:32 -0400 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-483-mQAznEE5NaWBQaqkQt9F7A-1; Mon, 18 Sep 2023 10:42:09 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (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 4984429AA2C9 for ; Mon, 18 Sep 2023 14:42:09 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.127]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 27D8F10F1BE7 for ; Mon, 18 Sep 2023 14:42:09 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 0EB5721E6914; Mon, 18 Sep 2023 16:42:07 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695048131; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aJm19gRF1BeP3FlRLLg1oF19qpeBGox3CvwduF1S/+Y=; b=IuofjNPO26VeXvCxE5onIBZ8ghTzzBsVrqA/Pn2+E+7FHKg8o2rQGDZ88JJyl9v1cDm/nx AbzwrFn/217jiDUYS5C40u8Ijg8tRRJY0xvACaEapzXX/a7ehz5J1chFh/xPbZ4eFDAFbh tSJisc+clgqvwhcmAfyrFmCYXtKCvZk= X-MC-Unique: mQAznEE5NaWBQaqkQt9F7A-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: quintela@redhat.com, peterx@redhat.com, leobras@redhat.com Subject: [PATCH 13/52] migration/rdma: Make qemu_rdma_buffer_mergable() return bool Date: Mon, 18 Sep 2023 16:41:27 +0200 Message-ID: <20230918144206.560120-14-armbru@redhat.com> In-Reply-To: <20230918144206.560120-1-armbru@redhat.com> References: <20230918144206.560120-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1695048328426100011 Content-Type: text/plain; charset="utf-8" qemu_rdma_buffer_mergable() is semantically a predicate. It returns int 0 or 1. Return bool instead. Signed-off-by: Markus Armbruster Reviewed-by: Fabiano Rosas Reviewed-by: Li Zhijian --- migration/rdma.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/migration/rdma.c b/migration/rdma.c index 98520a42b4..97715dbd78 100644 --- a/migration/rdma.c +++ b/migration/rdma.c @@ -2246,7 +2246,7 @@ static int qemu_rdma_write_flush(QEMUFile *f, RDMACon= text *rdma) return 0; } =20 -static inline int qemu_rdma_buffer_mergable(RDMAContext *rdma, +static inline bool qemu_rdma_buffer_mergable(RDMAContext *rdma, uint64_t offset, uint64_t len) { RDMALocalBlock *block; @@ -2254,11 +2254,11 @@ static inline int qemu_rdma_buffer_mergable(RDMACon= text *rdma, uint8_t *chunk_end; =20 if (rdma->current_index < 0) { - return 0; + return false; } =20 if (rdma->current_chunk < 0) { - return 0; + return false; } =20 block =3D &(rdma->local_ram_blocks.block[rdma->current_index]); @@ -2266,29 +2266,29 @@ static inline int qemu_rdma_buffer_mergable(RDMACon= text *rdma, chunk_end =3D ram_chunk_end(block, rdma->current_chunk); =20 if (rdma->current_length =3D=3D 0) { - return 0; + return false; } =20 /* * Only merge into chunk sequentially. */ if (offset !=3D (rdma->current_addr + rdma->current_length)) { - return 0; + return false; } =20 if (offset < block->offset) { - return 0; + return false; } =20 if ((offset + len) > (block->offset + block->length)) { - return 0; + return false; } =20 if ((host_addr + len) > chunk_end) { - return 0; + return false; } =20 - return 1; + return true; } =20 /* --=20 2.41.0