diff options
| author | Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> | 2011-05-25 19:48:00 +0100 |
|---|---|---|
| committer | Luiz Capitulino <lcapitulino@redhat.com> | 2011-06-01 11:43:18 -0300 |
| commit | 91b8eddf41fd62ecbc61cb901c40f50287126fac (patch) | |
| tree | f70d142b82ef8e0d507671a7784fa4dd226bd2aa /QMP | |
| parent | e9b4b432e781863869b074d46966bfa0bd672b8f (diff) | |
| download | qemu-91b8eddf41fd62ecbc61cb901c40f50287126fac.tar.gz qemu-91b8eddf41fd62ecbc61cb901c40f50287126fac.tar.bz2 qemu-91b8eddf41fd62ecbc61cb901c40f50287126fac.zip | |
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: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Diffstat (limited to 'QMP')
| -rw-r--r-- | QMP/qmp.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/QMP/qmp.py b/QMP/qmp.py index 14ce8b0d05..25655088fb 100644 --- a/QMP/qmp.py +++ b/QMP/qmp.py @@ -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,7 +51,8 @@ class QEMUMonitorProtocol: resp = json.loads(data) if 'event' in resp: self.__events.append(resp) - continue + if not only_event: + continue return resp error = socket.error @@ -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): |