aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorPeter Xu <peterx@redhat.com>2024-01-17 15:58:48 +0800
committerPeter Xu <peterx@redhat.com>2024-01-29 11:02:12 +0800
commit434b8adcf34dd43f19a4ec851eab33c8722d4877 (patch)
treea40e3e99be185455cc312ed06397cbf149b45ace /scripts
parentb0504edd401dc77ddf09070bb0b22ad7573b4c77 (diff)
analyze-migration.py: Remove trick on parsing ramblocks
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>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/analyze-migration.py11
1 files 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 @@ class RamSection(object):
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)