From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44132) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d80Ab-00085o-Iv for qemu-devel@nongnu.org; Tue, 09 May 2017 04:07:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d80AX-0007bI-N5 for qemu-devel@nongnu.org; Tue, 09 May 2017 04:06:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:6511) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d80AX-0007aY-Gp for qemu-devel@nongnu.org; Tue, 09 May 2017 04:06:53 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8624D61D15 for ; Tue, 9 May 2017 08:06:52 +0000 (UTC) From: Markus Armbruster Date: Tue, 9 May 2017 10:06:42 +0200 Message-Id: <1494317205-2211-26-git-send-email-armbru@redhat.com> In-Reply-To: <1494317205-2211-1-git-send-email-armbru@redhat.com> References: <1494317205-2211-1-git-send-email-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL v3 25/28] qmp-shell: add -N option to skip negotiate List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= From: Marc-Andr=C3=A9 Lureau qemu-ga doesn't have negotiate phase. Signed-off-by: Marc-Andr=C3=A9 Lureau Message-Id: <20170504125432.21653-2-marcandre.lureau@redhat.com> Reviewed-by: Eric Blake Signed-off-by: Markus Armbruster --- 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 =20 - def connect(self): - self._greeting =3D qmp.QEMUMonitorProtocol.connect(self) + def connect(self, negotiate): + self._greeting =3D qmp.QEMUMonitorProtocol.connect(self, negotia= te) self.__completer_setup() =20 def show_banner(self, msg=3D'Welcome to the QMP low-level shell!'): @@ -390,7 +390,7 @@ def die(msg): def fail_cmdline(option=3DNone): if option: sys.stderr.write('ERROR: bad command-line option \'%s\'\n' % opt= ion) - 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 sock= et path> | < TCP address:port >\n') sys.exit(1) =20 def main(): @@ -399,6 +399,7 @@ def main(): hmp =3D False pretty =3D False verbose =3D False + negotiate =3D True =20 try: for arg in sys.argv[1:]: @@ -408,6 +409,8 @@ def main(): hmp =3D True elif arg =3D=3D "-p": pretty =3D True + elif arg =3D=3D "-N": + negotiate =3D False elif arg =3D=3D "-v": verbose =3D True else: @@ -425,7 +428,7 @@ def main(): die('bad port number in command-line') =20 try: - qemu.connect() + qemu.connect(negotiate) except qmp.QMPConnectError: die('Didn\'t get QMP greeting message') except qmp.QMPCapabilitiesError: --=20 2.7.4