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 5ED366ADCA for ; Thu, 17 Mar 2022 12:31:44 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5863D2C01 for ; Thu, 17 Mar 2022 12:31:14 +0100 (CET) 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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id CE3072BCE for ; Thu, 17 Mar 2022 12:31:12 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id A664746EBC for ; Thu, 17 Mar 2022 12:31:12 +0100 (CET) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Thu, 17 Mar 2022 12:31:02 +0100 Message-Id: <20220317113107.60466-5-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220317113107.60466-1-f.ebner@proxmox.com> References: <20220317113107.60466-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.120 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 v13 qemu-server 4/8] clone disk: also clone EFI disk from snapshot 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: Thu, 17 Mar 2022 11:31:44 -0000 Signed-off-by: Fabian Ebner --- New in v13. Dependency bump for QEMU 6.2 needed for qemu-img dd's -l option. PVE/QemuServer.pm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 907cfc09..a24309d2 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -7662,14 +7662,18 @@ sub clone_disk { # the relevant data on the efidisk may be smaller than the source # e.g. on RBD/ZFS, so we use dd to copy only the amount # that is given by the OVMF_VARS.fd - my $src_path = PVE::Storage::path($storecfg, $drive->{file}); + my $src_path = PVE::Storage::path($storecfg, $drive->{file}, $snapname); my $dst_path = PVE::Storage::path($storecfg, $newvolid); + my $src_format = (PVE::Storage::parse_volname($storecfg, $drive->{file}))[6]; + # better for Ceph if block size is not too small, see bug #3324 my $bs = 1024*1024; - run_command(['qemu-img', 'dd', '-n', '-O', $dst_format, "bs=$bs", "osize=$size", - "if=$src_path", "of=$dst_path"]); + my $cmd = ['qemu-img', 'dd', '-n', '-O', $dst_format]; + push $cmd->@*, '-l', $snapname if $src_format eq 'qcow2' && $snapname; + push $cmd->@*, "bs=$bs", "osize=$size", "if=$src_path", "of=$dst_path"; + run_command($cmd); } else { qemu_img_convert($drive->{file}, $newvolid, $size, $snapname, $sparseinit); } -- 2.30.2