SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

qapi: type 'info' as Optional[QAPISourceInfo]

Browse Source 
For everything typed so far, type this parameter as
Optional[QAPISourceInfo].

In the most generic case, QAPISchemaEntity's info field may be None to
represent types that come from built-in definitions. Although some
Entity types may not currently have any built-in definitions, it is not
easily possible to constrain the type except on an ad-hoc basis using
assertions.

It's easier and simpler, then, to just say it's always an Optional type.

Signed-off-by: John Snow <jsnow@redhat.com>
Message-Id: <20210201193747.2169670-16-jsnow@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
John Snow 2021-02-01 14:37:46 -05:00 committed by Markus Armbruster
parent cc0747f6b7
commit 4a82e468e7
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/qapi/commands.py
View File

@ -296,7 +296,7 @@ void %(c_prefix)sqmp_init_marshal(QmpCommandList *cmds)
def visit_command(self, def visit_command(self,
name: str, name: str,
info: QAPISourceInfo, info: Optional[QAPISourceInfo],
ifcond: List[str], ifcond: List[str],
features: List[QAPISchemaFeature], features: List[QAPISchemaFeature],
arg_type: Optional[QAPISchemaObjectType], arg_type: Optional[QAPISchemaObjectType],

2
scripts/qapi/events.py
View File

@ -213,7 +213,7 @@ void %(event_emit)s(%(event_enum)s event, QDict *qdict);
def visit_event(self, def visit_event(self,
name: str, name: str,
info: QAPISourceInfo, info: Optional[QAPISourceInfo],
ifcond: List[str], ifcond: List[str],
features: List[QAPISchemaFeature], features: List[QAPISchemaFeature],
arg_type: Optional[QAPISchemaObjectType], arg_type: Optional[QAPISchemaObjectType],

2
scripts/qapi/gen.py
View File

@ -325,7 +325,7 @@ class QAPISchemaModularCVisitor(QAPISchemaVisitor):
self._add_module(name, self._user_blurb) self._add_module(name, self._user_blurb)
self._begin_user_module(name) self._begin_user_module(name)
def visit_include(self, name: str, info: QAPISourceInfo) -> None: def visit_include(self, name: str, info: Optional[QAPISourceInfo]) -> None:
relname = os.path.relpath(self._module_filename(self._what, name), relname = os.path.relpath(self._module_filename(self._what, name),
os.path.dirname(self._genh.fname)) os.path.dirname(self._genh.fname))
self._genh.preamble_add(mcgen(''' self._genh.preamble_add(mcgen('''

2
scripts/qapi/types.py
View File

@ -350,7 +350,7 @@ class QAPISchemaGenTypeVisitor(QAPISchemaModularCVisitor):
def visit_alternate_type(self, def visit_alternate_type(self,
name: str, name: str,
info: QAPISourceInfo, info: Optional[QAPISourceInfo],
ifcond: List[str], ifcond: List[str],
features: List[QAPISchemaFeature], features: List[QAPISchemaFeature],
variants: QAPISchemaVariants) -> None: variants: QAPISchemaVariants) -> None:

4
scripts/qapi/visit.py
View File

@ -336,7 +336,7 @@ class QAPISchemaGenVisitVisitor(QAPISchemaModularCVisitor):
def visit_enum_type(self, def visit_enum_type(self,
name: str, name: str,
info: QAPISourceInfo, info: Optional[QAPISourceInfo],
ifcond: List[str], ifcond: List[str],
features: List[QAPISchemaFeature], features: List[QAPISchemaFeature],
members: List[QAPISchemaEnumMember], members: List[QAPISchemaEnumMember],
@ -378,7 +378,7 @@ class QAPISchemaGenVisitVisitor(QAPISchemaModularCVisitor):
def visit_alternate_type(self, def visit_alternate_type(self,
name: str, name: str,
info: QAPISourceInfo, info: Optional[QAPISourceInfo],
ifcond: List[str], ifcond: List[str],
features: List[QAPISchemaFeature], features: List[QAPISchemaFeature],
variants: QAPISchemaVariants) -> None: variants: QAPISchemaVariants) -> None: