mii/qemu
1
0
Fork 0
mirror of https://github.com/mii443/qemu.git synced 2025-09-01 14:49:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

qapi: Generalize struct member policy checking

Browse Source 
The generated visitor functions call visit_deprecated_accept() and
visit_deprecated() when visiting a struct member with special feature
flag 'deprecated'.  This makes the feature flag visible to the actual
visitors.  I want to make feature flag 'unstable' visible there as
well, so I can add policy for it.

To let me make it visible, replace these functions by
visit_policy_reject() and visit_policy_skip(), which take the member's
special features as an argument.  Note that the new functions have the
opposite sense, i.e. the return value flips.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20211028102520.747396-6-armbru@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
[Unbreak forward visitor]
This commit is contained in:
Markus Armbruster
2021-10-28 12:25:16 +02:00
parent c67db1ed16
commit a130728554
8 changed files with 65 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/qapi/visit.py
View File

@ -21,7 +21,7 @@ from .common import (
indent,
mcgen,
)
from .gen import QAPISchemaModularCVisitor, ifcontext
from .gen import QAPISchemaModularCVisitor, gen_special_features, ifcontext
from .schema import (
QAPISchema,
QAPISchemaEnumMember,
@ -76,7 +76,6 @@ bool visit_type_%(c_name)s_members(Visitor *v, %(c_name)s *obj, Error **errp)
c_type=base.c_name())
for memb in members:
deprecated = 'deprecated' in [f.name for f in memb.features]
ret += memb.ifcond.gen_if()
if memb.optional:
ret += mcgen('''
@ -84,14 +83,15 @@ bool visit_type_%(c_name)s_members(Visitor *v, %(c_name)s *obj, Error **errp)
''',
name=memb.name, c_name=c_name(memb.name))
indent.increase()
if deprecated:
special_features = gen_special_features(memb.features)
if special_features != '0':
ret += mcgen('''
if (!visit_deprecated_accept(v, "%(name)s", errp)) {
if (visit_policy_reject(v, "%(name)s", %(special_features)s, errp)) {
return false;
}
if (visit_deprecated(v, "%(name)s")) {
if (!visit_policy_skip(v, "%(name)s", %(special_features)s)) {
''',
name=memb.name)
name=memb.name, special_features=special_features)
indent.increase()
ret += mcgen('''
if (!visit_type_%(c_type)s(v, "%(name)s", &obj->%(c_name)s, errp)) {
@ -100,7 +100,7 @@ bool visit_type_%(c_name)s_members(Visitor *v, %(c_name)s *obj, Error **errp)
''',
c_type=memb.type.c_name(), name=memb.name,
c_name=c_name(memb.name))
if deprecated:
if special_features != '0':
indent.decrease()
ret += mcgen('''
}