From nobody Sun Dec 14 01:50:24 2025 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=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1751984159; cv=none; d=zohomail.com; s=zohoarc; b=BV5o/ZrLXxNdCarwBobVDJbuNrDewNwUyBgIfUtlvhHC3Wm2ghgdw4ptI6EfsmwGs4nw3IDfSOcOnMuAg74Tokg7KNMZSdvJDTIDYn9V/DOuoyoltfwi4yPb6pVsz9+m7GOo754tlwcGs3ZBVRU6RL/HG6XxfGbdPi2C2vSiIBY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1751984159; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=cv5PMp4HrUAdrK0iSVxZCHngICznioeeokj34zSdlC0=; b=IP/2B60dUnr6PAnfPXv4QILEwZXzNB+iz6b5bwmWDJiiaU57YgFZs8aOeuotMLLJ54lTcwv9a1fn7r+ocqN8ypmSVoUA5uYMqVN9VcDmxVHBALVMAc3H4x6/BkCJ61RxXpBwdd11mtnfAxQE6LqD/hDBTpfh5TGvlfK2DXRL0iY= ARC-Authentication-Results: i=1; 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=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1751984159919974.216775592656; Tue, 8 Jul 2025 07:15:59 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id E9E2C13D2; Tue, 8 Jul 2025 10:15:58 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id E93D714E6; Tue, 8 Jul 2025 10:15:09 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 311E8CEB; Tue, 8 Jul 2025 10:15:06 -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 2A3B6B91 for ; Tue, 8 Jul 2025 10:15:05 -0400 (EDT) Received: from mx-prod-mc-03.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-425-eFtc3HkzMBi1ifrSQmxADw-1; Tue, 08 Jul 2025 10:15:03 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 01A651956048 for ; Tue, 8 Jul 2025 14:15:03 +0000 (UTC) Received: from speedmetal.lan (unknown [10.44.22.32]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 396A6180045B for ; Tue, 8 Jul 2025 14:15:01 +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.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,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=1751984104; 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=+r5997y09GbT8IPVyYEnIa/gvNbRmYd3aFlYwRTNdck=; b=Hwd4ornBRSKbsCCAsU1As4kZx6hIl+Jni48Z9Oyiqtzv1hV9G39xheYSMA2xkVr1YHd2gT VRoFoYf1Nv5ZU8KVBW+CbG+B/ZcPmVdNFXVw3Xxdfga2p7MDuPSnbvskUN37UaL/TdhH1d iQkByji7Dy3N9hDdKjjeQmYfbU0VevY= X-MC-Unique: eFtc3HkzMBi1ifrSQmxADw-1 X-Mimecast-MFC-AGG-ID: eFtc3HkzMBi1ifrSQmxADw_1751984103 To: devel@lists.libvirt.org Subject: [PATCH 1/3] sysinfotest: Use '.xml' suffix for output files Date: Tue, 8 Jul 2025 16:14:57 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: daGcxrEoPmHsW-3Fv-uDSR6gteGR6Eb7kyW3Nl77hYk_1751984103 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: BI4Y6DKDHQZKQB3FKQCVO5YFITNP3GCB X-Message-ID-Hash: BI4Y6DKDHQZKQB3FKQCVO5YFITNP3GCB 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: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1751984161455116600 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- ...rch64-gigabytesysinfo.expect =3D> aarch64-gigabytesysinfo.xml} | 0 ...4-hpe-apollosysinfo.expect =3D> aarch64-hpe-apollosysinfo.xml} | 0 ...rch64-moonshotsysinfo.expect =3D> aarch64-moonshotsysinfo.xml} | 0 tests/sysinfodata/{aarch64sysinfo.expect =3D> aarch64sysinfo.xml} | 0 .../sysinfodata/{arm-rpi2sysinfo.expect =3D> arm-rpi2sysinfo.xml} | 0 tests/sysinfodata/{armsysinfo.expect =3D> armsysinfo.xml} | 0 tests/sysinfodata/{ppcsysinfo.expect =3D> ppcsysinfo.xml} | 0 .../{s390-freqsysinfo.expect =3D> s390-freqsysinfo.xml} | 0 tests/sysinfodata/{s390sysinfo.expect =3D> s390sysinfo.xml} | 0 tests/sysinfodata/{x86sysinfo.expect =3D> x86sysinfo.xml} | 0 tests/sysinfotest.c | 2 +- 11 files changed, 1 insertion(+), 1 deletion(-) rename tests/sysinfodata/{aarch64-gigabytesysinfo.expect =3D> aarch64-giga= bytesysinfo.xml} (100%) rename tests/sysinfodata/{aarch64-hpe-apollosysinfo.expect =3D> aarch64-hp= e-apollosysinfo.xml} (100%) rename tests/sysinfodata/{aarch64-moonshotsysinfo.expect =3D> aarch64-moon= shotsysinfo.xml} (100%) rename tests/sysinfodata/{aarch64sysinfo.expect =3D> aarch64sysinfo.xml} (= 100%) rename tests/sysinfodata/{arm-rpi2sysinfo.expect =3D> arm-rpi2sysinfo.xml}= (100%) rename tests/sysinfodata/{armsysinfo.expect =3D> armsysinfo.xml} (100%) rename tests/sysinfodata/{ppcsysinfo.expect =3D> ppcsysinfo.xml} (100%) rename tests/sysinfodata/{s390-freqsysinfo.expect =3D> s390-freqsysinfo.xm= l} (100%) rename tests/sysinfodata/{s390sysinfo.expect =3D> s390sysinfo.xml} (100%) rename tests/sysinfodata/{x86sysinfo.expect =3D> x86sysinfo.xml} (100%) diff --git a/tests/sysinfodata/aarch64-gigabytesysinfo.expect b/tests/sysin= fodata/aarch64-gigabytesysinfo.xml similarity index 100% rename from tests/sysinfodata/aarch64-gigabytesysinfo.expect rename to tests/sysinfodata/aarch64-gigabytesysinfo.xml diff --git a/tests/sysinfodata/aarch64-hpe-apollosysinfo.expect b/tests/sys= infodata/aarch64-hpe-apollosysinfo.xml similarity index 100% rename from tests/sysinfodata/aarch64-hpe-apollosysinfo.expect rename to tests/sysinfodata/aarch64-hpe-apollosysinfo.xml diff --git a/tests/sysinfodata/aarch64-moonshotsysinfo.expect b/tests/sysin= fodata/aarch64-moonshotsysinfo.xml similarity index 100% rename from tests/sysinfodata/aarch64-moonshotsysinfo.expect rename to tests/sysinfodata/aarch64-moonshotsysinfo.xml diff --git a/tests/sysinfodata/aarch64sysinfo.expect b/tests/sysinfodata/aa= rch64sysinfo.xml similarity index 100% rename from tests/sysinfodata/aarch64sysinfo.expect rename to tests/sysinfodata/aarch64sysinfo.xml diff --git a/tests/sysinfodata/arm-rpi2sysinfo.expect b/tests/sysinfodata/a= rm-rpi2sysinfo.xml similarity index 100% rename from tests/sysinfodata/arm-rpi2sysinfo.expect rename to tests/sysinfodata/arm-rpi2sysinfo.xml diff --git a/tests/sysinfodata/armsysinfo.expect b/tests/sysinfodata/armsys= info.xml similarity index 100% rename from tests/sysinfodata/armsysinfo.expect rename to tests/sysinfodata/armsysinfo.xml diff --git a/tests/sysinfodata/ppcsysinfo.expect b/tests/sysinfodata/ppcsys= info.xml similarity index 100% rename from tests/sysinfodata/ppcsysinfo.expect rename to tests/sysinfodata/ppcsysinfo.xml diff --git a/tests/sysinfodata/s390-freqsysinfo.expect b/tests/sysinfodata/= s390-freqsysinfo.xml similarity index 100% rename from tests/sysinfodata/s390-freqsysinfo.expect rename to tests/sysinfodata/s390-freqsysinfo.xml diff --git a/tests/sysinfodata/s390sysinfo.expect b/tests/sysinfodata/s390s= ysinfo.xml similarity index 100% rename from tests/sysinfodata/s390sysinfo.expect rename to tests/sysinfodata/s390sysinfo.xml diff --git a/tests/sysinfodata/x86sysinfo.expect b/tests/sysinfodata/x86sys= info.xml similarity index 100% rename from tests/sysinfodata/x86sysinfo.expect rename to tests/sysinfodata/x86sysinfo.xml diff --git a/tests/sysinfotest.c b/tests/sysinfotest.c index b666847379..6828466f7a 100644 --- a/tests/sysinfotest.c +++ b/tests/sysinfotest.c @@ -103,7 +103,7 @@ testSysinfo(const void *data) sysinfo =3D g_strdup_printf("%s/sysinfodata/%ssysinfo.data", abs_srcdi= r, testdata->name); cpuinfo =3D g_strdup_printf("%s/sysinfodata/%scpuinfo.data", abs_srcdi= r, testdata->name); - expected =3D g_strdup_printf("%s/sysinfodata/%ssysinfo.expect", abs_sr= cdir, testdata->name); + expected =3D g_strdup_printf("%s/sysinfodata/%ssysinfo.xml", abs_srcdi= r, testdata->name); virCommandSetDryRun(dryRunToken, NULL, false, false, testDMIDecodeDryR= un, sysinfo); --=20 2.50.0 From nobody Sun Dec 14 01:50:24 2025 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=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1751984197; cv=none; d=zohomail.com; s=zohoarc; b=ngqZUNkF6cXy/Y33w3PcQoQWNv0u5/BYV9fDDo6HjYI40Tmuo0gxjWz0lWs9gXNqFxEPfDIM6LusSOU1ch0E3+gdICj2aq29jR6mkb9/dKyGeO2M0T+BemNLA01FPaSfZOLNrAfyNeYx7/wYpY0N85b63b1QmlNGayFHpZK4lgU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1751984197; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=Vs8gqGC4R5+CGz1EQ2N/VPEvFFuIGCl4mYF0oYY0wzk=; b=h5Mcf8iL4yhyO+UZm4Wttccf8vDFLHPVcZAjXfox8n7LftPeOfGKe8/VY8JfEEa9ykjAtUN666+7yeYYuNZxN1tTFiWV3nSeUvt9JSCs/DRXTlqgZreRq2BX2z5PqIdtl9IqSpQuHQVWMNlQ804V7cTYSEvJP2797UcEE8QroXo= ARC-Authentication-Results: i=1; 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=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1751984197425129.93815536186787; Tue, 8 Jul 2025 07:16:37 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 70A4414A8; Tue, 8 Jul 2025 10:16:36 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id E55EF150B; Tue, 8 Jul 2025 10:15:13 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id D6B3DCEB; Tue, 8 Jul 2025 10:15:08 -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 CA96DCEB for ; Tue, 8 Jul 2025 10:15:07 -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-424-w1pdc8E8PoGKo8b11yitEg-1; Tue, 08 Jul 2025 10:15:06 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 57F131944AA6 for ; Tue, 8 Jul 2025 14:15:04 +0000 (UTC) Received: from speedmetal.lan (unknown [10.44.22.32]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 8298C1800285 for ; Tue, 8 Jul 2025 14:15:03 +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.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,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=1751984107; 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=RtgtCLi9oLigoPk7+86qhsql7n/eK4uvBt+Pd1d1Lig=; b=aDm8Cqd/Yjpblw5sS4bbRj94ngEZynAq3vsME1MxmmmbvOkSo4YkhdqvUP+SjLjx7n4hmt kHetfNBjeJDz5emkgUHYt9Dn1mLrDOu5I2QRTR8/4xD2sSg/1AQzf/gG9D23I9QexFiX9O 37jeuOA6p79UeQflmZpp9a4URmgpsuU= X-MC-Unique: w1pdc8E8PoGKo8b11yitEg-1 X-Mimecast-MFC-AGG-ID: w1pdc8E8PoGKo8b11yitEg_1751984104 To: devel@lists.libvirt.org Subject: [PATCH 2/3] conf: schemas: Split out common parts of 'sysinfo' schema Date: Tue, 8 Jul 2025 16:14:58 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: Ra4P7KZXfElBSCOaeNUJa6xFHFm11vSRRZ5PKclgq3U_1751984104 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 7Q4T52X7QQ6PPZTZEIFCFRJBGKBP4UWH X-Message-ID-Hash: 7Q4T52X7QQ6PPZTZEIFCFRJBGKBP4UWH 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: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1751984198867116600 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Extract the common bits of the domain definition schema which will be also later reused to construct schema for the host top level element. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/conf/schemas/domaincommon.rng | 126 ++----------------------- src/conf/schemas/sysinfocommon.rng | 143 +++++++++++++++++++++++++++++ 2 files changed, 150 insertions(+), 119 deletions(-) create mode 100644 src/conf/schemas/sysinfocommon.rng diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincom= mon.rng index 183dd5db5e..2d6e15f144 100644 --- a/src/conf/schemas/domaincommon.rng +++ b/src/conf/schemas/domaincommon.rng @@ -7,6 +7,7 @@ + @@ -7125,63 +7126,11 @@ smbios - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + @@ -7189,74 +7138,13 @@ fwcfg - - - - - - - - - - - - - - - - + - - - vendor - version - date - release - - - - - - manufacturer - product - version - serial - uuid - sku - family - - - - - - manufacturer - product - version - serial - asset - location - - - - - - manufacturer - version - serial - asset - sku - - - - - - - diff --git a/src/conf/schemas/sysinfocommon.rng b/src/conf/schemas/sysinfoc= ommon.rng new file mode 100644 index 0000000000..dc3b761206 --- /dev/null +++ b/src/conf/schemas/sysinfocommon.rng @@ -0,0 +1,143 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + vendor + version + date + release + + + + + + manufacturer + product + version + serial + uuid + sku + family + + + + + + manufacturer + product + version + serial + asset + location + + + + + + manufacturer + version + serial + asset + sku + + + + + + + + --=20 2.50.0 From nobody Sun Dec 14 01:50:24 2025 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=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1751984221; cv=none; d=zohomail.com; s=zohoarc; b=mChSDdKIQYBgW3aLvfZxQXn5eKhF8dHdvYP1j9BMznVPzGhJksAil3ocCnhvL+IWRtS/ZFng8TY80ovfYl4p7nZNyiFQU9tE+Np6HwDJBl5kC28es5XBgRPaIJ0b14JkkIk9GMzMheJtg4Yd6GHSWTm9prIUgIUx3p89ikonmT8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1751984221; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=KJT7pthUsb980uVrsEppAVg+/kS4srr/nWUHhNzAVVo=; b=EzZJq4O5OrzI2K36ybYV9FyKl1IbKnZ087c98twHr5yaWQV614YVDhF2oxUbGaRZoGb13DCMRV5caho7WBN4JY9j9x9QxUnQ9k2VxZfGYufl8+TuNQszCeaVbpgiFTvYOWtX0faE/jnEha8QijAMdow/gxlp0RFPvJQy1HOCQVc= ARC-Authentication-Results: i=1; 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=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1751984221365428.60972307654004; Tue, 8 Jul 2025 07:17:01 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 6D98A1287; Tue, 8 Jul 2025 10:17:00 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id CA59714FC; Tue, 8 Jul 2025 10:15:20 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id AFC771298; Tue, 8 Jul 2025 10:15:16 -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 139DF12F7 for ; Tue, 8 Jul 2025 10:15:09 -0400 (EDT) Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-661-anpuPvnHPyuPP_sAu1wDGg-1; Tue, 08 Jul 2025 10:15:07 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A120218011DF for ; Tue, 8 Jul 2025 14:15:05 +0000 (UTC) Received: from speedmetal.lan (unknown [10.44.22.32]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id D67D218003FC for ; Tue, 8 Jul 2025 14:15:04 +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.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,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=1751984108; 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=8TuLG8jHna6wyozcG6iQGQAhSglB/dzqEcrYrRLcQuY=; b=VZ5Mf9P7riBGMZfs2k4ChH6f1DIaHJOmivf09qK1OownGsE8xSD1UeFPeYhJg4+v3uPET0 aduu9BWHFpjZVU9iNSILn8N+la03BEvIG3ZXAgTejgXFBKoDfA3Nzn0hqSnZWHK4V3BQo0 tTx9tmj26bRlmeVqtEKR2zODRtwcxNk= X-MC-Unique: anpuPvnHPyuPP_sAu1wDGg-1 X-Mimecast-MFC-AGG-ID: anpuPvnHPyuPP_sAu1wDGg_1751984105 To: devel@lists.libvirt.org Subject: [PATCH 3/3] schema: Schema validate host '' XML test documents Date: Tue, 8 Jul 2025 16:14:59 +0200 Message-ID: <07afe270f882168f1f3993a4dc0de97f4caa1b81.1751983969.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: OPf0tsuFAOknc0e1vNu1D76kGUV12kfrsSLjmYpG3M8_1751984105 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: J4G2TVHYZ2JQHFGI5JMSRCA63WHCPECF X-Message-ID-Hash: J4G2TVHYZ2JQHFGI5JMSRCA63WHCPECF 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: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1751984223279116600 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Introduce schema for the host '' output XMLs and validate our test data against the schema. This requires introduction of schema for '' and '' elements which are not supported when sysinfo is set explicitly for a domian definition. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/conf/schemas/sysinfo.rng | 34 +++++++++++++++++ src/conf/schemas/sysinfocommon.rng | 61 ++++++++++++++++++++++++++++++ tests/virschematest.c | 5 +++ 3 files changed, 100 insertions(+) create mode 100644 src/conf/schemas/sysinfo.rng diff --git a/src/conf/schemas/sysinfo.rng b/src/conf/schemas/sysinfo.rng new file mode 100644 index 0000000000..01d305b9d6 --- /dev/null +++ b/src/conf/schemas/sysinfo.rng @@ -0,0 +1,34 @@ + + + + + + + + smbios + + + + + + + + + + + + + + fwcfg + + + + + + + + + + + + diff --git a/src/conf/schemas/sysinfocommon.rng b/src/conf/schemas/sysinfoc= ommon.rng index dc3b761206..41296ea95e 100644 --- a/src/conf/schemas/sysinfocommon.rng +++ b/src/conf/schemas/sysinfocommon.rng @@ -63,6 +63,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -136,6 +166,37 @@ + + + socket_destination + type + family + manufacturer + signature + version + external_clock + max_speed + status + serial_number + part_number + + + + + + size + form_factor + locator + bank_locator + type + type_detail + speed + manufacturer + serial_number + part_number + + + diff --git a/tests/virschematest.c b/tests/virschematest.c index e08ae21738..57a49c270c 100644 --- a/tests/virschematest.c +++ b/tests/virschematest.c @@ -369,6 +369,10 @@ static const struct testSchemaEntry testDevice[] =3D { { .dir =3D "tests/qemublocktestdata/xml2json" }, }; +static const struct testSchemaEntry schemaSysinfo[] =3D { + { .dir =3D "tests/sysinfodata" }, +}; + static int mymain(void) { @@ -397,6 +401,7 @@ mymain(void) DO_TEST(SCHEMAS_PATH "storagepoolcaps.rng", schemaStoragepoolcaps); DO_TEST(SCHEMAS_PATH "storagepool.rng", schemaStoragePool); DO_TEST(SCHEMAS_PATH "storagevol.rng", schemaStorageVol); + DO_TEST(SCHEMAS_PATH "sysinfo.rng", schemaSysinfo); DO_TEST(INTERNAL_SCHEMAS_PATH "cpu-baseline.rng", testsCpuBaseline); DO_TEST(INTERNAL_SCHEMAS_PATH "device.rng", testDevice); --=20 2.50.0