| Message ID | 1458295469-22215-1-git-send-email-armbru@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 18 March 2016 at 10:04, Markus Armbruster <armbru@redhat.com> wrote: > The following changes since commit 6741d38ad0f2405a6e999ebc9550801b01aca479: > > Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (2016-03-17 15:59:42 +0000) > > are available in the git repository at: > > git://repo.or.cz/qemu/armbru.git tags/pull-qapi-2016-03-18 > > for you to fetch changes up to 3666a97f78704b941c360dc917acb14c8774eca7: > > qapi: Use anonymous bases in QMP flat unions (2016-03-18 10:29:26 +0100) > > ---------------------------------------------------------------- > QAPI patches for 2016-03-18 Applied, thanks. -- PMM
The following changes since commit 6741d38ad0f2405a6e999ebc9550801b01aca479: Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (2016-03-17 15:59:42 +0000) are available in the git repository at: git://repo.or.cz/qemu/armbru.git tags/pull-qapi-2016-03-18 for you to fetch changes up to 3666a97f78704b941c360dc917acb14c8774eca7: qapi: Use anonymous bases in QMP flat unions (2016-03-18 10:29:26 +0100) ---------------------------------------------------------------- QAPI patches for 2016-03-18 ---------------------------------------------------------------- Eric Blake (15): qapi: Assert in places where variants are not handled qapi: Fix command with named empty argument type qapi: Make c_type() more OO-like qapi: Adjust names of implicit types qapi: Emit implicit structs in generated C qapi-event: Drop qmp_output_get_qobject() null check qapi-event: Utilize implicit struct visits qapi-commands: Utilize implicit struct visits qapi-commands: Inline single-use helpers of gen_marshal() qapi: Inline gen_visit_members() into lone caller qapi: Drop unused c_null() qapi: Don't special-case simple union wrappers qapi: Make BlockdevOptions doc example closer to reality qapi: Allow anonymous base for flat union qapi: Use anonymous bases in QMP flat unions backends/baum.c | 2 +- backends/msmouse.c | 2 +- block/nbd.c | 6 +- block/qcow2.c | 6 +- block/vmdk.c | 8 +- blockdev.c | 24 ++-- docs/qapi-code-gen.txt | 98 ++++++++--------- hmp.c | 8 +- hw/char/escc.c | 2 +- hw/input/hid.c | 8 +- hw/input/ps2.c | 6 +- hw/input/virtio-input-hid.c | 8 +- hw/mem/pc-dimm.c | 2 +- net/dump.c | 2 +- net/hub.c | 2 +- net/l2tpv3.c | 2 +- net/net.c | 4 +- net/netmap.c | 2 +- net/slirp.c | 2 +- net/socket.c | 2 +- net/tap-win32.c | 2 +- net/tap.c | 4 +- net/vde.c | 2 +- net/vhost-user.c | 2 +- numa.c | 4 +- qapi-schema.json | 20 +--- qapi/block-core.json | 98 ++++++++--------- qapi/introspect.json | 12 +- qemu-char.c | 82 +++++++------- qemu-nbd.c | 6 +- replay/replay-input.c | 44 ++++---- scripts/qapi-commands.py | 117 ++++++++------------ scripts/qapi-event.py | 53 ++++++--- scripts/qapi-types.py | 34 +++--- scripts/qapi-visit.py | 68 ++++++------ scripts/qapi.py | 171 ++++++++++++----------------- spice-qemu-char.c | 14 ++- tests/qapi-schema/comments.out | 2 +- tests/qapi-schema/empty.out | 2 +- tests/qapi-schema/event-case.out | 2 +- tests/qapi-schema/flat-union-bad-base.err | 2 +- tests/qapi-schema/flat-union-bad-base.json | 5 +- tests/qapi-schema/ident-with-escape.out | 8 +- tests/qapi-schema/include-relpath.out | 2 +- tests/qapi-schema/include-repetition.out | 2 +- tests/qapi-schema/include-simple.out | 2 +- tests/qapi-schema/indented-expr.out | 2 +- tests/qapi-schema/qapi-schema-test.json | 8 +- tests/qapi-schema/qapi-schema-test.out | 166 ++++++++++++++-------------- tests/test-io-channel-socket.c | 40 +++---- tests/test-qmp-commands.c | 7 +- tests/test-qmp-input-visitor.c | 25 +++-- tests/test-qmp-output-visitor.c | 24 ++-- tpm.c | 2 +- ui/console.c | 4 +- ui/input-keymap.c | 10 +- ui/input-legacy.c | 8 +- ui/input.c | 34 +++--- ui/vnc-auth-sasl.c | 3 +- ui/vnc.c | 29 ++--- util/qemu-sockets.c | 35 +++--- 61 files changed, 651 insertions(+), 702 deletions(-) Eric Blake (15): qapi: Assert in places where variants are not handled qapi: Fix command with named empty argument type qapi: Make c_type() more OO-like qapi: Adjust names of implicit types qapi: Emit implicit structs in generated C qapi-event: Drop qmp_output_get_qobject() null check qapi-event: Utilize implicit struct visits qapi-commands: Utilize implicit struct visits qapi-commands: Inline single-use helpers of gen_marshal() qapi: Inline gen_visit_members() into lone caller qapi: Drop unused c_null() qapi: Don't special-case simple union wrappers qapi: Make BlockdevOptions doc example closer to reality qapi: Allow anonymous base for flat union qapi: Use anonymous bases in QMP flat unions backends/baum.c | 2 +- backends/msmouse.c | 2 +- block/nbd.c | 6 +- block/qcow2.c | 6 +- block/vmdk.c | 8 +- blockdev.c | 24 ++-- docs/qapi-code-gen.txt | 98 ++++++++--------- hmp.c | 8 +- hw/char/escc.c | 2 +- hw/input/hid.c | 8 +- hw/input/ps2.c | 6 +- hw/input/virtio-input-hid.c | 8 +- hw/mem/pc-dimm.c | 2 +- net/dump.c | 2 +- net/hub.c | 2 +- net/l2tpv3.c | 2 +- net/net.c | 4 +- net/netmap.c | 2 +- net/slirp.c | 2 +- net/socket.c | 2 +- net/tap-win32.c | 2 +- net/tap.c | 4 +- net/vde.c | 2 +- net/vhost-user.c | 2 +- numa.c | 4 +- qapi-schema.json | 20 +--- qapi/block-core.json | 98 ++++++++--------- qapi/introspect.json | 12 +- qemu-char.c | 82 +++++++------- qemu-nbd.c | 6 +- replay/replay-input.c | 44 ++++---- scripts/qapi-commands.py | 117 ++++++++------------ scripts/qapi-event.py | 53 ++++++--- scripts/qapi-types.py | 34 +++--- scripts/qapi-visit.py | 68 ++++++------ scripts/qapi.py | 171 ++++++++++++----------------- spice-qemu-char.c | 14 ++- tests/qapi-schema/comments.out | 2 +- tests/qapi-schema/empty.out | 2 +- tests/qapi-schema/event-case.out | 2 +- tests/qapi-schema/flat-union-bad-base.err | 2 +- tests/qapi-schema/flat-union-bad-base.json | 5 +- tests/qapi-schema/ident-with-escape.out | 8 +- tests/qapi-schema/include-relpath.out | 2 +- tests/qapi-schema/include-repetition.out | 2 +- tests/qapi-schema/include-simple.out | 2 +- tests/qapi-schema/indented-expr.out | 2 +- tests/qapi-schema/qapi-schema-test.json | 8 +- tests/qapi-schema/qapi-schema-test.out | 166 ++++++++++++++-------------- tests/test-io-channel-socket.c | 40 +++---- tests/test-qmp-commands.c | 7 +- tests/test-qmp-input-visitor.c | 25 +++-- tests/test-qmp-output-visitor.c | 24 ++-- tpm.c | 2 +- ui/console.c | 4 +- ui/input-keymap.c | 10 +- ui/input-legacy.c | 8 +- ui/input.c | 34 +++--- ui/vnc-auth-sasl.c | 3 +- ui/vnc.c | 29 ++--- util/qemu-sockets.c | 35 +++--- 61 files changed, 651 insertions(+), 702 deletions(-)