[Qemu-commits] [qemu/qemu] 8b8fa9: tests/check-qjson: fix a leak

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 8b8fa995b924fd8fb5cf14066fc4c1480fd3705f
      
https://github.com/qemu/qemu/commit/8b8fa995b924fd8fb5cf14066fc4c1480fd3705f
  Author: Marc-André Lureau <address@hidden>
  Date:   2018-10-09 (Tue, 09 Oct 2018)

  Changed paths:
    M tests/check-qjson.c

  Log Message:
  -----------
  tests/check-qjson: fix a leak

Spotted by ASAN:
=================================================================
==11893==ERROR: LeakSanitizer: detected memory leaks

Direct leak of 1120 byte(s) in 28 object(s) allocated from:
    #0 0x7fd0515b0c48 in malloc (/lib64/libasan.so.5+0xeec48)
    #1 0x7fd050ffa3c5 in g_malloc (/lib64/libglib-2.0.so.0+0x523c5)
    #2 0x559e708b56a4 in qstring_from_str 
/home/elmarco/src/qq/qobject/qstring.c:66
    #3 0x559e708b4fe0 in qstring_new /home/elmarco/src/qq/qobject/qstring.c:23
    #4 0x559e708bda7d in parse_string 
/home/elmarco/src/qq/qobject/json-parser.c:143
    #5 0x559e708c1009 in parse_literal 
/home/elmarco/src/qq/qobject/json-parser.c:484
    #6 0x559e708c1627 in parse_value 
/home/elmarco/src/qq/qobject/json-parser.c:547
    #7 0x559e708c1c67 in json_parser_parse 
/home/elmarco/src/qq/qobject/json-parser.c:573
    #8 0x559e708bc0ff in json_message_process_token 
/home/elmarco/src/qq/qobject/json-streamer.c:92
    #9 0x559e708d1655 in json_lexer_feed_char 
/home/elmarco/src/qq/qobject/json-lexer.c:292
    #10 0x559e708d1fe1 in json_lexer_feed 
/home/elmarco/src/qq/qobject/json-lexer.c:339
    #11 0x559e708bc856 in json_message_parser_feed 
/home/elmarco/src/qq/qobject/json-streamer.c:121
    #12 0x559e708b8b4b in qobject_from_jsonv 
/home/elmarco/src/qq/qobject/qjson.c:69
    #13 0x559e708b8d02 in qobject_from_json 
/home/elmarco/src/qq/qobject/qjson.c:83
    #14 0x559e708a74ae in from_json_str 
/home/elmarco/src/qq/tests/check-qjson.c:30
    #15 0x559e708a9f83 in utf8_string 
/home/elmarco/src/qq/tests/check-qjson.c:781
    #16 0x7fd05101bc49 in test_case_run gtestutils.c:2255
    #17 0x7fd05101bc49 in g_test_run_suite_internal gtestutils.c:2339

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


  Commit: 228018179bb65b984fcfb63e08d7e5e529e1bb15
      
https://github.com/qemu/qemu/commit/228018179bb65b984fcfb63e08d7e5e529e1bb15
  Author: Kashyap Chamarthy <address@hidden>
  Date:   2018-10-09 (Tue, 09 Oct 2018)

  Changed paths:
    M qapi/misc.json

  Log Message:
  -----------
  qapi/misc.json: Remove superfluous words in CpuModelExpansionType

Remove repetition of 'independent of'.  While at it, s/QMU/QEMU in
@CpuDefinitionInfo.

Signed-off-by: Kashyap Chamarthy <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
[Commit message updated as requested by Kashyap]
Signed-off-by: Markus Armbruster <address@hidden>


  Commit: 992159c79fa894b53640d66affcfde5a4799c446
      
https://github.com/qemu/qemu/commit/992159c79fa894b53640d66affcfde5a4799c446
  Author: Markus Armbruster <address@hidden>
  Date:   2018-10-10 (Wed, 10 Oct 2018)

  Changed paths:
    M tests/Makefile.include
    M tests/check-qdict.c

  Log Message:
  -----------
  tests: Restore check-qdict unit test

Commit 0bcc8e5bd8d accidentally dropped check-qdict from the list of
unit tests (again, see commit 4429532b48a).  Put it back, and fix up
the test.

Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>


  Commit: 70b1105930e71813a22f40e4139adcc5d540a5f0
      
https://github.com/qemu/qemu/commit/70b1105930e71813a22f40e4139adcc5d540a5f0
  Author: Markus Armbruster <address@hidden>
  Date:   2018-10-10 (Wed, 10 Oct 2018)

  Changed paths:
    M tests/libqtest.c

  Log Message:
  -----------
  libqtest: Inline g_assert_no_errno()

Macro g_assert_no_errno() intrudes into GLib's namespace.  It's also
pretty pointless.  Inline.

At one call site, its redundancy is now obvious.  Delete it there.

Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Laurent Vivier <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>


  Commit: b266f1d1123396f9f5df865508f7555ab0c9582a
      
https://github.com/qemu/qemu/commit/b266f1d1123396f9f5df865508f7555ab0c9582a
  Author: Markus Armbruster <address@hidden>
  Date:   2018-10-10 (Wed, 10 Oct 2018)

  Changed paths:
    M hw/misc/ivshmem.c

  Log Message:
  -----------
  ivshmem: Fix unplug of device "ivshmem-plain"

Commit 2aece63c8a "hostmem: detect host backend memory is being used
properly" fixed "ivshmem-plain" to reject memory backends that are
already in use, and to block their deletion while in use.  Two bugs
escaped review:

* New ivshmem_plain_exit() fails to call ivshmem_exit().  This breaks
  unplug.  Reproducer: migration after unplug still fails with
  "Migration is disabled when using feature 'peer mode' in device
  'ivshmem'".

* It failed to update legacy "ivshmem".  Harmless, because it creates
  the memory backend itself, and nothing else should use it.

Fix by moving the two host_memory_backend_set_mapped() calls into
ivshmem_common_realize() and ivshmem_exit(), guarded by s->hostmem.

Fixes: 2aece63c8a9d2c3a8ff41d2febc4cdeff2633331
Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>


  Commit: 75e50c80e051423a6f55a34ee4a1eec842444a5b
      
https://github.com/qemu/qemu/commit/75e50c80e051423a6f55a34ee4a1eec842444a5b
  Author: Peter Maydell <address@hidden>
  Date:   2018-10-11 (Thu, 11 Oct 2018)

  Changed paths:
    M hw/misc/ivshmem.c
    M qapi/misc.json
    M tests/Makefile.include
    M tests/check-qdict.c
    M tests/check-qjson.c
    M tests/libqtest.c

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

Miscellaneous patches for 2018-10-10

# gpg: Signature made Wed 10 Oct 2018 07:03:10 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-10-10:
  ivshmem: Fix unplug of device "ivshmem-plain"
  libqtest: Inline g_assert_no_errno()
  tests: Restore check-qdict unit test
  qapi/misc.json: Remove superfluous words in CpuModelExpansionType
  tests/check-qjson: fix a leak

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


Compare: https://github.com/qemu/qemu/compare/53a19a9a5f98...75e50c80e051
      **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.