diff options
| author | Markus Armbruster <armbru@redhat.com> | 2021-10-28 12:25:19 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2021-10-29 21:27:20 +0200 |
| commit | 7ce5fc63c75d0ac756fd0b4d0472774de17f8fec (patch) | |
| tree | bcab77bc0c0f51f58b4307afc089714bb1f12f00 /qapi/qapi-visit-core.c | |
| parent | c8688760437aaf4bfa9012ff5aef8ab1c92a38e1 (diff) | |
qapi: Factor out compat_policy_input_ok()
The code to check policy for handling deprecated input is triplicated.
Factor it out into compat_policy_input_ok() before I mess with it in
the next commit.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20211028102520.747396-9-armbru@redhat.com>
[Policy code moved from qmp-dispatch.c to qapi-util.c to make visitors
link without qmp-dispatch.o]
Diffstat (limited to 'qapi/qapi-visit-core.c')
| -rw-r--r-- | qapi/qapi-visit-core.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/qapi/qapi-visit-core.c b/qapi/qapi-visit-core.c index 34c59286b2..6c13510a2b 100644 --- a/qapi/qapi-visit-core.c +++ b/qapi/qapi-visit-core.c @@ -13,6 +13,7 @@ */ #include "qemu/osdep.h" +#include "qapi/compat-policy.h" #include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qapi/visitor.h" @@ -409,18 +410,11 @@ static bool input_type_enum(Visitor *v, const char *name, int *obj, } if (lookup->special_features - && (lookup->special_features[value] & QAPI_DEPRECATED)) { - switch (v->compat_policy.deprecated_input) { - case COMPAT_POLICY_INPUT_ACCEPT: - break; - case COMPAT_POLICY_INPUT_REJECT: - error_setg(errp, "Deprecated value '%s' disabled by policy", - enum_str); - return false; - case COMPAT_POLICY_INPUT_CRASH: - default: - abort(); - } + && !compat_policy_input_ok(lookup->special_features[value], + &v->compat_policy, + ERROR_CLASS_GENERIC_ERROR, + "value", enum_str, errp)) { + return false; } *obj = value; |