From: Luiz Capitulino <lcapitulino@redhat.com>
To: peter.maydell@linaro.org
Cc: Paolo Bonzini <pbonzini@redhat.com>,
qemu-devel@nongnu.org, anthony@codemonkey.ws
Subject: Re: [Qemu-devel] [PULL 00/43] QMP queue
Date: Mon, 23 Jun 2014 12:39:33 -0400 [thread overview]
Message-ID: <20140623123933.389beb38@redhat.com> (raw)
In-Reply-To: <1403541403-16468-1-git-send-email-lcapitulino@redhat.com>
[Forgot CC'ing Paolo and Eric]
On Mon, 23 Jun 2014 12:36:00 -0400
Luiz Capitulino <lcapitulino@redhat.com> wrote:
> The following changes since commit d9c1647d896d3192cba9dbf98fb7efab876edde5:
>
> Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging (2014-06-23 12:55:22 +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 d622cb5879ca8006d5482158e4e3b272a068c301:
>
> monitor: protect event emission (2014-06-23 11:12:28 -0400)
>
> ----------------------------------------------------------------
>
> I've included a fix from Igor that fixes the most serious conflict from my
> last pull request. Besides, I've fixed some trivial to medium conflicts myself
> and included my two build fixes. Build tested and tested most events again.
>
> 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
>
> Igor Mammedov (1):
> qmp: convert ACPI_DEVICE_OST event
>
> Luiz Capitulino (2):
> fpu: softfloat: drop INLINE macro
> audio: fmopl: drop INLINE macro
>
> 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 | 73 ++--
> 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 | 551 -------------------------------
> fpu/softfloat-macros.h | 38 +--
> fpu/softfloat.c | 48 +--
> hmp.c | 5 +-
> hw/acpi/core.c | 4 +-
> hw/acpi/memory_hotplug.c | 34 +-
> hw/audio/fmopl.c | 31 +-
> 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/fpu/softfloat.h | 99 +++---
> include/monitor/monitor.h | 41 ---
> 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 | 227 ++++++-------
> qapi-event.json | 318 ++++++++++++++++++
> 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 | 25 +-
> 75 files changed, 2050 insertions(+), 1316 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
>
next prev parent reply other threads:[~2014-06-23 16:39 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-23 16:36 [Qemu-devel] [PULL 00/43] QMP queue Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 01/43] fpu: softfloat: drop INLINE macro Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 02/43] audio: fmopl: " Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 03/43] qapi: fix coding style in parameters list Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 04/43] qapi: add const prefix to 'char *' insider c_type() Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 05/43] qapi: Suppress unwanted space between type and identifier Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 06/43] json-lexer: fix escaped backslash in single-quoted string Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 07/43] os-posix: include sys/time.h Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 08/43] qapi: Add includes from qapi/ as dependencies Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 09/43] qapi: add event helper functions Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 10/43] qapi script: add event support Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 11/43] test: add test cases for qapi event Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 12/43] qapi: adjust existing defines Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 13/43] monitor: add an implemention of qapi event emit method Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 14/43] qapi: add new schema file qapi-event.json Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 15/43] qapi event: convert SHUTDOWN Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 16/43] qapi event: convert POWERDOWN Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 17/43] qapi event: convert RESET Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 18/43] qapi event: convert STOP Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 19/43] qapi event: convert RESUME Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 20/43] qapi event: convert SUSPEND Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 21/43] qapi event: convert SUSPEND_DISK Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 22/43] qapi event: convert WAKEUP Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 23/43] qapi event: convert RTC_CHANGE Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 24/43] qapi event: convert WATCHDOG Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 25/43] qapi event: convert DEVICE_DELETED Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 26/43] qapi event: convert DEVICE_TRAY_MOVED Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 27/43] qapi event: convert BLOCK_IO_ERROR and BLOCK_JOB_ERROR Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 28/43] qapi event: convert BLOCK_IMAGE_CORRUPTED Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 29/43] qapi event: convert other BLOCK_JOB events Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 30/43] qapi event: convert NIC_RX_FILTER_CHANGED Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 31/43] qapi event: convert VNC events Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 32/43] qapi event: convert SPICE events Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 33/43] qmp: convert ACPI_DEVICE_OST event Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 34/43] qapi event: convert BALLOON_CHANGE Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 35/43] qapi event: convert GUEST_PANICKED Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 36/43] qapi event: convert QUORUM events Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 37/43] qapi event: clean up Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 38/43] qemu-char: introduce qemu_chr_alloc Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 39/43] qemu-char: do not call chr_write directly Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 40/43] qemu-char: move pty_chr_update_read_handler around Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 41/43] qemu-char: make writes thread-safe Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 42/43] monitor: protect outbuf and mux_out with mutex Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 43/43] monitor: protect event emission Luiz Capitulino
2014-06-23 16:39 ` Luiz Capitulino [this message]
2014-06-23 16:40 ` [Qemu-devel] [PULL 00/43] QMP queue Paolo Bonzini
2014-06-23 17:15 ` Eric Blake
2014-06-24 13:15 ` Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140623123933.389beb38@redhat.com \
--to=lcapitulino@redhat.com \
--cc=anthony@codemonkey.ws \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).