Commit 91b8eddf authored by Stefan Hajnoczi's avatar Stefan Hajnoczi Committed by Luiz Capitulino
Browse files

QMP: add get_events(wait=True) option 



The get_events() function polls for new QMP events and then returns.  It
can be useful to wait for the next QMP event so add the boolean 'wait'
keyword argument.

Signed-off-by: default avatarStefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Signed-off-by: default avatarLuiz Capitulino <lcapitulino@redhat.com>
parent e9b4b432

QMP/qmp.py

+8 −3
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ class QEMUMonitorProtocol: 
            family = socket.AF_UNIX

        return socket.socket(family, socket.SOCK_STREAM)



    def __json_read(self):

    def __json_read(self, only_event=False):

        while True:

            data = self.__sockfile.readline()

            if not data:
@@ -51,6 +51,7 @@ class QEMUMonitorProtocol: 
            resp = json.loads(data)

            if 'event' in resp:

                self.__events.append(resp)

                if not only_event:

                    continue

            return resp
@@ -106,9 +107,11 @@ class QEMUMonitorProtocol: 
            qmp_cmd['id'] = id

        return self.cmd_obj(qmp_cmd)



    def get_events(self):

    def get_events(self, wait=False):

        """

        Get a list of available QMP events.



        @param wait: block until an event is available (bool)

        """

        self.__sock.setblocking(0)

        try:
@@ -118,6 +121,8 @@ class QEMUMonitorProtocol: 
                # No data available

                pass

        self.__sock.setblocking(1)

        if not self.__events and wait:

            self.__json_read(only_event=True)

        return self.__events



    def clear_events(self):