From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: Eric Blake <eblake@redhat.com>, Thomas Huth <thuth@redhat.com>,
Fabiano Rosas <farosas@suse.de>,
Leonardo Bras <leobras@redhat.com>,
Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>,
Markus Armbruster <armbru@redhat.com>,
Peter Xu <peterx@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>,
Fam Zheng <fam@euphon.net>, Stefan Hajnoczi <stefanha@redhat.com>,
Li Zhijian <lizhijian@fujitsu.com>, John Snow <jsnow@redhat.com>,
qemu-block@nongnu.org, Cleber Rosa <crosa@redhat.com>,
Juan Quintela <quintela@redhat.com>,
Laurent Vivier <lvivier@redhat.com>
Subject: [PULL 07/38] migration: Add capability parsing to analyze-migration.py
Date: Tue, 17 Oct 2023 10:29:32 +0200 [thread overview]
Message-ID: <20231017083003.15951-8-quintela@redhat.com> (raw)
In-Reply-To: <20231017083003.15951-1-quintela@redhat.com>
From: Fabiano Rosas <farosas@suse.de>
The script is broken when the configuration/capabilities section is
present. Add support for parsing the capabilities so we can fix it in
the next patch.
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-4-farosas@suse.de>
---
scripts/analyze-migration.py | 38 ++++++++++++++++++++++++++++++++++++
1 file changed, 38 insertions(+)
diff --git a/scripts/analyze-migration.py b/scripts/analyze-migration.py
index 24687db497..c700fed64d 100755
--- a/scripts/analyze-migration.py
+++ b/scripts/analyze-migration.py
@@ -264,6 +264,24 @@ class ConfigurationSection(object):
def __init__(self, file, desc):
self.file = file
self.desc = desc
+ self.caps = []
+
+ def parse_capabilities(self, vmsd_caps):
+ if not vmsd_caps:
+ return
+
+ ncaps = vmsd_caps.data['caps_count'].data
+ self.caps = vmsd_caps.data['capabilities']
+
+ if type(self.caps) != list:
+ self.caps = [self.caps]
+
+ if len(self.caps) != ncaps:
+ raise Exception("Number of capabilities doesn't match "
+ "caps_count field")
+
+ def has_capability(self, cap):
+ return any([str(c) == cap for c in self.caps])
def read(self):
if self.desc:
@@ -271,6 +289,8 @@ def read(self):
section = VMSDSection(self.file, version_id, self.desc,
'configuration')
section.read()
+ self.parse_capabilities(
+ section.data.get("configuration/capabilities"))
else:
# backward compatibility for older streams that don't have
# the configuration section in the json
@@ -297,6 +317,23 @@ def read(self):
self.data = self.file.readvar(size)
return self.data
+class VMSDFieldCap(object):
+ def __init__(self, desc, file):
+ self.file = file
+ self.desc = desc
+ self.data = ""
+
+ def __repr__(self):
+ return self.data
+
+ def __str__(self):
+ return self.data
+
+ def read(self):
+ len = self.file.read8()
+ self.data = self.file.readstr(len)
+
+
class VMSDFieldInt(VMSDFieldGeneric):
def __init__(self, desc, file):
super(VMSDFieldInt, self).__init__(desc, file)
@@ -471,6 +508,7 @@ def getDict(self):
"unused_buffer" : VMSDFieldGeneric,
"bitmap" : VMSDFieldGeneric,
"struct" : VMSDFieldStruct,
+ "capability": VMSDFieldCap,
"unknown" : VMSDFieldGeneric,
}
--
2.41.0
next prev parent reply other threads:[~2023-10-17 8:33 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-17 8:29 [PULL 00/38] Migration 20231017 patches Juan Quintela
2023-10-17 8:29 ` [PULL 01/38] migration: refactor migration_completion Juan Quintela
2023-10-17 8:29 ` [PULL 02/38] migration: Use g_autofree to simplify ram_dirty_bitmap_reload() Juan Quintela
2023-10-17 8:29 ` [PULL 03/38] migration: Allow user to specify available switchover bandwidth Juan Quintela
2023-10-17 8:29 ` [PULL 04/38] migration: fix RAMBlock add NULL check Juan Quintela
2023-10-17 8:29 ` [PULL 05/38] migration: Add the configuration vmstate to the json writer Juan Quintela
2023-10-17 8:29 ` [PULL 06/38] migration: Fix analyze-migration.py 'configuration' parsing Juan Quintela
2023-10-17 8:29 ` Juan Quintela [this message]
2023-10-17 8:29 ` [PULL 08/38] migration: Fix analyze-migration.py when ignore-shared is used Juan Quintela
2023-10-17 8:29 ` [PULL 09/38] migration: Fix analyze-migration read operation signedness Juan Quintela
2023-10-17 8:29 ` [PULL 10/38] tests/qtest/migration: Add a test for the analyze-migration script Juan Quintela
2024-05-21 12:24 ` Alex Bennée
2024-05-21 12:46 ` Fabiano Rosas
2024-05-22 5:36 ` Thomas Huth
2024-05-22 12:48 ` Fabiano Rosas
2024-05-22 13:00 ` Thomas Huth
2024-05-22 14:11 ` Alex Bennée
2023-10-17 8:29 ` [PULL 11/38] tests/qtest: migration-test: Add tests for file-based migration Juan Quintela
2023-10-17 8:29 ` [PULL 12/38] migration: hold the BQL during setup Juan Quintela
2023-10-17 8:29 ` [PULL 13/38] migration: Non multifd migration don't care about multifd flushes Juan Quintela
2023-10-19 11:47 ` Michael Tokarev
2023-10-19 12:03 ` Juan Quintela
2023-10-17 8:29 ` [PULL 14/38] migration: Create migrate_rdma() Juan Quintela
2023-10-17 8:29 ` [PULL 15/38] migration/rdma: Unfold ram_control_before_iterate() Juan Quintela
2023-10-17 8:29 ` [PULL 16/38] migration/rdma: Unfold ram_control_after_iterate() Juan Quintela
2023-10-17 8:29 ` [PULL 17/38] migration/rdma: Remove all uses of RAM_CONTROL_HOOK Juan Quintela
2023-10-17 8:29 ` [PULL 18/38] migration/rdma: Unfold hook_ram_load() Juan Quintela
2023-10-17 8:29 ` [PULL 19/38] migration/rdma: Create rdma_control_save_page() Juan Quintela
2023-10-17 8:29 ` [PULL 20/38] qemu-file: Remove QEMUFileHooks Juan Quintela
2023-10-17 8:29 ` [PULL 21/38] migration/rdma: Move rdma constants from qemu-file.h to rdma.h Juan Quintela
2023-10-17 8:29 ` [PULL 22/38] migration/rdma: Remove qemu_ prefix from exported functions Juan Quintela
2023-10-17 8:29 ` [PULL 23/38] migration/rdma: Check sooner if we are in postcopy for save_page() Juan Quintela
2023-10-17 8:29 ` [PULL 24/38] migration/rdma: Use i as for index instead of idx Juan Quintela
2023-10-17 8:29 ` [PULL 25/38] migration/rdma: Declare for index variables local Juan Quintela
2023-10-17 8:29 ` [PULL 26/38] migration/rdma: Remove all "ret" variables that are used only once Juan Quintela
2023-10-17 8:29 ` [PULL 27/38] migration: Improve json and formatting Juan Quintela
2023-10-17 8:29 ` [PULL 28/38] migration: check for rate_limit_max for RATE_LIMIT_DISABLED Juan Quintela
2023-10-17 8:29 ` [PULL 29/38] multifd: fix counters in multifd_send_thread Juan Quintela
2023-10-17 8:29 ` [PULL 30/38] multifd: reset next_packet_len after sending pages Juan Quintela
2023-10-17 8:29 ` [PULL 31/38] migration/ram: Refactor precopy ram loading code Juan Quintela
2023-10-17 8:29 ` [PULL 32/38] migration/ram: Remove RAMState from xbzrle_cache_zero_page Juan Quintela
2023-10-17 8:29 ` [PULL 33/38] migration/ram: Stop passing QEMUFile around in save_zero_page Juan Quintela
2023-10-17 8:29 ` [PULL 34/38] migration/ram: Move xbzrle zero page handling into save_zero_page Juan Quintela
2023-10-17 8:30 ` [PULL 35/38] migration/ram: Merge save_zero_page functions Juan Quintela
2023-10-17 8:30 ` [PULL 36/38] migration/multifd: Remove direct "socket" references Juan Quintela
2023-10-17 8:30 ` [PULL 37/38] migration/multifd: Unify multifd_send_thread error paths Juan Quintela
2023-10-17 8:30 ` [PULL 38/38] migration/multifd: Clarify Error usage in multifd_channel_connect Juan Quintela
2023-10-17 19:04 ` [PULL 00/38] Migration 20231017 patches Stefan Hajnoczi
-- strict thread matches above, loose matches on Subject: below --
2023-10-16 10:06 [PULL 00/38] Migration 20231016 patches Juan Quintela
2023-10-16 10:06 ` [PULL 07/38] migration: Add capability parsing to analyze-migration.py 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=20231017083003.15951-8-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).