aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorThomas Huth <thuth@redhat.com>2023-11-20 12:39:51 +0100
committerThomas Huth <thuth@redhat.com>2023-12-20 10:29:23 +0100
commit81c2c9dd5dc2a39b95317ca3a9baff0184f9f097 (patch)
treef09275dcac662fe4f780b3aa00bd7c8f6278bb1a /scripts
parentb447378e121713faa4c63e8c93a8ebf25218fc40 (diff)
downloadqemu-81c2c9dd5dc2a39b95317ca3a9baff0184f9f097.zip
qemu-81c2c9dd5dc2a39b95317ca3a9baff0184f9f097.tar.gz
qemu-81c2c9dd5dc2a39b95317ca3a9baff0184f9f097.tar.bz2
tests/qtest/migration-test: Fix analyze-migration.py for s390x
The migration stream on s390x contains data for the storage_attributes which the analyze-migration.py cannot handle yet. Add the basic code for handling this, so we can re-enable the check in the migration-test. Message-ID: <20231120113951.162090-1-thuth@redhat.com> Reviewed-by: Fabiano Rosas <farosas@suse.de> Signed-off-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/analyze-migration.py35
1 files changed, 33 insertions, 2 deletions
diff --git a/scripts/analyze-migration.py b/scripts/analyze-migration.py
index de506cb..a39dfb8 100755
--- a/scripts/analyze-migration.py
+++ b/scripts/analyze-migration.py
@@ -263,6 +263,34 @@ class HTABSection(object):
return ""
+class S390StorageAttributes(object):
+ STATTR_FLAG_EOS = 0x01
+ STATTR_FLAG_MORE = 0x02
+ STATTR_FLAG_ERROR = 0x04
+ STATTR_FLAG_DONE = 0x08
+
+ def __init__(self, file, version_id, device, section_key):
+ if version_id != 0:
+ raise Exception("Unknown storage_attributes version %d" % version_id)
+
+ self.file = file
+ self.section_key = section_key
+
+ def read(self):
+ while True:
+ addr_flags = self.file.read64()
+ flags = addr_flags & 0xfff
+ if (flags & (self.STATTR_FLAG_DONE | self.STATTR_FLAG_EOS)):
+ return
+ if (flags & self.STATTR_FLAG_ERROR):
+ raise Exception("Error in migration stream")
+ count = self.file.read64()
+ self.file.readvar(count)
+
+ def getDict(self):
+ return ""
+
+
class ConfigurationSection(object):
def __init__(self, file, desc):
self.file = file
@@ -544,8 +572,11 @@ class MigrationDump(object):
QEMU_VM_SECTION_FOOTER= 0x7e
def __init__(self, filename):
- self.section_classes = { ( 'ram', 0 ) : [ RamSection, None ],
- ( 'spapr/htab', 0) : ( HTABSection, None ) }
+ self.section_classes = {
+ ( 'ram', 0 ) : [ RamSection, None ],
+ ( 's390-storage_attributes', 0 ) : [ S390StorageAttributes, None],
+ ( 'spapr/htab', 0) : ( HTABSection, None )
+ }
self.filename = filename
self.vmsd_desc = None