riscv
/
qemu
mirror of https://gitea.goldendeliverer.com/riscv/qemu.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

python: futurize -f libfuturize.fixes.fix_print_with_import 

Change all Python code to use print as a function.

This is necessary for Python 3 compatibility.

Done using:

  $ py=$( (g grep -l -E '^#!.*python';find -name '*.py' -printf '%P\n';) | \
    sort -u | grep -v README.sh4)
  $ futurize -w -f libfuturize.fixes.fix_print_with_import $py

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Acked-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20180608122952.2009-2-ehabkost@redhat.com>
[ehabkost: fixup tests/docker/docker.py]
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
pull/73/head
Eduardo Habkost 8 years ago
parent
0d2fa03dae
commit
f03868bd56
32 changed files with 281 additions and 256 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 89
      scripts/analyse-9p-simpletrace.py
  2. 1
      scripts/analyse-locks-simpletrace.py
  3. 11
      scripts/analyze-migration.py
  4. 3
      scripts/device-crash-test
  5. 1
      scripts/dump-guest-memory.py
  6. 21
      scripts/kvm/kvm_flightrecorder
  7. 1
      scripts/kvm/vmxcap
  8. 1
      scripts/qmp/qemu-ga-client
  9. 17
      scripts/qmp/qmp
  10. 35
      scripts/qmp/qmp-shell
  11. 7
      scripts/qmp/qom-get
  12. 11
      scripts/qmp/qom-list
  13. 5
      scripts/qmp/qom-set
  14. 11
      scripts/qmp/qom-tree
  15. 21
      scripts/replay-dump.py
  16. 1
      scripts/signrom.py
  17. 3
      scripts/simpletrace.py
  18. 85
      scripts/vmstate-static-checker.py
  19. 17
      tests/docker/docker.py
  20. 15
      tests/docker/travis.py
  21. 1
      tests/guest-debug/test-gdbstub.py
  22. 38
      tests/image-fuzzer/runner.py
  23. 29
      tests/migration/guestperf/engine.py
  24. 17
      tests/migration/guestperf/plot.py
  25. 19
      tests/migration/guestperf/shell.py
  26. 3
      tests/qemu-iotests/149
  27. 3
      tests/qemu-iotests/165
  28. 5
      tests/qemu-iotests/iotests.py
  29. 7
      tests/qemu-iotests/nbd-fault-injector.py
  30. 39
      tests/qemu-iotests/qcow2.py
  31. 17
      tests/qemu-iotests/qed.py
  32. 3
      tests/vm/basevm.py

89
scripts/analyse-9p-simpletrace.py
View File

@ -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 @@ symbol_9p = {
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())

1
scripts/analyse-locks-simpletrace.py
View File

@ -6,6 +6,7 @@
# Author: Alex Bennée <alex.bennee@linaro.org>
#
from __future__ import print_function
import os
import simpletrace
import argparse

11
scripts/analyze-migration.py
View File

@ -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 @@ class RamSection(object):
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 @@ if args.extract:
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 @@ if args.extract:
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 @@ elif args.dump == "state":
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")

3
scripts/device-crash-test
View File

@ -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

1
scripts/dump-guest-memory.py
View File

@ -12,6 +12,7 @@ Authors:
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

21
scripts/kvm/kvm_flightrecorder
View File

@ -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':

1
scripts/kvm/vmxcap
View File

@ -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
scripts/qmp/qemu-ga-client
View File

@ -36,6 +36,7 @@
# See also: https://wiki.qemu.org/Features/QAPI/GuestAgent
#
from __future__ import print_function
import base64
import random

17
scripts/qmp/qmp
View File

@ -10,6 +10,7 @@
# 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
import sys, os
from qmp import QEMUMonitorProtocol
@ -26,9 +27,9 @@ 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
@ -53,21 +54,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']:
@ -93,7 +94,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 +105,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:]

35
scripts/qmp/qmp-shell
View File

@ -65,6 +65,7 @@
# which will echo back the properly formatted JSON-compliant QMP that is being
# sent to QEMU, which is useful for debugging and documentation generation.
from __future__ import print_function
import qmp
import json
import ast
@ -153,14 +154,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 +259,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 +276,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 +286,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 +307,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 +367,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):

7
scripts/qmp/qom-get
View File

@ -11,6 +11,7 @@
# the COPYING file in the top-level directory.
##
from __future__ import print_function
import sys
import os
from qmp import QEMUMonitorProtocol
@ -33,7 +34,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:
@ -62,6 +63,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
scripts/qmp/qom-list
View File

@ -11,6 +11,7 @@
# the COPYING file in the top-level directory.
##
from __future__ import print_function
import sys
import os
from qmp import QEMUMonitorProtocol
@ -33,7 +34,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:
@ -52,13 +53,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'])

5
scripts/qmp/qom-set
View File

@ -11,6 +11,7 @@
# the COPYING file in the top-level directory.
##
from __future__ import print_function
import sys
import os
from qmp import QEMUMonitorProtocol
@ -34,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:
@ -61,4 +62,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))

11
scripts/qmp/qom-tree
View File

@ -13,6 +13,7 @@
# the COPYING file in the top-level directory.
##
from __future__ import print_function
import sys
import os
from qmp import QEMUMonitorProtocol
@ -35,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:
@ -54,15 +55,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'])

21
scripts/replay-dump.py
View File

@ -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
scripts/signrom.py
View File

@ -1,3 +1,4 @@
from __future__ import print_function
#
# Option ROM signing utility
#

3
scripts/simpletrace.py
View File

@ -9,6 +9,7 @@
#
# For help see docs/devel/tracing.txt
from __future__ import print_function
import struct
import re
import inspect
@ -257,6 +258,6 @@ if __name__ == '__main__':
else:
fields.append('%s=0x%x' % (name, rec[i]))
i += 1
print ' '.join(fields)
print(' '.join(fields))
run(Formatter())

85
scripts/vmstate-static-checker.py
View File

@ -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
@ -176,10 +177,10 @@ def check_fields(src_fields, dest_fields, desc, sec):
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

17
tests/docker/docker.py
View File

@ -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 @@ class Docker(object):
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 @@ class BuildCommand(SubCommand):
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 @@ class BuildCommand(SubCommand):
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 @@ class ProbeCommand(SubCommand):
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

15
tests/docker/travis.py
View File

@ -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
tests/guest-debug/test-gdbstub.py
View File

@ -1,3 +1,4 @@
from __future__ import print_function
#
# This script needs to be run on startup
# qemu -kernel ${KERNEL} -s -S

38
tests/image-fuzzer/runner.py
View File

@ -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 @@ except ImportError:
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
@ -158,9 +158,8 @@ class TestEnv(object):
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 @@ class TestEnv(object):
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 @@ if __name__ == '__main__':
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 @@ if __name__ == '__main__':
['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 @@ if __name__ == '__main__':
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 @@ if __name__ == '__main__':
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 @@ if __name__ == '__main__':
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

29
tests/migration/guestperf/engine.py
View File

@ -1,3 +1,4 @@
from __future__ import print_function
#
# Migration test main engine
#
@ -117,7 +118,7 @@ class Engine(object):
# 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 @@ class Engine(object):
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 @@ class Engine(object):
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 @@ class Engine(object):
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 @@ class Engine(object):
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 @@ class Engine(object):
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 @@ class Engine(object):
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 @@ class Engine(object):
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 @@ class Engine(object):
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 @@ class Engine(object):
pass
if self._debug:
print src.get_log()
print dst.get_log()
print(src.get_log())
print(dst.get_log())
raise

17
tests/migration/guestperf/plot.py
View File

@ -1,3 +1,4 @@
from __future__ import print_function
#
# Migration test graph plotting
#
@ -588,7 +589,7 @@ class Plot(object):
"""
def generate_html(self, fh):
print >>fh, """<html>
print("""<html>
<head>
<script type="text/javascript" src="plotly.min.js">
</script>
@ -601,19 +602,19 @@ class Plot(object):
<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:

19
tests/migration/guestperf/shell.py
View File

@ -1,3 +1,4 @@
from __future__ import print_function
#
# Migration test command line shell integration
#
@ -160,13 +161,13 @@ class Shell(BaseShell):
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 @@ class BatchShell(BaseShell):
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 @@ class BatchShell(BaseShell):
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 @@ class PlotShell(object):
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 = []

3
tests/qemu-iotests/149
View File

@ -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

3
tests/qemu-iotests/165
View File

@ -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()

5
tests/qemu-iotests/iotests.py
View File

@ -1,3 +1,4 @@
from __future__ import print_function
# Common utilities and Python wrappers for qemu-iotests
#
# Copyright (C) 2012 IBM Corp.
@ -239,7 +240,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"):
@ -599,7 +600,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=[]):

7
tests/qemu-iotests/nbd-fault-injector.py
View File

@ -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 @@ class FaultInjectionSocket(object):
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

39
tests/qemu-iotests/qcow2.py
View File

@ -1,5 +1,6 @@
#!/usr/bin/env python
from __future__ import print_function
import sys
import struct
import string
@ -129,8 +130,8 @@ class QcowHeader:
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 @@ class QcowHeader:
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:

17
tests/qemu-iotests/qed.py
View File

@ -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():

3
tests/vm/basevm.py
View File

@ -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))

Write Preview
Loading…
Cancel
Save