Commit 9d867123 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/ehabkost/tags/python-next-pull-request' into staging 



qmp-shell: fix nested json regression

One small bug fix.

# gpg: Signature made Tue 12 Mar 2019 02:16:24 GMT
# gpg:                using RSA key 2807936F984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>" [full]
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF  D1AA 2807 936F 984D C5A6

* remotes/ehabkost/tags/python-next-pull-request:
  qmp-shell: fix nested json regression

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents cfc3fef6 b35203b2

scripts/qmp/qmp-shell

+2 −2
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ import sys 
import os

import errno

import atexit

import shlex

import re



sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'python'))

from qemu import qmp
@@ -222,7 +222,7 @@ class QMPShell(qmp.QEMUMonitorProtocol): 


            < command-name > [ arg-name1=arg1 ] ... [ arg-nameN=argN ]

        """

        cmdargs = shlex.split(cmdline)

        cmdargs = re.findall(r'''(?:[^\s"']|"(?:\\.|[^"])*"|'(?:\\.|[^'])*')+''', cmdline)



        # Transactional CLI entry/exit:

        if cmdargs[0] == 'transaction(':