Commit 7b6b9dbb authored by Lukáš Doktor's avatar Lukáš Doktor Committed by Eduardo Habkost
Browse files

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: default avatarLukáš Doktor <ldoktor@redhat.com>
Reviewed-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Message-Id: <20170818142613.32394-10-ldoktor@redhat.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent 2cb05a3f

scripts/qmp/qmp.py

+4 −4
Original line number Diff line number Diff line
@@ -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):