[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 25/28] qmp-shell: add -N option to skip negotiate
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 25/28] qmp-shell: add -N option to skip negotiate |
Date: |
Thu, 4 May 2017 17:24:02 +0200 |
From: Marc-André Lureau <address@hidden>
qemu-ga doesn't have negotiate phase.
Signed-off-by: Marc-André Lureau <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
---
scripts/qmp/qmp-shell | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/scripts/qmp/qmp-shell b/scripts/qmp/qmp-shell
index 6ece6e7..b4d2dbd 100755
--- a/scripts/qmp/qmp-shell
+++ b/scripts/qmp/qmp-shell
@@ -277,8 +277,8 @@ class QMPShell(qmp.QEMUMonitorProtocol):
self._print(resp)
return True
- def connect(self):
- self._greeting = qmp.QEMUMonitorProtocol.connect(self)
+ def connect(self, negotiate):
+ self._greeting = qmp.QEMUMonitorProtocol.connect(self, negotiate)
self.__completer_setup()
def show_banner(self, msg='Welcome to the QMP low-level shell!'):
@@ -390,7 +390,7 @@ def die(msg):
def fail_cmdline(option=None):
if option:
sys.stderr.write('ERROR: bad command-line option \'%s\'\n' % option)
- sys.stderr.write('qemu-shell [ -v ] [ -p ] [ -H ] < UNIX socket path> | <
TCP address:port >\n')
+ sys.stderr.write('qemu-shell [ -v ] [ -p ] [ -H ] [ -N ] < UNIX socket
path> | < TCP address:port >\n')
sys.exit(1)
def main():
@@ -399,6 +399,7 @@ def main():
hmp = False
pretty = False
verbose = False
+ negotiate = True
try:
for arg in sys.argv[1:]:
@@ -408,6 +409,8 @@ def main():
hmp = True
elif arg == "-p":
pretty = True
+ elif arg == "-N":
+ negotiate = False
elif arg == "-v":
verbose = True
else:
@@ -425,7 +428,7 @@ def main():
die('bad port number in command-line')
try:
- qemu.connect()
+ qemu.connect(negotiate)
except qmp.QMPConnectError:
die('Didn\'t get QMP greeting message')
except qmp.QMPCapabilitiesError:
--
2.7.4
- [Qemu-devel] [PULL 02/28] test-keyval: fix leaks, (continued)
- [Qemu-devel] [PULL 02/28] test-keyval: fix leaks, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 11/28] fdc-test: Avoid deprecated 'change' command, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 20/28] qmp: Improve QMP dispatch error messages, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 26/28] qmp-shell: Cope with query-commands error, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 12/28] test-qga: Actually test 0xff sync bytes, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 27/28] qmp-shell: don't show version greeting if unavailable, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 15/28] qapi: New QAPI_CLONE_MEMBERS(), Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 19/28] sockets: Delete unused helper socket_address_crumple(), Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 14/28] sockets: Prepare inet_parse() for flattened SocketAddress, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 06/28] qobject: Drop useless QObject casts, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 25/28] qmp-shell: add -N option to skip negotiate,
Markus Armbruster <=
- [Qemu-devel] [PULL 24/28] qmp-shell: add persistent command history, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 23/28] qobject-input-visitor: Catch misuse of end_struct vs. end_list, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 08/28] qobject: Use simpler QDict/QList scalar insertion macros, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 13/28] sockets: Prepare vsock_parse() for flattened SocketAddress, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 16/28] sockets: Rename SocketAddress to SocketAddressLegacy, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 28/28] qmp-shell: improve help, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 17/28] sockets: Rename SocketAddressFlat to SocketAddress, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 18/28] sockets: Limit SocketAddressLegacy to external interfaces, Markus Armbruster, 2017/05/04
- Re: [Qemu-devel] [PULL 00/28] QAPI patches for 2017-05-04, no-reply, 2017/05/04