OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

tests/qtest/migration-test: Fix analyze-migration.py for s390x

Browse Source 
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>
This commit is contained in:
Thomas Huth 2023-11-20 12:39:51 +01:00
parent b447378e12
commit 81c2c9dd5d
2 changed files with 34 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
scripts/analyze-migration.py
View File

@ -263,6 +263,34 @@ class HTABSection(object):
return "" 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): class ConfigurationSection(object):
def __init__(self, file, desc): def __init__(self, file, desc):
self.file = file self.file = file
@ -544,8 +572,11 @@ class MigrationDump(object):
QEMU_VM_SECTION_FOOTER= 0x7e QEMU_VM_SECTION_FOOTER= 0x7e
def __init__(self, filename): def __init__(self, filename):
self.section_classes = { ( 'ram', 0 ) : [ RamSection, None ], self.section_classes = {
( 'spapr/htab', 0) : ( HTABSection, None ) } ( 'ram', 0 ) : [ RamSection, None ],
( 's390-storage_attributes', 0 ) : [ S390StorageAttributes, None],
( 'spapr/htab', 0) : ( HTABSection, None )
}
self.filename = filename self.filename = filename
self.vmsd_desc = None self.vmsd_desc = None

4
tests/qtest/migration-test.c
View File

@ -3360,9 +3360,7 @@ int main(int argc, char **argv)
qtest_add_func("/migration/bad_dest", test_baddest); qtest_add_func("/migration/bad_dest", test_baddest);
#ifndef _WIN32 #ifndef _WIN32
if (!g_str_equal(arch, "s390x")) { qtest_add_func("/migration/analyze-script", test_analyze_script);
qtest_add_func("/migration/analyze-script", test_analyze_script);
}
#endif #endif
qtest_add_func("/migration/precopy/unix/plain", test_precopy_unix_plain); qtest_add_func("/migration/precopy/unix/plain", test_precopy_unix_plain);
qtest_add_func("/migration/precopy/unix/xbzrle", test_precopy_unix_xbzrle); qtest_add_func("/migration/precopy/unix/xbzrle", test_precopy_unix_xbzrle);