Convert a legacy migration stream to a v2 stream.
"""
+from __future__ import print_function
+
import sys
import os, os.path
import syslog
from struct import calcsize, unpack, pack
+from xen.util import open_file_or_fd as open_file_or_fd
from xen.migration import legacy, public, libxc, libxl, xl
__version__ = 1
for line in msg.split("\n"):
syslog.syslog(syslog.LOG_INFO, line)
else:
- print msg
+ print(msg)
def err(msg):
"""Error message, routed to appropriate destination"""
if log_to_syslog:
for line in msg.split("\n"):
syslog.syslog(syslog.LOG_ERR, line)
- print >> sys.stderr, msg
+ print(msg, file = sys.stderr)
-class StreamError(StandardError):
+class StreamError(Exception):
"""Error with the incoming migration stream"""
pass
# libxl
self.libxl = fmt == "libxl"
- self.emu_xenstore = "" # NUL terminated key&val pairs from "toolstack" records
+ self.emu_xenstore = b"" # NUL terminated key&val pairs from "toolstack" records
def write_libxc_ihdr():
stream_write(pack(libxc.IHDR_FORMAT,
))
def write_record(rt, *argl):
- alldata = ''.join(argl)
+ alldata = b''.join(argl)
length = len(alldata)
record = pack(libxc.RH_FORMAT, rt, length) + alldata
plen = (8 - (length & 7)) & 7
- record += '\x00' * plen
+ record += b'\x00' * plen
stream_write(record)
pack("Q" * len(params), *params))
def write_libxl_end():
- write_record(libxl.REC_TYPE_end, "")
+ write_record(libxl.REC_TYPE_end)
def write_libxl_libxc_context():
- write_record(libxl.REC_TYPE_libxc_context, "")
+ write_record(libxl.REC_TYPE_libxc_context)
def write_libxl_emulator_xenstore_data(data):
write_record(libxl.REC_TYPE_emulator_xenstore_data,
so_far += datasz
# Eww, but this is how it is done :(
- if blkid == "vcpu":
+ if blkid == b"vcpu":
vm.basic_len = datasz
write_libxc_pv_info(vm)
- elif blkid == "extv":
+ elif blkid == b"extv":
vm.extd = True
- elif blkid == "xcnt":
+ elif blkid == b"xcnt":
vm.xsave_len, = unpack("I", data[:4])
info("xcnt sz 0x%x" % (vm.xsave_len, ))
info("Got shinfo")
write_record(libxc.REC_TYPE_shared_info, shinfo)
- write_record(libxc.REC_TYPE_end, "")
+ write_record(libxc.REC_TYPE_end)
def read_libxl_toolstack(vm, data):
if twidth == 64:
name = name[:-4]
- if name[-1] != '\x00':
+ if name[-1] != b'\x00':
raise StreamError("physmap name not NUL terminated")
- root = "physmap/%x" % (phys,)
- kv = [root + "/start_addr", "%x" % (start, ),
- root + "/size", "%x" % (size, ),
- root + "/name", name[:-1]]
+ root = b"physmap/%x" % (phys, )
+ kv = [root + b"/start_addr", b"%x" % (start, ),
+ root + b"/size", b"%x" % (size, ),
+ root + b"/name", name[:-1]]
for key, val in zip(kv[0::2], kv[1::2]):
- info(" '%s' = '%s'" % (key, val))
+ info(" '%s' = '%s'" % (key.decode(), val.decode()))
- vm.emu_xenstore += '\x00'.join(kv) + '\x00'
+ vm.emu_xenstore += b'\x00'.join(kv) + b'\x00'
def read_chunks(vm):
blob = rdexact(blobsz)
write_record(libxc.REC_TYPE_hvm_context, blob)
- write_record(libxc.REC_TYPE_end, "")
+ write_record(libxc.REC_TYPE_end)
sig, = unpack("21s", rawsig)
info("Qemu signature: %s" % (sig, ))
- if sig == "DeviceModelRecord0002":
+ if sig == b"DeviceModelRecord0002":
rawsz = rdexact(4)
sz, = unpack("I", rawsz)
qdata = rdexact(sz)
return 2
return 0
-def open_file_or_fd(val, mode):
- """
- If 'val' looks like a decimal integer, open it as an fd. If not, try to
- open it as a regular file.
- """
-
- fd = -1
- try:
- # Does it look like an integer?
- try:
- fd = int(val, 10)
- except ValueError:
- pass
-
- # Try to open it...
- if fd != -1:
- return os.fdopen(fd, mode, 0)
- else:
- return open(val, mode, 0)
-
- except StandardError, e:
- if fd != -1:
- err("Unable to open fd %d: %s: %s" %
- (fd, e.__class__.__name__, e))
- else:
- err("Unable to open file '%s': %s: %s" %
- (val, e.__class__.__name__, e))
-
- raise SystemExit(1)
-
def main():
from optparse import OptionParser
if __name__ == "__main__":
try:
sys.exit(main())
- except SystemExit, e:
+ except SystemExit as e:
sys.exit(e.code)
except KeyboardInterrupt:
sys.exit(1)
""" Verify a v2 format migration stream """
+from __future__ import print_function
+
import sys
import struct
import os, os.path
import syslog
import traceback
+from xen.util import open_file_or_fd as open_file_or_fd
from xen.migration.verify import StreamError, RecordError
from xen.migration.libxc import VerifyLibxc
from xen.migration.libxl import VerifyLibxl
for line in msg.split("\n"):
syslog.syslog(syslog.LOG_INFO, line)
else:
- print msg
+ print(msg)
def err(msg):
"""Error message, routed to appropriate destination"""
if log_to_syslog:
for line in msg.split("\n"):
syslog.syslog(syslog.LOG_ERR, line)
- print >> sys.stderr, msg
+ print(msg, file = sys.stderr)
def stream_read(_ = None):
"""Read from input"""
"""Skip over an xl header in the stream"""
hdr = rdexact(32)
- if hdr != "Xen saved domain, xl format\n \0 \r":
+ if hdr != b"Xen saved domain, xl format\n \0 \r":
raise StreamError("No xl header")
_, mflags, _, optlen = unpack_exact("=IIII")
err(traceback.format_exc())
return 1
- except StandardError:
+ except Exception:
err("Script Error:")
err(traceback.format_exc())
err("Please fix me")
return 0
-def open_file_or_fd(val, mode, buffering):
- """
- If 'val' looks like a decimal integer, open it as an fd. If not, try to
- open it as a regular file.
- """
-
- fd = -1
- try:
- # Does it look like an integer?
- try:
- fd = int(val, 10)
- except ValueError:
- pass
-
- # Try to open it...
- if fd != -1:
- return os.fdopen(fd, mode, buffering)
- else:
- return open(val, mode, buffering)
-
- except StandardError, e:
- if fd != -1:
- err("Unable to open fd %d: %s: %s" %
- (fd, e.__class__.__name__, e))
- else:
- err("Unable to open file '%s': %s: %s" %
- (val, e.__class__.__name__, e))
-
- raise SystemExit(2)
def main():
""" main """
if __name__ == "__main__":
try:
sys.exit(main())
- except SystemExit, e:
+ except SystemExit as e:
sys.exit(e.code)
except KeyboardInterrupt:
sys.exit(2)
from xen.migration.verify import StreamError, RecordError, VerifyBase
-# In Python3 long type have been merged into int, 1L syntax is no longer valid
-if sys.version_info > (3,):
- long = int
-
# Image Header
IHDR_FORMAT = "!QIIHHI"
# page_data
PAGE_DATA_FORMAT = "II"
-PAGE_DATA_PFN_MASK = (long(1) << 52) - 1
-PAGE_DATA_PFN_RESZ_MASK = ((long(1) << 60) - 1) & ~((long(1) << 52) - 1)
+PAGE_DATA_PFN_MASK = (1 << 52) - 1
+PAGE_DATA_PFN_RESZ_MASK = ((1 << 60) - 1) & ~((1 << 52) - 1)
# flags from xen/public/domctl.h: XEN_DOMCTL_PFINFO_* shifted by 32 bits
PAGE_DATA_TYPE_SHIFT = 60
-PAGE_DATA_TYPE_LTABTYPE_MASK = (long(0x7) << PAGE_DATA_TYPE_SHIFT)
-PAGE_DATA_TYPE_LTAB_MASK = (long(0xf) << PAGE_DATA_TYPE_SHIFT)
-PAGE_DATA_TYPE_LPINTAB = (long(0x8) << PAGE_DATA_TYPE_SHIFT) # Pinned pagetable
-
-PAGE_DATA_TYPE_NOTAB = (long(0x0) << PAGE_DATA_TYPE_SHIFT) # Regular page
-PAGE_DATA_TYPE_L1TAB = (long(0x1) << PAGE_DATA_TYPE_SHIFT) # L1 pagetable
-PAGE_DATA_TYPE_L2TAB = (long(0x2) << PAGE_DATA_TYPE_SHIFT) # L2 pagetable
-PAGE_DATA_TYPE_L3TAB = (long(0x3) << PAGE_DATA_TYPE_SHIFT) # L3 pagetable
-PAGE_DATA_TYPE_L4TAB = (long(0x4) << PAGE_DATA_TYPE_SHIFT) # L4 pagetable
-PAGE_DATA_TYPE_BROKEN = (long(0xd) << PAGE_DATA_TYPE_SHIFT) # Broken
-PAGE_DATA_TYPE_XALLOC = (long(0xe) << PAGE_DATA_TYPE_SHIFT) # Allocate-only
-PAGE_DATA_TYPE_XTAB = (long(0xf) << PAGE_DATA_TYPE_SHIFT) # Invalid
+PAGE_DATA_TYPE_LTABTYPE_MASK = (0x7 << PAGE_DATA_TYPE_SHIFT)
+PAGE_DATA_TYPE_LTAB_MASK = (0xf << PAGE_DATA_TYPE_SHIFT)
+PAGE_DATA_TYPE_LPINTAB = (0x8 << PAGE_DATA_TYPE_SHIFT) # Pinned pagetable
+
+PAGE_DATA_TYPE_NOTAB = (0x0 << PAGE_DATA_TYPE_SHIFT) # Regular page
+PAGE_DATA_TYPE_L1TAB = (0x1 << PAGE_DATA_TYPE_SHIFT) # L1 pagetable
+PAGE_DATA_TYPE_L2TAB = (0x2 << PAGE_DATA_TYPE_SHIFT) # L2 pagetable
+PAGE_DATA_TYPE_L3TAB = (0x3 << PAGE_DATA_TYPE_SHIFT) # L3 pagetable
+PAGE_DATA_TYPE_L4TAB = (0x4 << PAGE_DATA_TYPE_SHIFT) # L4 pagetable
+PAGE_DATA_TYPE_BROKEN = (0xd << PAGE_DATA_TYPE_SHIFT) # Broken
+PAGE_DATA_TYPE_XALLOC = (0xe << PAGE_DATA_TYPE_SHIFT) # Allocate-only
+PAGE_DATA_TYPE_XTAB = (0xf << PAGE_DATA_TYPE_SHIFT) # Invalid
# x86_pv_info
X86_PV_INFO_FORMAT = "BBHI"
self.squashed_pagedata_records += 1
padding = content[length:]
- if padding != "\x00" * len(padding):
+ if padding != b"\x00" * len(padding):
raise StreamError("Padding containing non0 bytes found")
if rtype not in record_verifiers:
projects / xen.git / commitdiff