From nobody Sat Nov 23 14:08:53 2024 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; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1723433329810355.6679212447458; Sun, 11 Aug 2024 20:28:49 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 9C2471552; Sun, 11 Aug 2024 23:28:48 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 4638C1486; Sun, 11 Aug 2024 23:28:34 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id CB2E814AE; Sun, 11 Aug 2024 23:28:30 -0400 (EDT) Received: from smtp.cecloud.com (unknown [1.203.97.240]) by lists.libvirt.org (Postfix) with ESMTP id 91B67AD6 for ; Sun, 11 Aug 2024 23:28:26 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by smtp.cecloud.com (Postfix) with ESMTP id 1C53D900118 for ; Mon, 12 Aug 2024 11:28:21 +0800 (CST) Received: from localhost.localdomain (unknown [111.48.58.10]) by smtp.cecloud.com (postfix) whith ESMTP id P1340312T281473089204592S1723433299725858_; Mon, 12 Aug 2024 11:28:21 +0800 (CST) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=0.5 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.4 X-MAIL-GRAY: 0 X-MAIL-DELIVERY: 1 X-SKE-CHECKED: 1 X-ANTISPAM-LEVEL: 2 X-IP-DOMAINF: 1 X-RL-SENDER: luzhipeng@cestc.cn X-SENDER: luzhipeng@cestc.cn X-LOGIN-NAME: luzhipeng@cestc.cn X-FST-TO: devel@lists.libvirt.org X-RCPT-COUNT: 2 X-LOCAL-RCPT-COUNT: 1 X-MUTI-DOMAIN-COUNT: 0 X-SENDER-IP: 111.48.58.10 X-ATTACHMENT-NUM: 0 X-UNIQUE-TAG: <123aa4ab40ec91742219682c9cfdc774> X-System-Flag: 0 From: luzhipeng To: devel@lists.libvirt.org Subject: [PATCH] add support for xml about cipher info Date: Mon, 12 Aug 2024 11:27:51 +0800 Message-Id: <20240812032751.1760-1-luzhipeng@cestc.cn> X-Mailer: git-send-email 2.34.0.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 6JBX7IBJ7VP2E5SR4CG3OVAOS2DFC5BA X-Message-ID-Hash: 6JBX7IBJ7VP2E5SR4CG3OVAOS2DFC5BA X-MailFrom: luzhipeng@cestc.cn X-Mailman-Rule-Hits: nonmember-moderation 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 CC: luzhipeng 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: X-ZM-MESSAGEID: 1723433331522116600 Content-Type: text/plain; charset="utf-8" The destination disk's xml contains the ciper info and it check fail, when snaphot,blockcopy and blockpull vm's disk. So it removes the check about cipher info. Signed-off-by: luzhipeng --- src/conf/domain_validate.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c index 39b8d67928..b70edcaaa0 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -529,18 +529,6 @@ virDomainDiskDefValidateSourceChainOne(const virStorag= eSource *src) } } =20 - if (src->encryption) { - virStorageEncryption *encryption =3D src->encryption; - - if (encryption->format =3D=3D VIR_STORAGE_ENCRYPTION_FORMAT_LUKS && - encryption->encinfo.cipher_name) { - - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("supplying for domain disk definitio= n is unnecessary")); - return -1; - } - } - /* internal snapshots and config files are currently supported only wi= th rbd: */ if (virStorageSourceGetActualType(src) !=3D VIR_STORAGE_TYPE_NETWORK && src->protocol !=3D VIR_STORAGE_NET_PROTOCOL_RBD) { --=20 2.39.3