Commit f03868bd authored by Eduardo Habkost's avatar Eduardo Habkost
Browse files

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: default avatarStefan Hajnoczi <stefanha@redhat.com>
Acked-by: default avatarFam Zheng <famz@redhat.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Message-Id: <20180608122952.2009-2-ehabkost@redhat.com>
[ehabkost: fixup tests/docker/docker.py]
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent 0d2fa03d

scripts/analyse-9p-simpletrace.py

+45 −44
Original line number Diff line number Diff line
@@ -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())

scripts/analyse-locks-simpletrace.py

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
# Author: Alex Bennée <alex.bennee@linaro.org>

#



from __future__ import print_function

import os

import simpletrace

import argparse

scripts/analyze-migration.py

+6 −5
Original line number Diff line number Diff line
@@ -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")

scripts/device-crash-test

+2 −1
Original line number Diff line number Diff line
@@ -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

scripts/dump-guest-memory.py

+1 −0
Original line number Diff line number Diff line
@@ -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