From 141ae90648a8bb4c26238cfde4d4946e6cff3108 Mon Sep 17 00:00:00 2001

From: Eduardo Habkost <ehabkost@redhat.com>

Date: Mon, 25 Jun 2018 21:23:43 +0100

Subject: [PATCH 02/15] python: futurize -f

 libfuturize.fixes.fix_print_with_import

RH-Author: Eduardo Habkost <ehabkost@redhat.com>

Message-id: <20180625212346.26440-2-ehabkost@redhat.com>

Patchwork-id: 81049

O-Subject: [qemu-kvm RHEL8/virt212 PATCH 1/4] python: futurize -f libfuturize.fixes.fix_print_with_import

Bugzilla: 1571533

RH-Acked-by: Thomas Huth <thuth@redhat.com>

RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>

RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>

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

Backport conflicts:

 * tests/docker/docker.py: class ProbeCommand doesn't exist

   in the RHEL8 tree

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>

(cherry picked from commit f03868bd5653265e97b253102d77d83ea85efdea)

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>

Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>

---

 scripts/analyse-9p-simpletrace.py        | 89 ++++++++++++++++----------------

 scripts/analyse-locks-simpletrace.py     |  1 +

 scripts/analyze-migration.py             | 11 ++--

 scripts/device-crash-test                |  3 +-

 scripts/dump-guest-memory.py             |  1 +

 scripts/kvm/kvm_flightrecorder           | 21 ++++----

 scripts/kvm/vmxcap                       |  1 +

 scripts/qmp/qemu-ga-client               |  1 +

 scripts/qmp/qmp                          | 17 +++---

 scripts/qmp/qmp-shell                    | 35 +++++++------

 scripts/qmp/qom-get                      |  7 +--

 scripts/qmp/qom-list                     | 11 ++--

 scripts/qmp/qom-set                      |  5 +-

 scripts/qmp/qom-tree                     | 11 ++--

 scripts/replay-dump.py                   | 21 ++++----

 scripts/signrom.py                       |  1 +

 scripts/simpletrace.py                   |  3 +-

 scripts/vmstate-static-checker.py        | 85 +++++++++++++++---------------

 tests/docker/docker.py                   | 11 ++--

 tests/docker/travis.py                   | 15 +++---

 tests/guest-debug/test-gdbstub.py        |  1 +

 tests/image-fuzzer/runner.py             | 38 ++++++--------

 tests/migration/guestperf/engine.py      | 29 ++++++-----

 tests/migration/guestperf/plot.py        | 17 +++---

 tests/migration/guestperf/shell.py       | 19 +++----

 tests/qemu-iotests/149                   |  3 +-

 tests/qemu-iotests/165                   |  3 +-

 tests/qemu-iotests/iotests.py            |  5 +-

 tests/qemu-iotests/nbd-fault-injector.py |  7 +--

 tests/qemu-iotests/qcow2.py              | 39 +++++++-------

 tests/qemu-iotests/qed.py                | 17 +++---

 tests/vm/basevm.py                       |  3 +-

 32 files changed, 278 insertions(+), 253 deletions(-)

diff --git a/scripts/analyse-9p-simpletrace.py b/scripts/analyse-9p-simpletrace.py

index 3c3dee4..710e01a 100755

--- a/scripts/analyse-9p-simpletrace.py

+++ b/scripts/analyse-9p-simpletrace.py

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

diff --git a/scripts/analyse-locks-simpletrace.py b/scripts/analyse-locks-simpletrace.py

index 101e84d..352bc9c 100755

--- a/scripts/analyse-locks-simpletrace.py

+++ b/scripts/analyse-locks-simpletrace.py

@@ -6,6 +6,7 @@

 # Author: Alex Bennée <alex.bennee@linaro.org>

 #

+from __future__ import print_function

 import os

 import simpletrace

 import argparse

diff --git a/scripts/analyze-migration.py b/scripts/analyze-migration.py

index 88ff4ad..5c2010c 100755

--- a/scripts/analyze-migration.py

+++ b/scripts/analyze-migration.py

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

diff --git a/scripts/device-crash-test b/scripts/device-crash-test

index 5d17dc6..6a85c15 100755

--- a/scripts/device-crash-test

+++ b/scripts/device-crash-test

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

@@ -557,7 +558,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

diff --git a/scripts/dump-guest-memory.py b/scripts/dump-guest-memory.py

index 276eebf..5a857ce 100644

--- a/scripts/dump-guest-memory.py

+++ b/scripts/dump-guest-memory.py

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

diff --git a/scripts/kvm/kvm_flightrecorder b/scripts/kvm/kvm_flightrecorder

index 7fb1c2d..54a5674 100755

--- a/scripts/kvm/kvm_flightrecorder

+++ b/scripts/kvm/kvm_flightrecorder

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

diff --git a/scripts/kvm/vmxcap b/scripts/kvm/vmxcap

index d9a6db0..99a8146 100755

--- a/scripts/kvm/vmxcap

+++ b/scripts/kvm/vmxcap

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

diff --git a/scripts/qmp/qemu-ga-client b/scripts/qmp/qemu-ga-client

index 7d2a472..8510814 100755

--- a/scripts/qmp/qemu-ga-client

+++ b/scripts/qmp/qemu-ga-client

@@ -36,6 +36,7 @@

 # See also: https://wiki.qemu.org/Features/QAPI/GuestAgent

 #

+from __future__ import print_function

 import base64

 import random

diff --git a/scripts/qmp/qmp b/scripts/qmp/qmp

index 514b539..16d3bdb 100755

--- a/scripts/qmp/qmp

+++ b/scripts/qmp/qmp

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

diff --git a/scripts/qmp/qmp-shell b/scripts/qmp/qmp-shell

index be449de..b1cc7e2 100755

--- a/scripts/qmp/qmp-shell

+++ b/scripts/qmp/qmp-shell

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

diff --git a/scripts/qmp/qom-get b/scripts/qmp/qom-get

index 0172c69..291c8bf 100755

--- a/scripts/qmp/qom-get

+++ b/scripts/qmp/qom-get

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

diff --git a/scripts/qmp/qom-list b/scripts/qmp/qom-list

index 1e7cc6c..cd907bb 100755

--- a/scripts/qmp/qom-list

+++ b/scripts/qmp/qom-list

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

diff --git a/scripts/qmp/qom-set b/scripts/qmp/qom-set

index 94e2778..fbe4b3e 100755

--- a/scripts/qmp/qom-set

+++ b/scripts/qmp/qom-set

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