Commit f880cd6b authored by Daniel P. Berrangé's avatar Daniel P. Berrangé Committed by Markus Armbruster
Browse files

qmp: allow setting properties to empty string in qmp-shell 



The qmp-shell property parser currently rejects attempts to
set string properties to the empty string eg

  (QEMU) migrate-set-parameters  tls-hostname=
  Error while parsing command line: Expected a key=value pair, got 'tls-hostname='
command format: <command-name>  [arg-name1=arg1] ... [arg-nameN=argN]

This is caused by checking the wrong condition after splitting
the parameter on '='. 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: default avatarDaniel P. Berrange <berrange@redhat.com>
Message-Id: <20170302122429.7737-1-berrange@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarJohn Snow <jsnow@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent 597494ab

scripts/qmp/qmp-shell

+2 −2
Original line number Diff line number Diff line
@@ -166,8 +166,8 @@ class QMPShell(qmp.QEMUMonitorProtocol): 


    def __cli_expr(self, tokens, parent):

        for arg in tokens:

            (key, _, val) = arg.partition('=')

            if not val:

            (key, sep, val) = arg.partition('=')

            if sep != '=':

                raise QMPShellError("Expected a key=value pair, got '%s'" % arg)



            value = self.__parse_value(val)