From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: qemu-block@nongnu.org, Paolo Bonzini <pbonzini@redhat.com>,
Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>,
Fam Zheng <fam@euphon.net>, Cleber Rosa <crosa@redhat.com>,
Eric Blake <eblake@redhat.com>,
Li Zhijian <lizhijian@fujitsu.com>, Peter Xu <peterx@redhat.com>,
Markus Armbruster <armbru@redhat.com>,
John Snow <jsnow@redhat.com>,
Stefan Hajnoczi <stefanha@redhat.com>,
Juan Quintela <quintela@redhat.com>,
Leonardo Bras <leobras@redhat.com>,
Laurent Vivier <lvivier@redhat.com>,
Fabiano Rosas <farosas@suse.de>, Thomas Huth <thuth@redhat.com>
Subject: [PULL 08/38] migration: Fix analyze-migration.py when ignore-shared is used
Date: Mon, 16 Oct 2023 12:06:36 +0200 [thread overview]
Message-ID: <20231016100706.2551-9-quintela@redhat.com> (raw)
In-Reply-To: <20231016100706.2551-1-quintela@redhat.com>
From: Fabiano Rosas <farosas@suse.de>
The script is currently broken when the x-ignore-shared capability is
used:
Traceback (most recent call last):
File "./scripts/analyze-migration.py", line 656, in <module>
dump.read(dump_memory = args.memory)
File "./scripts/analyze-migration.py", line 593, in read
section.read()
File "./scripts/analyze-migration.py", line 163, in read
self.name = self.file.readstr(len = namelen)
File "./scripts/analyze-migration.py", line 53, in readstr
return self.readvar(len).decode('utf-8')
UnicodeDecodeError: 'utf-8' codec can't decode byte 0x82 in position 55: invalid start byte
We're currently adding data to the middle of the ram section depending
on the presence of the capability. As a consequence, any code loading
the ram section needs to know about capabilities so it can interpret
the stream.
Skip the byte that's added when x-ignore-shared is used to fix the
script.
Signed-off-by: Fabiano Rosas <farosas@suse.de>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-ID: <20231009184326.15777-5-farosas@suse.de>
---
scripts/analyze-migration.py | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/scripts/analyze-migration.py b/scripts/analyze-migration.py
index c700fed64d..56ab04dd2d 100755
--- a/scripts/analyze-migration.py
+++ b/scripts/analyze-migration.py
@@ -123,6 +123,7 @@ def __init__(self, file, version_id, ramargs, section_key):
self.TARGET_PAGE_SIZE = ramargs['page_size']
self.dump_memory = ramargs['dump_memory']
self.write_memory = ramargs['write_memory']
+ self.ignore_shared = ramargs['ignore_shared']
self.sizeinfo = collections.OrderedDict()
self.data = collections.OrderedDict()
self.data['section sizes'] = self.sizeinfo
@@ -169,6 +170,8 @@ def read(self):
f.truncate(0)
f.truncate(len)
self.files[self.name] = f
+ if self.ignore_shared:
+ mr_addr = self.file.read64()
flags &= ~self.RAM_SAVE_FLAG_MEM_SIZE
if flags & self.RAM_SAVE_FLAG_COMPRESS:
@@ -572,6 +575,7 @@ def read(self, desc_only = False, dump_memory = False, write_memory = False):
ramargs['page_size'] = self.vmsd_desc['page_size']
ramargs['dump_memory'] = dump_memory
ramargs['write_memory'] = write_memory
+ ramargs['ignore_shared'] = False
self.section_classes[('ram',0)][1] = ramargs
while True:
@@ -582,6 +586,7 @@ def read(self, desc_only = False, dump_memory = False, write_memory = False):
config_desc = self.vmsd_desc.get('configuration')
section = ConfigurationSection(file, config_desc)
section.read()
+ ramargs['ignore_shared'] = section.has_capability('x-ignore-shared')
elif section_type == self.QEMU_VM_SECTION_START or section_type == self.QEMU_VM_SECTION_FULL:
section_id = file.read32()
name = file.readstr()
--
2.41.0
next prev parent reply other threads:[~2023-10-16 10:14 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-16 10:06 [PULL 00/38] Migration 20231016 patches Juan Quintela
2023-10-16 10:06 ` [PULL 01/38] migration: refactor migration_completion Juan Quintela
2023-10-16 10:06 ` [PULL 02/38] migration: Use g_autofree to simplify ram_dirty_bitmap_reload() Juan Quintela
2023-10-16 10:06 ` [PULL 03/38] migration: Allow user to specify available switchover bandwidth Juan Quintela
2023-10-16 10:06 ` [PULL 04/38] migration: fix RAMBlock add NULL check Juan Quintela
2023-10-16 10:06 ` [PULL 05/38] migration: Add the configuration vmstate to the json writer Juan Quintela
2023-10-16 10:06 ` [PULL 06/38] migration: Fix analyze-migration.py 'configuration' parsing Juan Quintela
2023-10-16 10:06 ` [PULL 07/38] migration: Add capability parsing to analyze-migration.py Juan Quintela
2023-10-16 10:06 ` Juan Quintela [this message]
2023-10-16 10:06 ` [PULL 09/38] migration: Fix analyze-migration read operation signedness Juan Quintela
2023-10-16 10:06 ` [PULL 10/38] tests/qtest/migration: Add a test for the analyze-migration script Juan Quintela
2023-10-16 10:06 ` [PULL 11/38] tests/qtest: migration-test: Add tests for file-based migration Juan Quintela
2023-10-16 18:25 ` Fabiano Rosas
2023-10-17 7:21 ` Juan Quintela
2023-10-17 12:30 ` Fabiano Rosas
2023-10-17 12:55 ` Juan Quintela
2023-10-17 13:19 ` Fabiano Rosas
2023-10-17 13:30 ` Juan Quintela
2023-10-16 10:06 ` [PULL 12/38] migration: hold the BQL during setup Juan Quintela
2023-10-16 10:06 ` [PULL 13/38] migration: Non multifd migration don't care about multifd flushes Juan Quintela
2023-10-16 10:06 ` [PULL 14/38] migration: Create migrate_rdma() Juan Quintela
2023-10-16 10:06 ` [PULL 15/38] migration/rdma: Unfold ram_control_before_iterate() Juan Quintela
2023-10-16 10:06 ` [PULL 16/38] migration/rdma: Unfold ram_control_after_iterate() Juan Quintela
2023-10-16 10:06 ` [PULL 17/38] migration/rdma: Remove all uses of RAM_CONTROL_HOOK Juan Quintela
2023-10-16 10:06 ` [PULL 18/38] migration/rdma: Unfold hook_ram_load() Juan Quintela
2023-10-16 10:06 ` [PULL 19/38] migration/rdma: Create rdma_control_save_page() Juan Quintela
2023-10-16 10:06 ` [PULL 20/38] qemu-file: Remove QEMUFileHooks Juan Quintela
2023-10-16 10:06 ` [PULL 21/38] migration/rdma: Move rdma constants from qemu-file.h to rdma.h Juan Quintela
2023-10-16 10:06 ` [PULL 22/38] migration/rdma: Remove qemu_ prefix from exported functions Juan Quintela
2023-10-16 10:06 ` [PULL 23/38] migration/rdma: Check sooner if we are in postcopy for save_page() Juan Quintela
2023-10-16 10:06 ` [PULL 24/38] migration/rdma: Use i as for index instead of idx Juan Quintela
2023-10-16 10:06 ` [PULL 25/38] migration/rdma: Declare for index variables local Juan Quintela
2023-10-16 10:06 ` [PULL 26/38] migration/rdma: Remove all "ret" variables that are used only once Juan Quintela
2023-10-16 10:06 ` [PULL 27/38] migration: Improve json and formatting Juan Quintela
2023-10-16 10:06 ` [PULL 28/38] migration: check for rate_limit_max for RATE_LIMIT_DISABLED Juan Quintela
2023-10-16 10:06 ` [PULL 29/38] multifd: fix counters in multifd_send_thread Juan Quintela
2023-10-16 10:06 ` [PULL 30/38] multifd: reset next_packet_len after sending pages Juan Quintela
2023-10-16 10:06 ` [PULL 31/38] migration/ram: Refactor precopy ram loading code Juan Quintela
2023-10-16 10:07 ` [PULL 32/38] migration/ram: Remove RAMState from xbzrle_cache_zero_page Juan Quintela
2023-10-16 10:07 ` [PULL 33/38] migration/ram: Stop passing QEMUFile around in save_zero_page Juan Quintela
2023-10-16 10:07 ` [PULL 34/38] migration/ram: Move xbzrle zero page handling into save_zero_page Juan Quintela
2023-10-16 10:07 ` [PULL 35/38] migration/ram: Merge save_zero_page functions Juan Quintela
2023-10-16 10:07 ` [PULL 36/38] migration/multifd: Remove direct "socket" references Juan Quintela
2023-10-16 10:07 ` [PULL 37/38] migration/multifd: Unify multifd_send_thread error paths Juan Quintela
2023-10-16 10:07 ` [PULL 38/38] migration/multifd: Clarify Error usage in multifd_channel_connect Juan Quintela
2023-10-16 16:31 ` [PULL 00/38] Migration 20231016 patches Stefan Hajnoczi
2023-10-16 17:13 ` Fabiano Rosas
2023-10-16 19:18 ` Stefan Hajnoczi
2023-10-16 20:31 ` Fabiano Rosas
2023-10-17 7:24 ` Juan Quintela
2023-10-17 8:20 ` Thomas Huth
-- strict thread matches above, loose matches on Subject: below --
2023-10-17 8:29 [PULL 00/38] Migration 20231017 patches Juan Quintela
2023-10-17 8:29 ` [PULL 08/38] migration: Fix analyze-migration.py when ignore-shared is used Juan Quintela
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=20231016100706.2551-9-quintela@redhat.com \
--to=quintela@redhat.com \
--cc=armbru@redhat.com \
--cc=crosa@redhat.com \
--cc=eblake@redhat.com \
--cc=fam@euphon.net \
--cc=farosas@suse.de \
--cc=jsnow@redhat.com \
--cc=leobras@redhat.com \
--cc=lizhijian@fujitsu.com \
--cc=lvivier@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peterx@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
--cc=thuth@redhat.com \
--cc=vsementsov@yandex-team.ru \
/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).