From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 76961C433F5 for ; Fri, 29 Oct 2021 17:46:28 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DB36E610A0 for ; Fri, 29 Oct 2021 17:46:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org DB36E610A0 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:41950 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mgVxS-0002bc-Ok for qemu-devel@archiver.kernel.org; Fri, 29 Oct 2021 13:46:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52100) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mgVBJ-00014Y-8S for qemu-devel@nongnu.org; Fri, 29 Oct 2021 12:56:42 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:38493) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mgVBH-0006OC-57 for qemu-devel@nongnu.org; Fri, 29 Oct 2021 12:56:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635526598; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aABcbGb9tSp3laOGyPvV8w9H65DOrr7LMtAIID3fsEw=; b=FX/WZ3zJqhd5cavJ+gvL2JrWCAROsiuIdyrlxX5D/eglPr0iaWVIrUPQq3is/97e1AA+yW Ko06w7DNw+VDVd6VTlBq3vxj8g0E+sXTUU+B7ZmqGS/qrms7//p8xezEThUjwJwMK7vi1p 6l8iiz2q7NkaBsr9KD8AL1OnLICYCzw= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-247-ZeDHVP-LM0iPUqMHoawIrg-1; Fri, 29 Oct 2021 12:56:35 -0400 X-MC-Unique: ZeDHVP-LM0iPUqMHoawIrg-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7E47D1006ABC; Fri, 29 Oct 2021 16:56:34 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-7.ams2.redhat.com [10.36.112.7]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AAA1D5BAFF; Fri, 29 Oct 2021 16:55:18 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 3FB5011380A7; Fri, 29 Oct 2021 18:55:17 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Subject: Re: [PATCH v2 8/9] qapi: Factor out compat_policy_input_ok() References: <20211028102520.747396-1-armbru@redhat.com> <20211028102520.747396-9-armbru@redhat.com> Date: Fri, 29 Oct 2021 18:55:17 +0200 In-Reply-To: <20211028102520.747396-9-armbru@redhat.com> (Markus Armbruster's message of "Thu, 28 Oct 2021 12:25:19 +0200") Message-ID: <87o877ahze.fsf@dusky.pond.sub.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=216.205.24.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, pkrempa@redhat.com, berrange@redhat.com, ehabkost@redhat.com, qemu-block@nongnu.org, quintela@redhat.com, libvir-list@redhat.com, eblake@redhat.com, kchamart@redhat.com, mdroth@linux.vnet.ibm.com, dgilbert@redhat.com, pbonzini@redhat.com, marcandre.lureau@redhat.com, philmd@redhat.com, jsnow@redhat.com, libguestfs@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Markus Armbruster writes: > 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 > Reviewed-by: Philippe Mathieu-Daud=C3=A9 > --- > include/qapi/compat-policy.h | 7 +++++ > qapi/qapi-visit-core.c | 18 +++++-------- > qapi/qmp-dispatch.c | 51 +++++++++++++++++++++++++++--------- > qapi/qobject-input-visitor.c | 19 +++----------- > 4 files changed, 55 insertions(+), 40 deletions(-) > > diff --git a/include/qapi/compat-policy.h b/include/qapi/compat-policy.h > index 1083f95122..8b7b25c0b5 100644 > --- a/include/qapi/compat-policy.h > +++ b/include/qapi/compat-policy.h > @@ -13,10 +13,17 @@ > #ifndef QAPI_COMPAT_POLICY_H > #define QAPI_COMPAT_POLICY_H > =20 > +#include "qapi/error.h" > #include "qapi/qapi-types-compat.h" > =20 > extern CompatPolicy compat_policy; > =20 > +bool compat_policy_input_ok(unsigned special_features, > + const CompatPolicy *policy, > + ErrorClass error_class, > + const char *kind, const char *name, > + Error **errp); > + > /* > * Create a QObject input visitor for @obj for use with QMP > * > 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 @@ > */ > =20 > #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, > } > =20 > 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; > } > =20 > *obj =3D value; > diff --git a/qapi/qmp-dispatch.c b/qapi/qmp-dispatch.c > index 8cca18c891..e29ade134c 100644 > --- a/qapi/qmp-dispatch.c > +++ b/qapi/qmp-dispatch.c > @@ -28,6 +28,40 @@ > =20 > CompatPolicy compat_policy; > =20 > +static bool compat_policy_input_ok1(const char *adjective, > + CompatPolicyInput policy, > + ErrorClass error_class, > + const char *kind, const char *name, > + Error **errp) > +{ > + switch (policy) { > + case COMPAT_POLICY_INPUT_ACCEPT: > + return true; > + case COMPAT_POLICY_INPUT_REJECT: > + error_set(errp, error_class, "%s %s %s disabled by policy", > + adjective, kind, name); > + return false; > + case COMPAT_POLICY_INPUT_CRASH: > + default: > + abort(); > + } > +} > + > +bool compat_policy_input_ok(unsigned special_features, > + const CompatPolicy *policy, > + ErrorClass error_class, > + const char *kind, const char *name, > + Error **errp) > +{ > + if ((special_features & 1u << QAPI_DEPRECATED) > + && !compat_policy_input_ok1("Deprecated", > + policy->deprecated_input, > + error_class, kind, name, errp)) { > + return false; > + } > + return true; > +} > + > Visitor *qobject_input_visitor_new_qmp(QObject *obj) > { > Visitor *v =3D qobject_input_visitor_new(obj); I'm moving the new functions along with @compat_policy to qapi-util.c, so the QAPI visitors survive linking without qmp-dispatch.o. > @@ -176,19 +210,10 @@ QDict *qmp_dispatch(const QmpCommandList *cmds, QOb= ject *request, > "The command %s has not been found", command); > goto out; > } > - if (cmd->special_features & 1u << QAPI_DEPRECATED) { > - switch (compat_policy.deprecated_input) { > - case COMPAT_POLICY_INPUT_ACCEPT: > - break; > - case COMPAT_POLICY_INPUT_REJECT: > - error_set(&err, ERROR_CLASS_COMMAND_NOT_FOUND, > - "Deprecated command %s disabled by policy", > - command); > - goto out; > - case COMPAT_POLICY_INPUT_CRASH: > - default: > - abort(); > - } > + if (!compat_policy_input_ok(cmd->special_features, &compat_policy, > + ERROR_CLASS_COMMAND_NOT_FOUND, > + "command", command, &err)) { > + goto out; > } > if (!cmd->enabled) { > error_set(&err, ERROR_CLASS_COMMAND_NOT_FOUND, > diff --git a/qapi/qobject-input-visitor.c b/qapi/qobject-input-visitor.c > index c120dbdd92..f0b4c7ca9d 100644 > --- a/qapi/qobject-input-visitor.c > +++ b/qapi/qobject-input-visitor.c > @@ -14,6 +14,7 @@ > =20 > #include "qemu/osdep.h" > #include > +#include "qapi/compat-policy.h" > #include "qapi/error.h" > #include "qapi/qobject-input-visitor.h" > #include "qapi/visitor-impl.h" > @@ -666,21 +667,9 @@ static bool qobject_input_policy_reject(Visitor *v, = const char *name, > unsigned special_features, > Error **errp) > { > - if (!(special_features & 1u << QAPI_DEPRECATED)) { > - return false; > - } > - > - switch (v->compat_policy.deprecated_input) { > - case COMPAT_POLICY_INPUT_ACCEPT: > - return false; > - case COMPAT_POLICY_INPUT_REJECT: > - error_setg(errp, "Deprecated parameter '%s' disabled by policy", > - name); > - return true; > - case COMPAT_POLICY_INPUT_CRASH: > - default: > - abort(); > - } > + return !compat_policy_input_ok(special_features, &v->compat_policy, > + ERROR_CLASS_GENERIC_ERROR, > + "parameter", name, errp); > } > =20 > static void qobject_input_free(Visitor *v)