From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44086) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZCVoS-0003oD-HZ for qemu-devel@nongnu.org; Tue, 07 Jul 2015 12:33:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZCVoO-0007EQ-B8 for qemu-devel@nongnu.org; Tue, 07 Jul 2015 12:33:40 -0400 Message-ID: <559BFF5B.4050405@redhat.com> Date: Tue, 07 Jul 2015 12:33:31 -0400 From: John Snow MIME-Version: 1.0 References: <1435775149-17285-1-git-send-email-jsnow@redhat.com> <20150702113102.39ab42a5@redhat.com> In-Reply-To: <20150702113102.39ab42a5@redhat.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] qmp-shell: add documentation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Luiz Capitulino Cc: qemu-trivial@nongnu.org, mjt@tls.msk.ru, qemu-devel@nongnu.org, Markus Armbruster On 07/02/2015 11:31 AM, Luiz Capitulino wrote: > On Wed, 1 Jul 2015 14:25:49 -0400 > John Snow wrote: > >> I should probably document the changes that were made. >> >> Signed-off-by: John Snow > > Looks good to me, CC'ing maintainer. > Whoops, didn't realize Markus took this file over, too. Sorry Luiz. Markus, would you consider staging this? It's purely a documentation update for only a dev tool, so it doesn't really matter /when/ it lands either way, just shoring up some changes I made a while back to the interpreter here. tldr: "ping" >> --- >> scripts/qmp/qmp-shell | 35 +++++++++++++++++++++++++++++++++++ >> 1 file changed, 35 insertions(+) >> >> diff --git a/scripts/qmp/qmp-shell b/scripts/qmp/qmp-shell >> index 65280d2..fa39bf0 100755 >> --- a/scripts/qmp/qmp-shell >> +++ b/scripts/qmp/qmp-shell >> @@ -29,6 +29,41 @@ >> # (QEMU) device_add driver=e1000 id=net1 >> # {u'return': {}} >> # (QEMU) >> +# >> +# key=value pairs also support Python or JSON object literal subset notations, >> +# without spaces. Dictionaries/objects {} are supported as are arrays []. >> +# >> +# example-command arg-name1={'key':'value','obj'={'prop':"value"}} >> +# >> +# Both JSON and Python formatting should work, including both styles of >> +# string literal quotes. Both paradigms of literal values should work, >> +# including null/true/false for JSON and None/True/False for Python. >> +# >> +# >> +# Transactions have the following multi-line format: >> +# >> +# transaction( >> +# action-name1 [ arg-name1=arg1 ] ... [arg-nameN=argN ] >> +# ... >> +# action-nameN [ arg-name1=arg1 ] ... [arg-nameN=argN ] >> +# ) >> +# >> +# One line transactions are also supported: >> +# >> +# transaction( action-name1 ... ) >> +# >> +# For example: >> +# >> +# (QEMU) transaction( >> +# TRANS> block-dirty-bitmap-add node=drive0 name=bitmap1 >> +# TRANS> block-dirty-bitmap-clear node=drive0 name=bitmap0 >> +# TRANS> ) >> +# {"return": {}} >> +# (QEMU) >> +# >> +# Use the -v and -p options to activate the verbose and pretty-print options, >> +# which will echo back the properly formatted JSON-compliant QMP that is being >> +# sent to QEMU, which is useful for debugging and documentation generation. >> >> import qmp >> import json > >