[Qemu-commits] [qemu/qemu] fcfab7: qmp-shell: learn to send commands with quoted argu...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: fcfab7541020d835daab3f7143da321cf1def926
      
https://github.com/qemu/qemu/commit/fcfab7541020d835daab3f7143da321cf1def926
  Author: Marc-André Lureau <address@hidden>
  Date:   2018-08-15 (Wed, 15 Aug 2018)

  Changed paths:
    M scripts/qmp/qmp-shell

  Log Message:
  -----------
  qmp-shell: learn to send commands with quoted arguments

Use shlex to split the CLI command, respecting quoted arguments, and
also comments. This allows to call for ex:

(QEMU) human-monitor-command command-line="screendump /dev/null"
{"execute": "human-monitor-command", "arguments": {"command-line": "screendump 
/dev/null"}}

Signed-off-by: Marc-André Lureau <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>


  Commit: 214e4a5b3838358dbbf145692a82561cbbbc1dfb
      
https://github.com/qemu/qemu/commit/214e4a5b3838358dbbf145692a82561cbbbc1dfb
  Author: Marc-André Lureau <address@hidden>
  Date:   2018-08-15 (Wed, 15 Aug 2018)

  Changed paths:
    M tests/test-qmp-cmds.c

  Log Message:
  -----------
  tests: change /0.15/* tests to /qmp/*

Presumably 0.15 was the version it was first introduced, but
qmp keeps evolving. There is no point in having that version
as test prefix, 'qmp' makes more sense here.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>


  Commit: b736e25a1820c63f7d69baa03e624cef80c4de90
      
https://github.com/qemu/qemu/commit/b736e25a1820c63f7d69baa03e624cef80c4de90
  Author: Markus Armbruster <address@hidden>
  Date:   2018-08-15 (Wed, 15 Aug 2018)

  Changed paths:
    M scripts/qapi/common.py
    M scripts/qapi/visit.py
    M tests/qapi-schema/test-qapi.py

  Log Message:
  -----------
  qapi: Fix some pycodestyle-3 complaints

Fix the following issues:

    common.py:873:13: E129 visually indented line with same indent as next 
logical line
    common.py:1766:5: E741 ambiguous variable name 'l'
    common.py:1784:1: E305 expected 2 blank lines after class or function 
definition, found 1
    common.py:1833:1: E305 expected 2 blank lines after class or function 
definition, found 1
    common.py:1843:1: E305 expected 2 blank lines after class or function 
definition, found 1
    visit.py:181:18: E127 continuation line over-indented for visual indent

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
[Fixup squashed in:]
Message-ID: <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>


  Commit: 42478dacc82f1da8dd5cb37e67e3799681d06eac
      
https://github.com/qemu/qemu/commit/42478dacc82f1da8dd5cb37e67e3799681d06eac
  Author: Marc-André Lureau <address@hidden>
  Date:   2018-08-15 (Wed, 15 Aug 2018)

  Changed paths:
    M tests/check-block-qdict.c

  Log Message:
  -----------
  tests: fix crumple/recursive leak

Spotted by ASAN:

=================================================================
==27907==ERROR: LeakSanitizer: detected memory leaks

Direct leak of 4120 byte(s) in 1 object(s) allocated from:
    #0 0x7f913458ce50 in calloc (/lib64/libasan.so.5+0xeee50)
    #1 0x7f9133fd641d in g_malloc0 (/lib64/libglib-2.0.so.0+0x5241d)
    #2 0x5561c6643c95 in qdict_crumple_test_recursive 
/home/elmarco/src/qq/tests/check-block-qdict.c:438
    #3 0x7f9133ff7c49  (/lib64/libglib-2.0.so.0+0x73c49)

Signed-off-by: Marc-André Lureau <address@hidden>
Message-Id: <address@hidden>
[Screwed up in commit 2860b2b2cb8]
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>


  Commit: cb9ec42f33c07cd07d2e2971422bf7636c761202
      
https://github.com/qemu/qemu/commit/cb9ec42f33c07cd07d2e2971422bf7636c761202
  Author: Marc-André Lureau <address@hidden>
  Date:   2018-08-15 (Wed, 15 Aug 2018)

  Changed paths:
    M monitor.c

  Log Message:
  -----------
  monitor: fix oob command leak

Spotted by ASAN, during make check...

Direct leak of 40 byte(s) in 1 object(s) allocated from:
    #0 0x7f8e27262c48 in malloc (/lib64/libasan.so.5+0xeec48)
    #1 0x7f8e26a5f3c5 in g_malloc (/lib64/libglib-2.0.so.0+0x523c5)
    #2 0x555ab67078a8 in qstring_from_str 
/home/elmarco/src/qq/qobject/qstring.c:67
    #3 0x555ab67071e4 in qstring_new /home/elmarco/src/qq/qobject/qstring.c:24
    #4 0x555ab6713fbf in qstring_from_escaped_str 
/home/elmarco/src/qq/qobject/json-parser.c:144
    #5 0x555ab671738c in parse_literal 
/home/elmarco/src/qq/qobject/json-parser.c:506
    #6 0x555ab67179c3 in parse_value 
/home/elmarco/src/qq/qobject/json-parser.c:569
    #7 0x555ab6715123 in parse_pair 
/home/elmarco/src/qq/qobject/json-parser.c:306
    #8 0x555ab6715483 in parse_object 
/home/elmarco/src/qq/qobject/json-parser.c:357
    #9 0x555ab671798b in parse_value 
/home/elmarco/src/qq/qobject/json-parser.c:561
    #10 0x555ab6717a6b in json_parser_parse_err 
/home/elmarco/src/qq/qobject/json-parser.c:592
    #11 0x555ab4fd4dcf in handle_qmp_command /home/elmarco/src/qq/monitor.c:4257
    #12 0x555ab6712c4d in json_message_process_token 
/home/elmarco/src/qq/qobject/json-streamer.c:105
    #13 0x555ab67e01e2 in json_lexer_feed_char 
/home/elmarco/src/qq/qobject/json-lexer.c:323
    #14 0x555ab67e0af6 in json_lexer_feed 
/home/elmarco/src/qq/qobject/json-lexer.c:373
    #15 0x555ab6713010 in json_message_parser_feed 
/home/elmarco/src/qq/qobject/json-streamer.c:124
    #16 0x555ab4fd58ec in monitor_qmp_read /home/elmarco/src/qq/monitor.c:4337
    #17 0x555ab6559df2 in qemu_chr_be_write_impl 
/home/elmarco/src/qq/chardev/char.c:175
    #18 0x555ab6559e95 in qemu_chr_be_write 
/home/elmarco/src/qq/chardev/char.c:187
    #19 0x555ab6560127 in fd_chr_read /home/elmarco/src/qq/chardev/char-fd.c:66
    #20 0x555ab65d9c73 in qio_channel_fd_source_dispatch 
/home/elmarco/src/qq/io/channel-watch.c:84
    #21 0x7f8e26a598ac in g_main_context_dispatch 
(/lib64/libglib-2.0.so.0+0x4c8ac)

Signed-off-by: Marc-André Lureau <address@hidden>
Message-Id: <address@hidden>
[Screwed up in commit b27314567d4]
Cc: address@hidden
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>


  Commit: c146b54c7fdbd926ee8fc4369699e3480d54f6fa
      
https://github.com/qemu/qemu/commit/c146b54c7fdbd926ee8fc4369699e3480d54f6fa
  Author: Peter Maydell <address@hidden>
  Date:   2018-08-15 (Wed, 15 Aug 2018)

  Changed paths:
    M monitor.c
    M scripts/qapi/common.py
    M scripts/qapi/visit.py
    M scripts/qmp/qmp-shell
    M tests/check-block-qdict.c
    M tests/qapi-schema/test-qapi.py
    M tests/test-qmp-cmds.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/armbru/tags/pull-misc-2018-08-15' into 
staging

Miscellaneous patches for 2018-08-15

# gpg: Signature made Wed 15 Aug 2018 07:15:31 BST
# gpg:                using RSA key 3870B400EB918653
# gpg: Good signature from "Markus Armbruster <address@hidden>"
# gpg:                 aka "Markus Armbruster <address@hidden>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* remotes/armbru/tags/pull-misc-2018-08-15:
  monitor: fix oob command leak
  tests: fix crumple/recursive leak
  qapi: Fix some pycodestyle-3 complaints
  tests: change /0.15/* tests to /qmp/*
  qmp-shell: learn to send commands with quoted arguments

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/1d746ee95d4d...c146b54c7fdb
      **NOTE:** This service has been marked for deprecation: 
https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.