qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: peterx@redhat.com
To: qemu-devel@nongnu.org
Cc: Fabiano Rosas <farosas@suse.de>, peterx@redhat.com
Subject: [PULL 05/15] analyze-migration.py: Remove trick on parsing ramblocks
Date: Fri, 26 Jan 2024 12:17:15 +0800	[thread overview]
Message-ID: <20240126041725.124562-6-peterx@redhat.com> (raw)
In-Reply-To: <20240126041725.124562-1-peterx@redhat.com>

From: Peter Xu <peterx@redhat.com>

RAM_SAVE_FLAG_MEM_SIZE contains the total length of ramblock idstr to know
whether scanning of ramblocks is complete.  Drop the trick.

Reviewed-by: Fabiano Rosas <farosas@suse.de>
Link: https://lore.kernel.org/r/20240117075848.139045-4-peterx@redhat.com
Signed-off-by: Peter Xu <peterx@redhat.com>
---
 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 &= ~(self.TARGET_PAGE_SIZE - 1)
 
             if flags & self.RAM_SAVE_FLAG_MEM_SIZE:
-                while True:
+                total_length = addr
+                while total_length > 0:
                     namelen = 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 == 0:
-                        self.file.file.seek(-1, 1)
-                        break
                     self.name = self.file.readstr(len = namelen)
                     len = self.file.read64()
+                    total_length -= len
                     self.sizeinfo[self.name] = '0x%016x' % len
                     if self.write_memory:
                         print(self.name)
-- 
2.43.0



  parent reply	other threads:[~2024-01-26  4:18 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-26  4:17 [PULL 00/15] Migration 20240126 patches peterx
2024-01-26  4:17 ` [PULL 01/15] userfaultfd: use 1ULL to build ioctl masks peterx
2024-01-26  4:17 ` [PULL 02/15] migration: Plug memory leak on HMP migrate error path peterx
2024-01-26  4:17 ` [PULL 03/15] migration: Make threshold_size an uint64_t peterx
2024-01-26  4:17 ` [PULL 04/15] migration: Drop unnecessary check in ram's pending_exact() peterx
2024-01-26  4:17 ` peterx [this message]
2024-01-26  4:17 ` [PULL 06/15] tests/qtest/migration: Don't use -cpu max for aarch64 peterx
2024-01-26 14:36   ` Fabiano Rosas
2024-01-26 14:39     ` Peter Maydell
2024-01-26 14:54       ` Fabiano Rosas
2024-01-29  2:51         ` Peter Xu
2024-01-29 12:14           ` Fabiano Rosas
2024-01-29 23:30             ` Fabiano Rosas
2024-01-30 10:18               ` Peter Maydell
2024-01-30 10:48                 ` Peter Xu
2024-01-30 21:23                   ` Fabiano Rosas
2024-01-31  4:04                     ` Peter Xu
2024-01-31 13:09                       ` Fabiano Rosas
2024-02-01  2:56                         ` Peter Xu
     [not found]                           ` <87y1c4ib03.fsf@suse.de>
2024-02-01 23:50                             ` Peter Xu
2024-02-02 10:51                               ` Peter Maydell
2024-02-05  2:56                                 ` Peter Xu
2024-02-12 18:29                                   ` Peter Maydell
2024-02-05  8:35                                 ` Eric Auger
2024-01-26  4:17 ` [PULL 07/15] ci: Add a migration compatibility test job peterx
2024-01-26  4:17 ` [PULL 08/15] ci: Disable migration compatibility tests for aarch64 peterx
2024-01-26  4:17 ` [PULL 09/15] migration/yank: Use channel features peterx
2024-01-26  4:17 ` [PULL 10/15] migration: Fix use-after-free of migration state object peterx
2024-01-26  4:17 ` [PULL 11/15] migration: Take reference to migration state around bg_migration_vm_start_bh peterx
2024-01-26  4:17 ` [PULL 12/15] migration: Reference migration state around loadvm_postcopy_handle_run_bh peterx
2024-01-26  4:17 ` [PULL 13/15] migration: Add a wrapper to qemu_bh_schedule peterx
2024-01-26  4:17 ` [PULL 14/15] migration: Centralize BH creation and dispatch peterx
2024-01-26  4:17 ` [PULL 15/15] Make 'uri' optional for migrate QAPI peterx
2024-01-26 18:16 ` [PULL 00/15] Migration 20240126 patches Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240126041725.124562-6-peterx@redhat.com \
    --to=peterx@redhat.com \
    --cc=farosas@suse.de \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).