From nobody Sun Dec 22 06:23:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1727185368387110.70128490697459; Tue, 24 Sep 2024 06:42:48 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 1E97D1791; Tue, 24 Sep 2024 09:42:44 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 2EDA017DD; Tue, 24 Sep 2024 09:42:14 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 552AD15EC; Tue, 24 Sep 2024 09:42:10 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id B2A8213A0 for ; Tue, 24 Sep 2024 09:42:09 -0400 (EDT) Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-206-u12Gl_SAMBm9LN9NDFi5HA-1; Tue, 24 Sep 2024 09:42:07 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (unknown [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0D64F18FFA53 for ; Tue, 24 Sep 2024 13:42:06 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.5]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 22A0419792F3 for ; Tue, 24 Sep 2024 13:41:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1727185329; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MbwOPC8oSkK8NdPWXfMFYHUMBhewhxxuNeyW/qVjWOo=; b=JKzPJUuE23aQTv2zuzTkLVnL+9FtFjWU59sqhKZ6/HLr8VJxbJewnHCcc7Kuqo443gA9On KEi3UgDu9VA0/XQAYIT1vuIR+/GmDhxmZjgF2xcBQRST8hiZVyNUfod8gaZH86N9nHm/3w 4VfHxT/yIq0qZU1V6yXi+i6JPbaHK4U= X-MC-Unique: u12Gl_SAMBm9LN9NDFi5HA-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 1/2] testutilsqemuschema: Rename and document 'testQEMUSchemaValidateDeprecated' Date: Tue, 24 Sep 2024 15:41:13 +0200 Message-ID: <5bc108dd69da01837df6b829a67e943ba772dfd4.1727185245.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: QH3I6ZD5KFPQDTTQAL6D65EE7ENHQCS2 X-Message-ID-Hash: QH3I6ZD5KFPQDTTQAL6D65EE7ENHQCS2 X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1727185369779116600 Content-Type: text/plain; charset="utf-8" Upcoming patch will add more features we care to check. Rename the function to 'testQEMUSchemaValidateFeatures'. Signed-off-by: Peter Krempa Reviewed-by: Pavel Hrdina --- tests/testutilsqemuschema.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/tests/testutilsqemuschema.c b/tests/testutilsqemuschema.c index f7b2e122bd..bb3d6b3141 100644 --- a/tests/testutilsqemuschema.c +++ b/tests/testutilsqemuschema.c @@ -29,8 +29,12 @@ struct testQEMUSchemaValidateCtxt { }; +/** + * Validate that the schema member doesn't have some significant features: + * - 'deprecated' - schema member is deprecated + */ static int -testQEMUSchemaValidateDeprecated(virJSONValue *root, +testQEMUSchemaValidateFeatures(virJSONValue *root, const char *name, struct testQEMUSchemaValidateCtxt *ctxt) { @@ -187,8 +191,8 @@ testQEMUSchemaValidateObjectMember(const char *key, return -1; } - /* validate that the member is not deprecated */ - if ((rc =3D testQEMUSchemaValidateDeprecated(keymember, key, data->ctx= t)) < 0) + /* validate that the member doesn't have some of the significant featu= res */ + if ((rc =3D testQEMUSchemaValidateFeatures(keymember, key, data->ctxt)= ) < 0) return rc; /* lookup schema entry for keytype */ @@ -387,8 +391,8 @@ testQEMUSchemaValidateEnum(virJSONValue *obj, if (STREQ_NULLABLE(objstr, virJSONValueObjectGetString(member,= "name"))) { int rc; - /* the new 'members' array allows us to check deprecations= */ - if ((rc =3D testQEMUSchemaValidateDeprecated(member, objst= r, ctxt)) < 0) + /* the new 'members' array allows us to check features */ + if ((rc =3D testQEMUSchemaValidateFeatures(member, objstr,= ctxt)) < 0) return rc; virBufferAsprintf(ctxt->debug, "'%s' OK", NULLSTR(objstr)); @@ -526,7 +530,7 @@ testQEMUSchemaValidateRecurse(virJSONValue *obj, const char *t =3D virJSONValueObjectGetString(root, "meta-type"); int rc; - if ((rc =3D testQEMUSchemaValidateDeprecated(root, n, ctxt)) < 0) + if ((rc =3D testQEMUSchemaValidateFeatures(root, n, ctxt)) < 0) return rc; if (STREQ_NULLABLE(t, "builtin")) { @@ -626,7 +630,7 @@ testQEMUSchemaValidateCommand(const char *command, return -1; } - if ((rc =3D testQEMUSchemaValidateDeprecated(schemarootcommand, comman= d, &ctxt)) < 0) + if ((rc =3D testQEMUSchemaValidateFeatures(schemarootcommand, command,= &ctxt)) < 0) return rc; if (!arguments) --=20 2.46.0 From nobody Sun Dec 22 06:23:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1727185388255310.8361154518742; Tue, 24 Sep 2024 06:43:08 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 7FC451730; Tue, 24 Sep 2024 09:42:59 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id C9DFB1815; Tue, 24 Sep 2024 09:42:22 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 185161758; Tue, 24 Sep 2024 09:42:19 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 8805C179C for ; Tue, 24 Sep 2024 09:42:13 -0400 (EDT) Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-695-X8yKc4hrPgKoHF7a6xSedA-1; Tue, 24 Sep 2024 09:42:07 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (unknown [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 9902118BC6C4 for ; Tue, 24 Sep 2024 13:42:06 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.5]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 6C35519792FB for ; Tue, 24 Sep 2024 13:41:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1727185333; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rvN/QFHxLbV5mz2+dLU1SqkS4ACL9liV44aqRV1bU3I=; b=eD5gvV0CxMeoqwl06RZ74kDeGSDXVoovngqmoZ+gUNdY7n8FSKjC6V6bL4pUjsa1/m5LwC V7H1cngLiNDWvywvU54J5WecVGBODV4XDAUrr67wLSbIF71hpJ26d+t5Y2L/mCDG2G4gb1 SAcqNCZUpcFjkOjscxK6Q2GtTYc4GAk= X-MC-Unique: X8yKc4hrPgKoHF7a6xSedA-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 2/2] testutilsqemuschema: Support 'unstable' feature in QMP schema validator Date: Tue, 24 Sep 2024 15:41:14 +0200 Message-ID: <7d780e00c98ec00795f87e490cd5eddda8188b01.1727185245.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: VTOFZWI5NRXNOF3UZ5C74QLNKQHNPNOS X-Message-ID-Hash: VTOFZWI5NRXNOF3UZ5C74QLNKQHNPNOS X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1727185389787116600 Content-Type: text/plain; charset="utf-8" The 'unstable' feature is present on any schema member which was not yet finalized in qemu. Use it to refuse such fields/commands in qemu as they are possibly subject to change. Signed-off-by: Peter Krempa Reviewed-by: Pavel Hrdina --- tests/testutilsqemuschema.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/testutilsqemuschema.c b/tests/testutilsqemuschema.c index bb3d6b3141..6ee83c3ba7 100644 --- a/tests/testutilsqemuschema.c +++ b/tests/testutilsqemuschema.c @@ -32,6 +32,7 @@ struct testQEMUSchemaValidateCtxt { /** * Validate that the schema member doesn't have some significant features: * - 'deprecated' - schema member is deprecated + * - 'unstable' - schema member is considered unstable */ static int testQEMUSchemaValidateFeatures(virJSONValue *root, @@ -57,6 +58,11 @@ testQEMUSchemaValidateFeatures(virJSONValue *root, return -2; } + if (STREQ(curstr, "unstable")) { + virBufferAsprintf(ctxt->debug, "ERROR: '%s' is unstable", name= ); + return -1; + } + if (STREQ(curstr, "deprecated")) { if (ctxt->allowDeprecated) { virBufferAsprintf(ctxt->debug, "WARNING: '%s' is deprecate= d", name); --=20 2.46.0