From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id E0549A973 for ; Tue, 5 Apr 2022 10:23:01 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C37161E26C for ; Tue, 5 Apr 2022 10:22:31 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 firstgate.proxmox.com (Proxmox) with ESMTPS id 5631F1E263 for ; Tue, 5 Apr 2022 10:22:31 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 2970641FF8 for ; Tue, 5 Apr 2022 10:22:31 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Tue, 5 Apr 2022 10:22:14 +0200 Message-Id: <20220405082214.15054-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.113 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [qemuserver.pm] Subject: [pve-devel] [PATCH qemu-server] clone disk: add version guard for qemu-img dd's -l option X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Apr 2022 08:23:01 -0000 It's only available since QEMU 6.2 and doing a check here rather than bumping the package dependency allows for easy downgrades. Suggested-by: Fabian Grünbichler Signed-off-by: Fabian Ebner --- PVE/QemuServer.pm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index eb2db42a..d7f4befc 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -7708,7 +7708,12 @@ sub clone_disk { my $bs = 1024*1024; my $cmd = ['qemu-img', 'dd', '-n', '-O', $dst_format]; - push $cmd->@*, '-l', $snapname if $src_format eq 'qcow2' && $snapname; + + if ($src_format eq 'qcow2' && $snapname) { + die "cannot clone qcow2 EFI disk snapshot - requires QEMU >= 6.2\n" + if !min_version(kvm_user_version(), 6, 2); + push $cmd->@*, '-l', $snapname; + } push $cmd->@*, "bs=$bs", "osize=$size", "if=$src_path", "of=$dst_path"; run_command($cmd); } else { -- 2.30.2