Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: fa15cf8b5c77fc5837bbd67066735b6da5b00ee2
      
https://github.com/qemu/qemu/commit/fa15cf8b5c77fc5837bbd67066735b6da5b00ee2
  Author: Marc-André Lureau <marcandre.lur...@redhat.com>
  Date:   2018-03-27 (Tue, 27 Mar 2018)

  Changed paths:
    M tests/qmp-test.c

  Log Message:
  -----------
  qmp-test: fix response leak

Apparently introduced in commit a4f90923b520f1dc0a768634877eb412e5052c26.

Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com>
Message-Id: <20180326172041.21009-1-marcandre.lur...@redhat.com>
Reviewed-by: Eric Blake <ebl...@redhat.com>
Signed-off-by: Eric Blake <ebl...@redhat.com>


  Commit: fdf235ba15167faa05fedb838562fc06e238f400
      
https://github.com/qemu/qemu/commit/fdf235ba15167faa05fedb838562fc06e238f400
  Author: Eric Blake <ebl...@redhat.com>
  Date:   2018-03-27 (Tue, 27 Mar 2018)

  Changed paths:
    M tests/test-visitor-serialization.c

  Log Message:
  -----------
  tests: Silence false positive warning on generated test name

Running 'make check' on rawhide with gcc 8.0.1 fails:

tests/test-visitor-serialization.c: In function 'main':
tests/test-visitor-serialization.c:1127:34: error: '/primitives/' directive 
writing 12 bytes into a region of size between 1 and 128 
[-Werror=format-overflow=]

The warning is a false positive (we have two buffers of size 128,
so yes, if we FULLY used the first buffer, then sprint'ing it into
the second will overflow the second).  But in practice, our first
buffer will not be longer than "/visitor/serialization/String",
so sizing it smaller is enough to let gcc see that we don't
overflow the second.

Signed-off-by: Eric Blake <ebl...@redhat.com>
Message-Id: <20180323204341.1501664-1-ebl...@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lur...@redhat.com>


  Commit: 2d9178d90f426d10860ac655f9748aa088870b1e
      
https://github.com/qemu/qemu/commit/2d9178d90f426d10860ac655f9748aa088870b1e
  Author: Laurent Vivier <lviv...@redhat.com>
  Date:   2018-03-27 (Tue, 27 Mar 2018)

  Changed paths:
    M target/i386/hvf/hvf.c

  Log Message:
  -----------
  error: Strip trailing '\n' from error string arguments (again again)

Re-run Coccinelle script scripts/coccinelle/err-bad-newline.cocci,
and found new error_report() occurrences with '\n'.

Signed-off-by: Laurent Vivier <lviv...@redhat.com>
Message-Id: <20180323143202.28879-3-lviv...@redhat.com>
Reviewed-by: Eric Blake <ebl...@redhat.com>
Signed-off-by: Eric Blake <ebl...@redhat.com>


  Commit: 710c2634078c030c1ca9cd3c15a96224ff3d90e2
      
https://github.com/qemu/qemu/commit/710c2634078c030c1ca9cd3c15a96224ff3d90e2
  Author: Laurent Vivier <lviv...@redhat.com>
  Date:   2018-03-27 (Tue, 27 Mar 2018)

  Changed paths:
    M io/channel-websock.c

  Log Message:
  -----------
  error: Remove NULL checks on error_propagate() calls

Re-run Coccinelle patch
scripts/coccinelle/error_propagate_null.cocci

Signed-off-by: Laurent Vivier <lviv...@redhat.com>
Message-Id: <20180323143202.28879-4-lviv...@redhat.com>
Reviewed-by: Thomas Huth <th...@redhat.com>
Signed-off-by: Eric Blake <ebl...@redhat.com>


  Commit: 625eaca9e516234ac70feeee5c4dad394c970820
      
https://github.com/qemu/qemu/commit/625eaca9e516234ac70feeee5c4dad394c970820
  Author: Laurent Vivier <lviv...@redhat.com>
  Date:   2018-03-27 (Tue, 27 Mar 2018)

  Changed paths:
    M block/nvme.c
    M monitor.c

  Log Message:
  -----------
  qdict: remove useless cast

Re-run Coccinelle script scripts/coccinelle/qobject.cocci

Signed-off-by: Laurent Vivier <lviv...@redhat.com>
Message-Id: <20180323143202.28879-5-lviv...@redhat.com>
Reviewed-by: Eric Blake <ebl...@redhat.com>
Acked-by: Dr. David Alan Gilbert <dgilb...@redhat.com>
Acked-by: Fam Zheng <f...@redhat.com>
Signed-off-by: Eric Blake <ebl...@redhat.com>


  Commit: 9ddb7456c87cd4f8fea2a08bb63183441709a872
      
https://github.com/qemu/qemu/commit/9ddb7456c87cd4f8fea2a08bb63183441709a872
  Author: Peter Xu <pet...@redhat.com>
  Date:   2018-03-27 (Tue, 27 Mar 2018)

  Changed paths:
    M monitor.c

  Log Message:
  -----------
  qmp: fix qmp_capabilities error regression

When someone sends a command before QMP handshake, the error used to be
like this:

 {"execute": "query-cpus"}
 {"error": {"class": "CommandNotFound", "desc":
      "Expecting capabilities negotiation with 'qmp_capabilities'"}}

While after cf869d5317 it becomes:

 {"execute": "query-cpus"}
 {"error": {"class": "CommandNotFound", "desc":
      "The command query-cpus has not been found"}}

Fix it back to the nicer one.

Fixes: cf869d5317 ("qmp: support out-of-band (oob) execution", 2018-03-19)
Reported-by: Marc-André Lureau <marcandre.lur...@redhat.com>
Signed-off-by: Peter Xu <pet...@redhat.com>
Message-Id: <20180326063901.27425-2-pet...@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lur...@redhat.com>
Reviewed-by: Eric Blake <ebl...@redhat.com>
[eblake: commit message grammar tweaks]
Signed-off-by: Eric Blake <ebl...@redhat.com>


  Commit: 9408860165e07aaadec66c336f3dc849b945a8ed
      
https://github.com/qemu/qemu/commit/9408860165e07aaadec66c336f3dc849b945a8ed
  Author: Peter Xu <pet...@redhat.com>
  Date:   2018-03-27 (Tue, 27 Mar 2018)

  Changed paths:
    M scripts/qapi/common.py

  Log Message:
  -----------
  qapi: restrict allow-oob value to be "true"

It was missed in the first version of OOB series.  We should check this
to make sure we throw the right error when fault value is passed in.

Signed-off-by: Peter Xu <pet...@redhat.com>
Message-Id: <20180326063901.27425-5-pet...@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lur...@redhat.com>
Reviewed-by: Eric Blake <ebl...@redhat.com>
Signed-off-by: Eric Blake <ebl...@redhat.com>


  Commit: 4bebca1e429a276bf9553dc2221862d2ea23a939
      
https://github.com/qemu/qemu/commit/4bebca1e429a276bf9553dc2221862d2ea23a939
  Author: Peter Xu <pet...@redhat.com>
  Date:   2018-03-27 (Tue, 27 Mar 2018)

  Changed paths:
    M tests/qapi-schema/doc-good.out
    M tests/qapi-schema/ident-with-escape.out
    M tests/qapi-schema/indented-expr.out
    M tests/qapi-schema/qapi-schema-test.out
    M tests/qapi-schema/test-qapi.py

  Log Message:
  -----------
  tests: let qapi-schema tests detect oob

The allow_oob parameter was passed in but not used in tests.  Now
reflect that in the tests, so we need to touch up other command testers
with that new change.

Reviewed-by: Eric Blake <ebl...@redhat.com>
Signed-off-by: Peter Xu <pet...@redhat.com>
Message-Id: <20180326063901.27425-6-pet...@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lur...@redhat.com>
Signed-off-by: Eric Blake <ebl...@redhat.com>


  Commit: 1a1b11dc0fb519f6dbc420925bde032e772fd610
      
https://github.com/qemu/qemu/commit/1a1b11dc0fb519f6dbc420925bde032e772fd610
  Author: Peter Xu <pet...@redhat.com>
  Date:   2018-03-27 (Tue, 27 Mar 2018)

  Changed paths:
    M tests/Makefile.include
    A tests/qapi-schema/oob-test.err
    A tests/qapi-schema/oob-test.exit
    A tests/qapi-schema/oob-test.json
    A tests/qapi-schema/oob-test.out
    M tests/qapi-schema/qapi-schema-test.json
    M tests/qapi-schema/qapi-schema-test.out
    M tests/test-qmp-cmds.c

  Log Message:
  -----------
  tests: add oob-test for qapi-schema

It simply tests the new OOB capability, and make sure the QAPISchema can
parse it correctly.

Signed-off-by: Peter Xu <pet...@redhat.com>
Message-Id: <20180326063901.27425-7-pet...@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lur...@redhat.com>
Reviewed-by: Eric Blake <ebl...@redhat.com>
Signed-off-by: Eric Blake <ebl...@redhat.com>


  Commit: 6d2d563f8ccc20a08a60ac87513ac113e0c881e3
      
https://github.com/qemu/qemu/commit/6d2d563f8ccc20a08a60ac87513ac113e0c881e3
  Author: Peter Xu <pet...@redhat.com>
  Date:   2018-03-27 (Tue, 27 Mar 2018)

  Changed paths:
    M monitor.c

  Log Message:
  -----------
  qmp: cleanup qmp queues properly

Marc-André Lureau reported that we can have this happen:

1. client1 connects, send command C1
2. client1 disconnects before getting response for C1
3. client2 connects, who might receive response of C1

However client2 should not receive remaining responses for client1.

Basically, we should clean up the request/response queue elements when:

- after a session is closed
- before destroying the queues

Some helpers are introduced to achieve that.  We need to make sure we're
with the lock when operating on those queues.  This also needed the
declaration of QMPRequest moved earlier.

Reported-by: Marc-André Lureau <marcandre.lur...@redhat.com>
Signed-off-by: Peter Xu <pet...@redhat.com>
Message-Id: <20180326063901.27425-3-pet...@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lur...@redhat.com>
[eblake: drop pointless qmp_response_free(), drop queue flush on connect
since a clean queue on disconnect is sufficient]
Tested-by: Christian Borntraeger <borntrae...@de.ibm.com>
Signed-off-by: Eric Blake <ebl...@redhat.com>


  Commit: be933ffc238dcedf0ba2bfa347b20b6dcb075b82
      
https://github.com/qemu/qemu/commit/be933ffc238dcedf0ba2bfa347b20b6dcb075b82
  Author: Peter Xu <pet...@redhat.com>
  Date:   2018-03-27 (Tue, 27 Mar 2018)

  Changed paths:
    M include/monitor/monitor.h
    M monitor.c
    M vl.c

  Log Message:
  -----------
  monitor: new parameter "x-oob"

Add new parameter to optionally enable Out-Of-Band for a QMP server.

An example command line:

  ./qemu-system-x86_64 -chardev stdio,id=char0 \
                 -mon chardev=char0,mode=control,x-oob=on

By default, Out-Of-Band is off.

It is not allowed if either MUX or non-QMP is detected, since
Out-Of-Band is currently only for QMP, and non-MUX chardev backends.

Note that the client STILL has to request 'oob' during qmp_capabilities;
in part because the x-oob command line option may disappear in the
future if we decide the capabilities negotiation is sufficient.

Signed-off-by: Peter Xu <pet...@redhat.com>
Message-Id: <20180326063901.27425-4-pet...@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lur...@redhat.com>
[eblake: enhance commit message]
Tested-by: Christian Borntraeger <borntrae...@de.ibm.com>
Signed-off-by: Eric Blake <ebl...@redhat.com>


  Commit: ddee57e0176f6ab53b13c6c97605b62737a8fd7a
      
https://github.com/qemu/qemu/commit/ddee57e0176f6ab53b13c6c97605b62737a8fd7a
  Author: Eric Blake <ebl...@redhat.com>
  Date:   2018-03-27 (Tue, 27 Mar 2018)

  Changed paths:
    M tests/libqtest.c
    M tests/libqtest.h
    M tests/qmp-test.c

  Log Message:
  -----------
  tests: Add parameter to qtest_init_without_qmp_handshake

Allow callers to choose whether to allow OOB support during a test;
for now, all existing callers pass false, but the next patch will
add a new caller.  Also, rewrite the monitor setup to be generic
(using the -qmp shorthand is insufficient for honoring the parameter).

Based on an idea by Peter Xu, in <20180326063901.27425-8-pet...@redhat.com>

Signed-off-by: Eric Blake <ebl...@redhat.com>
Message-Id: <20180327013620.1644387-4-ebl...@redhat.com>
Tested-by: Christian Borntraeger <borntrae...@de.ibm.com>
Acked-by: Peter Xu <pet...@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lur...@redhat.com>


  Commit: fa198ad9bdef7303d4e3613c69ea00eece6b3a75
      
https://github.com/qemu/qemu/commit/fa198ad9bdef7303d4e3613c69ea00eece6b3a75
  Author: Peter Xu <pet...@redhat.com>
  Date:   2018-03-27 (Tue, 27 Mar 2018)

  Changed paths:
    M tests/qmp-test.c

  Log Message:
  -----------
  tests: qmp-test: add test for new "x-oob"

Test the new OOB capability. It's mostly the reverted OOB test
(see commit 4fd78ad7), but differs in that:

- It uses the new qtest_init_without_qmp_handshake() parameter to
  create the monitor with "x-oob"
- Squashed the capability tests on greeting message
- Don't use qtest_global any more, instead use self-maintained
  QTestState, which is the trend

Signed-off-by: Peter Xu <pet...@redhat.com>
Message-Id: <20180326063901.27425-9-pet...@redhat.com>
Reviewed-by: Eric Blake <ebl...@redhat.com>
[eblake: rebase to qtest_init changes]
Reviewed-by: Marc-André Lureau <marcandre.lur...@redhat.com>
Tested-by: Christian Borntraeger <borntrae...@de.ibm.com>
Signed-off-by: Eric Blake <ebl...@redhat.com>


  Commit: 0dfddbb537fcb0fbd045e1c890bc0e95f2ea5177
      
https://github.com/qemu/qemu/commit/0dfddbb537fcb0fbd045e1c890bc0e95f2ea5177
  Author: Satheesh Rajendran <sathn...@linux.vnet.ibm.com>
  Date:   2018-03-27 (Tue, 27 Mar 2018)

  Changed paths:
    M hmp.c

  Log Message:
  -----------
  hmp.c: Revert hmp_info_cpus output format change

Commit 137b5cb6 refactored 'info cpus' output, changing
'thread_id' to 'thread-id'.  While HMP is not a stable
interface, it is trivial to keep the spelling consistent
for test frameworks that have not yet updated to using QMP.

This patch just reverts back output format to 'thread_id'.

CC: Viktor Mihajlovski <mihaj...@linux.vnet.ibm.com>
Signed-off-by: Satheesh Rajendran <sathn...@linux.vnet.ibm.com>
Message-Id: <20180327123800.28851-1-sathn...@linux.vnet.ibm.com>
Reviewed-by: Eric Blake <ebl...@redhat.com>
Acked-by: Dr. David Alan Gilbert <dgilb...@redhat.com>
[eblake: improve commit message]
Reviewed-by: Cornelia Huck <coh...@redhat.com>
Signed-off-by: Eric Blake <ebl...@redhat.com>


  Commit: f55e88f2ab09e9348b0d1d233acd9518a7570f16
      
https://github.com/qemu/qemu/commit/f55e88f2ab09e9348b0d1d233acd9518a7570f16
  Author: Peter Maydell <peter.mayd...@linaro.org>
  Date:   2018-03-27 (Tue, 27 Mar 2018)

  Changed paths:
    M block/nvme.c
    M hmp.c
    M include/monitor/monitor.h
    M io/channel-websock.c
    M monitor.c
    M scripts/qapi/common.py
    M target/i386/hvf/hvf.c
    M tests/Makefile.include
    M tests/libqtest.c
    M tests/libqtest.h
    M tests/qapi-schema/doc-good.out
    M tests/qapi-schema/ident-with-escape.out
    M tests/qapi-schema/indented-expr.out
    A tests/qapi-schema/oob-test.err
    A tests/qapi-schema/oob-test.exit
    A tests/qapi-schema/oob-test.json
    A tests/qapi-schema/oob-test.out
    M tests/qapi-schema/qapi-schema-test.json
    M tests/qapi-schema/qapi-schema-test.out
    M tests/qapi-schema/test-qapi.py
    M tests/qmp-test.c
    M tests/test-qmp-cmds.c
    M tests/test-visitor-serialization.c
    M vl.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/ericb/tags/pull-qapi-2018-03-27-v2' 
into staging

qapi patches for 2018-03-27, 2.12-rc1

- Marc-André Lureau: qmp-test: fix response leak
- Eric Blake: tests: Silence false positive warning on generated test name
- Laurent Vivier: 0/4 (partial) coccinelle: re-run scripts from 
scripst/coccinelle
- Peter Xu: 0/8 Monitor: some oob related patches (fixes, new param, tests)
- Satheesh Rajendran: hmp.c: Revert hmp_info_cpus output format change

# gpg: Signature made Tue 27 Mar 2018 16:18:36 BST
# gpg:                using RSA key A7A16B4A2527436A
# gpg: Good signature from "Eric Blake <ebl...@redhat.com>"
# gpg:                 aka "Eric Blake (Free Software Programmer) 
<e...@byu.net>"
# gpg:                 aka "[jpeg image of size 6874]"
# Primary key fingerprint: 71C2 CC22 B1C4 6029 27D2  F3AA A7A1 6B4A 2527 436A

* remotes/ericb/tags/pull-qapi-2018-03-27-v2:
  hmp.c: Revert hmp_info_cpus output format change
  tests: qmp-test: add test for new "x-oob"
  tests: Add parameter to qtest_init_without_qmp_handshake
  monitor: new parameter "x-oob"
  qmp: cleanup qmp queues properly
  tests: add oob-test for qapi-schema
  tests: let qapi-schema tests detect oob
  qapi: restrict allow-oob value to be "true"
  qmp: fix qmp_capabilities error regression
  qdict: remove useless cast
  error: Remove NULL checks on error_propagate() calls
  error: Strip trailing '\n' from error string arguments (again again)
  tests: Silence false positive warning on generated test name
  qmp-test: fix response leak

Signed-off-by: Peter Maydell <peter.mayd...@linaro.org>


Compare: https://github.com/qemu/qemu/compare/6cf38cbf2961...f55e88f2ab09

Reply via email to