[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-devel] [PULL 31/40] qapi: Forbid 'type' in schema

From: Markus Armbruster
Subject: [Qemu-devel] [PULL 31/40] qapi: Forbid 'type' in schema
Date: Tue, 5 May 2015 18:47:17 +0200

From: Eric Blake <address@hidden>

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>
Signed-off-by: Markus Armbruster <address@hidden>
 scripts/qapi.py | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/scripts/qapi.py b/scripts/qapi.py
index e50fec8..333f59a 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'])

reply via email to

[Prev in Thread] Current Thread [Next in Thread]