From nobody Mon May 13 22:46:54 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=1657075387; cv=none; d=zohomail.com; s=zohoarc; b=RUopKNmpuIg+PHbcCbJBslVt4QAZX3OBriN7cPY6JpXVt/1gDAJa0ZQ1JSXGz6K3CMksTdDn4NZ2svS7zWQlpXyG71A1CnkaC11dMNSOanP2yFFyGO1Vnl697x0Fn0gEwY/rhrhZYTUSMn/lqc02ZsvotB+slL2MjctXMDwZqzM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1657075387; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=z0wv7pw5/SLT6grJSVbieOZJLZadKVm7Qh19VqYkykQ=; b=UpwMk+OR5KzhJNcOnVL6yEt97JRxYq72G2j3suO73LYpZ548T+DZVcewNECr+RnLg9fzVriNBbHlvXIVN+ksQWkHr/Kh9GJmbiIRTzLPzDRpOqF+MyoNpzxgLmHrbfjr/WndUhFs8aGpqS1FcLn3KymJpSGJGkIdiAcRdtfwGBQ= 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 1657075387473574.9344384558038; Tue, 5 Jul 2022 19:43:07 -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-516-iBox2SqBMs-Wpae0dVF12A-1; Tue, 05 Jul 2022 22:42:10 -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 36AF329AA2EC; Wed, 6 Jul 2022 02:42:09 +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 ACAB440EC002; Wed, 6 Jul 2022 02:42:08 +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 83A961947061; Wed, 6 Jul 2022 02:42:08 +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 546B6194705F for ; Wed, 6 Jul 2022 02:42:07 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 20FB3C2811E; Wed, 6 Jul 2022 02:42:07 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-13-73.pek2.redhat.com [10.72.13.73]) by smtp.corp.redhat.com (Postfix) with ESMTP id C4D70C08F0D; Wed, 6 Jul 2022 02:42:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1657075386; 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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=z0wv7pw5/SLT6grJSVbieOZJLZadKVm7Qh19VqYkykQ=; b=iaN4GqJa/+gPHgFR7VhOb94KyHPLVFwU1xtWXuUCPXxVI9Sp0jLfTSdPfyAAJdRj36/IMU 27eDHcfa5pTD4hzMuI65sKNuR+mBr8vqBmSAVBnfsorfjN2aTS7gXcUS7edf3lV0sT0pau AgyFwz9vT/NsoFVgEuiA7IQv9OYIsuE= X-MC-Unique: iBox2SqBMs-Wpae0dVF12A-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Han Han To: libvir-list@redhat.com Subject: [PATCH] schemas: rng: Make secret optional in storage vol Date: Wed, 6 Jul 2022 10:42:02 +0800 Message-Id: <20220706024202.895610-1-hhan@redhat.com> 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: , Cc: Han Han Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 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: 1657075388788100001 Content-Type: text/plain; charset="utf-8"; x-default="true" For a qcow2 storage volume with luks encryption created by qemu-img, its dumped storage vol XML has no secret element in encryption: ... ... That will cause a failure in rng validation. Fix that validation failure. Signed-off-by: Han Han Reviewed-by: Michal Privoznik --- src/conf/schemas/storagecommon.rng | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/src/conf/schemas/storagecommon.rng b/src/conf/schemas/storagec= ommon.rng index 10f1bc6a15..76714c9aad 100644 --- a/src/conf/schemas/storagecommon.rng +++ b/src/conf/schemas/storagecommon.rng @@ -24,17 +24,19 @@ - - - - - - - - - - - + + + + + + + + + + + + + =20 --=20 2.36.1