I suppose these are all good even for 2.12, so marked in subject.
Tested with "make check" for all targets on x86_64, and iotest -raw.

Patch 1 fixes one OOB error message regression reported by Marc-Andre.

Patch 2 fixes one potential OOB problem when more than one clients are
there, reported by Marc-Andre (too).

Patch 3 introduce "-mon x-oob=on" parameter to allow user to
explicitly enable Out-Of-Band for a specific monitor.

Patch 4-6 are qapi-schema fixes and tests for Out-Of-Band.

Patch 7-8 add back the OOB test on the new parameter (with more
enhancements).

Please review, thanks.

Peter Xu (8):
  qmp: fix qmp_capabilities error regression
  qmp: cleanup qmp queues properly
  monitor: new parameter "x-oob"
  qapi: restrict allow-oob value to be "true"
  tests: let qapi-schema tests detect oob
  tests: add oob-test for qapi-schema
  tests: introduce qtest_init_with_qmp_format()
  tests: qmp-test: add test for new "x-oob"

 include/monitor/monitor.h               |   1 +
 monitor.c                               | 124 ++++++++++++++++++++++----------
 scripts/qapi/common.py                  |   2 +-
 tests/Makefile.include                  |   1 +
 tests/libqtest.c                        |  14 +++-
 tests/libqtest.h                        |  14 ++++
 tests/qapi-schema/doc-good.out          |   4 +-
 tests/qapi-schema/ident-with-escape.out |   2 +-
 tests/qapi-schema/indented-expr.out     |   4 +-
 tests/qapi-schema/oob-test.err          |   1 +
 tests/qapi-schema/oob-test.exit         |   1 +
 tests/qapi-schema/oob-test.json         |   2 +
 tests/qapi-schema/oob-test.out          |   0
 tests/qapi-schema/qapi-schema-test.json |   3 +
 tests/qapi-schema/qapi-schema-test.out  |  20 +++---
 tests/qapi-schema/test-qapi.py          |   4 +-
 tests/qmp-test.c                        |  84 ++++++++++++++++++++++
 tests/test-qmp-cmds.c                   |   4 ++
 vl.c                                    |   5 ++
 19 files changed, 233 insertions(+), 57 deletions(-)
 create mode 100644 tests/qapi-schema/oob-test.err
 create mode 100644 tests/qapi-schema/oob-test.exit
 create mode 100644 tests/qapi-schema/oob-test.json
 create mode 100644 tests/qapi-schema/oob-test.out

-- 
2.14.3

Thanks for the quick fixing. This series on top of master
works fine on s390. (make check and iotests)

Christian



On 03/26/2018 08:38 AM, Peter Xu wrote:
> I suppose these are all good even for 2.12, so marked in subject.
> Tested with "make check" for all targets on x86_64, and iotest -raw.
> 
> Patch 1 fixes one OOB error message regression reported by Marc-Andre.
> 
> Patch 2 fixes one potential OOB problem when more than one clients are
> there, reported by Marc-Andre (too).
> 
> Patch 3 introduce "-mon x-oob=on" parameter to allow user to
> explicitly enable Out-Of-Band for a specific monitor.
> 
> Patch 4-6 are qapi-schema fixes and tests for Out-Of-Band.
> 
> Patch 7-8 add back the OOB test on the new parameter (with more
> enhancements).
> 
> Please review, thanks.
> 
> Peter Xu (8):
>   qmp: fix qmp_capabilities error regression
>   qmp: cleanup qmp queues properly
>   monitor: new parameter "x-oob"
>   qapi: restrict allow-oob value to be "true"
>   tests: let qapi-schema tests detect oob
>   tests: add oob-test for qapi-schema
>   tests: introduce qtest_init_with_qmp_format()
>   tests: qmp-test: add test for new "x-oob"
> 
>  include/monitor/monitor.h               |   1 +
>  monitor.c                               | 124 ++++++++++++++++++++++----------
>  scripts/qapi/common.py                  |   2 +-
>  tests/Makefile.include                  |   1 +
>  tests/libqtest.c                        |  14 +++-
>  tests/libqtest.h                        |  14 ++++
>  tests/qapi-schema/doc-good.out          |   4 +-
>  tests/qapi-schema/ident-with-escape.out |   2 +-
>  tests/qapi-schema/indented-expr.out     |   4 +-
>  tests/qapi-schema/oob-test.err          |   1 +
>  tests/qapi-schema/oob-test.exit         |   1 +
>  tests/qapi-schema/oob-test.json         |   2 +
>  tests/qapi-schema/oob-test.out          |   0
>  tests/qapi-schema/qapi-schema-test.json |   3 +
>  tests/qapi-schema/qapi-schema-test.out  |  20 +++---
>  tests/qapi-schema/test-qapi.py          |   4 +-
>  tests/qmp-test.c                        |  84 ++++++++++++++++++++++
>  tests/test-qmp-cmds.c                   |   4 ++
>  vl.c                                    |   5 ++
>  19 files changed, 233 insertions(+), 57 deletions(-)
>  create mode 100644 tests/qapi-schema/oob-test.err
>  create mode 100644 tests/qapi-schema/oob-test.exit
>  create mode 100644 tests/qapi-schema/oob-test.json
>  create mode 100644 tests/qapi-schema/oob-test.out
> 

On Mon, Mar 26, 2018 at 12:18:28PM +0200, Christian Borntraeger wrote:
> Thanks for the quick fixing. This series on top of master
> works fine on s390. (make check and iotests)

Appreciate the quick follow up.  Thanks Christian.

-- 
Peter Xu

On 03/26/2018 01:38 AM, Peter Xu wrote:
> I suppose these are all good even for 2.12, so marked in subject.
> Tested with "make check" for all targets on x86_64, and iotest -raw.
> 
> Patch 1 fixes one OOB error message regression reported by Marc-Andre.
> 
> Patch 2 fixes one potential OOB problem when more than one clients are
> there, reported by Marc-Andre (too).
> 
> Patch 3 introduce "-mon x-oob=on" parameter to allow user to
> explicitly enable Out-Of-Band for a specific monitor.
> 
> Patch 4-6 are qapi-schema fixes and tests for Out-Of-Band.
> 
> Patch 7-8 add back the OOB test on the new parameter (with more
> enhancements).
> 
> Please review, thanks.
> 
> Peter Xu (8):
>    qmp: fix qmp_capabilities error regression
>    qmp: cleanup qmp queues properly
>    monitor: new parameter "x-oob"
>    qapi: restrict allow-oob value to be "true"
>    tests: let qapi-schema tests detect oob
>    tests: add oob-test for qapi-schema
>    tests: introduce qtest_init_with_qmp_format()
>    tests: qmp-test: add test for new "x-oob"

Queuing 1, 4-6 without further changes.  I'll repost a v2 of 2, 3, my 
rewrite of 7, and 8.

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3266
Virtualization:  qemu.org | libvirt.org