| Message ID | 1403206792-15387-1-git-send-email-lcapitulino@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 19 June 2014 20:39, Luiz Capitulino <lcapitulino@redhat.com> wrote: > The following changes since commit 6baa963f4dcc211801608ebe1e0482b51653350c: > > Merge remote-tracking branch 'remotes/bonzini/scsi-next' into staging (2014-06-19 16:18:04 +0100) > > are available in the git repository at: > > > git://repo.or.cz/qemu/qmp-unstable.git queue/qmp > > for you to fetch changes up to b98ff90e9459e0113da8502c03670a9539f90aa1: > > monitor: protect event emission (2014-06-19 15:34:33 -0400) CONFLICT (content): Merge conflict in vl.c CONFLICT (content): Merge conflict in qemu-char.c CONFLICT (content): Merge conflict in qapi-schema.json CONFLICT (content): Merge conflict in monitor.c CONFLICT (content): Merge conflict in include/monitor/monitor.h CONFLICT (content): Merge conflict in hw/core/qdev.c CONFLICT (modify/delete): docs/qmp/qmp-events.txt deleted in remotes/qmp-unstable/queue/qmp and modified in HEAD. Version HEAD of docs/qmp/qmp-events.txt left in tree. That's more conflicts than I feel happy fixing up by hand; could you rebase and resend, please? (I suspect you just lost out to MST's 100-patch monster that got merged just before this one; sorry.) thanks -- PMM
On Fri, 20 Jun 2014 19:24:48 +0100 Peter Maydell <peter.maydell@linaro.org> wrote: > On 19 June 2014 20:39, Luiz Capitulino <lcapitulino@redhat.com> wrote: > > The following changes since commit 6baa963f4dcc211801608ebe1e0482b51653350c: > > > > Merge remote-tracking branch 'remotes/bonzini/scsi-next' into staging (2014-06-19 16:18:04 +0100) > > > > are available in the git repository at: > > > > > > git://repo.or.cz/qemu/qmp-unstable.git queue/qmp > > > > for you to fetch changes up to b98ff90e9459e0113da8502c03670a9539f90aa1: > > > > monitor: protect event emission (2014-06-19 15:34:33 -0400) > > CONFLICT (content): Merge conflict in vl.c > CONFLICT (content): Merge conflict in qemu-char.c > CONFLICT (content): Merge conflict in qapi-schema.json > CONFLICT (content): Merge conflict in monitor.c > CONFLICT (content): Merge conflict in include/monitor/monitor.h > CONFLICT (content): Merge conflict in hw/core/qdev.c > CONFLICT (modify/delete): docs/qmp/qmp-events.txt deleted in > remotes/qmp-unstable/queue/qmp and modified in HEAD. Version HEAD of > docs/qmp/qmp-events.txt left in tree. Fun... > That's more conflicts than I feel happy fixing up by hand; > could you rebase and resend, please? Peter, I've dropped the series that's causing conflicts, can you try to pull again? Paolo, Wenchao, it's the QAPI event series that doesn't apply anymore. Can you please rebase it and post a new version? Could you also: 1. Add/keep Reviewed-bys of patches that did not change 2. Drop Reviewed-bys of patches that changed 3. Add Eric's review suggestions 4. Test build all targets > > (I suspect you just lost out to MST's 100-patch monster > that got merged just before this one; sorry.) > > thanks > -- PMM >
Il 20/06/2014 20:44, Luiz Capitulino ha scritto: > On Fri, 20 Jun 2014 19:24:48 +0100 > Peter Maydell <peter.maydell@linaro.org> wrote: > >> On 19 June 2014 20:39, Luiz Capitulino <lcapitulino@redhat.com> wrote: >>> The following changes since commit 6baa963f4dcc211801608ebe1e0482b51653350c: >>> >>> Merge remote-tracking branch 'remotes/bonzini/scsi-next' into staging (2014-06-19 16:18:04 +0100) >>> >>> are available in the git repository at: >>> >>> >>> git://repo.or.cz/qemu/qmp-unstable.git queue/qmp >>> >>> for you to fetch changes up to b98ff90e9459e0113da8502c03670a9539f90aa1: >>> >>> monitor: protect event emission (2014-06-19 15:34:33 -0400) >> >> CONFLICT (content): Merge conflict in vl.c >> CONFLICT (content): Merge conflict in qemu-char.c >> CONFLICT (content): Merge conflict in qapi-schema.json >> CONFLICT (content): Merge conflict in monitor.c >> CONFLICT (content): Merge conflict in include/monitor/monitor.h >> CONFLICT (content): Merge conflict in hw/core/qdev.c >> CONFLICT (modify/delete): docs/qmp/qmp-events.txt deleted in >> remotes/qmp-unstable/queue/qmp and modified in HEAD. Version HEAD of >> docs/qmp/qmp-events.txt left in tree. > > Fun... > >> That's more conflicts than I feel happy fixing up by hand; >> could you rebase and resend, please? > > Peter, I've dropped the series that's causing conflicts, can you try to > pull again? > > Paolo, Wenchao, it's the QAPI event series that doesn't apply anymore. Can > you please rebase it and post a new version? Could you also: > > 1. Add/keep Reviewed-bys of patches that did not change > 2. Drop Reviewed-bys of patches that changed > 3. Add Eric's review suggestions > 4. Test build all targets I'm fixing the conflicts. Peter, please don't pull. I prefer to have this fixed in a merge commit than as a huge rebase. The conflicts are many but not messy, and it will avoid bisection problems in the future. Paolo Paolo
The following changes since commit 6baa963f4dcc211801608ebe1e0482b51653350c: Merge remote-tracking branch 'remotes/bonzini/scsi-next' into staging (2014-06-19 16:18:04 +0100) are available in the git repository at: git://repo.or.cz/qemu/qmp-unstable.git queue/qmp for you to fetch changes up to b98ff90e9459e0113da8502c03670a9539f90aa1: monitor: protect event emission (2014-06-19 15:34:33 -0400) ---------------------------------------------------------------- Amos Kong (3): qapi: fix coding style in parameters list qapi: add const prefix to 'char *' insider c_type() qapi: Suppress unwanted space between type and identifier Max Reitz (1): qapi: Add includes from qapi/ as dependencies Paolo Bonzini (7): json-lexer: fix escaped backslash in single-quoted string qemu-char: introduce qemu_chr_alloc qemu-char: do not call chr_write directly qemu-char: move pty_chr_update_read_handler around qemu-char: make writes thread-safe monitor: protect outbuf and mux_out with mutex monitor: protect event emission Wenchao Xia (29): os-posix: include sys/time.h qapi: add event helper functions qapi script: add event support test: add test cases for qapi event qapi: adjust existing defines monitor: add an implemention of qapi event emit method qapi: add new schema file qapi-event.json qapi event: convert SHUTDOWN qapi event: convert POWERDOWN qapi event: convert RESET qapi event: convert STOP qapi event: convert RESUME qapi event: convert SUSPEND qapi event: convert SUSPEND_DISK qapi event: convert WAKEUP qapi event: convert RTC_CHANGE qapi event: convert WATCHDOG qapi event: convert DEVICE_DELETED qapi event: convert DEVICE_TRAY_MOVED qapi event: convert BLOCK_IO_ERROR and BLOCK_JOB_ERROR qapi event: convert BLOCK_IMAGE_CORRUPTED qapi event: convert other BLOCK_JOB events qapi event: convert NIC_RX_FILTER_CHANGED qapi event: convert VNC events qapi event: convert SPICE events qapi event: convert BALLOON_CHANGE qapi event: convert GUEST_PANICKED qapi event: convert QUORUM events qapi event: clean up Makefile | 21 +- Makefile.objs | 2 +- backends/baum.c | 2 +- backends/msmouse.c | 2 +- balloon.c | 13 - block.c | 68 +--- block/backup.c | 2 +- block/mirror.c | 9 +- block/qcow2-refcount.c | 14 +- block/quorum.c | 25 +- block/stream.c | 4 +- blockdev.c | 12 +- blockjob.c | 53 +-- cpus.c | 4 +- docs/qapi-code-gen.txt | 18 + docs/qmp/qmp-events.txt | 541 ------------------------------- hmp.c | 5 +- hw/acpi/core.c | 4 +- hw/block/virtio-blk.c | 6 +- hw/core/qdev.c | 12 +- hw/ide/core.c | 6 +- hw/misc/pvpanic.c | 13 +- hw/net/virtio-net.c | 13 +- hw/ppc/spapr_rtas.c | 3 +- hw/scsi/scsi-disk.c | 6 +- hw/timer/mc146818rtc.c | 3 +- hw/virtio/virtio-balloon.c | 6 +- hw/watchdog/watchdog.c | 23 +- include/block/block.h | 4 - include/block/block_int.h | 3 - include/block/blockjob.h | 17 +- include/monitor/monitor.h | 40 --- include/qapi/qmp-event.h | 27 ++ include/qemu/sockets.h | 3 +- include/sysemu/balloon.h | 2 - include/sysemu/char.h | 20 +- include/sysemu/os-posix.h | 2 + include/sysemu/sysemu.h | 2 - monitor.c | 226 ++++++------- qapi-event.json | 306 +++++++++++++++++ qapi-schema.json | 162 +++++++-- qapi/Makefile.objs | 1 + qapi/block-core.json | 150 +++++++++ qapi/block.json | 14 + qapi/qmp-event.c | 74 +++++ qemu-char.c | 134 +++++--- qobject/json-lexer.c | 4 +- scripts/qapi-commands.py | 8 +- scripts/qapi-event.py | 369 +++++++++++++++++++++ scripts/qapi-visit.py | 20 +- scripts/qapi.py | 37 ++- spice-qemu-char.c | 2 +- stubs/Makefile.objs | 1 - stubs/mon-protocol-event.c | 6 - target-s390x/kvm.c | 9 +- tests/Makefile | 18 +- tests/check-qjson.c | 7 + tests/qapi-schema/event-nest-struct.err | 1 + tests/qapi-schema/event-nest-struct.exit | 1 + tests/qapi-schema/event-nest-struct.json | 2 + tests/qapi-schema/event-nest-struct.out | 0 tests/qapi-schema/qapi-schema-test.json | 12 + tests/qapi-schema/qapi-schema-test.out | 10 +- tests/test-qmp-event.c | 265 +++++++++++++++ ui/console.c | 2 +- ui/spice-core.c | 77 ++--- ui/vnc.c | 120 +++---- ui/vnc.h | 4 +- util/qemu-sockets.c | 10 +- vl.c | 22 +- 70 files changed, 1919 insertions(+), 1165 deletions(-) delete mode 100644 docs/qmp/qmp-events.txt create mode 100644 include/qapi/qmp-event.h create mode 100644 qapi-event.json create mode 100644 qapi/qmp-event.c create mode 100644 scripts/qapi-event.py delete mode 100644 stubs/mon-protocol-event.c create mode 100644 tests/qapi-schema/event-nest-struct.err create mode 100644 tests/qapi-schema/event-nest-struct.exit create mode 100644 tests/qapi-schema/event-nest-struct.json create mode 100644 tests/qapi-schema/event-nest-struct.out create mode 100644 tests/test-qmp-event.c