motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-03 07:43:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

20
qapi/qapi-forward-visitor.c
View file

@ -246,25 +246,27 @@ static void forward_field_optional(Visitor *v, const char *name, bool *present)
visit_optional(ffv->target, name, present);
}
static bool forward_field_deprecated_accept(Visitor *v, const char *name,
Error **errp)
static bool forward_field_policy_reject(Visitor *v, const char *name,
unsigned special_features,
Error **errp)
{
ForwardFieldVisitor *ffv = to_ffv(v);
if (!forward_field_translate_name(ffv, &name, errp)) {
return false;
return true;
}
return visit_deprecated_accept(ffv->target, name, errp);
return visit_policy_reject(ffv->target, name, special_features, errp);
}
static bool forward_field_deprecated(Visitor *v, const char *name)
static bool forward_field_policy_skip(Visitor *v, const char *name,
unsigned special_features)
{
ForwardFieldVisitor *ffv = to_ffv(v);
if (!forward_field_translate_name(ffv, &name, NULL)) {
return false;
return true;
}
return visit_deprecated(ffv->target, name);
return visit_policy_skip(ffv->target, name, special_features);
}
static void forward_field_complete(Visitor *v, void *opaque)
@ -313,8 +315,8 @@ Visitor *visitor_forward_field(Visitor *target, const char *from, const char *to
v->visitor.type_any = forward_field_type_any;
v->visitor.type_null = forward_field_type_null;
v->visitor.optional = forward_field_optional;
v->visitor.deprecated_accept = forward_field_deprecated_accept;
v->visitor.deprecated = forward_field_deprecated;
v->visitor.policy_reject = forward_field_policy_reject;
v->visitor.policy_skip = forward_field_policy_skip;
v->visitor.complete = forward_field_complete;
v->visitor.free = forward_field_free;