Peter Xu <pet...@redhat.com> writes: > (this series is based on Markus's monitor-next tree so if patchew > spits something out with "apply failure" then it's expected)
Easy to avoid with suitable Based: tags in the cover letter: Based-on: <20180828191048.29806-1-arm...@redhat.com> Based-on: <20180901111716.1675-1-arm...@redhat.com> The first one gets you "[PULL 0/6] QAPI patches for 2018-08-28", which includes your PATCH 1+2. The second one gets you "[PULL 0/6] Monitor patches for 2018-09-01", which is monitor-next. I pushed the result for reviewers' convenience: http://repo.or.cz/qemu/armbru.git/shortlog/refs/heads/peterx-oob > > v7: > - use Markus's commit message for patch "qapi: Drop > qapi_event_send_FOO()'s Error ** argument" [Markus] > - update commit message for "qapi: remove COMMAND_DROPPED event" since > QEMU 3.0 is released [Eric/Dave] > - rebase to Markus's monitor-next tree: > http://repo.or.cz/qemu/armbru.git/shortlog/refs/heads/monitor-next > the patch "monitor: suspend monitor instead of send CMD_DROP" > re-written since people prefer to drop need_resume flag so now I > hand-made it. Dropped a few patches since not appliable any more. > > Please review. Thanks, > > Markus Armbruster (1): > qapi: Fix build_params() for empty parameter list > > Peter Xu (6): > qapi: Drop qapi_event_send_FOO()'s Error ** argument > monitor: suspend monitor instead of send CMD_DROP > qapi: remove COMMAND_DROPPED event > monitor: remove "x-oob", turn oob on by default > Revert "tests: Add parameter to qtest_init_without_qmp_handshake" > tests: add oob functional test for test-qmp-cmds > > block/block-backend.c | 8 ++--- > block/qcow2.c | 2 +- > block/quorum.c | 4 +-- > block/write-threshold.c | 3 +- > blockjob.c | 13 ++++---- > cpus.c | 8 ++--- > docs/devel/qapi-code-gen.txt | 6 ++-- > docs/interop/qmp-spec.txt | 5 ++-- > dump.c | 3 +- > hw/acpi/core.c | 2 +- > hw/acpi/cpu.c | 2 +- > hw/acpi/memory_hotplug.c | 5 ++-- > hw/char/virtio-console.c | 3 +- > hw/core/qdev.c | 3 +- > hw/net/virtio-net.c | 2 +- > hw/ppc/spapr_rtc.c | 2 +- > hw/timer/mc146818rtc.c | 2 +- > hw/virtio/virtio-balloon.c | 3 +- > hw/watchdog/watchdog.c | 15 +++++----- > include/monitor/monitor.h | 1 - > include/qapi/qmp-event.h | 3 +- > job.c | 2 +- > migration/migration.c | 4 +-- > migration/ram.c | 2 +- > monitor.c | 58 ++++++++++++++---------------------- > qapi/misc.json | 40 ------------------------- > scripts/qapi/common.py | 10 +++---- > scripts/qapi/events.py | 23 ++++---------- > scsi/pr-manager-helper.c | 3 +- > tests/libqtest.c | 10 +++---- > tests/libqtest.h | 4 +-- > tests/qmp-test.c | 6 ++-- > tests/test-qmp-cmds.c | 16 ++++++++++ > tests/test-qmp-event.c | 11 ++++--- > ui/spice-core.c | 10 +++---- > ui/vnc.c | 7 ++--- > vl.c | 21 +++++-------- > 37 files changed, 120 insertions(+), 202 deletions(-) Diffstat looks friendlier without PATCH 1+2: docs/interop/qmp-spec.txt | 5 +++-- include/monitor/monitor.h | 1 - monitor.c | 55 ++++++++++++++++++----------------------------- qapi/misc.json | 40 ---------------------------------- tests/libqtest.c | 10 ++++----- tests/libqtest.h | 4 +--- tests/qmp-test.c | 6 +++--- tests/test-qmp-cmds.c | 16 ++++++++++++++ vl.c | 5 ----- 9 files changed, 48 insertions(+), 94 deletions(-)
