From nobody Sun Dec 14 05:53:23 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 --- 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