[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v7 31/39] qapi: Forbid 'type' in schema
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PATCH v7 31/39] qapi: Forbid 'type' in schema |
Date: |
Wed, 29 Apr 2015 07:06:46 -0600 |
Referring to "type" as both a meta-type (built-in, enum, union,
alternate, or struct) and a specific type (the name that the
schema uses for declaring structs) is confusing. Finish up the
conversion to using "struct" in qapi schema by removing the hack
in the generator that allowed 'type'.
Signed-off-by: Eric Blake <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
---
v7: split from the previous patch
---
scripts/qapi.py | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/scripts/qapi.py b/scripts/qapi.py
index c163b45..609a169 100644
--- a/scripts/qapi.py
+++ b/scripts/qapi.py
@@ -617,20 +617,6 @@ def parse_schema(input_file):
for expr_elem in schema.exprs:
expr = expr_elem['expr']
info = expr_elem['info']
-
- # back-compat hack until all schemas have been converted;
- # preserve the ordering of the original expression
- if expr.has_key('type'):
- seen_type = False
- for (key, value) in expr.items():
- if key == 'type':
- seen_type = True
- del expr['type']
- expr['struct'] = value
- elif seen_type:
- del expr[key]
- expr[key] = value
-
if expr.has_key('enum'):
check_keys(expr_elem, 'enum', ['data'])
add_enum(expr['enum'], info, expr['data'])
--
2.1.0
- [Qemu-devel] [PATCH v7 29/39] qapi: Document 'struct' metatype, (continued)
- [Qemu-devel] [PATCH v7 29/39] qapi: Document 'struct' metatype, Eric Blake, 2015/04/29
- [Qemu-devel] [PATCH v7 21/39] qapi: Allow true, false and null in schema json, Eric Blake, 2015/04/29
- [Qemu-devel] [PATCH v7 16/39] qapi: Use 'alternate' to replace anonymous union, Eric Blake, 2015/04/29
- [Qemu-devel] [PATCH v7 18/39] qapi: Better error messages for bad expressions, Eric Blake, 2015/04/29
- [Qemu-devel] [PATCH v7 13/39] qapi: Segregate anonymous unions into alternates in generator, Eric Blake, 2015/04/29
- [Qemu-devel] [PATCH v7 17/39] qapi: Add some expr tests, Eric Blake, 2015/04/29
- [Qemu-devel] [PATCH v7 33/39] qapi: Drop tests for inline nested structs, Eric Blake, 2015/04/29
- [Qemu-devel] [PATCH v7 23/39] qapi: Add some type check tests, Eric Blake, 2015/04/29
- [Qemu-devel] [PATCH v7 36/39] qapi: Drop support for inline nested types, Eric Blake, 2015/04/29
- [Qemu-devel] [PATCH v7 25/39] qapi: Require valid names, Eric Blake, 2015/04/29
- [Qemu-devel] [PATCH v7 31/39] qapi: Forbid 'type' in schema,
Eric Blake <=
- [Qemu-devel] [PATCH v7 35/39] qapi: Drop inline nested structs in query-pci, Eric Blake, 2015/04/29
- [Qemu-devel] [PATCH v7 20/39] qapi: Better error messages for duplicated expressions, Eric Blake, 2015/04/29
- [Qemu-devel] [PATCH v7 34/39] qapi: Drop inline nested struct in query-version, Eric Blake, 2015/04/29
- [Qemu-devel] [PATCH v7 30/39] qapi: Use 'struct' instead of 'type' in schema, Eric Blake, 2015/04/29
- [Qemu-devel] [PATCH v7 37/39] qapi: Tweak doc references to QMP when QGA is also meant, Eric Blake, 2015/04/29
- [Qemu-devel] [PATCH v7 24/39] qapi: More rigourous checking of types, Eric Blake, 2015/04/29
- [Qemu-devel] [PATCH v7 38/39] qapi: Support (subset of) \u escapes in strings, Eric Blake, 2015/04/29
- [Qemu-devel] [PATCH v7 28/39] qapi: Prefer 'struct' over 'type' in generator, Eric Blake, 2015/04/29
- [Qemu-devel] [PATCH v7 32/39] qapi: Merge UserDefTwo and UserDefNested in tests, Eric Blake, 2015/04/29
- [Qemu-devel] [PATCH v7 39/39] qapi: Check for member name conflicts with a base class, Eric Blake, 2015/04/29