From 2d6d612c61e3984775788e0c1991d7b16a7ebe3f Mon Sep 17 00:00:00 2001
From: Eric Blake <eblake@redhat.com>
Date: Mon, 19 Feb 2018 14:23:19 -0500
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'.
Backports commit 3e391d355644b2bff7c9f187759aadb46c6e051f from qemu
---
qemu/scripts/qapi.py | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/qemu/scripts/qapi.py b/qemu/scripts/qapi.py
index 496f3be0..7aeed91d 100644
--- a/qemu/scripts/qapi.py
+++ b/qemu/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'])