From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: amit.shah@redhat.com,
Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>,
dgilbert@redhat.com
Subject: [Qemu-devel] [PULL 5/5] migration: fix analyze-migration.py script
Date: Wed, 4 Nov 2015 13:48:57 +0100 [thread overview]
Message-ID: <1446641337-2684-6-git-send-email-quintela@redhat.com> (raw)
In-Reply-To: <1446641337-2684-1-git-send-email-quintela@redhat.com>
From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Commit 61964 "Add configuration section" broke the analyze-migration.py script
which terminates due to the unrecognised section. Fix the script by parsing
the contents of the configuration section directly into a new
ConfigurationSection object (although nothing is done with it yet).
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Juan Quintela <quintela@redhat.com>al3
Signed-off-by: Juan Quintela <quintela@redhat.com>al3
---
scripts/analyze-migration.py | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/scripts/analyze-migration.py b/scripts/analyze-migration.py
index f6894be..1455387 100755
--- a/scripts/analyze-migration.py
+++ b/scripts/analyze-migration.py
@@ -252,6 +252,15 @@ class HTABSection(object):
def getDict(self):
return ""
+
+class ConfigurationSection(object):
+ def __init__(self, file):
+ self.file = file
+
+ def read(self):
+ name_len = self.file.read32()
+ name = self.file.readstr(len = name_len)
+
class VMSDFieldGeneric(object):
def __init__(self, desc, file):
self.file = file
@@ -474,6 +483,7 @@ class MigrationDump(object):
QEMU_VM_SECTION_FULL = 0x04
QEMU_VM_SUBSECTION = 0x05
QEMU_VM_VMDESCRIPTION = 0x06
+ QEMU_VM_CONFIGURATION = 0x07
QEMU_VM_SECTION_FOOTER= 0x7e
def __init__(self, filename):
@@ -514,6 +524,9 @@ class MigrationDump(object):
section_type = file.read8()
if section_type == self.QEMU_VM_EOF:
break
+ elif section_type == self.QEMU_VM_CONFIGURATION:
+ section = ConfigurationSection(file)
+ section.read()
elif section_type == self.QEMU_VM_SECTION_START or section_type == self.QEMU_VM_SECTION_FULL:
section_id = file.read32()
name = file.readstr()
--
2.4.3
next prev parent reply other threads:[~2015-11-04 12:49 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-04 12:48 [Qemu-devel] [PULL 0/5] Migration pull request Juan Quintela
2015-11-04 12:48 ` [Qemu-devel] [PULL 1/5] migration: defer migration_end & blk_mig_cleanup Juan Quintela
2015-11-04 12:48 ` [Qemu-devel] [PULL 2/5] migration: rename qemu_savevm_state_cancel Juan Quintela
2015-11-04 12:48 ` [Qemu-devel] [PULL 3/5] migration: rename cancel to cleanup in SaveVMHandles Juan Quintela
2015-11-04 12:48 ` [Qemu-devel] [PULL 4/5] migration: code clean up Juan Quintela
2015-11-04 12:48 ` Juan Quintela [this message]
2015-11-05 10:48 ` [Qemu-devel] [PULL 0/5] Migration pull request 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=1446641337-2684-6-git-send-email-quintela@redhat.com \
--to=quintela@redhat.com \
--cc=amit.shah@redhat.com \
--cc=dgilbert@redhat.com \
--cc=mark.cave-ayland@ilande.co.uk \
--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).