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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 03359A3BC for ; Mon, 4 Apr 2022 16:59:10 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E56ACF970 for ; Mon, 4 Apr 2022 16:58:39 +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 16341F967 for ; Mon, 4 Apr 2022 16:58:39 +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 DCD1E456D9 for ; Mon, 4 Apr 2022 16:58:38 +0200 (CEST) Date: Mon, 04 Apr 2022 16:58:19 +0200 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox VE development discussion References: <20220317113107.60466-1-f.ebner@proxmox.com> <20220317113107.60466-5-f.ebner@proxmox.com> In-Reply-To: <<20220317113107.60466-5-f.ebner@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.15.0 (https://github.com/astroidmail/astroid) Message-Id: <1648805668.1mco8c9jev.astroid@nora.none> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 0 AWL 0.178 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 - Subject: Re: [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: Mon, 04 Apr 2022 14:59:10 -0000 On March 17, 2022 12:31 pm, Fabian Ebner wrote: > Signed-off-by: Fabian Ebner > --- >=20 > New in v13. >=20 > Dependency bump for QEMU 6.2 needed for qemu-img dd's -l option. as discussed off-list - I'd prefer to version-guard the adding of the=20 `-l` part for a while, it's already conditional, and we probably want=20 users encountering issues with 6.2 to be able to downgrade to 6.1 ;) likely bumping the versioned dep to 6 might be a good idea in any case? >=20 > PVE/QemuServer.pm | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) >=20 > 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 =3D PVE::Storage::path($storecfg, $drive->{file}); > + my $src_path =3D PVE::Storage::path($storecfg, $drive->{file}, $snapna= me); > my $dst_path =3D PVE::Storage::path($storecfg, $newvolid); > =20 > + my $src_format =3D (PVE::Storage::parse_volname($storecfg, $drive->{fi= le}))[6]; > + > # better for Ceph if block size is not too small, see bug #3324 > my $bs =3D 1024*1024; > =20 > - run_command(['qemu-img', 'dd', '-n', '-O', $dst_format, "bs=3D$bs", "o= size=3D$size", > - "if=3D$src_path", "of=3D$dst_path"]); > + my $cmd =3D ['qemu-img', 'dd', '-n', '-O', $dst_format]; > + push $cmd->@*, '-l', $snapname if $src_format eq 'qcow2' && $snapname; > + push $cmd->@*, "bs=3D$bs", "osize=3D$size", "if=3D$src_path", "of=3D$d= st_path"; > + run_command($cmd); > } else { > qemu_img_convert($drive->{file}, $newvolid, $size, $snapname, $sparsei= nit); > } > --=20 > 2.30.2 >=20 >=20 >=20 > _______________________________________________ > pve-devel mailing list > pve-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel >=20 >=20 >=20