[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 01/15] Make negotiation optional in QEMUMonitorProtoc
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PULL 01/15] Make negotiation optional in QEMUMonitorProtocol |
Date: |
Thu, 27 Sep 2012 10:28:15 -0300 |
From: Ryota Ozaki <address@hidden>
This is a preparation for qemu-ga-client which uses
QEMUMonitorProtocol class. The class tries to
negotiate capabilities on connect, however, qemu-ga
doesn't suppose it and fails.
This change makes the negotiation optional, though
it's still performed by default for compatibility.
Signed-off-by: Ryota Ozaki <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>
---
QMP/qmp.py | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/QMP/qmp.py b/QMP/qmp.py
index 36ecc1d..5a573e1 100644
--- a/QMP/qmp.py
+++ b/QMP/qmp.py
@@ -49,7 +49,6 @@ class QEMUMonitorProtocol:
return socket.socket(family, socket.SOCK_STREAM)
def __negotiate_capabilities(self):
- self.__sockfile = self.__sock.makefile()
greeting = self.__json_read()
if greeting is None or not greeting.has_key('QMP'):
raise QMPConnectError
@@ -73,7 +72,7 @@ class QEMUMonitorProtocol:
error = socket.error
- def connect(self):
+ def connect(self, negotiate=True):
"""
Connect to the QMP Monitor and perform capabilities negotiation.
@@ -83,7 +82,9 @@ class QEMUMonitorProtocol:
@raise QMPCapabilitiesError if fails to negotiate capabilities
"""
self.__sock.connect(self.__address)
- return self.__negotiate_capabilities()
+ self.__sockfile = self.__sock.makefile()
+ if negotiate:
+ return self.__negotiate_capabilities()
def accept(self):
"""
--
1.7.12.315.g682ce8b
- [Qemu-devel] [PULL 00/15]: QMP queue, Luiz Capitulino, 2012/09/27
- [Qemu-devel] [PULL 03/15] Add qemu-ga-client script, Luiz Capitulino, 2012/09/27
- [Qemu-devel] [PULL 06/15] pci-assign: use monitor_handle_fd_param, Luiz Capitulino, 2012/09/27
- [Qemu-devel] [PULL 05/15] qapi: add "unix" to the set of reserved words, Luiz Capitulino, 2012/09/27
- [Qemu-devel] [PULL 01/15] Make negotiation optional in QEMUMonitorProtocol,
Luiz Capitulino <=
- [Qemu-devel] [PULL 04/15] qapi: do not protect enum values from namespace pollution, Luiz Capitulino, 2012/09/27
- [Qemu-devel] [PULL 02/15] Support settimeout in QEMUMonitorProtocol, Luiz Capitulino, 2012/09/27
- [Qemu-devel] [PULL 08/15] qapi: convert add_client, Luiz Capitulino, 2012/09/27
- [Qemu-devel] [PULL 07/15] monitor: add Error * argument to monitor_get_fd, Luiz Capitulino, 2012/09/27
- [Qemu-devel] [PULL 11/15] hmp: dump-guest-memory: hardcode protocol argument to "file:", Luiz Capitulino, 2012/09/27
- [Qemu-devel] [PULL 09/15] qmp: dump-guest-memory: improve schema doc (again), Luiz Capitulino, 2012/09/27
- [Qemu-devel] [PULL 13/15] qmp: qmp_send_key(): accept key codes in hex, Luiz Capitulino, 2012/09/27