From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54671) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZtBBI-0004A1-Ir for qemu-devel@nongnu.org; Mon, 02 Nov 2015 04:13:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZtBBF-0002Q9-UB for qemu-devel@nongnu.org; Mon, 02 Nov 2015 04:13:36 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49021) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZtBBF-0002Pj-Kq for qemu-devel@nongnu.org; Mon, 02 Nov 2015 04:13:33 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id 2CC4CC0B2ECA for ; Mon, 2 Nov 2015 09:13:33 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-50.ams2.redhat.com [10.36.116.50]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id tA29DU36018588 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Mon, 2 Nov 2015 04:13:31 -0500 From: Markus Armbruster Date: Mon, 2 Nov 2015 10:13:05 +0100 Message-Id: <1446455610-15739-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PULL v2 00/25] QAPI patches List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org v2: * Squashed Eric's build fix. * Moved Dan's fix to the front, to make merging it easier in case something's still wrong with Eric's patches. The following changes since commit 3a958f559ecd0511583d27b10011fa7f3cf79b63: Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging (2015-10-30 19:47:47 +0000) are available in the git repository at: git://repo.or.cz/qemu/armbru.git tags/pull-qapi-2015-11-02 for you to fetch changes up to 32bc6879beea0b0cac6196cb15a71d206401e96d: qapi: Simplify gen_struct_field() (2015-11-02 08:30:28 +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 | 164 ++++++++++----------- 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, 668 insertions(+), 612 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 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 | 164 ++++++++++----------- 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, 668 insertions(+), 612 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 -- 2.4.3