| Message ID | 1446219774-1802-1-git-send-email-armbru@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 30 October 2015 at 15:42, Markus Armbruster <armbru@redhat.com> wrote: > The following changes since commit fdf927621a99711bf1a81712bce054794f2d44c3: > > Merge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2015-10-30' into staging (2015-10-30 09:41:15 +0000) > > are available in the git repository at: > > git://repo.or.cz/qemu/armbru.git tags/pull-qapi-2015-10-30 > > for you to fetch changes up to 2e6a2cf766d49ee41fc20eec8f0bee2fb6acf188: > > qapi-schema: mark InetSocketAddress as mandatory again (2015-10-30 15:50:29 +0100) > > ---------------------------------------------------------------- > QAPI patches > > ---------------------------------------------------------------- > Daniel P. Berrange (1): > qapi-schema: mark InetSocketAddress as mandatory again > > Eric Blake (24): > tests/qapi-schema: Test for reserved names, empty struct > qapi: More idiomatic string operations > qapi: More robust conditions for when labels are needed > qapi: Reserve '*List' type names for list types > qapi: Reserve 'q_*' and 'has_*' member names > vnc: Hoist allocation of VncBasicInfo to callers > qapi-visit: Split off visit_type_FOO_fields forward decl > qapi-types: Refactor base fields output > qapi: Prefer typesafe upcasts to qapi base classes > qapi: Unbox base members > qapi-visit: Remove redundant functions for flat union base > qapi: Start converting to new qapi union layout > qapi-visit: Convert to new qapi union layout > tests: Convert to new qapi union layout > block: Convert to new qapi union layout > sockets: Convert to new qapi union layout > net: Convert to new qapi union layout > char: Convert to new qapi union layout > input: Convert to new qapi union layout > memory: Convert to new qapi union layout > tpm: Convert to new qapi union layout > qapi: Finish converting to new qapi union layout > qapi: Reserve 'u' member name > qapi: Simplify gen_struct_field() Hi; I'm afraid this doesn't build on w32: /home/petmay01/linaro/qemu-for-merges/qemu-char.c: In function ‘qmp_chardev_open_file’: /home/petmay01/linaro/qemu-for-merges/qemu-char.c:4051: error: ‘ChardevBackend’ has no member named ‘file’ /home/petmay01/linaro/qemu-for-merges/qemu-char.c: In function ‘qmp_chardev_open_serial’: /home/petmay01/linaro/qemu-for-merges/qemu-char.c:4073: error: ‘ChardevBackend’ has no member named ‘serial’ thanks -- PMM
On 10/30/2015 01:47 PM, Peter Maydell wrote: > On 30 October 2015 at 15:42, Markus Armbruster <armbru@redhat.com> wrote: >> char: Convert to new qapi union layout > Hi; I'm afraid this doesn't build on w32: > > /home/petmay01/linaro/qemu-for-merges/qemu-char.c: In function > ‘qmp_chardev_open_file’: > /home/petmay01/linaro/qemu-for-merges/qemu-char.c:4051: error: > ‘ChardevBackend’ has no member named ‘file’ > /home/petmay01/linaro/qemu-for-merges/qemu-char.c: In function > ‘qmp_chardev_open_serial’: > /home/petmay01/linaro/qemu-for-merges/qemu-char.c:4073: error: > ‘ChardevBackend’ has no member named ‘serial’ I'm not set up for easily cross-compiling qemu to windows at the moment, which is why I missed it. But the fix is easy (sent separately). Hopefully that's the only #ifdef spot of code I missed, and we aren't going to play the "whack-a-mole" game of seeing what fails to compile on the next platform after my w32 fixup is squashed in.
On 30 October 2015 at 20:03, Eric Blake <eblake@redhat.com> wrote: > On 10/30/2015 01:47 PM, Peter Maydell wrote: >> On 30 October 2015 at 15:42, Markus Armbruster <armbru@redhat.com> wrote: > >>> char: Convert to new qapi union layout > >> Hi; I'm afraid this doesn't build on w32: >> >> /home/petmay01/linaro/qemu-for-merges/qemu-char.c: In function >> ‘qmp_chardev_open_file’: >> /home/petmay01/linaro/qemu-for-merges/qemu-char.c:4051: error: >> ‘ChardevBackend’ has no member named ‘file’ >> /home/petmay01/linaro/qemu-for-merges/qemu-char.c: In function >> ‘qmp_chardev_open_serial’: >> /home/petmay01/linaro/qemu-for-merges/qemu-char.c:4073: error: >> ‘ChardevBackend’ has no member named ‘serial’ > > I'm not set up for easily cross-compiling qemu to windows at the moment, > which is why I missed it. But the fix is easy (sent separately). > Hopefully that's the only #ifdef spot of code I missed, and we aren't > going to play the "whack-a-mole" game of seeing what fails to compile on > the next platform after my w32 fixup is squashed in. OSX and the arm32, arm64 and ppc64be hosts all built ok. My x86 box does stop after the first failed build, but the only things after w32 are clang and the all-linux-static builds (plus the 'make check' run for everything). So no guarantees, but this is probably the last one. thanks -- PMM
The following changes since commit fdf927621a99711bf1a81712bce054794f2d44c3: Merge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2015-10-30' into staging (2015-10-30 09:41:15 +0000) are available in the git repository at: git://repo.or.cz/qemu/armbru.git tags/pull-qapi-2015-10-30 for you to fetch changes up to 2e6a2cf766d49ee41fc20eec8f0bee2fb6acf188: qapi-schema: mark InetSocketAddress as mandatory again (2015-10-30 15:50:29 +0100) ---------------------------------------------------------------- QAPI patches ---------------------------------------------------------------- Daniel P. Berrange (1): qapi-schema: mark InetSocketAddress as mandatory again Eric Blake (24): tests/qapi-schema: Test for reserved names, empty struct qapi: More idiomatic string operations qapi: More robust conditions for when labels are needed qapi: Reserve '*List' type names for list types qapi: Reserve 'q_*' and 'has_*' member names vnc: Hoist allocation of VncBasicInfo to callers qapi-visit: Split off visit_type_FOO_fields forward decl qapi-types: Refactor base fields output qapi: Prefer typesafe upcasts to qapi base classes qapi: Unbox base members qapi-visit: Remove redundant functions for flat union base qapi: Start converting to new qapi union layout qapi-visit: Convert to new qapi union layout tests: Convert to new qapi union layout block: Convert to new qapi union layout sockets: Convert to new qapi union layout net: Convert to new qapi union layout char: Convert to new qapi union layout input: Convert to new qapi union layout memory: Convert to new qapi union layout tpm: Convert to new qapi union layout qapi: Finish converting to new qapi union layout qapi: Reserve 'u' member name qapi: Simplify gen_struct_field() block/nbd.c | 18 +-- block/qcow2.c | 10 +- block/vmdk.c | 6 +- blockdev.c | 47 +++--- docs/qapi-code-gen.txt | 14 +- hmp.c | 26 ++-- hw/char/escc.c | 12 +- hw/input/hid.c | 32 ++--- hw/input/ps2.c | 24 ++-- hw/input/virtio-input-hid.c | 27 ++-- hw/mem/pc-dimm.c | 6 +- net/dump.c | 4 +- net/hub.c | 4 +- net/l2tpv3.c | 4 +- net/net.c | 24 ++-- net/slirp.c | 4 +- net/socket.c | 4 +- net/tap-win32.c | 4 +- net/tap.c | 8 +- net/vde.c | 4 +- net/vhost-user.c | 4 +- numa.c | 8 +- qapi-schema.json | 6 +- qemu-char.c | 160 ++++++++++----------- qemu-nbd.c | 16 +-- scripts/qapi-commands.py | 4 +- scripts/qapi-types.py | 68 +++++---- scripts/qapi-visit.py | 90 ++++++------ scripts/qapi.py | 25 ++-- spice-qemu-char.c | 12 +- tests/Makefile | 8 +- tests/qapi-schema/enum-union-clash.err | 1 - tests/qapi-schema/qapi-schema-test.json | 4 + tests/qapi-schema/qapi-schema-test.out | 3 + tests/qapi-schema/reserved-command-q.err | 1 + ...um-union-clash.exit => reserved-command-q.exit} | 0 tests/qapi-schema/reserved-command-q.json | 5 + ...-base-clash-base.err => reserved-command-q.out} | 0 tests/qapi-schema/reserved-member-has.err | 1 + tests/qapi-schema/reserved-member-has.exit | 1 + tests/qapi-schema/reserved-member-has.json | 5 + ...num-union-clash.out => reserved-member-has.out} | 0 tests/qapi-schema/reserved-member-q.err | 1 + tests/qapi-schema/reserved-member-q.exit | 1 + tests/qapi-schema/reserved-member-q.json | 4 + tests/qapi-schema/reserved-member-q.out | 0 tests/qapi-schema/reserved-member-u.err | 1 + tests/qapi-schema/reserved-member-u.exit | 1 + tests/qapi-schema/reserved-member-u.json | 7 + tests/qapi-schema/reserved-member-u.out | 0 tests/qapi-schema/reserved-type-kind.err | 1 + tests/qapi-schema/reserved-type-kind.exit | 1 + ...um-union-clash.json => reserved-type-kind.json} | 2 - tests/qapi-schema/reserved-type-kind.out | 0 tests/qapi-schema/reserved-type-list.err | 1 + tests/qapi-schema/reserved-type-list.exit | 1 + tests/qapi-schema/reserved-type-list.json | 5 + tests/qapi-schema/reserved-type-list.out | 0 tests/qapi-schema/struct-base-clash-base.exit | 1 - tests/qapi-schema/struct-base-clash-base.json | 9 -- tests/qapi-schema/struct-base-clash-base.out | 5 - tests/test-qmp-commands.c | 19 +-- tests/test-qmp-event.c | 8 +- tests/test-qmp-input-visitor.c | 87 +++++------ tests/test-qmp-output-visitor.c | 55 ++++--- tests/test-visitor-serialization.c | 14 +- tpm.c | 4 +- ui/console.c | 20 +-- ui/input-keymap.c | 20 +-- ui/input-legacy.c | 21 +-- ui/input.c | 84 +++++------ ui/spice-core.c | 23 +-- ui/vnc.c | 114 ++++++++------- util/qemu-sockets.c | 62 ++++---- 74 files changed, 666 insertions(+), 610 deletions(-) delete mode 100644 tests/qapi-schema/enum-union-clash.err create mode 100644 tests/qapi-schema/reserved-command-q.err rename tests/qapi-schema/{enum-union-clash.exit => reserved-command-q.exit} (100%) create mode 100644 tests/qapi-schema/reserved-command-q.json rename tests/qapi-schema/{struct-base-clash-base.err => reserved-command-q.out} (100%) create mode 100644 tests/qapi-schema/reserved-member-has.err create mode 100644 tests/qapi-schema/reserved-member-has.exit create mode 100644 tests/qapi-schema/reserved-member-has.json rename tests/qapi-schema/{enum-union-clash.out => reserved-member-has.out} (100%) create mode 100644 tests/qapi-schema/reserved-member-q.err create mode 100644 tests/qapi-schema/reserved-member-q.exit create mode 100644 tests/qapi-schema/reserved-member-q.json create mode 100644 tests/qapi-schema/reserved-member-q.out create mode 100644 tests/qapi-schema/reserved-member-u.err create mode 100644 tests/qapi-schema/reserved-member-u.exit create mode 100644 tests/qapi-schema/reserved-member-u.json create mode 100644 tests/qapi-schema/reserved-member-u.out create mode 100644 tests/qapi-schema/reserved-type-kind.err create mode 100644 tests/qapi-schema/reserved-type-kind.exit rename tests/qapi-schema/{enum-union-clash.json => reserved-type-kind.json} (69%) create mode 100644 tests/qapi-schema/reserved-type-kind.out create mode 100644 tests/qapi-schema/reserved-type-list.err create mode 100644 tests/qapi-schema/reserved-type-list.exit create mode 100644 tests/qapi-schema/reserved-type-list.json create mode 100644 tests/qapi-schema/reserved-type-list.out delete mode 100644 tests/qapi-schema/struct-base-clash-base.exit delete mode 100644 tests/qapi-schema/struct-base-clash-base.json delete mode 100644 tests/qapi-schema/struct-base-clash-base.out