From nobody Tue May 21 01:26:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1661420779; cv=none; d=zohomail.com; s=zohoarc; b=MYRJa5bic5pqzLVMDEjQyCr6AcvyMWeEP/rjeLjIE9efeVNBvsznOcyOLOVLbJGvyVkyHfVBdjon1Y4YVBSZJPqfWzY9HR3iXev0141NMh2RM58PPADOvB36pQdc7glyx2byWadqp5oRYkAaoCJlXn4K9SA0wgN8WOI6OIKEHSM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1661420779; 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=HDi/7z/IVNcl4tz/6zlrzOmy6EeTQ+qkWbT4MN/FeRM=; b=b3FL/Rx3FKTngCaXVr1KENWOoJ+IW6eow/tJXl5bSPwFJHm4Jp1RAdxEZL6s5f7iSTeqy3uemgWfoaoKviuZ8zPRWGHIbPJDWSP7Hs3RZv4dm5KAurM569noHNAaMRuRYu7kSA411Q+1AzUq1E7iF6AKnscFloiOcZRsY1/Uamw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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.133.124]) by mx.zohomail.com with SMTPS id 1661420779875645.6525309564885; Thu, 25 Aug 2022 02:46:19 -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-472-TF1p_8hZPXShZzWx6wWG4g-1; Thu, 25 Aug 2022 05:46:17 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5AB71382C96F; Thu, 25 Aug 2022 09:46:15 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1B3FF40E7F28; Thu, 25 Aug 2022 09:46:15 +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 01CF21946A5A; Thu, 25 Aug 2022 09:46:15 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 82D751946A43 for ; Thu, 25 Aug 2022 09:46:13 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 76226C15BC5; Thu, 25 Aug 2022 09:46:13 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id DC709C15BC3 for ; Thu, 25 Aug 2022 09:46:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1661420778; 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=HDi/7z/IVNcl4tz/6zlrzOmy6EeTQ+qkWbT4MN/FeRM=; b=LIe3BYy24qRY6WASS660WNgfLmaNTIx78pfuRd2sv8WSjzVxB60P6niL8iZm7+sBE8JkMU MWXJHhqqOGdXOOCYm8V5ViMlrlSCKBh71TCSr3OU0tH9E6X7TukMVQWe+ZIGPNWzfmuj5i P1ToVeadguDE3D+d7ikqHqJRCS3LR4I= X-MC-Unique: TF1p_8hZPXShZzWx6wWG4g-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 1/7] schema: nodedev: Fix schema attribute value for the 'vport_ops' capability Date: Thu, 25 Aug 2022 11:46:04 +0200 Message-Id: <0706bc2ea2ad43db8d92651b5425c418919c080d.1661420712.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 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.84 on 10.11.54.1 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: 1661420780657100001 Content-Type: text/plain; charset="utf-8" The code originally (since 76ddf2d2e350c3a879819) formatted 'vport_ops'. Later commit cc17f09246212ef added 'vports_ops' into the schema. Fix it and the corresponding docs. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=3D2121262 Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- docs/formatnode.rst | 2 +- src/conf/schemas/nodedev.rng | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/formatnode.rst b/docs/formatnode.rst index 5903cac7fe..61c2a0965f 100644 --- a/docs/formatnode.rst +++ b/docs/formatnode.rst @@ -250,7 +250,7 @@ Describes a SCSI host device. Sub-elements include: scsi_host adapter in a `Storage Pool `__. :since:`Since 1.2.7` ``capability`` - Current capabilities include "vports_ops" (indicates vport operations + Current capabilities include "vport_ops" (indicates vport operations are supported) and "fc_host". "vport_ops" could contain two optional sub-elements: ``vports``, and ``max_vports``. ``vports`` shows the number of vport in use. ``max_vports`` shows the maximum vports the HBA diff --git a/src/conf/schemas/nodedev.rng b/src/conf/schemas/nodedev.rng index e40243e257..6299c52671 100644 --- a/src/conf/schemas/nodedev.rng +++ b/src/conf/schemas/nodedev.rng @@ -416,7 +416,7 @@ - vports_ops + vport_ops --=20 2.37.1 From nobody Tue May 21 01:26:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1661420782; cv=none; d=zohomail.com; s=zohoarc; b=X0O8E6jzqPdoGsz/4+fL72/+RU72ZWtkOb8nGLhcPzF1Xh7w9wOn6YDfoYF9G9c5hPaIPrFZYBCgeZL7Ry6IxrgJUty7rG7JABZ1GJo8w5HonJm2ZA4bIyv3B6NT+/7cxZoZQU78MZx/EXd20EpB+Q3QAO8IwFougqGfVlOkDNM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1661420782; 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=E+9vKX1IB5Wb0Tfv3LzkxT+zBzvLmUCDXLjUYrjRpSU=; b=ewwSqDdDGLX7hLo+x8Z2lVuCcK0ntTpJchsV9SRSyQyjBqDX5NRQU5GVsPjWv2/zzaVEyqnR71jLRY3xRopjV2rEItR5OmXZ5OUppZC+Y8pooUESJRvXqZk0SUa9HqgfG+YRNk+FpfKQNeViA8x7H682KRV2opjvqTuPsauz2Ec= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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.133.124]) by mx.zohomail.com with SMTPS id 1661420782491738.9892966076645; Thu, 25 Aug 2022 02:46:22 -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-122-ySJfUCHfOTCqZvzLGJkc8g-1; Thu, 25 Aug 2022 05:46:17 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9652A181881F; Thu, 25 Aug 2022 09:46:15 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7FEEDC15BC5; Thu, 25 Aug 2022 09:46:15 +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 445451947048; Thu, 25 Aug 2022 09:46:15 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 978001946A43 for ; Thu, 25 Aug 2022 09:46:14 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 89CEBC15BC5; Thu, 25 Aug 2022 09:46:14 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id D16BFC15BC3 for ; Thu, 25 Aug 2022 09:46:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1661420780; 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=E+9vKX1IB5Wb0Tfv3LzkxT+zBzvLmUCDXLjUYrjRpSU=; b=BINB0aAXqqNgXaLfK6zHNgNWSHYTe8Bqv8sVRZGcslxU371ou7YtcvfWXqUfcJ6+H1Vmo3 UiAmDgKmKXs0BB/St7ppEMLQkK6qSEnGR1/y4q61UyjHp6xF11nOd43BdFNsrPECPluhB8 MGKI3wxYs/FcnAjjS1LYKGSbTEI1IRg= X-MC-Unique: ySJfUCHfOTCqZvzLGJkc8g-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 2/7] nodedevschematest: Add example file for a HBA with 'vport_ops' capability Date: Thu, 25 Aug 2022 11:46:05 +0200 Message-Id: <4f4de8c3573dbbaf1db35bbc8da116eac9e6de4e.1661420712.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 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.8 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: 1661420784681100005 Content-Type: text/plain; charset="utf-8" Illustrate the problem in the schema fixed by previous commit. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- tests/nodedevschemadata/hba_vport_ops.xml | 18 ++++++++++++++++++ tests/nodedevxml2xmlout/hba_vport_ops.xml | 18 ++++++++++++++++++ tests/nodedevxml2xmltest.c | 1 + 3 files changed, 37 insertions(+) create mode 100644 tests/nodedevschemadata/hba_vport_ops.xml create mode 100644 tests/nodedevxml2xmlout/hba_vport_ops.xml diff --git a/tests/nodedevschemadata/hba_vport_ops.xml b/tests/nodedevschem= adata/hba_vport_ops.xml new file mode 100644 index 0000000000..4abc2e5161 --- /dev/null +++ b/tests/nodedevschemadata/hba_vport_ops.xml @@ -0,0 +1,18 @@ + + scsi_host12 + /sys/devices/pci0000:00/0000:00:03.2/0000:06:00.1/host12 + pci_0000_06_00_1 + + 12 + 12 + + 2000f4e9d4eb02c9 + 2001f4e9d4eb02c9 + 2001547feebe79c1 + + + 254 + 0 + + + diff --git a/tests/nodedevxml2xmlout/hba_vport_ops.xml b/tests/nodedevxml2x= mlout/hba_vport_ops.xml new file mode 100644 index 0000000000..6a680d467e --- /dev/null +++ b/tests/nodedevxml2xmlout/hba_vport_ops.xml @@ -0,0 +1,18 @@ + + scsi_host12 + /sys/devices/pci0000:00/0000:00:03.2/0000:06:00.1/host12 + pci_0000_06_00_1 + + 12 + 12 + + 2000f4e9d4eb02c9 + 2001f4e9d4eb02c9 + 2001547feebe79c1 + + + 0 + 0 + + + diff --git a/tests/nodedevxml2xmltest.c b/tests/nodedevxml2xmltest.c index f82027fb87..68a4041d8c 100644 --- a/tests/nodedevxml2xmltest.c +++ b/tests/nodedevxml2xmltest.c @@ -134,6 +134,7 @@ mymain(void) DO_TEST("mdev_d069d019_36ea_4111_8f0a_8c9a70e21366"); DO_TEST("mdev_d2441d39_495e_4243_ad9f_beb3f14c23d9"); DO_TEST("mdev_fedc4916_1ca8_49ac_b176_871d16c13076"); + DO_TEST("hba_vport_ops"); return ret =3D=3D 0 ? EXIT_SUCCESS : EXIT_FAILURE; } --=20 2.37.1 From nobody Tue May 21 01:26:46 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=1661420784; cv=none; d=zohomail.com; s=zohoarc; b=LVz4nK1FMDQqZosI3VvKAUXpwuv0nwiEYnaGDqguAE0Q8Zti18q8TBevjPNiS56mvsaALhGAepEnD1Rej/1PWF24Tc+qE28QajBSDjjpempq9lyfCjuee6W/A+B8K57FrY5iuM4oG8SMyXxzMK5J4JPBpEybRuGkKnmHZcjntUo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1661420784; 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=qKaxCSJbQqQKP2rygWuSNWYIlMoNtzAAsAzatL/Sh3s=; b=BtNFG9evJx8ebf6m3D9peSNwH68Cmg/xcQOSLy+UhwLOn+RNTHXdFneFAObcl3O1zL7Ba6whAsfFOVEMXov+kMkTJuOwuGOk6ytgsotWMaqDBIyXuCGOt7/TaFw30tkx0AhnZg4ZWX0fYGgwri0ThNm4jeWqEzHa1wGZFp0u+zY= 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 1661420784853806.5093166678097; Thu, 25 Aug 2022 02:46:24 -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-299-vhTvEkxYN2Os9acXX6Id6Q-1; Thu, 25 Aug 2022 05:46:20 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1CDA3181880A; Thu, 25 Aug 2022 09:46:17 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0A1A8492C3B; Thu, 25 Aug 2022 09:46:17 +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 D03511946A5A; Thu, 25 Aug 2022 09:46:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 9DE551946A43 for ; Thu, 25 Aug 2022 09:46:15 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 8358DC15BC8; Thu, 25 Aug 2022 09:46:15 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id E6050C15BC3 for ; Thu, 25 Aug 2022 09:46:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1661420783; 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=qKaxCSJbQqQKP2rygWuSNWYIlMoNtzAAsAzatL/Sh3s=; b=bmrvPWCTVxo3WtonABy5GADnJ5HPJaUMfca8TnEu/5MNviwU00fgAZRM+sSt2CPUAi6oS4 bHJFlqUJv6pJcSsZ0MsZQtnXNRZMrBRS7fnaFL3SLPa7qVfgalNy1AI1QU4509auTmFyo8 xwqLtb5lnfl6cBLw4fbMwlTBXGdwaFc= X-MC-Unique: vhTvEkxYN2Os9acXX6Id6Q-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 3/7] qemudomainsnapshotxml2xmltest: Allow regenerating into non-existing output file Date: Thu, 25 Aug 2022 11:46:06 +0200 Message-Id: <48a169d10b3a119795372c42abb8a8e9ef35837c.1661420712.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 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.9 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: 1661420786634100007 Content-Type: text/plain; charset="utf-8" Replacing the 'virTestLoadFile' + 'virTestDifferenceFull' by ' virTestCompareToFile' allows to use the VIR_TEST_REGENERATE_OUTPUT=3D1 option to also generate the output file if it doesn't exist. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- tests/qemudomainsnapshotxml2xmltest.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/tests/qemudomainsnapshotxml2xmltest.c b/tests/qemudomainsnapsh= otxml2xmltest.c index 2f66839ae8..6881d692ee 100644 --- a/tests/qemudomainsnapshotxml2xmltest.c +++ b/tests/qemudomainsnapshotxml2xmltest.c @@ -30,7 +30,6 @@ testCompareXMLToXMLFiles(const char *inxml, unsigned int flags) { g_autofree char *inXmlData =3D NULL; - g_autofree char *outXmlData =3D NULL; g_autofree char *actual =3D NULL; unsigned int parseflags =3D 0; unsigned int formatflags =3D VIR_DOMAIN_SNAPSHOT_FORMAT_SECURE; @@ -48,9 +47,6 @@ testCompareXMLToXMLFiles(const char *inxml, if (virTestLoadFile(inxml, &inXmlData) < 0) return -1; - if (virTestLoadFile(outxml, &outXmlData) < 0) - return -1; - if (!(def =3D virDomainSnapshotDefParseString(inXmlData, driver.xmlopt, NULL, &cur, parseflags))) @@ -71,10 +67,8 @@ testCompareXMLToXMLFiles(const char *inxml, formatflags))) return -1; - if (STRNEQ(outXmlData, actual)) { - virTestDifferenceFull(stderr, outXmlData, outxml, actual, inxml); + if (virTestCompareToFile(actual, outxml) < 0) return -1; - } return 0; } --=20 2.37.1 From nobody Tue May 21 01:26:46 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=1661420785; cv=none; d=zohomail.com; s=zohoarc; b=k7wutEeUfEhLfzPxkCMZAG5RHHNeH9Gmq4qeVpBQYiR7dyBccaRxap/dYuWL2e+XTj0fHITpq71NfmhacOY1eUsYlvl60/oCsa22+P2qdTNPvHMFMOW337kVvWwZ7Hg2IkDr8GazODDVnAfDurRXrmQvylvHX1oKmEcnyHllQcY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1661420785; 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=8SjjjZfgWGsXn9l3rwYK2bpPBRcRLrgk606uosi3JJc=; b=OKkiBUDysj6oX3uSVrplKTFgqrQysBcOjzBNA/jGLKXT/JWsVjto+yETLlALdM98AOym/8pOmhvKm7GqWpD87BUB3A+yzOcOL5VuYQNaZY6E7vMMWDelux2kfiueAytF5X0uCHZSgtYefcyJV+9+twU6INIiR+F+K3WXcaZLmqc= 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 166142078566559.111017541576985; Thu, 25 Aug 2022 02:46:25 -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-357-bXmYGm54OXSAdDL9yEbKDg-1; Thu, 25 Aug 2022 05:46:21 -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 4964F1C13967; Thu, 25 Aug 2022 09:46:18 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 35CF0492C3B; Thu, 25 Aug 2022 09:46:18 +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 2B4631946A66; Thu, 25 Aug 2022 09:46:18 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id ABCAB1946A43 for ; Thu, 25 Aug 2022 09:46:16 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 91E46C15BC5; Thu, 25 Aug 2022 09:46:16 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id E4DC9C15BC3 for ; Thu, 25 Aug 2022 09:46:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1661420784; 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=8SjjjZfgWGsXn9l3rwYK2bpPBRcRLrgk606uosi3JJc=; b=QBMiY+V5KP8/ilmt4mG5el9uj6htDI6SJv8n70TV/cNGT/f1iV26jfUuhEXiYvmWqP61ab 6Cx/W97uR7/AGi4M75DuR/GWemr9SWmZ/o5GQIa0Yco7ZKVMU7ha40Rhxzj/pcqjsJp6jO wOQ9b+q+jyPfG1onmInosXAbMEG+5Yg= X-MC-Unique: bXmYGm54OXSAdDL9yEbKDg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 4/7] schemas: Extract overrides for the domain element from 'domain.rng' Date: Thu, 25 Aug 2022 11:46:07 +0200 Message-Id: <67096201a5fce4b584e6c9573700e41e813eb79e.1661420712.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 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 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: 1661420786649100009 Content-Type: text/plain; charset="utf-8" Move the overrides into a single file so that later patches can add another top level element 'inactiveDomain' used in snapshots. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/conf/schemas/domain.rng | 12 +----------- src/conf/schemas/domainoverrides.rng | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 11 deletions(-) create mode 100644 src/conf/schemas/domainoverrides.rng diff --git a/src/conf/schemas/domain.rng b/src/conf/schemas/domain.rng index b93bbed959..adc4386a27 100644 --- a/src/conf/schemas/domain.rng +++ b/src/conf/schemas/domain.rng @@ -6,16 +6,6 @@ - - - - - - - - - - - + diff --git a/src/conf/schemas/domainoverrides.rng b/src/conf/schemas/domain= overrides.rng new file mode 100644 index 0000000000..13b18a28ea --- /dev/null +++ b/src/conf/schemas/domainoverrides.rng @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + --=20 2.37.1 From nobody Tue May 21 01:26:46 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=1661420786; cv=none; d=zohomail.com; s=zohoarc; b=XoIuaCfLuXyNazfRzFRtjlSvFmyIOt021MQNFTHmAvyu1RwmlkPXsz8qlEpJ34EuVJm04hLMEpfF1otaJpl0tlBak41cPKRhJGDhsYZYYOkCdIDYzij8ABuufJEAWoLc/0v3Ku24g8CE09lU9GwIS0JP8fSal/pSgQe0anYqofc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1661420786; 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=70DZjV3i9SQXkJoagQTEqqbE1aoD1qnVReddUr9BTQc=; b=VWMyDpuFWsgsIO/9y52Jy5VrTNWIn37TFsV3uQ0h5iV6n1orDUra+MvCdPHoAgpsdETmm116YpBa+D2biZVFJn/6A8vuNnJanxF87yA9EFeYIVKdyBPPARV2+FmA68/4TwFOFbmRjD3c3JfuvAjNco/W5Qbuq7DiD9PPVFwTjMM= 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 1661420786031402.9078308758835; Thu, 25 Aug 2022 02:46:26 -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-439-ZF8xoaGyNKe407rsxuHqkw-1; Thu, 25 Aug 2022 05:46:22 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8B9963C0F382; Thu, 25 Aug 2022 09:46:19 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 78F9340D282E; Thu, 25 Aug 2022 09:46:19 +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 68FE11946A5A; Thu, 25 Aug 2022 09:46:19 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id C093E1946A43 for ; Thu, 25 Aug 2022 09:46:17 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id A59EBC15BC5; Thu, 25 Aug 2022 09:46:17 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1115EC15BC3 for ; Thu, 25 Aug 2022 09:46:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1661420785; 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=70DZjV3i9SQXkJoagQTEqqbE1aoD1qnVReddUr9BTQc=; b=aJvHM/Z91v7ctFXjVrDiDMYwNHAKSnVoA2Wsp0m8RDTEl4Uy8UcbDW40dtvfwd+2aCEQZE VFJZqsbmDvb9TeCVUgygUuOH3lFXbCijYF2mbMqDrvqvghC9uMNfgu+KHy7HezUaF0lwch rH7UvoNzBgn4nOUNp4daTCC1Ou4Mt5w= X-MC-Unique: ZF8xoaGyNKe407rsxuHqkw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 5/7] schemas: domaincommon: Extract contents of the 'domain' element definition Date: Thu, 25 Aug 2022 11:46:08 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 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.84 on 10.11.54.2 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: 1661420786640100008 Content-Type: text/plain; charset="utf-8" Move all definition under the element into a separate definition so that it can be referenced from elements with other names. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/conf/schemas/domaincommon.rng | 143 ++++++++++++++++-------------- 1 file changed, 74 insertions(+), 69 deletions(-) diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincom= mon.rng index 7f6ea1d888..cc6a3475c8 100644 --- a/src/conf/schemas/domaincommon.rng +++ b/src/conf/schemas/domaincommon.rng @@ -33,77 +33,82 @@ --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + --=20 2.37.1 From nobody Tue May 21 01:26:46 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=1661420829; cv=none; d=zohomail.com; s=zohoarc; b=P21Bmjh3yQeVtq2Ymzq0pCh6D3RUt0mOXx6eVxfdQiB437AK+hT7HbfW3Wqnmv6gHQKE02FAk0nUHeJ1/FlYaL2a2LJTFTvGzy1gk4V8mysuPlH55xkpS0v7TyaQa+bUQFQx4tbGlLQngbgqNK4AEmUN0/U2ioKKVQfJXBPXvYg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1661420829; 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=BEiObIUXWkosLpjyr89HB20/uXc9nu4zRHIpwVVBUpY=; b=JpWQ2k5tvSlteld/Ej4NYEIYIHJoo2bE4S70sSO86UTsIHv1GGE6vJfathaKmGkfqXHlLcuCUOJnUUYtWMRxifsL7w2Kikxzj8i6DItkWg8c3vm9Fnt9M2juHu5zx+sm+MTehPK/hRVqG/k5AgasiRcVtA3pNeGrMAYyz+Ui/iA= 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 166142082923614.38843046652903; Thu, 25 Aug 2022 02:47:09 -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-497-3TBF6mkvMwG-W-Fn_Sn_1w-1; Thu, 25 Aug 2022 05:46:22 -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 E6CAE2919EBF; Thu, 25 Aug 2022 09:46:19 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id C25DE403348; Thu, 25 Aug 2022 09:46:19 +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 B03381946A62; Thu, 25 Aug 2022 09:46:19 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 0BADC1946A5A for ; Thu, 25 Aug 2022 09:46:19 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 0037BC15BC5; Thu, 25 Aug 2022 09:46:19 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 19CF8C15BC3 for ; Thu, 25 Aug 2022 09:46:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1661420827; 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=BEiObIUXWkosLpjyr89HB20/uXc9nu4zRHIpwVVBUpY=; b=PbXCpPp8sN4tWN/xJm22RekMXcAkTvDWG2pzqiM88RYrEt3DNz7jGxTP/BfYs/1yb+LcIy 4k8vGum7QoUHMY+w7XElem8gj8nn6e3rfia06P6LerTC2n/lmNBvoOhZzZLpx1ErJ9NeSk TOTrymSt6G6gRy7MRFrSqvr6thkXMvY= X-MC-Unique: 3TBF6mkvMwG-W-Fn_Sn_1w-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 6/7] schema: Add schema for '' element used in the snapshot definition Date: Thu, 25 Aug 2022 11:46:09 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 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 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: 1661420830919100001 Content-Type: text/plain; charset="utf-8" The '' element stores the next-start definition of a VM on snapshot. It was not covered by the schema when it was introduced. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=3D2121276 Fixes: 152c165d34cb6dcd21d08427422850f406cd0643 Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/conf/schemas/domaincommon.rng | 7 +++++++ src/conf/schemas/domainsnapshot.rng | 5 +++++ src/conf/schemas/inactiveDomain.rng | 10 ++++++++++ 3 files changed, 22 insertions(+) create mode 100644 src/conf/schemas/inactiveDomain.rng diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincom= mon.rng index cc6a3475c8..ae04e0ea7d 100644 --- a/src/conf/schemas/domaincommon.rng +++ b/src/conf/schemas/domaincommon.rng @@ -37,6 +37,13 @@ + + + + + + + diff --git a/src/conf/schemas/domainsnapshot.rng b/src/conf/schemas/domains= napshot.rng index a5d1a40493..3db9f458ba 100644 --- a/src/conf/schemas/domainsnapshot.rng +++ b/src/conf/schemas/domainsnapshot.rng @@ -83,6 +83,11 @@ + + + + + diff --git a/src/conf/schemas/inactiveDomain.rng b/src/conf/schemas/inactiv= eDomain.rng new file mode 100644 index 0000000000..ae1207d978 --- /dev/null +++ b/src/conf/schemas/inactiveDomain.rng @@ -0,0 +1,10 @@ + + + + + + + + + + --=20 2.37.1 From nobody Tue May 21 01:26:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1661420794; cv=none; d=zohomail.com; s=zohoarc; b=kT+YVPgvdw/HjjgAKmCYiMaORttZYNSVErV+QBFaYb3vistGzS4tfdglPcWYo7tHh4xzwC+HWgLaTvGw82ctf42OOhv566OIrP3XZ2O0EoG6bnlGKLPEYiJkL/Ad2C5hoUgkAqfgfr+EE6wIDAGeFxvemgZFFt3A+5uoIfgnt/c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1661420794; 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=ZxqXLu0Ah1KF+ekR+kgF0zDDKVBopnnAl8278hORz/g=; b=Ykgt5aJMZA2VgBhID5ZOfP0SxvOPYJAsmMh5nZb/LLuYkTtDXh3O8x0novAGuQvKei5i34f0vK+NjqgenZ9PdIfx3s1JBjkEGunXYCp1mZgtUOW0jsciMVW6oA25UTCPuB68ecYEePtxpK8NFIDfHqn5pvAk7THU8dAtgoPFFnY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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.133.124]) by mx.zohomail.com with SMTPS id 1661420794361862.217459969102; Thu, 25 Aug 2022 02:46:34 -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-586-v5RvGz9eMUG12Jt6khLehw-1; Thu, 25 Aug 2022 05:46:23 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BAEC03C1014E; Thu, 25 Aug 2022 09:46:20 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id A70952166B2A; Thu, 25 Aug 2022 09:46:20 +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 9CF5F1946A5A; Thu, 25 Aug 2022 09:46:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 2719D1946A43 for ; Thu, 25 Aug 2022 09:46:20 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 0BD88C15BC5; Thu, 25 Aug 2022 09:46:20 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6A548C15BC3 for ; Thu, 25 Aug 2022 09:46:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1661420792; 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=ZxqXLu0Ah1KF+ekR+kgF0zDDKVBopnnAl8278hORz/g=; b=WEngn+q/4ekJK7UKiSeqniHFvv7C3dL8Kt2MQGphCskf43ogKK3sXNXwbf4bk37hhC2MQX WTB1TCIR9EpdUbAV5qHLMV+XYiOadY/FVrTnNST9vbJqYVkEvyR3MNsy535pH2HTsguI9j lotznCHVROLaS+81WWEwv/7lzxe8IYM= X-MC-Unique: v5RvGz9eMUG12Jt6khLehw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 7/7] qemudomainsnapshotxml2xmltest: Add test case for a snapshot with 'inactiveDomain' element Date: Thu, 25 Aug 2022 11:46:10 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 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.6 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: 1661420794744100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- .../memory-snapshot-inactivedomain.xml | 148 ++++++++++++++++++ tests/qemudomainsnapshotxml2xmltest.c | 2 + 2 files changed, 150 insertions(+) create mode 100644 tests/qemudomainsnapshotxml2xmlout/memory-snapshot-inac= tivedomain.xml diff --git a/tests/qemudomainsnapshotxml2xmlout/memory-snapshot-inactivedom= ain.xml b/tests/qemudomainsnapshotxml2xmlout/memory-snapshot-inactivedomain= .xml new file mode 100644 index 0000000000..3acc6d952b --- /dev/null +++ b/tests/qemudomainsnapshotxml2xmlout/memory-snapshot-inactivedomain.xml @@ -0,0 +1,148 @@ + + test-snap + running + 1661417356 + + + snapshot-inactivedomain + 14beef2c-8cae-4ea8-bf55-e48fe0cd4b73 + 1024000 + 1024000 + 8 + + /machine + + + hvm + + + + + + + + + qemu64 + + + destroy + restart + restart + + + + + + /usr/bin/qemu-system-x86_64 + +
+ + + +
+ + + +
+ + + +
+ + +
+ + +
+ + +
+ + +
+ + + + +