The typical API design pattern is for a method to be named after the type of the first arg passed into the method. For the compat_policy_input_ok method, this points towards 'CompatPolicy' being the first arg, matching compat_policy_check_security.
Signed-off-by: Daniel P. Berrangé <[email protected]> --- include/qapi/compat-policy.h | 4 ++-- qapi/qapi-util.c | 16 ++++++++-------- qapi/qapi-visit-core.c | 4 ++-- qapi/qmp-dispatch.c | 2 +- qapi/qobject-input-visitor.c | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/include/qapi/compat-policy.h b/include/qapi/compat-policy.h index f5af2090692..df87d716439 100644 --- a/include/qapi/compat-policy.h +++ b/include/qapi/compat-policy.h @@ -18,8 +18,8 @@ extern CompatPolicy compat_policy; -bool compat_policy_input_ok(uint64_t features, - const CompatPolicy *policy, +bool compat_policy_input_ok(const CompatPolicy *policy, + uint64_t features, ErrorClass error_class, const char *kind, const char *name, Error **errp); diff --git a/qapi/qapi-util.c b/qapi/qapi-util.c index 38b1cec7a41..93898f57a05 100644 --- a/qapi/qapi-util.c +++ b/qapi/qapi-util.c @@ -19,8 +19,8 @@ CompatPolicy compat_policy; -static bool compat_policy_input_ok1(const char *adjective, - CompatPolicyInput policy, +static bool compat_policy_input_ok1(CompatPolicyInput policy, + const char *adjective, ErrorClass error_class, const char *kind, const char *name, Error **errp) @@ -38,21 +38,21 @@ static bool compat_policy_input_ok1(const char *adjective, } } -bool compat_policy_input_ok(uint64_t features, - const CompatPolicy *policy, +bool compat_policy_input_ok(const CompatPolicy *policy, + uint64_t features, ErrorClass error_class, const char *kind, const char *name, Error **errp) { if ((features & 1u << QAPI_DEPRECATED) - && !compat_policy_input_ok1("Deprecated", - policy->deprecated_input, + && !compat_policy_input_ok1(policy->deprecated_input, + "Deprecated", error_class, kind, name, errp)) { return false; } if ((features & (1u << QAPI_UNSTABLE)) - && !compat_policy_input_ok1("Unstable", - policy->unstable_input, + && !compat_policy_input_ok1(policy->unstable_input, + "Unstable", error_class, kind, name, errp)) { return false; } diff --git a/qapi/qapi-visit-core.c b/qapi/qapi-visit-core.c index 706c61e0260..66d57dd447a 100644 --- a/qapi/qapi-visit-core.c +++ b/qapi/qapi-visit-core.c @@ -410,8 +410,8 @@ static bool input_type_enum(Visitor *v, const char *name, int *obj, } if (lookup->features - && !compat_policy_input_ok(lookup->features[value], - &v->compat_policy, + && !compat_policy_input_ok(&v->compat_policy, + lookup->features[value], ERROR_CLASS_GENERIC_ERROR, "value", enum_str, errp)) { return false; diff --git a/qapi/qmp-dispatch.c b/qapi/qmp-dispatch.c index 965cad64998..f2fb8f7976c 100644 --- a/qapi/qmp-dispatch.c +++ b/qapi/qmp-dispatch.c @@ -185,7 +185,7 @@ QDict *coroutine_mixed_fn qmp_dispatch(const QmpCommandList *cmds, QObject *requ "The command %s has not been found", command); goto out; } - if (!compat_policy_input_ok(cmd->features, &compat_policy, + if (!compat_policy_input_ok(&compat_policy, cmd->features, ERROR_CLASS_COMMAND_NOT_FOUND, "command", command, &err)) { goto out; diff --git a/qapi/qobject-input-visitor.c b/qapi/qobject-input-visitor.c index c52d36997df..17d91746d3a 100644 --- a/qapi/qobject-input-visitor.c +++ b/qapi/qobject-input-visitor.c @@ -667,7 +667,7 @@ static bool qobject_input_policy_reject(Visitor *v, const char *name, uint64_t features, Error **errp) { - return !compat_policy_input_ok(features, &v->compat_policy, + return !compat_policy_input_ok(&v->compat_policy, features, ERROR_CLASS_GENERIC_ERROR, "parameter", name, errp); } -- 2.56.0
