jcs.org / qemu
qemu with hax to log dma reads & writes jcs.org/2018/11/12/vfio
fork atom

qapi: Track enum values by QAPISchemaMember, not string

Rather than using just an array of strings, make enum.values be
an array of the new QAPISchemaMember type, and add a helper
member_names() method to get back at the original list of names.
Likewise, creating an enum requires wrapping strings, via a new
QAPISchema._make_enum_members() method. The benefit of wrapping
enum members in a QAPISchemaMember Python object is that we now
share the existing code for C name clash detection (although the
code is not yet active until a later commit removes the earlier
ad hoc parser checks).

In a related change, the QAPISchemaMember._pretty_owner() method
needs to learn about one more implicit type name: the generated
enum associated with a simple union.

In the interest of keeping the changes of this patch local to one
file, the visitor interface still passes just a list of names
rather than the full list of QAPISchemaMember instances. We may
want to revisit this in the future, if the consistency with
visit_object_type() is worth it.

Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1449033659-25497-12-git-send-email-eblake@redhat.com>
[Eric's simplifying followup squashed in]
Signed-off-by: Markus Armbruster <armbru@redhat.com>

authored by

Eric Blake and committed by
Markus Armbruster 93bda4dd d44f9ac8

+26 -11
+26 -11
scripts/qapi.py
··· 901 901 def __init__(self, name, info, values, prefix): 902 902 QAPISchemaType.__init__(self, name, info) 903 903 for v in values: 904 - assert isinstance(v, str) 904 + assert isinstance(v, QAPISchemaMember) 905 + v.set_owner(name) 905 906 assert prefix is None or isinstance(prefix, str) 906 907 self.values = values 907 908 self.prefix = prefix 908 909 909 910 def check(self, schema): 910 - assert len(set(self.values)) == len(self.values) 911 + seen = {} 912 + for v in self.values: 913 + v.check_clash(self.info, seen) 911 914 912 915 def is_implicit(self): 913 916 # See QAPISchema._make_implicit_enum_type() ··· 916 919 def c_type(self, is_param=False): 917 920 return c_name(self.name) 918 921 922 + def member_names(self): 923 + return [v.name for v in self.values] 924 + 919 925 def c_null(self): 920 - return c_enum_const(self.name, (self.values + ['_MAX'])[0], 926 + return c_enum_const(self.name, (self.member_names() + ['_MAX'])[0], 921 927 self.prefix) 922 928 923 929 def json_type(self): ··· 925 931 926 932 def visit(self, visitor): 927 933 visitor.visit_enum_type(self.name, self.info, 928 - self.values, self.prefix) 934 + self.member_names(), self.prefix) 929 935 930 936 931 937 class QAPISchemaArrayType(QAPISchemaType): ··· 1050 1056 assert owner.endswith('-wrapper') 1051 1057 # Unreachable and not implemented 1052 1058 assert False 1059 + if owner.endswith('Kind'): 1060 + # See QAPISchema._make_implicit_enum_type() 1061 + return '(branch of %s)' % owner[:-4] 1053 1062 return '(%s of %s)' % (self.role, owner) 1054 1063 1055 1064 def describe(self): ··· 1100 1109 # Union names must match enum values; alternate names are 1101 1110 # checked separately. Use 'seen' to tell the two apart. 1102 1111 if seen: 1103 - assert v.name in self.tag_member.type.values 1112 + assert v.name in self.tag_member.type.member_names() 1104 1113 assert isinstance(v.type, QAPISchemaObjectType) 1105 1114 v.type.check(schema) 1106 1115 ··· 1258 1267 self.the_empty_object_type = QAPISchemaObjectType(':empty', None, None, 1259 1268 [], None) 1260 1269 self._def_entity(self.the_empty_object_type) 1261 - self._def_entity(QAPISchemaEnumType('QType', None, 1262 - ['none', 'qnull', 'qint', 1263 - 'qstring', 'qdict', 'qlist', 1264 - 'qfloat', 'qbool'], 1270 + qtype_values = self._make_enum_members(['none', 'qnull', 'qint', 1271 + 'qstring', 'qdict', 'qlist', 1272 + 'qfloat', 'qbool']) 1273 + self._def_entity(QAPISchemaEnumType('QType', None, qtype_values, 1265 1274 'QTYPE')) 1266 1275 1276 + def _make_enum_members(self, values): 1277 + return [QAPISchemaMember(v) for v in values] 1278 + 1267 1279 def _make_implicit_enum_type(self, name, info, values): 1280 + # See also QAPISchemaObjectTypeMember._pretty_owner() 1268 1281 name = name + 'Kind' # Use namespace reserved by add_name() 1269 - self._def_entity(QAPISchemaEnumType(name, info, values, None)) 1282 + self._def_entity(QAPISchemaEnumType( 1283 + name, info, self._make_enum_members(values), None)) 1270 1284 return name 1271 1285 1272 1286 def _make_array_type(self, element_type, info): ··· 1289 1303 name = expr['enum'] 1290 1304 data = expr['data'] 1291 1305 prefix = expr.get('prefix') 1292 - self._def_entity(QAPISchemaEnumType(name, info, data, prefix)) 1306 + self._def_entity(QAPISchemaEnumType( 1307 + name, info, self._make_enum_members(data), prefix)) 1293 1308 1294 1309 def _make_member(self, name, typ, info): 1295 1310 optional = False