From nobody Tue Feb 10 04:08:23 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=1655820508; cv=none; d=zohomail.com; s=zohoarc; b=AHQnW5tXzEtl2p2ur2ed0rqvkMY/g3MXymcWzPPNDLH4bcRNBXDOTE6eVKavjttd57kXKshcWxRMRQT+1Mxr+DxvgSIi3canFi0mCSw4I2vF81rW+rVVSu1fmELvo2rcteU/JTZYDiyVCPA0loyorADv94ZQxB+rMoPccjxyEqw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1655820508; 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=5Ws13QdUcyYGFjbw70rrJhmkRqsVUGx4aeK7EIwM+OI=; b=WaWrNCdJcgWX1GnRa1MnUvUtsNI7nFuctuXazkfEzZiFRffm7QkPJwewqm7Sih06+OMer7YPVlrVgAgb3N4QT48YZnjVyL03OUy9NIw5arPuqfYydx8B0aCrDdYbdPrqoqZD7WwDpcAHz9IDvVAOVFj/0hkwivYxQsGNRtGOO+4= 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 165582050849791.42902412517196; Tue, 21 Jun 2022 07:08:28 -0700 (PDT) Received: from localhost ([::1]:52320 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o3eYM-0005Hn-JX for importer@patchew.org; Tue, 21 Jun 2022 10:08:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42452) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o3eVf-0003Ed-61 for qemu-devel@nongnu.org; Tue, 21 Jun 2022 10:05:39 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:36151) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o3eVZ-00007a-0O for qemu-devel@nongnu.org; Tue, 21 Jun 2022 10:05:38 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.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-571-1Q2-BpvaOUG2rxKroddsmg-1; Tue, 21 Jun 2022 10:05:26 -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 280B43C17F14; Tue, 21 Jun 2022 14:05:26 +0000 (UTC) Received: from secure.laptop (unknown [10.39.192.22]) by smtp.corp.redhat.com (Postfix) with ESMTP id 750E42166B26; Tue, 21 Jun 2022 14:05:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1655820332; 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=5Ws13QdUcyYGFjbw70rrJhmkRqsVUGx4aeK7EIwM+OI=; b=HaVB/QXXbNEn6OKZlwMwQj8vtpzLioGa9fAwOAkcFtnBRk4OPUSfnqMfc6CwrjD86gZCAK /slzI8WsIHprRNuN48Ydd3iGjk5b5qvrWGdHE+r6EN7Y2/6l5BNMOMpskcRk0KGdRjlEMQ C2ldKEGR2IkO384ceWXCwrykrqk9Sos= X-MC-Unique: 1Q2-BpvaOUG2rxKroddsmg-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 3/5] migration: Simplify ram_find_and_save_block() Date: Tue, 21 Jun 2022 16:05:05 +0200 Message-Id: <20220621140507.1246-4-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: 1655820509700100001 Content-Type: text/plain; charset="utf-8" We will need later that find_dirty_block() return errors, so simplify the loop. Signed-off-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert --- migration/ram.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index 35816a3a0a..1d4ff3185b 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -2256,7 +2256,6 @@ static int ram_find_and_save_block(RAMState *rs) { PageSearchStatus pss; int pages =3D 0; - bool again, found; =20 /* No dirty page as there is zero RAM */ if (!ram_bytes_total()) { @@ -2272,18 +2271,17 @@ static int ram_find_and_save_block(RAMState *rs) } =20 do { - again =3D true; - found =3D get_queued_page(rs, &pss); - - if (!found) { + if (!get_queued_page(rs, &pss)) { /* priority queue empty, so just search for something dirty */ - found =3D find_dirty_block(rs, &pss, &again); + bool again =3D true; + if (!find_dirty_block(rs, &pss, &again)) { + if (!again) { + break; + } + } } - - if (found) { - pages =3D ram_save_host_page(rs, &pss); - } - } while (!pages && again); + pages =3D ram_save_host_page(rs, &pss); + } while (!pages); =20 rs->last_seen_block =3D pss.block; rs->last_page =3D pss.page; --=20 2.34.1