From nobody Mon Feb 9 06:00:32 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 1489645775971439.6032274583936; Wed, 15 Mar 2017 23:29:35 -0700 (PDT) Received: from localhost ([::1]:41120 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1coOuk-000694-Fg for importer@patchew.org; Thu, 16 Mar 2017 02:29:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54635) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1coOtQ-00065R-9I for qemu-devel@nongnu.org; Thu, 16 Mar 2017 02:28:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1coOtN-0006yr-3H for qemu-devel@nongnu.org; Thu, 16 Mar 2017 02:28:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35072) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1coOtM-0006wp-U4 for qemu-devel@nongnu.org; Thu, 16 Mar 2017 02:28:09 -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 B248D81247 for ; Thu, 16 Mar 2017 06:28:08 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-26.ams2.redhat.com [10.36.116.26]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7BD4A60A99; Thu, 16 Mar 2017 06:28:08 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id C1A19113864D; Thu, 16 Mar 2017 07:28:05 +0100 (CET) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com B248D81247 Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=armbru@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com B248D81247 From: Markus Armbruster To: qemu-devel@nongnu.org Date: Thu, 16 Mar 2017 07:27:18 +0100 Message-Id: <1489645685-4750-3-git-send-email-armbru@redhat.com> In-Reply-To: <1489645685-4750-1-git-send-email-armbru@redhat.com> References: <1489645685-4750-1-git-send-email-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Thu, 16 Mar 2017 06:28:08 +0000 (UTC) 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 for 2.9 02/49] qmp: allow setting properties to empty string in qmp-shell 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: "Daniel P. Berrange" The qmp-shell property parser currently rejects attempts to set string properties to the empty string eg (QEMU) migrate-set-parameters tls-hostname=3D Error while parsing command line: Expected a key=3Dvalue pair, got 'tls-h= ostname=3D' command format: [arg-name1=3Darg1] ... [arg-nameN=3DargN] This is caused by checking the wrong condition after splitting the parameter on '=3D'. The "partition" method will return "" for the separator field, if the seperator was not present, so that is the correct thing to check for malformed syntax. Signed-off-by: Daniel P. Berrange Message-Id: <20170302122429.7737-1-berrange@redhat.com> Reviewed-by: Eric Blake Reviewed-by: John Snow Signed-off-by: Markus Armbruster --- scripts/qmp/qmp-shell | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/qmp/qmp-shell b/scripts/qmp/qmp-shell index 0373b24..eccb88a 100755 --- a/scripts/qmp/qmp-shell +++ b/scripts/qmp/qmp-shell @@ -166,8 +166,8 @@ class QMPShell(qmp.QEMUMonitorProtocol): =20 def __cli_expr(self, tokens, parent): for arg in tokens: - (key, _, val) =3D arg.partition('=3D') - if not val: + (key, sep, val) =3D arg.partition('=3D') + if sep !=3D '=3D': raise QMPShellError("Expected a key=3Dvalue pair, got '%s'= " % arg) =20 value =3D self.__parse_value(val) --=20 2.7.4