From nobody Sun May 5 23:47:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1658299004; cv=none; d=zohomail.com; s=zohoarc; b=LBwIoNE10+ymddMxmWojE033U2bGXY2IRvl+RRv0cNSv2da/spna6MD+h0D1qDFTQNSDZdIKLHfYlqWq+dRzFTNu+dDI9DtrYo/AB9zuwipA0jd9J5nxzQ1Z7TH3s6WpDJC5w0WR3gaJ+xyxudkYD8rsedqROAoWlWwVZsvl0wA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658299004; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Oi+2R1gZr49pNBg45QmOIpeX+0gm7jF1QrHf1OU6tRI=; b=L9e/uYfVzjhwNWDlFpKW9jPX+mRcEw8miElaVIxGuSEBKFSEjsXxz4tK0EN/XqoaChby8tbnCqgrzmFZ7qrpvMDlm++62caPFe55x/9SGGeltLrN5LE0qRvGwsQE3O9ea9yk7pW83eTzTVoaRHPUd1fFVCqrGRa0Srot+UTl9IA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1658299004332108.38662173750686; Tue, 19 Jul 2022 23:36:44 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-53-1TB9JzMeNMekSnrRzDsQPg-1; Wed, 20 Jul 2022 02:36:38 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 884648041B5; Wed, 20 Jul 2022 06:36:35 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 71C96401473; Wed, 20 Jul 2022 06:36:35 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 42AB119451EF; Wed, 20 Jul 2022 06:36:33 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 9C5F01945DA7 for ; Wed, 20 Jul 2022 06:36:31 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 612D61121315; Wed, 20 Jul 2022 06:36:31 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.88]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0D3821121314 for ; Wed, 20 Jul 2022 06:36:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658299003; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Oi+2R1gZr49pNBg45QmOIpeX+0gm7jF1QrHf1OU6tRI=; b=IUV4oj5VwsxqpWwCypCjHlQjzkFC6Ite3VMymUPxL3YvbVqsm5HW8rK9ci2oMS2DpZj12l 9QBHfCVwsXFqUprKfa9+fdEndSjfDWiDFxo7tdj2L2KSvBgeHUX/mjPxIrvKEiDpFBHgPQ QGBVMFDL/EwSbDKE+0an3etpBfX93LM= X-MC-Unique: 1TB9JzMeNMekSnrRzDsQPg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 1/2] capabilityschemadata: Fix order of in caps-test2.xml Date: Wed, 20 Jul 2022 08:36:28 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.85 on 10.11.54.10 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1658299006184100005 Content-Type: text/plain; charset="utf-8"; x-default="true" The guest is formatted in virCapabilitiesFormatGuestFeatures() and the order in which individual child elements are formatted is fixed, because the function iterates over the virCapsGuestFeatureType enum (possibly) formatting each member until _LAST is met. Therefore, and can't ever be formatted first. Move these elements to proper location. Signed-off-by: Michal Privoznik --- tests/capabilityschemadata/caps-test2.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/capabilityschemadata/caps-test2.xml b/tests/capabilitysc= hemadata/caps-test2.xml index 125a322998..bf18010440 100644 --- a/tests/capabilityschemadata/caps-test2.xml +++ b/tests/capabilityschemadata/caps-test2.xml @@ -72,12 +72,12 @@ - - + + =20 @@ -114,10 +114,10 @@ - - + + =20 --=20 2.35.1 From nobody Sun May 5 23:47:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1658299001; cv=none; d=zohomail.com; s=zohoarc; b=YCy94nI8BLLFV5nXLYYvbl3Vi7GNdSKw8Rkpuc0cpEdunSUxV07u4DrUknvnI0R0L3Z9BMijnKGbeeybCRt2OZjX6zbQK4zV8Va+/5n+pHdq5TKblCQXCblGa97CRWm2wWVIkgez0wsLwi6ew9bhcPmQKXy43Gh9GoyURx7jMpQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658299001; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=IocuB4/Hy8OR0K4ogHm94REj7uG240x8Zm9usCQ6DTM=; b=YGiCnBdLAIaBmTUVSKnBMizuSYwZSeedhMpXlL49itCZTi6VRsokTMs/WBNi2Pj9gg9eUlWh03VNLgQNtVvuYWJm2sRCgTzwqmQxDgZ1Dmp3DTXFsxnm8AgFhy0BuOHl7WK0MQXSmQ8OQB6oLGUGea3JMSmDbbAGb4bmc1R445E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1658299001809525.5486715841854; Tue, 19 Jul 2022 23:36:41 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-73-FTjpIYWbPjumoVwhKFQykQ-1; Wed, 20 Jul 2022 02:36:38 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1CAE238041F3; Wed, 20 Jul 2022 06:36:36 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id F3343112131B; Wed, 20 Jul 2022 06:36:35 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id DB1EC1947061; Wed, 20 Jul 2022 06:36:34 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 357131947042 for ; Wed, 20 Jul 2022 06:36:32 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 138361121315; Wed, 20 Jul 2022 06:36:32 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.88]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9841C1121314 for ; Wed, 20 Jul 2022 06:36:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658299000; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=IocuB4/Hy8OR0K4ogHm94REj7uG240x8Zm9usCQ6DTM=; b=XDkonjbUXLaYLJJ7i3NHuztom6zC6e4qgpWp5iQH1iNjvoXa02nWSnvv6lrWpIUAB8S57+ /LjoCh0/U6+9jmbhZB+jaxesqnkqT3UWITMq7V8PC7S0L/K1WlCJzd0Thc2511DzDB2foC 8tCsCK7vpiFzIbblfTlWNY3aNNc5E0M= X-MC-Unique: FTjpIYWbPjumoVwhKFQykQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 2/2] schemas: Drop from capabilities schemas Date: Wed, 20 Jul 2022 08:36:29 +0200 Message-Id: <9a597c62f6baf4f423a8907fb16cfade416d5852.1658298964.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1658299002169100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Currently, we have two types of output only XMLs: capabilities and domaincapabilities. Neither of these is ever parsed. Moreover, the order of elements inside these two documents is well defined by their respective format functions. Therefore, there's no need to have anywhere in their corresponding schemas. Signed-off-by: Michal Privoznik --- src/conf/schemas/capability.rng | 160 +++++++++++++++----------------- src/conf/schemas/domaincaps.rng | 80 ++++++++-------- 2 files changed, 115 insertions(+), 125 deletions(-) diff --git a/src/conf/schemas/capability.rng b/src/conf/schemas/capability.= rng index c7e72c6f39..7a24b2a076 100644 --- a/src/conf/schemas/capability.rng +++ b/src/conf/schemas/capability.rng @@ -53,44 +53,40 @@ =20 - - - - - - - - - - - - + + + + + + + + + - - - + + + + =20 - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + =20 @@ -442,57 +438,55 @@ =20 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + =20 diff --git a/src/conf/schemas/domaincaps.rng b/src/conf/schemas/domaincaps.= rng index 9cbc2467ab..331fdbb1e9 100644 --- a/src/conf/schemas/domaincaps.rng +++ b/src/conf/schemas/domaincaps.rng @@ -10,43 +10,41 @@ =20 - - - - - - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + =20 @@ -78,13 +76,11 @@ =20 - - - - - - - + + + + + =20 --=20 2.35.1