From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47904) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XEWU5-0000hP-Mf for qemu-devel@nongnu.org; Tue, 05 Aug 2014 00:36:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XEWTz-0003qb-Fo for qemu-devel@nongnu.org; Tue, 05 Aug 2014 00:36:25 -0400 Received: from qmta14.emeryville.ca.mail.comcast.net ([76.96.27.212]:55366) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XEWTz-0003mf-6U for qemu-devel@nongnu.org; Tue, 05 Aug 2014 00:36:19 -0400 From: Eric Blake Date: Mon, 4 Aug 2014 22:36:04 -0600 Message-Id: <1407213371-7408-1-git-send-email-eblake@redhat.com> Subject: [Qemu-devel] [PATCH 0/7] drop qapi nested structs List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: famz@redhat.com, Markus Armbruster , wenchaoqemu@gmail.com, Luiz Capitulino According to this email: https://lists.gnu.org/archive/html/qemu-devel/2014-05/msg00708.html we want to repurpose 'data': { 'name': {dict...} } in qapi files for future use of designating default values of optional parameters. But to do that, we must first nuke existing use of that syntax for declaring nested structs. Enhancing the testsuite while at it never hurts. Eric Blake (7): qapi: add some enum tests qapi: better error message for bad enum qapi: merge UserDefTwo and UserDefNested in tests qapi: drop tests for inline subtypes qapi: drop inline subtype in query-version qapi: drop inline subtype in query-pci qapi: drop support for inline subtypes hmp.c | 28 ++++----- hw/pci/pci.c | 42 +++++++------ qapi-schema.json | 90 +++++++++++++++++++--------- qapi/common.json | 26 +++++--- qmp.c | 9 +-- scripts/qapi-commands.py | 8 +-- scripts/qapi-event.py | 4 +- scripts/qapi-types.py | 9 +-- scripts/qapi-visit.py | 37 ++---------- scripts/qapi.py | 52 ++++++++++------ tests/Makefile | 6 +- tests/qapi-schema/enum-empty.err | 0 tests/qapi-schema/enum-empty.exit | 1 + tests/qapi-schema/enum-empty.json | 1 + tests/qapi-schema/enum-empty.out | 3 + tests/qapi-schema/enum-missing-data.err | 1 + tests/qapi-schema/enum-missing-data.exit | 1 + tests/qapi-schema/enum-missing-data.json | 1 + tests/qapi-schema/enum-missing-data.out | 0 tests/qapi-schema/enum-wrong-data.err | 1 + tests/qapi-schema/enum-wrong-data.exit | 1 + tests/qapi-schema/enum-wrong-data.json | 1 + tests/qapi-schema/enum-wrong-data.out | 0 tests/qapi-schema/event-nest-struct.err | 2 +- tests/qapi-schema/nested-struct-data.err | 1 + tests/qapi-schema/nested-struct-data.exit | 1 + tests/qapi-schema/nested-struct-data.json | 3 + tests/qapi-schema/nested-struct-data.out | 0 tests/qapi-schema/nested-struct-returns.err | 1 + tests/qapi-schema/nested-struct-returns.exit | 1 + tests/qapi-schema/nested-struct-returns.json | 2 + tests/qapi-schema/nested-struct-returns.out | 0 tests/qapi-schema/qapi-schema-test.json | 18 +++--- tests/qapi-schema/qapi-schema-test.out | 10 ++-- tests/test-qmp-commands.c | 35 ++++++----- tests/test-qmp-input-strict.c | 19 +++--- tests/test-qmp-input-visitor.c | 25 ++++---- tests/test-qmp-output-visitor.c | 64 +++++++++++--------- tests/test-visitor-serialization.c | 84 ++++++++++++++------------ 39 files changed, 334 insertions(+), 254 deletions(-) create mode 100644 tests/qapi-schema/enum-empty.err create mode 100644 tests/qapi-schema/enum-empty.exit create mode 100644 tests/qapi-schema/enum-empty.json create mode 100644 tests/qapi-schema/enum-empty.out create mode 100644 tests/qapi-schema/enum-missing-data.err create mode 100644 tests/qapi-schema/enum-missing-data.exit create mode 100644 tests/qapi-schema/enum-missing-data.json create mode 100644 tests/qapi-schema/enum-missing-data.out create mode 100644 tests/qapi-schema/enum-wrong-data.err create mode 100644 tests/qapi-schema/enum-wrong-data.exit create mode 100644 tests/qapi-schema/enum-wrong-data.json create mode 100644 tests/qapi-schema/enum-wrong-data.out create mode 100644 tests/qapi-schema/nested-struct-data.err create mode 100644 tests/qapi-schema/nested-struct-data.exit create mode 100644 tests/qapi-schema/nested-struct-data.json create mode 100644 tests/qapi-schema/nested-struct-data.out create mode 100644 tests/qapi-schema/nested-struct-returns.err create mode 100644 tests/qapi-schema/nested-struct-returns.exit create mode 100644 tests/qapi-schema/nested-struct-returns.json create mode 100644 tests/qapi-schema/nested-struct-returns.out -- 1.9.3