[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v8 31/40] qapi: Forbid 'type' in schema
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PATCH v8 31/40] qapi: Forbid 'type' in schema |
Date: |
Mon, 4 May 2015 09:05:28 -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 ff337c2..ff53360 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 v8 17/40] qapi: Add some expr tests, (continued)
- [Qemu-devel] [PATCH v8 18/40] qapi: Better error messages for bad expressions, Eric Blake, 2015/05/04
- [Qemu-devel] [PATCH v8 11/40] qapi: Tighten checking of unions, Eric Blake, 2015/05/04
- [Qemu-devel] [PATCH v8 22/40] qapi: Unify type bypass and add tests, Eric Blake, 2015/05/04
- [Qemu-devel] [PATCH v8 31/40] qapi: Forbid 'type' in schema,
Eric Blake <=
- [Qemu-devel] [PATCH v8 27/40] qapi: More rigorous checking for type safety bypass, Eric Blake, 2015/05/04
- [Qemu-devel] [PATCH v8 29/40] qapi: Document 'struct' metatype, Eric Blake, 2015/05/04
- [Qemu-devel] [PATCH v8 21/40] qapi: Allow true, false and null in schema json, Eric Blake, 2015/05/04
- [Qemu-devel] [PATCH v8 23/40] qapi: Add some type check tests, Eric Blake, 2015/05/04
- [Qemu-devel] [PATCH v8 25/40] qapi: Require valid names, Eric Blake, 2015/05/04
- [Qemu-devel] [PATCH v8 26/40] qapi: Whitelist commands that don't return dictionary, Eric Blake, 2015/05/04
- [Qemu-devel] [PATCH v8 28/40] qapi: Prefer 'struct' over 'type' in generator, Eric Blake, 2015/05/04
- [Qemu-devel] [PATCH v8 36/40] qapi: Drop support for inline nested types, Eric Blake, 2015/05/04