From nobody Thu May 16 01:16:50 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1608034630; cv=none; d=zohomail.com; s=zohoarc; b=UW01oIZTt8nvivCNgeWpAmBQlr1UL4/Bg5KjaZqghYyNT+s9O3mjyzdMM9YcN7y14Z0bLJpbR69sA9oYHXC8I0AOKC3NaNhXrKKbitTc9vteaM5UK4TO3o4Xlh0Rz+LFGnmqgC6IDLhJHMZb13rh2duBbTPEg4cH2YbG5HDumYk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608034630; h=Content-Type:Content-Transfer-Encoding:Cc: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=F2X6Yh/hCgKqhlUPamE8lbJKHaYmTLSmrbKuXj6YmIo=; b=f7TvAv1l5iTJXyGj0HP0hxFNqkOYdm05+vXMnXpICxc1w0GcHxDVz7czCtmAcxAFoHDQ67tNnfyf4SIV7pMFkX7MIvGYeUveZd437dfKwwrkLzIVd1YwSGg/zRf8mzep5btCLbQPsH3A2nXkqW0K+bPRR6rltgyJB9xEhQwxTVA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1608034630066951.1126286938452; Tue, 15 Dec 2020 04:17:10 -0800 (PST) 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-51-6tGqbaUZMdyxovlbviIjhA-1; Tue, 15 Dec 2020 07:17:05 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B0C94107ACF5; Tue, 15 Dec 2020 12:16:59 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 78D8E57; Tue, 15 Dec 2020 12:16:59 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 3781D180954D; Tue, 15 Dec 2020 12:16:57 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0BFCGsna031556 for ; Tue, 15 Dec 2020 07:16:54 -0500 Received: by smtp.corp.redhat.com (Postfix) id 20D8A19C47; Tue, 15 Dec 2020 12:16:54 +0000 (UTC) Received: from work.redhat.com (ovpn-114-20.ams2.redhat.com [10.36.114.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 68AD919C44; Tue, 15 Dec 2020 12:16:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1608034629; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=F2X6Yh/hCgKqhlUPamE8lbJKHaYmTLSmrbKuXj6YmIo=; b=K5pgkhcGeIlVNGyT6PhPukR/ZPHDfudEGyY4Zj738ZUCx1syby0UTD/mYNSymx3wK5TywT bpdM/9DWEECzOOn94BjjEMvA/kDCKSqFMmILEachuz/rs1alAVjyd8DZ1qrrOmUHtFU5bV 4qkbf6maIth/NVsgM3eojog24CgAQV0= X-MC-Unique: 6tGqbaUZMdyxovlbviIjhA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 1/2] schemas: Deduplicate cpuTopology in cputypes.rng Date: Tue, 15 Dec 2020 13:16:47 +0100 Message-Id: <20201215121648.28181-2-twiederh@redhat.com> In-Reply-To: <20201215121648.28181-1-twiederh@redhat.com> References: <20201215121648.28181-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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) Content-Type: text/plain; charset="utf-8" The duplicate had the "dies" attribute missing, causing $ virsh capabilities > cap.xml $ virsh [hypervisor-]cpu-compare cap.xml --validate to fail with error: Failed to compare hypervisor CPU with cap.xml error: XML document failed to validate against schema: Unable to validate= doc against /usr/share/libvirt/schemas/cpu.rng Invalid attribute dies for element topology Signed-off-by: Tim Wiederhake Reviewed-by: Michal Privoznik --- docs/schemas/cputypes.rng | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/docs/schemas/cputypes.rng b/docs/schemas/cputypes.rng index aea6ff0267..c4e7621659 100644 --- a/docs/schemas/cputypes.rng +++ b/docs/schemas/cputypes.rng @@ -337,17 +337,7 @@ - - - - - - - - - - - + --=20 2.26.2 From nobody Thu May 16 01:16:50 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.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=1608034628; cv=none; d=zohomail.com; s=zohoarc; b=bfgsFtQH68GWAAjF0N4ncm/yai9YDXqreJqKqJVkkIxIExBphAxc2zcsejBhrG71kxpHnSQZqp9EjRzQHtq7n12LzSFmseWMKmyki0SEraJRQb/0YVl113UoigsqKSGSNMnfSzuNhZ9CUzFGJXmt2Nr92+AQHDBRXN3eB3Lwwc4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608034628; h=Content-Type:Content-Transfer-Encoding:Cc: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=dk03F/dujl2P3sfcqUEiGTzzGGvYsKZWDJZePj69jTg=; b=CaWvcoBD1eBdcEjlKX3tBjHMjA51kMwMEDvVNkQbGeKVtq3QYgikyv846PKfiGIG9CddzugQpdfs3FYs7BvPFNLVZ/Z9BEQy74B4tJF8JaY3D1vapCr41UJJaWipEIVeHpT2WP7RExGioyY5+uEtQ/kXZfevOsSg3y71OwdyUWk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1608034628585678.082295192739; Tue, 15 Dec 2020 04:17:08 -0800 (PST) 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-346-iFiTS3YuPfmm09Y5wONipA-1; Tue, 15 Dec 2020 07:17:04 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1CD9E180A08A; Tue, 15 Dec 2020 12:16:59 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C919A60C15; Tue, 15 Dec 2020 12:16:58 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 538FF4A7C7; Tue, 15 Dec 2020 12:16:57 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0BFCGtcx031566 for ; Tue, 15 Dec 2020 07:16:55 -0500 Received: by smtp.corp.redhat.com (Postfix) id 2FF5A19C66; Tue, 15 Dec 2020 12:16:55 +0000 (UTC) Received: from work.redhat.com (ovpn-114-20.ams2.redhat.com [10.36.114.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7649419C46; Tue, 15 Dec 2020 12:16:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1608034626; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=dk03F/dujl2P3sfcqUEiGTzzGGvYsKZWDJZePj69jTg=; b=Z268BYABZIStUr5g294hhQbKaodNCAUDfqZ41OkTgsm3p7q5Q0ZG6MYrVQmYFNg4+eCVUX yNLG5gdTGk14kIb/V+l6kjQXHFOIDBKsYvbZmpTNpYRci3iS85+iJE1tlTzSYbObkiAt1B S9N1r2xL58dO0jK+i5KMfSpnLdDsJxc= X-MC-Unique: iFiTS3YuPfmm09Y5wONipA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 2/2] schema: Allow counter element in host cpu definition Date: Tue, 15 Dec 2020 13:16:48 +0100 Message-Id: <20201215121648.28181-3-twiederh@redhat.com> In-Reply-To: <20201215121648.28181-1-twiederh@redhat.com> References: <20201215121648.28181-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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) Content-Type: text/plain; charset="utf-8" If the capabilities include a counter element, e.g. the XML could not be validated: $ virsh capabilities > cap.xml $ virsh [hypervisor-]cpu-compare cap.xml --validate error: Failed to compare hypervisor CPU with cap.txt error: XML document failed to validate against schema: Unable to validate= doc against /usr/share/libvirt/schemas/cpu.rng Did not expect element counter there Signed-off-by: Tim Wiederhake Reviewed-by: Michal Privoznik --- docs/schemas/cputypes.rng | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/docs/schemas/cputypes.rng b/docs/schemas/cputypes.rng index c4e7621659..f66bc62ba7 100644 --- a/docs/schemas/cputypes.rng +++ b/docs/schemas/cputypes.rng @@ -336,6 +336,19 @@ + + + + + + + + + + + + + --=20 2.26.2