From nobody Mon Feb 9 07:56:44 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1493912791181754.0155906276154; Thu, 4 May 2017 08:46:31 -0700 (PDT) Received: from localhost ([::1]:42635 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d6IxZ-0007oS-Rf for importer@patchew.org; Thu, 04 May 2017 11:46:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56519) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d6Ic6-0002Aj-Oj for qemu-devel@nongnu.org; Thu, 04 May 2017 11:24:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d6Ic2-0008OY-Oi for qemu-devel@nongnu.org; Thu, 04 May 2017 11:24:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60224) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d6Ic2-0008N2-CQ for qemu-devel@nongnu.org; Thu, 04 May 2017 11:24:14 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 473D015561 for ; Thu, 4 May 2017 15:24:13 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-149.ams2.redhat.com [10.36.116.149]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 14744183A3; Thu, 4 May 2017 15:24:11 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 4E1D011385FB; Thu, 4 May 2017 17:24:06 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 473D015561 Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=armbru@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 473D015561 From: Markus Armbruster To: qemu-devel@nongnu.org Date: Thu, 4 May 2017 17:24:02 +0200 Message-Id: <1493911445-19568-26-git-send-email-armbru@redhat.com> In-Reply-To: <1493911445-19568-1-git-send-email-armbru@redhat.com> References: <1493911445-19568-1-git-send-email-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Thu, 04 May 2017 15:24:13 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 25/28] qmp-shell: add -N option to skip negotiate X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" 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, negotiate) 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' % optio= n) - 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) =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