mirror of https://gitee.com/openkylin/qemu.git
Python queue, 2018-06-11
* Make code compatible with Python 3 using 'futurize --stage1' * Require Python >= 2.7 and remove Python 2.6 compatibility modules -----BEGIN PGP SIGNATURE----- iQIcBAABCAAGBQJbHrRGAAoJECgHk2+YTcWmeV8P/ReYBQvv4QxFrGgFJs0unWR3 OLU/zZ3Uaf1U8Q/oJ/pLSYK+XFWJYC9utXApTpBr4Xaxd1eavHl/EpjS/iHaL8VB HguuvA2SdlU9+5ZJMk8IdG1Hft/cYLiLNCMJRQzrAL/CL/ToZOQyOPU0NNmyk0S5 J3cug4VCDJMs+unKPHL/ThxXoWS1sRq7DZyYeaFBqOuDBLf7ZXSGOWPTC4KKwGbl N7sXxhDUbXFnY6HYpdShB8gACeI4P0WN0UCtGkvMwjF17DbHMohgoaXkzUks4wCI gJF7m0tFY9rR2w/RPiHeZmPcuWsxFxKjLCE93qrxNSoq7DWQyS6UprIf1CaW6rgz rPJAbxjHedKhW3M4gW9utpqYlSweTg7kQP1jLStZATvCnRgjQ5BtDcBJFrXa0zdb 6+py9MlvE0ysiXPl6vmbcn8VzDq+TnmyXMj2zrpcXMLJphnUcJlD1EgbXMTqXRY5 HUN61ZWyc6nj3go52QaC1hupcCSf4macgoXWh8BORuHQZcL5xom4rOJL4MwhQIu/ 5crYp/Xa9SA1FU7c0we8Np53feSU+5PGY5VyHJJyRoVSEriJnvvN9kCBpziln+Y/ v0CIFt7ohVB1OzsdNvFLSsRrlPd1RReiGOE9ixgcb37mIKBPWc2u73Mws37lxxiC BO64VpDUXdwpyIrHXxTU =d1wy -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/ehabkost/tags/python-next-pull-request' into staging Python queue, 2018-06-11 * Make code compatible with Python 3 using 'futurize --stage1' * Require Python >= 2.7 and remove Python 2.6 compatibility modules # gpg: Signature made Mon 11 Jun 2018 18:41:26 BST # gpg: using RSA key 2807936F984DC5A6 # gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>" # Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6 * remotes/ehabkost/tags/python-next-pull-request: python: Remove scripts/ordereddict.py python: Remove scripts/argparse.py configure: Require Python 2.7 or newer python: futurize -f lib2to3.fixes.fix_numliterals python: futurize -f lib2to3.fixes.fix_except python: futurize -f lib2to3.fixes.fix_renames python: futurize -f lib2to3.fixes.fix_tuple_params python: futurize -f lib2to3.fixes.fix_reduce python: futurize -f lib2to3.fixes.fix_standarderror python: futurize -f lib2to3.fixes.fix_has_key python: futurize -f libfuturize.fixes.fix_next_call python: futurize -f libfuturize.fixes.fix_absolute_import python: futurize -f libfuturize.fixes.fix_print_with_import Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell
commit
5eca450b2e
1
Makefile
1
Makefile
|
|
@ -567,7 +567,6 @@ $(SRC_PATH)/scripts/qapi/types.py \
|
|||
$(SRC_PATH)/scripts/qapi/visit.py \
|
||||
$(SRC_PATH)/scripts/qapi/common.py \
|
||||
$(SRC_PATH)/scripts/qapi/doc.py \
|
||||
$(SRC_PATH)/scripts/ordereddict.py \
|
||||
$(SRC_PATH)/scripts/qapi-gen.py
|
||||
|
||||
qga/qapi-generated/qga-qapi-types.c qga/qapi-generated/qga-qapi-types.h \
|
||||
|
|
|
|||
|
|
@ -1651,8 +1651,8 @@ fi
|
|||
|
||||
# Note that if the Python conditional here evaluates True we will exit
|
||||
# with status 1 which is a shell 'false' value.
|
||||
if ! $python -c 'import sys; sys.exit(sys.version_info < (2,6))'; then
|
||||
error_exit "Cannot use '$python', Python 2 >= 2.6 or Python 3 is required." \
|
||||
if ! $python -c 'import sys; sys.exit(sys.version_info < (2,7))'; then
|
||||
error_exit "Cannot use '$python', Python 2 >= 2.7 or Python 3 is required." \
|
||||
"Use --python=/path/to/python to specify a supported Python."
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
# Usage: ./analyse-9p-simpletrace <trace-events> <trace-pid>
|
||||
#
|
||||
# Author: Harsh Prateek Bora
|
||||
from __future__ import print_function
|
||||
import os
|
||||
import simpletrace
|
||||
|
||||
|
|
@ -79,135 +80,135 @@
|
|||
|
||||
class VirtFSRequestTracker(simpletrace.Analyzer):
|
||||
def begin(self):
|
||||
print "Pretty printing 9p simpletrace log ..."
|
||||
print("Pretty printing 9p simpletrace log ...")
|
||||
|
||||
def v9fs_rerror(self, tag, id, err):
|
||||
print "RERROR (tag =", tag, ", id =", symbol_9p[id], ", err = \"", os.strerror(err), "\")"
|
||||
print("RERROR (tag =", tag, ", id =", symbol_9p[id], ", err = \"", os.strerror(err), "\")")
|
||||
|
||||
def v9fs_version(self, tag, id, msize, version):
|
||||
print "TVERSION (tag =", tag, ", msize =", msize, ", version =", version, ")"
|
||||
print("TVERSION (tag =", tag, ", msize =", msize, ", version =", version, ")")
|
||||
|
||||
def v9fs_version_return(self, tag, id, msize, version):
|
||||
print "RVERSION (tag =", tag, ", msize =", msize, ", version =", version, ")"
|
||||
print("RVERSION (tag =", tag, ", msize =", msize, ", version =", version, ")")
|
||||
|
||||
def v9fs_attach(self, tag, id, fid, afid, uname, aname):
|
||||
print "TATTACH (tag =", tag, ", fid =", fid, ", afid =", afid, ", uname =", uname, ", aname =", aname, ")"
|
||||
print("TATTACH (tag =", tag, ", fid =", fid, ", afid =", afid, ", uname =", uname, ", aname =", aname, ")")
|
||||
|
||||
def v9fs_attach_return(self, tag, id, type, version, path):
|
||||
print "RATTACH (tag =", tag, ", qid={type =", type, ", version =", version, ", path =", path, "})"
|
||||
print("RATTACH (tag =", tag, ", qid={type =", type, ", version =", version, ", path =", path, "})")
|
||||
|
||||
def v9fs_stat(self, tag, id, fid):
|
||||
print "TSTAT (tag =", tag, ", fid =", fid, ")"
|
||||
print("TSTAT (tag =", tag, ", fid =", fid, ")")
|
||||
|
||||
def v9fs_stat_return(self, tag, id, mode, atime, mtime, length):
|
||||
print "RSTAT (tag =", tag, ", mode =", mode, ", atime =", atime, ", mtime =", mtime, ", length =", length, ")"
|
||||
print("RSTAT (tag =", tag, ", mode =", mode, ", atime =", atime, ", mtime =", mtime, ", length =", length, ")")
|
||||
|
||||
def v9fs_getattr(self, tag, id, fid, request_mask):
|
||||
print "TGETATTR (tag =", tag, ", fid =", fid, ", request_mask =", hex(request_mask), ")"
|
||||
print("TGETATTR (tag =", tag, ", fid =", fid, ", request_mask =", hex(request_mask), ")")
|
||||
|
||||
def v9fs_getattr_return(self, tag, id, result_mask, mode, uid, gid):
|
||||
print "RGETATTR (tag =", tag, ", result_mask =", hex(result_mask), ", mode =", oct(mode), ", uid =", uid, ", gid =", gid, ")"
|
||||
print("RGETATTR (tag =", tag, ", result_mask =", hex(result_mask), ", mode =", oct(mode), ", uid =", uid, ", gid =", gid, ")")
|
||||
|
||||
def v9fs_walk(self, tag, id, fid, newfid, nwnames):
|
||||
print "TWALK (tag =", tag, ", fid =", fid, ", newfid =", newfid, ", nwnames =", nwnames, ")"
|
||||
print("TWALK (tag =", tag, ", fid =", fid, ", newfid =", newfid, ", nwnames =", nwnames, ")")
|
||||
|
||||
def v9fs_walk_return(self, tag, id, nwnames, qids):
|
||||
print "RWALK (tag =", tag, ", nwnames =", nwnames, ", qids =", hex(qids), ")"
|
||||
print("RWALK (tag =", tag, ", nwnames =", nwnames, ", qids =", hex(qids), ")")
|
||||
|
||||
def v9fs_open(self, tag, id, fid, mode):
|
||||
print "TOPEN (tag =", tag, ", fid =", fid, ", mode =", oct(mode), ")"
|
||||
print("TOPEN (tag =", tag, ", fid =", fid, ", mode =", oct(mode), ")")
|
||||
|
||||
def v9fs_open_return(self, tag, id, type, version, path, iounit):
|
||||
print "ROPEN (tag =", tag, ", qid={type =", type, ", version =", version, ", path =", path, "}, iounit =", iounit, ")"
|
||||
print("ROPEN (tag =", tag, ", qid={type =", type, ", version =", version, ", path =", path, "}, iounit =", iounit, ")")
|
||||
|
||||
def v9fs_lcreate(self, tag, id, dfid, flags, mode, gid):
|
||||
print "TLCREATE (tag =", tag, ", dfid =", dfid, ", flags =", oct(flags), ", mode =", oct(mode), ", gid =", gid, ")"
|
||||
print("TLCREATE (tag =", tag, ", dfid =", dfid, ", flags =", oct(flags), ", mode =", oct(mode), ", gid =", gid, ")")
|
||||
|
||||
def v9fs_lcreate_return(self, tag, id, type, version, path, iounit):
|
||||
print "RLCREATE (tag =", tag, ", qid={type =", type, ", version =", version, ", path =", path, "}, iounit =", iounit, ")"
|
||||
print("RLCREATE (tag =", tag, ", qid={type =", type, ", version =", version, ", path =", path, "}, iounit =", iounit, ")")
|
||||
|
||||
def v9fs_fsync(self, tag, id, fid, datasync):
|
||||
print "TFSYNC (tag =", tag, ", fid =", fid, ", datasync =", datasync, ")"
|
||||
print("TFSYNC (tag =", tag, ", fid =", fid, ", datasync =", datasync, ")")
|
||||
|
||||
def v9fs_clunk(self, tag, id, fid):
|
||||
print "TCLUNK (tag =", tag, ", fid =", fid, ")"
|
||||
print("TCLUNK (tag =", tag, ", fid =", fid, ")")
|
||||
|
||||
def v9fs_read(self, tag, id, fid, off, max_count):
|
||||
print "TREAD (tag =", tag, ", fid =", fid, ", off =", off, ", max_count =", max_count, ")"
|
||||
print("TREAD (tag =", tag, ", fid =", fid, ", off =", off, ", max_count =", max_count, ")")
|
||||
|
||||
def v9fs_read_return(self, tag, id, count, err):
|
||||
print "RREAD (tag =", tag, ", count =", count, ", err =", err, ")"
|
||||
print("RREAD (tag =", tag, ", count =", count, ", err =", err, ")")
|
||||
|
||||
def v9fs_readdir(self, tag, id, fid, offset, max_count):
|
||||
print "TREADDIR (tag =", tag, ", fid =", fid, ", offset =", offset, ", max_count =", max_count, ")"
|
||||
print("TREADDIR (tag =", tag, ", fid =", fid, ", offset =", offset, ", max_count =", max_count, ")")
|
||||
|
||||
def v9fs_readdir_return(self, tag, id, count, retval):
|
||||
print "RREADDIR (tag =", tag, ", count =", count, ", retval =", retval, ")"
|
||||
print("RREADDIR (tag =", tag, ", count =", count, ", retval =", retval, ")")
|
||||
|
||||
def v9fs_write(self, tag, id, fid, off, count, cnt):
|
||||
print "TWRITE (tag =", tag, ", fid =", fid, ", off =", off, ", count =", count, ", cnt =", cnt, ")"
|
||||
print("TWRITE (tag =", tag, ", fid =", fid, ", off =", off, ", count =", count, ", cnt =", cnt, ")")
|
||||
|
||||
def v9fs_write_return(self, tag, id, total, err):
|
||||
print "RWRITE (tag =", tag, ", total =", total, ", err =", err, ")"
|
||||
print("RWRITE (tag =", tag, ", total =", total, ", err =", err, ")")
|
||||
|
||||
def v9fs_create(self, tag, id, fid, name, perm, mode):
|
||||
print "TCREATE (tag =", tag, ", fid =", fid, ", perm =", oct(perm), ", name =", name, ", mode =", oct(mode), ")"
|
||||
print("TCREATE (tag =", tag, ", fid =", fid, ", perm =", oct(perm), ", name =", name, ", mode =", oct(mode), ")")
|
||||
|
||||
def v9fs_create_return(self, tag, id, type, version, path, iounit):
|
||||
print "RCREATE (tag =", tag, ", qid={type =", type, ", version =", version, ", path =", path, "}, iounit =", iounit, ")"
|
||||
print("RCREATE (tag =", tag, ", qid={type =", type, ", version =", version, ", path =", path, "}, iounit =", iounit, ")")
|
||||
|
||||
def v9fs_symlink(self, tag, id, fid, name, symname, gid):
|
||||
print "TSYMLINK (tag =", tag, ", fid =", fid, ", name =", name, ", symname =", symname, ", gid =", gid, ")"
|
||||
print("TSYMLINK (tag =", tag, ", fid =", fid, ", name =", name, ", symname =", symname, ", gid =", gid, ")")
|
||||
|
||||
def v9fs_symlink_return(self, tag, id, type, version, path):
|
||||
print "RSYMLINK (tag =", tag, ", qid={type =", type, ", version =", version, ", path =", path, "})"
|
||||
print("RSYMLINK (tag =", tag, ", qid={type =", type, ", version =", version, ", path =", path, "})")
|
||||
|
||||
def v9fs_flush(self, tag, id, flush_tag):
|
||||
print "TFLUSH (tag =", tag, ", flush_tag =", flush_tag, ")"
|
||||
print("TFLUSH (tag =", tag, ", flush_tag =", flush_tag, ")")
|
||||
|
||||
def v9fs_link(self, tag, id, dfid, oldfid, name):
|
||||
print "TLINK (tag =", tag, ", dfid =", dfid, ", oldfid =", oldfid, ", name =", name, ")"
|
||||
print("TLINK (tag =", tag, ", dfid =", dfid, ", oldfid =", oldfid, ", name =", name, ")")
|
||||
|
||||
def v9fs_remove(self, tag, id, fid):
|
||||
print "TREMOVE (tag =", tag, ", fid =", fid, ")"
|
||||
print("TREMOVE (tag =", tag, ", fid =", fid, ")")
|
||||
|
||||
def v9fs_wstat(self, tag, id, fid, mode, atime, mtime):
|
||||
print "TWSTAT (tag =", tag, ", fid =", fid, ", mode =", oct(mode), ", atime =", atime, "mtime =", mtime, ")"
|
||||
print("TWSTAT (tag =", tag, ", fid =", fid, ", mode =", oct(mode), ", atime =", atime, "mtime =", mtime, ")")
|
||||
|
||||
def v9fs_mknod(self, tag, id, fid, mode, major, minor):
|
||||
print "TMKNOD (tag =", tag, ", fid =", fid, ", mode =", oct(mode), ", major =", major, ", minor =", minor, ")"
|
||||
print("TMKNOD (tag =", tag, ", fid =", fid, ", mode =", oct(mode), ", major =", major, ", minor =", minor, ")")
|
||||
|
||||
def v9fs_lock(self, tag, id, fid, type, start, length):
|
||||
print "TLOCK (tag =", tag, ", fid =", fid, "type =", type, ", start =", start, ", length =", length, ")"
|
||||
print("TLOCK (tag =", tag, ", fid =", fid, "type =", type, ", start =", start, ", length =", length, ")")
|
||||
|
||||
def v9fs_lock_return(self, tag, id, status):
|
||||
print "RLOCK (tag =", tag, ", status =", status, ")"
|
||||
print("RLOCK (tag =", tag, ", status =", status, ")")
|
||||
|
||||
def v9fs_getlock(self, tag, id, fid, type, start, length):
|
||||
print "TGETLOCK (tag =", tag, ", fid =", fid, "type =", type, ", start =", start, ", length =", length, ")"
|
||||
print("TGETLOCK (tag =", tag, ", fid =", fid, "type =", type, ", start =", start, ", length =", length, ")")
|
||||
|
||||
def v9fs_getlock_return(self, tag, id, type, start, length, proc_id):
|
||||
print "RGETLOCK (tag =", tag, "type =", type, ", start =", start, ", length =", length, ", proc_id =", proc_id, ")"
|
||||
print("RGETLOCK (tag =", tag, "type =", type, ", start =", start, ", length =", length, ", proc_id =", proc_id, ")")
|
||||
|
||||
def v9fs_mkdir(self, tag, id, fid, name, mode, gid):
|
||||
print "TMKDIR (tag =", tag, ", fid =", fid, ", name =", name, ", mode =", mode, ", gid =", gid, ")"
|
||||
print("TMKDIR (tag =", tag, ", fid =", fid, ", name =", name, ", mode =", mode, ", gid =", gid, ")")
|
||||
|
||||
def v9fs_mkdir_return(self, tag, id, type, version, path, err):
|
||||
print "RMKDIR (tag =", tag, ", qid={type =", type, ", version =", version, ", path =", path, "}, err =", err, ")"
|
||||
print("RMKDIR (tag =", tag, ", qid={type =", type, ", version =", version, ", path =", path, "}, err =", err, ")")
|
||||
|
||||
def v9fs_xattrwalk(self, tag, id, fid, newfid, name):
|
||||
print "TXATTRWALK (tag =", tag, ", fid =", fid, ", newfid =", newfid, ", xattr name =", name, ")"
|
||||
print("TXATTRWALK (tag =", tag, ", fid =", fid, ", newfid =", newfid, ", xattr name =", name, ")")
|
||||
|
||||
def v9fs_xattrwalk_return(self, tag, id, size):
|
||||
print "RXATTRWALK (tag =", tag, ", xattrsize =", size, ")"
|
||||
print("RXATTRWALK (tag =", tag, ", xattrsize =", size, ")")
|
||||
|
||||
def v9fs_xattrcreate(self, tag, id, fid, name, size, flags):
|
||||
print "TXATTRCREATE (tag =", tag, ", fid =", fid, ", name =", name, ", xattrsize =", size, ", flags =", flags, ")"
|
||||
print("TXATTRCREATE (tag =", tag, ", fid =", fid, ", name =", name, ", xattrsize =", size, ", flags =", flags, ")")
|
||||
|
||||
def v9fs_readlink(self, tag, id, fid):
|
||||
print "TREADLINK (tag =", tag, ", fid =", fid, ")"
|
||||
print("TREADLINK (tag =", tag, ", fid =", fid, ")")
|
||||
|
||||
def v9fs_readlink_return(self, tag, id, target):
|
||||
print "RREADLINK (tag =", tag, ", target =", target, ")"
|
||||
print("RREADLINK (tag =", tag, ", target =", target, ")")
|
||||
|
||||
simpletrace.run(VirtFSRequestTracker())
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
# Author: Alex Bennée <alex.bennee@linaro.org>
|
||||
#
|
||||
|
||||
from __future__ import print_function
|
||||
import os
|
||||
import simpletrace
|
||||
import argparse
|
||||
|
|
@ -77,7 +78,7 @@ def get_args():
|
|||
|
||||
# Now dump the individual lock stats
|
||||
for key, val in sorted(analyser.mutex_records.iteritems(),
|
||||
key=lambda (k,v): v["locks"]):
|
||||
key=lambda k_v: k_v[1]["locks"]):
|
||||
print ("Lock: %#x locks: %d, locked: %d, unlocked: %d" %
|
||||
(key, val["locks"], val["locked"], val["unlocked"]))
|
||||
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@
|
|||
# You should have received a copy of the GNU Lesser General Public
|
||||
# License along with this library; if not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
from __future__ import print_function
|
||||
import numpy as np
|
||||
import json
|
||||
import os
|
||||
|
|
@ -162,7 +163,7 @@ def read(self):
|
|||
len = self.file.read64()
|
||||
self.sizeinfo[self.name] = '0x%016x' % len
|
||||
if self.write_memory:
|
||||
print self.name
|
||||
print(self.name)
|
||||
mkdir_p('./' + os.path.dirname(self.name))
|
||||
f = open('./' + self.name, "wb")
|
||||
f.truncate(0)
|
||||
|
|
@ -588,7 +589,7 @@ def default(self, o):
|
|||
dump = MigrationDump(args.file)
|
||||
|
||||
dump.read(desc_only = True)
|
||||
print "desc.json"
|
||||
print("desc.json")
|
||||
f = open("desc.json", "wb")
|
||||
f.truncate()
|
||||
f.write(jsonenc.encode(dump.vmsd_desc))
|
||||
|
|
@ -596,7 +597,7 @@ def default(self, o):
|
|||
|
||||
dump.read(write_memory = True)
|
||||
dict = dump.getDict()
|
||||
print "state.json"
|
||||
print("state.json")
|
||||
f = open("state.json", "wb")
|
||||
f.truncate()
|
||||
f.write(jsonenc.encode(dict))
|
||||
|
|
@ -605,10 +606,10 @@ def default(self, o):
|
|||
dump = MigrationDump(args.file)
|
||||
dump.read(dump_memory = args.memory)
|
||||
dict = dump.getDict()
|
||||
print jsonenc.encode(dict)
|
||||
print(jsonenc.encode(dict))
|
||||
elif args.dump == "desc":
|
||||
dump = MigrationDump(args.file)
|
||||
dump.read(desc_only = True)
|
||||
print jsonenc.encode(dump.vmsd_desc)
|
||||
print(jsonenc.encode(dump.vmsd_desc))
|
||||
else:
|
||||
raise Exception("Please specify either -x, -d state or -d dump")
|
||||
|
|
|
|||
2406
scripts/argparse.py
2406
scripts/argparse.py
File diff suppressed because it is too large
Load Diff
|
|
@ -23,6 +23,7 @@
|
|||
Run QEMU with all combinations of -machine and -device types,
|
||||
check for crashes and unexpected errors.
|
||||
"""
|
||||
from __future__ import print_function
|
||||
|
||||
import sys
|
||||
import os
|
||||
|
|
@ -554,7 +555,7 @@ def main():
|
|||
tc[k] = v
|
||||
|
||||
if len(binariesToTest(args, tc)) == 0:
|
||||
print >>sys.stderr, "No QEMU binary found"
|
||||
print("No QEMU binary found", file=sys.stderr)
|
||||
parser.print_usage(sys.stderr)
|
||||
return 1
|
||||
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@
|
|||
This work is licensed under the terms of the GNU GPL, version 2 or later. See
|
||||
the COPYING file in the top-level directory.
|
||||
"""
|
||||
from __future__ import print_function
|
||||
|
||||
import ctypes
|
||||
import struct
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@
|
|||
# consuming CPU cycles. No disk I/O is performed since the ring buffer holds a
|
||||
# fixed-size in-memory trace.
|
||||
|
||||
from __future__ import print_function
|
||||
import sys
|
||||
import os
|
||||
|
||||
|
|
@ -77,8 +78,8 @@ def tail_trace():
|
|||
pass
|
||||
|
||||
def usage():
|
||||
print 'Usage: %s start [buffer_size_kb] | stop | dump | tail' % sys.argv[0]
|
||||
print 'Control the KVM flight recorder tracing.'
|
||||
print('Usage: %s start [buffer_size_kb] | stop | dump | tail' % sys.argv[0])
|
||||
print('Control the KVM flight recorder tracing.')
|
||||
sys.exit(0)
|
||||
|
||||
def main():
|
||||
|
|
@ -87,15 +88,15 @@ def main():
|
|||
|
||||
cmd = sys.argv[1]
|
||||
if cmd == '--version':
|
||||
print 'kvm_flightrecorder version 1.0'
|
||||
print('kvm_flightrecorder version 1.0')
|
||||
sys.exit(0)
|
||||
|
||||
if not os.path.isdir(tracing_dir):
|
||||
print 'Unable to tracing debugfs directory, try:'
|
||||
print 'mount -t debugfs none /sys/kernel/debug'
|
||||
print('Unable to tracing debugfs directory, try:')
|
||||
print('mount -t debugfs none /sys/kernel/debug')
|
||||
sys.exit(1)
|
||||
if not os.access(tracing_dir, os.W_OK):
|
||||
print 'Unable to write to tracing debugfs directory, please run as root'
|
||||
print('Unable to write to tracing debugfs directory, please run as root')
|
||||
sys.exit(1)
|
||||
|
||||
if cmd == 'start':
|
||||
|
|
@ -105,16 +106,16 @@ def main():
|
|||
try:
|
||||
buffer_size_kb = int(sys.argv[2])
|
||||
except ValueError:
|
||||
print 'Invalid per-cpu trace buffer size in KB'
|
||||
print('Invalid per-cpu trace buffer size in KB')
|
||||
sys.exit(1)
|
||||
write_file(trace_path('buffer_size_kb'), str(buffer_size_kb))
|
||||
print 'Per-CPU ring buffer size set to %d KB' % buffer_size_kb
|
||||
print('Per-CPU ring buffer size set to %d KB' % buffer_size_kb)
|
||||
|
||||
start_tracing()
|
||||
print 'KVM flight recorder enabled'
|
||||
print('KVM flight recorder enabled')
|
||||
elif cmd == 'stop':
|
||||
stop_tracing()
|
||||
print 'KVM flight recorder disabled'
|
||||
print('KVM flight recorder disabled')
|
||||
elif cmd == 'dump':
|
||||
dump_trace()
|
||||
elif cmd == 'tail':
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@
|
|||
# This work is licensed under the terms of the GNU GPL, version 2. See
|
||||
# the COPYING file in the top-level directory.
|
||||
|
||||
from __future__ import print_function
|
||||
MSR_IA32_VMX_BASIC = 0x480
|
||||
MSR_IA32_VMX_PINBASED_CTLS = 0x481
|
||||
MSR_IA32_VMX_PROCBASED_CTLS = 0x482
|
||||
|
|
|
|||
|
|
@ -1,128 +0,0 @@
|
|||
# Copyright (c) 2009 Raymond Hettinger
|
||||
#
|
||||
# Permission is hereby granted, free of charge, to any person
|
||||
# obtaining a copy of this software and associated documentation files
|
||||
# (the "Software"), to deal in the Software without restriction,
|
||||
# including without limitation the rights to use, copy, modify, merge,
|
||||
# publish, distribute, sublicense, and/or sell copies of the Software,
|
||||
# and to permit persons to whom the Software is furnished to do so,
|
||||
# subject to the following conditions:
|
||||
#
|
||||
# The above copyright notice and this permission notice shall be
|
||||
# included in all copies or substantial portions of the Software.
|
||||
#
|
||||
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
||||
# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
||||
# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||
# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
||||
# OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
from UserDict import DictMixin
|
||||
|
||||
|
||||
class OrderedDict(dict, DictMixin):
|
||||
|
||||
def __init__(self, *args, **kwds):
|
||||
if len(args) > 1:
|
||||
raise TypeError('expected at most 1 arguments, got %d' % len(args))
|
||||
try:
|
||||
self.__end
|
||||
except AttributeError:
|
||||
self.clear()
|
||||
self.update(*args, **kwds)
|
||||
|
||||
def clear(self):
|
||||
self.__end = end = []
|
||||
end += [None, end, end] # sentinel node for doubly linked list
|
||||
self.__map = {} # key --> [key, prev, next]
|
||||
dict.clear(self)
|
||||
|
||||
def __setitem__(self, key, value):
|
||||
if key not in self:
|
||||
end = self.__end
|
||||
curr = end[1]
|
||||
curr[2] = end[1] = self.__map[key] = [key, curr, end]
|
||||
dict.__setitem__(self, key, value)
|
||||
|
||||
def __delitem__(self, key):
|
||||
dict.__delitem__(self, key)
|
||||
key, prev, next = self.__map.pop(key)
|
||||
prev[2] = next
|
||||
next[1] = prev
|
||||
|
||||
def __iter__(self):
|
||||
end = self.__end
|
||||
curr = end[2]
|
||||
while curr is not end:
|
||||
yield curr[0]
|
||||
curr = curr[2]
|
||||
|
||||
def __reversed__(self):
|
||||
end = self.__end
|
||||
curr = end[1]
|
||||
while curr is not end:
|
||||
yield curr[0]
|
||||
curr = curr[1]
|
||||
|
||||
def popitem(self, last=True):
|
||||
if not self:
|
||||
raise KeyError('dictionary is empty')
|
||||
if last:
|
||||
key = reversed(self).next()
|
||||
else:
|
||||
key = iter(self).next()
|
||||
value = self.pop(key)
|
||||
return key, value
|
||||
|
||||
def __reduce__(self):
|
||||
items = [[k, self[k]] for k in self]
|
||||
tmp = self.__map, self.__end
|
||||
del self.__map, self.__end
|
||||
inst_dict = vars(self).copy()
|
||||
self.__map, self.__end = tmp
|
||||
if inst_dict:
|
||||
return (self.__class__, (items,), inst_dict)
|
||||
return self.__class__, (items,)
|
||||
|
||||
def keys(self):
|
||||
return list(self)
|
||||
|
||||
setdefault = DictMixin.setdefault
|
||||
update = DictMixin.update
|
||||
pop = DictMixin.pop
|
||||
values = DictMixin.values
|
||||
items = DictMixin.items
|
||||
iterkeys = DictMixin.iterkeys
|
||||
itervalues = DictMixin.itervalues
|
||||
iteritems = DictMixin.iteritems
|
||||
|
||||
def __repr__(self):
|
||||
if not self:
|
||||
return '%s()' % (self.__class__.__name__,)
|
||||
return '%s(%r)' % (self.__class__.__name__, self.items())
|
||||
|
||||
def copy(self):
|
||||
return self.__class__(self)
|
||||
|
||||
@classmethod
|
||||
def fromkeys(cls, iterable, value=None):
|
||||
d = cls()
|
||||
for key in iterable:
|
||||
d[key] = value
|
||||
return d
|
||||
|
||||
def __eq__(self, other):
|
||||
if isinstance(other, OrderedDict):
|
||||
if len(self) != len(other):
|
||||
return False
|
||||
for p, q in zip(self.items(), other.items()):
|
||||
if p != q:
|
||||
return False
|
||||
return True
|
||||
return dict.__eq__(self, other)
|
||||
|
||||
def __ne__(self, other):
|
||||
return not self == other
|
||||
|
|
@ -16,10 +16,7 @@
|
|||
import os
|
||||
import re
|
||||
import string
|
||||
try:
|
||||
from collections import OrderedDict
|
||||
except:
|
||||
from ordereddict import OrderedDict
|
||||
from collections import OrderedDict
|
||||
|
||||
builtin_types = {
|
||||
'null': 'QTYPE_QNULL',
|
||||
|
|
|
|||
|
|
@ -36,10 +36,12 @@
|
|||
# See also: https://wiki.qemu.org/Features/QAPI/GuestAgent
|
||||
#
|
||||
|
||||
from __future__ import print_function
|
||||
from __future__ import absolute_import
|
||||
import base64
|
||||
import random
|
||||
|
||||
import qmp
|
||||
from . import qmp
|
||||
|
||||
|
||||
class QemuGuestAgent(qmp.QEMUMonitorProtocol):
|
||||
|
|
@ -135,7 +137,7 @@ class QemuGuestAgentClient:
|
|||
|
||||
def fsfreeze(self, cmd):
|
||||
if cmd not in ['status', 'freeze', 'thaw']:
|
||||
raise StandardError('Invalid command: ' + cmd)
|
||||
raise Exception('Invalid command: ' + cmd)
|
||||
|
||||
return getattr(self.qga, 'fsfreeze' + '_' + cmd)()
|
||||
|
||||
|
|
@ -144,7 +146,7 @@ class QemuGuestAgentClient:
|
|||
|
||||
def suspend(self, mode):
|
||||
if mode not in ['disk', 'ram', 'hybrid']:
|
||||
raise StandardError('Invalid mode: ' + mode)
|
||||
raise Exception('Invalid mode: ' + mode)
|
||||
|
||||
try:
|
||||
getattr(self.qga, 'suspend' + '_' + mode)()
|
||||
|
|
@ -155,7 +157,7 @@ class QemuGuestAgentClient:
|
|||
|
||||
def shutdown(self, mode='powerdown'):
|
||||
if mode not in ['powerdown', 'halt', 'reboot']:
|
||||
raise StandardError('Invalid mode: ' + mode)
|
||||
raise Exception('Invalid mode: ' + mode)
|
||||
|
||||
try:
|
||||
self.qga.shutdown(mode=mode)
|
||||
|
|
|
|||
|
|
@ -10,8 +10,10 @@
|
|||
# This work is licensed under the terms of the GNU GPLv2 or later.
|
||||
# See the COPYING file in the top-level directory.
|
||||
|
||||
from __future__ import print_function
|
||||
from __future__ import absolute_import
|
||||
import sys, os
|
||||
from qmp import QEMUMonitorProtocol
|
||||
from .qmp import QEMUMonitorProtocol
|
||||
|
||||
def print_response(rsp, prefix=[]):
|
||||
if type(rsp) == list:
|
||||
|
|
@ -26,15 +28,15 @@ def print_response(rsp, prefix=[]):
|
|||
print_response(rsp[key], prefix + [key])
|
||||
else:
|
||||
if len(prefix):
|
||||
print '%s: %s' % ('.'.join(prefix), rsp)
|
||||
print('%s: %s' % ('.'.join(prefix), rsp))
|
||||
else:
|
||||
print '%s' % (rsp)
|
||||
print('%s' % (rsp))
|
||||
|
||||
def main(args):
|
||||
path = None
|
||||
|
||||
# Use QMP_PATH if it's set
|
||||
if os.environ.has_key('QMP_PATH'):
|
||||
if 'QMP_PATH' in os.environ:
|
||||
path = os.environ['QMP_PATH']
|
||||
|
||||
while len(args):
|
||||
|
|
@ -53,21 +55,21 @@ def main(args):
|
|||
elif arg in ['help']:
|
||||
os.execlp('man', 'man', 'qmp')
|
||||
else:
|
||||
print 'Unknown argument "%s"' % arg
|
||||
print('Unknown argument "%s"' % arg)
|
||||
|
||||
args = args[1:]
|
||||
else:
|
||||
break
|
||||
|
||||
if not path:
|
||||
print "QMP path isn't set, use --path=qmp-monitor-address or set QMP_PATH"
|
||||
print("QMP path isn't set, use --path=qmp-monitor-address or set QMP_PATH")
|
||||
return 1
|
||||
|
||||
if len(args):
|
||||
command, args = args[0], args[1:]
|
||||
else:
|
||||
print 'No command found'
|
||||
print 'Usage: "qmp [--path=qmp-monitor-address] qmp-cmd arguments"'
|
||||
print('No command found')
|
||||
print('Usage: "qmp [--path=qmp-monitor-address] qmp-cmd arguments"')
|
||||
return 1
|
||||
|
||||
if command in ['help']:
|
||||
|
|
@ -78,7 +80,7 @@ def main(args):
|
|||
|
||||
def do_command(srv, cmd, **kwds):
|
||||
rsp = srv.cmd(cmd, kwds)
|
||||
if rsp.has_key('error'):
|
||||
if 'error' in rsp:
|
||||
raise Exception(rsp['error']['desc'])
|
||||
return rsp['return']
|
||||
|
||||
|
|
@ -93,7 +95,7 @@ def main(args):
|
|||
os.execvp(fullcmd, [fullcmd] + args)
|
||||
except OSError as exc:
|
||||
if exc.errno == 2:
|
||||
print 'Command "%s" not found.' % (fullcmd)
|
||||
print('Command "%s" not found.' % (fullcmd))
|
||||
return 1
|
||||
raise
|
||||
return 0
|
||||
|
|
@ -104,7 +106,7 @@ def main(args):
|
|||
arguments = {}
|
||||
for arg in args:
|
||||
if not arg.startswith('--'):
|
||||
print 'Unknown argument "%s"' % arg
|
||||
print('Unknown argument "%s"' % arg)
|
||||
return 1
|
||||
|
||||
arg = arg[2:]
|
||||
|
|
|
|||
|
|
@ -65,7 +65,9 @@
|
|||
# which will echo back the properly formatted JSON-compliant QMP that is being
|
||||
# sent to QEMU, which is useful for debugging and documentation generation.
|
||||
|
||||
import qmp
|
||||
from __future__ import print_function
|
||||
from __future__ import absolute_import
|
||||
from . import qmp
|
||||
import json
|
||||
import ast
|
||||
import readline
|
||||
|
|
@ -132,7 +134,7 @@ class QMPShell(qmp.QEMUMonitorProtocol):
|
|||
|
||||
def _fill_completion(self):
|
||||
cmds = self.cmd('query-commands')
|
||||
if cmds.has_key('error'):
|
||||
if 'error' in cmds:
|
||||
return
|
||||
for cmd in cmds['return']:
|
||||
self._completer.append(cmd['name'])
|
||||
|
|
@ -153,14 +155,14 @@ class QMPShell(qmp.QEMUMonitorProtocol):
|
|||
# File not found. No problem.
|
||||
pass
|
||||
else:
|
||||
print "Failed to read history '%s'; %s" % (self._histfile, e)
|
||||
print("Failed to read history '%s'; %s" % (self._histfile, e))
|
||||
atexit.register(self.__save_history)
|
||||
|
||||
def __save_history(self):
|
||||
try:
|
||||
readline.write_history_file(self._histfile)
|
||||
except Exception as e:
|
||||
print "Failed to save history file '%s'; %s" % (self._histfile, e)
|
||||
print("Failed to save history file '%s'; %s" % (self._histfile, e))
|
||||
|
||||
def __parse_value(self, val):
|
||||
try:
|
||||
|
|
@ -258,15 +260,15 @@ class QMPShell(qmp.QEMUMonitorProtocol):
|
|||
if self._pretty:
|
||||
indent = 4
|
||||
jsobj = json.dumps(qmp, indent=indent)
|
||||
print str(jsobj)
|
||||
print(str(jsobj))
|
||||
|
||||
def _execute_cmd(self, cmdline):
|
||||
try:
|
||||
qmpcmd = self.__build_cmd(cmdline)
|
||||
except Exception as e:
|
||||
print 'Error while parsing command line: %s' % e
|
||||
print 'command format: <command-name> ',
|
||||
print '[arg-name1=arg1] ... [arg-nameN=argN]'
|
||||
print('Error while parsing command line: %s' % e)
|
||||
print('command format: <command-name> ', end=' ')
|
||||
print('[arg-name1=arg1] ... [arg-nameN=argN]')
|
||||
return True
|
||||
# For transaction mode, we may have just cached the action:
|
||||
if qmpcmd is None:
|
||||
|
|
@ -275,7 +277,7 @@ class QMPShell(qmp.QEMUMonitorProtocol):
|
|||
self._print(qmpcmd)
|
||||
resp = self.cmd_obj(qmpcmd)
|
||||
if resp is None:
|
||||
print 'Disconnected'
|
||||
print('Disconnected')
|
||||
return False
|
||||
self._print(resp)
|
||||
return True
|
||||
|
|
@ -285,12 +287,12 @@ class QMPShell(qmp.QEMUMonitorProtocol):
|
|||
self.__completer_setup()
|
||||
|
||||
def show_banner(self, msg='Welcome to the QMP low-level shell!'):
|
||||
print msg
|
||||
print(msg)
|
||||
if not self._greeting:
|
||||
print 'Connected'
|
||||
print('Connected')
|
||||
return
|
||||
version = self._greeting['QMP']['version']['qemu']
|
||||
print 'Connected to QEMU %d.%d.%d\n' % (version['major'],version['minor'],version['micro'])
|
||||
print('Connected to QEMU %d.%d.%d\n' % (version['major'],version['minor'],version['micro']))
|
||||
|
||||
def get_prompt(self):
|
||||
if self._transmode:
|
||||
|
|
@ -306,11 +308,11 @@ class QMPShell(qmp.QEMUMonitorProtocol):
|
|||
try:
|
||||
cmdline = raw_input(prompt)
|
||||
except EOFError:
|
||||
print
|
||||
print()
|
||||
return False
|
||||
if cmdline == '':
|
||||
for ev in self.get_events():
|
||||
print ev
|
||||
print(ev)
|
||||
self.clear_events()
|
||||
return True
|
||||
else:
|
||||
|
|
@ -366,24 +368,24 @@ class HMPShell(QMPShell):
|
|||
try:
|
||||
idx = int(cmdline.split()[1])
|
||||
if not 'return' in self.__cmd_passthrough('info version', idx):
|
||||
print 'bad CPU index'
|
||||
print('bad CPU index')
|
||||
return True
|
||||
self.__cpu_index = idx
|
||||
except ValueError:
|
||||
print 'cpu command takes an integer argument'
|
||||
print('cpu command takes an integer argument')
|
||||
return True
|
||||
resp = self.__cmd_passthrough(cmdline, self.__cpu_index)
|
||||
if resp is None:
|
||||
print 'Disconnected'
|
||||
print('Disconnected')
|
||||
return False
|
||||
assert 'return' in resp or 'error' in resp
|
||||
if 'return' in resp:
|
||||
# Success
|
||||
if len(resp['return']) > 0:
|
||||
print resp['return'],
|
||||
print(resp['return'], end=' ')
|
||||
else:
|
||||
# Error
|
||||
print '%s: %s' % (resp['error']['class'], resp['error']['desc'])
|
||||
print('%s: %s' % (resp['error']['class'], resp['error']['desc']))
|
||||
return True
|
||||
|
||||
def show_banner(self):
|
||||
|
|
|
|||
|
|
@ -11,11 +11,12 @@
|
|||
# the COPYING file in the top-level directory.
|
||||
##
|
||||
|
||||
from __future__ import absolute_import
|
||||
import fuse, stat
|
||||
from fuse import Fuse
|
||||
import os, posix
|
||||
from errno import *
|
||||
from qmp import QEMUMonitorProtocol
|
||||
from .qmp import QEMUMonitorProtocol
|
||||
|
||||
fuse.fuse_python_api = (0, 2)
|
||||
|
||||
|
|
@ -28,7 +29,7 @@ class QOMFS(Fuse):
|
|||
self.ino_count = 1
|
||||
|
||||
def get_ino(self, path):
|
||||
if self.ino_map.has_key(path):
|
||||
if path in self.ino_map:
|
||||
return self.ino_map[path]
|
||||
self.ino_map[path] = self.ino_count
|
||||
self.ino_count += 1
|
||||
|
|
@ -89,7 +90,7 @@ class QOMFS(Fuse):
|
|||
|
||||
def getattr(self, path):
|
||||
if self.is_link(path):
|
||||
value = posix.stat_result((0755 | stat.S_IFLNK,
|
||||
value = posix.stat_result((0o755 | stat.S_IFLNK,
|
||||
self.get_ino(path),
|
||||
0,
|
||||
2,
|
||||
|
|
@ -100,7 +101,7 @@ class QOMFS(Fuse):
|
|||
0,
|
||||
0))
|
||||
elif self.is_object(path):
|
||||
value = posix.stat_result((0755 | stat.S_IFDIR,
|
||||
value = posix.stat_result((0o755 | stat.S_IFDIR,
|
||||
self.get_ino(path),
|
||||
0,
|
||||
2,
|
||||
|
|
@ -111,7 +112,7 @@ class QOMFS(Fuse):
|
|||
0,
|
||||
0))
|
||||
elif self.is_property(path):
|
||||
value = posix.stat_result((0644 | stat.S_IFREG,
|
||||
value = posix.stat_result((0o644 | stat.S_IFREG,
|
||||
self.get_ino(path),
|
||||
0,
|
||||
1,
|
||||
|
|
|
|||
|
|
@ -11,9 +11,11 @@
|
|||
# the COPYING file in the top-level directory.
|
||||
##
|
||||
|
||||
from __future__ import print_function
|
||||
from __future__ import absolute_import
|
||||
import sys
|
||||
import os
|
||||
from qmp import QEMUMonitorProtocol
|
||||
from .qmp import QEMUMonitorProtocol
|
||||
|
||||
cmd, args = sys.argv[0], sys.argv[1:]
|
||||
socket_path = None
|
||||
|
|
@ -33,7 +35,7 @@ def usage_error(error_msg = "unspecified error"):
|
|||
|
||||
if len(args) > 0:
|
||||
if args[0] == "-h":
|
||||
print usage()
|
||||
print(usage())
|
||||
exit(0);
|
||||
elif args[0] == "-s":
|
||||
try:
|
||||
|
|
@ -43,7 +45,7 @@ if len(args) > 0:
|
|||
args = args[2:]
|
||||
|
||||
if not socket_path:
|
||||
if os.environ.has_key('QMP_SOCKET'):
|
||||
if 'QMP_SOCKET' in os.environ:
|
||||
socket_path = os.environ['QMP_SOCKET']
|
||||
else:
|
||||
usage_error("no QMP socket path or address given");
|
||||
|
|
@ -62,6 +64,6 @@ srv.connect()
|
|||
rsp = srv.command('qom-get', path=path, property=prop)
|
||||
if type(rsp) == dict:
|
||||
for i in rsp.keys():
|
||||
print '%s: %s' % (i, rsp[i])
|
||||
print('%s: %s' % (i, rsp[i]))
|
||||
else:
|
||||
print rsp
|
||||
print(rsp)
|
||||
|
|
|
|||
|
|
@ -11,9 +11,11 @@
|
|||
# the COPYING file in the top-level directory.
|
||||
##
|
||||
|
||||
from __future__ import print_function
|
||||
from __future__ import absolute_import
|
||||
import sys
|
||||
import os
|
||||
from qmp import QEMUMonitorProtocol
|
||||
from .qmp import QEMUMonitorProtocol
|
||||
|
||||
cmd, args = sys.argv[0], sys.argv[1:]
|
||||
socket_path = None
|
||||
|
|
@ -33,7 +35,7 @@ def usage_error(error_msg = "unspecified error"):
|
|||
|
||||
if len(args) > 0:
|
||||
if args[0] == "-h":
|
||||
print usage()
|
||||
print(usage())
|
||||
exit(0);
|
||||
elif args[0] == "-s":
|
||||
try:
|
||||
|
|
@ -43,7 +45,7 @@ if len(args) > 0:
|
|||
args = args[2:]
|
||||
|
||||
if not socket_path:
|
||||
if os.environ.has_key('QMP_SOCKET'):
|
||||
if 'QMP_SOCKET' in os.environ:
|
||||
socket_path = os.environ['QMP_SOCKET']
|
||||
else:
|
||||
usage_error("no QMP socket path or address given");
|
||||
|
|
@ -52,13 +54,13 @@ srv = QEMUMonitorProtocol(socket_path)
|
|||
srv.connect()
|
||||
|
||||
if len(args) == 0:
|
||||
print '/'
|
||||
print('/')
|
||||
sys.exit(0)
|
||||
|
||||
for item in srv.command('qom-list', path=args[0]):
|
||||
if item['type'].startswith('child<'):
|
||||
print '%s/' % item['name']
|
||||
print('%s/' % item['name'])
|
||||
elif item['type'].startswith('link<'):
|
||||
print '@%s/' % item['name']
|
||||
print('@%s/' % item['name'])
|
||||
else:
|
||||
print '%s' % item['name']
|
||||
print('%s' % item['name'])
|
||||
|
|
|
|||
|
|
@ -11,9 +11,11 @@
|
|||
# the COPYING file in the top-level directory.
|
||||
##
|
||||
|
||||
from __future__ import print_function
|
||||
from __future__ import absolute_import
|
||||
import sys
|
||||
import os
|
||||
from qmp import QEMUMonitorProtocol
|
||||
from .qmp import QEMUMonitorProtocol
|
||||
|
||||
cmd, args = sys.argv[0], sys.argv[1:]
|
||||
socket_path = None
|
||||
|
|
@ -34,7 +36,7 @@ def usage_error(error_msg = "unspecified error"):
|
|||
|
||||
if len(args) > 0:
|
||||
if args[0] == "-h":
|
||||
print usage()
|
||||
print(usage())
|
||||
exit(0);
|
||||
elif args[0] == "-s":
|
||||
try:
|
||||
|
|
@ -44,7 +46,7 @@ if len(args) > 0:
|
|||
args = args[2:]
|
||||
|
||||
if not socket_path:
|
||||
if os.environ.has_key('QMP_SOCKET'):
|
||||
if 'QMP_SOCKET' in os.environ:
|
||||
socket_path = os.environ['QMP_SOCKET']
|
||||
else:
|
||||
usage_error("no QMP socket path or address given");
|
||||
|
|
@ -61,4 +63,4 @@ else:
|
|||
srv = QEMUMonitorProtocol(socket_path)
|
||||
srv.connect()
|
||||
|
||||
print srv.command('qom-set', path=path, property=prop, value=value)
|
||||
print(srv.command('qom-set', path=path, property=prop, value=value))
|
||||
|
|
|
|||
|
|
@ -13,9 +13,11 @@
|
|||
# the COPYING file in the top-level directory.
|
||||
##
|
||||
|
||||
from __future__ import print_function
|
||||
from __future__ import absolute_import
|
||||
import sys
|
||||
import os
|
||||
from qmp import QEMUMonitorProtocol
|
||||
from .qmp import QEMUMonitorProtocol
|
||||
|
||||
cmd, args = sys.argv[0], sys.argv[1:]
|
||||
socket_path = None
|
||||
|
|
@ -35,7 +37,7 @@ def usage_error(error_msg = "unspecified error"):
|
|||
|
||||
if len(args) > 0:
|
||||
if args[0] == "-h":
|
||||
print usage()
|
||||
print(usage())
|
||||
exit(0);
|
||||
elif args[0] == "-s":
|
||||
try:
|
||||
|
|
@ -45,7 +47,7 @@ if len(args) > 0:
|
|||
args = args[2:]
|
||||
|
||||
if not socket_path:
|
||||
if os.environ.has_key('QMP_SOCKET'):
|
||||
if 'QMP_SOCKET' in os.environ:
|
||||
socket_path = os.environ['QMP_SOCKET']
|
||||
else:
|
||||
usage_error("no QMP socket path or address given");
|
||||
|
|
@ -54,15 +56,15 @@ srv = QEMUMonitorProtocol(socket_path)
|
|||
srv.connect()
|
||||
|
||||
def list_node(path):
|
||||
print '%s' % path
|
||||
print('%s' % path)
|
||||
items = srv.command('qom-list', path=path)
|
||||
for item in items:
|
||||
if not item['type'].startswith('child<'):
|
||||
try:
|
||||
print ' %s: %s (%s)' % (item['name'], srv.command('qom-get', path=path, property=item['name']), item['type'])
|
||||
print(' %s: %s (%s)' % (item['name'], srv.command('qom-get', path=path, property=item['name']), item['type']))
|
||||
except:
|
||||
print ' %s: <EXCEPTION> (%s)' % (item['name'], item['type'])
|
||||
print ''
|
||||
print(' %s: <EXCEPTION> (%s)' % (item['name'], item['type']))
|
||||
print('')
|
||||
for item in items:
|
||||
if item['type'].startswith('child<'):
|
||||
list_node((path if (path != '/') else '') + '/' + item['name'])
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@
|
|||
# You should have received a copy of the GNU Lesser General Public
|
||||
# License along with this library; if not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
from __future__ import print_function
|
||||
import argparse
|
||||
import struct
|
||||
from collections import namedtuple
|
||||
|
|
@ -89,9 +90,9 @@ def call_decode(table, index, dumpfile):
|
|||
"Search decode table for next step"
|
||||
decoder = next((d for d in table if d.eid == index), None)
|
||||
if not decoder:
|
||||
print "Could not decode index: %d" % (index)
|
||||
print "Entry is: %s" % (decoder)
|
||||
print "Decode Table is:\n%s" % (table)
|
||||
print("Could not decode index: %d" % (index))
|
||||
print("Entry is: %s" % (decoder))
|
||||
print("Decode Table is:\n%s" % (table))
|
||||
return False
|
||||
else:
|
||||
return decoder.fn(decoder.eid, decoder.name, dumpfile)
|
||||
|
|
@ -103,23 +104,23 @@ def print_event(eid, name, string=None, event_count=None):
|
|||
event_count = replay_state.event_count
|
||||
|
||||
if string:
|
||||
print "%d:%s(%d) %s" % (event_count, name, eid, string)
|
||||
print("%d:%s(%d) %s" % (event_count, name, eid, string))
|
||||
else:
|
||||
print "%d:%s(%d)" % (event_count, name, eid)
|
||||
print("%d:%s(%d)" % (event_count, name, eid))
|
||||
|
||||
|
||||
# Decoders for each event type
|
||||
|
||||
def decode_unimp(eid, name, _unused_dumpfile):
|
||||
"Unimplimented decoder, will trigger exit"
|
||||
print "%s not handled - will now stop" % (name)
|
||||
print("%s not handled - will now stop" % (name))
|
||||
return False
|
||||
|
||||
# Checkpoint decoder
|
||||
def swallow_async_qword(eid, name, dumpfile):
|
||||
"Swallow a qword of data without looking at it"
|
||||
step_id = read_qword(dumpfile)
|
||||
print " %s(%d) @ %d" % (name, eid, step_id)
|
||||
print(" %s(%d) @ %d" % (name, eid, step_id))
|
||||
return True
|
||||
|
||||
async_decode_table = [ Decoder(0, "REPLAY_ASYNC_EVENT_BH", swallow_async_qword),
|
||||
|
|
@ -139,8 +140,8 @@ def decode_async(eid, name, dumpfile):
|
|||
async_event_checkpoint = read_byte(dumpfile)
|
||||
|
||||
if async_event_checkpoint != replay_state.current_checkpoint:
|
||||
print " mismatch between checkpoint %d and async data %d" % (
|
||||
replay_state.current_checkpoint, async_event_checkpoint)
|
||||
print(" mismatch between checkpoint %d and async data %d" % (
|
||||
replay_state.current_checkpoint, async_event_checkpoint))
|
||||
return True
|
||||
|
||||
return call_decode(async_decode_table, async_event_kind, dumpfile)
|
||||
|
|
@ -283,7 +284,7 @@ def decode_file(filename):
|
|||
version = read_dword(dumpfile)
|
||||
junk = read_qword(dumpfile)
|
||||
|
||||
print "HEADER: version 0x%x" % (version)
|
||||
print("HEADER: version 0x%x" % (version))
|
||||
|
||||
if version == 0xe02007:
|
||||
event_decode_table = v7_event_table
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
from __future__ import print_function
|
||||
#
|
||||
# Option ROM signing utility
|
||||
#
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@
|
|||
#
|
||||
# For help see docs/devel/tracing.txt
|
||||
|
||||
from __future__ import print_function
|
||||
import struct
|
||||
import re
|
||||
import inspect
|
||||
|
|
@ -44,7 +45,7 @@ def get_record(edict, idtoname, rechdr, fobj):
|
|||
rec = (name, rechdr[1], rechdr[3])
|
||||
try:
|
||||
event = edict[name]
|
||||
except KeyError, e:
|
||||
except KeyError as e:
|
||||
import sys
|
||||
sys.stderr.write('%s event is logged but is not declared ' \
|
||||
'in the trace events file, try using ' \
|
||||
|
|
@ -257,6 +258,6 @@ def catchall(self, event, rec):
|
|||
else:
|
||||
fields.append('%s=0x%x' % (name, rec[i]))
|
||||
i += 1
|
||||
print ' '.join(fields)
|
||||
print(' '.join(fields))
|
||||
|
||||
run(Formatter())
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@
|
|||
# You should have received a copy of the GNU General Public License along
|
||||
# with this program; if not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
from __future__ import print_function
|
||||
import argparse
|
||||
import json
|
||||
import sys
|
||||
|
|
@ -157,7 +158,7 @@ def check_fields(src_fields, dest_fields, desc, sec):
|
|||
while True:
|
||||
if advance_src:
|
||||
try:
|
||||
s_item = s_iter.next()
|
||||
s_item = next(s_iter)
|
||||
except StopIteration:
|
||||
if s_iter_list == []:
|
||||
break
|
||||
|
|
@ -172,14 +173,14 @@ def check_fields(src_fields, dest_fields, desc, sec):
|
|||
|
||||
if advance_dest:
|
||||
try:
|
||||
d_item = d_iter.next()
|
||||
d_item = next(d_iter)
|
||||
except StopIteration:
|
||||
if d_iter_list == []:
|
||||
# We were not in a substruct
|
||||
print "Section \"" + sec + "\",",
|
||||
print "Description " + "\"" + desc + "\":",
|
||||
print "expected field \"" + s_item["field"] + "\",",
|
||||
print "while dest has no further fields"
|
||||
print("Section \"" + sec + "\",", end=' ')
|
||||
print("Description " + "\"" + desc + "\":", end=' ')
|
||||
print("expected field \"" + s_item["field"] + "\",", end=' ')
|
||||
print("while dest has no further fields")
|
||||
bump_taint()
|
||||
break
|
||||
|
||||
|
|
@ -197,10 +198,10 @@ def check_fields(src_fields, dest_fields, desc, sec):
|
|||
advance_dest = True
|
||||
continue
|
||||
if unused_count < 0:
|
||||
print "Section \"" + sec + "\",",
|
||||
print "Description \"" + desc + "\":",
|
||||
print "unused size mismatch near \"",
|
||||
print s_item["field"] + "\""
|
||||
print("Section \"" + sec + "\",", end=' ')
|
||||
print("Description \"" + desc + "\":", end=' ')
|
||||
print("unused size mismatch near \"", end=' ')
|
||||
print(s_item["field"] + "\"")
|
||||
bump_taint()
|
||||
break
|
||||
continue
|
||||
|
|
@ -211,10 +212,10 @@ def check_fields(src_fields, dest_fields, desc, sec):
|
|||
advance_src = True
|
||||
continue
|
||||
if unused_count < 0:
|
||||
print "Section \"" + sec + "\",",
|
||||
print "Description \"" + desc + "\":",
|
||||
print "unused size mismatch near \"",
|
||||
print d_item["field"] + "\""
|
||||
print("Section \"" + sec + "\",", end=' ')
|
||||
print("Description \"" + desc + "\":", end=' ')
|
||||
print("unused size mismatch near \"", end=' ')
|
||||
print(d_item["field"] + "\"")
|
||||
bump_taint()
|
||||
break
|
||||
continue
|
||||
|
|
@ -262,10 +263,10 @@ def check_fields(src_fields, dest_fields, desc, sec):
|
|||
unused_count = s_item["size"] - d_item["size"]
|
||||
continue
|
||||
|
||||
print "Section \"" + sec + "\",",
|
||||
print "Description \"" + desc + "\":",
|
||||
print "expected field \"" + s_item["field"] + "\",",
|
||||
print "got \"" + d_item["field"] + "\"; skipping rest"
|
||||
print("Section \"" + sec + "\",", end=' ')
|
||||
print("Description \"" + desc + "\":", end=' ')
|
||||
print("expected field \"" + s_item["field"] + "\",", end=' ')
|
||||
print("got \"" + d_item["field"] + "\"; skipping rest")
|
||||
bump_taint()
|
||||
break
|
||||
|
||||
|
|
@ -289,8 +290,8 @@ def check_subsections(src_sub, dest_sub, desc, sec):
|
|||
check_descriptions(s_item, d_item, sec)
|
||||
|
||||
if not found:
|
||||
print "Section \"" + sec + "\", Description \"" + desc + "\":",
|
||||
print "Subsection \"" + s_item["name"] + "\" not found"
|
||||
print("Section \"" + sec + "\", Description \"" + desc + "\":", end=' ')
|
||||
print("Subsection \"" + s_item["name"] + "\" not found")
|
||||
bump_taint()
|
||||
|
||||
|
||||
|
|
@ -299,8 +300,8 @@ def check_description_in_list(s_item, d_item, sec, desc):
|
|||
return
|
||||
|
||||
if not "Description" in d_item:
|
||||
print "Section \"" + sec + "\", Description \"" + desc + "\",",
|
||||
print "Field \"" + s_item["field"] + "\": missing description"
|
||||
print("Section \"" + sec + "\", Description \"" + desc + "\",", end=' ')
|
||||
print("Field \"" + s_item["field"] + "\": missing description")
|
||||
bump_taint()
|
||||
return
|
||||
|
||||
|
|
@ -311,17 +312,17 @@ def check_descriptions(src_desc, dest_desc, sec):
|
|||
check_version(src_desc, dest_desc, sec, src_desc["name"])
|
||||
|
||||
if not check_fields_match(sec, src_desc["name"], dest_desc["name"]):
|
||||
print "Section \"" + sec + "\":",
|
||||
print "Description \"" + src_desc["name"] + "\"",
|
||||
print "missing, got \"" + dest_desc["name"] + "\" instead; skipping"
|
||||
print("Section \"" + sec + "\":", end=' ')
|
||||
print("Description \"" + src_desc["name"] + "\"", end=' ')
|
||||
print("missing, got \"" + dest_desc["name"] + "\" instead; skipping")
|
||||
bump_taint()
|
||||
return
|
||||
|
||||
for f in src_desc:
|
||||
if not f in dest_desc:
|
||||
print "Section \"" + sec + "\"",
|
||||
print "Description \"" + src_desc["name"] + "\":",
|
||||
print "Entry \"" + f + "\" missing"
|
||||
print("Section \"" + sec + "\"", end=' ')
|
||||
print("Description \"" + src_desc["name"] + "\":", end=' ')
|
||||
print("Entry \"" + f + "\" missing")
|
||||
bump_taint()
|
||||
continue
|
||||
|
||||
|
|
@ -334,39 +335,39 @@ def check_descriptions(src_desc, dest_desc, sec):
|
|||
|
||||
def check_version(s, d, sec, desc=None):
|
||||
if s["version_id"] > d["version_id"]:
|
||||
print "Section \"" + sec + "\"",
|
||||
print("Section \"" + sec + "\"", end=' ')
|
||||
if desc:
|
||||
print "Description \"" + desc + "\":",
|
||||
print "version error:", s["version_id"], ">", d["version_id"]
|
||||
print("Description \"" + desc + "\":", end=' ')
|
||||
print("version error:", s["version_id"], ">", d["version_id"])
|
||||
bump_taint()
|
||||
|
||||
if not "minimum_version_id" in d:
|
||||
return
|
||||
|
||||
if s["version_id"] < d["minimum_version_id"]:
|
||||
print "Section \"" + sec + "\"",
|
||||
print("Section \"" + sec + "\"", end=' ')
|
||||
if desc:
|
||||
print "Description \"" + desc + "\":",
|
||||
print "minimum version error:", s["version_id"], "<",
|
||||
print d["minimum_version_id"]
|
||||
print("Description \"" + desc + "\":", end=' ')
|
||||
print("minimum version error:", s["version_id"], "<", end=' ')
|
||||
print(d["minimum_version_id"])
|
||||
bump_taint()
|
||||
|
||||
|
||||
def check_size(s, d, sec, desc=None, field=None):
|
||||
if s["size"] != d["size"]:
|
||||
print "Section \"" + sec + "\"",
|
||||
print("Section \"" + sec + "\"", end=' ')
|
||||
if desc:
|
||||
print "Description \"" + desc + "\"",
|
||||
print("Description \"" + desc + "\"", end=' ')
|
||||
if field:
|
||||
print "Field \"" + field + "\"",
|
||||
print "size mismatch:", s["size"], ",", d["size"]
|
||||
print("Field \"" + field + "\"", end=' ')
|
||||
print("size mismatch:", s["size"], ",", d["size"])
|
||||
bump_taint()
|
||||
|
||||
|
||||
def check_machine_type(s, d):
|
||||
if s["Name"] != d["Name"]:
|
||||
print "Warning: checking incompatible machine types:",
|
||||
print "\"" + s["Name"] + "\", \"" + d["Name"] + "\""
|
||||
print("Warning: checking incompatible machine types:", end=' ')
|
||||
print("\"" + s["Name"] + "\", \"" + d["Name"] + "\"")
|
||||
return
|
||||
|
||||
|
||||
|
|
@ -400,7 +401,7 @@ def main():
|
|||
# doesn't exist in dest.
|
||||
dest_sec = get_changed_sec_name(sec)
|
||||
if not dest_sec in dest_data:
|
||||
print "Section \"" + sec + "\" does not exist in dest"
|
||||
print("Section \"" + sec + "\" does not exist in dest")
|
||||
bump_taint()
|
||||
continue
|
||||
|
||||
|
|
@ -415,8 +416,8 @@ def main():
|
|||
|
||||
for entry in s:
|
||||
if not entry in d:
|
||||
print "Section \"" + sec + "\": Entry \"" + entry + "\"",
|
||||
print "missing"
|
||||
print("Section \"" + sec + "\": Entry \"" + entry + "\"", end=' ')
|
||||
print("missing")
|
||||
bump_taint()
|
||||
continue
|
||||
|
||||
|
|
|
|||
|
|
@ -31,7 +31,6 @@ $(SRC_PATH)/scripts/qapi/types.py \
|
|||
$(SRC_PATH)/scripts/qapi/visit.py \
|
||||
$(SRC_PATH)/scripts/qapi/common.py \
|
||||
$(SRC_PATH)/scripts/qapi/doc.py \
|
||||
$(SRC_PATH)/scripts/ordereddict.py \
|
||||
$(SRC_PATH)/scripts/qapi-gen.py
|
||||
|
||||
# Get the list of all supported sysemu targets
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@
|
|||
# or (at your option) any later version. See the COPYING file in
|
||||
# the top-level directory.
|
||||
|
||||
from __future__ import print_function
|
||||
import os
|
||||
import sys
|
||||
sys.path.append(os.path.join(os.path.dirname(__file__),
|
||||
|
|
@ -87,7 +88,7 @@ def _get_so_libs(executable):
|
|||
so_lib = search.groups()[1]
|
||||
libs.append("%s/%s" % (so_path, so_lib))
|
||||
except subprocess.CalledProcessError:
|
||||
print "%s had no associated libraries (static build?)" % (executable)
|
||||
print("%s had no associated libraries (static build?)" % (executable))
|
||||
|
||||
return libs
|
||||
|
||||
|
|
@ -161,7 +162,7 @@ def _do_kill_instances(self, only_known, only_active=True):
|
|||
continue
|
||||
if only_known and instance_uuid not in self._instances:
|
||||
continue
|
||||
print "Terminating", i
|
||||
print("Terminating", i)
|
||||
if active:
|
||||
self._do(["kill", i])
|
||||
self._do(["rm", i])
|
||||
|
|
@ -288,7 +289,7 @@ def run(self, args, argv):
|
|||
if "--no-cache" not in argv and \
|
||||
dkr.image_matches_dockerfile(tag, dockerfile):
|
||||
if not args.quiet:
|
||||
print "Image is up to date."
|
||||
print("Image is up to date.")
|
||||
else:
|
||||
# Create a docker context directory for the build
|
||||
docker_dir = tempfile.mkdtemp(prefix="docker_build")
|
||||
|
|
@ -300,10 +301,10 @@ def run(self, args, argv):
|
|||
rc = subprocess.call(os.path.realpath(docker_pre),
|
||||
cwd=docker_dir, stdout=stdout)
|
||||
if rc == 3:
|
||||
print "Skip"
|
||||
print("Skip")
|
||||
return 0
|
||||
elif rc != 0:
|
||||
print "%s exited with code %d" % (docker_pre, rc)
|
||||
print("%s exited with code %d" % (docker_pre, rc))
|
||||
return 1
|
||||
|
||||
# Copy any extra files into the Docker context. These can be
|
||||
|
|
@ -399,11 +400,11 @@ def run(self, args, argv):
|
|||
try:
|
||||
docker = Docker()
|
||||
if docker._command[0] == "docker":
|
||||
print "yes"
|
||||
print("yes")
|
||||
elif docker._command[0] == "sudo":
|
||||
print "sudo"
|
||||
print("sudo")
|
||||
except Exception:
|
||||
print "no"
|
||||
print("no")
|
||||
|
||||
return
|
||||
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@
|
|||
# or (at your option) any later version. See the COPYING file in
|
||||
# the top-level directory.
|
||||
|
||||
from __future__ import print_function
|
||||
import sys
|
||||
import yaml
|
||||
import itertools
|
||||
|
|
@ -34,14 +35,14 @@ def main():
|
|||
sys.stderr.write("Usage: %s <travis-file>\n" % sys.argv[0])
|
||||
return 1
|
||||
conf = load_yaml(sys.argv[1])
|
||||
print "\n".join((": ${%s}" % var for var in conf["env"]["global"]))
|
||||
print("\n".join((": ${%s}" % var for var in conf["env"]["global"])))
|
||||
for config in conf_iter(conf):
|
||||
print "("
|
||||
print "\n".join(config["env"])
|
||||
print "alias cc=" + config["compiler"]
|
||||
print "\n".join(conf["before_script"])
|
||||
print "\n".join(conf["script"])
|
||||
print ")"
|
||||
print("(")
|
||||
print("\n".join(config["env"]))
|
||||
print("alias cc=" + config["compiler"])
|
||||
print("\n".join(conf["before_script"]))
|
||||
print("\n".join(conf["script"]))
|
||||
print(")")
|
||||
return 0
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
from __future__ import print_function
|
||||
#
|
||||
# This script needs to be run on startup
|
||||
# qemu -kernel ${KERNEL} -s -S
|
||||
|
|
|
|||
|
|
@ -1 +1,2 @@
|
|||
from layout import create_image
|
||||
from __future__ import absolute_import
|
||||
from .layout import create_image
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@
|
|||
#
|
||||
|
||||
import random
|
||||
from functools import reduce
|
||||
|
||||
UINT8 = 0xff
|
||||
UINT16 = 0xffff
|
||||
|
|
|
|||
|
|
@ -16,9 +16,10 @@
|
|||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
|
||||
from __future__ import absolute_import
|
||||
import random
|
||||
import struct
|
||||
import fuzz
|
||||
from . import fuzz
|
||||
from math import ceil
|
||||
from os import urandom
|
||||
from itertools import chain
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@
|
|||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
|
||||
from __future__ import print_function
|
||||
import sys
|
||||
import os
|
||||
import signal
|
||||
|
|
@ -36,9 +37,8 @@
|
|||
try:
|
||||
import simplejson as json
|
||||
except ImportError:
|
||||
print >>sys.stderr, \
|
||||
"Warning: Module for JSON processing is not found.\n" \
|
||||
"'--config' and '--command' options are not supported."
|
||||
print("Warning: Module for JSON processing is not found.\n" \
|
||||
"'--config' and '--command' options are not supported.", file=sys.stderr)
|
||||
|
||||
# Backing file sizes in MB
|
||||
MAX_BACKING_FILE_SIZE = 10
|
||||
|
|
@ -128,7 +128,7 @@ def __init__(self, test_id, seed, work_dir, run_log,
|
|||
if seed is not None:
|
||||
self.seed = seed
|
||||
else:
|
||||
self.seed = str(random.randint(0, sys.maxint))
|
||||
self.seed = str(random.randint(0, sys.maxsize))
|
||||
random.seed(self.seed)
|
||||
|
||||
self.init_path = os.getcwd()
|
||||
|
|
@ -158,9 +158,8 @@ def __init__(self, test_id, seed, work_dir, run_log,
|
|||
try:
|
||||
os.makedirs(self.current_dir)
|
||||
except OSError as e:
|
||||
print >>sys.stderr, \
|
||||
"Error: The working directory '%s' cannot be used. Reason: %s"\
|
||||
% (self.work_dir, e[1])
|
||||
print("Error: The working directory '%s' cannot be used. Reason: %s"\
|
||||
% (self.work_dir, e[1]), file=sys.stderr)
|
||||
raise TestException
|
||||
self.log = open(os.path.join(self.current_dir, "test.log"), "w")
|
||||
self.parent_log = open(run_log, "a")
|
||||
|
|
@ -277,7 +276,7 @@ def finish(self):
|
|||
if __name__ == '__main__':
|
||||
|
||||
def usage():
|
||||
print """
|
||||
print("""
|
||||
Usage: runner.py [OPTION...] TEST_DIR IMG_GENERATOR
|
||||
|
||||
Set up test environment in TEST_DIR and run a test in it. A module for
|
||||
|
|
@ -326,7 +325,7 @@ def usage():
|
|||
|
||||
If '--config' argument is specified, fields not listed in
|
||||
the configuration array will not be fuzzed.
|
||||
"""
|
||||
""")
|
||||
|
||||
def run_test(test_id, seed, work_dir, run_log, cleanup, log_all,
|
||||
command, fuzz_config):
|
||||
|
|
@ -357,8 +356,7 @@ def should_continue(duration, start_time):
|
|||
['command=', 'help', 'seed=', 'config=',
|
||||
'keep_passed', 'verbose', 'duration='])
|
||||
except getopt.error as e:
|
||||
print >>sys.stderr, \
|
||||
"Error: %s\n\nTry 'runner.py --help' for more information" % e
|
||||
print("Error: %s\n\nTry 'runner.py --help' for more information" % e, file=sys.stderr)
|
||||
sys.exit(1)
|
||||
|
||||
command = None
|
||||
|
|
@ -375,9 +373,8 @@ def should_continue(duration, start_time):
|
|||
try:
|
||||
command = json.loads(arg)
|
||||
except (TypeError, ValueError, NameError) as e:
|
||||
print >>sys.stderr, \
|
||||
"Error: JSON array of test commands cannot be loaded.\n" \
|
||||
"Reason: %s" % e
|
||||
print("Error: JSON array of test commands cannot be loaded.\n" \
|
||||
"Reason: %s" % e, file=sys.stderr)
|
||||
sys.exit(1)
|
||||
elif opt in ('-k', '--keep_passed'):
|
||||
cleanup = False
|
||||
|
|
@ -391,15 +388,13 @@ def should_continue(duration, start_time):
|
|||
try:
|
||||
config = json.loads(arg)
|
||||
except (TypeError, ValueError, NameError) as e:
|
||||
print >>sys.stderr, \
|
||||
"Error: JSON array with the fuzzer configuration cannot" \
|
||||
" be loaded\nReason: %s" % e
|
||||
print("Error: JSON array with the fuzzer configuration cannot" \
|
||||
" be loaded\nReason: %s" % e, file=sys.stderr)
|
||||
sys.exit(1)
|
||||
|
||||
if not len(args) == 2:
|
||||
print >>sys.stderr, \
|
||||
"Expected two parameters\nTry 'runner.py --help'" \
|
||||
" for more information."
|
||||
print("Expected two parameters\nTry 'runner.py --help'" \
|
||||
" for more information.", file=sys.stderr)
|
||||
sys.exit(1)
|
||||
|
||||
work_dir = os.path.realpath(args[0])
|
||||
|
|
@ -415,9 +410,8 @@ def should_continue(duration, start_time):
|
|||
try:
|
||||
image_generator = __import__(generator_name)
|
||||
except ImportError as e:
|
||||
print >>sys.stderr, \
|
||||
"Error: The image generator '%s' cannot be imported.\n" \
|
||||
"Reason: %s" % (generator_name, e)
|
||||
print("Error: The image generator '%s' cannot be imported.\n" \
|
||||
"Reason: %s" % (generator_name, e), file=sys.stderr)
|
||||
sys.exit(1)
|
||||
|
||||
# Enable core dumps
|
||||
|
|
@ -428,7 +422,7 @@ def should_continue(duration, start_time):
|
|||
test_id = count(1)
|
||||
while should_continue(duration, start_time):
|
||||
try:
|
||||
run_test(str(test_id.next()), seed, work_dir, run_log, cleanup,
|
||||
run_test(str(next(test_id)), seed, work_dir, run_log, cleanup,
|
||||
log_all, command, config)
|
||||
except (KeyboardInterrupt, SystemExit):
|
||||
sys.exit(1)
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
from __future__ import print_function
|
||||
#
|
||||
# Migration test main engine
|
||||
#
|
||||
|
|
@ -117,7 +118,7 @@ def _migrate(self, hardware, scenario, src, dst, connect_uri):
|
|||
# XXX how to get dst timings on remote host ?
|
||||
|
||||
if self._verbose:
|
||||
print "Sleeping %d seconds for initial guest workload run" % self._sleep
|
||||
print("Sleeping %d seconds for initial guest workload run" % self._sleep)
|
||||
sleep_secs = self._sleep
|
||||
while sleep_secs > 1:
|
||||
src_qemu_time.append(self._cpu_timing(src_pid))
|
||||
|
|
@ -126,7 +127,7 @@ def _migrate(self, hardware, scenario, src, dst, connect_uri):
|
|||
sleep_secs -= 1
|
||||
|
||||
if self._verbose:
|
||||
print "Starting migration"
|
||||
print("Starting migration")
|
||||
if scenario._auto_converge:
|
||||
resp = src.command("migrate-set-capabilities",
|
||||
capabilities = [
|
||||
|
|
@ -216,7 +217,7 @@ def _migrate(self, hardware, scenario, src, dst, connect_uri):
|
|||
|
||||
if progress._status == "completed":
|
||||
if self._verbose:
|
||||
print "Sleeping %d seconds for final guest workload run" % self._sleep
|
||||
print("Sleeping %d seconds for final guest workload run" % self._sleep)
|
||||
sleep_secs = self._sleep
|
||||
while sleep_secs > 1:
|
||||
time.sleep(1)
|
||||
|
|
@ -227,23 +228,23 @@ def _migrate(self, hardware, scenario, src, dst, connect_uri):
|
|||
return [progress_history, src_qemu_time, src_vcpu_time]
|
||||
|
||||
if self._verbose and (loop % 20) == 0:
|
||||
print "Iter %d: remain %5dMB of %5dMB (total %5dMB @ %5dMb/sec)" % (
|
||||
print("Iter %d: remain %5dMB of %5dMB (total %5dMB @ %5dMb/sec)" % (
|
||||
progress._ram._iterations,
|
||||
progress._ram._remaining_bytes / (1024 * 1024),
|
||||
progress._ram._total_bytes / (1024 * 1024),
|
||||
progress._ram._transferred_bytes / (1024 * 1024),
|
||||
progress._ram._transfer_rate_mbs,
|
||||
)
|
||||
))
|
||||
|
||||
if progress._ram._iterations > scenario._max_iters:
|
||||
if self._verbose:
|
||||
print "No completion after %d iterations over RAM" % scenario._max_iters
|
||||
print("No completion after %d iterations over RAM" % scenario._max_iters)
|
||||
src.command("migrate_cancel")
|
||||
continue
|
||||
|
||||
if time.time() > (start + scenario._max_time):
|
||||
if self._verbose:
|
||||
print "No completion after %d seconds" % scenario._max_time
|
||||
print("No completion after %d seconds" % scenario._max_time)
|
||||
src.command("migrate_cancel")
|
||||
continue
|
||||
|
||||
|
|
@ -251,7 +252,7 @@ def _migrate(self, hardware, scenario, src, dst, connect_uri):
|
|||
progress._ram._iterations >= scenario._post_copy_iters and
|
||||
not post_copy):
|
||||
if self._verbose:
|
||||
print "Switching to post-copy after %d iterations" % scenario._post_copy_iters
|
||||
print("Switching to post-copy after %d iterations" % scenario._post_copy_iters)
|
||||
resp = src.command("migrate-start-postcopy")
|
||||
post_copy = True
|
||||
|
||||
|
|
@ -259,7 +260,7 @@ def _migrate(self, hardware, scenario, src, dst, connect_uri):
|
|||
progress._ram._iterations >= scenario._pause_iters and
|
||||
not paused):
|
||||
if self._verbose:
|
||||
print "Pausing VM after %d iterations" % scenario._pause_iters
|
||||
print("Pausing VM after %d iterations" % scenario._pause_iters)
|
||||
resp = src.command("stop")
|
||||
paused = True
|
||||
|
||||
|
|
@ -348,7 +349,7 @@ def _get_timings(self, vm):
|
|||
if not log:
|
||||
return []
|
||||
if self._debug:
|
||||
print log
|
||||
print(log)
|
||||
|
||||
regex = r"[^\s]+\s\((\d+)\):\sINFO:\s(\d+)ms\scopied\s\d+\sGB\sin\s(\d+)ms"
|
||||
matcher = re.compile(regex)
|
||||
|
|
@ -407,7 +408,7 @@ def run(self, hardware, scenario, result_dir=os.getcwd()):
|
|||
if uri[0:5] == "unix:":
|
||||
os.remove(uri[5:])
|
||||
if self._verbose:
|
||||
print "Finished migration"
|
||||
print("Finished migration")
|
||||
|
||||
src.shutdown()
|
||||
dst.shutdown()
|
||||
|
|
@ -420,7 +421,7 @@ def run(self, hardware, scenario, result_dir=os.getcwd()):
|
|||
self._initrd, self._transport, self._sleep)
|
||||
except Exception as e:
|
||||
if self._debug:
|
||||
print "Failed: %s" % str(e)
|
||||
print("Failed: %s" % str(e))
|
||||
try:
|
||||
src.shutdown()
|
||||
except:
|
||||
|
|
@ -431,7 +432,7 @@ def run(self, hardware, scenario, result_dir=os.getcwd()):
|
|||
pass
|
||||
|
||||
if self._debug:
|
||||
print src.get_log()
|
||||
print dst.get_log()
|
||||
print(src.get_log())
|
||||
print(dst.get_log())
|
||||
raise
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
from __future__ import print_function
|
||||
#
|
||||
# Migration test graph plotting
|
||||
#
|
||||
|
|
@ -588,7 +589,7 @@ def _generate_style(self):
|
|||
"""
|
||||
|
||||
def generate_html(self, fh):
|
||||
print >>fh, """<html>
|
||||
print("""<html>
|
||||
<head>
|
||||
<script type="text/javascript" src="plotly.min.js">
|
||||
</script>
|
||||
|
|
@ -601,19 +602,19 @@ def generate_html(self, fh):
|
|||
<h1>Migration report</h1>
|
||||
<h2>Chart summary</h2>
|
||||
<div id="chart">
|
||||
""" % self._generate_style()
|
||||
print >>fh, self._generate_chart()
|
||||
print >>fh, """
|
||||
""" % self._generate_style(), file=fh)
|
||||
print(self._generate_chart(), file=fh)
|
||||
print("""
|
||||
</div>
|
||||
<h2>Report details</h2>
|
||||
<div id="report">
|
||||
"""
|
||||
print >>fh, self._generate_report()
|
||||
print >>fh, """
|
||||
""", file=fh)
|
||||
print(self._generate_report(), file=fh)
|
||||
print("""
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
"""
|
||||
""", file=fh)
|
||||
|
||||
def generate(self, filename):
|
||||
if filename is None:
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
from __future__ import print_function
|
||||
#
|
||||
# Migration test command line shell integration
|
||||
#
|
||||
|
|
@ -160,13 +161,13 @@ def run(self, argv):
|
|||
try:
|
||||
report = engine.run(hardware, scenario)
|
||||
if args.output is None:
|
||||
print report.to_json()
|
||||
print(report.to_json())
|
||||
else:
|
||||
with open(args.output, "w") as fh:
|
||||
print >>fh, report.to_json()
|
||||
print(report.to_json(), file=fh)
|
||||
return 0
|
||||
except Exception as e:
|
||||
print >>sys.stderr, "Error: %s" % str(e)
|
||||
print("Error: %s" % str(e), file=sys.stderr)
|
||||
if args.debug:
|
||||
raise
|
||||
return 1
|
||||
|
|
@ -199,11 +200,11 @@ def run(self, argv):
|
|||
name = os.path.join(comparison._name, scenario._name)
|
||||
if not fnmatch.fnmatch(name, args.filter):
|
||||
if args.verbose:
|
||||
print "Skipping %s" % name
|
||||
print("Skipping %s" % name)
|
||||
continue
|
||||
|
||||
if args.verbose:
|
||||
print "Running %s" % name
|
||||
print("Running %s" % name)
|
||||
|
||||
dirname = os.path.join(args.output, comparison._name)
|
||||
filename = os.path.join(dirname, scenario._name + ".json")
|
||||
|
|
@ -211,9 +212,9 @@ def run(self, argv):
|
|||
os.makedirs(dirname)
|
||||
report = engine.run(hardware, scenario)
|
||||
with open(filename, "w") as fh:
|
||||
print >>fh, report.to_json()
|
||||
print(report.to_json(), file=fh)
|
||||
except Exception as e:
|
||||
print >>sys.stderr, "Error: %s" % str(e)
|
||||
print("Error: %s" % str(e), file=sys.stderr)
|
||||
if args.debug:
|
||||
raise
|
||||
|
||||
|
|
@ -246,14 +247,14 @@ def run(self, argv):
|
|||
|
||||
|
||||
if len(args.reports) == 0:
|
||||
print >>sys.stderr, "At least one report required"
|
||||
print("At least one report required", file=sys.stderr)
|
||||
return 1
|
||||
|
||||
if not (args.qemu_cpu or
|
||||
args.vcpu_cpu or
|
||||
args.total_guest_cpu or
|
||||
args.split_guest_cpu):
|
||||
print >>sys.stderr, "At least one chart type is required"
|
||||
print("At least one chart type is required", file=sys.stderr)
|
||||
return 1
|
||||
|
||||
reports = []
|
||||
|
|
|
|||
|
|
@ -237,7 +237,7 @@ class ThrottleTestGroupNames(iotests.QMPTestCase):
|
|||
if name:
|
||||
self.assertEqual(info["group"], name)
|
||||
else:
|
||||
self.assertFalse(info.has_key('group'))
|
||||
self.assertFalse('group' in info)
|
||||
return
|
||||
|
||||
raise Exception("No group information found for '%s'" % device)
|
||||
|
|
|
|||
|
|
@ -53,9 +53,9 @@ class TestLiveSnapshot(iotests.QMPTestCase):
|
|||
self.assertEqual(r['iops'], self.iops)
|
||||
self.assertEqual(r['iops_size'], self.iops_size)
|
||||
else:
|
||||
self.assertFalse(r.has_key('group'))
|
||||
self.assertFalse('group' in r)
|
||||
self.assertEqual(r['iops'], 0)
|
||||
self.assertFalse(r.has_key('iops_size'))
|
||||
self.assertFalse('iops_size' in r)
|
||||
|
||||
def testSnapshot(self):
|
||||
self.checkConfig('base')
|
||||
|
|
|
|||
|
|
@ -390,14 +390,14 @@ class TestChangeReadOnly(ChangeBaseClass):
|
|||
|
||||
def tearDown(self):
|
||||
self.vm.shutdown()
|
||||
os.chmod(old_img, 0666)
|
||||
os.chmod(new_img, 0666)
|
||||
os.chmod(old_img, 0o666)
|
||||
os.chmod(new_img, 0o666)
|
||||
os.remove(old_img)
|
||||
os.remove(new_img)
|
||||
|
||||
def test_ro_ro_retain(self):
|
||||
os.chmod(old_img, 0444)
|
||||
os.chmod(new_img, 0444)
|
||||
os.chmod(old_img, 0o444)
|
||||
os.chmod(new_img, 0o444)
|
||||
self.vm.add_drive(old_img, 'media=disk,read-only=on', 'none')
|
||||
self.vm.add_device('floppy,drive=drive0,id=%s' % self.device_name)
|
||||
self.vm.launch()
|
||||
|
|
@ -417,7 +417,7 @@ class TestChangeReadOnly(ChangeBaseClass):
|
|||
self.assert_qmp(result, 'return[0]/inserted/image/filename', new_img)
|
||||
|
||||
def test_ro_rw_retain(self):
|
||||
os.chmod(old_img, 0444)
|
||||
os.chmod(old_img, 0o444)
|
||||
self.vm.add_drive(old_img, 'media=disk,read-only=on', 'none')
|
||||
self.vm.add_device('floppy,drive=drive0,id=%s' % self.device_name)
|
||||
self.vm.launch()
|
||||
|
|
@ -437,7 +437,7 @@ class TestChangeReadOnly(ChangeBaseClass):
|
|||
self.assert_qmp(result, 'return[0]/inserted/image/filename', new_img)
|
||||
|
||||
def test_rw_ro_retain(self):
|
||||
os.chmod(new_img, 0444)
|
||||
os.chmod(new_img, 0o444)
|
||||
self.vm.add_drive(old_img, 'media=disk', 'none')
|
||||
self.vm.add_device('floppy,drive=drive0,id=%s' % self.device_name)
|
||||
self.vm.launch()
|
||||
|
|
@ -459,7 +459,7 @@ class TestChangeReadOnly(ChangeBaseClass):
|
|||
self.assert_qmp(result, 'return[0]/inserted/image/filename', old_img)
|
||||
|
||||
def test_ro_rw(self):
|
||||
os.chmod(old_img, 0444)
|
||||
os.chmod(old_img, 0o444)
|
||||
self.vm.add_drive(old_img, 'media=disk,read-only=on', 'none')
|
||||
self.vm.add_device('floppy,drive=drive0,id=%s' % self.device_name)
|
||||
self.vm.launch()
|
||||
|
|
@ -480,7 +480,7 @@ class TestChangeReadOnly(ChangeBaseClass):
|
|||
self.assert_qmp(result, 'return[0]/inserted/image/filename', new_img)
|
||||
|
||||
def test_rw_ro(self):
|
||||
os.chmod(new_img, 0444)
|
||||
os.chmod(new_img, 0o444)
|
||||
self.vm.add_drive(old_img, 'media=disk', 'none')
|
||||
self.vm.add_device('floppy,drive=drive0,id=%s' % self.device_name)
|
||||
self.vm.launch()
|
||||
|
|
@ -521,7 +521,7 @@ class TestChangeReadOnly(ChangeBaseClass):
|
|||
self.assert_qmp(result, 'return[0]/inserted/image/filename', new_img)
|
||||
|
||||
def test_make_ro_rw(self):
|
||||
os.chmod(new_img, 0444)
|
||||
os.chmod(new_img, 0o444)
|
||||
self.vm.add_drive(old_img, 'media=disk', 'none')
|
||||
self.vm.add_device('floppy,drive=drive0,id=%s' % self.device_name)
|
||||
self.vm.launch()
|
||||
|
|
@ -542,7 +542,7 @@ class TestChangeReadOnly(ChangeBaseClass):
|
|||
self.assert_qmp(result, 'return[0]/inserted/image/filename', old_img)
|
||||
|
||||
def test_make_rw_ro_by_retain(self):
|
||||
os.chmod(old_img, 0444)
|
||||
os.chmod(old_img, 0o444)
|
||||
self.vm.add_drive(old_img, 'media=disk,read-only=on', 'none')
|
||||
self.vm.add_device('floppy,drive=drive0,id=%s' % self.device_name)
|
||||
self.vm.launch()
|
||||
|
|
@ -562,7 +562,7 @@ class TestChangeReadOnly(ChangeBaseClass):
|
|||
self.assert_qmp(result, 'return[0]/inserted/image/filename', new_img)
|
||||
|
||||
def test_make_ro_rw_by_retain(self):
|
||||
os.chmod(new_img, 0444)
|
||||
os.chmod(new_img, 0o444)
|
||||
self.vm.add_drive(old_img, 'media=disk', 'none')
|
||||
self.vm.add_device('floppy,drive=drive0,id=%s' % self.device_name)
|
||||
self.vm.launch()
|
||||
|
|
@ -582,7 +582,7 @@ class TestChangeReadOnly(ChangeBaseClass):
|
|||
self.assert_qmp(result, 'return[0]/inserted/image/filename', old_img)
|
||||
|
||||
def test_rw_ro_cycle(self):
|
||||
os.chmod(new_img, 0444)
|
||||
os.chmod(new_img, 0o444)
|
||||
self.vm.add_drive(old_img, 'media=disk', 'none')
|
||||
self.vm.add_device('floppy,drive=drive0,id=%s' % self.device_name)
|
||||
self.vm.launch()
|
||||
|
|
|
|||
|
|
@ -203,7 +203,7 @@ sector = "%d"
|
|||
if (self.accounted_ops(read = True, write = True, flush = True) != 0):
|
||||
self.assertLess(0, stats['idle_time_ns'])
|
||||
else:
|
||||
self.assertFalse(stats.has_key('idle_time_ns'))
|
||||
self.assertFalse('idle_time_ns' in stats)
|
||||
|
||||
# This test does not alter these, so they must be all 0
|
||||
self.assertEqual(0, stats['rd_merged'])
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@
|
|||
# Exercise the QEMU 'luks' block driver to validate interoperability
|
||||
# with the Linux dm-crypt + cryptsetup implementation
|
||||
|
||||
from __future__ import print_function
|
||||
import subprocess
|
||||
import os
|
||||
import os.path
|
||||
|
|
@ -376,7 +377,7 @@ def test_once(config, qemu_img=False):
|
|||
finally:
|
||||
iotests.log("# Delete image")
|
||||
delete_image(config)
|
||||
print
|
||||
print()
|
||||
|
||||
|
||||
# Obviously we only work with the luks image format
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@
|
|||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
|
||||
from __future__ import print_function
|
||||
import os
|
||||
import re
|
||||
import iotests
|
||||
|
|
@ -85,7 +86,7 @@ class TestPersistentDirtyBitmap(iotests.QMPTestCase):
|
|||
log = re.sub(r'^\[I \d+\.\d+\] OPENED\n', '', log)
|
||||
log = re.sub(r'\[I \+\d+\.\d+\] CLOSED\n?$', '', log)
|
||||
if log:
|
||||
print log
|
||||
print(log)
|
||||
|
||||
self.vm = self.mkVm()
|
||||
self.vm.launch()
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
from __future__ import print_function
|
||||
# Common utilities and Python wrappers for qemu-iotests
|
||||
#
|
||||
# Copyright (C) 2012 IBM Corp.
|
||||
|
|
@ -248,7 +249,7 @@ def filter_img_info(output, filename):
|
|||
def log(msg, filters=[]):
|
||||
for flt in filters:
|
||||
msg = flt(msg)
|
||||
print msg
|
||||
print(msg)
|
||||
|
||||
class Timeout:
|
||||
def __init__(self, seconds, errmsg = "Timeout"):
|
||||
|
|
@ -613,7 +614,7 @@ def notrun(reason):
|
|||
seq = os.path.basename(sys.argv[0])
|
||||
|
||||
open('%s/%s.notrun' % (output_dir, seq), 'wb').write(reason + '\n')
|
||||
print '%s not run: %s' % (seq, reason)
|
||||
print('%s not run: %s' % (seq, reason))
|
||||
sys.exit(0)
|
||||
|
||||
def verify_image_format(supported_fmts=[], unsupported_fmts=[]):
|
||||
|
|
|
|||
|
|
@ -43,6 +43,7 @@
|
|||
# This work is licensed under the terms of the GNU GPL, version 2 or later.
|
||||
# See the COPYING file in the top-level directory.
|
||||
|
||||
from __future__ import print_function
|
||||
import sys
|
||||
import socket
|
||||
import struct
|
||||
|
|
@ -110,7 +111,7 @@ def check(self, event, io, bufsize=None):
|
|||
for rule in self.rules:
|
||||
if rule.match(event, io):
|
||||
if rule.when == 0 or bufsize is None:
|
||||
print 'Closing connection on rule match %s' % rule.name
|
||||
print('Closing connection on rule match %s' % rule.name)
|
||||
sys.exit(0)
|
||||
if rule.when != -1:
|
||||
return rule.when
|
||||
|
|
@ -182,7 +183,7 @@ def handle_connection(conn, use_export):
|
|||
elif req.type == NBD_CMD_DISC:
|
||||
break
|
||||
else:
|
||||
print 'unrecognized command type %#02x' % req.type
|
||||
print('unrecognized command type %#02x' % req.type)
|
||||
break
|
||||
conn.close()
|
||||
|
||||
|
|
@ -242,7 +243,7 @@ def open_socket(path):
|
|||
sock = socket.socket(socket.AF_UNIX)
|
||||
sock.bind(path)
|
||||
sock.listen(0)
|
||||
print 'Listening on %s' % path
|
||||
print('Listening on %s' % path)
|
||||
sys.stdout.flush() # another process may be waiting, show message now
|
||||
return sock
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
#!/usr/bin/env python
|
||||
|
||||
from __future__ import print_function
|
||||
import sys
|
||||
import struct
|
||||
import string
|
||||
|
|
@ -129,8 +130,8 @@ def update(self, fd):
|
|||
|
||||
def dump(self):
|
||||
for f in QcowHeader.fields:
|
||||
print "%-25s" % f[2], f[1] % self.__dict__[f[2]]
|
||||
print ""
|
||||
print("%-25s" % f[2], f[1] % self.__dict__[f[2]])
|
||||
print("")
|
||||
|
||||
def dump_extensions(self):
|
||||
for ex in self.extensions:
|
||||
|
|
@ -141,11 +142,11 @@ def dump_extensions(self):
|
|||
else:
|
||||
data = "<binary>"
|
||||
|
||||
print "Header extension:"
|
||||
print "%-25s %#x" % ("magic", ex.magic)
|
||||
print "%-25s %d" % ("length", ex.length)
|
||||
print "%-25s %s" % ("data", data)
|
||||
print ""
|
||||
print("Header extension:")
|
||||
print("%-25s %#x" % ("magic", ex.magic))
|
||||
print("%-25s %d" % ("length", ex.length))
|
||||
print("%-25s %s" % ("data", data))
|
||||
print("")
|
||||
|
||||
|
||||
def cmd_dump_header(fd):
|
||||
|
|
@ -157,12 +158,12 @@ def cmd_set_header(fd, name, value):
|
|||
try:
|
||||
value = int(value, 0)
|
||||
except:
|
||||
print "'%s' is not a valid number" % value
|
||||
print("'%s' is not a valid number" % value)
|
||||
sys.exit(1)
|
||||
|
||||
fields = (field[2] for field in QcowHeader.fields)
|
||||
if not name in fields:
|
||||
print "'%s' is not a known header field" % name
|
||||
print("'%s' is not a known header field" % name)
|
||||
sys.exit(1)
|
||||
|
||||
h = QcowHeader(fd)
|
||||
|
|
@ -173,7 +174,7 @@ def cmd_add_header_ext(fd, magic, data):
|
|||
try:
|
||||
magic = int(magic, 0)
|
||||
except:
|
||||
print "'%s' is not a valid magic number" % magic
|
||||
print("'%s' is not a valid magic number" % magic)
|
||||
sys.exit(1)
|
||||
|
||||
h = QcowHeader(fd)
|
||||
|
|
@ -188,7 +189,7 @@ def cmd_del_header_ext(fd, magic):
|
|||
try:
|
||||
magic = int(magic, 0)
|
||||
except:
|
||||
print "'%s' is not a valid magic number" % magic
|
||||
print("'%s' is not a valid magic number" % magic)
|
||||
sys.exit(1)
|
||||
|
||||
h = QcowHeader(fd)
|
||||
|
|
@ -200,7 +201,7 @@ def cmd_del_header_ext(fd, magic):
|
|||
h.extensions.remove(ex)
|
||||
|
||||
if not found:
|
||||
print "No such header extension"
|
||||
print("No such header extension")
|
||||
return
|
||||
|
||||
h.update(fd)
|
||||
|
|
@ -211,7 +212,7 @@ def cmd_set_feature_bit(fd, group, bit):
|
|||
if bit < 0 or bit >= 64:
|
||||
raise ValueError
|
||||
except:
|
||||
print "'%s' is not a valid bit number in range [0, 64)" % bit
|
||||
print("'%s' is not a valid bit number in range [0, 64)" % bit)
|
||||
sys.exit(1)
|
||||
|
||||
h = QcowHeader(fd)
|
||||
|
|
@ -222,7 +223,7 @@ def cmd_set_feature_bit(fd, group, bit):
|
|||
elif group == 'autoclear':
|
||||
h.autoclear_features |= 1 << bit
|
||||
else:
|
||||
print "'%s' is not a valid group, try 'incompatible', 'compatible', or 'autoclear'" % group
|
||||
print("'%s' is not a valid group, try 'incompatible', 'compatible', or 'autoclear'" % group)
|
||||
sys.exit(1)
|
||||
|
||||
h.update(fd)
|
||||
|
|
@ -248,16 +249,16 @@ def main(filename, cmd, args):
|
|||
else:
|
||||
handler(fd, *args)
|
||||
return
|
||||
print "Unknown command '%s'" % cmd
|
||||
print("Unknown command '%s'" % cmd)
|
||||
finally:
|
||||
fd.close()
|
||||
|
||||
def usage():
|
||||
print "Usage: %s <file> <cmd> [<arg>, ...]" % sys.argv[0]
|
||||
print ""
|
||||
print "Supported commands:"
|
||||
print("Usage: %s <file> <cmd> [<arg>, ...]" % sys.argv[0])
|
||||
print("")
|
||||
print("Supported commands:")
|
||||
for name, handler, num_args, desc in cmds:
|
||||
print " %-20s - %s" % (name, desc)
|
||||
print(" %-20s - %s" % (name, desc))
|
||||
|
||||
if __name__ == '__main__':
|
||||
if len(sys.argv) < 3:
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@
|
|||
# This work is licensed under the terms of the GNU GPL, version 2 or later.
|
||||
# See the COPYING file in the top-level directory.
|
||||
|
||||
from __future__ import print_function
|
||||
import sys
|
||||
import struct
|
||||
import random
|
||||
|
|
@ -108,12 +109,12 @@ def corrupt_table_invalidate(qed, table):
|
|||
def cmd_show(qed, *args):
|
||||
'''show [header|l1|l2 <offset>]- Show header or l1/l2 tables'''
|
||||
if not args or args[0] == 'header':
|
||||
print qed.header
|
||||
print(qed.header)
|
||||
elif args[0] == 'l1':
|
||||
print qed.l1_table
|
||||
print(qed.l1_table)
|
||||
elif len(args) == 2 and args[0] == 'l2':
|
||||
offset = int(args[1])
|
||||
print qed.read_table(offset)
|
||||
print(qed.read_table(offset))
|
||||
else:
|
||||
err('unrecognized sub-command')
|
||||
|
||||
|
|
@ -146,7 +147,7 @@ def cmd_invalidate(qed, table_level):
|
|||
def cmd_need_check(qed, *args):
|
||||
'''need-check [on|off] - Test, set, or clear the QED_F_NEED_CHECK header bit'''
|
||||
if not args:
|
||||
print bool(qed.header['features'] & QED_F_NEED_CHECK)
|
||||
print(bool(qed.header['features'] & QED_F_NEED_CHECK))
|
||||
return
|
||||
|
||||
if args[0] == 'on':
|
||||
|
|
@ -208,11 +209,11 @@ def cmd_copy_metadata(qed, outfile):
|
|||
out.close()
|
||||
|
||||
def usage():
|
||||
print 'Usage: %s <file> <cmd> [<arg>, ...]' % sys.argv[0]
|
||||
print
|
||||
print 'Supported commands:'
|
||||
print('Usage: %s <file> <cmd> [<arg>, ...]' % sys.argv[0])
|
||||
print()
|
||||
print('Supported commands:')
|
||||
for cmd in sorted(x for x in globals() if x.startswith('cmd_')):
|
||||
print globals()[cmd].__doc__
|
||||
print(globals()[cmd].__doc__)
|
||||
sys.exit(1)
|
||||
|
||||
def main():
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@
|
|||
# the COPYING file in the top-level directory.
|
||||
#
|
||||
|
||||
from __future__ import print_function
|
||||
import os
|
||||
import sys
|
||||
import logging
|
||||
|
|
@ -222,7 +223,7 @@ def main(vmcls):
|
|||
try:
|
||||
args, argv = parse_args(vmcls.name)
|
||||
if not argv and not args.build_qemu and not args.build_image:
|
||||
print "Nothing to do?"
|
||||
print("Nothing to do?")
|
||||
return 1
|
||||
logging.basicConfig(level=(logging.DEBUG if args.debug
|
||||
else logging.WARN))
|
||||
|
|
|
|||
Loading…
Reference in New Issue