1. 05 3月, 2016 1 次提交
    • D
      qmp-shell: fix pretty printing of JSON responses · e55250c6
      Daniel P. Berrange 提交于
      Pretty printing of JSON responses is important to be able to understand
      large responses from query commands in particular. Unfortunately this
      was broken during the addition of the verbose flag in
      
        commit 1ceca07e
        Author: John Snow <jsnow@redhat.com>
        Date:   Wed Apr 29 15:14:04 2015 -0400
      
          scripts: qmp-shell: Add verbose flag
      
      This is because that change turned the python data structure into a
      formatted JSON string before the pretty print was given it. So we're
      just pretty printing a string, which is a no-op.
      
      The original pretty printer would output python objects.
      
      (QEMU) query-chardev
      {   u'return': [   {   u'filename': u'vc',
                             u'frontend-open': False,
                             u'label': u'parallel0'},
                         {   u'filename': u'vc',
                             u'frontend-open': True,
                             u'label': u'serial0'},
                         {   u'filename': u'unix:/tmp/qemp,server',
                             u'frontend-open': True,
                             u'label': u'compat_monitor0'}]}
      
      This fixes the problem by switching to outputting pretty formatted JSON
      text instead. This has the added benefit that the pretty printed output
      is now valid JSON text. Due to the way the verbose flag was handled, the
      pretty printing now applies to the command sent, as well as its response:
      
      (QEMU) query-chardev
      {
          "execute": "query-chardev",
          "arguments": {}
      }
      {
          "return": [
              {
                  "frontend-open": false,
                  "label": "parallel0",
                  "filename": "vc"
              },
              {
                  "frontend-open": true,
                  "label": "serial0",
                  "filename": "vc"
              },
              {
                  "frontend-open": true,
                  "label": "compat_monitor0",
                  "filename": "unix:/tmp/qmp,server"
              }
          ]
      }
      Signed-off-by: NDaniel P. Berrange <berrange@redhat.com>
      Message-Id: <1456224706-1591-1-git-send-email-berrange@redhat.com>
      Tested-by: NKashyap Chamarthy <kchamart@redhat.com>
      Reviewed-by: NJohn Snow <jsnow@redhat.com>
      [Bonus fix: multiple -p now work]
      Signed-off-by: NMarkus Armbruster <armbru@redhat.com>
      e55250c6
  2. 04 3月, 2016 31 次提交
  3. 03 3月, 2016 7 次提交
  4. 01 3月, 2016 1 次提交
    • P
      Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging · ed6128eb
      Peter Maydell 提交于
      # gpg: Signature made Tue 01 Mar 2016 15:48:04 GMT using RSA key ID 81AB73C8
      # gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
      # gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"
      
      * remotes/stefanha/tags/tracing-pull-request:
        trace: Add a proper API to manage auto-generated events from the 'tcg' property
        trace: Add 'vcpu' event property to trace guest vCPU
        typedefs: Add CPUState
        trace: Add helper function to cast event arguments
        tcg: Move definition of type TCGv
        tcg: Add type for vCPU pointers
        trace: Remove unnecessary intermediate event copies
        trace: Extend API to manage event arguments
        vl: fix tracing initialization
        trace: use addresses instead of offsets in memory tracepoints
        trace: split subpage MMIOs into their own trace events.
        trace: docs: "simple" backend does support strings
        trace: drop trailing empty strings
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      ed6128eb