From 3e391d355644b2bff7c9f187759aadb46c6e051f Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Mon, 4 May 2015 09:05:28 -0600 Subject: [PATCH] qapi: Forbid 'type' in schema 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 Reviewed-by: Markus Armbruster Signed-off-by: Markus Armbruster --- scripts/qapi.py | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/scripts/qapi.py b/scripts/qapi.py index e50fec826b..333f59ab5b 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'])