The following changes since commit cf6b56d4f2107259f52413f979a1d474dad0c1e1:

  Merge remote-tracking branch 'remotes/philmd/tags/pflash-20210318' into staging (2021-03-18 23:04:41 +0000)

are available in the Git repository at:

  git://repo.or.cz/qemu/armbru.git tags/pull-qapi-2021-03-16-v3

for you to fetch changes up to 64e9c1e5bc73192bbf740db40c5b2c3764dcaf05:

  qapi: New -compat deprecated-input=crash (2021-03-19 11:36:52 +0100)

----------------------------------------------------------------
QAPI patches patches for 2021-03-16

----------------------------------------------------------------
Markus Armbruster (10):
      qemu-options: New -compat to set policy for deprecated interfaces
      qapi: Implement deprecated-output=hide for QMP command results
      qapi: Implement deprecated-output=hide for QMP events
      qapi: Implement deprecated-output=hide for QMP event data
      monitor: Drop query-qmp-schema 'gen': false hack
      qapi: Implement deprecated-output=hide for QMP introspection
      test-util-sockets: Add stub for monitor_set_cur()
      qapi: Implement deprecated-input=reject for QMP commands
      qapi: Implement deprecated-input=reject for QMP command arguments
      qapi: New -compat deprecated-input=crash

Paolo Bonzini (1):
      qemuutil: remove qemu_set_fd_handler duplicate symbol

 qapi/compat.json                        |  52 +++++++++++++++++
 qapi/introspect.json                    |   2 +-
 qapi/qapi-schema.json                   |   1 +
 include/qapi/compat-policy.h            |  38 ++++++++++++
 include/qapi/qmp/dispatch.h             |   1 +
 include/qapi/qobject-input-visitor.h    |   4 ++
 include/qapi/qobject-output-visitor.h   |   4 ++
 include/qapi/visitor-impl.h             |   6 ++
 include/qapi/visitor.h                  |  18 ++++++
 monitor/monitor-internal.h              |   3 -
 monitor/misc.c                          |   2 -
 monitor/qmp-cmds-control.c              | 100 ++++++++++++++++++++++++++++----
 qapi/qapi-visit-core.c                  |  18 ++++++
 qapi/qmp-dispatch.c                     |  35 +++++++++++
 qapi/qobject-input-visitor.c            |  29 +++++++++
 qapi/qobject-output-visitor.c           |  19 ++++++
 softmmu/vl.c                            |  17 ++++++
 storage-daemon/qemu-storage-daemon.c    |   2 -
 stubs/set-fd-handler.c                  |  10 ----
 tests/unit/test-qmp-cmds.c              |  91 +++++++++++++++++++++++++++--
 tests/unit/test-qmp-event.c             |  41 +++++++++++++
 tests/unit/test-util-sockets.c          |   1 +
 qapi/meson.build                        |   1 +
 qapi/trace-events                       |   2 +
 qemu-options.hx                         |  22 +++++++
 scripts/qapi/commands.py                |  17 +++---
 scripts/qapi/events.py                  |  21 +++++--
 scripts/qapi/visit.py                   |  15 +++++
 stubs/meson.build                       |   1 -
 tests/qapi-schema/qapi-schema-test.json |  20 ++++---
 tests/qapi-schema/qapi-schema-test.out  |  20 ++++---
 31 files changed, 549 insertions(+), 64 deletions(-)
 create mode 100644 qapi/compat.json
 create mode 100644 include/qapi/compat-policy.h
 delete mode 100644 stubs/set-fd-handler.c

-- 
2.26.3

On Fri, 19 Mar 2021 at 11:58, Markus Armbruster <armbru@redhat.com> wrote:
>
> The following changes since commit cf6b56d4f2107259f52413f979a1d474dad0c1e1:
>
>   Merge remote-tracking branch 'remotes/philmd/tags/pflash-20210318' into staging (2021-03-18 23:04:41 +0000)
>
> are available in the Git repository at:
>
>   git://repo.or.cz/qemu/armbru.git tags/pull-qapi-2021-03-16-v3
>
> for you to fetch changes up to 64e9c1e5bc73192bbf740db40c5b2c3764dcaf05:
>
>   qapi: New -compat deprecated-input=crash (2021-03-19 11:36:52 +0100)
>
> ----------------------------------------------------------------
> QAPI patches patches for 2021-03-16
>
Conflict in storage-daemon/qemu-storage-daemon.c. I had a go at fixing
this one up, but obviously wrongly since my attempt didn't compile.
Can you rebase and resend, please?

thanks
-- PMM