From nobody Thu Nov 13 21:50:39 2025 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1582732726; cv=none; d=zohomail.com; s=zohoarc; b=Pfit2rqW1gKCRsIPkil/8wEEhtCOOY6NecphWDTTUZzGbSpXNwalEnBI+E4Gs+CVq0n56ldBtZmtBtIY/Jr2V2rR3HqsHyyZ28CH5NSEQRTSr3hDfs4jUyliZpnjcjVp7LSpymJHM5pVwZEDP6QBLcX9Ny3uAPqyL3Bmof8THes= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582732726; 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=ud93Vcxnd+Xp4+9u4iMrukyPfYJtI2St2nU+UuD+Msw=; b=jMpg7fa7R42gZItD0oOP4aaF44aIZn/cBPGm9YxySqRdkV9KJpU4YEG+JyClp7V9ipl2Wch56GuiLfdL+A2r/WLvRn+93NASD54Bvo8o7rmCoME0qZMo+iSVsYf7TQM1sq9+lkCodqwkL3VJDz5BiXUi2sSobARaaMXzNuA7kA4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1582732726880485.67942073479253; Wed, 26 Feb 2020 07:58:46 -0800 (PST) Received: from localhost ([::1]:46270 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6z5B-0002U8-Kh for importer@patchew.org; Wed, 26 Feb 2020 10:58:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34107) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6z0d-0003GM-Ka for qemu-devel@nongnu.org; Wed, 26 Feb 2020 10:54:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6z0c-00034k-B2 for qemu-devel@nongnu.org; Wed, 26 Feb 2020 10:54:03 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:36074 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j6z0c-00033v-6V for qemu-devel@nongnu.org; Wed, 26 Feb 2020 10:54:02 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-299-axvByKmyO7mv4qQ7GsZlcg-1; Wed, 26 Feb 2020 10:53:57 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3CBFB107ACC7; Wed, 26 Feb 2020 15:53:56 +0000 (UTC) Received: from t480s.redhat.com (ovpn-117-196.ams2.redhat.com [10.36.117.196]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7E52B101D482; Wed, 26 Feb 2020 15:53:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582732441; 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=ud93Vcxnd+Xp4+9u4iMrukyPfYJtI2St2nU+UuD+Msw=; b=iTHsClPhDEc8WzdeZhU1rl1/NtOp/HXodufEyXSRoUZ1YoF4jSFxeiNwoToLkWWp764j7t zA8dH1ZZoxjfWVDKERbstOtNLIqLRCqPo3NHX6SrCupYQRADmY9IW1yFjO5b040+TJ3SOP oEmbJstBh9z952c+ONRVwuxDKErYm/k= X-MC-Unique: axvByKmyO7mv4qQ7GsZlcg-1 From: David Hildenbrand To: qemu-devel@nongnu.org Subject: [PATCH v3 09/13] migration/ram: Consolidate variable reset after placement in ram_load_postcopy() Date: Wed, 26 Feb 2020 16:53:00 +0100 Message-Id: <20200226155304.60219-10-david@redhat.com> In-Reply-To: <20200226155304.60219-1-david@redhat.com> References: <20200226155304.60219-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , Juan Quintela , David Hildenbrand , "Dr . David Alan Gilbert" , Peter Xu , Paolo Bonzini , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Let's consolidate resetting the variables. Cc: "Dr. David Alan Gilbert" Cc: Juan Quintela Cc: Peter Xu Signed-off-by: David Hildenbrand --- migration/ram.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index f815f4e532..1a5ff07997 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -3126,7 +3126,7 @@ static int ram_load_postcopy(QEMUFile *f) /* Temporary page that is later 'placed' */ void *postcopy_host_page =3D mis->postcopy_tmp_page; void *host_page =3D NULL; - bool all_zero =3D false; + bool all_zero =3D true; int target_pages =3D 0; =20 while (!ret && !(flags & RAM_SAVE_FLAG_EOS)) { @@ -3152,7 +3152,6 @@ static int ram_load_postcopy(QEMUFile *f) addr &=3D TARGET_PAGE_MASK; =20 trace_ram_load_postcopy_loop((uint64_t)addr, flags); - place_needed =3D false; if (flags & (RAM_SAVE_FLAG_ZERO | RAM_SAVE_FLAG_PAGE | RAM_SAVE_FLAG_COMPRESS_PAGE)) { block =3D ram_block_from_stream(f, flags); @@ -3180,9 +3179,7 @@ static int ram_load_postcopy(QEMUFile *f) */ page_buffer =3D postcopy_host_page + host_page_offset_from_ram_block_offset(block, ad= dr); - /* If all TP are zero then we can optimise the place */ if (target_pages =3D=3D 1) { - all_zero =3D true; host_page =3D host_page_from_ram_block_offset(block, addr); } else if (host_page !=3D host_page_from_ram_block_offset(bloc= k, addr))= { @@ -3199,7 +3196,6 @@ static int ram_load_postcopy(QEMUFile *f) */ if (target_pages =3D=3D (block->page_size / TARGET_PAGE_SIZE))= { place_needed =3D true; - target_pages =3D 0; } place_source =3D postcopy_host_page; } @@ -3276,6 +3272,10 @@ static int ram_load_postcopy(QEMUFile *f) ret =3D postcopy_place_page(mis, host_page, place_source, block); } + place_needed =3D false; + target_pages =3D 0; + /* Assume we have a zero page until we detect something differ= ent */ + all_zero =3D true; } } =20 --=20 2.24.1