From nobody Tue Feb 10 04:16:41 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=1655820878; cv=none; d=zohomail.com; s=zohoarc; b=OUQcQ6MkazdqC4xyr2dN+RzffXnBsRnxfSMXjjMOA902Lp+1CvgPoNWk2pRQy5JJG+06x2RNWpbac6Tie3NL2zwC7dpcXk7eGg0OxMh8/KiLkOlapIIuFFEksVJzxKqVhoqVhJvTg7zu1tOqymnYUIPwLEMRGktXR8/gBH+NbqI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1655820878; h=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=J/MUBigceGvRp2LjYKVzNQe71uwZfeB9qhBxJavgDwQ=; b=D+Ip0GoqmUokejVuMJ+CnM5F05DmkC54IFtSrm2KqF6cJaPm3bcm3+xEZXmTJkPARwZZYb3F15XNm3WO7z96+soeI1LYKpKRFh52TiHdJ2Qjs5C7JZWCFuc+3pMtsDsgMjDUM6HzJWR73Mb6n9D/5RgCEZHFFBN344Aq0E0igfk= 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 1655820878322775.5144750201601; Tue, 21 Jun 2022 07:14:38 -0700 (PDT) Received: from localhost ([::1]:34494 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o3eeI-00046r-S3 for importer@patchew.org; Tue, 21 Jun 2022 10:14:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42442) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o3eVd-0003AK-AL for qemu-devel@nongnu.org; Tue, 21 Jun 2022 10:05:37 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:42063) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o3eVb-00007n-My for qemu-devel@nongnu.org; Tue, 21 Jun 2022 10:05:36 -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-159-V-YPGMMUP2OOav77oRoI7g-1; Tue, 21 Jun 2022 10:05:29 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3950D80B70A; Tue, 21 Jun 2022 14:05:29 +0000 (UTC) Received: from secure.laptop (unknown [10.39.192.22]) by smtp.corp.redhat.com (Postfix) with ESMTP id AD5222166B29; Tue, 21 Jun 2022 14:05:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1655820335; 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=J/MUBigceGvRp2LjYKVzNQe71uwZfeB9qhBxJavgDwQ=; b=Qfza+HMlojvBSjCOmYhDJuvTbncm/S63OLnJ7Iwh4oEdPInipUSzlkdEOZjYA/JV/ySTW0 DmHqhxW8CLvJExfILMnigdYQEkAGkQVwXCNpLFiP5k+CmQpEmpjtNtdFXXFtz3wd1uE7+a XIt4bWUOq2g3KxnrKPOoWwygHjR6Iqs= X-MC-Unique: V-YPGMMUP2OOav77oRoI7g-1 From: Juan Quintela To: qemu-devel@nongnu.org Cc: Juan Quintela , Leonardo Bras , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Marcel Apfelbaum , Eduardo Habkost , "Dr. David Alan Gilbert" , Yanan Wang Subject: [PATCH 4/5] migration: Make find_dirty_block() return a single parameter Date: Tue, 21 Jun 2022 16:05:06 +0200 Message-Id: <20220621140507.1246-5-quintela@redhat.com> In-Reply-To: <20220621140507.1246-1-quintela@redhat.com> References: <20220621140507.1246-1-quintela@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 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: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1655820879416100001 Content-Type: text/plain; charset="utf-8" We used to return two bools, just return a single int with the following meaning: old return / again / new return false false 0 false true 1 true true 2 /* We don't care about again at all */ Signed-off-by: Juan Quintela --- migration/ram.c | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index 1d4ff3185b..2c7289edad 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -1481,13 +1481,16 @@ retry: * find_dirty_block: find the next dirty page and update any state * associated with the search process. * - * Returns true if a page is found + * Returns: + * 0: no page found, give up + * 1: no page found, retry + * 2: page found * * @rs: current RAM state * @pss: data about the state of the current dirty page scan * @again: set to false if the search has scanned the whole of RAM */ -static bool find_dirty_block(RAMState *rs, PageSearchStatus *pss, bool *ag= ain) +static int find_dirty_block(RAMState *rs, PageSearchStatus *pss) { /* This is not a postcopy requested page */ pss->postcopy_requested =3D false; @@ -1499,8 +1502,7 @@ static bool find_dirty_block(RAMState *rs, PageSearch= Status *pss, bool *again) * We've been once around the RAM and haven't found anything. * Give up. */ - *again =3D false; - return false; + return 0; } if (!offset_in_ramblock(pss->block, ((ram_addr_t)pss->page) << TARGET_PAGE_BITS)) { @@ -1529,13 +1531,10 @@ static bool find_dirty_block(RAMState *rs, PageSear= chStatus *pss, bool *again) } } /* Didn't find anything this time, but try again on the new block = */ - *again =3D true; - return false; + return 1; } else { - /* Can go around again, but... */ - *again =3D true; - /* We've found something so probably don't need to */ - return true; + /* We've found something */ + return 2; } } =20 @@ -2270,18 +2269,20 @@ static int ram_find_and_save_block(RAMState *rs) pss.block =3D QLIST_FIRST_RCU(&ram_list.blocks); } =20 - do { + while (true){ if (!get_queued_page(rs, &pss)) { /* priority queue empty, so just search for something dirty */ - bool again =3D true; - if (!find_dirty_block(rs, &pss, &again)) { - if (!again) { - break; - } - } + int res =3D find_dirty_block(rs, &pss); + if (res =3D=3D 0) { + break; + } else if (res =3D=3D 1) + continue; } pages =3D ram_save_host_page(rs, &pss); - } while (!pages); + if (pages) { + break; + } + } =20 rs->last_seen_block =3D pss.block; rs->last_page =3D pss.page; --=20 2.34.1