On Thu, 18 Mar 2021 at 16:38, Markus Armbruster <arm...@redhat.com> wrote: > > The following changes since commit 1db136a29ce8594b693938ab8e788d8bcef54770: > > Merge remote-tracking branch > 'remotes/cleber-gitlab/tags/python-next-pull-request' into staging > (2021-03-18 14:07:31 +0000) > > are available in the Git repository at: > > git://repo.or.cz/qemu/armbru.git tags/pull-qapi-2021-03-16-v2 > > for you to fetch changes up to 6dbe64a7eeaf01cb2de939edb7226aff411b2816: > > qapi: New -compat deprecated-input=crash (2021-03-18 16:58:29 +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
CONFLICT (content): Merge conflict in monitor/qmp-cmds-control.c thanks -- PMM
