From nobody Tue Nov 26 18:39:04 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=1705478416; cv=none; d=zohomail.com; s=zohoarc; b=dXhvYuls5iw4RiYZg2IaxqVTbtu1bJQQbcbbHra3D15oK3w7sP6mFuzhCJipE7MRAivh1DRz5UbhosAvX889tWWubWJ2K5KP8kXZHNI747V9Z5wdmlzu5sTqvpadIo6ok9hIQIuyPqxUaBkHZWUgLiUqgx28bmVchdA6osddCe8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1705478416; 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=SkLCeIrbMoZQbvJLLKjgqsorGDJr9Xlgo9gWw+cIrD8=; b=i/96HhXdtDsYRpu+o8Gbmn7EtmCPoynLrnsmyD5fhuNIedGVHNL3XOVTxlER9qeelPWjjXbUuIj3+VUM+fu15YE6zW8wiz7ZkRs2hQvVQ5MYjNZSsS4/lqjnF5MBuUY6t6adVv+CGMP45zHGKGJ6P9+CFUHcOISeFfBUoI8nFcE= 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 1705478416768314.5310007821863; Wed, 17 Jan 2024 00:00:16 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQ0pE-00074p-Bw; Wed, 17 Jan 2024 02:59:04 -0500 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 1rQ0pC-000743-Uq for qemu-devel@nongnu.org; Wed, 17 Jan 2024 02:59:02 -0500 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 1rQ0pB-000275-Fn for qemu-devel@nongnu.org; Wed, 17 Jan 2024 02:59:02 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-649-b9B7bS71MPmDo0IDxwdltA-1; Wed, 17 Jan 2024 02:58:58 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3198283FC23; Wed, 17 Jan 2024 07:58:58 +0000 (UTC) Received: from x1n.redhat.com (unknown [10.72.116.92]) by smtp.corp.redhat.com (Postfix) with ESMTP id DDB9FC15A0C; Wed, 17 Jan 2024 07:58:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1705478340; 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=SkLCeIrbMoZQbvJLLKjgqsorGDJr9Xlgo9gWw+cIrD8=; b=ejiOnWWkHULCcOUE3MyfVzkCsE4qPIColqHp/atO3jx/YIw0qA8YFCQMu7wbKoUDX5CEVi Icmz7fHB1t2MyVuYI3DeV65phvpH6SC8Ed7Mr3bibN8cviIFsctha3P/XMKsHg6hlwC+Su 7HbqdvkBLlRHNQoMt/0ovyLSl6KbEao= X-MC-Unique: b9B7bS71MPmDo0IDxwdltA-1 From: peterx@redhat.com To: qemu-devel@nongnu.org Cc: Prasad Pandit , peterx@redhat.com, Fabiano Rosas , Bandan Das , Julia Suvorova Subject: [PATCH 1/3] migration: Make threshold_size an uint64_t Date: Wed, 17 Jan 2024 15:58:46 +0800 Message-ID: <20240117075848.139045-2-peterx@redhat.com> In-Reply-To: <20240117075848.139045-1-peterx@redhat.com> References: <20240117075848.139045-1-peterx@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 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=peterx@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -38 X-Spam_score: -3.9 X-Spam_bar: --- X-Spam_report: (-3.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.806, 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, 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1705478418057100001 Content-Type: text/plain; charset="utf-8" From: Peter Xu It's always used to compare against another uint64_t. Make it always clear that it's never a negative. Signed-off-by: Peter Xu Reviewed-by: Fabiano Rosas Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- migration/migration.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migration/migration.h b/migration/migration.h index 17972dac34..a589ae8650 100644 --- a/migration/migration.h +++ b/migration/migration.h @@ -296,7 +296,7 @@ struct MigrationState { * this threshold; it's calculated from the requested downtime and * measured bandwidth, or avail-switchover-bandwidth if specified. */ - int64_t threshold_size; + uint64_t threshold_size; =20 /* params from 'migrate-set-parameters' */ MigrationParameters parameters; --=20 2.43.0 From nobody Tue Nov 26 18:39:04 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=1705478376; cv=none; d=zohomail.com; s=zohoarc; b=YSQQxrLUd3GbnOohAG9QvcjOoXAEiJT6f6Ki1FfOS5271Ol7xYh/gIh5qwEvu14rQte1Jh+7PXb2hkTza/rTe7pt812h0mT1LVTfZYyfg2BuaelXKAOVowK1OkepC/todzPiik4MuhY5rtLW4LP9i1DaUG1yI5Exs72KhFbsIB0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1705478376; 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=l/AfrOArGK87QqBfGZNYZ4GvM4/I5ykEtD/gf9CmNRU=; b=YpUuSfo6/GE5+vsuw/U+r7WkQSRA+EMezy7U2ptaJbDEfF5zI8g74ga503YzetAPJ5CkRhnW0UzqrkbIsT9e0zFzb0t5u4w1jywZpZG89Wp89iPD+9Izx19Ymqnog7KxkatVdtgeQZNaUAGXXPHQOBRpzZi70Jd/oljO6OE8tUk= 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 1705478376555736.2930815744314; Tue, 16 Jan 2024 23:59:36 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQ0pJ-00077j-UR; Wed, 17 Jan 2024 02:59:09 -0500 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 1rQ0pI-00075m-9D for qemu-devel@nongnu.org; Wed, 17 Jan 2024 02:59:08 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rQ0pG-00027M-U1 for qemu-devel@nongnu.org; Wed, 17 Jan 2024 02:59:08 -0500 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-588-mWjXMP2EMM6G7v7fdnWUUA-1; Wed, 17 Jan 2024 02:59:02 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2F4F41C060C0; Wed, 17 Jan 2024 07:59:02 +0000 (UTC) Received: from x1n.redhat.com (unknown [10.72.116.92]) by smtp.corp.redhat.com (Postfix) with ESMTP id 00987C15E6C; Wed, 17 Jan 2024 07:58:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1705478346; 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=l/AfrOArGK87QqBfGZNYZ4GvM4/I5ykEtD/gf9CmNRU=; b=PPYHgxFSiNegKQZyyW3HtvbOilKrFieakbbzQC9NeqJQ1cEnDX1DctO8SHl9eM46ZfNadL g5Fq/i87fbu2Qmqv+StUGsTESgs/3lazBlbB64sDYb6XoI4LVhTVDhhHCsY67ZCdl/ticf ayCYC8gCOlVCTKYxiTiCFbK4hQd15SY= X-MC-Unique: mWjXMP2EMM6G7v7fdnWUUA-1 From: peterx@redhat.com To: qemu-devel@nongnu.org Cc: Prasad Pandit , peterx@redhat.com, Fabiano Rosas , Bandan Das , Julia Suvorova Subject: [PATCH 2/3] migration: Drop unnecessary check in ram's pending_exact() Date: Wed, 17 Jan 2024 15:58:47 +0800 Message-ID: <20240117075848.139045-3-peterx@redhat.com> In-Reply-To: <20240117075848.139045-1-peterx@redhat.com> References: <20240117075848.139045-1-peterx@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 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.133.124; envelope-from=peterx@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -38 X-Spam_score: -3.9 X-Spam_bar: --- X-Spam_report: (-3.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.806, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1705478377966100003 Content-Type: text/plain; charset="utf-8" From: Peter Xu When the migration frameworks fetches the exact pending sizes, it means this check: remaining_size < s->threshold_size Must have been done already, actually at migration_iteration_run(): if (must_precopy <=3D s->threshold_size) { qemu_savevm_state_pending_exact(&must_precopy, &can_postcopy); That should be after one round of ram_state_pending_estimate(). It makes the 2nd check meaningless and can be dropped. To say it in another way, when reaching ->state_pending_exact(), we unconditionally sync dirty bits for precopy. Then we can drop migrate_get_current() there too. Signed-off-by: Peter Xu Reviewed-by: Fabiano Rosas --- migration/ram.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index c0cdcccb75..d5b7cd5ac2 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -3213,21 +3213,20 @@ static void ram_state_pending_estimate(void *opaque= , uint64_t *must_precopy, static void ram_state_pending_exact(void *opaque, uint64_t *must_precopy, uint64_t *can_postcopy) { - MigrationState *s =3D migrate_get_current(); RAMState **temp =3D opaque; RAMState *rs =3D *temp; + uint64_t remaining_size; =20 - uint64_t remaining_size =3D rs->migration_dirty_pages * TARGET_PAGE_SI= ZE; - - if (!migration_in_postcopy() && remaining_size < s->threshold_size) { + if (!migration_in_postcopy()) { bql_lock(); WITH_RCU_READ_LOCK_GUARD() { migration_bitmap_sync_precopy(rs, false); } bql_unlock(); - remaining_size =3D rs->migration_dirty_pages * TARGET_PAGE_SIZE; } =20 + remaining_size =3D rs->migration_dirty_pages * TARGET_PAGE_SIZE; + if (migrate_postcopy_ram()) { /* We can do postcopy, and all the data is postcopiable */ *can_postcopy +=3D remaining_size; --=20 2.43.0 From nobody Tue Nov 26 18:39:04 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=1705478406; cv=none; d=zohomail.com; s=zohoarc; b=AhFFdJ81Cr1MONIhyoMFlNg1IqT1XwFhCIMtuk2uRHKDjBu0rthZTW/JbLaSYXCKvi0J75w/1gBVrFX7aU9Km1hEgHAzZqnuzVKSg7G13g0SoYGH7JS+vn+fYIWAlUBkjaYPoQc3wDSdbWyh1yMCZs5Zlcmd++ta2TiIHbeQ8wk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1705478406; 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=4szyQrnHzrYkL2h4yzGCzHjCPfkkzLtPUyuvC80BU3U=; b=jdhgw5jen1OsoHBhAPbawFw4J+nxuKWmDb+HsFeTRlfrZVHHjrX/9XK3BNKyY1dylMbq5IZq02+QXHaeitoiZr8dIkLLgtiCyDwEzrT+FwPFS3jm28EaXEn/CbJckx48gmPaBAhdOlJyO9iX4G6I+5QGn0oXqOtA6GF4gH40KMU= 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 1705478406474545.2843026843974; Wed, 17 Jan 2024 00:00:06 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQ0pL-000782-D8; Wed, 17 Jan 2024 02:59:11 -0500 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 1rQ0pK-00077m-EF for qemu-devel@nongnu.org; Wed, 17 Jan 2024 02:59:10 -0500 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 1rQ0pI-00027V-VT for qemu-devel@nongnu.org; Wed, 17 Jan 2024 02:59:10 -0500 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-489-C06tPBHFMFiiPwxL3c2vEg-1; Wed, 17 Jan 2024 02:59:06 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2D9C31C060C2; Wed, 17 Jan 2024 07:59:06 +0000 (UTC) Received: from x1n.redhat.com (unknown [10.72.116.92]) by smtp.corp.redhat.com (Postfix) with ESMTP id F3620C15A0C; Wed, 17 Jan 2024 07:59:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1705478348; 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=4szyQrnHzrYkL2h4yzGCzHjCPfkkzLtPUyuvC80BU3U=; b=EzBInvQyB4b5iL35B472gFP7zZUERgxrMZZTapXqLeqEqzpJSUAZKu43jUWybZ0MaqVQe5 ZdR9HL4+sDw47GJyPuydkOIdsKw3jxjuWcMqYRgVJpzkEnDeBo4z4KkP6jt+eazduu/j3l TWqbWtssuzJzbIf6rqbWazRW8MxpAtY= X-MC-Unique: C06tPBHFMFiiPwxL3c2vEg-1 From: peterx@redhat.com To: qemu-devel@nongnu.org Cc: Prasad Pandit , peterx@redhat.com, Fabiano Rosas , Bandan Das , Julia Suvorova Subject: [PATCH 3/3] analyze-migration.py: Remove trick on parsing ramblocks Date: Wed, 17 Jan 2024 15:58:48 +0800 Message-ID: <20240117075848.139045-4-peterx@redhat.com> In-Reply-To: <20240117075848.139045-1-peterx@redhat.com> References: <20240117075848.139045-1-peterx@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 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=peterx@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -38 X-Spam_score: -3.9 X-Spam_bar: --- X-Spam_report: (-3.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.806, 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, 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1705478408048100001 Content-Type: text/plain; charset="utf-8" From: Peter Xu RAM_SAVE_FLAG_MEM_SIZE contains the total length of ramblock idstr to know whether scanning of ramblocks is complete. Drop the trick. Signed-off-by: Peter Xu Reviewed-by: Fabiano Rosas --- scripts/analyze-migration.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/scripts/analyze-migration.py b/scripts/analyze-migration.py index a39dfb8766..8a254a5b6a 100755 --- a/scripts/analyze-migration.py +++ b/scripts/analyze-migration.py @@ -151,17 +151,12 @@ def read(self): addr &=3D ~(self.TARGET_PAGE_SIZE - 1) =20 if flags & self.RAM_SAVE_FLAG_MEM_SIZE: - while True: + total_length =3D addr + while total_length > 0: namelen =3D self.file.read8() - # We assume that no RAM chunk is big enough to ever - # hit the first byte of the address, so when we see - # a zero here we know it has to be an address, not the - # length of the next block. - if namelen =3D=3D 0: - self.file.file.seek(-1, 1) - break self.name =3D self.file.readstr(len =3D namelen) len =3D self.file.read64() + total_length -=3D len self.sizeinfo[self.name] =3D '0x%016x' % len if self.write_memory: print(self.name) --=20 2.43.0