aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukáš Doktor <ldoktor@redhat.com>2017-08-18 16:26:12 +0200
committerEduardo Habkost <ehabkost@redhat.com>2017-09-15 20:12:00 -0300
commit7b6b9dbb3c4cb7eac4c847d601735da9b1d150ce (patch)
tree7ca6dad3540ba50a94e044216f7226238e492bb0
parent2cb05a3f3613f633b916b854cfaf04c663ccc953 (diff)
downloadqemu-7b6b9dbb3c4cb7eac4c847d601735da9b1d150ce.zip
qemu-7b6b9dbb3c4cb7eac4c847d601735da9b1d150ce.tar.gz
qemu-7b6b9dbb3c4cb7eac4c847d601735da9b1d150ce.tar.bz2
qmp.py: Avoid overriding a builtin object
The "id" is a builtin method to get object's identity and should not be overridden. This might bring some issues in case someone was directly calling "cmd(..., id=id)" but I haven't found such usage on brief search for "cmd\(.*id=". Signed-off-by: Lukáš Doktor <ldoktor@redhat.com> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com> Message-Id: <20170818142613.32394-10-ldoktor@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
-rw-r--r--scripts/qmp/qmp.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/qmp/qmp.py b/scripts/qmp/qmp.py
index f2f5a9b..ef12e8a 100644
--- a/scripts/qmp/qmp.py
+++ b/scripts/qmp/qmp.py
@@ -177,19 +177,19 @@ class QEMUMonitorProtocol(object):
print >>sys.stderr, "QMP:<<< %s" % resp
return resp
- def cmd(self, name, args=None, id=None):
+ def cmd(self, name, args=None, cmd_id=None):
"""
Build a QMP command and send it to the QMP Monitor.
@param name: command name (string)
@param args: command arguments (dict)
- @param id: command id (dict, list, string or int)
+ @param cmd_id: command id (dict, list, string or int)
"""
qmp_cmd = {'execute': name}
if args:
qmp_cmd['arguments'] = args
- if id:
- qmp_cmd['id'] = id
+ if cmd_id:
+ qmp_cmd['id'] = cmd_id
return self.cmd_obj(qmp_cmd)
def command(self, cmd, **kwds):